diff --git a/third_party/nixpkgs/.git-blame-ignore-revs b/third_party/nixpkgs/.git-blame-ignore-revs index c34d5b8853..15be142ef0 100644 --- a/third_party/nixpkgs/.git-blame-ignore-revs +++ b/third_party/nixpkgs/.git-blame-ignore-revs @@ -28,6 +28,9 @@ # nixos/modules/rename: Sort alphabetically 1f71224fe86605ef4cd23ed327b3da7882dad382 +# manual: fix typos +feddd5e7f8c6f8167b48a077fa2a5394dc008999 + # nixos: fix module paths in rename.nix d08ede042b74b8199dc748323768227b88efcf7c diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index b9f69a6ce7..c7aa63d40f 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -252,9 +252,8 @@ # Go /doc/languages-frameworks/go.section.md @kalbasit @Mic92 @zowoq +/pkgs/build-support/go @kalbasit @Mic92 @zowoq /pkgs/development/compilers/go @kalbasit @Mic92 @zowoq -/pkgs/development/go-modules @kalbasit @Mic92 @zowoq -/pkgs/development/go-packages @kalbasit @Mic92 @zowoq # GNOME /pkgs/desktops/gnome @jtojnar diff --git a/third_party/nixpkgs/.github/labeler.yml b/third_party/nixpkgs/.github/labeler.yml index a48f60e776..94dfec05c9 100644 --- a/third_party/nixpkgs/.github/labeler.yml +++ b/third_party/nixpkgs/.github/labeler.yml @@ -40,9 +40,8 @@ "6.topic: golang": - doc/languages-frameworks/go.section.md + - pkgs/build-support/go/**/* - pkgs/development/compilers/go/**/* - - pkgs/development/go-modules/**/* - - pkgs/development/go-packages/**/* "6.topic: haskell": - doc/languages-frameworks/haskell.section.md diff --git a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml index d332fef12e..1650f537b7 100644 --- a/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml +++ b/third_party/nixpkgs/.github/workflows/update-terraform-providers.yml @@ -39,7 +39,7 @@ jobs: Check that all providers build with: ``` - @ofborg build terraform-full + @ofborg build terraform.full ``` branch: terraform-providers-update delete-branch: false diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md index 70380248f8..947afe8e9f 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md @@ -1,12 +1,51 @@ # Fetchers {#chap-pkgs-fetchers} -When using Nix, you will frequently need to download source code and other files from the internet. For this purpose, Nix provides the [_fixed output derivation_](https://nixos.org/manual/nix/stable/#fixed-output-drvs) feature and Nixpkgs provides various functions that implement the actual fetching from various protocols and services. +Building software with Nix often requires downloading source code and other files from the internet. +`nixpkgs` provides *fetchers* for different protocols and services. Fetchers are functions that simplify downloading files. ## Caveats -Because fixed output derivations are _identified_ by their hash, a common mistake is to update a fetcher's URL or a version parameter, without updating the hash. **This will cause the old contents to be used.** So remember to always invalidate the hash argument. +Fetchers create [fixed output derivations](https://nixos.org/manual/nix/stable/#fixed-output-drvs) from downloaded files. +Nix can reuse the downloaded files via the hash of the resulting derivation. -For those who develop and maintain fetchers, a similar problem arises with changes to the implementation of a fetcher. These may cause a fixed output derivation to fail, but won't normally be caught by tests because the supposed output is already in the store or cache. For the purpose of testing, you can use a trick that is embodied by the [`invalidateFetcherByDrvHash`](#tester-invalidateFetcherByDrvHash) function. It uses the derivation `name` to create a unique output path per fetcher implementation, defeating the caching precisely where it would be harmful. +The fact that the hash belongs to the Nix derivation output and not the file itself can lead to confusion. +For example, consider the following fetcher: + +```nix +fetchurl { + url = "http://www.example.org/hello-1.0.tar.gz"; + sha256 = "0v6r3wwnsk5pdjr188nip3pjgn1jrn5pc5ajpcfy6had6b3v4dwm"; +}; +``` + +A common mistake is to update a fetcher’s URL, or a version parameter, without updating the hash. + +```nix +fetchurl { + url = "http://www.example.org/hello-1.1.tar.gz"; + sha256 = "0v6r3wwnsk5pdjr188nip3pjgn1jrn5pc5ajpcfy6had6b3v4dwm"; +}; +``` + +**This will reuse the old contents**. +Remember to invalidate the hash argument, in this case by setting the `sha256` attribute to an empty string. + +```nix +fetchurl { + url = "http://www.example.org/hello-1.1.tar.gz"; + sha256 = ""; +}; +``` + +Use the resulting error message to determine the correct hash. + +``` +error: hash mismatch in fixed-output derivation '/path/to/my.drv': + specified: sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA= + got: sha256-RApQUm78dswhBLC/rfU9y0u6pSAzHceIJqgmetRD24E= +``` + +A similar problem arises while testing changes to a fetcher's implementation. If the output of the derivation already exists in the Nix store, test failures can go undetected. The [`invalidateFetcherByDrvHash`](#tester-invalidateFetcherByDrvHash) function helps prevent reusing cached derivations. ## `fetchurl` and `fetchzip` {#fetchurl} diff --git a/third_party/nixpkgs/doc/builders/images/dockertools.section.md b/third_party/nixpkgs/doc/builders/images/dockertools.section.md index 2a41d48cf1..d8deb6cfbc 100644 --- a/third_party/nixpkgs/doc/builders/images/dockertools.section.md +++ b/third_party/nixpkgs/doc/builders/images/dockertools.section.md @@ -321,3 +321,32 @@ buildImage { ``` Creating base files like `/etc/passwd` or `/etc/login.defs` is necessary for shadow-utils to manipulate users and groups. + +## fakeNss {#ssec-pkgs-dockerTools-fakeNss} + +If your primary goal is providing a basic skeleton for user lookups to work, +and/or a lesser privileged user, adding `pkgs.fakeNss` to +the container image root might be the better choice than a custom script +running `useradd` and friends. + +It provides a `/etc/passwd` and `/etc/group`, containing `root` and `nobody` +users and groups. + +It also provides a `/etc/nsswitch.conf`, configuring NSS host resolution to +first check `/etc/hosts`, before checking DNS, as the default in the absence of +a config file (`dns [!UNAVAIL=return] files`) is quite unexpected. + +You can pair it with `binSh`, which provides `bin/sh` as a symlink +to `bashInteractive` (as `/bin/sh` is configured as a shell). + +```nix +buildImage { + name = "shadow-basic"; + + copyToRoot = pkgs.buildEnv { + name = "image-root"; + paths = [ binSh pkgs.fakeNss ]; + pathsToLink = [ "/bin" "/etc" "/var" ]; + }; +} +``` diff --git a/third_party/nixpkgs/doc/builders/packages/unfree.xml b/third_party/nixpkgs/doc/builders/packages/unfree.xml deleted file mode 100644 index 3d4f199f8f..0000000000 --- a/third_party/nixpkgs/doc/builders/packages/unfree.xml +++ /dev/null @@ -1,13 +0,0 @@ -
- Unfree software - - - All users of Nixpkgs are free software users, and many users (and developers) of Nixpkgs want to limit and tightly control their exposure to unfree software. At the same time, many users need (or want) to run some specific pieces of proprietary software. Nixpkgs includes some expressions for unfree software packages. By default unfree software cannot be installed and doesn’t show up in searches. To allow installing unfree software in a single Nix invocation one can export NIXPKGS_ALLOW_UNFREE=1. For a persistent solution, users can set allowUnfree in the Nixpkgs configuration. - - - - Fine-grained control is possible by defining allowUnfreePredicate function in config; it takes the mkDerivation parameter attrset and returns true for unfree packages that should be allowed. - -
diff --git a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md index bc49fdc472..6473fa151a 100644 --- a/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md +++ b/third_party/nixpkgs/doc/contributing/coding-conventions.chapter.md @@ -453,7 +453,7 @@ In the file `pkgs/top-level/all-packages.nix` you can find fetch helpers, these } ``` - Find the value to put as `sha256` by running `nix run -f '' nix-prefetch-github -c nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix` or `nix-prefetch-url --unpack https://github.com/NixOS/nix/archive/1f795f9f44607cc5bec70d1300150bfefcef2aae.tar.gz`. +Find the value to put as `sha256` by running `nix-shell -p nix-prefetch-github --run "nix-prefetch-github --rev 1f795f9f44607cc5bec70d1300150bfefcef2aae NixOS nix"`. ## Obtaining source hash {#sec-source-hashes} diff --git a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md index 471e45d7df..d1aa701f0b 100644 --- a/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md +++ b/third_party/nixpkgs/doc/contributing/submitting-changes.chapter.md @@ -167,24 +167,30 @@ Packages with automated tests are much more likely to be merged in a timely fash ### Tested compilation of all pkgs that depend on this change using `nixpkgs-review` {#submitting-changes-tested-compilation} -If you are updating a package’s version, you can use nixpkgs-review to make sure all packages that depend on the updated package still compile correctly. The `nixpkgs-review` utility can look for and build all dependencies either based on uncommited changes with the `wip` option or specifying a github pull request number. +If you are updating a package’s version, you can use `nixpkgs-review` to make sure all packages that depend on the updated package still compile correctly. The `nixpkgs-review` utility can look for and build all dependencies either based on uncommitted changes with the `wip` option or specifying a GitHub pull request number. -review changes from pull request number 12345: +Review changes from pull request number 12345: ```ShellSession -nix run nixpkgs.nixpkgs-review -c nixpkgs-review pr 12345 +nix-shell -p nixpkgs-review --run "nixpkgs-review pr 12345" ``` -review uncommitted changes: +Alternatively, with flakes (and analogously for the other commands below): ```ShellSession -nix run nixpkgs.nixpkgs-review -c nixpkgs-review wip +nix run nixpkgs#nixpkgs-review -- pr 12345 ``` -review changes from last commit: +Review uncommitted changes: ```ShellSession -nix run nixpkgs.nixpkgs-review -c nixpkgs-review rev HEAD +nix-shell -p nixpkgs-review --run "nixpkgs-review wip" +``` + +Review changes from last commit: + +```ShellSession +nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD" ``` ### Tested execution of all binary files (usually in `./result/bin/`) {#submitting-changes-tested-execution} diff --git a/third_party/nixpkgs/doc/doc-support/parameters.xml b/third_party/nixpkgs/doc/doc-support/parameters.xml index e4b33e66ee..8b413dcd33 100644 --- a/third_party/nixpkgs/doc/doc-support/parameters.xml +++ b/third_party/nixpkgs/doc/doc-support/parameters.xml @@ -11,4 +11,5 @@ + diff --git a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md index 408446674e..4c245a7544 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/dotnet.section.md @@ -87,6 +87,7 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila * `executables` is used to specify which executables get wrapped to `$out/bin`, relative to `$out/lib/$pname`. If this is unset, all executables generated will get installed. If you do not want to install any, set this to `[]`. This gets done in the `preFixup` phase. * `runtimeDeps` is used to wrap libraries into `LD_LIBRARY_PATH`. This is how dotnet usually handles runtime dependencies. * `buildType` is used to change the type of build. Possible values are `Release`, `Debug`, etc. By default, this is set to `Release`. +* `selfContainedBuild` allows to enable the [self-contained](https://docs.microsoft.com/en-us/dotnet/core/deploying/#publish-self-contained) build flag. By default, it is set to false and generated applications have a dependency on the selected dotnet runtime. If enabled, the dotnet runtime is bundled into the executable and the built app has no dependency on Dotnet. * `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. * `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. This can be either a regular dotnet runtime, or an aspnetcore. * `dotnet-test-sdk` is useful in cases where unit tests expect a different dotnet SDK. By default, this is set to the `dotnet-sdk` attribute. diff --git a/third_party/nixpkgs/doc/languages-frameworks/go.section.md b/third_party/nixpkgs/doc/languages-frameworks/go.section.md index 9c67a51433..8616d64e7c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/go.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/go.section.md @@ -11,8 +11,8 @@ The function `buildGoModule` builds Go programs managed with Go modules. It buil In the following is an example expression using `buildGoModule`, the following arguments are of special significance to the function: -- `vendorSha256`: is the hash of the output of the intermediate fetcher derivation. `vendorSha256` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorSha256 = null;` -- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorSha256` checksums. +- `vendorHash`: is the hash of the output of the intermediate fetcher derivation. `vendorHash` can also take `null` as an input. When `null` is used as a value, rather than fetching the dependencies and vendoring them, we use the vendoring included within the source repo. If you'd like to not have to update this field on dependency changes, run `go mod vendor` in your source repo and set `vendorHash = null;` +- `proxyVendor`: Fetches (go mod download) and proxies the vendor directory. This is useful if your code depends on c code and go mod tidy does not include the needed sources to build or if any dependency has case-insensitive conflicts which will produce platform dependant `vendorHash` checksums. ```nix pet = buildGoModule rec { @@ -26,7 +26,7 @@ pet = buildGoModule rec { sha256 = "0m2fzpqxk7hrbxsgqplkg7h2p7gv6s1miymv3gvw0cz039skag0s"; }; - vendorSha256 = "1879j77k96684wi554rkjxydrj8g3hpp0kvxz03sd8dmwr3lh83j"; + vendorHash = "sha256-ciBIR+a1oaYH+H1PcC8cD8ncfJczk1IiJ8iYNM+R6aA="; meta = with lib; { description = "Simple command-line snippet manager, written in Go"; diff --git a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md index 19e31ea690..9d16b951e8 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/javascript.section.md @@ -180,18 +180,27 @@ See `node2nix` [docs](https://github.com/svanderburg/node2nix) for more info. #### Preparation {#javascript-yarn2nix-preparation} -You will need at least a yarn.lock and yarn.nix file. +You will need at least a `yarn.lock` file. If upstream does not have one you need to generate it and reference it in your package definition. -- Generate a yarn.lock in upstream if it is not already there. -- `yarn2nix > yarn.nix` will generate the dependencies in a Nix format. +If the downloaded files contain the `package.json` and `yarn.lock` files they can be used like this: + +```nix +offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = "...."; +}; +``` #### mkYarnPackage {#javascript-yarn2nix-mkYarnPackage} -This will by default try to generate a binary. For package only generating static assets (Svelte, Vue, React...), you will need to explicitly override the build step with your instructions. It's important to use the `--offline` flag. For example if you script is `"build": "something"` in package.json use: +`mkYarnPackage` will by default try to generate a binary. For package only generating static assets (Svelte, Vue, React, WebPack, ...), you will need to explicitly override the build step with your instructions. + +It's important to use the `--offline` flag. For example if you script is `"build": "something"` in `package.json` use: ```nix buildPhase = '' - yarn build --offline + export HOME=$(mktemp -d) + yarn --offline build ''; ``` @@ -201,15 +210,27 @@ The dist phase is also trying to build a binary, the only way to override it is distPhase = "true"; ``` -The configure phase can sometimes fail because it tries to be too clever. One common override is: +The configure phase can sometimes fail because it makes many assumptions which may not always apply. One common override is: ```nix -configurePhase = "ln -s $node_modules node_modules"; +configurePhase = '' + ln -s $node_modules node_modules +''; +``` + +or if you need a writeable node_modules directory: + +```nix +configurePhase = '' + cp -r $node_modules node_modules + chmod +w node_modules +''; ``` #### mkYarnModules {#javascript-yarn2nix-mkYarnModules} -This will generate a derivation including the node_modules. If you have to build a derivation for an integrated web framework (rails, phoenix..), this is probably the easiest way. [Plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix#L39) offers a good example of how to do this. +This will generate a derivation including the `node_modules` directory. +If you have to build a derivation for an integrated web framework (rails, phoenix..), this is probably the easiest way. #### Overriding dependency behavior diff --git a/third_party/nixpkgs/doc/languages-frameworks/maven.section.md b/third_party/nixpkgs/doc/languages-frameworks/maven.section.md index f53a6fa8ac..cc5b4e3ed7 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/maven.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/maven.section.md @@ -233,7 +233,8 @@ in stdenv.mkDerivation rec { src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; - buildInputs = [ maven makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ maven ]; buildPhase = '' echo "Using repository ${repository}" @@ -310,7 +311,8 @@ in stdenv.mkDerivation rec { src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; - buildInputs = [ maven makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ maven ]; buildPhase = '' echo "Using repository ${repository}" diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 7df8464917..7fb8ba2e7c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -1664,6 +1664,26 @@ self: super: { } ``` +### How to override a Python package for all Python versions using extensions? {#how-to-override-a-python-package-for-all-python-versions-using-extensions} + +The following overlay overrides the call to `buildPythonPackage` for the +`foo` package for all interpreters by appending a Python extension to the +`pythonPackagesExtensions` list of extensions. + +```nix +final: prev: { + pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ + ( + python-final: python-prev: { + foo = python-prev.foo.overridePythonAttrs (oldAttrs: { + ... + }); + } + ) + ]; +} +``` + ### How to use Intel’s MKL with numpy and scipy? {#how-to-use-intels-mkl-with-numpy-and-scipy} MKL can be configured using an overlay. See the section "[Using overlays to diff --git a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md index e29f97c566..d1265097d2 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/ruby.section.md @@ -274,7 +274,7 @@ bundlerApp { gemdir = ./.; exes = [ "r10k" ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; postBuild = '' wrapProgram $out/bin/r10k --prefix PATH : ${lib.makeBinPath [ git gnutar gzip ]} diff --git a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md index 7b8f2b4ce6..0eff70de5c 100644 --- a/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/cross-compilation.chapter.md @@ -155,14 +155,14 @@ doCheck = stdenv.hostPlatform == stdenv.buildPlatform; #### Package using Meson needs to run binaries for the host platform during build. {#cross-meson-runs-host-code} -Add `mesonEmulatorHook` cross conditionally to `nativeBuildInputs`. +Add `mesonEmulatorHook` to `nativeBuildInputs` conditionally on if the target binaries can be executed. e.g. ``` nativeBuildInputs = [ meson -] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ +] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; ``` diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index 5f7f45dc44..b4cc50b509 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -317,7 +317,7 @@ The script will be usually run from the root of the Nixpkgs repository but you s For information about how to run the updates, execute `nix-shell maintainers/scripts/update.nix`. -### Recursive attributes in `mkDerivation` +### Recursive attributes in `mkDerivation` {#mkderivation-recursive-attributes} If you pass a function to `mkDerivation`, it will receive as its argument the final arguments, including the overrides when reinvoked via `overrideAttrs`. For example: @@ -731,6 +731,10 @@ If set, files in `$out/sbin` are not moved to `$out/bin`. By default, they are. List of directories to search for libraries and executables from which *all* symbols should be stripped. By default, it’s empty. Stripping all symbols is risky, since it may remove not just debug symbols but also ELF information necessary for normal execution. +##### `stripAllListTarget` {#var-stdenv-stripAllListTarget} + +Like `stripAllList`, but only applies to packages’ target platform. By default, it’s empty. Useful when supporting cross compilation. + ##### `stripAllFlags` {#var-stdenv-stripAllFlags} Flags passed to the `strip` command applied to the files in the directories listed in `stripAllList`. Defaults to `-s` (i.e. `--strip-all`). @@ -739,6 +743,10 @@ Flags passed to the `strip` command applied to the files in the directories list List of directories to search for libraries and executables from which only debugging-related symbols should be stripped. It defaults to `lib lib32 lib64 libexec bin sbin`. +##### `stripDebugListTarget` {#var-stdenv-stripDebugListTarget} + +Like `stripDebugList`, but only applies to packages’ target platform. By default, it’s empty. Useful when supporting cross compilation. + ##### `stripDebugFlags` {#var-stdenv-stripDebugFlags} Flags passed to the `strip` command applied to the files in the directories listed in `stripDebugList`. Defaults to `-S` (i.e. `--strip-debug`). @@ -913,9 +921,9 @@ substitute ./foo.in ./foo.out \ --subst-var someVar ``` -### `substituteInPlace` \ \ {#fun-substituteInPlace} +### `substituteInPlace` \ \ {#fun-substituteInPlace} -Like `substitute`, but performs the substitutions in place on the file \. +Like `substitute`, but performs the substitutions in place on the files passed. ### `substituteAll` \ \ {#fun-substituteAll} diff --git a/third_party/nixpkgs/doc/using/configuration.chapter.md b/third_party/nixpkgs/doc/using/configuration.chapter.md index 2445aa32f2..3c46dc3227 100644 --- a/third_party/nixpkgs/doc/using/configuration.chapter.md +++ b/third_party/nixpkgs/doc/using/configuration.chapter.md @@ -77,6 +77,11 @@ The difference between a package being unsupported on some system and being brok ## Installing unfree packages {#sec-allow-unfree} +All users of Nixpkgs are free software users, and many users (and developers) of Nixpkgs want to limit and tightly control their exposure to unfree software. +At the same time, many users need (or want) to run some specific pieces of proprietary software. +Nixpkgs includes some expressions for unfree software packages. +By default unfree software cannot be installed and doesn’t show up in searches. + There are several ways to tweak how Nix handles a package which has been marked as unfree. - To temporarily allow all unfree packages, you can use an environment variable for a single invocation of the nix tools: diff --git a/third_party/nixpkgs/flake.nix b/third_party/nixpkgs/flake.nix index 8c0403adc4..67ecfc6eb0 100644 --- a/third_party/nixpkgs/flake.nix +++ b/third_party/nixpkgs/flake.nix @@ -20,13 +20,20 @@ nixos = import ./nixos/lib { lib = final; }; nixosSystem = args: - import ./nixos/lib/eval-config.nix (args // { - modules = args.modules ++ [ { - system.nixos.versionSuffix = - ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; - system.nixos.revision = final.mkIf (self ? rev) self.rev; - } ]; - }); + import ./nixos/lib/eval-config.nix ( + args // { + modules = args.modules ++ [{ + system.nixos.versionSuffix = + ".${final.substring 0 8 (self.lastModifiedDate or self.lastModified or "19700101")}.${self.shortRev or "dirty"}"; + system.nixos.revision = final.mkIf (self ? rev) self.rev; + }]; + } // lib.optionalAttrs (! args?system) { + # Allow system to be set modularly in nixpkgs.system. + # We set it to null, to remove the "legacy" entrypoint's + # non-hermetic default. + system = null; + } + ); }); checks.x86_64-linux.tarball = jobs.tarball; diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index 873ad1b7bb..56299612a0 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -520,6 +520,13 @@ in mkLicense lset) ({ free = false; }; + databricks-dbx = { + fullName = "DataBricks eXtensions aka dbx License"; + url = "https://github.com/databrickslabs/dbx/blob/743b579a4ac44531f764c6e522dbe5a81a7dc0e4/LICENSE"; + free = false; + redistributable = false; + }; + issl = { fullName = "Intel Simplified Software License"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; diff --git a/third_party/nixpkgs/lib/modules.nix b/third_party/nixpkgs/lib/modules.nix index 1e48f54407..7f1646e9b8 100644 --- a/third_party/nixpkgs/lib/modules.nix +++ b/third_party/nixpkgs/lib/modules.nix @@ -266,6 +266,15 @@ rec { turned off. ''; }; + + _module.specialArgs = mkOption { + readOnly = true; + internal = true; + description = '' + Externally provided module arguments that can't be modified from + within a configuration, but can be used in module imports. + ''; + }; }; config = { @@ -273,6 +282,7 @@ rec { inherit extendModules; moduleType = type; }; + _module.specialArgs = specialArgs; }; }; diff --git a/third_party/nixpkgs/lib/options.nix b/third_party/nixpkgs/lib/options.nix index 3a1c0e540d..84d9fd5e15 100644 --- a/third_party/nixpkgs/lib/options.nix +++ b/third_party/nixpkgs/lib/options.nix @@ -121,7 +121,7 @@ rec { Example: mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.packages.ghc924.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 = { ... }; } */ diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix index 25340825c4..2990afde3e 100644 --- a/third_party/nixpkgs/lib/systems/default.nix +++ b/third_party/nixpkgs/lib/systems/default.nix @@ -16,9 +16,6 @@ rec { */ flakeExposed = import ./flake-systems.nix { }; - # TODO(@sternenseemann): remove before 21.11 - supported = throw "2022-05-23: Use lib.systems.flakeExposed instead of lib.systems.supported.hydra, as lib.systems.supported has been removed"; - # Elaborate a `localSystem` or `crossSystem` so that it contains everything # necessary. # diff --git a/third_party/nixpkgs/lib/systems/inspect.nix b/third_party/nixpkgs/lib/systems/inspect.nix index e5bd879e2c..dbffca0300 100644 --- a/third_party/nixpkgs/lib/systems/inspect.nix +++ b/third_party/nixpkgs/lib/systems/inspect.nix @@ -16,6 +16,7 @@ rec { isx86 = { cpu = { family = "x86"; }; }; isAarch32 = { cpu = { family = "arm"; bits = 32; }; }; isAarch64 = { cpu = { family = "arm"; bits = 64; }; }; + isAarch = { cpu = { family = "arm"; }; }; isMips = { cpu = { family = "mips"; }; }; isMips32 = { cpu = { family = "mips"; bits = 32; }; }; isMips64 = { cpu = { family = "mips"; bits = 64; }; }; diff --git a/third_party/nixpkgs/lib/systems/platforms.nix b/third_party/nixpkgs/lib/systems/platforms.nix index d93d292a9f..41c25484ce 100644 --- a/third_party/nixpkgs/lib/systems/platforms.nix +++ b/third_party/nixpkgs/lib/systems/platforms.nix @@ -483,8 +483,8 @@ rec { }; # can execute on 32bit chip - gcc_mips32r2_o32 = { gcc = { arch = "mips32r2"; abi = "o32"; }; }; - gcc_mips32r6_o32 = { gcc = { arch = "mips32r6"; abi = "o32"; }; }; + gcc_mips32r2_o32 = { gcc = { arch = "mips32r2"; abi = "32"; }; }; + gcc_mips32r6_o32 = { gcc = { arch = "mips32r6"; abi = "32"; }; }; gcc_mips64r2_n32 = { gcc = { arch = "mips64r2"; abi = "n32"; }; }; gcc_mips64r6_n32 = { gcc = { arch = "mips64r6"; abi = "n32"; }; }; gcc_mips64r2_64 = { gcc = { arch = "mips64r2"; abi = "64"; }; }; diff --git a/third_party/nixpkgs/lib/types.nix b/third_party/nixpkgs/lib/types.nix index 354714b287..d7655bc1a6 100644 --- a/third_party/nixpkgs/lib/types.nix +++ b/third_party/nixpkgs/lib/types.nix @@ -55,6 +55,7 @@ let concatMapStringsSep concatStringsSep escapeNixString + hasInfix isCoercibleToString ; inherit (lib.trivial) @@ -360,6 +361,11 @@ rec { deprecationMessage = "See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types."; }; + passwdEntry = entryType: addCheck entryType (str: !(hasInfix ":" str || hasInfix "\n" str)) // { + name = "passwdEntry ${entryType.name}"; + description = "${entryType.description}, not containing newlines or colons"; + }; + attrs = mkOptionType { name = "attrs"; description = "attribute set"; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 1a0b2ab335..f5ec01fab6 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -683,6 +683,13 @@ githubId = 2626481; name = "Ambroz Bizjak"; }; + amesgen = { + email = "amesgen@amesgen.de"; + github = "amesgen"; + githubId = 15369874; + name = "Alexander Esgen"; + matrix = "@amesgen:amesgen.de"; + }; ametrine = { name = "Matilde Ametrine"; email = "matilde@diffyq.xyz"; @@ -845,6 +852,16 @@ githubId = 11699655; name = "Stanislas Lange"; }; + AngryAnt = { + name = "Emil Johansen"; + email = "git@eej.dk"; + matrix = "@angryant:envs.net"; + github = "AngryAnt"; + githubId = 102513; + keys = [{ + fingerprint = "B7B7 582E 564E 789B FCB8 71AB 0C6D FE2F B234 534A"; + }]; + }; anhdle14 = { name = "Le Anh Duc"; email = "anhdle14@icloud.com"; @@ -913,6 +930,15 @@ name = "Anselm Schüler"; matrix = "@schuelermine:matrix.org"; }; + anthonyroussel = { + email = "anthony@roussel.dev"; + github = "anthonyroussel"; + githubId = 220084; + name = "Anthony Roussel"; + keys = [{ + fingerprint = "472D 368A F107 F443 F3A5 C712 9DC4 987B 1A55 E75E"; + }]; + }; antoinerg = { email = "roygobeil.antoine@gmail.com"; github = "antoinerg"; @@ -1247,6 +1273,12 @@ githubId = 1217745; name = "Aldwin Vlasblom"; }; + aveltras = { + email = "romain.viallard@outlook.fr"; + github = "aveltras"; + githubId = 790607; + name = "Romain Viallard"; + }; avery = { email = "averyl+nixos@protonmail.com"; github = "AveryLychee"; @@ -2288,6 +2320,12 @@ githubId = 811527; name = "Christopher Jefferson"; }; + chrispattison = { + email = "chpattison@gmail.com"; + github = "ChrisPattison"; + githubId = 641627; + name = "Chris Pattison"; + }; chrispickard = { email = "chrispickard9@gmail.com"; github = "chrispickard"; @@ -2639,6 +2677,12 @@ fingerprint = "8026 D24A A966 BF9C D3CD CB3C 08FB 2BFC 470E 75B4"; }]; }; + Crafter = { + email = "crafter@crafter.rocks"; + github = "Craftzman7"; + githubId = 70068692; + name = "Crafter"; + }; craigem = { email = "craige@mcwhirter.io"; github = "craigem"; @@ -2808,6 +2852,15 @@ githubId = 743057; name = "Danylo Hlynskyi"; }; + danc86 = { + name = "Dan Callaghan"; + email = "djc@djc.id.au"; + github = "danc86"; + githubId = 398575; + keys = [{ + fingerprint = "1C56 01F1 D70A B56F EABB 6BC0 26B5 AA2F DAF2 F30A"; + }]; + }; dancek = { email = "hannu.hartikainen@gmail.com"; github = "dancek"; @@ -2854,7 +2907,7 @@ danth = { name = "Daniel Thwaites"; email = "danthwaites30@btinternet.com"; - matrix = "@danth:matrix.org"; + matrix = "@danth:pwak.org"; github = "danth"; githubId = 28959268; keys = [{ @@ -3122,6 +3175,13 @@ githubId = 1311761; name = "Didier J. Devroye"; }; + desttinghim = { + email = "opensource@louispearson.work"; + matrix = "@desttinghim:matrix.org"; + github = "desttinghim"; + githubId = 10042482; + name = "Louis Pearson"; + }; devhell = { email = ''"^"@regexmail.net''; github = "devhell"; @@ -4356,6 +4416,21 @@ githubId = 405105; name = "Dustin Frisch"; }; + foo-dogsquared = { + email = "foo.dogsquared@gmail.com"; + github = "foo-dogsquared"; + githubId = 34962634; + name = "Gabriel Arazas"; + }; + foolnotion = { + email = "bogdan.burlacu@pm.me"; + github = "foolnotion"; + githubId = 844222; + name = "Bogdan Burlacu"; + keys = [{ + fingerprint = "B722 6464 838F 8BDB 2BEA C8C8 5B0E FDDF BA81 6105"; + }]; + }; forkk = { email = "forkk@forkk.net"; github = "Forkk"; @@ -5126,6 +5201,12 @@ githubId = 3656888; name = "hhm"; }; + hhydraa = { + email = "hcurfman@keemail.me"; + github = "hhydraa"; + githubId = 58676303; + name = "hhydraa"; + }; higebu = { name = "Yuya Kusakabe"; email = "yuya.kusakabe@gmail.com"; @@ -5180,6 +5261,16 @@ githubId = 6074754; name = "Hlodver Sigurdsson"; }; + huantian = { + name = "David Li"; + email = "davidtianli@gmail.com"; + matrix = "@huantian:huantian.dev"; + github = "huantianad"; + githubId = 20760920; + keys = [{ + fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5"; + }]; + }; hugoreeves = { email = "hugo@hugoreeves.com"; github = "HugoReeves"; @@ -5268,6 +5359,12 @@ githubId = 39689; name = "Hugo Tavares Reis"; }; + hufman = { + email = "hufman@gmail.com"; + github = "hufman"; + githubId = 1592375; + name = "Walter Huf"; + }; hugolgst = { email = "hugo.lageneste@pm.me"; github = "hugolgst"; @@ -5412,10 +5509,10 @@ githubId = 40234257; name = "ilkecan bozdogan"; }; - ihatethefrench = { + not-my-segfault = { email = "michal@tar.black"; matrix = "@michal:tar.black"; - github = "ihatethefrench"; + github = "not-my-segfault"; githubId = 30374463; name = "Michal S."; }; @@ -6289,6 +6386,12 @@ github = "JoshuaFern"; githubId = 4300747; }; + joshvanl = { + email = " me@joshvanl.dev "; + github = "joshvanl"; + githubId = 15893072; + name = "Josh van Leeuwen"; + }; jpas = { name = "Jarrod Pas"; email = "jarrod@jarrodpas.com"; @@ -6343,13 +6446,6 @@ githubId = 3267697; name = "Joshua Potter"; }; - jschievink = { - email = "jonasschievink@gmail.com"; - matrix = "@jschievink:matrix.org"; - github = "jonas-schievink"; - githubId = 1786438; - name = "Jonas Schievink"; - }; jshcmpbll = { email = "me@joshuadcampbell.com"; github = "jshcmpbll"; @@ -6641,6 +6737,15 @@ githubId = 37185887; name = "Calvin Kim"; }; + keksbg = { + email = "keksbg@riseup.net"; + name = "Stella"; + github = "keksbg"; + githubId = 10682187; + keys = [{ + fingerprint = "AB42 1F18 5A19 A160 AD77 9885 3D6D CA5B 6F2C 2A7A"; + }]; + }; keldu = { email = "mail@keldu.de"; github = "keldu"; @@ -7241,6 +7346,13 @@ githubId = 4158274; name = "Michiel Leenaars"; }; + logo = { + email = "logo4poop@protonmail.com"; + matrix = "@logo4poop:matrix.org"; + github = "logo4poop"; + githubId = 24994565; + name = "Isaac Silverstein"; + }; lom = { email = "legendofmiracles@protonmail.com"; matrix = "@legendofmiracles:matrix.org"; @@ -7415,6 +7527,16 @@ githubId = 667272; name = "Lincoln Lee"; }; + linj = { + name = "Lin Jian"; + email = "me@linj.tech"; + matrix = "@me:linj.tech"; + github = "jian-lin"; + githubId = 75130626; + keys = [{ + fingerprint = "80EE AAD8 43F9 3097 24B5 3D7E 27E9 7B91 E63A 7FF8"; + }]; + }; linquize = { email = "linquize@yahoo.com.hk"; github = "linquize"; @@ -7463,6 +7585,16 @@ githubId = 22085373; name = "Luis Hebendanz"; }; + luizribeiro = { + email = "nixpkgs@l9o.dev"; + matrix = "@luizribeiro:matrix.org"; + name = "Luiz Ribeiro"; + github = "luizribeiro"; + githubId = 112069; + keys = [{ + fingerprint = "97A0 AE5E 03F3 499B 7D7A 65C6 76A4 1432 37EF 5817"; + }]; + }; lunarequest = { email = "nullarequest@vivlaid.net"; github = "Lunarequest"; @@ -7991,6 +8123,12 @@ githubId = 1711539; name = "matklad"; }; + matrss = { + name = "Matthias Riße"; + email = "matthias.risze@t-online.de"; + github = "matrss"; + githubId = 9308656; + }; matt-snider = { email = "matt.snider@protonmail.com"; github = "matt-snider"; @@ -9406,6 +9544,12 @@ githubId = 20391; name = "Nahum Shalman"; }; + nsnelson = { + email = "noah.snelson@protonmail.com"; + github = "peeley"; + githubId = 30942198; + name = "Noah Snelson"; + }; nthorne = { email = "notrupertthorne@gmail.com"; github = "nthorne"; @@ -9493,6 +9637,15 @@ fingerprint = "D5E4 A51D F8D2 55B9 FAC6 A9BB 2F96 07F0 9B36 0F2D"; }]; }; + ocfox = { + email = "i@ocfox.me"; + github = "ocfox"; + githubId = 47410251; + name = "ocfox"; + keys = [{ + fingerprint = "939E F8A5 CED8 7F50 5BB5 B2D0 24BC 2738 5F70 234F"; + }]; + }; odi = { email = "oliver.dunkl@gmail.com"; github = "odi"; @@ -9541,6 +9694,12 @@ githubId = 1237862; name = "Ollie Bunting"; }; + oluceps = { + email = "nixos@oluceps.uk"; + github = "oluceps"; + githubId = 35628088; + name = "oluceps"; + }; olynch = { email = "owen@olynch.me"; github = "olynch"; @@ -9583,6 +9742,12 @@ githubId = 757752; name = "Jonas Heinrich"; }; + onthestairs = { + email = "austinplatt@gmail.com"; + github = "onthestairs"; + githubId = 915970; + name = "Austin Platt"; + }; ony = { name = "Mykola Orliuk"; email = "virkony@gmail.com"; @@ -9643,6 +9808,12 @@ githubId = 25278; name = "Otavio Salvador"; }; + otini = { + name = "Olivier Nicole"; + email = "olivier@chnik.fr"; + github = "OlivierNicole"; + githubId = 14031333; + }; otwieracz = { email = "slawek@otwiera.cz"; github = "otwieracz"; @@ -9750,18 +9921,24 @@ githubId = 1788628; name = "pandaman"; }; + panicgh = { + email = "nbenes.gh@xandea.de"; + github = "panicgh"; + githubId = 79252025; + name = "Nicolas Benes"; + }; paperdigits = { email = "mica@silentumbrella.com"; github = "paperdigits"; githubId = 71795; name = "Mica Semrick"; }; - papojari = { - email = "papojari-git.ovoid@aleeas.com"; + annaaurora = { + email = "anna@annaaurora.eu"; matrix = "@papojari:artemislena.eu"; github = "auroraanna"; githubId = 81317317; - name = "papojari"; + name = "Anna Aurora"; }; paraseba = { email = "paraseba@gmail.com"; @@ -9814,6 +9991,12 @@ fingerprint = "196A BFEC 6A1D D1EC 7594 F8D1 F625 47D0 75E0 9767"; }]; }; + patryk4815 = { + email = "patryk.sondej@gmail.com"; + github = "patryk4815"; + githubId = 3074260; + name = "Patryk Sondej"; + }; patternspandemic = { email = "patternspandemic@live.com"; github = "patternspandemic"; @@ -10303,6 +10486,12 @@ } ]; }; + ProducerMatt = { + name = "Matthew Pherigo"; + email = "ProducerMatt42@gmail.com"; + github = "ProducerMatt"; + githubId = 58014742; + }; Profpatsch = { email = "mail@profpatsch.de"; github = "Profpatsch"; @@ -11279,6 +11468,12 @@ githubId = 107703; name = "Samuel Rivas"; }; + samw = { + email = "sam@wlcx.cc"; + github = "wlcx"; + githubId = 3065381; + name = "Sam Willcocks"; + }; samyak = { name = "Samyak Sarnayak"; email = "samyak201@gmail.com"; @@ -11962,15 +12157,6 @@ githubId = 9720532; name = "Sergei K"; }; - sondr3 = { - email = "nilsen.sondre@gmail.com"; - github = "sondr3"; - githubId = 2280539; - name = "Sondre Nilsen"; - keys = [{ - fingerprint = "0EC3 FA89 EFBA B421 F82E 40B0 2567 6BCB FFAD 76B1"; - }]; - }; sophrosyne = { email = "joshuaortiz@tutanota.com"; github = "sophrosyne97"; @@ -12038,6 +12224,12 @@ githubId = 36899624; name = "squalus"; }; + squarepear = { + email = "contact@jeffreyharmon.dev"; + github = "SquarePear"; + githubId = 16364318; + name = "Jeffrey Harmon"; + }; srapenne = { email = "solene@perso.pw"; github = "rapenne-s"; @@ -12632,6 +12824,16 @@ githubId = 886074; name = "Matthieu Coudron"; }; + teutat3s = { + email = "teutates@mailbox.org"; + matrix = "@teutat3s:pub.solar"; + github = "teutat3s"; + githubId = 10206665; + name = "teutat3s"; + keys = [{ + fingerprint = "81A1 1C61 F413 8C84 9139 A4FA 18DA E600 A6BB E705"; + }]; + }; tex = { email = "milan.svoboda@centrum.cz"; github = "tex"; @@ -12983,6 +13185,12 @@ githubId = 61303; name = "Tom Fitzhenry"; }; + tomhoule = { + email = "secondary+nixpkgs@tomhoule.com"; + github = "tomhoule"; + githubId = 13155277; + name = "Tom Houle"; + }; tomsmeets = { email = "tom.tsmeets@gmail.com"; github = "TomSmeets"; @@ -14009,6 +14217,12 @@ githubId = 5978566; name = "Yves-Stan Le Cornec"; }; + ylh = { + email = "nixpkgs@ylh.io"; + github = "ylh"; + githubId = 9125590; + name = "Yestin L. Harrison"; + }; ylwghst = { email = "ylwghst@onionmail.info"; github = "ylwghst"; @@ -14714,4 +14928,22 @@ 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; + }; } diff --git a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs index 60b57b97a2..f7e5f57398 100755 --- a/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs +++ b/third_party/nixpkgs/maintainers/scripts/haskell/hydra-report.hs @@ -451,8 +451,8 @@ printBuildSummary showBuild (name, entry) = printJob id name (summaryBuilds entry, Text.pack (if summaryReverseDeps entry > 0 then " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>" | "<> show (summaryReverseDeps entry) else "")) showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers))) tldr = case (errors, warnings) of - ([],[]) -> [":green_circle: **Ready to merge**"] - ([],_) -> [":yellow_circle: **Potential issues**"] + ([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] + ([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"] _ -> [":red_circle: **Branch not mergeable**"] warnings = if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <> diff --git a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv index c7b1e405eb..e41e8a1625 100644 --- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -39,11 +39,13 @@ lua-cmsgpack,,,,,, lua-iconv,,,,,, lua-lsp,,,,,, lua-messagepack,,,,,, +lua-protobuf,,,,,,lockejan lua-resty-http,,,,,, lua-resty-jwt,,,,,, lua-resty-openidc,,,,,, lua-resty-openssl,,,,,, lua-resty-session,,,,,, +lua-subprocess,https://github.com/0x0ade/lua-subprocess,,,,lua5_1,scoder12 lua-term,,,,,, lua-toml,,,,,, lua-zlib,,,,,,koral @@ -70,6 +72,7 @@ luasql-sqlite3,,,,,,vyp luassert,,,,,, luasystem,,,,,, luaunbound,,,,, +luaunit,,,,,,lockejan luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn @@ -86,6 +89,7 @@ plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,lua5_1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, readline,,,,,, say,https://github.com/Olivine-Labs/say.git,,,,, +serpent,,,,,,lockejan sqlite,,,,,, std._debug,https://github.com/lua-stdlib/_debug.git,,,,, std.normalize,https://github.com/lua-stdlib/normalize.git,,,,, diff --git a/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix index 3dda306cd1..86d297730c 100644 --- a/third_party/nixpkgs/maintainers/team-list.nix +++ b/third_party/nixpkgs/maintainers/team-list.nix @@ -256,12 +256,8 @@ with lib.maintainers; { golang = { members = [ c00w - cstrahan - Frostman kalbasit mic92 - orivej - rvolosatovs zowoq ]; scope = "Maintain Golang compilers."; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md b/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md index 08b6af5d98..835cbad554 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/gpu-accel.chapter.md @@ -169,7 +169,7 @@ configuration, GPU devices have world-read/write permissions (`/dev/dri/renderD*`) or are tagged as `uaccess` (`/dev/dri/card*`). The access control lists of devices with the `uaccess` tag will be updated automatically when a user logs in through `systemd-logind`. For example, -if the user *jane* is logged in, the access control list should look as +if the user *alice* is logged in, the access control list should look as follows: ```ShellSession @@ -178,7 +178,7 @@ $ getfacl /dev/dri/card0 # owner: root # group: video user::rw- -user:jane:rw- +user:alice:rw- group::rw- mask::rw- other::--- diff --git a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md index 79914f2cb6..8bf73a6645 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/option-declarations.section.md @@ -127,14 +127,14 @@ lib.mkOption { ```nix lib.mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.packages.ghc924.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.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = lib.literalExpression "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; description = "The GHC package to use."; } ``` diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md index da965ce09e..6934bb0fac 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -347,7 +347,7 @@ import ./make-test-python.nix { ## Failing tests early {#ssec-failing-tests-early} -To fail tests early when certain invariables are no longer met (instead of waiting for the build to time out), the decorator `polling_condition` is provided. For example, if we are testing a program `foo` that should not quit after being started, we might write the following: +To fail tests early when certain invariants are no longer met (instead of waiting for the build to time out), the decorator `polling_condition` is provided. For example, if we are testing a program `foo` that should not quit after being started, we might write the following: ```py @polling_condition @@ -369,29 +369,29 @@ with foo_running: : specifies how often the condition should be polled: - ```py - @polling_condition(seconds_interval=10) - def foo_running(): - machine.succeed("pgrep -x foo") - ``` +```py +@polling_condition(seconds_interval=10) +def foo_running(): + machine.succeed("pgrep -x foo") +``` `description` : is used in the log when the condition is checked. If this is not provided, the description is pulled from the docstring of the function. These two are therefore equivalent: - ```py - @polling_condition - def foo_running(): - "check that foo is running" - machine.succeed("pgrep -x foo") - ``` +```py +@polling_condition +def foo_running(): + "check that foo is running" + machine.succeed("pgrep -x foo") +``` - ```py - @polling_condition(description="check that foo is running") - def foo_running(): - machine.succeed("pgrep -x foo") - ``` +```py +@polling_condition(description="check that foo is running") +def foo_running(): + machine.succeed("pgrep -x foo") +``` ## Adding Python packages to the test script {#ssec-python-packages-in-test-script} diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml index 8e780c5dee..cc559a1933 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/configuration/gpu-accel.chapter.xml @@ -194,7 +194,7 @@ environment.variables.VK_ICD_FILENAMES = devices with the uaccess tag will be updated automatically when a user logs in through systemd-logind. For example, if the user - jane is logged in, the access control list + alice is logged in, the access control list should look as follows: @@ -203,7 +203,7 @@ $ getfacl /dev/dri/card0 # owner: root # group: video user::rw- -user:jane:rw- +user:alice:rw- group::rw- mask::rw- other::--- diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml index 03ec48f35f..d7c7f7716b 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -193,14 +193,14 @@ lib.mkOption { lib.mkPackageOption pkgs "GHC" { default = [ "ghc" ]; - example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = "pkgs.haskell.packages.ghc924.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.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])"; + example = lib.literalExpression "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; description = "The GHC package to use."; } diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml index 7e4af03829..d6f4f61c06 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -607,7 +607,7 @@ import ./make-test-python.nix {
Failing tests early - To fail tests early when certain invariables are no longer met + To fail tests early when certain invariants are no longer met (instead of waiting for the build to time out), the decorator polling_condition is provided. For example, if we are testing a program foo that should not @@ -635,12 +635,10 @@ with foo_running: : specifies how often the condition should be polled: - -```py + @polling_condition(seconds_interval=10) def foo_running(): machine.succeed("pgrep -x foo") -``` description @@ -650,19 +648,16 @@ def foo_running(): provided, the description is pulled from the docstring of the function. These two are therefore equivalent: - -```py + @polling_condition def foo_running(): "check that foo is running" machine.succeed("pgrep -x foo") -``` - -```py + + @polling_condition(description="check that foo is running") def foo_running(): machine.succeed("pgrep -x foo") -```
diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml index e7a76a6d71..ea2d01bebc 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/building-nixos.chapter.xml @@ -33,9 +33,14 @@
Practical Instructions + + To build an ISO image for the channel + nixos-unstable: + $ 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 diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml index 19ff841f5a..0fcbcf2e66 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/installation/installing.chapter.xml @@ -426,7 +426,9 @@ OK - You must set the option + You must select a boot-loader, either system-boot or + GRUB. The recommended option is systemd-boot: set the + option to true. nixos-generate-config should do this @@ -440,6 +442,23 @@ OK boot.loader.systemd-boot as well. + + If you want to use GRUB, set + to + nodev and + to + true. + + + With system-boot, you should not need any special + configuration to detect other installed systems. With + GRUB, set + to + true, but this will only detect + windows partitions, not other linux distributions. If + you dual boot another linux distribution, use + system-boot instead. + diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 864b6e47db..87066e6cdf 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -95,6 +95,11 @@ PHP now defaults to PHP 8.1, updated from 8.0. + + + Cinnamon has been updated to 5.4. + + hardware.nvidia has a new option @@ -119,6 +124,13 @@ virtualisation.appvm. + + + syncstorage-rs, + a self-hostable sync server for Firefox. Available as + services.firefox-syncserver. + + dragonflydb, @@ -126,6 +138,14 @@ services.dragonflydb. + + + HBase + cluster, a distributed, scalable, big data store. + Available as + services.hadoop.hbase. + + infnoise, @@ -133,6 +153,14 @@ services.infnoise. + + + kanata, + a tool to improve keyboard comfort and usability with advanced + customization. Available as + services.kanata. + + persistent-evdev, @@ -244,12 +272,26 @@ with Google Chrome and the Google Cast extension. + + + services.hbase has been renamed to + services.hbase-standalone. For production + HBase clusters, use services.hadoop.hbase + instead. + + PHP 7.4 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 22.11 release. + + + pkgs.cosign does not provide the + cosigned binary anymore. + + riak package removed along with @@ -257,6 +299,20 @@ maintainer to update the package. + + + xow package removed along with the + hardware.xow module, due to the project + being deprecated in favor of xone, which is + available via the hardware.xone module. + + + + + virtlyst package and services.virtlyst + module removed, due to lack of maintainers. + + The services.graphite.api and @@ -267,6 +323,13 @@ been removed due to lack of upstream maintenance. + + + The meta.mainProgram attribute of packages + in wineWowPackages now defaults to + "wine64". + + (Neo)Vim can not be configured with @@ -336,6 +399,18 @@ as coreboot’s fork is no longer available. + + + The udisks2 service, available at + services.udisks2.enable, is now disabled by + default. It will automatically be enabled through services and + desktop environments as needed. This also means that polkit + will now actually be disabled by default. The default for + security.polkit.enable was already flipped + in the previous release, but udisks2 being enabled by default + re-enabled it. + + Add udev rules for the Teensy family of microcontrollers. @@ -350,6 +425,12 @@ application tries to talk to the libsecret D-Bus API. + + + There is a new module for AMD SEV CPU functionality, which + grants access to the hardware. + + There is a new module for the thunar diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/building-nixos.chapter.md b/third_party/nixpkgs/nixos/doc/manual/installation/building-nixos.chapter.md index 27d7e1d385..17da261fbd 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/building-nixos.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/installation/building-nixos.chapter.md @@ -18,9 +18,12 @@ enforced values with `mkForce`. ## Practical Instructions {#sec-building-image-instructions} +To build an ISO image for the channel `nixos-unstable`: + ```ShellSession $ 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 ``` diff --git a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md index 7e830f8e45..dd7f883bb3 100644 --- a/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md +++ b/third_party/nixpkgs/nixos/doc/manual/installation/installing.chapter.md @@ -303,7 +303,8 @@ Use the following commands: UEFI systems - : You *must* set the option [](#opt-boot.loader.systemd-boot.enable) + : You must select a boot-loader, either system-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. @@ -312,6 +313,15 @@ 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 + [](#opt-boot.loader.grub.efiSupport) to `true`. + + : With system-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 + instead. + If you need to configure networking for your machine the configuration options are described in [](#sec-networking). In particular, while wifi is supported on the installation image, it is diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md index d4059e7393..be0d17f905 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md @@ -46,6 +46,8 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP now defaults to PHP 8.1, updated from 8.0. +- Cinnamon has been updated to 5.4. + - `hardware.nvidia` has a new option `open` that can be used to opt in the opensource version of NVIDIA kernel driver. Note that the driver's support for GeForce and Workstation GPUs is still alpha quality, see [NVIDIA Releases Open-Source GPU Kernel Modules](https://developer.nvidia.com/blog/nvidia-releases-open-source-gpu-kernel-modules/) for the official announcement. @@ -53,11 +55,18 @@ In addition to numerous new and upgraded packages, this release has the followin ## New Services {#sec-release-22.11-new-services} - [appvm](https://github.com/jollheef/appvm), Nix based app VMs. Available as [virtualisation.appvm](options.html#opt-virtualisation.appvm.enable). +- [syncstorage-rs](https://github.com/mozilla-services/syncstorage-rs), a self-hostable sync server for Firefox. Available as [services.firefox-syncserver](options.html#opt-services.firefox-syncserver.enable). - [dragonflydb](https://dragonflydb.io/), a modern replacement for Redis and Memcached. Available as [services.dragonflydb](#opt-services.dragonflydb.enable). +- [HBase cluster](https://hbase.apache.org/), a distributed, scalable, big data store. Available as [services.hadoop.hbase](options.html#opt-services.hadoop.hbase.enable). + - [infnoise](https://github.com/leetronics/infnoise), a hardware True Random Number Generator dongle. Available as [services.infnoise](options.html#opt-services.infnoise.enable). + +- [kanata](https://github.com/jtroo/kanata), a tool to improve keyboard comfort and usability with advanced customization. + Available as [services.kanata](options.html#opt-services.kanata.enable). + - [persistent-evdev](https://github.com/aiberia/persistent-evdev), a daemon to add virtual proxy devices that mirror a physical input device but persist even if the underlying hardware is hot-plugged. Available as [services.persistent-evdev](#opt-services.persistent-evdev.enable). - [schleuder](https://schleuder.org/), a mailing list manager with PGP support. Enable using [services.schleuder](#opt-services.schleuder.enable). @@ -94,16 +103,27 @@ In addition to numerous new and upgraded packages, this release has the followin as it requires `qt4`, which reached its end-of-life 2015 and will no longer be supported by nixpkgs. [According to Barco](https://www.barco.com/de/support/knowledge-base/4380-can-i-use-linux-os-with-clickshare-base-units) many of their base unit models can be used with Google Chrome and the Google Cast extension. +- `services.hbase` has been renamed to `services.hbase-standalone`. + For production HBase clusters, use `services.hadoop.hbase` instead. + - PHP 7.4 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 22.11 release. +- `pkgs.cosign` does not provide the `cosigned` binary anymore. + - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. +- xow package removed along with the `hardware.xow` module, due to the project being deprecated in favor of `xone`, which is available via the `hardware.xone` module. + +- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers. + - The `services.graphite.api` and `services.graphite.beacon` NixOS options, and the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream maintenance. +- The `meta.mainProgram` attribute of packages in `wineWowPackages` now defaults to `"wine64"`. + - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. @@ -126,10 +146,15 @@ Use `configure.packages` instead. - 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. +- The udisks2 service, available at `services.udisks2.enable`, is now disabled by default. It will automatically be enabled through services and desktop environments as needed. + This also means that polkit will now actually be disabled by default. The default for `security.polkit.enable` was already flipped in the previous release, but udisks2 being enabled by default re-enabled it. + - Add udev rules for the Teensy family of microcontrollers. - The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API. +- There is a new module for AMD SEV CPU functionality, which grants access to the hardware. + - There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed. - There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service. diff --git a/third_party/nixpkgs/nixos/lib/eval-config.nix b/third_party/nixpkgs/nixos/lib/eval-config.nix index 3b58ef2979..791a03a3ba 100644 --- a/third_party/nixpkgs/nixos/lib/eval-config.nix +++ b/third_party/nixpkgs/nixos/lib/eval-config.nix @@ -9,7 +9,9 @@ # expressions are ever made modular at the top level) can just use # types.submodule instead of using eval-config.nix evalConfigArgs@ -{ # !!! system can be set modularly, would be nice to remove +{ # !!! system can be set modularly, would be nice to remove, + # however, removing or changing this default is too much + # of a breaking change. To set it modularly, pass `null`. system ? builtins.currentSystem , # !!! is this argument needed any more? The pkgs argument can # be set modularly anyway. @@ -48,7 +50,7 @@ let # this. Since the latter defaults to the former, the former should # default to the argument. That way this new default could propagate all # they way through, but has the last priority behind everything else. - nixpkgs.system = lib.mkDefault system; + nixpkgs.system = lib.mkIf (system != null) (lib.mkDefault system); _module.args.pkgs = lib.mkIf (pkgs_ != null) (lib.mkForce pkgs_); }; diff --git a/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py b/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py index 33e5172270..d7dc6ca300 100644 --- a/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py +++ b/third_party/nixpkgs/nixos/lib/make-options-doc/mergeJSON.py @@ -3,6 +3,11 @@ import json import sys from typing import Any, Dict, List +# for MD conversion +import mistune +import re +from xml.sax.saxutils import escape, quoteattr + JSON = Dict[str, Any] class Key: @@ -41,135 +46,135 @@ def unpivot(options: Dict[Key, Option]) -> Dict[str, JSON]: result[opt.name] = opt.value return result +admonitions = { + '.warning': 'warning', + '.important': 'important', + '.note': 'note' +} +class Renderer(mistune.renderers.BaseRenderer): + def _get_method(self, name): + try: + return super(Renderer, self)._get_method(name) + except AttributeError: + def not_supported(*args, **kwargs): + raise NotImplementedError("md node not supported yet", name, args, **kwargs) + return not_supported + + def text(self, text): + return escape(text) + def paragraph(self, text): + return text + "\n\n" + def newline(self): + return "\n" + def codespan(self, text): + return f"{escape(text)}" + def block_code(self, text, info=None): + info = f" language={quoteattr(info)}" if info is not None else "" + return f"\n{escape(text)}" + def link(self, link, text=None, title=None): + tag = "link" + if link[0:1] == '#': + if text == "": + tag = "xref" + attr = "linkend" + link = quoteattr(link[1:]) + else: + # try to faithfully reproduce links that were of the form + # in docbook format + if text == link: + text = "" + attr = "xlink:href" + link = quoteattr(link) + return f"<{tag} {attr}={link}>{text}" + def list(self, text, ordered, level, start=None): + if ordered: + raise NotImplementedError("ordered lists not supported yet") + return f"\n{text}\n" + def list_item(self, text, level): + return f"{text}\n" + def block_text(self, text): + return text + def emphasis(self, text): + return f"{text}" + def strong(self, text): + return f"{text}" + def admonition(self, text, kind): + if kind not in admonitions: + raise NotImplementedError(f"admonition {kind} not supported yet") + tag = admonitions[kind] + # we don't keep whitespace here because usually we'll contain only + # a single paragraph and the original docbook string is no longer + # available to restore the trailer. + return f"<{tag}>{text.rstrip()}" + def block_quote(self, text): + return f"
{text}
" + def command(self, text): + return f"{escape(text)}" + def option(self, text): + return f"" + def file(self, text): + return f"{escape(text)}" + def manpage(self, page, section): + title = f"{escape(page)}" + vol = f"{escape(section)}" + return f"{title}{vol}" + + def finalize(self, data): + return "".join(data) + +def p_command(md): + COMMAND_PATTERN = r'\{command\}`(.*?)`' + def parse(self, m, state): + return ('command', m.group(1)) + md.inline.register_rule('command', COMMAND_PATTERN, parse) + md.inline.rules.append('command') + +def p_file(md): + FILE_PATTERN = r'\{file\}`(.*?)`' + def parse(self, m, state): + return ('file', m.group(1)) + md.inline.register_rule('file', FILE_PATTERN, parse) + md.inline.rules.append('file') + +def p_option(md): + OPTION_PATTERN = r'\{option\}`(.*?)`' + def parse(self, m, state): + return ('option', m.group(1)) + md.inline.register_rule('option', OPTION_PATTERN, parse) + md.inline.rules.append('option') + +def p_manpage(md): + MANPAGE_PATTERN = r'\{manpage\}`(.*?)\((.+?)\)`' + def parse(self, m, state): + return ('manpage', m.group(1), m.group(2)) + md.inline.register_rule('manpage', MANPAGE_PATTERN, parse) + md.inline.rules.append('manpage') + +def p_admonition(md): + ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::\n', flags=re.MULTILINE|re.DOTALL) + def parse(self, m, state): + return { + 'type': 'admonition', + 'children': self.parse(m.group(2), state), + 'params': [ m.group(1) ], + } + md.block.register_rule('admonition', ADMONITION_PATTERN, parse) + md.block.rules.append('admonition') + +md = mistune.create_markdown(renderer=Renderer(), plugins=[ + p_command, p_file, p_option, p_manpage, p_admonition +]) + # converts in-place! def convertMD(options: Dict[str, Any]) -> str: - import mistune - import re - from xml.sax.saxutils import escape, quoteattr - - admonitions = { - '.warning': 'warning', - '.important': 'important', - '.note': 'note' - } - class Renderer(mistune.renderers.BaseRenderer): - def _get_method(self, name): - try: - return super(Renderer, self)._get_method(name) - except AttributeError: - def not_supported(*args, **kwargs): - raise NotImplementedError("md node not supported yet", name, args, **kwargs) - return not_supported - - def text(self, text): - return escape(text) - def paragraph(self, text): - return text + "\n\n" - def newline(self): - return "\n" - def codespan(self, text): - return f"{escape(text)}" - def block_code(self, text, info=None): - info = f" language={quoteattr(info)}" if info is not None else "" - return f"\n{escape(text)}" - def link(self, link, text=None, title=None): - if link[0:1] == '#': - attr = "linkend" - link = quoteattr(link[1:]) - else: - # try to faithfully reproduce links that were of the form - # in docbook format - if text == link: - text = "" - attr = "xlink:href" - link = quoteattr(link) - return f"{text}" - def list(self, text, ordered, level, start=None): - if ordered: - raise NotImplementedError("ordered lists not supported yet") - return f"\n{text}\n" - def list_item(self, text, level): - return f"{text}\n" - def block_text(self, text): - return text - def emphasis(self, text): - return f"{text}" - def strong(self, text): - return f"{text}" - def admonition(self, text, kind): - if kind not in admonitions: - raise NotImplementedError(f"admonition {kind} not supported yet") - tag = admonitions[kind] - # we don't keep whitespace here because usually we'll contain only - # a single paragraph and the original docbook string is no longer - # available to restore the trailer. - return f"<{tag}>{text.rstrip()}" - def block_quote(self, text): - return f"
{text}
" - def command(self, text): - return f"{escape(text)}" - def option(self, text): - return f"" - def file(self, text): - return f"{escape(text)}" - def manpage(self, page, section): - title = f"{escape(page)}" - vol = f"{escape(section)}" - return f"{title}{vol}" - - def finalize(self, data): - return "".join(data) - - plugins = [] - - COMMAND_PATTERN = r'\{command\}`(.*?)`' - def command(md): - def parse(self, m, state): - return ('command', m.group(1)) - md.inline.register_rule('command', COMMAND_PATTERN, parse) - md.inline.rules.append('command') - plugins.append(command) - - FILE_PATTERN = r'\{file\}`(.*?)`' - def file(md): - def parse(self, m, state): - return ('file', m.group(1)) - md.inline.register_rule('file', FILE_PATTERN, parse) - md.inline.rules.append('file') - plugins.append(file) - - OPTION_PATTERN = r'\{option\}`(.*?)`' - def option(md): - def parse(self, m, state): - return ('option', m.group(1)) - md.inline.register_rule('option', OPTION_PATTERN, parse) - md.inline.rules.append('option') - plugins.append(option) - - MANPAGE_PATTERN = r'\{manpage\}`(.*?)\((.+?)\)`' - def manpage(md): - def parse(self, m, state): - return ('manpage', m.group(1), m.group(2)) - md.inline.register_rule('manpage', MANPAGE_PATTERN, parse) - md.inline.rules.append('manpage') - plugins.append(manpage) - - ADMONITION_PATTERN = re.compile(r'^::: \{([^\n]*?)\}\n(.*?)^:::\n', flags=re.MULTILINE|re.DOTALL) - def admonition(md): - def parse(self, m, state): - return { - 'type': 'admonition', - 'children': self.parse(m.group(2), state), - 'params': [ m.group(1) ], - } - md.block.register_rule('admonition', ADMONITION_PATTERN, parse) - md.block.rules.append('admonition') - plugins.append(admonition) - - def convertString(text: str) -> str: - rendered = mistune.markdown(text, renderer=Renderer(), plugins=plugins) - # keep trailing spaces so we can diff the generated XML to check for conversion bugs. - return rendered.rstrip() + text[len(text.rstrip()):] + def convertString(path: str, text: str) -> str: + try: + rendered = md(text) + # keep trailing spaces so we can diff the generated XML to check for conversion bugs. + return rendered.rstrip() + text[len(text.rstrip()):] + except: + print(f"error in {path}") + raise def optionIs(option: Dict[str, Any], key: str, typ: str) -> bool: if key not in option: return False @@ -179,12 +184,12 @@ def convertMD(options: Dict[str, Any]) -> str: for (name, option) in options.items(): if optionIs(option, 'description', 'mdDoc'): - option['description'] = convertString(option['description']['text']) + option['description'] = convertString(name, option['description']['text']) if optionIs(option, 'example', 'literalMD'): - docbook = convertString(option['example']['text']) + docbook = convertString(name, option['example']['text']) option['example'] = { '_type': 'literalDocBook', 'text': docbook } if optionIs(option, 'default', 'literalMD'): - docbook = convertString(option['default']['text']) + docbook = convertString(name, option['default']['text']) option['default'] = { '_type': 'literalDocBook', 'text': docbook } return options diff --git a/third_party/nixpkgs/nixos/lib/qemu-common.nix b/third_party/nixpkgs/nixos/lib/qemu-common.nix index 250f714be0..fc3dcb24ab 100644 --- a/third_party/nixpkgs/nixos/lib/qemu-common.nix +++ b/third_party/nixpkgs/nixos/lib/qemu-common.nix @@ -18,7 +18,7 @@ rec { ]; qemuSerialDevice = if pkgs.stdenv.hostPlatform.isx86 || pkgs.stdenv.hostPlatform.isRiscV then "ttyS0" - else if (with pkgs.stdenv.hostPlatform; isAarch32 || isAarch64 || isPower) then "ttyAMA0" + else if (with pkgs.stdenv.hostPlatform; isAarch || isPower) then "ttyAMA0" else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { diff --git a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py index e5c8f07b4e..f2a7f250d1 100644 --- a/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py +++ b/third_party/nixpkgs/nixos/lib/test-driver/test_driver/vlan.py @@ -32,8 +32,12 @@ class VLan: rootlog.info("start vlan") pty_master, pty_slave = pty.openpty() + # The --hub is required for the scenario determined by + # nixos/tests/networking.nix vlan-ping. + # VLAN Tagged traffic (802.1Q) seams to be blocked if a vde_switch is + # used without the hub mode (flood packets to all ports). self.process = subprocess.Popen( - ["vde_switch", "-s", self.socket_dir, "--dirmode", "0700"], + ["vde_switch", "-s", self.socket_dir, "--dirmode", "0700", "--hub"], stdin=pty_slave, stdout=subprocess.PIPE, stderr=subprocess.PIPE, @@ -50,7 +54,7 @@ class VLan: if not (self.socket_dir / "ctl").exists(): rootlog.error("cannot start vde_switch") - rootlog.info(f"running vlan (pid {self.pid})") + rootlog.info(f"running vlan (pid {self.pid}; ctl {self.socket_dir})") def __del__(self) -> None: rootlog.info(f"kill vlan (pid {self.pid})") diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix index 74634fd167..ead3d4e994 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/lxd/lxd-image-inner.nix @@ -55,7 +55,7 @@ with lib; # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { + # users.users.alice = { # isNormalUser = true; # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # }; diff --git a/third_party/nixpkgs/nixos/modules/config/appstream.nix b/third_party/nixpkgs/nixos/modules/config/appstream.nix index a72215c2f5..5b48f6e170 100644 --- a/third_party/nixpkgs/nixos/modules/config/appstream.nix +++ b/third_party/nixpkgs/nixos/modules/config/appstream.nix @@ -6,9 +6,9 @@ with lib; appstream.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to install files to support the - AppStream metadata specification. + [AppStream metadata specification](https://www.freedesktop.org/software/appstream/docs/index.html). ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/config/console.nix b/third_party/nixpkgs/nixos/modules/config/console.nix index 97e6405db9..7bcbf54ced 100644 --- a/third_party/nixpkgs/nixos/modules/config/console.nix +++ b/third_party/nixpkgs/nixos/modules/config/console.nix @@ -58,7 +58,7 @@ in type = with types; either str path; default = "us"; example = "fr"; - description = '' + description = lib.mdDoc '' The keyboard mapping table for the virtual consoles. ''; }; @@ -72,7 +72,7 @@ in "002b36" "cb4b16" "586e75" "657b83" "839496" "6c71c4" "93a1a1" "fdf6e3" ]; - description = '' + description = lib.mdDoc '' The 16 colors palette used by the virtual consoles. Leave empty to use the default colors. Colors must be in hexadecimal format and listed in @@ -84,7 +84,7 @@ in packages = mkOption { type = types.listOf types.package; default = [ ]; - description = '' + description = lib.mdDoc '' List of additional packages that provide console fonts, keymaps and other resources for virtual consoles use. ''; @@ -93,7 +93,7 @@ in useXkbConfig = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If set, configure the virtual console keymap from the xserver keyboard settings. ''; @@ -102,7 +102,7 @@ in earlySetup = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable setting virtual console options as early as possible (in initrd). ''; }; @@ -159,7 +159,11 @@ in "${config.boot.initrd.systemd.package}/lib/systemd/systemd-vconsole-setup" "${config.boot.initrd.systemd.package.kbd}/bin/setfont" "${config.boot.initrd.systemd.package.kbd}/bin/loadkeys" - "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # keyboard layouts are compressed + "${config.boot.initrd.systemd.package.kbd.gzip}/bin/gzip" # Fonts and keyboard layouts are compressed + ] ++ optionals (hasPrefix builtins.storeDir cfg.font) [ + "${cfg.font}" + ] ++ optionals (hasPrefix builtins.storeDir cfg.keyMap) [ + "${cfg.keyMap}" ]; systemd.services.reload-systemd-vconsole-setup = diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix index a10a8c6428..f86c0387e9 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontconfig.nix @@ -246,7 +246,7 @@ in enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' If enabled, a Fontconfig configuration file will be built pointing to a set of default fonts. If you don't care about running X11 applications or any other program that uses @@ -267,7 +267,7 @@ in antialias = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Enable font antialiasing. At high resolution (> 200 DPI), antialiasing has no visible effect; users of such displays may want to disable this option. @@ -277,9 +277,9 @@ in localConf = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' System-wide customization file contents, has higher priority than - defaultFonts settings. + `defaultFonts` settings. ''; }; @@ -287,7 +287,7 @@ in monospace = mkOption { type = types.listOf types.str; default = ["DejaVu Sans Mono"]; - description = '' + description = lib.mdDoc '' System-wide default monospace font(s). Multiple fonts may be listed in case multiple languages must be supported. ''; @@ -296,7 +296,7 @@ in sansSerif = mkOption { type = types.listOf types.str; default = ["DejaVu Sans"]; - description = '' + description = lib.mdDoc '' System-wide default sans serif font(s). Multiple fonts may be listed in case multiple languages must be supported. ''; @@ -305,7 +305,7 @@ in serif = mkOption { type = types.listOf types.str; default = ["DejaVu Serif"]; - description = '' + description = lib.mdDoc '' System-wide default serif font(s). Multiple fonts may be listed in case multiple languages must be supported. ''; @@ -314,7 +314,7 @@ in emoji = mkOption { type = types.listOf types.str; default = ["Noto Color Emoji"]; - description = '' + description = lib.mdDoc '' System-wide default emoji font(s). Multiple fonts may be listed in case a font does not support all emoji. @@ -331,7 +331,7 @@ in enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Enable font hinting. Hinting aligns glyphs to pixel boundaries to improve rendering sharpness at low resolution. At high resolution (> 200 dpi) hinting will do nothing (at best); users of such @@ -342,7 +342,7 @@ in autohint = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the autohinter in place of the default interpreter. The results are usually lower quality than correctly-hinted fonts, but better than unhinted fonts. @@ -352,7 +352,7 @@ in style = mkOption { type = types.enum [ "hintnone" "hintslight" "hintmedium" "hintfull" ]; default = "hintslight"; - description = '' + description = lib.mdDoc '' Hintstyle is the amount of font reshaping done to line up to the grid. @@ -367,10 +367,10 @@ in includeUserConf = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Include the user configuration from - ~/.config/fontconfig/fonts.conf or - ~/.config/fontconfig/conf.d. + {file}`~/.config/fontconfig/fonts.conf` or + {file}`~/.config/fontconfig/conf.d`. ''; }; @@ -379,26 +379,26 @@ in rgba = mkOption { default = "rgb"; type = types.enum ["rgb" "bgr" "vrgb" "vbgr" "none"]; - description = '' + description = lib.mdDoc '' Subpixel order. The overwhelming majority of displays are - rgb in their normal orientation. Select - vrgb for mounting such a display 90 degrees - clockwise from its normal orientation or vbgr + `rgb` in their normal orientation. Select + `vrgb` for mounting such a display 90 degrees + clockwise from its normal orientation or `vbgr` for mounting 90 degrees counter-clockwise. Select - bgr in the unlikely event of mounting 180 + `bgr` in the unlikely event of mounting 180 degrees from the normal orientation. Reverse these directions in the improbable event that the display's native subpixel order is - bgr. + `bgr`. ''; }; lcdfilter = mkOption { default = "default"; type = types.enum ["none" "default" "light" "legacy"]; - description = '' + description = lib.mdDoc '' FreeType LCD filter. At high resolution (> 200 DPI), LCD filtering has no visible effect; users of such displays may want to select - none. + `none`. ''; }; @@ -407,7 +407,7 @@ in cache32Bit = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Generate system fonts cache for 32-bit applications. ''; }; @@ -415,8 +415,8 @@ in allowBitmaps = mkOption { type = types.bool; default = true; - description = '' - Allow bitmap fonts. Set to false to ban all + description = lib.mdDoc '' + Allow bitmap fonts. Set to `false` to ban all bitmap fonts. ''; }; @@ -424,8 +424,8 @@ in allowType1 = mkOption { type = types.bool; default = false; - description = '' - Allow Type-1 fonts. Default is false because of + description = lib.mdDoc '' + Allow Type-1 fonts. Default is `false` because of poor rendering. ''; }; @@ -433,7 +433,7 @@ in useEmbeddedBitmaps = mkOption { type = types.bool; default = false; - description = "Use embedded bitmaps in fonts like Calibri."; + description = lib.mdDoc "Use embedded bitmaps in fonts like Calibri."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix index 560918302c..30e0dfe256 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fontdir.nix @@ -30,9 +30,9 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to create a directory with links to all fonts in - /run/current-system/sw/share/X11/fonts. + {file}`/run/current-system/sw/share/X11/fonts`. ''; }; @@ -40,9 +40,9 @@ in type = types.bool; default = config.programs.xwayland.enable; defaultText = literalExpression "config.programs.xwayland.enable"; - description = '' + description = lib.mdDoc '' Whether to decompress fonts in - /run/current-system/sw/share/X11/fonts. + {file}`/run/current-system/sw/share/X11/fonts`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix index adc6654afc..c0619fa31a 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix @@ -57,13 +57,13 @@ in type = types.listOf types.path; default = []; example = literalExpression "[ pkgs.dejavu_fonts ]"; - description = "List of primary font paths."; + description = lib.mdDoc "List of primary font paths."; }; enableDefaultFonts = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable a basic set of fonts providing several font styles and families and reasonable coverage of Unicode. ''; diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix b/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix index b1dd81bf2d..c284c4a0b0 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/ghostscript.nix @@ -11,7 +11,7 @@ with lib; enableGhostscriptFonts = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to add the fonts provided by Ghostscript (such as various URW fonts and the “Base-14” Postscript fonts) to the list of system fonts, making them available to X11 diff --git a/third_party/nixpkgs/nixos/modules/config/gnu.nix b/third_party/nixpkgs/nixos/modules/config/gnu.nix index 255d9741ba..d06b479e2a 100644 --- a/third_party/nixpkgs/nixos/modules/config/gnu.nix +++ b/third_party/nixpkgs/nixos/modules/config/gnu.nix @@ -5,7 +5,7 @@ gnu = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' When enabled, GNU software is chosen by default whenever a there is a choice between GNU and non-GNU software (e.g., GNU lsh vs. OpenSSH). diff --git a/third_party/nixpkgs/nixos/modules/config/gtk/gtk-icon-cache.nix b/third_party/nixpkgs/nixos/modules/config/gtk/gtk-icon-cache.nix index ff9aa7c6a0..87d5483e36 100644 --- a/third_party/nixpkgs/nixos/modules/config/gtk/gtk-icon-cache.nix +++ b/third_party/nixpkgs/nixos/modules/config/gtk/gtk-icon-cache.nix @@ -7,7 +7,7 @@ with lib; type = types.bool; default = config.services.xserver.enable; defaultText = literalExpression "config.services.xserver.enable"; - description = '' + description = lib.mdDoc '' Whether to build icon theme caches for GTK applications. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/i18n.nix b/third_party/nixpkgs/nixos/modules/config/i18n.nix index cdf5c661e5..f73f10f0f3 100644 --- a/third_party/nixpkgs/nixos/modules/config/i18n.nix +++ b/third_party/nixpkgs/nixos/modules/config/i18n.nix @@ -21,7 +21,7 @@ with lib; } ''; example = literalExpression "pkgs.glibcLocales"; - description = '' + description = lib.mdDoc '' Customized pkg.glibcLocales package. Changing this option can disable handling of i18n.defaultLocale @@ -33,7 +33,7 @@ with lib; type = types.str; default = "en_US.UTF-8"; example = "nl_NL.UTF-8"; - description = '' + description = lib.mdDoc '' The default locale. It determines the language for program messages, the format for dates and times, sort order, and so on. It also determines the character set, such as UTF-8. @@ -44,10 +44,10 @@ with lib; type = types.attrsOf types.str; default = {}; example = { LC_MESSAGES = "en_US.UTF-8"; LC_TIME = "de_DE.UTF-8"; }; - description = '' + description = lib.mdDoc '' A set of additional system-wide locale settings other than - LANG which can be configured with - . + `LANG` which can be configured with + {option}`i18n.defaultLocale`. ''; }; @@ -57,6 +57,7 @@ with lib; (builtins.map (l: (replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") ( [ "C.UTF-8" + "en_US.UTF-8" config.i18n.defaultLocale ] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) )); @@ -70,12 +71,11 @@ with lib; )) ''; example = ["en_US.UTF-8/UTF-8" "nl_NL.UTF-8/UTF-8" "nl_NL/ISO-8859-1"]; - description = '' + description = lib.mdDoc '' List of locales that the system should support. The value - "all" means that all locales supported by + `"all"` means that all locales supported by Glibc will be installed. A full list of supported locales - can be found at . + can be found at . ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/iproute2.nix b/third_party/nixpkgs/nixos/modules/config/iproute2.nix index 5f41f3d21e..2e059e2817 100644 --- a/third_party/nixpkgs/nixos/modules/config/iproute2.nix +++ b/third_party/nixpkgs/nixos/modules/config/iproute2.nix @@ -11,7 +11,7 @@ in rttablesExtraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Verbatim lines to add to /etc/iproute2/rt_tables ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/krb5/default.nix b/third_party/nixpkgs/nixos/modules/config/krb5/default.nix index 911c5b629a..6cc30c47b7 100644 --- a/third_party/nixpkgs/nixos/modules/config/krb5/default.nix +++ b/third_party/nixpkgs/nixos/modules/config/krb5/default.nix @@ -85,9 +85,9 @@ in { default = pkgs.krb5Full; defaultText = literalExpression "pkgs.krb5Full"; example = literalExpression "pkgs.heimdal"; - description = '' + description = lib.mdDoc '' The Kerberos implementation that will be present in - environment.systemPackages after enabling this + `environment.systemPackages` after enabling this service. ''; }; @@ -101,7 +101,7 @@ in { default_realm = "ATHENA.MIT.EDU"; }; ''; - description = '' + description = lib.mdDoc '' Settings used by the Kerberos V5 library. ''; }; @@ -121,7 +121,7 @@ in { }; ''; apply = attrs: filterEmbeddedMetadata attrs; - description = "Realm-specific contact information and settings."; + description = lib.mdDoc "Realm-specific contact information and settings."; }; domain_realm = mkOption { @@ -134,7 +134,7 @@ in { }; ''; apply = attrs: filterEmbeddedMetadata attrs; - description = '' + description = lib.mdDoc '' Map of server hostnames to Kerberos realms. ''; }; @@ -153,7 +153,7 @@ in { }; ''; apply = attrs: filterEmbeddedMetadata attrs; - description = '' + description = lib.mdDoc '' Authentication paths for non-hierarchical cross-realm authentication. ''; }; @@ -174,7 +174,7 @@ in { }; ''; apply = attrs: filterEmbeddedMetadata attrs; - description = '' + description = lib.mdDoc '' Settings used by some Kerberos V5 applications. ''; }; @@ -190,7 +190,7 @@ in { }; ''; apply = attrs: filterEmbeddedMetadata attrs; - description = '' + description = lib.mdDoc '' Controls plugin module registration. ''; }; @@ -235,14 +235,14 @@ in { admin_server = SYSLOG:NOTICE default = SYSLOG:NOTICE ''; - description = '' - Verbatim krb5.conf configuration. Note that this + description = lib.mdDoc '' + Verbatim `krb5.conf` configuration. Note that this is mutually exclusive with configuration via - libdefaults, realms, - domain_realm, capaths, - appdefaults, plugins and - extraConfig configuration options. Consult - man krb5.conf for documentation. + `libdefaults`, `realms`, + `domain_realm`, `capaths`, + `appdefaults`, `plugins` and + `extraConfig` configuration options. Consult + `man krb5.conf` for documentation. ''; }; @@ -250,9 +250,9 @@ in { type = with types; nullOr str; default = null; example = "ATHENA.MIT.EDU"; - description = '' + description = lib.mdDoc '' DEPRECATED, please use - krb5.libdefaults.default_realm. + `krb5.libdefaults.default_realm`. ''; }; @@ -260,9 +260,9 @@ in { type = with types; nullOr str; default = null; example = "athena.mit.edu"; - description = '' + description = lib.mdDoc '' DEPRECATED, please create a map of server hostnames to Kerberos realms - in krb5.domain_realm. + in `krb5.domain_realm`. ''; }; @@ -270,9 +270,9 @@ in { type = with types; nullOr str; default = null; example = "kerberos.mit.edu"; - description = '' - DEPRECATED, please pass a kdc attribute to a realm - in krb5.realms. + description = lib.mdDoc '' + DEPRECATED, please pass a `kdc` attribute to a realm + in `krb5.realms`. ''; }; @@ -280,9 +280,9 @@ in { type = with types; nullOr str; default = null; example = "kerberos.mit.edu"; - description = '' - DEPRECATED, please pass an admin_server attribute - to a realm in krb5.realms. + description = lib.mdDoc '' + DEPRECATED, please pass an `admin_server` attribute + to a realm in `krb5.realms`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/config/ldap.nix b/third_party/nixpkgs/nixos/modules/config/ldap.nix index 85cad8b93d..0f54e4a8cf 100644 --- a/third_party/nixpkgs/nixos/modules/config/ldap.nix +++ b/third_party/nixpkgs/nixos/modules/config/ldap.nix @@ -64,34 +64,34 @@ in loginPam = mkOption { type = types.bool; default = true; - description = "Whether to include authentication against LDAP in login PAM."; + description = lib.mdDoc "Whether to include authentication against LDAP in login PAM."; }; nsswitch = mkOption { type = types.bool; default = true; - description = "Whether to include lookup against LDAP in NSS."; + description = lib.mdDoc "Whether to include lookup against LDAP in NSS."; }; server = mkOption { type = types.str; example = "ldap://ldap.example.org/"; - description = "The URL of the LDAP server."; + description = lib.mdDoc "The URL of the LDAP server."; }; base = mkOption { type = types.str; example = "dc=example,dc=org"; - description = "The distinguished name of the search base."; + description = lib.mdDoc "The distinguished name of the search base."; }; useTLS = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, use TLS (encryption) over an LDAP (port 389) connection. The alternative is to specify an LDAPS server (port - 636) in or to forego + 636) in {option}`users.ldap.server` or to forego security. ''; }; @@ -99,7 +99,7 @@ in timeLimit = mkOption { default = 0; type = types.int; - description = '' + description = lib.mdDoc '' Specifies the time limit (in seconds) to use when performing searches. A value of zero (0), which is the default, is to wait indefinitely for searches to be completed. @@ -110,7 +110,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to let the nslcd daemon (nss-pam-ldapd) handle the LDAP lookups for NSS and PAM. This can improve performance, and if you need to bind to the LDAP server with a password, @@ -125,9 +125,9 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration options that will be added verbatim at - the end of the nslcd configuration file (nslcd.conf(5)). + the end of the nslcd configuration file (`nslcd.conf(5)`). '' ; } ; @@ -135,7 +135,7 @@ in default = ""; example = "cn=admin,dc=example,dc=com"; type = types.str; - description = '' + description = lib.mdDoc '' The distinguished name to use to bind to the LDAP server when the root user tries to modify a user's password. ''; @@ -145,7 +145,7 @@ in default = ""; example = "/run/keys/nslcd.rootpwmodpw"; type = types.str; - description = '' + description = lib.mdDoc '' The path to a file containing the credentials with which to bind to the LDAP server if the root user tries to change a user's password. ''; @@ -157,7 +157,7 @@ in default = ""; example = "cn=admin,dc=example,dc=com"; type = types.str; - description = '' + description = lib.mdDoc '' The distinguished name to bind to the LDAP server with. If this is not specified, an anonymous bind will be done. ''; @@ -166,7 +166,7 @@ in passwordFile = mkOption { default = "/etc/ldap/bind.password"; type = types.str; - description = '' + description = lib.mdDoc '' The path to a file containing the credentials to use when binding to the LDAP server (if not binding anonymously). ''; @@ -175,10 +175,10 @@ in timeLimit = mkOption { default = 30; type = types.int; - description = '' + description = lib.mdDoc '' Specifies the time limit (in seconds) to use when connecting to the directory server. This is distinct from the time limit - specified in and affects + specified in {option}`users.ldap.timeLimit` and affects the initial server connection only. ''; }; @@ -205,12 +205,12 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration options that will be added verbatim at - the end of the ldap configuration file (ldap.conf(5)). - If is enabled, this + the end of the ldap configuration file (`ldap.conf(5)`). + If {option}`users.ldap.daemon` is enabled, this configuration will not be used. In that case, use - instead. + {option}`users.ldap.daemon.extraConfig` instead. '' ; }; diff --git a/third_party/nixpkgs/nixos/modules/config/locale.nix b/third_party/nixpkgs/nixos/modules/config/locale.nix index 6f05658818..7716e121c7 100644 --- a/third_party/nixpkgs/nixos/modules/config/locale.nix +++ b/third_party/nixpkgs/nixos/modules/config/locale.nix @@ -22,9 +22,8 @@ in default = null; type = timezone; example = "America/New_York"; - description = '' - The time zone used when displaying times and dates. See + description = lib.mdDoc '' + The time zone used when displaying times and dates. See for a comprehensive list of possible values for this setting. If null, the timezone will default to UTC and can be set imperatively @@ -35,7 +34,7 @@ in hardwareClockInLocalTime = mkOption { default = false; type = types.bool; - description = "If set, keep the hardware clock in local time instead of UTC."; + description = lib.mdDoc "If set, keep the hardware clock in local time instead of UTC."; }; }; @@ -44,18 +43,18 @@ in latitude = mkOption { type = types.float; - description = '' + description = lib.mdDoc '' Your current latitude, between - -90.0 and 90.0. Must be provided + `-90.0` and `90.0`. Must be provided along with longitude. ''; }; longitude = mkOption { type = types.float; - description = '' + description = lib.mdDoc '' Your current longitude, between - between -180.0 and 180.0. Must be + between `-180.0` and `180.0`. Must be provided along with latitude. ''; }; @@ -63,9 +62,9 @@ in provider = mkOption { type = types.enum [ "manual" "geoclue2" ]; default = "manual"; - description = '' + description = lib.mdDoc '' The location provider to use for determining your location. If set to - manual you must also provide latitude/longitude. + `manual` you must also provide latitude/longitude. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/networking.nix b/third_party/nixpkgs/nixos/modules/config/networking.nix index bebfeb352c..185eff746d 100644 --- a/third_party/nixpkgs/nixos/modules/config/networking.nix +++ b/third_party/nixpkgs/nixos/modules/config/networking.nix @@ -28,7 +28,7 @@ in "192.168.0.2" = [ "fileserver.local" "nameserver.local" ]; }; ''; - description = '' + description = lib.mdDoc '' Locally defined maps of hostnames to IP addresses. ''; }; @@ -37,8 +37,8 @@ in type = types.listOf types.path; defaultText = literalDocBook "Hosts from and "; example = literalExpression ''[ "''${pkgs.my-blocklist-package}/share/my-blocklist/hosts" ]''; - description = '' - Files that should be concatenated together to form /etc/hosts. + description = lib.mdDoc '' + Files that should be concatenated together to form {file}`/etc/hosts`. ''; }; @@ -46,9 +46,9 @@ in type = types.lines; default = ""; example = "192.168.0.1 lanlocalhost"; - description = '' - Additional verbatim entries to be appended to /etc/hosts. - For adding hosts from derivation results, use instead. + description = lib.mdDoc '' + Additional verbatim entries to be appended to {file}`/etc/hosts`. + For adding hosts from derivation results, use {option}`networking.hostFiles` instead. ''; }; @@ -60,7 +60,7 @@ in "3.nixos.pool.ntp.org" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The set of NTP servers from which to synchronise. ''; }; @@ -70,7 +70,7 @@ in default = lib.mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' This option specifies the default value for httpProxy, httpsProxy, ftpProxy and rsyncProxy. ''; example = "http://127.0.0.1:3128"; @@ -80,7 +80,7 @@ in type = types.nullOr types.str; default = cfg.proxy.default; defaultText = literalExpression "config.${opt.proxy.default}"; - description = '' + description = lib.mdDoc '' This option specifies the http_proxy environment variable. ''; example = "http://127.0.0.1:3128"; @@ -90,7 +90,7 @@ in type = types.nullOr types.str; default = cfg.proxy.default; defaultText = literalExpression "config.${opt.proxy.default}"; - description = '' + description = lib.mdDoc '' This option specifies the https_proxy environment variable. ''; example = "http://127.0.0.1:3128"; @@ -100,7 +100,7 @@ in type = types.nullOr types.str; default = cfg.proxy.default; defaultText = literalExpression "config.${opt.proxy.default}"; - description = '' + description = lib.mdDoc '' This option specifies the ftp_proxy environment variable. ''; example = "http://127.0.0.1:3128"; @@ -110,7 +110,7 @@ in type = types.nullOr types.str; default = cfg.proxy.default; defaultText = literalExpression "config.${opt.proxy.default}"; - description = '' + description = lib.mdDoc '' This option specifies the rsync_proxy environment variable. ''; example = "http://127.0.0.1:3128"; @@ -120,7 +120,7 @@ in type = types.nullOr types.str; default = cfg.proxy.default; defaultText = literalExpression "config.${opt.proxy.default}"; - description = '' + description = lib.mdDoc '' This option specifies the all_proxy environment variable. ''; example = "http://127.0.0.1:3128"; @@ -129,7 +129,7 @@ in noProxy = lib.mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' This option specifies the no_proxy environment variable. If a default proxy is used and noProxy is null, then noProxy will be set to 127.0.0.1,localhost. diff --git a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix index 14fe180d0b..42e68c2ead 100644 --- a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix +++ b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix @@ -10,7 +10,7 @@ with lib; environment.noXlibs = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Switch off the options in the default configuration that require X11 libraries. This includes client-side font configuration and SSH forwarding of X11 authentication diff --git a/third_party/nixpkgs/nixos/modules/config/nsswitch.nix b/third_party/nixpkgs/nixos/modules/config/nsswitch.nix index e494ff5f74..b004072813 100644 --- a/third_party/nixpkgs/nixos/modules/config/nsswitch.nix +++ b/third_party/nixpkgs/nixos/modules/config/nsswitch.nix @@ -13,10 +13,10 @@ with lib; type = types.listOf types.path; internal = true; default = []; - description = '' + description = lib.mdDoc '' Search path for NSS (Name Service Switch) modules. This allows several DNS resolution methods to be specified via - /etc/nsswitch.conf. + {file}`/etc/nsswitch.conf`. ''; apply = list: { @@ -28,8 +28,8 @@ with lib; system.nssDatabases = { passwd = mkOption { type = types.listOf types.str; - description = '' - List of passwd entries to configure in /etc/nsswitch.conf. + description = lib.mdDoc '' + List of passwd entries to configure in {file}`/etc/nsswitch.conf`. Note that "files" is always prepended while "systemd" is appended if nscd is enabled. @@ -40,8 +40,8 @@ with lib; group = mkOption { type = types.listOf types.str; - description = '' - List of group entries to configure in /etc/nsswitch.conf. + description = lib.mdDoc '' + List of group entries to configure in {file}`/etc/nsswitch.conf`. Note that "files" is always prepended while "systemd" is appended if nscd is enabled. @@ -52,8 +52,8 @@ with lib; shadow = mkOption { type = types.listOf types.str; - description = '' - List of shadow entries to configure in /etc/nsswitch.conf. + description = lib.mdDoc '' + List of shadow entries to configure in {file}`/etc/nsswitch.conf`. Note that "files" is always prepended. @@ -64,8 +64,8 @@ with lib; hosts = mkOption { type = types.listOf types.str; - description = '' - List of hosts entries to configure in /etc/nsswitch.conf. + description = lib.mdDoc '' + List of hosts entries to configure in {file}`/etc/nsswitch.conf`. Note that "files" is always prepended, and "dns" and "myhostname" are always appended. @@ -76,8 +76,8 @@ with lib; services = mkOption { type = types.listOf types.str; - description = '' - List of services entries to configure in /etc/nsswitch.conf. + description = lib.mdDoc '' + List of services entries to configure in {file}`/etc/nsswitch.conf`. Note that "files" is always prepended. diff --git a/third_party/nixpkgs/nixos/modules/config/power-management.nix b/third_party/nixpkgs/nixos/modules/config/power-management.nix index 710842e150..919bb824bc 100644 --- a/third_party/nixpkgs/nixos/modules/config/power-management.nix +++ b/third_party/nixpkgs/nixos/modules/config/power-management.nix @@ -20,7 +20,7 @@ in type = types.bool; default = true; description = - '' + lib.mdDoc '' Whether to enable power management. This includes support for suspend-to-RAM and powersave features on laptops. ''; @@ -29,7 +29,7 @@ in resumeCommands = mkOption { type = types.lines; default = ""; - description = "Commands executed after the system resumes from suspend-to-RAM."; + description = lib.mdDoc "Commands executed after the system resumes from suspend-to-RAM."; }; powerUpCommands = mkOption { @@ -39,7 +39,7 @@ in "''${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda" ''; description = - '' + lib.mdDoc '' Commands executed when the machine powers up. That is, they're executed both when the system first boots and when it resumes from suspend or hibernation. @@ -53,7 +53,7 @@ in "''${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda" ''; description = - '' + lib.mdDoc '' Commands executed when the machine powers down. That is, they're executed both when the system shuts down and when it goes to suspend or hibernation. diff --git a/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix b/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix index 01555d28b7..aa3ca549f0 100644 --- a/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix +++ b/third_party/nixpkgs/nixos/modules/config/pulseaudio.nix @@ -89,7 +89,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the PulseAudio sound server. ''; }; @@ -97,7 +97,7 @@ in { systemWide = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If false, a PulseAudio server is launched automatically for each user that tries to use the sound system. The server runs with user privileges. If true, one system-wide PulseAudio @@ -112,7 +112,7 @@ in { support32Bit = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to include the 32-bit pulseaudio libraries in the system or not. This is only useful on 64-bit systems and currently limited to x86_64-linux. ''; @@ -120,7 +120,7 @@ in { configFile = mkOption { type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' The path to the default configuration options the PulseAudio server should use. By default, the "default.pa" configuration from the PulseAudio distribution is used. @@ -130,8 +130,8 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' - Literal string to append to configFile + description = lib.mdDoc '' + Literal string to append to `configFile` and the config file generated by the pulseaudio module. ''; }; @@ -139,7 +139,7 @@ in { extraClientConf = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration appended to pulse/client.conf file. ''; }; @@ -151,10 +151,10 @@ in { else pkgs.pulseaudio; defaultText = literalExpression "pkgs.pulseaudio"; example = literalExpression "pkgs.pulseaudioFull"; - description = '' + description = lib.mdDoc '' The PulseAudio derivation to use. This can be used to enable features (such as JACK support, Bluetooth) via the - pulseaudioFull package. + `pulseaudioFull` package. ''; }; @@ -162,7 +162,7 @@ in { type = types.listOf types.package; default = []; example = literalExpression "[ pkgs.pulseaudio-modules-bt ]"; - description = '' + description = lib.mdDoc '' Extra pulseaudio modules to use. This is intended for out-of-tree pulseaudio modules like extra bluetooth codecs. @@ -174,7 +174,7 @@ in { logLevel = mkOption { type = types.str; default = "notice"; - description = '' + description = lib.mdDoc '' The log level that the system-wide pulseaudio daemon should use, if activated. ''; @@ -183,7 +183,7 @@ in { config = mkOption { type = types.attrsOf types.unspecified; default = {}; - description = "Config of the pulse daemon. See man pulse-daemon.conf."; + description = lib.mdDoc "Config of the pulse daemon. See `man pulse-daemon.conf`."; example = literalExpression ''{ realtime-scheduling = "yes"; }''; }; }; @@ -205,7 +205,7 @@ in { type = types.listOf types.str; default = []; example = literalExpression ''[ "127.0.0.1" "192.168.1.0/24" ]''; - description = '' + description = lib.mdDoc '' A list of IP subnets that are allowed to stream to the server. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/qt5.nix b/third_party/nixpkgs/nixos/modules/config/qt5.nix index 0cda1ca9c3..9e19774b58 100644 --- a/third_party/nixpkgs/nixos/modules/config/qt5.nix +++ b/third_party/nixpkgs/nixos/modules/config/qt5.nix @@ -45,41 +45,17 @@ in ["lxqt" "lxqt-qtplugin"] ["libsForQt5" "plasma-integration"] ]; - description = '' - Selects the platform theme to use for Qt5 applications.
- The options are - - - gtk - Use GTK theme with - qtstyleplugins - - - - gnome - Use GNOME theme with - qgnomeplatform - - - - lxqt - Use LXQt style set using the - lxqt-config-appearance - application. - - - - qt5ct - Use Qt style set using the - qt5ct - application. - - - - kde - Use Qt settings from Plasma. - - + description = lib.mdDoc '' + Selects the platform theme to use for Qt5 applications. + + The options are + - `gtk`: Use GTK theme with [qtstyleplugins](https://github.com/qt/qtstyleplugins) + - `gnome`: Use GNOME theme with [qgnomeplatform](https://github.com/FedoraQt/QGnomePlatform) + - `lxqt`: Use LXQt style set using the [lxqt-config-appearance](https://github.com/lxqt/lxqt-config) + application. + - `qt5ct`: Use Qt style set using the [qt5ct](https://sourceforge.net/projects/qt5ct/) + application. + - `kde`: Use Qt settings from Plasma. ''; }; @@ -97,27 +73,14 @@ in "adwaita-qt" ["libsForQt5" "qtstyleplugins"] ]; - description = '' - Selects the style to use for Qt5 applications. - The options are - - - adwaita - adwaita-dark - Use Adwaita Qt style with - adwaita - - - - cleanlooks - gtk2 - motif - plastique - Use styles from - qtstyleplugins - - - + description = lib.mdDoc '' + Selects the style to use for Qt5 applications. + + The options are + - `adwaita`, `adwaita-dark`: Use Adwaita Qt style with + [adwaita](https://github.com/FedoraQt/adwaita-qt) + - `cleanlooks`, `gtk2`, `motif`, `plastique`: Use styles from + [qtstyleplugins](https://github.com/qt/qtstyleplugins) ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/config/resolvconf.nix b/third_party/nixpkgs/nixos/modules/config/resolvconf.nix index 3e14884bb2..76605a063a 100644 --- a/third_party/nixpkgs/nixos/modules/config/resolvconf.nix +++ b/third_party/nixpkgs/nixos/modules/config/resolvconf.nix @@ -49,7 +49,7 @@ in type = types.bool; default = !(config.environment.etc ? "resolv.conf"); defaultText = literalExpression ''!(config.environment.etc ? "resolv.conf")''; - description = '' + description = lib.mdDoc '' Whether DNS configuration is managed by resolvconf. ''; }; @@ -58,9 +58,9 @@ in type = types.package; default = pkgs.openresolv; defaultText = literalExpression "pkgs.openresolv"; - description = '' - The package that provides the system-wide resolvconf command. Defaults to openresolv - if this module is enabled. Otherwise, can be used by other modules (for example ) to + description = lib.mdDoc '' + The package that provides the system-wide resolvconf command. Defaults to `openresolv` + if this module is enabled. Otherwise, can be used by other modules (for example {option}`services.resolved`) to provide a compatibility layer. This option generally shouldn't be set by the user. @@ -70,7 +70,7 @@ in dnsSingleRequest = lib.mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Recent versions of glibc will issue both ipv4 (A) and ipv6 (AAAA) address queries at the same time, from the same port. Sometimes upstream routers will systemically drop the ipv4 queries. The symptom of this problem is @@ -83,9 +83,9 @@ in dnsExtensionMechanism = mkOption { type = types.bool; default = true; - description = '' - Enable the edns0 option in resolv.conf. With - that option set, glibc supports use of the extension mechanisms for + description = lib.mdDoc '' + Enable the `edns0` option in {file}`resolv.conf`. With + that option set, `glibc` supports use of the extension mechanisms for DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC, which does not work without it. ''; @@ -95,8 +95,8 @@ in type = types.lines; default = ""; example = "libc=NO"; - description = '' - Extra configuration to append to resolvconf.conf. + description = lib.mdDoc '' + Extra configuration to append to {file}`resolvconf.conf`. ''; }; @@ -104,15 +104,15 @@ in type = types.listOf types.str; default = []; example = [ "ndots:1" "rotate" ]; - description = '' - Set the options in /etc/resolv.conf. + description = lib.mdDoc '' + Set the options in {file}`/etc/resolv.conf`. ''; }; useLocalResolver = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Use local DNS server for resolving. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/shells-environment.nix b/third_party/nixpkgs/nixos/modules/config/shells-environment.nix index ae3f618e27..2fda71749c 100644 --- a/third_party/nixpkgs/nixos/modules/config/shells-environment.nix +++ b/third_party/nixpkgs/nixos/modules/config/shells-environment.nix @@ -35,7 +35,7 @@ in environment.variables = mkOption { default = {}; example = { EDITOR = "nvim"; VISUAL = "nvim"; }; - description = '' + description = lib.mdDoc '' A set of environment variables used in the global environment. These variables will be set on shell initialisation (e.g. in /etc/profile). The value of each variable can be either a string or a list of @@ -48,7 +48,7 @@ in environment.profiles = mkOption { default = []; - description = '' + description = lib.mdDoc '' A list of profiles used to setup the global environment. ''; type = types.listOf types.str; @@ -57,10 +57,10 @@ in environment.profileRelativeEnvVars = mkOption { type = types.attrsOf (types.listOf types.str); example = { PATH = [ "/bin" ]; MANPATH = [ "/man" "/share/man" ]; }; - description = '' + description = lib.mdDoc '' Attribute set of environment variable. Each attribute maps to a list of relative paths. Each relative path is appended to the each profile - of to form the content of the + of {option}`environment.profiles` to form the content of the corresponding environment variable. ''; }; @@ -68,7 +68,7 @@ in # !!! isn't there a better way? environment.extraInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during global environment initialisation after all variables and profileVariables have been set. This code is assumed to be shell-independent, which means you should @@ -79,7 +79,7 @@ in environment.shellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during shell initialisation. This code is assumed to be shell-independent, which means you should stick to pure sh without sh word split. @@ -89,7 +89,7 @@ in environment.loginShellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during login shell initialisation. This code is assumed to be shell-independent, which means you should stick to pure sh without sh word split. @@ -99,7 +99,7 @@ in environment.interactiveShellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during interactive shell initialisation. This code is assumed to be shell-independent, which means you should stick to pure sh without sh word split. @@ -109,17 +109,17 @@ in environment.shellAliases = mkOption { example = { l = null; ll = "ls -l"; }; - description = '' + description = lib.mdDoc '' An attribute set that maps aliases (the top level attribute names in this option) to command strings or directly to build outputs. The aliases are added to all users' shells. - Aliases mapped to null are ignored. + Aliases mapped to `null` are ignored. ''; type = with types; attrsOf (nullOr (either str path)); }; environment.homeBinInPath = mkOption { - description = '' + description = lib.mdDoc '' Include ~/bin/ in $PATH. ''; default = false; @@ -127,7 +127,7 @@ in }; environment.localBinInPath = mkOption { - description = '' + description = lib.mdDoc '' Add ~/.local/bin/ to $PATH ''; default = false; @@ -151,9 +151,9 @@ in environment.shells = mkOption { default = []; example = literalExpression "[ pkgs.bashInteractive pkgs.zsh ]"; - description = '' + description = lib.mdDoc '' A list of permissible login shells for user accounts. - No need to mention /bin/sh + No need to mention `/bin/sh` here, it is placed into this list implicitly. ''; type = types.listOf (types.either types.shellPackage types.path); diff --git a/third_party/nixpkgs/nixos/modules/config/swap.nix b/third_party/nixpkgs/nixos/modules/config/swap.nix index 2b94b954cb..3216590d8f 100644 --- a/third_party/nixpkgs/nixos/modules/config/swap.nix +++ b/third_party/nixpkgs/nixos/modules/config/swap.nix @@ -14,7 +14,7 @@ let enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Encrypt swap device with a random key. This way you won't have a persistent swap device. WARNING: Don't try to hibernate when you have at least one swap partition with @@ -31,7 +31,7 @@ let default = "aes-xts-plain64"; example = "serpent-xts-plain64"; type = types.str; - description = '' + description = lib.mdDoc '' Use specified cipher for randomEncryption. Hint: Run "cryptsetup benchmark" to see which one is fastest on your machine. @@ -42,7 +42,7 @@ let default = "/dev/urandom"; example = "/dev/random"; type = types.str; - description = '' + description = lib.mdDoc '' Define the source of randomness to obtain a random key for encryption. ''; }; @@ -50,7 +50,7 @@ let allowDiscards = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to allow TRIM requests to the underlying device. This option has security implications; please read the LUKS documentation before activating it. @@ -67,7 +67,7 @@ let device = mkOption { example = "/dev/sda3"; type = types.str; - description = "Path of the device or swap file."; + description = lib.mdDoc "Path of the device or swap file."; }; label = mkOption { @@ -82,7 +82,7 @@ let default = null; example = 2048; type = types.nullOr types.int; - description = '' + description = lib.mdDoc '' If this option is set, ‘device’ is interpreted as the path of a swapfile that will be created automatically with the indicated size (in megabytes). @@ -93,7 +93,7 @@ let default = null; example = 2048; type = types.nullOr types.int; - description = '' + description = lib.mdDoc '' Specify the priority of the swap device. Priority is a value between 0 and 32767. Higher numbers indicate higher priority. null lets the kernel choose a priority, which will show up as a negative value. @@ -108,7 +108,7 @@ let source = "/dev/random"; }; type = types.coercedTo types.bool randomEncryptionCoerce (types.submodule randomEncryptionOpts); - description = '' + description = lib.mdDoc '' Encrypt swap device with a random key. This way you won't have a persistent swap device. HINT: run "cryptsetup benchmark" to test cipher performance on your machine. @@ -127,7 +127,7 @@ let default = null; example = "once"; type = types.nullOr (types.enum ["once" "pages" "both" ]); - description = '' + description = lib.mdDoc '' Specify the discard policy for the swap device. If "once", then the whole swap space is discarded at swapon invocation. If "pages", asynchronous discard on freed pages is performed, before returning to @@ -140,7 +140,7 @@ let default = [ "defaults" ]; example = [ "nofail" ]; type = types.listOf types.nonEmptyStr; - description = '' + description = lib.mdDoc '' Options used to mount the swap. ''; }; @@ -181,13 +181,13 @@ in { device = "/var/swapfile"; } { label = "bigswap"; } ]; - description = '' + description = lib.mdDoc '' The swap devices and swap files. These must have been - initialised using mkswap. Each element + initialised using {command}`mkswap`. Each element should be an attribute set specifying either the path of the - swap device or file (device) or the label - of the swap device (label, see - mkswap -L). Using a label is + swap device or file (`device`) or the label + of the swap device (`label`, see + {command}`mkswap -L`). Using a label is recommended. ''; diff --git a/third_party/nixpkgs/nixos/modules/config/system-environment.nix b/third_party/nixpkgs/nixos/modules/config/system-environment.nix index d2a66b8d93..1e05ab7d0f 100644 --- a/third_party/nixpkgs/nixos/modules/config/system-environment.nix +++ b/third_party/nixpkgs/nixos/modules/config/system-environment.nix @@ -16,7 +16,7 @@ in environment.sessionVariables = mkOption { default = {}; - description = '' + description = lib.mdDoc '' A set of environment variables used in the global environment. These variables will be set by PAM early in the login process. @@ -25,12 +25,12 @@ in colon characters. Note, due to limitations in the PAM format values may not - contain the " character. + contain the `"` character. Also, these variables are merged into - and it is + [](#opt-environment.variables) and it is therefore not possible to use PAM style variables such as - @{HOME}. + `@{HOME}`. ''; type = with types; attrsOf (either str (listOf str)); apply = mapAttrs (n: v: if isList v then concatStringsSep ":" v else v); @@ -58,7 +58,7 @@ in Also, these variables are merged into and it is therefore not possible to use PAM style variables such as - @{HOME}. + @{HOME}. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/system-path.nix b/third_party/nixpkgs/nixos/modules/config/system-path.nix index 875c4c9c44..de980e7383 100644 --- a/third_party/nixpkgs/nixos/modules/config/system-path.nix +++ b/third_party/nixpkgs/nixos/modules/config/system-path.nix @@ -64,14 +64,14 @@ in type = types.listOf types.package; default = []; example = literalExpression "[ pkgs.firefox pkgs.thunderbird ]"; - description = '' + description = lib.mdDoc '' The set of packages that appear in /run/current-system/sw. These packages are automatically available to all users, and are automatically updated every time you rebuild the system configuration. (The latter is the main difference with installing them in the default profile, - /nix/var/nix/profiles/default. + {file}`/nix/var/nix/profiles/default`. ''; }; @@ -109,20 +109,20 @@ in # to work. default = []; example = ["/"]; - description = "List of directories to be symlinked in /run/current-system/sw."; + description = lib.mdDoc "List of directories to be symlinked in {file}`/run/current-system/sw`."; }; extraOutputsToInstall = mkOption { type = types.listOf types.str; default = [ ]; example = [ "doc" "info" "devdoc" ]; - description = "List of additional package outputs to be symlinked into /run/current-system/sw."; + description = lib.mdDoc "List of additional package outputs to be symlinked into {file}`/run/current-system/sw`."; }; extraSetup = mkOption { type = types.lines; default = ""; - description = "Shell fragments to be run after the system environment has been created. This should only be used for things that need to modify the internals of the environment, e.g. generating MIME caches. The environment being built can be accessed at $out."; + description = lib.mdDoc "Shell fragments to be run after the system environment has been created. This should only be used for things that need to modify the internals of the environment, e.g. generating MIME caches. The environment being built can be accessed at $out."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/config/terminfo.nix b/third_party/nixpkgs/nixos/modules/config/terminfo.nix index 693404a429..82f9ae4837 100644 --- a/third_party/nixpkgs/nixos/modules/config/terminfo.nix +++ b/third_party/nixpkgs/nixos/modules/config/terminfo.nix @@ -9,7 +9,7 @@ with lib; options.environment.enableAllTerminfo = with lib; mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to install all terminfo outputs ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix b/third_party/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix index 055c3b2364..7bd3fa1600 100644 --- a/third_party/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix +++ b/third_party/nixpkgs/nixos/modules/config/unix-odbc-drivers.nix @@ -20,10 +20,10 @@ in { type = types.listOf types.package; default = []; example = literalExpression "with pkgs.unixODBCDrivers; [ sqlite psql ]"; - description = '' + description = lib.mdDoc '' Specifies Unix ODBC drivers to be registered in - /etc/odbcinst.ini. You may also want to - add pkgs.unixODBC to the system path to get + {file}`/etc/odbcinst.ini`. You may also want to + add `pkgs.unixODBC` to the system path to get a command line client to connect to ODBC databases. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index d3bdf218c3..915687d179 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -6,12 +6,6 @@ let ids = config.ids; cfg = config.users; - isPasswdCompatible = str: !(hasInfix ":" str || hasInfix "\n" str); - passwdEntry = type: lib.types.addCheck type isPasswdCompatible // { - name = "passwdEntry ${type.name}"; - description = "${type.description}, not containing newlines or colons"; - }; - # Check whether a password hash will allow login. allowsLogin = hash: hash == "" # login without password @@ -60,29 +54,29 @@ let options = { name = mkOption { - type = passwdEntry types.str; + type = types.passwdEntry types.str; apply = x: assert (builtins.stringLength x < 32 || abort "Username '${x}' is longer than 31 characters which is not allowed!"); x; - description = '' + description = lib.mdDoc '' The name of the user account. If undefined, the name of the attribute set will be used. ''; }; description = mkOption { - type = passwdEntry types.str; + type = types.passwdEntry types.str; default = ""; example = "Alice Q. User"; - description = '' + description = lib.mdDoc '' A short description of the user account, typically the user's full name. This is actually the “GECOS” or “comment” - field in /etc/passwd. + field in {file}`/etc/passwd`. ''; }; uid = mkOption { type = with types; nullOr int; default = null; - description = '' + description = lib.mdDoc '' The account UID. If the UID is null, a free UID is picked on activation. ''; @@ -91,32 +85,32 @@ let isSystemUser = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Indicates if the user is a system user or not. This option - only has an effect if is - , in which case it determines whether + 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 1000). - Exactly one of isNormalUser and - isSystemUser must be true. + Exactly one of `isNormalUser` and + `isSystemUser` must be true. ''; }; isNormalUser = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Indicates whether this is an account for a “real” user. This - automatically sets to - users, to - true, to - /home/username, - to true, - and to - false. - Exactly one of isNormalUser and - isSystemUser must be true. + automatically sets {option}`group` to + `users`, {option}`createHome` to + `true`, {option}`home` to + {file}`/home/«username»`, + {option}`useDefaultShell` to `true`, + and {option}`isSystemUser` to + `false`. + Exactly one of `isNormalUser` and + `isSystemUser` must be true. ''; }; @@ -124,31 +118,31 @@ let type = types.str; apply = x: assert (builtins.stringLength x < 32 || abort "Group name '${x}' is longer than 31 characters which is not allowed!"); x; default = ""; - description = "The user's primary group."; + description = lib.mdDoc "The user's primary group."; }; extraGroups = mkOption { type = types.listOf types.str; default = []; - description = "The user's auxiliary groups."; + description = lib.mdDoc "The user's auxiliary groups."; }; home = mkOption { - type = passwdEntry types.path; + type = types.passwdEntry types.path; default = "/var/empty"; - description = "The user's home directory."; + description = lib.mdDoc "The user's home directory."; }; homeMode = mkOption { type = types.strMatching "[0-7]{1,5}"; default = "700"; - description = "The user's home directory mode in numeric format. See chmod(1). The mode is only applied if is true."; + description = lib.mdDoc "The user's home directory mode in numeric format. See chmod(1). The mode is only applied if {option}`users.users..createHome` is true."; }; cryptHomeLuks = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Path to encrypted luks device that contains the user's home directory. ''; @@ -157,28 +151,27 @@ let pamMount = mkOption { type = with types; attrsOf str; default = {}; - description = '' + description = lib.mdDoc '' Attributes for user's entry in - pam_mount.conf.xml. - Useful attributes might include path, - options, fstype, and server. - See + {file}`pam_mount.conf.xml`. + Useful attributes might include `path`, + `options`, `fstype`, and `server`. + See for more information. ''; }; shell = mkOption { - type = types.nullOr (types.either types.shellPackage (passwdEntry types.path)); + type = types.nullOr (types.either types.shellPackage (types.passwdEntry types.path)); default = pkgs.shadow; defaultText = literalExpression "pkgs.shadow"; example = literalExpression "pkgs.bashInteractive"; - description = '' + description = lib.mdDoc '' The path to the user's shell. Can use shell derivations, - like pkgs.bashInteractive. Don’t + like `pkgs.bashInteractive`. Don’t forget to enable your shell in - programs if necessary, - like programs.zsh.enable = true;. + `programs` if necessary, + like `programs.zsh.enable = true;`. ''; }; @@ -189,10 +182,10 @@ let { startUid = 1000; count = 1; } { startUid = 100001; count = 65534; } ]; - description = '' + description = lib.mdDoc '' Subordinate user ids that user is allowed to use. - They are set into /etc/subuid and are used - by newuidmap for user namespaces. + They are set into {file}`/etc/subuid` and are used + by `newuidmap` for user namespaces. ''; }; @@ -203,10 +196,10 @@ let { startGid = 100; count = 1; } { startGid = 1001; count = 999; } ]; - description = '' + description = lib.mdDoc '' Subordinate group ids that user is allowed to use. - They are set into /etc/subgid and are used - by newgidmap for user namespaces. + They are set into {file}`/etc/subgid` and are used + by `newgidmap` for user namespaces. ''; }; @@ -214,7 +207,7 @@ let type = types.bool; default = false; example = true; - description = '' + description = lib.mdDoc '' Automatically allocate subordinate user and group ids for this user. Allocated range is currently always of size 65536. ''; @@ -223,7 +216,7 @@ let createHome = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to create the home directory and ensure ownership as well as permissions to match the user. ''; @@ -232,9 +225,9 @@ let useDefaultShell = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If true, the user's shell will be set to - . + {option}`users.defaultUserShell`. ''; }; @@ -290,13 +283,13 @@ let initialPassword = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specifies the initial password for the user, i.e. the password assigned if the user does not already exist. If - is true, the password + {option}`users.mutableUsers` is true, the password can be changed subsequently using the - passwd command. Otherwise, it's - equivalent to setting the + {command}`passwd` command. Otherwise, it's + equivalent to setting the {option}`password` option. The same caveat applies: the password specified here is world-readable in the Nix store, so it should only be used for guest accounts or passwords that will be changed @@ -308,9 +301,9 @@ let type = types.listOf types.package; default = []; example = literalExpression "[ pkgs.firefox pkgs.thunderbird ]"; - description = '' + description = lib.mdDoc '' The set of packages that should be made available to the user. - This is in contrast to , + This is in contrast to {option}`environment.systemPackages`, which adds packages to all users. ''; }; @@ -349,8 +342,8 @@ let options = { name = mkOption { - type = passwdEntry types.str; - description = '' + type = types.passwdEntry types.str; + description = lib.mdDoc '' The name of the group. If undefined, the name of the attribute set will be used. ''; @@ -359,7 +352,7 @@ let gid = mkOption { type = with types; nullOr int; default = null; - description = '' + description = lib.mdDoc '' The group GID. If the GID is null, a free GID is picked on activation. ''; @@ -368,9 +361,9 @@ let members = mkOption { type = with types; listOf (passwdEntry str); default = []; - description = '' + description = lib.mdDoc '' The user names of the group members, added to the - /etc/group file. + `/etc/group` file. ''; }; @@ -390,7 +383,7 @@ let options = { startUid = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' Start of the range of subordinate user ids that user is allowed to use. ''; @@ -398,7 +391,7 @@ let count = mkOption { type = types.int; default = 1; - description = "Count of subordinate user ids"; + description = lib.mdDoc "Count of subordinate user ids"; }; }; }; @@ -407,7 +400,7 @@ let options = { startGid = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' Start of the range of subordinate group ids that user is allowed to use. ''; @@ -415,7 +408,7 @@ let count = mkOption { type = types.int; default = 1; - description = "Count of subordinate group ids"; + description = lib.mdDoc "Count of subordinate group ids"; }; }; }; @@ -490,7 +483,7 @@ in { users.enforceIdUniqueness = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to require that no two users/groups share the same uid/gid. ''; }; @@ -509,7 +502,7 @@ in { shell = "/bin/sh"; }; }; - description = '' + description = lib.mdDoc '' Additional user accounts to be created automatically by the system. This can also be used to set options for root. ''; @@ -522,7 +515,7 @@ in { hackers = { }; }; type = with types; attrsOf (submodule groupOpts); - description = '' + description = lib.mdDoc '' Additional groups to be created automatically by the system. ''; }; @@ -531,8 +524,8 @@ in { users.allowNoPasswordLogin = mkOption { type = types.bool; default = false; - description = '' - Disable checking that at least the root user or a user in the wheel group can log in using + description = lib.mdDoc '' + Disable checking that at least the `root` user or a user in the `wheel` group can log in using a password or an SSH key. WARNING: enabling this can lock you out of your system. Enable this only if you know what are you doing. diff --git a/third_party/nixpkgs/nixos/modules/config/vte.nix b/third_party/nixpkgs/nixos/modules/config/vte.nix index 24d32a00fd..a969607f6e 100644 --- a/third_party/nixpkgs/nixos/modules/config/vte.nix +++ b/third_party/nixpkgs/nixos/modules/config/vte.nix @@ -25,7 +25,7 @@ in programs.bash.vteIntegration = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable Bash integration for VTE terminals. This allows it to preserve the current directory of the shell across terminals. @@ -35,7 +35,7 @@ in programs.zsh.vteIntegration = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable Zsh integration for VTE terminals. This allows it to preserve the current directory of the shell across terminals. diff --git a/third_party/nixpkgs/nixos/modules/config/xdg/autostart.nix b/third_party/nixpkgs/nixos/modules/config/xdg/autostart.nix index 40984cb5ec..a4fdbda911 100644 --- a/third_party/nixpkgs/nixos/modules/config/xdg/autostart.nix +++ b/third_party/nixpkgs/nixos/modules/config/xdg/autostart.nix @@ -10,9 +10,9 @@ with lib; xdg.autostart.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to install files to support the - XDG Autostart specification. + [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html). ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/config/xdg/icons.nix b/third_party/nixpkgs/nixos/modules/config/xdg/icons.nix index 1e91670cf0..8d44a43144 100644 --- a/third_party/nixpkgs/nixos/modules/config/xdg/icons.nix +++ b/third_party/nixpkgs/nixos/modules/config/xdg/icons.nix @@ -10,9 +10,9 @@ with lib; xdg.icons.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to install files to support the - XDG Icon Theme specification. + [XDG Icon Theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html). ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/config/xdg/menus.nix b/third_party/nixpkgs/nixos/modules/config/xdg/menus.nix index 6735a7a5c4..b8f829e815 100644 --- a/third_party/nixpkgs/nixos/modules/config/xdg/menus.nix +++ b/third_party/nixpkgs/nixos/modules/config/xdg/menus.nix @@ -10,9 +10,9 @@ with lib; xdg.menus.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to install files to support the - XDG Desktop Menu specification. + [XDG Desktop Menu specification](https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html). ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/config/xdg/mime.nix b/third_party/nixpkgs/nixos/modules/config/xdg/mime.nix index 9b6dd4cab5..3aa8630832 100644 --- a/third_party/nixpkgs/nixos/modules/config/xdg/mime.nix +++ b/third_party/nixpkgs/nixos/modules/config/xdg/mime.nix @@ -18,10 +18,10 @@ in xdg.mime.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to install files to support the - XDG Shared MIME-info specification and the - XDG MIME Applications specification. + [XDG Shared MIME-info specification](https://specifications.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html) and the + [XDG MIME Applications specification](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html). ''; }; @@ -32,10 +32,10 @@ in "application/pdf" = "firefox.desktop"; "text/xml" = [ "nvim.desktop" "codium.desktop" ]; }; - description = '' + description = lib.mdDoc '' Adds associations between mimetypes and applications. See the - - specifications for more information. + [ + specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations) for more information. ''; }; @@ -46,10 +46,10 @@ in "application/pdf" = "firefox.desktop"; "image/png" = [ "sxiv.desktop" "gimp.desktop" ]; }; - description = '' + description = lib.mdDoc '' Sets the default applications for given mimetypes. See the - - specifications for more information. + [ + specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#default) for more information. ''; }; @@ -60,10 +60,10 @@ in "audio/mp3" = [ "mpv.desktop" "umpv.desktop" ]; "inode/directory" = "codium.desktop"; }; - description = '' + description = lib.mdDoc '' Removes associations between mimetypes and applications. See the - - specifications for more information. + [ + specifications](https://specifications.freedesktop.org/mime-apps-spec/mime-apps-spec-latest.html#associations) for more information. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/config/xdg/portal.nix b/third_party/nixpkgs/nixos/modules/config/xdg/portal.nix index 1e6ddd7c4a..689abf267f 100644 --- a/third_party/nixpkgs/nixos/modules/config/xdg/portal.nix +++ b/third_party/nixpkgs/nixos/modules/config/xdg/portal.nix @@ -33,7 +33,7 @@ in options.xdg.portal = { enable = - mkEnableOption "xdg desktop integration" // { + mkEnableOption ''xdg desktop integration'' // { default = false; }; diff --git a/third_party/nixpkgs/nixos/modules/config/xdg/sounds.nix b/third_party/nixpkgs/nixos/modules/config/xdg/sounds.nix index 0b94f55092..713d68131f 100644 --- a/third_party/nixpkgs/nixos/modules/config/xdg/sounds.nix +++ b/third_party/nixpkgs/nixos/modules/config/xdg/sounds.nix @@ -10,9 +10,9 @@ with lib; xdg.sounds.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to install files to support the - XDG Sound Theme specification. + [XDG Sound Theme specification](https://www.freedesktop.org/wiki/Specifications/sound-theme-spec/). ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/config/zram.nix b/third_party/nixpkgs/nixos/modules/config/zram.nix index 1f513b7e4d..34e80df47a 100644 --- a/third_party/nixpkgs/nixos/modules/config/zram.nix +++ b/third_party/nixpkgs/nixos/modules/config/zram.nix @@ -40,21 +40,21 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable in-memory compressed devices and swap space provided by the zram kernel module. - See + See [ https://www.kernel.org/doc/Documentation/blockdev/zram.txt - . + ](https://www.kernel.org/doc/Documentation/blockdev/zram.txt). ''; }; numDevices = mkOption { default = 1; type = types.int; - description = '' + description = lib.mdDoc '' Number of zram devices to create. See also - zramSwap.swapDevices + `zramSwap.swapDevices` ''; }; @@ -62,20 +62,20 @@ in default = null; example = 1; type = with types; nullOr int; - description = '' + 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. + `<= zramSwap.numDevices`. + Default is same as `zramSwap.numDevices`, recommended is 1. ''; }; memoryPercent = mkOption { default = 50; type = types.int; - description = '' + description = lib.mdDoc '' Maximum amount of memory that can be used by the zram swap devices (as a percentage of your total memory). Defaults to 1/2 of your total - RAM. Run zramctl to check how good memory is + RAM. Run `zramctl` to check how good memory is compressed. ''; }; @@ -83,7 +83,7 @@ in memoryMax = mkOption { default = null; type = with types; nullOr int; - description = '' + description = lib.mdDoc '' Maximum total amount of memory (in bytes) that can be used by the zram swap devices. ''; @@ -92,7 +92,7 @@ in priority = mkOption { default = 5; type = types.int; - description = '' + 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 fill the zram swap devices before falling back to disk swap). diff --git a/third_party/nixpkgs/nixos/modules/hardware/acpilight.nix b/third_party/nixpkgs/nixos/modules/hardware/acpilight.nix index 2de448a265..d8d82b0e81 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/acpilight.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/acpilight.nix @@ -10,7 +10,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable acpilight. This will allow brightness control via xbacklight from users in the video group ''; diff --git a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix index 89a1217dfb..2d5a0007ff 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/all-firmware.nix @@ -21,7 +21,7 @@ in { hardware.enableAllFirmware = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Turn on this option if you want to enable all the firmware. ''; }; @@ -30,7 +30,7 @@ in { default = config.hardware.enableAllFirmware; defaultText = lib.literalExpression "config.hardware.enableAllFirmware"; type = types.bool; - description = '' + description = lib.mdDoc '' Turn on this option if you want to enable all the firmware with a license allowing redistribution. ''; }; @@ -38,7 +38,7 @@ in { hardware.wirelessRegulatoryDatabase = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Load the wireless regulatory database at boot. ''; }; @@ -62,7 +62,7 @@ in { alsa-firmware sof-firmware libreelec-dvb-firmware - ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware + ] ++ 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") [ diff --git a/third_party/nixpkgs/nixos/modules/hardware/bladeRF.nix b/third_party/nixpkgs/nixos/modules/hardware/bladeRF.nix index 35b74b8382..52a1f52024 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/bladeRF.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/bladeRF.nix @@ -12,7 +12,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables udev rules for BladeRF devices. By default grants access to users in the "bladerf" group. You may want to install the libbladeRF package. diff --git a/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix b/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix index 751ed663aa..287d287a77 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix @@ -19,7 +19,7 @@ in type = types.nullOr types.int; default = null; example = 100; - description = '' + description = lib.mdDoc '' Limit access to the ckb daemon to a particular group. ''; }; @@ -28,7 +28,7 @@ in type = types.package; default = pkgs.ckb-next; defaultText = literalExpression "pkgs.ckb-next"; - description = '' + description = lib.mdDoc '' The package implementing the Corsair keyboard/mouse driver. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-microcode.nix b/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-microcode.nix index 621c7066bf..3f52cb1fca 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-microcode.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-microcode.nix @@ -11,7 +11,7 @@ with lib; hardware.cpu.amd.updateMicrocode = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Update the CPU microcode for AMD processors. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-sev.nix b/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-sev.nix new file mode 100644 index 0000000000..32fed2c484 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/hardware/cpu/amd-sev.nix @@ -0,0 +1,51 @@ +{ config, lib, ... }: +with lib; +let + cfg = config.hardware.cpu.amd.sev; + defaultGroup = "sev"; +in + with lib; { + options.hardware.cpu.amd.sev = { + enable = mkEnableOption "access to the AMD SEV device"; + user = mkOption { + description = "Owner to assign to the SEV device."; + type = types.str; + default = "root"; + }; + group = mkOption { + description = "Group to assign to the SEV device."; + type = types.str; + default = defaultGroup; + }; + mode = mkOption { + description = "Mode to set for the SEV device."; + type = types.str; + default = "0660"; + }; + }; + + config = mkIf cfg.enable { + assertions = [ + { + assertion = hasAttr cfg.user config.users.users; + message = "Given user does not exist"; + } + { + assertion = (cfg.group == defaultGroup) || (hasAttr cfg.group config.users.groups); + message = "Given group does not exist"; + } + ]; + + boot.extraModprobeConfig = '' + options kvm_amd sev=1 + ''; + + users.groups = optionalAttrs (cfg.group == defaultGroup) { + "${cfg.group}" = {}; + }; + + services.udev.extraRules = with cfg; '' + KERNEL=="sev", OWNER="${user}", GROUP="${group}", MODE="${mode}" + ''; + }; + } diff --git a/third_party/nixpkgs/nixos/modules/hardware/cpu/intel-microcode.nix b/third_party/nixpkgs/nixos/modules/hardware/cpu/intel-microcode.nix index acce565fd8..d30ebfefee 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/cpu/intel-microcode.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/cpu/intel-microcode.nix @@ -11,7 +11,7 @@ with lib; hardware.cpu.intel.updateMicrocode = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Update the CPU microcode for Intel processors. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/cpu/intel-sgx.nix b/third_party/nixpkgs/nixos/modules/hardware/cpu/intel-sgx.nix index 1355ee753f..76664133a0 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/cpu/intel-sgx.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/cpu/intel-sgx.nix @@ -6,13 +6,13 @@ let in { options.hardware.cpu.intel.sgx.enableDcapCompat = mkOption { - description = '' + description = lib.mdDoc '' Whether to enable backward compatibility for SGX software build for the out-of-tree Intel SGX DCAP driver. - Creates symbolic links for the SGX devices /dev/sgx_enclave - and /dev/sgx_provision to make them available as - /dev/sgx/enclave and /dev/sgx/provision, + Creates symbolic links for the SGX devices `/dev/sgx_enclave` + and `/dev/sgx_provision` to make them available as + `/dev/sgx/enclave` and `/dev/sgx/provision`, respectively. ''; type = types.bool; @@ -22,17 +22,17 @@ in options.hardware.cpu.intel.sgx.provision = { enable = mkEnableOption "access to the Intel SGX provisioning device"; user = mkOption { - description = "Owner to assign to the SGX provisioning device."; + description = lib.mdDoc "Owner to assign to the SGX provisioning device."; type = types.str; default = "root"; }; group = mkOption { - description = "Group to assign to the SGX provisioning device."; + description = lib.mdDoc "Group to assign to the SGX provisioning device."; type = types.str; default = defaultPrvGroup; }; mode = mkOption { - description = "Mode to set for the SGX provisioning device."; + description = lib.mdDoc "Mode to set for the SGX provisioning device."; type = types.str; default = "0660"; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix b/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix index 5a8a8e27be..5585277622 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/device-tree.nix @@ -9,14 +9,14 @@ let options = { name = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Name of this overlay ''; }; dtsFile = mkOption { type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Path to .dts overlay file, overlay is applied to each .dtb file matching "compatible" of the overlay. ''; @@ -27,7 +27,7 @@ let dtsText = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Literal DTS contents, overlay is applied to each .dtb file matching "compatible" of the overlay. ''; @@ -49,7 +49,7 @@ let dtboFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to .dtbo compiled overlay file. ''; }; @@ -115,7 +115,7 @@ in enable = mkOption { default = pkgs.stdenv.hostPlatform.linux-kernel.DTB or false; type = types.bool; - description = '' + description = lib.mdDoc '' Build device tree files. These are used to describe the non-discoverable hardware of a system. ''; @@ -126,7 +126,7 @@ in defaultText = literalExpression "config.boot.kernelPackages.kernel"; example = literalExpression "pkgs.linux_latest"; type = types.path; - description = '' + description = lib.mdDoc '' Kernel package containing the base device-tree (.dtb) to boot. Uses device trees bundled with the Linux kernel by default. ''; @@ -136,7 +136,7 @@ in default = null; example = "some-dtb.dtb"; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The name of an explicit dtb to be loaded, relative to the dtb base. Useful in extlinux scenarios if the bootloader doesn't pick the right .dtb file from FDTDIR. @@ -147,7 +147,7 @@ in type = types.nullOr types.str; default = null; example = "*rpi*.dtb"; - description = '' + description = lib.mdDoc '' Only include .dtb files matching glob expression. ''; }; @@ -167,7 +167,7 @@ in name = baseNameOf path; dtboFile = path; }) overlayType); - description = '' + description = lib.mdDoc '' List of overlays to apply to base device-tree (.dtb) files. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/digitalbitbox.nix b/third_party/nixpkgs/nixos/modules/hardware/digitalbitbox.nix index 097448a74f..74e46bd34a 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/digitalbitbox.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/digitalbitbox.nix @@ -11,7 +11,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables udev rules for Digital Bitbox devices. ''; }; @@ -20,7 +20,7 @@ in type = types.package; default = pkgs.digitalbitbox; defaultText = literalExpression "pkgs.digitalbitbox"; - description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; + description = lib.mdDoc "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/hackrf.nix b/third_party/nixpkgs/nixos/modules/hardware/hackrf.nix index 7f03b765bb..38ef7fa6d3 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/hackrf.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/hackrf.nix @@ -9,7 +9,7 @@ in enable = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables hackrf udev rules and ensures 'plugdev' group exists. This is a prerequisite to using HackRF devices without being root, since HackRF USB descriptors will be owned by plugdev through udev. ''; diff --git a/third_party/nixpkgs/nixos/modules/hardware/i2c.nix b/third_party/nixpkgs/nixos/modules/hardware/i2c.nix index ff14b4b1c8..0b57cd1c28 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/i2c.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/i2c.nix @@ -17,7 +17,7 @@ in group = mkOption { type = types.str; default = "i2c"; - description = '' + description = lib.mdDoc '' Grant access to i2c devices (/dev/i2c-*) to users in this group. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix b/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix index bb69cfa0bf..5bf4022cdc 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/keyboard/zsa.nix @@ -9,7 +9,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + 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. diff --git a/third_party/nixpkgs/nixos/modules/hardware/ksm.nix b/third_party/nixpkgs/nixos/modules/hardware/ksm.nix index 829c3532c4..ba7a1c1216 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/ksm.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/ksm.nix @@ -15,9 +15,9 @@ in { sleep = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' How many milliseconds ksmd should sleep between scans. - Setting it to null uses the kernel's default time. + Setting it to `null` uses the kernel's default time. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/logitech.nix b/third_party/nixpkgs/nixos/modules/hardware/logitech.nix index 3ebe6aacf5..70ca59a7dd 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/logitech.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/logitech.nix @@ -24,7 +24,7 @@ in startWhenNeeded = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Only run the service when an actual supported device is plugged. ''; }; @@ -32,10 +32,9 @@ in devices = mkOption { type = types.listOf types.str; default = [ "0a07" "c222" "c225" "c227" "c251" ]; - description = '' + description = lib.mdDoc '' List of USB device ids supported by g15daemon. - - + You most likely do not need to change this. ''; }; @@ -47,7 +46,7 @@ in enableGraphical = mkOption { type = types.bool; default = false; - description = "Enable graphical support applications."; + description = lib.mdDoc "Enable graphical support applications."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/mcelog.nix b/third_party/nixpkgs/nixos/modules/hardware/mcelog.nix index 13ad238870..be8fc8cd19 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/mcelog.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/mcelog.nix @@ -10,7 +10,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the Machine Check Exception logger. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/network/ath-user-regd.nix b/third_party/nixpkgs/nixos/modules/hardware/network/ath-user-regd.nix index b5ade5ed50..a7f023d26c 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/network/ath-user-regd.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/network/ath-user-regd.nix @@ -14,7 +14,7 @@ in options.networking.wireless.athUserRegulatoryDomain = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If enabled, sets the ATH_USER_REGD kernel config switch to true to disable the enforcement of EEPROM regulatory restrictions for ath drivers. Requires at least Linux ${linuxKernelMinVersion}. diff --git a/third_party/nixpkgs/nixos/modules/hardware/network/b43.nix b/third_party/nixpkgs/nixos/modules/hardware/network/b43.nix index eb03bf223c..7f045f7b70 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/network/b43.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/network/b43.nix @@ -13,7 +13,7 @@ let kernelVersion = config.boot.kernelPackages.kernel.version; in networking.enableB43Firmware = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Turn on this option if you want firmware for the NICs supported by the b43 module. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix b/third_party/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix index 17b973474c..e1ec813412 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/network/intel-2200bg.nix @@ -9,7 +9,7 @@ networking.enableIntel2200BGFirmware = lib.mkOption { default = false; type = lib.types.bool; - description = '' + description = lib.mdDoc '' Turn on this option if you want firmware for the Intel PRO/Wireless 2200BG to be loaded automatically. This is required if you want to use this device. diff --git a/third_party/nixpkgs/nixos/modules/hardware/new-lg4ff.nix b/third_party/nixpkgs/nixos/modules/hardware/new-lg4ff.nix index 3c7f66f8d8..fac376eb7a 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/new-lg4ff.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/new-lg4ff.nix @@ -10,7 +10,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables improved Linux module drivers for Logitech driving wheels. This will replace the existing in-kernel hid-logitech modules. Works most notably on the Logitech G25, G27, G29 and Driving Force (GT). diff --git a/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix b/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix index baa0720311..fa9dd4d6d8 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/nitrokey.nix @@ -13,7 +13,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables udev rules for Nitrokey devices. By default grants access to users in the "nitrokey" group. You may want to install the nitrokey-app package, depending on your device and needs. diff --git a/third_party/nixpkgs/nixos/modules/hardware/onlykey/default.nix b/third_party/nixpkgs/nixos/modules/hardware/onlykey/default.nix index 07358c8a87..59e159dce4 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/onlykey/default.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/onlykey/default.nix @@ -12,7 +12,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable OnlyKey device (https://crp.to/p/) support. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/opengl.nix b/third_party/nixpkgs/nixos/modules/hardware/opengl.nix index 0d8aaf7345..dd30bd92b4 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/opengl.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/opengl.nix @@ -35,7 +35,7 @@ in hardware.opengl = { enable = mkOption { - description = '' + description = lib.mdDoc '' Whether to enable OpenGL drivers. This is needed to enable OpenGL support in X11 systems, as well as for Wayland compositors like sway and Weston. It is enabled by default @@ -51,7 +51,7 @@ in driSupport = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable accelerated OpenGL rendering through the Direct Rendering Interface (DRI). ''; @@ -60,11 +60,11 @@ in driSupport32Bit = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' On 64-bit systems, whether to support Direct Rendering for 32-bit applications (such as Wine). This is currently only - supported for the nvidia as well as - Mesa. + supported for the `nvidia` as well as + `Mesa`. ''; }; @@ -90,7 +90,7 @@ in type = types.listOf types.package; default = []; example = literalExpression "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau intel-ocl ]"; - description = '' + description = lib.mdDoc '' Additional packages to add to OpenGL drivers. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. ''; @@ -100,9 +100,9 @@ in type = types.listOf types.package; default = []; example = literalExpression "with pkgs.pkgsi686Linux; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]"; - description = '' + description = lib.mdDoc '' Additional packages to add to 32-bit OpenGL drivers on - 64-bit systems. Used when is + 64-bit systems. Used when {option}`driSupport32Bit` is set. This can be used to add OpenCL drivers, VA-API/VDPAU drivers etc. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix b/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix index bd9fc485e1..315a4a6824 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/openrazer.nix @@ -56,7 +56,7 @@ in verboseLogging = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable verbose logging. Logs debug messages. ''; }; @@ -64,7 +64,7 @@ in syncEffectsEnabled = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Set the sync effects flag to true so any assignment of effects will work across devices. ''; @@ -73,7 +73,7 @@ in devicesOffOnScreensaver = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Turn off the devices when the systems screensaver kicks in. ''; }; @@ -81,7 +81,7 @@ in mouseBatteryNotifier = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Mouse battery notifier. ''; }; @@ -89,7 +89,7 @@ in keyStatistics = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Collects number of keypresses per hour per key used to generate a heatmap. ''; @@ -98,7 +98,7 @@ in users = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Usernames to be added to the "openrazer" group, so that they can start and interact with the OpenRazer userspace daemon. ''; diff --git a/third_party/nixpkgs/nixos/modules/hardware/opentabletdriver.nix b/third_party/nixpkgs/nixos/modules/hardware/opentabletdriver.nix index caba934ebe..6c5ca3d949 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/opentabletdriver.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/opentabletdriver.nix @@ -12,7 +12,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable OpenTabletDriver udev rules, user service and blacklist kernel modules known to conflict with OpenTabletDriver. ''; @@ -21,7 +21,7 @@ in blacklistedKernelModules = mkOption { type = types.listOf types.str; default = [ "hid-uclogic" "wacom" ]; - description = '' + description = lib.mdDoc '' Blacklist of kernel modules known to conflict with OpenTabletDriver. ''; }; @@ -30,7 +30,7 @@ in type = types.package; default = pkgs.opentabletdriver; defaultText = literalExpression "pkgs.opentabletdriver"; - description = '' + description = lib.mdDoc '' OpenTabletDriver derivation to use. ''; }; @@ -39,7 +39,7 @@ in enable = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to start OpenTabletDriver daemon as a systemd user service. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/pcmcia.nix b/third_party/nixpkgs/nixos/modules/hardware/pcmcia.nix index aef35a28e5..f7a5565d77 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/pcmcia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/pcmcia.nix @@ -20,7 +20,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable this option to support PCMCIA card. ''; }; @@ -28,7 +28,7 @@ in firmware = mkOption { type = types.listOf types.path; default = []; - description = '' + description = lib.mdDoc '' List of firmware used to handle specific PCMCIA card. ''; }; @@ -36,7 +36,7 @@ in config = mkOption { default = null; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Path to the configuration file which maps the memory, IRQs and ports used by the PCMCIA hardware. ''; diff --git a/third_party/nixpkgs/nixos/modules/hardware/printers.nix b/third_party/nixpkgs/nixos/modules/hardware/printers.nix index ef07542950..64c29bb0a5 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/printers.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/printers.nix @@ -30,17 +30,17 @@ in { ensureDefaultPrinter = mkOption { type = types.nullOr printerName; default = null; - description = '' + description = lib.mdDoc '' Ensures the named printer is the default CUPS printer / printer queue. ''; }; ensurePrinters = mkOption { - description = '' + description = lib.mdDoc '' Will regularly ensure that the given CUPS printers are configured as declared here. If a printer's options are manually changed afterwards, they will be overwritten eventually. This option will never delete any printer, even if removed from this list. - You can check existing printers with lpstat -s - and remove printers with lpadmin -x <printer-name>. + You can check existing printers with {command}`lpstat -s` + and remove printers with {command}`lpadmin -x `. Printers not listed here can still be manually configured. ''; default = []; @@ -49,7 +49,7 @@ in { name = mkOption { type = printerName; example = "BrotherHL_Workroom"; - description = '' + description = lib.mdDoc '' Name of the printer / printer queue. May contain any printable characters except "/", "#", and space. ''; @@ -58,7 +58,7 @@ in { type = types.nullOr types.str; default = null; example = "Workroom"; - description = '' + description = lib.mdDoc '' Optional human-readable location. ''; }; @@ -66,7 +66,7 @@ in { type = types.nullOr types.str; default = null; example = "Brother HL-5140"; - description = '' + description = lib.mdDoc '' Optional human-readable description. ''; }; @@ -76,9 +76,9 @@ in { "ipp://printserver.local/printers/BrotherHL_Workroom" "usb://HP/DESKJET%20940C?serial=CN16E6C364BH" ''; - description = '' + description = lib.mdDoc '' How to reach the printer. - lpinfo -v shows a list of supported device URIs and schemes. + {command}`lpinfo -v` shows a list of supported device URIs and schemes. ''; }; model = mkOption { @@ -86,9 +86,9 @@ in { example = literalExpression '' "gutenprint.''${lib.versions.majorMinor (lib.getVersion pkgs.gutenprint)}://brother-hl-5140/expert" ''; - description = '' + description = lib.mdDoc '' Location of the ppd driver file for the printer. - lpinfo -m shows a list of supported models. + {command}`lpinfo -m` shows a list of supported models. ''; }; ppdOptions = mkOption { @@ -98,9 +98,9 @@ in { Duplex = "DuplexNoTumble"; }; default = {}; - description = '' + description = lib.mdDoc '' Sets PPD options for the printer. - lpoptions [-p printername] -l shows suported PPD options for the given printer. + {command}`lpoptions [-p printername] -l` shows suported PPD options for the given printer. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/rtl-sdr.nix b/third_party/nixpkgs/nixos/modules/hardware/rtl-sdr.nix index e85fc04e29..7f462005f1 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/rtl-sdr.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/rtl-sdr.nix @@ -8,7 +8,7 @@ in { enable = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables rtl-sdr udev rules, ensures 'plugdev' group exists, and blacklists DVB kernel modules. This is a prerequisite to using devices supported by rtl-sdr without being root, since rtl-sdr USB descriptors will be owned by plugdev through udev. ''; diff --git a/third_party/nixpkgs/nixos/modules/hardware/saleae-logic.nix b/third_party/nixpkgs/nixos/modules/hardware/saleae-logic.nix index a3810d640c..02d234cd3f 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/saleae-logic.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/saleae-logic.nix @@ -11,7 +11,7 @@ in type = lib.types.package; default = pkgs.saleae-logic-2; defaultText = lib.literalExpression "pkgs.saleae-logic-2"; - description = '' + description = lib.mdDoc '' Saleae Logic package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/sata.nix b/third_party/nixpkgs/nixos/modules/hardware/sata.nix index 81592997d6..bac24236f7 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/sata.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/sata.nix @@ -41,7 +41,7 @@ in deciSeconds = mkOption { example = 70; type = types.int; - description = '' + description = lib.mdDoc '' Set SCT Error Recovery Control timeout in deciseconds for use in RAID configurations. Values are as follows: @@ -53,17 +53,17 @@ in }; drives = mkOption { - description = "List of drives for which to configure the timeout."; + description = lib.mdDoc "List of drives for which to configure the timeout."; type = types.listOf (types.submodule { options = { name = mkOption { - description = "Drive name without the full path."; + description = lib.mdDoc "Drive name without the full path."; type = types.str; }; idBy = mkOption { - description = "The method to identify the drive."; + description = lib.mdDoc "The method to identify the drive."; type = types.enum [ "path" "wwn" ]; default = "path"; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/sensor/hddtemp.nix b/third_party/nixpkgs/nixos/modules/hardware/sensor/hddtemp.nix index df3f75e229..b69d012b4d 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/sensor/hddtemp.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/sensor/hddtemp.nix @@ -30,7 +30,7 @@ in options = { hardware.sensor.hddtemp = { enable = mkOption { - description = '' + description = lib.mdDoc '' Enable this option to support HDD/SSD temperature sensors. ''; type = types.bool; @@ -38,24 +38,24 @@ in }; drives = mkOption { - description = "List of drives to monitor. If you pass /dev/disk/by-path/* entries the symlinks will be resolved as hddtemp doesn't like names with colons."; + description = lib.mdDoc "List of drives to monitor. If you pass /dev/disk/by-path/* entries the symlinks will be resolved as hddtemp doesn't like names with colons."; type = types.listOf types.str; }; unit = mkOption { - description = "Celcius or Fahrenheit"; + description = lib.mdDoc "Celcius or Fahrenheit"; type = types.enum [ "C" "F" ]; default = "C"; }; dbEntries = mkOption { - description = "Additional DB entries"; + description = lib.mdDoc "Additional DB entries"; type = types.listOf types.str; default = [ ]; }; extraArgs = mkOption { - description = "Additional arguments passed to the daemon."; + description = lib.mdDoc "Additional arguments passed to the daemon."; type = types.listOf types.str; default = [ ]; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/sensor/iio.nix b/third_party/nixpkgs/nixos/modules/hardware/sensor/iio.nix index 8b3ba87a7d..6f7b1dc1f7 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/sensor/iio.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/sensor/iio.nix @@ -8,7 +8,7 @@ with lib; options = { hardware.sensor.iio = { enable = mkOption { - description = '' + description = lib.mdDoc '' Enable this option to support IIO sensors with iio-sensor-proxy. IIO sensors are used for orientation and ambient light diff --git a/third_party/nixpkgs/nixos/modules/hardware/steam-hardware.nix b/third_party/nixpkgs/nixos/modules/hardware/steam-hardware.nix index 6218c9ffbb..07edf68703 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/steam-hardware.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/steam-hardware.nix @@ -13,7 +13,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable udev rules for Steam hardware such as the Steam Controller, other supported controllers and the HTC Vive"; + description = lib.mdDoc "Enable udev rules for Steam hardware such as the Steam Controller, other supported controllers and the HTC Vive"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/system-76.nix b/third_party/nixpkgs/nixos/modules/hardware/system-76.nix index ca40ee0ebb..21cab4a378 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/system-76.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/system-76.nix @@ -63,7 +63,7 @@ in { default = cfg.enableAll; defaultText = literalExpression "config.${opt.enableAll}"; example = true; - description = "Whether to enable the system76 firmware daemon"; + description = lib.mdDoc "Whether to enable the system76 firmware daemon"; type = types.bool; }; @@ -71,7 +71,7 @@ in { default = cfg.enableAll; defaultText = literalExpression "config.${opt.enableAll}"; example = true; - description = "Whether to make the system76 out-of-tree kernel modules available"; + description = lib.mdDoc "Whether to make the system76 out-of-tree kernel modules available"; type = types.bool; }; @@ -79,7 +79,7 @@ in { default = cfg.enableAll; defaultText = literalExpression "config.${opt.enableAll}"; example = true; - description = "Whether to enable the system76 power daemon"; + description = lib.mdDoc "Whether to enable the system76 power daemon"; type = types.bool; }; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/tuxedo-keyboard.nix b/third_party/nixpkgs/nixos/modules/hardware/tuxedo-keyboard.nix index 97af7c61f3..7bcabde489 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/tuxedo-keyboard.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/tuxedo-keyboard.nix @@ -13,7 +13,7 @@ in To configure the driver, pass the options to the configuration. There are several parameters you can change. It's best to check at the source code description which options are supported. - You can find all the supported parameters at: + You can find all the supported parameters at: In order to use the custom lighting with the maximumg brightness and a color of 0xff0a0a one would put pass like this: diff --git a/third_party/nixpkgs/nixos/modules/hardware/ubertooth.nix b/third_party/nixpkgs/nixos/modules/hardware/ubertooth.nix index 637fddfb37..e76fa45fea 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/ubertooth.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/ubertooth.nix @@ -16,7 +16,7 @@ in { type = types.str; default = "ubertooth"; example = "wheel"; - description = "Group for Ubertooth's udev rules."; + description = lib.mdDoc "Group for Ubertooth's udev rules."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/usb-wwan.nix b/third_party/nixpkgs/nixos/modules/hardware/usb-wwan.nix index 679a6c6497..69673872cf 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/usb-wwan.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/usb-wwan.nix @@ -11,7 +11,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable this option to support USB WWAN adapters. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/bumblebee.nix b/third_party/nixpkgs/nixos/modules/hardware/video/bumblebee.nix index b6af4f8044..75f71d499e 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/bumblebee.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/bumblebee.nix @@ -29,7 +29,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable the bumblebee daemon to manage Optimus hybrid video cards. This should power off secondary GPU until its use is requested by running an application with optirun. @@ -40,13 +40,13 @@ in default = "wheel"; example = "video"; type = types.str; - description = "Group for bumblebee socket"; + description = lib.mdDoc "Group for bumblebee socket"; }; connectDisplay = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Set to true if you intend to connect your discrete card to a monitor. This option will set up your Nvidia card for EDID discovery and to turn on the monitor signal. @@ -58,7 +58,7 @@ in driver = mkOption { default = "nvidia"; type = types.enum [ "nvidia" "nouveau" ]; - description = '' + description = lib.mdDoc '' Set driver used by bumblebeed. Supported are nouveau and nvidia. ''; }; @@ -66,7 +66,7 @@ in pmMethod = mkOption { default = "auto"; type = types.enum [ "auto" "bbswitch" "switcheroo" "none" ]; - description = '' + description = lib.mdDoc '' Set preferred power management method for unused card. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix index 5fcd165186..8c6c97f9b2 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix @@ -40,7 +40,7 @@ in hardware.nvidia.powerManagement.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Experimental power management through systemd. For more information, see the NVIDIA docs, on Chapter 21. Configuring Power Management Support. ''; @@ -49,7 +49,7 @@ in hardware.nvidia.powerManagement.finegrained = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Experimental power management of PRIME offload. For more information, see the NVIDIA docs, chapter 22. PCI-Express runtime power management. ''; @@ -58,11 +58,11 @@ in hardware.nvidia.modesetting.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable kernel modesetting when using the NVIDIA proprietary driver. Enabling this fixes screen tearing when using Optimus via PRIME (see - . This is not enabled + {option}`hardware.nvidia.prime.sync.enable`. This is not enabled by default because it is not officially supported by NVIDIA and would not work with SLI. ''; @@ -72,7 +72,7 @@ in type = busIDType; default = ""; example = "PCI:1:0:0"; - description = '' + description = lib.mdDoc '' Bus ID of the NVIDIA GPU. You can find it using lspci; for example if lspci shows the NVIDIA GPU at "01:00.0", set this option to "PCI:1:0:0". ''; @@ -82,7 +82,7 @@ in type = busIDType; default = ""; example = "PCI:0:2:0"; - description = '' + description = lib.mdDoc '' Bus ID of the Intel GPU. You can find it using lspci; for example if lspci shows the Intel GPU at "00:02.0", set this option to "PCI:0:2:0". ''; @@ -92,7 +92,7 @@ in type = busIDType; default = ""; example = "PCI:4:0:0"; - description = '' + description = lib.mdDoc '' Bus ID of the AMD APU. You can find it using lspci; for example if lspci shows the AMD APU at "04:00.0", set this option to "PCI:4:0:0". ''; @@ -101,26 +101,26 @@ in hardware.nvidia.prime.sync.enable = mkOption { type = types.bool; default = false; - description = '' + 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. Note that this option only has any effect if the "nvidia" driver is specified - in , and it should preferably + 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 ( and - ). + specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId`). If you enable this, you may want to also enable kernel modesetting for the - NVIDIA driver () in order + 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 + for which the {option}`services.xserver.displayManager.setupCommands` option is supported is used. ''; }; @@ -128,7 +128,7 @@ in hardware.nvidia.prime.sync.allowExternalGpu = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Configure X to allow external NVIDIA GPUs when using optimus. ''; }; @@ -136,19 +136,19 @@ in hardware.nvidia.prime.offload.enable = mkOption { type = types.bool; default = false; - description = '' + 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 ( and - ). + specified ({option}`hardware.nvidia.prime.nvidiaBusId` and + {option}`hardware.nvidia.prime.intelBusId`). ''; }; hardware.nvidia.nvidiaSettings = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to add nvidia-settings, NVIDIA's GUI configuration tool, to systemPackages. ''; @@ -157,7 +157,7 @@ in hardware.nvidia.nvidiaPersistenced = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Update for NVIDA GPU headless mode, i.e. nvidia-persistenced. It ensures all GPUs stay awake even during headless mode. ''; @@ -166,7 +166,7 @@ in hardware.nvidia.forceFullCompositionPipeline = lib.mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to force-enable the full composition pipeline. This sometimes fixes screen tearing issues. This has been reported to reduce the performance of some OpenGL applications and may produce issues in WebGL. @@ -178,7 +178,7 @@ in type = types.package; default = config.boot.kernelPackages.nvidiaPackages.stable; defaultText = literalExpression "config.boot.kernelPackages.nvidiaPackages.stable"; - description = '' + description = lib.mdDoc '' The NVIDIA X11 derivation to use. ''; example = literalExpression "config.boot.kernelPackages.nvidiaPackages.legacy_340"; @@ -187,7 +187,7 @@ in hardware.nvidia.open = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use the open source kernel module ''; }; @@ -392,10 +392,9 @@ in services.udev.extraRules = '' # Create /dev/nvidia-uvm when the nvidia-uvm module is loaded. - KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c 195 255'" - KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c 195 254'" - KERNEL=="card*", SUBSYSTEM=="drm", DRIVERS=="nvidia", PROGRAM="${pkgs.gnugrep}/bin/grep 'Device Minor:' /proc/driver/nvidia/gpus/%b/information", \ - RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia%c{3} c 195 %c{3}" + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidiactl c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 255'" + KERNEL=="nvidia", RUN+="${pkgs.runtimeShell} -c 'for i in $$(cat /proc/driver/nvidia/gpus/*/information | grep Minor | cut -d \ -f 4); do mknod -m 666 /dev/nvidia$${i} c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) $${i}; done'" + KERNEL=="nvidia_modeset", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-modeset c $$(grep nvidia-frontend /proc/devices | cut -d \ -f 1) 254'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 0'" KERNEL=="nvidia_uvm", RUN+="${pkgs.runtimeShell} -c 'mknod -m 666 /dev/nvidia-uvm-tools c $$(grep nvidia-uvm /proc/devices | cut -d \ -f 1) 1'" '' + optionalString cfg.powerManagement.finegrained ( diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/uvcvideo/default.nix b/third_party/nixpkgs/nixos/modules/hardware/video/uvcvideo/default.nix index 338062cf69..6cfb8cc6ad 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/uvcvideo/default.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/uvcvideo/default.nix @@ -22,27 +22,27 @@ in enable = mkOption { type = types.bool; default = false; - description = '' - Whether to enable uvcvideo dynamic controls. + description = lib.mdDoc '' + Whether to enable {command}`uvcvideo` dynamic controls. - Note that enabling this brings the uvcdynctrl tool + Note that enabling this brings the {command}`uvcdynctrl` tool into your environment and register all dynamic controls from - specified packages to the uvcvideo driver. + specified {command}`packages` to the {command}`uvcvideo` driver. ''; }; packages = mkOption { type = types.listOf types.path; example = literalExpression "[ pkgs.tiscamera ]"; - description = '' - List of packages containing uvcvideo dynamic controls + description = lib.mdDoc '' + List of packages containing {command}`uvcvideo` dynamic controls rules. All files found in - pkg/share/uvcdynctrl/data + {file}`«pkg»/share/uvcdynctrl/data` will be included. - Note that these will serve as input to the libwebcam - package which through its own udev rule will register - the dynamic controls from specified packages to the uvcvideo + Note that these will serve as input to the {command}`libwebcam` + package which through its own {command}`udev` rule will register + the dynamic controls from specified packages to the {command}`uvcvideo` driver. ''; apply = map getBin; diff --git a/third_party/nixpkgs/nixos/modules/hardware/video/webcam/facetimehd.nix b/third_party/nixpkgs/nixos/modules/hardware/video/webcam/facetimehd.nix index c48eac5e9c..8940674ce5 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/video/webcam/facetimehd.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/video/webcam/facetimehd.nix @@ -18,10 +18,10 @@ in default = false; example = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to include sensor calibration files for facetimehd. This makes colors look much better but is experimental, see - + for details. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/hardware/xpadneo.nix b/third_party/nixpkgs/nixos/modules/hardware/xpadneo.nix index dbc4ba2125..092f36729b 100644 --- a/third_party/nixpkgs/nixos/modules/hardware/xpadneo.nix +++ b/third_party/nixpkgs/nixos/modules/hardware/xpadneo.nix @@ -15,7 +15,8 @@ in # https://wiki.archlinux.org/index.php/Gamepad#Connect_Xbox_Wireless_Controller_with_Bluetooth extraModprobeConfig = mkIf - config.hardware.bluetooth.enable + (config.hardware.bluetooth.enable && + (lib.versionOlder config.boot.kernelPackages.kernel.version "5.12")) "options bluetooth disable_ertm=1"; extraModulePackages = with config.boot.kernelPackages; [ xpadneo ]; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix index 7738581b89..043ec3d55c 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx.nix @@ -22,9 +22,9 @@ in let enginesDrv = filterAttrs (const isDerivation) pkgs.fcitx-engines; engines = concatStringsSep ", " - (map (name: "${name}") (attrNames enginesDrv)); + (map (name: "`${name}`") (attrNames enginesDrv)); in - "Enabled Fcitx engines. Available engines are: ${engines}."; + lib.mdDoc "Enabled Fcitx engines. Available engines are: ${engines}."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix index 9ef0285f7b..7cdef9ae93 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/fcitx5.nix @@ -15,7 +15,7 @@ in { type = with types; listOf package; default = []; example = literalExpression "with pkgs; [ fcitx5-rime ]"; - description = '' + description = lib.mdDoc '' Enabled Fcitx5 addons. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix index 907f6451fc..520db128ac 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/ibus.nix @@ -43,15 +43,15 @@ in let enginesDrv = filterAttrs (const isDerivation) pkgs.ibus-engines; engines = concatStringsSep ", " - (map (name: "${name}") (attrNames enginesDrv)); + (map (name: "`${name}`") (attrNames enginesDrv)); in - "Enabled IBus engines. Available engines are: ${engines}."; + lib.mdDoc "Enabled IBus engines. Available engines are: ${engines}."; }; panel = mkOption { type = with types; nullOr path; default = null; example = literalExpression ''"''${pkgs.plasma5Packages.plasma-desktop}/lib/libexec/kimpanel-ibus-panel"''; - description = "Replace the IBus panel with another panel."; + description = lib.mdDoc "Replace the IBus panel with another panel."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix index 729a665614..29224a6bf7 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/kime.nix @@ -27,8 +27,8 @@ in }; } ''; - description = '' - kime configuration. Refer to for details on supported values. + description = lib.mdDoc '' + kime configuration. Refer to for details on supported values. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/i18n/input-method/uim.nix b/third_party/nixpkgs/nixos/modules/i18n/input-method/uim.nix index 459294657e..9491ab2640 100644 --- a/third_party/nixpkgs/nixos/modules/i18n/input-method/uim.nix +++ b/third_party/nixpkgs/nixos/modules/i18n/input-method/uim.nix @@ -13,7 +13,7 @@ in type = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ]; default = "gtk"; example = "gtk-systray"; - description = '' + description = lib.mdDoc '' selected UIM toolbar. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix index d1ccc6c207..cefe252e2e 100644 --- a/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/third_party/nixpkgs/nixos/modules/installer/cd-dvd/iso-image.nix @@ -476,9 +476,9 @@ in isoImage.squashfsCompression = mkOption { default = with pkgs.stdenv.targetPlatform; "xz -Xdict-size 100% " - + lib.optionalString (isx86_32 || isx86_64) "-Xbcj x86" + + lib.optionalString isx86 "-Xbcj x86" # Untested but should also reduce size for these platforms - + lib.optionalString (isAarch32 || isAarch64) "-Xbcj arm" + + lib.optionalString isAarch "-Xbcj arm" + lib.optionalString (isPower && is32bit && isBigEndian) "-Xbcj powerpc" + lib.optionalString (isSparc) "-Xbcj sparc"; description = '' @@ -618,7 +618,7 @@ in This will be directly appended (without whitespace) to the NixOS version string, like for example if it is set to XXX: - NixOS 99.99-pre666XXX + NixOS 99.99-pre666XXX ''; }; diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl index 0e6320e469..212b2b3cd2 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl @@ -85,7 +85,7 @@ sub debug { # nixpkgs.system -my ($status, @systemLines) = runCommand("nix-instantiate --impure --eval --expr builtins.currentSystem"); +my ($status, @systemLines) = runCommand("@nixInstantiate@ --impure --eval --expr builtins.currentSystem"); if ($status != 0 || join("", @systemLines) =~ /error/) { die "Failed to retrieve current system type from nix.\n"; } diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix index 04be272742..e46a2df8fa 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/tools.nix @@ -34,6 +34,7 @@ let name = "nixos-generate-config"; src = ./nixos-generate-config.pl; perl = "${pkgs.perl.withPackages (p: [ p.FileSlurp ])}/bin/perl"; + nixInstantiate = "${pkgs.nix}/bin/nix-instantiate"; detectvirt = "${config.systemd.package}/bin/systemd-detect-virt"; btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; inherit (config.system.nixos-generate-config) configuration desktopConfiguration; @@ -74,15 +75,15 @@ in configuration = mkOption { internal = true; type = types.str; - description = '' - The NixOS module that nixos-generate-config - saves to /etc/nixos/configuration.nix. + description = lib.mdDoc '' + The NixOS module that `nixos-generate-config` + saves to `/etc/nixos/configuration.nix`. This is an internal option. No backward compatibility is guaranteed. Use at your own risk! Note that this string gets spliced into a Perl script. The perl - variable $bootLoaderConfig can be used to + variable `$bootLoaderConfig` can be used to splice in the boot loader configuration. ''; }; @@ -91,15 +92,15 @@ in internal = true; type = types.listOf types.lines; default = []; - description = '' - Text to preseed the desktop configuration that nixos-generate-config - saves to /etc/nixos/configuration.nix. + description = lib.mdDoc '' + Text to preseed the desktop configuration that `nixos-generate-config` + saves to `/etc/nixos/configuration.nix`. This is an internal option. No backward compatibility is guaranteed. Use at your own risk! Note that this string gets spliced into a Perl script. The perl - variable $bootLoaderConfig can be used to + variable `$bootLoaderConfig` can be used to splice in the boot loader configuration. ''; }; @@ -109,7 +110,7 @@ in internal = true; type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Disable nixos-rebuild, nixos-generate-config, nixos-installer and other NixOS tools. This is useful to shrink embedded, read-only systems which are not expected to be rebuild or @@ -174,7 +175,7 @@ in # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { + # users.users.alice = { # isNormalUser = true; # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. # packages = with pkgs; [ diff --git a/third_party/nixpkgs/nixos/modules/misc/crashdump.nix b/third_party/nixpkgs/nixos/modules/misc/crashdump.nix index b0f75d9caa..4ae18984ee 100644 --- a/third_party/nixpkgs/nixos/modules/misc/crashdump.nix +++ b/third_party/nixpkgs/nixos/modules/misc/crashdump.nix @@ -16,7 +16,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, NixOS will set up a kernel that will boot on crash, and leave the user in systemd rescue to be able to save the crashed kernel dump at @@ -27,7 +27,7 @@ in reservedMemory = mkOption { default = "128M"; type = types.str; - description = '' + description = lib.mdDoc '' The amount of memory reserved for the crashdump kernel. If you choose a too high value, dmesg will mention "crashkernel reservation failed". @@ -36,7 +36,7 @@ in kernelParams = mkOption { type = types.listOf types.str; default = [ "1" "boot.shell_on_fail" ]; - description = '' + description = lib.mdDoc '' Parameters that will be passed to the kernel kexec-ed on crash. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation.nix b/third_party/nixpkgs/nixos/modules/misc/documentation.nix index b031ff2f2b..09f6d8443b 100644 --- a/third_party/nixpkgs/nixos/modules/misc/documentation.nix +++ b/third_party/nixpkgs/nixos/modules/misc/documentation.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, utils, modules, baseModules, extraModules, modulesPath, ... }: +{ config, options, lib, pkgs, utils, modules, baseModules, extraModules, modulesPath, specialArgs, ... }: with lib; @@ -7,9 +7,6 @@ let cfg = config.documentation; allOpts = options; - /* Modules for which to show options even when not imported. */ - extraDocModules = [ ../virtualisation/qemu-vm.nix ]; - canCacheDocs = m: let f = import m; @@ -23,7 +20,7 @@ let docModules = let - p = partition canCacheDocs (baseModules ++ extraDocModules); + p = partition canCacheDocs (baseModules ++ cfg.nixos.extraModules); in { lazy = p.right; @@ -41,7 +38,7 @@ let modules = [ { _module.check = false; } ] ++ docModules.eager; - specialArgs = { + specialArgs = specialArgs // { pkgs = scrubDerivations "pkgs" pkgs; # allow access to arbitrary options for eager modules, eg for getting # option types from lazy modules @@ -145,6 +142,12 @@ in { imports = [ + ./man-db.nix + ./mandoc.nix + ./assertions.nix + ./meta.nix + ../config/system-path.nix + ../system/etc/etc.nix (mkRenamedOptionModule [ "programs" "info" "enable" ] [ "documentation" "info" "enable" ]) (mkRenamedOptionModule [ "programs" "man" "enable" ] [ "documentation" "man" "enable" ]) (mkRenamedOptionModule [ "services" "nixosManual" "enable" ] [ "documentation" "nixos" "enable" ]) @@ -236,6 +239,14 @@ in ''; }; + nixos.extraModules = mkOption { + type = types.listOf types.raw; + default = []; + description = '' + Modules for which to show options even when not imported. + ''; + }; + nixos.options.splitBuild = mkOption { type = types.bool; default = true; @@ -327,10 +338,6 @@ in environment.systemPackages = [] ++ optional cfg.man.enable manual.manpages ++ optionals cfg.doc.enable [ manual.manualHTML nixos-help ]; - - services.getty.helpLine = mkIf cfg.doc.enable ( - "\nRun 'nixos-help' for the NixOS manual." - ); }) ]); diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation/test-dummy.chapter.xml b/third_party/nixpkgs/nixos/modules/misc/documentation/test-dummy.chapter.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/third_party/nixpkgs/nixos/modules/misc/documentation/test.nix b/third_party/nixpkgs/nixos/modules/misc/documentation/test.nix new file mode 100644 index 0000000000..1eaa63b1fb --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/misc/documentation/test.nix @@ -0,0 +1,49 @@ +{ nixosLib, pkgsModule, runCommand }: + +let + sys = nixosLib.evalModules rec { + modules = [ + pkgsModule + ../documentation.nix + ../version.nix + + ({ lib, someArg, ... }: { + # Make sure imports from specialArgs are respected + imports = [ someArg.myModule ]; + + # TODO test this + meta.doc = ./test-dummy.chapter.xml; + }) + + { + _module.args = { + baseModules = [ + ../documentation.nix + ../version.nix + ]; + extraModules = [ ]; + inherit modules; + }; + documentation.nixos.includeAllModules = true; + } + ]; + specialArgs.someArg.myModule = { lib, ... }: { + options.foobar = lib.mkOption { + type = lib.types.str; + description = "The foobar option was added via specialArgs"; + default = "qux"; + }; + }; + }; + +in +runCommand "documentation-check" +{ + inherit (sys.config.system.build.manual) optionsJSON; +} '' + json="$optionsJSON/share/doc/nixos/options.json" + echo checking $json + + grep 'The foobar option was added via specialArgs' <"$json" >/dev/null + touch $out +'' diff --git a/third_party/nixpkgs/nixos/modules/misc/lib.nix b/third_party/nixpkgs/nixos/modules/misc/lib.nix index 121f396701..f97e9209e2 100644 --- a/third_party/nixpkgs/nixos/modules/misc/lib.nix +++ b/third_party/nixpkgs/nixos/modules/misc/lib.nix @@ -7,7 +7,7 @@ type = lib.types.attrsOf lib.types.attrs; - description = '' + description = lib.mdDoc '' This option allows modules to define helper functions, constants, etc. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/misc/locate.nix b/third_party/nixpkgs/nixos/modules/misc/locate.nix index 50495eebe4..bba35b752c 100644 --- a/third_party/nixpkgs/nixos/modules/misc/locate.nix +++ b/third_party/nixpkgs/nixos/modules/misc/locate.nix @@ -19,9 +19,9 @@ in enable = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, NixOS will periodically update the database of - files used by the locate command. + files used by the {command}`locate` command. ''; }; @@ -30,7 +30,7 @@ in default = pkgs.findutils.locate; defaultText = literalExpression "pkgs.findutils"; example = literalExpression "pkgs.mlocate"; - description = '' + description = lib.mdDoc '' The locate implementation to use ''; }; @@ -55,15 +55,15 @@ in extraFlags = mkOption { type = listOf str; default = [ ]; - description = '' - Extra flags to pass to updatedb. + description = lib.mdDoc '' + Extra flags to pass to {command}`updatedb`. ''; }; output = mkOption { type = path; default = "/var/cache/locatedb"; - description = '' + description = lib.mdDoc '' The database file to build. ''; }; @@ -71,9 +71,9 @@ in localuser = mkOption { type = nullOr str; default = "nobody"; - description = '' + description = lib.mdDoc '' The user to search non-network directories as, using - su. + {command}`su`. ''; }; @@ -159,7 +159,7 @@ in "vboxsf" "vperfctrfs" ]; - description = '' + description = lib.mdDoc '' Which filesystem types to exclude from indexing ''; }; @@ -176,7 +176,7 @@ in "/nix/store" "/nix/var/log/nix" ]; - description = '' + description = lib.mdDoc '' Which paths to exclude from indexing ''; }; @@ -188,7 +188,7 @@ in [ ".bzr" ".cache" ".git" ".hg" ".svn" ], if supported by the locate implementation (i.e. mlocate or plocate). ''; - description = '' + description = lib.mdDoc '' Directory components which should exclude paths containing them from indexing ''; }; @@ -196,7 +196,7 @@ in pruneBindMounts = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' Whether not to index bind mounts ''; }; diff --git a/third_party/nixpkgs/nixos/modules/misc/man-db.nix b/third_party/nixpkgs/nixos/modules/misc/man-db.nix index 7aeb02d883..d267ad1256 100644 --- a/third_party/nixpkgs/nixos/modules/misc/man-db.nix +++ b/third_party/nixpkgs/nixos/modules/misc/man-db.nix @@ -36,8 +36,8 @@ in type = lib.types.package; default = pkgs.man-db; defaultText = lib.literalExpression "pkgs.man-db"; - description = '' - The man-db derivation to use. Useful to override + description = lib.mdDoc '' + The `man-db` derivation to use. Useful to override configuration options used for the package. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/misc/mandoc.nix b/third_party/nixpkgs/nixos/modules/misc/mandoc.nix index 838f208765..d67c42bff6 100644 --- a/third_party/nixpkgs/nixos/modules/misc/mandoc.nix +++ b/third_party/nixpkgs/nixos/modules/misc/mandoc.nix @@ -16,9 +16,9 @@ in { type = with lib.types; listOf str; default = [ "share/man" ]; example = lib.literalExpression "[ \"share/man\" \"share/man/fr\" ]"; - description = '' + description = lib.mdDoc '' Change the manpath, i. e. the directories where - man1 + {manpage}`man(1)` looks for section-specific directories of man pages. You only need to change this setting if you want extra man pages (e. g. in non-english languages). All values must be strings that @@ -31,8 +31,8 @@ in { type = lib.types.package; default = pkgs.mandoc; defaultText = lib.literalExpression "pkgs.mandoc"; - description = '' - The mandoc derivation to use. Useful to override + description = lib.mdDoc '' + The `mandoc` derivation to use. Useful to override configuration options used for the package. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix index ad017aff81..bb21e31ec9 100644 --- a/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix +++ b/third_party/nixpkgs/nixos/modules/misc/nixpkgs.nix @@ -119,11 +119,11 @@ in example = literalExpression "import {}"; description = '' If set, the pkgs argument to all NixOS modules is the value of - this option, extended with nixpkgs.overlays, if - that is also set. Either nixpkgs.crossSystem or - nixpkgs.localSystem will be used in an assertion + this option, extended with nixpkgs.overlays, if + that is also set. Either nixpkgs.crossSystem or + nixpkgs.localSystem will be used in an assertion to check that the NixOS and Nixpkgs architectures match. Any - other options in nixpkgs.*, notably config, + other options in nixpkgs.*, notably config, will be ignored. If unset, the pkgs argument to all NixOS modules is determined @@ -132,18 +132,18 @@ in The default value imports the Nixpkgs source files relative to the location of this NixOS module, because NixOS and Nixpkgs are distributed together for consistency, - so the nixos in the default value is in fact a - relative path. The config, overlays, - localSystem, and crossSystem come + so the nixos in the default value is in fact a + relative path. The config, overlays, + localSystem, and crossSystem come from this option's siblings. This option can be used by applications like NixOps to increase the performance of evaluation, or to create packages that depend on a container that should be built with the exact same evaluation of Nixpkgs, for example. Applications like this should set - their default value using lib.mkDefault, so + their default value using lib.mkDefault, so user-provided configuration can override it without using - lib. + lib. Note that using a distinct version of Nixpkgs with NixOS may be an unexpected source of problems. Use this option with care. @@ -162,7 +162,7 @@ in details, see the Nixpkgs documentation.) It allows you to set package configuration options. - Ignored when nixpkgs.pkgs is set. + Ignored when nixpkgs.pkgs is set. ''; }; @@ -188,9 +188,9 @@ in The first argument should be used for finding dependencies, and the second should be used for overriding recipes. - If nixpkgs.pkgs is set, overlays specified here + If nixpkgs.pkgs is set, overlays specified here will be applied after the overlays that were already present - in nixpkgs.pkgs. + in nixpkgs.pkgs. ''; }; @@ -205,9 +205,9 @@ in description = '' Specifies the platform where the NixOS configuration will run. - To cross-compile, set also nixpkgs.buildPlatform. + To cross-compile, set also nixpkgs.buildPlatform. - Ignored when nixpkgs.pkgs is set. + Ignored when nixpkgs.pkgs is set. ''; }; @@ -230,7 +230,7 @@ in or if you're building machines, you can set this to match your development system and/or build farm. - Ignored when nixpkgs.pkgs is set. + Ignored when nixpkgs.pkgs is set. ''; }; @@ -244,8 +244,16 @@ in defaultText = literalExpression ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' + Systems with a recently generated hardware-configuration.nix + do not need to specify this option, unless cross-compiling, in which case + you should set only . + + If this is somehow not feasible, you may fall back to removing the + line from the generated config and + use the old options. + Specifies the platform on which NixOS should be built. When - nixpkgs.crossSystem is unset, it also specifies + nixpkgs.crossSystem is unset, it also specifies the platform for which NixOS should be built. If this option is unset, it defaults to the platform type of the machine where evaluation happens. Specifying this @@ -253,7 +261,7 @@ in deployment, or when building virtual machines. See its description in the Nixpkgs manual for more details. - Ignored when nixpkgs.pkgs or hostPlatform is set. + Ignored when nixpkgs.pkgs or hostPlatform is set. ''; }; @@ -265,24 +273,50 @@ in default = null; example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; description = '' + Systems with a recently generated hardware-configuration.nix + may instead specify only , + or fall back to removing the line from the generated config. + Specifies the platform for which NixOS should be built. Specify this only if it is different from - nixpkgs.localSystem, the platform + nixpkgs.localSystem, the platform on which NixOS should be built. In other words, specify this to cross-compile NixOS. Otherwise it should be set as null, the default. See its description in the Nixpkgs manual for more details. - Ignored when nixpkgs.pkgs or hostPlatform is set. + Ignored when nixpkgs.pkgs or hostPlatform is set. ''; }; system = mkOption { type = types.str; example = "i686-linux"; + default = + if opt.hostPlatform.isDefined + then + throw '' + Neither ${opt.system} nor any other option in nixpkgs.* is meant + to be read by modules and configurations. + Use pkgs.stdenv.hostPlatform instead. + '' + else + throw '' + Neither ${opt.hostPlatform} nor or the legacy option ${opt.system} has been set. + You can set ${opt.hostPlatform} in hardware-configuration.nix by re-running + a recent version of nixos-generate-config. + The option ${opt.system} is still fully supported for NixOS 22.05 interoperability, + but will be deprecated in the future, so we recommend to set ${opt.hostPlatform}. + ''; + defaultText = lib.literalMD '' + Traditionally `builtins.currentSystem`, but unset when invoking NixOS through `lib.nixosSystem`. + ''; description = '' + This option does not need to be specified for NixOS configurations + with a recently generated hardware-configuration.nix. + Specifies the Nix platform type on which NixOS should be built. - It is better to specify nixpkgs.localSystem instead. + It is better to specify nixpkgs.localSystem instead. { nixpkgs.system = ..; @@ -294,9 +328,9 @@ in nixpkgs.localSystem.system = ..; } - See nixpkgs.localSystem for more information. + See nixpkgs.localSystem for more information. - Ignored when nixpkgs.pkgs, nixpkgs.localSystem or nixpkgs.hostPlatform is set. + Ignored when nixpkgs.pkgs, nixpkgs.localSystem or nixpkgs.hostPlatform is set. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/misc/version.nix b/third_party/nixpkgs/nixos/modules/misc/version.nix index da458a5748..b3cdaf5568 100644 --- a/third_party/nixpkgs/nixos/modules/misc/version.nix +++ b/third_party/nixpkgs/nixos/modules/misc/version.nix @@ -38,53 +38,60 @@ let in { imports = [ + ./label.nix (mkRenamedOptionModule [ "system" "nixosVersion" ] [ "system" "nixos" "version" ]) (mkRenamedOptionModule [ "system" "nixosVersionSuffix" ] [ "system" "nixos" "versionSuffix" ]) (mkRenamedOptionModule [ "system" "nixosRevision" ] [ "system" "nixos" "revision" ]) (mkRenamedOptionModule [ "system" "nixosLabel" ] [ "system" "nixos" "label" ]) ]; + options.boot.initrd.osRelease = mkOption { + internal = true; + readOnly = true; + default = initrdRelease; + }; + options.system = { nixos.version = mkOption { internal = true; type = types.str; - description = "The full NixOS version (e.g. 16.03.1160.f2d4ee1)."; + description = lib.mdDoc "The full NixOS version (e.g. `16.03.1160.f2d4ee1`)."; }; nixos.release = mkOption { readOnly = true; type = types.str; default = trivial.release; - description = "The NixOS release (e.g. 16.03)."; + description = lib.mdDoc "The NixOS release (e.g. `16.03`)."; }; nixos.versionSuffix = mkOption { internal = true; type = types.str; default = trivial.versionSuffix; - description = "The NixOS version suffix (e.g. 1160.f2d4ee1)."; + description = lib.mdDoc "The NixOS version suffix (e.g. `1160.f2d4ee1`)."; }; nixos.revision = mkOption { internal = true; type = types.nullOr types.str; default = trivial.revisionWithDefault null; - description = "The Git revision from which this NixOS configuration was built."; + description = lib.mdDoc "The Git revision from which this NixOS configuration was built."; }; nixos.codeName = mkOption { readOnly = true; type = types.str; default = trivial.codeName; - description = "The NixOS release code name (e.g. Emu)."; + description = lib.mdDoc "The NixOS release code name (e.g. `Emu`)."; }; stateVersion = mkOption { type = types.str; default = cfg.release; defaultText = literalExpression "config.${opt.release}"; - description = '' + description = lib.mdDoc '' Every once in a while, a new NixOS release may change configuration defaults in a way incompatible with stateful data. For instance, if the default version of PostgreSQL @@ -108,13 +115,13 @@ in internal = true; type = types.str; default = "https://nixos.org/channels/nixos-unstable"; - description = "Default NixOS channel to which the root user is subscribed."; + description = lib.mdDoc "Default NixOS channel to which the root user is subscribed."; }; configurationRevision = mkOption { type = types.nullOr types.str; default = null; - description = "The Git revision of the top-level flake from which this configuration was built."; + description = lib.mdDoc "The Git revision of the top-level flake from which this configuration was built."; }; }; @@ -142,11 +149,6 @@ in "os-release".text = attrsToText osReleaseContents; }; - boot.initrd.systemd.contents = { - "/etc/os-release".source = initrdRelease; - "/etc/initrd-release".source = initrdRelease; - }; - # We have to use `warnings` because when warning in the default of the option # the warning would also be shown when building the manual since the manual # has to evaluate the default. diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 82c0b5d74d..6e979561fa 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -357,7 +357,7 @@ ./services/databases/dgraph.nix ./services/databases/firebird.nix ./services/databases/foundationdb.nix - ./services/databases/hbase.nix + ./services/databases/hbase-standalone.nix ./services/databases/influxdb.nix ./services/databases/influxdb2.nix ./services/databases/memcached.nix @@ -447,6 +447,7 @@ ./services/hardware/interception-tools.nix ./services/hardware/irqbalance.nix ./services/hardware/joycond.nix + ./services/hardware/kanata.nix ./services/hardware/lcd.nix ./services/hardware/lirc.nix ./services/hardware/nvidia-optimus.nix @@ -474,7 +475,6 @@ ./services/hardware/thermald.nix ./services/hardware/undervolt.nix ./services/hardware/vdr.nix - ./services/hardware/xow.nix ./services/home-automation/home-assistant.nix ./services/home-automation/zigbee2mqtt.nix ./services/logging/SystemdJournal2Gelf.nix @@ -783,6 +783,7 @@ ./services/networking/expressvpn.nix ./services/networking/fakeroute.nix ./services/networking/ferm.nix + ./services/networking/firefox-syncserver.nix ./services/networking/fireqos.nix ./services/networking/firewall.nix ./services/networking/flannel.nix @@ -1088,6 +1089,7 @@ ./services/web-apps/nifi.nix ./services/web-apps/node-red.nix ./services/web-apps/phylactery.nix + ./services/web-apps/onlyoffice.nix ./services/web-apps/pict-rs.nix ./services/web-apps/peertube.nix ./services/web-apps/plantuml-server.nix @@ -1106,7 +1108,6 @@ ./services/web-apps/shiori.nix ./services/web-apps/snipe-it.nix ./services/web-apps/vikunja.nix - ./services/web-apps/virtlyst.nix ./services/web-apps/wiki-js.nix ./services/web-apps/whitebophir.nix ./services/web-apps/wordpress.nix @@ -1287,4 +1288,5 @@ ./virtualisation/waydroid.nix ./virtualisation/xen-dom0.nix ./virtualisation/xe-guest-utilities.nix + { documentation.nixos.extraModules = [ ./virtualisation/qemu-vm.nix ]; } ] diff --git a/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix b/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix index 8347453d40..5fa64a6c52 100644 --- a/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix +++ b/third_party/nixpkgs/nixos/modules/profiles/all-hardware.nix @@ -57,7 +57,7 @@ in # Hyper-V support. "hv_storvsc" - ] ++ lib.optionals (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ + ] ++ lib.optionals pkgs.stdenv.hostPlatform.isAarch [ # Most of the following falls into two categories: # - early KMS / early display # - early storage (e.g. USB) support @@ -109,6 +109,9 @@ in # USB drivers "xhci-pci-renesas" + # Reset controllers + "reset-raspberrypi" # Triggers USB chip firmware load. + # Misc "weak" dependencies "analogix-dp" "analogix-anx6345" # For DP or eDP (e.g. integrated display) diff --git a/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix b/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix index 657116c267..20bd846d51 100644 --- a/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix +++ b/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix @@ -22,7 +22,7 @@ in type = types.listOf types.str; default = [ ]; example = literalExpression ''["user1" "user2" "user3"]''; - description = '' + description = lib.mdDoc '' A list of users who should be able to integrate 1Password with polkit-based authentication mechanisms. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/adb.nix b/third_party/nixpkgs/nixos/modules/programs/adb.nix index 9e9e37f92a..e5b0abd9fc 100644 --- a/third_party/nixpkgs/nixos/modules/programs/adb.nix +++ b/third_party/nixpkgs/nixos/modules/programs/adb.nix @@ -11,10 +11,10 @@ with lib; enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to configure system to use Android Debug Bridge (adb). To grant access to a user, it must be part of adbusers group: - users.users.alice.extraGroups = ["adbusers"]; + `users.users.alice.extraGroups = ["adbusers"];` ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/atop.nix b/third_party/nixpkgs/nixos/modules/programs/atop.nix index a31078a891..a0763d2dcf 100644 --- a/third_party/nixpkgs/nixos/modules/programs/atop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/atop.nix @@ -20,7 +20,7 @@ in type = types.package; default = pkgs.atop; defaultText = literalExpression "pkgs.atop"; - description = '' + description = lib.mdDoc '' Which package to use for Atop. ''; }; @@ -29,7 +29,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to install and enable the netatop kernel module. Note: this sets the kernel taint flag "O" for loading out-of-tree modules. ''; @@ -38,7 +38,7 @@ in type = types.package; default = config.boot.kernelPackages.netatop; defaultText = literalExpression "config.boot.kernelPackages.netatop"; - description = '' + description = lib.mdDoc '' Which package to use for netatop. ''; }; @@ -47,7 +47,7 @@ in atopgpu.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to install and enable the atopgpud daemon to get information about NVIDIA gpus. ''; @@ -56,7 +56,7 @@ in setuidWrapper.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to install a setuid wrapper for Atop. This is required to use some of the features as non-root user (e.g.: ipc information, netatop, atopgpu). Atop tries to drop the root privileges shortly after starting. @@ -66,7 +66,7 @@ in atopService.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable the atop service responsible for storing statistics for long-term analysis. ''; @@ -74,7 +74,7 @@ in atopRotateTimer.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable the atop-rotate timer, which restarts the atop service daily to make sure the data files are rotate. ''; @@ -82,7 +82,7 @@ in atopacctService.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable the atopacct service which manages process accounting. This allows Atop to gather data about processes that disappeared in between two refresh intervals. @@ -95,8 +95,8 @@ in flags = "a1f"; interval = 5; }; - description = '' - Parameters to be written to /etc/atoprc. + description = lib.mdDoc '' + Parameters to be written to {file}`/etc/atoprc`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/autojump.nix b/third_party/nixpkgs/nixos/modules/programs/autojump.nix index ecfc2f6580..dde6870d98 100644 --- a/third_party/nixpkgs/nixos/modules/programs/autojump.nix +++ b/third_party/nixpkgs/nixos/modules/programs/autojump.nix @@ -13,7 +13,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable autojump. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/bandwhich.nix b/third_party/nixpkgs/nixos/modules/programs/bandwhich.nix index 610d602ad2..8d1612217a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bandwhich.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bandwhich.nix @@ -11,7 +11,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to add bandwhich to the global environment and configure a setcap wrapper for it. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix b/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix index 7281126979..249e99ddc4 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bash/bash.nix @@ -30,10 +30,10 @@ in /* enable = mkOption { default = true; - description = '' + description = lib.mdDoc '' Whenever to configure Bash as an interactive shell. Note that this tries to make Bash the default - , + {option}`users.defaultUserShell`, which in turn means that you might need to explicitly set this variable if you have another shell configured with NixOS. @@ -44,16 +44,16 @@ in shellAliases = mkOption { default = {}; - description = '' - Set of aliases for bash shell, which overrides . - See for an option format description. + description = lib.mdDoc '' + Set of aliases for bash shell, which overrides {option}`environment.shellAliases`. + See {option}`environment.shellAliases` for an option format description. ''; type = with types; attrsOf (nullOr (either str path)); }; shellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during bash shell initialisation. ''; type = types.lines; @@ -61,7 +61,7 @@ in loginShellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during login bash shell initialisation. ''; type = types.lines; @@ -69,7 +69,7 @@ in interactiveShellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during interactive bash shell initialisation. ''; type = types.lines; @@ -92,7 +92,7 @@ in fi fi ''; - description = '' + description = lib.mdDoc '' Shell script code used to initialise the bash prompt. ''; type = types.lines; @@ -100,7 +100,7 @@ in promptPluginInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code used to initialise bash prompt plugins. ''; type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/programs/bash/undistract-me.nix b/third_party/nixpkgs/nixos/modules/programs/bash/undistract-me.nix index 0e6465e048..8d1b1740f6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/bash/undistract-me.nix +++ b/third_party/nixpkgs/nixos/modules/programs/bash/undistract-me.nix @@ -14,7 +14,7 @@ in timeout = mkOption { default = 10; - description = '' + description = lib.mdDoc '' Number of seconds it would take for a command to be considered long-running. ''; type = types.int; diff --git a/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix b/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix index 1e5c6ff9b2..7ebce17beb 100644 --- a/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix +++ b/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix @@ -40,12 +40,12 @@ in type = types.package; default = pkgs.captive-browser; defaultText = literalExpression "pkgs.captive-browser"; - description = "Which package to use for captive-browser"; + description = lib.mdDoc "Which package to use for captive-browser"; }; interface = mkOption { type = types.str; - description = "your public network interface (wlp3s0, wlan0, eth0, ...)"; + description = lib.mdDoc "your public network interface (wlp3s0, wlan0, eth0, ...)"; }; # the options below are the same as in "captive-browser.toml" @@ -53,7 +53,7 @@ in type = types.str; default = browserDefault pkgs.chromium; defaultText = literalExpression (browserDefault "\${pkgs.chromium}"); - description = '' + description = lib.mdDoc '' The shell (/bin/sh) command executed once the proxy starts. When browser exits, the proxy exits. An extra env var PROXY is available. @@ -69,7 +69,7 @@ in dhcp-dns = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The shell (/bin/sh) command executed to obtain the DHCP DNS server address. The first match of an IPv4 regex is used. IPv4 only, because let's be real, it's a captive portal. @@ -79,7 +79,7 @@ in socks5-addr = mkOption { type = types.str; default = "localhost:1666"; - description = "the listen address for the SOCKS5 proxy server"; + description = lib.mdDoc "the listen address for the SOCKS5 proxy server"; }; bindInterface = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/programs/ccache.nix b/third_party/nixpkgs/nixos/modules/programs/ccache.nix index 0f7fd0a368..a554109533 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ccache.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ccache.nix @@ -9,13 +9,13 @@ in { enable = mkEnableOption "CCache"; cacheDir = mkOption { type = types.path; - description = "CCache directory"; + description = lib.mdDoc "CCache directory"; default = "/var/cache/ccache"; }; # target configuration packageNames = mkOption { type = types.listOf types.str; - description = "Nix top-level packages to be compiled using CCache"; + description = lib.mdDoc "Nix top-level packages to be compiled using CCache"; default = []; example = [ "wxGTK30" "ffmpeg" "libav_all" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/cdemu.nix b/third_party/nixpkgs/nixos/modules/programs/cdemu.nix index 142e293424..d43f009f2f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/cdemu.nix +++ b/third_party/nixpkgs/nixos/modules/programs/cdemu.nix @@ -10,29 +10,29 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' - cdemu for members of - . + description = lib.mdDoc '' + {command}`cdemu` for members of + {option}`programs.cdemu.group`. ''; }; group = mkOption { type = types.str; default = "cdrom"; - description = '' - Group that users must be in to use cdemu. + description = lib.mdDoc '' + Group that users must be in to use {command}`cdemu`. ''; }; gui = mkOption { type = types.bool; default = true; - description = '' - Whether to install the cdemu GUI (gCDEmu). + description = lib.mdDoc '' + Whether to install the {command}`cdemu` GUI (gCDEmu). ''; }; image-analyzer = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to install the image analyzer. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/chromium.nix b/third_party/nixpkgs/nixos/modules/programs/chromium.nix index 4b8bec33eb..98eb071e61 100644 --- a/third_party/nixpkgs/nixos/modules/programs/chromium.nix +++ b/third_party/nixpkgs/nixos/modules/programs/chromium.nix @@ -23,14 +23,14 @@ in extensions = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of chromium extensions to install. For list of plugins ids see id in url of extensions on - chrome web store + [chrome web store](https://chrome.google.com/webstore/category/extensions) page. To install a chromium extension not included in the chrome web store, append to the extension id a semicolon ";" followed by a URL pointing to an Update Manifest XML file. See - ExtensionInstallForcelist + [ExtensionInstallForcelist](https://cloud.google.com/docs/chrome-enterprise/policies/?policy=ExtensionInstallForcelist) for additional details. ''; default = []; @@ -46,21 +46,21 @@ in homepageLocation = mkOption { type = types.nullOr types.str; - description = "Chromium default homepage"; + description = lib.mdDoc "Chromium default homepage"; default = null; example = "https://nixos.org"; }; defaultSearchProviderEnabled = mkOption { type = types.nullOr types.bool; - description = "Enable the default search provider."; + description = lib.mdDoc "Enable the default search provider."; default = null; example = true; }; defaultSearchProviderSearchURL = mkOption { type = types.nullOr types.str; - description = "Chromium default search provider url."; + description = lib.mdDoc "Chromium default search provider url."; default = null; example = "https://encrypted.google.com/search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:searchClient}{google:sourceId}{google:instantExtendedEnabledParameter}ie={inputEncoding}"; @@ -68,7 +68,7 @@ in defaultSearchProviderSuggestURL = mkOption { type = types.nullOr types.str; - description = "Chromium default search provider url for suggestions."; + description = lib.mdDoc "Chromium default search provider url for suggestions."; default = null; example = "https://encrypted.google.com/complete/search?output=chrome&q={searchTerms}"; diff --git a/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix b/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix index 4d2a89b515..b5c7626bd2 100644 --- a/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix +++ b/third_party/nixpkgs/nixos/modules/programs/command-not-found/command-not-found.nix @@ -26,7 +26,7 @@ in enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether interactive shells should show which Nix package (if any) provides a missing command. ''; @@ -34,7 +34,7 @@ in dbPath = mkOption { default = "/nix/var/nix/profiles/per-user/root/channels/nixos/programs.sqlite" ; - description = '' + description = lib.mdDoc '' Absolute path to programs.sqlite. By default this file will be provided by your channel diff --git a/third_party/nixpkgs/nixos/modules/programs/criu.nix b/third_party/nixpkgs/nixos/modules/programs/criu.nix index 1714e1331a..9f03b0c643 100644 --- a/third_party/nixpkgs/nixos/modules/programs/criu.nix +++ b/third_party/nixpkgs/nixos/modules/programs/criu.nix @@ -10,8 +10,8 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' - Install criu along with necessary kernel options. + description = lib.mdDoc '' + Install {command}`criu` along with necessary kernel options. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/dconf.nix b/third_party/nixpkgs/nixos/modules/programs/dconf.nix index 265c41cbbb..b5ef42a3b7 100644 --- a/third_party/nixpkgs/nixos/modules/programs/dconf.nix +++ b/third_party/nixpkgs/nixos/modules/programs/dconf.nix @@ -33,14 +33,14 @@ in profiles = mkOption { type = types.attrsOf types.path; default = {}; - description = "Set of dconf profile files, installed at /etc/dconf/profiles/name."; + description = lib.mdDoc "Set of dconf profile files, installed at {file}`/etc/dconf/profiles/«name»`."; internal = true; }; packages = mkOption { type = types.listOf types.package; default = []; - description = "A list of packages which provide dconf profiles and databases in /etc/dconf."; + description = lib.mdDoc "A list of packages which provide dconf profiles and databases in {file}`/etc/dconf`."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix b/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix index cabdf260cd..101ee8ddba 100644 --- a/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix +++ b/third_party/nixpkgs/nixos/modules/programs/digitalbitbox/default.nix @@ -11,7 +11,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Installs the Digital Bitbox application and enables the complementary hardware module. ''; }; @@ -20,7 +20,7 @@ in type = types.package; default = pkgs.digitalbitbox; defaultText = literalExpression "pkgs.digitalbitbox"; - description = "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; + description = lib.mdDoc "The Digital Bitbox package to use. This can be used to install a package with udev rules that differ from the defaults."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix b/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix index 89ac3443a1..20a0dc9556 100644 --- a/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix +++ b/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix @@ -14,7 +14,7 @@ in { enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to configure system to enable use of dmrconfig. This enables the required udev rules and installs the program. ''; @@ -25,7 +25,7 @@ in { default = pkgs.dmrconfig; type = types.package; defaultText = literalExpression "pkgs.dmrconfig"; - description = "dmrconfig derivation to use"; + description = lib.mdDoc "dmrconfig derivation to use"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/evince.nix b/third_party/nixpkgs/nixos/modules/programs/evince.nix index c033230afb..bbc54241d5 100644 --- a/third_party/nixpkgs/nixos/modules/programs/evince.nix +++ b/third_party/nixpkgs/nixos/modules/programs/evince.nix @@ -28,7 +28,7 @@ in { type = types.package; default = pkgs.evince; defaultText = literalExpression "pkgs.evince"; - description = "Evince derivation to use."; + description = lib.mdDoc "Evince derivation to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/feedbackd.nix b/third_party/nixpkgs/nixos/modules/programs/feedbackd.nix index 4194080c8a..7e6cf82946 100644 --- a/third_party/nixpkgs/nixos/modules/programs/feedbackd.nix +++ b/third_party/nixpkgs/nixos/modules/programs/feedbackd.nix @@ -13,7 +13,7 @@ in { Your user needs to be in the `feedbackd` group to trigger effects. ''; package = mkOption { - description = '' + description = lib.mdDoc '' Which feedbackd package to use. ''; type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/programs/file-roller.nix b/third_party/nixpkgs/nixos/modules/programs/file-roller.nix index 3c47d59816..ca2651becf 100644 --- a/third_party/nixpkgs/nixos/modules/programs/file-roller.nix +++ b/third_party/nixpkgs/nixos/modules/programs/file-roller.nix @@ -27,7 +27,7 @@ in { type = types.package; default = pkgs.gnome.file-roller; defaultText = literalExpression "pkgs.gnome.file-roller"; - description = "File Roller derivation to use."; + description = lib.mdDoc "File Roller derivation to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/firejail.nix b/third_party/nixpkgs/nixos/modules/programs/firejail.nix index 76b42168c1..417eff91d3 100644 --- a/third_party/nixpkgs/nixos/modules/programs/firejail.nix +++ b/third_party/nixpkgs/nixos/modules/programs/firejail.nix @@ -69,13 +69,12 @@ in { }; } ''; - description = '' + description = lib.mdDoc '' Wrap the binaries in firejail and place them in the global path. - - + You will get file collisions if you put the actual application binary in the global environment (such as by adding the application package to - environment.systemPackages), and applications started via + `environment.systemPackages`), and applications started via .desktop files are not wrapped if they specify the absolute path to the binary. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/fish.nix b/third_party/nixpkgs/nixos/modules/programs/fish.nix index 8dd7101947..357105c3e7 100644 --- a/third_party/nixpkgs/nixos/modules/programs/fish.nix +++ b/third_party/nixpkgs/nixos/modules/programs/fish.nix @@ -49,7 +49,7 @@ in enable = mkOption { default = false; - description = '' + description = lib.mdDoc '' Whether to configure fish as an interactive shell. ''; type = types.bool; @@ -58,16 +58,16 @@ in useBabelfish = mkOption { type = types.bool; default = false; - description = '' - If enabled, the configured environment will be translated to native fish using babelfish. - Otherwise, foreign-env will be used. + description = lib.mdDoc '' + If enabled, the configured environment will be translated to native fish using [babelfish](https://github.com/bouk/babelfish). + Otherwise, [foreign-env](https://github.com/oh-my-fish/plugin-foreign-env) will be used. ''; }; vendor.config.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether fish should source configuration snippets provided by other packages. ''; }; @@ -75,7 +75,7 @@ in vendor.completions.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether fish should use completion files provided by other packages. ''; }; @@ -83,7 +83,7 @@ in vendor.functions.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether fish should autoload fish functions provided by other packages. ''; }; @@ -94,7 +94,7 @@ in gco = "git checkout"; npu = "nix-prefetch-url"; }; - description = '' + description = lib.mdDoc '' Set of fish abbreviations. ''; type = with types; attrsOf str; @@ -102,16 +102,16 @@ in shellAliases = mkOption { default = {}; - description = '' - Set of aliases for fish shell, which overrides . - See for an option format description. + description = lib.mdDoc '' + Set of aliases for fish shell, which overrides {option}`environment.shellAliases`. + See {option}`environment.shellAliases` for an option format description. ''; type = with types; attrsOf (nullOr (either str path)); }; shellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during fish shell initialisation. ''; type = types.lines; @@ -119,7 +119,7 @@ in loginShellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during fish login shell initialisation. ''; type = types.lines; @@ -127,7 +127,7 @@ in interactiveShellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during interactive fish shell initialisation. ''; type = types.lines; @@ -135,7 +135,7 @@ in promptInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code used to initialise fish prompt. ''; type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/programs/flashrom.nix b/third_party/nixpkgs/nixos/modules/programs/flashrom.nix index f026c2e31c..5f0de5a402 100644 --- a/third_party/nixpkgs/nixos/modules/programs/flashrom.nix +++ b/third_party/nixpkgs/nixos/modules/programs/flashrom.nix @@ -10,7 +10,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Installs flashrom and configures udev rules for programmers used by flashrom. Grants access to users in the "flashrom" group. diff --git a/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix b/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix index 5e169be2d8..e87d107650 100644 --- a/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix +++ b/third_party/nixpkgs/nixos/modules/programs/flexoptix-app.nix @@ -10,7 +10,7 @@ in { enable = mkEnableOption "FLEXOPTIX app + udev rules"; package = mkOption { - description = "FLEXOPTIX app package to use"; + description = lib.mdDoc "FLEXOPTIX app package to use"; type = types.package; default = pkgs.flexoptix-app; defaultText = literalExpression "pkgs.flexoptix-app"; diff --git a/third_party/nixpkgs/nixos/modules/programs/freetds.nix b/third_party/nixpkgs/nixos/modules/programs/freetds.nix index d95c44d756..98274fa9b5 100644 --- a/third_party/nixpkgs/nixos/modules/programs/freetds.nix +++ b/third_party/nixpkgs/nixos/modules/programs/freetds.nix @@ -26,7 +26,7 @@ in } ''; description = - '' + lib.mdDoc '' Configure freetds database entries. Each attribute denotes a section within freetds.conf, and the value (a string) is the config content for that section. When at least one entry is configured diff --git a/third_party/nixpkgs/nixos/modules/programs/fuse.nix b/third_party/nixpkgs/nixos/modules/programs/fuse.nix index c15896efbb..b82d37a051 100644 --- a/third_party/nixpkgs/nixos/modules/programs/fuse.nix +++ b/third_party/nixpkgs/nixos/modules/programs/fuse.nix @@ -13,7 +13,7 @@ in { # negative numbers obviously make no sense: type = types.ints.between 0 32767; # 2^15 - 1 default = 1000; - description = '' + description = lib.mdDoc '' Set the maximum number of FUSE mounts allowed to non-root users. ''; }; @@ -21,7 +21,7 @@ in { userAllowOther = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allow non-root users to specify the allow_other or allow_root mount options, see mount.fuse3(8). ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/gamemode.nix b/third_party/nixpkgs/nixos/modules/programs/gamemode.nix index a377a1619a..84e20934ed 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gamemode.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gamemode.nix @@ -19,7 +19,7 @@ in settings = mkOption { type = settingsFormat.type; default = {}; - description = '' + description = lib.mdDoc '' System-wide configuration for GameMode (/etc/gamemode.ini). See gamemoded(8) man page for available settings. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/git.nix b/third_party/nixpkgs/nixos/modules/programs/git.nix index 06ce374b19..c4cf3cc561 100644 --- a/third_party/nixpkgs/nixos/modules/programs/git.nix +++ b/third_party/nixpkgs/nixos/modules/programs/git.nix @@ -16,7 +16,7 @@ in default = pkgs.git; defaultText = literalExpression "pkgs.git"; example = literalExpression "pkgs.gitFull"; - description = "The git package to use"; + description = lib.mdDoc "The git package to use"; }; config = mkOption { @@ -26,7 +26,7 @@ in init.defaultBranch = "main"; url."https://github.com/".insteadOf = [ "gh:" "github:" ]; }; - description = '' + description = lib.mdDoc '' Configuration to write to /etc/gitconfig. See the CONFIGURATION FILE section of git-config(1) for more information. ''; @@ -39,7 +39,7 @@ in type = types.package; default = pkgs.git-lfs; defaultText = literalExpression "pkgs.git-lfs"; - description = "The git-lfs package to use"; + description = lib.mdDoc "The git-lfs package to use"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix b/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix index 4b128b4712..dcb20bd603 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gnome-disks.nix @@ -26,7 +26,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable GNOME Disks daemon, a program designed to be a UDisks2 graphical front-end. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix b/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix index 43ad3163ef..2831ac9aff 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gnome-documents.nix @@ -26,7 +26,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable GNOME Documents, a document manager application for GNOME. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/gnupg.nix b/third_party/nixpkgs/nixos/modules/programs/gnupg.nix index 7d8ab7dda9..ad27766b72 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gnupg.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gnupg.nix @@ -28,7 +28,7 @@ in type = types.package; default = pkgs.gnupg; defaultText = literalExpression "pkgs.gnupg"; - description = '' + description = lib.mdDoc '' The gpg package that should be used. ''; }; @@ -36,7 +36,7 @@ in agent.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables GnuPG agent with socket-activation for every user session. ''; }; @@ -44,7 +44,7 @@ in agent.enableSSHSupport = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable SSH agent support in GnuPG agent. Also sets SSH_AUTH_SOCK environment variable correctly. This will disable socket-activation and thus always start a GnuPG agent per user session. @@ -54,7 +54,7 @@ in agent.enableExtraSocket = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable extra socket for GnuPG agent. ''; }; @@ -62,7 +62,7 @@ in agent.enableBrowserSocket = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable browser socket for GnuPG agent. ''; }; @@ -72,7 +72,7 @@ in example = "gnome3"; default = defaultPinentryFlavor; defaultText = literalDocBook ''matching the configured desktop environment''; - description = '' + description = lib.mdDoc '' Which pinentry interface to use. If not null, the path to the pinentry binary will be passed to gpg-agent via commandline and thus overrides the pinentry option in gpg-agent.conf in the user's @@ -86,7 +86,7 @@ in dirmngr.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables GnuPG network certificate management daemon with socket-activation for every user session. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/gpaste.nix b/third_party/nixpkgs/nixos/modules/programs/gpaste.nix index cff2fb8d00..074b4d59a3 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gpaste.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gpaste.nix @@ -18,7 +18,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable GPaste, a clipboard manager. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/gphoto2.nix b/third_party/nixpkgs/nixos/modules/programs/gphoto2.nix index 93923ff313..f31b186396 100644 --- a/third_party/nixpkgs/nixos/modules/programs/gphoto2.nix +++ b/third_party/nixpkgs/nixos/modules/programs/gphoto2.nix @@ -11,11 +11,11 @@ with lib; enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to configure system to use gphoto2. To grant digital camera access to a user, the user must be part of the camera group: - users.users.alice.extraGroups = ["camera"]; + `users.users.alice.extraGroups = ["camera"];` ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/htop.nix b/third_party/nixpkgs/nixos/modules/programs/htop.nix index 5c197838e4..94f6e3c0ef 100644 --- a/third_party/nixpkgs/nixos/modules/programs/htop.nix +++ b/third_party/nixpkgs/nixos/modules/programs/htop.nix @@ -21,7 +21,7 @@ in type = types.package; default = pkgs.htop; defaultText = "pkgs.htop"; - description = '' + description = lib.mdDoc '' The htop package that should be used. ''; }; @@ -35,7 +35,7 @@ in hide_kernel_threads = true; hide_userland_threads = true; }; - description = '' + description = lib.mdDoc '' Extra global default configuration for htop which is read on first startup only. Htop subsequently uses ~/.config/htop/htoprc diff --git a/third_party/nixpkgs/nixos/modules/programs/java.nix b/third_party/nixpkgs/nixos/modules/programs/java.nix index 4e4e0629e5..5994f53f76 100644 --- a/third_party/nixpkgs/nixos/modules/programs/java.nix +++ b/third_party/nixpkgs/nixos/modules/programs/java.nix @@ -35,7 +35,7 @@ in package = mkOption { default = pkgs.jdk; defaultText = literalExpression "pkgs.jdk"; - description = '' + description = lib.mdDoc '' Java package to install. Typical values are pkgs.jdk or pkgs.jre. ''; type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix b/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix index 3163e45f57..305c828f0a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix +++ b/third_party/nixpkgs/nixos/modules/programs/k40-whisperer.nix @@ -14,7 +14,7 @@ in group = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Group assigned to the device when connected. ''; default = "k40"; @@ -25,7 +25,7 @@ in default = pkgs.k40-whisperer; defaultText = literalExpression "pkgs.k40-whisperer"; example = literalExpression "pkgs.k40-whisperer"; - description = '' + description = lib.mdDoc '' K40 Whisperer package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix b/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix index 10d6e18a3d..1f326c9e92 100644 --- a/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix +++ b/third_party/nixpkgs/nixos/modules/programs/kdeconnect.nix @@ -8,7 +8,7 @@ with lib; Note that it will open the TCP and UDP port from 1714 to 1764 as they are needed for it to function properly. You can use the to use - gnomeExtensions.gsconnect as an alternative + gnomeExtensions.gsconnect as an alternative implementation if you use Gnome. ''; package = mkOption { @@ -16,7 +16,7 @@ with lib; defaultText = literalExpression "pkgs.plasma5Packages.kdeconnect-kde"; type = types.package; example = literalExpression "pkgs.gnomeExtensions.gsconnect"; - description = '' + description = lib.mdDoc '' The package providing the implementation for kdeconnect. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/less.nix b/third_party/nixpkgs/nixos/modules/programs/less.nix index 794146b19f..9f2d5d9158 100644 --- a/third_party/nixpkgs/nixos/modules/programs/less.nix +++ b/third_party/nixpkgs/nixos/modules/programs/less.nix @@ -41,12 +41,12 @@ in type = types.nullOr types.path; default = null; example = literalExpression ''"''${pkgs.my-configs}/lesskey"''; - description = '' + description = lib.mdDoc '' Path to lesskey configuration file. - takes precedence over , - , , and - . + {option}`configFile` takes precedence over {option}`commands`, + {option}`clearDefaultCommands`, {option}`lineEditingKeys`, and + {option}`envVariables`. ''; }; @@ -57,13 +57,13 @@ in h = "noaction 5\\e("; l = "noaction 5\\e)"; }; - description = "Defines new command keys."; + description = lib.mdDoc "Defines new command keys."; }; clearDefaultCommands = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Clear all default commands. You should remember to set the quit key. Otherwise you will not be able to leave less without killing it. @@ -76,7 +76,7 @@ in example = { e = "abort"; }; - description = "Defines new line-editing keys."; + description = lib.mdDoc "Defines new line-editing keys."; }; envVariables = mkOption { @@ -87,14 +87,14 @@ in example = { LESS = "--quit-if-one-screen"; }; - description = "Defines environment variables."; + description = lib.mdDoc "Defines environment variables."; }; lessopen = mkOption { type = types.nullOr types.str; default = "|${pkgs.lesspipe}/bin/lesspipe.sh %s"; defaultText = literalExpression ''"|''${pkgs.lesspipe}/bin/lesspipe.sh %s"''; - description = '' + description = lib.mdDoc '' Before less opens a file, it first gives your input preprocessor a chance to modify the way the contents of the file are displayed. ''; }; @@ -102,7 +102,7 @@ in lessclose = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' When less closes a file opened in such a way, it will call another program, called the input postprocessor, which may perform any desired clean-up action (such as deleting the replacement file created by LESSOPEN). ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/light.nix b/third_party/nixpkgs/nixos/modules/programs/light.nix index 9f2a03e7e7..57cc925be4 100644 --- a/third_party/nixpkgs/nixos/modules/programs/light.nix +++ b/third_party/nixpkgs/nixos/modules/programs/light.nix @@ -12,7 +12,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to install Light backlight control command and udev rules granting access to members of the "video" group. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/mosh.nix b/third_party/nixpkgs/nixos/modules/programs/mosh.nix index e08099e21a..31aadb6aba 100644 --- a/third_party/nixpkgs/nixos/modules/programs/mosh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/mosh.nix @@ -10,7 +10,7 @@ in { options.programs.mosh = { enable = mkOption { - description = '' + description = lib.mdDoc '' Whether to enable mosh. Note, this will open ports in your firewall! ''; default = false; diff --git a/third_party/nixpkgs/nixos/modules/programs/msmtp.nix b/third_party/nixpkgs/nixos/modules/programs/msmtp.nix index 9c067bdc96..fbdab2cac5 100644 --- a/third_party/nixpkgs/nixos/modules/programs/msmtp.nix +++ b/third_party/nixpkgs/nixos/modules/programs/msmtp.nix @@ -15,7 +15,7 @@ in { setSendmail = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to set the system sendmail to msmtp's. ''; }; @@ -28,7 +28,7 @@ in { port = 587; tls = true; }; - description = '' + description = lib.mdDoc '' Default values applied to all accounts. See msmtp(1) for the available options. ''; @@ -62,7 +62,7 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra lines to add to the msmtp configuration verbatim. See msmtp(1) for the syntax and available options. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/mtr.nix b/third_party/nixpkgs/nixos/modules/programs/mtr.nix index 3cffe0fd8b..173f247294 100644 --- a/third_party/nixpkgs/nixos/modules/programs/mtr.nix +++ b/third_party/nixpkgs/nixos/modules/programs/mtr.nix @@ -11,7 +11,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to add mtr to the global environment and configure a setcap wrapper for it. ''; @@ -21,7 +21,7 @@ in { type = types.package; default = pkgs.mtr; defaultText = literalExpression "pkgs.mtr"; - description = '' + description = lib.mdDoc '' The package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/nano.nix b/third_party/nixpkgs/nixos/modules/programs/nano.nix index 5837dd46d7..16bab620d6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nano.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nano.nix @@ -14,9 +14,9 @@ in nanorc = lib.mkOption { type = lib.types.lines; default = ""; - description = '' + description = lib.mdDoc '' The system-wide nano configuration. - See nanorc5. + See {manpage}`nanorc(5)`. ''; example = '' set nowrap @@ -27,7 +27,7 @@ in syntaxHighlight = lib.mkOption { type = lib.types.bool; default = true; - description = "Whether to enable syntax highlight for various languages."; + description = lib.mdDoc "Whether to enable syntax highlight for various languages."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/neovim.nix b/third_party/nixpkgs/nixos/modules/programs/neovim.nix index 4649662542..85963159a7 100644 --- a/third_party/nixpkgs/nixos/modules/programs/neovim.nix +++ b/third_party/nixpkgs/nixos/modules/programs/neovim.nix @@ -16,7 +16,7 @@ in { defaultEditor = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' When enabled, installs neovim and configures neovim to be the default editor using the EDITOR environment variable. ''; @@ -25,35 +25,35 @@ in { viAlias = mkOption { type = types.bool; default = false; - description = '' - Symlink vi to nvim binary. + description = lib.mdDoc '' + Symlink {command}`vi` to {command}`nvim` binary. ''; }; vimAlias = mkOption { type = types.bool; default = false; - description = '' - Symlink vim to nvim binary. + description = lib.mdDoc '' + Symlink {command}`vim` to {command}`nvim` binary. ''; }; withRuby = mkOption { type = types.bool; default = true; - description = "Enable Ruby provider."; + description = lib.mdDoc "Enable Ruby provider."; }; withPython3 = mkOption { type = types.bool; default = true; - description = "Enable Python 3 provider."; + description = lib.mdDoc "Enable Python 3 provider."; }; withNodeJs = mkOption { type = types.bool; default = false; - description = "Enable Node provider."; + description = lib.mdDoc "Enable Node provider."; }; configure = mkOption { @@ -72,9 +72,9 @@ in { }; } ''; - description = '' + description = lib.mdDoc '' Generate your init file from your list of plugins and custom commands. - Neovim will then be wrapped to load nvim -u /nix/store/hash-vimrc + Neovim will then be wrapped to load {command}`nvim -u /nix/store/«hash»-vimrc` ''; }; @@ -82,7 +82,7 @@ in { type = types.package; default = pkgs.neovim-unwrapped; defaultText = literalExpression "pkgs.neovim-unwrapped"; - description = "The package to use for the neovim binary."; + description = lib.mdDoc "The package to use for the neovim binary."; }; finalPackage = mkOption { @@ -97,8 +97,8 @@ in { example = literalExpression '' { "ftplugin/c.vim".text = "setlocal omnifunc=v:lua.vim.lsp.omnifunc"; } ''; - description = '' - Set of files that have to be linked in runtime. + description = lib.mdDoc '' + Set of files that have to be linked in {file}`runtime`. ''; type = with types; attrsOf (submodule ( @@ -108,7 +108,7 @@ in { enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether this /etc file should be generated. This option allows specific /etc files to be disabled. ''; @@ -116,7 +116,7 @@ in { target = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Name of symlink. Defaults to the attribute name. ''; @@ -125,12 +125,12 @@ in { text = mkOption { default = null; type = types.nullOr types.lines; - description = "Text of the file."; + description = lib.mdDoc "Text of the file."; }; source = mkOption { type = types.path; - description = "Path of the source file."; + description = lib.mdDoc "Path of the source file."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/nethoscope.nix b/third_party/nixpkgs/nixos/modules/programs/nethoscope.nix index 495548e9c6..d8ece61c90 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nethoscope.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nethoscope.nix @@ -12,7 +12,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to add nethoscope to the global environment and configure a setcap wrapper for it. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/nm-applet.nix b/third_party/nixpkgs/nixos/modules/programs/nm-applet.nix index 5bcee30125..ef24030c9d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nm-applet.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nm-applet.nix @@ -11,7 +11,7 @@ indicator = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to use indicator instead of status icon. It is needed for Appindicator environments, like Enlightenment. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/nncp.nix b/third_party/nixpkgs/nixos/modules/programs/nncp.nix index 29a703eadf..a58748d2fe 100644 --- a/third_party/nixpkgs/nixos/modules/programs/nncp.nix +++ b/third_party/nixpkgs/nixos/modules/programs/nncp.nix @@ -16,7 +16,7 @@ in { group = mkOption { type = types.str; default = "uucp"; - description = '' + description = lib.mdDoc '' The group under which NNCP files shall be owned. Any member of this group may access the secret keys of this NNCP node. @@ -27,30 +27,30 @@ in { type = types.package; default = pkgs.nncp; defaultText = literalExpression "pkgs.nncp"; - description = "The NNCP package to use system-wide."; + description = lib.mdDoc "The NNCP package to use system-wide."; }; secrets = mkOption { type = with types; listOf str; example = [ "/run/keys/nncp.hjson" ]; - description = '' + description = lib.mdDoc '' A list of paths to NNCP configuration files that should not be in the Nix store. These files are layered on top of the values at - . + [](#opt-programs.nncp.settings). ''; }; settings = mkOption { type = settingsFormat.type; - description = '' + description = lib.mdDoc '' NNCP configuration, see - . + . At runtime these settings will be overlayed by the contents of - into the file - ${nncpCfgFile}. Node keypairs go in - secrets, do not specify them in - settings as they will be leaked into - /nix/store! + [](#opt-programs.nncp.secrets) into the file + `${nncpCfgFile}`. Node keypairs go in + `secrets`, do not specify them in + `settings` as they will be leaked into + `/nix/store`! ''; default = { }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix b/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix index f76555289f..d5e004da73 100644 --- a/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix +++ b/third_party/nixpkgs/nixos/modules/programs/noisetorch.nix @@ -3,7 +3,8 @@ with lib; let cfg = config.programs.noisetorch; -in { +in +{ options.programs.noisetorch = { enable = mkEnableOption "noisetorch + setcap wrapper"; @@ -11,7 +12,7 @@ in { type = types.package; default = pkgs.noisetorch; defaultText = literalExpression "pkgs.noisetorch"; - description = '' + description = lib.mdDoc '' The noisetorch package to use. ''; }; @@ -24,5 +25,6 @@ in { capabilities = "cap_sys_resource=+ep"; source = "${cfg.package}/bin/noisetorch"; }; + environment.systemPackages = [ cfg.package ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/programs/npm.nix b/third_party/nixpkgs/nixos/modules/programs/npm.nix index d79c6c7340..7094380483 100644 --- a/third_party/nixpkgs/nixos/modules/programs/npm.nix +++ b/third_party/nixpkgs/nixos/modules/programs/npm.nix @@ -15,7 +15,7 @@ in package = mkOption { type = types.package; - description = "The npm package version / flavor to use"; + description = lib.mdDoc "The npm package version / flavor to use"; default = pkgs.nodePackages.npm; defaultText = literalExpression "pkgs.nodePackages.npm"; example = literalExpression "pkgs.nodePackages_13_x.npm"; @@ -23,9 +23,9 @@ in npmrc = mkOption { type = lib.types.lines; - description = '' + description = lib.mdDoc '' The system-wide npm configuration. - See . + See . ''; default = '' prefix = ''${HOME}/.npm diff --git a/third_party/nixpkgs/nixos/modules/programs/plotinus.nix b/third_party/nixpkgs/nixos/modules/programs/plotinus.nix index 2c90a41ba0..a011bb862a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/plotinus.nix +++ b/third_party/nixpkgs/nixos/modules/programs/plotinus.nix @@ -17,7 +17,7 @@ in programs.plotinus = { enable = mkOption { default = false; - description = '' + description = lib.mdDoc '' Whether to enable the Plotinus GTK 3 plugin. Plotinus provides a popup (triggered by Ctrl-Shift-P) to search the menus of a compatible application. diff --git a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix index 3f44e23a93..5d932b2d84 100644 --- a/third_party/nixpkgs/nixos/modules/programs/proxychains.nix +++ b/third_party/nixpkgs/nixos/modules/programs/proxychains.nix @@ -26,17 +26,17 @@ let type = mkOption { type = types.enum [ "http" "socks4" "socks5" ]; - description = "Proxy type."; + description = lib.mdDoc "Proxy type."; }; host = mkOption { type = types.str; - description = "Proxy host or IP address."; + description = lib.mdDoc "Proxy host or IP address."; }; port = mkOption { type = types.port; - description = "Proxy port"; + description = lib.mdDoc "Proxy port"; }; }; }; @@ -55,26 +55,26 @@ in { type = mkOption { type = types.enum [ "dynamic" "strict" "random" ]; default = "strict"; - description = '' - dynamic - Each connection will be done via chained proxies + description = lib.mdDoc '' + `dynamic` - Each connection will be done via chained proxies all proxies chained in the order as they appear in the list at least one proxy must be online to play in chain (dead proxies are skipped) - otherwise EINTR is returned to the app. + otherwise `EINTR` is returned to the app. - strict - Each connection will be done via chained proxies + `strict` - Each connection will be done via chained proxies all proxies chained in the order as they appear in the list all proxies must be online to play in chain - otherwise EINTR is returned to the app. + otherwise `EINTR` is returned to the app. - random - Each connection will be done via random proxy - (or proxy chain, see ) from the list. + `random` - Each connection will be done via random proxy + (or proxy chain, see {option}`programs.proxychains.chain.length`) from the list. ''; }; length = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Chain length for random chain. ''; }; @@ -83,7 +83,7 @@ in { proxyDNS = mkOption { type = types.bool; default = true; - description = "Proxy DNS requests - no leak for DNS data."; + description = lib.mdDoc "Proxy DNS requests - no leak for DNS data."; }; quietMode = mkEnableOption "Quiet mode (no output from the library)."; @@ -91,7 +91,7 @@ in { remoteDNSSubnet = mkOption { type = types.enum [ 10 127 224 ]; default = 224; - description = '' + description = lib.mdDoc '' Set the class A subnet number to use for the internal remote DNS mapping, uses the reserved 224.x.x.x range by default. ''; }; @@ -99,24 +99,24 @@ in { tcpReadTimeOut = mkOption { type = types.int; default = 15000; - description = "Connection read time-out in milliseconds."; + description = lib.mdDoc "Connection read time-out in milliseconds."; }; tcpConnectTimeOut = mkOption { type = types.int; default = 8000; - description = "Connection time-out in milliseconds."; + description = lib.mdDoc "Connection time-out in milliseconds."; }; localnet = mkOption { type = types.str; default = "127.0.0.0/255.0.0.0"; - description = "By default enable localnet for loopback address ranges."; + description = lib.mdDoc "By default enable localnet for loopback address ranges."; }; proxies = mkOption { type = types.attrsOf (types.submodule proxyOptions); - description = '' + description = lib.mdDoc '' Proxies to be used by proxychains. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/screen.nix b/third_party/nixpkgs/nixos/modules/programs/screen.nix index 728a0eb8ce..68de9e52d7 100644 --- a/third_party/nixpkgs/nixos/modules/programs/screen.nix +++ b/third_party/nixpkgs/nixos/modules/programs/screen.nix @@ -13,7 +13,7 @@ in screenrc = mkOption { default = ""; - description = '' + description = lib.mdDoc '' The contents of /etc/screenrc file. ''; type = types.lines; diff --git a/third_party/nixpkgs/nixos/modules/programs/shadow.nix b/third_party/nixpkgs/nixos/modules/programs/shadow.nix index 963cd8853d..fab809f279 100644 --- a/third_party/nixpkgs/nixos/modules/programs/shadow.nix +++ b/third_party/nixpkgs/nixos/modules/programs/shadow.nix @@ -59,7 +59,7 @@ in options = { users.defaultUserShell = lib.mkOption { - description = '' + description = lib.mdDoc '' This option defines the default shell assigned to user accounts. This can be either a full system path or a shell package. diff --git a/third_party/nixpkgs/nixos/modules/programs/slock.nix b/third_party/nixpkgs/nixos/modules/programs/slock.nix index ce80fcc5d4..3db9866d9f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/slock.nix +++ b/third_party/nixpkgs/nixos/modules/programs/slock.nix @@ -12,7 +12,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to install slock screen locker with setuid wrapper. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/spacefm.nix b/third_party/nixpkgs/nixos/modules/programs/spacefm.nix index f71abcaa33..b4ba9dcdea 100644 --- a/third_party/nixpkgs/nixos/modules/programs/spacefm.nix +++ b/third_party/nixpkgs/nixos/modules/programs/spacefm.nix @@ -17,8 +17,8 @@ in enable = mkOption { type = types.bool; default = false; - description = '' - Whether to install SpaceFM and create /etc/spacefm/spacefm.conf. + description = lib.mdDoc '' + Whether to install SpaceFM and create {file}`/etc/spacefm/spacefm.conf`. ''; }; @@ -34,10 +34,10 @@ in terminal_su = "''${pkgs.sudo}/bin/sudo"; } ''; - description = '' + description = lib.mdDoc '' The system-wide spacefm configuration. - Parameters to be written to /etc/spacefm/spacefm.conf. - Refer to the relevant entry in the SpaceFM manual. + Parameters to be written to {file}`/etc/spacefm/spacefm.conf`. + Refer to the [relevant entry](https://ignorantguru.github.io/spacefm/spacefm-manual-en.html#programfiles-etc) in the SpaceFM manual. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/ssh.nix b/third_party/nixpkgs/nixos/modules/programs/ssh.nix index 75685de4f0..9c4a95ef22 100644 --- a/third_party/nixpkgs/nixos/modules/programs/ssh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/ssh.nix @@ -40,20 +40,20 @@ in type = types.bool; default = config.services.xserver.enable; defaultText = literalExpression "config.services.xserver.enable"; - description = "Whether to configure SSH_ASKPASS in the environment."; + description = lib.mdDoc "Whether to configure SSH_ASKPASS in the environment."; }; askPassword = mkOption { type = types.str; default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; defaultText = literalExpression ''"''${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"''; - description = "Program used by SSH to ask for passwords."; + description = lib.mdDoc "Program used by SSH to ask for passwords."; }; forwardX11 = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to request X11 forwarding on outgoing connections by default. This is useful for running graphical programs on the remote machine and have them display to your local X11 server. Historically, this value has depended on the value used by the local sshd daemon, but there really isn't a relation between the two. @@ -66,8 +66,8 @@ in setXAuthLocation = mkOption { type = types.bool; - description = '' - Whether to set the path to xauth for X11-forwarded connections. + description = lib.mdDoc '' + Whether to set the path to {command}`xauth` for X11-forwarded connections. This causes a dependency on X11 packages. ''; }; @@ -76,7 +76,7 @@ in type = types.listOf types.str; default = []; example = [ "ssh-ed25519" "ssh-rsa" ]; - description = '' + description = lib.mdDoc '' Specifies the key types that will be used for public key authentication. ''; }; @@ -85,7 +85,7 @@ in type = types.listOf types.str; default = []; example = [ "ssh-ed25519" "ssh-rsa" ]; - description = '' + description = lib.mdDoc '' Specifies the host key algorithms that the client wants to use in order of preference. ''; }; @@ -95,7 +95,7 @@ in default = ""; description = '' Extra configuration text prepended to ssh_config. Other generated - options will be added after a Host * pattern. + options will be added after a Host * pattern. See ssh_config5 for help. ''; @@ -104,11 +104,11 @@ in startAgent = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to start the OpenSSH agent when you log in. The OpenSSH agent remembers private keys for you so that you don't have to type in passphrases every time you make an SSH connection. Use - ssh-add to add a key to the agent. + {command}`ssh-add` to add a key to the agent. ''; }; @@ -116,7 +116,7 @@ in type = types.nullOr types.str; default = null; example = "1h"; - description = '' + description = lib.mdDoc '' How long to keep the private keys in memory. Use null to keep them forever. ''; }; @@ -125,7 +125,7 @@ in type = types.nullOr types.str; default = null; example = literalExpression ''"''${pkgs.opensc}/lib/opensc-pkcs11.so"''; - description = '' + description = lib.mdDoc '' A pattern-list of acceptable paths for PKCS#11 shared libraries that may be used with the -s option to ssh-add. ''; @@ -135,7 +135,7 @@ in type = types.package; default = pkgs.openssh; defaultText = literalExpression "pkgs.openssh"; - description = '' + description = lib.mdDoc '' The package used for the openssh client and daemon. ''; }; @@ -147,7 +147,7 @@ in certAuthority = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This public key is an SSH certificate authority, rather than an individual host's key. ''; @@ -156,32 +156,32 @@ in type = types.listOf types.str; default = [ name ] ++ config.extraHostNames; defaultText = literalExpression "[ ${name} ] ++ config.${options.extraHostNames}"; - description = '' + description = lib.mdDoc '' A list of host names and/or IP numbers used for accessing the host's ssh service. This list includes the name of the - containing knownHosts attribute by default + containing `knownHosts` attribute by default for convenience. If you wish to configure multiple host keys - for the same host use multiple knownHosts + for the same host use multiple `knownHosts` entries with different attribute names and the same - hostNames list. + `hostNames` list. ''; }; extraHostNames = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' A list of additional host names and/or IP numbers used for accessing the host's ssh service. This list is ignored if - hostNames is set explicitly. + `hostNames` is set explicitly. ''; }; publicKey = mkOption { default = null; type = types.nullOr types.str; example = "ecdsa-sha2-nistp521 AAAAE2VjZHN...UEPg=="; - description = '' + description = lib.mdDoc '' The public key data for the host. You can fetch a public key - from a running SSH server with the ssh-keyscan + from a running SSH server with the {command}`ssh-keyscan` command. The public key should not include any host names, only the key type and the key itself. ''; @@ -189,25 +189,25 @@ in publicKeyFile = mkOption { default = null; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' The path to the public key file for the host. The public key file is read at build time and saved in the Nix store. You can fetch a public key file from a running SSH server - with the ssh-keyscan command. The content + with the {command}`ssh-keyscan` command. The content of the file should follow the same format as described for - the publicKey option. Only a single key + the `publicKey` option. Only a single key is supported. If a host has multiple keys, use - instead. + {option}`programs.ssh.knownHostsFiles` instead. ''; }; }; })); - description = '' + description = lib.mdDoc '' The set of system-wide known SSH hosts. To make simple setups more convenient the name of an attribute in this set is used as a host name for the entry. This behaviour can be disabled by setting - hostNames explicitly. You can use - extraHostNames to add additional host names without + `hostNames` explicitly. You can use + `extraHostNames` to add additional host names without disabling this default. ''; example = literalExpression '' @@ -228,11 +228,11 @@ in knownHostsFiles = mkOption { default = []; type = with types; listOf path; - description = '' + description = lib.mdDoc '' Files containing SSH host keys to set as global known hosts. - /etc/ssh/ssh_known_hosts (which is - generated by ) and - /etc/ssh/ssh_known_hosts2 are always + `/etc/ssh/ssh_known_hosts` (which is + generated by {option}`programs.ssh.knownHosts`) and + `/etc/ssh/ssh_known_hosts2` are always included. ''; example = literalExpression '' @@ -251,7 +251,7 @@ in type = types.nullOr (types.listOf types.str); default = null; example = [ "curve25519-sha256@libssh.org" "diffie-hellman-group-exchange-sha256" ]; - description = '' + description = lib.mdDoc '' Specifies the available KEX (Key Exchange) algorithms. ''; }; @@ -260,7 +260,7 @@ in type = types.nullOr (types.listOf types.str); default = null; example = [ "chacha20-poly1305@openssh.com" "aes256-gcm@openssh.com" ]; - description = '' + description = lib.mdDoc '' Specifies the ciphers allowed and their order of preference. ''; }; @@ -269,7 +269,7 @@ in type = types.nullOr (types.listOf types.str); default = null; example = [ "hmac-sha2-512-etm@openssh.com" "hmac-sha1" ]; - description = '' + description = lib.mdDoc '' Specifies the MAC (message authentication code) algorithms in order of preference. The MAC algorithm is used for data integrity protection. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/starship.nix b/third_party/nixpkgs/nixos/modules/programs/starship.nix index 83d2272003..ade80b9999 100644 --- a/third_party/nixpkgs/nixos/modules/programs/starship.nix +++ b/third_party/nixpkgs/nixos/modules/programs/starship.nix @@ -16,8 +16,8 @@ in { settings = mkOption { inherit (settingsFormat) type; default = { }; - description = '' - Configuration included in starship.toml. + description = lib.mdDoc '' + Configuration included in `starship.toml`. See https://starship.rs/config/#prompt for documentation. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/steam.nix b/third_party/nixpkgs/nixos/modules/programs/steam.nix index ff4deba2bf..d80718e792 100644 --- a/third_party/nixpkgs/nixos/modules/programs/steam.nix +++ b/third_party/nixpkgs/nixos/modules/programs/steam.nix @@ -18,7 +18,7 @@ in { remotePlay.openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for Steam Remote Play. ''; }; @@ -26,7 +26,7 @@ in { dedicatedServer.openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for Source Dedicated Server. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix b/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix index 1434f82660..04aa0a80e8 100644 --- a/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix +++ b/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix @@ -11,7 +11,7 @@ in { autoStart = mkOption { default = true; type = types.bool; - description = "Whether streamdeck-ui should be started automatically."; + description = lib.mdDoc "Whether streamdeck-ui should be started automatically."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/sway.nix b/third_party/nixpkgs/nixos/modules/programs/sway.nix index 01b0472813..af2b261d3c 100644 --- a/third_party/nixpkgs/nixos/modules/programs/sway.nix +++ b/third_party/nixpkgs/nixos/modules/programs/sway.nix @@ -12,7 +12,7 @@ let type = types.bool; inherit default; example = !default; - description = "Whether to make use of the ${description}"; + description = lib.mdDoc "Whether to make use of the ${description}"; }; in { base = mkWrapperFeature true '' @@ -39,14 +39,14 @@ in { Sway, the i3-compatible tiling Wayland compositor. You can manually launch Sway by executing "exec sway" on a TTY. Copy /etc/sway/config to ~/.config/sway/config to modify the default configuration. See - and + and "man 5 sway" for more information''; wrapperFeatures = mkOption { type = wrapperOptions; default = { }; example = { gtk = true; }; - description = '' + description = lib.mdDoc '' Attribute set of features to enable in the wrapper. ''; }; @@ -64,10 +64,10 @@ in { # use this if they aren't displayed properly: export _JAVA_AWT_WM_NONREPARENTING=1 ''; - description = '' + description = lib.mdDoc '' Shell commands executed just before Sway is started. See - - and + + and for some useful environment variables. ''; }; @@ -81,7 +81,7 @@ in { "--unsupported-gpu" "--my-next-gpu-wont-be-nvidia" ]; - description = '' + description = lib.mdDoc '' Command line arguments passed to launch Sway. Please DO NOT report issues if you use an unsupported GPU (proprietary drivers). ''; @@ -101,10 +101,10 @@ in { termite rofi light ] ''; - description = '' + description = lib.mdDoc '' Extra packages to be installed system wide. See - and - + and + for a list of useful software. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/systemtap.nix b/third_party/nixpkgs/nixos/modules/programs/systemtap.nix index 360e106678..cbb9ec164c 100644 --- a/third_party/nixpkgs/nixos/modules/programs/systemtap.nix +++ b/third_party/nixpkgs/nixos/modules/programs/systemtap.nix @@ -10,8 +10,8 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' - Install systemtap along with necessary kernel options. + description = lib.mdDoc '' + Install {command}`systemtap` along with necessary kernel options. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/thunar.nix b/third_party/nixpkgs/nixos/modules/programs/thunar.nix index 5ea2982dd9..a67d8ae064 100644 --- a/third_party/nixpkgs/nixos/modules/programs/thunar.nix +++ b/third_party/nixpkgs/nixos/modules/programs/thunar.nix @@ -16,7 +16,7 @@ in { plugins = mkOption { default = []; type = types.listOf types.package; - description = "List of thunar plugins to install."; + description = lib.mdDoc "List of thunar plugins to install."; example = literalExpression "with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]"; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/tmux.nix b/third_party/nixpkgs/nixos/modules/programs/tmux.nix index 74b3fbd9ac..cf7ea4cfcf 100644 --- a/third_party/nixpkgs/nixos/modules/programs/tmux.nix +++ b/third_party/nixpkgs/nixos/modules/programs/tmux.nix @@ -70,14 +70,14 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whenever to configure tmux system-wide."; + description = lib.mdDoc "Whenever to configure {command}`tmux` system-wide."; relatedPackages = [ "tmux" ]; }; aggressiveResize = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Resize the window to the size of the smallest session for which it is the current window. ''; }; @@ -86,31 +86,31 @@ in { default = 0; example = 1; type = types.int; - description = "Base index for windows and panes."; + description = lib.mdDoc "Base index for windows and panes."; }; clock24 = mkOption { default = false; type = types.bool; - description = "Use 24 hour clock."; + description = lib.mdDoc "Use 24 hour clock."; }; customPaneNavigationAndResize = mkOption { default = false; type = types.bool; - description = "Override the hjkl and HJKL bindings for pane navigation and resizing in VI mode."; + description = lib.mdDoc "Override the hjkl and HJKL bindings for pane navigation and resizing in VI mode."; }; escapeTime = mkOption { default = 500; example = 0; type = types.int; - description = "Time in milliseconds for which tmux waits after an escape is input."; + description = lib.mdDoc "Time in milliseconds for which tmux waits after an escape is input."; }; extraConfig = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Additional contents of /etc/tmux.conf ''; type = types.lines; @@ -120,53 +120,53 @@ in { default = 2000; example = 5000; type = types.int; - description = "Maximum number of lines held in window history."; + description = lib.mdDoc "Maximum number of lines held in window history."; }; keyMode = mkOption { default = defaultKeyMode; example = "vi"; type = types.enum [ "emacs" "vi" ]; - description = "VI or Emacs style shortcuts."; + description = lib.mdDoc "VI or Emacs style shortcuts."; }; newSession = mkOption { default = false; type = types.bool; - description = "Automatically spawn a session if trying to attach and none are running."; + description = lib.mdDoc "Automatically spawn a session if trying to attach and none are running."; }; reverseSplit = mkOption { default = false; type = types.bool; - description = "Reverse the window split shortcuts."; + description = lib.mdDoc "Reverse the window split shortcuts."; }; resizeAmount = mkOption { default = defaultResize; example = 10; type = types.int; - description = "Number of lines/columns when resizing."; + description = lib.mdDoc "Number of lines/columns when resizing."; }; shortcut = mkOption { default = defaultShortcut; example = "a"; type = types.str; - description = "Ctrl following by this key is used as the main shortcut."; + description = lib.mdDoc "Ctrl following by this key is used as the main shortcut."; }; terminal = mkOption { default = defaultTerminal; example = "screen-256color"; type = types.str; - description = "Set the $TERM variable."; + description = lib.mdDoc "Set the $TERM variable."; }; secureSocket = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Store tmux socket under /run, which is more secure than /tmp, but as a downside it doesn't survive user logout. ''; @@ -175,7 +175,7 @@ in { plugins = mkOption { default = []; type = types.listOf types.package; - description = "List of plugins to install."; + description = lib.mdDoc "List of plugins to install."; example = lib.literalExpression "[ pkgs.tmuxPlugins.nord ]"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/traceroute.nix b/third_party/nixpkgs/nixos/modules/programs/traceroute.nix index 6e04057ac5..df5f10b87d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/traceroute.nix +++ b/third_party/nixpkgs/nixos/modules/programs/traceroute.nix @@ -10,7 +10,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to configure a setcap wrapper for traceroute. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix b/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix index 28db962538..0a3af3744a 100644 --- a/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix +++ b/third_party/nixpkgs/nixos/modules/programs/tsm-client.nix @@ -26,43 +26,43 @@ let options.name = mkOption { type = servernameType; example = "mainTsmServer"; - description = '' + description = lib.mdDoc '' Local name of the IBM TSM server, must be uncapitalized and no longer than 64 chars. The value will be used for the - server - directive in dsm.sys. + `server` + directive in {file}`dsm.sys`. ''; }; options.server = mkOption { type = nonEmptyStr; example = "tsmserver.company.com"; - description = '' + description = lib.mdDoc '' Host/domain name or IP address of the IBM TSM server. The value will be used for the - tcpserveraddress - directive in dsm.sys. + `tcpserveraddress` + directive in {file}`dsm.sys`. ''; }; options.port = mkOption { type = addCheck port (p: p<=32767); default = 1500; # official default - description = '' + description = lib.mdDoc '' TCP port of the IBM TSM server. The value will be used for the - tcpport - directive in dsm.sys. + `tcpport` + directive in {file}`dsm.sys`. TSM does not support ports above 32767. ''; }; options.node = mkOption { type = nonEmptyStr; example = "MY-TSM-NODE"; - description = '' + description = lib.mdDoc '' Target node name on the IBM TSM server. The value will be used for the - nodename - directive in dsm.sys. + `nodename` + directive in {file}`dsm.sys`. ''; }; options.genPasswd = mkEnableOption '' @@ -80,12 +80,12 @@ let options.passwdDir = mkOption { type = path; example = "/home/alice/tsm-password"; - description = '' + description = lib.mdDoc '' Directory that holds the TSM node's password information. The value will be used for the - passworddir - directive in dsm.sys. + `passworddir` + directive in {file}`dsm.sys`. ''; }; options.includeExclude = mkOption { @@ -114,9 +114,9 @@ let default = {}; example.compression = "yes"; example.passwordaccess = null; - description = '' + description = lib.mdDoc '' Additional key-value pairs for the server stanza. - Values must be strings, or null + Values must be strings, or `null` for the key not to be used in the stanza (e.g. to overrule values generated by other options). ''; @@ -125,13 +125,13 @@ let type = lines; example = literalExpression ''lib.modules.mkAfter "compression no"''; - description = '' + description = lib.mdDoc '' Additional text lines for the server stanza. This option can be used if certion configuration keys must be used multiple times or ordered in a certain way - as the option can't + as the {option}`extraConfig` option can't control the order of lines in the resulting stanza. - Note that the server + Note that the `server` line at the beginning of the stanza is not part of this option's value. ''; @@ -185,7 +185,7 @@ let node = "MY-TSM-NODE"; extraConfig.compression = "yes"; }; - description = '' + description = lib.mdDoc '' Server definitions ("stanzas") for the client system-options file. ''; @@ -194,20 +194,20 @@ let type = nullOr servernameType; default = null; example = "mainTsmServer"; - description = '' + description = lib.mdDoc '' If multiple server stanzas are declared with - , + {option}`programs.tsmClient.servers`, this option may be used to name a default server stanza that IBM TSM uses in the absence of - a user-defined dsm.opt file. + a user-defined {file}`dsm.opt` file. This option translates to a - defaultserver configuration line. + `defaultserver` configuration line. ''; }; dsmSysText = mkOption { type = lines; readOnly = true; - description = '' + description = lib.mdDoc '' This configuration key contains the effective text of the client system-options file "dsm.sys". It should not be changed, but may be @@ -220,17 +220,17 @@ let default = pkgs.tsm-client; defaultText = literalExpression "pkgs.tsm-client"; example = literalExpression "pkgs.tsm-client-withGui"; - description = '' + description = lib.mdDoc '' The TSM client derivation to be added to the system environment. - It will called with .override + It will called with `.override` to add paths to the client system-options file. ''; }; wrappedPackage = mkOption { type = package; readOnly = true; - description = '' + description = lib.mdDoc '' The TSM client derivation, wrapped with the path to the client system-options file "dsm.sys". This option is to provide the effective derivation diff --git a/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix b/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix index e6f8836aa3..a0e4a36cfd 100644 --- a/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix +++ b/third_party/nixpkgs/nixos/modules/programs/turbovnc.nix @@ -15,14 +15,14 @@ in ensureHeadlessSoftwareOpenGL = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to set up NixOS such that TurboVNC's built-in software OpenGL implementation works. - This will enable so that OpenGL + This will enable {option}`hardware.opengl.enable` so that OpenGL programs can find Mesa's llvmpipe drivers. - Setting this option to false does not mean that software + Setting this option to `false` does not mean that software OpenGL won't work; it may still work depending on your system configuration. diff --git a/third_party/nixpkgs/nixos/modules/programs/vim.nix b/third_party/nixpkgs/nixos/modules/programs/vim.nix index 1695bc9947..15983e371f 100644 --- a/third_party/nixpkgs/nixos/modules/programs/vim.nix +++ b/third_party/nixpkgs/nixos/modules/programs/vim.nix @@ -9,7 +9,7 @@ in { defaultEditor = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' When enabled, installs vim and configures vim to be the default editor using the EDITOR environment variable. ''; @@ -20,7 +20,7 @@ in { default = pkgs.vim; defaultText = literalExpression "pkgs.vim"; example = literalExpression "pkgs.vimHugeX"; - description = '' + description = lib.mdDoc '' vim package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/wavemon.nix b/third_party/nixpkgs/nixos/modules/programs/wavemon.nix index e5ccacba75..4dbf274891 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wavemon.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wavemon.nix @@ -10,7 +10,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to add wavemon to the global environment and configure a setcap wrapper for it. ''; diff --git a/third_party/nixpkgs/nixos/modules/programs/weylus.nix b/third_party/nixpkgs/nixos/modules/programs/weylus.nix index ea92c77e7c..0a506bfa27 100644 --- a/third_party/nixpkgs/nixos/modules/programs/weylus.nix +++ b/third_party/nixpkgs/nixos/modules/programs/weylus.nix @@ -12,7 +12,7 @@ in openFirewall = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' Open ports needed for the functionality of the program. ''; }; @@ -20,7 +20,7 @@ in users = mkOption { type = listOf str; default = [ ]; - description = '' + description = lib.mdDoc '' To enable stylus and multi-touch support, the user you're going to use must be added to this list. These users can synthesize input events system-wide, even when another user is logged in - untrusted users should not be added. ''; @@ -30,7 +30,7 @@ in type = package; default = pkgs.weylus; defaultText = "pkgs.weylus"; - description = "Weylus package to install."; + description = lib.mdDoc "Weylus package to install."; }; }; config = mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/programs/wireshark.nix b/third_party/nixpkgs/nixos/modules/programs/wireshark.nix index f7b0727cb2..088c2bb795 100644 --- a/third_party/nixpkgs/nixos/modules/programs/wireshark.nix +++ b/third_party/nixpkgs/nixos/modules/programs/wireshark.nix @@ -11,7 +11,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to add Wireshark to the global environment and configure a setcap wrapper for 'dumpcap' for users in the 'wireshark' group. ''; @@ -20,7 +20,7 @@ in { type = types.package; default = pkgs.wireshark-cli; defaultText = literalExpression "pkgs.wireshark-cli"; - description = '' + description = lib.mdDoc '' Which Wireshark package to install in the global environment. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/xfs_quota.nix b/third_party/nixpkgs/nixos/modules/programs/xfs_quota.nix index c03e59a5b4..a1e9ff941c 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xfs_quota.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xfs_quota.nix @@ -28,37 +28,37 @@ in options = { id = mkOption { type = types.int; - description = "Project ID."; + description = lib.mdDoc "Project ID."; }; fileSystem = mkOption { type = types.str; - description = "XFS filesystem hosting the xfs_quota project."; + description = lib.mdDoc "XFS filesystem hosting the xfs_quota project."; default = "/"; }; path = mkOption { type = types.str; - description = "Project directory."; + description = lib.mdDoc "Project directory."; }; sizeSoftLimit = mkOption { type = types.nullOr types.str; default = null; example = "30g"; - description = "Soft limit of the project size"; + description = lib.mdDoc "Soft limit of the project size"; }; sizeHardLimit = mkOption { type = types.nullOr types.str; default = null; example = "50g"; - description = "Hard limit of the project size."; + description = lib.mdDoc "Hard limit of the project size."; }; }; }); - description = "Setup of xfs_quota projects. Make sure the filesystem is mounted with the pquota option."; + description = lib.mdDoc "Setup of xfs_quota projects. Make sure the filesystem is mounted with the pquota option."; example = { projname = { diff --git a/third_party/nixpkgs/nixos/modules/programs/xonsh.nix b/third_party/nixpkgs/nixos/modules/programs/xonsh.nix index 6e40db51cd..3223761f93 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xonsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xonsh.nix @@ -18,7 +18,7 @@ in enable = mkOption { default = false; - description = '' + description = lib.mdDoc '' Whether to configure xonsh as an interactive shell. ''; type = types.bool; @@ -29,14 +29,14 @@ in default = pkgs.xonsh; defaultText = literalExpression "pkgs.xonsh"; example = literalExpression "pkgs.xonsh.override { configFile = \"/path/to/xonshrc\"; }"; - description = '' + description = lib.mdDoc '' xonsh package to use. ''; }; config = mkOption { default = ""; - description = "Control file to customize your shell behavior."; + description = lib.mdDoc "Control file to customize your shell behavior."; type = types.lines; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix b/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix index aba76133e5..c14c09721d 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xss-lock.nix @@ -14,16 +14,16 @@ in defaultText = literalExpression ''"''${pkgs.i3lock}/bin/i3lock"''; example = literalExpression ''"''${pkgs.i3lock-fancy}/bin/i3lock-fancy"''; type = types.separatedString " "; - description = "Locker to be used with xsslock"; + description = lib.mdDoc "Locker to be used with xsslock"; }; extraOptions = mkOption { default = [ ]; example = [ "--ignore-sleep" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Additional command-line arguments to pass to - xss-lock. + {command}`xss-lock`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/xwayland.nix b/third_party/nixpkgs/nixos/modules/programs/xwayland.nix index 3a8080fa4c..9296116dca 100644 --- a/third_party/nixpkgs/nixos/modules/programs/xwayland.nix +++ b/third_party/nixpkgs/nixos/modules/programs/xwayland.nix @@ -19,7 +19,7 @@ in defaultText = literalExpression '' optionalString config.fonts.fontDir.enable "/run/current-system/sw/share/X11/fonts" ''; - description = '' + description = lib.mdDoc '' Default font path. Setting this option causes Xwayland to be rebuilt. ''; }; @@ -34,7 +34,7 @@ in inherit (config.programs.xwayland) defaultFontPath; }) ''; - description = "The Xwayland package to use."; + description = lib.mdDoc "The Xwayland package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/yabar.nix b/third_party/nixpkgs/nixos/modules/programs/yabar.nix index a8fac41e89..0ec668ada8 100644 --- a/third_party/nixpkgs/nixos/modules/programs/yabar.nix +++ b/third_party/nixpkgs/nixos/modules/programs/yabar.nix @@ -79,7 +79,7 @@ in example = "Droid Sans, FontAwesome Bold 9"; type = types.str; - description = '' + description = lib.mdDoc '' The font that will be used to draw the status bar. ''; }; @@ -89,7 +89,7 @@ in example = "bottom"; type = types.enum [ "top" "bottom" ]; - description = '' + description = lib.mdDoc '' The position where the bar will be rendered. ''; }; @@ -98,7 +98,7 @@ in default = {}; type = types.attrsOf types.str; - description = '' + description = lib.mdDoc '' An attribute set which contains further attributes of a bar. ''; }; @@ -109,7 +109,7 @@ in options.exec = mkOption { example = "YABAR_DATE"; type = types.str; - description = '' + description = lib.mdDoc '' The type of the indicator to be executed. ''; }; @@ -119,7 +119,7 @@ in example = "right"; type = types.enum [ "left" "center" "right" ]; - description = '' + description = lib.mdDoc '' Whether to align the indicator at the left or right of the bar. ''; }; @@ -128,20 +128,20 @@ in default = {}; type = types.attrsOf (types.either types.str types.int); - description = '' + description = lib.mdDoc '' An attribute set which contains further attributes of a indicator. ''; }; }); - description = '' + description = lib.mdDoc '' Indicators that should be rendered by yabar. ''; }; }; }); - description = '' + description = lib.mdDoc '' List of bars that should be rendered by yabar. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix index 9d7622bd32..b253b803ed 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -41,7 +41,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable oh-my-zsh. ''; }; @@ -59,7 +59,7 @@ in plugins = mkOption { default = []; type = types.listOf(types.str); - description = '' + description = lib.mdDoc '' List of oh-my-zsh plugins ''; }; @@ -84,7 +84,7 @@ in theme = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Name of the theme to be used by oh-my-zsh. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix index 2e53e907d5..b6c36a082e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-autosuggestions.nix @@ -17,7 +17,7 @@ in highlightStyle = mkOption { type = types.str; default = "fg=8"; # https://github.com/zsh-users/zsh-autosuggestions/tree/v0.4.3#suggestion-highlight-style - description = "Highlight style for suggestions ({fore,back}ground color)"; + description = lib.mdDoc "Highlight style for suggestions ({fore,back}ground color)"; example = "fg=cyan"; }; @@ -40,14 +40,14 @@ in async = mkOption { type = types.bool; default = true; - description = "Whether to fetch suggestions asynchronously"; + description = lib.mdDoc "Whether to fetch suggestions asynchronously"; example = false; }; extraConfig = mkOption { type = with types; attrsOf str; default = {}; - description = "Attribute set with additional configuration values"; + description = lib.mdDoc "Attribute set with additional configuration values"; example = literalExpression '' { "ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" = "20"; diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix index 1eb53ccae5..37e1c2ebc3 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh-syntax-highlighting.nix @@ -30,7 +30,7 @@ in "line" ])); - description = '' + description = lib.mdDoc '' Specifies the highlighters to be used by zsh-syntax-highlighting. The following defined options can be found here: @@ -48,7 +48,7 @@ in } ''; - description = '' + description = lib.mdDoc '' Specifies custom patterns to be highlighted by zsh-syntax-highlighting. Please refer to the docs for more information about the usage: @@ -65,7 +65,7 @@ in } ''; - description = '' + description = lib.mdDoc '' Specifies custom styles to be highlighted by zsh-syntax-highlighting. Please refer to the docs for more information about the usage: diff --git a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix index 5fe98b6801..0c59d20fee 100644 --- a/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix +++ b/third_party/nixpkgs/nixos/modules/programs/zsh/zsh.nix @@ -44,27 +44,27 @@ in enable = mkOption { default = false; - description = '' + description = lib.mdDoc '' Whether to configure zsh as an interactive shell. To enable zsh for - a particular user, use the + a particular user, use the {option}`users.users..shell` option for that user. To enable zsh system-wide use the - option. + {option}`users.defaultUserShell` option. ''; type = types.bool; }; shellAliases = mkOption { default = { }; - description = '' - Set of aliases for zsh shell, which overrides . - See for an option format description. + description = lib.mdDoc '' + Set of aliases for zsh shell, which overrides {option}`environment.shellAliases`. + See {option}`environment.shellAliases` for an option format description. ''; type = with types; attrsOf (nullOr (either str path)); }; shellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during zsh shell initialisation. ''; type = types.lines; @@ -72,7 +72,7 @@ in loginShellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during zsh login shell initialisation. ''; type = types.lines; @@ -80,7 +80,7 @@ in interactiveShellInit = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Shell script code called during interactive zsh shell initialisation. ''; type = types.lines; @@ -94,7 +94,7 @@ in # a lot of different prompt variables. autoload -U promptinit && promptinit && prompt suse && setopt prompt_sp ''; - description = '' + description = lib.mdDoc '' Shell script code used to initialise the zsh prompt. ''; type = types.lines; @@ -102,7 +102,7 @@ in histSize = mkOption { default = 2000; - description = '' + description = lib.mdDoc '' Change history size. ''; type = types.int; @@ -110,7 +110,7 @@ in histFile = mkOption { default = "$HOME/.zsh_history"; - description = '' + description = lib.mdDoc '' Change history file. ''; type = types.str; @@ -124,15 +124,15 @@ in "HIST_FCNTL_LOCK" ]; example = [ "EXTENDED_HISTORY" "RM_STAR_WAIT" ]; - description = '' + description = lib.mdDoc '' Configure zsh options. See - zshoptions1. + {manpage}`zshoptions(1)`. ''; }; enableCompletion = mkOption { default = true; - description = '' + description = lib.mdDoc '' Enable zsh completion for all interactive zsh shells. ''; type = types.bool; @@ -140,7 +140,7 @@ in enableBashCompletion = mkOption { default = false; - description = '' + description = lib.mdDoc '' Enable compatibility with bash's programmable completion system. ''; type = types.bool; @@ -149,11 +149,11 @@ in enableGlobalCompInit = mkOption { default = cfg.enableCompletion; defaultText = literalExpression "config.${opt.enableCompletion}"; - description = '' + description = lib.mdDoc '' Enable execution of compinit call for all interactive zsh shells. This option can be disabled if the user wants to extend its - fpath and a custom compinit + `fpath` and a custom `compinit` call in the local config is required. ''; type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/rename.nix b/third_party/nixpkgs/nixos/modules/rename.nix index 22fcb72e9f..f86aa2fa5c 100644 --- a/third_party/nixpkgs/nixos/modules/rename.nix +++ b/third_party/nixpkgs/nixos/modules/rename.nix @@ -30,6 +30,10 @@ with lib; udev rules from libu2f-host to the system. Udev gained native support to handle FIDO security tokens, so this isn't necessary anymore. '') + (mkRemovedOptionModule [ "hardware" "xow" ] '' + The xow package was removed from nixpkgs. Upstream has deprecated + the project and users are urged to switch to xone. + '') (mkRemovedOptionModule [ "networking" "vpnc" ] "Use environment.etc.\"vpnc/service.conf\" instead.") (mkRemovedOptionModule [ "networking" "wicd" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "programs" "tilp2" ] "The corresponding package was removed from nixpkgs.") diff --git a/third_party/nixpkgs/nixos/modules/security/acme/default.nix b/third_party/nixpkgs/nixos/modules/security/acme/default.nix index d827c44805..a1d8c53330 100644 --- a/third_party/nixpkgs/nixos/modules/security/acme/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/acme/default.nix @@ -445,7 +445,7 @@ let validMinDays = mkOption { type = types.int; inherit (defaultAndText "validMinDays" 30) default defaultText; - description = "Minimum remaining validity before renewal in days."; + description = lib.mdDoc "Minimum remaining validity before renewal in days."; }; renewInterval = mkOption { @@ -466,11 +466,11 @@ let type = types.nullOr types.str; inherit (defaultAndText "webroot" null) default defaultText; example = "/var/lib/acme/acme-challenge"; - description = '' + description = lib.mdDoc '' Where the webroot of the HTTP vhost is located. - .well-known/acme-challenge/ directory + {file}`.well-known/acme-challenge/` directory will be created below the webroot if it doesn't exist. - http://example.org/.well-known/acme-challenge/ must also + `http://example.org/.well-known/acme-challenge/` must also be available (notice unencrypted HTTP). ''; }; @@ -478,17 +478,17 @@ let server = mkOption { type = types.nullOr types.str; inherit (defaultAndText "server" null) default defaultText; - description = '' + description = lib.mdDoc '' ACME Directory Resource URI. Defaults to Let's Encrypt's production endpoint, - , if unset. + , if unset. ''; }; email = mkOption { type = types.str; inherit (defaultAndText "email" null) default defaultText; - description = '' + description = lib.mdDoc '' Email address for account creation and correspondence from the CA. It is recommended to use the same email for all certs to avoid account creation limits. @@ -498,14 +498,14 @@ let group = mkOption { type = types.str; inherit (defaultAndText "group" "acme") default defaultText; - description = "Group running the ACME client."; + description = lib.mdDoc "Group running the ACME client."; }; reloadServices = mkOption { type = types.listOf types.str; inherit (defaultAndText "reloadServices" []) default defaultText; - description = '' - The list of systemd services to call systemctl try-reload-or-restart + description = lib.mdDoc '' + The list of systemd services to call `systemctl try-reload-or-restart` on. ''; }; @@ -514,7 +514,7 @@ let type = types.lines; inherit (defaultAndText "postRun" "") default defaultText; example = "cp full.pem backup.pem"; - description = '' + description = lib.mdDoc '' Commands to run after new certificates go live. Note that these commands run as the root user. @@ -525,10 +525,10 @@ let keyType = mkOption { type = types.str; inherit (defaultAndText "keyType" "ec256") default defaultText; - description = '' + description = lib.mdDoc '' Key type to use for private keys. For an up to date list of supported values check the --key-type option - at . + at . ''; }; @@ -536,9 +536,9 @@ let type = types.nullOr types.str; inherit (defaultAndText "dnsProvider" null) default defaultText; example = "route53"; - description = '' + description = lib.mdDoc '' DNS Challenge provider. For a list of supported providers, see the "code" - field of the DNS providers listed at . + field of the DNS providers listed at . ''; }; @@ -546,7 +546,7 @@ let type = types.nullOr types.str; inherit (defaultAndText "dnsResolver" null) default defaultText; example = "1.1.1.1:53"; - description = '' + description = lib.mdDoc '' Set the resolver to use for performing recursive DNS queries. Supported: host:port. The default is to use the system resolvers, or Google's DNS resolvers if the system's cannot be determined. @@ -556,11 +556,11 @@ let credentialsFile = mkOption { type = types.path; inherit (defaultAndText "credentialsFile" null) default defaultText; - description = '' + description = lib.mdDoc '' Path to an EnvironmentFile for the cert's service containing any required and optional environment variables for your selected dnsProvider. To find out what values you need to set, consult the documentation at - for the corresponding dnsProvider. + for the corresponding dnsProvider. ''; example = "/var/src/secrets/example.org-route53-api-token"; }; @@ -568,7 +568,7 @@ let dnsPropagationCheck = mkOption { type = types.bool; inherit (defaultAndText "dnsPropagationCheck" true) default defaultText; - description = '' + description = lib.mdDoc '' Toggles lego DNS propagation check, which is used alongside DNS-01 challenge to ensure the DNS entries required are available. ''; @@ -581,8 +581,8 @@ let Turns on the OCSP Must-Staple TLS extension. Make sure you know what you're doing! See: - - + + ''; }; @@ -590,7 +590,7 @@ let extraLegoFlags = mkOption { type = types.listOf types.str; inherit (defaultAndText "extraLegoFlags" []) default defaultText; - description = '' + description = lib.mdDoc '' Additional global flags to pass to all lego commands. ''; }; @@ -598,7 +598,7 @@ let extraLegoRenewFlags = mkOption { type = types.listOf types.str; inherit (defaultAndText "extraLegoRenewFlags" []) default defaultText; - description = '' + description = lib.mdDoc '' Additional flags to pass to lego renew. ''; }; @@ -606,7 +606,7 @@ let extraLegoRunFlags = mkOption { type = types.listOf types.str; inherit (defaultAndText "extraLegoRunFlags" []) default defaultText; - description = '' + description = lib.mdDoc '' Additional flags to pass to lego run. ''; }; @@ -637,13 +637,13 @@ let type = types.str; readOnly = true; default = "/var/lib/acme/${name}"; - description = "Directory where certificate and other state is stored."; + description = lib.mdDoc "Directory where certificate and other state is stored."; }; domain = mkOption { type = types.str; default = name; - description = "Domain to fetch certificate for (defaults to the entry name)."; + description = lib.mdDoc "Domain to fetch certificate for (defaults to the entry name)."; }; extraDomainNames = mkOption { @@ -655,7 +655,7 @@ let "mydomain.org" ] ''; - description = '' + description = lib.mdDoc '' A list of extra domain names, which are included in the one certificate to be issued. ''; }; @@ -667,7 +667,7 @@ let type = types.nullOr types.str; default = null; example = ":1360"; - description = '' + description = lib.mdDoc '' Interface and port to listen on to solve HTTP challenges in the form [INTERFACE]:PORT. If you use a port other than 80, you must proxy port 80 to this port. @@ -690,7 +690,7 @@ in { preliminarySelfsigned = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether a preliminary self-signed certificate should be generated before doing ACME requests. This can be useful when certificates are required in a webserver, but ACME needs the webserver to make its requests. @@ -703,16 +703,16 @@ in { acceptTerms = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Accept the CA's terms of service. The default provider is Let's Encrypt, - you can find their ToS at . + you can find their ToS at . ''; }; useRoot = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use the root user when generating certs. This is not recommended for security + compatiblity reasons. If a service requires root owned certificates consider following the guide on "Using ACME with services demanding root @@ -723,7 +723,7 @@ in { defaults = mkOption { type = types.submodule (inheritableModule true); - description = '' + description = lib.mdDoc '' Default values inheritable by all configured certs. You can use this to define options shared by all your certs. These defaults can also be ignored on a per-cert basis using the @@ -734,9 +734,9 @@ in { certs = mkOption { default = { }; type = with types; attrsOf (submodule [ (inheritableModule false) certOpts ]); - description = '' + description = lib.mdDoc '' Attribute set of certificates to get signed and renewed. Creates - acme-''${cert}.{service,timer} systemd units for + `acme-''${cert}.{service,timer}` systemd units for each certificate defined here. Other services can add dependencies to those units if they rely on the certificates being present, or trigger restarts of the service if certificates get renewed. diff --git a/third_party/nixpkgs/nixos/modules/security/audit.nix b/third_party/nixpkgs/nixos/modules/security/audit.nix index 2b22bdd9f0..06b4766c8f 100644 --- a/third_party/nixpkgs/nixos/modules/security/audit.nix +++ b/third_party/nixpkgs/nixos/modules/security/audit.nix @@ -56,7 +56,7 @@ in { enable = mkOption { type = types.enum [ false true "lock" ]; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the Linux audit system. The special `lock' value can be used to enable auditing and prevent disabling it until a restart. Be careful about locking this, as it will prevent you from changing your audit configuration until you @@ -67,13 +67,13 @@ in { failureMode = mkOption { type = types.enum [ "silent" "printk" "panic" ]; default = "printk"; - description = "How to handle critical errors in the auditing system"; + description = lib.mdDoc "How to handle critical errors in the auditing system"; }; backlogLimit = mkOption { type = types.int; default = 64; # Apparently the kernel default - description = '' + description = lib.mdDoc '' The maximum number of outstanding audit buffers allowed; exceeding this is considered a failure and handled in a manner specified by failureMode. ''; @@ -82,7 +82,7 @@ in { rateLimit = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' The maximum messages per second permitted before triggering a failure as specified by failureMode. Setting it to zero disables the limit. ''; @@ -92,7 +92,7 @@ in { type = types.listOf types.str; # (types.either types.str (types.submodule rule)); default = []; example = [ "-a exit,always -F arch=b64 -S execve" ]; - description = '' + description = lib.mdDoc '' The ordered audit rules, with each string appearing as one line of the audit.rules file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/security/ca.nix b/third_party/nixpkgs/nixos/modules/security/ca.nix index f71d9d90ec..c704e2c1f5 100644 --- a/third_party/nixpkgs/nixos/modules/security/ca.nix +++ b/third_party/nixpkgs/nixos/modules/security/ca.nix @@ -23,12 +23,12 @@ in type = types.listOf types.path; default = []; example = literalExpression ''[ "''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]''; - description = '' + description = lib.mdDoc '' A list of files containing trusted root certificates in PEM format. These are concatenated to form - /etc/ssl/certs/ca-certificates.crt, which is + {file}`/etc/ssl/certs/ca-certificates.crt`, which is used by many programs that use OpenSSL, such as - curl and git. + {command}`curl` and {command}`git`. ''; }; @@ -47,7 +47,7 @@ in ''' ] ''; - description = '' + description = lib.mdDoc '' A list of trusted root certificates in PEM format. ''; }; @@ -60,10 +60,10 @@ in "CA WoSign ECC Root" "Certification Authority of WoSign G2" ]; - description = '' + description = lib.mdDoc '' A list of blacklisted CA certificate names that won't be imported from the Mozilla Trust Store into - /etc/ssl/certs/ca-certificates.crt. Use the + {file}`/etc/ssl/certs/ca-certificates.crt`. Use the names from that file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix b/third_party/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix index bb99c053f7..cab4b9f8d3 100644 --- a/third_party/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix +++ b/third_party/nixpkgs/nixos/modules/security/chromium-suid-sandbox.nix @@ -14,7 +14,7 @@ in options.security.chromiumSuidSandbox.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to install the Chromium SUID sandbox which is an executable that Chromium may use in order to achieve sandboxing. diff --git a/third_party/nixpkgs/nixos/modules/security/dhparams.nix b/third_party/nixpkgs/nixos/modules/security/dhparams.nix index cfa9003f12..b3fce7e83a 100644 --- a/third_party/nixpkgs/nixos/modules/security/dhparams.nix +++ b/third_party/nixpkgs/nixos/modules/security/dhparams.nix @@ -15,7 +15,7 @@ let type = bitType; default = cfg.defaultBitSize; defaultText = literalExpression "config.${opt.defaultBitSize}"; - description = '' + description = lib.mdDoc '' The bit size for the prime that is used during a Diffie-Hellman key exchange. ''; @@ -24,11 +24,11 @@ let options.path = mkOption { type = types.path; readOnly = true; - description = '' + description = lib.mdDoc '' The resulting path of the generated Diffie-Hellman parameters file for other services to reference. This could be either a store path or a file inside the directory specified by - . + {option}`security.dhparams.path`. ''; }; @@ -45,7 +45,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to generate new DH params and clean up old DH params. ''; }; @@ -61,7 +61,7 @@ in { The value is the size (in bits) of the DH params to generate. The generated DH params path can be found in - config.security.dhparams.params.name.path. + config.security.dhparams.params.«name».path. The name of the DH params is taken as being the name of the service it serves and the params will be generated before the @@ -101,21 +101,21 @@ in { defaultBitSize = mkOption { type = bitType; default = 2048; - description = '' + description = lib.mdDoc '' This allows to override the default bit size for all of the Diffie-Hellman parameters set in - . + {option}`security.dhparams.params`. ''; }; path = mkOption { type = types.str; default = "/var/lib/dhparams"; - description = '' + description = lib.mdDoc '' Path to the directory in which Diffie-Hellman parameters will be stored. This only is relevant if - is - true. + {option}`security.dhparams.stateful` is + `true`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/security/doas.nix b/third_party/nixpkgs/nixos/modules/security/doas.nix index 2a814f17e4..4d15ed9a80 100644 --- a/third_party/nixpkgs/nixos/modules/security/doas.nix +++ b/third_party/nixpkgs/nixos/modules/security/doas.nix @@ -53,8 +53,8 @@ in enable = mkOption { type = with types; bool; default = false; - description = '' - Whether to enable the doas command, which allows + description = lib.mdDoc '' + Whether to enable the {command}`doas` command, which allows non-root users to execute commands as root. ''; }; @@ -62,19 +62,19 @@ in wheelNeedsPassword = mkOption { type = with types; bool; default = true; - description = '' - Whether users of the wheel group must provide a password to - run commands as super user via doas. + description = lib.mdDoc '' + Whether users of the `wheel` group must provide a password to + run commands as super user via {command}`doas`. ''; }; extraRules = mkOption { default = []; - description = '' + description = lib.mdDoc '' Define specific rules to be set in the - /etc/doas.conf file. More specific rules should + {file}`/etc/doas.conf` file. More specific rules should come after more general ones in order to yield the expected behavior. - You can use mkBefore and/or mkAfter to ensure + You can use `mkBefore` and/or `mkAfter` to ensure this is the case when configuration options are merged. ''; example = literalExpression '' @@ -113,8 +113,8 @@ in noPass = mkOption { type = with types; bool; default = false; - description = '' - If true, the user is not required to enter a + description = lib.mdDoc '' + If `true`, the user is not required to enter a password. ''; }; @@ -122,18 +122,18 @@ in noLog = mkOption { type = with types; bool; default = false; - description = '' - If true, successful executions will not be logged + description = lib.mdDoc '' + If `true`, successful executions will not be logged to - syslogd8. + {manpage}`syslogd(8)`. ''; }; persist = mkOption { type = with types; bool; default = false; - description = '' - If true, do not ask for a password again for some + description = lib.mdDoc '' + If `true`, do not ask for a password again for some time after the user successfully authenticates. ''; }; @@ -141,10 +141,10 @@ in keepEnv = mkOption { type = with types; bool; default = false; - description = '' - If true, environment variables other than those + description = lib.mdDoc '' + If `true`, environment variables other than those listed in - doas1 + {manpage}`doas(1)` are kept when creating the environment for the new process. ''; }; @@ -152,18 +152,18 @@ in setEnv = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Keep or set the specified variables. Variables may also be removed with a leading '-' or set using - variable=value. If the first character of - value is a '$', the value to be set is taken from + `variable=value`. If the first character of + `value` is a '$', the value to be set is taken from the existing environment variable of the indicated name. This option is processed after the default environment has been created. - NOTE: All rules have setenv { SSH_AUTH_SOCK } by - default. To prevent SSH_AUTH_SOCK from being - inherited, add "-SSH_AUTH_SOCK" anywhere in this + NOTE: All rules have `setenv { SSH_AUTH_SOCK }` by + default. To prevent `SSH_AUTH_SOCK` from being + inherited, add `"-SSH_AUTH_SOCK"` anywhere in this list. ''; }; @@ -171,35 +171,35 @@ in users = mkOption { type = with types; listOf (either str int); default = []; - description = "The usernames / UIDs this rule should apply for."; + description = lib.mdDoc "The usernames / UIDs this rule should apply for."; }; groups = mkOption { type = with types; listOf (either str int); default = []; - description = "The groups / GIDs this rule should apply for."; + description = lib.mdDoc "The groups / GIDs this rule should apply for."; }; runAs = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Which user or group the specified command is allowed to run as. - When set to null (the default), all users are + When set to `null` (the default), all users are allowed. A user can be specified using just the username: - "foo". It is also possible to only allow running as - a specific group with ":bar". + `"foo"`. It is also possible to only allow running as + a specific group with `":bar"`. ''; }; cmd = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The command the user is allowed to run. When set to - null (the default), all commands are allowed. + `null` (the default), all commands are allowed. NOTE: It is best practice to specify absolute paths. If a relative path is specified, only a restricted PATH will be @@ -210,9 +210,9 @@ in args = mkOption { type = with types; nullOr (listOf str); default = null; - description = '' + description = lib.mdDoc '' Arguments that must be provided to the command. When set to - [], the command must be run without any arguments. + `[]`, the command must be run without any arguments. ''; }; }; @@ -223,8 +223,8 @@ in extraConfig = mkOption { type = with types; lines; default = ""; - description = '' - Extra configuration text appended to doas.conf. + description = lib.mdDoc '' + Extra configuration text appended to {file}`doas.conf`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/security/duosec.nix b/third_party/nixpkgs/nixos/modules/security/duosec.nix index bbe246fe22..02b11766b3 100644 --- a/third_party/nixpkgs/nixos/modules/security/duosec.nix +++ b/third_party/nixpkgs/nixos/modules/security/duosec.nix @@ -36,24 +36,24 @@ in ssh.enable = mkOption { type = types.bool; default = false; - description = "If enabled, protect SSH logins with Duo Security."; + description = lib.mdDoc "If enabled, protect SSH logins with Duo Security."; }; pam.enable = mkOption { type = types.bool; default = false; - description = "If enabled, protect logins with Duo Security using PAM support."; + description = lib.mdDoc "If enabled, protect logins with Duo Security using PAM support."; }; integrationKey = mkOption { type = types.str; - description = "Integration key."; + description = lib.mdDoc "Integration key."; }; secretKeyFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' A file containing your secret key. The security of your Duo application is tied to the security of your secret key. ''; example = "/run/keys/duo-skey"; @@ -61,25 +61,25 @@ in host = mkOption { type = types.str; - description = "Duo API hostname."; + description = lib.mdDoc "Duo API hostname."; }; groups = mkOption { type = types.str; default = ""; example = "users,!wheel,!*admin guests"; - description = '' + description = lib.mdDoc '' If specified, Duo authentication is required only for users whose primary group or supplementary group list matches one of the space-separated pattern lists. Refer to - for details. + for details. ''; }; failmode = mkOption { type = types.enum [ "safe" "secure" ]; default = "safe"; - description = '' + description = lib.mdDoc '' On service or configuration errors that prevent Duo authentication, fail "safe" (allow access) or "secure" (deny access). The default is "safe". @@ -89,7 +89,7 @@ in pushinfo = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Include information such as the command to be executed in the Duo Push message. ''; @@ -98,22 +98,22 @@ in autopush = mkOption { type = types.bool; default = false; - description = '' - If true, Duo Unix will automatically send + description = lib.mdDoc '' + If `true`, Duo Unix will automatically send a push login request to the user’s phone, falling back on a phone call if push is unavailable. If - false, the user will be prompted to + `false`, the user will be prompted to choose an authentication method. When configured with - autopush = yes, we recommend setting - prompts = 1. + `autopush = yes`, we recommend setting + `prompts = 1`. ''; }; motd = mkOption { type = types.bool; default = false; - description = '' - Print the contents of /etc/motd to screen + description = lib.mdDoc '' + Print the contents of `/etc/motd` to screen after a successful login. ''; }; @@ -121,30 +121,30 @@ in prompts = mkOption { type = types.enum [ 1 2 3 ]; default = 3; - description = '' + description = lib.mdDoc '' If a user fails to authenticate with a second factor, Duo Unix will prompt the user to authenticate again. This option sets the maximum number of prompts that Duo Unix will display before denying access. Must be 1, 2, or 3. Default is 3. - For example, when prompts = 1, the user + For example, when `prompts = 1`, the user will have to successfully authenticate on the first prompt, - whereas if prompts = 2, if the user + whereas if `prompts = 2`, if the user enters incorrect information at the initial prompt, he/she will be prompted to authenticate again. - When configured with autopush = true, we - recommend setting prompts = 1. + When configured with `autopush = true`, we + recommend setting `prompts = 1`. ''; }; acceptEnvFactor = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Look for factor selection or passcode in the - $DUO_PASSCODE environment variable before + `$DUO_PASSCODE` environment variable before prompting the user for input. When $DUO_PASSCODE is non-empty, it will override @@ -157,11 +157,11 @@ in fallbackLocalIP = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Duo Unix reports the IP address of the authorizing user, for the purposes of authorization and whitelisting. If Duo Unix cannot detect the IP address of the client, setting - fallbackLocalIP = yes will cause Duo Unix + `fallbackLocalIP = yes` will cause Duo Unix to send the IP address of the server it is running on. If you are using IP whitelisting, enabling this option could @@ -173,7 +173,7 @@ in allowTcpForwarding = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' By default, when SSH forwarding, enabling Duo Security will disable TCP forwarding. By enabling this, you potentially undermine some of the SSH based login security. Note this is diff --git a/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix b/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix index cf416035ef..f75b4df185 100644 --- a/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix +++ b/third_party/nixpkgs/nixos/modules/security/google_oslogin.nix @@ -16,7 +16,7 @@ in security.googleOsLogin.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Google OS Login. The OS Login package enables the following components: diff --git a/third_party/nixpkgs/nixos/modules/security/lock-kernel-modules.nix b/third_party/nixpkgs/nixos/modules/security/lock-kernel-modules.nix index 065587bc28..674ba85781 100644 --- a/third_party/nixpkgs/nixos/modules/security/lock-kernel-modules.nix +++ b/third_party/nixpkgs/nixos/modules/security/lock-kernel-modules.nix @@ -11,11 +11,11 @@ with lib; security.lockKernelModules = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Disable kernel module loading once the system is fully initialised. Module loading is disabled until the next reboot. Problems caused by delayed module loading can be fixed by adding the module(s) in - question to . + question to {option}`boot.kernelModules`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/security/misc.nix b/third_party/nixpkgs/nixos/modules/security/misc.nix index c20e067b8c..6833452a57 100644 --- a/third_party/nixpkgs/nixos/modules/security/misc.nix +++ b/third_party/nixpkgs/nixos/modules/security/misc.nix @@ -15,7 +15,7 @@ with lib; security.allowUserNamespaces = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to allow creation of user namespaces. The motivation for disabling user namespaces is the potential @@ -34,7 +34,7 @@ with lib; security.unprivilegedUsernsClone = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' When disabled, unprivileged users will not be able to create new namespaces. By default unprivileged user namespaces are disabled. This option only works in a hardened profile. @@ -44,7 +44,7 @@ with lib; security.protectKernelImage = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to prevent replacing the running kernel image. ''; }; @@ -52,7 +52,7 @@ with lib; security.allowSimultaneousMultithreading = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to allow SMT/hyperthreading. Disabling SMT means that only physical CPU cores will be usable at runtime, potentially at significant performance cost. @@ -62,7 +62,7 @@ with lib; e.g., shared caches). This attack vector is unproven. Disabling SMT is a supplement to the L1 data cache flushing mitigation - (see ) + (see [](#opt-security.virtualisation.flushL1DataCache)) versus malicious VM guests (SMT could "bring back" previously flushed data). ''; @@ -71,7 +71,7 @@ with lib; security.forcePageTableIsolation = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to force-enable the Page Table Isolation (PTI) Linux kernel feature even on CPU models that claim to be safe from Meltdown. diff --git a/third_party/nixpkgs/nixos/modules/security/oath.nix b/third_party/nixpkgs/nixos/modules/security/oath.nix index 93bdc85111..3342866538 100644 --- a/third_party/nixpkgs/nixos/modules/security/oath.nix +++ b/third_party/nixpkgs/nixos/modules/security/oath.nix @@ -11,7 +11,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the OATH (one-time password) PAM module. ''; }; @@ -19,7 +19,7 @@ with lib; digits = mkOption { type = types.enum [ 6 7 8 ]; default = 6; - description = '' + description = lib.mdDoc '' Specify the length of the one-time password in number of digits. ''; @@ -28,7 +28,7 @@ with lib; window = mkOption { type = types.int; default = 5; - description = '' + description = lib.mdDoc '' Specify the number of one-time passwords to check in order to accommodate for situations where the system and the client are slightly out of sync (iteration for HOTP or time @@ -39,7 +39,7 @@ with lib; usersFile = mkOption { type = types.path; default = "/etc/users.oath"; - description = '' + description = lib.mdDoc '' Set the path to file where the user's credentials are stored. This file must not be world readable! ''; diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index ce18af9fbc..2d0f256897 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -15,24 +15,24 @@ let name = mkOption { example = "sshd"; type = types.str; - description = "Name of the PAM service."; + description = lib.mdDoc "Name of the PAM service."; }; unixAuth = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whether users can log in with passwords defined in - /etc/shadow. + {file}`/etc/shadow`. ''; }; rootOK = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If set, root doesn't need to authenticate (e.g. for the - useradd service). + {command}`useradd` service). ''; }; @@ -40,10 +40,10 @@ let default = config.security.pam.p11.enable; defaultText = literalExpression "config.security.pam.p11.enable"; type = types.bool; - description = '' + description = lib.mdDoc '' If set, keys listed in - ~/.ssh/authorized_keys and - ~/.eid/authorized_certificates + {file}`~/.ssh/authorized_keys` and + {file}`~/.eid/authorized_certificates` can be used to log in with the associated PKCS#11 tokens. ''; }; @@ -52,24 +52,24 @@ let default = config.security.pam.u2f.enable; defaultText = literalExpression "config.security.pam.u2f.enable"; type = types.bool; - description = '' + description = lib.mdDoc '' If set, users listed in - $XDG_CONFIG_HOME/Yubico/u2f_keys (or - $HOME/.config/Yubico/u2f_keys if XDG variable is + {file}`$XDG_CONFIG_HOME/Yubico/u2f_keys` (or + {file}`$HOME/.config/Yubico/u2f_keys` if XDG variable is not set) are able to log in with the associated U2F key. Path can be - changed using option. + changed using {option}`security.pam.u2f.authFile` option. ''; }; usshAuth = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If set, users with an SSH certificate containing an authorized principal in their SSH agent are able to log in. Specific options are controlled - using the options. + using the {option}`security.pam.ussh` options. - Note that the must also be + Note that the {option}`security.pam.ussh.enable` must also be set for this option to take effect. ''; }; @@ -78,9 +78,9 @@ let default = config.security.pam.yubico.enable; defaultText = literalExpression "config.security.pam.yubico.enable"; type = types.bool; - description = '' + description = lib.mdDoc '' If set, users listed in - ~/.yubico/authorized_yubikeys + {file}`~/.yubico/authorized_yubikeys` are able to log in with the associated Yubikey tokens. ''; }; @@ -89,9 +89,9 @@ let enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If set, users with enabled Google Authenticator (created - ~/.google_authenticator) will be required + {file}`~/.google_authenticator`) will be required to provide Google Authenticator token to log in. ''; }; @@ -101,9 +101,9 @@ let default = config.security.pam.usb.enable; defaultText = literalExpression "config.security.pam.usb.enable"; type = types.bool; - description = '' + description = lib.mdDoc '' If set, users listed in - /etc/pamusb.conf are able to log in + {file}`/etc/pamusb.conf` are able to log in with the associated USB key. ''; }; @@ -112,21 +112,21 @@ let default = config.security.pam.enableOTPW; defaultText = literalExpression "config.security.pam.enableOTPW"; type = types.bool; - description = '' + description = lib.mdDoc '' If set, the OTPW system will be used (if - ~/.otpw exists). + {file}`~/.otpw` exists). ''; }; googleOsLoginAccountVerification = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If set, will use the Google OS Login PAM modules - (pam_oslogin_login, - pam_oslogin_admin) to verify possible OS Login + (`pam_oslogin_login`, + `pam_oslogin_admin`) to verify possible OS Login users and set sudoers configuration accordingly. - This only makes sense to enable for the sshd PAM + This only makes sense to enable for the `sshd` PAM service. ''; }; @@ -134,10 +134,10 @@ let googleOsLoginAuthentication = mkOption { default = false; type = types.bool; - description = '' - If set, will use the pam_oslogin_login's user + description = lib.mdDoc '' + If set, will use the `pam_oslogin_login`'s user authentication methods to authenticate users using 2FA. - This only makes sense to enable for the sshd PAM + This only makes sense to enable for the `sshd` PAM service. ''; }; @@ -146,7 +146,7 @@ let default = config.services.fprintd.enable; defaultText = literalExpression "config.services.fprintd.enable"; type = types.bool; - description = '' + description = lib.mdDoc '' If set, fingerprint reader will be used (if exists and your fingerprints are enrolled). ''; @@ -156,7 +156,7 @@ let default = config.security.pam.oath.enable; defaultText = literalExpression "config.security.pam.oath.enable"; type = types.bool; - description = '' + description = lib.mdDoc '' If set, the OATH Toolkit will be used. ''; }; @@ -164,11 +164,11 @@ let sshAgentAuth = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If set, the calling user's SSH agent is used to authenticate against the keys in the calling user's - ~/.ssh/authorized_keys. This is useful - for sudo on password-less remote systems. + {file}`~/.ssh/authorized_keys`. This is useful + for {command}`sudo` on password-less remote systems. ''; }; @@ -176,10 +176,10 @@ let enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If set, use the Duo Security pam module - pam_duo for authentication. Requires - configuration of options. + `pam_duo` for authentication. Requires + configuration of {option}`security.duosec` options. ''; }; }; @@ -187,7 +187,7 @@ let startSession = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If set, the service will register a new session with systemd's login manager. For local sessions, this will give the user access to audio devices, CD-ROM drives. In the @@ -199,21 +199,21 @@ let setEnvironment = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the service should set the environment variables - listed in - using pam_env.so. + listed in {option}`environment.sessionVariables` + using `pam_env.so`. ''; }; setLoginUid = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Set the login uid of the process - (/proc/self/loginuid) for auditing + ({file}`/proc/self/loginuid`) for auditing purposes. The login uid is only set by ‘entry points’ like - login and sshd, not by - commands like sudo. + {command}`login` and {command}`sshd`, not by + commands like {command}`sudo`. ''; }; @@ -221,7 +221,7 @@ let enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable or disable TTY auditing for specified users ''; }; @@ -229,7 +229,7 @@ let enablePattern = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' For each user matching one of comma-separated glob patterns, enable TTY auditing ''; @@ -238,7 +238,7 @@ let disablePattern = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' For each user matching one of comma-separated glob patterns, disable TTY auditing ''; @@ -247,7 +247,7 @@ let openOnly = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Set the TTY audit flag when opening the session, but do not restore it when closing the session. Using this option is necessary for some services @@ -260,10 +260,10 @@ let forwardXAuth = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether X authentication keys should be passed from the calling user to the target user (e.g. for - su) + {command}`su`) ''; }; @@ -271,7 +271,7 @@ let default = config.security.pam.mount.enable; defaultText = literalExpression "config.security.pam.mount.enable"; type = types.bool; - description = '' + description = lib.mdDoc '' Enable PAM mount (pam_mount) system to mount fileystems on user login. ''; }; @@ -279,13 +279,13 @@ let allowNullPassword = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to allow logging into accounts that have no password set (i.e., have an empty password field in - /etc/passwd or - /etc/group). This does not enable + {file}`/etc/passwd` or + {file}`/etc/group`). This does not enable logging into disabled accounts (i.e., that have the password - field set to !). Note that regardless of + field set to `!`). Note that regardless of what the pam_unix documentation says, accounts with hashed empty passwords are always allowed to log in. ''; @@ -294,7 +294,7 @@ let nodelay = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Wheather the delay after typing a wrong password should be disabled. ''; }; @@ -302,7 +302,7 @@ let requireWheel = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to permit root access only to members of group wheel. ''; }; @@ -322,15 +322,15 @@ let showMotd = mkOption { default = false; type = types.bool; - description = "Whether to show the message of the day."; + description = lib.mdDoc "Whether to show the message of the day."; }; makeHomeDir = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to try to create home directories for users - with $HOMEs pointing to nonexistent + with `$HOME`s pointing to nonexistent locations on session login. ''; }; @@ -338,19 +338,19 @@ let updateWtmp = mkOption { default = false; type = types.bool; - description = "Whether to update /var/log/wtmp."; + description = lib.mdDoc "Whether to update {file}`/var/log/wtmp`."; }; logFailures = mkOption { default = false; type = types.bool; - description = "Whether to log authentication failures in /var/log/faillog."; + description = lib.mdDoc "Whether to log authentication failures in {file}`/var/log/faillog`."; }; enableAppArmor = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable support for attaching AppArmor profiles at the user/group level, e.g., as part of a role based access control scheme. @@ -360,7 +360,7 @@ let enableKwallet = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If enabled, pam_wallet will attempt to automatically unlock the user's default KDE wallet upon login. If the user has no wallet named "kdewallet", or the login password does not match their wallet @@ -370,13 +370,13 @@ let sssdStrictAccess = mkOption { default = false; type = types.bool; - description = "enforce sssd access control"; + description = lib.mdDoc "enforce sssd access control"; }; enableGnomeKeyring = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If enabled, pam_gnome_keyring will attempt to automatically unlock the user's default Gnome keyring upon login. If the user login password does not match their keyring password, Gnome Keyring will prompt separately @@ -388,24 +388,24 @@ let enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, pam_gnupg will attempt to automatically unlock the user's GPG keys with the login password via - gpg-agent. The keygrips of all keys to be - unlocked should be written to ~/.pam-gnupg, - and can be queried with gpg -K --with-keygrip. + {command}`gpg-agent`. The keygrips of all keys to be + unlocked should be written to {file}`~/.pam-gnupg`, + and can be queried with {command}`gpg -K --with-keygrip`. Presetting passphrases must be enabled by adding - allow-preset-passphrase in - ~/.gnupg/gpg-agent.conf. + `allow-preset-passphrase` in + {file}`~/.gnupg/gpg-agent.conf`. ''; }; noAutostart = mkOption { type = types.bool; default = false; - description = '' - Don't start gpg-agent if it is not running. - Useful in conjunction with starting gpg-agent as + description = lib.mdDoc '' + Don't start {command}`gpg-agent` if it is not running. + Useful in conjunction with starting {command}`gpg-agent` as a systemd user service. ''; }; @@ -413,16 +413,16 @@ let storeOnly = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Don't send the password immediately after login, but store for PAM - session. + `session`. ''; }; }; text = mkOption { type = types.nullOr types.lines; - description = "Contents of the PAM service file."; + description = lib.mdDoc "Contents of the PAM service file."; }; }; @@ -453,7 +453,7 @@ let optionalString (config.services.sssd.enable && cfg.sssdStrictAccess) '' account [default=bad success=ok user_unknown=ignore] ${pkgs.sssd}/lib/security/pam_sss.so '' + - optionalString config.krb5.enable '' + optionalString config.security.pam.krb5.enable '' account sufficient ${pam_krb5}/lib/security/pam_krb5.so '' + optionalString cfg.googleOsLoginAccountVerification '' @@ -482,10 +482,10 @@ let (let p11 = config.security.pam.p11; in optionalString cfg.p11Auth '' auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so '') + - (let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth '' + (let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth ('' auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} '' + ''${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"} ${optionalString (u2f.appId != null) "appid=${u2f.appId}"} ${optionalString (u2f.origin != null) "origin=${u2f.origin}"} - '') + + '')) + optionalString cfg.usbAuth '' auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so '' + @@ -553,7 +553,7 @@ let optionalString config.services.sssd.enable '' auth sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_first_pass '' + - optionalString config.krb5.enable '' + optionalString config.security.pam.krb5.enable '' auth [default=ignore success=1 service_err=reset] ${pam_krb5}/lib/security/pam_krb5.so use_first_pass auth [default=die success=done] ${pam_ccreds}/lib/security/pam_ccreds.so action=validate use_first_pass auth sufficient ${pam_ccreds}/lib/security/pam_ccreds.so action=store use_first_pass @@ -576,7 +576,7 @@ let optionalString config.services.sssd.enable '' password sufficient ${pkgs.sssd}/lib/security/pam_sss.so use_authtok '' + - optionalString config.krb5.enable '' + optionalString config.security.pam.krb5.enable '' password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass '' + optionalString cfg.enableGnomeKeyring '' @@ -611,7 +611,6 @@ let session optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so '' + optionalString cfg.pamMount '' - session [success=1 default=ignore] ${pkgs.pam}/lib/security/pam_succeed_if.so service = systemd-user quiet session optional ${pkgs.pam_mount}/lib/security/pam_mount.so disable_interactive '' + optionalString use_ldap '' @@ -620,7 +619,7 @@ let optionalString config.services.sssd.enable '' session optional ${pkgs.sssd}/lib/security/pam_sss.so '' + - optionalString config.krb5.enable '' + optionalString config.security.pam.krb5.enable '' session optional ${pam_krb5}/lib/security/pam_krb5.so '' + optionalString cfg.otpwAuth '' @@ -674,19 +673,19 @@ let limitsType = with lib.types; listOf (submodule ({ ... }: { options = { domain = mkOption { - description = "Username, groupname, or wildcard this limit applies to"; + description = lib.mdDoc "Username, groupname, or wildcard this limit applies to"; example = "@wheel"; type = str; }; type = mkOption { - description = "Type of this limit"; + description = lib.mdDoc "Type of this limit"; type = enum [ "-" "hard" "soft" ]; default = "-"; }; item = mkOption { - description = "Item this limit applies to"; + description = lib.mdDoc "Item this limit applies to"; type = enum [ "core" "data" @@ -710,7 +709,7 @@ let }; value = mkOption { - description = "Value of this limit"; + description = lib.mdDoc "Value of this limit"; type = oneOf [ str int ]; }; }; @@ -770,10 +769,10 @@ in default = {}; type = with types; attrsOf (submodule pamOpts); description = - '' + lib.mdDoc '' This option defines the PAM services. A service typically corresponds to a program that uses PAM, - e.g. login or passwd. + e.g. {command}`login` or {command}`passwd`. Each attribute of this set defines a PAM service, with the attribute name defining the name of the service. ''; @@ -783,9 +782,9 @@ in type = types.str; default = "/var/empty"; example = "/etc/skel"; - description = '' + description = lib.mdDoc '' Path to skeleton directory whose contents are copied to home - directories newly created by pam_mkhomedir. + directories newly created by `pam_mkhomedir`. ''; }; @@ -793,9 +792,9 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Enable sudo logins if the user's SSH agent provides a key - present in ~/.ssh/authorized_keys. + present in {file}`~/.ssh/authorized_keys`. This allows machines to exclusively use SSH keys instead of passwords. ''; @@ -803,17 +802,36 @@ in security.pam.enableOTPW = mkEnableOption "the OTPW (one-time password) PAM module"; + security.pam.krb5 = { + enable = mkOption { + default = config.krb5.enable; + defaultText = literalExpression "config.krb5.enable"; + type = types.bool; + description = lib.mdDoc '' + Enables Kerberos PAM modules (`pam-krb5`, + `pam-ccreds`). + + If set, users can authenticate with their Kerberos password. + This requires a valid Kerberos configuration + (`config.krb5.enable` should be set to + `true`). + + Note that the Kerberos PAM modules are not necessary when using SSS + to handle Kerberos authentication. + ''; + }; + }; + security.pam.p11 = { enable = mkOption { default = false; type = types.bool; - description = '' - Enables P11 PAM (pam_p11) module. + description = lib.mdDoc '' + Enables P11 PAM (`pam_p11`) module. If set, users can log in with SSH keys and PKCS#11 tokens. - More information can be found here. + More information can be found [here](https://github.com/OpenSC/pam_p11). ''; }; @@ -840,77 +858,71 @@ in enable = mkOption { default = false; type = types.bool; - description = '' - Enables U2F PAM (pam-u2f) module. + description = lib.mdDoc '' + Enables U2F PAM (`pam-u2f`) module. If set, users listed in - $XDG_CONFIG_HOME/Yubico/u2f_keys (or - $HOME/.config/Yubico/u2f_keys if XDG variable is + {file}`$XDG_CONFIG_HOME/Yubico/u2f_keys` (or + {file}`$HOME/.config/Yubico/u2f_keys` if XDG variable is not set) are able to log in with the associated U2F key. The path can - be changed using option. + be changed using {option}`security.pam.u2f.authFile` option. File format is: - username:first_keyHandle,first_public_key: second_keyHandle,second_public_key - This file can be generated using pamu2fcfg command. + `username:first_keyHandle,first_public_key: second_keyHandle,second_public_key` + This file can be generated using {command}`pamu2fcfg` command. - More information can be found here. + More information can be found [here](https://developers.yubico.com/pam-u2f/). ''; }; authFile = mkOption { default = null; type = with types; nullOr path; - description = '' - By default pam-u2f module reads the keys from - $XDG_CONFIG_HOME/Yubico/u2f_keys (or - $HOME/.config/Yubico/u2f_keys if XDG variable is + description = lib.mdDoc '' + By default `pam-u2f` module reads the keys from + {file}`$XDG_CONFIG_HOME/Yubico/u2f_keys` (or + {file}`$HOME/.config/Yubico/u2f_keys` if XDG variable is not set). If you want to change auth file locations or centralize database (for - example use /etc/u2f-mappings) you can set this + example use {file}`/etc/u2f-mappings`) you can set this option. File format is: - username:first_keyHandle,first_public_key: second_keyHandle,second_public_key - This file can be generated using pamu2fcfg command. + `username:first_keyHandle,first_public_key: second_keyHandle,second_public_key` + This file can be generated using {command}`pamu2fcfg` command. - More information can be found here. + More information can be found [here](https://developers.yubico.com/pam-u2f/). ''; }; appId = mkOption { default = null; type = with types; nullOr str; - description = '' - By default pam-u2f module sets the application - ID to pam://$HOSTNAME. + description = lib.mdDoc '' + By default `pam-u2f` module sets the application + ID to `pam://$HOSTNAME`. - When using pamu2fcfg, you can specify your - application ID with the -i flag. + When using {command}`pamu2fcfg`, you can specify your + application ID with the `-i` flag. - More information can be found - here + More information can be found [here](https://developers.yubico.com/pam-u2f/Manuals/pam_u2f.8.html) ''; }; origin = mkOption { default = null; type = with types; nullOr str; - description = '' - By default pam-u2f module sets the origin - to pam://$HOSTNAME. + description = lib.mdDoc '' + By default `pam-u2f` module sets the origin + to `pam://$HOSTNAME`. Setting origin to an host independent value will allow you to reuse credentials across machines - When using pamu2fcfg, you can specify your - application ID with the -o flag. + When using {command}`pamu2fcfg`, you can specify your + application ID with the `-o` flag. - More information can be found - here + More information can be found [here](https://developers.yubico.com/pam-u2f/Manuals/pam_u2f.8.html) ''; }; @@ -934,7 +946,7 @@ in debug = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Debug output to stderr. ''; }; @@ -942,7 +954,7 @@ in interactive = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Set to prompt a message and wait before testing the presence of a U2F device. Recommended if your device doesn’t have a tactile trigger. ''; @@ -951,12 +963,12 @@ in cue = mkOption { default = false; type = types.bool; - description = '' - By default pam-u2f module does not inform user + description = lib.mdDoc '' + By default `pam-u2f` module does not inform user that he needs to use the u2f device, it just waits without a prompt. - If you set this option to true, - cue option is added to pam-u2f + If you set this option to `true`, + `cue` option is added to `pam-u2f` module and reminder message will be displayed. ''; }; @@ -966,29 +978,28 @@ in enable = mkOption { default = false; type = types.bool; - description = '' - Enables Uber's USSH PAM (pam-ussh) module. + description = lib.mdDoc '' + Enables Uber's USSH PAM (`pam-ussh`) module. - This is similar to pam-ssh-agent, except that + This is similar to `pam-ssh-agent`, except that the presence of a CA-signed SSH key with a valid principal is checked instead. Note that this module must both be enabled using this option and on a - per-PAM-service level as well (using usshAuth). + per-PAM-service level as well (using `usshAuth`). - More information can be found here. + More information can be found [here](https://github.com/uber/pam-ussh). ''; }; caFile = mkOption { default = null; type = with types; nullOr path; - description = '' - By default pam-ussh reads the trusted user CA keys - from /etc/ssh/trusted_user_ca. + description = lib.mdDoc '' + By default `pam-ussh` reads the trusted user CA keys + from {file}`/etc/ssh/trusted_user_ca`. - This should be set the same as your TrustedUserCAKeys + This should be set the same as your `TrustedUserCAKeys` option for sshd. ''; }; @@ -996,38 +1007,38 @@ in authorizedPrincipals = mkOption { default = null; type = with types; nullOr commas; - description = '' + description = lib.mdDoc '' Comma-separated list of authorized principals to permit; if the user presents a certificate with one of these principals, then they will be authorized. - Note that pam-ussh also requires that the certificate + Note that `pam-ussh` also requires that the certificate contain a principal matching the user's username. The principals from this list are in addition to those principals. - Mutually exclusive with authorizedPrincipalsFile. + Mutually exclusive with `authorizedPrincipalsFile`. ''; }; authorizedPrincipalsFile = mkOption { default = null; type = with types; nullOr path; - description = '' + description = lib.mdDoc '' Path to a list of principals; if the user presents a certificate with one of these principals, then they will be authorized. - Note that pam-ussh also requires that the certificate + Note that `pam-ussh` also requires that the certificate contain a principal matching the user's username. The principals from this file are in addition to those principals. - Mutually exclusive with authorizedPrincipals. + Mutually exclusive with `authorizedPrincipals`. ''; }; group = mkOption { default = null; type = with types; nullOr str; - description = '' + description = lib.mdDoc '' If set, then the authenticating user must be a member of this group to use this module. ''; @@ -1056,17 +1067,16 @@ in enable = mkOption { default = false; type = types.bool; - description = '' - Enables Yubico PAM (yubico-pam) module. + description = lib.mdDoc '' + Enables Yubico PAM (`yubico-pam`) module. If set, users listed in - ~/.yubico/authorized_yubikeys + {file}`~/.yubico/authorized_yubikeys` are able to log in with the associated Yubikey tokens. The file must have only one line: - username:yubikey_token_id1:yubikey_token_id2 - More information can be found here. + `username:yubikey_token_id1:yubikey_token_id2` + More information can be found [here](https://developers.yubico.com/yubico-pam/). ''; }; control = mkOption { @@ -1088,20 +1098,20 @@ in id = mkOption { example = "42"; type = types.str; - description = "client id"; + description = lib.mdDoc "client id"; }; debug = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Debug output to stderr. ''; }; mode = mkOption { default = "client"; type = types.enum [ "client" "challenge-response" ]; - description = '' + description = lib.mdDoc '' Mode of operation. Use "client" for online validation with a YubiKey validation service such as @@ -1111,18 +1121,16 @@ in Challenge-Response configurations. See the man-page ykpamcfg(1) for further details on how to configure offline Challenge-Response validation. - More information can be found here. + More information can be found [here](https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html). ''; }; challengeResponsePath = mkOption { default = null; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' If not null, set the path used by yubico pam module where the challenge expected response is stored. - More information can be found here. + More information can be found [here](https://developers.yubico.com/yubico-pam/Authentication_Using_Challenge-Response.html). ''; }; }; @@ -1133,7 +1141,7 @@ in default = null; example = "Today is Sweetmorn, the 4th day of The Aftermath in the YOLD 3178."; type = types.nullOr types.lines; - description = "Message of the day shown to users when they log in."; + description = lib.mdDoc "Message of the day shown to users when they log in."; }; }; @@ -1148,7 +1156,7 @@ in [ pkgs.pam ] ++ optional config.users.ldap.enable pam_ldap ++ optional config.services.sssd.enable pkgs.sssd - ++ optionals config.krb5.enable [pam_krb5 pam_ccreds] + ++ optionals config.security.pam.krb5.enable [pam_krb5 pam_ccreds] ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ] ++ optionals config.security.pam.oath.enable [ pkgs.oath-toolkit ] ++ optionals config.security.pam.p11.enable [ pkgs.pam_p11 ] @@ -1212,7 +1220,7 @@ in optionalString config.services.sssd.enable '' mr ${pkgs.sssd}/lib/security/pam_sss.so, '' + - optionalString config.krb5.enable '' + optionalString config.security.pam.krb5.enable '' mr ${pam_krb5}/lib/security/pam_krb5.so, mr ${pam_ccreds}/lib/security/pam_ccreds.so, '' + diff --git a/third_party/nixpkgs/nixos/modules/security/pam_mount.nix b/third_party/nixpkgs/nixos/modules/security/pam_mount.nix index 1d0efee8ca..11cc13a8cb 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam_mount.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam_mount.nix @@ -23,7 +23,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable PAM mount system to mount fileystems on user login. ''; }; @@ -31,10 +31,9 @@ in extraVolumes = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' List of volume definitions for pam_mount. - For more information, visit . + For more information, visit . ''; }; @@ -42,7 +41,7 @@ in type = types.listOf types.package; default = []; example = literalExpression "[ pkgs.bindfs ]"; - description = '' + description = lib.mdDoc '' Additional programs to include in the search path of pam_mount. Useful for example if you want to use some FUSE filesystems like bindfs. ''; @@ -54,7 +53,7 @@ in example = literalExpression '' [ "nodev" "nosuid" "force-user=%(USER)" "gid=%(USERGID)" "perms=0700" "chmod-deny" "chown-deny" "chgrp-deny" ] ''; - description = '' + description = lib.mdDoc '' Global mount options that apply to every FUSE volume. You can define volume-specific options in the volume definitions. ''; @@ -64,29 +63,27 @@ in type = types.int; default = 0; example = 1; - description = '' + description = lib.mdDoc '' Sets the Debug-Level. 0 disables debugging, 1 enables pam_mount tracing, and 2 additionally enables tracing in mount.crypt. The default is 0. - For more information, visit . + For more information, visit . ''; }; logoutWait = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Amount of microseconds to wait until killing remaining processes after final logout. - For more information, visit . + For more information, visit . ''; }; logoutHup = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Kill remaining processes after logout by sending a SIGHUP. ''; }; @@ -94,7 +91,7 @@ in logoutTerm = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Kill remaining processes after logout by sending a SIGTERM. ''; }; @@ -102,7 +99,7 @@ in logoutKill = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Kill remaining processes after logout by sending a SIGKILL. ''; }; @@ -110,7 +107,7 @@ in createMountPoints = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Create mountpoints for volumes if they do not exist. ''; }; @@ -118,7 +115,7 @@ in removeCreatedMountPoints = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Remove mountpoints created by pam_mount after logout. This only affects mountpoints that have been created by pam_mount in the same session. diff --git a/third_party/nixpkgs/nixos/modules/security/pam_usb.nix b/third_party/nixpkgs/nixos/modules/security/pam_usb.nix index 51d81e823f..4275c26c6b 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam_usb.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam_usb.nix @@ -17,10 +17,9 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable USB login for all login systems that support it. For - more information, visit . + more information, visit . ''; }; diff --git a/third_party/nixpkgs/nixos/modules/security/polkit.nix b/third_party/nixpkgs/nixos/modules/security/polkit.nix index 1ba149745c..0a2d81445b 100644 --- a/third_party/nixpkgs/nixos/modules/security/polkit.nix +++ b/third_party/nixpkgs/nixos/modules/security/polkit.nix @@ -29,7 +29,7 @@ in if (subject.local) return "yes"; }); ''; - description = + description = lib.mdDoc '' Any polkit rules to be added to config (in JavaScript ;-). See: http://www.freedesktop.org/software/polkit/docs/latest/polkit.8.html#polkit-rules @@ -40,12 +40,12 @@ in type = types.listOf types.str; default = [ "unix-group:wheel" ]; example = [ "unix-user:alice" "unix-group:admin" ]; - description = + description = lib.mdDoc '' Specifies which users are considered “administrators”, for those actions that require the user to authenticate as an - administrator (i.e. have an auth_admin - value). By default, this is all users in the wheel group. + administrator (i.e. have an `auth_admin` + value). By default, this is all users in the `wheel` group. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/security/rtkit.nix b/third_party/nixpkgs/nixos/modules/security/rtkit.nix index ad8746808e..0f58b4dce8 100644 --- a/third_party/nixpkgs/nixos/modules/security/rtkit.nix +++ b/third_party/nixpkgs/nixos/modules/security/rtkit.nix @@ -12,7 +12,7 @@ with lib; security.rtkit.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the RealtimeKit system service, which hands out realtime scheduling priority to user processes on demand. For example, the PulseAudio server uses this to diff --git a/third_party/nixpkgs/nixos/modules/security/sudo.nix b/third_party/nixpkgs/nixos/modules/security/sudo.nix index 4bf239fca8..faa99a31a6 100644 --- a/third_party/nixpkgs/nixos/modules/security/sudo.nix +++ b/third_party/nixpkgs/nixos/modules/security/sudo.nix @@ -36,8 +36,8 @@ in type = types.bool; default = true; description = - '' - Whether to enable the sudo command, which + lib.mdDoc '' + Whether to enable the {command}`sudo` command, which allows non-root users to execute commands as root. ''; }; @@ -55,19 +55,19 @@ in type = types.bool; default = true; description = - '' - Whether users of the wheel group must - provide a password to run commands as super user via sudo. + lib.mdDoc '' + Whether users of the `wheel` group must + provide a password to run commands as super user via {command}`sudo`. ''; }; security.sudo.execWheelOnly = mkOption { type = types.bool; default = false; - description = '' - Only allow members of the wheel group to execute sudo by + description = lib.mdDoc '' + Only allow members of the `wheel` group to execute sudo by setting the executable's permissions accordingly. - This prevents users that are not members of wheel from + This prevents users that are not members of `wheel` from exploiting vulnerabilities in sudo such as CVE-2021-3156. ''; }; @@ -77,15 +77,15 @@ in # Note: if syntax errors are detected in this file, the NixOS # configuration will fail to build. description = - '' + lib.mdDoc '' This string contains the contents of the - sudoers file. + {file}`sudoers` file. ''; }; security.sudo.extraRules = mkOption { - description = '' - Define specific rules to be in the sudoers file. + description = lib.mdDoc '' + Define specific rules to be in the {file}`sudoers` file. More specific rules should come after more general ones in order to yield the expected behavior. You can use mkBefore/mkAfter to ensure this is the case when configuration options are merged. @@ -114,7 +114,7 @@ in options = { users = mkOption { type = with types; listOf (either str int); - description = '' + description = lib.mdDoc '' The usernames / UIDs this rule should apply for. ''; default = []; @@ -122,7 +122,7 @@ in groups = mkOption { type = with types; listOf (either str int); - description = '' + description = lib.mdDoc '' The groups / GIDs this rule should apply for. ''; default = []; @@ -131,7 +131,7 @@ in host = mkOption { type = types.str; default = "ALL"; - description = '' + description = lib.mdDoc '' For what host this rule should apply. ''; }; @@ -139,17 +139,17 @@ in runAs = mkOption { type = with types; str; default = "ALL:ALL"; - description = '' + description = lib.mdDoc '' Under which user/group the specified command is allowed to run. - A user can be specified using just the username: "foo". - It is also possible to specify a user/group combination using "foo:bar" - or to only allow running as a specific group with ":bar". + A user can be specified using just the username: `"foo"`. + It is also possible to specify a user/group combination using `"foo:bar"` + or to only allow running as a specific group with `":bar"`. ''; }; commands = mkOption { - description = '' + description = lib.mdDoc '' The commands for which the rule should apply. ''; type = with types; listOf (either str (submodule { @@ -159,7 +159,7 @@ in type = with types; str; description = '' A command being either just a path to a binary to allow any arguments, - the full command with arguments pre-set or with "" used as the argument, + the full command with arguments pre-set or with "" used as the argument, not allowing arguments to the command at all. ''; }; @@ -182,8 +182,8 @@ in security.sudo.extraConfig = mkOption { type = types.lines; default = ""; - description = '' - Extra configuration text appended to sudoers. + description = lib.mdDoc '' + Extra configuration text appended to {file}`sudoers`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/security/tpm2.nix b/third_party/nixpkgs/nixos/modules/security/tpm2.nix index be85fd246e..375f4af1a6 100644 --- a/third_party/nixpkgs/nixos/modules/security/tpm2.nix +++ b/third_party/nixpkgs/nixos/modules/security/tpm2.nix @@ -20,7 +20,7 @@ in { enable = lib.mkEnableOption "Trusted Platform Module 2 support"; tssUser = lib.mkOption { - description = '' + description = lib.mdDoc '' Name of the tpm device-owner and service user, set if applyUdevRules is set. ''; @@ -30,7 +30,7 @@ in { }; tssGroup = lib.mkOption { - description = '' + description = lib.mdDoc '' Group of the tpm kernel resource manager (tpmrm) device-group, set if applyUdevRules is set. ''; @@ -39,7 +39,7 @@ in { }; applyUdevRules = lib.mkOption { - description = '' + description = lib.mdDoc '' Whether to make the /dev/tpm[0-9] devices accessible by the tssUser, or the /dev/tpmrm[0-9] by tssGroup respectively ''; @@ -53,7 +53,7 @@ in { ''; package = lib.mkOption { - description = "tpm2-abrmd package to use"; + description = lib.mdDoc "tpm2-abrmd package to use"; type = lib.types.package; default = pkgs.tpm2-abrmd; defaultText = lib.literalExpression "pkgs.tpm2-abrmd"; @@ -67,7 +67,7 @@ in { ''; package = lib.mkOption { - description = "tpm2-pkcs11 package to use"; + description = lib.mdDoc "tpm2-pkcs11 package to use"; type = lib.types.package; default = pkgs.tpm2-pkcs11; defaultText = lib.literalExpression "pkgs.tpm2-pkcs11"; @@ -97,7 +97,7 @@ in { }; interface = lib.mkOption { - description = '' + description = lib.mdDoc '' The name of the TPM command transmission interface (TCTI) library to use. ''; @@ -106,24 +106,24 @@ in { }; deviceConf = lib.mkOption { - description = '' + description = lib.mdDoc '' Configuration part of the device TCTI, e.g. the path to the TPM device. Applies if interface is set to "device". The format is specified in the - - tpm2-tools repository. + [ + tpm2-tools repository](https://github.com/tpm2-software/tpm2-tools/blob/master/man/common/tcti.md#tcti-options). ''; type = lib.types.str; default = "/dev/tpmrm0"; }; tabrmdConf = lib.mkOption { - description = '' + description = lib.mdDoc '' Configuration part of the tabrmd TCTI, like the D-Bus bus name. Applies if interface is set to "tabrmd". The format is specified in the - - tpm2-tools repository. + [ + tpm2-tools repository](https://github.com/tpm2-software/tpm2-tools/blob/master/man/common/tcti.md#tcti-options). ''; type = lib.types.str; default = "bus_name=com.intel.tss2.Tabrmd"; diff --git a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix index 169ef74426..cdf99e697f 100644 --- a/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix +++ b/third_party/nixpkgs/nixos/modules/security/wrappers/default.nix @@ -22,30 +22,30 @@ let wrapperType = lib.types.submodule ({ name, config, ... }: { options.source = lib.mkOption { type = lib.types.path; - description = "The absolute path to the program to be wrapped."; + description = lib.mdDoc "The absolute path to the program to be wrapped."; }; options.program = lib.mkOption { type = with lib.types; nullOr str; default = name; - description = '' + description = lib.mdDoc '' The name of the wrapper program. Defaults to the attribute name. ''; }; options.owner = lib.mkOption { type = lib.types.str; - description = "The owner of the wrapper program."; + description = lib.mdDoc "The owner of the wrapper program."; }; options.group = lib.mkOption { type = lib.types.str; - description = "The group of the wrapper program."; + description = lib.mdDoc "The group of the wrapper program."; }; options.permissions = lib.mkOption { type = fileModeType; default = "u+rx,g+x,o+x"; example = "a+rx"; - description = '' + description = lib.mdDoc '' The permissions of the wrapper program. The format is that of a - symbolic or numeric file mode understood by chmod. + symbolic or numeric file mode understood by {command}`chmod`. ''; }; options.capabilities = lib.mkOption @@ -73,12 +73,12 @@ let options.setuid = lib.mkOption { type = lib.types.bool; default = false; - description = "Whether to add the setuid bit the wrapper program."; + description = lib.mdDoc "Whether to add the setuid bit the wrapper program."; }; options.setgid = lib.mkOption { type = lib.types.bool; default = false; - description = "Whether to add the setgid bit the wrapper program."; + description = lib.mdDoc "Whether to add the setgid bit the wrapper program."; }; }); @@ -179,12 +179,12 @@ in }; } ''; - description = '' + description = lib.mdDoc '' This option effectively allows adding setuid/setgid bits, capabilities, changing file ownership and permissions of a program without directly modifying it. This works by creating a wrapper program under the - directory, which is then added to - the shell PATH. + {option}`security.wrapperDir` directory, which is then added to + the shell `PATH`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/admin/meshcentral.nix b/third_party/nixpkgs/nixos/modules/services/admin/meshcentral.nix index 92762d2037..e1df39716d 100644 --- a/third_party/nixpkgs/nixos/modules/services/admin/meshcentral.nix +++ b/third_party/nixpkgs/nixos/modules/services/admin/meshcentral.nix @@ -7,7 +7,7 @@ in with lib; { options.services.meshcentral = with types; { enable = mkEnableOption "MeshCentral computer management server"; package = mkOption { - description = "MeshCentral package to use. Replacing this may be necessary to add dependencies for extra functionality."; + description = lib.mdDoc "MeshCentral package to use. Replacing this may be necessary to add dependencies for extra functionality."; type = types.package; default = pkgs.meshcentral; defaultText = literalExpression "pkgs.meshcentral"; diff --git a/third_party/nixpkgs/nixos/modules/services/admin/oxidized.nix b/third_party/nixpkgs/nixos/modules/services/admin/oxidized.nix index 49ea3ced76..f0d46f787b 100644 --- a/third_party/nixpkgs/nixos/modules/services/admin/oxidized.nix +++ b/third_party/nixpkgs/nixos/modules/services/admin/oxidized.nix @@ -12,7 +12,7 @@ in user = mkOption { type = types.str; default = "oxidized"; - description = '' + description = lib.mdDoc '' User under which the oxidized service runs. ''; }; @@ -20,7 +20,7 @@ in group = mkOption { type = types.str; default = "oxidized"; - description = '' + description = lib.mdDoc '' Group under which the oxidized service runs. ''; }; @@ -28,7 +28,7 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/oxidized"; - description = "State directory for the oxidized service."; + description = lib.mdDoc "State directory for the oxidized service."; }; configFile = mkOption { @@ -62,7 +62,7 @@ in # ... additional config '''; ''; - description = '' + description = lib.mdDoc '' Path to the oxidized configuration file. ''; }; @@ -76,7 +76,7 @@ in # ... additional hosts ''' ''; - description = '' + description = lib.mdDoc '' Path to the file/database which contains the targets for oxidized. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix b/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix index 80b6814541..aff25bcb68 100644 --- a/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix +++ b/third_party/nixpkgs/nixos/modules/services/admin/pgadmin.nix @@ -31,18 +31,18 @@ in enable = mkEnableOption "PostgreSQL Admin 4"; port = mkOption { - description = "Port for pgadmin4 to run on"; + description = lib.mdDoc "Port for pgadmin4 to run on"; type = types.port; default = 5050; }; initialEmail = mkOption { - description = "Initial email for the pgAdmin account."; + description = lib.mdDoc "Initial email for the pgAdmin account."; type = types.str; }; initialPasswordFile = mkOption { - description = '' + description = lib.mdDoc '' Initial password file for the pgAdmin account. NOTE: Should be string not a store path, to prevent the password from being world readable. ''; @@ -52,9 +52,9 @@ in openFirewall = mkEnableOption "firewall passthrough for pgadmin4"; settings = mkOption { - description = '' + description = lib.mdDoc '' Settings for pgadmin4. - Documentation. + [Documentation](https://www.pgadmin.org/docs/pgadmin4/development/config_py.html). ''; type = pyType; default= {}; diff --git a/third_party/nixpkgs/nixos/modules/services/admin/salt/master.nix b/third_party/nixpkgs/nixos/modules/services/admin/salt/master.nix index a3069c81c1..3c246a9423 100644 --- a/third_party/nixpkgs/nixos/modules/services/admin/salt/master.nix +++ b/third_party/nixpkgs/nixos/modules/services/admin/salt/master.nix @@ -24,7 +24,7 @@ in configuration = mkOption { type = types.attrs; default = {}; - description = "Salt master configuration as Nix attribute set."; + description = lib.mdDoc "Salt master configuration as Nix attribute set."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/admin/salt/minion.nix b/third_party/nixpkgs/nixos/modules/services/admin/salt/minion.nix index ac124c570d..165ec8ef96 100644 --- a/third_party/nixpkgs/nixos/modules/services/admin/salt/minion.nix +++ b/third_party/nixpkgs/nixos/modules/services/admin/salt/minion.nix @@ -25,9 +25,9 @@ in configuration = mkOption { type = types.attrs; default = {}; - description = '' + description = lib.mdDoc '' Salt minion configuration as Nix attribute set. - See + See for details. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix b/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix index 47669b05aa..bd37fe3b55 100644 --- a/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/amqp/activemq/default.nix @@ -27,7 +27,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the Apache ActiveMQ message broker service. ''; }; @@ -35,7 +35,7 @@ in { default = "${activemq}/conf"; defaultText = literalExpression ''"''${pkgs.activemq}/conf"''; type = types.str; - description = '' + description = lib.mdDoc '' The base directory for ActiveMQ's configuration. By default, this directory is searched for a file named activemq.xml, which should contain the configuration for the broker service. @@ -44,21 +44,21 @@ in { configurationURI = mkOption { type = types.str; default = "xbean:activemq.xml"; - description = '' + description = lib.mdDoc '' The URI that is passed along to the BrokerFactory to set up the configuration of the ActiveMQ broker service. You should not need to change this. For custom configuration, - set the configurationDir instead, and create + set the `configurationDir` instead, and create an activemq.xml configuration file in it. ''; }; baseDir = mkOption { type = types.str; default = "/var/activemq"; - description = '' + description = lib.mdDoc '' The base directory where ActiveMQ stores its persistent data and logs. This will be overridden if you set "activemq.base" and "activemq.data" - in the javaProperties option. You can also override + in the `javaProperties` option. You can also override this in activemq.xml. ''; }; @@ -76,7 +76,7 @@ in { "activemq.conf" = "${cfg.configurationDir}"; "activemq.home" = "${activemq}"; } // attrs; - description = '' + description = lib.mdDoc '' Specifies Java properties that are sent to the ActiveMQ broker service with the "-D" option. You can set properties here to change the behaviour and configuration of the broker. @@ -88,7 +88,7 @@ in { type = types.separatedString " "; default = ""; example = "-Xmx2G -Xms2G -XX:MaxPermSize=512M"; - description = '' + description = lib.mdDoc '' Add extra options here that you want to be sent to the Java runtime when the broker service is started. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix b/third_party/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix index 3255942fe4..9d3243722d 100644 --- a/third_party/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix +++ b/third_party/nixpkgs/nixos/modules/services/amqp/rabbitmq.nix @@ -20,7 +20,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the RabbitMQ server, an Advanced Message Queuing Protocol (AMQP) broker. ''; @@ -30,7 +30,7 @@ in default = pkgs.rabbitmq-server; type = types.package; defaultText = literalExpression "pkgs.rabbitmq-server"; - description = '' + description = lib.mdDoc '' Which rabbitmq package to use. ''; }; @@ -38,12 +38,12 @@ in listenAddress = mkOption { default = "127.0.0.1"; example = ""; - description = '' + description = lib.mdDoc '' IP address on which RabbitMQ will listen for AMQP connections. Set to the empty string to listen on all interfaces. Note that RabbitMQ creates a user named - guest with password - guest by default, so you should delete + `guest` with password + `guest` by default, so you should delete this user if you intend to allow external access. Together with 'port' setting it's mostly an alias for @@ -55,7 +55,7 @@ in port = mkOption { default = 5672; - description = '' + description = lib.mdDoc '' Port on which RabbitMQ will listen for AMQP connections. ''; type = types.port; @@ -64,7 +64,7 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/rabbitmq"; - description = '' + description = lib.mdDoc '' Data directory for rabbitmq. ''; }; @@ -72,7 +72,7 @@ in cookie = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Erlang cookie is a string of arbitrary length which must be the same for several nodes to be allowed to communicate. Leave empty to generate automatically. @@ -88,15 +88,15 @@ in "auth_backends.1.authz" = "rabbit_auth_backend_internal"; } ''; - description = '' + description = lib.mdDoc '' Configuration options in RabbitMQ's new config file format, which is a simple key-value format that can not express nested - data structures. This is known as the rabbitmq.conf file, + data structures. This is known as the `rabbitmq.conf` file, although outside NixOS that filename may have Erlang syntax, particularly prior to RabbitMQ 3.7.0. If you do need to express nested data structures, you can use - config option. Configuration from config + `config` option. Configuration from `config` will be merged into these options by RabbitMQ at runtime to form the final configuration. @@ -108,14 +108,14 @@ in config = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Verbatim advanced configuration file contents using the Erlang syntax. - This is also known as the advanced.config file or the old config format. + This is also known as the `advanced.config` file or the old config format. - configItems is preferred whenever possible. However, nested - data structures can only be expressed properly using the config option. + `configItems` is preferred whenever possible. However, nested + data structures can only be expressed properly using the `config` option. - The contents of this option will be merged into the configItems + The contents of this option will be merged into the `configItems` by RabbitMQ at runtime to form the final configuration. See the second table on https://www.rabbitmq.com/configure.html#config-items @@ -126,13 +126,13 @@ in plugins = mkOption { default = [ ]; type = types.listOf types.str; - description = "The names of plugins to enable"; + description = lib.mdDoc "The names of plugins to enable"; }; pluginDirs = mkOption { default = [ ]; type = types.listOf types.path; - description = "The list of directories containing external plugins"; + description = lib.mdDoc "The list of directories containing external plugins"; }; managementPlugin = { @@ -140,7 +140,7 @@ in port = mkOption { default = 15672; type = types.port; - description = '' + description = lib.mdDoc '' On which port to run the management plugin ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/alsa.nix b/third_party/nixpkgs/nixos/modules/services/audio/alsa.nix index 0d743ed31d..155780199f 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/alsa.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/alsa.nix @@ -25,7 +25,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable ALSA sound. ''; }; @@ -33,7 +33,7 @@ in enableOSSEmulation = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable ALSA OSS emulation (with certain cards sound mixing may not work!). ''; }; @@ -44,7 +44,7 @@ in example = '' defaults.pcm.!card 3 ''; - description = '' + description = lib.mdDoc '' Set addition configuration for system-wide alsa. ''; }; @@ -54,7 +54,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable volume and capture control with keyboard media keys. You want to leave this disabled if you run a desktop environment @@ -62,7 +62,7 @@ in You might want to enable this if you run a minimalistic desktop environment or work from bare linux ttys/framebuffers. - Enabling this will turn on . + Enabling this will turn on {option}`services.actkbd`. ''; }; @@ -70,7 +70,7 @@ in type = types.str; default = "1"; example = "1%"; - description = '' + description = lib.mdDoc '' The value by which to increment/decrement volume on media keys. See amixer(1) for allowed values. diff --git a/third_party/nixpkgs/nixos/modules/services/audio/botamusique.nix b/third_party/nixpkgs/nixos/modules/services/audio/botamusique.nix index f4fa0ead4f..edb59a49fd 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/botamusique.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/botamusique.nix @@ -18,7 +18,7 @@ in type = types.package; default = pkgs.botamusique; defaultText = literalExpression "pkgs.botamusique"; - description = "The botamusique package to use."; + description = lib.mdDoc "The botamusique package to use."; }; settings = mkOption { @@ -29,32 +29,32 @@ in type = types.str; default = "localhost"; example = "mumble.example.com"; - description = "Hostname of the mumble server to connect to."; + description = lib.mdDoc "Hostname of the mumble server to connect to."; }; server.port = mkOption { type = types.port; default = 64738; - description = "Port of the mumble server to connect to."; + description = lib.mdDoc "Port of the mumble server to connect to."; }; bot.username = mkOption { type = types.str; default = "botamusique"; - description = "Name the bot should appear with."; + description = lib.mdDoc "Name the bot should appear with."; }; bot.comment = mkOption { type = types.str; default = "Hi, I'm here to play radio, local music or youtube/soundcloud music. Have fun!"; - description = "Comment displayed for the bot."; + description = lib.mdDoc "Comment displayed for the bot."; }; }; }; default = {}; - description = '' - Your configuration.ini as a Nix attribute set. Look up - possible options in the configuration.example.ini. + description = lib.mdDoc '' + Your {file}`configuration.ini` as a Nix attribute set. Look up + possible options in the [configuration.example.ini](https://github.com/azlux/botamusique/blob/master/configuration.example.ini). ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/hqplayerd.nix b/third_party/nixpkgs/nixos/modules/services/audio/hqplayerd.nix index 416d12ce21..4045a34b40 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/hqplayerd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/hqplayerd.nix @@ -18,7 +18,7 @@ in username = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Username used for HQPlayer's WebUI. Without this you will need to manually create the credentials after @@ -29,7 +29,7 @@ in password = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Password used for HQPlayer's WebUI. Without this you will need to manually create the credentials after @@ -41,7 +41,7 @@ in licenseFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to the HQPlayer license key file. Without this, the service will run in trial mode and restart every 30 @@ -52,7 +52,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Opens ports needed for the WebUI and controller API. ''; }; @@ -60,7 +60,7 @@ in config = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' HQplayer daemon configuration, written to /etc/hqplayer/hqplayerd.xml. Refer to share/doc/hqplayerd/readme.txt in the hqplayerd derivation for possible values. @@ -133,7 +133,7 @@ in users.users = { hqplayer = { description = "hqplayer daemon user"; - extraGroups = [ "audio" ]; + extraGroups = [ "audio" "video" ]; group = "hqplayer"; uid = config.ids.uids.hqplayer; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/icecast.nix b/third_party/nixpkgs/nixos/modules/services/audio/icecast.nix index 5ee5bd745f..0a81d71b56 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/icecast.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/icecast.nix @@ -48,7 +48,7 @@ in { hostname = mkOption { type = types.nullOr types.str; - description = "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided."; + description = lib.mdDoc "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided."; default = config.networking.domain; defaultText = literalExpression "config.networking.domain"; }; @@ -56,51 +56,51 @@ in { admin = { user = mkOption { type = types.str; - description = "Username used for all administration functions."; + description = lib.mdDoc "Username used for all administration functions."; default = "admin"; }; password = mkOption { type = types.str; - description = "Password used for all administration functions."; + description = lib.mdDoc "Password used for all administration functions."; }; }; logDir = mkOption { type = types.path; - description = "Base directory used for logging."; + description = lib.mdDoc "Base directory used for logging."; default = "/var/log/icecast"; }; listen = { port = mkOption { type = types.int; - description = "TCP port that will be used to accept client connections."; + description = lib.mdDoc "TCP port that will be used to accept client connections."; default = 8000; }; address = mkOption { type = types.str; - description = "Address Icecast will listen on."; + description = lib.mdDoc "Address Icecast will listen on."; default = "::"; }; }; user = mkOption { type = types.str; - description = "User privileges for the server."; + description = lib.mdDoc "User privileges for the server."; default = "nobody"; }; group = mkOption { type = types.str; - description = "Group privileges for the server."; + description = lib.mdDoc "Group privileges for the server."; default = "nogroup"; }; extraConf = mkOption { type = types.lines; - description = "icecast.xml content."; + description = lib.mdDoc "icecast.xml content."; default = ""; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix index 84fc9957b8..ae566bba84 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/jack.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/jack.nix @@ -40,14 +40,14 @@ in { example = literalExpression '' [ "-dalsa" "--device" "hw:1" ]; ''; - description = '' + description = lib.mdDoc '' Specifies startup command line arguments to pass to JACK server. ''; }; session = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' Commands to run after JACK is started. ''; }; @@ -58,7 +58,7 @@ in { enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Route audio to/from generic ALSA-using applications using ALSA JACK PCM plugin. ''; }; @@ -66,7 +66,7 @@ in { support32Bit = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to support sound for 32-bit ALSA applications on 64-bit system. ''; }; @@ -76,7 +76,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Create ALSA loopback device, instead of using PCM plugin. Has broader application support (things like Steam will work), but may need fine-tuning for concrete hardware. @@ -86,14 +86,14 @@ in { index = mkOption { type = types.int; default = 10; - description = '' + description = lib.mdDoc '' Index of an ALSA loopback device. ''; }; config = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' ALSA config for loopback device. ''; }; @@ -105,7 +105,7 @@ in { period_size 2048 periods 2 ''; - description = '' + description = lib.mdDoc '' For music production software that still doesn't support JACK natively you would like to put buffer/period adjustments here to decrease dmix device latency. @@ -114,7 +114,7 @@ in { session = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' Additional commands to run to setup loopback device. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix b/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix index e0f8d461af..7e23ffe6bf 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix @@ -13,12 +13,12 @@ in type = types.package; default = pkgs.jmusicbot; defaultText = literalExpression "pkgs.jmusicbot"; - description = "JMusicBot package to use"; + description = lib.mdDoc "JMusicBot package to use"; }; stateDir = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' The directory where config.txt and serversettings.json is saved. If left as the default value this directory will automatically be created before JMusicBot starts, otherwise the sysadmin is responsible for ensuring the directory exists with appropriate ownership and permissions. Untouched by the value of this option config.txt needs to be placed manually into this directory. diff --git a/third_party/nixpkgs/nixos/modules/services/audio/liquidsoap.nix b/third_party/nixpkgs/nixos/modules/services/audio/liquidsoap.nix index ffeefc0f98..c313104c46 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/liquidsoap.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/liquidsoap.nix @@ -31,7 +31,7 @@ in services.liquidsoap.streams = mkOption { description = - '' + lib.mdDoc '' Set of Liquidsoap streams to start, one systemd service per stream. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mopidy.nix b/third_party/nixpkgs/nixos/modules/services/audio/mopidy.nix index 9937feadae..9c8e9b693c 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/mopidy.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/mopidy.nix @@ -31,7 +31,7 @@ in { dataDir = mkOption { default = "/var/lib/mopidy"; type = types.str; - description = '' + description = lib.mdDoc '' The directory where Mopidy stores its state. ''; }; @@ -40,7 +40,7 @@ in { default = []; type = types.listOf types.package; example = literalExpression "[ pkgs.mopidy-spotify ]"; - description = '' + description = lib.mdDoc '' Mopidy extensions that should be loaded by the service. ''; }; @@ -48,7 +48,7 @@ in { configuration = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' The configuration that Mopidy should use. ''; }; @@ -56,7 +56,7 @@ in { extraConfigFiles = mkOption { default = []; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Extra config file read by Mopidy when the service starts. Later files in the list overrides earlier configuration. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix index 11733d99fc..bbfccec98c 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/mpd.nix @@ -56,7 +56,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable MPD, the music player daemon. ''; }; @@ -64,8 +64,8 @@ in { startWhenNeeded = mkOption { type = types.bool; default = false; - description = '' - If set, mpd is socket-activated; that + description = lib.mdDoc '' + If set, {command}`mpd` is socket-activated; that is, instead of having it permanently running as a daemon, systemd will start it on the first incoming connection. ''; @@ -75,7 +75,7 @@ in { type = with types; either path (strMatching "(http|https|nfs|smb)://.+"); default = "${cfg.dataDir}/music"; defaultText = literalExpression ''"''${dataDir}/music"''; - description = '' + description = lib.mdDoc '' The directory or NFS/SMB network share where MPD reads music from. If left as the default value this directory will automatically be created before the MPD server starts, otherwise the sysadmin is responsible for ensuring @@ -87,7 +87,7 @@ in { type = types.path; default = "${cfg.dataDir}/playlists"; defaultText = literalExpression ''"''${dataDir}/playlists"''; - description = '' + description = lib.mdDoc '' The directory where MPD stores playlists. If left as the default value this directory will automatically be created before the MPD server starts, otherwise the sysadmin is responsible for ensuring the directory exists @@ -98,18 +98,18 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra directives added to to the end of MPD's configuration file, mpd.conf. Basic configuration like file location and uid/gid is added automatically to the beginning of the file. For available - options see man 5 mpd.conf'. + options see `man 5 mpd.conf`'. ''; }; dataDir = mkOption { type = types.path; default = "/var/lib/${name}"; - description = '' + description = lib.mdDoc '' The directory where MPD stores its state, tag cache, playlists etc. If left as the default value this directory will automatically be created before the MPD server starts, otherwise the sysadmin is responsible for @@ -120,13 +120,13 @@ in { user = mkOption { type = types.str; default = name; - description = "User account under which MPD runs."; + description = lib.mdDoc "User account under which MPD runs."; }; group = mkOption { type = types.str; default = name; - description = "Group account under which MPD runs."; + description = lib.mdDoc "Group account under which MPD runs."; }; network = { @@ -135,16 +135,16 @@ in { type = types.str; default = "127.0.0.1"; example = "any"; - description = '' + description = lib.mdDoc '' The address for the daemon to listen on. - Use any to listen on all addresses. + Use `any` to listen on all addresses. ''; }; port = mkOption { type = types.int; default = 6600; - description = '' + description = lib.mdDoc '' This setting is the TCP port that is desired for the daemon to get assigned to. ''; @@ -156,8 +156,8 @@ in { type = types.nullOr types.str; default = "${cfg.dataDir}/tag_cache"; defaultText = literalExpression ''"''${dataDir}/tag_cache"''; - description = '' - The path to MPD's database. If set to null the + description = lib.mdDoc '' + The path to MPD's database. If set to `null` the parameter is omitted from the configuration. ''; }; @@ -167,7 +167,7 @@ in { options = { passwordFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to file containing the password. ''; }; @@ -176,14 +176,14 @@ in { in mkOption { type = types.listOf (types.enum perms); default = [ "read" ]; - description = '' + description = lib.mdDoc '' List of permissions that are granted with this password. Permissions can be "${concatStringsSep "\", \"" perms}". ''; }; }; }); - description = '' + description = lib.mdDoc '' Credentials and permissions for accessing the mpd server. ''; default = []; @@ -196,7 +196,7 @@ in { fluidsynth = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If set, add fluidsynth soundfont and configure the plugin. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/mpdscribble.nix b/third_party/nixpkgs/nixos/modules/services/audio/mpdscribble.nix index 333ffb7094..d829bc7ae0 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/mpdscribble.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/mpdscribble.nix @@ -82,7 +82,7 @@ in { proxy = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' HTTP proxy URL. ''; }; @@ -90,7 +90,7 @@ in { verbose = mkOption { default = 1; type = types.int; - description = '' + description = lib.mdDoc '' Log level for the mpdscribble daemon. ''; }; @@ -99,7 +99,7 @@ in { default = 600; example = 60; type = types.int; - description = '' + description = lib.mdDoc '' How often should mpdscribble save the journal file? [seconds] ''; }; @@ -115,7 +115,7 @@ in { else "localhost" ''; type = types.str; - description = '' + description = lib.mdDoc '' Host for the mpdscribble daemon to search for a mpd daemon on. ''; }; @@ -133,9 +133,9 @@ in { otherwise null. ''; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' File containing the password for the mpd daemon. - If there is a local mpd configured using + If there is a local mpd configured using {option}`services.mpd.credentials` the default is automatically set to a matching passwordFile of the local mpd. ''; }; @@ -144,7 +144,7 @@ in { default = mpdCfg.network.port; defaultText = literalExpression "config.${mpdOpt.network.port}"; type = types.port; - description = '' + description = lib.mdDoc '' Port for the mpdscribble daemon to search for a mpd daemon on. ''; }; @@ -157,18 +157,18 @@ in { type = types.str; default = endpointUrls.${name} or ""; description = - "The url endpoint where the scrobble API is listening."; + lib.mdDoc "The url endpoint where the scrobble API is listening."; }; username = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Username for the scrobble service. ''; }; passwordFile = mkOption { type = types.nullOr types.str; description = - "File containing the password, either as MD5SUM or cleartext."; + lib.mdDoc "File containing the password, either as MD5SUM or cleartext."; }; }; }; @@ -180,7 +180,7 @@ in { passwordFile = "/run/secrets/lastfm_password"; }; }; - description = '' + description = lib.mdDoc '' Endpoints to scrobble to. If the endpoint is one of "${ concatStringsSep "\", \"" (attrNames endpointUrls) diff --git a/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix b/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix index 319212c020..a7c8953f51 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/navidrome.nix @@ -21,8 +21,8 @@ in { example = { MusicFolder = "/mnt/music"; }; - description = '' - Configuration for Navidrome, see for supported values. + description = lib.mdDoc '' + Configuration for Navidrome, see for supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/roon-bridge.nix b/third_party/nixpkgs/nixos/modules/services/audio/roon-bridge.nix index e08f8a4f9e..9a9a6479ef 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/roon-bridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/roon-bridge.nix @@ -12,21 +12,21 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for the bridge. ''; }; user = mkOption { type = types.str; default = "roon-bridge"; - description = '' + description = lib.mdDoc '' User to run the Roon bridge as. ''; }; group = mkOption { type = types.str; default = "roon-bridge"; - description = '' + description = lib.mdDoc '' Group to run the Roon Bridge as. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/roon-server.nix b/third_party/nixpkgs/nixos/modules/services/audio/roon-server.nix index de1f61c8e7..535950f756 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/roon-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/roon-server.nix @@ -12,21 +12,21 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for the server. ''; }; user = mkOption { type = types.str; default = "roon-server"; - description = '' + description = lib.mdDoc '' User to run the Roon Server as. ''; }; group = mkOption { type = types.str; default = "roon-server"; - description = '' + description = lib.mdDoc '' Group to run the Roon Server as. ''; }; @@ -53,10 +53,12 @@ in { networking.firewall = mkIf cfg.openFirewall { allowedTCPPortRanges = [ { from = 9100; to = 9200; } - { from = 9330; to = 9332; } + { from = 9330; to = 9339; } + { from = 30000; to = 30010; } ]; allowedUDPPorts = [ 9003 ]; extraCommands = '' + ## IGMP / Broadcast ## iptables -A INPUT -s 224.0.0.0/4 -j ACCEPT iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT iptables -A INPUT -s 240.0.0.0/5 -j ACCEPT diff --git a/third_party/nixpkgs/nixos/modules/services/audio/slimserver.nix b/third_party/nixpkgs/nixos/modules/services/audio/slimserver.nix index ecd2652849..9fbc68b713 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/slimserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/slimserver.nix @@ -14,7 +14,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable slimserver. ''; }; @@ -23,13 +23,13 @@ in { type = types.package; default = pkgs.slimserver; defaultText = literalExpression "pkgs.slimserver"; - description = "Slimserver package to use."; + description = lib.mdDoc "Slimserver package to use."; }; dataDir = mkOption { type = types.path; default = "/var/lib/slimserver"; - description = '' + description = lib.mdDoc '' The directory where slimserver stores its state, tag cache, playlists etc. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix index 91d97a0b55..fdc1f605bb 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/snapserver.nix @@ -12,7 +12,7 @@ let sampleFormat = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Default sample format. ''; example = "48000:16:2"; @@ -21,7 +21,7 @@ let codec = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Default audio compression method. ''; example = "flac"; @@ -77,7 +77,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable snapserver. ''; }; @@ -86,7 +86,7 @@ in { type = types.str; default = "::"; example = "0.0.0.0"; - description = '' + description = lib.mdDoc '' The address where snapclients can connect. ''; }; @@ -94,7 +94,7 @@ in { port = mkOption { type = types.port; default = 1704; - description = '' + description = lib.mdDoc '' The port that snapclients can connect to. ''; }; @@ -104,7 +104,7 @@ in { # Make the behavior consistent with other services. Set the default to # false and remove the accompanying warning after NixOS 22.05 is released. default = true; - description = '' + description = lib.mdDoc '' Whether to automatically open the specified ports in the firewall. ''; }; @@ -115,7 +115,7 @@ in { streamBuffer = mkOption { type = with types; nullOr int; default = null; - description = '' + description = lib.mdDoc '' Stream read (input) buffer in ms. ''; example = 20; @@ -124,7 +124,7 @@ in { buffer = mkOption { type = with types; nullOr int; default = null; - description = '' + description = lib.mdDoc '' Network buffer in ms. ''; example = 1000; @@ -133,7 +133,7 @@ in { sendToMuted = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Send audio to muted clients. ''; }; @@ -141,7 +141,7 @@ in { tcp.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable the JSON-RPC via TCP. ''; }; @@ -150,7 +150,7 @@ in { type = types.str; default = "::"; example = "0.0.0.0"; - description = '' + description = lib.mdDoc '' The address where the TCP JSON-RPC listens on. ''; }; @@ -158,7 +158,7 @@ in { tcp.port = mkOption { type = types.port; default = 1705; - description = '' + description = lib.mdDoc '' The port where the TCP JSON-RPC listens on. ''; }; @@ -166,7 +166,7 @@ in { http.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable the JSON-RPC via HTTP. ''; }; @@ -175,7 +175,7 @@ in { type = types.str; default = "::"; example = "0.0.0.0"; - description = '' + description = lib.mdDoc '' The address where the HTTP JSON-RPC listens on. ''; }; @@ -183,7 +183,7 @@ in { http.port = mkOption { type = types.port; default = 1780; - description = '' + description = lib.mdDoc '' The port where the HTTP JSON-RPC listens on. ''; }; @@ -191,7 +191,7 @@ in { http.docRoot = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' Path to serve from the HTTP servers root. ''; }; @@ -201,12 +201,12 @@ in { options = { location = mkOption { type = types.oneOf [ types.path types.str ]; - description = '' - For type pipe or file, the path to the pipe or file. - For type librespot, airplay or process, the path to the corresponding binary. - For type tcp, the host:port address to connect to or listen on. - For type meta, a list of stream names in the form /one/two/.... Don't forget the leading slash. - For type alsa, use an empty string. + description = lib.mdDoc '' + For type `pipe` or `file`, the path to the pipe or file. + For type `librespot`, `airplay` or `process`, the path to the corresponding binary. + For type `tcp`, the `host:port` address to connect to or listen on. + For type `meta`, a list of stream names in the form `/one/two/...`. Don't forget the leading slash. + For type `alsa`, use an empty string. ''; example = literalExpression '' "/path/to/pipe" @@ -218,14 +218,14 @@ in { type = mkOption { type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" "meta" ]; default = "pipe"; - description = '' + description = lib.mdDoc '' The type of input stream. ''; }; query = mkOption { type = attrsOf str; default = {}; - description = '' + description = lib.mdDoc '' Key-value pairs that convey additional parameters about a stream. ''; example = literalExpression '' @@ -253,7 +253,7 @@ in { }; }); default = { default = {}; }; - description = '' + description = lib.mdDoc '' The definition for an input source. ''; example = literalExpression '' diff --git a/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix b/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix index 22848ed980..87ee083e74 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix @@ -22,9 +22,9 @@ in config = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' (Deprecated) Configuration for Spotifyd. For syntax and directives, see - . + . ''; }; @@ -32,9 +32,9 @@ in default = {}; type = toml.type; example = { global.bitrate = 320; }; - description = '' + description = lib.mdDoc '' Configuration for Spotifyd. For syntax and directives, see - . + . ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/squeezelite.nix b/third_party/nixpkgs/nixos/modules/services/audio/squeezelite.nix index 36295e21c6..767eeda177 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/squeezelite.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/squeezelite.nix @@ -21,7 +21,7 @@ in extraArguments = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Additional command line arguments to pass to Squeezelite. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix b/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix index 84b72d1425..98522f2542 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/ympd.nix @@ -17,7 +17,7 @@ in { webPort = mkOption { type = types.either types.str types.port; # string for backwards compat default = "8080"; - description = "The port where ympd's web interface will be available."; + description = lib.mdDoc "The port where ympd's web interface will be available."; example = "ssl://8080:/path/to/ssl-private-key.pem"; }; @@ -25,14 +25,14 @@ in { host = mkOption { type = types.str; default = "localhost"; - description = "The host where MPD is listening."; + description = lib.mdDoc "The host where MPD is listening."; }; port = mkOption { type = types.int; default = config.services.mpd.network.port; defaultText = literalExpression "config.services.mpd.network.port"; - description = "The port where MPD is listening."; + description = lib.mdDoc "The port where MPD is listening."; example = 6600; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix index cf0cb4da32..194b49da53 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/automysqlbackup.nix @@ -35,7 +35,7 @@ in calendar = mkOption { type = types.str; default = "01:15:00"; - description = '' + description = lib.mdDoc '' Configured when to run the backup service systemd unit (DayOfWeek Year-Month-Day Hour:Minute:Second). ''; }; @@ -43,9 +43,9 @@ in config = mkOption { type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); default = {}; - description = '' + description = lib.mdDoc '' automysqlbackup configuration. Refer to - ''${pkgs.automysqlbackup}/etc/automysqlbackup.conf + {file}`''${pkgs.automysqlbackup}/etc/automysqlbackup.conf` for details on supported values. ''; example = literalExpression '' diff --git a/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix b/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix index 5989020423..cb8a6eb439 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/bacula.nix @@ -114,7 +114,7 @@ let password = mkOption { type = types.str; # TODO: required? - description = '' + description = lib.mdDoc '' Specifies the password that must be supplied for the default Bacula Console to be authorized. The same password must appear in the Director resource of the Console configuration file. For added @@ -135,10 +135,10 @@ let type = types.enum [ "no" "yes" ]; default = "no"; example = "yes"; - description = '' - If Monitor is set to no, this director will have + description = lib.mdDoc '' + If Monitor is set to `no`, this director will have full access to this Storage daemon. If Monitor is set to - yes, this director will only be able to fetch the + `yes`, this director will only be able to fetch the current status of this Storage daemon. Please note that if this director is being used by a Monitor, we @@ -154,15 +154,15 @@ let options = { changerDevice = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The specified name-string must be the generic SCSI device name of the autochanger that corresponds to the normal read/write Archive Device specified in the Device resource. This generic SCSI device name should be specified if you have an autochanger or if you have a standard tape drive and want to use the Alert Command (see below). For example, on Linux systems, for an Archive Device name of - /dev/nst0, you would specify - /dev/sg0 for the Changer Device name. Depending + `/dev/nst0`, you would specify + `/dev/sg0` for the Changer Device name. Depending on your exact configuration, and the number of autochangers or the type of autochanger, what you specify here can vary. This directive is optional. See the Using AutochangersAutochangersChapter chapter of @@ -173,7 +173,7 @@ let changerCommand = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The name-string specifies an external program to be called that will automatically change volumes as required by Bacula. Normally, this directive will be specified only in the AutoChanger resource, which @@ -181,7 +181,7 @@ let different Changer Command in each Device resource. Most frequently, you will specify the Bacula supplied mtx-changer script as follows: - "/path/mtx-changer %c %o %S %a %d" + `"/path/mtx-changer %c %o %S %a %d"` and you will install the mtx on your system (found in the depkgs release). An example of this command is in the default bacula-sd.conf @@ -202,7 +202,7 @@ let extraAutochangerConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration to be passed in Autochanger directive. ''; example = '' @@ -219,13 +219,13 @@ let archiveDevice = mkOption { # TODO: required? type = types.str; - description = '' + description = lib.mdDoc '' The specified name-string gives the system file name of the storage device managed by this storage daemon. This will usually be the device file name of a removable storage device (tape drive), for - example /dev/nst0 or - /dev/rmt/0mbn. For a DVD-writer, it will be for - example /dev/hdc. It may also be a directory name + example `/dev/nst0` or + `/dev/rmt/0mbn`. For a DVD-writer, it will be for + example `/dev/hdc`. It may also be a directory name if you are archiving to disk storage. In this case, you must supply the full absolute path to the directory. When specifying a tape device, it is preferable that the "non-rewind" variant of the device @@ -236,9 +236,9 @@ let mediaType = mkOption { # TODO: required? type = types.str; - description = '' + description = lib.mdDoc '' The specified name-string names the type of media supported by this - device, for example, DLT7000. Media type names are + device, for example, `DLT7000`. Media type names are arbitrary in that you set them to anything you want, but they must be known to the volume database to keep track of which storage daemons can read which volumes. In general, each different storage type @@ -255,9 +255,9 @@ let Storage daemon, but it is with multiple Storage daemons, especially if they have incompatible media. - For example, if you specify a Media Type of DDS-4 + For example, if you specify a Media Type of `DDS-4` then during the restore, Bacula will be able to choose any Storage - Daemon that handles DDS-4. If you have an + Daemon that handles `DDS-4`. If you have an autochanger, you might want to name the Media Type in a way that is unique to the autochanger, unless you wish to possibly use the Volumes in other drives. You should also ensure to have unique Media @@ -274,7 +274,7 @@ let extraDeviceConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration to be passed in Device directive. ''; example = '' @@ -295,7 +295,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the Bacula File Daemon. ''; }; @@ -304,7 +304,7 @@ in { default = "${config.networking.hostName}-fd"; defaultText = literalExpression ''"''${config.networking.hostName}-fd"''; type = types.str; - description = '' + description = lib.mdDoc '' The client name that must be used by the Director when connecting. Generally, it is a good idea to use a name related to the machine so that error messages can be easily identified if you have multiple @@ -315,7 +315,7 @@ in { port = mkOption { default = 9102; type = types.int; - description = '' + description = lib.mdDoc '' This specifies the port number on which the Client listens for Director connections. It must agree with the FDPort specified in the Client resource of the Director's configuration file. @@ -324,7 +324,7 @@ in { director = mkOption { default = {}; - description = '' + description = lib.mdDoc '' This option defines director resources in Bacula File Daemon. ''; type = with types; attrsOf (submodule directorOptions); @@ -333,7 +333,7 @@ in { extraClientConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration to be passed in Client directive. ''; example = '' @@ -345,7 +345,7 @@ in { extraMessagesConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration to be passed in Messages directive. ''; example = '' @@ -358,7 +358,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Bacula Storage Daemon. ''; }; @@ -367,7 +367,7 @@ in { default = "${config.networking.hostName}-sd"; defaultText = literalExpression ''"''${config.networking.hostName}-sd"''; type = types.str; - description = '' + description = lib.mdDoc '' Specifies the Name of the Storage daemon. ''; }; @@ -375,7 +375,7 @@ in { port = mkOption { default = 9103; type = types.int; - description = '' + description = lib.mdDoc '' Specifies port number on which the Storage daemon listens for Director connections. ''; @@ -383,7 +383,7 @@ in { director = mkOption { default = {}; - description = '' + description = lib.mdDoc '' This option defines Director resources in Bacula Storage Daemon. ''; type = with types; attrsOf (submodule directorOptions); @@ -391,7 +391,7 @@ in { device = mkOption { default = {}; - description = '' + description = lib.mdDoc '' This option defines Device resources in Bacula Storage Daemon. ''; type = with types; attrsOf (submodule deviceOptions); @@ -399,7 +399,7 @@ in { autochanger = mkOption { default = {}; - description = '' + description = lib.mdDoc '' This option defines Autochanger resources in Bacula Storage Daemon. ''; type = with types; attrsOf (submodule autochangerOptions); @@ -408,7 +408,7 @@ in { extraStorageConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration to be passed in Storage directive. ''; example = '' @@ -420,7 +420,7 @@ in { extraMessagesConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration to be passed in Messages directive. ''; example = '' @@ -434,7 +434,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Bacula Director Daemon. ''; }; @@ -443,7 +443,7 @@ in { default = "${config.networking.hostName}-dir"; defaultText = literalExpression ''"''${config.networking.hostName}-dir"''; type = types.str; - description = '' + description = lib.mdDoc '' The director name used by the system administrator. This directive is required. ''; @@ -452,7 +452,7 @@ in { port = mkOption { default = 9101; type = types.int; - description = '' + description = lib.mdDoc '' Specify the port (a positive integer) on which the Director daemon will listen for Bacula Console connections. This same port number must be specified in the Director resource of the Console @@ -465,7 +465,7 @@ in { password = mkOption { # TODO: required? type = types.str; - description = '' + description = lib.mdDoc '' Specifies the password that must be supplied for a Director. ''; }; @@ -473,7 +473,7 @@ in { extraMessagesConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration to be passed in Messages directive. ''; example = '' @@ -484,7 +484,7 @@ in { extraDirectorConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration to be passed in Director directive. ''; example = '' @@ -496,7 +496,7 @@ in { extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration for Bacula Director Daemon. ''; example = '' diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix index 4c9ddfe467..147b827497 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgbackup.nix @@ -219,7 +219,7 @@ in { ###### interface options.services.borgbackup.jobs = mkOption { - description = '' + description = lib.mdDoc '' Deduplicating backups using BorgBackup. Adding a job will cause a borg-job-NAME wrapper to be added to your system path, so that you can perform maintenance easily. @@ -265,9 +265,9 @@ in { paths = mkOption { type = with types; nullOr (coercedTo str lib.singleton (listOf str)); default = null; - description = '' + description = lib.mdDoc '' Path(s) to back up. - Mutually exclusive with . + Mutually exclusive with {option}`dumpCommand`. ''; example = "/home/user"; }; @@ -275,42 +275,42 @@ in { dumpCommand = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' Backup the stdout of this program instead of filesystem paths. - Mutually exclusive with . + Mutually exclusive with {option}`paths`. ''; example = "/path/to/createZFSsend.sh"; }; repo = mkOption { type = types.str; - description = "Remote or local repository to back up to."; + description = lib.mdDoc "Remote or local repository to back up to."; example = "user@machine:/path/to/repo"; }; removableDevice = mkOption { type = types.bool; default = false; - description = "Whether the repo (which must be local) is a removable device."; + description = lib.mdDoc "Whether the repo (which must be local) is a removable device."; }; archiveBaseName = mkOption { type = types.nullOr (types.strMatching "[^/{}]+"); default = "${globalConfig.networking.hostName}-${name}"; defaultText = literalExpression ''"''${config.networking.hostName}-"''; - description = '' + description = lib.mdDoc '' How to name the created archives. A timestamp, whose format is - determined by , will be appended. The full - name can be modified at runtime ($archiveName). - Placeholders like {hostname} must not be used. - Use null for no base name. + determined by {option}`dateFormat`, will be appended. The full + name can be modified at runtime (`$archiveName`). + Placeholders like `{hostname}` must not be used. + Use `null` for no base name. ''; }; dateFormat = mkOption { type = types.str; - description = '' - Arguments passed to date + description = lib.mdDoc '' + Arguments passed to {command}`date` to create a timestamp suffix for the archive name. ''; default = "+%Y-%m-%dT%H:%M:%S"; @@ -347,19 +347,19 @@ in { user = mkOption { type = types.str; - description = '' - The user borg is run as. + description = lib.mdDoc '' + The user {command}`borg` is run as. User or group need read permission - for the specified . + for the specified {option}`paths`. ''; default = "root"; }; group = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The group borg is run as. User or group needs read permission - for the specified . + for the specified {option}`paths`. ''; default = "root"; }; @@ -371,20 +371,20 @@ in { "authenticated" "authenticated-blake2" "none" ]; - description = '' + description = lib.mdDoc '' Encryption mode to use. Setting a mode - other than "none" requires - you to specify a - or a . + other than `"none"` requires + you to specify a {option}`passCommand` + or a {option}`passphrase`. ''; example = "repokey-blake2"; }; encryption.passCommand = mkOption { type = with types; nullOr str; - description = '' + description = lib.mdDoc '' A command which prints the passphrase to stdout. - Mutually exclusive with . + Mutually exclusive with {option}`passphrase`. ''; default = null; example = "cat /path/to/passphrase_file"; @@ -392,11 +392,11 @@ in { encryption.passphrase = mkOption { type = with types; nullOr str; - description = '' + description = lib.mdDoc '' The passphrase the backups are encrypted with. - Mutually exclusive with . + Mutually exclusive with {option}`passCommand`. If you do not want the passphrase to be stored in the - world-readable Nix store, use . + world-readable Nix store, use {option}`passCommand`. ''; default = null; }; @@ -406,9 +406,9 @@ in { # compression mode must be given, # compression level is optional type = types.strMatching "none|(auto,)?(lz4|zstd|zlib|lzma)(,[[:digit:]]{1,2})?"; - description = '' + description = lib.mdDoc '' Compression method to use. Refer to - borg help compression + {command}`borg help compression` for all available options. ''; default = "lz4"; @@ -417,9 +417,9 @@ in { exclude = mkOption { type = with types; listOf str; - description = '' + description = lib.mdDoc '' Exclude paths matching any of the given patterns. See - borg help patterns for pattern syntax. + {command}`borg help patterns` for pattern syntax. ''; default = [ ]; example = [ @@ -430,9 +430,9 @@ in { readWritePaths = mkOption { type = with types; listOf path; - description = '' + description = lib.mdDoc '' By default, borg cannot write anywhere on the system but - $HOME/.config/borg and $HOME/.cache/borg. + `$HOME/.config/borg` and `$HOME/.cache/borg`. If, for example, your preHook script needs to dump files somewhere, put those directories here. ''; @@ -444,8 +444,8 @@ in { privateTmp = mkOption { type = types.bool; - description = '' - Set the PrivateTmp option for + description = lib.mdDoc '' + Set the `PrivateTmp` option for the systemd-service. Set to false if you need sockets or other files from global /tmp. ''; @@ -454,10 +454,10 @@ in { doInit = mkOption { type = types.bool; - description = '' - Run borg init if the - specified does not exist. - You should set this to false + description = lib.mdDoc '' + Run {command}`borg init` if the + specified {option}`repo` does not exist. + You should set this to `false` if the repository is located on an external drive that might not always be mounted. ''; @@ -466,10 +466,10 @@ in { appendFailedSuffix = mkOption { type = types.bool; - description = '' - Append a .failed suffix + description = lib.mdDoc '' + Append a `.failed` suffix to the archive name, which is only removed if - borg create has a zero exit status. + {command}`borg create` has a zero exit status. ''; default = true; }; @@ -479,9 +479,9 @@ in { # means there is no limit of yearly archives to keep # The regex is for use with e.g. --keep-within 1y type = with types; attrsOf (either int (strMatching "[[:digit:]]+[Hdwmy]")); - description = '' + description = lib.mdDoc '' Prune a repository by deleting all archives not matching any of the - specified retention options. See borg help prune + specified retention options. See {command}`borg help prune` for the available options. ''; default = { }; @@ -497,10 +497,10 @@ in { prune.prefix = mkOption { type = types.nullOr (types.str); - description = '' + description = lib.mdDoc '' Only consider archive names starting with this prefix for pruning. By default, only archives created by this job are considered. - Use "" or null to consider all archives. + Use `""` or `null` to consider all archives. ''; default = config.archiveBaseName; defaultText = literalExpression "archiveBaseName"; @@ -508,7 +508,7 @@ in { environment = mkOption { type = with types; attrsOf str; - description = '' + description = lib.mdDoc '' Environment variables passed to the backup script. You can for example specify which SSH key to use. ''; @@ -518,7 +518,7 @@ in { preHook = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands to run before the backup. This can for example be used to mount file systems. ''; @@ -531,43 +531,43 @@ in { postInit = mkOption { type = types.lines; - description = '' - Shell commands to run after borg init. + description = lib.mdDoc '' + Shell commands to run after {command}`borg init`. ''; default = ""; }; postCreate = mkOption { type = types.lines; - description = '' - Shell commands to run after borg create. The name - of the created archive is stored in $archiveName. + description = lib.mdDoc '' + Shell commands to run after {command}`borg create`. The name + of the created archive is stored in `$archiveName`. ''; default = ""; }; postPrune = mkOption { type = types.lines; - description = '' - Shell commands to run after borg prune. + description = lib.mdDoc '' + Shell commands to run after {command}`borg prune`. ''; default = ""; }; postHook = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands to run just before exit. They are executed even if a previous command exits with a non-zero exit code. - The latter is available as $exitStatus. + The latter is available as `$exitStatus`. ''; default = ""; }; extraArgs = mkOption { type = types.str; - description = '' - Additional arguments for all borg calls the + description = lib.mdDoc '' + Additional arguments for all {command}`borg` calls the service has. Handle with care. ''; default = ""; @@ -576,9 +576,9 @@ in { extraInitArgs = mkOption { type = types.str; - description = '' - Additional arguments for borg init. - Can also be set at runtime using $extraInitArgs. + description = lib.mdDoc '' + Additional arguments for {command}`borg init`. + Can also be set at runtime using `$extraInitArgs`. ''; default = ""; example = "--append-only"; @@ -586,9 +586,9 @@ in { extraCreateArgs = mkOption { type = types.str; - description = '' - Additional arguments for borg create. - Can also be set at runtime using $extraCreateArgs. + description = lib.mdDoc '' + Additional arguments for {command}`borg create`. + Can also be set at runtime using `$extraCreateArgs`. ''; default = ""; example = "--stats --checkpoint-interval 600"; @@ -596,9 +596,9 @@ in { extraPruneArgs = mkOption { type = types.str; - description = '' - Additional arguments for borg prune. - Can also be set at runtime using $extraPruneArgs. + description = lib.mdDoc '' + Additional arguments for {command}`borg prune`. + Can also be set at runtime using `$extraPruneArgs`. ''; default = ""; example = "--save-space"; @@ -610,12 +610,12 @@ in { }; options.services.borgbackup.repos = mkOption { - description = '' + description = lib.mdDoc '' Serve BorgBackup repositories to given public SSH keys, restricting their access to the repository only. See also the chapter about BorgBackup in the NixOS manual. Also, clients do not need to specify the absolute path when accessing the repository, - i.e. user@machine:. is enough. (Note colon and dot.) + i.e. `user@machine:.` is enough. (Note colon and dot.) ''; default = { }; type = types.attrsOf (types.submodule ( @@ -623,7 +623,7 @@ in { options = { path = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Where to store the backups. Note that the directory is created automatically, with correct permissions. ''; @@ -632,30 +632,30 @@ in { user = mkOption { type = types.str; - description = '' - The user borg serve is run as. + description = lib.mdDoc '' + The user {command}`borg serve` is run as. User or group needs write permission - for the specified . + for the specified {option}`path`. ''; default = "borg"; }; group = mkOption { type = types.str; - description = '' - The group borg serve is run as. + description = lib.mdDoc '' + The group {command}`borg serve` is run as. User or group needs write permission - for the specified . + for the specified {option}`path`. ''; default = "borg"; }; authorizedKeys = mkOption { type = with types; listOf str; - description = '' + description = lib.mdDoc '' Public SSH keys that are given full write access to this repository. You should use a different SSH key for each repository you write to, because - the specified keys are restricted to running borg serve + the specified keys are restricted to running {command}`borg serve` and can only access this single repository. ''; default = [ ]; @@ -663,7 +663,7 @@ in { authorizedKeysAppendOnly = mkOption { type = with types; listOf str; - description = '' + description = lib.mdDoc '' Public SSH keys that can only be used to append new data (archives) to the repository. Note that archives can still be marked as deleted and are subsequently removed from disk upon accessing the repo with full write access, e.g. when pruning. @@ -673,11 +673,11 @@ in { allowSubRepos = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Allow clients to create repositories in subdirectories of the - specified . These can be accessed using - user@machine:path/to/subrepo. Note that a - applies to repositories independently. + specified {option}`path`. These can be accessed using + `user@machine:path/to/subrepo`. Note that a + {option}`quota` applies to repositories independently. Therefore, if this is enabled, clients can create multiple repositories and upload an arbitrary amount of data. ''; @@ -687,9 +687,9 @@ in { quota = mkOption { # See the definition of parse_file_size() in src/borg/helpers/parseformat.py type = with types; nullOr (strMatching "[[:digit:].]+[KMGTP]?"); - description = '' + description = lib.mdDoc '' Storage quota for the repository. This quota is ensured for all - sub-repositories if is enabled + sub-repositories if {option}`allowSubRepos` is enabled but not for the overall storage space used. ''; default = null; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix index 9414d78aa7..7236a1f194 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix @@ -11,7 +11,7 @@ in { enable = mkEnableOption "borgmatic"; settings = mkOption { - description = '' + description = lib.mdDoc '' See https://torsion.org/borgmatic/docs/reference/configuration/ ''; type = types.submodule { @@ -19,7 +19,7 @@ in { options.location = { source_directories = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of source directories to backup (required). Globs and tildes are expanded. ''; @@ -27,7 +27,7 @@ in { }; repositories = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Paths to local or remote repositories (required). Tildes are expanded. Multiple repositories are backed up to in sequence. Borg placeholders can be used. See the output of diff --git a/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix b/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix index e17761ffc3..f1d58f597c 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/btrbk.nix @@ -74,23 +74,23 @@ in options = { services.btrbk = { extraPackages = mkOption { - description = "Extra packages for btrbk, like compression utilities for stream_compress"; + description = lib.mdDoc "Extra packages for btrbk, like compression utilities for `stream_compress`"; type = types.listOf types.package; default = [ ]; example = literalExpression "[ pkgs.xz ]"; }; niceness = mkOption { - description = "Niceness for local instances of btrbk. Also applies to remote ones connecting via ssh when positive."; + description = lib.mdDoc "Niceness for local instances of btrbk. Also applies to remote ones connecting via ssh when positive."; type = types.ints.between (-20) 19; default = 10; }; ioSchedulingClass = mkOption { - description = "IO scheduling class for btrbk (see ionice(1) for a quick description). Applies to local instances, and remote ones connecting by ssh if set to idle."; + description = lib.mdDoc "IO scheduling class for btrbk (see ionice(1) for a quick description). Applies to local instances, and remote ones connecting by ssh if set to idle."; type = types.enum [ "idle" "best-effort" "realtime" ]; default = "best-effort"; }; instances = mkOption { - description = "Set of btrbk instances. The instance named btrbk is the default one."; + description = lib.mdDoc "Set of btrbk instances. The instance named `btrbk` is the default one."; type = with types; attrsOf ( submodule { @@ -98,7 +98,7 @@ in onCalendar = mkOption { type = types.nullOr types.str; default = "daily"; - description = '' + description = lib.mdDoc '' How often this btrbk instance is started. See systemd.time(7) for more information about the format. Setting it to null disables the timer, thus this instance can only be started manually. ''; @@ -119,7 +119,7 @@ in }; }; }; - description = "configuration options for btrbk. Nested attrsets translate to subsections."; + description = lib.mdDoc "configuration options for btrbk. Nested attrsets translate to subsections."; }; }; } @@ -127,18 +127,18 @@ in default = { }; }; sshAccess = mkOption { - description = "SSH keys that should be able to make or push snapshots on this system remotely with btrbk"; + description = lib.mdDoc "SSH keys that should be able to make or push snapshots on this system remotely with btrbk"; type = with types; listOf ( submodule { options = { key = mkOption { type = str; - description = "SSH public key allowed to login as user btrbk to run remote backups."; + description = lib.mdDoc "SSH public key allowed to login as user `btrbk` to run remote backups."; }; roles = mkOption { type = listOf (enum [ "info" "source" "target" "delete" "snapshot" "send" "receive" ]); example = [ "source" "info" "send" ]; - description = "What actions can be performed with this SSH key. See ssh_filter_btrbk(1) for details"; + description = lib.mdDoc "What actions can be performed with this SSH key. See ssh_filter_btrbk(1) for details"; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/backup/duplicati.nix b/third_party/nixpkgs/nixos/modules/services/backup/duplicati.nix index 97864c4469..8da29a04c8 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/duplicati.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/duplicati.nix @@ -13,7 +13,7 @@ in port = mkOption { default = 8200; type = types.int; - description = '' + description = lib.mdDoc '' Port serving the web interface ''; }; @@ -35,7 +35,7 @@ in interface = mkOption { default = "127.0.0.1"; type = types.str; - description = '' + description = lib.mdDoc '' Listening interface for the web UI Set it to "any" to listen on all available interfaces ''; @@ -44,7 +44,7 @@ in user = mkOption { default = "duplicati"; type = types.str; - description = '' + description = lib.mdDoc '' Duplicati runs as it's own user. It will only be able to backup world-readable files. Run as root with special care. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/duplicity.nix b/third_party/nixpkgs/nixos/modules/services/backup/duplicity.nix index 6949fa8b99..765afd43d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/duplicity.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/duplicity.nix @@ -18,7 +18,7 @@ in root = mkOption { type = types.path; default = "/"; - description = '' + description = lib.mdDoc '' Root directory to backup. ''; }; @@ -63,9 +63,9 @@ in systemd.exec 5. For example: - PASSPHRASE=... - AWS_ACCESS_KEY_ID=... - AWS_SECRET_ACCESS_KEY=... + PASSPHRASE=«...» + AWS_ACCESS_KEY_ID=«...» + AWS_SECRET_ACCESS_KEY=«...» ''; }; @@ -96,10 +96,10 @@ in type = types.str; default = "never"; example = "1M"; - description = '' - If "never" (the default) always do incremental + description = lib.mdDoc '' + If `"never"` (the default) always do incremental backups (the first backup will be a full backup, of course). If - "always" always do full backups. Otherwise, this + `"always"` always do full backups. Otherwise, this must be a string representing a duration. Full backups will be made when the latest full backup is older than this duration. If this is not the case, an incremental backup is performed. @@ -111,7 +111,7 @@ in type = types.nullOr types.str; default = null; example = "6M"; - description = '' + description = lib.mdDoc '' If non-null, delete all backup sets older than the given time. Old backup sets will not be deleted if backup sets newer than time depend on them. ''; @@ -120,7 +120,7 @@ in type = types.nullOr types.int; default = null; example = 2; - description = '' + description = lib.mdDoc '' If non-null, delete all backups sets that are older than the count:th last full backup (in other words, keep the last count full backups and associated incremental sets). @@ -130,7 +130,7 @@ in type = types.nullOr types.int; default = null; example = 1; - description = '' + description = lib.mdDoc '' If non-null, delete incremental sets of all backups sets that are older than the count:th last full backup (in other words, keep only old full backups and not their increments). diff --git a/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix b/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix index c40a0b5abc..41adb63e7f 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix @@ -42,7 +42,7 @@ in calendar = mkOption { type = types.str; default = "01:15:00"; - description = '' + description = lib.mdDoc '' Configured when to run the backup service systemd unit (DayOfWeek Year-Month-Day Hour:Minute:Second). ''; }; @@ -50,7 +50,7 @@ in user = mkOption { type = types.str; default = defaultUser; - description = '' + description = lib.mdDoc '' User to be used to perform backup. ''; }; @@ -58,7 +58,7 @@ in databases = mkOption { default = []; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of database names to dump. ''; }; @@ -66,7 +66,7 @@ in location = mkOption { type = types.path; default = "/var/backup/mysql"; - description = '' + description = lib.mdDoc '' Location to put the gzipped MySQL database dumps. ''; }; @@ -74,7 +74,7 @@ in singleTransaction = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to create database dump in a single transaction ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix index f22b613382..744ccb98e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-backup.nix @@ -76,8 +76,8 @@ in { startAt = mkOption { default = "*-*-* 01:15:00"; type = with types; either (listOf str) str; - description = '' - This option defines (see systemd.time for format) when the + description = lib.mdDoc '' + This option defines (see `systemd.time` for format) when the databases should be dumped. The default is to update at 01:15 (at night) every day. ''; @@ -87,10 +87,10 @@ in { default = cfg.databases == []; defaultText = literalExpression "services.postgresqlBackup.databases == []"; type = lib.types.bool; - description = '' + description = lib.mdDoc '' Backup all databases using pg_dumpall. This option is mutual exclusive to - services.postgresqlBackup.databases. + `services.postgresqlBackup.databases`. The resulting backup dump will have the name all.sql.gz. This option is the default if no databases are specified. ''; @@ -99,7 +99,7 @@ in { databases = mkOption { default = []; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of database names to dump. ''; }; @@ -107,7 +107,7 @@ in { location = mkOption { default = "/var/backup/postgresql"; type = types.path; - description = '' + description = lib.mdDoc '' Path of directory where the PostgreSQL database dumps will be placed. ''; }; @@ -115,9 +115,9 @@ in { pgdumpOptions = mkOption { type = types.separatedString " "; default = "-C"; - description = '' + description = lib.mdDoc '' Command line options for pg_dump. This options is not used - if config.services.postgresqlBackup.backupAll is enabled. + if `config.services.postgresqlBackup.backupAll` is enabled. Note that config.services.postgresqlBackup.backupAll is also active, when no databases where specified. ''; @@ -126,7 +126,7 @@ in { compression = mkOption { type = types.enum ["none" "gzip" "zstd"]; default = "gzip"; - description = '' + description = lib.mdDoc '' The type of compression to use on the generated database dump. ''; }; @@ -134,7 +134,7 @@ in { compressionLevel = mkOption { type = types.ints.between 1 19; default = 6; - description = '' + description = lib.mdDoc '' The compression level used when compression is enabled. gzip accepts levels 1 to 9. zstd accepts levels 1 to 19. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix index 32643adfda..01fd57f5c5 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/postgresql-wal-receiver.nix @@ -8,7 +8,7 @@ let postgresqlPackage = mkOption { type = types.package; example = literalExpression "pkgs.postgresql_11"; - description = '' + description = lib.mdDoc '' PostgreSQL package to use. ''; }; @@ -16,7 +16,7 @@ let directory = mkOption { type = types.path; example = literalExpression "/mnt/pg_wal/main/"; - description = '' + description = lib.mdDoc '' Directory to write the output to. ''; }; @@ -24,7 +24,7 @@ let statusInterval = mkOption { type = types.int; default = 10; - description = '' + description = lib.mdDoc '' Specifies the number of seconds between status packets sent back to the server. This allows for easier monitoring of the progress from server. A value of zero disables the periodic status updates completely, @@ -36,27 +36,27 @@ let type = types.str; default = ""; example = "some_slot_name"; - description = '' - Require pg_receivewal to use an existing replication slot (see - Section 26.2.6 of the PostgreSQL manual). - When this option is used, pg_receivewal will report a flush position to the server, + description = lib.mdDoc '' + Require {command}`pg_receivewal` to use an existing replication slot (see + [Section 26.2.6 of the PostgreSQL manual](https://www.postgresql.org/docs/current/warm-standby.html#STREAMING-REPLICATION-SLOTS)). + When this option is used, {command}`pg_receivewal` will report a flush position to the server, indicating when each segment has been synchronized to disk so that the server can remove that segment if it is not otherwise needed. - When the replication client of pg_receivewal is configured on the server as a synchronous standby, + When the replication client of {command}`pg_receivewal` is configured on the server as a synchronous standby, then using a replication slot will report the flush position to the server, but only when a WAL file is closed. Therefore, that configuration will cause transactions on the primary to wait for a long time and effectively not work satisfactorily. - The option must be specified in addition to make this work correctly. + The option {option}`synchronous` must be specified in addition to make this work correctly. ''; }; synchronous = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Flush the WAL data to disk immediately after it has been received. - Also send a status packet back to the server immediately after flushing, regardless of . + Also send a status packet back to the server immediately after flushing, regardless of {option}`statusInterval`. - This option should be specified if the replication client of pg_receivewal is configured on the server as a synchronous standby, + This option should be specified if the replication client of {command}`pg_receivewal` is configured on the server as a synchronous standby, to ensure that timely feedback is sent to the server. ''; }; @@ -64,10 +64,10 @@ let compress = mkOption { type = types.ints.between 0 9; default = 0; - description = '' + description = lib.mdDoc '' Enables gzip compression of write-ahead logs, and specifies the compression level - (0 through 9, 0 being no compression and 9 being best compression). - The suffix .gz will automatically be added to all filenames. + (`0` through `9`, `0` being no compression and `9` being best compression). + The suffix `.gz` will automatically be added to all filenames. This option requires PostgreSQL >= 10. ''; @@ -76,11 +76,11 @@ let connection = mkOption { type = types.str; example = "postgresql://user@somehost"; - description = '' + description = lib.mdDoc '' Specifies parameters used to connect to the server, as a connection string. - See Section 34.1.1 of the PostgreSQL manual for more information. + See [Section 34.1.1 of the PostgreSQL manual](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING) for more information. - Because pg_receivewal doesn't connect to any particular database in the cluster, + Because {command}`pg_receivewal` doesn't connect to any particular database in the cluster, database name in the connection string will be ignored. ''; }; @@ -93,8 +93,8 @@ let "--no-sync" ] ''; - description = '' - A list of extra arguments to pass to the pg_receivewal command. + description = lib.mdDoc '' + A list of extra arguments to pass to the {command}`pg_receivewal` command. ''; }; @@ -107,9 +107,9 @@ let PGSSLMODE = "require"; } ''; - description = '' + description = lib.mdDoc '' Environment variables passed to the service. - Usable parameters are listed in Section 34.14 of the PostgreSQL manual. + Usable parameters are listed in [Section 34.14 of the PostgreSQL manual](https://www.postgresql.org/docs/current/libpq-envars.html). ''; }; }; @@ -131,10 +131,10 @@ in { }; } ''; - description = '' + description = lib.mdDoc '' PostgreSQL WAL receivers. - Stream write-ahead logs from a PostgreSQL server using pg_receivewal (formerly pg_receivexlog). - See the man page for more information. + Stream write-ahead logs from a PostgreSQL server using {command}`pg_receivewal` (formerly {command}`pg_receivexlog`). + See [the man page](https://www.postgresql.org/docs/current/app-pgreceivewal.html) for more information. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix index 4717119f17..1d3892c158 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix @@ -15,19 +15,19 @@ in default = ":8000"; example = "127.0.0.1:8080"; type = types.str; - description = "Listen on a specific IP address and port."; + description = lib.mdDoc "Listen on a specific IP address and port."; }; dataDir = mkOption { default = "/var/lib/restic"; type = types.path; - description = "The directory for storing the restic repository."; + description = lib.mdDoc "The directory for storing the restic repository."; }; appendOnly = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable append only mode. This mode allows creation of new backups but prevents deletion and modification of existing backups. This can be useful when backing up systems that have a potential of being hacked. @@ -37,7 +37,7 @@ in privateRepos = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable private repos. Grants access only when a subdirectory with the same name as the user is specified in the repository URL. ''; @@ -46,13 +46,13 @@ in prometheus = mkOption { default = false; type = types.bool; - description = "Enable Prometheus metrics at /metrics."; + description = lib.mdDoc "Enable Prometheus metrics at /metrics."; }; extraFlags = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Extra commandline options to pass to Restic REST server. ''; }; @@ -61,7 +61,7 @@ in default = pkgs.restic-rest-server; defaultText = literalExpression "pkgs.restic-rest-server"; type = types.package; - description = "Restic REST server package to use."; + description = lib.mdDoc "Restic REST server package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix index 333fdd494e..2b0dcb1634 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix @@ -8,14 +8,14 @@ let in { options.services.restic.backups = mkOption { - description = '' + description = lib.mdDoc '' Periodic backups to create with Restic. ''; type = types.attrsOf (types.submodule ({ config, name, ... }: { options = { passwordFile = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Read the repository password from a file. ''; example = "/etc/nixos/restic-password"; @@ -26,7 +26,7 @@ in # added on 2021-08-28, s3CredentialsFile should # be removed in the future (+ remember the warning) default = config.s3CredentialsFile; - description = '' + description = lib.mdDoc '' file containing the credentials to access the repository, in the format of an EnvironmentFile as described by systemd.exec(5) ''; @@ -35,7 +35,7 @@ in s3CredentialsFile = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' file containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY for an S3-hosted repository, in the format of an EnvironmentFile as described by systemd.exec(5) @@ -45,13 +45,13 @@ in rcloneOptions = mkOption { type = with types; nullOr (attrsOf (oneOf [ str bool ])); default = null; - description = '' + description = lib.mdDoc '' Options to pass to rclone to control its behavior. - See for + See for available options. When specifying option names, strip the - leading --. To set a flag such as - --drive-use-trash, which does not take a value, - set the value to the Boolean true. + leading `--`. To set a flag such as + `--drive-use-trash`, which does not take a value, + set the value to the Boolean `true`. ''; example = { bwlimit = "10M"; @@ -62,16 +62,16 @@ in rcloneConfig = mkOption { type = with types; nullOr (attrsOf (oneOf [ str bool ])); default = null; - description = '' + description = lib.mdDoc '' Configuration for the rclone remote being used for backup. See the remote's specific options under rclone's docs at - . When specifying + . When specifying option names, use the "config" name specified in the docs. - For example, to set --b2-hard-delete for a B2 - remote, use hard_delete = true in the + For example, to set `--b2-hard-delete` for a B2 + remote, use `hard_delete = true` in the attribute set. Warning: Secrets set in here will be world-readable in the Nix - store! Consider using the rcloneConfigFile + store! Consider using the `rcloneConfigFile` option instead to specify secret values separately. Note that options set here will override those set in the config file. ''; @@ -86,11 +86,11 @@ in rcloneConfigFile = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' Path to the file containing rclone configuration. This file must contain configuration for the remote specified in this backup set and also must be readable by root. Options set in - rcloneConfig will override those set in this + `rcloneConfig` will override those set in this file. ''; }; @@ -98,7 +98,7 @@ in repository = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' repository to backup to. ''; example = "sftp:backup@192.168.1.100:/backups/${name}"; @@ -107,7 +107,7 @@ in repositoryFile = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' Path to the file containing the repository location to backup to. ''; }; @@ -115,7 +115,7 @@ in paths = mkOption { type = types.nullOr (types.listOf types.str); default = null; - description = '' + description = lib.mdDoc '' Which paths to backup. If null or an empty array, no backup command will be run. This can be used to create a prune-only job. @@ -131,7 +131,7 @@ in default = { OnCalendar = "daily"; }; - description = '' + description = lib.mdDoc '' When to run the backup. See man systemd.timer for details. ''; example = { @@ -143,7 +143,7 @@ in user = mkOption { type = types.str; default = "root"; - description = '' + description = lib.mdDoc '' As which user the backup should run. ''; example = "postgresql"; @@ -152,7 +152,7 @@ in extraBackupArgs = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' Extra arguments passed to restic backup. ''; example = [ @@ -163,7 +163,7 @@ in extraOptions = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' Extra extended options to be passed to the restic --option flag. ''; example = [ @@ -174,7 +174,7 @@ in initialize = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Create the repository if it doesn't exist. ''; }; @@ -199,7 +199,7 @@ in dynamicFilesFrom = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' A script that produces a list of files to back up. The results of this command are given to the '--files-from' option. @@ -210,7 +210,7 @@ in backupPrepareCommand = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' A script that must run before starting the backup process. ''; }; @@ -218,10 +218,19 @@ in backupCleanupCommand = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' A script that must run after finishing the backup process. ''; }; + + package = mkOption { + type = types.package; + default = pkgs.restic; + defaultText = literalExpression "pkgs.restic"; + description = lib.mdDoc '' + Restic package to use. + ''; + }; }; })); default = { }; @@ -254,7 +263,7 @@ in (name: backup: let extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions; - resticCmd = "${pkgs.restic}/bin/restic${extraOptions}"; + resticCmd = "${backup.package}/bin/restic${extraOptions}"; filesFromTmpFile = "/run/restic-backups-${name}/includes"; backupPaths = if (backup.dynamicFilesFrom == null) @@ -312,7 +321,7 @@ in ''} ''; } // optionalAttrs (backup.dynamicFilesFrom != null || backup.backupCleanupCommand != null) { - postStart = '' + postStop = '' ${optionalString (backup.backupCleanupCommand != null) '' ${pkgs.writeScript "backupCleanupCommand" backup.backupCleanupCommand} ''} diff --git a/third_party/nixpkgs/nixos/modules/services/backup/rsnapshot.nix b/third_party/nixpkgs/nixos/modules/services/backup/rsnapshot.nix index 6635a51ec2..b18c02d7d1 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/rsnapshot.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/rsnapshot.nix @@ -24,7 +24,7 @@ in services.rsnapshot = { enable = mkEnableOption "rsnapshot backups"; enableManualRsnapshot = mkOption { - description = "Whether to enable manual usage of the rsnapshot command with this module."; + description = lib.mdDoc "Whether to enable manual usage of the rsnapshot command with this module."; default = true; type = types.bool; }; @@ -37,7 +37,7 @@ in backup /home/ localhost/ ''; type = types.lines; - description = '' + description = lib.mdDoc '' rsnapshot configuration option in addition to the defaults from rsnapshot and this module. @@ -53,7 +53,7 @@ in default = {}; example = { hourly = "0 * * * *"; daily = "50 21 * * *"; }; type = types.attrsOf types.str; - description = '' + description = lib.mdDoc '' Periodicity at which intervals should be run by cron. Note that the intervals also have to exist in configuration as retain options. diff --git a/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix b/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix index 5eb031b2e9..847b8507f7 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/sanoid.nix @@ -12,37 +12,37 @@ let commonOptions = { hourly = mkOption { - description = "Number of hourly snapshots."; + description = lib.mdDoc "Number of hourly snapshots."; type = with types; nullOr ints.unsigned; default = null; }; daily = mkOption { - description = "Number of daily snapshots."; + description = lib.mdDoc "Number of daily snapshots."; type = with types; nullOr ints.unsigned; default = null; }; monthly = mkOption { - description = "Number of monthly snapshots."; + description = lib.mdDoc "Number of monthly snapshots."; type = with types; nullOr ints.unsigned; default = null; }; yearly = mkOption { - description = "Number of yearly snapshots."; + description = lib.mdDoc "Number of yearly snapshots."; type = with types; nullOr ints.unsigned; default = null; }; autoprune = mkOption { - description = "Whether to automatically prune old snapshots."; + description = lib.mdDoc "Whether to automatically prune old snapshots."; type = with types; nullOr bool; default = null; }; autosnap = mkOption { - description = "Whether to automatically take snapshots."; + description = lib.mdDoc "Whether to automatically take snapshots."; type = with types; nullOr bool; default = null; }; @@ -50,7 +50,7 @@ let datasetOptions = rec { use_template = mkOption { - description = "Names of the templates to use for this dataset."; + description = lib.mdDoc "Names of the templates to use for this dataset."; type = types.listOf (types.str // { check = (types.enum (attrNames cfg.templates)).check; description = "configured template name"; @@ -60,9 +60,9 @@ let useTemplate = use_template; recursive = mkOption { - description = '' + description = lib.mdDoc '' Whether to recursively snapshot dataset children. - You can also set this to "zfs" to handle datasets + You can also set this to `"zfs"` to handle datasets recursively in an atomic way without the possibility to override settings for child datasets. ''; @@ -71,7 +71,7 @@ let }; process_children_only = mkOption { - description = "Whether to only snapshot child datasets if recursing."; + description = lib.mdDoc "Whether to only snapshot child datasets if recursing."; type = types.bool; default = false; }; @@ -135,7 +135,7 @@ in config.process_children_only = mkAliasDefinitions (mkDefault options.processChildrenOnly or { }); })); default = { }; - description = "Datasets to snapshot."; + description = lib.mdDoc "Datasets to snapshot."; }; templates = mkOption { @@ -144,14 +144,14 @@ in options = commonOptions; }); default = { }; - description = "Templates for datasets."; + description = lib.mdDoc "Templates for datasets."; }; settings = mkOption { type = types.attrsOf datasetSettingsType; - description = '' + description = lib.mdDoc '' Free-form settings written directly to the config file. See - + for allowed values. ''; }; @@ -160,9 +160,9 @@ in type = types.listOf types.str; default = [ ]; example = [ "--verbose" "--readonly" "--debug" ]; - description = '' + description = lib.mdDoc '' Extra arguments to pass to sanoid. See - + for allowed options. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix index 4df10f5ee0..cbfbc59bf5 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/syncoid.nix @@ -102,7 +102,7 @@ in type = types.str; default = "syncoid"; example = "backup"; - description = '' + description = lib.mdDoc '' The user for the service. ZFS privilege delegation will be automatically configured for any local pools used by syncoid if this option is set to a user other than root. The user will be given the @@ -116,7 +116,7 @@ in type = types.str; default = "syncoid"; example = "backup"; - description = "The group for the service."; + description = lib.mdDoc "The group for the service."; }; sshKey = mkOption { @@ -124,7 +124,7 @@ in # Prevent key from being copied to store apply = mapNullable toString; default = null; - description = '' + description = lib.mdDoc '' SSH private key file to use to login to the remote system. Can be overridden in individual commands. ''; @@ -134,10 +134,10 @@ in type = types.listOf types.str; # Permissions snapshot and destroy are in case --no-sync-snap is not used default = [ "bookmark" "hold" "send" "snapshot" "destroy" ]; - description = '' - Permissions granted for the user + description = lib.mdDoc '' + Permissions granted for the {option}`services.syncoid.user` user for local source datasets. See - + for available permissions. ''; }; @@ -146,13 +146,13 @@ in type = types.listOf types.str; default = [ "change-key" "compression" "create" "mount" "mountpoint" "receive" "rollback" ]; example = [ "create" "mount" "receive" "rollback" ]; - description = '' - Permissions granted for the user + description = lib.mdDoc '' + Permissions granted for the {option}`services.syncoid.user` user for local target datasets. See - + for available permissions. - Make sure to include the change-key permission if you send raw encrypted datasets, - the compression permission if you send raw compressed datasets, and so on. + Make sure to include the `change-key` permission if you send raw encrypted datasets, + the `compression` permission if you send raw compressed datasets, and so on. For remote target datasets you'll have to set your remote user permissions by yourself. ''; }; @@ -161,10 +161,10 @@ in type = types.listOf types.str; default = [ ]; example = [ "--no-sync-snap" ]; - description = '' + description = lib.mdDoc '' Arguments to add to every syncoid command, unless disabled for that command. See - + for available options. ''; }; @@ -172,7 +172,7 @@ in service = mkOption { type = types.attrs; default = { }; - description = '' + description = lib.mdDoc '' Systemd configuration common to all syncoid services. ''; }; @@ -183,7 +183,7 @@ in source = mkOption { type = types.str; example = "pool/dataset"; - description = '' + description = lib.mdDoc '' Source ZFS dataset. Can be either local or remote. Defaults to the attribute name. ''; @@ -192,10 +192,10 @@ in target = mkOption { type = types.str; example = "user@server:pool/dataset"; - description = '' + description = lib.mdDoc '' Target ZFS dataset. Can be either local - (pool/dataset) or remote - (user@server:pool/dataset). + («pool/dataset») or remote + («user@server:pool/dataset»). ''; }; @@ -205,32 +205,32 @@ in type = types.nullOr types.path; # Prevent key from being copied to store apply = mapNullable toString; - description = '' + description = lib.mdDoc '' SSH private key file to use to login to the remote system. - Defaults to option. + Defaults to {option}`services.syncoid.sshKey` option. ''; }; localSourceAllow = mkOption { type = types.listOf types.str; - description = '' - Permissions granted for the user + description = lib.mdDoc '' + Permissions granted for the {option}`services.syncoid.user` user for local source datasets. See - + for available permissions. - Defaults to option. + Defaults to {option}`services.syncoid.localSourceAllow` option. ''; }; localTargetAllow = mkOption { type = types.listOf types.str; - description = '' - Permissions granted for the user + description = lib.mdDoc '' + Permissions granted for the {option}`services.syncoid.user` user for local target datasets. See - + for available permissions. - Make sure to include the change-key permission if you send raw encrypted datasets, - the compression permission if you send raw compressed datasets, and so on. + Make sure to include the `change-key` permission if you send raw encrypted datasets, + the `compression` permission if you send raw compressed datasets, and so on. For remote target datasets you'll have to set your remote user permissions by yourself. ''; }; @@ -239,7 +239,7 @@ in type = types.separatedString " "; default = ""; example = "Lc e"; - description = '' + description = lib.mdDoc '' Advanced options to pass to zfs send. Options are specified without their leading dashes and separated by spaces. ''; @@ -249,7 +249,7 @@ in type = types.separatedString " "; default = ""; example = "ux recordsize o compression=lz4"; - description = '' + description = lib.mdDoc '' Advanced options to pass to zfs recv. Options are specified without their leading dashes and separated by spaces. ''; @@ -258,7 +258,7 @@ in useCommonArgs = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to add the configured common arguments to this command. ''; }; @@ -266,7 +266,7 @@ in service = mkOption { type = types.attrs; default = { }; - description = '' + description = lib.mdDoc '' Systemd configuration specific to this syncoid service. ''; }; @@ -275,7 +275,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "--sshport 2222" ]; - description = "Extra syncoid arguments for this command."; + description = lib.mdDoc "Extra syncoid arguments for this command."; }; }; config = { @@ -291,7 +291,7 @@ in "pool/test".target = "root@target:pool/test"; } ''; - description = "Syncoid commands to run."; + description = lib.mdDoc "Syncoid commands to run."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix b/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix index 9b5fd90012..965166479b 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/tarsnap.nix @@ -35,10 +35,10 @@ in keyfile = mkOption { type = types.str; default = "/root/tarsnap.key"; - description = '' + description = lib.mdDoc '' The keyfile which associates this machine with your tarsnap account. - Create the keyfile with tarsnap-keygen. + Create the keyfile with {command}`tarsnap-keygen`. Note that each individual archive (specified below) may also have its own individual keyfile specified. Tarsnap does not allow multiple @@ -47,11 +47,11 @@ in archives specified, you should either spread out your backups to be far apart, or specify a separate key for each archive. By default every archive defaults to using - "/root/tarsnap.key". + `"/root/tarsnap.key"`. It's recommended for backups that you generate a key for every archive - using tarsnap-keygen(1), and then generate a - write-only tarsnap key using tarsnap-keymgmt(1), + using `tarsnap-keygen(1)`, and then generate a + write-only tarsnap key using `tarsnap-keymgmt(1)`, and keep your master key(s) for a particular machine off-site. The keyfile name should be given as a string and not a path, to @@ -67,18 +67,18 @@ in type = types.str; default = gcfg.keyfile; defaultText = literalExpression "config.${opt.keyfile}"; - description = '' + description = lib.mdDoc '' Set a specific keyfile for this archive. This defaults to - "/root/tarsnap.key" if left unspecified. + `"/root/tarsnap.key"` if left unspecified. Use this option if you want to run multiple backups concurrently - each archive must have a unique key. You can generate a write-only key derived from your master key (which - is recommended) using tarsnap-keymgmt(1). + is recommended) using `tarsnap-keymgmt(1)`. Note: every archive must have an individual master key. You must generate multiple keys with - tarsnap-keygen(1), and then generate write + `tarsnap-keygen(1)`, and then generate write only keys from those. The keyfile name should be given as a string and not a path, to @@ -92,47 +92,47 @@ in defaultText = literalExpression '' "/var/cache/tarsnap/''${utils.escapeSystemdPath config.${options.keyfile}}" ''; - description = '' + description = lib.mdDoc '' The cache allows tarsnap to identify previously stored data blocks, reducing archival time and bandwidth usage. Should the cache become desynchronized or corrupted, tarsnap will refuse to run until you manually rebuild the cache with - tarsnap --fsck. + {command}`tarsnap --fsck`. - Set to null to disable caching. + Set to `null` to disable caching. ''; }; nodump = mkOption { type = types.bool; default = true; - description = '' - Exclude files with the nodump flag. + description = lib.mdDoc '' + Exclude files with the `nodump` flag. ''; }; printStats = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Print global archive statistics upon completion. The output is available via - systemctl status tarsnap-archive-name. + {command}`systemctl status tarsnap-archive-name`. ''; }; checkpointBytes = mkOption { type = types.nullOr types.str; default = "1GB"; - description = '' - Create a checkpoint every checkpointBytes + description = lib.mdDoc '' + Create a checkpoint every `checkpointBytes` of uploaded data (optionally specified using an SI prefix). 1GB is the minimum value. A higher value is recommended, as checkpointing is expensive. - Set to null to disable checkpointing. + Set to `null` to disable checkpointing. ''; }; @@ -152,7 +152,7 @@ in aggressiveNetworking = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Upload data over multiple TCP connections, potentially increasing tarsnap's bandwidth utilisation at the cost of slowing down all other network traffic. Not @@ -164,13 +164,13 @@ in directories = mkOption { type = types.listOf types.path; default = []; - description = "List of filesystem paths to archive."; + description = lib.mdDoc "List of filesystem paths to archive."; }; excludes = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Exclude files and directories matching these patterns. ''; }; @@ -178,7 +178,7 @@ in includes = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Include only files and directories matching these patterns (the empty list includes everything). @@ -189,7 +189,7 @@ in lowmem = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Reduce memory consumption by not caching small files. Possibly beneficial if the average file size is smaller than 1 MB and the number of files is lower than the @@ -200,9 +200,9 @@ in verylowmem = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Reduce memory consumption by a factor of 2 beyond what - lowmem does, at the cost of significantly + `lowmem` does, at the cost of significantly slowing down the archiving process. ''; }; @@ -210,7 +210,7 @@ in maxbw = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Abort archival if upstream bandwidth usage in bytes exceeds this threshold. ''; @@ -220,7 +220,7 @@ in type = types.nullOr types.int; default = null; example = literalExpression "25 * 1000"; - description = '' + description = lib.mdDoc '' Upload bandwidth rate limit in bytes. ''; }; @@ -229,7 +229,7 @@ in type = types.nullOr types.int; default = null; example = literalExpression "50 * 1000"; - description = '' + description = lib.mdDoc '' Download bandwidth rate limit in bytes. ''; }; @@ -237,21 +237,21 @@ in verbose = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to produce verbose logging output. ''; }; explicitSymlinks = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to follow symlinks specified as archives. ''; }; followSymlinks = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to follow all symlinks in archive trees. ''; }; @@ -274,17 +274,17 @@ in } ''; - description = '' + description = lib.mdDoc '' Tarsnap archive configurations. Each attribute names an archive to be created at a given time interval, according to the options associated with it. When uploading to the tarsnap server, archive names are suffixed by a 1 second resolution timestamp, - with the format %Y%m%d%H%M%S. + with the format `%Y%m%d%H%M%S`. For each member of the set is created a timer which triggers the - instanced tarsnap-archive-name service unit. You may use - systemctl start tarsnap-archive-name to - manually trigger creation of archive-name at + instanced `tarsnap-archive-name` service unit. You may use + {command}`systemctl start tarsnap-archive-name` to + manually trigger creation of `archive-name` at any time. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/tsm.nix b/third_party/nixpkgs/nixos/modules/services/backup/tsm.nix index 4e690ac6ec..bd6f3d71fe 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/tsm.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/tsm.nix @@ -18,38 +18,38 @@ let type = nonEmptyStr; default = "backup"; example = "incr"; - description = '' + description = lib.mdDoc '' The actual command passed to the - dsmc executable to start the backup. + `dsmc` executable to start the backup. ''; }; servername = mkOption { type = nonEmptyStr; example = "mainTsmServer"; - description = '' + description = lib.mdDoc '' Create a systemd system service - tsm-backup.service that starts + `tsm-backup.service` that starts a backup based on the given servername's stanza. Note that this server's - will default to - /var/lib/tsm-backup/password + {option}`passwdDir` will default to + {file}`/var/lib/tsm-backup/password` (but may be overridden); also, the service will use - /var/lib/tsm-backup as - HOME when calling - dsmc. + {file}`/var/lib/tsm-backup` as + `HOME` when calling + `dsmc`. ''; }; autoTime = mkOption { type = nullOr nonEmptyStr; default = null; example = "12:00"; - description = '' + description = lib.mdDoc '' The backup service will be invoked automatically at the given date/time, which must be in the format described in - systemd.time5. - The default null + {manpage}`systemd.time(5)`. + The default `null` disables automatic backups. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/zfs-replication.nix b/third_party/nixpkgs/nixos/modules/services/backup/zfs-replication.nix index 6d75774c78..1a089bb348 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/zfs-replication.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/zfs-replication.nix @@ -12,43 +12,43 @@ in { enable = mkEnableOption "ZFS snapshot replication."; followDelete = mkOption { - description = "Remove remote snapshots that don't have a local correspondant."; + description = lib.mdDoc "Remove remote snapshots that don't have a local correspondant."; default = true; type = types.bool; }; host = mkOption { - description = "Remote host where snapshots should be sent. lz4 is expected to be installed on this host."; + description = lib.mdDoc "Remote host where snapshots should be sent. `lz4` is expected to be installed on this host."; example = "example.com"; type = types.str; }; identityFilePath = mkOption { - description = "Path to SSH key used to login to host."; + description = lib.mdDoc "Path to SSH key used to login to host."; example = "/home/username/.ssh/id_rsa"; type = types.path; }; localFilesystem = mkOption { - description = "Local ZFS fileystem from which snapshots should be sent. Defaults to the attribute name."; + description = lib.mdDoc "Local ZFS fileystem from which snapshots should be sent. Defaults to the attribute name."; example = "pool/file/path"; type = types.str; }; remoteFilesystem = mkOption { - description = "Remote ZFS filesystem where snapshots should be sent."; + description = lib.mdDoc "Remote ZFS filesystem where snapshots should be sent."; example = "pool/file/path"; type = types.str; }; recursive = mkOption { - description = "Recursively discover snapshots to send."; + description = lib.mdDoc "Recursively discover snapshots to send."; default = true; type = types.bool; }; username = mkOption { - description = "Username used by SSH to login to remote host."; + description = lib.mdDoc "Username used by SSH to login to remote host."; example = "username"; type = types.str; }; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix b/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix index 09e60177c3..ecd90ba5b3 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/znapzend.nix @@ -52,7 +52,7 @@ let label = mkOption { type = str; - description = "Label for this destination. Defaults to the attribute name."; + description = lib.mdDoc "Label for this destination. Defaults to the attribute name."; }; plan = mkOption { @@ -63,15 +63,15 @@ let dataset = mkOption { type = str; - description = "Dataset name to send snapshots to."; + description = lib.mdDoc "Dataset name to send snapshots to."; example = "tank/main"; }; host = mkOption { type = nullOr str; - description = '' + description = lib.mdDoc '' Host to use for the destination dataset. Can be prefixed with - user@ to specify the ssh user. + `user@` to specify the ssh user. ''; default = null; example = "john@example.com"; @@ -79,11 +79,11 @@ let presend = mkOption { type = nullOr str; - description = '' + description = lib.mdDoc '' Command to run before sending the snapshot to the destination. - Intended to run a remote script via ssh on the + Intended to run a remote script via {command}`ssh` on the destination, e.g. to bring up a backup disk or server or to put a - zpool online/offline. See also . + zpool online/offline. See also {option}`postsend`. ''; default = null; example = "ssh root@bserv zpool import -Nf tank"; @@ -91,11 +91,11 @@ let postsend = mkOption { type = nullOr str; - description = '' + description = lib.mdDoc '' Command to run after sending the snapshot to the destination. - Intended to run a remote script via ssh on the + Intended to run a remote script via {command}`ssh` on the destination, e.g. to bring up a backup disk or server or to put a - zpool online/offline. See also . + zpool online/offline. See also {option}`presend`. ''; default = null; example = "ssh root@bserv zpool export tank"; @@ -115,32 +115,32 @@ let enable = mkOption { type = bool; - description = "Whether to enable this source."; + description = lib.mdDoc "Whether to enable this source."; default = true; }; recursive = mkOption { type = bool; - description = "Whether to do recursive snapshots."; + description = lib.mdDoc "Whether to do recursive snapshots."; default = false; }; mbuffer = { enable = mkOption { type = bool; - description = "Whether to use mbuffer."; + description = lib.mdDoc "Whether to use {command}`mbuffer`."; default = false; }; port = mkOption { type = nullOr ints.u16; - description = '' - Port to use for mbuffer. + description = lib.mdDoc '' + Port to use for {command}`mbuffer`. - If this is null, it will run mbuffer through + If this is null, it will run {command}`mbuffer` through ssh. - If this is not null, it will run mbuffer + If this is not null, it will run {command}`mbuffer` directly through TCP, which is not encrypted but faster. In that case the given port needs to be open on the destination host. ''; @@ -149,8 +149,8 @@ let size = mkOption { type = mbufferSizeType; - description = '' - The size for mbuffer. + description = lib.mdDoc '' + The size for {command}`mbuffer`. Supports the units b, k, M, G. ''; default = "1G"; @@ -160,10 +160,10 @@ let presnap = mkOption { type = nullOr str; - description = '' + description = lib.mdDoc '' Command to run before snapshots are taken on the source dataset, e.g. for database locking/flushing. See also - . + {option}`postsnap`. ''; default = null; example = literalExpression '' @@ -173,9 +173,9 @@ let postsnap = mkOption { type = nullOr str; - description = '' + description = lib.mdDoc '' Command to run after snapshots are taken on the source dataset, - e.g. for database unlocking. See also . + e.g. for database unlocking. See also {option}`presnap`. ''; default = null; example = literalExpression '' @@ -185,13 +185,13 @@ let timestampFormat = mkOption { type = timestampType; - description = '' + description = lib.mdDoc '' The timestamp format to use for constructing snapshot names. - The syntax is strftime-like. The string must - consist of the mandatory %Y %m %d %H %M %S. - Optionally - _ . : characters as well as any + The syntax is `strftime`-like. The string must + consist of the mandatory `%Y %m %d %H %M %S`. + Optionally `- _ . :` characters as well as any alphanumeric character are allowed. If suffixed by a - Z, times will be in UTC. + `Z`, times will be in UTC. ''; default = "%Y-%m-%d-%H%M%S"; example = "znapzend-%m.%d.%Y-%H%M%SZ"; @@ -199,7 +199,7 @@ let sendDelay = mkOption { type = int; - description = '' + description = lib.mdDoc '' Specify delay (in seconds) before sending snaps to the destination. May be useful if you want to control sending time. ''; @@ -215,13 +215,13 @@ let dataset = mkOption { type = str; - description = "The dataset to use for this source."; + description = lib.mdDoc "The dataset to use for this source."; example = "tank/home"; }; destinations = mkOption { type = attrsOf (destType config); - description = "Additional destinations."; + description = lib.mdDoc "Additional destinations."; default = {}; example = literalExpression '' { @@ -300,7 +300,7 @@ in default = "debug"; example = "warning"; type = enum ["debug" "info" "warning" "err" "alert"]; - description = '' + description = lib.mdDoc '' The log level when logging to file. Any of debug, info, warning, err, alert. Default in daemonized form is debug. ''; @@ -318,18 +318,18 @@ in noDestroy = mkOption { type = bool; default = false; - description = "Does all changes to the filesystem except destroy."; + description = lib.mdDoc "Does all changes to the filesystem except destroy."; }; autoCreation = mkOption { type = bool; default = false; - description = "Automatically create the destination dataset if it does not exist."; + description = lib.mdDoc "Automatically create the destination dataset if it does not exist."; }; zetup = mkOption { type = attrsOf srcType; - description = "Znapzend configuration."; + description = lib.mdDoc "Znapzend configuration."; default = {}; example = literalExpression '' { @@ -350,7 +350,7 @@ in pure = mkOption { type = bool; - description = '' + description = lib.mdDoc '' Do not persist any stateful znapzend setups. If this option is enabled, your previously set znapzend setups will be cleared and only the ones defined with this module will be applied. diff --git a/third_party/nixpkgs/nixos/modules/services/backup/zrepl.nix b/third_party/nixpkgs/nixos/modules/services/backup/zrepl.nix index 1b4216ed17..ea858a8b77 100644 --- a/third_party/nixpkgs/nixos/modules/services/backup/zrepl.nix +++ b/third_party/nixpkgs/nixos/modules/services/backup/zrepl.nix @@ -17,14 +17,13 @@ in type = types.package; default = pkgs.zrepl; defaultText = literalExpression "pkgs.zrepl"; - description = "Which package to use for zrepl"; + description = lib.mdDoc "Which package to use for zrepl"; }; settings = mkOption { default = { }; - description = '' - Configuration for zrepl. See + description = lib.mdDoc '' + Configuration for zrepl. See for more information. ''; type = types.submodule { diff --git a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix index bf2cf1edd4..4f045acd95 100644 --- a/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix +++ b/third_party/nixpkgs/nixos/modules/services/blockchain/ethereum/geth.nix @@ -14,7 +14,7 @@ let port = mkOption { type = types.port; default = 30303; - description = "Port number Go Ethereum will be listening on, both TCP and UDP."; + description = lib.mdDoc "Port number Go Ethereum will be listening on, both TCP and UDP."; }; http = { @@ -22,19 +22,19 @@ let address = mkOption { type = types.str; default = "127.0.0.1"; - description = "Listen address of Go Ethereum HTTP API."; + description = lib.mdDoc "Listen address of Go Ethereum HTTP API."; }; port = mkOption { type = types.port; default = 8545; - description = "Port number of Go Ethereum HTTP API."; + description = lib.mdDoc "Port number of Go Ethereum HTTP API."; }; apis = mkOption { type = types.nullOr (types.listOf types.str); default = null; - description = "APIs to enable over WebSocket"; + description = lib.mdDoc "APIs to enable over WebSocket"; example = ["net" "eth"]; }; }; @@ -44,19 +44,19 @@ let address = mkOption { type = types.str; default = "127.0.0.1"; - description = "Listen address of Go Ethereum WebSocket API."; + description = lib.mdDoc "Listen address of Go Ethereum WebSocket API."; }; port = mkOption { type = types.port; default = 8546; - description = "Port number of Go Ethereum WebSocket API."; + description = lib.mdDoc "Port number of Go Ethereum WebSocket API."; }; apis = mkOption { type = types.nullOr (types.listOf types.str); default = null; - description = "APIs to enable over WebSocket"; + description = lib.mdDoc "APIs to enable over WebSocket"; example = ["net" "eth"]; }; }; @@ -66,43 +66,43 @@ let address = mkOption { type = types.str; default = "127.0.0.1"; - description = "Listen address of Go Ethereum metrics service."; + description = lib.mdDoc "Listen address of Go Ethereum metrics service."; }; port = mkOption { type = types.port; default = 6060; - description = "Port number of Go Ethereum metrics service."; + description = lib.mdDoc "Port number of Go Ethereum metrics service."; }; }; network = mkOption { type = types.nullOr (types.enum [ "goerli" "rinkeby" "yolov2" "ropsten" ]); default = null; - description = "The network to connect to. Mainnet (null) is the default ethereum network."; + description = lib.mdDoc "The network to connect to. Mainnet (null) is the default ethereum network."; }; syncmode = mkOption { type = types.enum [ "snap" "fast" "full" "light" ]; default = "snap"; - description = "Blockchain sync mode."; + description = lib.mdDoc "Blockchain sync mode."; }; gcmode = mkOption { type = types.enum [ "full" "archive" ]; default = "full"; - description = "Blockchain garbage collection mode."; + description = lib.mdDoc "Blockchain garbage collection mode."; }; maxpeers = mkOption { type = types.int; default = 50; - description = "Maximum peers to connect to."; + description = lib.mdDoc "Maximum peers to connect to."; }; extraArgs = mkOption { type = types.listOf types.str; - description = "Additional arguments passed to Go Ethereum."; + description = lib.mdDoc "Additional arguments passed to Go Ethereum."; default = []; }; @@ -110,7 +110,7 @@ let default = pkgs.go-ethereum.geth; defaultText = literalExpression "pkgs.go-ethereum.geth"; type = types.package; - description = "Package to use as Go Ethereum node."; + description = lib.mdDoc "Package to use as Go Ethereum node."; }; }; }; @@ -124,7 +124,7 @@ in services.geth = mkOption { type = types.attrsOf (types.submodule gethOpts); default = {}; - description = "Specification of one or more geth instances."; + description = lib.mdDoc "Specification of one or more geth instances."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/corosync/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/corosync/default.nix index b4144917fe..9730894454 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/corosync/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/corosync/default.nix @@ -13,37 +13,37 @@ in type = types.package; default = pkgs.corosync; defaultText = literalExpression "pkgs.corosync"; - description = "Package that should be used for corosync."; + description = lib.mdDoc "Package that should be used for corosync."; }; clusterName = mkOption { type = types.str; default = "nixcluster"; - description = "Name of the corosync cluster."; + description = lib.mdDoc "Name of the corosync cluster."; }; extraOptions = mkOption { type = with types; listOf str; default = []; - description = "Additional options with which to start corosync."; + description = lib.mdDoc "Additional options with which to start corosync."; }; nodelist = mkOption { - description = "Corosync nodelist: all cluster members."; + description = lib.mdDoc "Corosync nodelist: all cluster members."; default = []; type = with types; listOf (submodule { options = { nodeid = mkOption { type = int; - description = "Node ID number"; + description = lib.mdDoc "Node ID number"; }; name = mkOption { type = str; - description = "Node name"; + description = lib.mdDoc "Node name"; }; ring_addrs = mkOption { type = listOf str; - description = "List of addresses, one for each ring."; + description = lib.mdDoc "List of addresses, one for each ring."; }; }; }); diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/conf.nix b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/conf.nix index e3c26a0d55..388eaafcc3 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/conf.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/conf.nix @@ -33,6 +33,7 @@ pkgs.runCommand "hadoop-conf" {} (with cfg; '' mkdir -p $out/ cp ${siteXml "core-site.xml" (coreSite // coreSiteInternal)}/* $out/ cp ${siteXml "hdfs-site.xml" (hdfsSiteDefault // hdfsSite // hdfsSiteInternal)}/* $out/ + cp ${siteXml "hbase-site.xml" (hbaseSiteDefault // hbaseSite // hbaseSiteInternal)}/* $out/ cp ${siteXml "mapred-site.xml" (mapredSiteDefault // mapredSite)}/* $out/ cp ${siteXml "yarn-site.xml" (yarnSiteDefault // yarnSite // yarnSiteInternal)}/* $out/ cp ${siteXml "httpfs-site.xml" httpfsSite}/* $out/ @@ -40,5 +41,5 @@ pkgs.runCommand "hadoop-conf" {} (with cfg; '' cp ${pkgs.writeTextDir "hadoop-user-functions.sh" userFunctions}/* $out/ cp ${pkgs.writeTextDir "hadoop-env.sh" hadoopEnv}/* $out/ cp ${log4jProperties} $out/log4j.properties - ${lib.concatMapStringsSep "\n" (dir: "cp -r ${dir}/* $out/") extraConfDirs} + ${lib.concatMapStringsSep "\n" (dir: "cp -f -r ${dir}/* $out/") extraConfDirs} '') diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix index a4fdea8103..a3a28eb718 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/default.nix @@ -5,7 +5,7 @@ let in with lib; { - imports = [ ./yarn.nix ./hdfs.nix ]; + imports = [ ./yarn.nix ./hdfs.nix ./hbase.nix ]; options.services.hadoop = { coreSite = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hbase.nix b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hbase.nix new file mode 100644 index 0000000000..246775dc89 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hbase.nix @@ -0,0 +1,196 @@ +{ config, lib, pkgs, ...}: + +with lib; +let + cfg = config.services.hadoop; + hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/"; + mkIfNotNull = x: mkIf (x != null) x; +in +{ + options.services.hadoop = { + + gatewayRole.enableHbaseCli = mkEnableOption "HBase CLI tools"; + + hbaseSiteDefault = mkOption { + default = { + "hbase.regionserver.ipc.address" = "0.0.0.0"; + "hbase.master.ipc.address" = "0.0.0.0"; + "hbase.master.info.bindAddress" = "0.0.0.0"; + "hbase.regionserver.info.bindAddress" = "0.0.0.0"; + + "hbase.cluster.distributed" = "true"; + }; + type = types.attrsOf types.anything; + description = '' + Default options for hbase-site.xml + ''; + }; + hbaseSite = mkOption { + default = {}; + type = with types; attrsOf anything; + example = literalExpression '' + ''; + description = '' + Additional options and overrides for hbase-site.xml + + ''; + }; + hbaseSiteInternal = mkOption { + default = {}; + type = with types; attrsOf anything; + internal = true; + description = '' + Internal option to add configs to hbase-site.xml based on module options + ''; + }; + + hbase = { + + package = mkOption { + type = types.package; + default = pkgs.hbase; + defaultText = literalExpression "pkgs.hbase"; + description = "HBase package"; + }; + + rootdir = mkOption { + description = '' + This option will set "hbase.rootdir" in hbase-site.xml and determine + the directory shared by region servers and into which HBase persists. + The URL should be 'fully-qualified' to include the filesystem scheme. + If a core-site.xml is provided, the FS scheme defaults to the value + of "fs.defaultFS". + + Filesystems other than HDFS (like S3, QFS, Swift) are also supported. + ''; + type = types.str; + example = "hdfs://nameservice1/hbase"; + default = "/hbase"; + }; + zookeeperQuorum = mkOption { + description = '' + This option will set "hbase.zookeeper.quorum" in hbase-site.xml. + Comma separated list of servers in the ZooKeeper ensemble. + ''; + type = with types; nullOr commas; + example = "zk1.internal,zk2.internal,zk3.internal"; + default = null; + }; + master = { + enable = mkEnableOption "HBase Master"; + initHDFS = mkEnableOption "initialization of the hbase directory on HDFS"; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open firewall ports for HBase master. + ''; + }; + }; + regionServer = { + enable = mkEnableOption "HBase RegionServer"; + + overrideHosts = mkOption { + type = types.bool; + default = true; + description = '' + Remove /etc/hosts entries for "127.0.0.2" and "::1" defined in nixos/modules/config/networking.nix + Regionservers must be able to resolve their hostnames to their IP addresses, through PTR records + or /etc/hosts entries. + + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open firewall ports for HBase master. + ''; + }; + }; + }; + }; + + config = mkMerge [ + (mkIf cfg.hbase.master.enable { + services.hadoop.gatewayRole = { + enable = true; + enableHbaseCli = mkDefault true; + }; + + systemd.services.hbase-master = { + description = "HBase master"; + wantedBy = [ "multi-user.target" ]; + + preStart = mkIf cfg.hbase.master.initHDFS '' + HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfsadmin -safemode wait + HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -mkdir -p ${cfg.hbase.rootdir} + HADOOP_USER_NAME=hdfs ${cfg.package}/bin/hdfs --config ${hadoopConf} dfs -chown hbase ${cfg.hbase.rootdir} + ''; + + serviceConfig = { + User = "hbase"; + SyslogIdentifier = "hbase-master"; + ExecStart = "${cfg.hbase.package}/bin/hbase --config ${hadoopConf} " + + "master start"; + Restart = "always"; + }; + }; + + services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir; + + networking.firewall.allowedTCPPorts = (mkIf cfg.hbase.master.openFirewall [ + 16000 16010 + ]); + + }) + + (mkIf cfg.hbase.regionServer.enable { + services.hadoop.gatewayRole = { + enable = true; + enableHbaseCli = mkDefault true; + }; + + systemd.services.hbase-regionserver = { + description = "HBase RegionServer"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "hbase"; + SyslogIdentifier = "hbase-regionserver"; + ExecStart = "${cfg.hbase.package}/bin/hbase --config /etc/hadoop-conf/ " + + "regionserver start"; + Restart = "always"; + }; + }; + + services.hadoop.hbaseSiteInternal."hbase.rootdir" = cfg.hbase.rootdir; + + networking = { + firewall.allowedTCPPorts = (mkIf cfg.hbase.regionServer.openFirewall [ + 16020 16030 + ]); + hosts = mkIf cfg.hbase.regionServer.overrideHosts { + "127.0.0.2" = mkForce [ ]; + "::1" = mkForce [ ]; + }; + }; + }) + + (mkIf cfg.gatewayRole.enable { + + environment.systemPackages = mkIf cfg.gatewayRole.enableHbaseCli [ cfg.hbase.package ]; + + services.hadoop.hbaseSiteInternal = with cfg.hbase; { + "hbase.zookeeper.quorum" = mkIfNotNull zookeeperQuorum; + }; + + users.users.hbase = { + description = "Hadoop HBase user"; + group = "hadoop"; + isSystemUser = true; + }; + }) + ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hdfs.nix b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hdfs.nix index 325a002ad3..75a97e5354 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hdfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/hdfs.nix @@ -11,7 +11,7 @@ let enable = mkEnableOption serviceName; restartIfChanged = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Automatically restart the service on config change. This can be set to false to defer restarts on clusters running critical applications. Please consider the security implications of inadvertently running an older version, @@ -22,7 +22,7 @@ let extraFlags = mkOption{ type = with types; listOf str; default = []; - description = "Extra command line flags to pass to ${serviceName}"; + description = lib.mdDoc "Extra command line flags to pass to ${serviceName}"; example = [ "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.port=8010" @@ -31,13 +31,13 @@ let extraEnv = mkOption{ type = with types; attrsOf str; default = {}; - description = "Extra environment variables for ${serviceName}"; + description = lib.mdDoc "Extra environment variables for ${serviceName}"; }; } // (optionalAttrs firewallOption { openFirewall = mkOption { type = types.bool; default = false; - description = "Open firewall ports for ${serviceName}."; + description = lib.mdDoc "Open firewall ports for ${serviceName}."; }; }) // (optionalAttrs (extraOpts != null) extraOpts); @@ -83,12 +83,12 @@ in formatOnInit = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Format HDFS namenode on first start. This is useful for quickly spinning up ephemeral HDFS clusters with a single namenode. For HA clusters, initialization involves multiple steps across multiple nodes. Follow this guide to initialize an HA cluster manually: - + ''; }; }; @@ -96,19 +96,19 @@ in datanode = hadoopServiceOption { serviceName = "HDFS DataNode"; } // { dataDirs = mkOption { default = null; - description = "Tier and path definitions for datanode storage."; + description = lib.mdDoc "Tier and path definitions for datanode storage."; type = with types; nullOr (listOf (submodule { options = { type = mkOption { type = enum [ "SSD" "DISK" "ARCHIVE" "RAM_DISK" ]; - description = '' + description = lib.mdDoc '' Storage types ([SSD]/[DISK]/[ARCHIVE]/[RAM_DISK]) for HDFS storage policies. ''; }; path = mkOption { type = path; example = [ "/var/lib/hadoop/hdfs/dn" ]; - description = "Determines where on the local filesystem a data node should store its blocks."; + description = lib.mdDoc "Determines where on the local filesystem a data node should store its blocks."; }; }; })); @@ -126,7 +126,7 @@ in tempPath = mkOption { type = types.path; default = "/tmp/hadoop/httpfs"; - description = "HTTPFS_TEMP path used by HTTPFS"; + description = lib.mdDoc "HTTPFS_TEMP path used by HTTPFS"; }; }; @@ -158,8 +158,8 @@ in 50010 # datanode.address 50020 # datanode.ipc.address ]; - extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = let d = cfg.hdfs.datanode.dataDirs; in - if (d!= null) then (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs) else d; + extraConfig.services.hadoop.hdfsSiteInternal."dfs.datanode.data.dir" = mkIf (cfg.hdfs.datanode.dataDirs!= null) + (concatMapStringsSep "," (x: "["+x.type+"]file://"+x.path) cfg.hdfs.datanode.dataDirs); }) (hadoopServiceConfig { diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix index 74e16bdec6..be0b9c13cd 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/hadoop/yarn.nix @@ -5,7 +5,7 @@ let hadoopConf = "${import ./conf.nix { inherit cfg pkgs lib; }}/"; restartIfChanged = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Automatically restart the service on config change. This can be set to false to defer restarts on clusters running critical applications. Please consider the security implications of inadvertently running an older version, @@ -16,7 +16,7 @@ let extraFlags = mkOption{ type = with types; listOf str; default = []; - description = "Extra command line flags to pass to the service"; + description = lib.mdDoc "Extra command line flags to pass to the service"; example = [ "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.port=8010" @@ -25,7 +25,7 @@ let extraEnv = mkOption{ type = with types; attrsOf str; default = {}; - description = "Extra environment variables"; + description = lib.mdDoc "Extra environment variables"; }; in { @@ -37,7 +37,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open firewall ports for resourcemanager ''; }; @@ -48,22 +48,22 @@ in resource = { cpuVCores = mkOption { - description = "Number of vcores that can be allocated for containers."; + description = lib.mdDoc "Number of vcores that can be allocated for containers."; type = with types; nullOr ints.positive; default = null; }; maximumAllocationVCores = mkOption { - description = "The maximum virtual CPU cores any container can be allocated."; + description = lib.mdDoc "The maximum virtual CPU cores any container can be allocated."; type = with types; nullOr ints.positive; default = null; }; memoryMB = mkOption { - description = "Amount of physical memory, in MB, that can be allocated for containers."; + description = lib.mdDoc "Amount of physical memory, in MB, that can be allocated for containers."; type = with types; nullOr ints.positive; default = null; }; maximumAllocationMB = mkOption { - description = "The maximum physical memory any container can be allocated."; + description = lib.mdDoc "The maximum physical memory any container can be allocated."; type = with types; nullOr ints.positive; default = null; }; @@ -72,13 +72,13 @@ in useCGroups = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Use cgroups to enforce resource limits on containers ''; }; localDir = mkOption { - description = "List of directories to store localized files in."; + description = lib.mdDoc "List of directories to store localized files in."; type = with types; nullOr (listOf path); example = [ "/var/lib/hadoop/yarn/nm" ]; default = null; @@ -87,14 +87,14 @@ in addBinBash = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Add /bin/bash. This is needed by the linux container executor's launch script. ''; }; openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open firewall ports for nodemanager. Because containers can listen on any ephemeral port, TCP ports 1024–65535 will be opened. ''; @@ -178,18 +178,18 @@ in services.hadoop.gatewayRole.enable = true; - services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; { - "yarn.nodemanager.local-dirs" = localDir; + services.hadoop.yarnSiteInternal = with cfg.yarn.nodemanager; mkMerge [ ({ + "yarn.nodemanager.local-dirs" = mkIf (localDir!= null) (concatStringsSep "," localDir); "yarn.scheduler.maximum-allocation-vcores" = resource.maximumAllocationVCores; "yarn.scheduler.maximum-allocation-mb" = resource.maximumAllocationMB; "yarn.nodemanager.resource.cpu-vcores" = resource.cpuVCores; "yarn.nodemanager.resource.memory-mb" = resource.memoryMB; - } // mkIf useCGroups { + }) (mkIf useCGroups { "yarn.nodemanager.linux-container-executor.cgroups.hierarchy" = "/hadoop-yarn"; "yarn.nodemanager.linux-container-executor.resources-handler.class" = "org.apache.hadoop.yarn.server.nodemanager.util.CgroupsLCEResourcesHandler"; "yarn.nodemanager.linux-container-executor.cgroups.mount" = "true"; "yarn.nodemanager.linux-container-executor.cgroups.mount-path" = "/run/wrappers/yarn-nodemanager/cgroup"; - }; + })]; networking.firewall.allowedTCPPortRanges = [ (mkIf (cfg.yarn.nodemanager.openFirewall) {from = 1024; to = 65535;}) diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix index 421aa0aac6..a1f6d4ecdf 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/k3s/default.nix @@ -19,11 +19,11 @@ in type = types.package; default = pkgs.k3s; defaultText = literalExpression "pkgs.k3s"; - description = "Package that should be used for k3s"; + description = lib.mdDoc "Package that should be used for k3s"; }; role = mkOption { - description = '' + description = lib.mdDoc '' Whether k3s should run as a server or agent. Note that the server, by default, also runs as an agent. ''; @@ -33,14 +33,14 @@ in serverAddr = mkOption { type = types.str; - description = "The k3s server to connect to. This option only makes sense for an agent."; + description = lib.mdDoc "The k3s server to connect to. This option only makes sense for an agent."; example = "https://10.0.0.10:6443"; default = ""; }; token = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The k3s token to use when connecting to the server. This option only makes sense for an agent. WARNING: This option will expose store your token unencrypted world-readable in the nix store. If this is undesired use the tokenFile option instead. @@ -50,12 +50,12 @@ in tokenFile = mkOption { type = types.nullOr types.path; - description = "File path containing k3s token to use when connecting to the server. This option only makes sense for an agent."; + description = lib.mdDoc "File path containing k3s token to use when connecting to the server. This option only makes sense for an agent."; default = null; }; extraFlags = mkOption { - description = "Extra flags to pass to the k3s command."; + description = lib.mdDoc "Extra flags to pass to the k3s command."; type = types.str; default = ""; example = "--no-deploy traefik --cluster-cidr 10.24.0.0/16"; @@ -64,13 +64,13 @@ in disableAgent = mkOption { type = types.bool; default = false; - description = "Only run the server. This option only makes sense for a server."; + description = lib.mdDoc "Only run the server. This option only makes sense for a server."; }; configPath = mkOption { type = types.nullOr types.path; default = null; - description = "File path containing the k3s YAML config. This is useful when the config is generated (for example on boot)."; + description = lib.mdDoc "File path containing the k3s YAML config. This is useful when the config is generated (for example on boot)."; }; }; @@ -111,7 +111,6 @@ in [ "${cfg.package}/bin/k3s ${cfg.role}" ] - ++ (optional (config.systemd.enableUnifiedCgroupHierarchy) "--kubelet-arg=cgroup-driver=systemd") ++ (optional cfg.disableAgent "--disable-agent") ++ (optional (cfg.serverAddr != "") "--server ${cfg.serverAddr}") ++ (optional (cfg.token != "") "--token ${cfg.token}") diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix index b677d900ff..99fd1e6f04 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -21,7 +21,7 @@ in options.services.kubernetes.addonManager = with lib.types; { bootstrapAddons = mkOption { - description = '' + description = lib.mdDoc '' Bootstrap addons are like regular addons, but they are applied with cluster-admin rigths. They are applied at addon-manager startup only. ''; @@ -43,7 +43,7 @@ in }; addons = mkOption { - description = "Kubernetes addons (any kind of Kubernetes resource can be an addon)."; + description = lib.mdDoc "Kubernetes addons (any kind of Kubernetes resource can be an addon)."; default = { }; type = attrsOf (either attrs (listOf attrs)); example = literalExpression '' diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix index 7bd4991f43..5b1e9a6876 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addons/dns.nix @@ -15,7 +15,7 @@ in { enable = mkEnableOption "kubernetes dns addon"; clusterIp = mkOption { - description = "Dns addon clusterIP"; + description = lib.mdDoc "Dns addon clusterIP"; # this default is also what kubernetes users default = ( @@ -31,31 +31,31 @@ in { }; clusterDomain = mkOption { - description = "Dns cluster domain"; + description = lib.mdDoc "Dns cluster domain"; default = "cluster.local"; type = types.str; }; replicas = mkOption { - description = "Number of DNS pod replicas to deploy in the cluster."; + description = lib.mdDoc "Number of DNS pod replicas to deploy in the cluster."; default = 2; type = types.int; }; reconcileMode = mkOption { - description = '' + description = lib.mdDoc '' Controls the addon manager reconciliation mode for the DNS addon. Setting reconcile mode to EnsureExists makes it possible to tailor DNS behavior by editing the coredns ConfigMap. - See: . + See: . ''; default = "Reconcile"; type = types.enum [ "Reconcile" "EnsureExists" ]; }; coredns = mkOption { - description = "Docker image to seed for the CoreDNS container."; + description = lib.mdDoc "Docker image to seed for the CoreDNS container."; type = types.attrs; default = { imageName = "coredns/coredns"; @@ -66,10 +66,10 @@ in { }; corefile = mkOption { - description = '' + description = lib.mdDoc '' Custom coredns corefile configuration. - See: . + See: . ''; type = types.str; default = '' diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix index a192e93bad..c9ae2c14bb 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -30,7 +30,7 @@ in options.services.kubernetes.apiserver = with lib.types; { advertiseAddress = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes apiserver IP address on which to advertise the apiserver to members of the cluster. This address must be reachable by the rest of the cluster. @@ -40,40 +40,40 @@ in }; allowPrivileged = mkOption { - description = "Whether to allow privileged containers on Kubernetes."; + description = lib.mdDoc "Whether to allow privileged containers on Kubernetes."; default = false; type = bool; }; authorizationMode = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC/Webhook/RBAC/Node). See - + ''; default = ["RBAC" "Node"]; # Enabling RBAC by default, although kubernetes default is AllowAllow type = listOf (enum ["AlwaysAllow" "AlwaysDeny" "ABAC" "Webhook" "RBAC" "Node"]); }; authorizationPolicy = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes apiserver authorization policy file. See - + ''; default = []; type = listOf attrs; }; basicAuthFile = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes apiserver basic authentication file. See - + ''; default = null; type = nullOr path; }; bindAddress = mkOption { - description = '' + description = lib.mdDoc '' The IP address on which to listen for the --secure-port port. The associated interface(s) must be reachable by the rest of the cluster, and by CLI/web clients. @@ -83,16 +83,16 @@ in }; clientCaFile = mkOption { - description = "Kubernetes apiserver CA file for client auth."; + description = lib.mdDoc "Kubernetes apiserver CA file for client auth."; default = top.caFile; defaultText = literalExpression "config.${otop.caFile}"; type = nullOr path; }; disableAdmissionPlugins = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes admission control plugins to disable. See - + ''; default = []; type = listOf str; @@ -101,9 +101,9 @@ in enable = mkEnableOption "Kubernetes apiserver"; enableAdmissionPlugins = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes admission control plugins to enable. See - + ''; default = [ "NamespaceLifecycle" "LimitRanger" "ServiceAccount" @@ -120,25 +120,25 @@ in etcd = { servers = mkOption { - description = "List of etcd servers."; + description = lib.mdDoc "List of etcd servers."; default = ["http://127.0.0.1:2379"]; type = types.listOf types.str; }; keyFile = mkOption { - description = "Etcd key file."; + description = lib.mdDoc "Etcd key file."; default = null; type = types.nullOr types.path; }; certFile = mkOption { - description = "Etcd cert file."; + description = lib.mdDoc "Etcd cert file."; default = null; type = types.nullOr types.path; }; caFile = mkOption { - description = "Etcd ca file."; + description = lib.mdDoc "Etcd ca file."; default = top.caFile; defaultText = literalExpression "config.${otop.caFile}"; type = types.nullOr types.path; @@ -146,77 +146,77 @@ in }; extraOpts = mkOption { - description = "Kubernetes apiserver extra command line options."; + description = lib.mdDoc "Kubernetes apiserver extra command line options."; default = ""; type = separatedString " "; }; extraSANs = mkOption { - description = "Extra x509 Subject Alternative Names to be added to the kubernetes apiserver tls cert."; + description = lib.mdDoc "Extra x509 Subject Alternative Names to be added to the kubernetes apiserver tls cert."; default = []; type = listOf str; }; featureGates = mkOption { - description = "List set of feature gates"; + description = lib.mdDoc "List set of feature gates"; default = top.featureGates; defaultText = literalExpression "config.${otop.featureGates}"; type = listOf str; }; insecureBindAddress = mkOption { - description = "The IP address on which to serve the --insecure-port."; + description = lib.mdDoc "The IP address on which to serve the --insecure-port."; default = "127.0.0.1"; type = str; }; insecurePort = mkOption { - description = "Kubernetes apiserver insecure listening port. (0 = disabled)"; + description = lib.mdDoc "Kubernetes apiserver insecure listening port. (0 = disabled)"; default = 0; type = int; }; kubeletClientCaFile = mkOption { - description = "Path to a cert file for connecting to kubelet."; + description = lib.mdDoc "Path to a cert file for connecting to kubelet."; default = top.caFile; defaultText = literalExpression "config.${otop.caFile}"; type = nullOr path; }; kubeletClientCertFile = mkOption { - description = "Client certificate to use for connections to kubelet."; + description = lib.mdDoc "Client certificate to use for connections to kubelet."; default = null; type = nullOr path; }; kubeletClientKeyFile = mkOption { - description = "Key to use for connections to kubelet."; + description = lib.mdDoc "Key to use for connections to kubelet."; default = null; type = nullOr path; }; preferredAddressTypes = mkOption { - description = "List of the preferred NodeAddressTypes to use for kubelet connections."; + description = lib.mdDoc "List of the preferred NodeAddressTypes to use for kubelet connections."; type = nullOr str; default = null; }; proxyClientCertFile = mkOption { - description = "Client certificate to use for connections to proxy."; + description = lib.mdDoc "Client certificate to use for connections to proxy."; default = null; type = nullOr path; }; proxyClientKeyFile = mkOption { - description = "Key to use for connections to proxy."; + description = lib.mdDoc "Key to use for connections to proxy."; default = null; type = nullOr path; }; runtimeConfig = mkOption { - description = '' + description = lib.mdDoc '' Api runtime configuration. See - + ''; default = "authentication.k8s.io/v1beta1=true"; example = "api/all=false,api/v1=true"; @@ -224,7 +224,7 @@ in }; storageBackend = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes apiserver storage backend. ''; default = "etcd3"; @@ -232,13 +232,13 @@ in }; securePort = mkOption { - description = "Kubernetes apiserver secure port."; + description = lib.mdDoc "Kubernetes apiserver secure port."; default = 6443; type = int; }; apiAudiences = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes apiserver ServiceAccount issuer. ''; default = "api,https://kubernetes.default.svc"; @@ -246,7 +246,7 @@ in }; serviceAccountIssuer = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes apiserver ServiceAccount issuer. ''; default = "https://kubernetes.default.svc"; @@ -254,7 +254,7 @@ in }; serviceAccountSigningKeyFile = mkOption { - description = '' + description = lib.mdDoc '' Path to the file that contains the current private key of the service account token issuer. The issuer will sign issued ID tokens with this private key. @@ -263,7 +263,7 @@ in }; serviceAccountKeyFile = mkOption { - description = '' + description = lib.mdDoc '' File containing PEM-encoded x509 RSA or ECDSA private or public keys, used to verify ServiceAccount tokens. The specified file can contain multiple keys, and the flag can be specified multiple times with @@ -274,7 +274,7 @@ in }; serviceClusterIpRange = mkOption { - description = '' + description = lib.mdDoc '' A CIDR notation IP range from which to assign service cluster IPs. This must not overlap with any IP ranges assigned to nodes for pods. ''; @@ -283,39 +283,39 @@ in }; tlsCertFile = mkOption { - description = "Kubernetes apiserver certificate file."; + description = lib.mdDoc "Kubernetes apiserver certificate file."; default = null; type = nullOr path; }; tlsKeyFile = mkOption { - description = "Kubernetes apiserver private key file."; + description = lib.mdDoc "Kubernetes apiserver private key file."; default = null; type = nullOr path; }; tokenAuthFile = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes apiserver token authentication file. See - + ''; default = null; type = nullOr path; }; verbosity = mkOption { - description = '' + description = lib.mdDoc '' Optional glog verbosity level for logging statements. See - + ''; default = null; type = nullOr int; }; webhookConfig = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes apiserver Webhook config file. It uses the kubeconfig file format. - See + See ''; default = null; type = nullOr path; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix index 7c317e94de..6080e6f991 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix @@ -17,19 +17,19 @@ in options.services.kubernetes.controllerManager = with lib.types; { allocateNodeCIDRs = mkOption { - description = "Whether to automatically allocate CIDR ranges for cluster nodes."; + description = lib.mdDoc "Whether to automatically allocate CIDR ranges for cluster nodes."; default = true; type = bool; }; bindAddress = mkOption { - description = "Kubernetes controller manager listening address."; + description = lib.mdDoc "Kubernetes controller manager listening address."; default = "127.0.0.1"; type = str; }; clusterCidr = mkOption { - description = "Kubernetes CIDR Range for Pods in cluster."; + description = lib.mdDoc "Kubernetes CIDR Range for Pods in cluster."; default = top.clusterCidr; defaultText = literalExpression "config.${otop.clusterCidr}"; type = str; @@ -38,20 +38,20 @@ in enable = mkEnableOption "Kubernetes controller manager"; extraOpts = mkOption { - description = "Kubernetes controller manager extra command line options."; + description = lib.mdDoc "Kubernetes controller manager extra command line options."; default = ""; type = separatedString " "; }; featureGates = mkOption { - description = "List set of feature gates"; + description = lib.mdDoc "List set of feature gates"; default = top.featureGates; defaultText = literalExpression "config.${otop.featureGates}"; type = listOf str; }; insecurePort = mkOption { - description = "Kubernetes controller manager insecure listening port."; + description = lib.mdDoc "Kubernetes controller manager insecure listening port."; default = 0; type = int; }; @@ -59,13 +59,13 @@ in kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager"; leaderElect = mkOption { - description = "Whether to start leader election before executing main loop."; + description = lib.mdDoc "Whether to start leader election before executing main loop."; type = bool; default = true; }; rootCaFile = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes controller manager certificate authority file included in service account's token secret. ''; @@ -75,13 +75,13 @@ in }; securePort = mkOption { - description = "Kubernetes controller manager secure listening port."; + description = lib.mdDoc "Kubernetes controller manager secure listening port."; default = 10252; type = int; }; serviceAccountKeyFile = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes controller manager PEM-encoded private RSA key file used to sign service account tokens ''; @@ -90,21 +90,21 @@ in }; tlsCertFile = mkOption { - description = "Kubernetes controller-manager certificate file."; + description = lib.mdDoc "Kubernetes controller-manager certificate file."; default = null; type = nullOr path; }; tlsKeyFile = mkOption { - description = "Kubernetes controller-manager private key file."; + description = lib.mdDoc "Kubernetes controller-manager private key file."; default = null; type = nullOr path; }; verbosity = mkOption { - description = '' + description = lib.mdDoc '' Optional glog verbosity level for logging statements. See - + ''; default = null; type = nullOr int; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix index 35ec99d83c..f5374fc719 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/default.nix @@ -77,25 +77,25 @@ let mkKubeConfigOptions = prefix: { server = mkOption { - description = "${prefix} kube-apiserver server address."; + description = lib.mdDoc "${prefix} kube-apiserver server address."; type = types.str; }; caFile = mkOption { - description = "${prefix} certificate authority file used to connect to kube-apiserver."; + description = lib.mdDoc "${prefix} certificate authority file used to connect to kube-apiserver."; type = types.nullOr types.path; default = cfg.caFile; defaultText = literalExpression "config.${opt.caFile}"; }; certFile = mkOption { - description = "${prefix} client certificate file used to connect to kube-apiserver."; + description = lib.mdDoc "${prefix} client certificate file used to connect to kube-apiserver."; type = types.nullOr types.path; default = null; }; keyFile = mkOption { - description = "${prefix} client key file used to connect to kube-apiserver."; + description = lib.mdDoc "${prefix} client key file used to connect to kube-apiserver."; type = types.nullOr types.path; default = null; }; @@ -111,7 +111,7 @@ in { options.services.kubernetes = { roles = mkOption { - description = '' + description = lib.mdDoc '' Kubernetes role that this machine should take. Master role will enable etcd, apiserver, scheduler, controller manager @@ -123,7 +123,7 @@ in { }; package = mkOption { - description = "Kubernetes package to use."; + description = lib.mdDoc "Kubernetes package to use."; type = types.package; default = pkgs.kubernetes; defaultText = literalExpression "pkgs.kubernetes"; @@ -132,7 +132,7 @@ in { kubeconfig = mkKubeConfigOptions "Default kubeconfig"; apiserverAddress = mkOption { - description = '' + description = lib.mdDoc '' Clusterwide accessible address for the kubernetes apiserver, including protocol and optional port. ''; @@ -141,49 +141,49 @@ in { }; caFile = mkOption { - description = "Default kubernetes certificate authority"; + description = lib.mdDoc "Default kubernetes certificate authority"; type = types.nullOr types.path; default = null; }; dataDir = mkOption { - description = "Kubernetes root directory for managing kubelet files."; + description = lib.mdDoc "Kubernetes root directory for managing kubelet files."; default = "/var/lib/kubernetes"; type = types.path; }; easyCerts = mkOption { - description = "Automatically setup x509 certificates and keys for the entire cluster."; + description = lib.mdDoc "Automatically setup x509 certificates and keys for the entire cluster."; default = false; type = types.bool; }; featureGates = mkOption { - description = "List set of feature gates."; + description = lib.mdDoc "List set of feature gates."; default = []; type = types.listOf types.str; }; masterAddress = mkOption { - description = "Clusterwide available network address or hostname for the kubernetes master server."; + description = lib.mdDoc "Clusterwide available network address or hostname for the kubernetes master server."; example = "master.example.com"; type = types.str; }; path = mkOption { - description = "Packages added to the services' PATH environment variable. Both the bin and sbin subdirectories of each package are added."; + description = lib.mdDoc "Packages added to the services' PATH environment variable. Both the bin and sbin subdirectories of each package are added."; type = types.listOf types.package; default = []; }; clusterCidr = mkOption { - description = "Kubernetes controller manager and proxy CIDR Range for Pods in cluster."; + description = lib.mdDoc "Kubernetes controller manager and proxy CIDR Range for Pods in cluster."; default = "10.1.0.0/16"; type = types.nullOr types.str; }; lib = mkOption { - description = "Common functions for the kubernetes modules."; + description = lib.mdDoc "Common functions for the kubernetes modules."; default = { inherit mkCert; inherit mkKubeConfig; @@ -193,7 +193,7 @@ in { }; secretsPath = mkOption { - description = "Default location for kubernetes secrets. Not a store location."; + description = lib.mdDoc "Default location for kubernetes secrets. Not a store location."; type = types.path; default = cfg.dataDir + "/secrets"; defaultText = literalExpression '' diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index 4363ed35d3..cbb1cffc16 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -38,17 +38,17 @@ let taintOptions = with lib.types; { name, ... }: { options = { key = mkOption { - description = "Key of taint."; + description = lib.mdDoc "Key of taint."; default = name; defaultText = literalDocBook "Name of this submodule."; type = str; }; value = mkOption { - description = "Value of taint."; + description = lib.mdDoc "Value of taint."; type = str; }; effect = mkOption { - description = "Effect of taint."; + description = lib.mdDoc "Effect of taint."; example = "NoSchedule"; type = enum ["NoSchedule" "PreferNoSchedule" "NoExecute"]; }; @@ -68,26 +68,26 @@ in options.services.kubernetes.kubelet = with lib.types; { address = mkOption { - description = "Kubernetes kubelet info server listening address."; + description = lib.mdDoc "Kubernetes kubelet info server listening address."; default = "0.0.0.0"; type = str; }; clusterDns = mkOption { - description = "Use alternative DNS."; + description = lib.mdDoc "Use alternative DNS."; default = "10.1.0.1"; type = str; }; clusterDomain = mkOption { - description = "Use alternative domain."; + description = lib.mdDoc "Use alternative domain."; default = config.services.kubernetes.addons.dns.clusterDomain; defaultText = literalExpression "config.${options.services.kubernetes.addons.dns.clusterDomain}"; type = str; }; clientCaFile = mkOption { - description = "Kubernetes apiserver CA file for client authentication."; + description = lib.mdDoc "Kubernetes apiserver CA file for client authentication."; default = top.caFile; defaultText = literalExpression "config.${otop.caFile}"; type = nullOr path; @@ -95,13 +95,13 @@ in cni = { packages = mkOption { - description = "List of network plugin packages to install."; + description = lib.mdDoc "List of network plugin packages to install."; type = listOf package; default = []; }; config = mkOption { - description = "Kubernetes CNI configuration."; + description = lib.mdDoc "Kubernetes CNI configuration."; type = listOf attrs; default = []; example = literalExpression '' @@ -127,20 +127,20 @@ in }; configDir = mkOption { - description = "Path to Kubernetes CNI configuration directory."; + description = lib.mdDoc "Path to Kubernetes CNI configuration directory."; type = nullOr path; default = null; }; }; containerRuntime = mkOption { - description = "Which container runtime type to use"; + description = lib.mdDoc "Which container runtime type to use"; type = enum ["docker" "remote"]; default = "remote"; }; containerRuntimeEndpoint = mkOption { - description = "Endpoint at which to find the container runtime api interface/socket"; + description = lib.mdDoc "Endpoint at which to find the container runtime api interface/socket"; type = str; default = "unix:///run/containerd/containerd.sock"; }; @@ -148,13 +148,13 @@ in enable = mkEnableOption "Kubernetes kubelet."; extraOpts = mkOption { - description = "Kubernetes kubelet extra command line options."; + description = lib.mdDoc "Kubernetes kubelet extra command line options."; default = ""; type = separatedString " "; }; featureGates = mkOption { - description = "List set of feature gates"; + description = lib.mdDoc "List set of feature gates"; default = top.featureGates; defaultText = literalExpression "config.${otop.featureGates}"; type = listOf str; @@ -162,20 +162,20 @@ in healthz = { bind = mkOption { - description = "Kubernetes kubelet healthz listening address."; + description = lib.mdDoc "Kubernetes kubelet healthz listening address."; default = "127.0.0.1"; type = str; }; port = mkOption { - description = "Kubernetes kubelet healthz port."; + description = lib.mdDoc "Kubernetes kubelet healthz port."; default = 10248; type = int; }; }; hostname = mkOption { - description = "Kubernetes kubelet hostname override."; + description = lib.mdDoc "Kubernetes kubelet hostname override."; default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; type = str; @@ -184,69 +184,69 @@ in kubeconfig = top.lib.mkKubeConfigOptions "Kubelet"; manifests = mkOption { - description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)"; + description = lib.mdDoc "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)"; type = attrsOf attrs; default = {}; }; networkPlugin = mkOption { - description = "Network plugin to use by Kubernetes."; + description = lib.mdDoc "Network plugin to use by Kubernetes."; type = nullOr (enum ["cni" "kubenet"]); default = "kubenet"; }; nodeIp = mkOption { - description = "IP address of the node. If set, kubelet will use this IP address for the node."; + description = lib.mdDoc "IP address of the node. If set, kubelet will use this IP address for the node."; default = null; type = nullOr str; }; registerNode = mkOption { - description = "Whether to auto register kubelet with API server."; + description = lib.mdDoc "Whether to auto register kubelet with API server."; default = true; type = bool; }; port = mkOption { - description = "Kubernetes kubelet info server listening port."; + description = lib.mdDoc "Kubernetes kubelet info server listening port."; default = 10250; type = int; }; seedDockerImages = mkOption { - description = "List of docker images to preload on system"; + description = lib.mdDoc "List of docker images to preload on system"; default = []; type = listOf package; }; taints = mkOption { - description = "Node taints (https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)."; + description = lib.mdDoc "Node taints (https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)."; default = {}; type = attrsOf (submodule [ taintOptions ]); }; tlsCertFile = mkOption { - description = "File containing x509 Certificate for HTTPS."; + description = lib.mdDoc "File containing x509 Certificate for HTTPS."; default = null; type = nullOr path; }; tlsKeyFile = mkOption { - description = "File containing x509 private key matching tlsCertFile."; + description = lib.mdDoc "File containing x509 private key matching tlsCertFile."; default = null; type = nullOr path; }; unschedulable = mkOption { - description = "Whether to set node taint to unschedulable=true as it is the case of node that has only master role."; + description = lib.mdDoc "Whether to set node taint to unschedulable=true as it is the case of node that has only master role."; default = false; type = bool; }; verbosity = mkOption { - description = '' + description = lib.mdDoc '' Optional glog verbosity level for logging statements. See - + ''; default = null; type = nullOr int; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix index 7d9198d20e..7c46ac8558 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/pki.nix @@ -44,13 +44,13 @@ in enable = mkEnableOption "easyCert issuer service"; certs = mkOption { - description = "List of certificate specs to feed to cert generator."; + description = lib.mdDoc "List of certificate specs to feed to cert generator."; default = {}; type = attrs; }; genCfsslCACert = mkOption { - description = '' + description = lib.mdDoc '' Whether to automatically generate cfssl CA certificate and key, if they don't exist. ''; @@ -59,7 +59,7 @@ in }; genCfsslAPICerts = mkOption { - description = '' + description = lib.mdDoc '' Whether to automatically generate cfssl API webserver TLS cert and key, if they don't exist. ''; @@ -68,7 +68,7 @@ in }; cfsslAPIExtraSANs = mkOption { - description = '' + description = lib.mdDoc '' Extra x509 Subject Alternative Names to be added to the cfssl API webserver TLS cert. ''; default = []; @@ -77,7 +77,7 @@ in }; genCfsslAPIToken = mkOption { - description = '' + description = lib.mdDoc '' Whether to automatically generate cfssl API-token secret, if they doesn't exist. ''; @@ -86,13 +86,13 @@ in }; pkiTrustOnBootstrap = mkOption { - description = "Whether to always trust remote cfssl server upon initial PKI bootstrap."; + description = lib.mdDoc "Whether to always trust remote cfssl server upon initial PKI bootstrap."; default = true; type = bool; }; caCertPathPrefix = mkOption { - description = '' + description = lib.mdDoc '' Path-prefrix for the CA-certificate to be used for cfssl signing. Suffixes ".pem" and "-key.pem" will be automatically appended for the public and private keys respectively. @@ -103,7 +103,7 @@ in }; caSpec = mkOption { - description = "Certificate specification for the auto-generated CAcert."; + description = lib.mdDoc "Certificate specification for the auto-generated CAcert."; default = { CN = "kubernetes-cluster-ca"; O = "NixOS"; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix index 0fd98d1c15..51114c3249 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -16,7 +16,7 @@ in options.services.kubernetes.proxy = with lib.types; { bindAddress = mkOption { - description = "Kubernetes proxy listening address."; + description = lib.mdDoc "Kubernetes proxy listening address."; default = "0.0.0.0"; type = str; }; @@ -24,20 +24,20 @@ in enable = mkEnableOption "Kubernetes proxy"; extraOpts = mkOption { - description = "Kubernetes proxy extra command line options."; + description = lib.mdDoc "Kubernetes proxy extra command line options."; default = ""; type = separatedString " "; }; featureGates = mkOption { - description = "List set of feature gates"; + description = lib.mdDoc "List set of feature gates"; default = top.featureGates; defaultText = literalExpression "config.${otop.featureGates}"; type = listOf str; }; hostname = mkOption { - description = "Kubernetes proxy hostname override."; + description = lib.mdDoc "Kubernetes proxy hostname override."; default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; type = str; @@ -46,9 +46,9 @@ in kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy"; verbosity = mkOption { - description = '' + description = lib.mdDoc '' Optional glog verbosity level for logging statements. See - + ''; default = null; type = nullOr int; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix index 2d95528a6e..ddc67889a3 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -12,7 +12,7 @@ in options.services.kubernetes.scheduler = with lib.types; { address = mkOption { - description = "Kubernetes scheduler listening address."; + description = lib.mdDoc "Kubernetes scheduler listening address."; default = "127.0.0.1"; type = str; }; @@ -20,13 +20,13 @@ in enable = mkEnableOption "Kubernetes scheduler"; extraOpts = mkOption { - description = "Kubernetes scheduler extra command line options."; + description = lib.mdDoc "Kubernetes scheduler extra command line options."; default = ""; type = separatedString " "; }; featureGates = mkOption { - description = "List set of feature gates"; + description = lib.mdDoc "List set of feature gates"; default = top.featureGates; defaultText = literalExpression "config.${otop.featureGates}"; type = listOf str; @@ -35,21 +35,21 @@ in kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes scheduler"; leaderElect = mkOption { - description = "Whether to start leader election before executing main loop."; + description = lib.mdDoc "Whether to start leader election before executing main loop."; type = bool; default = true; }; port = mkOption { - description = "Kubernetes scheduler listening port."; + description = lib.mdDoc "Kubernetes scheduler listening port."; default = 10251; type = int; }; verbosity = mkOption { - description = '' + description = lib.mdDoc '' Optional glog verbosity level for logging statements. See - + ''; default = null; type = nullOr int; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/pacemaker/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/pacemaker/default.nix index 7eeadffcc5..41d98a460f 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/pacemaker/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/pacemaker/default.nix @@ -13,7 +13,7 @@ in type = types.package; default = pkgs.pacemaker; defaultText = literalExpression "pkgs.pacemaker"; - description = "Package that should be used for pacemaker."; + description = lib.mdDoc "Package that should be used for pacemaker."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/spark/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/spark/default.nix index e6b44e130a..30d8fa0fc4 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/spark/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/spark/default.nix @@ -10,13 +10,13 @@ with lib; enable = mkEnableOption "Spark master service"; bind = mkOption { type = types.str; - description = "Address the spark master binds to."; + description = lib.mdDoc "Address the spark master binds to."; default = "127.0.0.1"; example = "0.0.0.0"; }; restartIfChanged = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Automatically restart master service on config change. This can be set to false to defer restarts on clusters running critical applications. Please consider the security implications of inadvertently running an older version, @@ -26,7 +26,7 @@ with lib; }; extraEnvironment = mkOption { type = types.attrsOf types.str; - description = "Extra environment variables to pass to spark master. See spark-standalone documentation."; + description = lib.mdDoc "Extra environment variables to pass to spark master. See spark-standalone documentation."; default = {}; example = { SPARK_MASTER_WEBUI_PORT = 8181; @@ -38,17 +38,17 @@ with lib; enable = mkEnableOption "Spark worker service"; workDir = mkOption { type = types.path; - description = "Spark worker work dir."; + description = lib.mdDoc "Spark worker work dir."; default = "/var/lib/spark"; }; master = mkOption { type = types.str; - description = "Address of the spark master."; + description = lib.mdDoc "Address of the spark master."; default = "127.0.0.1:7077"; }; restartIfChanged = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Automatically restart worker service on config change. This can be set to false to defer restarts on clusters running critical applications. Please consider the security implications of inadvertently running an older version, @@ -58,7 +58,7 @@ with lib; }; extraEnvironment = mkOption { type = types.attrsOf types.str; - description = "Extra environment variables to pass to spark worker."; + description = lib.mdDoc "Extra environment variables to pass to spark worker."; default = {}; example = { SPARK_WORKER_CORES = 5; @@ -68,18 +68,18 @@ with lib; }; confDir = mkOption { type = types.path; - description = "Spark configuration directory. Spark will use the configuration files (spark-defaults.conf, spark-env.sh, log4j.properties, etc) from this directory."; + description = lib.mdDoc "Spark configuration directory. Spark will use the configuration files (spark-defaults.conf, spark-env.sh, log4j.properties, etc) from this directory."; default = "${cfg.package}/lib/${cfg.package.untarDir}/conf"; defaultText = literalExpression ''"''${package}/lib/''${package.untarDir}/conf"''; }; logDir = mkOption { type = types.path; - description = "Spark log directory."; + description = lib.mdDoc "Spark log directory."; default = "/var/log/spark"; }; package = mkOption { type = types.package; - description = "Spark package."; + description = lib.mdDoc "Spark package."; default = pkgs.spark; defaultText = literalExpression "pkgs.spark"; example = literalExpression ''pkgs.spark.overrideAttrs (super: rec { diff --git a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix index 52249455fd..ec88be95ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/boinc/client.nix @@ -19,7 +19,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the BOINC distributed computing client. If this option is set to true, the boinc_client daemon will be run as a background service. The boinccmd command can be used to control the @@ -31,7 +31,7 @@ in type = types.package; default = pkgs.boinc; defaultText = literalExpression "pkgs.boinc"; - description = '' + description = lib.mdDoc '' Which BOINC package to use. ''; }; @@ -39,7 +39,7 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/boinc"; - description = '' + description = lib.mdDoc '' The directory in which to store BOINC's configuration and data files. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix b/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix index aa9d0a5218..ad88fffe43 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/foldingathome/client.nix @@ -24,7 +24,7 @@ in type = types.package; default = pkgs.fahclient; defaultText = literalExpression "pkgs.fahclient"; - description = '' + description = lib.mdDoc '' Which Folding@home client to use. ''; }; @@ -32,7 +32,7 @@ in user = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The user associated with the reported computation results. This will be used in the ranking statistics. ''; @@ -41,7 +41,7 @@ in team = mkOption { type = types.int; default = 236565; - description = '' + description = lib.mdDoc '' The team ID associated with the reported computation results. This will be used in the ranking statistics. @@ -52,7 +52,7 @@ in daemonNiceLevel = mkOption { type = types.ints.between (-20) 19; default = 0; - description = '' + description = lib.mdDoc '' Daemon process priority for FAHClient. 0 is the default Unix process priority, 19 is the lowest. ''; @@ -61,9 +61,9 @@ in extraArgs = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Extra startup options for the FAHClient. Run - FAHClient --help to find all the available options. + `FAHClient --help` to find all the available options. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix index b9792fd133..785267d4b3 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/slurm/slurm.nix @@ -66,11 +66,11 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the slurm control daemon. Note that the standard authentication method is "munge". The "munge" service needs to be provided with a password file in order for - slurm to work properly (see services.munge.password). + slurm to work properly (see `services.munge.password`). ''; }; }; @@ -82,9 +82,9 @@ in type = types.str; default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; - description = '' - Hostname of the machine where slurmdbd - is running (i.e. name returned by hostname -s). + description = lib.mdDoc '' + Hostname of the machine where `slurmdbd` + is running (i.e. name returned by `hostname -s`). ''; }; @@ -92,7 +92,7 @@ in type = types.str; default = cfg.user; defaultText = literalExpression "config.${opt.user}"; - description = '' + description = lib.mdDoc '' Database user name. ''; }; @@ -100,9 +100,9 @@ in storagePassFile = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Path to file with database password. The content of this will be used to - create the password for the StoragePass option. + create the password for the `StoragePass` option. ''; }; @@ -124,10 +124,10 @@ in enableStools = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to provide a slurm.conf file. Enable this option if you do not run a slurm daemon on this host - (i.e. server.enable and client.enable are false) + (i.e. `server.enable` and `client.enable` are `false`) but you still want to run slurm commands from this host. ''; }; @@ -137,7 +137,7 @@ in default = pkgs.slurm.override { enableX11 = ! cfg.enableSrunX11; }; defaultText = literalExpression "pkgs.slurm"; example = literalExpression "pkgs.slurm-full"; - description = '' + description = lib.mdDoc '' The package to use for slurm binaries. ''; }; @@ -146,7 +146,7 @@ in type = types.nullOr types.str; default = null; example = null; - description = '' + description = lib.mdDoc '' The short hostname of the machine where SLURM control functions are executed (i.e. the name returned by the command "hostname -s", use "tux001" rather than "tux001.my.com"). @@ -158,7 +158,7 @@ in default = cfg.controlMachine; defaultText = literalExpression "config.${opt.controlMachine}"; example = null; - description = '' + description = lib.mdDoc '' Name that ControlMachine should be referred to in establishing a communications path. ''; @@ -168,7 +168,7 @@ in type = types.str; default = "default"; example = "myCluster"; - description = '' + description = lib.mdDoc '' Necessary to distinguish accounting records in a multi-cluster environment. ''; }; @@ -177,7 +177,7 @@ in type = types.listOf types.str; default = []; example = literalExpression ''[ "linux[1-32] CPUs=1 State=UNKNOWN" ];''; - description = '' + description = lib.mdDoc '' Name that SLURM uses to refer to a node (or base partition for BlueGene systems). Typically this would be the string that "/bin/hostname -s" returns. Note that now you have to write node's parameters after the name. @@ -188,7 +188,7 @@ in type = types.listOf types.str; default = []; example = literalExpression ''[ "debug Nodes=linux[1-32] Default=YES MaxTime=INFINITE State=UP" ];''; - description = '' + description = lib.mdDoc '' Name by which the partition may be referenced. Note that now you have to write the partition's parameters after the name. ''; @@ -197,17 +197,17 @@ in enableSrunX11 = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If enabled srun will accept the option "--x11" to allow for X11 forwarding from within an interactive session or a batch job. This activates the slurm-spank-x11 module. Note that this option also enables - on the client. + {option}`services.openssh.forwardX11` on the client. This option requires slurm to be compiled without native X11 support. The default behavior is to re-compile the slurm package with native X11 support disabled if this option is set to true. - To use the native X11 support add PrologFlags=X11 in . + To use the native X11 support add `PrologFlags=X11` in {option}`extraConfig`. Note that this method will only work RSA SSH host keys. ''; }; @@ -215,7 +215,7 @@ in procTrackType = mkOption { type = types.str; default = "proctrack/linuxproc"; - description = '' + description = lib.mdDoc '' Plugin to be used for process tracking on a job step basis. The slurmd daemon uses this mechanism to identify all processes which are children of processes it spawns for a user job step. @@ -225,7 +225,7 @@ in stateSaveLocation = mkOption { type = types.str; default = "/var/spool/slurmctld"; - description = '' + description = lib.mdDoc '' Directory into which the Slurm controller, slurmctld, saves its state. ''; }; @@ -233,7 +233,7 @@ in user = mkOption { type = types.str; default = defaultUser; - description = '' + description = lib.mdDoc '' Set this option when you want to run the slurmctld daemon as something else than the default slurm user "slurm". Note that the UID of this user needs to be the same @@ -244,7 +244,7 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration options that will be added verbatim at the end of the slurm configuration file. ''; @@ -253,28 +253,28 @@ in extraPlugstackConfig = mkOption { default = ""; type = types.lines; - description = '' - Extra configuration that will be added to the end of plugstack.conf. + description = lib.mdDoc '' + Extra configuration that will be added to the end of `plugstack.conf`. ''; }; extraCgroupConfig = mkOption { default = ""; type = types.lines; - description = '' - Extra configuration for cgroup.conf. This file is - used when procTrackType=proctrack/cgroup. + description = lib.mdDoc '' + Extra configuration for `cgroup.conf`. This file is + used when `procTrackType=proctrack/cgroup`. ''; }; extraConfigPaths = mkOption { type = with types; listOf path; default = []; - description = '' + description = lib.mdDoc '' Slurm expects config files for plugins in the same path - as slurm.conf. Add extra nix store + as `slurm.conf`. Add extra nix store paths that should be merged into same directory as - slurm.conf. + `slurm.conf`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/computing/torque/mom.nix b/third_party/nixpkgs/nixos/modules/services/computing/torque/mom.nix index 6747bd4b0d..bf3679847b 100644 --- a/third_party/nixpkgs/nixos/modules/services/computing/torque/mom.nix +++ b/third_party/nixpkgs/nixos/modules/services/computing/torque/mom.nix @@ -21,7 +21,7 @@ in serverNode = mkOption { type = types.str; - description = "Hostname running pbs server."; + description = lib.mdDoc "Hostname running pbs server."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix index 80c6c6abfd..ab1a8076c9 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -61,7 +61,7 @@ in { factorySteps = mkOption { type = types.listOf types.str; - description = "Factory Steps"; + description = lib.mdDoc "Factory Steps"; default = []; example = [ "steps.Git(repourl='https://github.com/buildbot/pyflakes.git', mode='incremental')" @@ -71,7 +71,7 @@ in { changeSource = mkOption { type = types.listOf types.str; - description = "List of Change Sources."; + description = lib.mdDoc "List of Change Sources."; default = []; example = [ "changes.GitPoller('https://github.com/buildbot/pyflakes.git', workdir='gitpoller-workdir', branch='master', pollinterval=300)" @@ -81,18 +81,18 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the Buildbot continuous integration server."; + description = lib.mdDoc "Whether to enable the Buildbot continuous integration server."; }; extraConfig = mkOption { type = types.str; - description = "Extra configuration to append to master.cfg"; + description = lib.mdDoc "Extra configuration to append to master.cfg"; default = "c['buildbotNetUsageData'] = None"; }; masterCfg = mkOption { type = types.path; - description = "Optionally pass master.cfg path. Other options in this configuration will be ignored."; + description = lib.mdDoc "Optionally pass master.cfg path. Other options in this configuration will be ignored."; default = defaultMasterCfg; defaultText = literalDocBook ''generated configuration file''; example = "/etc/nixos/buildbot/master.cfg"; @@ -100,7 +100,7 @@ in { schedulers = mkOption { type = types.listOf types.str; - description = "List of Schedulers."; + description = lib.mdDoc "List of Schedulers."; default = [ "schedulers.SingleBranchScheduler(name='all', change_filter=util.ChangeFilter(branch='master'), treeStableTimer=None, builderNames=['runtests'])" "schedulers.ForceScheduler(name='force',builderNames=['runtests'])" @@ -109,7 +109,7 @@ in { builders = mkOption { type = types.listOf types.str; - description = "List of Builders."; + description = lib.mdDoc "List of Builders."; default = [ "util.BuilderConfig(name='runtests',workernames=['example-worker'],factory=factory)" ]; @@ -117,52 +117,52 @@ in { workers = mkOption { type = types.listOf types.str; - description = "List of Workers."; + description = lib.mdDoc "List of Workers."; default = [ "worker.Worker('example-worker', 'pass')" ]; }; reporters = mkOption { default = []; type = types.listOf types.str; - description = "List of reporter objects used to present build status to various users."; + description = lib.mdDoc "List of reporter objects used to present build status to various users."; }; user = mkOption { default = "buildbot"; type = types.str; - description = "User the buildbot server should execute under."; + description = lib.mdDoc "User the buildbot server should execute under."; }; group = mkOption { default = "buildbot"; type = types.str; - description = "Primary group of buildbot user."; + description = lib.mdDoc "Primary group of buildbot user."; }; extraGroups = mkOption { type = types.listOf types.str; default = []; - description = "List of extra groups that the buildbot user should be a part of."; + description = lib.mdDoc "List of extra groups that the buildbot user should be a part of."; }; home = mkOption { default = "/home/buildbot"; type = types.path; - description = "Buildbot home directory."; + description = lib.mdDoc "Buildbot home directory."; }; buildbotDir = mkOption { default = "${cfg.home}/master"; defaultText = literalExpression ''"''${config.${opt.home}}/master"''; type = types.path; - description = "Specifies the Buildbot directory."; + description = lib.mdDoc "Specifies the Buildbot directory."; }; pbPort = mkOption { default = 9989; type = types.either types.str types.int; example = "'tcp:9990:interface=127.0.0.1'"; - description = '' + description = lib.mdDoc '' The buildmaster will listen on a TCP port of your choosing for connections from workers. It can also use this port for connections from remote Change Sources, @@ -170,51 +170,51 @@ in { This port should be visible to the outside world, and you’ll need to tell your worker admins about your choice. If put in (single) quotes, this can also be used as a connection string, - as defined in the ConnectionStrings guide. + as defined in the [ConnectionStrings guide](https://twistedmatrix.com/documents/current/core/howto/endpoints.html). ''; }; listenAddress = mkOption { default = "0.0.0.0"; type = types.str; - description = "Specifies the bind address on which the buildbot HTTP interface listens."; + description = lib.mdDoc "Specifies the bind address on which the buildbot HTTP interface listens."; }; buildbotUrl = mkOption { default = "http://localhost:8010/"; type = types.str; - description = "Specifies the Buildbot URL."; + description = lib.mdDoc "Specifies the Buildbot URL."; }; title = mkOption { default = "Buildbot"; type = types.str; - description = "Specifies the Buildbot Title."; + description = lib.mdDoc "Specifies the Buildbot Title."; }; titleUrl = mkOption { default = "Buildbot"; type = types.str; - description = "Specifies the Buildbot TitleURL."; + description = lib.mdDoc "Specifies the Buildbot TitleURL."; }; dbUrl = mkOption { default = "sqlite:///state.sqlite"; type = types.str; - description = "Specifies the database connection string."; + description = lib.mdDoc "Specifies the database connection string."; }; port = mkOption { default = 8010; type = types.int; - description = "Specifies port number on which the buildbot HTTP interface listens."; + description = lib.mdDoc "Specifies port number on which the buildbot HTTP interface listens."; }; package = mkOption { type = types.package; default = pkgs.python3Packages.buildbot-full; defaultText = literalExpression "pkgs.python3Packages.buildbot-full"; - description = "Package to use for buildbot."; + description = lib.mdDoc "Package to use for buildbot."; example = literalExpression "pkgs.python3Packages.buildbot"; }; @@ -222,14 +222,14 @@ in { default = [ pkgs.git ]; defaultText = literalExpression "[ pkgs.git ]"; type = types.listOf types.package; - description = "Packages to add to PATH for the buildbot process."; + description = lib.mdDoc "Packages to add to PATH for the buildbot process."; }; pythonPackages = mkOption { type = types.functionTo (types.listOf types.package); default = pythonPackages: with pythonPackages; [ ]; defaultText = literalExpression "pythonPackages: with pythonPackages; [ ]"; - description = "Packages to add the to the PYTHONPATH of the buildbot process."; + description = lib.mdDoc "Packages to add the to the PYTHONPATH of the buildbot process."; example = literalExpression "pythonPackages: with pythonPackages; [ requests ]"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix index 1d7f53bb65..245f685764 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildbot/worker.nix @@ -49,73 +49,73 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the Buildbot Worker."; + description = lib.mdDoc "Whether to enable the Buildbot Worker."; }; user = mkOption { default = "bbworker"; type = types.str; - description = "User the buildbot Worker should execute under."; + description = lib.mdDoc "User the buildbot Worker should execute under."; }; group = mkOption { default = "bbworker"; type = types.str; - description = "Primary group of buildbot Worker user."; + description = lib.mdDoc "Primary group of buildbot Worker user."; }; extraGroups = mkOption { type = types.listOf types.str; default = []; - description = "List of extra groups that the Buildbot Worker user should be a part of."; + description = lib.mdDoc "List of extra groups that the Buildbot Worker user should be a part of."; }; home = mkOption { default = "/home/bbworker"; type = types.path; - description = "Buildbot home directory."; + description = lib.mdDoc "Buildbot home directory."; }; buildbotDir = mkOption { default = "${cfg.home}/worker"; defaultText = literalExpression ''"''${config.${opt.home}}/worker"''; type = types.path; - description = "Specifies the Buildbot directory."; + description = lib.mdDoc "Specifies the Buildbot directory."; }; workerUser = mkOption { default = "example-worker"; type = types.str; - description = "Specifies the Buildbot Worker user."; + description = lib.mdDoc "Specifies the Buildbot Worker user."; }; workerPass = mkOption { default = "pass"; type = types.str; - description = "Specifies the Buildbot Worker password."; + description = lib.mdDoc "Specifies the Buildbot Worker password."; }; workerPassFile = mkOption { type = types.path; - description = "File used to store the Buildbot Worker password"; + description = lib.mdDoc "File used to store the Buildbot Worker password"; }; hostMessage = mkOption { default = null; type = types.nullOr types.str; - description = "Description of this worker"; + description = lib.mdDoc "Description of this worker"; }; adminMessage = mkOption { default = null; type = types.nullOr types.str; - description = "Name of the administrator of this worker"; + description = lib.mdDoc "Name of the administrator of this worker"; }; masterUrl = mkOption { default = "localhost:9989"; type = types.str; - description = "Specifies the Buildbot Worker connection string."; + description = lib.mdDoc "Specifies the Buildbot Worker connection string."; }; keepalive = mkOption { @@ -131,7 +131,7 @@ in { type = types.package; default = pkgs.python3Packages.buildbot-worker; defaultText = literalExpression "pkgs.python3Packages.buildbot-worker"; - description = "Package to use for buildbot worker."; + description = lib.mdDoc "Package to use for buildbot worker."; example = literalExpression "pkgs.python2Packages.buildbot-worker"; }; @@ -139,7 +139,7 @@ in { default = with pkgs; [ git ]; defaultText = literalExpression "[ pkgs.git ]"; type = types.listOf types.package; - description = "Packages to add to PATH for the buildbot process."; + description = lib.mdDoc "Packages to add to PATH for the buildbot process."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix index 1872567c9f..cafa40dc6e 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -34,32 +34,32 @@ let enable = mkOption { default = true; type = types.bool; - description = "Whether to enable this buildkite agent"; + description = lib.mdDoc "Whether to enable this buildkite agent"; }; package = mkOption { default = pkgs.buildkite-agent; defaultText = literalExpression "pkgs.buildkite-agent"; - description = "Which buildkite-agent derivation to use"; + description = lib.mdDoc "Which buildkite-agent derivation to use"; type = types.package; }; dataDir = mkOption { default = "/var/lib/buildkite-agent-${name}"; - description = "The workdir for the agent"; + description = lib.mdDoc "The workdir for the agent"; type = types.str; }; runtimePackages = mkOption { default = [ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]; defaultText = literalExpression "[ pkgs.bash pkgs.gnutar pkgs.gzip pkgs.git pkgs.nix ]"; - description = "Add programs to the buildkite-agent environment"; + description = lib.mdDoc "Add programs to the buildkite-agent environment"; type = types.listOf types.package; }; tokenPath = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' The token from your Buildkite "Agents" page. A run-time path to the token file, which is supposed to be provisioned @@ -70,7 +70,7 @@ let name = mkOption { type = types.str; default = "%hostname-${name}-%n"; - description = '' + description = lib.mdDoc '' The name of the agent as seen in the buildkite dashboard. ''; }; @@ -79,7 +79,7 @@ let type = types.attrsOf (types.either types.str (types.listOf types.str)); default = {}; example = { queue = "default"; docker = "true"; ruby2 ="true"; }; - description = '' + description = lib.mdDoc '' Tags for the agent. ''; }; @@ -88,7 +88,7 @@ let type = types.lines; default = ""; example = "debug=true"; - description = '' + description = lib.mdDoc '' Extra lines to be added verbatim to the configuration file. ''; }; @@ -100,7 +100,7 @@ let ## don't end up in the Nix store. apply = final: if final == null then null else toString final; - description = '' + description = lib.mdDoc '' OpenSSH private key A run-time path to the key file, which is supposed to be provisioned @@ -169,9 +169,9 @@ let type = types.path; default = hooksDir config; defaultText = literalDocBook "generated from "; - description = '' + description = lib.mdDoc '' Path to the directory storing the hooks. - Consider using + Consider using {option}`services.buildkite-agents..hooks.` instead. ''; }; @@ -180,7 +180,7 @@ let type = types.str; default = "${pkgs.bash}/bin/bash -e -c"; defaultText = literalExpression ''"''${pkgs.bash}/bin/bash -e -c"''; - description = '' + description = lib.mdDoc '' Command that buildkite-agent 3 will execute when it spawns a shell. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix index 30dd919b81..5400338236 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/github-runner.nix @@ -18,29 +18,28 @@ in enable = mkOption { default = false; example = true; - description = '' + description = lib.mdDoc '' Whether to enable GitHub Actions runner. Note: GitHub recommends using self-hosted runners with private repositories only. Learn more here: - About self-hosted runners. + [About self-hosted runners](https://docs.github.com/en/actions/hosting-your-own-runners/about-self-hosted-runners). ''; type = lib.types.bool; }; url = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Repository to add the runner to. Changing this option triggers a new runner registration. IMPORTANT: If your token is org-wide (not per repository), you need to provide a github org link, not a single repository, so do it like this - https://github.com/nixos, not like this - https://github.com/nixos/nixpkgs. - Otherwise, you are going to get a 404 NotFound - from POST https://api.github.com/actions/runner-registration + `https://github.com/nixos`, not like this + `https://github.com/nixos/nixpkgs`. + Otherwise, you are going to get a `404 NotFound` + from `POST https://api.github.com/actions/runner-registration` in the configure script. ''; example = "https://github.com/nixos/nixpkgs"; @@ -48,7 +47,7 @@ in tokenFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' The full path to a file which contains the runner registration token. The file should contain exactly one line with the token without any newline. The token can be used to re-register a runner of the same name but is time-limited. @@ -61,7 +60,7 @@ in name = mkOption { # Same pattern as for `networking.hostName` type = types.strMatching "^$|^[[:alnum:]]([[:alnum:]_-]{0,61}[[:alnum:]])?$"; - description = '' + description = lib.mdDoc '' Name of the runner to configure. Defaults to the hostname. Changing this option triggers a new runner registration. @@ -73,7 +72,7 @@ in runnerGroup = mkOption { type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Name of the runner group to add this runner to (defaults to the default runner group). Changing this option triggers a new runner registration. @@ -83,8 +82,8 @@ in extraLabels = mkOption { type = types.listOf types.str; - description = '' - Extra labels in addition to the default (["self-hosted", "Linux", "X64"]). + description = lib.mdDoc '' + Extra labels in addition to the default (`["self-hosted", "Linux", "X64"]`). Changing this option triggers a new runner registration. ''; @@ -94,7 +93,7 @@ in replace = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Replace any existing runner with the same name. Without this flag, registering a new runner with the same name fails. @@ -104,15 +103,15 @@ in extraPackages = mkOption { type = types.listOf types.package; - description = '' - Extra packages to add to PATH of the service to make them available to workflows. + description = lib.mdDoc '' + Extra packages to add to `PATH` of the service to make them available to workflows. ''; default = [ ]; }; package = mkOption { type = types.package; - description = '' + description = lib.mdDoc '' Which github-runner derivation to use. ''; default = pkgs.github-runner; @@ -280,7 +279,6 @@ in CapabilityBoundingSet = ""; # ProtectClock= adds DeviceAllow=char-rtc r DeviceAllow = ""; - LockPersonality = true; NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; @@ -300,13 +298,17 @@ in RestrictSUIDSGID = true; UMask = "0066"; ProtectProc = "invisible"; - ProcSubset = "pid"; SystemCallFilter = [ - "~@debug" - "~@mount" - "~@privileged" + "~@clock" "~@cpu-emulation" + "~@module" + "~@mount" "~@obsolete" + "~@raw-io" + "~@reboot" + "~capset" + "~setdomainname" + "~sethostname" ]; RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" "AF_NETLINK" ]; @@ -314,6 +316,17 @@ in PrivateNetwork = false; # Cannot be true due to Node MemoryDenyWriteExecute = false; + + # The more restrictive "pid" option makes `nix` commands in CI emit + # "GC Warning: Couldn't read /proc/stat" + # You may want to set this to "pid" if not using `nix` commands + ProcSubset = "all"; + # Coverage programs for compiled code such as `cargo-tarpaulin` disable + # ASLR (address space layout randomization) which requires the + # `personality` syscall + # You may want to set this to `true` if not using coverage tooling on + # compiled code + LockPersonality = false; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix index 85ac0fb2a8..9f076e2d7a 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -22,6 +22,14 @@ let export CONFIG_FILE=${configPath} mkdir -p $(dirname ${configPath}) + touch ${configPath} + + # update global options + remarshal --if toml --of json ${configPath} \ + | jq -cM 'with_entries(select([.key] | inside(["runners"])))' \ + | jq -scM '.[0] + .[1]' - <(echo ${escapeShellArg (toJSON cfg.settings)}) \ + | remarshal --if json --of toml \ + | sponge ${configPath} # remove no longer existing services gitlab-runner verify --delete @@ -91,22 +99,6 @@ let --name "$NAME" && sleep 1 done - # update global options - remarshal --if toml --of json ${configPath} \ - | jq -cM ${escapeShellArg (concatStringsSep " | " [ - ".check_interval = ${toJSON cfg.checkInterval}" - ".concurrent = ${toJSON cfg.concurrent}" - ".sentry_dsn = ${toJSON cfg.sentryDSN}" - ".listen_address = ${toJSON cfg.prometheusListenAddress}" - ".session_server.listen_address = ${toJSON cfg.sessionServer.listenAddress}" - ".session_server.advertise_address = ${toJSON cfg.sessionServer.advertiseAddress}" - ".session_server.session_timeout = ${toJSON cfg.sessionServer.sessionTimeout}" - "del(.[] | nulls)" - "del(.session_server[] | nulls)" - ])} \ - | remarshal --if json --of toml \ - | sponge ${configPath} - # make config file readable by service chown -R --reference=$HOME $(dirname ${configPath}) ''); @@ -121,103 +113,33 @@ in configFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Configuration file for gitlab-runner. - takes precedence over . - and will be ignored too. + {option}`configFile` takes precedence over {option}`services`. + {option}`checkInterval` and {option}`concurrent` will be ignored too. - This option is deprecated, please use instead. - You can use and - + This option is deprecated, please use {option}`services` instead. + You can use {option}`registrationConfigFile` and + {option}`registrationFlags` for settings not covered by this module. ''; }; - checkInterval = mkOption { - type = types.int; - default = 0; - example = literalExpression "with lib; (length (attrNames config.services.gitlab-runner.services)) * 3"; - description = '' - Defines the interval length, in seconds, between new jobs check. - The default value is 3; - if set to 0 or lower, the default value will be used. - See runner documentation for more information. - ''; - }; - concurrent = mkOption { - type = types.int; - default = 1; - example = literalExpression "config.nix.settings.max-jobs"; - description = '' - Limits how many jobs globally can be run concurrently. - The most upper limit of jobs using all defined runners. - 0 does not mean unlimited. - ''; - }; - sentryDSN = mkOption { - type = types.nullOr types.str; - default = null; - example = "https://public:private@host:port/1"; - description = '' - Data Source Name for tracking of all system level errors to Sentry. - ''; - }; - prometheusListenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "localhost:8080"; - description = '' - Address (<host>:<port>) on which the Prometheus metrics HTTP server - should be listening. - ''; - }; - sessionServer = mkOption { + settings = mkOption { type = types.submodule { - options = { - listenAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "0.0.0.0:8093"; - description = '' - An internal URL to be used for the session server. - ''; - }; - advertiseAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "runner-host-name.tld:8093"; - description = '' - The URL that the Runner will expose to GitLab to be used - to access the session server. - Fallbacks to if not defined. - ''; - }; - sessionTimeout = mkOption { - type = types.int; - default = 1800; - description = '' - How long in seconds the session can stay active after - the job completes (which will block the job from finishing). - ''; - }; - }; + freeformType = (pkgs.formats.json { }).type; }; default = { }; - example = literalExpression '' - { - listenAddress = "0.0.0.0:8093"; - } - ''; - description = '' - The session server allows the user to interact with jobs - that the Runner is responsible for. A good example of this is the - interactive web terminal. + description = lib.mdDoc '' + Global gitlab-runner configuration. See + + for supported values. ''; }; gracefulTermination = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Finish all remaining jobs before stopping. If not set gitlab-runner will stop immediatly without waiting for jobs to finish, which will lead to failed builds. @@ -227,7 +149,7 @@ in type = types.str; default = "infinity"; example = "5min 20s"; - description = '' + description = lib.mdDoc '' Time to wait until a graceful shutdown is turned into a forceful one. ''; }; @@ -236,17 +158,17 @@ in default = pkgs.gitlab-runner; defaultText = literalExpression "pkgs.gitlab-runner"; example = literalExpression "pkgs.gitlab-runner_1_11"; - description = "Gitlab Runner package to use."; + description = lib.mdDoc "Gitlab Runner package to use."; }; extraPackages = mkOption { type = types.listOf types.package; default = [ ]; - description = '' + description = lib.mdDoc '' Extra packages to add to PATH for the gitlab-runner process. ''; }; services = mkOption { - description = "GitLab Runner services."; + description = lib.mdDoc "GitLab Runner services."; default = { }; example = literalExpression '' { @@ -328,17 +250,17 @@ in options = { registrationConfigFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Absolute path to a file with environment variables used for gitlab-runner registration. A list of all supported environment variables can be found in - gitlab-runner register --help. + `gitlab-runner register --help`. Ones that you probably want to set is - CI_SERVER_URL=<CI server URL> + `CI_SERVER_URL=` - REGISTRATION_TOKEN=<registration secret> + `REGISTRATION_TOKEN=` WARNING: make sure to use quoted absolute path, or it is going to be copied to Nix Store. @@ -348,10 +270,10 @@ in type = types.listOf types.str; default = [ ]; example = [ "--docker-helper-image my/gitlab-runner-helper" ]; - description = '' + description = lib.mdDoc '' Extra command-line flags passed to - gitlab-runner register. - Execute gitlab-runner register --help + `gitlab-runner register`. + Execute `gitlab-runner register --help` for a list of supported flags. ''; }; @@ -359,32 +281,32 @@ in type = types.attrsOf types.str; default = { }; example = { NAME = "value"; }; - description = '' + description = lib.mdDoc '' Custom environment variables injected to build environment. - For secrets you can use - with RUNNER_ENV variable set. + For secrets you can use {option}`registrationConfigFile` + with `RUNNER_ENV` variable set. ''; }; description = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Name/description of the runner. ''; }; executor = mkOption { type = types.str; default = "docker"; - description = '' + description = lib.mdDoc '' Select executor, eg. shell, docker, etc. - See runner documentation for more information. + See [runner documentation](https://docs.gitlab.com/runner/executors/README.html) for more information. ''; }; buildsDir = mkOption { type = types.nullOr types.path; default = null; example = "/var/lib/gitlab-runner/builds"; - description = '' + description = lib.mdDoc '' Absolute path to a directory where builds will be stored in context of selected executor (Locally, Docker, SSH). ''; @@ -393,14 +315,14 @@ in type = types.nullOr types.str; default = null; example = "http://gitlab.example.local"; - description = '' + description = lib.mdDoc '' Overwrite the URL for the GitLab instance. Used if the Runner can’t connect to GitLab on the URL GitLab exposes itself. ''; }; dockerImage = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Docker image to be used. ''; }; @@ -408,7 +330,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "/var/run/docker.sock:/var/run/docker.sock" ]; - description = '' + description = lib.mdDoc '' Bind-mount a volume and create it if it doesn't exist prior to mounting. ''; @@ -416,14 +338,14 @@ in dockerDisableCache = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Disable all container caching. ''; }; dockerPrivileged = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Give extended privileges to container. ''; }; @@ -431,7 +353,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "other-host:127.0.0.1" ]; - description = '' + description = lib.mdDoc '' Add a custom host-to-IP mapping. ''; }; @@ -439,7 +361,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "ruby:*" "python:*" "php:*" "my.registry.tld:5000/*:*" ]; - description = '' + description = lib.mdDoc '' Whitelist allowed images. ''; }; @@ -447,21 +369,21 @@ in type = types.listOf types.str; default = [ ]; example = [ "postgres:9" "redis:*" "mysql:*" ]; - description = '' + description = lib.mdDoc '' Whitelist allowed services. ''; }; preCloneScript = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Runner-specific command script executed before code is pulled. ''; }; preBuildScript = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Runner-specific command script executed after code is pulled, just before build executes. ''; @@ -469,7 +391,7 @@ in postBuildScript = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Runner-specific command script executed after code is pulled and just after build executes. ''; @@ -477,22 +399,22 @@ in tagList = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' Tag list. ''; }; runUntagged = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Register to run untagged builds; defaults to - true when is empty. + `true` when {option}`tagList` is empty. ''; }; limit = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Limit how many jobs can be handled concurrently by this service. 0 (default) simply means don't limit. ''; @@ -500,14 +422,14 @@ in requestConcurrency = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Limit number of concurrent requests for new jobs from GitLab. ''; }; maximumTimeout = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' What is the maximum timeout (in seconds) that will be set for job when using this Runner. 0 (default) simply means don't limit. ''; @@ -515,7 +437,7 @@ in protected = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' When set to true Runner will only run on pipelines triggered on protected branches. ''; @@ -523,9 +445,9 @@ in debugTraceDisabled = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' When set to true Runner will disable the possibility of - using the CI_DEBUG_TRACE feature. + using the `CI_DEBUG_TRACE` feature. ''; }; }; @@ -535,8 +457,8 @@ in config = mkIf cfg.enable { warnings = (mapAttrsToList (n: v: "services.gitlab-runner.services.${n}.`registrationConfigFile` points to a file in Nix Store. You should use quoted absolute path to prevent this.") - (filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services)) - ++ optional (cfg.configFile != null) "services.gitlab-runner.`configFile` is deprecated, please use services.gitlab-runner.`services`."; + (filterAttrs (n: v: isStorePath v.registrationConfigFile) cfg.services)); + environment.systemPackages = [ cfg.package ]; systemd.services.gitlab-runner = { description = "Gitlab Runner"; @@ -584,5 +506,14 @@ in (mkRenamedOptionModule [ "services" "gitlab-runner" "packages" ] [ "services" "gitlab-runner" "extraPackages" ] ) (mkRemovedOptionModule [ "services" "gitlab-runner" "configOptions" ] "Use services.gitlab-runner.services option instead" ) (mkRemovedOptionModule [ "services" "gitlab-runner" "workDir" ] "You should move contents of workDir (if any) to /var/lib/gitlab-runner" ) + + (mkRenamedOptionModule [ "services" "gitlab-runner" "checkInterval" ] [ "services" "gitlab-runner" "settings" "check_interval" ] ) + (mkRenamedOptionModule [ "services" "gitlab-runner" "concurrent" ] [ "services" "gitlab-runner" "settings" "concurrent" ] ) + (mkRenamedOptionModule [ "services" "gitlab-runner" "sentryDSN" ] [ "services" "gitlab-runner" "settings" "sentry_dsn" ] ) + (mkRenamedOptionModule [ "services" "gitlab-runner" "prometheusListenAddress" ] [ "services" "gitlab-runner" "settings" "listen_address" ] ) + + (mkRenamedOptionModule [ "services" "gitlab-runner" "sessionServer" "listenAddress" ] [ "services" "gitlab-runner" "settings" "session_server" "listen_address" ] ) + (mkRenamedOptionModule [ "services" "gitlab-runner" "sessionServer" "advertiseAddress" ] [ "services" "gitlab-runner" "settings" "session_server" "advertise_address" ] ) + (mkRenamedOptionModule [ "services" "gitlab-runner" "sessionServer" "sessionTimeout" ] [ "services" "gitlab-runner" "settings" "session_server" "session_timeout" ] ) ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix index c63998c673..c9e22dff15 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -13,7 +13,7 @@ in { user = mkOption { default = "gocd-agent"; type = types.str; - description = '' + description = lib.mdDoc '' User the Go.CD agent should execute under. ''; }; @@ -21,7 +21,7 @@ in { group = mkOption { default = "gocd-agent"; type = types.str; - description = '' + description = lib.mdDoc '' If the default user "gocd-agent" is configured then this is the primary group of that user. ''; @@ -31,7 +31,7 @@ in { type = types.listOf types.str; default = [ ]; example = [ "wheel" "docker" ]; - description = '' + description = lib.mdDoc '' List of extra groups that the "gocd-agent" user should be a part of. ''; }; @@ -40,7 +40,7 @@ in { default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]; defaultText = literalExpression "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; - description = '' + description = lib.mdDoc '' Packages to add to PATH for the Go.CD agent process. ''; }; @@ -53,7 +53,7 @@ in { agent.auto.register.environments=QA,Performance agent.auto.register.hostname=Agent01 ''; - description = '' + description = lib.mdDoc '' Agent registration configuration. ''; }; @@ -61,7 +61,7 @@ in { goServer = mkOption { default = "https://127.0.0.1:8154/go"; type = types.str; - description = '' + description = lib.mdDoc '' URL of the GoCD Server to attach the Go.CD Agent to. ''; }; @@ -69,7 +69,7 @@ in { workDir = mkOption { default = "/var/lib/go-agent"; type = types.str; - description = '' + description = lib.mdDoc '' Specifies the working directory in which the Go.CD agent java archive resides. ''; }; @@ -77,7 +77,7 @@ in { initialJavaHeapSize = mkOption { default = "128m"; type = types.str; - description = '' + description = lib.mdDoc '' Specifies the initial java heap memory size for the Go.CD agent java process. ''; }; @@ -85,7 +85,7 @@ in { maxJavaHeapMemory = mkOption { default = "256m"; type = types.str; - description = '' + description = lib.mdDoc '' Specifies the java maximum heap memory size for the Go.CD agent java process. ''; }; @@ -108,7 +108,7 @@ in { "-Djava.security.egd=file:/dev/./urandom" ] ''; - description = '' + description = lib.mdDoc '' Specifies startup command line arguments to pass to Go.CD agent java process. ''; @@ -127,7 +127,7 @@ in { "-XX:+PrintGCDetails" "-XX:+PrintGC" ]; - description = '' + description = lib.mdDoc '' Specifies additional command line arguments to pass to Go.CD agent java process. Example contains debug and gcLog arguments. ''; @@ -136,10 +136,10 @@ in { environment = mkOption { default = { }; type = with types; attrsOf str; - description = '' + description = lib.mdDoc '' Additional environment variables to be passed to the Go.CD agent process. As a base environment, Go.CD agent receives NIX_PATH from - , NIX_REMOTE is set to + {option}`environment.sessionVariables`, NIX_REMOTE is set to "daemon". ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix index 3540656f93..50b5a20ad7 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -13,7 +13,7 @@ in { user = mkOption { default = "gocd-server"; type = types.str; - description = '' + description = lib.mdDoc '' User the Go.CD server should execute under. ''; }; @@ -21,7 +21,7 @@ in { group = mkOption { default = "gocd-server"; type = types.str; - description = '' + description = lib.mdDoc '' If the default user "gocd-server" is configured then this is the primary group of that user. ''; }; @@ -30,7 +30,7 @@ in { default = [ ]; type = types.listOf types.str; example = [ "wheel" "docker" ]; - description = '' + description = lib.mdDoc '' List of extra groups that the "gocd-server" user should be a part of. ''; }; @@ -39,7 +39,7 @@ in { default = "0.0.0.0"; example = "localhost"; type = types.str; - description = '' + description = lib.mdDoc '' Specifies the bind address on which the Go.CD server HTTP interface listens. ''; }; @@ -47,7 +47,7 @@ in { port = mkOption { default = 8153; type = types.int; - description = '' + description = lib.mdDoc '' Specifies port number on which the Go.CD server HTTP interface listens. ''; }; @@ -55,7 +55,7 @@ in { sslPort = mkOption { default = 8154; type = types.int; - description = '' + description = lib.mdDoc '' Specifies port number on which the Go.CD server HTTPS interface listens. ''; }; @@ -63,7 +63,7 @@ in { workDir = mkOption { default = "/var/lib/go-server"; type = types.str; - description = '' + description = lib.mdDoc '' Specifies the working directory in which the Go.CD server java archive resides. ''; }; @@ -72,7 +72,7 @@ in { default = [ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]; defaultText = literalExpression "[ pkgs.stdenv pkgs.jre pkgs.git config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; - description = '' + description = lib.mdDoc '' Packages to add to PATH for the Go.CD server's process. ''; }; @@ -80,7 +80,7 @@ in { initialJavaHeapSize = mkOption { default = "512m"; type = types.str; - description = '' + description = lib.mdDoc '' Specifies the initial java heap memory size for the Go.CD server's java process. ''; }; @@ -88,7 +88,7 @@ in { maxJavaHeapMemory = mkOption { default = "1024m"; type = types.str; - description = '' + description = lib.mdDoc '' Specifies the java maximum heap memory size for the Go.CD server's java process. ''; }; @@ -122,7 +122,7 @@ in { ] ''; - description = '' + description = lib.mdDoc '' Specifies startup command line arguments to pass to Go.CD server java process. ''; @@ -141,7 +141,7 @@ in { "-XX:+PrintGCDetails" "-XX:+PrintGC" ]; - description = '' + description = lib.mdDoc '' Specifies additional command line arguments to pass to Go.CD server's java process. Example contains debug and gcLog arguments. ''; @@ -150,10 +150,10 @@ in { environment = mkOption { default = { }; type = with types; attrsOf str; - description = '' + description = lib.mdDoc '' Additional environment variables to be passed to the gocd-server process. As a base environment, gocd-server receives NIX_PATH from - , NIX_REMOTE is set to + {option}`environment.sessionVariables`, NIX_REMOTE is set to "daemon". ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix index 4070a3425c..76d7356e24 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hail.nix @@ -13,7 +13,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables the Hail Auto Update Service. Hail can automatically deploy artifacts built by a Hydra Continous Integration server. A common use case is to provide continous deployment for single services or a full NixOS configuration.''; @@ -21,22 +21,22 @@ in { profile = mkOption { type = types.str; default = "hail-profile"; - description = "The name of the Nix profile used by Hail."; + description = lib.mdDoc "The name of the Nix profile used by Hail."; }; hydraJobUri = mkOption { type = types.str; - description = "The URI of the Hydra Job."; + description = lib.mdDoc "The URI of the Hydra Job."; }; netrc = mkOption { type = types.nullOr types.path; - description = "The netrc file to use when fetching data from Hydra."; + description = lib.mdDoc "The netrc file to use when fetching data from Hydra."; default = null; }; package = mkOption { type = types.package; default = pkgs.haskellPackages.hail; defaultText = literalExpression "pkgs.haskellPackages.hail"; - description = "Hail package to use."; + description = lib.mdDoc "Hail package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix index 80c88714bf..9e1fb03075 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -28,7 +28,7 @@ let freeformType = format.type; options = { apiBaseUrl = mkOption { - description = '' + description = lib.mdDoc '' API base URL that the agent will connect to. When using Hercules CI Enterprise, set this to the URL where your @@ -40,19 +40,19 @@ let baseDirectory = mkOption { type = types.path; default = "/var/lib/hercules-ci-agent"; - description = '' + description = lib.mdDoc '' State directory (secrets, work directory, etc) for agent ''; }; concurrentTasks = mkOption { - description = '' + description = lib.mdDoc '' Number of tasks to perform simultaneously. A task is a single derivation build, an evaluation or an effect run. - At minimum, you need 2 concurrent tasks for x86_64-linux + At minimum, you need 2 concurrent tasks for `x86_64-linux` in your cluster, to allow for import from derivation. - concurrentTasks can be around the CPU core count or lower if memory is + `concurrentTasks` can be around the CPU core count or lower if memory is the bottleneck. The optimal value depends on the resource consumption characteristics of your workload, @@ -66,7 +66,7 @@ let default = "auto"; }; labels = mkOption { - description = '' + description = lib.mdDoc '' A key-value map of user data. This data will be available to organization members in the dashboard and API. @@ -85,7 +85,7 @@ let ''; }; workDirectory = mkOption { - description = '' + description = lib.mdDoc '' The directory in which temporary subdirectories are created for task state. This includes sources for Nix evaluation. ''; type = types.path; @@ -93,10 +93,10 @@ let defaultText = literalExpression ''baseDirectory + "/work"''; }; staticSecretsDirectory = mkOption { - description = '' - This is the default directory to look for statically configured secrets like cluster-join-token.key. + description = lib.mdDoc '' + This is the default directory to look for statically configured secrets like `cluster-join-token.key`. - See also clusterJoinTokenPath and binaryCachesPath for fine-grained configuration. + See also `clusterJoinTokenPath` and `binaryCachesPath` for fine-grained configuration. ''; type = types.path; default = config.baseDirectory + "/secrets"; @@ -190,26 +190,26 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable to run Hercules CI Agent as a system service. - Hercules CI is a + [Hercules CI](https://hercules-ci.com) is a continuous integation service that is centered around Nix. - Support is available at help@hercules-ci.com. + Support is available at [help@hercules-ci.com](mailto:help@hercules-ci.com). ''; }; checkNix = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to make sure that the system's Nix (nix-daemon) is compatible. If you set this to false, please keep up with the change log. ''; }; package = mkOption { - description = '' + description = lib.mdDoc '' Package containing the bin/hercules-ci-agent executable. ''; type = types.package; @@ -217,12 +217,12 @@ in defaultText = literalExpression "pkgs.hercules-ci-agent"; }; settings = mkOption { - description = '' - These settings are written to the agent.toml file. + description = lib.mdDoc '' + These settings are written to the `agent.toml` file. Not all settings are listed as options, can be set nonetheless. - For the exhaustive list of settings, see . + For the exhaustive list of settings, see . ''; type = types.submoduleWith { modules = [ settingsModule ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix index d3945f2370..7159ec287f 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/hydra/default.nix @@ -78,7 +78,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run Hydra services. ''; }; @@ -101,12 +101,12 @@ in type = types.package; default = pkgs.hydra_unstable; defaultText = literalExpression "pkgs.hydra_unstable"; - description = "The Hydra package."; + description = lib.mdDoc "The Hydra package."; }; hydraURL = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The base URL for the Hydra webserver instance. Used for links in emails. ''; }; @@ -124,7 +124,7 @@ in port = mkOption { type = types.int; default = 3000; - description = '' + description = lib.mdDoc '' TCP port the web server should listen to. ''; }; @@ -132,7 +132,7 @@ in minimumDiskFree = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Threshold of minimum disk space (GiB) to determine if the queue runner should run or not. ''; }; @@ -140,14 +140,14 @@ in minimumDiskFreeEvaluator = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Threshold of minimum disk space (GiB) to determine if the evaluator should run or not. ''; }; notificationSender = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Sender email address used for email notifications. ''; }; @@ -156,7 +156,7 @@ in type = types.nullOr types.str; default = null; example = "localhost"; - description = '' + description = lib.mdDoc '' Hostname of the SMTP server to use to send email. ''; }; @@ -164,7 +164,7 @@ in tracker = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Piece of HTML that is included on all pages. ''; }; @@ -172,7 +172,7 @@ in logo = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to a file containing the logo of your Hydra instance. ''; }; @@ -180,24 +180,24 @@ in debugServer = mkOption { type = types.bool; default = false; - description = "Whether to run the server in debug mode."; + description = lib.mdDoc "Whether to run the server in debug mode."; }; extraConfig = mkOption { type = types.lines; - description = "Extra lines for the Hydra configuration."; + description = lib.mdDoc "Extra lines for the Hydra configuration."; }; extraEnv = mkOption { type = types.attrsOf types.str; default = {}; - description = "Extra environment variables for Hydra."; + description = lib.mdDoc "Extra environment variables for Hydra."; }; gcRootsDir = mkOption { type = types.path; default = "/nix/var/nix/gcroots/hydra"; - description = "Directory that holds Hydra garbage collector roots."; + description = lib.mdDoc "Directory that holds Hydra garbage collector roots."; }; buildMachinesFiles = mkOption { @@ -205,13 +205,13 @@ in default = optional (config.nix.buildMachines != []) "/etc/nix/machines"; defaultText = literalExpression ''optional (config.nix.buildMachines != []) "/etc/nix/machines"''; example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ]; - description = "List of files containing build machines."; + description = lib.mdDoc "List of files containing build machines."; }; useSubstitutes = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use binary caches for downloading store paths. Note that binary substitutions trigger (a potentially large number of) additional HTTP requests that slow down the queue monitor thread significantly. @@ -320,7 +320,7 @@ in ${optionalString haveLocalDB '' if ! [ -e ${baseDir}/.db-created ]; then runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra - runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra + runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -- -O hydra hydra touch ${baseDir}/.db-created fi echo "create extension if not exists pg_trgm" | runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix index d37dcb5519..6cd5718f42 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -9,7 +9,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the jenkins continuous integration server. ''; }; @@ -17,7 +17,7 @@ in { user = mkOption { default = "jenkins"; type = types.str; - description = '' + description = lib.mdDoc '' User the jenkins server should execute under. ''; }; @@ -25,7 +25,7 @@ in { group = mkOption { default = "jenkins"; type = types.str; - description = '' + description = lib.mdDoc '' If the default user "jenkins" is configured then this is the primary group of that user. ''; @@ -35,7 +35,7 @@ in { type = types.listOf types.str; default = [ ]; example = [ "wheel" "dialout" ]; - description = '' + description = lib.mdDoc '' List of extra groups that the "jenkins" user should be a part of. ''; }; @@ -43,7 +43,7 @@ in { home = mkOption { default = "/var/lib/jenkins"; type = types.path; - description = '' + description = lib.mdDoc '' The path to use as JENKINS_HOME. If the default user "jenkins" is configured then this is the home of the "jenkins" user. ''; @@ -53,7 +53,7 @@ in { default = "0.0.0.0"; example = "localhost"; type = types.str; - description = '' + description = lib.mdDoc '' Specifies the bind address on which the jenkins HTTP interface listens. The default is the wildcard address. ''; @@ -62,7 +62,7 @@ in { port = mkOption { default = 8080; type = types.port; - description = '' + description = lib.mdDoc '' Specifies port number on which the jenkins HTTP interface listens. The default is 8080. ''; @@ -72,7 +72,7 @@ in { default = ""; example = "/jenkins"; type = types.str; - description = '' + description = lib.mdDoc '' Specifies a urlPrefix to use with jenkins. If the example /jenkins is given, the jenkins server will be accessible using localhost:8080/jenkins. @@ -83,14 +83,14 @@ in { default = pkgs.jenkins; defaultText = literalExpression "pkgs.jenkins"; type = types.package; - description = "Jenkins package to use."; + description = lib.mdDoc "Jenkins package to use."; }; packages = mkOption { default = [ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]; defaultText = literalExpression "[ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; - description = '' + description = lib.mdDoc '' Packages to add to PATH for the jenkins process. ''; }; @@ -98,12 +98,12 @@ in { environment = mkOption { default = { }; type = with types; attrsOf str; - description = '' + description = lib.mdDoc '' Additional environment variables to be passed to the jenkins process. As a base environment, jenkins receives NIX_PATH from - , NIX_REMOTE is set to + {option}`environment.sessionVariables`, NIX_REMOTE is set to "daemon" and JENKINS_HOME is set to the value of - . + {option}`services.jenkins.home`. This option has precedence and can be used to override those mentioned variables. ''; @@ -112,13 +112,13 @@ in { plugins = mkOption { default = null; type = types.nullOr (types.attrsOf types.package); - description = '' + description = lib.mdDoc '' A set of plugins to activate. Note that this will completely remove and replace any previously installed plugins. If you have manually-installed plugins that you want to keep while using this module, set this option to - null. You can generate this set with a - tool such as jenkinsPlugins2nix. + `null`. You can generate this set with a + tool such as `jenkinsPlugins2nix`. ''; example = literalExpression '' import path/to/jenkinsPlugins2nix-generated-plugins.nix { inherit (pkgs) fetchurl stdenv; } @@ -129,7 +129,7 @@ in { type = types.listOf types.str; default = [ ]; example = [ "--debug=9" ]; - description = '' + description = lib.mdDoc '' Additional command line arguments to pass to Jenkins. ''; }; @@ -138,7 +138,7 @@ in { type = types.listOf types.str; default = [ ]; example = [ "-Xmx80m" ]; - description = '' + description = lib.mdDoc '' Additional command line arguments to pass to the Java run time (as opposed to Jenkins). ''; }; @@ -146,12 +146,12 @@ in { withCLI = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to make the CLI available. More info about the CLI available at - - https://www.jenkins.io/doc/book/managing/cli . + [ + https://www.jenkins.io/doc/book/managing/cli](https://www.jenkins.io/doc/book/managing/cli) . ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix index edbf31f5ca..8dc06bf264 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix @@ -12,7 +12,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether or not to enable the Jenkins Job Builder (JJB) service. It allows defining jobs for Jenkins in a declarative manner. @@ -24,15 +24,15 @@ in { deleted. Please see the Jenkins Job Builder documentation for more info: - - http://docs.openstack.org/infra/jenkins-job-builder/ + [ + http://docs.openstack.org/infra/jenkins-job-builder/](http://docs.openstack.org/infra/jenkins-job-builder/) ''; }; accessUser = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' User id in Jenkins used to reload config. ''; }; @@ -40,10 +40,10 @@ in { accessToken = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' User token in Jenkins used to reload config. WARNING: This token will be world readable in the Nix store. To keep - it secret, use the option instead. + it secret, use the {option}`accessTokenFile` option instead. ''; }; @@ -51,8 +51,8 @@ in { default = ""; type = types.str; example = "/run/keys/jenkins-job-builder-access-token"; - description = '' - File containing the API token for the + description = lib.mdDoc '' + File containing the API token for the {option}`accessUser` user. ''; }; @@ -66,7 +66,7 @@ in { builders: - shell: echo 'Hello world!' ''; - description = '' + description = lib.mdDoc '' Job descriptions for Jenkins Job Builder in YAML format. ''; }; @@ -86,7 +86,7 @@ in { ''' ] ''; - description = '' + description = lib.mdDoc '' Job descriptions for Jenkins Job Builder in JSON format. ''; }; @@ -104,7 +104,7 @@ in { } ] ''; - description = '' + description = lib.mdDoc '' Job descriptions for Jenkins Job Builder in Nix format. This is a trivial wrapper around jsonJobs, using builtins.toJSON @@ -243,6 +243,7 @@ in { done '' + (if cfg.accessUser != "" then reloadScript else ""); serviceConfig = { + Type = "oneshot"; User = jenkinsCfg.user; RuntimeDirectory = "jenkins-job-builder"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/slave.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/slave.nix index 871b9914fb..9b86917ab3 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/slave.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/slave.nix @@ -14,7 +14,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If true the system will be configured to work as a jenkins slave. If the system is also configured to work as a jenkins master then this has no effect. In progress: Currently only assures the jenkins user is configured. @@ -24,7 +24,7 @@ in { user = mkOption { default = "jenkins"; type = types.str; - description = '' + description = lib.mdDoc '' User the jenkins slave agent should execute under. ''; }; @@ -32,7 +32,7 @@ in { group = mkOption { default = "jenkins"; type = types.str; - description = '' + description = lib.mdDoc '' If the default slave agent user "jenkins" is configured then this is the primary group of that user. ''; @@ -41,7 +41,7 @@ in { home = mkOption { default = "/var/lib/jenkins"; type = types.path; - description = '' + description = lib.mdDoc '' The path to use as JENKINS_HOME. If the default user "jenkins" is configured then this is the home of the "jenkins" user. ''; @@ -50,7 +50,7 @@ in { javaPackage = mkOption { default = pkgs.jdk; defaultText = literalExpression "pkgs.jdk"; - description = '' + description = lib.mdDoc '' Java package to install. ''; type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/aerospike.nix b/third_party/nixpkgs/nixos/modules/services/databases/aerospike.nix index 8109762aea..9ffedaebf6 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/aerospike.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/aerospike.nix @@ -45,13 +45,13 @@ in default = pkgs.aerospike; defaultText = literalExpression "pkgs.aerospike"; type = types.package; - description = "Which Aerospike derivation to use"; + description = lib.mdDoc "Which Aerospike derivation to use"; }; workDir = mkOption { type = types.str; default = "/var/lib/aerospike"; - description = "Location where Aerospike stores its files"; + description = lib.mdDoc "Location where Aerospike stores its files"; }; networkConfig = mkOption { @@ -80,7 +80,7 @@ in port 3003 } ''; - description = "network section of configuration file"; + description = lib.mdDoc "network section of configuration file"; }; extraConfig = mkOption { @@ -94,7 +94,7 @@ in storage-engine memory } ''; - description = "Extra configuration"; + description = lib.mdDoc "Extra configuration"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix b/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix index b457e69bab..38db1d2e9f 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/cassandra.nix @@ -422,11 +422,11 @@ in options = { username = mkOption { type = types.str; - description = "Username for JMX"; + description = lib.mdDoc "Username for JMX"; }; password = mkOption { type = types.str; - description = "Password for JMX"; + description = lib.mdDoc "Password for JMX"; }; }; }); @@ -440,7 +440,7 @@ in else null; defaultText = literalMD ''generated configuration file if version is at least 3.11, otherwise `null`''; example = "/var/lib/cassandra/jmx.password"; - description = '' + description = lib.mdDoc '' Specify your own jmx roles file. Make sure the permissions forbid "others" from reading the file if diff --git a/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix b/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix index 3a161d5610..53637f4171 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/clickhouse.nix @@ -17,7 +17,7 @@ with lib; type = types.package; default = pkgs.clickhouse; defaultText = "pkgs.clickhouse"; - description = '' + description = lib.mdDoc '' ClickHouse package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/cockroachdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/cockroachdb.nix index 9a7aebe4f6..b8d7321d00 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/cockroachdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/cockroachdb.nix @@ -35,13 +35,13 @@ let address = mkOption { type = types.str; default = "localhost"; - description = "Address to bind to for ${descr}"; + description = lib.mdDoc "Address to bind to for ${descr}"; }; port = mkOption { type = types.port; default = defaultPort; - description = "Port to bind to for ${descr}"; + description = lib.mdDoc "Port to bind to for ${descr}"; }; }; in @@ -80,50 +80,50 @@ in join = mkOption { type = types.nullOr types.str; default = null; - description = "The addresses for connecting the node to a cluster."; + description = lib.mdDoc "The addresses for connecting the node to a cluster."; }; insecure = mkOption { type = types.bool; default = false; - description = "Run in insecure mode."; + description = lib.mdDoc "Run in insecure mode."; }; certsDir = mkOption { type = types.nullOr types.path; default = null; - description = "The path to the certificate directory."; + description = lib.mdDoc "The path to the certificate directory."; }; user = mkOption { type = types.str; default = "cockroachdb"; - description = "User account under which CockroachDB runs"; + description = lib.mdDoc "User account under which CockroachDB runs"; }; group = mkOption { type = types.str; default = "cockroachdb"; - description = "User account under which CockroachDB runs"; + description = lib.mdDoc "User account under which CockroachDB runs"; }; openPorts = mkOption { type = types.bool; default = false; - description = "Open firewall ports for cluster communication by default"; + description = lib.mdDoc "Open firewall ports for cluster communication by default"; }; cache = mkOption { type = types.str; default = "25%"; - description = '' + description = lib.mdDoc '' The total size for caches. This can be a percentage, expressed with a fraction sign or as a decimal-point number, or any bytes-based unit. For example, - "25%", "0.25" both represent + `"25%"`, `"0.25"` both represent 25% of the available system memory. The values - "1000000000" and "1GB" both + `"1000000000"` and `"1GB"` both represent 1 gigabyte of memory. ''; @@ -132,15 +132,15 @@ in maxSqlMemory = mkOption { type = types.str; default = "25%"; - description = '' + description = lib.mdDoc '' The maximum in-memory storage capacity available to store temporary data for SQL queries. This can be a percentage, expressed with a fraction sign or as a decimal-point number, or any bytes-based unit. For example, - "25%", "0.25" both represent + `"25%"`, `"0.25"` both represent 25% of the available system memory. The values - "1000000000" and "1GB" both + `"1000000000"` and `"1GB"` both represent 1 gigabyte of memory. ''; }; @@ -149,7 +149,7 @@ in type = types.package; default = pkgs.cockroachdb; defaultText = literalExpression "pkgs.cockroachdb"; - description = '' + description = lib.mdDoc '' The CockroachDB derivation to use for running the service. This would primarily be useful to enable Enterprise Edition features @@ -162,9 +162,9 @@ in type = types.listOf types.str; default = []; example = [ "--advertise-addr" "[fe80::f6f2:::]" ]; - description = '' - Extra CLI arguments passed to cockroach start. - For the full list of supported argumemnts, check + description = lib.mdDoc '' + Extra CLI arguments passed to {command}`cockroach start`. + For the full list of supported argumemnts, check ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix index 39d1ead28f..2a570d09a2 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/couchdb.nix @@ -37,7 +37,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run CouchDB Server. ''; }; @@ -46,7 +46,7 @@ in { type = types.package; default = pkgs.couchdb3; defaultText = literalExpression "pkgs.couchdb3"; - description = '' + description = lib.mdDoc '' CouchDB package to use. ''; }; @@ -54,7 +54,7 @@ in { adminUser = mkOption { type = types.str; default = "admin"; - description = '' + description = lib.mdDoc '' Couchdb (i.e. fauxton) account with permission for all dbs and tasks. ''; @@ -63,7 +63,7 @@ in { adminPass = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Couchdb (i.e. fauxton) account with permission for all dbs and tasks. ''; @@ -72,7 +72,7 @@ in { user = mkOption { type = types.str; default = "couchdb"; - description = '' + description = lib.mdDoc '' User account under which couchdb runs. ''; }; @@ -80,7 +80,7 @@ in { group = mkOption { type = types.str; default = "couchdb"; - description = '' + description = lib.mdDoc '' Group account under which couchdb runs. ''; }; @@ -90,7 +90,7 @@ in { databaseDir = mkOption { type = types.path; default = "/var/lib/couchdb"; - description = '' + description = lib.mdDoc '' Specifies location of CouchDB database files (*.couch named). This location should be writable and readable for the user the CouchDB service runs as (couchdb by default). @@ -100,7 +100,7 @@ in { uriFile = mkOption { type = types.path; default = "/run/couchdb/couchdb.uri"; - description = '' + description = lib.mdDoc '' This file contains the full URI that can be used to access this instance of CouchDB. It is used to help discover the port CouchDB is running on (if it was set to 0 (e.g. automatically assigned any free @@ -112,7 +112,7 @@ in { viewIndexDir = mkOption { type = types.path; default = "/var/lib/couchdb"; - description = '' + description = lib.mdDoc '' Specifies location of CouchDB view index files. This location should be writable and readable for the user that runs the CouchDB service (couchdb by default). @@ -122,7 +122,7 @@ in { bindAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Defines the IP address by which CouchDB will be accessible. ''; }; @@ -130,7 +130,7 @@ in { port = mkOption { type = types.int; default = 5984; - description = '' + description = lib.mdDoc '' Defined the port number to listen. ''; }; @@ -138,7 +138,7 @@ in { logFile = mkOption { type = types.path; default = "/var/log/couchdb.log"; - description = '' + description = lib.mdDoc '' Specifies the location of file for logging output. ''; }; @@ -146,7 +146,7 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration. Overrides any other cofiguration. ''; }; @@ -155,14 +155,14 @@ in { type = types.path; default = "${cfg.package}/etc/vm.args"; defaultText = literalExpression ''"config.${opt.package}/etc/vm.args"''; - description = '' + description = lib.mdDoc '' vm.args configuration. Overrides Couchdb's Erlang VM parameters file. ''; }; configFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Configuration file for persisting runtime changes. File needs to be readable and writable from couchdb user/group. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/dgraph.nix b/third_party/nixpkgs/nixos/modules/services/databases/dgraph.nix index 5c1ae53605..a6178b3d1c 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/dgraph.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/dgraph.nix @@ -60,7 +60,7 @@ in settings = mkOption { type = settingsFormat.type; default = {}; - description = '' + description = lib.mdDoc '' Contents of the dgraph config. For more details see https://dgraph.io/docs/deploy/config ''; }; @@ -69,14 +69,14 @@ in host = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' The host which dgraph alpha will be run on. ''; }; port = mkOption { type = types.port; default = 7080; - description = '' + description = lib.mdDoc '' The port which to run dgraph alpha on. ''; }; @@ -87,14 +87,14 @@ in host = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' The host which dgraph zero will be run on. ''; }; port = mkOption { type = types.port; default = 5080; - description = '' + description = lib.mdDoc '' The port which to run dgraph zero on. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/dragonflydb.nix b/third_party/nixpkgs/nixos/modules/services/databases/dragonflydb.nix index e72afa9d90..e35de2019a 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/dragonflydb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/dragonflydb.nix @@ -30,55 +30,55 @@ in user = mkOption { type = types.str; default = "dragonfly"; - description = "The user to run DragonflyDB as"; + description = lib.mdDoc "The user to run DragonflyDB as"; }; port = mkOption { type = types.port; default = 6379; - description = "The TCP port to accept connections."; + description = lib.mdDoc "The TCP port to accept connections."; }; bind = mkOption { type = with types; nullOr str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' The IP interface to bind to. - null means "all interfaces". + `null` means "all interfaces". ''; }; requirePass = mkOption { type = with types; nullOr str; default = null; - description = "Password for database"; + description = lib.mdDoc "Password for database"; example = "letmein!"; }; maxMemory = mkOption { type = with types; nullOr ints.unsigned; default = null; - description = '' + description = lib.mdDoc '' The maximum amount of memory to use for storage (in bytes). - null means this will be automatically set. + `null` means this will be automatically set. ''; }; memcachePort = mkOption { type = with types; nullOr port; default = null; - description = '' + description = lib.mdDoc '' To enable memcached compatible API on this port. - null means disabled. + `null` means disabled. ''; }; keysOutputLimit = mkOption { type = types.ints.unsigned; default = 8192; - description = '' + description = lib.mdDoc '' Maximum number of returned keys in keys command. - keys is a dangerous command. + `keys` is a dangerous command. We truncate its result to avoid blowup in memory when fetching too many keys. ''; }; @@ -86,13 +86,13 @@ in dbNum = mkOption { type = with types; nullOr ints.unsigned; default = null; - description = "Maximum number of supported databases for select"; + description = lib.mdDoc "Maximum number of supported databases for `select`"; }; cacheMode = mkOption { type = with types; nullOr bool; default = null; - description = '' + description = lib.mdDoc '' Once this mode is on, Dragonfly will evict items least likely to be stumbled upon in the future but only when it is near maxmemory limit. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix b/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix index 4e3130bea2..4aaf4ca12a 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/firebird.nix @@ -47,16 +47,16 @@ in defaultText = literalExpression "pkgs.firebird"; type = types.package; example = literalExpression "pkgs.firebird_3"; - description = '' - Which Firebird package to be installed: pkgs.firebird_3 - For SuperServer use override: pkgs.firebird_3.override { superServer = true; }; + description = lib.mdDoc '' + Which Firebird package to be installed: `pkgs.firebird_3` + For SuperServer use override: `pkgs.firebird_3.override { superServer = true; };` ''; }; port = mkOption { default = 3050; type = types.port; - description = '' + description = lib.mdDoc '' Port Firebird uses. ''; }; @@ -64,7 +64,7 @@ in user = mkOption { default = "firebird"; type = types.str; - description = '' + description = lib.mdDoc '' User account under which firebird runs. ''; }; @@ -72,7 +72,7 @@ in baseDir = mkOption { default = "/var/lib/firebird"; type = types.str; - description = '' + description = lib.mdDoc '' Location containing data/ and system/ directories. data/ stores the databases, system/ stores the password database security2.fdb. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.nix index e22127403e..f71228708e 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/foundationdb.nix @@ -66,7 +66,7 @@ in package = mkOption { type = types.package; - description = '' + description = lib.mdDoc '' The FoundationDB package to use for this server. This must be specified by the user in order to ensure migrations and upgrades are controlled appropriately. ''; @@ -75,19 +75,19 @@ in publicAddress = mkOption { type = types.str; default = "auto"; - description = "Publicly visible IP address of the process. Port is determined by process ID"; + description = lib.mdDoc "Publicly visible IP address of the process. Port is determined by process ID"; }; listenAddress = mkOption { type = types.str; default = "public"; - description = "Publicly visible IP address of the process. Port is determined by process ID"; + description = lib.mdDoc "Publicly visible IP address of the process. Port is determined by process ID"; }; listenPortStart = mkOption { type = types.int; default = 4500; - description = '' + description = lib.mdDoc '' Starting port number for database listening sockets. Every FDB process binds to a subsequent port, to this number reflects the start of the overall range. e.g. having 8 server processes will use all ports between 4500 and 4507. @@ -106,43 +106,43 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/foundationdb"; - description = "Data directory. All cluster data will be put under here."; + description = lib.mdDoc "Data directory. All cluster data will be put under here."; }; logDir = mkOption { type = types.path; default = "/var/log/foundationdb"; - description = "Log directory."; + description = lib.mdDoc "Log directory."; }; user = mkOption { type = types.str; default = "foundationdb"; - description = "User account under which FoundationDB runs."; + description = lib.mdDoc "User account under which FoundationDB runs."; }; group = mkOption { type = types.str; default = "foundationdb"; - description = "Group account under which FoundationDB runs."; + description = lib.mdDoc "Group account under which FoundationDB runs."; }; class = mkOption { type = types.nullOr (types.enum [ "storage" "transaction" "stateless" ]); default = null; - description = "Process class"; + description = lib.mdDoc "Process class"; }; restartDelay = mkOption { type = types.int; default = 10; - description = "Number of seconds to wait before restarting servers."; + description = lib.mdDoc "Number of seconds to wait before restarting servers."; }; logSize = mkOption { type = types.str; default = "10MiB"; - description = '' + description = lib.mdDoc '' Roll over to a new log file after the current log file reaches the specified size. ''; @@ -151,7 +151,7 @@ in maxLogSize = mkOption { type = types.str; default = "100MiB"; - description = '' + description = lib.mdDoc '' Delete the oldest log file when the total size of all log files exceeds the specified size. If set to 0, old log files will not be deleted. @@ -161,33 +161,33 @@ in serverProcesses = mkOption { type = types.int; default = 1; - description = "Number of fdbserver processes to run."; + description = lib.mdDoc "Number of fdbserver processes to run."; }; backupProcesses = mkOption { type = types.int; default = 1; - description = "Number of backup_agent processes to run for snapshots."; + description = lib.mdDoc "Number of backup_agent processes to run for snapshots."; }; memory = mkOption { type = types.str; default = "8GiB"; - description = '' + description = lib.mdDoc '' Maximum memory used by the process. The default value is - 8GiB. When specified without a unit, - MiB is assumed. This parameter does not + `8GiB`. When specified without a unit, + `MiB` is assumed. This parameter does not change the memory allocation of the program. Rather, it sets a hard limit beyond which the process will kill itself and - be restarted. The default value of 8GiB + be restarted. The default value of `8GiB` is double the intended memory usage in the default configuration (providing an emergency buffer to deal with memory leaks or similar problems). It is not recommended to decrease the value of this parameter below its default value. It may be increased if you wish to allocate a very large amount of storage engine memory or cache. In - particular, when the storageMemory - parameter is increased, the memory + particular, when the `storageMemory` + parameter is increased, the `memory` parameter should be increased by an equal amount. ''; }; @@ -195,22 +195,22 @@ in storageMemory = mkOption { type = types.str; default = "1GiB"; - description = '' + description = lib.mdDoc '' Maximum memory used for data storage. The default value is - 1GiB. When specified without a unit, - MB is assumed. Clusters using the memory + `1GiB`. When specified without a unit, + `MB` is assumed. Clusters using the memory storage engine will be restricted to using this amount of memory per process for purposes of data storage. Memory overhead associated with storing the data is counted against this total. If you increase the - storageMemory, you should also increase - the memory parameter by the same amount. + `storageMemory`, you should also increase + the `memory` parameter by the same amount. ''; }; tls = mkOption { default = null; - description = '' + description = lib.mdDoc '' FoundationDB Transport Security Layer (TLS) settings. ''; @@ -218,7 +218,7 @@ in options = { certificate = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Path to the TLS certificate file. This certificate will be offered to, and may be verified by, clients. ''; @@ -226,13 +226,13 @@ in key = mkOption { type = types.str; - description = "Private key file for the certificate."; + description = lib.mdDoc "Private key file for the certificate."; }; allowedPeers = mkOption { type = types.str; default = "Check.Valid=1,Check.Unexpired=1"; - description = '' + description = lib.mdDoc '' "Peer verification string". This may be used to adjust which TLS client certificates a server will accept, as a form of user authorization; for example, it may only accept TLS clients who @@ -253,7 +253,7 @@ in dataHall = null; }; - description = '' + description = lib.mdDoc '' FoundationDB locality settings. ''; @@ -262,7 +262,7 @@ in machineId = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Machine identifier key. All processes on a machine should share a unique id. By default, processes on a machine determine a unique id to share. This does not generally need to be set. @@ -272,7 +272,7 @@ in zoneId = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Zone identifier key. Processes that share a zone id are considered non-unique for the purposes of data replication. If unset, defaults to machine id. @@ -282,7 +282,7 @@ in datacenterId = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Data center identifier key. All processes physically located in a data center should share the id. If you are depending on data center based replication this must be set on all processes. @@ -292,7 +292,7 @@ in dataHall = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Data hall identifier key. All processes physically located in a data hall should share the id. If you are depending on data hall based replication this must be set on all processes. @@ -305,7 +305,7 @@ in extraReadWritePaths = mkOption { default = [ ]; type = types.listOf types.path; - description = '' + description = lib.mdDoc '' An extra set of filesystem paths that FoundationDB can read to and write from. By default, FoundationDB runs under a heavily namespaced systemd environment without write access to most of @@ -319,13 +319,13 @@ in pidfile = mkOption { type = types.path; default = "/run/foundationdb.pid"; - description = "Path to pidfile for fdbmonitor."; + description = lib.mdDoc "Path to pidfile for fdbmonitor."; }; traceFormat = mkOption { type = types.enum [ "xml" "json" ]; default = "xml"; - description = "Trace logging format."; + description = lib.mdDoc "Trace logging format."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/hbase.nix b/third_party/nixpkgs/nixos/modules/services/databases/hbase-standalone.nix similarity index 78% rename from third_party/nixpkgs/nixos/modules/services/databases/hbase.nix rename to third_party/nixpkgs/nixos/modules/services/databases/hbase-standalone.nix index fe4f05eec6..ca891fe8a5 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/hbase.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/hbase-standalone.nix @@ -3,8 +3,8 @@ with lib; let - cfg = config.services.hbase; - opt = options.services.hbase; + cfg = config.services.hbase-standalone; + opt = options.services.hbase-standalone; buildProperty = configAttr: (builtins.concatStringsSep "\n" @@ -32,25 +32,25 @@ let in { + imports = [ + (mkRenamedOptionModule [ "services" "hbase" ] [ "services" "hbase-standalone" ]) + ]; + ###### interface options = { + services.hbase-standalone = { - services.hbase = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to run HBase. - ''; - }; + enable = mkEnableOption '' + HBase master in standalone mode with embedded regionserver and zookeper. + Do not use this configuration for production nor for evaluating HBase performance. + ''; package = mkOption { type = types.package; default = pkgs.hbase; defaultText = literalExpression "pkgs.hbase"; - description = '' + description = lib.mdDoc '' HBase package to use. ''; }; @@ -59,7 +59,7 @@ in { user = mkOption { type = types.str; default = "hbase"; - description = '' + description = lib.mdDoc '' User account under which HBase runs. ''; }; @@ -67,7 +67,7 @@ in { group = mkOption { type = types.str; default = "hbase"; - description = '' + description = lib.mdDoc '' Group account under which HBase runs. ''; }; @@ -75,7 +75,7 @@ in { dataDir = mkOption { type = types.path; default = "/var/lib/hbase"; - description = '' + description = lib.mdDoc '' Specifies location of HBase database files. This location should be writable and readable for the user the HBase service runs as (hbase by default). @@ -85,7 +85,7 @@ in { logDir = mkOption { type = types.path; default = "/var/log/hbase"; - description = '' + description = lib.mdDoc '' Specifies the location of HBase log files. ''; }; @@ -102,18 +102,17 @@ in { "hbase.zookeeper.property.dataDir" = "''${config.${opt.dataDir}}/zookeeper"; } ''; - description = '' - configurations in hbase-site.xml, see for details. + description = lib.mdDoc '' + configurations in hbase-site.xml, see for details. ''; }; }; - }; ###### implementation - config = mkIf config.services.hbase.enable { + config = mkIf cfg.enable { systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' - ${cfg.user} ${cfg.group} - -" diff --git a/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix index f7383b2023..9b3922c70a 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/influxdb.nix @@ -114,38 +114,38 @@ in enable = mkOption { default = false; - description = "Whether to enable the influxdb server"; + description = lib.mdDoc "Whether to enable the influxdb server"; type = types.bool; }; package = mkOption { default = pkgs.influxdb; defaultText = literalExpression "pkgs.influxdb"; - description = "Which influxdb derivation to use"; + description = lib.mdDoc "Which influxdb derivation to use"; type = types.package; }; user = mkOption { default = "influxdb"; - description = "User account under which influxdb runs"; + description = lib.mdDoc "User account under which influxdb runs"; type = types.str; }; group = mkOption { default = "influxdb"; - description = "Group under which influxdb runs"; + description = lib.mdDoc "Group under which influxdb runs"; type = types.str; }; dataDir = mkOption { default = "/var/db/influxdb"; - description = "Data directory for influxd data files."; + description = lib.mdDoc "Data directory for influxd data files."; type = types.path; }; extraConfig = mkOption { default = {}; - description = "Extra configuration options for influxdb"; + description = lib.mdDoc "Extra configuration options for influxdb"; type = types.attrs; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix b/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix index 340c515bbb..8eeec7816c 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/influxdb2.nix @@ -15,13 +15,13 @@ in package = mkOption { default = pkgs.influxdb2-server; defaultText = literalExpression "pkgs.influxdb2"; - description = "influxdb2 derivation to use."; + description = lib.mdDoc "influxdb2 derivation to use."; type = types.package; }; settings = mkOption { default = { }; - description = ''configuration options for influxdb2, see for details.''; + description = lib.mdDoc ''configuration options for influxdb2, see for details.''; type = format.type; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/memcached.nix b/third_party/nixpkgs/nixos/modules/services/databases/memcached.nix index 1c06937e2f..33627e8ad3 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/memcached.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/memcached.nix @@ -22,19 +22,19 @@ in user = mkOption { type = types.str; default = "memcached"; - description = "The user to run Memcached as"; + description = lib.mdDoc "The user to run Memcached as"; }; listen = mkOption { type = types.str; default = "127.0.0.1"; - description = "The IP address to bind to."; + description = lib.mdDoc "The IP address to bind to."; }; port = mkOption { type = types.port; default = 11211; - description = "The port to bind to."; + description = lib.mdDoc "The port to bind to."; }; enableUnixSocket = mkEnableOption "unix socket at /run/memcached/memcached.sock"; @@ -42,19 +42,19 @@ in maxMemory = mkOption { type = types.ints.unsigned; default = 64; - description = "The maximum amount of memory to use for storage, in megabytes."; + description = lib.mdDoc "The maximum amount of memory to use for storage, in megabytes."; }; maxConnections = mkOption { type = types.ints.unsigned; default = 1024; - description = "The maximum number of simultaneous connections."; + description = lib.mdDoc "The maximum number of simultaneous connections."; }; extraOptions = mkOption { type = types.listOf types.str; default = []; - description = "A list of extra options that will be added as a suffix when running memcached."; + description = lib.mdDoc "A list of extra options that will be added as a suffix when running memcached."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/monetdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/monetdb.nix index 52a2ef041f..c6836128d9 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/monetdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/monetdb.nix @@ -18,38 +18,38 @@ in { type = types.package; default = pkgs.monetdb; defaultText = literalExpression "pkgs.monetdb"; - description = "MonetDB package to use."; + description = lib.mdDoc "MonetDB package to use."; }; user = mkOption { type = types.str; default = "monetdb"; - description = "User account under which MonetDB runs."; + description = lib.mdDoc "User account under which MonetDB runs."; }; group = mkOption { type = types.str; default = "monetdb"; - description = "Group under which MonetDB runs."; + description = lib.mdDoc "Group under which MonetDB runs."; }; dataDir = mkOption { type = types.path; default = "/var/lib/monetdb"; - description = "Data directory for the dbfarm."; + description = lib.mdDoc "Data directory for the dbfarm."; }; port = mkOption { type = types.ints.u16; default = 50000; - description = "Port to listen on."; + description = lib.mdDoc "Port to listen on."; }; listenAddress = mkOption { type = types.str; default = "127.0.0.1"; example = "0.0.0.0"; - description = "Address to listen on."; + description = lib.mdDoc "Address to listen on."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix b/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix index fccf85d482..981185cc53 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/mongodb.nix @@ -43,49 +43,49 @@ in user = mkOption { type = types.str; default = "mongodb"; - description = "User account under which MongoDB runs"; + description = lib.mdDoc "User account under which MongoDB runs"; }; bind_ip = mkOption { type = types.str; default = "127.0.0.1"; - description = "IP to bind to"; + description = lib.mdDoc "IP to bind to"; }; quiet = mkOption { type = types.bool; default = false; - description = "quieter output"; + description = lib.mdDoc "quieter output"; }; enableAuth = mkOption { type = types.bool; default = false; - description = "Enable client authentication. Creates a default superuser with username root!"; + description = lib.mdDoc "Enable client authentication. Creates a default superuser with username root!"; }; initialRootPassword = mkOption { type = types.nullOr types.str; default = null; - description = "Password for the root user if auth is enabled."; + description = lib.mdDoc "Password for the root user if auth is enabled."; }; dbpath = mkOption { type = types.str; default = "/var/db/mongodb"; - description = "Location where MongoDB stores its files"; + description = lib.mdDoc "Location where MongoDB stores its files"; }; pidFile = mkOption { type = types.str; default = "/run/mongodb.pid"; - description = "Location of MongoDB pid file"; + description = lib.mdDoc "Location of MongoDB pid file"; }; replSetName = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' If this instance is part of a replica set, set its name here. Otherwise, leave empty to run as single node. ''; @@ -97,13 +97,13 @@ in example = '' storage.journal.enabled: false ''; - description = "MongoDB extra configuration in YAML format"; + description = lib.mdDoc "MongoDB extra configuration in YAML format"; }; initialScript = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' A file containing MongoDB statements to execute on first startup. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix index 625b31d081..1a096d2a88 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/mysql.nix @@ -88,9 +88,9 @@ in defaultText = '' A configuration file automatically generated by NixOS. ''; - description = '' + description = lib.mdDoc '' Override the configuration file used by MySQL. By default, - NixOS generates one automatically from . + NixOS generates one automatically from {option}`services.mysql.settings`. ''; example = literalExpression '' pkgs.writeText "my.cnf" ''' @@ -143,14 +143,14 @@ in options = { name = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The name of the database to create. ''; }; schema = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' The initial schema of the database; if null (the default), an empty database is created. ''; @@ -158,7 +158,7 @@ in }; }); default = []; - description = '' + description = lib.mdDoc '' List of database names and their initial schemas that should be used to create databases on the first startup of MySQL. The schema attribute is optional: If not specified, an empty database is created. ''; @@ -171,13 +171,13 @@ in initialScript = mkOption { type = types.nullOr types.path; default = null; - description = "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database."; + description = lib.mdDoc "A file containing SQL statements to be executed on the first startup. Can be used for granting certain permissions on the database."; }; ensureDatabases = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Ensures that the specified databases exist. This option will never delete existing databases, especially not when the value of this option is changed. This means that databases created once through this option or @@ -194,14 +194,14 @@ in options = { name = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Name of the user to ensure. ''; }; ensurePermissions = mkOption { type = types.attrsOf types.str; default = {}; - description = '' + description = lib.mdDoc '' Permissions to ensure for the user, specified as attribute set. The attribute names specify the database and tables to grant the permissions for, separated by a dot. You may use wildcards here. @@ -210,8 +210,8 @@ in For more information on how to specify the target and on which privileges exist, see the - GRANT syntax. - The attributes are used as GRANT ''${attrName} ON ''${attrValue}. + [GRANT syntax](https://mariadb.com/kb/en/library/grant/). + The attributes are used as `GRANT ''${attrName} ON ''${attrValue}`. ''; example = literalExpression '' { @@ -223,7 +223,7 @@ in }; }); default = []; - description = '' + description = lib.mdDoc '' Ensures that the specified users exist and have at least the ensured permissions. The MySQL users will be identified using Unix socket authentication. This authenticates the Unix user with the same name only, and that without the need for a password. @@ -253,39 +253,39 @@ in role = mkOption { type = types.enum [ "master" "slave" "none" ]; default = "none"; - description = "Role of the MySQL server instance."; + description = lib.mdDoc "Role of the MySQL server instance."; }; serverId = mkOption { type = types.int; default = 1; - description = "Id of the MySQL server instance. This number must be unique for each instance."; + description = lib.mdDoc "Id of the MySQL server instance. This number must be unique for each instance."; }; masterHost = mkOption { type = types.str; - description = "Hostname of the MySQL master server."; + description = lib.mdDoc "Hostname of the MySQL master server."; }; slaveHost = mkOption { type = types.str; - description = "Hostname of the MySQL slave server."; + description = lib.mdDoc "Hostname of the MySQL slave server."; }; masterUser = mkOption { type = types.str; - description = "Username of the MySQL replication user."; + description = lib.mdDoc "Username of the MySQL replication user."; }; masterPassword = mkOption { type = types.str; - description = "Password of the MySQL replication user."; + description = lib.mdDoc "Password of the MySQL replication user."; }; masterPort = mkOption { type = types.port; default = 3306; - description = "Port number on which the MySQL master server runs."; + description = lib.mdDoc "Port number on which the MySQL master server runs."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix b/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix index 8816f3b2e4..d1be4034dd 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/neo4j.nix @@ -123,7 +123,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Neo4j Community Edition. ''; }; @@ -131,7 +131,7 @@ in { allowUpgrade = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allow upgrade of Neo4j database files from an older version. ''; }; @@ -139,15 +139,14 @@ in { constrainLoadCsv = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Sets the root directory for file URLs used with the Cypher - LOAD CSV clause to be that defined by - . It restricts + `LOAD CSV` clause to be that defined by + {option}`directories.imports`. It restricts access to only those files within that directory and its subdirectories. - - - Setting this option to false introduces + + Setting this option to `false` introduces possible security problems. ''; }; @@ -155,24 +154,23 @@ in { defaultListenAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Default network interface to listen for incoming connections. To listen for connections on all interfaces, use "0.0.0.0". - - + Specifies the default IP address and address part of connector - specific options. To bind specific + specific {option}`listenAddress` options. To bind specific connectors to a specific network interfaces, specify the entire - option for that connector. + {option}`listenAddress` option for that connector. ''; }; extraServerConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration for Neo4j Community server. Refer to the - complete reference + [complete reference](https://neo4j.com/docs/operations-manual/current/reference/configuration-settings/) of Neo4j configuration settings. ''; }; @@ -181,7 +179,7 @@ in { type = types.package; default = pkgs.neo4j; defaultText = literalExpression "pkgs.neo4j"; - description = '' + description = lib.mdDoc '' Neo4j package to use. ''; }; @@ -189,7 +187,7 @@ in { readOnly = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Only allow read operations from this Neo4j instance. ''; }; @@ -197,9 +195,9 @@ in { workerCount = mkOption { type = types.ints.between 0 44738; default = 0; - description = '' + description = lib.mdDoc '' Number of Neo4j worker threads, where the default of - 0 indicates a worker count equal to the number of + `0` indicates a worker count equal to the number of available processors. ''; }; @@ -208,9 +206,9 @@ in { enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Enable the BOLT connector for Neo4j. Setting this option to - false will stop Neo4j from listening for incoming + `false` will stop Neo4j from listening for incoming connections on the BOLT port (7687 by default). ''; }; @@ -218,36 +216,34 @@ in { listenAddress = mkOption { type = types.str; default = ":7687"; - description = '' + description = lib.mdDoc '' Neo4j listen address for BOLT traffic. The listen address is - expressed in the format <ip-address>:<port-number>. + expressed in the format `:`. ''; }; sslPolicy = mkOption { type = types.str; default = "legacy"; - description = '' + description = lib.mdDoc '' Neo4j SSL policy for BOLT traffic. - - + The legacy policy is a special policy which is not defined in the policy configuration section, but rather derives from - and - associated files (by default: neo4j.key and - neo4j.cert). Its use will be deprecated. - - + {option}`directories.certificates` and + associated files (by default: {file}`neo4j.key` and + {file}`neo4j.cert`). Its use will be deprecated. + Note: This connector must be configured to support/require SSL/TLS for the legacy policy to actually be utilized. See - . + {option}`bolt.tlsLevel`. ''; }; tlsLevel = mkOption { type = types.enum [ "REQUIRED" "OPTIONAL" "DISABLED" ]; default = "OPTIONAL"; - description = '' + description = lib.mdDoc '' SSL/TSL requirement level for BOLT traffic. ''; }; @@ -258,21 +254,19 @@ in { type = types.path; default = "${cfg.directories.home}/certificates"; defaultText = literalExpression ''"''${config.${opt.directories.home}}/certificates"''; - description = '' + description = lib.mdDoc '' Directory for storing certificates to be used by Neo4j for TLS connections. - - + When setting this directory to something other than its default, ensure the directory's existence, and that read/write permissions are - given to the Neo4j daemon user neo4j. - - + given to the Neo4j daemon user `neo4j`. + Note that changing this directory from its default will prevent the directory structure required for each SSL policy from being automatically generated. A policy's directory structure as defined by - its , and - must then be setup manually. The + its {option}`baseDirectory`,{option}`revokedDir` and + {option}`trustedDir` must then be setup manually. The existence of these directories is mandatory, as well as the presence of the certificate file and the private key. Ensure the correct permissions are set on these directories and files. @@ -283,25 +277,24 @@ in { type = types.path; default = "${cfg.directories.home}/data"; defaultText = literalExpression ''"''${config.${opt.directories.home}}/data"''; - description = '' + description = lib.mdDoc '' Path of the data directory. You must not configure more than one Neo4j installation to use the same data directory. - - + When setting this directory to something other than its default, ensure the directory's existence, and that read/write permissions are - given to the Neo4j daemon user neo4j. + given to the Neo4j daemon user `neo4j`. ''; }; home = mkOption { type = types.path; default = "/var/lib/neo4j"; - description = '' + description = lib.mdDoc '' Path of the Neo4j home directory. Other default directories are subdirectories of this path. This directory will be created if - non-existent, and its ownership will be chown to - the Neo4j daemon user neo4j. + non-existent, and its ownership will be {command}`chown` to + the Neo4j daemon user `neo4j`. ''; }; @@ -309,16 +302,15 @@ in { type = types.path; default = "${cfg.directories.home}/import"; defaultText = literalExpression ''"''${config.${opt.directories.home}}/import"''; - description = '' + description = lib.mdDoc '' The root directory for file URLs used with the Cypher - LOAD CSV clause. Only meaningful when - is set to - true. - - + `LOAD CSV` clause. Only meaningful when + {option}`constrainLoadCvs` is set to + `true`. + When setting this directory to something other than its default, ensure the directory's existence, and that read permission is - given to the Neo4j daemon user neo4j. + given to the Neo4j daemon user `neo4j`. ''; }; @@ -326,15 +318,14 @@ in { type = types.path; default = "${cfg.directories.home}/plugins"; defaultText = literalExpression ''"''${config.${opt.directories.home}}/plugins"''; - description = '' + description = lib.mdDoc '' Path of the database plugin directory. Compiled Java JAR files that contain database procedures will be loaded if they are placed in this directory. - - + When setting this directory to something other than its default, ensure the directory's existence, and that read permission is - given to the Neo4j daemon user neo4j. + given to the Neo4j daemon user `neo4j`. ''; }; }; @@ -343,10 +334,10 @@ in { enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' The HTTP connector is required for Neo4j, and cannot be disabled. - Setting this option to false will force the HTTP - connector's to the loopback + Setting this option to `false` will force the HTTP + connector's {option}`listenAddress` to the loopback interface to prevent connection of remote clients. To prevent all clients from connecting, block the HTTP port (7474 by default) by firewall. @@ -356,9 +347,9 @@ in { listenAddress = mkOption { type = types.str; default = ":7474"; - description = '' + description = lib.mdDoc '' Neo4j listen address for HTTP traffic. The listen address is - expressed in the format <ip-address>:<port-number>. + expressed in the format `:`. ''; }; }; @@ -367,9 +358,9 @@ in { enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Enable the HTTPS connector for Neo4j. Setting this option to - false will stop Neo4j from listening for incoming + `false` will stop Neo4j from listening for incoming connections on the HTTPS port (7473 by default). ''; }; @@ -377,24 +368,23 @@ in { listenAddress = mkOption { type = types.str; default = ":7473"; - description = '' + description = lib.mdDoc '' Neo4j listen address for HTTPS traffic. The listen address is - expressed in the format <ip-address>:<port-number>. + expressed in the format `:`. ''; }; sslPolicy = mkOption { type = types.str; default = "legacy"; - description = '' + description = lib.mdDoc '' Neo4j SSL policy for HTTPS traffic. - - + The legacy policy is a special policy which is not defined in the policy configuration section, but rather derives from - and - associated files (by default: neo4j.key and - neo4j.cert). Its use will be deprecated. + {option}`directories.certificates` and + associated files (by default: {file}`neo4j.key` and + {file}`neo4j.cert`). Its use will be deprecated. ''; }; }; @@ -403,9 +393,9 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable a remote shell server which Neo4j Shell clients can log in to. - Only applicable to neo4j-shell. + Only applicable to {command}`neo4j-shell`. ''; }; }; @@ -417,18 +407,16 @@ in { allowKeyGeneration = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allows the generation of a private key and associated self-signed certificate. Only performed when both objects cannot be found for this policy. It is recommended to turn this off again after keys have been generated. - - + The public certificate is required to be duplicated to the directory holding trusted certificates as defined by the - option. - - + {option}`trustedDir` option. + Keys should in general be generated and distributed offline by a trusted certificate authority and not by utilizing this mode. ''; @@ -438,17 +426,16 @@ in { type = types.path; default = "${cfg.directories.certificates}/${name}"; defaultText = literalExpression ''"''${config.${opt.directories.certificates}}/''${name}"''; - description = '' + description = lib.mdDoc '' The mandatory base directory for cryptographic objects of this policy. This path is only automatically generated when this - option as well as are + option as well as {option}`directories.certificates` are left at their default. Ensure read/write permissions are given - to the Neo4j daemon user neo4j. - - + to the Neo4j daemon user `neo4j`. + It is also possible to override each individual configuration with absolute paths. See the - and + {option}`privateKey` and {option}`publicCertificate` policy options. ''; }; @@ -456,7 +443,7 @@ in { ciphers = mkOption { type = types.nullOr (types.listOf types.str); default = null; - description = '' + description = lib.mdDoc '' Restrict the allowed ciphers of this policy to those defined here. The default ciphers are those of the JVM platform. ''; @@ -465,7 +452,7 @@ in { clientAuth = mkOption { type = types.enum [ "NONE" "OPTIONAL" "REQUIRE" ]; default = "REQUIRE"; - description = '' + description = lib.mdDoc '' The client authentication stance for this policy. ''; }; @@ -473,9 +460,9 @@ in { privateKey = mkOption { type = types.str; default = "private.key"; - description = '' + description = lib.mdDoc '' The name of private PKCS #8 key file for this policy to be found - in the , or the absolute path to + in the {option}`baseDirectory`, or the absolute path to the key file. It is mandatory that a key can be found or generated. ''; }; @@ -483,16 +470,15 @@ in { publicCertificate = mkOption { type = types.str; default = "public.crt"; - description = '' + description = lib.mdDoc '' The name of public X.509 certificate (chain) file in PEM format - for this policy to be found in the , + for this policy to be found in the {option}`baseDirectory`, or the absolute path to the certificate file. It is mandatory that a certificate can be found or generated. - - + The public certificate is required to be duplicated to the directory holding trusted certificates as defined by the - option. + {option}`trustedDir` option. ''; }; @@ -500,22 +486,22 @@ in { type = types.path; default = "${config.baseDirectory}/revoked"; defaultText = literalExpression ''"''${config.${options.baseDirectory}}/revoked"''; - description = '' + description = lib.mdDoc '' Path to directory of CRLs (Certificate Revocation Lists) in PEM format. Must be an absolute path. The existence of this directory is mandatory and will need to be created manually when: setting this option to something other than its default; setting - either this policy's or - to something other than + either this policy's {option}`baseDirectory` or + {option}`directories.certificates` to something other than their default. Ensure read/write permissions are given to the - Neo4j daemon user neo4j. + Neo4j daemon user `neo4j`. ''; }; tlsVersions = mkOption { type = types.listOf types.str; default = [ "TLSv1.2" ]; - description = '' + description = lib.mdDoc '' Restrict the TLS protocol versions of this policy to those defined here. ''; @@ -524,7 +510,7 @@ in { trustAll = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Makes this policy trust all remote parties. Enabling this is not recommended and the policy's trusted directory will be ignored. Use of this mode is discouraged. It would offer encryption but @@ -536,19 +522,18 @@ in { type = types.path; default = "${config.baseDirectory}/trusted"; defaultText = literalExpression ''"''${config.${options.baseDirectory}}/trusted"''; - description = '' + description = lib.mdDoc '' Path to directory of X.509 certificates in PEM format for trusted parties. Must be an absolute path. The existence of this directory is mandatory and will need to be created manually when: setting this option to something other than its default; setting - either this policy's or - to something other than + either this policy's {option}`baseDirectory` or + {option}`directories.certificates` to something other than their default. Ensure read/write permissions are given to the - Neo4j daemon user neo4j. - - + Neo4j daemon user `neo4j`. + The public certificate as defined by - is required to be duplicated + {option}`publicCertificate` is required to be duplicated to this directory. ''; }; @@ -573,12 +558,12 @@ in { })); default = {}; - description = '' + description = lib.mdDoc '' Defines the SSL policies for use with Neo4j connectors. Each attribute of this set defines a policy, with the attribute name defining the name of the policy and its namespace. Refer to the operations manual section on Neo4j's - SSL Framework + [SSL Framework](https://neo4j.com/docs/operations-manual/current/security/ssl-framework/) for further details. ''; }; @@ -587,10 +572,10 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the Usage Data Collector which Neo4j uses to collect usage data. Refer to the operations manual section on the - Usage Data Collector + [Usage Data Collector](https://neo4j.com/docs/operations-manual/current/configuration/usage-data-collector/) for more information. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix b/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix index d80d1b07b9..7a59de372f 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/openldap.nix @@ -3,7 +3,6 @@ with lib; let cfg = config.services.openldap; - legacyOptions = [ "rootpwFile" "suffix" "dataDir" "rootdn" "rootpw" ]; openldap = cfg.package; configDir = if cfg.configDir != null then cfg.configDir else "/etc/openldap/slapd.d"; @@ -11,7 +10,15 @@ let # Can't do types.either with multiple non-overlapping submodules, so define our own singleLdapValueType = lib.mkOptionType rec { name = "LDAP"; - description = "LDAP value"; + # TODO: It would be nice to define a { secret = ...; } option, using + # systemd's LoadCredentials for secrets. That would remove the last + # barrier to using DynamicUser for openldap. This is blocked on + # systemd/systemd#19604 + description = '' + LDAP value - either a string, or an attrset containing + path or base64 for included + values or base-64 encoded values respectively. + ''; check = x: lib.isString x || (lib.isAttrs x && (x ? path || x ? base64)); merge = lib.mergeEqualOption; }; @@ -24,7 +31,7 @@ let attrs = mkOption { type = types.attrsOf ldapValueType; default = {}; - description = "Attributes of the parent entry."; + description = lib.mdDoc "Attributes of the parent entry."; }; children = mkOption { # Hide the child attributes, to avoid infinite recursion in e.g. documentation @@ -33,7 +40,7 @@ let hiddenOptions = lib.mapAttrs (name: attr: attr // { visible = false; }) options; in types.attrsOf (types.submodule { options = hiddenOptions; }); default = {}; - description = "Child entries of the current entry, with recursively the same structure."; + description = lib.mdDoc "Child entries of the current entry, with recursively the same structure."; example = lib.literalExpression '' { "cn=schema" = { @@ -52,7 +59,7 @@ let includes = mkOption { type = types.listOf types.path; default = []; - description = '' + description = lib.mdDoc '' LDIF files to include after the parent's attributes but before its children. ''; }; @@ -76,59 +83,19 @@ let lib.flatten (lib.mapAttrsToList (name: value: attrsToLdif "${name},${dn}" value) children) ); in { - imports = let - deprecationNote = "This option is removed due to the deprecation of `slapd.conf` upstream. Please migrate to `services.openldap.settings`, see the release notes for advice with this process."; - mkDatabaseOption = old: new: - lib.mkChangedOptionModule [ "services" "openldap" old ] [ "services" "openldap" "settings" "children" ] - (config: let - database = lib.getAttrFromPath [ "services" "openldap" "database" ] config; - value = lib.getAttrFromPath [ "services" "openldap" old ] config; - in lib.setAttrByPath ([ "olcDatabase={1}${database}" "attrs" ] ++ new) value); - in [ - (lib.mkRemovedOptionModule [ "services" "openldap" "extraConfig" ] deprecationNote) - (lib.mkRemovedOptionModule [ "services" "openldap" "extraDatabaseConfig" ] deprecationNote) - - (lib.mkChangedOptionModule [ "services" "openldap" "logLevel" ] [ "services" "openldap" "settings" "attrs" "olcLogLevel" ] - (config: lib.splitString " " (lib.getAttrFromPath [ "services" "openldap" "logLevel" ] config))) - (lib.mkChangedOptionModule [ "services" "openldap" "defaultSchemas" ] [ "services" "openldap" "settings" "children" "cn=schema" "includes"] - (config: lib.optionals (lib.getAttrFromPath [ "services" "openldap" "defaultSchemas" ] config) ( - map (schema: "${openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ]))) - - (lib.mkChangedOptionModule [ "services" "openldap" "database" ] [ "services" "openldap" "settings" "children" ] - (config: let - database = lib.getAttrFromPath [ "services" "openldap" "database" ] config; - in { - "olcDatabase={1}${database}".attrs = { - # objectClass is case-insensitive, so don't need to capitalize ${database} - objectClass = [ "olcdatabaseconfig" "olc${database}config" ]; - olcDatabase = "{1}${database}"; - olcDbDirectory = lib.mkDefault "/var/db/openldap"; - }; - "cn=schema".includes = lib.mkDefault ( - map (schema: "${openldap}/etc/schema/${schema}.ldif") [ "core" "cosine" "inetorgperson" "nis" ] - ); - })) - (mkDatabaseOption "rootpwFile" [ "olcRootPW" "path" ]) - (mkDatabaseOption "suffix" [ "olcSuffix" ]) - (mkDatabaseOption "dataDir" [ "olcDbDirectory" ]) - (mkDatabaseOption "rootdn" [ "olcRootDN" ]) - (mkDatabaseOption "rootpw" [ "olcRootPW" ]) - ]; options = { services.openldap = { enable = mkOption { type = types.bool; default = false; - description = " - Whether to enable the ldap server. - "; + description = lib.mdDoc "Whether to enable the ldap server."; }; package = mkOption { type = types.package; default = pkgs.openldap; defaultText = literalExpression "pkgs.openldap"; - description = '' + description = lib.mdDoc '' OpenLDAP package to use. This can be used to, for example, set an OpenLDAP package @@ -140,25 +107,25 @@ in { user = mkOption { type = types.str; default = "openldap"; - description = "User account under which slapd runs."; + description = lib.mdDoc "User account under which slapd runs."; }; group = mkOption { type = types.str; default = "openldap"; - description = "Group account under which slapd runs."; + description = lib.mdDoc "Group account under which slapd runs."; }; urlList = mkOption { type = types.listOf types.str; default = [ "ldap:///" ]; - description = "URL list slapd should listen on."; + description = lib.mdDoc "URL list slapd should listen on."; example = [ "ldaps:///" ]; }; settings = mkOption { type = ldapAttrsType; - description = "Configuration for OpenLDAP, in OLC format"; + description = lib.mdDoc "Configuration for OpenLDAP, in OLC format"; example = lib.literalExpression '' { attrs.olcLogLevel = [ "stats" ]; @@ -186,7 +153,7 @@ in { attrs = { objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; olcDatabase = "{1}mdb"; - olcDbDirectory = "/var/db/ldap"; + olcDbDirectory = "/var/lib/openldap/ldap"; olcDbIndex = [ "objectClass eq" "cn pres,eq" @@ -206,18 +173,28 @@ in { configDir = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Use this config directory instead of generating one from the - settings option. Overrides all NixOS settings. If - you use this option,ensure `olcPidFile` is set to `/run/slapd/slapd.conf`. + `settings` option. Overrides all NixOS settings. + ''; + example = "/var/lib/openldap/slapd.d"; + }; + + mutableConfig = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to allow writable on-line configuration. If + `true`, the NixOS settings will only be used to + initialize the OpenLDAP configuration if it does not exist, and are + subsequently ignored. ''; - example = "/var/db/slapd.d"; }; declarativeContents = mkOption { type = with types; attrsOf lines; default = {}; - description = '' + description = lib.mdDoc '' Declarative contents for the LDAP database, in LDIF format by suffix. All data will be erased when starting the LDAP server. Modifications @@ -225,6 +202,11 @@ in { reboot of the server. Performance-wise the database and indexes are rebuilt on each server startup, so this will slow down server startup, especially with large databases. + + Note that the root of the DB must be defined in + `services.openldap.settings` and the + `olcDbDirectory` must begin with + `"/var/lib/openldap"`. ''; example = lib.literalExpression '' { @@ -245,13 +227,56 @@ in { }; }; - meta.maintainers = with lib.maintainers; [ mic92 kwohlfahrt ]; + meta.maintainers = with lib.maintainers; [ kwohlfahrt ]; - config = mkIf cfg.enable { - assertions = map (opt: { - assertion = ((getAttr opt cfg) != "_mkMergedOptionModule") -> (cfg.database != "_mkMergedOptionModule"); - message = "Legacy OpenLDAP option `services.openldap.${opt}` requires `services.openldap.database` (use value \"mdb\" if unsure)"; - }) legacyOptions; + config = let + dbSettings = mapAttrs' (name: { attrs, ... }: nameValuePair attrs.olcSuffix attrs) + (filterAttrs (name: { attrs, ... }: (hasPrefix "olcDatabase=" name) && attrs ? olcSuffix) cfg.settings.children); + settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings)); + writeConfig = pkgs.writeShellScript "openldap-config" '' + set -euo pipefail + + ${lib.optionalString (!cfg.mutableConfig) '' + chmod -R u+w ${configDir} + rm -rf ${configDir}/* + ''} + if [ ! -e "${configDir}/cn=config.ldif" ]; then + ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile} + fi + chmod -R ${if cfg.mutableConfig then "u+rw" else "u+r-w"} ${configDir} + ''; + + contentsFiles = mapAttrs (dn: ldif: pkgs.writeText "${dn}.ldif" ldif) cfg.declarativeContents; + writeContents = pkgs.writeShellScript "openldap-load" '' + set -euo pipefail + + rm -rf $2/* + ${openldap}/bin/slapadd -F ${configDir} -b $1 -l $3 + ''; + in mkIf cfg.enable { + assertions = [{ + assertion = (cfg.declarativeContents != {}) -> cfg.configDir == null; + message = '' + Declarative DB contents (${attrNames cfg.declarativeContents}) are not + supported with user-managed configuration. + ''; + }] ++ (map (dn: { + assertion = (getAttr dn dbSettings) ? "olcDbDirectory"; + # olcDbDirectory is necessary to prepopulate database using `slapadd`. + message = '' + Declarative DB ${dn} does not exist in `services.openldap.settings`, or does not have + `olcDbDirectory` configured. + ''; + }) (attrNames cfg.declarativeContents)) ++ (mapAttrsToList (dn: { olcDbDirectory ? null, ... }: { + # For forward compatibility with `DynamicUser`, and to avoid accidentally clobbering + # directories with `declarativeContents`. + assertion = (olcDbDirectory != null) -> + ((hasPrefix "/var/lib/openldap/" olcDbDirectory) && (olcDbDirectory != "/var/lib/openldap/")); + message = '' + Database ${dn} has `olcDbDirectory` (${olcDbDirectory}) that is not a subdirectory of + `/var/lib/openldap/`. + ''; + }) dbSettings); environment.systemPackages = [ openldap ]; # Literal attributes must always be set @@ -259,7 +284,6 @@ in { attrs = { objectClass = "olcGlobal"; cn = "config"; - olcPidFile = "/run/slapd/slapd.pid"; }; children."cn=schema".attrs = { cn = "schema"; @@ -276,44 +300,31 @@ in { ]; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; - preStart = let - settingsFile = pkgs.writeText "config.ldif" (lib.concatStringsSep "\n" (attrsToLdif "cn=config" cfg.settings)); - - dbSettings = lib.filterAttrs (name: value: lib.hasPrefix "olcDatabase=" name) cfg.settings.children; - dataDirs = lib.mapAttrs' (name: value: lib.nameValuePair value.attrs.olcSuffix value.attrs.olcDbDirectory) - (lib.filterAttrs (_: value: value.attrs ? olcDbDirectory) dbSettings); - dataFiles = lib.mapAttrs (dn: contents: pkgs.writeText "${dn}.ldif" contents) cfg.declarativeContents; - mkLoadScript = dn: let - dataDir = lib.escapeShellArg (getAttr dn dataDirs); - in '' - rm -rf ${dataDir}/* - ${openldap}/bin/slapadd -F ${lib.escapeShellArg configDir} -b ${dn} -l ${getAttr dn dataFiles} - chown -R "${cfg.user}:${cfg.group}" ${dataDir} - ''; - in '' - mkdir -p /run/slapd - chown -R "${cfg.user}:${cfg.group}" /run/slapd - - mkdir -p ${lib.escapeShellArg configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)} - chown "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir} ${lib.escapeShellArgs (lib.attrValues dataDirs)} - - ${lib.optionalString (cfg.configDir == null) ('' - rm -Rf ${configDir}/* - ${openldap}/bin/slapadd -F ${configDir} -bcn=config -l ${settingsFile} - '')} - chown -R "${cfg.user}:${cfg.group}" ${lib.escapeShellArg configDir} - - ${lib.concatStrings (map mkLoadScript (lib.attrNames cfg.declarativeContents))} - ${openldap}/bin/slaptest -u -F ${lib.escapeShellArg configDir} - ''; serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStartPre = [ + "!${pkgs.coreutils}/bin/mkdir -p ${configDir}" + "+${pkgs.coreutils}/bin/chown $USER ${configDir}" + ] ++ (lib.optional (cfg.configDir == null) writeConfig) + ++ (mapAttrsToList (dn: content: lib.escapeShellArgs [ + writeContents dn (getAttr dn dbSettings).olcDbDirectory content + ]) contentsFiles) + ++ [ "${openldap}/bin/slaptest -u -F ${configDir}" ]; ExecStart = lib.escapeShellArgs ([ - "${openldap}/libexec/slapd" "-u" cfg.user "-g" cfg.group "-F" configDir - "-h" (lib.concatStringsSep " " cfg.urlList) + "${openldap}/libexec/slapd" "-d" "0" "-F" configDir "-h" (lib.concatStringsSep " " cfg.urlList) ]); Type = "notify"; + # Fixes an error where openldap attempts to notify from a thread + # outside the main process: + # Got notification message from PID 6378, but reception only permitted for main PID 6377 NotifyAccess = "all"; - PIDFile = cfg.settings.attrs.olcPidFile; + RuntimeDirectory = "openldap"; + StateDirectory = ["openldap"] + ++ (map ({olcDbDirectory, ... }: removePrefix "/var/lib/" olcDbDirectory) (attrValues dbSettings)); + StateDirectoryMode = "700"; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; + CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/opentsdb.nix b/third_party/nixpkgs/nixos/modules/services/databases/opentsdb.nix index e873b2f701..45c84b12a5 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/opentsdb.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/opentsdb.nix @@ -18,7 +18,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run OpenTSDB. ''; }; @@ -27,7 +27,7 @@ in { type = types.package; default = pkgs.opentsdb; defaultText = literalExpression "pkgs.opentsdb"; - description = '' + description = lib.mdDoc '' OpenTSDB package to use. ''; }; @@ -35,7 +35,7 @@ in { user = mkOption { type = types.str; default = "opentsdb"; - description = '' + description = lib.mdDoc '' User account under which OpenTSDB runs. ''; }; @@ -43,7 +43,7 @@ in { group = mkOption { type = types.str; default = "opentsdb"; - description = '' + description = lib.mdDoc '' Group account under which OpenTSDB runs. ''; }; @@ -51,7 +51,7 @@ in { port = mkOption { type = types.int; default = 4242; - description = '' + description = lib.mdDoc '' Which port OpenTSDB listens on. ''; }; @@ -62,7 +62,7 @@ in { tsd.core.auto_create_metrics = true tsd.http.request.enable_chunked = true ''; - description = '' + description = lib.mdDoc '' The contents of OpenTSDB's configuration file ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix b/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix index f30f71866a..9ce2265a4d 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/pgmanage.nix @@ -50,7 +50,7 @@ in { type = types.package; default = pkgs.pgmanage; defaultText = literalExpression "pkgs.pgmanage"; - description = '' + description = lib.mdDoc '' The pgmanage package to use. ''; }; @@ -62,12 +62,12 @@ in { nuc-server = "hostaddr=192.168.0.100 port=5432 dbname=postgres"; mini-server = "hostaddr=127.0.0.1 port=5432 dbname=postgres sslmode=require"; }; - description = '' + description = lib.mdDoc '' pgmanage requires at least one PostgreSQL server be defined. - + Detailed information about PostgreSQL connection strings is available at: - - + + Note that you should not specify your user name or password. That information will be entered on the login screen. If you specify a username or password, it will be removed by pgmanage before attempting to @@ -78,7 +78,7 @@ in { allowCustomConnections = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This tells pgmanage whether or not to allow anyone to use a custom connection from the login screen. ''; @@ -87,7 +87,7 @@ in { port = mkOption { type = types.int; default = 8080; - description = '' + description = lib.mdDoc '' This tells pgmanage what port to listen on for browser requests. ''; }; @@ -95,7 +95,7 @@ in { localOnly = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' This tells pgmanage whether or not to set the listening socket to local addresses only. ''; @@ -104,7 +104,7 @@ in { superOnly = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' This tells pgmanage whether or not to only allow super users to login. The recommended value is true and will restrict users who are not super users from logging in to any PostgreSQL instance through @@ -116,7 +116,7 @@ in { loginGroup = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' This tells pgmanage to only allow users in a certain PostgreSQL group to login to pgmanage. Note that a connection will be made to PostgreSQL in order to test if the user is a member of the login group. @@ -126,7 +126,7 @@ in { loginTimeout = mkOption { type = types.int; default = 3600; - description = '' + description = lib.mdDoc '' Number of seconds of inactivity before user is automatically logged out. ''; @@ -135,7 +135,7 @@ in { sqlRoot = mkOption { type = types.str; default = "/var/lib/pgmanage"; - description = '' + description = lib.mdDoc '' This tells pgmanage where to put the SQL file history. All tabs are saved to this location so that if you get disconnected from pgmanage you don't lose your work. @@ -147,16 +147,16 @@ in { options = { cert = mkOption { type = types.str; - description = "TLS certificate"; + description = lib.mdDoc "TLS certificate"; }; key = mkOption { type = types.str; - description = "TLS key"; + description = lib.mdDoc "TLS key"; }; }; }); default = null; - description = '' + description = lib.mdDoc '' These options tell pgmanage where the TLS Certificate and Key files reside. If you use these options then you'll only be able to access pgmanage through a secure TLS connection. These options are only @@ -165,14 +165,14 @@ in { configuration. This allows your web server to terminate the secure connection and pass on the request to pgmanage. You can find help to set up this configuration in: - + ''; }; logLevel = mkOption { type = types.enum ["error" "warn" "notice" "info"]; default = "error"; - description = '' + description = lib.mdDoc '' Verbosity of logs ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix index 550bd36eff..d0135647d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/postgresql.nix @@ -45,7 +45,7 @@ in package = mkOption { type = types.package; example = literalExpression "pkgs.postgresql_11"; - description = '' + description = lib.mdDoc '' PostgreSQL package to use. ''; }; @@ -53,7 +53,7 @@ in port = mkOption { type = types.int; default = 5432; - description = '' + description = lib.mdDoc '' The port on which PostgreSQL listens. ''; }; @@ -61,14 +61,14 @@ in checkConfig = mkOption { type = types.bool; default = true; - description = "Check the syntax of the configuration file at compile time"; + description = lib.mdDoc "Check the syntax of the configuration file at compile time"; }; dataDir = mkOption { type = types.path; defaultText = literalExpression ''"/var/lib/postgresql/''${config.services.postgresql.package.psqlSchema}"''; example = "/var/lib/postgresql/11"; - description = '' + description = lib.mdDoc '' The data directory for PostgreSQL. If left as the default value this directory will automatically be created before the PostgreSQL server starts, otherwise the sysadmin is responsible for ensuring the directory exists with appropriate ownership @@ -81,8 +81,7 @@ in default = ""; description = '' Defines how users authenticate themselves to the server. See the - - PostgreSQL documentation for pg_hba.conf + PostgreSQL documentation for pg_hba.conf for details on the expected format of this option. By default, peer based authentication will be used for users connecting via the Unix socket, and md5 password authentication will be @@ -96,7 +95,7 @@ in identMap = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Defines the mapping from system users to database users. The general form is: @@ -109,8 +108,8 @@ in type = with types; listOf str; default = []; example = [ "--data-checksums" "--allow-group-access" ]; - description = '' - Additional arguments passed to initdb during data dir + description = lib.mdDoc '' + Additional arguments passed to `initdb` during data dir initialisation. ''; }; @@ -118,7 +117,7 @@ in initialScript = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' A file containing SQL statements to execute on first startup. ''; }; @@ -126,7 +125,7 @@ in ensureDatabases = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Ensures that the specified databases exist. This option will never delete existing databases, especially not when the value of this option is changed. This means that databases created once through this option or @@ -143,14 +142,14 @@ in options = { name = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Name of the user to ensure. ''; }; ensurePermissions = mkOption { type = types.attrsOf types.str; default = {}; - description = '' + description = lib.mdDoc '' Permissions to ensure for the user, specified as an attribute set. The attribute names specify the database and tables to grant the permissions for. The attribute values specify the permissions to grant. You may specify one or @@ -158,8 +157,8 @@ in For more information on how to specify the target and on which privileges exist, see the - GRANT syntax. - The attributes are used as GRANT ''${attrValue} ON ''${attrName}. + [GRANT syntax](https://www.postgresql.org/docs/current/sql-grant.html). + The attributes are used as `GRANT ''${attrValue} ON ''${attrName}`. ''; example = literalExpression '' { @@ -171,7 +170,7 @@ in }; }); default = []; - description = '' + description = lib.mdDoc '' Ensures that the specified users exist and have at least the ensured permissions. The PostgreSQL users will be identified using peer authentication. This authenticates the Unix user with the same name only, and that without the need for a password. @@ -200,7 +199,7 @@ in enableTCPIP = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether PostgreSQL should listen on all network interfaces. If disabled, the database can only be accessed via its Unix domain socket or via TCP connections to localhost. @@ -211,9 +210,9 @@ in type = types.str; default = "[%p] "; example = "%m [%p] "; - description = '' + description = lib.mdDoc '' A printf-style string that is output at the beginning of each log line. - Upstream default is '%m [%p] ', i.e. it includes the timestamp. We do + Upstream default is `'%m [%p] '`, i.e. it includes the timestamp. We do not include the timestamp, because journal has it anyway. ''; }; @@ -222,9 +221,9 @@ in type = types.listOf types.path; default = []; example = literalExpression "with pkgs.postgresql_11.pkgs; [ postgis pg_repack ]"; - description = '' + description = lib.mdDoc '' List of PostgreSQL plugins. PostgreSQL version for each plugin should - match version for services.postgresql.package value. + match version for `services.postgresql.package` value. ''; }; @@ -255,8 +254,8 @@ in recoveryConfig = mkOption { type = types.nullOr types.lines; default = null; - description = '' - Contents of the recovery.conf file. + description = lib.mdDoc '' + Contents of the {file}`recovery.conf` file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix index 5532c54019..b346438cff 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/redis.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/redis.nix @@ -58,7 +58,7 @@ in { type = types.package; default = pkgs.redis; defaultText = literalExpression "pkgs.redis"; - description = "Which Redis derivation to use."; + description = lib.mdDoc "Which Redis derivation to use."; }; vmOverCommit = mkEnableOption '' @@ -84,14 +84,14 @@ in { defaultText = literalExpression '' if name == "" then "redis" else "redis-''${name}" ''; - description = "The username and groupname for redis-server."; + description = lib.mdDoc "The username and groupname for redis-server."; }; port = mkOption { type = types.port; default = if name == "" then 6379 else 0; defaultText = literalExpression ''if name == "" then 6379 else 0''; - description = '' + description = lib.mdDoc '' The TCP port to accept connections. If port 0 is specified Redis will not listen on a TCP socket. ''; @@ -100,7 +100,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open ports in the firewall for the server. ''; }; @@ -108,9 +108,9 @@ in { bind = mkOption { type = with types; nullOr str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' The IP interface to bind to. - null means "all interfaces". + `null` means "all interfaces". ''; example = "192.0.2.1"; }; @@ -121,13 +121,13 @@ in { defaultText = literalExpression '' if name == "" then "/run/redis/redis.sock" else "/run/redis-''${name}/redis.sock" ''; - description = "The path to the socket to bind to."; + description = lib.mdDoc "The path to the socket to bind to."; }; unixSocketPerm = mkOption { type = types.int; default = 660; - description = "Change permissions for the socket"; + description = lib.mdDoc "Change permissions for the socket"; example = 600; }; @@ -135,32 +135,32 @@ in { type = types.str; default = "notice"; # debug, verbose, notice, warning example = "debug"; - description = "Specify the server verbosity level, options: debug, verbose, notice, warning."; + description = lib.mdDoc "Specify the server verbosity level, options: debug, verbose, notice, warning."; }; logfile = mkOption { type = types.str; default = "/dev/null"; - description = "Specify the log file name. Also 'stdout' can be used to force Redis to log on the standard output."; + description = lib.mdDoc "Specify the log file name. Also 'stdout' can be used to force Redis to log on the standard output."; example = "/var/log/redis.log"; }; syslog = mkOption { type = types.bool; default = true; - description = "Enable logging to the system logger."; + description = lib.mdDoc "Enable logging to the system logger."; }; databases = mkOption { type = types.int; default = 16; - description = "Set the number of databases."; + description = lib.mdDoc "Set the number of databases."; }; maxclients = mkOption { type = types.int; default = 10000; - description = "Set the max number of connected clients at the same time."; + description = lib.mdDoc "Set the max number of connected clients at the same time."; }; save = mkOption { @@ -178,27 +178,27 @@ in { options = { ip = mkOption { type = str; - description = "IP of the Redis master"; + description = lib.mdDoc "IP of the Redis master"; example = "192.168.1.100"; }; port = mkOption { type = port; - description = "port of the Redis master"; + description = lib.mdDoc "port of the Redis master"; default = 6379; }; }; })); default = null; - description = "IP and port to which this redis instance acts as a slave."; + description = lib.mdDoc "IP and port to which this redis instance acts as a slave."; example = { ip = "192.168.1.100"; port = 6379; }; }; masterAuth = mkOption { type = with types; nullOr str; default = null; - description = ''If the master is password protected (using the requirePass configuration) + description = lib.mdDoc ''If the master is password protected (using the requirePass configuration) it is possible to tell the slave to authenticate before starting the replication synchronization process, otherwise the master will refuse the slave request. (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)''; @@ -207,7 +207,7 @@ in { requirePass = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Password for database (STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE). Use requirePassFile to store it outside of the nix store in a dedicated file. ''; @@ -217,42 +217,42 @@ in { requirePassFile = mkOption { type = with types; nullOr path; default = null; - description = "File with password for the database."; + description = lib.mdDoc "File with password for the database."; example = "/run/keys/redis-password"; }; appendOnly = mkOption { type = types.bool; default = false; - description = "By default data is only periodically persisted to disk, enable this option to use an append-only file for improved persistence."; + description = lib.mdDoc "By default data is only periodically persisted to disk, enable this option to use an append-only file for improved persistence."; }; appendFsync = mkOption { type = types.str; default = "everysec"; # no, always, everysec - description = "How often to fsync the append-only log, options: no, always, everysec."; + description = lib.mdDoc "How often to fsync the append-only log, options: no, always, everysec."; }; slowLogLogSlowerThan = mkOption { type = types.int; default = 10000; - description = "Log queries whose execution take longer than X in milliseconds."; + description = lib.mdDoc "Log queries whose execution take longer than X in milliseconds."; example = 1000; }; slowLogMaxLen = mkOption { type = types.int; default = 128; - description = "Maximum number of items to keep in slow log."; + description = lib.mdDoc "Maximum number of items to keep in slow log."; }; settings = mkOption { # TODO: this should be converted to freeformType type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); default = {}; - description = '' + description = lib.mdDoc '' Redis configuration. Refer to - + for details on supported values. ''; example = literalExpression '' @@ -294,7 +294,7 @@ in { (mkIf (config.requirePass != null) { requirepass = config.requirePass; }) ]; })); - description = "Configuration of multiple redis-server instances."; + description = lib.mdDoc "Configuration of multiple `redis-server` instances."; default = {}; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix b/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix index 0513dcff17..f87a5862f6 100644 --- a/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix +++ b/third_party/nixpkgs/nixos/modules/services/databases/victoriametrics.nix @@ -7,31 +7,31 @@ let cfg = config.services.victoriametrics; in type = types.package; default = pkgs.victoriametrics; defaultText = literalExpression "pkgs.victoriametrics"; - description = '' + description = lib.mdDoc '' The VictoriaMetrics distribution to use. ''; }; listenAddress = mkOption { default = ":8428"; type = types.str; - description = '' + description = lib.mdDoc '' The listen address for the http interface. ''; }; retentionPeriod = mkOption { type = types.int; default = 1; - description = '' + description = lib.mdDoc '' Retention period in months. ''; }; extraOptions = mkOption { type = types.listOf types.str; default = []; - description = '' - Extra options to pass to VictoriaMetrics. See the README: - or victoriametrics -help for more + description = lib.mdDoc '' + Extra options to pass to VictoriaMetrics. See the README: + + or {command}`victoriametrics -help` for more information. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/accountsservice.nix b/third_party/nixpkgs/nixos/modules/services/desktops/accountsservice.nix index ae2ecb5ffe..af62850acd 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/accountsservice.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/accountsservice.nix @@ -19,7 +19,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable AccountsService, a DBus service for accessing the list of user accounts and information attached to those accounts. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/cpupower-gui.nix b/third_party/nixpkgs/nixos/modules/services/desktops/cpupower-gui.nix index f66afc0a3d..47071aebce 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/cpupower-gui.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/cpupower-gui.nix @@ -11,7 +11,7 @@ in { type = lib.types.bool; default = false; example = true; - description = '' + description = lib.mdDoc '' Enables dbus/systemd service needed by cpupower-gui. These services are responsible for retrieving and modifying cpu power saving settings. diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/dleyna-renderer.nix b/third_party/nixpkgs/nixos/modules/services/desktops/dleyna-renderer.nix index 7f88605f62..daf65180b3 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/dleyna-renderer.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/dleyna-renderer.nix @@ -10,7 +10,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable dleyna-renderer service, a DBus service for handling DLNA renderers. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/dleyna-server.nix b/third_party/nixpkgs/nixos/modules/services/desktops/dleyna-server.nix index 9a131a5e70..9cbcd2a9cd 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/dleyna-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/dleyna-server.nix @@ -10,7 +10,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable dleyna-server service, a DBus service for handling DLNA servers. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix b/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix index 60a34dd656..a9712b962f 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/geoclue2.nix @@ -16,19 +16,19 @@ let options = { desktopID = mkOption { type = types.str; - description = "Desktop ID of the application."; + description = lib.mdDoc "Desktop ID of the application."; }; isAllowed = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Whether the application will be allowed access to location information. ''; }; isSystem = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Whether the application is a system component or not. ''; }; @@ -36,7 +36,7 @@ let users = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' List of UIDs of all users for which this application is allowed location info access, Defaults to an empty string to allow it for all users. ''; @@ -67,7 +67,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable GeoClue 2 daemon, a DBus service that provides location information for accessing. ''; @@ -76,7 +76,7 @@ in enableDemoAgent = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to use the GeoClue demo agent. This should be overridden by desktop environments that provide their own agent. @@ -86,7 +86,7 @@ in enableNmea = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to fetch location from NMEA sources on local network. ''; }; @@ -94,7 +94,7 @@ in enable3G = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable 3G source. ''; }; @@ -102,7 +102,7 @@ in enableCDMA = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable CDMA source. ''; }; @@ -110,7 +110,7 @@ in enableModemGPS = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable Modem-GPS source. ''; }; @@ -118,7 +118,7 @@ in enableWifi = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable WiFi source. ''; }; @@ -127,7 +127,7 @@ in type = types.str; default = "https://location.services.mozilla.com/v1/geolocate?key=geoclue"; example = "https://www.googleapis.com/geolocation/v1/geolocate?key=YOUR_KEY"; - description = '' + description = lib.mdDoc '' The url to the wifi GeoLocation Service. ''; }; @@ -135,7 +135,7 @@ in submitData = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to submit data to a GeoLocation Service. ''; }; @@ -143,7 +143,7 @@ in submissionUrl = mkOption { type = types.str; default = "https://location.services.mozilla.com/v1/submit?key=geoclue"; - description = '' + description = lib.mdDoc '' The url to submit data to a GeoLocation Service. ''; }; @@ -151,7 +151,7 @@ in submissionNick = mkOption { type = types.str; default = "geoclue"; - description = '' + description = lib.mdDoc '' A nickname to submit network data with. Must be 2-32 characters long. ''; @@ -167,7 +167,7 @@ in users = [ "300" ]; }; ''; - description = '' + description = lib.mdDoc '' Specify extra settings per application. ''; }; @@ -216,6 +216,7 @@ in # we can't be part of a system service, and the agent should # be okay with the main service coming and going wantedBy = [ "default.target" ]; + after = lib.optionals cfg.enableWifi [ "network-online.target" ]; unitConfig.ConditionUser = "!@system"; serviceConfig = { Type = "exec"; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix index 1268a9d49b..495ea5af98 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/at-spi2-core.nix @@ -27,12 +27,12 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable at-spi2-core, a service for the Assistive Technologies available on the GNOME platform. Enable this if you get the error or warning - The name org.a11y.Bus was not provided by any .service files. + `The name org.a11y.Bus was not provided by any .service files`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix index bd2242d981..65bb75c62d 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/evolution-data-server.nix @@ -31,7 +31,7 @@ with lib; plugins = mkOption { type = types.listOf types.package; default = [ ]; - description = "Plugins for Evolution Data Server."; + description = lib.mdDoc "Plugins for Evolution Data Server."; }; }; programs.evolution = { @@ -40,7 +40,7 @@ with lib; type = types.listOf types.package; default = [ ]; example = literalExpression "[ pkgs.evolution-ews ]"; - description = "Plugins for Evolution."; + description = lib.mdDoc "Plugins for Evolution."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix index d821da164b..6c7e713b32 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-keyring.nix @@ -27,7 +27,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable GNOME Keyring daemon, a service designed to take care of the user's security credentials, such as user names and passwords. diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix index 01f7e3695c..ed5e000cae 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix @@ -27,7 +27,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable GNOME Online Accounts daemon, a service that provides a single sign-on framework for the GNOME desktop. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix index 5f9039f68c..7cf1bfa1b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/gnome-online-miners.nix @@ -27,7 +27,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable GNOME Online Miners, a service that crawls through your online content. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix index 7ea9778fc4..9c0faaa488 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/rygel.nix @@ -21,10 +21,10 @@ with lib; services.gnome.rygel = { enable = mkOption { default = false; - description = '' + description = lib.mdDoc '' Whether to enable Rygel UPnP Mediaserver. - You will need to also allow UPnP connections in firewall, see the following comment. + You will need to also allow UPnP connections in firewall, see the following [comment](https://github.com/NixOS/nixpkgs/pull/45045#issuecomment-416030795). ''; type = types.bool; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix index 3133a3a0d9..446851f434 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/sushi.nix @@ -27,7 +27,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Sushi, a quick previewer for nautilus. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix index 9351007d30..a3c58f3742 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker-miners.nix @@ -27,7 +27,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Tracker miners, indexing services for Tracker search engine and metadata storage system. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix index fef399d011..485632712f 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gnome/tracker.nix @@ -30,7 +30,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Tracker services, a search engine, search tool and metadata storage system. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gsignond.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gsignond.nix index 465acd73fa..cf80fd7545 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gsignond.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gsignond.nix @@ -20,7 +20,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable gSignOn daemon, a DBus service which performs user authentication on behalf of its clients. ''; @@ -29,7 +29,7 @@ in plugins = mkOption { type = types.listOf types.package; default = []; - description = '' + description = lib.mdDoc '' What plugins to use with the gSignOn daemon. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix index 1aa64ea37d..84cd296387 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/gvfs.nix @@ -36,7 +36,7 @@ in type = types.package; default = pkgs.gnome.gvfs; defaultText = literalExpression "pkgs.gnome.gvfs"; - description = "Which GVfs package to use."; + description = lib.mdDoc "Which GVfs package to use."; }; }; @@ -56,6 +56,8 @@ in services.udev.packages = [ pkgs.libmtp.out ]; + services.udisks2.enable = true; + # Needed for unwrapped applications environment.sessionVariables.GIO_EXTRA_MODULES = [ "${cfg.package}/lib/gio/modules" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json index c7f58fd579..0f1ebe5749 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/daemon/minimal.conf.json @@ -91,6 +91,7 @@ "adapter.auto-port-config": { "mode": "dsp", "monitor": false, + "control": false, "position": "unknown" } } @@ -109,6 +110,7 @@ "adapter.auto-port-config": { "mode": "dsp", "monitor": false, + "control": false, "position": "unknown" } } diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix index dd1f5e3a01..ed64406ab6 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -56,7 +56,7 @@ in { type = types.package; default = pkgs.pipewire; defaultText = literalExpression "pkgs.pipewire"; - description = '' + description = lib.mdDoc '' The pipewire derivation to use. ''; }; @@ -64,7 +64,7 @@ in { socketActivation = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Automatically run pipewire when connections are made to the pipewire socket. ''; }; @@ -73,7 +73,7 @@ in { client = mkOption { type = json.type; default = {}; - description = '' + description = lib.mdDoc '' Configuration for pipewire clients. For details see https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/client.conf.in ''; @@ -82,7 +82,7 @@ in { client-rt = mkOption { type = json.type; default = {}; - description = '' + description = lib.mdDoc '' Configuration for realtime pipewire clients. For details see https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/client-rt.conf.in ''; @@ -91,7 +91,7 @@ in { jack = mkOption { type = json.type; default = {}; - description = '' + description = lib.mdDoc '' Configuration for the pipewire daemon's jack module. For details see https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/jack.conf.in ''; @@ -100,7 +100,7 @@ in { pipewire = mkOption { type = json.type; default = {}; - description = '' + description = lib.mdDoc '' Configuration for the pipewire daemon. For details see https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/pipewire.conf.in ''; @@ -109,7 +109,7 @@ in { pipewire-pulse = mkOption { type = json.type; default = {}; - description = '' + description = lib.mdDoc '' Configuration for the pipewire-pulse daemon. For details see https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/pipewire-pulse.conf.in ''; @@ -122,7 +122,7 @@ in { # this is for backwards compatibility default = cfg.alsa.enable || cfg.jack.enable || cfg.pulse.enable; defaultText = lib.literalExpression "config.services.pipewire.alsa.enable || config.services.pipewire.jack.enable || config.services.pipewire.pulse.enable"; - description = "Whether to use PipeWire as the primary sound server"; + description = lib.mdDoc "Whether to use PipeWire as the primary sound server"; }; }; @@ -142,7 +142,7 @@ in { systemWide = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' If true, a system-wide PipeWire service and socket is enabled allowing all users in the "pipewire" group to use it simultaneously. If false, then user units are used instead, restricting access to diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix index 004392c787..32490773b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/pipewire/wireplumber.nix @@ -14,14 +14,14 @@ in type = lib.types.bool; default = config.services.pipewire.enable; defaultText = lib.literalExpression "config.services.pipewire.enable"; - description = "Whether to enable Wireplumber, a modular session / policy manager for PipeWire"; + description = lib.mdDoc "Whether to enable Wireplumber, a modular session / policy manager for PipeWire"; }; package = lib.mkOption { type = lib.types.package; default = pkgs.wireplumber; defaultText = lib.literalExpression "pkgs.wireplumber"; - description = "The wireplumber derivation to use."; + description = lib.mdDoc "The wireplumber derivation to use."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/profile-sync-daemon.nix b/third_party/nixpkgs/nixos/modules/services/desktops/profile-sync-daemon.nix index 6206295272..e307c67350 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/profile-sync-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/profile-sync-daemon.nix @@ -9,7 +9,7 @@ in { enable = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the Profile Sync daemon. ''; }; @@ -17,7 +17,7 @@ in { type = str; default = "1h"; example = "1h 30min"; - description = '' + description = lib.mdDoc '' The amount of time to wait before syncing browser profiles back to the disk. diff --git a/third_party/nixpkgs/nixos/modules/services/desktops/telepathy.nix b/third_party/nixpkgs/nixos/modules/services/desktops/telepathy.nix index b5f6a5fcbc..cdc6eb26de 100644 --- a/third_party/nixpkgs/nixos/modules/services/desktops/telepathy.nix +++ b/third_party/nixpkgs/nixos/modules/services/desktops/telepathy.nix @@ -19,7 +19,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Telepathy service, a communications framework that enables real-time communication via pluggable protocol backends. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/development/blackfire.nix b/third_party/nixpkgs/nixos/modules/services/development/blackfire.nix index 8564aabc6a..6b71e59d4b 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/blackfire.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/blackfire.nix @@ -18,7 +18,7 @@ in { services.blackfire-agent = { enable = lib.mkEnableOption "Blackfire profiler agent"; settings = lib.mkOption { - description = '' + description = lib.mdDoc '' See https://blackfire.io/docs/up-and-running/configuration/agent ''; type = lib.types.submodule { @@ -27,7 +27,7 @@ in { options = { server-id = lib.mkOption { type = lib.types.str; - description = '' + description = lib.mdDoc '' Sets the server id used to authenticate with Blackfire You can find your personal server-id at https://blackfire.io/my/settings/credentials @@ -36,7 +36,7 @@ in { server-token = lib.mkOption { type = lib.types.str; - description = '' + description = lib.mdDoc '' Sets the server token used to authenticate with Blackfire You can find your personal server-token at https://blackfire.io/my/settings/credentials diff --git a/third_party/nixpkgs/nixos/modules/services/development/bloop.nix b/third_party/nixpkgs/nixos/modules/services/development/bloop.nix index c1180a8bbd..27da76a744 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/bloop.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/bloop.nix @@ -17,7 +17,7 @@ in { "-J-XX:MaxInlineLevel=20" "-J-XX:+UseParallelGC" ]; - description = '' + description = lib.mdDoc '' Specifies additional command line argument to pass to bloop java process. ''; @@ -26,7 +26,7 @@ in { install = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to install a user service for the Bloop server. The service must be manually started for each user with diff --git a/third_party/nixpkgs/nixos/modules/services/development/distccd.nix b/third_party/nixpkgs/nixos/modules/services/development/distccd.nix index 9f6d5c813c..7a8e780c3e 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/distccd.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/distccd.nix @@ -14,7 +14,7 @@ in type = types.listOf types.str; default = [ "127.0.0.1" ]; example = [ "127.0.0.1" "192.168.0.0/24" "10.0.0.0/24" ]; - description = '' + description = lib.mdDoc '' Client IPs which are allowed to connect to distccd in CIDR notation. Anyone who can connect to the distccd server can run arbitrary @@ -26,7 +26,7 @@ in jobTimeout = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Maximum duration, in seconds, of a single compilation request. ''; }; @@ -34,7 +34,7 @@ in logLevel = mkOption { type = types.nullOr (types.enum [ "critical" "error" "warning" "notice" "info" "debug" ]); default = "warning"; - description = '' + description = lib.mdDoc '' Set the minimum severity of error that will be included in the log file. Useful if you only want to see error messages rather than an entry for each connection. @@ -44,7 +44,7 @@ in maxJobs = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Maximum number of tasks distccd should execute at any time. ''; }; @@ -53,7 +53,7 @@ in nice = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Niceness of the compilation tasks. ''; }; @@ -61,7 +61,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Opens the specified TCP port for distcc. ''; }; @@ -70,7 +70,7 @@ in type = types.package; default = pkgs.distcc; defaultText = literalExpression "pkgs.distcc"; - description = '' + description = lib.mdDoc '' The distcc package to use. ''; }; @@ -78,7 +78,7 @@ in port = mkOption { type = types.port; default = 3632; - description = '' + description = lib.mdDoc '' The TCP port which distccd will listen on. ''; }; @@ -88,7 +88,7 @@ in port = mkOption { type = types.port; default = 3633; - description = '' + description = lib.mdDoc '' The TCP port which the distccd statistics HTTP server will listen on. ''; @@ -98,7 +98,7 @@ in zeroconf = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to register via mDNS/DNS-SD ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/development/hoogle.nix b/third_party/nixpkgs/nixos/modules/services/development/hoogle.nix index 7c2a1c8e16..399ffccabf 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/hoogle.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/hoogle.nix @@ -19,7 +19,7 @@ in { port = mkOption { type = types.port; default = 8080; - description = '' + description = lib.mdDoc '' Port number Hoogle will be listening to. ''; }; @@ -39,7 +39,7 @@ in { }; haskellPackages = mkOption { - description = "Which haskell package set to use."; + description = lib.mdDoc "Which haskell package set to use."; type = types.attrs; default = pkgs.haskellPackages; defaultText = literalExpression "pkgs.haskellPackages"; @@ -47,13 +47,13 @@ in { home = mkOption { type = types.str; - description = "Url for hoogle logo"; + description = lib.mdDoc "Url for hoogle logo"; default = "https://hoogle.haskell.org"; }; host = mkOption { type = types.str; - description = "Set the host to bind on."; + description = lib.mdDoc "Set the host to bind on."; default = "127.0.0.1"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/development/lorri.nix b/third_party/nixpkgs/nixos/modules/services/development/lorri.nix index bda63518bf..a82b3f57f8 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/lorri.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/lorri.nix @@ -18,7 +18,7 @@ in { package = lib.mkOption { default = pkgs.lorri; type = lib.types.package; - description = '' + description = lib.mdDoc '' The lorri package to use. ''; defaultText = lib.literalExpression "pkgs.lorri"; diff --git a/third_party/nixpkgs/nixos/modules/services/development/rstudio-server/default.nix b/third_party/nixpkgs/nixos/modules/services/development/rstudio-server/default.nix index cd903c7e55..74a7cd2f4e 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/rstudio-server/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/rstudio-server/default.nix @@ -26,7 +26,7 @@ in serverWorkingDir = mkOption { type = types.str; default = "/var/lib/rstudio-server"; - description = '' + description = lib.mdDoc '' Default working directory for server (server-working-dir in rserver.conf). ''; }; @@ -34,7 +34,7 @@ in listenAddr = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Address to listen on (www-address in rserver.conf). ''; }; @@ -44,7 +44,7 @@ in default = pkgs.rstudio-server; defaultText = literalExpression "pkgs.rstudio-server"; example = literalExpression "pkgs.rstudioServerWrapper.override { packages = [ pkgs.rPackages.ggplot2 ]; }"; - description = '' + description = lib.mdDoc '' Rstudio server package to use. Can be set to rstudioServerWrapper to provide packages. ''; }; @@ -52,7 +52,7 @@ in rserverExtraConfig = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Extra contents for rserver.conf. ''; }; @@ -60,7 +60,7 @@ in rsessionExtraConfig = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Extra contents for resssion.conf. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/development/zammad.nix b/third_party/nixpkgs/nixos/modules/services/development/zammad.nix index d457a60718..e81eef3c0a 100644 --- a/third_party/nixpkgs/nixos/modules/services/development/zammad.nix +++ b/third_party/nixpkgs/nixos/modules/services/development/zammad.nix @@ -34,13 +34,13 @@ in type = types.package; default = pkgs.zammad; defaultText = literalExpression "pkgs.zammad"; - description = "Zammad package to use."; + description = lib.mdDoc "Zammad package to use."; }; dataDir = mkOption { type = types.path; default = "/var/lib/zammad"; - description = '' + description = lib.mdDoc '' Path to a folder that will contain Zammad working directory. ''; }; @@ -49,25 +49,25 @@ in type = types.str; default = "127.0.0.1"; example = "192.168.23.42"; - description = "Host address."; + description = lib.mdDoc "Host address."; }; openPorts = mkOption { type = types.bool; default = false; - description = "Whether to open firewall ports for Zammad"; + description = lib.mdDoc "Whether to open firewall ports for Zammad"; }; port = mkOption { type = types.port; default = 3000; - description = "Web service port."; + description = lib.mdDoc "Web service port."; }; websocketPort = mkOption { type = types.port; default = 6042; - description = "Websocket service port."; + description = lib.mdDoc "Websocket service port."; }; database = { @@ -75,7 +75,7 @@ in type = types.enum [ "PostgreSQL" "MySQL" ]; default = "PostgreSQL"; example = "MySQL"; - description = "Database engine to use."; + description = lib.mdDoc "Database engine to use."; }; host = mkOption { @@ -90,7 +90,7 @@ in MySQL = "localhost"; }.''${config.services.zammad.database.type}; ''; - description = '' + description = lib.mdDoc '' Database host address. ''; }; @@ -98,13 +98,13 @@ in port = mkOption { type = types.nullOr types.port; default = null; - description = "Database port. Use null for default port."; + description = lib.mdDoc "Database port. Use `null` for default port."; }; name = mkOption { type = types.str; default = "zammad"; - description = '' + description = lib.mdDoc '' Database name. ''; }; @@ -112,22 +112,22 @@ in user = mkOption { type = types.nullOr types.str; default = "zammad"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; example = "/run/keys/zammad-dbpassword"; - description = '' - A file containing the password for . + description = lib.mdDoc '' + A file containing the password for {option}`services.zammad.database.user`. ''; }; createLocally = mkOption { type = types.bool; default = true; - description = "Whether to create a local database automatically."; + description = lib.mdDoc "Whether to create a local database automatically."; }; settings = mkOption { @@ -139,7 +139,7 @@ in ''; description = '' The database.yml configuration file as key value set. - See + See for list of configuration parameters. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix b/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix index 4fc6ca3674..a81fcbf19d 100644 --- a/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix +++ b/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix @@ -14,7 +14,7 @@ in type = types.package; default = pkgs.greetd.greetd; defaultText = literalExpression "pkgs.greetd.greetd"; - description = "The greetd package that should be used."; + description = lib.mdDoc "The greetd package that should be used."; }; settings = mkOption { @@ -26,8 +26,8 @@ in }; } ''; - description = '' - greetd configuration (documentation) + description = lib.mdDoc '' + greetd configuration ([documentation](https://man.sr.ht/~kennylevinsen/greetd/)) as a Nix attribute set. ''; }; @@ -35,7 +35,7 @@ in vt = mkOption { type = types.int; default = 1; - description = '' + description = lib.mdDoc '' The virtual console (tty) that greetd should use. This option also disables getty on that tty. ''; }; @@ -44,7 +44,7 @@ in type = types.bool; default = !(cfg.settings ? initial_session); defaultText = literalExpression "!(config.services.greetd.settings ? initial_session)"; - description = '' + description = lib.mdDoc '' Wether to restart greetd when it terminates (e.g. on failure). This is usually desirable so a user can always log in, but should be disabled when using 'settings.initial_session' (autologin), because every greetd restart will trigger the autologin again. diff --git a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix index e2bbd27f6e..0d9949d2ba 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix +++ b/third_party/nixpkgs/nixos/modules/services/editors/emacs.nix @@ -67,7 +67,7 @@ in type = types.package; default = pkgs.emacs; defaultText = literalExpression "pkgs.emacs"; - description = '' + description = lib.mdDoc '' emacs derivation to use. ''; }; @@ -75,7 +75,7 @@ in defaultEditor = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' When enabled, configures emacsclient to be the default editor using the EDITOR environment variable. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/editors/haste.nix b/third_party/nixpkgs/nixos/modules/services/editors/haste.nix index 35fe26766e..2208dccbc0 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/haste.nix +++ b/third_party/nixpkgs/nixos/modules/services/editors/haste.nix @@ -14,9 +14,9 @@ in openFirewall = mkEnableOption "firewall passthrough for haste-server"; settings = mkOption { - description = '' + description = lib.mdDoc '' Configuration for haste-server. - For documentation see project readme + For documentation see [project readme](https://github.com/toptal/haste-server#settings) ''; type = format.type; }; diff --git a/third_party/nixpkgs/nixos/modules/services/editors/infinoted.nix b/third_party/nixpkgs/nixos/modules/services/editors/infinoted.nix index 16fe52a232..d2eb4946f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/editors/infinoted.nix +++ b/third_party/nixpkgs/nixos/modules/services/editors/infinoted.nix @@ -12,7 +12,7 @@ in { type = types.package; default = pkgs.libinfinity; defaultText = literalExpression "pkgs.libinfinity"; - description = '' + description = lib.mdDoc '' Package providing infinoted ''; }; @@ -20,7 +20,7 @@ in { keyFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Private key to use for TLS ''; }; @@ -28,7 +28,7 @@ in { certificateFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Server certificate to use for TLS ''; }; @@ -45,7 +45,7 @@ in { securityPolicy = mkOption { type = types.enum ["no-tls" "allow-tls" "require-tls"]; default = "require-tls"; - description = '' + description = lib.mdDoc '' How strictly to enforce clients connection with TLS. ''; }; @@ -53,7 +53,7 @@ in { port = mkOption { type = types.port; default = 6523; - description = '' + description = lib.mdDoc '' Port to listen on ''; }; @@ -61,7 +61,7 @@ in { rootDirectory = mkOption { type = types.path; default = "/var/lib/infinoted/documents/"; - description = '' + description = lib.mdDoc '' Root of the directory structure to serve ''; }; @@ -69,7 +69,7 @@ in { plugins = mkOption { type = types.listOf types.str; default = [ "note-text" "note-chat" "logging" "autosave" ]; - description = '' + description = lib.mdDoc '' Plugins to enable ''; }; @@ -77,7 +77,7 @@ in { passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' File to read server-wide password from ''; }; @@ -88,7 +88,7 @@ in { [autosave] interval=10 ''; - description = '' + description = lib.mdDoc '' Additional configuration to append to infinoted.conf ''; }; @@ -96,7 +96,7 @@ in { user = mkOption { type = types.str; default = "infinoted"; - description = '' + description = lib.mdDoc '' What to call the dedicated user under which infinoted is run ''; }; @@ -104,7 +104,7 @@ in { group = mkOption { type = types.str; default = "infinoted"; - description = '' + description = lib.mdDoc '' What to call the primary group of the dedicated user under which infinoted is run ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/finance/odoo.nix b/third_party/nixpkgs/nixos/modules/services/finance/odoo.nix index 422ee95100..78c54a9e05 100644 --- a/third_party/nixpkgs/nixos/modules/services/finance/odoo.nix +++ b/third_party/nixpkgs/nixos/modules/services/finance/odoo.nix @@ -15,27 +15,27 @@ in type = types.package; default = pkgs.odoo; defaultText = literalExpression "pkgs.odoo"; - description = "Odoo package to use."; + description = lib.mdDoc "Odoo package to use."; }; addons = mkOption { type = with types; listOf package; default = []; example = literalExpression "[ pkgs.odoo_enterprise ]"; - description = "Odoo addons."; + description = lib.mdDoc "Odoo addons."; }; settings = mkOption { type = format.type; default = {}; - description = '' - Odoo configuration settings. For more details see + description = lib.mdDoc '' + Odoo configuration settings. For more details see ''; }; domain = mkOption { type = with types; nullOr str; - description = "Domain to host Odoo with nginx"; + description = lib.mdDoc "Domain to host Odoo with nginx"; default = null; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/games/asf.nix b/third_party/nixpkgs/nixos/modules/services/games/asf.nix index ed1a5544d7..b789290037 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/asf.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/asf.nix @@ -32,7 +32,7 @@ in options.services.archisteamfarm = { enable = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' If enabled, starts the ArchisSteamFarm service. For configuring the SteamGuard token you will need to use the web-ui, which is enabled by default over on 127.0.0.1:1242. You cannot configure ASF in any way outside of nix, since all the config files get wiped on restart and replaced with the programatically set ones by nix. @@ -50,7 +50,7 @@ in type = types.package; default = pkgs.ArchiSteamFarm.ui; description = - "Web-UI package to use. Contents must be in lib/dist."; + lib.mdDoc "Web-UI package to use. Contents must be in lib/dist."; }; }; }; @@ -61,20 +61,20 @@ in example = { enable = false; }; - description = "The Web-UI hosted on 127.0.0.1:1242."; + description = lib.mdDoc "The Web-UI hosted on 127.0.0.1:1242."; }; package = mkOption { type = types.package; default = pkgs.ArchiSteamFarm; description = - "Package to use. Should always be the latest version, for security reasons, since this module uses very new features and to not get out of sync with the Steam API."; + lib.mdDoc "Package to use. Should always be the latest version, for security reasons, since this module uses very new features and to not get out of sync with the Steam API."; }; dataDir = mkOption { type = types.path; default = "/var/lib/asf"; - description = '' + description = lib.mdDoc '' The ASF home directory used to store all data. If left as the default value this directory will automatically be created before the ASF server starts, otherwise the sysadmin is responsible for ensuring the directory exists with appropriate ownership and permissions.''; }; @@ -96,14 +96,14 @@ in ipcPasswordFile = mkOption { type = types.nullOr types.path; default = null; - description = "Path to a file containig the password. The file must be readable by the asf user/group."; + description = lib.mdDoc "Path to a file containig the password. The file must be readable by the `asf` user/group."; }; ipcSettings = mkOption { type = format.type; - description = '' + description = lib.mdDoc '' Settings to write to IPC.config. - All options can be found here. + All options can be found [here](https://github.com/JustArchiNET/ArchiSteamFarm/wiki/IPC#custom-configuration). ''; example = { Kestrel = { @@ -122,26 +122,28 @@ in options = { username = mkOption { type = types.str; - description = "Name of the user to log in. Default is attribute name."; + description = lib.mdDoc "Name of the user to log in. Default is attribute name."; default = ""; }; passwordFile = mkOption { type = types.path; - description = "Path to a file containig the password. The file must be readable by the asf user/group."; + description = lib.mdDoc "Path to a file containig the password. The file must be readable by the `asf` user/group."; }; enabled = mkOption { type = types.bool; default = true; - description = "Whether to enable the bot on startup."; + description = lib.mdDoc "Whether to enable the bot on startup."; }; settings = mkOption { type = types.attrs; - description = "Additional settings that are documented here."; + description = lib.mdDoc '' + Additional settings that are documented [here](https://github.com/JustArchiNET/ArchiSteamFarm/wiki/Configuration#bot-config). + ''; default = { }; }; }; }); - description = '' + description = lib.mdDoc '' Bots name and configuration. ''; example = { diff --git a/third_party/nixpkgs/nixos/modules/services/games/crossfire-server.nix b/third_party/nixpkgs/nixos/modules/services/games/crossfire-server.nix index a33025e0c3..a0dc1e6c56 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/crossfire-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/crossfire-server.nix @@ -10,7 +10,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, the Crossfire game server will be started at boot. ''; }; @@ -19,7 +19,7 @@ in { type = types.package; default = pkgs.crossfire-server; defaultText = literalExpression "pkgs.crossfire-server"; - description = '' + description = lib.mdDoc '' The package to use for the Crossfire server (and map/arch data, if you don't change dataDir). ''; @@ -29,7 +29,7 @@ in { type = types.str; default = "${cfg.package}/share/crossfire"; defaultText = literalExpression ''"''${config.services.crossfire.package}/share/crossfire"''; - description = '' + description = lib.mdDoc '' Where to load readonly data from -- maps, archetypes, treasure tables, and the like. If you plan to edit the data on the live server (rather than overlaying the crossfire-maps and crossfire-arch packages and @@ -54,7 +54,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open ports in the firewall for the server. ''; }; @@ -76,7 +76,7 @@ in { { dm_file = ''' admin:secret_password:localhost - jane:xyzzy:* + alice:xyzzy:* '''; ban_file = ''' # Bob is a jerk diff --git a/third_party/nixpkgs/nixos/modules/services/games/deliantra-server.nix b/third_party/nixpkgs/nixos/modules/services/games/deliantra-server.nix index b7011f4c35..17bdf2aef7 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/deliantra-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/deliantra-server.nix @@ -10,7 +10,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, the Deliantra game server will be started at boot. ''; }; @@ -19,7 +19,7 @@ in { type = types.package; default = pkgs.deliantra-server; defaultText = literalExpression "pkgs.deliantra-server"; - description = '' + description = lib.mdDoc '' The package to use for the Deliantra server (and map/arch data, if you don't change dataDir). ''; @@ -29,7 +29,7 @@ in { type = types.str; default = "${pkgs.deliantra-data}"; defaultText = literalExpression ''"''${pkgs.deliantra-data}"''; - description = '' + description = lib.mdDoc '' Where to store readonly data (maps, archetypes, sprites, etc). Note that if you plan to use the live map editor (rather than editing the maps offline and then nixos-rebuilding), THIS MUST BE WRITEABLE -- @@ -54,14 +54,14 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open ports in the firewall for the server. ''; }; configFiles = mkOption { type = types.attrsOf types.str; - description = '' + description = lib.mdDoc '' Contents of the server configuration files. These will be appended to the example configurations the server comes with and overwrite any default settings defined therein. @@ -73,7 +73,7 @@ in { { dm_file = ''' admin:secret_password:localhost - jane:xyzzy:* + alice:xyzzy:* '''; motd = "Welcome to Deliantra!"; settings = ''' diff --git a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix index bb6898a08c..893afa9772 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/factorio.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/factorio.nix @@ -48,7 +48,7 @@ in port = mkOption { type = types.int; default = 34197; - description = '' + description = lib.mdDoc '' The port to which the service should bind. ''; }; @@ -56,7 +56,7 @@ in bind = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' The address to which the service should bind. ''; }; @@ -65,7 +65,7 @@ in type = types.listOf types.str; default = []; example = [ "username" ]; - description = '' + description = lib.mdDoc '' List of player names which will be admin. ''; }; @@ -73,14 +73,14 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to automatically open the specified UDP port in the firewall. ''; }; saveName = mkOption { type = types.str; default = "default"; - description = '' + description = lib.mdDoc '' The name of the savegame that will be used by the server. When not present in /var/lib/''${config.services.factorio.stateDirName}/saves, @@ -90,7 +90,7 @@ in loadLatestSave = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Load the latest savegame on startup. This overrides saveName, in that the latest save will always be used even if a saved game of the given name exists. It still controls the 'canonical' name of the savegame. @@ -107,7 +107,7 @@ in type = types.path; default = configFile; defaultText = literalExpression "configFile"; - description = '' + description = lib.mdDoc '' The server's configuration file. The default file generated by this module contains lines essential to @@ -118,7 +118,7 @@ in stateDirName = mkOption { type = types.str; default = "factorio"; - description = '' + description = lib.mdDoc '' Name of the directory under /var/lib holding the server's data. The configuration and map will be stored here. @@ -127,7 +127,7 @@ in mods = mkOption { type = types.listOf types.package; default = []; - description = '' + description = lib.mdDoc '' Mods the server should install and activate. The derivations in this list must "build" the mod by simply copying @@ -139,14 +139,14 @@ in game-name = mkOption { type = types.nullOr types.str; default = "Factorio Game"; - description = '' + description = lib.mdDoc '' Name of the game as it will appear in the game listing. ''; }; description = mkOption { type = types.nullOr types.str; default = ""; - description = '' + description = lib.mdDoc '' Description of the game that will appear in the listing. ''; }; @@ -154,28 +154,28 @@ in type = types.attrs; default = {}; example = { admins = [ "username" ];}; - description = '' + description = lib.mdDoc '' Extra game configuration that will go into server-settings.json ''; }; public = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Game will be published on the official Factorio matching server. ''; }; lan = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Game will be broadcast on LAN. ''; }; username = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Your factorio.com login credentials. Required for games with visibility public. ''; }; @@ -184,35 +184,35 @@ in default = pkgs.factorio-headless; defaultText = literalExpression "pkgs.factorio-headless"; example = literalExpression "pkgs.factorio-headless-experimental"; - description = '' + description = lib.mdDoc '' Factorio version to use. This defaults to the stable channel. ''; }; password = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Your factorio.com login credentials. Required for games with visibility public. ''; }; token = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Authentication token. May be used instead of 'password' above. ''; }; game-password = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Game password. ''; }; requireUserVerification = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' When set to true, the server will only allow clients that have a valid factorio.com account. ''; }; @@ -220,14 +220,14 @@ in type = types.nullOr types.int; default = null; example = 10; - description = '' + description = lib.mdDoc '' Autosave interval in minutes. ''; }; nonBlockingSaving = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Highly experimental feature, enable only at your own risk of losing your saves. On UNIX systems, server will fork itself to create an autosave. Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option. diff --git a/third_party/nixpkgs/nixos/modules/services/games/freeciv.nix b/third_party/nixpkgs/nixos/modules/services/games/freeciv.nix index 4923891a61..02af9fda7a 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/freeciv.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/freeciv.nix @@ -27,7 +27,7 @@ in services.freeciv = { enable = mkEnableOption ''freeciv''; settings = mkOption { - description = '' + description = lib.mdDoc '' Parameters of freeciv-server. ''; default = {}; @@ -36,7 +36,7 @@ in options.Announce = mkOption { type = types.enum ["IPv4" "IPv6" "none"]; default = "none"; - description = "Announce game in LAN using given protocol."; + description = lib.mdDoc "Announce game in LAN using given protocol."; }; options.auth = mkEnableOption "server authentication"; options.Database = mkOption { @@ -47,12 +47,12 @@ in backend="sqlite" database="/var/lib/freeciv/auth.sqlite" ''; - description = "Enable database connection with given configuration."; + description = lib.mdDoc "Enable database connection with given configuration."; }; options.debug = mkOption { type = types.ints.between 0 3; default = 0; - description = "Set debug log level."; + description = lib.mdDoc "Set debug log level."; }; options.exit-on-end = mkEnableOption "exit instead of restarting when a game ends."; options.Guests = mkEnableOption "guests to login if auth is enabled"; @@ -60,12 +60,12 @@ in options.port = mkOption { type = types.port; default = 5556; - description = "Listen for clients on given port"; + description = lib.mdDoc "Listen for clients on given port"; }; options.quitidle = mkOption { type = types.nullOr types.int; default = null; - description = "Quit if no players for given time in seconds."; + description = lib.mdDoc "Quit if no players for given time in seconds."; }; options.read = mkOption { type = types.lines; @@ -73,12 +73,12 @@ in default = '' /fcdb lua sqlite_createdb() ''; - description = "Startup script."; + description = lib.mdDoc "Startup script."; }; options.saves = mkOption { type = types.nullOr types.str; default = "/var/lib/freeciv/saves/"; - description = '' + description = lib.mdDoc '' Save games to given directory, a sub-directory named after the starting date of the service will me inserted to preserve older saves. diff --git a/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix b/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix index 8233962c1a..77f92ab97d 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/minecraft-server.nix @@ -22,6 +22,15 @@ let '' + concatStringsSep "\n" (mapAttrsToList (n: v: "${n}=${cfgToString v}") cfg.serverProperties)); + stopScript = pkgs.writeShellScript "minecraft-server-stop" '' + echo stop > ${config.systemd.sockets.minecraft-server.socketConfig.ListenFIFO} + + # Wait for the PID of the minecraft server to disappear before + # returning, so systemd doesn't attempt to SIGKILL it. + while kill -0 "$1" 2> /dev/null; do + sleep 1s + done + ''; # To be able to open the firewall, we need to read out port values in the # server properties, but fall back to the defaults when those don't exist. @@ -45,21 +54,21 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, start a Minecraft Server. The server data will be loaded from and saved to - . + {option}`services.minecraft-server.dataDir`. ''; }; declarative = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use a declarative Minecraft server configuration. - Only if set to true, the options - and - will be + Only if set to `true`, the options + {option}`services.minecraft-server.whitelist` and + {option}`services.minecraft-server.serverProperties` will be applied. ''; }; @@ -67,18 +76,18 @@ in { eula = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether you agree to - - Mojangs EULA. This option must be set to - true to run Minecraft server. + [ + Mojangs EULA](https://account.mojang.com/documents/minecraft_eula). This option must be set to + `true` to run Minecraft server. ''; }; dataDir = mkOption { type = types.path; default = "/var/lib/minecraft"; - description = '' + description = lib.mdDoc '' Directory to store Minecraft database and other state/data files. ''; }; @@ -86,7 +95,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open ports in the firewall for the server. ''; }; @@ -99,14 +108,14 @@ in { }; in types.attrsOf minecraftUUID; default = {}; - description = '' + description = lib.mdDoc '' Whitelisted players, only has an effect when - is - true and the whitelist is enabled - via by - setting white-list to true. + {option}`services.minecraft-server.declarative` is + `true` and the whitelist is enabled + via {option}`services.minecraft-server.serverProperties` by + setting `white-list` to `true`. This is a mapping from Minecraft usernames to UUIDs. - You can use to get a + You can use to get a Minecraft UUID for a username. ''; example = literalExpression '' @@ -132,11 +141,11 @@ in { "rcon.password" = "hunter2"; } ''; - description = '' + description = lib.mdDoc '' Minecraft server properties for the server.properties file. Only has - an effect when - is set to true. See - + an effect when {option}`services.minecraft-server.declarative` + is set to `true`. See + for documentation on these values. ''; }; @@ -146,7 +155,7 @@ in { default = pkgs.minecraft-server; defaultText = literalExpression "pkgs.minecraft-server"; example = literalExpression "pkgs.minecraft-server_1_12_2"; - description = "Version of minecraft-server to run."; + description = lib.mdDoc "Version of minecraft-server to run."; }; jvmOpts = mkOption { @@ -156,7 +165,7 @@ in { example = "-Xms4092M -Xmx4092M -XX:+UseG1GC -XX:+CMSIncrementalPacing " + "-XX:+CMSClassUnloadingEnabled -XX:ParallelGCThreads=2 " + "-XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10"; - description = "JVM options for the Minecraft server."; + description = lib.mdDoc "JVM options for the Minecraft server."; }; }; }; @@ -172,16 +181,35 @@ in { }; users.groups.minecraft = {}; + systemd.sockets.minecraft-server = { + bindsTo = [ "minecraft-server.service" ]; + socketConfig = { + ListenFIFO = "/run/minecraft-server.stdin"; + SocketMode = "0660"; + SocketUser = "minecraft"; + SocketGroup = "minecraft"; + RemoveOnStop = true; + FlushPending = true; + }; + }; + systemd.services.minecraft-server = { description = "Minecraft Server Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + requires = [ "minecraft-server.socket" ]; + after = [ "network.target" "minecraft-server.socket" ]; serviceConfig = { ExecStart = "${cfg.package}/bin/minecraft-server ${cfg.jvmOpts}"; + ExecStop = "${stopScript} $MAINPID"; Restart = "always"; User = "minecraft"; WorkingDirectory = cfg.dataDir; + + StandardInput = "socket"; + StandardOutput = "journal"; + StandardError = "journal"; + # Hardening CapabilityBoundingSet = [ "" ]; DeviceAllow = [ "" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix b/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix index 2111c970d4..bc6ab7462d 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/minetest-server.nix @@ -19,7 +19,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "If enabled, starts a Minetest Server."; + description = lib.mdDoc "If enabled, starts a Minetest Server."; }; gameId = mkOption { @@ -58,7 +58,7 @@ in logPath = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to logfile for logging. If set to null, logging will be output to stdout which means @@ -69,7 +69,7 @@ in port = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Port number to bind to. If set to null, the default 30000 will be used. diff --git a/third_party/nixpkgs/nixos/modules/services/games/openarena.nix b/third_party/nixpkgs/nixos/modules/services/games/openarena.nix index 9c441e98b2..e38bc8f205 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/openarena.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/openarena.nix @@ -13,13 +13,13 @@ in openPorts = mkOption { type = types.bool; default = false; - description = "Whether to open firewall ports for OpenArena"; + description = lib.mdDoc "Whether to open firewall ports for OpenArena"; }; extraFlags = mkOption { type = types.listOf types.str; default = []; - description = "Extra flags to pass to oa_ded"; + description = lib.mdDoc "Extra flags to pass to {command}`oa_ded`"; example = [ "+set dedicated 2" "+set sv_hostname 'My NixOS OpenArena Server'" diff --git a/third_party/nixpkgs/nixos/modules/services/games/quake3-server.nix b/third_party/nixpkgs/nixos/modules/services/games/quake3-server.nix index 175af4a838..69fdbc50d8 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/quake3-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/quake3-server.nix @@ -42,7 +42,7 @@ in { port = mkOption { type = types.port; default = 27960; - description = '' + description = lib.mdDoc '' UDP Port the server should listen on. ''; }; @@ -50,7 +50,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open the firewall. ''; }; @@ -62,7 +62,7 @@ in { seta rconPassword "superSecret" // sets RCON password for remote console seta sv_hostname "My Quake 3 server" // name that appears in server list ''; - description = '' + description = lib.mdDoc '' Extra configuration options. Note that options changed via RCON will not be persisted. To list all possible options, use "cvarlist 1" via RCON. ''; @@ -73,7 +73,7 @@ in { default = defaultBaseq3; defaultText = literalDocBook "Manually downloaded Quake 3 installation directory."; example = "/var/lib/q3ds"; - description = '' + description = lib.mdDoc '' Path to the baseq3 files (pak*.pk3). If this is on the nix store (type = package) all .pk3 files should be saved in the top-level directory. If this is on another filesystem (e.g /var/lib/baseq3) the .pk3 files are searched in $baseq3/.q3a/baseq3/ diff --git a/third_party/nixpkgs/nixos/modules/services/games/teeworlds.nix b/third_party/nixpkgs/nixos/modules/services/games/teeworlds.nix index babf989c98..6ddd0bee60 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/teeworlds.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/teeworlds.nix @@ -25,13 +25,13 @@ in openPorts = mkOption { type = types.bool; default = false; - description = "Whether to open firewall ports for Teeworlds"; + description = lib.mdDoc "Whether to open firewall ports for Teeworlds"; }; name = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Name of the server. Defaults to 'unnamed server'. ''; }; @@ -40,7 +40,7 @@ in type = types.bool; example = true; default = false; - description = '' + description = lib.mdDoc '' Whether the server registers as public server in the global server list. This is disabled by default because of privacy. ''; }; @@ -48,7 +48,7 @@ in motd = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Set the server message of the day text. ''; }; @@ -56,7 +56,7 @@ in password = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Password to connect to the server. ''; }; @@ -64,7 +64,7 @@ in rconPassword = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Password to access the remote console. If not set, a randomly generated one is displayed in the server log. ''; }; @@ -72,7 +72,7 @@ in port = mkOption { type = types.int; default = 8303; - description = '' + description = lib.mdDoc '' Port the server will listen on. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/games/terraria.nix b/third_party/nixpkgs/nixos/modules/services/games/terraria.nix index 29f976b3c2..cd1bb7d819 100644 --- a/third_party/nixpkgs/nixos/modules/services/games/terraria.nix +++ b/third_party/nixpkgs/nixos/modules/services/games/terraria.nix @@ -36,16 +36,16 @@ in enable = mkOption { type = types.bool; default = false; - description = '' - If enabled, starts a Terraria server. The server can be connected to via tmux -S ''${config.${opt.dataDir}}/terraria.sock attach - for administration by users who are a part of the terraria group (use C-b d shortcut to detach again). + description = lib.mdDoc '' + If enabled, starts a Terraria server. The server can be connected to via `tmux -S ''${config.${opt.dataDir}}/terraria.sock attach` + for administration by users who are a part of the `terraria` group (use `C-b d` shortcut to detach again). ''; }; port = mkOption { type = types.port; default = 7777; - description = '' + description = lib.mdDoc '' Specifies the port to listen on. ''; }; @@ -53,7 +53,7 @@ in maxPlayers = mkOption { type = types.ints.u8; default = 255; - description = '' + description = lib.mdDoc '' Sets the max number of players (between 1 and 255). ''; }; @@ -61,15 +61,15 @@ in password = mkOption { type = types.nullOr types.str; default = null; - description = '' - Sets the server password. Leave null for no password. + description = lib.mdDoc '' + Sets the server password. Leave `null` for no password. ''; }; messageOfTheDay = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Set the server message of the day text. ''; }; @@ -77,18 +77,18 @@ in worldPath = mkOption { type = types.nullOr types.path; default = null; - description = '' - The path to the world file (.wld) which should be loaded. + description = lib.mdDoc '' + The path to the world file (`.wld`) which should be loaded. If no world exists at this path, one will be created with the size - specified by autoCreatedWorldSize. + specified by `autoCreatedWorldSize`. ''; }; autoCreatedWorldSize = mkOption { type = types.enum [ "small" "medium" "large" ]; default = "medium"; - description = '' - Specifies the size of the auto-created world if worldPath does not + description = lib.mdDoc '' + Specifies the size of the auto-created world if `worldPath` does not point to an existing world. ''; }; @@ -96,7 +96,7 @@ in banListPath = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' The path to the ban list. ''; }; @@ -104,26 +104,26 @@ in secure = mkOption { type = types.bool; default = false; - description = "Adds additional cheat protection to the server."; + description = lib.mdDoc "Adds additional cheat protection to the server."; }; noUPnP = mkOption { type = types.bool; default = false; - description = "Disables automatic Universal Plug and Play."; + description = lib.mdDoc "Disables automatic Universal Plug and Play."; }; openFirewall = mkOption { type = types.bool; default = false; - description = "Wheter to open ports in the firewall"; + description = lib.mdDoc "Wheter to open ports in the firewall"; }; dataDir = mkOption { type = types.str; default = "/var/lib/terraria"; example = "/srv/terraria"; - description = "Path to variable state data directory for terraria."; + description = lib.mdDoc "Path to variable state data directory for terraria."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix b/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix index 883ef08300..fef2c14b9d 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/acpid.nix @@ -53,7 +53,7 @@ in logEvents = mkOption { type = types.bool; default = false; - description = "Log all event activity."; + description = lib.mdDoc "Log all event activity."; }; handlers = mkOption { @@ -62,12 +62,12 @@ in event = mkOption { type = types.str; example = literalExpression ''"button/power.*" "button/lid.*" "ac_adapter.*" "button/mute.*" "button/volumedown.*" "cd/play.*" "cd/next.*"''; - description = "Event type."; + description = lib.mdDoc "Event type."; }; action = mkOption { type = types.lines; - description = "Shell commands to execute when the event is triggered."; + description = lib.mdDoc "Shell commands to execute when the event is triggered."; }; }; }); @@ -104,19 +104,19 @@ in powerEventCommands = mkOption { type = types.lines; default = ""; - description = "Shell commands to execute on a button/power.* event."; + description = lib.mdDoc "Shell commands to execute on a button/power.* event."; }; lidEventCommands = mkOption { type = types.lines; default = ""; - description = "Shell commands to execute on a button/lid.* event."; + description = lib.mdDoc "Shell commands to execute on a button/lid.* event."; }; acEventCommands = mkOption { type = types.lines; default = ""; - description = "Shell commands to execute on an ac_adapter.* event."; + description = lib.mdDoc "Shell commands to execute on an ac_adapter.* event."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/actkbd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/actkbd.nix index b499de97b2..3ad2998e82 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/actkbd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/actkbd.nix @@ -20,25 +20,25 @@ let keys = mkOption { type = types.listOf types.int; - description = "List of keycodes to match."; + description = lib.mdDoc "List of keycodes to match."; }; events = mkOption { type = types.listOf (types.enum ["key" "rep" "rel"]); default = [ "key" ]; - description = "List of events to match."; + description = lib.mdDoc "List of events to match."; }; attributes = mkOption { type = types.listOf types.str; default = [ "exec" ]; - description = "List of attributes."; + description = lib.mdDoc "List of attributes."; }; command = mkOption { type = types.str; default = ""; - description = "What to run."; + description = lib.mdDoc "What to run."; }; }; @@ -78,19 +78,19 @@ in [ { keys = [ 113 ]; events = [ "key" ]; command = "''${pkgs.alsa-utils}/bin/amixer -q set Master toggle"; } ] ''; - description = '' - Key bindings for actkbd. + description = lib.mdDoc '' + Key bindings for {command}`actkbd`. - See actkbd README for documentation. + See {command}`actkbd` {file}`README` for documentation. - The example shows a piece of what does when enabled. + The example shows a piece of what {option}`sound.mediaKeys.enable` does when enabled. ''; }; extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Literal contents to append to the end of actkbd configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/argonone.nix b/third_party/nixpkgs/nixos/modules/services/hardware/argonone.nix index 638181b1b1..61656237d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/argonone.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/argonone.nix @@ -10,7 +10,7 @@ in type = lib.types.package; default = pkgs.argononed; defaultText = "pkgs.argononed"; - description = '' + description = lib.mdDoc '' The package implementing the Argon One driver ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix b/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix index 69a66723e7..a1e980dbec 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix @@ -43,7 +43,7 @@ in powerOnBoot = mkOption { type = types.bool; default = true; - description = "Whether to power up the default Bluetooth controller on boot."; + description = lib.mdDoc "Whether to power up the default Bluetooth controller on boot."; }; package = mkOption { @@ -64,7 +64,7 @@ in disabledPlugins = mkOption { type = types.listOf types.str; default = [ ]; - description = "Built-in plugins to disable"; + description = lib.mdDoc "Built-in plugins to disable"; }; settings = mkOption { @@ -75,7 +75,7 @@ in ControllerMode = "bredr"; }; }; - description = "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; + description = lib.mdDoc "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf)."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/bolt.nix b/third_party/nixpkgs/nixos/modules/services/hardware/bolt.nix index 32b60af060..6990a9ea63 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/bolt.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/bolt.nix @@ -12,7 +12,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Bolt, a userspace daemon to enable security levels for Thunderbolt 3 on GNU/Linux. diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/brltty.nix b/third_party/nixpkgs/nixos/modules/services/hardware/brltty.nix index 7305601753..3133804f48 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/brltty.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/brltty.nix @@ -25,7 +25,7 @@ in { services.brltty.enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the BRLTTY daemon."; + description = lib.mdDoc "Whether to enable the BRLTTY daemon."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix b/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix index 861b70970b..65c0c60ed3 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/fancontrol.nix @@ -13,7 +13,7 @@ in config = mkOption { type = types.lines; - description = "Required fancontrol configuration file content. See pwmconfig8 from the lm_sensors package."; + description = lib.mdDoc "Required fancontrol configuration file content. See {manpage}`pwmconfig(8)` from the lm_sensors package."; example = '' # Configuration file generated by pwmconfig INTERVAL=10 diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/freefall.nix b/third_party/nixpkgs/nixos/modules/services/hardware/freefall.nix index 3f7b159244..7b794264ff 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/freefall.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/freefall.nix @@ -13,7 +13,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to protect HP/Dell laptop hard drives (not SSDs) in free fall. ''; }; @@ -22,7 +22,7 @@ in { type = types.package; default = pkgs.freefall; defaultText = literalExpression "pkgs.freefall"; - description = '' + description = lib.mdDoc '' freefall derivation to use. ''; }; @@ -30,7 +30,7 @@ in { devices = mkOption { type = types.listOf types.str; default = [ "/dev/sda" ]; - description = '' + description = lib.mdDoc '' Device paths to all internal spinning hard drives. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix index e0506416ff..241c9d143d 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/fwupd.nix @@ -53,7 +53,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable fwupd, a DBus service that allows applications to update firmware. ''; @@ -63,7 +63,7 @@ in { type = types.listOf types.str; default = []; example = [ "2082b5e0-7a64-478a-b1b2-e3404fab6dad" ]; - description = '' + description = lib.mdDoc '' Allow disabling specific devices by their GUID ''; }; @@ -72,7 +72,7 @@ in { type = types.listOf types.str; default = []; example = [ "udev" ]; - description = '' + description = lib.mdDoc '' Allow disabling specific plugins ''; }; @@ -81,7 +81,7 @@ in { type = types.listOf types.path; default = []; example = literalExpression "[ /etc/nixos/fwupd/myfirmware.pem ]"; - description = '' + description = lib.mdDoc '' Installing a public key allows firmware signed with a matching private key to be recognized as trusted, which may require less authentication to install than for untrusted files. By default trusted firmware can be upgraded (but not downgraded) without the user or administrator password. Only very few keys are installed by default. ''; }; @@ -89,9 +89,9 @@ in { enableTestRemote = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable test remote. This is used by - installed tests. + [installed tests](https://github.com/fwupd/fwupd/blob/master/data/installed-tests/README.md). ''; }; @@ -99,7 +99,7 @@ in { type = types.package; default = pkgs.fwupd; defaultText = literalExpression "pkgs.fwupd"; - description = '' + description = lib.mdDoc '' Which fwupd package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/illum.nix b/third_party/nixpkgs/nixos/modules/services/hardware/illum.nix index 7f7a850002..46172fb7b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/illum.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/illum.nix @@ -13,7 +13,7 @@ in { enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable illum, a daemon for controlling screen brightness with brightness buttons. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/interception-tools.nix b/third_party/nixpkgs/nixos/modules/services/hardware/interception-tools.nix index e69c05841e..4f86bd470e 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/interception-tools.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/interception-tools.nix @@ -9,14 +9,14 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the interception tools service."; + description = lib.mdDoc "Whether to enable the interception tools service."; }; plugins = mkOption { type = types.listOf types.package; default = [ pkgs.interception-tools-plugins.caps2esc ]; defaultText = literalExpression "[ pkgs.interception-tools-plugins.caps2esc ]"; - description = '' + description = lib.mdDoc '' A list of interception tools plugins that will be made available to use inside the udevmon configuration. ''; @@ -36,7 +36,7 @@ in { EVENTS: EV_KEY: [KEY_X, KEY_Y] ''; - description = '' + description = lib.mdDoc '' String of udevmon YAML configuration, or path to a udevmon YAML configuration file. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/joycond.nix b/third_party/nixpkgs/nixos/modules/services/hardware/joycond.nix index d81c1bb6d6..c3a71edaa2 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/joycond.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/joycond.nix @@ -15,7 +15,7 @@ with lib; type = types.package; default = pkgs.joycond; defaultText = "pkgs.joycond"; - description = '' + description = lib.mdDoc '' The joycond package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix b/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix new file mode 100644 index 0000000000..ccba87531e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/hardware/kanata.nix @@ -0,0 +1,215 @@ +{ config, lib, pkgs, utils, ... }: + +with lib; + +let + cfg = config.services.kanata; + + keyboard = { + options = { + devices = mkOption { + type = types.addCheck (types.listOf types.str) + (devices: (length devices) > 0); + 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. + ::: + ''; + }; + config = mkOption { + type = types.lines; + example = '' + (defsrc + grv 1 2 3 4 5 6 7 8 9 0 - = bspc + tab q w e r t y u i o p [ ] \ + caps a s d f g h j k l ; ' ret + lsft z x c v b n m , . / rsft + lctl lmet lalt spc ralt rmet rctl) + + (deflayer qwerty + grv 1 2 3 4 5 6 7 8 9 0 - = bspc + tab q w e r t y u i o p [ ] \ + @cap a s d f g h j k l ; ' ret + lsft z x c v b n m , . / rsft + lctl lmet lalt spc ralt rmet rctl) + + (defalias + ;; tap within 100ms for capslk, hold more than 100ms for lctl + 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. + ''; + }; + extraDefCfg = mkOption { + type = types.lines; + 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. + ''; + }; + extraArgs = mkOption { + type = types.listOf types.str; + default = [ ]; + description = mdDoc "Extra command line arguments passed to kanata."; + }; + port = mkOption { + type = types.nullOr types.port; + default = null; + example = 6666; + description = mdDoc '' + Port to run the notification server on. `null` will not run the + server. + ''; + }; + }; + }; + + mkName = name: "kanata-${name}"; + + mkDevices = devices: concatStringsSep ":" devices; + + mkConfig = name: keyboard: pkgs.writeText "${mkName name}-config.kdb" '' + (defcfg + ${keyboard.extraDefCfg} + linux-dev ${mkDevices keyboard.devices}) + + ${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; + + serviceConfig = { + ExecStart = '' + ${cfg.package}/bin/kanata \ + --cfg ${mkConfig name keyboard} \ + --symlink-path ''${RUNTIME_DIRECTORY}/${name} \ + ${optionalString (keyboard.port != null) "--port ${toString keyboard.port}"} \ + ${utils.escapeSystemdExecArgs keyboard.extraArgs} + ''; + + DynamicUser = true; + RuntimeDirectory = mkName name; + SupplementaryGroups = with config.users.groups; [ + input.name + uinput.name + ]; + + # hardening + DeviceAllow = [ + "/dev/uinput rw" + "char-input r" + ]; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + IPAddressAllow = optional (keyboard.port != null) "localhost"; + IPAddressDeny = [ "any" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + PrivateNetwork = keyboard.port == null; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RestrictAddressFamilies = + if (keyboard.port == null) then "none" else [ "AF_INET" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = [ "native" ]; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + 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 "kanata"; + package = mkOption { + type = types.package; + default = pkgs.kanata; + defaultText = lib.literalExpression "pkgs.kanata"; + example = lib.literalExpression "pkgs.kanata-with-cmd"; + description = mdDoc '' + The kanata package to use. + + ::: {.note} + If `danger-enable-cmd` is enabled in any of the keyboards, the + `kanata-with-cmd` package should be used. + ::: + ''; + }; + keyboards = mkOption { + type = types.attrsOf (types.submodule keyboard); + default = { }; + description = mdDoc "Keyboard configurations."; + }; + }; + + config = lib.mkIf cfg.enable { + hardware.uinput.enable = true; + + systemd = { + paths = trivial.pipe cfg.keyboards [ + (mapAttrsToList mkPaths) + concatLists + listToAttrs + ]; + services = mapAttrs' mkService cfg.keyboards; + }; + }; + + meta.maintainers = with lib.maintainers; [ linj ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/lcd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/lcd.nix index dc8595ea60..c817225c1f 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/lcd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/lcd.nix @@ -36,26 +36,26 @@ in with lib; { serverHost = mkOption { type = str; default = "localhost"; - description = "Host on which LCDd is listening."; + description = lib.mdDoc "Host on which LCDd is listening."; }; serverPort = mkOption { type = int; default = 13666; - description = "Port on which LCDd is listening."; + description = lib.mdDoc "Port on which LCDd is listening."; }; server = { enable = mkOption { type = bool; default = false; - description = "Enable the LCD panel server (LCDd)"; + description = lib.mdDoc "Enable the LCD panel server (LCDd)"; }; openPorts = mkOption { type = bool; default = false; - description = "Open the ports in the firewall"; + description = lib.mdDoc "Open the ports in the firewall"; }; usbPermissions = mkOption { @@ -63,8 +63,7 @@ in with lib; { default = false; description = '' Set group-write permissions on a USB device. - - + A USB connected LCD panel will most likely require having its permissions modified for lcdd to write to it. Enabling this option sets group-write permissions on the device identified by @@ -72,13 +71,11 @@ in with lib; { . In order to find the values, you can run the lsusb command. Example output: - - + Bus 005 Device 002: ID 0403:c630 Future Technology Devices International, Ltd lcd2usb interface - - + In this case the vendor id is 0403 and the product id is c630. ''; }; @@ -86,25 +83,25 @@ in with lib; { usbVid = mkOption { type = str; default = ""; - description = "The vendor ID of the USB device to claim."; + description = lib.mdDoc "The vendor ID of the USB device to claim."; }; usbPid = mkOption { type = str; default = ""; - description = "The product ID of the USB device to claim."; + description = lib.mdDoc "The product ID of the USB device to claim."; }; usbGroup = mkOption { type = str; default = "dialout"; - description = "The group to use for settings permissions. This group must exist or you will have to create it."; + description = lib.mdDoc "The group to use for settings permissions. This group must exist or you will have to create it."; }; extraConfig = mkOption { type = lines; default = ""; - description = "Additional configuration added verbatim to the server config."; + description = lib.mdDoc "Additional configuration added verbatim to the server config."; }; }; @@ -112,19 +109,19 @@ in with lib; { enable = mkOption { type = bool; default = false; - description = "Enable the LCD panel client (LCDproc)"; + description = lib.mdDoc "Enable the LCD panel client (LCDproc)"; }; extraConfig = mkOption { type = lines; default = ""; - description = "Additional configuration added verbatim to the client config."; + description = lib.mdDoc "Additional configuration added verbatim to the client config."; }; restartForever = mkOption { type = bool; default = true; - description = "Try restarting the client forever."; + description = lib.mdDoc "Try restarting the client forever."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/lirc.nix b/third_party/nixpkgs/nixos/modules/services/hardware/lirc.nix index f970b0a095..dfdd768c35 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/lirc.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/lirc.nix @@ -19,18 +19,18 @@ in { [lircd] nodaemon = False ''; - description = "LIRC default options descriped in man:lircd(8) (lirc_options.conf)"; + description = lib.mdDoc "LIRC default options descriped in man:lircd(8) ({file}`lirc_options.conf`)"; }; configs = mkOption { type = types.listOf types.lines; - description = "Configurations for lircd to load, see man:lircd.conf(5) for details (lircd.conf)"; + description = lib.mdDoc "Configurations for lircd to load, see man:lircd.conf(5) for details ({file}`lircd.conf`)"; }; extraArguments = mkOption { type = types.listOf types.str; default = []; - description = "Extra arguments to lircd."; + description = lib.mdDoc "Extra arguments to lircd."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-optimus.nix b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-optimus.nix index d53175052c..5b5273ed78 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-optimus.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/nvidia-optimus.nix @@ -11,7 +11,7 @@ let kernel = config.boot.kernelPackages; in hardware.nvidiaOptimus.disable = lib.mkOption { default = false; type = lib.types.bool; - description = '' + description = lib.mdDoc '' Completely disable the NVIDIA graphics card and use the integrated graphics processor instead. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/pcscd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/pcscd.nix index b1a5c680a0..c4ae6e19b7 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/pcscd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/pcscd.nix @@ -23,7 +23,7 @@ in default = [ pkgs.ccid ]; defaultText = literalExpression "[ pkgs.ccid ]"; example = literalExpression "[ pkgs.pcsc-cyberjack ]"; - description = "Plugin packages to be used for PCSC-Lite."; + description = lib.mdDoc "Plugin packages to be used for PCSC-Lite."; }; readerConfig = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/pommed.nix b/third_party/nixpkgs/nixos/modules/services/hardware/pommed.nix index bf7d6a46a2..a71004c176 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/pommed.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/pommed.nix @@ -13,7 +13,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use the pommed tool to handle Apple laptop keyboard hotkeys. ''; @@ -22,12 +22,12 @@ in { configFile = mkOption { type = types.nullOr types.path; default = null; - description = '' - The path to the pommed.conf file. Leave + description = lib.mdDoc '' + The path to the {file}`pommed.conf` file. Leave to null to use the default config file - (/etc/pommed.conf.mactel). See the - files /etc/pommed.conf.mactel and - /etc/pommed.conf.pmac for examples to + ({file}`/etc/pommed.conf.mactel`). See the + files {file}`/etc/pommed.conf.mactel` and + {file}`/etc/pommed.conf.pmac` for examples to build on. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/power-profiles-daemon.nix b/third_party/nixpkgs/nixos/modules/services/hardware/power-profiles-daemon.nix index 4144bc6670..101da01b4a 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/power-profiles-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/power-profiles-daemon.nix @@ -18,7 +18,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable power-profiles-daemon, a DBus daemon that allows changing system behavior based upon user-selected power profiles. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/rasdaemon.nix b/third_party/nixpkgs/nixos/modules/services/hardware/rasdaemon.nix index 2d4c6d2ce9..7048a56cb7 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/rasdaemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/rasdaemon.nix @@ -15,13 +15,13 @@ in record = mkOption { type = types.bool; default = true; - description = "record events via sqlite3, required for ras-mc-ctl"; + description = lib.mdDoc "record events via sqlite3, required for ras-mc-ctl"; }; mainboard = mkOption { type = types.lines; default = ""; - description = "Custom mainboard description, see ras-mc-ctl8 for more details."; + description = lib.mdDoc "Custom mainboard description, see {manpage}`ras-mc-ctl(8)` for more details."; example = '' vendor = ASRock model = B450M Pro4 @@ -40,7 +40,7 @@ in labels = mkOption { type = types.lines; default = ""; - description = "Additional memory module label descriptions to be placed in /etc/ras/dimm_labels.d/labels"; + description = lib.mdDoc "Additional memory module label descriptions to be placed in /etc/ras/dimm_labels.d/labels"; example = '' # vendor and model may be shown by 'ras-mc-ctl --mainboard' vendor: ASRock @@ -57,7 +57,7 @@ in config = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' rasdaemon configuration, currently only used for CE PFA for details, read rasdaemon.outPath/etc/sysconfig/rasdaemon's comments ''; @@ -72,7 +72,7 @@ in extraModules = mkOption { type = types.listOf types.str; default = []; - description = "extra kernel modules to load"; + description = lib.mdDoc "extra kernel modules to load"; example = [ "i7core_edac" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix b/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix index caf232e234..aaf19c1cc0 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/sane.nix @@ -60,7 +60,7 @@ in hardware.sane.snapshot = mkOption { type = types.bool; default = false; - description = "Use a development snapshot of SANE scanner drivers."; + description = lib.mdDoc "Use a development snapshot of SANE scanner drivers."; }; hardware.sane.extraBackends = mkOption { @@ -80,9 +80,9 @@ in type = types.listOf types.str; default = []; example = [ "v4l" ]; - description = '' + description = lib.mdDoc '' Names of backends which are enabled by default but should be disabled. - See $SANE_CONFIG_DIR/dll.conf for the list of possible names. + See `$SANE_CONFIG_DIR/dll.conf` for the list of possible names. ''; }; @@ -96,7 +96,7 @@ in type = types.lines; default = ""; example = "192.168.0.16"; - description = '' + description = lib.mdDoc '' Network hosts that should be probed for remote scanners. ''; }; @@ -105,7 +105,7 @@ in type = types.bool; default = false; example = true; - description = '' + description = lib.mdDoc '' Whether to enable drivers for the Fujitsu ScanSnap scanners. The driver files are unfree and extracted from the Windows driver image. @@ -116,22 +116,22 @@ in type = types.package; default = pkgs.sane-drivers.epjitsu; defaultText = literalExpression "pkgs.sane-drivers.epjitsu"; - description = '' + description = lib.mdDoc '' Epjitsu driver package to use. Useful if you want to extract the driver files yourself. - The process is described in the /etc/sane.d/epjitsu.conf file in - the sane-backends package. + The process is described in the `/etc/sane.d/epjitsu.conf` file in + the `sane-backends` package. ''; }; services.saned.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable saned network daemon for remote connection to scanners. - saned would be runned from scanner user; to allow - access to hardware that doesn't have scanner group + saned would be runned from `scanner` user; to allow + access to hardware that doesn't have `scanner` group you should add needed groups to this user. ''; }; @@ -140,7 +140,7 @@ in type = types.lines; default = ""; example = "192.168.0.0/24"; - description = '' + description = lib.mdDoc '' Extra saned configuration lines. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix index 8f99981084..f01446c411 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix @@ -15,7 +15,7 @@ let name = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The friendly name you give to the network device. If undefined, the name of attribute will be used. ''; @@ -25,7 +25,7 @@ let model = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The model of the network device. ''; @@ -35,7 +35,7 @@ let ip = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The ip address of the device. If undefined, you will have to provide a nodename. ''; @@ -46,7 +46,7 @@ let nodename = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The node name of the device. If undefined, you will have to provide an ip. ''; @@ -82,7 +82,7 @@ in office2 = { model = "MFC-7860DW"; nodename = "BRW0080927AFBCE"; }; }; type = with types; attrsOf (submodule netDeviceOpts); - description = '' + description = lib.mdDoc '' The list of network devices that will be registered against the brscan4 sane backend. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix b/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix index 2e4ad8cc3b..506cb8167e 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/sane_extra_backends/brscan5.nix @@ -15,7 +15,7 @@ let name = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The friendly name you give to the network device. If undefined, the name of attribute will be used. ''; @@ -25,7 +25,7 @@ let model = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The model of the network device. ''; @@ -35,7 +35,7 @@ let ip = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The ip address of the device. If undefined, you will have to provide a nodename. ''; @@ -46,7 +46,7 @@ let nodename = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The node name of the device. If undefined, you will have to provide an ip. ''; @@ -77,7 +77,7 @@ in office2 = { model = "MFC-7860DW"; nodename = "BRW0080927AFBCE"; }; }; type = with types; attrsOf (submodule netDeviceOpts); - description = '' + description = lib.mdDoc '' The list of network devices that will be registered against the brscan5 sane backend. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/tcsd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/tcsd.nix index e414b9647c..f22924d410 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/tcsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/tcsd.nix @@ -40,7 +40,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable tcsd, a Trusted Computing management service that provides TCG Software Stack (TSS). The tcsd daemon is the only portal to the Trusted Platform Module (TPM), a hardware @@ -51,19 +51,19 @@ in user = mkOption { default = "tss"; type = types.str; - description = "User account under which tcsd runs."; + description = lib.mdDoc "User account under which tcsd runs."; }; group = mkOption { default = "tss"; type = types.str; - description = "Group account under which tcsd runs."; + description = lib.mdDoc "Group account under which tcsd runs."; }; stateDir = mkOption { default = "/var/lib/tpm"; type = types.path; - description = '' + description = lib.mdDoc '' The location of the system persistent storage file. The system persistent storage file holds keys and data across restarts of the TCSD and system reboots. @@ -73,20 +73,20 @@ in firmwarePCRs = mkOption { default = "0,1,2,3,4,5,6,7"; type = types.str; - description = "PCR indices used in the TPM for firmware measurements."; + description = lib.mdDoc "PCR indices used in the TPM for firmware measurements."; }; kernelPCRs = mkOption { default = "8,9,10,11,12"; type = types.str; - description = "PCR indices used in the TPM for kernel measurements."; + description = lib.mdDoc "PCR indices used in the TPM for kernel measurements."; }; platformCred = mkOption { default = "${cfg.stateDir}/platform.cert"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/platform.cert"''; type = types.path; - description = '' + description = lib.mdDoc '' Path to the platform credential for your TPM. Your TPM manufacturer may have provided you with a set of credentials (certificates) that should be used when creating identities @@ -100,7 +100,7 @@ in default = "${cfg.stateDir}/conformance.cert"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/conformance.cert"''; type = types.path; - description = '' + description = lib.mdDoc '' Path to the conformance credential for your TPM. See also the platformCred option''; }; @@ -109,7 +109,7 @@ in default = "${cfg.stateDir}/endorsement.cert"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/endorsement.cert"''; type = types.path; - description = '' + description = lib.mdDoc '' Path to the endorsement credential for your TPM. See also the platformCred option''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix index fcd02ea90c..b433f46f28 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/thermald.nix @@ -14,7 +14,7 @@ in debug = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable debug logging. ''; }; @@ -22,14 +22,14 @@ in configFile = mkOption { type = types.nullOr types.path; default = null; - description = "the thermald manual configuration file."; + description = lib.mdDoc "the thermald manual configuration file."; }; package = mkOption { type = types.package; default = pkgs.thermald; defaultText = literalExpression "pkgs.thermald"; - description = "Which thermald package to use."; + description = lib.mdDoc "Which thermald package to use."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/thinkfan.nix b/third_party/nixpkgs/nixos/modules/services/hardware/thinkfan.nix index 4ea829e496..86dabe71a4 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/thinkfan.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/thinkfan.nix @@ -29,16 +29,16 @@ let options = { type = mkOption { type = types.enum [ "hwmon" "atasmart" "tpacpi" "nvml" ]; - description = '' + description = lib.mdDoc '' The ${name} type, can be - hwmon for standard ${name}s, + `hwmon` for standard ${name}s, - atasmart to read the temperature via + `atasmart` to read the temperature via S.M.A.R.T (requires smartSupport to be enabled), - tpacpi for the legacy thinkpac_acpi driver, or + `tpacpi` for the legacy thinkpac_acpi driver, or - nvml for the (proprietary) nVidia driver. + `nvml` for the (proprietary) nVidia driver. ''; }; query = mkOption { @@ -67,7 +67,7 @@ let correction = mkOption { type = with types; nullOr (listOf int); default = null; - description = '' + description = lib.mdDoc '' A list of values to be added to the temperature of each sensor, can be used to equalize small discrepancies in temperature ratings. ''; @@ -118,7 +118,7 @@ in { smartSupport = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to build thinkfan with S.M.A.R.T. support to read temperatures directly from hard disks. ''; @@ -159,7 +159,7 @@ in { [7 60 85] ["level auto" 80 32767] ]; - description = '' + description = lib.mdDoc '' [LEVEL LOW HIGH] LEVEL is the fan level to use: it can be an integer (0-7 with thinkpad_acpi), @@ -175,7 +175,7 @@ in { type = types.listOf types.str; default = [ ]; example = [ "-b" "0" ]; - description = '' + description = lib.mdDoc '' A list of extra command line arguments to pass to thinkfan. Check the thinkfan(1) manpage for available arguments. ''; @@ -184,12 +184,12 @@ in { settings = mkOption { type = types.attrsOf settingsFormat.type; default = { }; - description = '' + description = lib.mdDoc '' Thinkfan settings. Use this option to configure thinkfan settings not exposed in a NixOS option or to bypass one. - Before changing this, read the thinkfan.conf(5) + Before changing this, read the `thinkfan.conf(5)` manpage and take a look at the example config file at - + ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix b/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix index 1905eb565c..559b29627c 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/throttled.nix @@ -12,7 +12,7 @@ in { extraConfig = mkOption { type = types.str; default = ""; - description = "Alternative configuration"; + description = lib.mdDoc "Alternative configuration"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/tlp.nix b/third_party/nixpkgs/nixos/modules/services/hardware/tlp.nix index eb53f565a6..d2cc7c661c 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/tlp.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/tlp.nix @@ -20,7 +20,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the TLP power management daemon."; + description = lib.mdDoc "Whether to enable the TLP power management daemon."; }; settings = mkOption {type = with types; attrsOf (oneOf [bool int float str (listOf str)]); @@ -29,7 +29,7 @@ in SATA_LINKPWR_ON_BAT = "med_power_with_dipm"; USB_BLACKLIST_PHONE = 1; }; - description = '' + description = lib.mdDoc '' Options passed to TLP. See https://linrunner.de/tlp for all supported options.. ''; }; @@ -37,7 +37,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Verbatim additional configuration variables for TLP. DEPRECATED: use services.tlp.settings instead. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix b/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix index a65d4250c2..70c1fd0986 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/trezord.nix @@ -18,7 +18,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable Trezor bridge daemon, for use with Trezor hardware bitcoin wallets. ''; }; @@ -26,7 +26,7 @@ in { emulator.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable Trezor emulator support. ''; }; @@ -34,7 +34,7 @@ in { emulator.port = mkOption { type = types.port; default = 21324; - description = '' + description = lib.mdDoc '' Listening port for the Trezor emulator. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix b/third_party/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix index c2fa87875e..54eac70643 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/triggerhappy.nix @@ -22,18 +22,18 @@ let keys = mkOption { type = types.listOf types.str; - description = "List of keys to match. Key names as defined in linux/input-event-codes.h"; + description = lib.mdDoc "List of keys to match. Key names as defined in linux/input-event-codes.h"; }; event = mkOption { type = types.enum ["press" "hold" "release"]; default = "press"; - description = "Event to match."; + description = lib.mdDoc "Event to match."; }; cmd = mkOption { type = types.str; - description = "What to run."; + description = lib.mdDoc "What to run."; }; }; @@ -52,8 +52,8 @@ in enable = mkOption { type = types.bool; default = false; - description = '' - Whether to enable the triggerhappy hotkey daemon. + description = lib.mdDoc '' + Whether to enable the {command}`triggerhappy` hotkey daemon. ''; }; @@ -61,8 +61,8 @@ in type = types.str; default = "nobody"; example = "root"; - description = '' - User account under which triggerhappy runs. + description = lib.mdDoc '' + User account under which {command}`triggerhappy` runs. ''; }; @@ -72,16 +72,16 @@ in example = lib.literalExpression '' [ { keys = ["PLAYPAUSE"]; cmd = "''${pkgs.mpc-cli}/bin/mpc -q toggle"; } ] ''; - description = '' - Key bindings for triggerhappy. + description = lib.mdDoc '' + Key bindings for {command}`triggerhappy`. ''; }; extraConfig = mkOption { type = types.lines; default = ""; - description = '' - Literal contents to append to the end of triggerhappy configuration file. + description = lib.mdDoc '' + Literal contents to append to the end of {command}`triggerhappy` configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix index 2e9deebbb7..1723cb5084 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix @@ -196,7 +196,7 @@ in boot.hardwareScan = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to try to load kernel modules for all detected hardware. Usually this does a good job of providing you with the modules you need, but sometimes it can crash the system or cause other @@ -209,11 +209,11 @@ in packages = mkOption { type = types.listOf types.path; default = []; - description = '' - List of packages containing udev rules. + description = lib.mdDoc '' + List of packages containing {command}`udev` rules. All files found in - pkg/etc/udev/rules.d and - pkg/lib/udev/rules.d + {file}`«pkg»/etc/udev/rules.d` and + {file}`«pkg»/lib/udev/rules.d` will be included. ''; apply = map getBin; @@ -234,9 +234,9 @@ in ENV{ID_VENDOR_ID}=="046d", ENV{ID_MODEL_ID}=="0825", ENV{PULSE_IGNORE}="1" ''; type = types.lines; - description = '' - Additional udev rules. They'll be written - into file 99-local.rules. Thus they are + description = lib.mdDoc '' + Additional {command}`udev` rules. They'll be written + into file {file}`99-local.rules`. Thus they are read and applied after all other rules. ''; }; @@ -249,9 +249,9 @@ in KEYBOARD_KEY_700e2=leftctrl ''; type = types.lines; - description = '' - Additional hwdb files. They'll be written - into file 99-local.hwdb. Thus they are + description = lib.mdDoc '' + Additional {command}`hwdb` files. They'll be written + into file {file}`99-local.hwdb`. Thus they are read after all other files. ''; }; @@ -261,7 +261,7 @@ in hardware.firmware = mkOption { type = types.listOf types.package; default = []; - description = '' + description = lib.mdDoc '' List of packages containing firmware files. Such files will be loaded automatically if the kernel asks for them (i.e., when it has detected specific hardware that requires @@ -281,16 +281,15 @@ in networking.usePredictableInterfaceNames = mkOption { default = true; type = types.bool; - description = '' - Whether to assign predictable - names to network interfaces. If enabled, interfaces + description = lib.mdDoc '' + Whether to assign [predictable names to network interfaces](http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames). + If enabled, interfaces are assigned names that contain topology information - (e.g. wlp3s0) and thus should be stable + (e.g. `wlp3s0`) and thus should be stable across reboots. If disabled, names depend on the order in which interfaces are discovered by the kernel, which may change randomly across reboots; for instance, you may find - eth0 and eth1 flipping + `eth0` and `eth1` flipping unpredictably. ''; }; @@ -306,8 +305,8 @@ in List of packages containing udev rules that will be copied to stage 1. All files found in - pkg/etc/udev/rules.d and - pkg/lib/udev/rules.d + «pkg»/etc/udev/rules.d and + «pkg»/lib/udev/rules.d will be included. ''; }; @@ -331,10 +330,10 @@ in SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:1D:60:B9:6D:4F", KERNEL=="eth*", NAME="my_fast_network_card" ''; type = types.lines; - description = '' - udev rules to include in the initrd - only. They'll be written into file - 99-local.rules. Thus they are read and applied + description = lib.mdDoc '' + {command}`udev` rules to include in the initrd + *only*. They'll be written into file + {file}`99-local.rules`. Thus they are read and applied after the essential initrd rules. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix index ea552ce867..988e975d7e 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/udisks2.nix @@ -19,14 +19,7 @@ in services.udisks2 = { - enable = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable Udisks, a DBus service that allows - applications to query and manipulate storage devices. - ''; - }; + enable = mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices."; settings = mkOption rec { type = types.attrsOf settingsFormat.type; @@ -51,10 +44,10 @@ in }; }; ''; - description = '' + description = lib.mdDoc '' Options passed to udisksd. - See here and - drive configuration in here for supported options. + 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. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix b/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix index a743bbf21c..2bf37b4112 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/undervolt.nix @@ -42,7 +42,7 @@ in verbose = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable verbose logging. ''; }; @@ -51,7 +51,7 @@ in type = types.package; default = pkgs.undervolt; defaultText = literalExpression "pkgs.undervolt"; - description = '' + description = lib.mdDoc '' undervolt derivation to use. ''; }; @@ -59,7 +59,7 @@ in coreOffset = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' The amount of voltage in mV to offset the CPU cores by. ''; }; @@ -67,7 +67,7 @@ in gpuOffset = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' The amount of voltage in mV to offset the GPU by. ''; }; @@ -75,7 +75,7 @@ in uncoreOffset = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' The amount of voltage in mV to offset uncore by. ''; }; @@ -83,7 +83,7 @@ in analogioOffset = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' The amount of voltage in mV to offset analogio by. ''; }; @@ -91,7 +91,7 @@ in temp = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' The temperature target in Celsius degrees. ''; }; @@ -99,7 +99,7 @@ in tempAc = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' The temperature target on AC power in Celsius degrees. ''; }; @@ -107,7 +107,7 @@ in tempBat = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' The temperature target on battery power in Celsius degrees. ''; }; @@ -115,7 +115,7 @@ in p1.limit = mkOption { type = with types; nullOr int; default = null; - description = '' + description = lib.mdDoc '' The P1 Power Limit in Watts. Both limit and window must be set. ''; @@ -123,7 +123,7 @@ in p1.window = mkOption { type = with types; nullOr (oneOf [ float int ]); default = null; - description = '' + description = lib.mdDoc '' The P1 Time Window in seconds. Both limit and window must be set. ''; @@ -132,7 +132,7 @@ in p2.limit = mkOption { type = with types; nullOr int; default = null; - description = '' + description = lib.mdDoc '' The P2 Power Limit in Watts. Both limit and window must be set. ''; @@ -140,7 +140,7 @@ in p2.window = mkOption { type = with types; nullOr (oneOf [ float int ]); default = null; - description = '' + description = lib.mdDoc '' The P2 Time Window in seconds. Both limit and window must be set. ''; @@ -149,7 +149,7 @@ in useTimer = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to set a timer that applies the undervolt settings every 30s. This will cause spam in the journal but might be required for some hardware under specific conditions. diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix b/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix index 81bf497c99..54208158b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/upower.nix @@ -21,7 +21,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Upower, a DBus service that provides power management support to applications. ''; @@ -31,7 +31,7 @@ in type = types.package; default = pkgs.upower; defaultText = literalExpression "pkgs.upower"; - description = '' + description = lib.mdDoc '' Which upower package to use. ''; }; @@ -59,7 +59,7 @@ in noPollBatteries = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Don't poll the kernel for battery level changes. Some hardware will send us battery level changes through @@ -71,7 +71,7 @@ in ignoreLid = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Do we ignore the lid state Some laptops are broken. The lid state is either inverted, or stuck @@ -85,7 +85,7 @@ in usePercentageForPolicy = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Policy for warnings and action based on battery levels Whether battery percentage based policy should be used. The default @@ -99,17 +99,17 @@ in percentageLow = mkOption { type = types.ints.unsigned; default = 10; - description = '' - When usePercentageForPolicy is - true, the levels at which UPower will consider the + description = lib.mdDoc '' + When `usePercentageForPolicy` is + `true`, the levels at which UPower will consider the battery low. This will also be used for batteries which don't have time information such as that of peripherals. - If any value (of percentageLow, - percentageCritical and - percentageAction) is invalid, or not in descending + If any value (of `percentageLow`, + `percentageCritical` and + `percentageAction`) is invalid, or not in descending order, the defaults will be used. ''; }; @@ -117,17 +117,17 @@ in percentageCritical = mkOption { type = types.ints.unsigned; default = 3; - description = '' - When usePercentageForPolicy is - true, the levels at which UPower will consider the + description = lib.mdDoc '' + When `usePercentageForPolicy` is + `true`, the levels at which UPower will consider the battery critical. This will also be used for batteries which don't have time information such as that of peripherals. - If any value (of percentageLow, - percentageCritical and - percentageAction) is invalid, or not in descending + If any value (of `percentageLow`, + `percentageCritical` and + `percentageAction`) is invalid, or not in descending order, the defaults will be used. ''; }; @@ -135,17 +135,17 @@ in percentageAction = mkOption { type = types.ints.unsigned; default = 2; - description = '' - When usePercentageForPolicy is - true, the levels at which UPower will take action + description = lib.mdDoc '' + When `usePercentageForPolicy` is + `true`, the levels at which UPower will take action for the critical battery level. This will also be used for batteries which don't have time information such as that of peripherals. - If any value (of percentageLow, - percentageCritical and - percentageAction) is invalid, or not in descending + If any value (of `percentageLow`, + `percentageCritical` and + `percentageAction`) is invalid, or not in descending order, the defaults will be used. ''; }; @@ -153,13 +153,13 @@ in timeLow = mkOption { type = types.ints.unsigned; default = 1200; - description = '' - When usePercentageForPolicy is - false, the time remaining in seconds at which + description = lib.mdDoc '' + When `usePercentageForPolicy` is + `false`, the time remaining in seconds at which UPower will consider the battery low. - If any value (of timeLow, - timeCritical and timeAction) is + If any value (of `timeLow`, + `timeCritical` and `timeAction`) is invalid, or not in descending order, the defaults will be used. ''; }; @@ -167,13 +167,13 @@ in timeCritical = mkOption { type = types.ints.unsigned; default = 300; - description = '' - When usePercentageForPolicy is - false, the time remaining in seconds at which + description = lib.mdDoc '' + When `usePercentageForPolicy` is + `false`, the time remaining in seconds at which UPower will consider the battery critical. - If any value (of timeLow, - timeCritical and timeAction) is + If any value (of `timeLow`, + `timeCritical` and `timeAction`) is invalid, or not in descending order, the defaults will be used. ''; }; @@ -181,13 +181,13 @@ in timeAction = mkOption { type = types.ints.unsigned; default = 120; - description = '' - When usePercentageForPolicy is - false, the time remaining in seconds at which + description = lib.mdDoc '' + When `usePercentageForPolicy` is + `false`, the time remaining in seconds at which UPower will take action for the critical battery level. - If any value (of timeLow, - timeCritical and timeAction) is + If any value (of `timeLow`, + `timeCritical` and `timeAction`) is invalid, or not in descending order, the defaults will be used. ''; }; @@ -195,9 +195,9 @@ in criticalPowerAction = mkOption { type = types.enum [ "PowerOff" "Hibernate" "HybridSleep" ]; default = "HybridSleep"; - description = '' - The action to take when timeAction or - percentageAction has been reached for the batteries + description = lib.mdDoc '' + The action to take when `timeAction` or + `percentageAction` has been reached for the batteries (UPS or laptop batteries) supplying the computer ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/usbmuxd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/usbmuxd.nix index 11a4b0a858..b4c954906d 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/usbmuxd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/usbmuxd.nix @@ -16,7 +16,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the usbmuxd ("USB multiplexing daemon") service. This daemon is in charge of multiplexing connections over USB to an iOS device. This is needed for transferring data from and to iOS devices (see ifuse). Also @@ -27,7 +27,7 @@ in user = mkOption { type = types.str; default = defaultUserGroup; - description = '' + description = lib.mdDoc '' The user usbmuxd should use to run after startup. ''; }; @@ -35,7 +35,7 @@ in group = mkOption { type = types.str; default = defaultUserGroup; - description = '' + description = lib.mdDoc '' The group usbmuxd should use to run after startup. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/usbrelayd.nix b/third_party/nixpkgs/nixos/modules/services/hardware/usbrelayd.nix index 2cee4e1ff7..471657190b 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/usbrelayd.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/usbrelayd.nix @@ -9,7 +9,7 @@ in broker = mkOption { type = str; - description = "Hostname or IP address of your MQTT Broker."; + description = lib.mdDoc "Hostname or IP address of your MQTT Broker."; default = "127.0.0.1"; example = [ "mqtt" @@ -19,7 +19,7 @@ in clientName = mkOption { type = str; - description = "Name, your client connects as."; + description = lib.mdDoc "Name, your client connects as."; default = "MyUSBRelay"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/vdr.nix b/third_party/nixpkgs/nixos/modules/services/hardware/vdr.nix index 5ec222b805..4fc2905c09 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/vdr.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/vdr.nix @@ -19,19 +19,19 @@ in { default = pkgs.vdr; defaultText = literalExpression "pkgs.vdr"; example = literalExpression "pkgs.wrapVdr.override { plugins = with pkgs.vdrPlugins; [ hello ]; }"; - description = "Package to use."; + description = lib.mdDoc "Package to use."; }; videoDir = mkOption { type = types.path; default = "/srv/vdr/video"; - description = "Recording directory"; + description = lib.mdDoc "Recording directory"; }; extraArguments = mkOption { type = types.listOf types.str; default = []; - description = "Additional command line arguments to pass to VDR."; + description = lib.mdDoc "Additional command line arguments to pass to VDR."; }; enableLirc = mkEnableOption "LIRC"; diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/xow.nix b/third_party/nixpkgs/nixos/modules/services/hardware/xow.nix deleted file mode 100644 index 311181176b..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/hardware/xow.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, pkgs, lib, ... }: - -let - cfg = config.services.hardware.xow; -in { - options.services.hardware.xow = { - enable = lib.mkEnableOption "xow as a systemd service"; - }; - - config = lib.mkIf cfg.enable { - hardware.uinput.enable = true; - - boot.extraModprobeConfig = lib.readFile "${pkgs.xow}/lib/modprobe.d/xow-blacklist.conf"; - - systemd.packages = [ pkgs.xow ]; - systemd.services.xow.wantedBy = [ "multi-user.target" ]; - - services.udev.packages = [ pkgs.xow ]; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix index 2cff5051c7..2b81283836 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/home-assistant.nix @@ -82,7 +82,7 @@ in { configDir = mkOption { default = "/var/lib/hass"; type = types.path; - description = "The config directory, where your configuration.yaml is located."; + description = lib.mdDoc "The config directory, where your {file}`configuration.yaml` is located."; }; extraComponents = mkOption { @@ -92,7 +92,7 @@ in { "default_config" "met" "esphome" - ] ++ optionals (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) [ + ] ++ optionals pkgs.stdenv.hostPlatform.isAarch [ # Use the platform as an indicator that we might be running on a RaspberryPi and include # relevant components "rpi_power" @@ -107,10 +107,10 @@ in { "wled" ] ''; - description = '' - List of components that have their dependencies included in the package. + description = lib.mdDoc '' + List of [components](https://www.home-assistant.io/integrations/) that have their dependencies included in the package. - The component name can be found in the URL, for example https://www.home-assistant.io/integrations/ffmpeg/ would map to ffmpeg. + The component name can be found in the URL, for example `https://www.home-assistant.io/integrations/ffmpeg/` would map to `ffmpeg`. ''; }; @@ -148,7 +148,7 @@ in { type = types.nullOr types.str; default = null; example = "Home"; - description = '' + description = lib.mdDoc '' Name of the location where Home Assistant is running. ''; }; @@ -157,7 +157,7 @@ in { type = types.nullOr (types.either types.float types.str); default = null; example = 52.3; - description = '' + description = lib.mdDoc '' Latitude of your location required to calculate the time the sun rises and sets. ''; }; @@ -166,7 +166,7 @@ in { type = types.nullOr (types.either types.float types.str); default = null; example = 4.9; - description = '' + description = lib.mdDoc '' Longitude of your location required to calculate the time the sun rises and sets. ''; }; @@ -175,7 +175,7 @@ in { type = types.nullOr (types.enum [ "metric" "imperial" ]); default = null; example = "metric"; - description = '' + description = lib.mdDoc '' The unit system to use. This also sets temperature_unit, Celsius for Metric and Fahrenheit for Imperial. ''; }; @@ -184,8 +184,8 @@ in { type = types.nullOr (types.enum [ "C" "F" ]); default = null; example = "C"; - description = '' - Override temperature unit set by unit_system. C for Celsius, F for Fahrenheit. + description = lib.mdDoc '' + Override temperature unit set by unit_system. `C` for Celsius, `F` for Fahrenheit. ''; }; @@ -196,8 +196,8 @@ in { config.time.timeZone or null ''; example = "Europe/Amsterdam"; - description = '' - Pick your time zone from the column TZ of Wikipedia’s list of tz database time zones. + description = lib.mdDoc '' + Pick your time zone from the column TZ of Wikipedia’s [list of tz database time zones](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones). ''; }; }; @@ -211,7 +211,7 @@ in { "::" ]; example = "::1"; - description = '' + description = lib.mdDoc '' Only listen to incoming requests on specific IP/host. The default listed assumes support for IPv4 and IPv6. ''; }; @@ -219,7 +219,7 @@ in { server_port = mkOption { default = 8123; type = types.port; - description = '' + description = lib.mdDoc '' The port on which to listen. ''; }; @@ -238,8 +238,8 @@ in { else "storage"; ''; example = "yaml"; - description = '' - In what mode should the main Lovelace panel be, yaml or storage (UI managed). + description = lib.mdDoc '' + In what mode should the main Lovelace panel be, `yaml` or `storage` (UI managed). ''; }; }; @@ -262,14 +262,14 @@ in { feedreader.urls = [ "https://nixos.org/blogs.xml" ]; } ''; - description = '' - Your configuration.yaml as a Nix attribute set. + description = lib.mdDoc '' + Your {file}`configuration.yaml` as a Nix attribute set. - YAML functions like secrets + YAML functions like [secrets](https://www.home-assistant.io/docs/configuration/secrets/) can be passed as a string and will be unquoted automatically. - Unless this option is explicitly set to null - we assume your configuration.yaml is + Unless this option is explicitly set to `null` + we assume your {file}`configuration.yaml` is managed through this module and thereby overwritten on startup. ''; }; @@ -277,12 +277,12 @@ in { configWritable = mkOption { default = false; type = types.bool; - description = '' - Whether to make configuration.yaml writable. + description = lib.mdDoc '' + Whether to make {file}`configuration.yaml` writable. This will allow you to edit it from Home Assistant's web interface. - This only has an effect if is set. + This only has an effect if {option}`config` is set. However, bear in mind that it will be overwritten at every start of the service. ''; }; @@ -304,23 +304,23 @@ in { } ]; } ''; - description = '' - Your ui-lovelace.yaml as a Nix attribute set. - Setting this option will automatically set lovelace.mode to yaml. + description = lib.mdDoc '' + Your {file}`ui-lovelace.yaml` as a Nix attribute set. + Setting this option will automatically set `lovelace.mode` to `yaml`. - Beware that setting this option will delete your previous ui-lovelace.yaml + Beware that setting this option will delete your previous {file}`ui-lovelace.yaml` ''; }; lovelaceConfigWritable = mkOption { default = false; type = types.bool; - description = '' - Whether to make ui-lovelace.yaml writable. + description = lib.mdDoc '' + Whether to make {file}`ui-lovelace.yaml` writable. This will allow you to edit it from Home Assistant's web interface. - This only has an effect if is set. + This only has an effect if {option}`lovelaceConfig` is set. However, bear in mind that it will be overwritten at every start of the service. ''; }; @@ -347,7 +347,7 @@ in { ]; } ''; - description = '' + description = lib.mdDoc '' The Home Assistant package to use. ''; }; @@ -355,7 +355,7 @@ in { openFirewall = mkOption { default = false; type = types.bool; - description = "Whether to open the firewall for the specified port."; + description = lib.mdDoc "Whether to open the firewall for the specified port."; }; }; @@ -411,12 +411,12 @@ in { ; serviceConfig = let # List of capabilities to equip home-assistant with, depending on configured components - capabilities = [ + capabilities = lib.unique ([ # Empty string first, so we will never accidentally have an empty capability bounding set # https://github.com/NixOS/nixpkgs/issues/120617#issuecomment-830685115 "" - ] ++ (unique (optionals (useComponent "bluetooth_tracker" || useComponent "bluetooth_le_tracker") [ - # Required for interaction with hci devices and bluetooth sockets + ] ++ lib.optionals (builtins.any useComponent [ "bluetooth" "bluetooth_le_tracker" "bluetooth_tracker" "eq3btsmart" "fjaraskupan" "govee_ble" "homekit_controller" "inkbird" "moat" "sensorpush" "switchbot" "xiaomi_ble" ]) [ + # Required for interaction with hci devices and bluetooth sockets, identified by bluetooth-adapters dependency # https://www.home-assistant.io/integrations/bluetooth_le_tracker/#rootless-setup-on-core-installs "CAP_NET_ADMIN" "CAP_NET_RAW" @@ -429,7 +429,7 @@ in { "CAP_NET_ADMIN" "CAP_NET_BIND_SERVICE" "CAP_NET_RAW" - ])); + ]); componentsUsingBluetooth = [ # Components that require the AF_BLUETOOTH address family "bluetooth_tracker" diff --git a/third_party/nixpkgs/nixos/modules/services/home-automation/zigbee2mqtt.nix b/third_party/nixpkgs/nixos/modules/services/home-automation/zigbee2mqtt.nix index ff6d595e5a..48474ab3fa 100644 --- a/third_party/nixpkgs/nixos/modules/services/home-automation/zigbee2mqtt.nix +++ b/third_party/nixpkgs/nixos/modules/services/home-automation/zigbee2mqtt.nix @@ -21,7 +21,7 @@ in enable = mkEnableOption "enable zigbee2mqtt service"; package = mkOption { - description = "Zigbee2mqtt package to use"; + description = lib.mdDoc "Zigbee2mqtt package to use"; default = pkgs.zigbee2mqtt; defaultText = literalExpression '' pkgs.zigbee2mqtt @@ -30,7 +30,7 @@ in }; dataDir = mkOption { - description = "Zigbee2mqtt data directory"; + description = lib.mdDoc "Zigbee2mqtt data directory"; default = "/var/lib/zigbee2mqtt"; type = types.path; }; @@ -47,9 +47,9 @@ in }; } ''; - description = '' - Your configuration.yaml as a Nix attribute set. - Check the documentation + description = lib.mdDoc '' + Your {file}`configuration.yaml` as a Nix attribute set. + Check the [documentation](https://www.zigbee2mqtt.io/information/configuration.html) for possible options. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/SystemdJournal2Gelf.nix b/third_party/nixpkgs/nixos/modules/services/logging/SystemdJournal2Gelf.nix index f28ecab8ac..3d85c2b62c 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/SystemdJournal2Gelf.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/SystemdJournal2Gelf.nix @@ -10,7 +10,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable SystemdJournal2Gelf. ''; }; @@ -18,7 +18,7 @@ in graylogServer = mkOption { type = types.str; example = "graylog2.example.com:11201"; - description = '' + description = lib.mdDoc '' Host and port of your graylog2 input. This should be a GELF UDP input. ''; @@ -27,9 +27,9 @@ in extraOptions = mkOption { type = types.separatedString " "; default = ""; - description = '' + description = lib.mdDoc '' Any extra flags to pass to SystemdJournal2Gelf. Note that - these are basically journalctl flags. + these are basically `journalctl` flags. ''; }; @@ -37,7 +37,7 @@ in type = types.package; default = pkgs.systemd-journal2gelf; defaultText = literalExpression "pkgs.systemd-journal2gelf"; - description = '' + description = lib.mdDoc '' SystemdJournal2Gelf package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/awstats.nix b/third_party/nixpkgs/nixos/modules/services/logging/awstats.nix index df0124380f..8dbf895a76 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/awstats.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/awstats.nix @@ -11,14 +11,14 @@ let type = types.enum [ "mail" "web" ]; default = "web"; example = "mail"; - description = '' + description = lib.mdDoc '' The type of log being collected. ''; }; domain = mkOption { type = types.str; default = name; - description = "The domain name to collect stats for."; + description = lib.mdDoc "The domain name to collect stats for."; example = "example.com"; }; @@ -52,7 +52,7 @@ let type = types.listOf types.str; default = []; example = [ "www.example.org" ]; - description = '' + description = lib.mdDoc '' List of aliases the site has. ''; }; @@ -65,7 +65,7 @@ let "ValidHTTPCodes" = "404"; } ''; - description = "Extra configuration to be appended to awstats.\${name}.conf."; + description = lib.mdDoc "Extra configuration to be appended to awstats.\${name}.conf."; }; webService = { @@ -74,13 +74,13 @@ let hostname = mkOption { type = types.str; default = config.domain; - description = "The hostname the web service appears under."; + description = lib.mdDoc "The hostname the web service appears under."; }; urlPrefix = mkOption { type = types.str; default = "/awstats"; - description = "The URL prefix under which the awstats pages appear."; + description = lib.mdDoc "The URL prefix under which the awstats pages appear."; }; }; }; @@ -100,7 +100,7 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/awstats"; - description = "The directory where awstats data will be stored."; + description = lib.mdDoc "The directory where awstats data will be stored."; }; configs = mkOption { @@ -114,7 +114,7 @@ in }; } ''; - description = "Attribute set of domains to collect stats for."; + description = lib.mdDoc "Attribute set of domains to collect stats for."; }; updateAt = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/logging/filebeat.nix b/third_party/nixpkgs/nixos/modules/services/logging/filebeat.nix index 223a993c50..3dc9df372a 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/filebeat.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/filebeat.nix @@ -25,26 +25,26 @@ in default = pkgs.filebeat; defaultText = literalExpression "pkgs.filebeat"; example = literalExpression "pkgs.filebeat7"; - description = '' + description = lib.mdDoc '' The filebeat package to use. ''; }; inputs = mkOption { - description = '' + description = lib.mdDoc '' Inputs specify how Filebeat locates and processes input data. - This is like services.filebeat.settings.filebeat.inputs, + This is like `services.filebeat.settings.filebeat.inputs`, but structured as an attribute set. This has the benefit that multiple NixOS modules can contribute settings to a single filebeat input. An input type can be specified multiple times by choosing a - different <name> for each, but setting - + different `` for each, but setting + [](#opt-services.filebeat.inputs._name_.type) to the same value. - See . + See . ''; default = {}; type = types.attrsOf (types.submodule ({ name, ... }: { @@ -53,12 +53,12 @@ in type = mkOption { type = types.str; default = name; - description = '' + description = lib.mdDoc '' The input type. - Look for the value after type: on + Look for the value after `type:` on the individual input pages linked from - . + . ''; }; }; @@ -77,24 +77,24 @@ in }; modules = mkOption { - description = '' + description = lib.mdDoc '' Filebeat modules provide a quick way to get started processing common log formats. They contain default configurations, Elasticsearch ingest pipeline definitions, and Kibana dashboards to help you implement and deploy a log monitoring solution. - This is like services.filebeat.settings.filebeat.modules, + This is like `services.filebeat.settings.filebeat.modules`, but structured as an attribute set. This has the benefit that multiple NixOS modules can contribute settings to a single filebeat module. A module can be specified multiple times by choosing a - different <name> for each, but setting - + different `` for each, but setting + [](#opt-services.filebeat.modules._name_.module) to the same value. - See . + See . ''; default = {}; type = types.attrsOf (types.submodule ({ name, ... }: { @@ -103,12 +103,12 @@ in module = mkOption { type = types.str; default = name; - description = '' + description = lib.mdDoc '' The name of the module. - Look for the value after module: on + Look for the value after `module:` on the individual input pages linked from - . + . ''; }; }; @@ -139,7 +139,7 @@ in type = with types; listOf str; default = [ "127.0.0.1:9200" ]; example = [ "myEShost:9200" ]; - description = '' + description = lib.mdDoc '' The list of Elasticsearch nodes to connect to. The events are distributed to these nodes in round @@ -147,10 +147,10 @@ in event is automatically sent to another node. Each Elasticsearch node can be defined as a URL or IP:PORT. For example: - http://192.15.3.2, - https://es.found.io:9230 or - 192.24.3.2:9300. If no port is - specified, 9200 is used. + `http://192.15.3.2`, + `https://es.found.io:9230` or + `192.24.3.2:9300`. If no port is + specified, `9200` is used. ''; }; @@ -161,8 +161,7 @@ in internal = true; description = '' Inputs specify how Filebeat locates and processes - input data. Use instead. + input data. Use instead. See . ''; @@ -200,20 +199,20 @@ in }; ''; - description = '' + description = lib.mdDoc '' Configuration for filebeat. See - + for supported values. Options containing secret data should be set to an attribute - set containing the attribute _secret - a + set containing the attribute `_secret` - a string pointing to a file containing the value the option should be set to. See the example to get a better picture of this: in the resulting - filebeat.yml file, the - output.elasticsearch.password + {file}`filebeat.yml` file, the + `output.elasticsearch.password` key will be set to the contents of the - /var/keys/elasticsearch_password file. + {file}`/var/keys/elasticsearch_password` file. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/fluentd.nix b/third_party/nixpkgs/nixos/modules/services/logging/fluentd.nix index dd19617a13..fe9f4b07e1 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/fluentd.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/fluentd.nix @@ -15,26 +15,26 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable fluentd."; + description = lib.mdDoc "Whether to enable fluentd."; }; config = mkOption { type = types.lines; default = ""; - description = "Fluentd config."; + description = lib.mdDoc "Fluentd config."; }; package = mkOption { type = types.path; default = pkgs.fluentd; defaultText = literalExpression "pkgs.fluentd"; - description = "The fluentd package to use."; + description = lib.mdDoc "The fluentd package to use."; }; plugins = mkOption { type = types.listOf types.path; default = []; - description = '' + description = lib.mdDoc '' A list of plugin paths to pass into fluentd. It will make plugins defined in ruby files there available in your config. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix b/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix index 28e2d18bf0..9f7160b3e8 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/graylog.nix @@ -39,30 +39,30 @@ in type = types.package; default = pkgs.graylog; defaultText = literalExpression "pkgs.graylog"; - description = "Graylog package to use."; + description = lib.mdDoc "Graylog package to use."; }; user = mkOption { type = types.str; default = "graylog"; - description = "User account under which graylog runs"; + description = lib.mdDoc "User account under which graylog runs"; }; isMaster = mkOption { type = types.bool; default = true; - description = "Whether this is the master instance of your Graylog cluster"; + description = lib.mdDoc "Whether this is the master instance of your Graylog cluster"; }; nodeIdFile = mkOption { type = types.str; default = "/var/lib/graylog/server/node-id"; - description = "Path of the file containing the graylog node-id"; + description = lib.mdDoc "Path of the file containing the graylog node-id"; }; passwordSecret = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' You MUST set a secret to secure/pepper the stored user passwords here. Use at least 64 characters. Generate one by using for example: pwgen -N 1 -s 96 ''; @@ -71,13 +71,13 @@ in rootUsername = mkOption { type = types.str; default = "admin"; - description = "Name of the default administrator user"; + description = lib.mdDoc "Name of the default administrator user"; }; rootPasswordSha2 = mkOption { type = types.str; example = "e3c652f0ba0b4801205814f8b6bc49672c4c74e25b497770bb89b22cdeb4e952"; - description = '' + description = lib.mdDoc '' You MUST specify a hash password for the root user (which you only need to initially set up the system and in case you lose connectivity to your authentication backend) This password cannot be changed using the API or via the web interface. If you need to change it, @@ -90,29 +90,29 @@ in elasticsearchHosts = mkOption { type = types.listOf types.str; example = literalExpression ''[ "http://node1:9200" "http://user:password@node2:19200" ]''; - description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication"; + description = lib.mdDoc "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication"; }; messageJournalDir = mkOption { type = types.str; default = "/var/lib/graylog/data/journal"; - description = "The directory which will be used to store the message journal. The directory must be exclusively used by Graylog and must not contain any other files than the ones created by Graylog itself"; + description = lib.mdDoc "The directory which will be used to store the message journal. The directory must be exclusively used by Graylog and must not contain any other files than the ones created by Graylog itself"; }; mongodbUri = mkOption { type = types.str; default = "mongodb://localhost/graylog"; - description = "MongoDB connection string. See http://docs.mongodb.org/manual/reference/connection-string/ for details"; + description = lib.mdDoc "MongoDB connection string. See http://docs.mongodb.org/manual/reference/connection-string/ for details"; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Any other configuration options you might want to add"; + description = lib.mdDoc "Any other configuration options you might want to add"; }; plugins = mkOption { - description = "Extra graylog plugins"; + description = lib.mdDoc "Extra graylog plugins"; default = [ ]; type = types.listOf types.package; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/heartbeat.nix b/third_party/nixpkgs/nixos/modules/services/logging/heartbeat.nix index 56fb4deabd..72fbf41739 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/heartbeat.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/heartbeat.nix @@ -20,22 +20,32 @@ in enable = mkEnableOption "heartbeat"; + package = mkOption { + type = types.package; + default = pkgs.heartbeat; + defaultText = literalExpression "pkgs.heartbeat"; + example = literalExpression "pkgs.heartbeat7"; + description = lib.mdDoc '' + The heartbeat package to use. + ''; + }; + name = mkOption { type = types.str; default = "heartbeat"; - description = "Name of the beat"; + description = lib.mdDoc "Name of the beat"; }; tags = mkOption { type = types.listOf types.str; default = []; - description = "Tags to place on the shipped log messages"; + description = lib.mdDoc "Tags to place on the shipped log messages"; }; stateDir = mkOption { type = types.str; default = "/var/lib/heartbeat"; - description = "The state directory. heartbeat's own logs and other data are stored here."; + description = lib.mdDoc "The state directory. heartbeat's own logs and other data are stored here."; }; extraConfig = mkOption { @@ -46,7 +56,7 @@ in urls: ["http://localhost:9200"] schedule: '@every 10s' ''; - description = "Any other configuration options you want to add"; + description = lib.mdDoc "Any other configuration options you want to add"; }; }; @@ -67,7 +77,7 @@ in serviceConfig = { User = "nobody"; AmbientCapabilities = "cap_net_raw"; - ExecStart = "${pkgs.heartbeat}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\""; + ExecStart = "${cfg.package}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\""; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/journalbeat.nix b/third_party/nixpkgs/nixos/modules/services/logging/journalbeat.nix index 4035ab48b4..a38283ae1e 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/journalbeat.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/journalbeat.nix @@ -24,7 +24,7 @@ in type = types.package; default = pkgs.journalbeat; defaultText = literalExpression "pkgs.journalbeat"; - description = '' + description = lib.mdDoc '' The journalbeat package to use ''; }; @@ -32,20 +32,20 @@ in name = mkOption { type = types.str; default = "journalbeat"; - description = "Name of the beat"; + description = lib.mdDoc "Name of the beat"; }; tags = mkOption { type = types.listOf types.str; default = []; - description = "Tags to place on the shipped log messages"; + description = lib.mdDoc "Tags to place on the shipped log messages"; }; stateDir = mkOption { type = types.str; default = "journalbeat"; - description = '' - Directory below /var/lib/ to store journalbeat's + description = lib.mdDoc '' + Directory below `/var/lib/` to store journalbeat's own logs and other data. This directory will be created automatically using systemd's StateDirectory mechanism. ''; @@ -54,7 +54,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = "Any other configuration options you want to add"; + description = lib.mdDoc "Any other configuration options you want to add"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/journaldriver.nix b/third_party/nixpkgs/nixos/modules/services/logging/journaldriver.nix index 9bd581e9ec..59eedff90d 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/journaldriver.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/journaldriver.nix @@ -17,7 +17,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable journaldriver to forward journald logs to Stackdriver Logging. ''; @@ -26,7 +26,7 @@ in { logLevel = mkOption { type = types.str; default = "info"; - description = '' + description = lib.mdDoc '' Log level at which journaldriver logs its own output. ''; }; @@ -34,7 +34,7 @@ in { logName = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Configures the name of the target log in Stackdriver Logging. This option can be set to, for example, the hostname of a machine to improve the user experience in the logging @@ -45,7 +45,7 @@ in { googleCloudProject = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Configures the name of the Google Cloud project to which to forward journald logs. @@ -57,7 +57,7 @@ in { logStream = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Configures the name of the Stackdriver Logging log stream into which to write journald entries. @@ -69,7 +69,7 @@ in { applicationCredentials = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' Path to the service account private key (in JSON-format) used to forward log entries to Stackdriver Logging on non-GCP instances. diff --git a/third_party/nixpkgs/nixos/modules/services/logging/journalwatch.nix b/third_party/nixpkgs/nixos/modules/services/logging/journalwatch.nix index fb86904d1e..a315da3ea0 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/journalwatch.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/journalwatch.nix @@ -51,7 +51,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, periodically check the journal with journalwatch and report the results by mail. ''; }; @@ -59,12 +59,12 @@ in { priority = mkOption { type = types.int; default = 6; - description = '' + description = lib.mdDoc '' Lowest priority of message to be considered. A value between 7 ("debug"), and 0 ("emerg"). Defaults to 6 ("info"). If you don't care about anything with "info" priority, you can reduce this to e.g. 5 ("notice") to considerably reduce the amount of - messages without needing many . + messages without needing many {option}`filterBlocks`. ''; }; @@ -75,7 +75,7 @@ in { type = types.str; default = "journalwatch@${config.networking.hostName}"; defaultText = literalExpression ''"journalwatch@''${config.networking.hostName}"''; - description = '' + description = lib.mdDoc '' Mail address to send journalwatch reports from. ''; }; @@ -83,7 +83,7 @@ in { mailTo = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Mail address to send journalwatch reports to. ''; }; @@ -91,7 +91,7 @@ in { mailBinary = mkOption { type = types.path; default = "/run/wrappers/bin/sendmail"; - description = '' + description = lib.mdDoc '' Sendmail-compatible binary to be used to send the messages. ''; }; @@ -99,10 +99,10 @@ in { extraConfig = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Extra lines to be added verbatim to the journalwatch/config configuration file. You can add any commandline argument to the config, without the '--'. - See journalwatch --help for all arguments and their description. + See `journalwatch --help` for all arguments and their description. ''; }; @@ -112,12 +112,12 @@ in { match = mkOption { type = types.str; example = "SYSLOG_IDENTIFIER = systemd"; - description = '' - Syntax: field = value - Specifies the log entry field this block should apply to. - If the field of a message matches this value, - this patternBlock's are applied. - If value starts and ends with a slash, it is interpreted as + description = lib.mdDoc '' + Syntax: `field = value` + Specifies the log entry `field` this block should apply to. + If the `field` of a message matches this `value`, + this patternBlock's {option}`filters` are applied. + If `value` starts and ends with a slash, it is interpreted as an extended python regular expression, if not, it's an exact match. The journal fields are explained in systemd.journal-fields(7). ''; @@ -129,8 +129,8 @@ in { (Stopped|Stopping|Starting|Started) .* (Reached target|Stopped target) .* ''; - description = '' - The filters to apply on all messages which satisfy . + description = lib.mdDoc '' + The filters to apply on all messages which satisfy {option}`match`. Any of those messages that match any specified filter will be removed from journalwatch's output. Each filter is an extended Python regular expression. You can specify multiple filters and separate them by newlines. @@ -175,7 +175,7 @@ in { ]; - description = '' + description = lib.mdDoc '' filterBlocks can be defined to blacklist journal messages which are not errors. Each block matches on a log entry field, and the filters in that block then are matched against all messages with a matching log entry field. @@ -191,7 +191,7 @@ in { interval = mkOption { type = types.str; default = "hourly"; - description = '' + description = lib.mdDoc '' How often to run journalwatch. The format is described in systemd.time(7). @@ -200,7 +200,7 @@ in { accuracy = mkOption { type = types.str; default = "10min"; - description = '' + description = lib.mdDoc '' The time window around the interval in which the journalwatch run will be scheduled. The format is described in systemd.time(7). diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logcheck.nix b/third_party/nixpkgs/nixos/modules/services/logging/logcheck.nix index c8738b734f..b1279f0fe5 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logcheck.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logcheck.nix @@ -56,7 +56,7 @@ let levelOption = mkOption { default = "server"; type = types.enum [ "workstation" "server" "paranoid" ]; - description = '' + description = lib.mdDoc '' Set the logcheck level. ''; }; @@ -68,7 +68,7 @@ let regex = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Regex specifying which log lines to ignore. ''; }; @@ -80,7 +80,7 @@ let user = mkOption { default = "root"; type = types.str; - description = '' + description = lib.mdDoc '' User that runs the cronjob. ''; }; @@ -88,7 +88,7 @@ let cmdline = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Command line for the cron job. Will be turned into a regex for the logcheck ignore rule. ''; }; @@ -97,7 +97,7 @@ let default = null; type = types.nullOr (types.str); example = "02 06 * * *"; - description = '' + description = lib.mdDoc '' "min hr dom mon dow" crontab time args, to auto-create a cronjob too. Leave at null to not do this and just add a logcheck ignore rule. ''; @@ -112,7 +112,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable the logcheck cron job. ''; }; @@ -120,7 +120,7 @@ in user = mkOption { default = "logcheck"; type = types.str; - description = '' + description = lib.mdDoc '' Username for the logcheck user. ''; }; @@ -129,7 +129,7 @@ in default = "*"; example = "6"; type = types.str; - description = '' + description = lib.mdDoc '' Time of day to run logcheck. A logcheck will be scheduled at xx:02 each day. Leave default (*) to run every hour. Of course when nothing special was logged, logcheck will be silent. @@ -140,7 +140,7 @@ in default = "root"; example = "you@domain.com"; type = types.str; - description = '' + description = lib.mdDoc '' Email address to send reports to. ''; }; @@ -148,7 +148,7 @@ in level = mkOption { default = "server"; type = types.str; - description = '' + description = lib.mdDoc '' Set the logcheck level. Either "workstation", "server", or "paranoid". ''; }; @@ -156,7 +156,7 @@ in config = mkOption { default = "FQDN=1"; type = types.lines; - description = '' + description = lib.mdDoc '' Config options that you would like in logcheck.conf. ''; }; @@ -165,7 +165,7 @@ in default = [ "/var/log/messages" ]; type = types.listOf types.path; example = [ "/var/log/messages" "/var/log/mail" ]; - description = '' + description = lib.mdDoc '' Which log files to check. ''; }; @@ -174,14 +174,14 @@ in default = []; example = [ "/etc/logcheck" ]; type = types.listOf types.path; - description = '' + description = lib.mdDoc '' Directories with extra rules. ''; }; ignore = mkOption { default = {}; - description = '' + description = lib.mdDoc '' This option defines extra ignore rules. ''; type = with types; attrsOf (submodule ignoreOptions); @@ -189,7 +189,7 @@ in ignoreCron = mkOption { default = {}; - description = '' + description = lib.mdDoc '' This option defines extra ignore rules for cronjobs. ''; type = with types; attrsOf (submodule ignoreCronOptions); @@ -199,7 +199,7 @@ in default = []; type = types.listOf types.str; example = [ "postdrop" "mongodb" ]; - description = '' + description = lib.mdDoc '' Extra groups for the logcheck user, for example to be able to use sendmail, or to access certain log files. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix index 893d951ee2..53230cc51e 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logrotate.nix @@ -13,7 +13,7 @@ let enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable log rotation for this path. This can be used to explicitly disable logging that has been configured by NixOS. ''; @@ -28,7 +28,7 @@ let type = with types; either str (listOf str); default = name; defaultText = "attribute name"; - description = '' + description = lib.mdDoc '' The path to log files to be rotated. Spaces are allowed and normal shell quoting rules apply, with ', ", and \ characters supported. @@ -38,7 +38,7 @@ let user = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The user account to use for rotation. ''; }; @@ -46,7 +46,7 @@ let group = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The group to use for rotation. ''; }; @@ -54,7 +54,7 @@ let frequency = mkOption { type = types.enum [ "hourly" "daily" "weekly" "monthly" "yearly" ]; default = "daily"; - description = '' + description = lib.mdDoc '' How often to rotate the logs. ''; }; @@ -62,7 +62,7 @@ let keep = mkOption { type = types.int; default = 20; - description = '' + description = lib.mdDoc '' How many rotations to keep. ''; }; @@ -70,9 +70,9 @@ let extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra logrotate config options for this path. Refer to - for details. + for details. ''; }; @@ -212,11 +212,11 @@ in settings = mkOption { default = { }; - description = '' + description = lib.mdDoc '' logrotate freeform settings: each attribute here will define its own section, ordered by priority, which can either define files to rotate with their settings or settings common to all further files settings. - Refer to for details. + Refer to for details. ''; type = types.attrsOf (types.submodule ({ name, ... }: { freeformType = with types; attrsOf (nullOr (oneOf [ int bool str ])); @@ -229,7 +229,7 @@ in global = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether this setting is a global option or not: set to have these settings apply to all files settings with a higher priority. ''; @@ -240,7 +240,7 @@ in defaultText = '' The attrset name if not specified ''; - description = '' + description = lib.mdDoc '' Single or list of files for which rules are defined. The files are quoted with double-quotes in logrotate configuration, so globs and spaces are supported. @@ -251,7 +251,7 @@ in frequency = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' How often to rotate the logs. Defaults to previously set global setting, which itself defauts to weekly. ''; @@ -276,9 +276,9 @@ in defaultText = '' A configuration file automatically generated by NixOS. ''; - description = '' + description = lib.mdDoc '' Override the configuration file used by MySQL. By default, - NixOS generates one automatically from . + NixOS generates one automatically from [](#opt-services.logrotate.settings). ''; example = literalExpression '' pkgs.writeText "logrotate.conf" ''' @@ -294,7 +294,7 @@ in checkConfig = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the config should be checked at build time. Some options are not checkable at build time because of the build sandbox: @@ -304,7 +304,7 @@ in and users are replaced by dummy users), so tests are complemented by a logrotate-checkconf service that is enabled by default. This extra check can be disabled by disabling it at the systemd level with the - option. + {option}`services.systemd.services.logrotate-checkconf.enable` option. Conversely there are still things that might make this check fail incorrectly (e.g. a file path where we don't have access to intermediate directories): @@ -346,11 +346,11 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra contents to append to the logrotate configuration file. Refer to - for details. + for details. This setting has been deprecated in favor of - logrotate settings. + [logrotate settings](#opt-services.logrotate.settings). ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix b/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix index 5d00feabe1..e9e3ae1f14 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/logstash.nix @@ -51,27 +51,27 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable logstash."; + description = lib.mdDoc "Enable logstash."; }; package = mkOption { type = types.package; default = pkgs.logstash; defaultText = literalExpression "pkgs.logstash"; - description = "Logstash package to use."; + description = lib.mdDoc "Logstash package to use."; }; plugins = mkOption { type = types.listOf types.path; default = [ ]; example = literalExpression "[ pkgs.logstash-contrib ]"; - description = "The paths to find other logstash plugins in."; + description = lib.mdDoc "The paths to find other logstash plugins in."; }; dataDir = mkOption { type = types.str; default = "/var/lib/logstash"; - description = '' + description = lib.mdDoc '' A path to directory writable by logstash that it uses to store data. Plugins will also have access to this path. ''; @@ -80,31 +80,31 @@ in logLevel = mkOption { type = types.enum [ "debug" "info" "warn" "error" "fatal" ]; default = "warn"; - description = "Logging verbosity level."; + description = lib.mdDoc "Logging verbosity level."; }; filterWorkers = mkOption { type = types.int; default = 1; - description = "The quantity of filter workers to run."; + description = lib.mdDoc "The quantity of filter workers to run."; }; listenAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = "Address on which to start webserver."; + description = lib.mdDoc "Address on which to start webserver."; }; port = mkOption { type = types.str; default = "9292"; - description = "Port on which to start webserver."; + description = lib.mdDoc "Port on which to start webserver."; }; inputConfig = mkOption { type = types.lines; default = "generator { }"; - description = "Logstash input configuration."; + description = lib.mdDoc "Logstash input configuration."; example = literalExpression '' ''' # Read from journal @@ -119,7 +119,7 @@ in filterConfig = mkOption { type = types.lines; default = ""; - description = "logstash filter configuration."; + description = lib.mdDoc "logstash filter configuration."; example = '' if [type] == "syslog" { # Keep only relevant systemd fields @@ -137,7 +137,7 @@ in outputConfig = mkOption { type = types.lines; default = "stdout { codec => rubydebug }"; - description = "Logstash output configuration."; + description = lib.mdDoc "Logstash output configuration."; example = '' redis { host => ["localhost"] data_type => "list" key => "logstash" codec => json } elasticsearch { } @@ -147,7 +147,7 @@ in extraSettings = mkOption { type = types.lines; default = ""; - description = "Extra Logstash settings in YAML format."; + description = lib.mdDoc "Extra Logstash settings in YAML format."; example = '' pipeline: batch: @@ -159,7 +159,7 @@ in extraJvmOptions = mkOption { type = types.lines; default = ""; - description = "Extra JVM options, one per line (jvm.options format)."; + description = lib.mdDoc "Extra JVM options, one per line (jvm.options format)."; example = '' -Xms2g -Xmx2g diff --git a/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix b/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix index a34bc07b6a..bdf98322fa 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix @@ -17,7 +17,7 @@ in { configuration = mkOption { type = (pkgs.formats.json {}).type; - description = '' + description = lib.mdDoc '' Specify the configuration for Promtail in Nix. ''; }; @@ -26,7 +26,7 @@ in { type = listOf str; default = []; example = [ "--server.http-listen-port=3101" ]; - description = '' + description = lib.mdDoc '' Specify a list of additional command line flags, which get escaped and are then passed to Loki. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/rsyslogd.nix b/third_party/nixpkgs/nixos/modules/services/logging/rsyslogd.nix index b924d94e0b..21d6482d9f 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/rsyslogd.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/rsyslogd.nix @@ -39,7 +39,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable syslogd. Note that systemd also logs syslog messages, so you normally don't need to run syslogd. ''; @@ -69,8 +69,8 @@ in type = types.listOf types.str; default = [ ]; example = [ "-m 0" ]; - description = '' - Additional parameters passed to rsyslogd. + description = lib.mdDoc '' + Additional parameters passed to {command}`rsyslogd`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/syslog-ng.nix b/third_party/nixpkgs/nixos/modules/services/logging/syslog-ng.nix index 1c11de51f2..d22acbeaa7 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/syslog-ng.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/syslog-ng.nix @@ -36,7 +36,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the syslog-ng daemon. ''; }; @@ -44,24 +44,24 @@ in { type = types.package; default = pkgs.syslogng; defaultText = literalExpression "pkgs.syslogng"; - description = '' + description = lib.mdDoc '' The package providing syslog-ng binaries. ''; }; extraModulePaths = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' A list of paths that should be included in syslog-ng's - --module-path option. They should usually - end in /lib/syslog-ng + `--module-path` option. They should usually + end in `/lib/syslog-ng` ''; }; extraConfig = mkOption { type = types.lines; default = ""; - description = '' - Configuration added to the end of syslog-ng.conf. + description = lib.mdDoc '' + Configuration added to the end of `syslog-ng.conf`. ''; }; configHeader = mkOption { @@ -70,7 +70,7 @@ in { @version: 3.6 @include "scl.conf" ''; - description = '' + description = lib.mdDoc '' The very first lines of the configuration file. Should usually contain the syslog-ng version header. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/syslogd.nix b/third_party/nixpkgs/nixos/modules/services/logging/syslogd.nix index fe0b049081..a51bf08e5d 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/syslogd.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/syslogd.nix @@ -39,7 +39,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable syslogd. Note that systemd also logs syslog messages, so you normally don't need to run syslogd. ''; @@ -48,7 +48,7 @@ in tty = mkOption { type = types.str; default = "tty10"; - description = '' + description = lib.mdDoc '' The tty device on which syslogd will print important log messages. Leave this option blank to disable tty logging. ''; @@ -67,7 +67,7 @@ in enableNetworkInput = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Accept logging through UDP. Option -r of syslogd(8). ''; }; @@ -86,8 +86,8 @@ in type = types.listOf types.str; default = [ ]; example = [ "-m 0" ]; - description = '' - Additional parameters passed to syslogd. + description = lib.mdDoc '' + Additional parameters passed to {command}`syslogd`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/vector.nix b/third_party/nixpkgs/nixos/modules/services/logging/vector.nix index be36b2a41b..93d8550c31 100644 --- a/third_party/nixpkgs/nixos/modules/services/logging/vector.nix +++ b/third_party/nixpkgs/nixos/modules/services/logging/vector.nix @@ -11,7 +11,7 @@ in journaldAccess = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable Vector to access journald. ''; }; @@ -19,7 +19,7 @@ in settings = mkOption { type = (pkgs.formats.json { }).type; default = { }; - description = '' + description = lib.mdDoc '' Specify the configuration for Vector in Nix. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/clamsmtp.nix b/third_party/nixpkgs/nixos/modules/services/mail/clamsmtp.nix index fc1267c5d2..a0de259628 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/clamsmtp.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/clamsmtp.nix @@ -12,17 +12,17 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable clamsmtp."; + description = lib.mdDoc "Whether to enable clamsmtp."; }; instances = mkOption { - description = "Instances of clamsmtp to run."; + description = lib.mdDoc "Instances of clamsmtp to run."; type = types.listOf (types.submodule { options = { action = mkOption { type = types.enum [ "bounce" "drop" "pass" ]; default = "drop"; description = - '' + lib.mdDoc '' Action to take when a virus is detected. Note that viruses often spoof sender addresses, so bouncing is @@ -35,7 +35,7 @@ in default = ""; example = "X-Virus-Scanned: ClamAV using ClamSMTP"; description = - '' + lib.mdDoc '' A header to add to scanned messages. See clamsmtpd.conf(5) for more details. Empty means no header. ''; @@ -45,7 +45,7 @@ in type = types.int; default = 0; description = - '' + lib.mdDoc '' Number of seconds to wait between each NOOP sent to the sending server. 0 to disable. @@ -58,7 +58,7 @@ in type = types.str; example = "127.0.0.1:10025"; description = - '' + lib.mdDoc '' Address to wait for incoming SMTP connections on. See clamsmtpd.conf(5) for more details. ''; @@ -68,7 +68,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Whether to quarantine files that contain viruses by leaving them in the temporary directory. ''; @@ -77,13 +77,13 @@ in maxConnections = mkOption { type = types.int; default = 64; - description = "Maximum number of connections to accept at once."; + description = lib.mdDoc "Maximum number of connections to accept at once."; }; outAddress = mkOption { type = types.str; description = - '' + lib.mdDoc '' Address of the SMTP server to send email to once it has been scanned. ''; @@ -93,7 +93,7 @@ in type = types.str; default = "/tmp"; description = - '' + lib.mdDoc '' Temporary directory that needs to be accessible to both clamd and clamsmtpd. ''; @@ -102,20 +102,20 @@ in timeout = mkOption { type = types.int; default = 180; - description = "Time-out for network connections."; + description = lib.mdDoc "Time-out for network connections."; }; transparentProxy = mkOption { type = types.bool; default = false; - description = "Enable clamsmtp's transparent proxy support."; + description = lib.mdDoc "Enable clamsmtp's transparent proxy support."; }; virusAction = mkOption { type = with types; nullOr path; default = null; description = - '' + lib.mdDoc '' Command to run when a virus is found. Please see VIRUS ACTION in clamsmtpd(8) for a discussion of this option and its safe use. ''; @@ -125,7 +125,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Send the XCLIENT command to the receiving server, for forwarding client addresses and connection information if the receiving server supports this feature. diff --git a/third_party/nixpkgs/nixos/modules/services/mail/davmail.nix b/third_party/nixpkgs/nixos/modules/services/mail/davmail.nix index e9f31e6fb3..a01d8758c0 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/davmail.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/davmail.nix @@ -29,17 +29,17 @@ in url = mkOption { type = types.str; - description = "Outlook Web Access URL to access the exchange server, i.e. the base webmail URL."; + description = lib.mdDoc "Outlook Web Access URL to access the exchange server, i.e. the base webmail URL."; example = "https://outlook.office365.com/EWS/Exchange.asmx"; }; config = mkOption { type = configType; default = {}; - description = '' + description = lib.mdDoc '' Davmail configuration. Refer to - - and + + and for details on supported values. ''; example = literalExpression '' diff --git a/third_party/nixpkgs/nixos/modules/services/mail/dkimproxy-out.nix b/third_party/nixpkgs/nixos/modules/services/mail/dkimproxy-out.nix index f4ac9e4700..aa465891db 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/dkimproxy-out.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/dkimproxy-out.nix @@ -15,7 +15,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Whether to enable dkimproxy_out. Note that a key will be auto-generated, and can be found in @@ -26,19 +26,19 @@ in listen = mkOption { type = types.str; example = "127.0.0.1:10027"; - description = "Address:port DKIMproxy should listen on."; + description = lib.mdDoc "Address:port DKIMproxy should listen on."; }; relay = mkOption { type = types.str; example = "127.0.0.1:10028"; - description = "Address:port DKIMproxy should forward mail to."; + description = lib.mdDoc "Address:port DKIMproxy should forward mail to."; }; domains = mkOption { type = with types; listOf str; example = [ "example.org" "example.com" ]; - description = "List of domains DKIMproxy can sign for."; + description = lib.mdDoc "List of domains DKIMproxy can sign for."; }; selector = mkOption { @@ -59,7 +59,7 @@ in type = types.int; default = 2048; description = - '' + lib.mdDoc '' Size of the RSA key to use to sign outgoing emails. Note that the maximum mandatorily verified as per RFC6376 is 2048. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix index a8c1f17678..4caf8dbfd2 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix @@ -137,25 +137,25 @@ let example = "Spam"; default = name; readOnly = true; - description = "The name of the mailbox."; + description = lib.mdDoc "The name of the mailbox."; }; auto = mkOption { type = types.enum [ "no" "create" "subscribe" ]; default = "no"; example = "subscribe"; - description = "Whether to automatically create or create and subscribe to the mailbox or not."; + description = lib.mdDoc "Whether to automatically create or create and subscribe to the mailbox or not."; }; specialUse = mkOption { type = types.nullOr (types.enum [ "All" "Archive" "Drafts" "Flagged" "Junk" "Sent" "Trash" ]); default = null; example = "Junk"; - description = "Null if no special use flag is set. Other than that every use flag mentioned in the RFC is valid."; + description = lib.mdDoc "Null if no special use flag is set. Other than that every use flag mentioned in the RFC is valid."; }; autoexpunge = mkOption { type = types.nullOr types.str; default = null; example = "60d"; - description = '' + description = lib.mdDoc '' To automatically remove all email from the mailbox which is older than the specified time. ''; @@ -180,26 +180,26 @@ in protocols = mkOption { type = types.listOf types.str; default = []; - description = "Additional listeners to start when Dovecot is enabled."; + description = lib.mdDoc "Additional listeners to start when Dovecot is enabled."; }; user = mkOption { type = types.str; default = "dovecot2"; - description = "Dovecot user name."; + description = lib.mdDoc "Dovecot user name."; }; group = mkOption { type = types.str; default = "dovecot2"; - description = "Dovecot group name."; + description = lib.mdDoc "Dovecot group name."; }; extraConfig = mkOption { type = types.lines; default = ""; example = "mail_debug = yes"; - description = "Additional entries to put verbatim into Dovecot's config file."; + description = lib.mdDoc "Additional entries to put verbatim into Dovecot's config file."; }; mailPlugins = @@ -209,7 +209,7 @@ in enable = mkOption { type = types.listOf types.str; default = []; - description = "mail plugins to enable as a list of strings to append to the ${hint} $mail_plugins configuration variable"; + description = lib.mdDoc "mail plugins to enable as a list of strings to append to the ${hint} `$mail_plugins` configuration variable"; }; }; }; @@ -218,20 +218,20 @@ in type = with types; submodule { options = { globally = mkOption { - description = "Additional entries to add to the mail_plugins variable for all protocols"; + description = lib.mdDoc "Additional entries to add to the mail_plugins variable for all protocols"; type = plugins "top-level"; example = { enable = [ "virtual" ]; }; default = { enable = []; }; }; perProtocol = mkOption { - description = "Additional entries to add to the mail_plugins variable, per protocol"; + description = lib.mdDoc "Additional entries to add to the mail_plugins variable, per protocol"; type = attrsOf (plugins "corresponding per-protocol"); default = {}; example = { imap = [ "imap_acl" ]; }; }; }; }; - description = "Additional entries to add to the mail_plugins variable, globally and per protocol"; + description = lib.mdDoc "Additional entries to add to the mail_plugins variable, globally and per protocol"; example = { globally.enable = [ "acl" ]; perProtocol.imap.enable = [ "imap_acl" ]; @@ -242,7 +242,7 @@ in configFile = mkOption { type = types.nullOr types.path; default = null; - description = "Config file used for the whole dovecot configuration."; + description = lib.mdDoc "Config file used for the whole dovecot configuration."; apply = v: if v != null then v else pkgs.writeText "dovecot.conf" dovecotConf; }; @@ -250,7 +250,7 @@ in type = types.str; default = "maildir:/var/spool/mail/%u"; /* Same as inbox, as postfix */ example = "maildir:~/mail:INBOX=/var/spool/mail/%u"; - description = '' + description = lib.mdDoc '' Location that dovecot will use for mail folders. Dovecot mail_location option. ''; }; @@ -258,13 +258,13 @@ in mailUser = mkOption { type = types.nullOr types.str; default = null; - description = "Default user to store mail for virtual users."; + description = lib.mdDoc "Default user to store mail for virtual users."; }; mailGroup = mkOption { type = types.nullOr types.str; default = null; - description = "Default group to store mail for virtual users."; + description = lib.mdDoc "Default group to store mail for virtual users."; }; createMailUser = mkEnableOption ''automatically creating the user @@ -275,7 +275,7 @@ in type = types.listOf types.package; default = []; example = literalExpression "[ pkgs.dovecot_pigeonhole ]"; - description = '' + description = lib.mdDoc '' Symlinks the contents of lib/dovecot of every given package into /etc/dovecot/modules. This will make the given modules available if a dovecot package with the module_dir patch applied is being used. @@ -285,19 +285,19 @@ in sslCACert = mkOption { type = types.nullOr types.str; default = null; - description = "Path to the server's CA certificate key."; + description = lib.mdDoc "Path to the server's CA certificate key."; }; sslServerCert = mkOption { type = types.nullOr types.str; default = null; - description = "Path to the server's public key."; + description = lib.mdDoc "Path to the server's public key."; }; sslServerKey = mkOption { type = types.nullOr types.str; default = null; - description = "Path to the server's private key."; + description = lib.mdDoc "Path to the server's private key."; }; enablePAM = mkEnableOption "creating a own Dovecot PAM service and configure PAM user logins." // { default = true; }; @@ -307,7 +307,7 @@ in sieveScripts = mkOption { type = types.attrsOf types.path; default = {}; - description = "Sieve scripts to be executed. Key is a sequence, e.g. 'before2', 'after' etc."; + description = lib.mdDoc "Sieve scripts to be executed. Key is a sequence, e.g. 'before2', 'after' etc."; }; showPAMFailure = mkEnableOption "showing the PAM failure message on authentication error (useful for OTPW)."; @@ -323,7 +323,7 @@ in Spam = { specialUse = "Junk"; auto = "create"; }; } ''; - description = "Configure mailboxes and auto create or subscribe them."; + description = lib.mdDoc "Configure mailboxes and auto create or subscribe them."; }; enableQuota = mkEnableOption "the dovecot quota service."; @@ -331,7 +331,7 @@ in quotaPort = mkOption { type = types.str; default = "12340"; - description = '' + description = lib.mdDoc '' The Port the dovecot quota service binds to. If using postfix, add check_policy_service inet:localhost:12340 to your smtpd_recipient_restrictions in your postfix config. ''; @@ -340,7 +340,7 @@ in type = types.str; default = "100G"; example = "10G"; - description = "Quota limit for the user in bytes. Supports suffixes b, k, M, G, T and %."; + description = lib.mdDoc "Quota limit for the user in bytes. Supports suffixes b, k, M, G, T and %."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/dspam.nix b/third_party/nixpkgs/nixos/modules/services/mail/dspam.nix index 766ebc8095..4fccd452a4 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/dspam.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/dspam.nix @@ -38,43 +38,43 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the dspam spam filter."; + description = lib.mdDoc "Whether to enable the dspam spam filter."; }; user = mkOption { type = types.str; default = "dspam"; - description = "User for the dspam daemon."; + description = lib.mdDoc "User for the dspam daemon."; }; group = mkOption { type = types.str; default = "dspam"; - description = "Group for the dspam daemon."; + description = lib.mdDoc "Group for the dspam daemon."; }; storageDriver = mkOption { type = types.str; default = "hash"; - description = "Storage driver backend to use for dspam."; + description = lib.mdDoc "Storage driver backend to use for dspam."; }; domainSocket = mkOption { type = types.nullOr types.path; default = defaultSock; - description = "Path to local domain socket which is used for communication with the daemon. Set to null to disable UNIX socket."; + description = lib.mdDoc "Path to local domain socket which is used for communication with the daemon. Set to null to disable UNIX socket."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Additional dspam configuration."; + description = lib.mdDoc "Additional dspam configuration."; }; maintenanceInterval = mkOption { type = types.nullOr types.str; default = null; - description = "If set, maintenance script will be run at specified (in systemd.timer format) interval"; + description = lib.mdDoc "If set, maintenance script will be run at specified (in systemd.timer format) interval"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/exim.nix b/third_party/nixpkgs/nixos/modules/services/mail/exim.nix index 7356db2b6a..cd0da4fc50 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/exim.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/exim.nix @@ -17,13 +17,13 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the Exim mail transfer agent."; + description = lib.mdDoc "Whether to enable the Exim mail transfer agent."; }; config = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Verbatim Exim configuration. This should not contain exim_user, exim_group, exim_path, or spool_directory. ''; @@ -32,7 +32,7 @@ in user = mkOption { type = types.str; default = "exim"; - description = '' + description = lib.mdDoc '' User to use when no root privileges are required. In particular, this applies when receiving messages and when doing remote deliveries. (Local deliveries run as various non-root users, @@ -44,7 +44,7 @@ in group = mkOption { type = types.str; default = "exim"; - description = '' + description = lib.mdDoc '' Group to use when no root privileges are required. ''; }; @@ -52,7 +52,7 @@ in spoolDir = mkOption { type = types.path; default = "/var/spool/exim"; - description = '' + description = lib.mdDoc '' Location of the spool directory of exim. ''; }; @@ -61,7 +61,7 @@ in type = types.package; default = pkgs.exim; defaultText = literalExpression "pkgs.exim"; - description = '' + description = lib.mdDoc '' The Exim derivation to use. This can be used to enable features such as LDAP or PAM support. ''; @@ -70,7 +70,7 @@ in queueRunnerInterval = mkOption { type = types.str; default = "5m"; - description = '' + description = lib.mdDoc '' How often to spawn a new queue runner. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/maddy.nix b/third_party/nixpkgs/nixos/modules/services/mail/maddy.nix index 0b06905ac6..2f9abd3ed1 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/maddy.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/maddy.nix @@ -173,7 +173,7 @@ in { default = "localhost"; type = with types; uniq string; example = ''example.com''; - description = '' + description = lib.mdDoc '' Hostname to use. It should be FQDN. ''; }; @@ -182,7 +182,7 @@ in { default = "localhost"; type = with types; uniq string; example = ''mail.example.com''; - description = '' + description = lib.mdDoc '' Primary MX domain to use. It should be FQDN. ''; }; @@ -195,7 +195,7 @@ in { "example.com" "other.example.com" ]; - description = '' + description = lib.mdDoc '' Define list of allowed domains. ''; }; @@ -217,7 +217,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open the configured incoming and outgoing mail server ports. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailcatcher.nix b/third_party/nixpkgs/nixos/modules/services/mail/mailcatcher.nix index 84f06ed199..01f3a9776b 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/mailcatcher.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/mailcatcher.nix @@ -16,32 +16,32 @@ in http.ip = mkOption { type = types.str; default = "127.0.0.1"; - description = "The ip address of the http server."; + description = lib.mdDoc "The ip address of the http server."; }; http.port = mkOption { type = types.port; default = 1080; - description = "The port address of the http server."; + description = lib.mdDoc "The port address of the http server."; }; http.path = mkOption { type = with types; nullOr str; default = null; - description = "Prefix to all HTTP paths."; + description = lib.mdDoc "Prefix to all HTTP paths."; example = "/mailcatcher"; }; smtp.ip = mkOption { type = types.str; default = "127.0.0.1"; - description = "The ip address of the smtp server."; + description = lib.mdDoc "The ip address of the smtp server."; }; smtp.port = mkOption { type = types.port; default = 1025; - description = "The port address of the smtp server."; + description = lib.mdDoc "The port address of the smtp server."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailhog.nix b/third_party/nixpkgs/nixos/modules/services/mail/mailhog.nix index b113f4ff3d..defc58b806 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/mailhog.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/mailhog.nix @@ -32,31 +32,31 @@ in storage = mkOption { type = types.enum [ "maildir" "memory" ]; default = "memory"; - description = "Store mails on disk or in memory."; + description = lib.mdDoc "Store mails on disk or in memory."; }; apiPort = mkOption { type = types.port; default = 8025; - description = "Port on which the API endpoint will listen."; + description = lib.mdDoc "Port on which the API endpoint will listen."; }; smtpPort = mkOption { type = types.port; default = 1025; - description = "Port on which the SMTP endpoint will listen."; + description = lib.mdDoc "Port on which the SMTP endpoint will listen."; }; uiPort = mkOption { type = types.port; default = 8025; - description = "Port on which the HTTP UI will listen."; + description = lib.mdDoc "Port on which the HTTP UI will listen."; }; extraArgs = mkOption { type = types.listOf types.str; default = []; - description = "List of additional arguments to pass to the MailHog process."; + description = lib.mdDoc "List of additional arguments to pass to the MailHog process."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix index 11ea169fe2..c76d40a68c 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/mailman.nix @@ -44,7 +44,13 @@ let transport_file_type: hash ''; - mailmanCfg = lib.generators.toINI {} cfg.settings; + mailmanCfg = lib.generators.toINI {} + (recursiveUpdate cfg.settings + ((optionalAttrs (cfg.restApiPassFile != null) { + webservice.admin_pass = "#NIXOS_MAILMAN_REST_API_PASS_SECRET#"; + }))); + + mailmanCfgFile = pkgs.writeText "mailman-raw.cfg" mailmanCfg; mailmanHyperkittyCfg = pkgs.writeText "mailman-hyperkitty.cfg" '' [general] @@ -84,7 +90,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Enable Mailman on this host. Requires an active MTA on the host (e.g. Postfix)."; + description = lib.mdDoc "Enable Mailman on this host. Requires an active MTA on the host (e.g. Postfix)."; }; ldap = { @@ -92,30 +98,30 @@ in { serverUri = mkOption { type = types.str; example = "ldaps://ldap.host"; - description = '' + description = lib.mdDoc '' LDAP host to connect against. ''; }; bindDn = mkOption { type = types.str; example = "cn=root,dc=nixos,dc=org"; - description = '' + description = lib.mdDoc '' Service account to bind against. ''; }; bindPasswordFile = mkOption { type = types.str; example = "/run/secrets/ldap-bind"; - description = '' + description = lib.mdDoc '' Path to the file containing the bind password of the servie account - defined by . + defined by [](#opt-services.mailman.ldap.bindDn). ''; }; superUserGroup = mkOption { type = types.nullOr types.str; default = null; example = "cn=admin,ou=groups,dc=nixos,dc=org"; - description = '' + description = lib.mdDoc '' Group where a user must be a member of to gain superuser rights. ''; }; @@ -123,14 +129,14 @@ in { query = mkOption { type = types.str; example = "(&(objectClass=inetOrgPerson)(|(uid=%(user)s)(mail=%(user)s)))"; - description = '' + description = lib.mdDoc '' Query to find a user in the LDAP database. ''; }; ou = mkOption { type = types.str; example = "ou=users,dc=nixos,dc=org"; - description = '' + description = lib.mdDoc '' Organizational unit to look up a user. ''; }; @@ -144,21 +150,21 @@ in { ]; default = "posixGroup"; apply = v: "${toUpper (substring 0 1 v)}${substring 1 (stringLength v) v}Type"; - description = '' + description = lib.mdDoc '' Type of group to perform a group search against. ''; }; query = mkOption { type = types.str; example = "(objectClass=groupOfNames)"; - description = '' + description = lib.mdDoc '' Query to find a group associated to a user in the LDAP database. ''; }; ou = mkOption { type = types.str; example = "ou=groups,dc=nixos,dc=org"; - description = '' + description = lib.mdDoc '' Organizational unit to look up a group. ''; }; @@ -167,29 +173,29 @@ in { username = mkOption { default = "uid"; type = types.str; - description = '' - LDAP-attribute that corresponds to the username-attribute in mailman. + description = lib.mdDoc '' + LDAP-attribute that corresponds to the `username`-attribute in mailman. ''; }; firstName = mkOption { default = "givenName"; type = types.str; - description = '' - LDAP-attribute that corresponds to the firstName-attribute in mailman. + description = lib.mdDoc '' + LDAP-attribute that corresponds to the `firstName`-attribute in mailman. ''; }; lastName = mkOption { default = "sn"; type = types.str; - description = '' - LDAP-attribute that corresponds to the lastName-attribute in mailman. + description = lib.mdDoc '' + LDAP-attribute that corresponds to the `lastName`-attribute in mailman. ''; }; email = mkOption { default = "mail"; type = types.str; - description = '' - LDAP-attribute that corresponds to the email-attribute in mailman. + description = lib.mdDoc '' + LDAP-attribute that corresponds to the `email`-attribute in mailman. ''; }; }; @@ -199,7 +205,7 @@ in { type = types.bool; default = true; example = false; - description = '' + description = lib.mdDoc '' Enable Postfix integration. Requires an active Postfix installation. If you want to use another MTA, set this option to false and configure @@ -212,7 +218,7 @@ in { siteOwner = mkOption { type = types.str; example = "postmaster@example.org"; - description = '' + description = lib.mdDoc '' Certain messages that must be delivered to a human, but which can't be delivered to a list owner (e.g. a bounce from a list owner), will be sent to this address. It should point to a human. @@ -222,7 +228,7 @@ in { webHosts = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' The list of hostnames and/or IP addresses from which the Mailman Web UI will accept requests. By default, "localhost" and "127.0.0.1" are enabled. All additional names under which your web server accepts @@ -234,7 +240,7 @@ in { webUser = mkOption { type = types.str; default = "mailman-web"; - description = '' + description = lib.mdDoc '' User to run mailman-web as ''; }; @@ -242,23 +248,31 @@ in { webSettings = mkOption { type = types.attrs; default = {}; - description = '' + description = lib.mdDoc '' Overrides for the default mailman-web Django settings. ''; }; + restApiPassFile = mkOption { + default = null; + type = types.nullOr types.str; + description = lib.mdDoc '' + Path to the file containing the value for `MAILMAN_REST_API_PASS`. + ''; + }; + serve = { enable = mkEnableOption "Automatic nginx and uwsgi setup for mailman-web"; }; extraPythonPackages = mkOption { - description = "Packages to add to the python environment used by mailman and mailman-web"; + description = lib.mdDoc "Packages to add to the python environment used by mailman and mailman-web"; type = types.listOf types.package; default = []; }; settings = mkOption { - description = "Settings for mailman.cfg"; + description = lib.mdDoc "Settings for mailman.cfg"; type = types.attrsOf (types.attrsOf types.str); default = {}; }; @@ -269,7 +283,7 @@ in { baseUrl = mkOption { type = types.str; default = "http://localhost:18507/archives/"; - description = '' + description = lib.mdDoc '' Where can Mailman connect to Hyperkitty's internal API, preferably on localhost? ''; @@ -363,8 +377,6 @@ in { }; users.groups.mailman = {}; - environment.etc."mailman.cfg".text = mailmanCfg; - environment.etc."mailman3/settings.py".text = '' import os @@ -383,6 +395,11 @@ in { with open('/var/lib/mailman-web/settings_local.json') as f: globals().update(json.load(f)) + ${optionalString (cfg.restApiPassFile != null) '' + with open('${cfg.restApiPassFile}') as f: + MAILMAN_REST_API_PASS = f.read().rstrip('\n') + ''} + ${optionalString (cfg.ldap.enable) '' import ldap from django_auth_ldap.config import LDAPSearch, ${cfg.ldap.groupSearch.type} @@ -456,7 +473,7 @@ in { after = [ "network.target" ] ++ lib.optional cfg.enablePostfix "postfix-setup.service" ++ lib.optional withPostgresql "postgresql.service"; - restartTriggers = [ config.environment.etc."mailman.cfg".source ]; + restartTriggers = [ mailmanCfgFile ]; requires = optional withPostgresql "postgresql.service"; wantedBy = [ "multi-user.target" ]; serviceConfig = { @@ -480,6 +497,14 @@ in { requires = optional withPostgresql "postgresql.service"; serviceConfig.Type = "oneshot"; script = '' + install -m0750 -o mailman -g mailman ${mailmanCfgFile} /etc/mailman.cfg + ${optionalString (cfg.restApiPassFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret \ + '#NIXOS_MAILMAN_REST_API_PASS_SECRET#' \ + ${cfg.restApiPassFile} \ + /etc/mailman.cfg + ''} + mailmanDir=/var/lib/mailman mailmanWebDir=/var/lib/mailman-web @@ -560,7 +585,7 @@ in { mailman-daily = { description = "Trigger daily Mailman events"; startAt = "daily"; - restartTriggers = [ config.environment.etc."mailman.cfg".source ]; + restartTriggers = [ mailmanCfgFile ]; serviceConfig = { ExecStart = "${mailmanEnv}/bin/mailman digests --send"; User = "mailman"; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/mlmmj.nix b/third_party/nixpkgs/nixos/modules/services/mail/mlmmj.nix index fd74f2dc5f..0a6c7eceaa 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/mlmmj.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/mlmmj.nix @@ -56,31 +56,31 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable mlmmj"; + description = lib.mdDoc "Enable mlmmj"; }; user = mkOption { type = types.str; default = "mlmmj"; - description = "mailinglist local user"; + description = lib.mdDoc "mailinglist local user"; }; group = mkOption { type = types.str; default = "mlmmj"; - description = "mailinglist local group"; + description = lib.mdDoc "mailinglist local group"; }; listDomain = mkOption { type = types.str; default = "localhost"; - description = "Set the mailing list domain"; + description = lib.mdDoc "Set the mailing list domain"; }; mailLists = mkOption { type = types.listOf types.str; default = []; - description = "The collection of hosted maillists"; + description = lib.mdDoc "The collection of hosted maillists"; }; maintInterval = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/mail/nullmailer.nix b/third_party/nixpkgs/nixos/modules/services/mail/nullmailer.nix index f9c3456699..336c76c985 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/nullmailer.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/nullmailer.nix @@ -10,13 +10,13 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = "Whether to enable nullmailer daemon."; + description = lib.mdDoc "Whether to enable nullmailer daemon."; }; user = mkOption { type = types.str; default = "nullmailer"; - description = '' + description = lib.mdDoc '' User to use to run nullmailer-send. ''; }; @@ -24,7 +24,7 @@ with lib; group = mkOption { type = types.str; default = "nullmailer"; - description = '' + description = lib.mdDoc '' Group to use to run nullmailer-send. ''; }; @@ -32,17 +32,17 @@ with lib; setSendmail = mkOption { type = types.bool; default = true; - description = "Whether to set the system sendmail to nullmailer's."; + description = lib.mdDoc "Whether to set the system sendmail to nullmailer's."; }; remotesFile = mkOption { type = types.nullOr types.str; default = null; - description = '' - Path to the remotes control file. This file contains a + description = lib.mdDoc '' + Path to the `remotes` control file. This file contains a list of remote servers to which to send each message. - See man 8 nullmailer-send for syntax and available + See `man 8 nullmailer-send` for syntax and available options. ''; }; @@ -51,7 +51,7 @@ with lib; adminaddr = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' If set, all recipients to users at either "localhost" (the literal string) or the canonical host name (from the me control attribute) are remapped to this address. This is provided to allow local daemons to be able to send email to @@ -64,7 +64,7 @@ with lib; allmailfrom = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' If set, content will override the envelope sender on all messages. ''; }; @@ -72,7 +72,7 @@ with lib; defaultdomain = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The content of this attribute is appended to any host name that does not contain a period (except localhost), including defaulthost and idhost. Defaults to the value of the me attribute, if it exists, @@ -83,7 +83,7 @@ with lib; defaulthost = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The content of this attribute is appended to any address that is missing a host name. Defaults to the value of the me control attribute, if it exists, otherwise the literal name defaulthost. @@ -93,7 +93,7 @@ with lib; doublebounceto = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' If the original sender was empty (the original message was a delivery status or disposition notification), the double bounce is sent to the address in this attribute. @@ -103,7 +103,7 @@ with lib; helohost = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Sets the environment variable $HELOHOST which is used by the SMTP protocol module to set the parameter given to the HELO command. Defaults to the value of the me configuration attribute. @@ -113,7 +113,7 @@ with lib; idhost = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The content of this attribute is used when building the message-id string for the message. Defaults to the canonicalized value of defaulthost. ''; @@ -122,7 +122,7 @@ with lib; maxpause = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The maximum time to pause between successive queue runs, in seconds. Defaults to 24 hours (86400). ''; @@ -131,7 +131,7 @@ with lib; me = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The fully-qualifiled host name of the computer running nullmailer. Defaults to the literal name me. ''; @@ -140,7 +140,7 @@ with lib; pausetime = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The minimum time to pause between successive queue runs when there are messages in the queue, in seconds. Defaults to 1 minute (60). Each time this timeout is reached, the timeout is doubled to a @@ -153,24 +153,24 @@ with lib; remotes = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' A list of remote servers to which to send each message. Each line contains a remote host name or address followed by an optional protocol string, separated by white space. - See man 8 nullmailer-send for syntax and available + See `man 8 nullmailer-send` for syntax and available options. WARNING: This is stored world-readable in the nix store. If you need to specify any secret credentials here, consider using the - remotesFile option instead. + `remotesFile` option instead. ''; }; sendtimeout = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The time to wait for a remote module listed above to complete sending a message before killing it and trying again, in seconds. Defaults to 1 hour (3600). If this is set to 0, nullmailer-send diff --git a/third_party/nixpkgs/nixos/modules/services/mail/offlineimap.nix b/third_party/nixpkgs/nixos/modules/services/mail/offlineimap.nix index 4514775811..17c09df8f9 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/offlineimap.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/offlineimap.nix @@ -26,26 +26,26 @@ in { type = types.package; default = pkgs.offlineimap; defaultText = literalExpression "pkgs.offlineimap"; - description = "Offlineimap derivation to use."; + description = lib.mdDoc "Offlineimap derivation to use."; }; path = mkOption { type = types.listOf types.path; default = []; example = literalExpression "[ pkgs.pass pkgs.bash pkgs.notmuch ]"; - description = "List of derivations to put in Offlineimap's path."; + description = lib.mdDoc "List of derivations to put in Offlineimap's path."; }; onCalendar = mkOption { type = types.str; default = "*:0/3"; # every 3 minutes - description = "How often is offlineimap started. Default is '*:0/3' meaning every 3 minutes. See systemd.time(7) for more information about the format."; + description = lib.mdDoc "How often is offlineimap started. Default is '*:0/3' meaning every 3 minutes. See systemd.time(7) for more information about the format."; }; timeoutStartSec = mkOption { type = types.str; default = "120sec"; # Kill if still alive after 2 minutes - description = "How long waiting for offlineimap before killing it. Default is '120sec' meaning every 2 minutes. See systemd.time(7) for more information about the format."; + description = lib.mdDoc "How long waiting for offlineimap before killing it. Default is '120sec' meaning every 2 minutes. See systemd.time(7) for more information about the format."; }; }; config = mkIf (cfg.enable || cfg.install) { diff --git a/third_party/nixpkgs/nixos/modules/services/mail/opendkim.nix b/third_party/nixpkgs/nixos/modules/services/mail/opendkim.nix index f1ffc5d3ae..a377fccc7b 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/opendkim.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/opendkim.nix @@ -31,25 +31,25 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the OpenDKIM sender authentication system."; + description = lib.mdDoc "Whether to enable the OpenDKIM sender authentication system."; }; socket = mkOption { type = types.str; default = defaultSock; - description = "Socket which is used for communication with OpenDKIM."; + description = lib.mdDoc "Socket which is used for communication with OpenDKIM."; }; user = mkOption { type = types.str; default = "opendkim"; - description = "User for the daemon."; + description = lib.mdDoc "User for the daemon."; }; group = mkOption { type = types.str; default = "opendkim"; - description = "Group for the daemon."; + description = lib.mdDoc "Group for the daemon."; }; domains = mkOption { @@ -57,15 +57,15 @@ in { default = "csl:${config.networking.hostName}"; defaultText = literalExpression ''"csl:''${config.networking.hostName}"''; example = "csl:example.com,mydomain.net"; - description = '' - Local domains set (see opendkim(8) for more information on datasets). + description = lib.mdDoc '' + Local domains set (see `opendkim(8)` for more information on datasets). Messages from them are signed, not verified. ''; }; keyPath = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' The path that opendkim should put its generated private keys into. The DNS settings will be found in this directory with the name selector.txt. ''; @@ -74,13 +74,13 @@ in { selector = mkOption { type = types.str; - description = "Selector to use when signing."; + description = lib.mdDoc "Selector to use when signing."; }; configFile = mkOption { type = types.nullOr types.path; default = null; - description = "Additional opendkim configuration."; + description = lib.mdDoc "Additional opendkim configuration."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/opensmtpd.nix b/third_party/nixpkgs/nixos/modules/services/mail/opensmtpd.nix index e7632be280..6ad3386d2d 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/opensmtpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/opensmtpd.nix @@ -28,27 +28,27 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the OpenSMTPD server."; + description = lib.mdDoc "Whether to enable the OpenSMTPD server."; }; package = mkOption { type = types.package; default = pkgs.opensmtpd; defaultText = literalExpression "pkgs.opensmtpd"; - description = "The OpenSMTPD package to use."; + description = lib.mdDoc "The OpenSMTPD package to use."; }; setSendmail = mkOption { type = types.bool; default = true; - description = "Whether to set the system sendmail to OpenSMTPD's."; + description = lib.mdDoc "Whether to set the system sendmail to OpenSMTPD's."; }; extraServerArgs = mkOption { type = types.listOf types.str; default = []; example = [ "-v" "-P mta" ]; - description = '' + description = lib.mdDoc '' Extra command line arguments provided when the smtpd process is started. ''; @@ -60,7 +60,7 @@ in { listen on lo accept for any deliver to lmtp localhost:24 ''; - description = '' + description = lib.mdDoc '' The contents of the smtpd.conf configuration file. See the OpenSMTPD documentation for syntax information. ''; @@ -69,7 +69,7 @@ in { procPackages = mkOption { type = types.listOf types.package; default = []; - description = '' + description = lib.mdDoc '' Packages to search for filters, tables, queues, and schedulers. Add OpenSMTPD-extras here if you want to use the filters, etc. from diff --git a/third_party/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix b/third_party/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix index e3dbf2a014..d46447a480 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/pfix-srsd.nix @@ -12,11 +12,11 @@ with lib; enable = mkOption { default = false; type = types.bool; - description = "Whether to run the postfix sender rewriting scheme daemon."; + description = lib.mdDoc "Whether to run the postfix sender rewriting scheme daemon."; }; domain = mkOption { - description = "The domain for which to enable srs"; + description = lib.mdDoc "The domain for which to enable srs"; type = types.str; example = "example.com"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix index de00c87b95..2fc79949fb 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/postfix.nix @@ -45,7 +45,7 @@ let type = types.str; default = name; example = "smtp"; - description = '' + description = lib.mdDoc '' The name of the service to run. Defaults to the attribute set key. ''; }; @@ -54,16 +54,16 @@ let type = types.enum [ "inet" "unix" "unix-dgram" "fifo" "pass" ]; default = "unix"; example = "inet"; - description = "The type of the service"; + description = lib.mdDoc "The type of the service"; }; private = mkOption { type = types.bool; example = false; - description = '' + description = lib.mdDoc '' Whether the service's sockets and storage directory is restricted to - be only available via the mail system. If null is - given it uses the postfix default true. + be only available via the mail system. If `null` is + given it uses the postfix default `true`. ''; }; @@ -76,19 +76,19 @@ let chroot = mkOption { type = types.bool; example = true; - description = '' + description = lib.mdDoc '' Whether the service is chrooted to have only access to the - and the closure of - store paths specified by the option. + {option}`services.postfix.queueDir` and the closure of + store paths specified by the {option}`program` option. ''; }; wakeup = mkOption { type = types.int; example = 60; - description = '' + description = lib.mdDoc '' Automatically wake up the service after the specified number of - seconds. If 0 is given, never wake the service + seconds. If `0` is given, never wake the service up. ''; }; @@ -96,22 +96,22 @@ let wakeupUnusedComponent = mkOption { type = types.bool; example = false; - description = '' - If set to false the component will only be woken + description = lib.mdDoc '' + If set to `false` the component will only be woken up if it is used. This is equivalent to postfix' notion of adding a question mark behind the wakeup time in - master.cf + {file}`master.cf` ''; }; maxproc = mkOption { type = types.int; example = 1; - description = '' + description = lib.mdDoc '' The maximum number of processes to spawn for this service. If the - value is 0 it doesn't have any limit. If - null is given it uses the postfix default of - 100. + value is `0` it doesn't have any limit. If + `null` is given it uses the postfix default of + `100`. ''; }; @@ -119,9 +119,9 @@ let type = types.str; default = name; example = "smtpd"; - description = '' + description = lib.mdDoc '' A program name specifying a Postfix service/daemon process. - By default it's the attribute . + By default it's the attribute {option}`name`. ''; }; @@ -129,8 +129,8 @@ let type = types.listOf types.str; default = []; example = [ "-o" "smtp_helo_timeout=5" ]; - description = '' - Arguments to pass to the . There is no shell + description = lib.mdDoc '' + Arguments to pass to the {option}`command`. There is no shell processing involved and shell syntax is passed verbatim to the process. ''; @@ -221,13 +221,13 @@ let type = types.str; default = "/^.*/"; example = "/^X-Mailer:/"; - description = "A regexp pattern matching the header"; + description = lib.mdDoc "A regexp pattern matching the header"; }; action = mkOption { type = types.str; default = "DUNNO"; example = "BCC mail@example.com"; - description = "The action to be executed when the pattern is matched"; + description = lib.mdDoc "The action to be executed when the pattern is matched"; }; }; }; @@ -267,25 +267,25 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to run the Postfix mail server."; + description = lib.mdDoc "Whether to run the Postfix mail server."; }; enableSmtp = mkOption { type = types.bool; default = true; - description = "Whether to enable smtp in master.cf."; + description = lib.mdDoc "Whether to enable smtp in master.cf."; }; enableSubmission = mkOption { type = types.bool; default = false; - description = "Whether to enable smtp submission."; + description = lib.mdDoc "Whether to enable smtp submission."; }; enableSubmissions = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable smtp submission via smtps. According to RFC 8314 this should be preferred @@ -308,7 +308,7 @@ in smtpd_client_restrictions = "permit_sasl_authenticated,reject"; milter_macro_daemon_name = "ORIGINATING"; }; - description = "Options for the submission config in master.cf"; + description = lib.mdDoc "Options for the submission config in master.cf"; }; submissionsOptions = mkOption { @@ -324,7 +324,7 @@ in smtpd_client_restrictions = "permit_sasl_authenticated,reject"; milter_macro_daemon_name = "ORIGINATING"; }; - description = '' + description = lib.mdDoc '' Options for the submission config via smtps in master.cf. smtpd_tls_security_level will be set to encrypt, if it is missing @@ -337,19 +337,19 @@ in setSendmail = mkOption { type = types.bool; default = true; - description = "Whether to set the system sendmail to postfix's."; + description = lib.mdDoc "Whether to set the system sendmail to postfix's."; }; user = mkOption { type = types.str; default = "postfix"; - description = "What to call the Postfix user (must be used only for postfix)."; + description = lib.mdDoc "What to call the Postfix user (must be used only for postfix)."; }; group = mkOption { type = types.str; default = "postfix"; - description = "What to call the Postfix group (must be used only for postfix)."; + description = lib.mdDoc "What to call the Postfix group (must be used only for postfix)."; }; setgidGroup = mkOption { @@ -480,12 +480,12 @@ in type = with types; enum [ "hash" "regexp" "pcre" ]; default = "hash"; example = "regexp"; - description = "The format the alias map should have. Use regexp if you want to use regular expressions."; + description = lib.mdDoc "The format the alias map should have. Use regexp if you want to use regular expressions."; }; config = mkOption { type = with types; attrsOf (oneOf [ bool str (listOf str) ]); - description = '' + description = lib.mdDoc '' The main.cf configuration file as key value set. ''; example = { @@ -506,7 +506,7 @@ in type = types.str; default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; defaultText = literalExpression ''"''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"''; - description = '' + description = lib.mdDoc '' File containing trusted certification authorities (CA) to verify certificates of mailservers contacted for mail delivery. This basically sets smtp_tls_CAfile and enables opportunistic tls. Defaults to NixOS trusted certification authorities. ''; }; @@ -514,13 +514,13 @@ in sslCert = mkOption { type = types.str; default = ""; - description = "SSL certificate to use."; + description = lib.mdDoc "SSL certificate to use."; }; sslKey = mkOption { type = types.str; default = ""; - description = "SSL key to use."; + description = lib.mdDoc "SSL key to use."; }; recipientDelimiter = mkOption { @@ -552,18 +552,18 @@ in virtualMapType = mkOption { type = types.enum ["hash" "regexp" "pcre"]; default = "hash"; - description = '' - What type of virtual alias map file to use. Use "regexp" for regular expressions. + description = lib.mdDoc '' + What type of virtual alias map file to use. Use `"regexp"` for regular expressions. ''; }; localRecipients = mkOption { type = with types; nullOr (listOf str); default = null; - description = '' + description = lib.mdDoc '' List of accepted local users. Specify a bare username, an - "@domain.tld" wild-card, or a complete - "user@domain.tld" address. If set, these names end + `"@domain.tld"` wild-card, or a complete + `"user@domain.tld"` address. If set, these names end up in the local recipient map -- see the local(8) man-page -- and effectively replace the system user database lookup that's otherwise used by default. @@ -581,13 +581,13 @@ in dnsBlacklists = mkOption { default = []; type = with types; listOf str; - description = "dns blacklist servers to use with smtpd_client_restrictions"; + description = lib.mdDoc "dns blacklist servers to use with smtpd_client_restrictions"; }; dnsBlacklistOverrides = mkOption { default = ""; type = types.lines; - description = "contents of check_client_access for overriding dnsBlacklists"; + description = lib.mdDoc "contents of check_client_access for overriding dnsBlacklists"; }; masterConfig = mkOption { @@ -599,10 +599,10 @@ in args = [ "-o" "smtpd_tls_security_level=encrypt" ]; }; }; - description = '' + description = lib.mdDoc '' An attribute set of service options, which correspond to the service definitions usually done within the Postfix - master.cf file. + {file}`master.cf` file. ''; }; @@ -610,46 +610,46 @@ in type = types.lines; default = ""; example = "submission inet n - n - - smtpd"; - description = "Extra lines to append to the generated master.cf file."; + description = lib.mdDoc "Extra lines to append to the generated master.cf file."; }; enableHeaderChecks = mkOption { type = types.bool; default = false; example = true; - description = "Whether to enable postfix header checks"; + description = lib.mdDoc "Whether to enable postfix header checks"; }; headerChecks = mkOption { type = types.listOf (types.submodule headerCheckOptions); default = []; example = [ { pattern = "/^X-Spam-Flag:/"; action = "REDIRECT spam@example.com"; } ]; - description = "Postfix header checks."; + description = lib.mdDoc "Postfix header checks."; }; extraHeaderChecks = mkOption { type = types.lines; default = ""; example = "/^X-Spam-Flag:/ REDIRECT spam@example.com"; - description = "Extra lines to /etc/postfix/header_checks file."; + description = lib.mdDoc "Extra lines to /etc/postfix/header_checks file."; }; aliasFiles = mkOption { type = types.attrsOf types.path; default = {}; - description = "Aliases' tables to be compiled and placed into /var/lib/postfix/conf."; + description = lib.mdDoc "Aliases' tables to be compiled and placed into /var/lib/postfix/conf."; }; mapFiles = mkOption { type = types.attrsOf types.path; default = {}; - description = "Maps to be compiled and placed into /var/lib/postfix/conf."; + description = lib.mdDoc "Maps to be compiled and placed into /var/lib/postfix/conf."; }; useSrs = mkOption { type = types.bool; default = false; - description = "Whether to enable sender rewriting scheme"; + description = lib.mdDoc "Whether to enable sender rewriting scheme"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/postfixadmin.nix b/third_party/nixpkgs/nixos/modules/services/mail/postfixadmin.nix index 8adae3c1a0..b86428770c 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/postfixadmin.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/postfixadmin.nix @@ -13,25 +13,25 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable postfixadmin. Also enables nginx virtual host management. - Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. - See for further information. + Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`. + See [](#opt-services.nginx.virtualHosts) for further information. ''; }; hostName = mkOption { type = types.str; example = "postfixadmin.example.com"; - description = "Hostname to use for the nginx vhost"; + description = lib.mdDoc "Hostname to use for the nginx vhost"; }; adminEmail = mkOption { type = types.str; example = "postmaster@example.com"; - description = '' + description = lib.mdDoc '' Defines the Site Admin's email address. This will be used to send emails from to create mailboxes and from Send Email / Broadcast message pages. @@ -40,9 +40,9 @@ in setupPasswordFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Password file for the admin. - Generate with php -r "echo password_hash('some password here', PASSWORD_DEFAULT);" + Generate with `php -r "echo password_hash('some password here', PASSWORD_DEFAULT);"` ''; }; @@ -50,36 +50,36 @@ in username = mkOption { type = types.str; default = "postfixadmin"; - description = '' + description = lib.mdDoc '' Username for the postgresql connection. - If database.host is set to localhost, a unix user and group of the same name will be created as well. + If `database.host` is set to `localhost`, a unix user and group of the same name will be created as well. ''; }; host = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Host of the postgresql server. If this is not set to - localhost, you have to create the + `localhost`, you have to create the postgresql user and database yourself, with appropriate permissions. ''; }; passwordFile = mkOption { type = types.path; - description = "Password file for the postgresql connection. Must be readable by user nginx."; + description = lib.mdDoc "Password file for the postgresql connection. Must be readable by user `nginx`."; }; dbname = mkOption { type = types.str; default = "postfixadmin"; - description = "Name of the postgresql database"; + description = lib.mdDoc "Name of the postgresql database"; }; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra configuration for the postfixadmin instance, see postfixadmin's config.inc.php for available options."; + description = lib.mdDoc "Extra configuration for the postfixadmin instance, see postfixadmin's config.inc.php for available options."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/postgrey.nix b/third_party/nixpkgs/nixos/modules/services/mail/postgrey.nix index 7c206e3725..301bc69e1c 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/postgrey.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/postgrey.nix @@ -59,7 +59,7 @@ in { enable = mkOption { type = bool; default = false; - description = "Whether to run the Postgrey daemon"; + description = lib.mdDoc "Whether to run the Postgrey daemon"; }; socket = mkOption { type = socket; @@ -71,73 +71,73 @@ in { addr = "127.0.0.1"; port = 10030; }; - description = "Socket to bind to"; + description = lib.mdDoc "Socket to bind to"; }; greylistText = mkOption { type = str; default = "Greylisted for %%s seconds"; - description = "Response status text for greylisted messages; use %%s for seconds left until greylisting is over and %%r for mail domain of recipient"; + description = lib.mdDoc "Response status text for greylisted messages; use %%s for seconds left until greylisting is over and %%r for mail domain of recipient"; }; greylistAction = mkOption { type = str; default = "DEFER_IF_PERMIT"; - description = "Response status for greylisted messages (see access(5))"; + description = lib.mdDoc "Response status for greylisted messages (see access(5))"; }; greylistHeader = mkOption { type = str; default = "X-Greylist: delayed %%t seconds by postgrey-%%v at %%h; %%d"; - description = "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host"; + description = lib.mdDoc "Prepend header to greylisted mails; use %%t for seconds delayed due to greylisting, %%v for the version of postgrey, %%d for the date, and %%h for the host"; }; delay = mkOption { type = natural; default = 300; - description = "Greylist for N seconds"; + description = lib.mdDoc "Greylist for N seconds"; }; maxAge = mkOption { type = natural; default = 35; - description = "Delete entries from whitelist if they haven't been seen for N days"; + description = lib.mdDoc "Delete entries from whitelist if they haven't been seen for N days"; }; retryWindow = mkOption { type = either str natural; default = 2; example = "12h"; - description = "Allow N days for the first retry. Use string with appended 'h' to specify time in hours"; + description = lib.mdDoc "Allow N days for the first retry. Use string with appended 'h' to specify time in hours"; }; lookupBySubnet = mkOption { type = bool; default = true; - description = "Strip the last N bits from IP addresses, determined by IPv4CIDR and IPv6CIDR"; + description = lib.mdDoc "Strip the last N bits from IP addresses, determined by IPv4CIDR and IPv6CIDR"; }; IPv4CIDR = mkOption { type = natural; default = 24; - description = "Strip N bits from IPv4 addresses if lookupBySubnet is true"; + description = lib.mdDoc "Strip N bits from IPv4 addresses if lookupBySubnet is true"; }; IPv6CIDR = mkOption { type = natural; default = 64; - description = "Strip N bits from IPv6 addresses if lookupBySubnet is true"; + description = lib.mdDoc "Strip N bits from IPv6 addresses if lookupBySubnet is true"; }; privacy = mkOption { type = bool; default = true; - description = "Store data using one-way hash functions (SHA1)"; + description = lib.mdDoc "Store data using one-way hash functions (SHA1)"; }; autoWhitelist = mkOption { type = nullOr natural'; default = 5; - description = "Whitelist clients after successful delivery of N messages"; + description = lib.mdDoc "Whitelist clients after successful delivery of N messages"; }; whitelistClients = mkOption { type = listOf path; default = []; - description = "Client address whitelist files (see postgrey(8))"; + description = lib.mdDoc "Client address whitelist files (see postgrey(8))"; }; whitelistRecipients = mkOption { type = listOf path; default = []; - description = "Recipient address whitelist files (see postgrey(8))"; + description = lib.mdDoc "Recipient address whitelist files (see postgrey(8))"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/postsrsd.nix b/third_party/nixpkgs/nixos/modules/services/mail/postsrsd.nix index 2ebc675ab1..41301c8697 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/postsrsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/postsrsd.nix @@ -17,24 +17,24 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the postsrsd SRS server for Postfix."; + description = lib.mdDoc "Whether to enable the postsrsd SRS server for Postfix."; }; secretsFile = mkOption { type = types.path; default = "/var/lib/postsrsd/postsrsd.secret"; - description = "Secret keys used for signing and verification"; + description = lib.mdDoc "Secret keys used for signing and verification"; }; domain = mkOption { type = types.str; - description = "Domain name for rewrite"; + description = lib.mdDoc "Domain name for rewrite"; }; separator = mkOption { type = types.enum ["-" "=" "+"]; default = "="; - description = "First separator character in generated addresses"; + description = lib.mdDoc "First separator character in generated addresses"; }; # bindAddress = mkOption { # uncomment once 1.5 is released @@ -46,37 +46,37 @@ in { forwardPort = mkOption { type = types.int; default = 10001; - description = "Port for the forward SRS lookup"; + description = lib.mdDoc "Port for the forward SRS lookup"; }; reversePort = mkOption { type = types.int; default = 10002; - description = "Port for the reverse SRS lookup"; + description = lib.mdDoc "Port for the reverse SRS lookup"; }; timeout = mkOption { type = types.int; default = 1800; - description = "Timeout for idle client connections in seconds"; + description = lib.mdDoc "Timeout for idle client connections in seconds"; }; excludeDomains = mkOption { type = types.listOf types.str; default = []; - description = "Origin domains to exclude from rewriting in addition to primary domain"; + description = lib.mdDoc "Origin domains to exclude from rewriting in addition to primary domain"; }; user = mkOption { type = types.str; default = "postsrsd"; - description = "User for the daemon"; + description = lib.mdDoc "User for the daemon"; }; group = mkOption { type = types.str; default = "postsrsd"; - description = "Group for the daemon"; + description = lib.mdDoc "Group for the daemon"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/public-inbox.nix b/third_party/nixpkgs/nixos/modules/services/mail/public-inbox.nix index 0f9bc4ef22..a81dd1cdb3 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/public-inbox.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/public-inbox.nix @@ -23,10 +23,10 @@ let port = mkOption { type = with types; nullOr (either str port); default = defaultPort; - description = '' + description = lib.mdDoc '' Listening port. Beware that public-inbox uses well-known ports number to decide whether to enable TLS or not. - Set to null and use systemd.sockets.public-inbox-${proto}d.listenStreams + Set to null and use `systemd.sockets.public-inbox-${proto}d.listenStreams` if you need a more advanced listening. ''; }; @@ -150,19 +150,19 @@ in type = types.package; default = pkgs.public-inbox; defaultText = literalExpression "pkgs.public-inbox"; - description = "public-inbox package to use."; + description = lib.mdDoc "public-inbox package to use."; }; path = mkOption { type = with types; listOf package; default = []; example = literalExpression "with pkgs; [ spamassassin ]"; - description = '' + description = lib.mdDoc '' Additional packages to place in the path of public-inbox-mda, public-inbox-watch, etc. ''; }; inboxes = mkOption { - description = '' + description = lib.mdDoc '' Inboxes to configure, where attribute names are inbox names. ''; default = {}; @@ -171,29 +171,29 @@ in options.inboxdir = mkOption { type = types.str; default = "${stateDir}/inboxes/${name}"; - description = "The absolute path to the directory which hosts the public-inbox."; + description = lib.mdDoc "The absolute path to the directory which hosts the public-inbox."; }; options.address = mkOption { type = with types; listOf str; example = "example-discuss@example.org"; - description = "The email addresses of the public-inbox."; + description = lib.mdDoc "The email addresses of the public-inbox."; }; options.url = mkOption { type = with types; nullOr str; default = null; example = "https://example.org/lists/example-discuss"; - description = "URL where this inbox can be accessed over HTTP."; + description = lib.mdDoc "URL where this inbox can be accessed over HTTP."; }; options.description = mkOption { type = types.str; example = "user/dev discussion of public-inbox itself"; - description = "User-visible description for the repository."; + description = lib.mdDoc "User-visible description for the repository."; apply = pkgs.writeText "public-inbox-description-${name}"; }; options.newsgroup = mkOption { type = with types; nullOr str; default = null; - description = "NNTP group name for the inbox."; + description = lib.mdDoc "NNTP group name for the inbox."; }; options.watch = mkOption { type = with types; listOf str; @@ -215,7 +215,7 @@ in description = "list of coderepo names"; }; default = []; - description = "Nicknames of a 'coderepo' section associated with the inbox."; + description = lib.mdDoc "Nicknames of a 'coderepo' section associated with the inbox."; }; })); }; @@ -228,7 +228,7 @@ in type = with types; listOf str; default = [ "/" ]; example = [ "/lists/archives" ]; - description = '' + description = lib.mdDoc '' Root paths or URLs that public-inbox will be served on. If domain parts are present, only requests to those domains will be accepted. @@ -239,11 +239,11 @@ in type = with types; nullOr (either str port); default = 80; example = "/run/public-inbox-httpd.sock"; - description = '' + description = lib.mdDoc '' Listening port or systemd's ListenStream= entry to be used as a reverse proxy, eg. in nginx: - locations."/inbox".proxyPass = "http://unix:''${config.services.public-inbox.http.port}:/inbox"; - Set to null and use systemd.sockets.public-inbox-httpd.listenStreams + `locations."/inbox".proxyPass = "http://unix:''${config.services.public-inbox.http.port}:/inbox";` + Set to null and use `systemd.sockets.public-inbox-httpd.listenStreams` if you need a more advanced listening. ''; }; @@ -264,35 +264,35 @@ in type = with types; nullOr path; default = "${cfg.package.sa_config}/user/.spamassassin/user_prefs"; defaultText = literalExpression "\${cfg.package.sa_config}/user/.spamassassin/user_prefs"; - description = "SpamAssassin configuration specific to public-inbox."; + description = lib.mdDoc "SpamAssassin configuration specific to public-inbox."; }; settings = mkOption { - description = '' - Settings for the public-inbox config file. + description = lib.mdDoc '' + Settings for the [public-inbox config file](https://public-inbox.org/public-inbox-config.html). ''; default = {}; type = types.submodule { freeformType = gitIni.type; options.publicinbox = mkOption { default = {}; - description = "public inboxes"; + description = lib.mdDoc "public inboxes"; type = types.submodule { freeformType = with types; /*inbox name*/attrsOf (/*inbox option name*/attrsOf /*inbox option value*/iniAtom); options.css = mkOption { type = with types; listOf str; default = []; - description = "The local path name of a CSS file for the PSGI web interface."; + description = lib.mdDoc "The local path name of a CSS file for the PSGI web interface."; }; options.nntpserver = mkOption { type = with types; listOf str; default = []; example = [ "nntp://news.public-inbox.org" "nntps://news.public-inbox.org" ]; - description = "NNTP URLs to this public-inbox instance"; + description = lib.mdDoc "NNTP URLs to this public-inbox instance"; }; options.wwwlisting = mkOption { type = with types; enum [ "all" "404" "match=domain" ]; default = "404"; - description = '' + description = lib.mdDoc '' Controls which lists (if any) are listed for when the root public-inbox URL is accessed over HTTP. ''; @@ -319,23 +319,23 @@ in type = with types; nullOr str; default = null; example = "maildir:/path/to/spam"; - description = '' + description = lib.mdDoc '' If set, mail in this maildir will be trained as spam and deleted from all watched inboxes ''; }; options.coderepo = mkOption { default = {}; - description = "code repositories"; + description = lib.mdDoc "code repositories"; type = types.attrsOf (types.submodule { freeformType = types.attrsOf iniAtom; options.cgitUrl = mkOption { type = types.str; - description = "URL of a cgit instance"; + description = lib.mdDoc "URL of a cgit instance"; }; options.dir = mkOption { type = types.str; - description = "Path to a git repository"; + description = lib.mdDoc "Path to a git repository"; }; }); }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix index 1dd393da88..d8adf53e48 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/roundcube.nix @@ -14,19 +14,19 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable roundcube. Also enables nginx virtual host management. - Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. - See for further information. + Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`. + See [](#opt-services.nginx.virtualHosts) for further information. ''; }; hostName = mkOption { type = types.str; example = "webmail.example.com"; - description = "Hostname to use for the nginx vhost"; + description = lib.mdDoc "Hostname to use for the nginx vhost"; }; package = mkOption { @@ -38,7 +38,7 @@ in roundcube.withPlugins (plugins: [ plugins.persistent_login ]) ''; - description = '' + description = lib.mdDoc '' The package which contains roundcube's sources. Can be overriden to create an environment which contains roundcube and third-party plugins. ''; @@ -48,41 +48,41 @@ in username = mkOption { type = types.str; default = "roundcube"; - description = '' + description = lib.mdDoc '' Username for the postgresql connection. - If database.host is set to localhost, a unix user and group of the same name will be created as well. + If `database.host` is set to `localhost`, a unix user and group of the same name will be created as well. ''; }; host = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Host of the postgresql server. If this is not set to - localhost, you have to create the + `localhost`, you have to create the postgresql user and database yourself, with appropriate permissions. ''; }; password = mkOption { type = types.str; - description = "Password for the postgresql connection. Do not use: the password will be stored world readable in the store; use passwordFile instead."; + description = lib.mdDoc "Password for the postgresql connection. Do not use: the password will be stored world readable in the store; use `passwordFile` instead."; default = ""; }; passwordFile = mkOption { type = types.str; - description = "Password file for the postgresql connection. Must be readable by user nginx. Ignored if database.host is set to localhost, as peer authentication will be used."; + description = lib.mdDoc "Password file for the postgresql connection. Must be readable by user `nginx`. Ignored if `database.host` is set to `localhost`, as peer authentication will be used."; }; dbname = mkOption { type = types.str; default = "roundcube"; - description = "Name of the postgresql database"; + description = lib.mdDoc "Name of the postgresql database"; }; }; plugins = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' List of roundcube plugins to enable. Currently, only those directly shipped with Roundcube are supported. ''; }; @@ -91,7 +91,7 @@ in type = types.listOf types.package; default = []; example = literalExpression "with pkgs.aspellDicts; [ en fr de ]"; - description = '' + description = lib.mdDoc '' List of aspell dictionnaries for spell checking. If empty, spell checking is disabled. ''; }; @@ -99,11 +99,11 @@ in maxAttachmentSize = mkOption { type = types.int; default = 18; - description = '' + description = lib.mdDoc '' The maximum attachment size in MB. Note: Since roundcube only uses 70% of max upload values configured in php - 30% is added automatically to . + 30% is added automatically to [](#opt-services.roundcube.maxAttachmentSize). ''; apply = configuredMaxAttachmentSize: "${toString (configuredMaxAttachmentSize * 1.3)}M"; }; @@ -111,7 +111,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra configuration for roundcube webmail instance"; + description = lib.mdDoc "Extra configuration for roundcube webmail instance"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix b/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix index a570e137a5..ed4d7a5044 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix @@ -52,21 +52,21 @@ let enable = mkOption { type = types.nullOr types.bool; default = null; - description = "Whether to run the rspamd worker."; + description = lib.mdDoc "Whether to run the rspamd worker."; }; name = mkOption { type = types.nullOr types.str; default = name; - description = "Name of the worker"; + description = lib.mdDoc "Name of the worker"; }; type = mkOption { type = types.nullOr (types.enum [ "normal" "controller" "fuzzy" "rspamd_proxy" "lua" "proxy" ]); - description = '' - The type of this worker. The type proxy is + description = lib.mdDoc '' + The type of this worker. The type `proxy` is deprecated and only kept for backwards compatibility and should be - replaced with rspamd_proxy. + replaced with `rspamd_proxy`. ''; apply = let from = "services.rspamd.workers.\"${name}\".type"; @@ -77,7 +77,7 @@ let bindSockets = mkOption { type = types.listOf (types.either types.str (types.submodule bindSocketOpts)); default = []; - description = '' + description = lib.mdDoc '' List of sockets to listen, in format acceptable by rspamd ''; example = [{ @@ -94,21 +94,21 @@ let count = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Number of worker instances to run ''; }; includes = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' List of files to include in configuration ''; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Additional entries to put verbatim into worker section of rspamd config file."; + description = lib.mdDoc "Additional entries to put verbatim into worker section of rspamd config file."; }; }; config = mkIf (name == "normal" || name == "controller" || name == "fuzzy" || name == "rspamd_proxy") { @@ -186,7 +186,7 @@ let enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether this file ${prefix} should be generated. This option allows specific ${prefix} files to be disabled. ''; @@ -195,12 +195,12 @@ let text = mkOption { default = null; type = types.nullOr types.lines; - description = "Text of the file."; + description = lib.mdDoc "Text of the file."; }; source = mkOption { type = types.path; - description = "Path of the source file."; + description = lib.mdDoc "Path of the source file."; }; }; config = { @@ -232,14 +232,14 @@ in debug = mkOption { type = types.bool; default = false; - description = "Whether to run the rspamd daemon in debug mode."; + description = lib.mdDoc "Whether to run the rspamd daemon in debug mode."; }; locals = mkOption { type = with types; attrsOf (submodule (configFileModule "locals")); default = {}; - description = '' - Local configuration files, written into /etc/rspamd/local.d/{name}. + description = lib.mdDoc '' + Local configuration files, written into {file}`/etc/rspamd/local.d/{name}`. ''; example = literalExpression '' { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf"; @@ -251,8 +251,8 @@ in overrides = mkOption { type = with types; attrsOf (submodule (configFileModule "overrides")); default = {}; - description = '' - Overridden configuration files, written into /etc/rspamd/override.d/{name}. + description = lib.mdDoc '' + Overridden configuration files, written into {file}`/etc/rspamd/override.d/{name}`. ''; example = literalExpression '' { "redis.conf".source = "/nix/store/.../etc/dir/redis.conf"; @@ -264,15 +264,15 @@ in localLuaRules = mkOption { default = null; type = types.nullOr types.path; - description = '' - Path of file to link to /etc/rspamd/rspamd.local.lua for local + description = lib.mdDoc '' + Path of file to link to {file}`/etc/rspamd/rspamd.local.lua` for local rules written in Lua ''; }; workers = mkOption { type = with types; attrsOf (submodule workerOpts); - description = '' + description = lib.mdDoc '' Attribute set of workers to start. ''; default = { @@ -301,7 +301,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration to add at the end of the rspamd configuration file. ''; @@ -310,7 +310,7 @@ in user = mkOption { type = types.str; default = "rspamd"; - description = '' + description = lib.mdDoc '' User to use when no root privileges are required. ''; }; @@ -318,7 +318,7 @@ in group = mkOption { type = types.str; default = "rspamd"; - description = '' + description = lib.mdDoc '' Group to use when no root privileges are required. ''; }; @@ -327,12 +327,12 @@ in enable = mkOption { type = types.bool; default = false; - description = "Add rspamd milter to postfix main.conf"; + description = lib.mdDoc "Add rspamd milter to postfix main.conf"; }; config = mkOption { type = with types; attrsOf (oneOf [ bool str (listOf str) ]); - description = '' + description = lib.mdDoc '' Addon to postfix configuration ''; default = { diff --git a/third_party/nixpkgs/nixos/modules/services/mail/rss2email.nix b/third_party/nixpkgs/nixos/modules/services/mail/rss2email.nix index 7f8d2adac6..7b74db1e71 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/rss2email.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/rss2email.nix @@ -15,57 +15,57 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable rss2email."; + description = lib.mdDoc "Whether to enable rss2email."; }; to = mkOption { type = types.str; - description = "Mail address to which to send emails"; + description = lib.mdDoc "Mail address to which to send emails"; }; interval = mkOption { type = types.str; default = "12h"; - description = "How often to check the feeds, in systemd interval format"; + description = lib.mdDoc "How often to check the feeds, in systemd interval format"; }; config = mkOption { type = with types; attrsOf (oneOf [ str int bool ]); default = {}; - description = '' + description = lib.mdDoc '' The configuration to give rss2email. - Default will use system-wide sendmail to send the + Default will use system-wide `sendmail` to send the email. This is rss2email's default when running - r2e new. + `r2e new`. This set contains key-value associations that will be set in the - [DEFAULT] block along with the - to parameter. + `[DEFAULT]` block along with the + `to` parameter. - See man r2e for more information on which + See `man r2e` for more information on which parameters are accepted. ''; }; feeds = mkOption { - description = "The feeds to watch."; + description = lib.mdDoc "The feeds to watch."; type = types.attrsOf (types.submodule { options = { url = mkOption { type = types.str; - description = "The URL at which to fetch the feed."; + description = lib.mdDoc "The URL at which to fetch the feed."; }; to = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Email address to which to send feed items. - If null, this will not be set in the + If `null`, this will not be set in the configuration file, and rss2email will make it default to - rss2email.to. + `rss2email.to`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/schleuder.nix b/third_party/nixpkgs/nixos/modules/services/mail/schleuder.nix index 7ba15f1070..80b37ac129 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/schleuder.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/schleuder.nix @@ -21,7 +21,7 @@ in enable = lib.mkEnableOption "Schleuder secure remailer"; enablePostfix = lib.mkEnableOption "automatic postfix integration" // { default = true; }; lists = lib.mkOption { - description = '' + description = lib.mdDoc '' List of list addresses that should be handled by Schleuder. Note that this is only handled by the postfix integration, and @@ -42,16 +42,16 @@ in }; */ settings = lib.mkOption { - description = '' + description = lib.mdDoc '' Settings for schleuder.yml. - Check the example configuration for possible values. + Check the [example configuration](https://0xacab.org/schleuder/schleuder/blob/master/etc/schleuder.yml) for possible values. ''; type = lib.types.submodule { freeformType = settingsFormat.type; options.keyserver = lib.mkOption { type = lib.types.str; - description = '' + description = lib.mdDoc '' Key server from which to fetch and update keys. Note that NixOS uses a different default from upstream, since the upstream default sks-keyservers.net is deprecated. @@ -62,15 +62,15 @@ in default = { }; }; extraSettingsFile = lib.mkOption { - description = "YAML file to merge into the schleuder config at runtime. This can be used for secrets such as API keys."; + description = lib.mdDoc "YAML file to merge into the schleuder config at runtime. This can be used for secrets such as API keys."; type = lib.types.nullOr lib.types.path; default = null; }; listDefaults = lib.mkOption { - description = '' + description = lib.mdDoc '' Default settings for lists (list-defaults.yml). - Check the example configuration for possible values. + Check the [example configuration](https://0xacab.org/schleuder/schleuder/-/blob/master/etc/list-defaults.yml) for possible values. ''; type = settingsFormat.type; default = { }; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/spamassassin.nix b/third_party/nixpkgs/nixos/modules/services/mail/spamassassin.nix index 3b10d8d290..153e3c0008 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/spamassassin.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/spamassassin.nix @@ -17,7 +17,7 @@ in debug = mkOption { type = types.bool; default = false; - description = "Whether to run the SpamAssassin daemon in debug mode"; + description = lib.mdDoc "Whether to run the SpamAssassin daemon in debug mode"; }; config = mkOption { @@ -54,7 +54,7 @@ in initPreConf = mkOption { type = with types; either str path; - description = "The SpamAssassin init.pre config."; + description = lib.mdDoc "The SpamAssassin init.pre config."; apply = val: if builtins.isPath val then val else pkgs.writeText "init.pre" val; default = '' diff --git a/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix b/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix index f3578bef96..0014701d58 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/sympa.nix @@ -86,9 +86,9 @@ in type = str; default = "en_US"; example = "cs"; - description = '' + description = lib.mdDoc '' Default Sympa language. - See + See for available options. ''; }; @@ -96,7 +96,7 @@ in listMasters = mkOption { type = listOf str; example = [ "postmaster@sympa.example.org" ]; - description = '' + description = lib.mdDoc '' The list of the email addresses of the listmasters (users authorized to perform global server commands). ''; @@ -106,9 +106,9 @@ in type = nullOr str; default = null; example = "lists.example.org"; - description = '' - Main domain to be used in sympa.conf. - If null, one of the is chosen for you. + description = lib.mdDoc '' + Main domain to be used in {file}`sympa.conf`. + If `null`, one of the {option}`services.sympa.domains` is chosen for you. ''; }; @@ -119,8 +119,8 @@ in type = nullOr str; default = null; example = "archive.example.org"; - description = '' - Domain part of the web interface URL (no web interface for this domain if null). + description = lib.mdDoc '' + Domain part of the web interface URL (no web interface for this domain if `null`). DNS record of type A (or AAAA or CNAME) has to exist with this value. ''; }; @@ -128,7 +128,7 @@ in type = str; default = "/"; example = "/sympa"; - description = "URL path part of the web interface."; + description = lib.mdDoc "URL path part of the web interface."; }; settings = mkOption { type = attrsOf (oneOf [ str int bool ]); @@ -136,9 +136,9 @@ in example = { default_max_list_members = 3; }; - description = '' - The robot.conf configuration file as key value set. - See + description = lib.mdDoc '' + The {file}`robot.conf` configuration file as key value set. + See for list of configuration parameters. ''; }; @@ -149,7 +149,7 @@ in }; })); - description = '' + description = lib.mdDoc '' Email domains handled by this instance. There have to be MX records for keys of this attribute set. ''; @@ -172,36 +172,36 @@ in type = enum [ "SQLite" "PostgreSQL" "MySQL" ]; default = "SQLite"; example = "MySQL"; - description = "Database engine to use."; + description = lib.mdDoc "Database engine to use."; }; host = mkOption { type = nullOr str; default = null; - description = '' + description = lib.mdDoc '' Database host address. - For MySQL, use localhost to connect using Unix domain socket. + For MySQL, use `localhost` to connect using Unix domain socket. - For PostgreSQL, use path to directory (e.g. /run/postgresql) + For PostgreSQL, use path to directory (e.g. {file}`/run/postgresql`) to connect using Unix domain socket located in this directory. - Use null to fall back on Sympa default, or when using - . + Use `null` to fall back on Sympa default, or when using + {option}`services.sympa.database.createLocally`. ''; }; port = mkOption { type = nullOr port; default = null; - description = "Database port. Use null for default port."; + description = lib.mdDoc "Database port. Use `null` for default port."; }; name = mkOption { type = str; default = if cfg.database.type == "SQLite" then "${dataDir}/sympa.sqlite" else "sympa"; defaultText = literalExpression ''if database.type == "SQLite" then "${dataDir}/sympa.sqlite" else "sympa"''; - description = '' + description = lib.mdDoc '' Database name. When using SQLite this must be an absolute path to the database file. ''; @@ -210,22 +210,22 @@ in user = mkOption { type = nullOr str; default = user; - description = "Database user. The system user name is used as a default."; + description = lib.mdDoc "Database user. The system user name is used as a default."; }; passwordFile = mkOption { type = nullOr path; default = null; example = "/run/keys/sympa-dbpassword"; - description = '' - A file containing the password for . + description = lib.mdDoc '' + A file containing the password for {option}`services.sympa.database.user`. ''; }; createLocally = mkOption { type = bool; default = true; - description = "Whether to create a local database automatically."; + description = lib.mdDoc "Whether to create a local database automatically."; }; }; @@ -233,7 +233,7 @@ in enable = mkOption { type = bool; default = true; - description = "Whether to enable Sympa web interface."; + description = lib.mdDoc "Whether to enable Sympa web interface."; }; server = mkOption { @@ -242,14 +242,14 @@ in description = '' The webserver used for the Sympa web interface. Set it to `none` if you want to configure it yourself. Further nginx configuration can be done by adapting - . + . ''; }; https = mkOption { type = bool; default = true; - description = '' + description = lib.mdDoc '' Whether to use HTTPS. When nginx integration is enabled, this option forces SSL and enables ACME. Please note that Sympa web interface always uses https links even when this option is disabled. ''; @@ -258,7 +258,7 @@ in fcgiProcs = mkOption { type = ints.positive; default = 2; - description = "Number of FastCGI processes to fork."; + description = lib.mdDoc "Number of FastCGI processes to fork."; }; }; @@ -266,12 +266,12 @@ in type = mkOption { type = enum [ "postfix" "none" ]; default = "postfix"; - description = '' - Mail transfer agent (MTA) integration. Use none if you want to configure it yourself. + description = lib.mdDoc '' + Mail transfer agent (MTA) integration. Use `none` if you want to configure it yourself. - The postfix integration sets up local Postfix instance that will pass incoming + The `postfix` integration sets up local Postfix instance that will pass incoming messages from configured domains to Sympa. You still need to configure at least outgoing message - handling using e.g. . + handling using e.g. {option}`services.postfix.relayHost`. ''; }; }; @@ -285,9 +285,9 @@ in viewlogs_page_size = 50; } ''; - description = '' - The sympa.conf configuration file as key value set. - See + description = lib.mdDoc '' + The {file}`sympa.conf` configuration file as key value set. + See for list of configuration parameters. ''; }; @@ -298,16 +298,16 @@ in enable = mkOption { type = bool; default = true; - description = "Whether this file should be generated. This option allows specific files to be disabled."; + description = lib.mdDoc "Whether this file should be generated. This option allows specific files to be disabled."; }; text = mkOption { default = null; type = nullOr lines; - description = "Text of the file."; + description = lib.mdDoc "Text of the file."; }; source = mkOption { type = path; - description = "Path of the source file."; + description = lib.mdDoc "Path of the source file."; }; }; @@ -321,7 +321,7 @@ in }; } ''; - description = "Set of files to be linked in ${dataDir}."; + description = lib.mdDoc "Set of files to be linked in {file}`${dataDir}`."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-discord.nix b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-discord.nix index 8a8c7f41e3..c72a2123a9 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-discord.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-discord.nix @@ -40,23 +40,16 @@ in { }; } ''; - description = '' - config.yaml configuration as a Nix attribute set. - + description = lib.mdDoc '' + {file}`config.yaml` configuration as a Nix attribute set. - Configuration options should match those described in - - config.sample.yaml. - + [config.sample.yaml](https://github.com/Half-Shot/matrix-appservice-discord/blob/master/config/config.sample.yaml). - - and + {option}`config.bridge.domain` and {option}`config.bridge.homeserverUrl` should be set to match the public host name of the Matrix homeserver for webhooks and avatars to work. - - - Secret tokens should be specified using + Secret tokens should be specified using {option}`environmentFile` instead of this world-readable attribute set. ''; }; @@ -64,11 +57,11 @@ in { environmentFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' File containing environment variables to be passed to the matrix-appservice-discord service, in which secret tokens can be specified securely by defining values for - APPSERVICE_DISCORD_AUTH_CLIENT_I_D and - APPSERVICE_DISCORD_AUTH_BOT_TOKEN. + `APPSERVICE_DISCORD_AUTH_CLIENT_I_D` and + `APPSERVICE_DISCORD_AUTH_BOT_TOKEN`. ''; }; @@ -76,7 +69,7 @@ in { type = types.str; default = "http://localhost:${toString cfg.port}"; defaultText = literalExpression ''"http://localhost:''${toString config.${opt.port}}"''; - description = '' + description = lib.mdDoc '' The URL where the application service is listening for HS requests. ''; }; @@ -84,7 +77,7 @@ in { port = mkOption { type = types.port; default = 9005; # from https://github.com/Half-Shot/matrix-appservice-discord/blob/master/package.json#L11 - description = '' + description = lib.mdDoc '' Port number on which the bridge should listen for internal communication with the Matrix homeserver. ''; }; @@ -92,7 +85,7 @@ in { localpart = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The user_id localpart to assign to the AS. ''; }; @@ -103,7 +96,7 @@ in { defaultText = literalExpression '' optional config.services.matrix-synapse.enable "matrix-synapse.service" ''; - description = '' + description = lib.mdDoc '' List of Systemd services to require and wait for when starting the application service, such as the Matrix homeserver if it's running on the same host. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix index ff938527ed..b24edba96d 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/appservice-irc.nix @@ -32,26 +32,26 @@ in { port = mkOption { type = port; - description = "The port to listen on"; + description = lib.mdDoc "The port to listen on"; default = 8009; }; needBindingCap = mkOption { type = bool; - description = "Whether the daemon needs to bind to ports below 1024 (e.g. for the ident service)"; + description = lib.mdDoc "Whether the daemon needs to bind to ports below 1024 (e.g. for the ident service)"; default = false; }; passwordEncryptionKeyLength = mkOption { type = ints.unsigned; - description = "Length of the key to encrypt IRC passwords with"; + description = lib.mdDoc "Length of the key to encrypt IRC passwords with"; default = 4096; example = 8192; }; registrationUrl = mkOption { type = str; - description = '' + description = lib.mdDoc '' The URL where the application service is listening for homeserver requests, from the Matrix homeserver perspective. ''; @@ -60,14 +60,14 @@ in { localpart = mkOption { type = str; - description = "The user_id localpart to assign to the appservice"; + description = lib.mdDoc "The user_id localpart to assign to the appservice"; default = "appservice-irc"; }; settings = mkOption { - description = '' + description = lib.mdDoc '' Configuration for the appservice, see - + for supported values ''; default = {}; @@ -76,7 +76,7 @@ in { options = { homeserver = mkOption { - description = "Homeserver configuration"; + description = lib.mdDoc "Homeserver configuration"; default = {}; type = submodule { freeformType = jsonType; @@ -84,12 +84,12 @@ in { options = { url = mkOption { type = str; - description = "The URL to the home server for client-server API calls"; + description = lib.mdDoc "The URL to the home server for client-server API calls"; }; domain = mkOption { type = str; - description = '' + description = lib.mdDoc '' The 'domain' part for user IDs on this home server. Usually (but not always) is the "domain name" part of the homeserver URL. ''; @@ -100,21 +100,21 @@ in { database = mkOption { default = {}; - description = "Configuration for the database"; + description = lib.mdDoc "Configuration for the database"; type = submodule { freeformType = jsonType; options = { engine = mkOption { type = str; - description = "Which database engine to use"; + description = lib.mdDoc "Which database engine to use"; default = "nedb"; example = "postgres"; }; connectionString = mkOption { type = str; - description = "The database connection string"; + description = lib.mdDoc "The database connection string"; default = "nedb://var/lib/matrix-appservice-irc/data"; example = "postgres://username:password@host:port/databasename"; }; @@ -124,14 +124,14 @@ in { ircService = mkOption { default = {}; - description = "IRC bridge configuration"; + description = lib.mdDoc "IRC bridge configuration"; type = submodule { freeformType = jsonType; options = { passwordEncryptionKeyPath = mkOption { type = str; - description = '' + description = lib.mdDoc '' Location of the key with which IRC passwords are encrypted for storage. Will be generated on first run if not present. ''; @@ -140,7 +140,7 @@ in { servers = mkOption { type = submodule { freeformType = jsonType; }; - description = "IRC servers to connect to"; + description = lib.mdDoc "IRC servers to connect to"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix b/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix index 108f64de7a..29040c3850 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/conduit.nix @@ -15,7 +15,7 @@ in extraEnvironment = mkOption { type = types.attrsOf types.str; - description = "Extra Environment variables to pass to the conduit server."; + description = lib.mdDoc "Extra Environment variables to pass to the conduit server."; default = {}; example = { RUST_BACKTRACE="yes"; }; }; @@ -25,7 +25,7 @@ in default = pkgs.matrix-conduit; defaultText = "pkgs.matrix-conduit"; example = "pkgs.matrix-conduit"; - description = '' + description = lib.mdDoc '' Package of the conduit matrix server to use. ''; }; @@ -37,50 +37,50 @@ in global.server_name = mkOption { type = types.str; example = "example.com"; - description = "The server_name is the name of this server. It is used as a suffix for user # and room ids."; + description = lib.mdDoc "The server_name is the name of this server. It is used as a suffix for user # and room ids."; }; global.port = mkOption { type = types.port; default = 6167; - description = "The port Conduit will be running on. You need to set up a reverse proxy in your web server (e.g. apache or nginx), so all requests to /_matrix on port 443 and 8448 will be forwarded to the Conduit instance running on this port"; + description = lib.mdDoc "The port Conduit will be running on. You need to set up a reverse proxy in your web server (e.g. apache or nginx), so all requests to /_matrix on port 443 and 8448 will be forwarded to the Conduit instance running on this port"; }; global.max_request_size = mkOption { type = types.ints.positive; default = 20000000; - description = "Max request size in bytes. Don't forget to also change it in the proxy."; + description = lib.mdDoc "Max request size in bytes. Don't forget to also change it in the proxy."; }; global.allow_registration = mkOption { type = types.bool; default = false; - description = "Whether new users can register on this server."; + description = lib.mdDoc "Whether new users can register on this server."; }; global.allow_encryption = mkOption { type = types.bool; default = true; - description = "Whether new encrypted rooms can be created. Note: existing rooms will continue to work."; + description = lib.mdDoc "Whether new encrypted rooms can be created. Note: existing rooms will continue to work."; }; global.allow_federation = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether this server federates with other servers. ''; }; global.trusted_servers = mkOption { type = types.listOf types.str; default = [ "matrix.org" ]; - description = "Servers trusted with signing server keys."; + description = lib.mdDoc "Servers trusted with signing server keys."; }; global.address = mkOption { type = types.str; default = "::1"; - description = "Address to listen on for connections by the reverse proxy/tls terminator."; + description = lib.mdDoc "Address to listen on for connections by the reverse proxy/tls terminator."; }; global.database_path = mkOption { type = types.str; default = "/var/lib/matrix-conduit/"; readOnly = true; - description = '' + description = lib.mdDoc '' Path to the conduit database, the directory where conduit will save its data. Note that due to using the DynamicUser feature of systemd, this value should not be changed and is set to be read only. @@ -90,7 +90,7 @@ in type = types.enum [ "sqlite" "rocksdb" ]; default = "sqlite"; example = "rocksdb"; - description = '' + description = lib.mdDoc '' The database backend for the service. Switching it on an existing instance will require manual migration of data. ''; @@ -98,9 +98,9 @@ in }; }; default = {}; - description = '' + description = lib.mdDoc '' Generates the conduit.toml configuration file. Refer to - + for details on supported values. Note that database_path can not be edited because the service's reliance on systemd StateDir. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/dendrite.nix b/third_party/nixpkgs/nixos/modules/services/matrix/dendrite.nix index 54052084b3..4275950ec7 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/dendrite.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/dendrite.nix @@ -11,14 +11,14 @@ in httpPort = lib.mkOption { type = lib.types.nullOr lib.types.port; default = 8008; - description = '' + description = lib.mdDoc '' The port to listen for HTTP requests on. ''; }; httpsPort = lib.mkOption { type = lib.types.nullOr lib.types.port; default = null; - description = '' + description = lib.mdDoc '' The port to listen for HTTPS requests on. ''; }; @@ -78,11 +78,11 @@ in type = lib.types.listOf lib.types.str; default = [ ]; example = [ "private_key:/path/to/my_private_key" ]; - description = '' + description = lib.mdDoc '' This can be used to pass secrets to the systemd service without adding them to the nix store. To use the example setting, see the example of - . + {option}`services.dendrite.settings.global.private_key`. See the LoadCredential section of systemd.exec manual for more information. ''; }; @@ -93,7 +93,7 @@ in server_name = lib.mkOption { type = lib.types.str; example = "example.com"; - description = '' + description = lib.mdDoc '' The domain name of the server, with optional explicit port. This is used by remote servers to connect to this server. This is also the last part of your UserID. @@ -117,7 +117,7 @@ in type = lib.types.listOf lib.types.str; example = [ "matrix.org" ]; default = [ "matrix.org" "vector.im" ]; - description = '' + description = lib.mdDoc '' Lists of domains that the server will trust as identity servers to verify third party identifiers such as phone numbers and email addresses @@ -128,7 +128,7 @@ in connection_string = lib.mkOption { type = lib.types.str; default = "file:federationapi.db"; - description = '' + description = lib.mdDoc '' Database for the Appservice API. ''; }; @@ -137,7 +137,7 @@ in registration_disabled = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to disable user registration to the server without the shared secret. ''; @@ -147,7 +147,7 @@ in connection_string = lib.mkOption { type = lib.types.str; default = "file:federationapi.db"; - description = '' + description = lib.mdDoc '' Database for the Federation API. ''; }; @@ -156,7 +156,7 @@ in connection_string = lib.mkOption { type = lib.types.str; default = "file:keyserver.db"; - description = '' + description = lib.mdDoc '' Database for the Key Server (for end-to-end encryption). ''; }; @@ -166,7 +166,7 @@ in connection_string = lib.mkOption { type = lib.types.str; default = "file:mediaapi.db"; - description = '' + description = lib.mdDoc '' Database for the Media API. ''; }; @@ -174,7 +174,7 @@ in base_path = lib.mkOption { type = lib.types.str; default = "${workingDir}/media_store"; - description = '' + description = lib.mdDoc '' Storage path for uploaded media. ''; }; @@ -183,7 +183,7 @@ in connection_string = lib.mkOption { type = lib.types.str; default = "file:roomserver.db"; - description = '' + description = lib.mdDoc '' Database for the Room Server. ''; }; @@ -192,7 +192,7 @@ in connection_string = lib.mkOption { type = lib.types.str; default = "file:syncserver.db"; - description = '' + description = lib.mdDoc '' Database for the Sync API. ''; }; @@ -202,7 +202,7 @@ in connection_string = lib.mkOption { type = lib.types.str; default = "file:userapi_accounts.db"; - description = '' + description = lib.mdDoc '' Database for the User API, accounts. ''; }; @@ -211,7 +211,7 @@ in connection_string = lib.mkOption { type = lib.types.str; default = "file:userapi_devices.db"; - description = '' + description = lib.mdDoc '' Database for the User API, devices. ''; }; @@ -222,7 +222,7 @@ in connection_string = lib.mkOption { type = lib.types.str; default = "file:mscs.db"; - description = '' + description = lib.mdDoc '' Database for exerimental MSC's. ''; }; @@ -230,16 +230,16 @@ in }; }; default = { }; - description = '' + description = lib.mdDoc '' Configuration for dendrite, see: - + for available options with which to populate settings. ''; }; openRegistration = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Allow open registration without secondary verification (reCAPTCHA). ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-facebook.nix b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-facebook.nix index e046c791ac..dfdf6e2502 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-facebook.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-facebook.nix @@ -75,15 +75,12 @@ in { }; } ''; - description = '' - config.yaml configuration as a Nix attribute set. + description = lib.mdDoc '' + {file}`config.yaml` configuration as a Nix attribute set. Configuration options should match those described in - - example-config.yaml. - + [example-config.yaml](https://github.com/mautrix/facebook/blob/master/mautrix_facebook/example-config.yaml). - - Secret tokens should be specified using + Secret tokens should be specified using {option}`environmentFile` instead of this world-readable attribute set. ''; }; @@ -91,28 +88,28 @@ in { environmentFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' File containing environment variables to be passed to the mautrix-telegram service. - Any config variable can be overridden by setting MAUTRIX_FACEBOOK_SOME_KEY to override the some.key variable. + Any config variable can be overridden by setting `MAUTRIX_FACEBOOK_SOME_KEY` to override the `some.key` variable. ''; }; configurePostgresql = mkOption { type = types.bool; default = true; - description = '' - Enable PostgreSQL and create a user and database for mautrix-facebook. The default settings reference this database, if you disable this option you must provide a database URL. + description = lib.mdDoc '' + Enable PostgreSQL and create a user and database for mautrix-facebook. The default `settings` reference this database, if you disable this option you must provide a database URL. ''; }; registrationData = mkOption { type = types.attrs; default = {}; - description = '' + description = lib.mdDoc '' Output data for appservice registration. Simply make any desired changes and serialize to JSON. Note that this data contains secrets so think twice before putting it into the nix store. - Currently as_token and hs_token need to be added as they are not known to this module. + Currently `as_token` and `hs_token` need to be added as they are not known to this module. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-telegram.nix b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-telegram.nix index 794c4dd9dd..196100a531 100644 --- a/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-telegram.nix +++ b/third_party/nixpkgs/nixos/modules/services/matrix/mautrix-telegram.nix @@ -78,15 +78,12 @@ in { }; } ''; - description = '' - config.yaml configuration as a Nix attribute set. + description = lib.mdDoc '' + {file}`config.yaml` configuration as a Nix attribute set. Configuration options should match those described in - - example-config.yaml. - + [example-config.yaml](https://github.com/tulir/mautrix-telegram/blob/master/example-config.yaml). - - Secret tokens should be specified using + Secret tokens should be specified using {option}`environmentFile` instead of this world-readable attribute set. ''; }; @@ -94,14 +91,14 @@ in { environmentFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' File containing environment variables to be passed to the mautrix-telegram service, in which secret tokens can be specified securely by defining values for - MAUTRIX_TELEGRAM_APPSERVICE_AS_TOKEN, - MAUTRIX_TELEGRAM_APPSERVICE_HS_TOKEN, - MAUTRIX_TELEGRAM_TELEGRAM_API_ID, - MAUTRIX_TELEGRAM_TELEGRAM_API_HASH and optionally - MAUTRIX_TELEGRAM_TELEGRAM_BOT_TOKEN. + `MAUTRIX_TELEGRAM_APPSERVICE_AS_TOKEN`, + `MAUTRIX_TELEGRAM_APPSERVICE_HS_TOKEN`, + `MAUTRIX_TELEGRAM_TELEGRAM_API_ID`, + `MAUTRIX_TELEGRAM_TELEGRAM_API_HASH` and optionally + `MAUTRIX_TELEGRAM_TELEGRAM_BOT_TOKEN`. ''; }; @@ -111,7 +108,7 @@ in { defaultText = literalExpression '' optional config.services.matrix-synapse.enable "matrix-synapse.service" ''; - description = '' + description = lib.mdDoc '' List of Systemd services to require and wait for when starting the application service. ''; }; @@ -125,6 +122,7 @@ in { wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ] ++ cfg.serviceDependencies; after = [ "network-online.target" ] ++ cfg.serviceDependencies; + path = [ pkgs.lottieconverter ]; preStart = '' # Not all secrets can be passed as environment variable (yet) diff --git a/third_party/nixpkgs/nixos/modules/services/misc/airsonic.nix b/third_party/nixpkgs/nixos/modules/services/misc/airsonic.nix index 2b9c6d80ab..01e330929c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/airsonic.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/airsonic.nix @@ -14,13 +14,13 @@ in { user = mkOption { type = types.str; default = "airsonic"; - description = "User account under which airsonic runs."; + description = lib.mdDoc "User account under which airsonic runs."; }; home = mkOption { type = types.path; default = "/var/lib/airsonic"; - description = '' + description = lib.mdDoc '' The directory where Airsonic will create files. Make sure it is writable. ''; @@ -29,7 +29,7 @@ in { virtualHost = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. ''; }; @@ -37,7 +37,7 @@ in { listenAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' The host name or IP address on which to bind Airsonic. The default value is appropriate for first launch, when the default credentials are easy to guess. It is also appropriate @@ -50,7 +50,7 @@ in { port = mkOption { type = types.int; default = 4040; - description = '' + description = lib.mdDoc '' The port on which Airsonic will listen for incoming HTTP traffic. Set to 0 to disable. ''; @@ -59,7 +59,7 @@ in { contextPath = mkOption { type = types.path; default = "/"; - description = '' + description = lib.mdDoc '' The context path, i.e., the last part of the Airsonic URL. Typically '/' or '/airsonic'. Default '/' ''; @@ -68,7 +68,7 @@ in { maxMemory = mkOption { type = types.int; default = 100; - description = '' + description = lib.mdDoc '' The memory limit (max Java heap size) in megabytes. Default: 100 ''; @@ -78,7 +78,7 @@ in { type = types.listOf types.path; default = [ "${pkgs.ffmpeg.bin}/bin/ffmpeg" ]; defaultText = literalExpression ''[ "''${pkgs.ffmpeg.bin}/bin/ffmpeg" ]''; - description = '' + description = lib.mdDoc '' List of paths to transcoder executables that should be accessible from Airsonic. Symlinks will be created to each executable inside ''${config.${opt.home}}/transcoders. @@ -89,7 +89,7 @@ in { type = types.package; default = pkgs.jre8; defaultText = literalExpression "pkgs.jre8"; - description = '' + description = lib.mdDoc '' JRE package to use. Airsonic only supports Java 8, airsonic-advanced requires at least @@ -101,11 +101,11 @@ in { type = types.path; default = "${pkgs.airsonic}/webapps/airsonic.war"; defaultText = literalExpression ''"''${pkgs.airsonic}/webapps/airsonic.war"''; - description = "Airsonic war file to use."; + description = lib.mdDoc "Airsonic war file to use."; }; jvmOptions = mkOption { - description = '' + description = lib.mdDoc '' Extra command line options for the JVM running AirSonic. Useful for sending jukebox output to non-default alsa devices. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ananicy.nix b/third_party/nixpkgs/nixos/modules/services/misc/ananicy.nix index 191666bc36..bf33b2c060 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ananicy.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ananicy.nix @@ -18,7 +18,7 @@ in default = pkgs.ananicy; defaultText = literalExpression "pkgs.ananicy"; example = literalExpression "pkgs.ananicy-cpp"; - description = '' + description = lib.mdDoc '' Which ananicy package to use. ''; }; @@ -29,18 +29,18 @@ in example = { apply_nice = false; }; - description = '' - See + description = lib.mdDoc '' + See ''; }; extraRules = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Extra rules in json format on separate lines. See: - - + + ''; example = literalExpression '' ''' diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ankisyncd.nix b/third_party/nixpkgs/nixos/modules/services/misc/ankisyncd.nix index 69e471f4f5..fe71b528b6 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ankisyncd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ankisyncd.nix @@ -34,25 +34,25 @@ in type = types.package; default = pkgs.ankisyncd; defaultText = literalExpression "pkgs.ankisyncd"; - description = "The package to use for the ankisyncd command."; + description = lib.mdDoc "The package to use for the ankisyncd command."; }; host = mkOption { type = types.str; default = "localhost"; - description = "ankisyncd host"; + description = lib.mdDoc "ankisyncd host"; }; port = mkOption { type = types.int; default = 27701; - description = "ankisyncd port"; + description = lib.mdDoc "ankisyncd port"; }; openFirewall = mkOption { default = false; type = types.bool; - description = "Whether to open the firewall for the specified port."; + description = lib.mdDoc "Whether to open the firewall for the specified port."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix b/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix index d1856fff4a..c428cfbc67 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix @@ -26,49 +26,49 @@ in { options.services.apache-kafka = { enable = mkOption { - description = "Whether to enable Apache Kafka."; + description = lib.mdDoc "Whether to enable Apache Kafka."; default = false; type = types.bool; }; brokerId = mkOption { - description = "Broker ID."; + description = lib.mdDoc "Broker ID."; default = -1; type = types.int; }; port = mkOption { - description = "Port number the broker should listen on."; + description = lib.mdDoc "Port number the broker should listen on."; default = 9092; type = types.int; }; hostname = mkOption { - description = "Hostname the broker should bind to."; + description = lib.mdDoc "Hostname the broker should bind to."; default = "localhost"; type = types.str; }; logDirs = mkOption { - description = "Log file directories"; + description = lib.mdDoc "Log file directories"; default = [ "/tmp/kafka-logs" ]; type = types.listOf types.path; }; zookeeper = mkOption { - description = "Zookeeper connection string"; + description = lib.mdDoc "Zookeeper connection string"; default = "localhost:2181"; type = types.str; }; extraProperties = mkOption { - description = "Extra properties for server.properties."; + description = lib.mdDoc "Extra properties for server.properties."; type = types.nullOr types.lines; default = null; }; serverProperties = mkOption { - description = '' + description = lib.mdDoc '' Complete server.properties content. Other server.properties config options will be ignored if this option is used. ''; @@ -77,7 +77,7 @@ in { }; log4jProperties = mkOption { - description = "Kafka log4j property configuration."; + description = lib.mdDoc "Kafka log4j property configuration."; default = '' log4j.rootLogger=INFO, stdout @@ -89,7 +89,7 @@ in { }; jvmOptions = mkOption { - description = "Extra command line options for the JVM running Kafka."; + description = lib.mdDoc "Extra command line options for the JVM running Kafka."; default = []; type = types.listOf types.str; example = [ @@ -100,14 +100,14 @@ in { }; package = mkOption { - description = "The kafka package to use"; + description = lib.mdDoc "The kafka package to use"; default = pkgs.apacheKafka; defaultText = literalExpression "pkgs.apacheKafka"; type = types.package; }; jre = mkOption { - description = "The JRE with which to run Kafka"; + description = lib.mdDoc "The JRE with which to run Kafka"; default = cfg.package.passthru.jre; defaultText = literalExpression "pkgs.apacheKafka.passthru.jre"; type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix b/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix index 5fce990afe..55ab15ff00 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/autofs.nix @@ -21,7 +21,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Mount filesystems on demand. Unmount them automatically. You may also be interested in afuse. ''; @@ -46,21 +46,21 @@ in /auto file:''${mapConf} ''' ''; - description = '' - Contents of /etc/auto.master file. See auto.master(5) and autofs(5). + description = lib.mdDoc '' + Contents of `/etc/auto.master` file. See {command}`auto.master(5)` and {command}`autofs(5)`. ''; }; timeout = mkOption { type = types.int; default = 600; - description = "Set the global minimum timeout, in seconds, until directories are unmounted"; + description = lib.mdDoc "Set the global minimum timeout, in seconds, until directories are unmounted"; }; debug = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Pass -d and -7 to automount and write log to the system journal. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix b/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix index ef799e9ce3..036bb4f41b 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/autorandr.nix @@ -27,22 +27,22 @@ let options = { fingerprint = mkOption { type = types.attrsOf types.str; - description = '' + description = lib.mdDoc '' Output name to EDID mapping. - Use autorandr --fingerprint to get current setup values. + Use `autorandr --fingerprint` to get current setup values. ''; default = { }; }; config = mkOption { type = types.attrsOf configModule; - description = "Per output profile configuration."; + description = lib.mdDoc "Per output profile configuration."; default = { }; }; hooks = mkOption { type = hooksModule; - description = "Profile hook scripts."; + description = lib.mdDoc "Profile hook scripts."; default = { }; }; }; @@ -52,54 +52,54 @@ let options = { enable = mkOption { type = types.bool; - description = "Whether to enable the output."; + description = lib.mdDoc "Whether to enable the output."; default = true; }; crtc = mkOption { type = types.nullOr types.ints.unsigned; - description = "Output video display controller."; + description = lib.mdDoc "Output video display controller."; default = null; example = 0; }; primary = mkOption { type = types.bool; - description = "Whether output should be marked as primary"; + description = lib.mdDoc "Whether output should be marked as primary"; default = false; }; position = mkOption { type = types.str; - description = "Output position"; + description = lib.mdDoc "Output position"; default = ""; example = "5760x0"; }; mode = mkOption { type = types.str; - description = "Output resolution."; + description = lib.mdDoc "Output resolution."; default = ""; example = "3840x2160"; }; rate = mkOption { type = types.str; - description = "Output framerate."; + description = lib.mdDoc "Output framerate."; default = ""; example = "60.00"; }; gamma = mkOption { type = types.str; - description = "Output gamma configuration."; + description = lib.mdDoc "Output gamma configuration."; default = ""; example = "1.0:0.909:0.833"; }; rotate = mkOption { type = types.nullOr (types.enum [ "normal" "left" "right" "inverted" ]); - description = "Output rotate configuration."; + description = lib.mdDoc "Output rotate configuration."; default = null; example = "left"; }; @@ -126,7 +126,7 @@ let dpi = mkOption { type = types.nullOr types.ints.positive; - description = "Output DPI configuration."; + description = lib.mdDoc "Output DPI configuration."; default = null; example = 96; }; @@ -136,25 +136,25 @@ let options = { method = mkOption { type = types.enum [ "factor" "pixel" ]; - description = "Output scaling method."; + description = lib.mdDoc "Output scaling method."; default = "factor"; example = "pixel"; }; x = mkOption { type = types.either types.float types.ints.positive; - description = "Horizontal scaling factor/pixels."; + description = lib.mdDoc "Horizontal scaling factor/pixels."; }; y = mkOption { type = types.either types.float types.ints.positive; - description = "Vertical scaling factor/pixels."; + description = lib.mdDoc "Vertical scaling factor/pixels."; }; }; }); description = '' Output scale configuration. - + Either configure by pixels or a scaling factor. When using pixel method the xrandr @@ -165,7 +165,7 @@ let will be used; when using factor method the option --scale will be used. - + This option is a shortcut version of the transform option and they are mutually exclusive. ''; @@ -184,19 +184,19 @@ let options = { postswitch = mkOption { type = types.attrsOf hookType; - description = "Postswitch hook executed after mode switch."; + description = lib.mdDoc "Postswitch hook executed after mode switch."; default = { }; }; preswitch = mkOption { type = types.attrsOf hookType; - description = "Preswitch hook executed before mode switch."; + description = lib.mdDoc "Preswitch hook executed before mode switch."; default = { }; }; predetect = mkOption { type = types.attrsOf hookType; - description = '' + description = lib.mdDoc '' Predetect hook executed before autorandr attempts to run xrandr. ''; default = { }; @@ -253,7 +253,7 @@ in { defaultTarget = mkOption { default = "default"; type = types.str; - description = '' + description = lib.mdDoc '' Fallback if no monitor layout can be detected. See the docs (https://github.com/phillipberndt/autorandr/blob/v1.0/README.md#how-to-use) for further reference. @@ -262,7 +262,7 @@ in { hooks = mkOption { type = hooksModule; - description = "Global hook scripts"; + description = lib.mdDoc "Global hook scripts"; default = { }; example = '' { @@ -292,7 +292,7 @@ in { }; profiles = mkOption { type = types.attrsOf profileModule; - description = "Autorandr profiles specification."; + description = lib.mdDoc "Autorandr profiles specification."; default = { }; example = literalExpression '' { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix index 99343a146a..8c0b4b88e5 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/bazarr.nix @@ -13,25 +13,25 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the bazarr web interface."; + description = lib.mdDoc "Open ports in the firewall for the bazarr web interface."; }; listenPort = mkOption { type = types.port; default = 6767; - description = "Port on which the bazarr web interface should listen"; + description = lib.mdDoc "Port on which the bazarr web interface should listen"; }; user = mkOption { type = types.str; default = "bazarr"; - description = "User account under which bazarr runs."; + description = lib.mdDoc "User account under which bazarr runs."; }; group = mkOption { type = types.str; default = "bazarr"; - description = "Group under which bazarr runs."; + description = lib.mdDoc "Group under which bazarr runs."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/beanstalkd.nix b/third_party/nixpkgs/nixos/modules/services/misc/beanstalkd.nix index 1c674a5b23..498e287ac7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/beanstalkd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/beanstalkd.nix @@ -17,13 +17,13 @@ in listen = { port = mkOption { type = types.int; - description = "TCP port that will be used to accept client connections."; + description = lib.mdDoc "TCP port that will be used to accept client connections."; default = 11300; }; address = mkOption { type = types.str; - description = "IP address to listen on."; + description = lib.mdDoc "IP address to listen on."; default = "127.0.0.1"; example = "0.0.0.0"; }; @@ -32,7 +32,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = "Whether to open ports in the firewall for the server."; + description = lib.mdDoc "Whether to open ports in the firewall for the server."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bees.nix b/third_party/nixpkgs/nixos/modules/services/misc/bees.nix index fa00d7e4f5..37f90c6822 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/bees.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/bees.nix @@ -11,14 +11,13 @@ let fsOptions = with types; { options.spec = mkOption { type = str; - description = '' + description = lib.mdDoc '' Description of how to identify the filesystem to be duplicated by this instance of bees. Note that deduplication crosses subvolumes; one must not configure multiple instances for subvolumes of the same filesystem (or block devices which are part of the same filesystem), but only for completely independent btrfs filesystems. - - + This must be in a format usable by findmnt; that could be a key=value pair, or a bare path to a mount point. Using bare paths will allow systemd to start the beesd service only @@ -29,14 +28,12 @@ let options.hashTableSizeMB = mkOption { type = types.addCheck types.int (n: mod n 16 == 0); default = 1024; # 1GB; default from upstream beesd script - description = '' + description = lib.mdDoc '' Hash table size in MB; must be a multiple of 16. - - + A larger ratio of index size to storage size means smaller blocks of duplicate content are recognized. - - + If you have 1TB of data, a 4GB hash table (which is to say, a value of 4096) will permit 4KB extents (the smallest possible size) to be recognized, whereas a value of 1024 -- creating a 1GB hash table -- @@ -47,12 +44,12 @@ let type = types.enum (attrNames logLevels ++ attrValues logLevels); apply = v: if isString v then logLevels.${v} else v; default = "info"; - description = "Log verbosity (syslog keyword/level)."; + description = lib.mdDoc "Log verbosity (syslog keyword/level)."; }; options.workDir = mkOption { type = str; default = ".beeshome"; - description = '' + description = lib.mdDoc '' Name (relative to the root of the filesystem) of the subvolume where the hash table will be stored. ''; @@ -60,7 +57,7 @@ let options.extraOptions = mkOption { type = listOf str; default = [ ]; - description = '' + description = lib.mdDoc '' Extra command-line options passed to the daemon. See upstream bees documentation. ''; example = literalExpression '' @@ -75,7 +72,7 @@ in options.services.beesd = { filesystems = mkOption { type = with types; attrsOf (submodule fsOptions); - description = "BTRFS filesystems to run block-level deduplication on."; + description = lib.mdDoc "BTRFS filesystems to run block-level deduplication on."; default = { }; example = literalExpression '' { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/bepasty.nix b/third_party/nixpkgs/nixos/modules/services/misc/bepasty.nix index f69832e5b2..8d18ef7f19 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/bepasty.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/bepasty.nix @@ -17,7 +17,7 @@ in servers = mkOption { default = {}; - description = '' + description = lib.mdDoc '' configure a number of bepasty servers which will be started with gunicorn. ''; @@ -27,7 +27,7 @@ in bind = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Bind address to be used for this server. ''; example = "0.0.0.0:8000"; @@ -36,7 +36,7 @@ in dataDir = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Path to the directory where the pastes will be saved to ''; default = default_home+"/data"; @@ -44,7 +44,7 @@ in defaultPermissions = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' default permissions for all unauthenticated accesses. ''; example = "read,create,delete"; @@ -53,7 +53,7 @@ in extraConfig = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' Extra configuration for bepasty server to be appended on the configuration. see https://bepasty-server.readthedocs.org/en/latest/quickstart.html#configuring-bepasty @@ -70,13 +70,13 @@ in secretKey = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' server secret for safe session cookies, must be set. Warning: this secret is stored in the WORLD-READABLE Nix store! - It's recommended to use - which takes precedence over . + It's recommended to use {option}`secretKeyFile` + which takes precedence over {option}`secretKey`. ''; default = ""; }; @@ -84,19 +84,19 @@ in secretKeyFile = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' A file that contains the server secret for safe session cookies, must be set. - takes precedence over . + {option}`secretKeyFile` takes precedence over {option}`secretKey`. - Warning: when is non-empty + Warning: when {option}`secretKey` is non-empty {option}`secretKeyFile` defaults to a file in the WORLD-READABLE Nix store containing that secret. ''; }; workDir = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Path to the working directory (used for config and pidfile). Defaults to the users home directory. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix b/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix index 2467d34b52..d75c33bab5 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/calibre-server.nix @@ -26,20 +26,20 @@ in enable = mkEnableOption "calibre-server"; libraries = mkOption { - description = '' + description = lib.mdDoc '' The directories of the libraries to serve. They must be readable for the user under which the server runs. ''; type = types.listOf types.path; }; user = mkOption { - description = "The user under which calibre-server runs."; + description = lib.mdDoc "The user under which calibre-server runs."; type = types.str; default = "calibre-server"; }; group = mkOption { - description = "The group under which calibre-server runs."; + description = lib.mdDoc "The group under which calibre-server runs."; type = types.str; default = "calibre-server"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/canto-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/canto-daemon.nix index db51a263aa..8150e038bc 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/canto-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/canto-daemon.nix @@ -16,7 +16,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the canto RSS daemon."; + description = lib.mdDoc "Whether to enable the canto RSS daemon."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/cfdyndns.nix b/third_party/nixpkgs/nixos/modules/services/misc/cfdyndns.nix index 5885617d74..74d7a0b2c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/cfdyndns.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/cfdyndns.nix @@ -18,7 +18,7 @@ in email = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The email address to use to authenticate to CloudFlare. ''; }; @@ -26,7 +26,7 @@ in apikeyFile = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The path to a file containing the API Key used to authenticate with CloudFlare. ''; @@ -36,7 +36,7 @@ in default = []; example = [ "host.tld" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The records to update in CloudFlare. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix b/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix index 60f7553072..a67986d301 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/cgminer.nix @@ -36,20 +36,20 @@ in package = mkOption { default = pkgs.cgminer; defaultText = literalExpression "pkgs.cgminer"; - description = "Which cgminer derivation to use."; + description = lib.mdDoc "Which cgminer derivation to use."; type = types.package; }; user = mkOption { type = types.str; default = "cgminer"; - description = "User account under which cgminer runs"; + description = lib.mdDoc "User account under which cgminer runs"; }; pools = mkOption { default = []; # Run benchmark type = types.listOf (types.attrsOf types.str); - description = "List of pools where to mine"; + description = lib.mdDoc "List of pools where to mine"; example = [{ url = "http://p2pool.org:9332"; username = "17EUZxTvs9uRmPsjPZSYUU3zCz9iwstudk"; @@ -60,7 +60,7 @@ in hardware = mkOption { default = []; # Run without options type = types.listOf (types.attrsOf (types.either types.str types.int)); - description= "List of config options for every GPU"; + description= lib.mdDoc "List of config options for every GPU"; example = [ { intensity = 9; @@ -87,7 +87,7 @@ in config = mkOption { default = {}; type = types.attrsOf (types.either types.bool types.int); - description = "Additional config"; + description = lib.mdDoc "Additional config"; example = { auto-fan = true; auto-gpu = true; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/clipcat.nix b/third_party/nixpkgs/nixos/modules/services/misc/clipcat.nix index 8b749aa728..0c067d23d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/clipcat.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/clipcat.nix @@ -13,7 +13,7 @@ in { type = types.package; default = pkgs.clipcat; defaultText = literalExpression "pkgs.clipcat"; - description = "clipcat derivation to use."; + description = lib.mdDoc "clipcat derivation to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/clipmenu.nix b/third_party/nixpkgs/nixos/modules/services/misc/clipmenu.nix index ef95985f8d..a31879284e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/clipmenu.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/clipmenu.nix @@ -13,7 +13,7 @@ in { type = types.package; default = pkgs.clipmenu; defaultText = literalExpression "pkgs.clipmenu"; - description = "clipmenu derivation to use."; + description = lib.mdDoc "clipmenu derivation to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/confd.nix b/third_party/nixpkgs/nixos/modules/services/misc/confd.nix index 6c66786524..87a9a25d49 100755 --- a/third_party/nixpkgs/nixos/modules/services/misc/confd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/confd.nix @@ -20,49 +20,49 @@ in { enable = mkEnableOption "confd service"; backend = mkOption { - description = "Confd config storage backend to use."; + description = lib.mdDoc "Confd config storage backend to use."; default = "etcd"; type = types.enum ["etcd" "consul" "redis" "zookeeper"]; }; interval = mkOption { - description = "Confd check interval."; + description = lib.mdDoc "Confd check interval."; default = 10; type = types.int; }; nodes = mkOption { - description = "Confd list of nodes to connect to."; + description = lib.mdDoc "Confd list of nodes to connect to."; default = [ "http://127.0.0.1:2379" ]; type = types.listOf types.str; }; watch = mkOption { - description = "Confd, whether to watch etcd config for changes."; + description = lib.mdDoc "Confd, whether to watch etcd config for changes."; default = true; type = types.bool; }; prefix = mkOption { - description = "The string to prefix to keys."; + description = lib.mdDoc "The string to prefix to keys."; default = "/"; type = types.path; }; logLevel = mkOption { - description = "Confd log level."; + description = lib.mdDoc "Confd log level."; default = "info"; type = types.enum ["info" "debug"]; }; confDir = mkOption { - description = "The path to the confd configs."; + description = lib.mdDoc "The path to the confd configs."; default = "/etc/confd"; type = types.path; }; package = mkOption { - description = "Confd package to use."; + description = lib.mdDoc "Confd package to use."; default = pkgs.confd; defaultText = literalExpression "pkgs.confd"; type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/cpuminer-cryptonight.nix b/third_party/nixpkgs/nixos/modules/services/misc/cpuminer-cryptonight.nix index 907b9d90da..7b18c6b3cd 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/cpuminer-cryptonight.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/cpuminer-cryptonight.nix @@ -23,27 +23,27 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the cpuminer cryptonight miner. ''; }; url = mkOption { type = types.str; - description = "URL of mining server"; + description = lib.mdDoc "URL of mining server"; }; user = mkOption { type = types.str; - description = "Username for mining server"; + description = lib.mdDoc "Username for mining server"; }; pass = mkOption { type = types.str; default = "x"; - description = "Password for mining server"; + description = lib.mdDoc "Password for mining server"; }; threads = mkOption { type = types.int; default = 0; - description = "Number of miner threads, defaults to available processors"; + description = lib.mdDoc "Number of miner threads, defaults to available processors"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/dictd.nix b/third_party/nixpkgs/nixos/modules/services/misc/dictd.nix index 8cb51bb0b7..4b714b84f3 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/dictd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/dictd.nix @@ -17,7 +17,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the DICT.org dictionary server. ''; }; @@ -27,7 +27,7 @@ in default = with pkgs.dictdDBs; [ wiktionary wordnet ]; defaultText = literalExpression "with pkgs.dictdDBs; [ wiktionary wordnet ]"; example = literalExpression "[ pkgs.dictdDBs.nld2eng ]"; - description = "List of databases to make available."; + description = lib.mdDoc "List of databases to make available."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix index 07c0613336..08e0a321a2 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/disnix.nix @@ -22,14 +22,14 @@ in enableMultiUser = mkOption { type = types.bool; default = true; - description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; + description = lib.mdDoc "Whether to support multi-user mode by enabling the Disnix D-Bus service"; }; useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat"; package = mkOption { type = types.path; - description = "The Disnix package"; + description = lib.mdDoc "The Disnix package"; default = pkgs.disnix; defaultText = literalExpression "pkgs.disnix"; }; @@ -39,7 +39,7 @@ in profiles = mkOption { type = types.listOf types.str; default = [ "default" ]; - description = "Names of the Disnix profiles to expose in the system's PATH"; + description = lib.mdDoc "Names of the Disnix profiles to expose in the system's PATH"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix b/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix index cb68a29c53..5b32762a36 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/docker-registry.nix @@ -50,13 +50,13 @@ in { enable = mkEnableOption "Docker Registry"; listenAddress = mkOption { - description = "Docker registry host or ip to bind to."; + description = lib.mdDoc "Docker registry host or ip to bind to."; default = "127.0.0.1"; type = types.str; }; port = mkOption { - description = "Docker registry port to bind to."; + description = lib.mdDoc "Docker registry port to bind to."; default = 5000; type = types.port; }; @@ -64,7 +64,7 @@ in { storagePath = mkOption { type = types.nullOr types.path; default = "/var/lib/docker-registry"; - description = '' + description = lib.mdDoc '' Docker registry storage path for the filesystem storage backend. Set to null to configure another backend via extraConfig. ''; @@ -73,7 +73,7 @@ in { enableDelete = mkOption { type = types.bool; default = false; - description = "Enable delete for manifests and blobs."; + description = lib.mdDoc "Enable delete for manifests and blobs."; }; enableRedisCache = mkEnableOption "redis as blob cache"; @@ -81,17 +81,17 @@ in { redisUrl = mkOption { type = types.str; default = "localhost:6379"; - description = "Set redis host and port."; + description = lib.mdDoc "Set redis host and port."; }; redisPassword = mkOption { type = types.str; default = ""; - description = "Set redis password."; + description = lib.mdDoc "Set redis password."; }; extraConfig = mkOption { - description = '' + description = lib.mdDoc '' Docker extra registry configuration via environment variables. ''; default = {}; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/domoticz.nix b/third_party/nixpkgs/nixos/modules/services/misc/domoticz.nix index b1353d4840..d01158b327 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/domoticz.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/domoticz.nix @@ -17,13 +17,13 @@ in { bind = mkOption { type = types.str; default = "0.0.0.0"; - description = "IP address to bind to."; + description = lib.mdDoc "IP address to bind to."; }; port = mkOption { type = types.int; default = 8080; - description = "Port to bind to for HTTP, set to 0 to disable HTTP."; + description = lib.mdDoc "Port to bind to for HTTP, set to 0 to disable HTTP."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/duckling.nix b/third_party/nixpkgs/nixos/modules/services/misc/duckling.nix index 77d2a92380..55a87fccf8 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/duckling.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/duckling.nix @@ -12,7 +12,7 @@ in { port = mkOption { type = types.port; default = 8080; - description = '' + description = lib.mdDoc '' Port on which duckling will run. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/dwm-status.nix b/third_party/nixpkgs/nixos/modules/services/misc/dwm-status.nix index 5f591b3c5d..92705e5515 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/dwm-status.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/dwm-status.nix @@ -29,14 +29,14 @@ in default = pkgs.dwm-status; defaultText = literalExpression "pkgs.dwm-status"; example = literalExpression "pkgs.dwm-status.override { enableAlsaUtils = false; }"; - description = '' + description = lib.mdDoc '' Which dwm-status package to use. ''; }; order = mkOption { type = types.listOf (types.enum [ "audio" "backlight" "battery" "cpu_load" "network" "time" ]); - description = '' + description = lib.mdDoc '' List of enabled features in order. ''; }; @@ -44,7 +44,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra config in TOML format. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix b/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix index 7d9c39a697..4d748ec6eb 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/dysnomia.nix @@ -87,52 +87,52 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable Dysnomia"; + description = lib.mdDoc "Whether to enable Dysnomia"; }; enableAuthentication = mkOption { type = types.bool; default = false; - description = "Whether to publish privacy-sensitive authentication credentials"; + description = lib.mdDoc "Whether to publish privacy-sensitive authentication credentials"; }; package = mkOption { type = types.path; - description = "The Dysnomia package"; + description = lib.mdDoc "The Dysnomia package"; }; properties = mkOption { - description = "An attribute set in which each attribute represents a machine property. Optionally, these values can be shell substitutions."; + description = lib.mdDoc "An attribute set in which each attribute represents a machine property. Optionally, these values can be shell substitutions."; default = {}; type = types.attrs; }; containers = mkOption { - description = "An attribute set in which each key represents a container and each value an attribute set providing its configuration properties"; + description = lib.mdDoc "An attribute set in which each key represents a container and each value an attribute set providing its configuration properties"; default = {}; type = types.attrsOf types.attrs; }; components = mkOption { - description = "An atttribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state"; + description = lib.mdDoc "An atttribute set in which each key represents a container and each value an attribute set in which each key represents a component and each value a derivation constructing its initial state"; default = {}; type = types.attrsOf types.attrs; }; extraContainerProperties = mkOption { - description = "An attribute set providing additional container settings in addition to the default properties"; + description = lib.mdDoc "An attribute set providing additional container settings in addition to the default properties"; default = {}; type = types.attrs; }; extraContainerPaths = mkOption { - description = "A list of paths containing additional container configurations that are added to the search folders"; + description = lib.mdDoc "A list of paths containing additional container configurations that are added to the search folders"; default = []; type = types.listOf types.path; }; extraModulePaths = mkOption { - description = "A list of paths containing additional modules that are added to the search folders"; + description = lib.mdDoc "A list of paths containing additional modules that are added to the search folders"; default = []; type = types.listOf types.path; }; @@ -140,7 +140,7 @@ in enableLegacyModules = mkOption { type = types.bool; default = true; - description = "Whether to enable Dysnomia legacy process and wrapper modules"; + description = lib.mdDoc "Whether to enable Dysnomia legacy process and wrapper modules"; }; }; }; @@ -186,7 +186,7 @@ in dysnomia.properties = { hostname = config.networking.hostName; - inherit (config.nixpkgs.localSystem) system; + inherit (pkgs.stdenv.hostPlatform) system; supportedTypes = [ "echo" diff --git a/third_party/nixpkgs/nixos/modules/services/misc/errbot.nix b/third_party/nixpkgs/nixos/modules/services/misc/errbot.nix index b447ba5d43..a650bc5bbd 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/errbot.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/errbot.nix @@ -27,48 +27,48 @@ in { options = { services.errbot.instances = mkOption { default = {}; - description = "Errbot instance configs"; + description = lib.mdDoc "Errbot instance configs"; type = types.attrsOf (types.submodule { options = { dataDir = mkOption { type = types.nullOr types.path; default = null; - description = "Data directory for errbot instance."; + description = lib.mdDoc "Data directory for errbot instance."; }; plugins = mkOption { type = types.listOf types.package; default = []; - description = "List of errbot plugin derivations."; + description = lib.mdDoc "List of errbot plugin derivations."; }; logLevel = mkOption { type = types.str; default = "INFO"; - description = "Errbot log level"; + description = lib.mdDoc "Errbot log level"; }; admins = mkOption { type = types.listOf types.str; default = []; - description = "List of identifiers of errbot admins."; + description = lib.mdDoc "List of identifiers of errbot admins."; }; backend = mkOption { type = types.str; default = "XMPP"; - description = "Errbot backend name."; + description = lib.mdDoc "Errbot backend name."; }; identity = mkOption { type = types.attrs; - description = "Errbot identity configuration"; + description = lib.mdDoc "Errbot identity configuration"; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "String to be appended to the config verbatim"; + description = lib.mdDoc "String to be appended to the config verbatim"; }; }; }); diff --git a/third_party/nixpkgs/nixos/modules/services/misc/etcd.nix b/third_party/nixpkgs/nixos/modules/services/misc/etcd.nix index 3925b7dd16..3343e94778 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/etcd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/etcd.nix @@ -10,124 +10,124 @@ in { options.services.etcd = { enable = mkOption { - description = "Whether to enable etcd."; + description = lib.mdDoc "Whether to enable etcd."; default = false; type = types.bool; }; name = mkOption { - description = "Etcd unique node name."; + description = lib.mdDoc "Etcd unique node name."; default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; type = types.str; }; advertiseClientUrls = mkOption { - description = "Etcd list of this member's client URLs to advertise to the rest of the cluster."; + description = lib.mdDoc "Etcd list of this member's client URLs to advertise to the rest of the cluster."; default = cfg.listenClientUrls; defaultText = literalExpression "config.${opt.listenClientUrls}"; type = types.listOf types.str; }; listenClientUrls = mkOption { - description = "Etcd list of URLs to listen on for client traffic."; + description = lib.mdDoc "Etcd list of URLs to listen on for client traffic."; default = ["http://127.0.0.1:2379"]; type = types.listOf types.str; }; listenPeerUrls = mkOption { - description = "Etcd list of URLs to listen on for peer traffic."; + description = lib.mdDoc "Etcd list of URLs to listen on for peer traffic."; default = ["http://127.0.0.1:2380"]; type = types.listOf types.str; }; initialAdvertisePeerUrls = mkOption { - description = "Etcd list of this member's peer URLs to advertise to rest of the cluster."; + description = lib.mdDoc "Etcd list of this member's peer URLs to advertise to rest of the cluster."; default = cfg.listenPeerUrls; defaultText = literalExpression "config.${opt.listenPeerUrls}"; type = types.listOf types.str; }; initialCluster = mkOption { - description = "Etcd initial cluster configuration for bootstrapping."; + description = lib.mdDoc "Etcd initial cluster configuration for bootstrapping."; default = ["${cfg.name}=http://127.0.0.1:2380"]; defaultText = literalExpression ''["''${config.${opt.name}}=http://127.0.0.1:2380"]''; type = types.listOf types.str; }; initialClusterState = mkOption { - description = "Etcd initial cluster configuration for bootstrapping."; + description = lib.mdDoc "Etcd initial cluster configuration for bootstrapping."; default = "new"; type = types.enum ["new" "existing"]; }; initialClusterToken = mkOption { - description = "Etcd initial cluster token for etcd cluster during bootstrap."; + description = lib.mdDoc "Etcd initial cluster token for etcd cluster during bootstrap."; default = "etcd-cluster"; type = types.str; }; discovery = mkOption { - description = "Etcd discovery url"; + description = lib.mdDoc "Etcd discovery url"; default = ""; type = types.str; }; clientCertAuth = mkOption { - description = "Whether to use certs for client authentication"; + description = lib.mdDoc "Whether to use certs for client authentication"; default = false; type = types.bool; }; trustedCaFile = mkOption { - description = "Certificate authority file to use for clients"; + description = lib.mdDoc "Certificate authority file to use for clients"; default = null; type = types.nullOr types.path; }; certFile = mkOption { - description = "Cert file to use for clients"; + description = lib.mdDoc "Cert file to use for clients"; default = null; type = types.nullOr types.path; }; keyFile = mkOption { - description = "Key file to use for clients"; + description = lib.mdDoc "Key file to use for clients"; default = null; type = types.nullOr types.path; }; peerCertFile = mkOption { - description = "Cert file to use for peer to peer communication"; + description = lib.mdDoc "Cert file to use for peer to peer communication"; default = cfg.certFile; defaultText = literalExpression "config.${opt.certFile}"; type = types.nullOr types.path; }; peerKeyFile = mkOption { - description = "Key file to use for peer to peer communication"; + description = lib.mdDoc "Key file to use for peer to peer communication"; default = cfg.keyFile; defaultText = literalExpression "config.${opt.keyFile}"; type = types.nullOr types.path; }; peerTrustedCaFile = mkOption { - description = "Certificate authority file to use for peer to peer communication"; + description = lib.mdDoc "Certificate authority file to use for peer to peer communication"; default = cfg.trustedCaFile; defaultText = literalExpression "config.${opt.trustedCaFile}"; type = types.nullOr types.path; }; peerClientCertAuth = mkOption { - description = "Whether to check all incoming peer requests from the cluster for valid client certificates signed by the supplied CA"; + description = lib.mdDoc "Whether to check all incoming peer requests from the cluster for valid client certificates signed by the supplied CA"; default = false; type = types.bool; }; extraConf = mkOption { - description = '' + description = lib.mdDoc '' Etcd extra configuration. See - + ''; type = types.attrsOf types.str; default = {}; @@ -145,7 +145,7 @@ in { dataDir = mkOption { type = types.path; default = "/var/lib/etcd"; - description = "Etcd data directory."; + description = lib.mdDoc "Etcd data directory."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix b/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix index cb99364aa1..1359c265c8 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/etebase-server.nix @@ -36,12 +36,12 @@ in type = types.bool; default = false; example = true; - description = '' + description = lib.mdDoc '' Whether to enable the Etebase server. Once enabled you need to create an admin user by invoking the - shell command etebase-server createsuperuser with - the user specified by the user option or a superuser. + shell command `etebase-server createsuperuser` with + the user specified by the `user` option or a superuser. Then you can login and create accounts on your-etebase-server.com/admin ''; }; @@ -49,19 +49,19 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/etebase-server"; - description = "Directory to store the Etebase server data."; + description = lib.mdDoc "Directory to store the Etebase server data."; }; port = mkOption { type = with types; nullOr port; default = 8001; - description = "Port to listen on."; + description = lib.mdDoc "Port to listen on."; }; openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open ports in the firewall for the server. ''; }; @@ -69,7 +69,7 @@ in unixSocket = mkOption { type = with types; nullOr str; default = null; - description = "The path to the socket to bind to."; + description = lib.mdDoc "The path to the socket to bind to."; example = "/run/etebase-server/etebase-server.sock"; }; @@ -82,14 +82,14 @@ in debug = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to set django's DEBUG flag. ''; }; secret_file = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The path to a file containing the secret used as django's SECRET_KEY. ''; @@ -98,13 +98,13 @@ in type = types.str; default = "${cfg.dataDir}/static"; defaultText = literalExpression ''"''${config.services.etebase-server.dataDir}/static"''; - description = "The directory for static files."; + description = lib.mdDoc "The directory for static files."; }; media_root = mkOption { type = types.str; default = "${cfg.dataDir}/media"; defaultText = literalExpression ''"''${config.services.etebase-server.dataDir}/media"''; - description = "The media directory."; + description = lib.mdDoc "The media directory."; }; }; allowed_hosts = { @@ -112,7 +112,7 @@ in type = types.str; default = "0.0.0.0"; example = "localhost"; - description = '' + description = lib.mdDoc '' The main host that is allowed access. ''; }; @@ -121,13 +121,13 @@ in engine = mkOption { type = types.enum [ "django.db.backends.sqlite3" "django.db.backends.postgresql" ]; default = "django.db.backends.sqlite3"; - description = "The database engine to use."; + description = lib.mdDoc "The database engine to use."; }; name = mkOption { type = types.str; default = "${cfg.dataDir}/db.sqlite3"; defaultText = literalExpression ''"''${config.services.etebase-server.dataDir}/db.sqlite3"''; - description = "The database name."; + description = lib.mdDoc "The database name."; }; }; }; @@ -135,8 +135,8 @@ in default = {}; description = '' Configuration for etebase-server. Refer to - - and + + and for details on supported values. ''; example = { @@ -153,7 +153,7 @@ in user = mkOption { type = types.str; default = defaultUser; - description = "User under which Etebase server runs."; + description = lib.mdDoc "User under which Etebase server runs."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/etesync-dav.nix b/third_party/nixpkgs/nixos/modules/services/misc/etesync-dav.nix index 9d7cfda371..6a755be850 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/etesync-dav.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/etesync-dav.nix @@ -12,32 +12,32 @@ in host = mkOption { type = types.str; default = "localhost"; - description = "The server host address."; + description = lib.mdDoc "The server host address."; }; port = mkOption { type = types.port; default = 37358; - description = "The server host port."; + description = lib.mdDoc "The server host port."; }; apiUrl = mkOption { type = types.str; default = "https://api.etesync.com/"; - description = "The url to the etesync API."; + description = lib.mdDoc "The url to the etesync API."; }; openFirewall = mkOption { default = false; type = types.bool; - description = "Whether to open the firewall for the specified port."; + description = lib.mdDoc "Whether to open the firewall for the specified port."; }; sslCertificate = mkOption { type = types.nullOr types.path; default = null; example = "/var/etesync.crt"; - description = '' + description = lib.mdDoc '' Path to server SSL certificate. It will be copied into etesync-dav's data directory. ''; @@ -47,7 +47,7 @@ in type = types.nullOr types.path; default = null; example = "/var/etesync.key"; - description = '' + description = lib.mdDoc '' Path to server SSL certificate key. It will be copied into etesync-dav's data directory. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ethminer.nix b/third_party/nixpkgs/nixos/modules/services/misc/ethminer.nix index 2236346698..909c49866e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ethminer.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ethminer.nix @@ -18,61 +18,61 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable ethminer ether mining."; + description = lib.mdDoc "Enable ethminer ether mining."; }; recheckInterval = mkOption { type = types.ints.unsigned; default = 2000; - description = "Interval in milliseconds between farm rechecks."; + description = lib.mdDoc "Interval in milliseconds between farm rechecks."; }; toolkit = mkOption { type = types.enum [ "cuda" "opencl" ]; default = "cuda"; - description = "Cuda or opencl toolkit."; + description = lib.mdDoc "Cuda or opencl toolkit."; }; apiPort = mkOption { type = types.int; default = -3333; - description = "Ethminer api port. minus sign puts api in read-only mode."; + description = lib.mdDoc "Ethminer api port. minus sign puts api in read-only mode."; }; wallet = mkOption { type = types.str; example = "0x0123456789abcdef0123456789abcdef01234567"; - description = "Ethereum wallet address."; + description = lib.mdDoc "Ethereum wallet address."; }; pool = mkOption { type = types.str; example = "eth-us-east1.nanopool.org"; - description = "Mining pool address."; + description = lib.mdDoc "Mining pool address."; }; stratumPort = mkOption { type = types.port; default = 9999; - description = "Stratum protocol tcp port."; + description = lib.mdDoc "Stratum protocol tcp port."; }; rig = mkOption { type = types.str; default = "mining-rig-name"; - description = "Mining rig name."; + description = lib.mdDoc "Mining rig name."; }; registerMail = mkOption { type = types.str; example = "email%40example.org"; - description = "Url encoded email address to register with pool."; + description = lib.mdDoc "Url encoded email address to register with pool."; }; maxPower = mkOption { type = types.ints.unsigned; default = 113; - description = "Miner max watt usage."; + description = lib.mdDoc "Miner max watt usage."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/exhibitor.nix b/third_party/nixpkgs/nixos/modules/services/misc/exhibitor.nix index 4c935efbd8..3db42b8e4a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/exhibitor.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/exhibitor.nix @@ -80,69 +80,69 @@ in port = mkOption { type = types.int; default = 8080; - description = '' + description = lib.mdDoc '' The port for exhibitor to listen on and communicate with other exhibitors. ''; }; baseDir = mkOption { type = types.str; default = "/var/exhibitor"; - description = '' + description = lib.mdDoc '' Baseline directory for exhibitor runtime config. ''; }; configType = mkOption { type = types.enum [ "file" "s3" "zookeeper" "none" ]; - description = '' + description = lib.mdDoc '' Which configuration type you want to use. Additional config will be required depending on which type you are using. ''; }; hostname = mkOption { type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Hostname to use and advertise ''; default = null; }; nodeModification = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Whether the Explorer UI will allow nodes to be modified (use with caution). ''; default = true; }; configCheckMs = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' Period (ms) to check for shared config updates. ''; default = 30000; }; headingText = mkOption { type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Extra text to display in UI header ''; default = null; }; jqueryStyle = mkOption { type = types.enum [ "red" "black" "custom" ]; - description = '' + description = lib.mdDoc '' Styling used for the JQuery-based UI. ''; default = "red"; }; logLines = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' Max lines of logging to keep in memory for display. ''; default = 1000; }; servo = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' ZooKeeper will be queried once a minute for its state via the 'mntr' four letter word (this requires ZooKeeper 3.4.x+). Servo will be used to publish this data via JMX. @@ -151,14 +151,14 @@ in }; timeout = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' Connection timeout (ms) for ZK connections. ''; default = 30000; }; autoManageInstances = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Automatically manage ZooKeeper instances in the ensemble ''; default = false; @@ -167,7 +167,7 @@ in type = types.str; default = "${cfg.baseDir}/zkData"; defaultText = literalExpression ''"''${config.${opt.baseDir}}/zkData"''; - description = '' + description = lib.mdDoc '' The Zookeeper data directory ''; }; @@ -175,56 +175,56 @@ in type = types.path; default = "${cfg.baseDir}/zkLogs"; defaultText = literalExpression ''"''${config.${opt.baseDir}}/zkLogs"''; - description = '' + description = lib.mdDoc '' The Zookeeper logs directory ''; }; extraConf = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Extra Exhibitor configuration to put in the ZooKeeper config file. ''; }; zkExtraCfg = mkOption { type = types.str; default = "initLimit=5&syncLimit=2&tickTime=2000"; - description = '' + description = lib.mdDoc '' Extra options to pass into Zookeeper ''; }; zkClientPort = mkOption { type = types.int; default = 2181; - description = '' + description = lib.mdDoc '' Zookeeper client port ''; }; zkConnectPort = mkOption { type = types.int; default = 2888; - description = '' + description = lib.mdDoc '' The port to use for followers to talk to each other. ''; }; zkElectionPort = mkOption { type = types.int; default = 3888; - description = '' + description = lib.mdDoc '' The port for Zookeepers to use for leader election. ''; }; zkCleanupPeriod = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' How often (in milliseconds) to run the Zookeeper log cleanup task. ''; }; zkServersSpec = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Zookeeper server spec for all servers in the ensemble. ''; example = [ "S:1:zk1.example.com" "S:2:zk2.example.com" "S:3:zk3.example.com" "O:4:zk-observer.example.com" ]; @@ -234,14 +234,14 @@ in s3Backup = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable backups to S3 ''; }; fileSystemBackup = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables file system backup of ZooKeeper log files ''; }; @@ -249,21 +249,21 @@ in # Options for using zookeeper configType zkConfigConnect = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The initial connection string for ZooKeeper shared config storage ''; example = ["host1:2181" "host2:2181"]; }; zkConfigExhibitorPath = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' If the ZooKeeper shared config is also running Exhibitor, the URI path for the REST call ''; default = "/"; }; zkConfigExhibitorPort = mkOption { type = types.nullOr types.int; - description = '' + description = lib.mdDoc '' If the ZooKeeper shared config is also running Exhibitor, the port that Exhibitor is listening on. IMPORTANT: if this value is not set it implies that Exhibitor is not being used on the ZooKeeper shared config. @@ -271,7 +271,7 @@ in }; zkConfigPollMs = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' The period in ms to check for changes in the config ensemble ''; default = 10000; @@ -280,21 +280,21 @@ in sleepMs = mkOption { type = types.int; default = 1000; - description = '' + description = lib.mdDoc '' Retry sleep time connecting to the ZooKeeper config ''; }; retryQuantity = mkOption { type = types.int; default = 3; - description = '' + description = lib.mdDoc '' Retries connecting to the ZooKeeper config ''; }; }; zkConfigZPath = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The base ZPath that Exhibitor should use ''; example = "/exhibitor/config"; @@ -304,19 +304,19 @@ in s3Config = { bucketName = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Bucket name to store config ''; }; objectKey = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' S3 key name to store the config ''; }; configPrefix = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' When using AWS S3 shared config files, the prefix to use for values such as locks ''; default = "exhibitor-"; @@ -326,7 +326,7 @@ in # The next two are used for either s3backup or s3 configType s3Credentials = mkOption { type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Optional credentials to use for s3backup or s3config. Argument is the path to an AWS credential properties file with two properties: com.netflix.exhibitor.s3.access-key-id and com.netflix.exhibitor.s3.access-secret-key @@ -335,7 +335,7 @@ in }; s3Region = mkOption { type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Optional region for S3 calls ''; default = null; @@ -344,7 +344,7 @@ in # Config options for file config type fsConfigDir = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Directory to store Exhibitor properties (cannot be used with s3config). Exhibitor uses file system locks so you can specify a shared location so as to enable complete ensemble management. @@ -352,14 +352,14 @@ in }; fsConfigLockPrefix = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' A prefix for a locking mechanism used in conjunction with fsconfigdir ''; default = "exhibitor-lock-"; }; fsConfigName = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The name of the file to store config in ''; default = "exhibitor.properties"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/felix.nix b/third_party/nixpkgs/nixos/modules/services/misc/felix.nix index 0283de128a..7654ad2844 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/felix.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/felix.nix @@ -23,19 +23,19 @@ in type = types.listOf types.package; default = [ pkgs.felix_remoteshell ]; defaultText = literalExpression "[ pkgs.felix_remoteshell ]"; - description = "List of bundles that should be activated on startup"; + description = lib.mdDoc "List of bundles that should be activated on startup"; }; user = mkOption { type = types.str; default = "osgi"; - description = "User account under which Apache Felix runs."; + description = lib.mdDoc "User account under which Apache Felix runs."; }; group = mkOption { type = types.str; default = "osgi"; - description = "Group account under which Apache Felix runs."; + description = lib.mdDoc "Group account under which Apache Felix runs."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix b/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix index 472b0b73ff..8a74b229ce 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/freeswitch.nix @@ -34,9 +34,9 @@ in { default = "${config.services.freeswitch.package}/share/freeswitch/conf/vanilla"; defaultText = literalExpression ''"''${config.services.freeswitch.package}/share/freeswitch/conf/vanilla"''; example = literalExpression ''"''${config.services.freeswitch.package}/share/freeswitch/conf/minimal"''; - description = '' + description = lib.mdDoc '' Configuration template to use. - See available templates in FreeSWITCH repository. + See available templates in [FreeSWITCH repository](https://github.com/signalwire/freeswitch/tree/master/conf). You can also set your own configuration directory. ''; }; @@ -51,18 +51,18 @@ in { '''; } ''; - description = '' + description = lib.mdDoc '' Override file in FreeSWITCH config template directory. Each top-level attribute denotes a file path in the configuration directory, its value is the file path. - See FreeSWITCH documentation for more info. - Also check available templates in FreeSWITCH repository. + See [FreeSWITCH documentation](https://freeswitch.org/confluence/display/FREESWITCH/Default+Configuration) for more info. + Also check available templates in [FreeSWITCH repository](https://github.com/signalwire/freeswitch/tree/master/conf). ''; }; package = mkOption { type = types.package; default = pkgs.freeswitch; defaultText = literalExpression "pkgs.freeswitch"; - description = '' + description = lib.mdDoc '' FreeSWITCH package. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix b/third_party/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix index d4bb58d81d..daa0e22e32 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gammu-smsd.nix @@ -58,39 +58,39 @@ in { user = mkOption { type = types.str; default = "smsd"; - description = "User that has access to the device"; + description = lib.mdDoc "User that has access to the device"; }; device = { path = mkOption { type = types.path; - description = "Device node or address of the phone"; + description = lib.mdDoc "Device node or address of the phone"; example = "/dev/ttyUSB2"; }; group = mkOption { type = types.str; default = "root"; - description = "Owner group of the device"; + description = lib.mdDoc "Owner group of the device"; example = "dialout"; }; connection = mkOption { type = types.str; default = "at"; - description = "Protocol which will be used to talk to the phone"; + description = lib.mdDoc "Protocol which will be used to talk to the phone"; }; synchronizeTime = mkOption { type = types.bool; default = true; - description = "Whether to set time from computer to the phone during starting connection"; + description = lib.mdDoc "Whether to set time from computer to the phone during starting connection"; }; pin = mkOption { type = types.nullOr types.str; default = null; - description = "PIN code for the simcard"; + description = lib.mdDoc "PIN code for the simcard"; }; }; @@ -99,13 +99,13 @@ in { file = mkOption { type = types.str; default = "syslog"; - description = "Path to file where information about communication will be stored"; + description = lib.mdDoc "Path to file where information about communication will be stored"; }; format = mkOption { type = types.enum [ "nothing" "text" "textall" "textalldate" "errors" "errorsdate" "binary" ]; default = "errors"; - description = "Determines what will be logged to the LogFile"; + description = lib.mdDoc "Determines what will be logged to the LogFile"; }; }; @@ -114,14 +114,14 @@ in { gammu = mkOption { type = types.lines; default = ""; - description = "Extra config lines to be added into [gammu] section"; + description = lib.mdDoc "Extra config lines to be added into [gammu] section"; }; smsd = mkOption { type = types.lines; default = ""; - description = "Extra config lines to be added into [smsd] section"; + description = lib.mdDoc "Extra config lines to be added into [smsd] section"; }; }; @@ -130,69 +130,69 @@ in { service = mkOption { type = types.enum [ "null" "files" "sql" ]; default = "null"; - description = "Service to use to store sms data."; + description = lib.mdDoc "Service to use to store sms data."; }; files = { inboxPath = mkOption { type = types.path; default = "/var/spool/sms/inbox/"; - description = "Where the received SMSes are stored"; + description = lib.mdDoc "Where the received SMSes are stored"; }; outboxPath = mkOption { type = types.path; default = "/var/spool/sms/outbox/"; - description = "Where SMSes to be sent should be placed"; + description = lib.mdDoc "Where SMSes to be sent should be placed"; }; sentSMSPath = mkOption { type = types.path; default = "/var/spool/sms/sent/"; - description = "Where the transmitted SMSes are placed"; + description = lib.mdDoc "Where the transmitted SMSes are placed"; }; errorSMSPath = mkOption { type = types.path; default = "/var/spool/sms/error/"; - description = "Where SMSes with error in transmission is placed"; + description = lib.mdDoc "Where SMSes with error in transmission is placed"; }; }; sql = { driver = mkOption { type = types.enum [ "native_mysql" "native_pgsql" "odbc" "dbi" ]; - description = "DB driver to use"; + description = lib.mdDoc "DB driver to use"; }; sqlDialect = mkOption { type = types.nullOr types.str; default = null; - description = "SQL dialect to use (odbc driver only)"; + description = lib.mdDoc "SQL dialect to use (odbc driver only)"; }; database = mkOption { type = types.nullOr types.str; default = null; - description = "Database name to store sms data"; + description = lib.mdDoc "Database name to store sms data"; }; host = mkOption { type = types.str; default = "localhost"; - description = "Database server address"; + description = lib.mdDoc "Database server address"; }; user = mkOption { type = types.nullOr types.str; default = null; - description = "User name used for connection to the database"; + description = lib.mdDoc "User name used for connection to the database"; }; password = mkOption { type = types.nullOr types.str; default = null; - description = "User password used for connetion to the database"; + description = lib.mdDoc "User password used for connetion to the database"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/geoipupdate.nix b/third_party/nixpkgs/nixos/modules/services/misc/geoipupdate.nix index db643c3d84..98d4704121 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/geoipupdate.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/geoipupdate.nix @@ -40,7 +40,7 @@ in description = '' geoipupdate configuration options. See - + for a full list of available options. Settings containing secret data should be set to an @@ -65,7 +65,7 @@ in AccountID = lib.mkOption { type = lib.types.int; - description = '' + description = lib.mdDoc '' Your MaxMind account ID. ''; }; @@ -77,10 +77,10 @@ in "GeoLite2-City" "GeoLite2-Country" ]; - description = '' + description = lib.mdDoc '' List of database edition IDs. This includes new string - IDs like GeoIP2-City and old - numeric IDs like 106. + IDs like `GeoIP2-City` and old + numeric IDs like `106`. ''; }; @@ -92,8 +92,7 @@ in Always handled as a secret whether the value is wrapped in a { _secret = ...; } - attrset or not (refer to for + attrset or not (refer to for details). ''; apply = x: if isAttrs x then x else { _secret = x; }; @@ -103,10 +102,10 @@ in type = lib.types.path; default = "/var/lib/GeoIP"; example = "/run/GeoIP"; - description = '' + description = lib.mdDoc '' The directory to store the database files in. The directory will be automatically created, the owner - changed to geoip and permissions + changed to `geoip` and permissions set to world readable. This applies if the directory already exists as well, so don't use a directory with sensitive contents. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix index effa0c06ad..82345ad786 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitea.nix @@ -27,26 +27,26 @@ in enable = mkOption { default = false; type = types.bool; - description = "Enable Gitea Service."; + description = lib.mdDoc "Enable Gitea Service."; }; package = mkOption { default = pkgs.gitea; type = types.package; defaultText = literalExpression "pkgs.gitea"; - description = "gitea derivation to use"; + description = lib.mdDoc "gitea derivation to use"; }; useWizard = mkOption { default = false; type = types.bool; - description = "Do not generate a configuration and use gitea' installation wizard instead. The first registered user will be administrator."; + description = lib.mdDoc "Do not generate a configuration and use gitea' installation wizard instead. The first registered user will be administrator."; }; stateDir = mkOption { default = "/var/lib/gitea"; type = types.str; - description = "gitea data directory."; + description = lib.mdDoc "gitea data directory."; }; log = { @@ -54,19 +54,19 @@ in default = "${cfg.stateDir}/log"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/log"''; type = types.str; - description = "Root path for log files."; + description = lib.mdDoc "Root path for log files."; }; level = mkOption { default = "Info"; type = types.enum [ "Trace" "Debug" "Info" "Warn" "Error" "Critical" ]; - description = "General log level."; + description = lib.mdDoc "General log level."; }; }; user = mkOption { type = types.str; default = "gitea"; - description = "User account under which gitea runs."; + description = lib.mdDoc "User account under which gitea runs."; }; database = { @@ -74,13 +74,13 @@ in type = types.enum [ "sqlite3" "mysql" "postgres" ]; example = "mysql"; default = "sqlite3"; - description = "Database engine to use."; + description = lib.mdDoc "Database engine to use."; }; host = mkOption { type = types.str; default = "127.0.0.1"; - description = "Database host address."; + description = lib.mdDoc "Database host address."; }; port = mkOption { @@ -91,28 +91,28 @@ in then 3306 else config.${options.services.postgresql.port} ''; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = mkOption { type = types.str; default = "gitea"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = mkOption { type = types.str; default = "gitea"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; password = mkOption { type = types.str; default = ""; - description = '' - The password corresponding to . + description = lib.mdDoc '' + The password corresponding to {option}`database.user`. Warning: this is stored in cleartext in the Nix store! - Use instead. + Use {option}`database.passwordFile` instead. ''; }; @@ -120,9 +120,9 @@ in type = types.nullOr types.path; default = null; example = "/run/keys/gitea-dbpassword"; - description = '' + description = lib.mdDoc '' A file containing the password corresponding to - . + {option}`database.user`. ''; }; @@ -131,20 +131,20 @@ in default = if (cfg.database.createDatabase && usePostgresql) then "/run/postgresql" else if (cfg.database.createDatabase && useMysql) then "/run/mysqld/mysqld.sock" else null; defaultText = literalExpression "null"; example = "/run/mysqld/mysqld.sock"; - description = "Path to the unix socket file to use for authentication."; + description = lib.mdDoc "Path to the unix socket file to use for authentication."; }; path = mkOption { type = types.str; default = "${cfg.stateDir}/data/gitea.db"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/data/gitea.db"''; - description = "Path to the sqlite3 database file."; + description = lib.mdDoc "Path to the sqlite3 database file."; }; createDatabase = mkOption { type = types.bool; default = true; - description = "Whether to create a local database automatically."; + description = lib.mdDoc "Whether to create a local database automatically."; }; }; @@ -152,7 +152,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable a timer that runs gitea dump to generate backup-files of the current gitea database and repositories. ''; @@ -175,13 +175,13 @@ in type = types.str; default = "${cfg.stateDir}/dump"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/dump"''; - description = "Path to the dump files."; + description = lib.mdDoc "Path to the dump files."; }; type = mkOption { type = types.enum [ "zip" "rar" "tar" "sz" "tar.gz" "tar.xz" "tar.bz2" "tar.br" "tar.lz4" ]; default = "zip"; - description = "Archive format used to store the dump file."; + description = lib.mdDoc "Archive format used to store the dump file."; }; file = mkOption { @@ -196,14 +196,14 @@ in enable = mkOption { type = types.bool; default = true; - description = "Enable external SSH feature."; + description = lib.mdDoc "Enable external SSH feature."; }; clonePort = mkOption { type = types.int; default = 22; example = 2222; - description = '' + description = lib.mdDoc '' SSH port displayed in clone URL. The option is required to configure a service when the external visible port differs from the local listening port i.e. if port forwarding is used. @@ -215,64 +215,64 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enables git-lfs support."; + description = lib.mdDoc "Enables git-lfs support."; }; contentDir = mkOption { type = types.str; default = "${cfg.stateDir}/data/lfs"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/data/lfs"''; - description = "Where to store LFS files."; + description = lib.mdDoc "Where to store LFS files."; }; }; appName = mkOption { type = types.str; default = "gitea: Gitea Service"; - description = "Application name."; + description = lib.mdDoc "Application name."; }; repositoryRoot = mkOption { type = types.str; default = "${cfg.stateDir}/repositories"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/repositories"''; - description = "Path to the git repositories."; + description = lib.mdDoc "Path to the git repositories."; }; domain = mkOption { type = types.str; default = "localhost"; - description = "Domain name of your server."; + description = lib.mdDoc "Domain name of your server."; }; rootUrl = mkOption { type = types.str; default = "http://localhost:3000/"; - description = "Full public URL of gitea server."; + description = lib.mdDoc "Full public URL of gitea server."; }; httpAddress = mkOption { type = types.str; default = "0.0.0.0"; - description = "HTTP listen address."; + description = lib.mdDoc "HTTP listen address."; }; httpPort = mkOption { type = types.int; default = 3000; - description = "HTTP listen port."; + description = lib.mdDoc "HTTP listen port."; }; enableUnixSocket = mkOption { type = types.bool; default = false; - description = "Configure Gitea to listen on a unix socket instead of the default TCP port."; + description = lib.mdDoc "Configure Gitea to listen on a unix socket instead of the default TCP port."; }; cookieSecure = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Marks session cookies as "secure" as a hint for browsers to only send them via HTTPS. This option is recommend, if gitea is being served over HTTPS. ''; @@ -283,14 +283,14 @@ in default = gitea.data; defaultText = literalExpression "package.data"; example = "/var/lib/gitea/data"; - description = "Upper level of template and static files path."; + description = lib.mdDoc "Upper level of template and static files path."; }; mailerPasswordFile = mkOption { type = types.nullOr types.str; default = null; example = "/var/lib/secrets/gitea/mailpw"; - description = "Path to a file containing the SMTP password."; + description = lib.mdDoc "Path to a file containing the SMTP password."; }; disableRegistration = mkEnableOption "the registration lock" // { @@ -308,8 +308,8 @@ in settings = mkOption { type = with types; attrsOf (attrsOf (oneOf [ bool int str ])); default = {}; - description = '' - Gitea configuration. Refer to + description = lib.mdDoc '' + Gitea configuration. Refer to for details on supported values. ''; example = literalExpression '' @@ -335,7 +335,7 @@ in extraConfig = mkOption { type = with types; nullOr str; default = null; - description = "Configuration lines appended to the generated gitea configuration file."; + description = lib.mdDoc "Configuration lines appended to the generated gitea configuration file."; }; }; }; @@ -506,24 +506,24 @@ in function gitea_setup { cp -f ${configFile} ${runConfig} - if [ ! -e ${secretKey} ]; then + if [ ! -s ${secretKey} ]; then ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey} fi # Migrate LFS_JWT_SECRET filename - if [[ -e ${oldLfsJwtSecret} && ! -e ${lfsJwtSecret} ]]; then + if [[ -s ${oldLfsJwtSecret} && ! -s ${lfsJwtSecret} ]]; then mv ${oldLfsJwtSecret} ${lfsJwtSecret} fi - if [ ! -e ${oauth2JwtSecret} ]; then + if [ ! -s ${oauth2JwtSecret} ]; then ${gitea}/bin/gitea generate secret JWT_SECRET > ${oauth2JwtSecret} fi - if [ ! -e ${lfsJwtSecret} ]; then + if [ ! -s ${lfsJwtSecret} ]; then ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${lfsJwtSecret} fi - if [ ! -e ${internalToken} ]; then + if [ ! -s ${internalToken} ]; then ${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken} fi diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitit.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitit.nix index 87dd97166b..223fa76d91 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitit.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitit.nix @@ -689,14 +689,14 @@ in '' if [ ! -d _darcs ] then - ${pkgs.darcs}/bin/darcs initialize + darcs initialize echo "${gm}" > _darcs/prefs/email '' else if repositoryType == "mercurial" then '' if [ ! -d .hg ] then - ${pkgs.mercurial}/bin/hg init + hg init cat >> .hg/hgrc <root or the user set in - . + either `root` or the user set in + {option}`services.gitlab.user`. ''; }; extraEnv = mkOption { type = types.attrsOf types.str; default = {}; - description = '' + description = lib.mdDoc '' Additional environment variables for the GitLab environment. ''; }; @@ -331,7 +331,7 @@ in { type = types.str; default = cfg.statePath + "/backup"; defaultText = literalExpression ''config.${opt.statePath} + "/backup"''; - description = "GitLab path for backups."; + description = lib.mdDoc "GitLab path for backups."; }; backup.keepTime = mkOption { @@ -364,13 +364,13 @@ in { default = []; example = [ "artifacts" "lfs" ]; apply = x: if isString x then x else concatStringsSep "," x; - description = '' + description = lib.mdDoc '' Directories to exclude from the backup. The example excludes CI artifacts and LFS objects from the backups. The - tar option skips the creation of a tar + `tar` option skips the creation of a tar file. - Refer to + Refer to for more information. ''; }; @@ -403,13 +403,13 @@ in { storage_class = "STANDARD"; }; ''; - description = '' + description = lib.mdDoc '' GitLab automatic upload specification. Tells GitLab to upload the backup to a remote location when done. Attributes specified here are added under - production -> backup -> upload in - config/gitlab.yml. + `production -> backup -> upload` in + {file}`config/gitlab.yml`. ''; }; @@ -425,7 +425,7 @@ in { databasePasswordFile = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' File containing the GitLab database user password. This should be a string, not a nix path, since nix paths are @@ -436,43 +436,43 @@ in { databaseCreateLocally = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether a database should be automatically created on the - local host. Set this to false if you plan + local host. Set this to `false` if you plan on provisioning a local database yourself. This has no effect - if is customized. + if {option}`services.gitlab.databaseHost` is customized. ''; }; databaseName = mkOption { type = types.str; default = "gitlab"; - description = "GitLab database name."; + description = lib.mdDoc "GitLab database name."; }; databaseUsername = mkOption { type = types.str; default = "gitlab"; - description = "GitLab database user."; + description = lib.mdDoc "GitLab database user."; }; databasePool = mkOption { type = types.int; default = 5; - description = "Database connection pool size."; + description = lib.mdDoc "Database connection pool size."; }; extraDatabaseConfig = mkOption { type = types.attrs; default = {}; - description = "Extra configuration in config/database.yml."; + description = lib.mdDoc "Extra configuration in config/database.yml."; }; redisUrl = mkOption { type = types.str; default = "redis://localhost:${toString config.services.redis.servers.gitlab.port}/"; defaultText = literalExpression ''redis://localhost:''${toString config.services.redis.servers.gitlab.port}/''; - description = "Redis URL for all GitLab services except gitlab-shell"; + description = lib.mdDoc "Redis URL for all GitLab services except gitlab-shell"; }; extraGitlabRb = mkOption { @@ -488,7 +488,7 @@ in { } end ''; - description = '' + description = lib.mdDoc '' Extra configuration to be placed in config/extra-gitlab.rb. This can be used to add configuration not otherwise exposed through this module's options. @@ -499,13 +499,13 @@ in { type = types.str; default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; - description = "GitLab host name. Used e.g. for copy-paste URLs."; + description = lib.mdDoc "GitLab host name. Used e.g. for copy-paste URLs."; }; port = mkOption { type = types.port; default = 8080; - description = '' + description = lib.mdDoc '' GitLab server port for copy-paste URLs, e.g. 80 or 443 if you're service over https. ''; @@ -514,25 +514,25 @@ in { https = mkOption { type = types.bool; default = false; - description = "Whether gitlab prints URLs with https as scheme."; + description = lib.mdDoc "Whether gitlab prints URLs with https as scheme."; }; user = mkOption { type = types.str; default = "gitlab"; - description = "User to run gitlab and all related services."; + description = lib.mdDoc "User to run gitlab and all related services."; }; group = mkOption { type = types.str; default = "gitlab"; - description = "Group to run gitlab and all related services."; + description = lib.mdDoc "Group to run gitlab and all related services."; }; initialRootEmail = mkOption { type = types.str; default = "admin@local.host"; - description = '' + description = lib.mdDoc '' Initial email address of the root account if this is a new install. ''; }; @@ -540,7 +540,7 @@ in { initialRootPasswordFile = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' File containing the initial password of the root account if this is a new install. @@ -553,51 +553,51 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Enable GitLab container registry."; + description = lib.mdDoc "Enable GitLab container registry."; }; host = mkOption { type = types.str; default = config.services.gitlab.host; defaultText = literalExpression "config.services.gitlab.host"; - description = "GitLab container registry host name."; + description = lib.mdDoc "GitLab container registry host name."; }; port = mkOption { type = types.int; default = 4567; - description = "GitLab container registry port."; + description = lib.mdDoc "GitLab container registry port."; }; certFile = mkOption { type = types.path; - description = "Path to GitLab container registry certificate."; + description = lib.mdDoc "Path to GitLab container registry certificate."; }; keyFile = mkOption { type = types.path; - description = "Path to GitLab container registry certificate-key."; + description = lib.mdDoc "Path to GitLab container registry certificate-key."; }; defaultForProjects = mkOption { type = types.bool; default = cfg.registry.enable; defaultText = literalExpression "config.${opt.registry.enable}"; - description = "If GitLab container registry should be enabled by default for projects."; + description = lib.mdDoc "If GitLab container registry should be enabled by default for projects."; }; issuer = mkOption { type = types.str; default = "gitlab-issuer"; - description = "GitLab container registry issuer."; + description = lib.mdDoc "GitLab container registry issuer."; }; serviceName = mkOption { type = types.str; default = "container_registry"; - description = "GitLab container registry service name."; + description = lib.mdDoc "GitLab container registry service name."; }; externalAddress = mkOption { type = types.str; default = ""; - description = "External address used to access registry from the internet"; + description = lib.mdDoc "External address used to access registry from the internet"; }; externalPort = mkOption { type = types.int; - description = "External port used to access registry from the internet"; + description = lib.mdDoc "External port used to access registry from the internet"; }; }; @@ -605,31 +605,31 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Enable gitlab mail delivery over SMTP."; + description = lib.mdDoc "Enable gitlab mail delivery over SMTP."; }; address = mkOption { type = types.str; default = "localhost"; - description = "Address of the SMTP server for GitLab."; + description = lib.mdDoc "Address of the SMTP server for GitLab."; }; port = mkOption { type = types.int; default = 25; - description = "Port of the SMTP server for GitLab."; + description = lib.mdDoc "Port of the SMTP server for GitLab."; }; username = mkOption { type = with types; nullOr str; default = null; - description = "Username of the SMTP server for GitLab."; + description = lib.mdDoc "Username of the SMTP server for GitLab."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' File containing the password of the SMTP server for GitLab. This should be a string, not a nix path, since nix paths @@ -640,44 +640,44 @@ in { domain = mkOption { type = types.str; default = "localhost"; - description = "HELO domain to use for outgoing mail."; + description = lib.mdDoc "HELO domain to use for outgoing mail."; }; authentication = mkOption { type = with types; nullOr str; default = null; - description = "Authentication type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; + description = lib.mdDoc "Authentication type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; }; enableStartTLSAuto = mkOption { type = types.bool; default = true; - description = "Whether to try to use StartTLS."; + description = lib.mdDoc "Whether to try to use StartTLS."; }; tls = mkOption { type = types.bool; default = false; - description = "Whether to use TLS wrapper-mode."; + description = lib.mdDoc "Whether to use TLS wrapper-mode."; }; opensslVerifyMode = mkOption { type = types.str; default = "peer"; - description = "How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; + description = lib.mdDoc "How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html"; }; }; pagesExtraArgs = mkOption { type = types.listOf types.str; default = [ "-listen-proxy" "127.0.0.1:8090" ]; - description = "Arguments to pass to the gitlab-pages daemon"; + description = lib.mdDoc "Arguments to pass to the gitlab-pages daemon"; }; secrets.secretFile = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' A file containing the secret used to encrypt variables in the DB. If you change or lose this key you will be unable to access variables stored in database. @@ -693,7 +693,7 @@ in { secrets.dbFile = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' A file containing the secret used to encrypt variables in the DB. If you change or lose this key you will be unable to access variables stored in database. @@ -709,7 +709,7 @@ in { secrets.otpFile = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' A file containing the secret used to encrypt secrets for OTP tokens. If you change or lose this key, users which have 2FA enabled for login won't be able to login anymore. @@ -725,7 +725,7 @@ in { secrets.jwsFile = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' A file containing the secret used to encrypt session keys. If you change or lose this key, users will be disconnected. @@ -743,7 +743,7 @@ in { extraShellConfig = mkOption { type = types.attrs; default = {}; - description = "Extra configuration to merge into shell-config.yml"; + description = lib.mdDoc "Extra configuration to merge into shell-config.yml"; }; puma.workers = mkOption { @@ -805,12 +805,12 @@ in { sidekiq.memoryKiller.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the Sidekiq MemoryKiller should be turned on. MemoryKiller kills Sidekiq when its memory consumption exceeds a certain limit. - See + See for details. ''; }; @@ -819,7 +819,7 @@ in { type = types.int; default = 2000; apply = x: builtins.toString (x * 1024); - description = '' + description = lib.mdDoc '' The maximum amount of memory, in MiB, a Sidekiq worker is allowed to consume before being killed. ''; @@ -829,7 +829,7 @@ in { type = types.int; default = 900; apply = x: builtins.toString x; - description = '' + description = lib.mdDoc '' The time MemoryKiller waits after noticing excessive memory consumption before killing Sidekiq. ''; @@ -839,7 +839,7 @@ in { type = types.int; default = 30; apply = x: builtins.toString x; - description = '' + description = lib.mdDoc '' The time allowed for all jobs to finish before Sidekiq is killed forcefully. ''; @@ -849,7 +849,7 @@ in { enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Enable rotation of log files. ''; }; @@ -857,21 +857,21 @@ in { frequency = mkOption { type = types.str; default = "daily"; - description = "How often to rotate the logs."; + description = lib.mdDoc "How often to rotate the logs."; }; keep = mkOption { type = types.int; default = 30; - description = "How many rotations to keep."; + description = lib.mdDoc "How many rotations to keep."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra logrotate config options for this path. Refer to - for details. + for details. ''; }; }; @@ -914,21 +914,21 @@ in { }; }; ''; - description = '' + description = lib.mdDoc '' Extra options to be added under - production in - config/gitlab.yml, as a nix attribute + `production` in + {file}`config/gitlab.yml`, as a nix attribute set. Options containing secret data should be set to an attribute - set containing the attribute _secret - a + set containing the attribute `_secret` - a string pointing to a file containing the value the option should be set to. See the example to get a better picture of this: in the resulting - config/gitlab.yml file, the - production.omniauth.providers[0].args.client_options.secret + {file}`config/gitlab.yml` file, the + `production.omniauth.providers[0].args.client_options.secret` key will be set to the contents of the - /var/keys/gitlab_oidc_secret file. + {file}`/var/keys/gitlab_oidc_secret` file. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitolite.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitolite.nix index 810ef1f21b..b313be074d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitolite.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitolite.nix @@ -26,7 +26,7 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/gitolite"; - description = '' + description = lib.mdDoc '' The gitolite home directory used to store all repositories. If left as the default value this directory will automatically be created before the gitolite server starts, otherwise the sysadmin is responsible for ensuring the directory exists with appropriate ownership @@ -36,7 +36,7 @@ in adminPubkey = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Initial administrative public key for Gitolite. This should be an SSH Public Key. Note that this key will only be used once, upon the first initialization of the Gitolite user. @@ -47,8 +47,8 @@ in enableGitAnnex = mkOption { type = types.bool; default = false; - description = '' - Enable git-annex support. Uses the extraGitoliteRc option + description = lib.mdDoc '' + Enable git-annex support. Uses the `extraGitoliteRc` option to apply the necessary configuration. ''; }; @@ -56,8 +56,8 @@ in commonHooks = mkOption { type = types.listOf types.path; default = []; - description = '' - A list of custom git hooks that get copied to ~/.gitolite/hooks/common. + description = lib.mdDoc '' + A list of custom git hooks that get copied to `~/.gitolite/hooks/common`. ''; }; @@ -97,7 +97,7 @@ in user = mkOption { type = types.str; default = "gitolite"; - description = '' + description = lib.mdDoc '' Gitolite user account. This is the username of the gitolite endpoint. ''; }; @@ -105,7 +105,7 @@ in group = mkOption { type = types.str; default = "gitolite"; - description = '' + description = lib.mdDoc '' Primary group of the Gitolite user account. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix index a1180716e3..ef20347ee2 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix @@ -13,7 +13,7 @@ in projectroot = mkOption { default = "/srv/git"; type = types.path; - description = '' + description = lib.mdDoc '' Path to git projects (bare repositories) that should be served by gitweb. Must not end with a slash. ''; @@ -22,7 +22,7 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Verbatim configuration text appended to the generated gitweb.conf file. ''; example = '' @@ -35,7 +35,7 @@ in gitwebTheme = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Use an alternative theme for gitweb, strongly inspired by GitHub. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix b/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix index c7ae4f4940..e726f2c5c7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gogs.nix @@ -48,31 +48,31 @@ in enable = mkOption { default = false; type = types.bool; - description = "Enable Go Git Service."; + description = lib.mdDoc "Enable Go Git Service."; }; useWizard = mkOption { default = false; type = types.bool; - description = "Do not generate a configuration and use Gogs' installation wizard instead. The first registered user will be administrator."; + description = lib.mdDoc "Do not generate a configuration and use Gogs' installation wizard instead. The first registered user will be administrator."; }; stateDir = mkOption { default = "/var/lib/gogs"; type = types.str; - description = "Gogs data directory."; + description = lib.mdDoc "Gogs data directory."; }; user = mkOption { type = types.str; default = "gogs"; - description = "User account under which Gogs runs."; + description = lib.mdDoc "User account under which Gogs runs."; }; group = mkOption { type = types.str; default = "gogs"; - description = "Group account under which Gogs runs."; + description = lib.mdDoc "Group account under which Gogs runs."; }; database = { @@ -80,40 +80,40 @@ in type = types.enum [ "sqlite3" "mysql" "postgres" ]; example = "mysql"; default = "sqlite3"; - description = "Database engine to use."; + description = lib.mdDoc "Database engine to use."; }; host = mkOption { type = types.str; default = "127.0.0.1"; - description = "Database host address."; + description = lib.mdDoc "Database host address."; }; port = mkOption { type = types.int; default = 3306; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = mkOption { type = types.str; default = "gogs"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = mkOption { type = types.str; default = "gogs"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; password = mkOption { type = types.str; default = ""; - description = '' - The password corresponding to . + description = lib.mdDoc '' + The password corresponding to {option}`database.user`. Warning: this is stored in cleartext in the Nix store! - Use instead. + Use {option}`database.passwordFile` instead. ''; }; @@ -121,9 +121,9 @@ in type = types.nullOr types.path; default = null; example = "/run/keys/gogs-dbpassword"; - description = '' + description = lib.mdDoc '' A file containing the password corresponding to - . + {option}`database.user`. ''; }; @@ -131,51 +131,51 @@ in type = types.str; default = "${cfg.stateDir}/data/gogs.db"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/data/gogs.db"''; - description = "Path to the sqlite3 database file."; + description = lib.mdDoc "Path to the sqlite3 database file."; }; }; appName = mkOption { type = types.str; default = "Gogs: Go Git Service"; - description = "Application name."; + description = lib.mdDoc "Application name."; }; repositoryRoot = mkOption { type = types.str; default = "${cfg.stateDir}/repositories"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/repositories"''; - description = "Path to the git repositories."; + description = lib.mdDoc "Path to the git repositories."; }; domain = mkOption { type = types.str; default = "localhost"; - description = "Domain name of your server."; + description = lib.mdDoc "Domain name of your server."; }; rootUrl = mkOption { type = types.str; default = "http://localhost:3000/"; - description = "Full public URL of Gogs server."; + description = lib.mdDoc "Full public URL of Gogs server."; }; httpAddress = mkOption { type = types.str; default = "0.0.0.0"; - description = "HTTP listen address."; + description = lib.mdDoc "HTTP listen address."; }; httpPort = mkOption { type = types.int; default = 3000; - description = "HTTP listen port."; + description = lib.mdDoc "HTTP listen port."; }; cookieSecure = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Marks session cookies as "secure" as a hint for browsers to only send them via HTTPS. This option is recommend, if Gogs is being served over HTTPS. ''; @@ -184,7 +184,7 @@ in extraConfig = mkOption { type = types.str; default = ""; - description = "Configuration lines appended to the generated Gogs configuration file."; + description = lib.mdDoc "Configuration lines appended to the generated Gogs configuration file."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix b/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix index 5a5f488dc5..a4bed2da8a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gollum.nix @@ -11,80 +11,80 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the Gollum service."; + description = lib.mdDoc "Enable the Gollum service."; }; address = mkOption { type = types.str; default = "0.0.0.0"; - description = "IP address on which the web server will listen."; + description = lib.mdDoc "IP address on which the web server will listen."; }; port = mkOption { type = types.int; default = 4567; - description = "Port on which the web server will run."; + description = lib.mdDoc "Port on which the web server will run."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Content of the configuration file"; + description = lib.mdDoc "Content of the configuration file"; }; mathjax = mkOption { type = types.bool; default = false; - description = "Enable support for math rendering using MathJax"; + description = lib.mdDoc "Enable support for math rendering using MathJax"; }; allowUploads = mkOption { type = types.nullOr (types.enum [ "dir" "page" ]); default = null; - description = "Enable uploads of external files"; + description = lib.mdDoc "Enable uploads of external files"; }; user-icons = mkOption { type = types.nullOr (types.enum [ "gravatar" "identicon" ]); default = null; - description = "Enable specific user icons for history view"; + description = lib.mdDoc "Enable specific user icons for history view"; }; emoji = mkOption { type = types.bool; default = false; - description = "Parse and interpret emoji tags"; + description = lib.mdDoc "Parse and interpret emoji tags"; }; h1-title = mkOption { type = types.bool; default = false; - description = "Use the first h1 as page title"; + description = lib.mdDoc "Use the first h1 as page title"; }; no-edit = mkOption { type = types.bool; default = false; - description = "Disable editing pages"; + description = lib.mdDoc "Disable editing pages"; }; local-time = mkOption { type = types.bool; default = false; - description = "Use the browser's local timezone instead of the server's for displaying dates."; + description = lib.mdDoc "Use the browser's local timezone instead of the server's for displaying dates."; }; branch = mkOption { type = types.str; default = "master"; example = "develop"; - description = "Git branch to serve"; + description = lib.mdDoc "Git branch to serve"; }; stateDir = mkOption { type = types.path; default = "/var/lib/gollum"; - description = "Specifies the path of the repository directory. If it does not exist, Gollum will create it on startup."; + description = lib.mdDoc "Specifies the path of the repository directory. If it does not exist, Gollum will create it on startup."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix b/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix index 6494578f76..1ab8d1bbe0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gpsd.nix @@ -21,7 +21,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable `gpsd', a GPS service daemon. ''; }; @@ -29,9 +29,9 @@ in device = mkOption { type = types.str; default = "/dev/ttyUSB0"; - description = '' + description = lib.mdDoc '' A device may be a local serial device for GPS input, or a URL of the form: - [{dgpsip|ntrip}://][user:passwd@]host[:port][/stream] + `[{dgpsip|ntrip}://][user:passwd@]host[:port][/stream]` in which case it specifies an input source for DGPS or ntrip data. ''; }; @@ -39,7 +39,7 @@ in readonly = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable the broken-device-safety, otherwise known as read-only mode. Some popular bluetooth and USB receivers lock up or become totally inaccessible when @@ -56,7 +56,7 @@ in nowait = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' don't wait for client connects to poll GPS ''; }; @@ -64,7 +64,7 @@ in port = mkOption { type = types.port; default = 2947; - description = '' + description = lib.mdDoc '' The port where to listen for TCP connections. ''; }; @@ -72,7 +72,7 @@ in debugLevel = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' The debugging level. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/greenclip.nix b/third_party/nixpkgs/nixos/modules/services/misc/greenclip.nix index 32e8d746cb..210827ea07 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/greenclip.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/greenclip.nix @@ -13,7 +13,7 @@ in { type = types.package; default = pkgs.haskellPackages.greenclip; defaultText = literalExpression "pkgs.haskellPackages.greenclip"; - description = "greenclip derivation to use."; + description = lib.mdDoc "greenclip derivation to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/headphones.nix b/third_party/nixpkgs/nixos/modules/services/misc/headphones.nix index 31bd61cb4c..472b330fff 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/headphones.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/headphones.nix @@ -20,38 +20,38 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the headphones server."; + description = lib.mdDoc "Whether to enable the headphones server."; }; dataDir = mkOption { type = types.path; default = "/var/lib/${name}"; - description = "Path where to store data files."; + description = lib.mdDoc "Path where to store data files."; }; configFile = mkOption { type = types.path; default = "${cfg.dataDir}/config.ini"; defaultText = literalExpression ''"''${config.${opt.dataDir}}/config.ini"''; - description = "Path to config file."; + description = lib.mdDoc "Path to config file."; }; host = mkOption { type = types.str; default = "localhost"; - description = "Host to listen on."; + description = lib.mdDoc "Host to listen on."; }; port = mkOption { type = types.ints.u16; default = 8181; - description = "Port to bind to."; + description = lib.mdDoc "Port to bind to."; }; user = mkOption { type = types.str; default = name; - description = "User to run the service as"; + description = lib.mdDoc "User to run the service as"; }; group = mkOption { type = types.str; default = name; - description = "Group to run the service as"; + description = lib.mdDoc "Group to run the service as"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix b/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix index deefb061d8..486ba512ac 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/heisenbridge.nix @@ -30,20 +30,20 @@ in default = pkgs.heisenbridge; defaultText = "pkgs.heisenbridge"; example = "pkgs.heisenbridge.override { … = …; }"; - description = '' + description = lib.mdDoc '' Package of the application to run, exposed for overriding purposes. ''; }; homeserver = mkOption { type = types.str; - description = "The URL to the home server for client-server API calls"; + description = lib.mdDoc "The URL to the home server for client-server API calls"; example = "http://localhost:8008"; }; registrationUrl = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The URL where the application service is listening for HS requests, from the Matrix HS perspective.# The default value assumes the bridge runs on the same host as the home server, in the same network. ''; @@ -54,26 +54,26 @@ in address = mkOption { type = types.str; - description = "Address to listen on. IPv6 does not seem to be supported."; + description = lib.mdDoc "Address to listen on. IPv6 does not seem to be supported."; default = "127.0.0.1"; example = "0.0.0.0"; }; port = mkOption { type = types.port; - description = "The port to listen on"; + description = lib.mdDoc "The port to listen on"; default = 9898; }; debug = mkOption { type = types.bool; - description = "More verbose logging. Recommended during initial setup."; + description = lib.mdDoc "More verbose logging. Recommended during initial setup."; default = false; }; owner = mkOption { type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Set owner MXID otherwise first talking local user will claim the bridge ''; default = null; @@ -81,7 +81,7 @@ in }; namespaces = mkOption { - description = "Configure the 'namespaces' section of the registration.yml for the bridge and the server"; + description = lib.mdDoc "Configure the 'namespaces' section of the registration.yml for the bridge and the server"; # TODO link to Matrix documentation of the format type = types.submodule { freeformType = jsonType; @@ -102,13 +102,13 @@ in identd.enable = mkEnableOption "identd service support"; identd.port = mkOption { type = types.port; - description = "identd listen port"; + description = lib.mdDoc "identd listen port"; default = 113; }; extraArgs = mkOption { type = types.listOf types.str; - description = "Heisenbridge is configured over the command line. Append extra arguments here"; + description = lib.mdDoc "Heisenbridge is configured over the command line. Append extra arguments here"; default = [ ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ihaskell.nix b/third_party/nixpkgs/nixos/modules/services/misc/ihaskell.nix index 9978e8a465..ff5709922e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ihaskell.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ihaskell.nix @@ -17,7 +17,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Autostart an IHaskell notebook service."; + description = lib.mdDoc "Autostart an IHaskell notebook service."; }; extraPackages = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix b/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix index f5fb2bf530..f66d714e11 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/input-remapper.nix @@ -13,7 +13,7 @@ let cfg = config.services.input-remapper; in default = [ "graphical.target" ]; example = [ "multi-user.target" ]; type = types.listOf types.str; - description = "Specifies the WantedBy setting for the input-remapper service."; + description = lib.mdDoc "Specifies the WantedBy setting for the input-remapper service."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/irkerd.nix b/third_party/nixpkgs/nixos/modules/services/misc/irkerd.nix index 993d77ba42..d080cc0a73 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/irkerd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/irkerd.nix @@ -9,13 +9,13 @@ in { options.services.irkerd = { enable = mkOption { - description = "Whether to enable irker, an IRC notification daemon."; + description = lib.mdDoc "Whether to enable irker, an IRC notification daemon."; default = false; type = types.bool; }; openPorts = mkOption { - description = "Open ports in the firewall for irkerd"; + description = lib.mdDoc "Open ports in the firewall for irkerd"; default = false; type = types.bool; }; @@ -24,7 +24,7 @@ in default = "localhost"; example = "0.0.0.0"; type = types.str; - description = '' + description = lib.mdDoc '' Specifies the bind address on which the irker daemon listens. The default is localhost. @@ -36,7 +36,7 @@ in nick = mkOption { default = "irker"; type = types.str; - description = "Nick to use for irker"; + description = lib.mdDoc "Nick to use for irker"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/jackett.nix b/third_party/nixpkgs/nixos/modules/services/misc/jackett.nix index c2144d4a9a..e8315d1341 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/jackett.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/jackett.nix @@ -14,32 +14,32 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/jackett/.config/Jackett"; - description = "The directory where Jackett stores its data files."; + description = lib.mdDoc "The directory where Jackett stores its data files."; }; openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the Jackett web interface."; + description = lib.mdDoc "Open ports in the firewall for the Jackett web interface."; }; user = mkOption { type = types.str; default = "jackett"; - description = "User account under which Jackett runs."; + description = lib.mdDoc "User account under which Jackett runs."; }; group = mkOption { type = types.str; default = "jackett"; - description = "Group under which Jackett runs."; + description = lib.mdDoc "Group under which Jackett runs."; }; package = mkOption { type = types.package; default = pkgs.jackett; defaultText = literalExpression "pkgs.jackett"; - description = "Jackett package to use."; + description = lib.mdDoc "Jackett package to use."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix index e2f227b061..af5256e46d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix @@ -13,14 +13,14 @@ in user = mkOption { type = types.str; default = "jellyfin"; - description = "User account under which Jellyfin runs."; + description = lib.mdDoc "User account under which Jellyfin runs."; }; package = mkOption { type = types.package; default = pkgs.jellyfin; defaultText = literalExpression "pkgs.jellyfin"; - description = '' + description = lib.mdDoc '' Jellyfin package to use. ''; }; @@ -28,13 +28,13 @@ in group = mkOption { type = types.str; default = "jellyfin"; - description = "Group under which jellyfin runs."; + description = lib.mdDoc "Group under which jellyfin runs."; }; openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open the default ports in the firewall for the media server. The HTTP/HTTPS ports can be changed in the Web UI, so this option should only be used if they are unchanged. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix b/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix index 7b3780b5cc..34e9acc719 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/klipper.nix @@ -5,9 +5,9 @@ let format = pkgs.formats.ini { # https://github.com/NixOS/nixpkgs/pull/121613#issuecomment-885241996 listToValue = l: - if builtins.length l == 1 then generators.mkValueStringDefault {} (head l) + if builtins.length l == 1 then generators.mkValueStringDefault { } (head l) else lib.concatMapStrings (s: "\n ${generators.mkValueStringDefault {} s}") l; - mkKeyValue = generators.mkKeyValueDefault {} ":"; + mkKeyValue = generators.mkKeyValueDefault { } ":"; }; in { @@ -20,31 +20,31 @@ in type = types.package; default = pkgs.klipper; defaultText = literalExpression "pkgs.klipper"; - description = "The Klipper package."; + description = lib.mdDoc "The Klipper package."; }; inputTTY = mkOption { type = types.path; default = "/run/klipper/tty"; - description = "Path of the virtual printer symlink to create."; + description = lib.mdDoc "Path of the virtual printer symlink to create."; }; apiSocket = mkOption { type = types.nullOr types.path; default = "/run/klipper/api"; - description = "Path of the API socket to create."; + description = lib.mdDoc "Path of the API socket to create."; }; octoprintIntegration = mkOption { type = types.bool; default = false; - description = "Allows Octoprint to control Klipper."; + description = lib.mdDoc "Allows Octoprint to control Klipper."; }; user = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' User account under which Klipper runs. If null is specified (default), a temporary user will be created by systemd. @@ -54,7 +54,7 @@ in group = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Group account under which Klipper runs. If null is specified (default), a temporary user will be created by systemd. @@ -64,11 +64,29 @@ in settings = mkOption { type = format.type; default = { }; - description = '' - Configuration for Klipper. See the documentation + description = lib.mdDoc '' + Configuration for Klipper. See the [documentation](https://www.klipper3d.org/Overview.html#configuration-and-tuning-guides) for supported values. ''; }; + + firmwares = mkOption { + description = lib.mdDoc "Firmwares klipper should manage"; + default = { }; + type = with types; attrsOf + (submodule { + options = { + enable = mkEnableOption '' + building of firmware and addition of klipper-flash tools for manual flashing. + This will add `klipper-flash-$mcu` scripts to your environment which can be called to flash the firmware. + ''; + configFile = mkOption { + type = path; + description = "Path to firmware config which is generated using `klipper-genconf`"; + }; + }; + }); + }; }; }; @@ -83,6 +101,10 @@ in assertion = cfg.user != null -> cfg.group != null; message = "Option klipper.group is not set when a user is specified."; } + { + assertion = foldl (a: b: a && b) true (mapAttrsToList (mcu: _: mcu != null -> (hasAttrByPath [ "${mcu}" "serial" ] cfg.settings)) cfg.firmwares); + message = "Option klipper.settings.$mcu.serial must be set when klipper.firmware.$mcu is specified"; + } ]; environment.etc."klipper.cfg".source = format.generate "klipper.cfg" cfg.settings; @@ -92,26 +114,53 @@ in group = config.services.octoprint.group; }; - systemd.services.klipper = let - klippyArgs = "--input-tty=${cfg.inputTTY}" - + optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}"; - in { - description = "Klipper 3D Printer Firmware"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + systemd.services.klipper = + let + klippyArgs = "--input-tty=${cfg.inputTTY}" + + optionalString (cfg.apiSocket != null) " --api-server=${cfg.apiSocket}"; + in + { + description = "Klipper 3D Printer Firmware"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} /etc/klipper.cfg"; - RuntimeDirectory = "klipper"; - SupplementaryGroups = [ "dialout" ]; - WorkingDirectory = "${cfg.package}/lib"; - } // (if cfg.user != null then { - Group = cfg.group; - User = cfg.user; - } else { - DynamicUser = true; - User = "klipper"; - }); - }; + serviceConfig = { + ExecStart = "${cfg.package}/lib/klipper/klippy.py ${klippyArgs} /etc/klipper.cfg"; + RuntimeDirectory = "klipper"; + SupplementaryGroups = [ "dialout" ]; + WorkingDirectory = "${cfg.package}/lib"; + OOMScoreAdjust = "-999"; + CPUSchedulingPolicy = "rr"; + CPUSchedulingPriority = 99; + IOSchedulingClass = "realtime"; + IOSchedulingPriority = 0; + } // (if cfg.user != null then { + Group = cfg.group; + User = cfg.user; + } else { + DynamicUser = true; + User = "klipper"; + }); + }; + + environment.systemPackages = + with pkgs; + let + firmwares = filterAttrs (n: v: v!= null) (mapAttrs + (mcu: { enable, configFile }: if enable then pkgs.klipper-firmware.override { + mcu = lib.strings.sanitizeDerivationName mcu; + firmwareConfig = configFile; + } else null) + cfg.firmwares); + firmwareFlasher = mapAttrsToList + (mcu: firmware: pkgs.klipper-flash.override { + mcu = lib.strings.sanitizeDerivationName mcu; + klipper-firmware = firmware; + flashDevice = cfg.settings."${mcu}".serial; + firmwareConfig = cfg.firmwares."${mcu}".configFile; + }) + firmwares; + in + [ klipper-genconf ] ++ firmwareFlasher ++ attrValues firmwares; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/misc/leaps.nix b/third_party/nixpkgs/nixos/modules/services/misc/leaps.nix index f797218522..0308fbfcf4 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/leaps.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/leaps.nix @@ -13,18 +13,18 @@ in port = mkOption { type = types.port; default = 8080; - description = "A port where leaps listens for incoming http requests"; + description = lib.mdDoc "A port where leaps listens for incoming http requests"; }; address = mkOption { default = ""; type = types.str; example = "127.0.0.1"; - description = "Hostname or IP-address to listen to. By default it will listen on all interfaces."; + description = lib.mdDoc "Hostname or IP-address to listen to. By default it will listen on all interfaces."; }; path = mkOption { default = "/"; type = types.path; - description = "Subdirectory used for reverse proxy setups"; + description = lib.mdDoc "Subdirectory used for reverse proxy setups"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/libreddit.nix b/third_party/nixpkgs/nixos/modules/services/misc/libreddit.nix index e21a884478..0359f57c0d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/libreddit.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/libreddit.nix @@ -19,20 +19,20 @@ in default = "0.0.0.0"; example = "127.0.0.1"; type = types.str; - description = "The address to listen on"; + description = lib.mdDoc "The address to listen on"; }; port = mkOption { default = 8080; example = 8000; type = types.port; - description = "The port to listen on"; + description = lib.mdDoc "The port to listen on"; }; openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the libreddit web interface"; + description = lib.mdDoc "Open ports in the firewall for the libreddit web interface"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/lidarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/lidarr.nix index 20153c7e61..d070a7f091 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/lidarr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/lidarr.nix @@ -13,20 +13,20 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/lidarr/.config/Lidarr"; - description = "The directory where Lidarr stores its data files."; + description = lib.mdDoc "The directory where Lidarr stores its data files."; }; package = mkOption { type = types.package; default = pkgs.lidarr; defaultText = literalExpression "pkgs.lidarr"; - description = "The Lidarr package to use"; + description = lib.mdDoc "The Lidarr package to use"; }; openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for Lidarr ''; }; @@ -34,7 +34,7 @@ in user = mkOption { type = types.str; default = "lidarr"; - description = '' + description = lib.mdDoc '' User account under which Lidarr runs. ''; }; @@ -42,7 +42,7 @@ in group = mkOption { type = types.str; default = "lidarr"; - description = '' + description = lib.mdDoc '' Group under which Lidarr runs. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/lifecycled.nix b/third_party/nixpkgs/nixos/modules/services/misc/lifecycled.nix index 1c8942998d..fc8c77c6ca 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/lifecycled.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/lifecycled.nix @@ -33,12 +33,12 @@ in frequency = mkOption { type = types.str; default = "hourly"; - description = '' + description = lib.mdDoc '' How often to trigger the queue cleaner. NOTE: This string should be a valid value for a systemd - timer's OnCalendar configuration. See - systemd.timer5 + timer's `OnCalendar` configuration. See + {manpage}`systemd.timer(5)` for more information. ''; }; @@ -46,7 +46,7 @@ in parallel = mkOption { type = types.ints.unsigned; default = 20; - description = '' + description = lib.mdDoc '' The number of parallel deletes to run. ''; }; @@ -55,7 +55,7 @@ in instanceId = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The instance ID to listen for events for. ''; }; @@ -63,7 +63,7 @@ in snsTopic = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The SNS topic that receives events. ''; }; @@ -71,14 +71,14 @@ in noSpot = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Disable the spot termination listener. ''; }; handler = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' The script to invoke to handle events. ''; }; @@ -86,7 +86,7 @@ in json = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable JSON logging. ''; }; @@ -94,7 +94,7 @@ in cloudwatchGroup = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Write logs to a specific Cloudwatch Logs group. ''; }; @@ -102,7 +102,7 @@ in cloudwatchStream = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Write logs to a specific Cloudwatch Logs stream. Defaults to the instance ID. ''; }; @@ -110,7 +110,7 @@ in debug = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable debugging information. ''; }; @@ -120,7 +120,7 @@ in awsRegion = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The region used for accessing AWS services. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/logkeys.nix b/third_party/nixpkgs/nixos/modules/services/misc/logkeys.nix index 0082db63a0..628f562743 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/logkeys.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/logkeys.nix @@ -9,7 +9,7 @@ in { enable = mkEnableOption "logkeys service"; device = mkOption { - description = "Use the given device as keyboard input event device instead of /dev/input/eventX default."; + description = lib.mdDoc "Use the given device as keyboard input event device instead of /dev/input/eventX default."; default = null; type = types.nullOr types.str; example = "/dev/input/event15"; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mame.nix b/third_party/nixpkgs/nixos/modules/services/misc/mame.nix index dd6c5ef9aa..6e9d2fd26c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mame.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mame.nix @@ -12,19 +12,19 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to setup TUN/TAP Ethernet interface for MAME emulator. ''; }; user = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' User from which you run MAME binary. ''; }; hostAddr = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' IP address of the host system. Usually an address of the main network adapter or the adapter through which you get an internet connection. ''; @@ -32,9 +32,9 @@ in }; emuAddr = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' IP address of the guest system. The same you set inside guest OS under - MAME. Should be on the same subnet as . + MAME. Should be on the same subnet as {option}`services.mame.hostAddr`. ''; example = "192.168.31.155"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix b/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix index 7a149ff47e..786ecf2d69 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mbpfan.nix @@ -16,7 +16,7 @@ in { type = types.package; default = pkgs.mbpfan; defaultText = literalExpression "pkgs.mbpfan"; - description = '' + description = lib.mdDoc '' The package used for the mbpfan daemon. ''; }; @@ -24,14 +24,14 @@ in { verbose = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If true, sets the log level to verbose. ''; }; settings = mkOption { default = {}; - description = "INI configuration for Mbpfan."; + description = lib.mdDoc "INI configuration for Mbpfan."; type = types.submodule { freeformType = settingsFormat.type; @@ -48,22 +48,22 @@ in { options.general.low_temp = mkOption { type = types.int; default = 55; - description = "If temperature is below this, fans will run at minimum speed."; + description = lib.mdDoc "If temperature is below this, fans will run at minimum speed."; }; options.general.high_temp = mkOption { type = types.int; default = 58; - description = "If temperature is above this, fan speed will gradually increase."; + description = lib.mdDoc "If temperature is above this, fan speed will gradually increase."; }; options.general.max_temp = mkOption { type = types.int; default = 86; - description = "If temperature is above this, fans will run at maximum speed."; + description = lib.mdDoc "If temperature is above this, fans will run at maximum speed."; }; options.general.polling_interval = mkOption { type = types.int; default = 1; - description = "The polling interval."; + description = lib.mdDoc "The polling interval."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix b/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix index ee5c0ef8d2..8cac87f532 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mediatomb.nix @@ -15,19 +15,19 @@ let options = { path = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Absolute directory path to the media directory to index. ''; }; recursive = mkOption { type = types.bool; default = false; - description = "Whether the indexation must take place recursively or not."; + description = lib.mdDoc "Whether the indexation must take place recursively or not."; }; hidden-files = mkOption { type = types.bool; default = true; - description = "Whether to index the hidden files or not."; + description = lib.mdDoc "Whether to index the hidden files or not."; }; }; }; @@ -202,7 +202,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the Gerbera/Mediatomb DLNA server. ''; }; @@ -210,7 +210,7 @@ in { serverName = mkOption { type = types.str; default = "Gerbera (Mediatomb)"; - description = '' + description = lib.mdDoc '' How to identify the server on the network. ''; }; @@ -219,7 +219,7 @@ in { type = types.package; default = pkgs.gerbera; defaultText = literalExpression "pkgs.gerbera"; - description = '' + description = lib.mdDoc '' Underlying package to be used with the module. ''; }; @@ -227,7 +227,7 @@ in { ps3Support = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable ps3 specific tweaks. WARNING: incompatible with DSM 320 support. ''; @@ -236,7 +236,7 @@ in { dsmSupport = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable D-Link DSM 320 specific tweaks. WARNING: incompatible with ps3 support. ''; @@ -245,7 +245,7 @@ in { tg100Support = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Telegent TG100 specific tweaks. ''; }; @@ -253,7 +253,7 @@ in { transcoding = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable transcoding. ''; }; @@ -262,7 +262,7 @@ in { type = types.path; default = "/var/lib/${name}"; defaultText = literalExpression ''"/var/lib/''${config.${opt.package}.pname}"''; - description = '' + description = lib.mdDoc '' The directory where Gerbera/Mediatomb stores its state, data, etc. ''; }; @@ -270,7 +270,7 @@ in { pcDirectoryHide = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to list the top-level directory or not (from upnp client standpoint). ''; }; @@ -278,19 +278,19 @@ in { user = mkOption { type = types.str; default = "mediatomb"; - description = "User account under which the service runs."; + description = lib.mdDoc "User account under which the service runs."; }; group = mkOption { type = types.str; default = "mediatomb"; - description = "Group account under which the service runs."; + description = lib.mdDoc "Group account under which the service runs."; }; port = mkOption { type = types.int; default = 49152; - description = '' + description = lib.mdDoc '' The network port to listen on. ''; }; @@ -298,7 +298,7 @@ in { interface = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' A specific interface to bind to. ''; }; @@ -306,12 +306,12 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If false (the default), this is up to the user to declare the firewall rules. If true, this opens port 1900 (tcp and udp) and the port specified by - . + {option}`sercvices.mediatomb.port`. - If the option is set, + If the option {option}`services.mediatomb.interface` is set, the firewall rules opened are dedicated to that interface. Otherwise, those rules are opened globally. ''; @@ -320,7 +320,7 @@ in { uuid = mkOption { type = types.str; default = "fdfc8a4e-a3ad-4c1d-b43d-a2eedb03a687"; - description = '' + description = lib.mdDoc '' A unique (on your network) to identify the server by. ''; }; @@ -328,7 +328,7 @@ in { mediaDirectories = mkOption { type = with types; listOf (submodule mediaDirectory); default = []; - description = '' + description = lib.mdDoc '' Declare media directories to index. ''; example = [ @@ -340,12 +340,12 @@ in { customCfg = mkOption { type = types.bool; default = false; - description = '' - Allow the service to create and use its own config file inside the dataDir as - configured by . + description = lib.mdDoc '' + Allow the service to create and use its own config file inside the `dataDir` as + configured by {option}`services.mediatomb.dataDir`. Deactivated by default, the service then runs with the configuration generated from this module. Otherwise, when enabled, no service configuration is generated. Gerbera/Mediatomb then starts using - config.xml within the configured dataDir. It's up to the user to make a correct + config.xml within the configured `dataDir`. It's up to the user to make a correct configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/metabase.nix b/third_party/nixpkgs/nixos/modules/services/misc/metabase.nix index e78100a046..26c48c0503 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/metabase.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/metabase.nix @@ -19,7 +19,7 @@ in { ip = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' IP address that Metabase should listen on. ''; }; @@ -27,7 +27,7 @@ in { port = mkOption { type = types.port; default = 3000; - description = '' + description = lib.mdDoc '' Listen port for Metabase. ''; }; @@ -37,7 +37,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable SSL (https) support. ''; }; @@ -45,7 +45,7 @@ in { port = mkOption { type = types.port; default = 8443; - description = '' + description = lib.mdDoc '' Listen port over SSL (https) for Metabase. ''; }; @@ -54,8 +54,8 @@ in { type = types.nullOr types.path; default = "${dataDir}/metabase.jks"; example = "/etc/secrets/keystore.jks"; - description = '' - Java KeyStore file containing the certificates. + description = lib.mdDoc '' + [Java KeyStore](https://www.digitalocean.com/community/tutorials/java-keytool-essentials-working-with-java-keystores) file containing the certificates. ''; }; @@ -64,7 +64,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for Metabase. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix b/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix index b75227effa..5b4e4bd34d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/moonraker.nix @@ -20,20 +20,20 @@ in { type = types.path; default = config.services.klipper.apiSocket; defaultText = literalExpression "config.services.klipper.apiSocket"; - description = "Path to Klipper's API socket."; + description = lib.mdDoc "Path to Klipper's API socket."; }; stateDir = mkOption { type = types.path; default = "/var/lib/moonraker"; - description = "The directory containing the Moonraker databases."; + description = lib.mdDoc "The directory containing the Moonraker databases."; }; configDir = mkOption { type = types.path; default = cfg.stateDir + "/config"; defaultText = literalExpression ''config.${opt.stateDir} + "/config"''; - description = '' + description = lib.mdDoc '' The directory containing client-writable configuration files. Clients will be able to edit files in this directory via the API. This directory must be writable. @@ -43,26 +43,26 @@ in { user = mkOption { type = types.str; default = "moonraker"; - description = "User account under which Moonraker runs."; + description = lib.mdDoc "User account under which Moonraker runs."; }; group = mkOption { type = types.str; default = "moonraker"; - description = "Group account under which Moonraker runs."; + description = lib.mdDoc "Group account under which Moonraker runs."; }; address = mkOption { type = types.str; default = "127.0.0.1"; example = "0.0.0.0"; - description = "The IP or host to listen on."; + description = lib.mdDoc "The IP or host to listen on."; }; port = mkOption { type = types.ints.unsigned; default = 7125; - description = "The port to listen on."; + description = lib.mdDoc "The port to listen on."; }; settings = mkOption { @@ -74,8 +74,8 @@ in { cors_domains = [ "https://app.fluidd.xyz" ]; }; }; - description = '' - Configuration for Moonraker. See the documentation + description = lib.mdDoc '' + Configuration for Moonraker. See the [documentation](https://moonraker.readthedocs.io/en/latest/configuration/) for supported values. ''; }; @@ -83,12 +83,12 @@ in { allowSystemControl = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to allow Moonraker to perform system-level operations. Moonraker exposes APIs to perform system-level operations, such as reboot, shutdown, and management of systemd units. See the - documentation + [documentation](https://moonraker.readthedocs.io/en/latest/web_api/#machine-commands) for details on what clients are able to do. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix b/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix index 6214f7f7eb..18b083b99b 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/mx-puppet-discord.nix @@ -57,11 +57,11 @@ in { relay.whitelist = [ "@.*:example.com" ]; } ''; - description = '' - config.yaml configuration as a Nix attribute set. + description = lib.mdDoc '' + {file}`config.yaml` configuration as a Nix attribute set. Configuration options should match those described in - - sample.config.yaml. + [ + sample.config.yaml](https://github.com/matrix-discord/mx-puppet-discord/blob/master/sample.config.yaml). ''; }; serviceDependencies = mkOption { @@ -70,7 +70,7 @@ in { defaultText = literalExpression '' optional config.services.matrix-synapse.enable "matrix-synapse.service" ''; - description = '' + description = lib.mdDoc '' List of Systemd services to require and wait for when starting the application service. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/n8n.nix b/third_party/nixpkgs/nixos/modules/services/misc/n8n.nix index 77e717eeff..40a262116c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/n8n.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/n8n.nix @@ -15,14 +15,14 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the n8n web interface."; + description = lib.mdDoc "Open ports in the firewall for the n8n web interface."; }; settings = mkOption { type = format.type; default = {}; - description = '' - Configuration for n8n, see + description = lib.mdDoc '' + Configuration for n8n, see for supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix b/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix index 5bf0e6bc00..e6cf69d235 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nitter.nix @@ -53,7 +53,7 @@ in default = pkgs.nitter; type = types.package; defaultText = literalExpression "pkgs.nitter"; - description = "The nitter derivation to use."; + description = lib.mdDoc "The nitter derivation to use."; }; server = { @@ -61,46 +61,46 @@ in type = types.str; default = "0.0.0.0"; example = "127.0.0.1"; - description = "The address to listen on."; + description = lib.mdDoc "The address to listen on."; }; port = mkOption { type = types.port; default = 8080; example = 8000; - description = "The port to listen on."; + description = lib.mdDoc "The port to listen on."; }; https = mkOption { type = types.bool; default = false; - description = "Set secure attribute on cookies. Keep it disabled to enable cookies when not using HTTPS."; + description = lib.mdDoc "Set secure attribute on cookies. Keep it disabled to enable cookies when not using HTTPS."; }; httpMaxConnections = mkOption { type = types.int; default = 100; - description = "Maximum number of HTTP connections."; + description = lib.mdDoc "Maximum number of HTTP connections."; }; staticDir = mkOption { type = types.path; default = "${cfg.package}/share/nitter/public"; defaultText = literalExpression ''"''${config.services.nitter.package}/share/nitter/public"''; - description = "Path to the static files directory."; + description = lib.mdDoc "Path to the static files directory."; }; title = mkOption { type = types.str; default = "nitter"; - description = "Title of the instance."; + description = lib.mdDoc "Title of the instance."; }; hostname = mkOption { type = types.str; default = "localhost"; example = "nitter.net"; - description = "Hostname of the instance."; + description = lib.mdDoc "Hostname of the instance."; }; }; @@ -108,37 +108,37 @@ in listMinutes = mkOption { type = types.int; default = 240; - description = "How long to cache list info (not the tweets, so keep it high)."; + description = lib.mdDoc "How long to cache list info (not the tweets, so keep it high)."; }; rssMinutes = mkOption { type = types.int; default = 10; - description = "How long to cache RSS queries."; + description = lib.mdDoc "How long to cache RSS queries."; }; redisHost = mkOption { type = types.str; default = "localhost"; - description = "Redis host."; + description = lib.mdDoc "Redis host."; }; redisPort = mkOption { type = types.port; default = 6379; - description = "Redis port."; + description = lib.mdDoc "Redis port."; }; redisConnections = mkOption { type = types.int; default = 20; - description = "Redis connection pool size."; + description = lib.mdDoc "Redis connection pool size."; }; redisMaxConnections = mkOption { type = types.int; default = 30; - description = '' + description = lib.mdDoc '' Maximum number of connections to Redis. New connections are opened when none are available, but if the @@ -152,13 +152,13 @@ in base64Media = mkOption { type = types.bool; default = false; - description = "Use base64 encoding for proxied media URLs."; + description = lib.mdDoc "Use base64 encoding for proxied media URLs."; }; tokenCount = mkOption { type = types.int; default = 10; - description = '' + description = lib.mdDoc '' Minimum amount of usable tokens. Tokens are used to authorize API requests, but they expire after @@ -175,105 +175,105 @@ in type = types.str; default = ""; example = "nitter.net"; - description = "Replace Twitter links with links to this instance (blank to disable)."; + description = lib.mdDoc "Replace Twitter links with links to this instance (blank to disable)."; }; replaceYouTube = mkOption { type = types.str; default = ""; example = "piped.kavin.rocks"; - description = "Replace YouTube links with links to this instance (blank to disable)."; + description = lib.mdDoc "Replace YouTube links with links to this instance (blank to disable)."; }; replaceInstagram = mkOption { type = types.str; default = ""; - description = "Replace Instagram links with links to this instance (blank to disable)."; + description = lib.mdDoc "Replace Instagram links with links to this instance (blank to disable)."; }; mp4Playback = mkOption { type = types.bool; default = true; - description = "Enable MP4 video playback."; + description = lib.mdDoc "Enable MP4 video playback."; }; hlsPlayback = mkOption { type = types.bool; default = false; - description = "Enable HLS video streaming (requires JavaScript)."; + description = lib.mdDoc "Enable HLS video streaming (requires JavaScript)."; }; proxyVideos = mkOption { type = types.bool; default = true; - description = "Proxy video streaming through the server (might be slow)."; + description = lib.mdDoc "Proxy video streaming through the server (might be slow)."; }; muteVideos = mkOption { type = types.bool; default = false; - description = "Mute videos by default."; + description = lib.mdDoc "Mute videos by default."; }; autoplayGifs = mkOption { type = types.bool; default = true; - description = "Autoplay GIFs."; + description = lib.mdDoc "Autoplay GIFs."; }; theme = mkOption { type = types.str; default = "Nitter"; - description = "Instance theme."; + description = lib.mdDoc "Instance theme."; }; infiniteScroll = mkOption { type = types.bool; default = false; - description = "Infinite scrolling (requires JavaScript, experimental!)."; + description = lib.mdDoc "Infinite scrolling (requires JavaScript, experimental!)."; }; stickyProfile = mkOption { type = types.bool; default = true; - description = "Make profile sidebar stick to top."; + description = lib.mdDoc "Make profile sidebar stick to top."; }; bidiSupport = mkOption { type = types.bool; default = false; - description = "Support bidirectional text (makes clicking on tweets harder)."; + description = lib.mdDoc "Support bidirectional text (makes clicking on tweets harder)."; }; hideTweetStats = mkOption { type = types.bool; default = false; - description = "Hide tweet stats (replies, retweets, likes)."; + description = lib.mdDoc "Hide tweet stats (replies, retweets, likes)."; }; hideBanner = mkOption { type = types.bool; default = false; - description = "Hide profile banner."; + description = lib.mdDoc "Hide profile banner."; }; hidePins = mkOption { type = types.bool; default = false; - description = "Hide pinned tweets."; + description = lib.mdDoc "Hide pinned tweets."; }; hideReplies = mkOption { type = types.bool; default = false; - description = "Hide tweet replies."; + description = lib.mdDoc "Hide tweet replies."; }; }; settings = mkOption { type = types.attrs; default = {}; - description = '' + description = lib.mdDoc '' Add settings here to override NixOS module generated settings. Check the official repository for the available settings: @@ -284,13 +284,13 @@ in redisCreateLocally = mkOption { type = types.bool; default = true; - description = "Configure local Redis server for Nitter."; + description = lib.mdDoc "Configure local Redis server for Nitter."; }; openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for Nitter web interface."; + description = lib.mdDoc "Open ports in the firewall for Nitter web interface."; }; }; }; @@ -347,8 +347,9 @@ in }; }; - services.redis = lib.mkIf (cfg.redisCreateLocally) { + services.redis.servers.nitter = lib.mkIf (cfg.redisCreateLocally) { enable = true; + port = cfg.cache.redisPort; }; networking.firewall = mkIf cfg.openFirewall { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix index f6f74d12e1..93ff5fcfb8 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-daemon.nix @@ -127,7 +127,7 @@ in enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable Nix. Disabling Nix makes the system hard to modify and the Nix programs and configuration will not be made available by NixOS itself. ''; @@ -137,7 +137,7 @@ in type = types.package; default = pkgs.nix; defaultText = literalExpression "pkgs.nix"; - description = '' + description = lib.mdDoc '' This option specifies the Nix package instance to use throughout the system. ''; }; @@ -145,9 +145,9 @@ in distributedBuilds = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to distribute builds to the machines listed in - . + {option}`nix.buildMachines`. ''; }; @@ -186,22 +186,22 @@ in type = types.enum [ "best-effort" "idle" ]; default = "best-effort"; example = "idle"; - description = '' + description = lib.mdDoc '' Nix daemon process I/O scheduling class. This class propagates to - build processes. best-effort is the default - class for regular tasks. The idle class is for + build processes. `best-effort` is the default + class for regular tasks. The `idle` class is for extremely low-priority tasks that should only perform I/O when no other task does. - Please note that while using the idle scheduling + Please note that while using the `idle` scheduling class can improve responsiveness of a system performing expensive builds, it might also slow down or starve crucial configuration updates during load. - idle may therefore be a sensible class for + `idle` may therefore be a sensible class for systems that experience only intermittent phases of high I/O load, such as desktop or portable computers used interactively. Other - systems should use the best-effort class. + systems should use the `best-effort` class. ''; }; @@ -209,7 +209,7 @@ in type = types.int; default = 0; example = 1; - description = '' + description = lib.mdDoc '' Nix daemon process I/O scheduling priority. This priority propagates to build processes. The supported priorities depend on the scheduling policy: With idle, priorities are not used in scheduling @@ -224,7 +224,7 @@ in hostName = mkOption { type = types.str; example = "nixbuilder.example.org"; - description = '' + description = lib.mdDoc '' The hostname of the build machine. ''; }; @@ -254,11 +254,11 @@ in type = types.nullOr types.str; default = null; example = "builder"; - description = '' + description = lib.mdDoc '' The username to log in as on the remote host. This user must be able to log in and run nix commands non-interactively. It must also be privileged to build derivations, so must be included in - . + {option}`nix.settings.trusted-users`. ''; }; sshKey = mkOption { @@ -278,7 +278,7 @@ in maxJobs = mkOption { type = types.int; default = 1; - description = '' + description = lib.mdDoc '' The number of concurrent jobs the build machine supports. The build machine will enforce its own limits, but this allows hydra to schedule better since there is no work-stealing between build @@ -288,7 +288,7 @@ in speedFactor = mkOption { type = types.int; default = 1; - description = '' + description = lib.mdDoc '' The relative speed of this builder. This is an arbitrary integer that indicates the speed of this builder, relative to other builders. Higher is faster. @@ -309,7 +309,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "kvm" "big-parallel" ]; - description = '' + description = lib.mdDoc '' A list of features supported by this builder. The builder will be ignored for derivations that require features not in this list. @@ -318,18 +318,18 @@ in publicHostKey = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The (base64-encoded) public host key of this builder. The field - is calculated via base64 -w0 /etc/ssh/ssh_host_type_key.pub. + is calculated via {command}`base64 -w0 /etc/ssh/ssh_host_type_key.pub`. If null, SSH will use its regular known-hosts file when connecting. ''; }; }; }); default = [ ]; - description = '' + description = lib.mdDoc '' This option lists the machines to be used if distributed builds are - enabled (see ). + enabled (see {option}`nix.distributedBuilds`). Nix will perform derivations on those machines via SSH by copying the inputs to the Nix store on the remote machine, starting the build, then copying the output back to the local Nix store. @@ -346,8 +346,8 @@ in nrBuildUsers = mkOption { type = types.int; - description = '' - Number of nixbld user accounts created to + description = lib.mdDoc '' + Number of `nixbld` user accounts created to perform secure concurrent builds. If you receive an error message saying that “all build users are currently in use”, you should increase this value. @@ -357,9 +357,9 @@ in readOnlyStore = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' If set, NixOS will enforce the immutability of the Nix store - by making /nix/store a read-only bind + by making {file}`/nix/store` a read-only bind mount. Nix will automatically make the store writable when needed. ''; @@ -372,17 +372,17 @@ in "nixos-config=/etc/nixos/configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" ]; - description = '' + description = lib.mdDoc '' The default Nix expression search path, used by the Nix evaluator to look up paths enclosed in angle brackets - (e.g. <nixpkgs>). + (e.g. ``). ''; }; checkConfig = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' If enabled (the default), checks for data type mismatches and that Nix can parse the generated nix.conf. ''; @@ -404,28 +404,28 @@ in from = mkOption { type = referenceAttrs; example = { type = "indirect"; id = "nixpkgs"; }; - description = "The flake reference to be rewritten."; + description = lib.mdDoc "The flake reference to be rewritten."; }; to = mkOption { type = referenceAttrs; example = { type = "github"; owner = "my-org"; repo = "my-nixpkgs"; }; - description = "The flake reference is rewritten to."; + description = lib.mdDoc "The flake reference {option}`from` is rewritten to."; }; flake = mkOption { type = types.nullOr types.attrs; default = null; example = literalExpression "nixpkgs"; - description = '' - The flake input is rewritten to. + description = lib.mdDoc '' + The flake input {option}`from` is rewritten to. ''; }; exact = mkOption { type = types.bool; default = true; - description = '' - Whether the reference needs to match exactly. If set, - a reference like nixpkgs does not - match with a reference like nixpkgs/nixos-20.03. + description = lib.mdDoc '' + Whether the {option}`from` reference needs to match exactly. If set, + a {option}`from` reference like `nixpkgs` does not + match with a reference like `nixpkgs/nixos-20.03`. ''; }; }; @@ -442,7 +442,7 @@ in } )); default = { }; - description = '' + description = lib.mdDoc '' A system-wide flake registry. ''; }; @@ -454,7 +454,7 @@ in keep-outputs = true keep-derivations = true ''; - description = "Additional text appended to nix.conf."; + description = lib.mdDoc "Additional text appended to {file}`nix.conf`."; }; settings = mkOption { @@ -466,7 +466,7 @@ in type = types.either types.int (types.enum [ "auto" ]); default = "auto"; example = 64; - description = '' + description = lib.mdDoc '' This option defines the maximum number of jobs that Nix will try to build in parallel. The default is auto, which means it will use all available logical cores. It is recommend to set it to the total @@ -479,7 +479,7 @@ in type = types.bool; default = false; example = true; - description = '' + description = lib.mdDoc '' If set to true, Nix automatically detects files in the store that have identical contents, and replaces them with hard links to a single copy. This saves disk space. If set to false (the default), you can still run @@ -491,7 +491,7 @@ in type = types.int; default = 0; example = 64; - description = '' + description = lib.mdDoc '' This option defines the maximum number of concurrent tasks during one build. It affects, e.g., -j option for make. The special value 0 means that the builder should use all @@ -504,7 +504,7 @@ in sandbox = mkOption { type = types.either types.bool (types.enum [ "relaxed" ]); default = true; - description = '' + description = lib.mdDoc '' If set, Nix will perform builds in a sandboxed environment that it will set up automatically for each build. This prevents impurities in builds by disallowing access to dependencies outside of the Nix @@ -520,7 +520,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "/dev" "/proc" ]; - description = '' + description = lib.mdDoc '' Directories from the host filesystem to be included in the sandbox. ''; @@ -528,7 +528,7 @@ in substituters = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of binary cache URLs used to obtain pre-built binaries of Nix packages. @@ -540,21 +540,21 @@ in type = types.listOf types.str; default = [ ]; example = [ "https://hydra.nixos.org/" ]; - description = '' + description = lib.mdDoc '' List of binary cache URLs that non-root users can use (in addition to those specified using - ) by passing - --option binary-caches to Nix commands. + {option}`nix.settings.substituters`) by passing + `--option binary-caches` to Nix commands. ''; }; require-sigs = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' If enabled (the default), Nix will only download binaries from binary caches if they are cryptographically signed with any of the keys listed in - . If disabled, signatures are neither + {option}`nix.settings.trusted-public-keys`. If disabled, signatures are neither required nor checked, so it's strongly recommended that you use only trustworthy caches and https to prevent man-in-the-middle attacks. ''; @@ -577,13 +577,13 @@ in type = types.listOf types.str; default = [ "root" ]; example = [ "root" "alice" "@wheel" ]; - description = '' + description = lib.mdDoc '' A list of names of users that have additional rights when connecting to the Nix daemon, such as the ability to specify additional binary caches, or to import unsigned NARs. You can also specify groups by prefixing them with - @; for instance, - @wheel means all users in the wheel + `@`; for instance, + `@wheel` means all users in the wheel group. ''; }; @@ -591,13 +591,13 @@ in system-features = mkOption { type = types.listOf types.str; example = [ "kvm" "big-parallel" "gccarch-skylake" ]; - description = '' + description = lib.mdDoc '' The set of features supported by the machine. Derivations can express dependencies on system features through the - requiredSystemFeatures attribute. + `requiredSystemFeatures` attribute. - By default, pseudo-features nixos-test, benchmark, - and big-parallel used in Nixpkgs are set, kvm + By default, pseudo-features `nixos-test`, `benchmark`, + and `big-parallel` used in Nixpkgs are set, `kvm` is also included in it is avaliable. ''; }; @@ -636,12 +636,10 @@ in 5 for avalaible options. The value declared here will be translated directly to the key-value pairs Nix expects. - - + You can use nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.nix.settings to view the current value. By default it is empty. - - + Nix configurations defined under will be translated and applied to this option. In addition, configuration specified in which will be appended verbatim to the resulting config file. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix index 0fcb016010..ac554dcea8 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-gc.nix @@ -17,7 +17,7 @@ in automatic = mkOption { default = false; type = types.bool; - description = "Automatically run the garbage collector at a specific time."; + description = lib.mdDoc "Automatically run the garbage collector at a specific time."; }; dates = mkOption { @@ -51,7 +51,7 @@ in default = true; type = types.bool; example = false; - description = '' + description = lib.mdDoc '' Takes a boolean argument. If true, the time when the service unit was last triggered is stored on disk. When the timer is activated, the service unit is triggered immediately if it @@ -67,8 +67,8 @@ in default = ""; example = "--max-freed $((64 * 1024**3))"; type = types.str; - description = '' - Options given to nix-collect-garbage when the + description = lib.mdDoc '' + Options given to {file}`nix-collect-garbage` when the garbage collector is run automatically. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-optimise.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-optimise.nix index acf8177b14..bcfc69c521 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-optimise.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-optimise.nix @@ -17,7 +17,7 @@ in automatic = mkOption { default = false; type = types.bool; - description = "Automatically run the nix store optimiser at a specific time."; + description = lib.mdDoc "Automatically run the nix store optimiser at a specific time."; }; dates = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix b/third_party/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix index 355fad5db4..b656692ca0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nix-ssh-serve.nix @@ -14,26 +14,26 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable serving the Nix store as a remote store via SSH."; + description = lib.mdDoc "Whether to enable serving the Nix store as a remote store via SSH."; }; write = mkOption { type = types.bool; default = false; - description = "Whether to enable writing to the Nix store as a remote store via SSH. Note: the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the option in most use cases, such as allowing remote building of derivations."; + description = lib.mdDoc "Whether to enable writing to the Nix store as a remote store via SSH. Note: the sshServe user is named nix-ssh and is not a trusted-user. nix-ssh should be added to the {option}`nix.settings.trusted-users` option in most use cases, such as allowing remote building of derivations."; }; keys = mkOption { type = types.listOf types.str; default = []; example = [ "ssh-dss AAAAB3NzaC1k... alice@example.org" ]; - description = "A list of SSH public keys allowed to access the binary cache via SSH."; + description = lib.mdDoc "A list of SSH public keys allowed to access the binary cache via SSH."; }; protocol = mkOption { type = types.enum [ "ssh" "ssh-ng" ]; default = "ssh"; - description = "The specific Nix-over-SSH protocol to use."; + description = lib.mdDoc "The specific Nix-over-SSH protocol to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nzbget.nix b/third_party/nixpkgs/nixos/modules/services/misc/nzbget.nix index 27c5f2e395..ddcb16e135 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nzbget.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nzbget.nix @@ -30,21 +30,21 @@ in user = mkOption { type = types.str; default = "nzbget"; - description = "User account under which NZBGet runs"; + description = lib.mdDoc "User account under which NZBGet runs"; }; group = mkOption { type = types.str; default = "nzbget"; - description = "Group under which NZBGet runs"; + description = lib.mdDoc "Group under which NZBGet runs"; }; settings = mkOption { type = with types; attrsOf (oneOf [ bool int str ]); default = {}; - description = '' + description = lib.mdDoc '' NZBGet configuration, passed via command line using switch -o. Refer to - + for details on supported values. ''; example = { diff --git a/third_party/nixpkgs/nixos/modules/services/misc/nzbhydra2.nix b/third_party/nixpkgs/nixos/modules/services/misc/nzbhydra2.nix index 500c40f117..b728ca248c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/nzbhydra2.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/nzbhydra2.nix @@ -12,21 +12,21 @@ in { dataDir = mkOption { type = types.str; default = "/var/lib/nzbhydra2"; - description = "The directory where NZBHydra2 stores its data files."; + description = lib.mdDoc "The directory where NZBHydra2 stores its data files."; }; openFirewall = mkOption { type = types.bool; default = false; description = - "Open ports in the firewall for the NZBHydra2 web interface."; + lib.mdDoc "Open ports in the firewall for the NZBHydra2 web interface."; }; package = mkOption { type = types.package; default = pkgs.nzbhydra2; defaultText = literalExpression "pkgs.nzbhydra2"; - description = "NZBHydra2 package to use."; + description = lib.mdDoc "NZBHydra2 package to use."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix index cd846d3f26..071174c141 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix @@ -34,7 +34,7 @@ in host = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' Host to bind OctoPrint to. ''; }; @@ -42,7 +42,7 @@ in port = mkOption { type = types.port; default = 5000; - description = '' + description = lib.mdDoc '' Port to bind OctoPrint to. ''; }; @@ -50,19 +50,19 @@ in user = mkOption { type = types.str; default = "octoprint"; - description = "User for the daemon."; + description = lib.mdDoc "User for the daemon."; }; group = mkOption { type = types.str; default = "octoprint"; - description = "Group for the daemon."; + description = lib.mdDoc "Group for the daemon."; }; stateDir = mkOption { type = types.path; default = "/var/lib/octoprint"; - description = "State directory of the daemon."; + description = lib.mdDoc "State directory of the daemon."; }; plugins = mkOption { @@ -70,13 +70,13 @@ in default = plugins: []; defaultText = literalExpression "plugins: []"; example = literalExpression "plugins: with plugins; [ themeify stlviewer ]"; - description = "Additional plugins to be used. Available plugins are passed through the plugins input."; + description = lib.mdDoc "Additional plugins to be used. Available plugins are passed through the plugins input."; }; extraConfig = mkOption { type = types.attrs; default = {}; - description = "Extra options which are added to OctoPrint's YAML configuration file."; + description = lib.mdDoc "Extra options which are added to OctoPrint's YAML configuration file."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix b/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix index b5882168e5..51cfb05d35 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ombi.nix @@ -16,31 +16,31 @@ in { dataDir = mkOption { type = types.str; default = "/var/lib/ombi"; - description = "The directory where Ombi stores its data files."; + description = lib.mdDoc "The directory where Ombi stores its data files."; }; port = mkOption { type = types.port; default = 5000; - description = "The port for the Ombi web interface."; + description = lib.mdDoc "The port for the Ombi web interface."; }; openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the Ombi web interface."; + description = lib.mdDoc "Open ports in the firewall for the Ombi web interface."; }; user = mkOption { type = types.str; default = "ombi"; - description = "User account under which Ombi runs."; + description = lib.mdDoc "User account under which Ombi runs."; }; group = mkOption { type = types.str; default = "ombi"; - description = "Group under which Ombi runs."; + description = lib.mdDoc "Group under which Ombi runs."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/osrm.nix b/third_party/nixpkgs/nixos/modules/services/misc/osrm.nix index 79c347ab7e..bcfb868422 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/osrm.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/osrm.nix @@ -11,44 +11,44 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the OSRM service."; + description = lib.mdDoc "Enable the OSRM service."; }; address = mkOption { type = types.str; default = "0.0.0.0"; - description = "IP address on which the web server will listen."; + description = lib.mdDoc "IP address on which the web server will listen."; }; port = mkOption { type = types.int; default = 5000; - description = "Port on which the web server will run."; + description = lib.mdDoc "Port on which the web server will run."; }; threads = mkOption { type = types.int; default = 4; - description = "Number of threads to use."; + description = lib.mdDoc "Number of threads to use."; }; algorithm = mkOption { type = types.enum [ "CH" "CoreCH" "MLD" ]; default = "MLD"; - description = "Algorithm to use for the data. Must be one of CH, CoreCH, MLD"; + description = lib.mdDoc "Algorithm to use for the data. Must be one of CH, CoreCH, MLD"; }; extraFlags = mkOption { type = types.listOf types.str; default = []; example = [ "--max-table-size 1000" "--max-matching-size 1000" ]; - description = "Extra command line arguments passed to osrm-routed"; + description = lib.mdDoc "Extra command line arguments passed to osrm-routed"; }; dataFile = mkOption { type = types.path; example = "/var/lib/osrm/berlin-latest.osrm"; - description = "Data file location"; + description = lib.mdDoc "Data file location"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/owncast.nix b/third_party/nixpkgs/nixos/modules/services/misc/owncast.nix index 0852335238..23c49d1c11 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/owncast.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/owncast.nix @@ -10,7 +10,7 @@ in { dataDir = mkOption { type = types.str; default = "/var/lib/owncast"; - description = '' + description = lib.mdDoc '' The directory where owncast stores its data files. If left as the default value this directory will automatically be created before the owncast server starts, otherwise the sysadmin is responsible for ensuring the directory exists with appropriate ownership and permissions. ''; }; @@ -18,7 +18,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open the appropriate ports in the firewall for owncast. ''; }; @@ -26,26 +26,26 @@ in { user = mkOption { type = types.str; default = "owncast"; - description = "User account under which owncast runs."; + description = lib.mdDoc "User account under which owncast runs."; }; group = mkOption { type = types.str; default = "owncast"; - description = "Group under which owncast runs."; + description = lib.mdDoc "Group under which owncast runs."; }; listen = mkOption { type = types.str; default = "127.0.0.1"; example = "0.0.0.0"; - description = "The IP address to bind the owncast web server to."; + description = lib.mdDoc "The IP address to bind the owncast web server to."; }; port = mkOption { type = types.port; default = 8080; - description = '' + description = lib.mdDoc '' TCP port where owncast web-gui listens. ''; }; @@ -53,7 +53,7 @@ in { rtmp-port = mkOption { type = types.port; default = 1935; - description = '' + description = lib.mdDoc '' TCP port where owncast rtmp service listens. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/packagekit.nix b/third_party/nixpkgs/nixos/modules/services/misc/packagekit.nix index 9191078ef9..04150ef76f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/packagekit.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/packagekit.nix @@ -48,13 +48,13 @@ in settings = mkOption { type = iniFmt.type; default = { }; - description = "Additional settings passed straight through to PackageKit.conf"; + description = lib.mdDoc "Additional settings passed straight through to PackageKit.conf"; }; vendorSettings = mkOption { type = iniFmt.type; default = { }; - description = "Additional settings passed straight through to Vendor.conf"; + description = lib.mdDoc "Additional settings passed straight through to Vendor.conf"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix index 17cd555d7e..fbf1338a0d 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/paperless.nix @@ -93,7 +93,7 @@ in enable = mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable Paperless. When started, the Paperless database is automatically created if it doesn't @@ -101,54 +101,54 @@ in Both tasks are achieved by running a Django migration. A script to manage the Paperless instance (by wrapping Django's manage.py) is linked to - ''${dataDir}/paperless-manage. + `''${dataDir}/paperless-manage`. ''; }; dataDir = mkOption { type = types.str; default = "/var/lib/paperless"; - description = "Directory to store the Paperless data."; + description = lib.mdDoc "Directory to store the Paperless data."; }; mediaDir = mkOption { type = types.str; default = "${cfg.dataDir}/media"; defaultText = literalExpression ''"''${dataDir}/media"''; - description = "Directory to store the Paperless documents."; + description = lib.mdDoc "Directory to store the Paperless documents."; }; consumptionDir = mkOption { type = types.str; default = "${cfg.dataDir}/consume"; defaultText = literalExpression ''"''${dataDir}/consume"''; - description = "Directory from which new documents are imported."; + description = lib.mdDoc "Directory from which new documents are imported."; }; consumptionDirIsPublic = mkOption { type = types.bool; default = false; - description = "Whether all users can write to the consumption dir."; + description = lib.mdDoc "Whether all users can write to the consumption dir."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; example = "/run/keys/paperless-password"; - description = '' + description = lib.mdDoc '' A file containing the superuser password. A superuser is required to access the web interface. If unset, you can create a superuser manually by running - ''${dataDir}/paperless-manage createsuperuser. + `''${dataDir}/paperless-manage createsuperuser`. - The default superuser name is admin. To change it, set - option . + The default superuser name is `admin`. To change it, set + option {option}`extraConfig.PAPERLESS_ADMIN_USER`. WARNING: When changing the superuser name after the initial setup, the old superuser will continue to exist. To disable login for the web interface, set the following: - extraConfig.PAPERLESS_AUTO_LOGIN_USERNAME = "admin";. + `extraConfig.PAPERLESS_AUTO_LOGIN_USERNAME = "admin";`. WARNING: Only use this on a trusted system without internet access to Paperless. ''; }; @@ -156,22 +156,22 @@ in address = mkOption { type = types.str; default = "localhost"; - description = "Web interface address."; + description = lib.mdDoc "Web interface address."; }; port = mkOption { type = types.port; default = 28981; - description = "Web interface port."; + description = lib.mdDoc "Web interface port."; }; extraConfig = mkOption { type = types.attrs; default = {}; - description = '' + description = lib.mdDoc '' Extra paperless config options. - See the documentation + See [the documentation](https://paperless-ngx.readthedocs.io/en/latest/configuration.html) for available options. ''; example = literalExpression '' @@ -184,14 +184,14 @@ in user = mkOption { type = types.str; default = defaultUser; - description = "User under which Paperless runs."; + description = lib.mdDoc "User under which Paperless runs."; }; package = mkOption { type = types.package; default = pkgs.paperless-ngx; defaultText = literalExpression "pkgs.paperless-ngx"; - description = "The Paperless package to use."; + description = lib.mdDoc "The Paperless package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/parsoid.nix b/third_party/nixpkgs/nixos/modules/services/misc/parsoid.nix index 09b7f977bf..101ece5ab4 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/parsoid.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/parsoid.nix @@ -39,7 +39,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Parsoid -- bidirectional wikitext parser. ''; @@ -48,7 +48,7 @@ in wikis = mkOption { type = types.listOf (types.either types.str types.attrs); example = [ "http://localhost/api.php" ]; - description = '' + description = lib.mdDoc '' Used MediaWiki API endpoints. ''; }; @@ -56,7 +56,7 @@ in workers = mkOption { type = types.int; default = 2; - description = '' + description = lib.mdDoc '' Number of Parsoid workers. ''; }; @@ -64,7 +64,7 @@ in interface = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Interface to listen on. ''; }; @@ -72,7 +72,7 @@ in port = mkOption { type = types.int; default = 8000; - description = '' + description = lib.mdDoc '' Port to listen on. ''; }; @@ -80,7 +80,7 @@ in extraConfig = mkOption { type = types.attrs; default = {}; - description = '' + description = lib.mdDoc '' Extra configuration to add to parsoid configuration. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/persistent-evdev.nix b/third_party/nixpkgs/nixos/modules/services/misc/persistent-evdev.nix index 401d20010b..fd6e298ef6 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/persistent-evdev.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/persistent-evdev.nix @@ -22,8 +22,8 @@ in Physical devices should already exist in /dev/input/by-id/. Proxy devices will be automatically given a uinput- prefix. - See the - project page for example configuration of virtual devices with libvirt + See the project page + for example configuration of virtual devices with libvirt and remember to add uinput-* devices to the qemu cgroup_device_acl list (see ). ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/pinnwand.nix b/third_party/nixpkgs/nixos/modules/services/misc/pinnwand.nix index cbc796c9a7..4eda25b4eb 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/pinnwand.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/pinnwand.nix @@ -14,15 +14,15 @@ in port = mkOption { type = types.port; - description = "The port to listen on."; + description = lib.mdDoc "The port to listen on."; default = 8000; }; settings = mkOption { type = format.type; - description = '' - Your pinnwand.toml as a Nix attribute set. Look up - possible options in the pinnwand.toml-example. + description = lib.mdDoc '' + Your {file}`pinnwand.toml` as a Nix attribute set. Look up + possible options in the [pinnwand.toml-example](https://github.com/supakeen/pinnwand/blob/master/pinnwand.toml-example). ''; default = {}; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/plex.nix b/third_party/nixpkgs/nixos/modules/services/misc/plex.nix index 1cd8da768f..cb41bbb54b 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/plex.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/plex.nix @@ -17,7 +17,7 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/plex"; - description = '' + description = lib.mdDoc '' The directory where Plex stores its data files. ''; }; @@ -25,7 +25,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for the media server. ''; }; @@ -33,7 +33,7 @@ in user = mkOption { type = types.str; default = "plex"; - description = '' + description = lib.mdDoc '' User account under which Plex runs. ''; }; @@ -41,7 +41,7 @@ in group = mkOption { type = types.str; default = "plex"; - description = '' + description = lib.mdDoc '' Group under which Plex runs. ''; }; @@ -49,7 +49,7 @@ in extraPlugins = mkOption { type = types.listOf types.path; default = []; - description = '' + description = lib.mdDoc '' A list of paths to extra plugin bundles to install in Plex's plugin directory. Every time the systemd unit for Plex starts up, all of the symlinks in Plex's plugin directory will be cleared and this module @@ -73,7 +73,7 @@ in extraScanners = mkOption { type = types.listOf types.path; default = []; - description = '' + description = lib.mdDoc '' A list of paths to extra scanners to install in Plex's scanners directory. @@ -97,7 +97,7 @@ in type = types.package; default = pkgs.plex; defaultText = literalExpression "pkgs.plex"; - description = '' + description = lib.mdDoc '' The Plex package to use. Plex subscribers may wish to use their own package here, pointing to subscriber-only server versions. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/plikd.nix b/third_party/nixpkgs/nixos/modules/services/misc/plikd.nix index a62dbef1d2..9ae9e064fd 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/plikd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/plikd.nix @@ -16,14 +16,14 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the plikd."; + description = lib.mdDoc "Open ports in the firewall for the plikd."; }; settings = mkOption { type = format.type; default = {}; - description = '' - Configuration for plikd, see + description = lib.mdDoc '' + Configuration for plikd, see for supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/podgrab.nix b/third_party/nixpkgs/nixos/modules/services/misc/podgrab.nix index 7077408b79..590309ace7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/podgrab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/podgrab.nix @@ -10,7 +10,7 @@ in type = with types; nullOr str; default = null; example = "/run/secrets/password.env"; - description = '' + description = lib.mdDoc '' The path to a file containing the PASSWORD environment variable definition for Podgrab's authentification. ''; @@ -20,7 +20,7 @@ in type = types.port; default = 8080; example = 4242; - description = "The port on which Podgrab will listen for incoming HTTP traffic."; + description = lib.mdDoc "The port on which Podgrab will listen for incoming HTTP traffic."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/polaris.nix b/third_party/nixpkgs/nixos/modules/services/misc/polaris.nix index 68045af152..b5f7f17e66 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/polaris.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/polaris.nix @@ -18,26 +18,26 @@ in user = mkOption { type = types.str; default = "polaris"; - description = "User account under which Polaris runs."; + description = lib.mdDoc "User account under which Polaris runs."; }; group = mkOption { type = types.str; default = "polaris"; - description = "Group under which Polaris is run."; + description = lib.mdDoc "Group under which Polaris is run."; }; extraGroups = mkOption { type = types.listOf types.str; default = []; - description = "Polaris' auxiliary groups."; + description = lib.mdDoc "Polaris' auxiliary groups."; example = literalExpression ''["media" "music"]''; }; port = mkOption { type = types.port; default = 5050; - description = '' + description = lib.mdDoc '' The port which the Polaris REST api and web UI should listen to. Note: polaris is hardcoded to listen to the hostname "0.0.0.0". ''; @@ -46,10 +46,10 @@ in settings = mkOption { type = settingsFormat.type; default = {}; - description = '' + description = lib.mdDoc '' Contents for the TOML Polaris config, applied each start. Although poorly documented, an example may be found here: - test-config.toml + [test-config.toml](https://github.com/agersant/polaris/blob/374d0ca56fc0a466d797a4b252e2078607476797/test-data/config.toml) ''; example = literalExpression '' { @@ -73,7 +73,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open the configured port in the firewall. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/prowlarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/prowlarr.nix index ef820b4022..6152ee4a76 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/prowlarr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/prowlarr.nix @@ -14,7 +14,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the Prowlarr web interface."; + description = lib.mdDoc "Open ports in the firewall for the Prowlarr web interface."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix b/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix index 2f752bcc7e..d24cd1bfa0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/pykms.nix @@ -18,43 +18,43 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the PyKMS service."; + description = lib.mdDoc "Whether to enable the PyKMS service."; }; listenAddress = mkOption { type = types.str; default = "0.0.0.0"; - description = "The IP address on which to listen."; + description = lib.mdDoc "The IP address on which to listen."; }; port = mkOption { type = types.int; default = 1688; - description = "The port on which to listen."; + description = lib.mdDoc "The port on which to listen."; }; openFirewallPort = mkOption { type = types.bool; default = false; - description = "Whether the listening port should be opened automatically."; + description = lib.mdDoc "Whether the listening port should be opened automatically."; }; memoryLimit = mkOption { type = types.str; default = "64M"; - description = "How much memory to use at most."; + description = lib.mdDoc "How much memory to use at most."; }; logLevel = mkOption { type = types.enum [ "CRITICAL" "ERROR" "WARNING" "INFO" "DEBUG" "MININFO" ]; default = "INFO"; - description = "How much to log"; + description = lib.mdDoc "How much to log"; }; extraArgs = mkOption { type = types.listOf types.str; default = [ ]; - description = "Additional arguments"; + description = lib.mdDoc "Additional arguments"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/radarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/radarr.nix index 826d59da0a..a2d7b734f7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/radarr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/radarr.nix @@ -12,7 +12,7 @@ in enable = mkEnableOption "Radarr"; package = mkOption { - description = "Radarr package to use"; + description = lib.mdDoc "Radarr package to use"; default = pkgs.radarr; defaultText = literalExpression "pkgs.radarr"; example = literalExpression "pkgs.radarr"; @@ -22,25 +22,25 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/radarr/.config/Radarr"; - description = "The directory where Radarr stores its data files."; + description = lib.mdDoc "The directory where Radarr stores its data files."; }; openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the Radarr web interface."; + description = lib.mdDoc "Open ports in the firewall for the Radarr web interface."; }; user = mkOption { type = types.str; default = "radarr"; - description = "User account under which Radarr runs."; + description = lib.mdDoc "User account under which Radarr runs."; }; group = mkOption { type = types.str; default = "radarr"; - description = "Group under which Radarr runs."; + description = lib.mdDoc "Group under which Radarr runs."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix index 696b8d1a25..13b62f4355 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/redmine.nix @@ -55,40 +55,40 @@ in type = types.package; default = pkgs.redmine; defaultText = literalExpression "pkgs.redmine"; - description = "Which Redmine package to use."; + description = lib.mdDoc "Which Redmine package to use."; example = literalExpression "pkgs.redmine.override { ruby = pkgs.ruby_2_7; }"; }; user = mkOption { type = types.str; default = "redmine"; - description = "User under which Redmine is ran."; + description = lib.mdDoc "User under which Redmine is ran."; }; group = mkOption { type = types.str; default = "redmine"; - description = "Group under which Redmine is ran."; + description = lib.mdDoc "Group under which Redmine is ran."; }; port = mkOption { type = types.port; default = 3000; - description = "Port on which Redmine is ran."; + description = lib.mdDoc "Port on which Redmine is ran."; }; stateDir = mkOption { type = types.str; default = "/var/lib/redmine"; - description = "The state directory, logs and plugins are stored here."; + description = lib.mdDoc "The state directory, logs and plugins are stored here."; }; settings = mkOption { type = format.type; default = {}; - description = '' - Redmine configuration (configuration.yml). Refer to - + description = lib.mdDoc '' + Redmine configuration ({file}`configuration.yml`). Refer to + for details. ''; example = literalExpression '' @@ -107,10 +107,10 @@ in extraEnv = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration in additional_environment.rb. - See + See for details. ''; example = '' @@ -121,7 +121,7 @@ in themes = mkOption { type = types.attrsOf types.path; default = {}; - description = "Set of themes."; + description = lib.mdDoc "Set of themes."; example = literalExpression '' { dkuk-redmine_alex_skin = builtins.fetchurl { @@ -135,7 +135,7 @@ in plugins = mkOption { type = types.attrsOf types.path; default = {}; - description = "Set of plugins."; + description = lib.mdDoc "Set of plugins."; example = literalExpression '' { redmine_env_auth = builtins.fetchurl { @@ -151,41 +151,41 @@ in type = types.enum [ "mysql2" "postgresql" ]; example = "postgresql"; default = "mysql2"; - description = "Database engine to use."; + description = lib.mdDoc "Database engine to use."; }; host = mkOption { type = types.str; default = "localhost"; - description = "Database host address."; + description = lib.mdDoc "Database host address."; }; port = mkOption { type = types.int; default = if cfg.database.type == "postgresql" then 5432 else 3306; defaultText = literalExpression "3306"; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = mkOption { type = types.str; default = "redmine"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = mkOption { type = types.str; default = "redmine"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; example = "/run/keys/redmine-dbpassword"; - description = '' + description = lib.mdDoc '' A file containing the password corresponding to - . + {option}`database.user`. ''; }; @@ -197,13 +197,13 @@ in else null; defaultText = literalExpression "/run/mysqld/mysqld.sock"; example = "/run/mysqld/mysqld.sock"; - description = "Path to the unix socket file to use for authentication."; + description = lib.mdDoc "Path to the unix socket file to use for authentication."; }; createLocally = mkOption { type = types.bool; default = true; - description = "Create the database and database user locally."; + description = lib.mdDoc "Create the database and database user locally."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ripple-data-api.nix b/third_party/nixpkgs/nixos/modules/services/misc/ripple-data-api.nix index 93eba98b7d..7d8a4cb2b4 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ripple-data-api.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ripple-data-api.nix @@ -38,44 +38,44 @@ in { enable = mkEnableOption "ripple data api"; port = mkOption { - description = "Ripple data api port"; + description = lib.mdDoc "Ripple data api port"; default = 5993; type = types.int; }; importMode = mkOption { - description = "Ripple data api import mode."; + description = lib.mdDoc "Ripple data api import mode."; default = "liveOnly"; type = types.enum ["live" "liveOnly"]; }; minLedger = mkOption { - description = "Ripple data api minimal ledger to fetch."; + description = lib.mdDoc "Ripple data api minimal ledger to fetch."; default = null; type = types.nullOr types.int; }; maxLedger = mkOption { - description = "Ripple data api maximal ledger to fetch."; + description = lib.mdDoc "Ripple data api maximal ledger to fetch."; default = null; type = types.nullOr types.int; }; redis = { enable = mkOption { - description = "Whether to enable caching of ripple data to redis."; + description = lib.mdDoc "Whether to enable caching of ripple data to redis."; default = true; type = types.bool; }; host = mkOption { - description = "Ripple data api redis host."; + description = lib.mdDoc "Ripple data api redis host."; default = "localhost"; type = types.str; }; port = mkOption { - description = "Ripple data api redis port."; + description = lib.mdDoc "Ripple data api redis port."; default = 5984; type = types.int; }; @@ -83,44 +83,44 @@ in { couchdb = { host = mkOption { - description = "Ripple data api couchdb host."; + description = lib.mdDoc "Ripple data api couchdb host."; default = "localhost"; type = types.str; }; port = mkOption { - description = "Ripple data api couchdb port."; + description = lib.mdDoc "Ripple data api couchdb port."; default = 5984; type = types.int; }; db = mkOption { - description = "Ripple data api couchdb database."; + description = lib.mdDoc "Ripple data api couchdb database."; default = "rippled"; type = types.str; }; user = mkOption { - description = "Ripple data api couchdb username."; + description = lib.mdDoc "Ripple data api couchdb username."; default = "rippled"; type = types.str; }; pass = mkOption { - description = "Ripple data api couchdb password."; + description = lib.mdDoc "Ripple data api couchdb password."; default = ""; type = types.str; }; create = mkOption { - description = "Whether to create couchdb database needed by ripple data api."; + description = lib.mdDoc "Whether to create couchdb database needed by ripple data api."; type = types.bool; default = true; }; }; rippleds = mkOption { - description = "List of rippleds to be used by ripple data api."; + description = lib.mdDoc "List of rippleds to be used by ripple data api."; default = [ "http://s_east.ripple.com:51234" "http://s_west.ripple.com:51234" diff --git a/third_party/nixpkgs/nixos/modules/services/misc/rippled.nix b/third_party/nixpkgs/nixos/modules/services/misc/rippled.nix index f6ec067777..8b6704c1be 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/rippled.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/rippled.nix @@ -92,41 +92,41 @@ let ip = mkOption { default = "127.0.0.1"; - description = "Ip where rippled listens."; + description = lib.mdDoc "Ip where rippled listens."; type = types.str; }; port = mkOption { - description = "Port where rippled listens."; + description = lib.mdDoc "Port where rippled listens."; type = types.int; }; protocol = mkOption { - description = "Protocols expose by rippled."; + description = lib.mdDoc "Protocols expose by rippled."; type = types.listOf (types.enum ["http" "https" "ws" "wss" "peer"]); }; user = mkOption { - description = "When set, these credentials will be required on HTTP/S requests."; + description = lib.mdDoc "When set, these credentials will be required on HTTP/S requests."; type = types.str; default = ""; }; password = mkOption { - description = "When set, these credentials will be required on HTTP/S requests."; + description = lib.mdDoc "When set, these credentials will be required on HTTP/S requests."; type = types.str; default = ""; }; admin = mkOption { - description = "A comma-separated list of admin IP addresses."; + description = lib.mdDoc "A comma-separated list of admin IP addresses."; type = types.listOf types.str; default = ["127.0.0.1"]; }; ssl = { key = mkOption { - description = '' + description = lib.mdDoc '' Specifies the filename holding the SSL key in PEM format. ''; default = null; @@ -134,7 +134,7 @@ let }; cert = mkOption { - description = '' + description = lib.mdDoc '' Specifies the path to the SSL certificate file in PEM format. This is not needed if the chain includes it. ''; @@ -143,7 +143,7 @@ let }; chain = mkOption { - description = '' + description = lib.mdDoc '' If you need a certificate chain, specify the path to the certificate chain here. The chain may include the end certificate. ''; @@ -157,33 +157,33 @@ let dbOptions = { options = { type = mkOption { - description = "Rippled database type."; + description = lib.mdDoc "Rippled database type."; type = types.enum ["rocksdb" "nudb"]; default = "rocksdb"; }; path = mkOption { - description = "Location to store the database."; + description = lib.mdDoc "Location to store the database."; type = types.path; default = cfg.databasePath; defaultText = literalExpression "config.${opt.databasePath}"; }; compression = mkOption { - description = "Whether to enable snappy compression."; + description = lib.mdDoc "Whether to enable snappy compression."; type = types.nullOr types.bool; default = null; }; onlineDelete = mkOption { - description = "Enable automatic purging of older ledger information."; + description = lib.mdDoc "Enable automatic purging of older ledger information."; type = types.nullOr (types.addCheck types.int (v: v > 256)); default = cfg.ledgerHistory; defaultText = literalExpression "config.${opt.ledgerHistory}"; }; advisoryDelete = mkOption { - description = '' + description = lib.mdDoc '' If set, then require administrative RPC call "can_delete" to enable online deletion of ledger records. ''; @@ -192,7 +192,7 @@ let }; extraOpts = mkOption { - description = "Extra database options."; + description = lib.mdDoc "Extra database options."; type = types.lines; default = ""; }; @@ -210,14 +210,14 @@ in enable = mkEnableOption "rippled"; package = mkOption { - description = "Which rippled package to use."; + description = lib.mdDoc "Which rippled package to use."; type = types.package; default = pkgs.rippled; defaultText = literalExpression "pkgs.rippled"; }; ports = mkOption { - description = "Ports exposed by rippled"; + description = lib.mdDoc "Ports exposed by rippled"; type = with types; attrsOf (submodule portOptions); default = { rpc = { @@ -241,7 +241,7 @@ in }; nodeDb = mkOption { - description = "Rippled main database options."; + description = lib.mdDoc "Rippled main database options."; type = with types; nullOr (submodule dbOptions); default = { type = "rocksdb"; @@ -256,19 +256,19 @@ in }; tempDb = mkOption { - description = "Rippled temporary database options."; + description = lib.mdDoc "Rippled temporary database options."; type = with types; nullOr (submodule dbOptions); default = null; }; importDb = mkOption { - description = "Settings for performing a one-time import."; + description = lib.mdDoc "Settings for performing a one-time import."; type = with types; nullOr (submodule dbOptions); default = null; }; nodeSize = mkOption { - description = '' + description = lib.mdDoc '' Rippled size of the node you are running. "tiny", "small", "medium", "large", and "huge" ''; @@ -277,7 +277,7 @@ in }; ips = mkOption { - description = '' + description = lib.mdDoc '' List of hostnames or ips where the Ripple protocol is served. For a starter list, you can either copy entries from: https://ripple.com/ripple.txt or if you prefer you can let it @@ -292,7 +292,7 @@ in }; ipsFixed = mkOption { - description = '' + description = lib.mdDoc '' List of IP addresses or hostnames to which rippled should always attempt to maintain peer connections with. This is useful for manually forming private networks, for example to configure a @@ -306,7 +306,7 @@ in }; validators = mkOption { - description = '' + description = lib.mdDoc '' List of nodes to always accept as validators. Nodes are specified by domain or public key. ''; @@ -321,7 +321,7 @@ in }; databasePath = mkOption { - description = '' + description = lib.mdDoc '' Path to the ripple database. ''; type = types.path; @@ -329,7 +329,7 @@ in }; validationQuorum = mkOption { - description = '' + description = lib.mdDoc '' The minimum number of trusted validations a ledger must have before the server considers it fully validated. ''; @@ -338,7 +338,7 @@ in }; ledgerHistory = mkOption { - description = '' + description = lib.mdDoc '' The number of past ledgers to acquire on server startup and the minimum to maintain while running. ''; @@ -347,7 +347,7 @@ in }; fetchDepth = mkOption { - description = '' + description = lib.mdDoc '' The number of past ledgers to serve to other peers that request historical ledger data (or "full" for no limit). ''; @@ -356,7 +356,7 @@ in }; sntpServers = mkOption { - description = '' + description = lib.mdDoc '' IP address or domain of NTP servers to use for time synchronization.; ''; type = types.listOf types.str; @@ -369,7 +369,7 @@ in }; logLevel = mkOption { - description = "Logging verbosity."; + description = lib.mdDoc "Logging verbosity."; type = types.enum ["debug" "error" "info"]; default = "error"; }; @@ -378,13 +378,13 @@ in enable = mkEnableOption "statsd monitoring for rippled"; address = mkOption { - description = "The UDP address and port of the listening StatsD server."; + description = lib.mdDoc "The UDP address and port of the listening StatsD server."; default = "127.0.0.1:8125"; type = types.str; }; prefix = mkOption { - description = "A string prepended to each collected metric."; + description = lib.mdDoc "A string prepended to each collected metric."; default = ""; type = types.str; }; @@ -393,7 +393,7 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra lines to be added verbatim to the rippled.cfg configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/rmfakecloud.nix b/third_party/nixpkgs/nixos/modules/services/misc/rmfakecloud.nix index fe522653c2..2feb663f7c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/rmfakecloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/rmfakecloud.nix @@ -15,7 +15,7 @@ in { type = types.package; default = pkgs.rmfakecloud; defaultText = literalExpression "pkgs.rmfakecloud"; - description = '' + description = lib.mdDoc '' rmfakecloud package to use. The default does not include the web user interface. @@ -25,7 +25,7 @@ in { storageUrl = mkOption { type = types.str; example = "https://local.appspot.com"; - description = '' + description = lib.mdDoc '' URL used by the tablet to access the rmfakecloud service. ''; }; @@ -33,7 +33,7 @@ in { port = mkOption { type = types.port; default = 3000; - description = '' + description = lib.mdDoc '' Listening port number. ''; }; @@ -41,7 +41,7 @@ in { logLevel = mkOption { type = types.enum [ "info" "debug" "warn" "error" ]; default = "info"; - description = '' + description = lib.mdDoc '' Logging level. ''; }; @@ -63,7 +63,7 @@ in { type = with types; nullOr path; default = null; example = "/etc/secrets/rmfakecloud.env"; - description = '' + description = lib.mdDoc '' Path to an environment file loaded for the rmfakecloud service. This can be used to securely store tokens and secrets outside of the diff --git a/third_party/nixpkgs/nixos/modules/services/misc/serviio.nix b/third_party/nixpkgs/nixos/modules/services/misc/serviio.nix index 0ead6a8169..57efebb2c0 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/serviio.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/serviio.nix @@ -31,7 +31,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the Serviio Media Server. ''; }; @@ -39,7 +39,7 @@ in { dataDir = mkOption { type = types.path; default = "/var/lib/serviio"; - description = '' + description = lib.mdDoc '' The directory where serviio stores its state, data, etc. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix b/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix index a3db992863..bd8d8d8fa7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sickbeard.nix @@ -20,43 +20,43 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the sickbeard server."; + description = lib.mdDoc "Whether to enable the sickbeard server."; }; package = mkOption { type = types.package; default = pkgs.sickbeard; defaultText = literalExpression "pkgs.sickbeard"; example = literalExpression "pkgs.sickrage"; - description ='' - Enable pkgs.sickrage or pkgs.sickgear + description =lib.mdDoc '' + Enable `pkgs.sickrage` or `pkgs.sickgear` as an alternative to SickBeard ''; }; dataDir = mkOption { type = types.path; default = "/var/lib/${name}"; - description = "Path where to store data files."; + description = lib.mdDoc "Path where to store data files."; }; configFile = mkOption { type = types.path; default = "${cfg.dataDir}/config.ini"; defaultText = literalExpression ''"''${config.${opt.dataDir}}/config.ini"''; - description = "Path to config file."; + description = lib.mdDoc "Path to config file."; }; port = mkOption { type = types.ints.u16; default = 8081; - description = "Port to bind to."; + description = lib.mdDoc "Port to bind to."; }; user = mkOption { type = types.str; default = name; - description = "User to run the service as"; + description = lib.mdDoc "User to run the service as"; }; group = mkOption { type = types.str; default = name; - description = "Group to run the service as"; + description = lib.mdDoc "Group to run the service as"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/signald.nix b/third_party/nixpkgs/nixos/modules/services/misc/signald.nix index 4cd34e4326..8a1d2c4ad3 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/signald.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/signald.nix @@ -13,19 +13,19 @@ in user = mkOption { type = types.str; default = defaultUser; - description = "User under which signald runs."; + description = lib.mdDoc "User under which signald runs."; }; group = mkOption { type = types.str; default = defaultUser; - description = "Group under which signald runs."; + description = lib.mdDoc "Group under which signald runs."; }; socketPath = mkOption { type = types.str; default = "/run/signald/signald.sock"; - description = "Path to the signald socket"; + description = lib.mdDoc "Path to the signald socket"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/siproxd.nix b/third_party/nixpkgs/nixos/modules/services/misc/siproxd.nix index 20fe0793b8..f1a1ed4d29 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/siproxd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/siproxd.nix @@ -37,7 +37,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the Siproxd SIP proxy/masquerading daemon. ''; @@ -46,20 +46,20 @@ in ifInbound = mkOption { type = types.str; example = "eth0"; - description = "Local network interface"; + description = lib.mdDoc "Local network interface"; }; ifOutbound = mkOption { type = types.str; example = "ppp0"; - description = "Public network interface"; + description = lib.mdDoc "Public network interface"; }; hostsAllowReg = mkOption { type = types.listOf types.str; default = [ ]; example = [ "192.168.1.0/24" "192.168.2.0/24" ]; - description = '' + description = lib.mdDoc '' Acess control list for incoming SIP registrations. ''; }; @@ -68,7 +68,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "123.45.0.0/16" "123.46.0.0/16" ]; - description = '' + description = lib.mdDoc '' Acess control list for incoming SIP traffic. ''; }; @@ -77,7 +77,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "10.0.0.0/8" "11.0.0.0/8" ]; - description = '' + description = lib.mdDoc '' Acess control list for denying incoming SIP registrations and traffic. ''; @@ -86,7 +86,7 @@ in sipListenPort = mkOption { type = types.int; default = 5060; - description = '' + description = lib.mdDoc '' Port to listen for incoming SIP messages. ''; }; @@ -94,7 +94,7 @@ in rtpPortLow = mkOption { type = types.int; default = 7070; - description = '' + description = lib.mdDoc '' Bottom of UDP port range for incoming and outgoing RTP traffic ''; }; @@ -102,7 +102,7 @@ in rtpPortHigh = mkOption { type = types.int; default = 7089; - description = '' + description = lib.mdDoc '' Top of UDP port range for incoming and outgoing RTP traffic ''; }; @@ -110,7 +110,7 @@ in rtpTimeout = mkOption { type = types.int; default = 300; - description = '' + description = lib.mdDoc '' Timeout for an RTP stream. If for the specified number of seconds no data is relayed on an active stream, it is considered dead and will be killed. @@ -120,7 +120,7 @@ in rtpDscp = mkOption { type = types.int; default = 46; - description = '' + description = lib.mdDoc '' DSCP (differentiated services) value to be assigned to RTP packets. Allows QOS aware routers to handle different types traffic with different priorities. @@ -130,7 +130,7 @@ in sipDscp = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' DSCP (differentiated services) value to be assigned to SIP packets. Allows QOS aware routers to handle different types traffic with different priorities. @@ -140,7 +140,7 @@ in passwordFile = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Path to per-user password file. ''; }; @@ -148,7 +148,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration to add to siproxd configuration. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix b/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix index 3c3f6c4d64..7d7e3db3ce 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/snapper.nix @@ -12,7 +12,7 @@ in snapshotRootOnBoot = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to snapshot root on boot ''; }; @@ -44,7 +44,7 @@ in filters = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Global display difference filter. See man:snapper(8) for more details. ''; }; @@ -64,7 +64,7 @@ in } ''; - description = '' + description = lib.mdDoc '' Subvolume configuration ''; @@ -72,7 +72,7 @@ in options = { subvolume = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path of the subvolume or mount point. This path is a subvolume and has to contain a subvolume named .snapshots. @@ -83,7 +83,7 @@ in fstype = mkOption { type = types.enum [ "btrfs" ]; default = "btrfs"; - description = '' + description = lib.mdDoc '' Filesystem type. Only btrfs is stable and tested. ''; }; @@ -91,7 +91,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Additional configuration next to SUBVOLUME and FSTYPE. See man:snapper-configs(5). ''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sonarr.nix b/third_party/nixpkgs/nixos/modules/services/misc/sonarr.nix index 77c7f0582d..a956a14d00 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sonarr.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sonarr.nix @@ -13,13 +13,13 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/sonarr/.config/NzbDrone"; - description = "The directory where Sonarr stores its data files."; + description = lib.mdDoc "The directory where Sonarr stores its data files."; }; openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for the Sonarr web interface ''; }; @@ -27,13 +27,13 @@ in user = mkOption { type = types.str; default = "sonarr"; - description = "User account under which Sonaar runs."; + description = lib.mdDoc "User account under which Sonaar runs."; }; group = mkOption { type = types.str; default = "sonarr"; - description = "Group under which Sonaar runs."; + description = lib.mdDoc "Group under which Sonaar runs."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix index 3ff2837900..de04797a80 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sourcehut/default.nix @@ -180,7 +180,7 @@ in network-key = mkOption { description = '' An absolute file path (which should be outside the Nix-store) - to a secret key to encrypt internal messages with. Use srht-keygen network to + to a secret key to encrypt internal messages with. Use srht-keygen network to generate this key. It must be consistent between all services and nodes. ''; type = types.path; @@ -209,7 +209,7 @@ in service-key = mkOption { description = '' An absolute file path (which should be outside the Nix-store) - to a key used for encrypting session cookies. Use srht-keygen service to + to a key used for encrypting session cookies. Use srht-keygen service to generate the service key. This must be shared between each node of the same service (e.g. git1.sr.ht and git2.sr.ht), but different services may use different keys. If you configure all of your services with the same @@ -252,8 +252,8 @@ in Your PGP key information (DO NOT mix up pub and priv here) You must remove the password from your secret key, if present. - You can do this with gpg --edit-key [key-id], - then use the passwd command and do not enter a new password. + You can do this with gpg --edit-key [key-id], + then use the passwd command and do not enter a new password. ''; }; pgp-pubkey = mkOption { @@ -294,7 +294,7 @@ in This should be consistent for all *.sr.ht sites, as this key will be used to verify signatures from other sites in your network. - Use the srht-keygen webhook command to generate a key. + Use the srht-keygen webhook command to generate a key. ''; type = types.path; apply = s: "<" + toString s; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix b/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix index 4ae596ade1..5f2b47bae4 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/ssm-agent.nix @@ -21,7 +21,7 @@ in { package = mkOption { type = types.path; - description = "The SSM agent package to use"; + description = lib.mdDoc "The SSM agent package to use"; default = pkgs.ssm-agent.override { overrideEtc = false; }; defaultText = literalExpression "pkgs.ssm-agent.override { overrideEtc = false; }"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix b/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix index 386281e2b7..70afbe0433 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/sssd.nix @@ -10,7 +10,7 @@ in { config = mkOption { type = types.lines; - description = "Contents of sssd.conf."; + description = lib.mdDoc "Contents of {file}`sssd.conf`."; default = '' [sssd] config_file_version = 2 @@ -33,9 +33,18 @@ in { sshAuthorizedKeysIntegration = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to make sshd look up authorized keys from SSS. - For this to work, the ssh SSS service must be enabled in the sssd configuration. + For this to work, the `ssh` SSS service must be enabled in the sssd configuration. + ''; + }; + + kcm = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to use SSS as a Kerberos Cache Manager (KCM). + Kerberos will be configured to cache credentials in SSS. ''; }; }; @@ -79,6 +88,28 @@ in { services.dbus.packages = [ pkgs.sssd ]; }) + (mkIf cfg.kcm { + systemd.services.sssd-kcm = { + description = "SSSD Kerberos Cache Manager"; + requires = [ "sssd-kcm.socket" ]; + serviceConfig = { + ExecStartPre = "-${pkgs.sssd}/bin/sssd --genconf-section=kcm"; + ExecStart = "${pkgs.sssd}/libexec/sssd/sssd_kcm --uid 0 --gid 0"; + }; + restartTriggers = [ + config.environment.etc."sssd/sssd.conf".source + ]; + }; + systemd.sockets.sssd-kcm = { + description = "SSSD Kerberos Cache Manager responder socket"; + wantedBy = [ "sockets.target" ]; + # Matches the default in MIT krb5 and Heimdal: + # https://github.com/krb5/krb5/blob/krb5-1.19.3-final/src/include/kcm.h#L43 + listenStreams = [ "/var/run/.heim_org.h5l.kcm-socket" ]; + }; + krb5.libdefaults.default_ccache_name = "KCM:"; + }) + (mkIf cfg.sshAuthorizedKeysIntegration { # Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable. # So indirect by a symlink. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/subsonic.nix b/third_party/nixpkgs/nixos/modules/services/misc/subsonic.nix index 2dda8970dd..d657ae2b99 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/subsonic.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/subsonic.nix @@ -13,7 +13,7 @@ in { home = mkOption { type = types.path; default = "/var/lib/subsonic"; - description = '' + description = lib.mdDoc '' The directory where Subsonic will create files. Make sure it is writable. ''; @@ -22,7 +22,7 @@ in { listenAddress = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' The host name or IP address on which to bind Subsonic. Only relevant if you have multiple network interfaces and want to make Subsonic available on only one of them. The default value @@ -33,7 +33,7 @@ in { port = mkOption { type = types.port; default = 4040; - description = '' + description = lib.mdDoc '' The port on which Subsonic will listen for incoming HTTP traffic. Set to 0 to disable. ''; @@ -42,7 +42,7 @@ in { httpsPort = mkOption { type = types.port; default = 0; - description = '' + description = lib.mdDoc '' The port on which Subsonic will listen for incoming HTTPS traffic. Set to 0 to disable. ''; @@ -51,7 +51,7 @@ in { contextPath = mkOption { type = types.path; default = "/"; - description = '' + description = lib.mdDoc '' The context path, i.e., the last part of the Subsonic URL. Typically '/' or '/subsonic'. Default '/' ''; @@ -60,7 +60,7 @@ in { maxMemory = mkOption { type = types.int; default = 100; - description = '' + description = lib.mdDoc '' The memory limit (max Java heap size) in megabytes. Default: 100 ''; @@ -69,7 +69,7 @@ in { defaultMusicFolder = mkOption { type = types.path; default = "/var/music"; - description = '' + description = lib.mdDoc '' Configure Subsonic to use this folder for music. This option only has effect the first time Subsonic is started. ''; @@ -78,7 +78,7 @@ in { defaultPodcastFolder = mkOption { type = types.path; default = "/var/music/Podcast"; - description = '' + description = lib.mdDoc '' Configure Subsonic to use this folder for Podcasts. This option only has effect the first time Subsonic is started. ''; @@ -87,7 +87,7 @@ in { defaultPlaylistFolder = mkOption { type = types.path; default = "/var/playlists"; - description = '' + description = lib.mdDoc '' Configure Subsonic to use this folder for playlists. This option only has effect the first time Subsonic is started. ''; @@ -97,7 +97,7 @@ in { type = types.listOf types.path; default = [ "${pkgs.ffmpeg.bin}/bin/ffmpeg" ]; defaultText = literalExpression ''[ "''${pkgs.ffmpeg.bin}/bin/ffmpeg" ]''; - description = '' + description = lib.mdDoc '' List of paths to transcoder executables that should be accessible from Subsonic. Symlinks will be created to each executable inside ''${config.${opt.home}}/transcoders. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/svnserve.nix b/third_party/nixpkgs/nixos/modules/services/misc/svnserve.nix index 5fa262ca3b..a0103641c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/svnserve.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/svnserve.nix @@ -20,13 +20,13 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol."; + description = lib.mdDoc "Whether to enable svnserve to serve Subversion repositories through the SVN protocol."; }; svnBaseDir = mkOption { type = types.str; default = "/repos"; - description = "Base directory from which Subversion repositories are accessed."; + description = lib.mdDoc "Base directory from which Subversion repositories are accessed."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/synergy.nix b/third_party/nixpkgs/nixos/modules/services/misc/synergy.nix index d6cd5d7f0d..c02d80b35c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/synergy.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/synergy.nix @@ -24,14 +24,14 @@ in screenName = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Use the given name instead of the hostname to identify ourselves to the server. ''; }; serverAddress = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The server address is of the form: [hostname][:port]. The hostname must be the address or hostname of the server. The port overrides the default port, 24800. @@ -40,7 +40,7 @@ in autoStart = mkOption { default = true; type = types.bool; - description = "Whether the Synergy client should be started automatically."; + description = lib.mdDoc "Whether the Synergy client should be started automatically."; }; }; @@ -50,12 +50,12 @@ in configFile = mkOption { type = types.path; default = "/etc/synergy-server.conf"; - description = "The Synergy server configuration file."; + description = lib.mdDoc "The Synergy server configuration file."; }; screenName = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Use the given name instead of the hostname to identify this screen in the configuration. ''; @@ -63,18 +63,18 @@ in address = mkOption { type = types.str; default = ""; - description = "Address on which to listen for clients."; + description = lib.mdDoc "Address on which to listen for clients."; }; autoStart = mkOption { default = true; type = types.bool; - description = "Whether the Synergy server should be started automatically."; + description = lib.mdDoc "Whether the Synergy server should be started automatically."; }; tls = { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether TLS encryption should be used. Using this requires a TLS certificate that can be @@ -87,7 +87,7 @@ in type = types.nullOr types.str; default = null; example = "~/.synergy/SSL/Synergy.pem"; - description = "The TLS certificate to use for encryption."; + description = lib.mdDoc "The TLS certificate to use for encryption."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.nix b/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.nix index e208049299..d9572f006e 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/taskserver/default.nix @@ -89,7 +89,7 @@ let type = types.uniq (types.listOf types.str); default = []; example = [ "alice" "bob" ]; - description = '' + description = lib.mdDoc '' A list of user names that belong to the organization. ''; }; @@ -98,7 +98,7 @@ let type = types.listOf types.str; default = []; example = [ "workers" "slackers" ]; - description = '' + description = lib.mdDoc '' A list of group names that belong to the organization. ''; }; @@ -151,19 +151,19 @@ in { user = mkOption { type = types.str; default = "taskd"; - description = "User for Taskserver."; + description = lib.mdDoc "User for Taskserver."; }; group = mkOption { type = types.str; default = "taskd"; - description = "Group for Taskserver."; + description = lib.mdDoc "Group for Taskserver."; }; dataDir = mkOption { type = types.path; default = "/var/lib/taskserver"; - description = "Data directory for Taskserver."; + description = lib.mdDoc "Data directory for Taskserver."; }; ciphers = mkOption { @@ -184,17 +184,17 @@ in { example.myShinyOrganisation.users = [ "alice" "bob" ]; example.myShinyOrganisation.groups = [ "staff" "outsiders" ]; example.yetAnotherOrganisation.users = [ "foo" "bar" ]; - description = '' + description = lib.mdDoc '' An attribute set where the keys name the organisation and the values - are a set of lists of and - . + are a set of lists of {option}`users` and + {option}`groups`. ''; }; confirmation = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Determines whether certain commands are confirmed. ''; }; @@ -202,7 +202,7 @@ in { debug = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Logs debugging information. ''; }; @@ -210,7 +210,7 @@ in { extensions = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Fully qualified path of the Taskserver extension scripts. Currently there are none. ''; @@ -219,7 +219,7 @@ in { ipLog = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Logs the IP addresses of incoming requests. ''; }; @@ -238,7 +238,7 @@ in { requestLimit = mkOption { type = types.int; default = 1048576; - description = '' + description = lib.mdDoc '' Size limit of incoming requests, in bytes. ''; }; @@ -247,13 +247,13 @@ in { type = with types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; - description = '' + description = lib.mdDoc '' A list of regular expressions that are matched against the reported - client id (such as task 2.3.0). + client id (such as `task 2.3.0`). - The values all or none have + The values `all` or `none` have special meaning. Overidden by any entry in the option - . + {option}`services.taskserver.disallowedClientIDs`. ''; }; @@ -261,13 +261,13 @@ in { type = with types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; - description = '' + description = lib.mdDoc '' A list of regular expressions that are matched against the reported - client id (such as task 2.3.0). + client id (such as `task 2.3.0`). - The values all or none have + The values `all` or `none` have special meaning. Any entry here overrides those in - . + {option}`services.taskserver.allowedClientIDs`. ''; }; @@ -275,7 +275,7 @@ in { type = types.str; default = "localhost"; example = "::"; - description = '' + description = lib.mdDoc '' The address (IPv4, IPv6 or DNS) to listen on. ''; }; @@ -283,7 +283,7 @@ in { listenPort = mkOption { type = types.int; default = 53589; - description = '' + description = lib.mdDoc '' Port number of the Taskserver. ''; }; @@ -291,7 +291,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open the firewall for the specified Taskserver port. ''; }; @@ -299,7 +299,7 @@ in { fqdn = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' The fully qualified domain name of this server, which is also used as the common name in the certificates. ''; @@ -308,12 +308,12 @@ in { trust = mkOption { type = types.enum [ "allow all" "strict" ]; default = "strict"; - description = '' + description = lib.mdDoc '' Determines how client certificates are validated. - The value allow all performs no client + The value `allow all` performs no client certificate validation. This is not recommended. The value - strict causes the client certificate to be + `strict` causes the client certificate to be validated against a CA. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/tautulli.nix b/third_party/nixpkgs/nixos/modules/services/misc/tautulli.nix index 9a972b2912..78f9429c9a 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/tautulli.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/tautulli.nix @@ -17,38 +17,44 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/plexpy"; - description = "The directory where Tautulli stores its data files."; + description = lib.mdDoc "The directory where Tautulli stores its data files."; }; configFile = mkOption { type = types.str; default = "/var/lib/plexpy/config.ini"; - description = "The location of Tautulli's config file."; + description = lib.mdDoc "The location of Tautulli's config file."; }; port = mkOption { type = types.int; default = 8181; - description = "TCP port where Tautulli listens."; + description = lib.mdDoc "TCP port where Tautulli listens."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Open ports in the firewall for Tautulli."; }; user = mkOption { type = types.str; default = "plexpy"; - description = "User account under which Tautulli runs."; + description = lib.mdDoc "User account under which Tautulli runs."; }; group = mkOption { type = types.str; default = "nogroup"; - description = "Group under which Tautulli runs."; + description = lib.mdDoc "Group under which Tautulli runs."; }; package = mkOption { type = types.package; default = pkgs.tautulli; defaultText = literalExpression "pkgs.tautulli"; - description = '' + description = lib.mdDoc '' The Tautulli package to use. ''; }; @@ -74,6 +80,8 @@ in }; }; + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + users.users = mkIf (cfg.user == "plexpy") { plexpy = { group = cfg.group; uid = config.ids.uids.plexpy; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/tiddlywiki.nix b/third_party/nixpkgs/nixos/modules/services/misc/tiddlywiki.nix index 2adc08f6cf..7052be23d7 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/tiddlywiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/tiddlywiki.nix @@ -24,9 +24,9 @@ in { readers="(authenticated)"; port = 3456; }; - description = '' - Parameters passed to --listen command. - Refer to + description = lib.mdDoc '' + Parameters passed to `--listen` command. + Refer to for details on supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/tp-auto-kbbl.nix b/third_party/nixpkgs/nixos/modules/services/misc/tp-auto-kbbl.nix index 59018f7f81..54dec0b3fe 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/tp-auto-kbbl.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/tp-auto-kbbl.nix @@ -15,21 +15,21 @@ in { type = types.package; default = pkgs.tp-auto-kbbl; defaultText = literalExpression "pkgs.tp-auto-kbbl"; - description = "Package providing tp-auto-kbbl."; + description = lib.mdDoc "Package providing {command}`tp-auto-kbbl`."; }; arguments = mkOption { type = types.listOf types.str; default = [ ]; - description = '' - List of arguments appended to ./tp-auto-kbbl --device [device] [arguments] + description = lib.mdDoc '' + List of arguments appended to `./tp-auto-kbbl --device [device] [arguments]` ''; }; device = mkOption { type = types.str; default = "/dev/input/event0"; - description = "Device watched for activities."; + description = lib.mdDoc "Device watched for activities."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/tzupdate.nix b/third_party/nixpkgs/nixos/modules/services/misc/tzupdate.nix index eac1e1112a..300a578f7c 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/tzupdate.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/tzupdate.nix @@ -9,7 +9,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the tzupdate timezone updating service. This provides a one-shot service which can be activated with systemctl to update the timezone. diff --git a/third_party/nixpkgs/nixos/modules/services/misc/uhub.nix b/third_party/nixpkgs/nixos/modules/services/misc/uhub.nix index 99774fbb92..c3eda0db44 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/uhub.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/uhub.nix @@ -15,7 +15,7 @@ in { services.uhub = mkOption { default = { }; - description = "Uhub ADC hub instances"; + description = lib.mdDoc "Uhub ADC hub instances"; type = types.attrsOf (types.submodule { options = { @@ -24,12 +24,12 @@ in { enableTLS = mkOption { type = types.bool; default = false; - description = "Whether to enable TLS support."; + description = lib.mdDoc "Whether to enable TLS support."; }; settings = mkOption { inherit (settingsFormat) type; - description = '' + description = lib.mdDoc '' Configuration of uhub. See https://www.uhub.org/doc/config.php for a list of options. ''; @@ -44,7 +44,7 @@ in { }; plugins = mkOption { - description = "Uhub plugin configuration."; + description = lib.mdDoc "Uhub plugin configuration."; type = with types; listOf (submodule { options = { @@ -52,10 +52,10 @@ in { type = path; example = literalExpression "$${pkgs.uhub}/plugins/mod_auth_sqlite.so"; - description = "Path to plugin file."; + description = lib.mdDoc "Path to plugin file."; }; settings = mkOption { - description = "Settings specific to this plugin."; + description = lib.mdDoc "Settings specific to this plugin."; type = with types; attrsOf str; example = { file = "/etc/uhub/users.db"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix b/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix index 7a4c4dca2a..b1de30ae2b 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/weechat.nix @@ -10,18 +10,18 @@ in options.services.weechat = { enable = mkEnableOption "weechat"; root = mkOption { - description = "Weechat state directory."; + description = lib.mdDoc "Weechat state directory."; type = types.str; default = "/var/lib/weechat"; }; sessionName = mkOption { - description = "Name of the `screen' session for weechat."; + description = lib.mdDoc "Name of the `screen' session for weechat."; default = "weechat-screen"; type = types.str; }; binary = mkOption { type = types.path; - description = "Binary to execute."; + description = lib.mdDoc "Binary to execute."; default = "${pkgs.weechat}/bin/weechat"; defaultText = literalExpression ''"''${pkgs.weechat}/bin/weechat"''; example = literalExpression ''"''${pkgs.weechat}/bin/weechat-headless"''; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix b/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix index 9256e9ae01..c218f747f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/xmr-stak.nix @@ -23,7 +23,7 @@ in type = types.listOf types.str; default = []; example = [ "--noCPU" "--currency monero" ]; - description = "List of parameters to pass to xmr-stak."; + description = lib.mdDoc "List of parameters to pass to xmr-stak."; }; configFiles = mkOption { @@ -52,7 +52,7 @@ in '''; } ''; - description = '' + description = lib.mdDoc '' Content of config files like config.txt, pools.txt or cpu.txt. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/xmrig.nix b/third_party/nixpkgs/nixos/modules/services/misc/xmrig.nix index c5c3803920..a98b2292f5 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/xmrig.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/xmrig.nix @@ -20,7 +20,7 @@ with lib; default = pkgs.xmrig; defaultText = literalExpression "pkgs.xmrig"; example = literalExpression "pkgs.xmrig-mo"; - description = "XMRig package to use."; + description = lib.mdDoc "XMRig package to use."; }; settings = mkOption { @@ -42,9 +42,9 @@ with lib; ] } ''; - description = '' + description = lib.mdDoc '' XMRig configuration. Refer to - + for details on supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix index a557e742b7..ef3f6c1a0f 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix @@ -68,7 +68,7 @@ in { services.zoneminder = with lib; { enable = lib.mkEnableOption '' ZoneMinder - + If you intend to run the database locally, you should set `config.services.zoneminder.database.createLocally` to true. Otherwise, when set to `false` (the default), you will have to create the database @@ -82,8 +82,6 @@ in { default = "nginx"; description = '' The webserver to configure for the PHP frontend. - - Set it to `none` if you want to configure it yourself. PRs are welcome for support for other web servers. @@ -93,7 +91,7 @@ in { hostname = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' The hostname on which to listen. ''; }; @@ -101,7 +99,7 @@ in { port = mkOption { type = types.int; default = 8095; - description = '' + description = lib.mdDoc '' The port on which to listen. ''; }; @@ -109,7 +107,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open the firewall port(s). ''; }; @@ -118,7 +116,7 @@ in { createLocally = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Create the database and database user locally. ''; }; @@ -126,7 +124,7 @@ in { host = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Hostname hosting the database. ''; }; @@ -134,7 +132,7 @@ in { name = mkOption { type = types.str; default = "zm"; - description = '' + description = lib.mdDoc '' Name of database. ''; }; @@ -142,7 +140,7 @@ in { username = mkOption { type = types.str; default = "zmuser"; - description = '' + description = lib.mdDoc '' Username for accessing the database. ''; }; @@ -150,9 +148,9 @@ in { password = mkOption { type = types.str; default = "zmpass"; - description = '' + description = lib.mdDoc '' Username for accessing the database. - Not used if createLocally is set. + Not used if `createLocally` is set. ''; }; }; @@ -160,7 +158,7 @@ in { cameras = mkOption { type = types.int; default = 1; - description = '' + description = lib.mdDoc '' Set this to the number of cameras you expect to support. ''; }; @@ -169,7 +167,7 @@ in { type = types.nullOr types.str; default = null; example = "/storage/tank"; - description = '' + description = lib.mdDoc '' ZoneMinder can generate quite a lot of data, so in case you don't want to use the default ${defaultDir}, you can override the path here. ''; @@ -178,7 +176,7 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Additional configuration added verbatim to the configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix b/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix index fefbf9a86d..17d4a00f28 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/zookeeper.nix @@ -25,25 +25,25 @@ in { options.services.zookeeper = { enable = mkOption { - description = "Whether to enable Zookeeper."; + description = lib.mdDoc "Whether to enable Zookeeper."; default = false; type = types.bool; }; port = mkOption { - description = "Zookeeper Client port."; + description = lib.mdDoc "Zookeeper Client port."; default = 2181; type = types.int; }; id = mkOption { - description = "Zookeeper ID."; + description = lib.mdDoc "Zookeeper ID."; default = 0; type = types.int; }; purgeInterval = mkOption { - description = '' + description = lib.mdDoc '' The time interval in hours for which the purge task has to be triggered. Set to a positive integer (1 and above) to enable the auto purging. ''; default = 1; @@ -51,7 +51,7 @@ in { }; extraConf = mkOption { - description = "Extra configuration for Zookeeper."; + description = lib.mdDoc "Extra configuration for Zookeeper."; type = types.lines; default = '' initLimit=5 @@ -61,7 +61,7 @@ in { }; servers = mkOption { - description = "All Zookeeper Servers."; + description = lib.mdDoc "All Zookeeper Servers."; default = ""; type = types.lines; example = '' @@ -72,7 +72,7 @@ in { }; logging = mkOption { - description = "Zookeeper logging configuration."; + description = lib.mdDoc "Zookeeper logging configuration."; default = '' zookeeper.root.logger=INFO, CONSOLE log4j.rootLogger=INFO, CONSOLE @@ -87,13 +87,13 @@ in { dataDir = mkOption { type = types.path; default = "/var/lib/zookeeper"; - description = '' + description = lib.mdDoc '' Data directory for Zookeeper ''; }; extraCmdLineOptions = mkOption { - description = "Extra command line options for the Zookeeper launcher."; + description = lib.mdDoc "Extra command line options for the Zookeeper launcher."; default = [ "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ]; type = types.listOf types.str; example = [ "-Djava.net.preferIPv4Stack=true" "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ]; @@ -102,20 +102,20 @@ in { preferIPv4 = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Add the -Djava.net.preferIPv4Stack=true flag to the Zookeeper server. ''; }; package = mkOption { - description = "The zookeeper package to use"; + description = lib.mdDoc "The zookeeper package to use"; default = pkgs.zookeeper; defaultText = literalExpression "pkgs.zookeeper"; type = types.package; }; jre = mkOption { - description = "The JRE with which to run Zookeeper"; + description = lib.mdDoc "The JRE with which to run Zookeeper"; default = cfg.package.jre; defaultText = literalExpression "pkgs.zookeeper.jre"; example = literalExpression "pkgs.jre"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix index a73d94001f..c0caa0dc3b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/alerta.nix @@ -26,53 +26,53 @@ in port = mkOption { type = types.int; default = 5000; - description = "Port of Alerta"; + description = lib.mdDoc "Port of Alerta"; }; bind = mkOption { type = types.str; default = "0.0.0.0"; - description = "Address to bind to. The default is to bind to all addresses"; + description = lib.mdDoc "Address to bind to. The default is to bind to all addresses"; }; logDir = mkOption { type = types.path; - description = "Location where the logfiles are stored"; + description = lib.mdDoc "Location where the logfiles are stored"; default = "/var/log/alerta"; }; databaseUrl = mkOption { type = types.str; - description = "URL of the MongoDB or PostgreSQL database to connect to"; + description = lib.mdDoc "URL of the MongoDB or PostgreSQL database to connect to"; default = "mongodb://localhost"; }; databaseName = mkOption { type = types.str; - description = "Name of the database instance to connect to"; + description = lib.mdDoc "Name of the database instance to connect to"; default = "monitoring"; }; corsOrigins = mkOption { type = types.listOf types.str; - description = "List of URLs that can access the API for Cross-Origin Resource Sharing (CORS)"; + description = lib.mdDoc "List of URLs that can access the API for Cross-Origin Resource Sharing (CORS)"; default = [ "http://localhost" "http://localhost:5000" ]; }; authenticationRequired = mkOption { type = types.bool; - description = "Whether users must authenticate when using the web UI or command-line tool"; + description = lib.mdDoc "Whether users must authenticate when using the web UI or command-line tool"; default = false; }; signupEnabled = mkOption { type = types.bool; - description = "Whether to prevent sign-up of new users via the web UI"; + description = lib.mdDoc "Whether to prevent sign-up of new users via the web UI"; default = true; }; extraConfig = mkOption { - description = "These lines go into alertad.conf verbatim."; + description = lib.mdDoc "These lines go into alertad.conf verbatim."; default = ""; type = types.lines; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/apcupsd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/apcupsd.nix index 1dccbc93ed..d4216b44cd 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/apcupsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/apcupsd.nix @@ -75,7 +75,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable the APC UPS daemon. apcupsd monitors your UPS and permits orderly shutdown of your computer in the event of a power failure. User manual: http://www.apcupsd.com/manual/manual.html. @@ -92,7 +92,7 @@ in MINUTES 5 ''; type = types.lines; - description = '' + description = lib.mdDoc '' Contents of the runtime configuration file, apcupsd.conf. The default settings makes apcupsd autodetect USB UPSes, limit network access to localhost and shutdown the system when the battery level is below 50 @@ -107,7 +107,7 @@ in doshutdown = "# shell commands to notify that the computer is shutting down"; }; type = types.attrsOf types.lines; - description = '' + description = lib.mdDoc '' Each attribute in this option names an apcupsd event and the string value it contains will be executed in a shell, in response to that event (prior to the default action). See "man apccontrol" for the diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix index 94eead220a..8bf4f78cc7 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/arbtt.nix @@ -10,7 +10,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the arbtt statistics capture service. ''; }; @@ -19,7 +19,7 @@ in { type = types.package; default = pkgs.haskellPackages.arbtt; defaultText = literalExpression "pkgs.haskellPackages.arbtt"; - description = '' + description = lib.mdDoc '' The package to use for the arbtt binaries. ''; }; @@ -28,7 +28,7 @@ in { type = types.str; default = "%h/.arbtt/capture.log"; example = "/home/username/.arbtt-capture.log"; - description = '' + description = lib.mdDoc '' The log file for captured samples. ''; }; @@ -37,7 +37,7 @@ in { type = types.int; default = 60; example = 120; - description = '' + description = lib.mdDoc '' The sampling interval in seconds. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/bosun.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/bosun.nix index 4b278b9c20..27966e089e 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/bosun.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/bosun.nix @@ -25,7 +25,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run bosun. ''; }; @@ -34,7 +34,7 @@ in { type = types.package; default = pkgs.bosun; defaultText = literalExpression "pkgs.bosun"; - description = '' + description = lib.mdDoc '' bosun binary to use. ''; }; @@ -42,7 +42,7 @@ in { user = mkOption { type = types.str; default = "bosun"; - description = '' + description = lib.mdDoc '' User account under which bosun runs. ''; }; @@ -50,7 +50,7 @@ in { group = mkOption { type = types.str; default = "bosun"; - description = '' + description = lib.mdDoc '' Group account under which bosun runs. ''; }; @@ -58,7 +58,7 @@ in { opentsdbHost = mkOption { type = types.nullOr types.str; default = "localhost:4242"; - description = '' + description = lib.mdDoc '' Host and port of the OpenTSDB database that stores bosun data. To disable opentsdb you can pass null as parameter. ''; @@ -68,7 +68,7 @@ in { type = types.nullOr types.str; default = null; example = "localhost:8086"; - description = '' + description = lib.mdDoc '' Host and port of the influxdb database. ''; }; @@ -76,7 +76,7 @@ in { listenAddress = mkOption { type = types.str; default = ":8070"; - description = '' + description = lib.mdDoc '' The host address and port that bosun's web interface will listen on. ''; }; @@ -84,7 +84,7 @@ in { stateFile = mkOption { type = types.path; default = "/var/lib/bosun/bosun.state"; - description = '' + description = lib.mdDoc '' Path to bosun's state file. ''; }; @@ -92,7 +92,7 @@ in { ledisDir = mkOption { type = types.path; default = "/var/lib/bosun/ledis_data"; - description = '' + description = lib.mdDoc '' Path to bosun's ledis data dir ''; }; @@ -100,7 +100,7 @@ in { checkFrequency = mkOption { type = types.str; default = "5m"; - description = '' + description = lib.mdDoc '' Bosun's check frequency ''; }; @@ -108,7 +108,7 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration options for Bosun. You should describe your desired templates, alerts, macros, etc through this configuration option. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/cadvisor.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/cadvisor.nix index dfbf07efca..d5e4403101 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/cadvisor.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/cadvisor.nix @@ -11,87 +11,87 @@ in { enable = mkOption { default = false; type = types.bool; - description = "Whether to enable cadvisor service."; + description = lib.mdDoc "Whether to enable cadvisor service."; }; listenAddress = mkOption { default = "127.0.0.1"; type = types.str; - description = "Cadvisor listening host"; + description = lib.mdDoc "Cadvisor listening host"; }; port = mkOption { default = 8080; type = types.int; - description = "Cadvisor listening port"; + description = lib.mdDoc "Cadvisor listening port"; }; storageDriver = mkOption { default = null; type = types.nullOr types.str; example = "influxdb"; - description = "Cadvisor storage driver."; + description = lib.mdDoc "Cadvisor storage driver."; }; storageDriverHost = mkOption { default = "localhost:8086"; type = types.str; - description = "Cadvisor storage driver host."; + description = lib.mdDoc "Cadvisor storage driver host."; }; storageDriverDb = mkOption { default = "root"; type = types.str; - description = "Cadvisord storage driver database name."; + description = lib.mdDoc "Cadvisord storage driver database name."; }; storageDriverUser = mkOption { default = "root"; type = types.str; - description = "Cadvisor storage driver username."; + description = lib.mdDoc "Cadvisor storage driver username."; }; storageDriverPassword = mkOption { default = "root"; type = types.str; - description = '' + description = lib.mdDoc '' Cadvisor storage driver password. Warning: this password is stored in the world-readable Nix store. It's - recommended to use the option + recommended to use the {option}`storageDriverPasswordFile` option since that gives you control over the security of the password. - also takes precedence over . + {option}`storageDriverPasswordFile` also takes precedence over {option}`storageDriverPassword`. ''; }; storageDriverPasswordFile = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' File that contains the cadvisor storage driver password. - takes precedence over + {option}`storageDriverPasswordFile` takes precedence over {option}`storageDriverPassword` - Warning: when is non-empty this defaults to a file in the - world-readable Nix store that contains the value of . + Warning: when {option}`storageDriverPassword` is non-empty this defaults to a file in the + world-readable Nix store that contains the value of {option}`storageDriverPassword`. It's recommended to override this with a path not in the Nix store. - Tip: use nixops key management + Tip: use [nixops key management](https://nixos.org/nixops/manual/#idm140737318306400) ''; }; storageDriverSecure = mkOption { default = false; type = types.bool; - description = "Cadvisor storage driver, enable secure communication."; + description = lib.mdDoc "Cadvisor storage driver, enable secure communication."; }; extraOptions = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Additional cadvisor options. - See for available options. + See for available options. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/collectd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/collectd.nix index 1b9af58575..5c62d50951 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/collectd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/collectd.nix @@ -33,7 +33,7 @@ in { validateConfig = mkOption { default = true; - description = '' + description = lib.mdDoc '' Validate the syntax of collectd configuration file at build time. Disable this if you use the Include directive on files unavailable in the build sandbox, or when cross-compiling. @@ -44,7 +44,7 @@ in { package = mkOption { default = pkgs.collectd; defaultText = literalExpression "pkgs.collectd"; - description = '' + description = lib.mdDoc '' Which collectd package to use. ''; type = types.package; @@ -60,7 +60,7 @@ in { user = mkOption { default = "collectd"; - description = '' + description = lib.mdDoc '' User under which to run collectd. ''; type = nullOr str; @@ -68,7 +68,7 @@ in { dataDir = mkOption { default = "/var/lib/collectd"; - description = '' + description = lib.mdDoc '' Data directory for collectd agent. ''; type = path; @@ -76,7 +76,7 @@ in { autoLoadPlugin = mkOption { default = false; - description = '' + description = lib.mdDoc '' Enable plugin autoloading. ''; type = bool; @@ -84,7 +84,7 @@ in { include = mkOption { default = []; - description = '' + description = lib.mdDoc '' Additional paths to load config from. ''; type = listOf str; @@ -93,7 +93,7 @@ in { plugins = mkOption { default = {}; example = { cpu = ""; memory = ""; network = "Server 192.168.1.1 25826"; }; - description = '' + description = lib.mdDoc '' Attribute set of plugin names to plugin config segments ''; type = attrsOf lines; @@ -101,7 +101,7 @@ in { extraConfig = mkOption { default = ""; - description = '' + description = lib.mdDoc '' Extra configuration for collectd. Use mkBefore to add lines before the default config, and mkAfter to add them below. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix index 6d9d1ef973..9b984fafc1 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/datadog-agent.nix @@ -50,7 +50,7 @@ let in { options.services.datadog-agent = { enable = mkOption { - description = '' + description = lib.mdDoc '' Whether to enable the datadog-agent v7 monitoring service ''; default = false; @@ -70,7 +70,7 @@ in { }; apiKeyFile = mkOption { - description = '' + description = lib.mdDoc '' Path to a file containing the Datadog API key to associate the agent with your account. ''; @@ -79,7 +79,7 @@ in { }; ddUrl = mkOption { - description = '' + description = lib.mdDoc '' Custom dd_url to configure the agent with. Useful if traffic to datadog needs to go through a proxy. Don't use this to point to another datadog site (EU) - use site instead. @@ -90,7 +90,7 @@ in { }; site = mkOption { - description = '' + description = lib.mdDoc '' The datadog site to point the agent towards. Set to datadoghq.eu to point it to their EU site. ''; @@ -100,21 +100,21 @@ in { }; tags = mkOption { - description = "The tags to mark this Datadog agent"; + description = lib.mdDoc "The tags to mark this Datadog agent"; example = [ "test" "service" ]; default = null; type = types.nullOr (types.listOf types.str); }; hostname = mkOption { - description = "The hostname to show in the Datadog dashboard (optional)"; + description = lib.mdDoc "The hostname to show in the Datadog dashboard (optional)"; default = null; example = "mymachine.mydomain"; type = types.nullOr types.str; }; logLevel = mkOption { - description = "Logging verbosity."; + description = lib.mdDoc "Logging verbosity."; default = null; type = types.nullOr (types.enum ["DEBUG" "INFO" "WARN" "ERROR"]); }; @@ -123,7 +123,7 @@ in { default = {}; type = types.attrs; - description = '' + description = lib.mdDoc '' Extra integrations from the Datadog core-integrations repository that should be built and included. @@ -145,14 +145,14 @@ in { extraConfig = mkOption { default = {}; type = types.attrs; - description = '' + description = lib.mdDoc '' Extra configuration options that will be merged into the - main config file datadog.yaml. + main config file {file}`datadog.yaml`. ''; }; enableLiveProcessCollection = mkOption { - description = '' + description = lib.mdDoc '' Whether to enable the live process collection agent. ''; default = false; @@ -160,7 +160,7 @@ in { }; enableTraceAgent = mkOption { - description = '' + description = lib.mdDoc '' Whether to enable the trace agent. ''; default = false; @@ -207,7 +207,7 @@ in { }; diskCheck = mkOption { - description = "Disk check config"; + description = lib.mdDoc "Disk check config"; type = types.attrs; default = { init_config = {}; @@ -216,7 +216,7 @@ in { }; networkCheck = mkOption { - description = "Network check config"; + description = lib.mdDoc "Network check config"; type = types.attrs; default = { init_config = {}; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index a290dae8d4..8c0070c485 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -112,68 +112,68 @@ let in { options.services.dd-agent = { enable = mkOption { - description = '' + description = lib.mdDoc '' Whether to enable the dd-agent v5 monitoring service. - For datadog-agent v6, see . + For datadog-agent v6, see {option}`services.datadog-agent.enable`. ''; default = false; type = types.bool; }; api_key = mkOption { - description = '' + description = lib.mdDoc '' The Datadog API key to associate the agent with your account. Warning: this key is stored in cleartext within the world-readable Nix store! Consider using the new v6 - module instead. + {option}`services.datadog-agent` module instead. ''; example = "ae0aa6a8f08efa988ba0a17578f009ab"; type = types.str; }; tags = mkOption { - description = "The tags to mark this Datadog agent"; + description = lib.mdDoc "The tags to mark this Datadog agent"; example = [ "test" "service" ]; default = null; type = types.nullOr (types.listOf types.str); }; hostname = mkOption { - description = "The hostname to show in the Datadog dashboard (optional)"; + description = lib.mdDoc "The hostname to show in the Datadog dashboard (optional)"; default = null; example = "mymachine.mydomain"; type = types.nullOr types.str; }; postgresqlConfig = mkOption { - description = "Datadog PostgreSQL integration configuration"; + description = lib.mdDoc "Datadog PostgreSQL integration configuration"; default = null; type = types.nullOr types.lines; }; nginxConfig = mkOption { - description = "Datadog nginx integration configuration"; + description = lib.mdDoc "Datadog nginx integration configuration"; default = null; type = types.nullOr types.lines; }; mongoConfig = mkOption { - description = "MongoDB integration configuration"; + description = lib.mdDoc "MongoDB integration configuration"; default = null; type = types.nullOr types.lines; }; jmxConfig = mkOption { - description = "JMX integration configuration"; + description = lib.mdDoc "JMX integration configuration"; default = null; type = types.nullOr types.lines; }; processConfig = mkOption { - description = '' + description = lib.mdDoc '' Process integration configuration - See + See ''; default = null; type = types.nullOr types.lines; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix index 9b65c76ce0..6b440e9fa4 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/fusion-inventory.nix @@ -26,7 +26,7 @@ in { servers = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The urls of the OCS/GLPI servers to connect to. ''; }; @@ -34,7 +34,7 @@ in { extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Configuration that is injected verbatim into the configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-agent.nix index bbeda18464..8190f44c72 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-agent.nix @@ -17,11 +17,11 @@ in type = types.package; default = pkgs.grafana-agent; defaultText = "pkgs.grafana-agent"; - description = "The grafana-agent package to use."; + description = lib.mdDoc "The grafana-agent package to use."; }; credentials = mkOption { - description = '' + description = lib.mdDoc '' Credentials to load at service startup. Keys that are UPPER_SNAKE will be loaded as env vars. Values are absolute paths to the credentials. ''; type = types.attrsOf types.str; @@ -48,9 +48,10 @@ in freeformType = settingsFormat.type; }; - default = { + default = { }; + defaultText = '' metrics = { - wal_directory = "\${STATE_DIRECTORY}"; + wal_directory = "\''${STATE_DIRECTORY}"; global.scrape_interval = "5s"; }; integrations = { @@ -59,8 +60,7 @@ in node_exporter.enabled = true; replace_instance_label = true; }; - }; - + ''; example = { metrics.global.remote_write = [{ url = "\${METRICS_REMOTE_WRITE_URL}"; @@ -104,6 +104,20 @@ in }; config = mkIf cfg.enable { + services.grafana-agent.settings = { + # keep this in sync with config.services.grafana-agent.settings.defaultText. + metrics = { + wal_directory = mkDefault "\${STATE_DIRECTORY}"; + global.scrape_interval = mkDefault "5s"; + }; + integrations = { + agent.enabled = mkDefault true; + agent.scrape_integration = mkDefault true; + node_exporter.enabled = mkDefault true; + replace_instance_label = mkDefault true; + }; + }; + systemd.services.grafana-agent = { wantedBy = [ "multi-user.target" ]; script = '' diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-image-renderer.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-image-renderer.nix index b8b95d846c..4820b19469 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-image-renderer.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-image-renderer.nix @@ -14,7 +14,7 @@ in { chromium = mkOption { type = types.package; - description = '' + description = lib.mdDoc '' The chromium to use for image rendering. ''; }; @@ -32,15 +32,15 @@ in { port = mkOption { type = types.port; default = 8081; - description = '' + description = lib.mdDoc '' The TCP port to use for the rendering server. ''; }; logging.level = mkOption { type = types.enum [ "error" "warning" "info" "debug" ]; default = "info"; - description = '' - The log-level of the grafana-image-renderer.service-unit. + description = lib.mdDoc '' + The log-level of the {file}`grafana-image-renderer.service`-unit. ''; }; }; @@ -48,14 +48,14 @@ in { width = mkOption { default = 1000; type = types.ints.positive; - description = '' + description = lib.mdDoc '' Width of the PNG used to display the alerting graph. ''; }; height = mkOption { default = 500; type = types.ints.positive; - description = '' + description = lib.mdDoc '' Height of the PNG used to display the alerting graph. ''; }; @@ -92,7 +92,7 @@ in { description = '' Configuration attributes for grafana-image-renderer. - See + See for supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-reporter.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-reporter.nix index e40d78f538..7a27b5cbce 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-reporter.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana-reporter.nix @@ -11,36 +11,36 @@ in { grafana = { protocol = mkOption { - description = "Grafana protocol."; + description = lib.mdDoc "Grafana protocol."; default = "http"; type = types.enum ["http" "https"]; }; addr = mkOption { - description = "Grafana address."; + description = lib.mdDoc "Grafana address."; default = "127.0.0.1"; type = types.str; }; port = mkOption { - description = "Grafana port."; + description = lib.mdDoc "Grafana port."; default = 3000; type = types.int; }; }; addr = mkOption { - description = "Listening address."; + description = lib.mdDoc "Listening address."; default = "127.0.0.1"; type = types.str; }; port = mkOption { - description = "Listening port."; + description = lib.mdDoc "Listening port."; default = 8686; type = types.int; }; templateDir = mkOption { - description = "Optional template directory to use custom tex templates"; + description = lib.mdDoc "Optional template directory to use custom tex templates"; default = pkgs.grafana_reporter; defaultText = literalExpression "pkgs.grafana_reporter"; type = types.either types.str types.path; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix index 68b4796f4f..456fe92eea 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix @@ -108,90 +108,90 @@ let options = { name = mkOption { type = types.str; - description = "Name of the datasource. Required."; + description = lib.mdDoc "Name of the datasource. Required."; }; type = mkOption { type = types.str; - description = "Datasource type. Required."; + description = lib.mdDoc "Datasource type. Required."; }; access = mkOption { type = types.enum ["proxy" "direct"]; default = "proxy"; - description = "Access mode. proxy or direct (Server or Browser in the UI). Required."; + description = lib.mdDoc "Access mode. proxy or direct (Server or Browser in the UI). Required."; }; orgId = mkOption { type = types.int; default = 1; - description = "Org id. will default to orgId 1 if not specified."; + description = lib.mdDoc "Org id. will default to orgId 1 if not specified."; }; uid = mkOption { type = types.nullOr types.str; default = null; - description = "Custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically."; + description = lib.mdDoc "Custom UID which can be used to reference this datasource in other parts of the configuration, if not specified will be generated automatically."; }; url = mkOption { type = types.str; - description = "Url of the datasource."; + description = lib.mdDoc "Url of the datasource."; }; password = mkOption { type = types.nullOr types.str; default = null; - description = "Database password, if used."; + description = lib.mdDoc "Database password, if used."; }; user = mkOption { type = types.nullOr types.str; default = null; - description = "Database user, if used."; + description = lib.mdDoc "Database user, if used."; }; database = mkOption { type = types.nullOr types.str; default = null; - description = "Database name, if used."; + description = lib.mdDoc "Database name, if used."; }; basicAuth = mkOption { type = types.nullOr types.bool; default = null; - description = "Enable/disable basic auth."; + description = lib.mdDoc "Enable/disable basic auth."; }; basicAuthUser = mkOption { type = types.nullOr types.str; default = null; - description = "Basic auth username."; + description = lib.mdDoc "Basic auth username."; }; basicAuthPassword = mkOption { type = types.nullOr types.str; default = null; - description = "Basic auth password."; + description = lib.mdDoc "Basic auth password."; }; withCredentials = mkOption { type = types.bool; default = false; - description = "Enable/disable with credentials headers."; + description = lib.mdDoc "Enable/disable with credentials headers."; }; isDefault = mkOption { type = types.bool; default = false; - description = "Mark as default datasource. Max one per org."; + description = lib.mdDoc "Mark as default datasource. Max one per org."; }; jsonData = mkOption { type = types.nullOr types.attrs; default = null; - description = "Datasource specific configuration."; + description = lib.mdDoc "Datasource specific configuration."; }; secureJsonData = mkOption { type = types.nullOr types.attrs; default = null; - description = "Datasource specific secure configuration."; + description = lib.mdDoc "Datasource specific secure configuration."; }; version = mkOption { type = types.int; default = 1; - description = "Version."; + description = lib.mdDoc "Version."; }; editable = mkOption { type = types.bool; default = false; - description = "Allow users to edit datasources from the UI."; + description = lib.mdDoc "Allow users to edit datasources from the UI."; }; }; }; @@ -202,42 +202,42 @@ let name = mkOption { type = types.str; default = "default"; - description = "Provider name."; + description = lib.mdDoc "Provider name."; }; orgId = mkOption { type = types.int; default = 1; - description = "Organization ID."; + description = lib.mdDoc "Organization ID."; }; folder = mkOption { type = types.str; default = ""; - description = "Add dashboards to the specified folder."; + description = lib.mdDoc "Add dashboards to the specified folder."; }; type = mkOption { type = types.str; default = "file"; - description = "Dashboard provider type."; + description = lib.mdDoc "Dashboard provider type."; }; disableDeletion = mkOption { type = types.bool; default = false; - description = "Disable deletion when JSON file is removed."; + description = lib.mdDoc "Disable deletion when JSON file is removed."; }; updateIntervalSeconds = mkOption { type = types.int; default = 10; - description = "How often Grafana will scan for changed dashboards."; + description = lib.mdDoc "How often Grafana will scan for changed dashboards."; }; options = { path = mkOption { type = types.path; - description = "Path grafana will watch for dashboards."; + description = lib.mdDoc "Path grafana will watch for dashboards."; }; foldersFromFilesStructure = mkOption { type = types.bool; default = false; - description = "Use folder names from filesystem to create folders in Grafana."; + description = lib.mdDoc "Use folder names from filesystem to create folders in Grafana."; }; }; }; @@ -248,55 +248,55 @@ let name = mkOption { type = types.str; default = "default"; - description = "Notifier name."; + description = lib.mdDoc "Notifier name."; }; type = mkOption { type = types.enum ["dingding" "discord" "email" "googlechat" "hipchat" "kafka" "line" "teams" "opsgenie" "pagerduty" "prometheus-alertmanager" "pushover" "sensu" "sensugo" "slack" "telegram" "threema" "victorops" "webhook"]; - description = "Notifier type."; + description = lib.mdDoc "Notifier type."; }; uid = mkOption { type = types.str; - description = "Unique notifier identifier."; + description = lib.mdDoc "Unique notifier identifier."; }; org_id = mkOption { type = types.int; default = 1; - description = "Organization ID."; + description = lib.mdDoc "Organization ID."; }; org_name = mkOption { type = types.str; default = "Main Org."; - description = "Organization name."; + description = lib.mdDoc "Organization name."; }; is_default = mkOption { type = types.bool; - description = "Is the default notifier."; + description = lib.mdDoc "Is the default notifier."; default = false; }; send_reminder = mkOption { type = types.bool; default = true; - description = "Should the notifier be sent reminder notifications while alerts continue to fire."; + description = lib.mdDoc "Should the notifier be sent reminder notifications while alerts continue to fire."; }; frequency = mkOption { type = types.str; default = "5m"; - description = "How frequently should the notifier be sent reminders."; + description = lib.mdDoc "How frequently should the notifier be sent reminders."; }; disable_resolve_message = mkOption { type = types.bool; default = false; - description = "Turn off the message that sends when an alert returns to OK."; + description = lib.mdDoc "Turn off the message that sends when an alert returns to OK."; }; settings = mkOption { type = types.nullOr types.attrs; default = null; - description = "Settings for the notifier type."; + description = lib.mdDoc "Settings for the notifier type."; }; secure_settings = mkOption { type = types.nullOr types.attrs; default = null; - description = "Secure settings for the notifier type."; + description = lib.mdDoc "Secure settings for the notifier type."; }; }; }; @@ -305,62 +305,62 @@ in { enable = mkEnableOption "grafana"; protocol = mkOption { - description = "Which protocol to listen."; + description = lib.mdDoc "Which protocol to listen."; default = "http"; type = types.enum ["http" "https" "socket"]; }; addr = mkOption { - description = "Listening address."; + description = lib.mdDoc "Listening address."; default = "127.0.0.1"; type = types.str; }; port = mkOption { - description = "Listening port."; + description = lib.mdDoc "Listening port."; default = 3000; type = types.port; }; socket = mkOption { - description = "Listening socket."; + description = lib.mdDoc "Listening socket."; default = "/run/grafana/grafana.sock"; type = types.str; }; domain = mkOption { - description = "The public facing domain name used to access grafana from a browser."; + description = lib.mdDoc "The public facing domain name used to access grafana from a browser."; default = "localhost"; type = types.str; }; rootUrl = mkOption { - description = "Full public facing url."; + description = lib.mdDoc "Full public facing url."; default = "%(protocol)s://%(domain)s:%(http_port)s/"; type = types.str; }; certFile = mkOption { - description = "Cert file for ssl."; + description = lib.mdDoc "Cert file for ssl."; default = ""; type = types.str; }; certKey = mkOption { - description = "Cert key for ssl."; + description = lib.mdDoc "Cert key for ssl."; default = ""; type = types.str; }; staticRootPath = mkOption { - description = "Root path for static assets."; + description = lib.mdDoc "Root path for static assets."; default = "${cfg.package}/share/grafana/public"; defaultText = literalExpression ''"''${package}/share/grafana/public"''; type = types.str; }; package = mkOption { - description = "Package to use."; + description = lib.mdDoc "Package to use."; default = pkgs.grafana; defaultText = literalExpression "pkgs.grafana"; type = types.package; @@ -369,7 +369,7 @@ in { declarativePlugins = mkOption { type = with types; nullOr (listOf path); default = null; - description = "If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot be manually installed."; + description = lib.mdDoc "If non-null, then a list of packages containing Grafana plugins to install. If set, plugins cannot be manually installed."; example = literalExpression "with pkgs.grafanaPlugins; [ grafana-piechart-panel ]"; # Make sure each plugin is added only once; otherwise building # the link farm fails, since the same path is added multiple @@ -378,38 +378,38 @@ in { }; dataDir = mkOption { - description = "Data directory."; + description = lib.mdDoc "Data directory."; default = "/var/lib/grafana"; type = types.path; }; database = { type = mkOption { - description = "Database type."; + description = lib.mdDoc "Database type."; default = "sqlite3"; type = types.enum ["mysql" "sqlite3" "postgres"]; }; host = mkOption { - description = "Database host."; + description = lib.mdDoc "Database host."; default = "127.0.0.1:3306"; type = types.str; }; name = mkOption { - description = "Database name."; + description = lib.mdDoc "Database name."; default = "grafana"; type = types.str; }; user = mkOption { - description = "Database user."; + description = lib.mdDoc "Database user."; default = "root"; type = types.str; }; password = mkOption { - description = '' + description = lib.mdDoc '' Database password. This option is mutual exclusive with the passwordFile option. ''; @@ -418,7 +418,7 @@ in { }; passwordFile = mkOption { - description = '' + description = lib.mdDoc '' File that containts the database password. This option is mutual exclusive with the password option. ''; @@ -427,14 +427,14 @@ in { }; path = mkOption { - description = "Database path."; + description = lib.mdDoc "Database path."; default = "${cfg.dataDir}/data/grafana.db"; defaultText = literalExpression ''"''${config.${opt.dataDir}}/data/grafana.db"''; type = types.path; }; connMaxLifetime = mkOption { - description = '' + description = lib.mdDoc '' Sets the maximum amount of time (in seconds) a connection may be reused. For MySQL this setting should be shorter than the `wait_timeout' variable. ''; @@ -447,19 +447,19 @@ in { provision = { enable = mkEnableOption "provision"; datasources = mkOption { - description = "Grafana datasources configuration."; + description = lib.mdDoc "Grafana datasources configuration."; default = []; type = types.listOf grafanaTypes.datasourceConfig; apply = x: map _filter x; }; dashboards = mkOption { - description = "Grafana dashboard configuration."; + description = lib.mdDoc "Grafana dashboard configuration."; default = []; type = types.listOf grafanaTypes.dashboardConfig; apply = x: map _filter x; }; notifiers = mkOption { - description = "Grafana notifier configuration."; + description = lib.mdDoc "Grafana notifier configuration."; default = []; type = types.listOf grafanaTypes.notifierConfig; apply = x: map _filter x; @@ -468,13 +468,13 @@ in { security = { adminUser = mkOption { - description = "Default admin username."; + description = lib.mdDoc "Default admin username."; default = "admin"; type = types.str; }; adminPassword = mkOption { - description = '' + description = lib.mdDoc '' Default admin password. This option is mutual exclusive with the adminPasswordFile option. ''; @@ -483,22 +483,22 @@ in { }; adminPasswordFile = mkOption { - description = '' + description = lib.mdDoc '' Default admin password. - This option is mutual exclusive with the adminPassword option. + This option is mutual exclusive with the `adminPassword` option. ''; default = null; type = types.nullOr types.path; }; secretKey = mkOption { - description = "Secret key used for signing."; + description = lib.mdDoc "Secret key used for signing."; default = "SW2YcwTIb9zpOOhoPsMm"; type = types.str; }; secretKeyFile = mkOption { - description = "Secret key used for signing."; + description = lib.mdDoc "Secret key used for signing."; default = null; type = types.nullOr types.path; }; @@ -506,7 +506,7 @@ in { server = { serveFromSubPath = mkOption { - description = "Serve Grafana from subpath specified in rootUrl setting"; + description = lib.mdDoc "Serve Grafana from subpath specified in rootUrl setting"; default = false; type = types.bool; }; @@ -515,17 +515,17 @@ in { smtp = { enable = mkEnableOption "smtp"; host = mkOption { - description = "Host to connect to."; + description = lib.mdDoc "Host to connect to."; default = "localhost:25"; type = types.str; }; user = mkOption { - description = "User used for authentication."; + description = lib.mdDoc "User used for authentication."; default = ""; type = types.str; }; password = mkOption { - description = '' + description = lib.mdDoc '' Password used for authentication. This option is mutual exclusive with the passwordFile option. ''; @@ -533,7 +533,7 @@ in { type = types.str; }; passwordFile = mkOption { - description = '' + description = lib.mdDoc '' Password used for authentication. This option is mutual exclusive with the password option. ''; @@ -541,7 +541,7 @@ in { type = types.nullOr types.path; }; fromAddress = mkOption { - description = "Email address used for sending."; + description = lib.mdDoc "Email address used for sending."; default = "admin@grafana.localhost"; type = types.str; }; @@ -549,25 +549,25 @@ in { users = { allowSignUp = mkOption { - description = "Disable user signup / registration."; + description = lib.mdDoc "Disable user signup / registration."; default = false; type = types.bool; }; allowOrgCreate = mkOption { - description = "Whether user is allowed to create organizations."; + description = lib.mdDoc "Whether user is allowed to create organizations."; default = false; type = types.bool; }; autoAssignOrg = mkOption { - description = "Whether to automatically assign new users to default org."; + description = lib.mdDoc "Whether to automatically assign new users to default org."; default = true; type = types.bool; }; autoAssignOrgRole = mkOption { - description = "Default role new users will be auto assigned."; + description = lib.mdDoc "Default role new users will be auto assigned."; default = "Viewer"; type = types.enum ["Viewer" "Editor"]; }; @@ -575,51 +575,51 @@ in { auth = { disableLoginForm = mkOption { - description = "Set to true to disable (hide) the login form, useful if you use OAuth"; + description = lib.mdDoc "Set to true to disable (hide) the login form, useful if you use OAuth"; default = false; type = types.bool; }; anonymous = { enable = mkOption { - description = "Whether to allow anonymous access."; + description = lib.mdDoc "Whether to allow anonymous access."; default = false; type = types.bool; }; org_name = mkOption { - description = "Which organization to allow anonymous access to."; + description = lib.mdDoc "Which organization to allow anonymous access to."; default = "Main Org."; type = types.str; }; org_role = mkOption { - description = "Which role anonymous users have in the organization."; + description = lib.mdDoc "Which role anonymous users have in the organization."; default = "Viewer"; type = types.str; }; }; azuread = { enable = mkOption { - description = "Whether to allow Azure AD OAuth."; + description = lib.mdDoc "Whether to allow Azure AD OAuth."; default = false; type = types.bool; }; allowSignUp = mkOption { - description = "Whether to allow sign up with Azure AD OAuth."; + description = lib.mdDoc "Whether to allow sign up with Azure AD OAuth."; default = false; type = types.bool; }; clientId = mkOption { - description = "Azure AD OAuth client ID."; + description = lib.mdDoc "Azure AD OAuth client ID."; default = ""; type = types.str; }; clientSecretFile = mkOption { - description = "Azure AD OAuth client secret."; + description = lib.mdDoc "Azure AD OAuth client secret."; default = null; type = types.nullOr types.path; }; tenantId = mkOption { - description = '' + description = lib.mdDoc '' Tenant id used to create auth and token url. Default to "common" , let user sign in with any tenant. ''; @@ -627,7 +627,7 @@ in { type = types.str; }; allowedDomains = mkOption { - description = '' + description = lib.mdDoc '' To limit access to authenticated users who are members of one or more groups, set allowedGroups to a comma- or space-separated list of group object IDs. You can find object IDs for a specific group on the Azure portal. @@ -636,7 +636,7 @@ in { type = types.str; }; allowedGroups = mkOption { - description = '' + description = lib.mdDoc '' Limits access to users who belong to specific domains. Separate domains with space or comma. ''; @@ -646,22 +646,22 @@ in { }; google = { enable = mkOption { - description = "Whether to allow Google OAuth2."; + description = lib.mdDoc "Whether to allow Google OAuth2."; default = false; type = types.bool; }; allowSignUp = mkOption { - description = "Whether to allow sign up with Google OAuth2."; + description = lib.mdDoc "Whether to allow sign up with Google OAuth2."; default = false; type = types.bool; }; clientId = mkOption { - description = "Google OAuth2 client ID."; + description = lib.mdDoc "Google OAuth2 client ID."; default = ""; type = types.str; }; clientSecretFile = mkOption { - description = "Google OAuth2 client secret."; + description = lib.mdDoc "Google OAuth2 client secret."; default = null; type = types.nullOr types.path; }; @@ -670,16 +670,16 @@ in { analytics.reporting = { enable = mkOption { - description = "Whether to allow anonymous usage reporting to stats.grafana.net."; + description = lib.mdDoc "Whether to allow anonymous usage reporting to stats.grafana.net."; default = true; type = types.bool; }; }; extraOptions = mkOption { - description = '' + description = lib.mdDoc '' Extra configuration options passed as env variables as specified in - documentation, + [documentation](http://docs.grafana.org/installation/configuration/), but without GF_ prefix ''; default = {}; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/graphite.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/graphite.nix index 1dc2cee479..8edb2ca099 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/graphite.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/graphite.nix @@ -73,26 +73,26 @@ in { dataDir = mkOption { type = types.path; default = "/var/db/graphite"; - description = '' + description = lib.mdDoc '' Data directory for graphite. ''; }; web = { enable = mkOption { - description = "Whether to enable graphite web frontend."; + description = lib.mdDoc "Whether to enable graphite web frontend."; default = false; type = types.bool; }; listenAddress = mkOption { - description = "Graphite web frontend listen address."; + description = lib.mdDoc "Graphite web frontend listen address."; default = "127.0.0.1"; type = types.str; }; port = mkOption { - description = "Graphite web frontend port."; + description = lib.mdDoc "Graphite web frontend port."; default = 8080; type = types.int; }; @@ -100,16 +100,16 @@ in { extraConfig = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Graphite webapp settings. See: - + ''; }; }; carbon = { config = mkOption { - description = "Content of carbon configuration file."; + description = lib.mdDoc "Content of carbon configuration file."; default = '' [cache] # Listen on localhost by default for security reasons @@ -125,13 +125,13 @@ in { }; enableCache = mkOption { - description = "Whether to enable carbon cache, the graphite storage daemon."; + description = lib.mdDoc "Whether to enable carbon cache, the graphite storage daemon."; default = false; type = types.bool; }; storageAggregation = mkOption { - description = "Defines how to aggregate data to lower-precision retentions."; + description = lib.mdDoc "Defines how to aggregate data to lower-precision retentions."; default = null; type = types.nullOr types.str; example = '' @@ -143,7 +143,7 @@ in { }; storageSchemas = mkOption { - description = "Defines retention rates for storing metrics."; + description = lib.mdDoc "Defines retention rates for storing metrics."; default = ""; type = types.nullOr types.str; example = '' @@ -154,21 +154,21 @@ in { }; blacklist = mkOption { - description = "Any metrics received which match one of the experssions will be dropped."; + description = lib.mdDoc "Any metrics received which match one of the experssions will be dropped."; default = null; type = types.nullOr types.str; example = "^some\\.noisy\\.metric\\.prefix\\..*"; }; whitelist = mkOption { - description = "Only metrics received which match one of the experssions will be persisted."; + description = lib.mdDoc "Only metrics received which match one of the experssions will be persisted."; default = null; type = types.nullOr types.str; example = ".*"; }; rewriteRules = mkOption { - description = '' + description = lib.mdDoc '' Regular expression patterns that can be used to rewrite metric names in a search and replace fashion. ''; @@ -182,13 +182,13 @@ in { }; enableRelay = mkOption { - description = "Whether to enable carbon relay, the carbon replication and sharding service."; + description = lib.mdDoc "Whether to enable carbon relay, the carbon replication and sharding service."; default = false; type = types.bool; }; relayRules = mkOption { - description = "Relay rules are used to send certain metrics to a certain backend."; + description = lib.mdDoc "Relay rules are used to send certain metrics to a certain backend."; default = null; type = types.nullOr types.str; example = '' @@ -199,13 +199,13 @@ in { }; enableAggregator = mkOption { - description = "Whether to enable carbon aggregator, the carbon buffering service."; + description = lib.mdDoc "Whether to enable carbon aggregator, the carbon buffering service."; default = false; type = types.bool; }; aggregationRules = mkOption { - description = "Defines if and how received metrics will be aggregated."; + description = lib.mdDoc "Defines if and how received metrics will be aggregated."; default = null; type = types.nullOr types.str; example = '' @@ -217,13 +217,13 @@ in { seyren = { enable = mkOption { - description = "Whether to enable seyren service."; + description = lib.mdDoc "Whether to enable seyren service."; default = false; type = types.bool; }; port = mkOption { - description = "Seyren listening port."; + description = lib.mdDoc "Seyren listening port."; default = 8081; type = types.int; }; @@ -231,29 +231,29 @@ in { seyrenUrl = mkOption { default = "http://localhost:${toString cfg.seyren.port}/"; defaultText = literalExpression ''"http://localhost:''${toString config.${opt.seyren.port}}/"''; - description = "Host where seyren is accessible."; + description = lib.mdDoc "Host where seyren is accessible."; type = types.str; }; graphiteUrl = mkOption { default = "http://${cfg.web.listenAddress}:${toString cfg.web.port}"; defaultText = literalExpression ''"http://''${config.${opt.web.listenAddress}}:''${toString config.${opt.web.port}}"''; - description = "Host where graphite service runs."; + description = lib.mdDoc "Host where graphite service runs."; type = types.str; }; mongoUrl = mkOption { default = "mongodb://${config.services.mongodb.bind_ip}:27017/seyren"; defaultText = literalExpression ''"mongodb://''${config.services.mongodb.bind_ip}:27017/seyren"''; - description = "Mongodb connection string."; + description = lib.mdDoc "Mongodb connection string."; type = types.str; }; extraConfig = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Extra seyren configuration. See - + ''; type = types.attrsOf types.str; example = literalExpression '' diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/heapster.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/heapster.nix index 44f53e1890..2f2467477a 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/heapster.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/heapster.nix @@ -7,31 +7,31 @@ let in { options.services.heapster = { enable = mkOption { - description = "Whether to enable heapster monitoring"; + description = lib.mdDoc "Whether to enable heapster monitoring"; default = false; type = types.bool; }; source = mkOption { - description = "Heapster metric source"; + description = lib.mdDoc "Heapster metric source"; example = "kubernetes:https://kubernetes.default"; type = types.str; }; sink = mkOption { - description = "Heapster metic sink"; + description = lib.mdDoc "Heapster metic sink"; example = "influxdb:http://localhost:8086"; type = types.str; }; extraOpts = mkOption { - description = "Heapster extra options"; + description = lib.mdDoc "Heapster extra options"; default = ""; type = types.separatedString " "; }; package = mkOption { - description = "Package to use by heapster"; + description = lib.mdDoc "Package to use by heapster"; default = pkgs.heapster; defaultText = literalExpression "pkgs.heapster"; type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/incron.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/incron.nix index 2681c35d6a..53cbe1a9e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/incron.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/incron.nix @@ -27,12 +27,12 @@ in allow = mkOption { type = types.nullOr (types.listOf types.str); default = null; - description = '' + description = lib.mdDoc '' Users allowed to use incrontab. If empty then no user will be allowed to have their own incrontab. - If null then will defer to . - If both and are null + If `null` then will defer to {option}`deny`. + If both {option}`allow` and {option}`deny` are null then all users will be allowed to have their own incrontab. ''; }; @@ -40,13 +40,13 @@ in deny = mkOption { type = types.nullOr (types.listOf types.str); default = null; - description = "Users forbidden from using incrontab."; + description = lib.mdDoc "Users forbidden from using incrontab."; }; systab = mkOption { type = types.lines; default = ""; - description = "The system incrontab contents."; + description = lib.mdDoc "The system incrontab contents."; example = '' /var/mail IN_CLOSE_WRITE abc $@/$# /tmp IN_ALL_EVENTS efg $@/$# $& @@ -57,7 +57,7 @@ in type = types.listOf types.package; default = []; example = literalExpression "[ pkgs.rsync ]"; - description = "Extra packages available to the system incrontab."; + description = lib.mdDoc "Extra packages available to the system incrontab."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/kapacitor.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/kapacitor.nix index a79c647bec..9cdb0e4495 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/kapacitor.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/kapacitor.nix @@ -62,24 +62,24 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/kapacitor"; - description = "Location where Kapacitor stores its state"; + description = lib.mdDoc "Location where Kapacitor stores its state"; }; port = mkOption { type = types.int; default = 9092; - description = "Port of Kapacitor"; + description = lib.mdDoc "Port of Kapacitor"; }; bind = mkOption { type = types.str; default = ""; example = "0.0.0.0"; - description = "Address to bind to. The default is to bind to all addresses"; + description = lib.mdDoc "Address to bind to. The default is to bind to all addresses"; }; extraConfig = mkOption { - description = "These lines go into kapacitord.conf verbatim."; + description = lib.mdDoc "These lines go into kapacitord.conf verbatim."; default = ""; type = types.lines; }; @@ -87,24 +87,24 @@ in user = mkOption { type = types.str; default = "kapacitor"; - description = "User account under which Kapacitor runs"; + description = lib.mdDoc "User account under which Kapacitor runs"; }; group = mkOption { type = types.str; default = "kapacitor"; - description = "Group under which Kapacitor runs"; + description = lib.mdDoc "Group under which Kapacitor runs"; }; taskSnapshotInterval = mkOption { type = types.str; - description = "Specifies how often to snapshot the task state (in InfluxDB time units)"; + description = lib.mdDoc "Specifies how often to snapshot the task state (in InfluxDB time units)"; default = "1m0s"; }; loadDirectory = mkOption { type = types.nullOr types.path; - description = "Directory where to load services from, such as tasks, templates and handlers (or null to disable service loading on startup)"; + description = lib.mdDoc "Directory where to load services from, such as tasks, templates and handlers (or null to disable service loading on startup)"; default = null; }; @@ -112,18 +112,18 @@ in enable = mkEnableOption "kapacitor.defaultDatabase"; url = mkOption { - description = "The URL to an InfluxDB server that serves as the default database"; + description = lib.mdDoc "The URL to an InfluxDB server that serves as the default database"; example = "http://localhost:8086"; type = types.str; }; username = mkOption { - description = "The username to connect to the remote InfluxDB server"; + description = lib.mdDoc "The username to connect to the remote InfluxDB server"; type = types.str; }; password = mkOption { - description = "The password to connect to the remote InfluxDB server"; + description = lib.mdDoc "The password to connect to the remote InfluxDB server"; type = types.str; }; }; @@ -132,25 +132,25 @@ in enable = mkEnableOption "kapacitor alerta integration"; url = mkOption { - description = "The URL to the Alerta REST API"; + description = lib.mdDoc "The URL to the Alerta REST API"; default = "http://localhost:5000"; type = types.str; }; token = mkOption { - description = "Default Alerta authentication token"; + description = lib.mdDoc "Default Alerta authentication token"; type = types.str; default = ""; }; environment = mkOption { - description = "Default Alerta environment"; + description = lib.mdDoc "Default Alerta environment"; type = types.str; default = "Production"; }; origin = mkOption { - description = "Default origin of alert"; + description = lib.mdDoc "Default origin of alert"; type = types.str; default = "kapacitor"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix index ebac70c30c..d73e2abb71 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/loki.nix @@ -17,7 +17,7 @@ in { user = mkOption { type = types.str; default = "loki"; - description = '' + description = lib.mdDoc '' User under which the Loki service runs. ''; }; @@ -25,7 +25,7 @@ in { group = mkOption { type = types.str; default = "loki"; - description = '' + description = lib.mdDoc '' Group under which the Loki service runs. ''; }; @@ -33,7 +33,7 @@ in { dataDir = mkOption { type = types.path; default = "/var/lib/loki"; - description = '' + description = lib.mdDoc '' Specify the directory for Loki. ''; }; @@ -41,7 +41,7 @@ in { configuration = mkOption { type = (pkgs.formats.json {}).type; default = {}; - description = '' + description = lib.mdDoc '' Specify the configuration for Loki in Nix. ''; }; @@ -49,7 +49,7 @@ in { configFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Specify a configuration file that Loki should use. ''; }; @@ -58,7 +58,7 @@ in { type = types.listOf types.str; default = []; example = [ "--server.http-listen-port=3101" ]; - description = '' + description = lib.mdDoc '' Specify a list of additional command line flags, which get escaped and are then passed to Loki. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/longview.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/longview.nix index 9c38956f9b..5825cab013 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/longview.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/longview.nix @@ -16,7 +16,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, system metrics will be sent to Linode LongView. ''; }; @@ -25,12 +25,12 @@ in { type = types.str; default = ""; example = "01234567-89AB-CDEF-0123456789ABCDEF"; - description = '' + description = lib.mdDoc '' Longview API key. To get this, look in Longview settings which are found at https://manager.linode.com/longview/. Warning: this secret is stored in the world-readable Nix store! - Use instead. + Use {option}`apiKeyFile` instead. ''; }; @@ -38,12 +38,12 @@ in { type = types.nullOr types.path; default = null; example = "/run/keys/longview-api-key"; - description = '' + description = lib.mdDoc '' A file containing the Longview API key. To get this, look in Longview settings which are found at https://manager.linode.com/longview/. - takes precedence over . + {option}`apiKeyFile` takes precedence over {option}`apiKey`. ''; }; @@ -51,7 +51,7 @@ in { type = types.str; default = ""; example = "http://127.0.0.1/server-status"; - description = '' + description = lib.mdDoc '' The Apache status page URL. If provided, Longview will gather statistics from this location. This requires Apache mod_status to be loaded and enabled. @@ -62,7 +62,7 @@ in { type = types.str; default = ""; example = "http://127.0.0.1/nginx_status"; - description = '' + description = lib.mdDoc '' The Nginx status page URL. Longview will gather statistics from this URL. This requires the Nginx stub_status module to be enabled and configured at the given location. @@ -72,7 +72,7 @@ in { mysqlUser = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' The user for connecting to the MySQL database. If provided, Longview will connect to MySQL and collect statistics about queries, etc. This user does not need to have been granted @@ -83,10 +83,10 @@ in { mysqlPassword = mkOption { type = types.str; default = ""; - description = '' - The password corresponding to . + description = lib.mdDoc '' + The password corresponding to {option}`mysqlUser`. Warning: this is stored in cleartext in the Nix store! - Use instead. + Use {option}`mysqlPasswordFile` instead. ''; }; @@ -94,8 +94,8 @@ in { type = types.nullOr types.path; default = null; example = "/run/keys/dbpassword"; - description = '' - A file containing the password corresponding to . + description = lib.mdDoc '' + A file containing the password corresponding to {option}`mysqlUser`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix index aeb6247abd..89c6d4d6c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/mackerel-agent.nix @@ -29,11 +29,11 @@ in { }; settings = mkOption { - description = '' + description = lib.mdDoc '' Options for mackerel-agent.conf. Documentation: - + ''; default = {}; @@ -48,12 +48,12 @@ in { options.host_status = { on_start = mkOption { type = types.enum [ "working" "standby" "maintenance" "poweroff" ]; - description = "Host status after agent startup."; + description = lib.mdDoc "Host status after agent startup."; default = "working"; }; on_stop = mkOption { type = types.enum [ "working" "standby" "maintenance" "poweroff" ]; - description = "Host status after agent shutdown."; + description = lib.mdDoc "Host status after agent shutdown."; default = "poweroff"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/metricbeat.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/metricbeat.nix index e75039daa1..14066da1be 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/metricbeat.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/metricbeat.nix @@ -26,23 +26,23 @@ in default = pkgs.metricbeat; defaultText = literalExpression "pkgs.metricbeat"; example = literalExpression "pkgs.metricbeat7"; - description = '' + description = lib.mdDoc '' The metricbeat package to use ''; }; modules = mkOption { - description = '' + description = lib.mdDoc '' Metricbeat modules are responsible for reading metrics from the various sources. - This is like services.metricbeat.settings.metricbeat.modules, + This is like `services.metricbeat.settings.metricbeat.modules`, but structured as an attribute set. This has the benefit that multiple NixOS modules can contribute settings to a single metricbeat module. - A module can be specified multiple times by choosing a different <name> - for each, but setting to the same value. + A module can be specified multiple times by choosing a different `` + for each, but setting [](#opt-services.metricbeat.modules._name_.module) to the same value. - See . + See . ''; default = {}; type = types.attrsOf (types.submodule ({ name, ... }: { @@ -51,11 +51,11 @@ in module = mkOption { type = types.str; default = name; - description = '' + description = lib.mdDoc '' The name of the module. - Look for the value after module: on the individual - module pages linked from . + Look for the value after `module:` on the individual + module pages linked from . ''; }; }; @@ -80,18 +80,18 @@ in name = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Name of the beat. Defaults to the hostname. - See . + See . ''; }; tags = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Tags to place on the shipped metrics. - See . + See . ''; }; @@ -108,8 +108,8 @@ in }; }; default = {}; - description = '' - Configuration for metricbeat. See for supported values. + description = lib.mdDoc '' + Configuration for metricbeat. See for supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/mimir.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/mimir.nix index 83c0b23c59..87f7af7855 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/mimir.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/mimir.nix @@ -13,7 +13,7 @@ in { configuration = mkOption { type = (pkgs.formats.json {}).type; default = {}; - description = '' + description = lib.mdDoc '' Specify the configuration for Mimir in Nix. ''; }; @@ -21,7 +21,7 @@ in { configFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Specify a configuration file that Mimir should use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/monit.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/monit.nix index 379ee96762..6ce5b44eb2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/monit.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/monit.nix @@ -14,7 +14,7 @@ in config = mkOption { type = types.lines; default = ""; - description = "monitrc content"; + description = lib.mdDoc "monitrc content"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix index 4fddb1e37e..9461bd3f35 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/munin.nix @@ -138,29 +138,29 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable Munin Node agent. Munin node listens on 0.0.0.0 and by default accepts connections only from 127.0.0.1 for security reasons. - See . + See . ''; }; extraConfig = mkOption { default = ""; type = types.lines; - description = '' - munin-node.conf extra configuration. See - + description = lib.mdDoc '' + {file}`munin-node.conf` extra configuration. See + ''; }; extraPluginConfig = mkOption { default = ""; type = types.lines; - description = '' - plugin-conf.d extra plugin configuration. See - + description = lib.mdDoc '' + {file}`plugin-conf.d` extra plugin configuration. See + ''; example = '' [fail2ban_*] @@ -171,7 +171,7 @@ in extraPlugins = mkOption { default = {}; type = with types; attrsOf path; - description = '' + description = lib.mdDoc '' Additional Munin plugins to activate. Keys are the name of the plugin symlink, values are the path to the underlying plugin script. You can use the same plugin script multiple times (e.g. for wildcard @@ -179,15 +179,15 @@ in Note that these plugins do not participate in autoconfiguration. If you want to autoconfigure additional plugins, use - . + {option}`services.munin-node.extraAutoPlugins`. Plugins enabled in this manner take precedence over autoconfigured plugins. Plugins will be copied into the Nix store, and it will attempt to modify them to run properly by fixing hardcoded references to - /bin, /usr/bin, - /sbin, and /usr/sbin. + `/bin`, `/usr/bin`, + `/sbin`, and `/usr/sbin`. ''; example = literalExpression '' { @@ -201,24 +201,24 @@ in extraAutoPlugins = mkOption { default = []; type = with types; listOf path; - description = '' + description = lib.mdDoc '' Additional Munin plugins to autoconfigure, using - munin-node-configure --suggest. These should be + `munin-node-configure --suggest`. These should be the actual paths to the plugin files (or directories containing them), not just their names. If you want to manually enable individual plugins instead, use - . + {option}`services.munin-node.extraPlugins`. Note that only plugins that have the 'autoconfig' capability will do anything if listed here, since plugins that cannot autoconfigure won't be automatically enabled by - munin-node-configure. + `munin-node-configure`. Plugins will be copied into the Nix store, and it will attempt to modify them to run properly by fixing hardcoded references to - /bin, /usr/bin, - /sbin, and /usr/sbin. + `/bin`, `/usr/bin`, + `/sbin`, and `/usr/sbin`. ''; example = literalExpression '' [ @@ -234,14 +234,14 @@ in # NaNs in the output. default = [ "munin_stats" ]; type = with types; listOf str; - description = '' + description = lib.mdDoc '' Munin plugins to disable, even if - munin-node-configure --suggest tries to enable + `munin-node-configure --suggest` tries to enable them. To disable a wildcard plugin, use an actual wildcard, as in the example. munin_stats is disabled by default as it tries to read - /var/log/munin/munin-update.log for timing + `/var/log/munin/munin-update.log` for timing information, and the NixOS build of Munin does not write this file. ''; example = [ "diskstats" "zfs_usage_*" ]; @@ -253,12 +253,12 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable munin-cron. Takes care of all heavy lifting to collect data from nodes and draws graphs to html. Runs munin-update, munin-limits, munin-graphs and munin-html in that order. - HTML output is in /var/www/munin/, configure your + HTML output is in {file}`/var/www/munin/`, configure your favourite webserver to serve static files. ''; }; @@ -266,11 +266,11 @@ in extraGlobalConfig = mkOption { default = ""; type = types.lines; - description = '' - munin.conf extra global configuration. - See . + description = lib.mdDoc '' + {file}`munin.conf` extra global configuration. + See . Useful to setup notifications, see - + ''; example = '' contact.email.command mail -s "Munin notification for ''${var:host}" someone@example.com @@ -280,10 +280,10 @@ in hosts = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Definitions of hosts of nodes to collect data from. Needs at least one host for cron to succeed. See - + ''; example = literalExpression '' ''' @@ -296,7 +296,7 @@ in extraCSS = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Custom styling for the HTML that munin-cron generates. This will be appended to the CSS files used by munin-cron and will thus take precedence over the builtin styles. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix index 69173ce4e4..a17797f682 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/nagios.nix @@ -88,7 +88,7 @@ in options = { services.nagios = { - enable = mkEnableOption "Nagios to monitor your system or network."; + enable = mkEnableOption ''Nagios to monitor your system or network.''; objectDefs = mkOption { description = " diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix index c6a3315d40..e20eaf3b14 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -55,24 +55,24 @@ in { type = types.package; default = pkgs.netdata; defaultText = literalExpression "pkgs.netdata"; - description = "Netdata package to use."; + description = lib.mdDoc "Netdata package to use."; }; user = mkOption { type = types.str; default = "netdata"; - description = "User account under which netdata runs."; + description = lib.mdDoc "User account under which netdata runs."; }; group = mkOption { type = types.str; default = "netdata"; - description = "Group under which netdata runs."; + description = lib.mdDoc "Group under which netdata runs."; }; configText = mkOption { type = types.nullOr types.lines; - description = "Verbatim netdata.conf, cannot be combined with config."; + description = lib.mdDoc "Verbatim netdata.conf, cannot be combined with config."; default = null; example = '' [global] @@ -86,7 +86,7 @@ in { enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable python-based plugins ''; }; @@ -101,7 +101,7 @@ in { ps.dnspython ] ''; - description = '' + description = lib.mdDoc '' Extra python packages available at runtime to enable additional python plugins. ''; @@ -114,14 +114,14 @@ in { example = literalExpression '' [ "/path/to/plugins.d" ] ''; - description = '' + description = lib.mdDoc '' Extra paths to add to the netdata global "plugins directory" option. Useful for when you want to include your own collection scripts. - + Details about writing a custom netdata plugin are available at: - - + + Cannot be combined with configText. ''; }; @@ -129,7 +129,7 @@ in { config = mkOption { type = types.attrsOf types.attrs; default = {}; - description = "netdata.conf configuration as nix attributes. cannot be combined with configText."; + description = lib.mdDoc "netdata.conf configuration as nix attributes. cannot be combined with configText."; example = literalExpression '' global = { "debug log" = "syslog"; @@ -142,7 +142,7 @@ in { configDir = mkOption { type = types.attrsOf types.path; default = {}; - description = '' + description = lib.mdDoc '' Complete netdata config directory except netdata.conf. The default configuration is merged with changes defined in this option. @@ -162,11 +162,11 @@ in { enableAnalyticsReporting = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable reporting of anonymous usage statistics to Netdata Inc. via either Google Analytics (in versions prior to 1.29.4), or Netdata Inc.'s self-hosted PostHog (in versions 1.29.4 and later). - See: + See: ''; }; }; @@ -186,7 +186,7 @@ in { description = "Real time performance monitoring"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = (with pkgs; [ curl gawk iproute2 which procps ]) + path = (with pkgs; [ curl gawk iproute2 which procps bash ]) ++ lib.optional cfg.python.enable (pkgs.python3.withPackages cfg.python.extraPackages) ++ lib.optional config.virtualisation.libvirtd.enable (config.virtualisation.libvirtd.package); environment = { @@ -201,7 +201,9 @@ in { serviceConfig = { ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf"; ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID"; - ExecStartPost = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done''; + ExecStartPost = pkgs.writeShellScript "wait-for-netdata-up" '' + while [ "$(${pkgs.netdata}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done + ''; TimeoutStopSec = 60; Restart = "on-failure"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix index efc7f69be7..b0858184b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/parsedmarc.nix @@ -29,18 +29,18 @@ in enable = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether Postfix and Dovecot should be set up to receive mail locally. parsedmarc will be configured to watch the local inbox as the automatically created user specified in - + [](#opt-services.parsedmarc.provision.localMail.recipientName) ''; }; recipientName = lib.mkOption { type = lib.types.str; default = "dmarc"; - description = '' + description = lib.mdDoc '' The DMARC mail recipient name, i.e. the name part of the email address which receives DMARC reports. @@ -54,7 +54,7 @@ in default = config.networking.fqdn; defaultText = lib.literalExpression "config.networking.fqdn"; example = "monitoring.example.com"; - description = '' + description = lib.mdDoc '' The hostname to use when configuring Postfix. Should correspond to the host's fully qualified domain @@ -68,15 +68,13 @@ in geoIp = lib.mkOption { type = lib.types.bool; default = true; - description = '' - Whether to enable and configure the geoipupdate + description = lib.mdDoc '' + Whether to enable and configure the [geoipupdate](#opt-services.geoipupdate.enable) service to automatically fetch GeoIP databases. Not crucial, but recommended for full functionality. - To finish the setup, you need to manually set the and - + To finish the setup, you need to manually set the [](#opt-services.geoipupdate.settings.AccountID) and + [](#opt-services.geoipupdate.settings.LicenseKey) options. ''; }; @@ -84,7 +82,7 @@ in elasticsearch = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to set up and use a local instance of Elasticsearch. ''; }; @@ -97,11 +95,11 @@ in config.${opt.provision.elasticsearch} && config.${options.services.grafana.enable} ''; apply = x: x && cfg.provision.elasticsearch; - description = '' + description = lib.mdDoc '' Whether the automatically provisioned Elasticsearch instance should be added as a grafana datasource. Has no effect unless - + [](#opt-services.parsedmarc.provision.elasticsearch) is also enabled. ''; }; @@ -110,7 +108,7 @@ in type = lib.types.bool; default = config.services.grafana.enable; defaultText = lib.literalExpression "config.services.grafana.enable"; - description = '' + description = lib.mdDoc '' Whether the official parsedmarc grafana dashboard should be provisioned to the local grafana instance. ''; @@ -134,20 +132,20 @@ in }; } ''; - description = '' + description = lib.mdDoc '' Configuration parameters to set in - parsedmarc.ini. For a full list of + {file}`parsedmarc.ini`. For a full list of available parameters, see - . + . Settings containing secret data should be set to an attribute - set containing the attribute _secret - a + set containing the attribute `_secret` - a string pointing to a file containing the value the option should be set to. See the example to get a better picture of - this: in the resulting parsedmarc.ini - file, the splunk_hec.token key will be set + this: in the resulting {file}`parsedmarc.ini` + file, the `splunk_hec.token` key will be set to the contents of the - /run/keys/splunk_token file. + {file}`/run/keys/splunk_token` file. ''; type = lib.types.submodule { @@ -158,7 +156,7 @@ in save_aggregate = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Save aggregate report data to Elasticsearch and/or Splunk. ''; }; @@ -166,7 +164,7 @@ in save_forensic = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Save forensic report data to Elasticsearch and/or Splunk. ''; }; @@ -176,7 +174,7 @@ in host = lib.mkOption { type = lib.types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' The IMAP server hostname or IP address. ''; }; @@ -184,7 +182,7 @@ in port = lib.mkOption { type = lib.types.port; default = 993; - description = '' + description = lib.mdDoc '' The IMAP server port. ''; }; @@ -192,7 +190,7 @@ in ssl = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Use an encrypted SSL/TLS connection. ''; }; @@ -200,7 +198,7 @@ in user = lib.mkOption { type = with lib.types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The IMAP server username. ''; }; @@ -208,13 +206,12 @@ in password = lib.mkOption { type = with lib.types; nullOr (either path (attrsOf path)); default = null; - description = '' + description = lib.mdDoc '' The IMAP server password. Always handled as a secret whether the value is - wrapped in a { _secret = ...; } - attrset or not (refer to for + wrapped in a `{ _secret = ...; }` + attrset or not (refer to [](#opt-services.parsedmarc.settings) for details). ''; apply = x: if isAttrs x || x == null then x else { _secret = x; }; @@ -223,7 +220,7 @@ in watch = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Use the IMAP IDLE command to process messages as they arrive. ''; }; @@ -231,7 +228,7 @@ in delete = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Delete messages after processing them, instead of archiving them. ''; }; @@ -241,7 +238,7 @@ in host = lib.mkOption { type = with lib.types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The SMTP server hostname or IP address. ''; }; @@ -249,7 +246,7 @@ in port = lib.mkOption { type = with lib.types; nullOr port; default = null; - description = '' + description = lib.mdDoc '' The SMTP server port. ''; }; @@ -257,7 +254,7 @@ in ssl = lib.mkOption { type = with lib.types; nullOr bool; default = null; - description = '' + description = lib.mdDoc '' Use an encrypted SSL/TLS connection. ''; }; @@ -265,7 +262,7 @@ in user = lib.mkOption { type = with lib.types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The SMTP server username. ''; }; @@ -273,13 +270,12 @@ in password = lib.mkOption { type = with lib.types; nullOr (either path (attrsOf path)); default = null; - description = '' + description = lib.mdDoc '' The SMTP server password. Always handled as a secret whether the value is - wrapped in a { _secret = ...; } - attrset or not (refer to for + wrapped in a `{ _secret = ...; }` + attrset or not (refer to [](#opt-services.parsedmarc.settings) for details). ''; apply = x: if isAttrs x || x == null then x else { _secret = x; }; @@ -288,8 +284,8 @@ in from = lib.mkOption { type = with lib.types; nullOr str; default = null; - description = '' - The From address to use for the + description = lib.mdDoc '' + The `From` address to use for the outgoing mail. ''; }; @@ -297,7 +293,7 @@ in to = lib.mkOption { type = with lib.types; nullOr (listOf str); default = null; - description = '' + description = lib.mdDoc '' The addresses to send outgoing mail to. ''; }; @@ -308,7 +304,7 @@ in default = []; type = with lib.types; listOf str; apply = x: if x == [] then null else lib.concatStringsSep "," x; - description = '' + description = lib.mdDoc '' A list of Elasticsearch hosts to push parsed reports to. ''; @@ -317,7 +313,7 @@ in user = lib.mkOption { type = with lib.types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Username to use when connecting to Elasticsearch, if required. ''; @@ -326,14 +322,13 @@ in password = lib.mkOption { type = with lib.types; nullOr (either path (attrsOf path)); default = null; - description = '' + description = lib.mdDoc '' The password to use when connecting to Elasticsearch, if required. Always handled as a secret whether the value is - wrapped in a { _secret = ...; } - attrset or not (refer to for + wrapped in a `{ _secret = ...; }` + attrset or not (refer to [](#opt-services.parsedmarc.settings) for details). ''; apply = x: if isAttrs x || x == null then x else { _secret = x; }; @@ -342,7 +337,7 @@ in ssl = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use an encrypted SSL/TLS connection. ''; }; @@ -350,7 +345,7 @@ in cert_path = lib.mkOption { type = lib.types.path; default = "/etc/ssl/certs/ca-certificates.crt"; - description = '' + description = lib.mdDoc '' The path to a TLS certificate bundle used to verify the server's certificate. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix index 1f396634ae..60e0523cc3 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -46,7 +46,7 @@ in { type = types.package; default = pkgs.prometheus-alertmanager; defaultText = literalExpression "pkgs.alertmanager"; - description = '' + description = lib.mdDoc '' Package that should be used for alertmanager. ''; }; @@ -54,7 +54,7 @@ in { configuration = mkOption { type = types.nullOr types.attrs; default = null; - description = '' + description = lib.mdDoc '' Alertmanager configuration as nix attribute set. ''; }; @@ -62,7 +62,7 @@ in { configText = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Alertmanager configuration as YAML text. If non-null, this option defines the text that is written to alertmanager.yml. If null, the contents of alertmanager.yml is generated from the structured config @@ -73,7 +73,7 @@ in { logFormat = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' If set use a syslog logger or JSON logging. ''; }; @@ -81,7 +81,7 @@ in { logLevel = mkOption { type = types.enum ["debug" "info" "warn" "error" "fatal"]; default = "warn"; - description = '' + description = lib.mdDoc '' Only log messages with the given severity or above. ''; }; @@ -89,7 +89,7 @@ in { webExternalUrl = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The URL under which Alertmanager is externally reachable (for example, if Alertmanager is served via a reverse proxy). Used for generating relative and absolute links back to Alertmanager itself. If the URL has a path portion, it will be used to prefix all HTTP endoints served by Alertmanager. @@ -100,7 +100,7 @@ in { listenAddress = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Address to listen on for the web interface and API. Empty string will listen on all interfaces. "localhost" will listen on 127.0.0.1 (but not ::1). ''; @@ -109,7 +109,7 @@ in { port = mkOption { type = types.int; default = 9093; - description = '' + description = lib.mdDoc '' Port to listen on for the web interface and API. ''; }; @@ -117,7 +117,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open port in firewall for incoming connections. ''; }; @@ -125,7 +125,7 @@ in { clusterPeers = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Initial peers for HA cluster. ''; }; @@ -133,7 +133,7 @@ in { extraFlags = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Extra commandline options when launching the Alertmanager. ''; }; @@ -142,11 +142,11 @@ in { type = types.nullOr types.path; default = null; example = "/root/alertmanager.env"; - description = '' + description = lib.mdDoc '' File to load as environment file. Environment variables from this file will be interpolated into the config file using envsubst with this syntax: - $ENVIRONMENT ''${VARIABLE} + `$ENVIRONMENT ''${VARIABLE}` ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix index 41848c1c6d..3bc61fba15 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/default.nix @@ -184,7 +184,7 @@ let options = { username = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' HTTP username ''; }; @@ -257,7 +257,7 @@ let }; job_name = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The job name assigned to scraped metrics by default. ''; }; @@ -379,9 +379,8 @@ let gce_sd_configs = mkOpt (types.listOf promTypes.gce_sd_config) '' List of Google Compute Engine service discovery configurations. - See the - relevant Prometheus configuration docs for more detail. + See the relevant Prometheus configuration docs + for more detail. ''; hetzner_sd_configs = mkOpt (types.listOf promTypes.hetzner_sd_config) '' @@ -513,7 +512,7 @@ let subscription_id = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The subscription ID. ''; }; @@ -618,7 +617,7 @@ let mkDockerSdConfigModule = extraOptions: mkSdConfigModule ({ host = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Address of the Docker daemon. ''; }; @@ -675,7 +674,7 @@ let options = { names = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' A list of DNS SRV record names to be queried. ''; }; @@ -698,7 +697,7 @@ let options = { region = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The AWS Region. If blank, the region from the instance metadata is used. ''; }; @@ -762,7 +761,7 @@ let promTypes.eureka_sd_config = mkSdConfigModule { server = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The URL to connect to the Eureka server. ''; }; @@ -772,7 +771,7 @@ let options = { files = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Patterns for files from which target groups are extracted. Refer to the Prometheus documentation for permitted filename patterns and formats. @@ -791,14 +790,14 @@ let # required configuration values for `gce_sd_config`. project = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The GCP Project. ''; }; zone = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The zone of the scrape targets. If you need multiple zones use multiple gce_sd_configs. ''; @@ -807,9 +806,7 @@ let filter = mkOpt types.str '' Filter can be used optionally to filter the instance list by other criteria Syntax of this filter string is described here in the filter - query parameter section: . + query parameter section: . ''; refresh_interval = mkDefOpt types.str "60s" '' @@ -825,7 +822,7 @@ let The tag separator used to separate concatenated GCE instance network tags. See the GCP documentation on network tags for more information: - + ''; }; }; @@ -833,9 +830,9 @@ let promTypes.hetzner_sd_config = mkSdConfigModule { role = mkOption { type = types.enum [ "robot" "hcloud" ]; - description = '' + description = lib.mdDoc '' The Hetzner role of entities that should be discovered. - One of robot or hcloud. + One of `robot` or `hcloud`. ''; }; @@ -852,7 +849,7 @@ let options = { url = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' URL from which the targets are fetched. ''; }; @@ -889,7 +886,7 @@ let role = mkOption { type = types.enum [ "endpoints" "service" "pod" "node" "ingress" ]; - description = '' + description = lib.mdDoc '' The Kubernetes role of entities that should be discovered. One of endpoints, service, pod, node, or ingress. ''; @@ -954,7 +951,7 @@ let promTypes.kuma_sd_config = mkSdConfigModule { server = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Address of the Kuma Control Plane's MADS xDS server. ''; }; @@ -1022,7 +1019,7 @@ let promTypes.marathon_sd_config = mkSdConfigModule { servers = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of URLs to be used to contact Marathon servers. You need to provide at least one server URL. ''; }; @@ -1033,13 +1030,13 @@ let auth_token = mkOpt types.str '' Optional authentication information for token-based authentication: - + It is mutually exclusive with auth_token_file and other authentication mechanisms. ''; auth_token_file = mkOpt types.str '' Optional authentication information for token-based authentication: - + It is mutually exclusive with auth_token and other authentication mechanisms. ''; }; @@ -1048,14 +1045,14 @@ let options = { servers = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The Zookeeper servers. ''; }; paths = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Paths can point to a single service, or the root of a tree of services. ''; }; @@ -1097,14 +1094,14 @@ let { role = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The OpenStack role of entities that should be discovered. ''; }; region = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The OpenStack Region. ''; }; @@ -1165,14 +1162,14 @@ let promTypes.puppetdb_sd_config = mkSdConfigModule { url = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The URL of the PuppetDB root query endpoint. ''; }; query = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Puppet Query Language (PQL) query. Only resources are supported. https://puppet.com/docs/puppetdb/latest/api/query/v4/pql.html ''; @@ -1201,7 +1198,7 @@ let options = { access_key = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Access key to use. https://console.scaleway.com/project/credentials ''; }; @@ -1218,7 +1215,7 @@ let project_id = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Project ID of the targets. ''; }; @@ -1275,7 +1272,7 @@ let options = { account = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The account to use for discovering new targets. ''; }; @@ -1288,15 +1285,15 @@ let dns_suffix = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The DNS suffix which should be applied to target. ''; }; endpoint = mkOption { type = types.str; - description = '' - The Triton discovery endpoint (e.g. cmon.us-east-3b.triton.zone). This is + description = lib.mdDoc '' + The Triton discovery endpoint (e.g. `cmon.us-east-3b.triton.zone`). This is often the same value as dns_suffix. ''; }; @@ -1327,21 +1324,21 @@ let promTypes.uyuni_sd_config = mkSdConfigModule { server = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The URL to connect to the Uyuni server. ''; }; username = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Credentials are used to authenticate the requests to Uyuni API. ''; }; password = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Credentials are used to authenticate the requests to Uyuni API. ''; }; @@ -1363,14 +1360,14 @@ let options = { targets = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The targets specified by the target group. ''; }; labels = mkOption { type = types.attrsOf types.str; default = { }; - description = '' + description = lib.mdDoc '' Labels assigned to all metrics scraped from the targets. ''; }; @@ -1426,7 +1423,7 @@ let options = { url = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' ServerName extension to indicate the name of the server. http://tools.ietf.org/html/rfc4366#section-3.1 ''; @@ -1512,7 +1509,7 @@ let options = { url = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' ServerName extension to indicate the name of the server. http://tools.ietf.org/html/rfc4366#section-3.1 ''; @@ -1569,7 +1566,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the Prometheus monitoring daemon. ''; }; @@ -1578,7 +1575,7 @@ in type = types.package; default = pkgs.prometheus; defaultText = literalExpression "pkgs.prometheus"; - description = '' + description = lib.mdDoc '' The prometheus package that should be used. ''; }; @@ -1586,7 +1583,7 @@ in port = mkOption { type = types.port; default = 9090; - description = '' + description = lib.mdDoc '' Port to listen on. ''; }; @@ -1594,7 +1591,7 @@ in listenAddress = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' Address to listen on for the web interface, API, and telemetry. ''; }; @@ -1602,8 +1599,8 @@ in stateDir = mkOption { type = types.str; default = "prometheus2"; - description = '' - Directory below /var/lib to store Prometheus metrics data. + description = lib.mdDoc '' + Directory below `/var/lib` to store Prometheus metrics data. This directory will be created automatically using systemd's StateDirectory mechanism. ''; }; @@ -1611,7 +1608,7 @@ in extraFlags = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' Extra commandline options when launching Prometheus. ''; }; @@ -1619,11 +1616,11 @@ in enableReload = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Reload prometheus when configuration file changes (instead of restart). The following property holds: switching to a configuration - (switch-to-configuration) that changes the prometheus + (`switch-to-configuration`) that changes the prometheus configuration only finishes successully when prometheus has finished loading the new configuration. ''; @@ -1632,7 +1629,7 @@ in configText = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' If non-null, this option defines the text that is written to prometheus.yml. If null, the contents of prometheus.yml is generated from the structured config options. @@ -1642,7 +1639,7 @@ in globalConfig = mkOption { type = promTypes.globalConfig; default = { }; - description = '' + description = lib.mdDoc '' Parameters that are valid in all configuration contexts. They also serve as defaults for other configuration sections ''; @@ -1651,25 +1648,25 @@ in remoteRead = mkOption { type = types.listOf promTypes.remote_read; default = [ ]; - description = '' + description = lib.mdDoc '' Parameters of the endpoints to query from. - See the official documentation for more information. + See [the official documentation](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_read) for more information. ''; }; remoteWrite = mkOption { type = types.listOf promTypes.remote_write; default = [ ]; - description = '' + description = lib.mdDoc '' Parameters of the endpoints to send samples to. - See the official documentation for more information. + See [the official documentation](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#remote_write) for more information. ''; }; rules = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' Alerting and/or Recording rules to evaluate at runtime. ''; }; @@ -1677,7 +1674,7 @@ in ruleFiles = mkOption { type = types.listOf types.path; default = [ ]; - description = '' + description = lib.mdDoc '' Any additional rules files to include in this configuration. ''; }; @@ -1685,7 +1682,7 @@ in scrapeConfigs = mkOption { type = types.listOf promTypes.scrape_config; default = [ ]; - description = '' + description = lib.mdDoc '' A list of scrape configurations. ''; }; @@ -1704,16 +1701,16 @@ in } ] ''; default = [ ]; - description = '' + description = lib.mdDoc '' A list of alertmanagers to send alerts to. - See the official documentation for more information. + See [the official documentation](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#alertmanager_config) for more information. ''; }; alertmanagerNotificationQueueCapacity = mkOption { type = types.int; default = 10000; - description = '' + description = lib.mdDoc '' The capacity of the queue for pending alert manager notifications. ''; }; @@ -1722,7 +1719,7 @@ in type = types.nullOr types.str; default = null; example = "https://example.com/"; - description = '' + description = lib.mdDoc '' The URL under which Prometheus is externally reachable (for example, if Prometheus is served via a reverse proxy). ''; @@ -1750,7 +1747,7 @@ in type = types.nullOr types.str; default = null; example = "15d"; - description = '' + description = lib.mdDoc '' How long to retain samples in storage. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix index 092ac6fea7..4e7aae0b34 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/dovecot.nix @@ -33,10 +33,10 @@ in work with this exporter: { - = true; - = "/var/run/dovecot2/old-stats"; - = [ "old_stats" ]; - = ''' + = true; + = "/var/run/dovecot2/old-stats"; + = [ "old_stats" ]; + = ''' service old-stats { unix_listener old-stats { user = dovecot-exporter diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix index 956bd96aa4..a60f47f639 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/mail.nix @@ -5,6 +5,8 @@ with lib; let cfg = config.services.prometheus.exporters.mail; + configFile = if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile); + configurationFile = pkgs.writeText "prometheus-mail-exporter.conf" (builtins.toJSON ( # removes the _module attribute, null values and converts attrNames to lowercase mapAttrs' (name: value: @@ -137,6 +139,13 @@ in { port = 9225; extraOpts = { + environmentFile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + File containing env-vars to be substituted into the exporter's config. + ''; + }; configFile = mkOption { type = types.nullOr types.path; default = null; @@ -162,13 +171,19 @@ in serviceOpts = { serviceConfig = { DynamicUser = false; + EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + RuntimeDirectory = "prometheus-mail-exporter"; + ExecStartPre = [ + "${pkgs.writeShellScript "subst-secrets-mail-exporter" '' + umask 0077 + ${pkgs.envsubst}/bin/envsubst -i ${configFile} -o ''${RUNTIME_DIRECTORY}/mail-exporter.json + ''}" + ]; ExecStart = '' ${pkgs.prometheus-mail-exporter}/bin/mailexporter \ --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ --web.telemetry-path ${cfg.telemetryPath} \ - --config.file ${ - if cfg.configuration != null then configurationFile else (escapeShellArg cfg.configFile) - } \ + --config.file ''${RUNTIME_DIRECTORY}/mail-exporter.json \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix index 1e9c402fb5..666116991b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/process.nix @@ -22,7 +22,7 @@ in All settings expressed as an Nix attrset. Check the official documentation for the corresponding YAML - settings that can all be used here: + settings that can all be used here: ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix index a805a0ad33..2a43fbcab3 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/script.nix @@ -41,7 +41,7 @@ in All settings expressed as an Nix attrset. Check the official documentation for the corresponding YAML - settings that can all be used here: + settings that can all be used here: ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix index 01b9937624..ac7a2300f6 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/pushgateway.nix @@ -27,7 +27,7 @@ in { type = types.package; default = pkgs.prometheus-pushgateway; defaultText = literalExpression "pkgs.prometheus-pushgateway"; - description = '' + description = lib.mdDoc '' Package that should be used for the prometheus pushgateway. ''; }; @@ -35,27 +35,27 @@ in { web.listen-address = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Address to listen on for the web interface, API and telemetry. - null will default to :9091. + `null` will default to `:9091`. ''; }; web.telemetry-path = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Path under which to expose metrics. - null will default to /metrics. + `null` will default to `/metrics`. ''; }; web.external-url = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The URL under which Pushgateway is externally reachable. ''; }; @@ -63,11 +63,11 @@ in { web.route-prefix = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Prefix for the internal routes of web endpoints. Defaults to the path of - . + {option}`services.prometheus.pushgateway.web.external-url`. ''; }; @@ -75,20 +75,20 @@ in { type = types.nullOr types.str; default = null; example = "10m"; - description = '' + description = lib.mdDoc '' The minimum interval at which to write out the persistence file. - null will default to 5m. + `null` will default to `5m`. ''; }; log.level = mkOption { type = types.nullOr (types.enum ["debug" "info" "warn" "error" "fatal"]); default = null; - description = '' + description = lib.mdDoc '' Only log messages with the given severity or above. - null will default to info. + `null` will default to `info`. ''; }; @@ -96,17 +96,17 @@ in { type = types.nullOr types.str; default = null; example = "logger:syslog?appname=bob&local=7"; - description = '' + description = lib.mdDoc '' Set the log target and format. - null will default to logger:stderr. + `null` will default to `logger:stderr`. ''; }; extraFlags = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Extra commandline options when launching the Pushgateway. ''; }; @@ -114,26 +114,26 @@ in { persistMetrics = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to persist metrics to a file. When enabled metrics will be saved to a file called - metrics in the directory - /var/lib/pushgateway. The directory below - /var/lib can be set using - . + `metrics` in the directory + `/var/lib/pushgateway`. The directory below + `/var/lib` can be set using + {option}`services.prometheus.pushgateway.stateDir`. ''; }; stateDir = mkOption { type = types.str; default = "pushgateway"; - description = '' - Directory below /var/lib to store metrics. + description = lib.mdDoc '' + Directory below `/var/lib` to store metrics. This directory will be created automatically using systemd's StateDirectory mechanism when - + {option}`services.prometheus.pushgateway.persistMetrics` is enabled. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix index 980c93c9c4..1d7da7ced3 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/xmpp-alerts.nix @@ -21,9 +21,9 @@ in type = settingsFormat.type; default = {}; - description = '' + description = lib.mdDoc '' Configuration for prometheus xmpp-alerts, see - + for supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/riemann-dash.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/riemann-dash.nix index 16eb830085..1ca8af14e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/riemann-dash.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/riemann-dash.nix @@ -26,20 +26,20 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the riemann-dash dashboard daemon. ''; }; config = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' Contents added to the end of the riemann-dash configuration file. ''; }; dataDir = mkOption { type = types.str; default = "/var/riemann-dash"; - description = '' + description = lib.mdDoc '' Location of the riemann-base dir. The dashboard configuration file is is stored to this directory. The directory is created automatically on service start, and owner is set to the riemanndash user. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/riemann-tools.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/riemann-tools.nix index 86a11694e7..b5cd79c743 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/riemann-tools.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/riemann-tools.nix @@ -23,14 +23,14 @@ in { enableHealth = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the riemann-health daemon. ''; }; riemannHost = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Address of the host riemann node. Defaults to localhost. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/riemann.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/riemann.nix index 13d2b1cc06..8d61ec2a30 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/riemann.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/riemann.nix @@ -30,13 +30,13 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the Riemann network monitoring daemon. ''; }; config = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' Contents of the Riemann configuration file. For more complicated config you should use configFile. ''; @@ -44,17 +44,17 @@ in { configFiles = mkOption { type = with types; listOf path; default = []; - description = '' + description = lib.mdDoc '' Extra files containing Riemann configuration. These files will be loaded at runtime by Riemann (with Clojure's - load-file function) at the end of the + `load-file` function) at the end of the configuration if you use the config option, this is ignored if you use configFile. ''; }; configFile = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' A Riemann config file. Any files in the same directory as this file will be added to the classpath by Riemann. ''; @@ -62,14 +62,14 @@ in { extraClasspathEntries = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Extra entries added to the Java classpath when running Riemann. ''; }; extraJavaOpts = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Extra Java options used when launching Riemann. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix index 6a6fe110f9..48be309c95 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/scollector.nix @@ -35,7 +35,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run scollector. ''; }; @@ -44,7 +44,7 @@ in { type = types.package; default = pkgs.scollector; defaultText = literalExpression "pkgs.scollector"; - description = '' + description = lib.mdDoc '' scollector binary to use. ''; }; @@ -52,7 +52,7 @@ in { user = mkOption { type = types.str; default = "scollector"; - description = '' + description = lib.mdDoc '' User account under which scollector runs. ''; }; @@ -60,7 +60,7 @@ in { group = mkOption { type = types.str; default = "scollector"; - description = '' + description = lib.mdDoc '' Group account under which scollector runs. ''; }; @@ -68,7 +68,7 @@ in { bosunHost = mkOption { type = types.str; default = "localhost:8070"; - description = '' + description = lib.mdDoc '' Host and port of the bosun server that will store the collected data. ''; @@ -78,7 +78,7 @@ in { type = with types; attrsOf (listOf path); default = {}; example = literalExpression ''{ "0" = [ "''${postgresStats}/bin/collect-stats" ]; }''; - description = '' + description = lib.mdDoc '' An attribute set mapping the frequency of collection to a list of binaries that should be executed at that frequency. You can use "0" to run a binary forever. @@ -89,7 +89,7 @@ in { type = with types; listOf str; default = []; example = [ "-d" ]; - description = '' + description = lib.mdDoc '' Extra scollector command line options ''; }; @@ -97,7 +97,7 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra scollector configuration added to the end of scollector.toml ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix index 6d39cc3e4e..83791631d2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/smartd.nix @@ -72,14 +72,14 @@ let device = mkOption { example = "/dev/sda"; type = types.str; - description = "Location of the device."; + description = lib.mdDoc "Location of the device."; }; options = mkOption { default = ""; example = "-d sat"; type = types.separatedString " "; - description = "Options that determine how smartd monitors the device."; + description = lib.mdDoc "Options that determine how smartd monitors the device."; }; }; @@ -100,12 +100,12 @@ in autodetect = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whenever smartd should monitor all devices connected to the machine at the time it's being started (the default). Set to false to monitor the devices listed in - only. + {option}`services.smartd.devices` only. ''; }; @@ -113,11 +113,11 @@ in default = []; type = types.listOf types.str; example = ["-A /var/log/smartd/" "--interval=3600"]; - description = '' - Extra command-line options passed to the smartd + description = lib.mdDoc '' + Extra command-line options passed to the `smartd` daemon on startup. - (See man 8 smartd.) + (See `man 8 smartd`.) ''; }; @@ -128,7 +128,7 @@ in default = config.services.mail.sendmailSetuidWrapper != null; defaultText = literalExpression "config.services.mail.sendmailSetuidWrapper != null"; type = types.bool; - description = "Whenever to send e-mail notifications."; + description = lib.mdDoc "Whenever to send e-mail notifications."; }; sender = mkOption { @@ -144,17 +144,17 @@ in recipient = mkOption { default = "root"; type = types.str; - description = "Recipient of the notification messages."; + description = lib.mdDoc "Recipient of the notification messages."; }; mailer = mkOption { default = "/run/wrappers/bin/sendmail"; type = types.path; - description = '' + description = lib.mdDoc '' Sendmail-compatible binary to be used to send the messages. You should probably enable - or some other MTA for + {option}`services.postfix` or some other MTA for this to work. ''; }; @@ -164,7 +164,7 @@ in enable = mkOption { default = true; type = types.bool; - description = "Whenever to send wall notifications to all users."; + description = lib.mdDoc "Whenever to send wall notifications to all users."; }; }; @@ -173,21 +173,21 @@ in default = config.services.xserver.enable; defaultText = literalExpression "config.services.xserver.enable"; type = types.bool; - description = "Whenever to send X11 xmessage notifications."; + description = lib.mdDoc "Whenever to send X11 xmessage notifications."; }; display = mkOption { default = ":${toString config.services.xserver.display}"; defaultText = literalExpression ''":''${toString config.services.xserver.display}"''; type = types.str; - description = "DISPLAY to send X11 notifications to."; + description = lib.mdDoc "DISPLAY to send X11 notifications to."; }; }; test = mkOption { default = false; type = types.bool; - description = "Whenever to send a test notification on startup."; + description = lib.mdDoc "Whenever to send a test notification on startup."; }; }; @@ -197,12 +197,12 @@ in default = "-a"; type = types.separatedString " "; example = "-a -o on -s (S/../.././02|L/../../7/04)"; - description = '' + description = lib.mdDoc '' Common default options for explicitly monitored (listed in - ) devices. + {option}`services.smartd.devices`) devices. The default value turns on monitoring of all the things (see - man 5 smartd.conf). + `man 5 smartd.conf`). The example also turns on SMART Automatic Offline Testing on startup, and schedules short self-tests daily, and long @@ -214,8 +214,8 @@ in default = cfg.defaults.monitored; defaultText = literalExpression "config.${opt.defaults.monitored}"; type = types.separatedString " "; - description = '' - Like , but for the + description = lib.mdDoc '' + Like {option}`services.smartd.defaults.monitored`, but for the autodetected devices. ''; }; @@ -225,7 +225,7 @@ in default = []; example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ]; type = with types; listOf (submodule smartdDeviceOpts); - description = "List of devices to monitor."; + description = lib.mdDoc "List of devices to monitor."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/statsd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/statsd.nix index 30b2916a99..d109e08262 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/statsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/statsd.nix @@ -59,31 +59,31 @@ in enable = mkEnableOption "statsd"; listenAddress = mkOption { - description = "Address that statsd listens on over UDP"; + description = lib.mdDoc "Address that statsd listens on over UDP"; default = "127.0.0.1"; type = types.str; }; port = mkOption { - description = "Port that stats listens for messages on over UDP"; + description = lib.mdDoc "Port that stats listens for messages on over UDP"; default = 8125; type = types.int; }; mgmt_address = mkOption { - description = "Address to run management TCP interface on"; + description = lib.mdDoc "Address to run management TCP interface on"; default = "127.0.0.1"; type = types.str; }; mgmt_port = mkOption { - description = "Port to run the management TCP interface on"; + description = lib.mdDoc "Port to run the management TCP interface on"; default = 8126; type = types.int; }; backends = mkOption { - description = "List of backends statsd will use for data persistence"; + description = lib.mdDoc "List of backends statsd will use for data persistence"; default = []; example = [ "graphite" @@ -97,19 +97,19 @@ in }; graphiteHost = mkOption { - description = "Hostname or IP of Graphite server"; + description = lib.mdDoc "Hostname or IP of Graphite server"; default = null; type = types.nullOr types.str; }; graphitePort = mkOption { - description = "Port of Graphite server (i.e. carbon-cache)."; + description = lib.mdDoc "Port of Graphite server (i.e. carbon-cache)."; default = null; type = types.nullOr types.int; }; extraConfig = mkOption { - description = "Extra configuration options for statsd"; + description = lib.mdDoc "Extra configuration options for statsd"; default = ""; type = types.nullOr types.str; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/sysstat.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/sysstat.nix index ca2cff8272..f8621f08bb 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/sysstat.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/sysstat.nix @@ -10,7 +10,7 @@ in { collect-frequency = mkOption { type = types.str; default = "*:00/10"; - description = '' + description = lib.mdDoc '' OnCalendar specification for sysstat-collect ''; }; @@ -18,7 +18,7 @@ in { collect-args = mkOption { type = types.str; default = "1 1"; - description = '' + description = lib.mdDoc '' Arguments to pass sa1 when collecting statistics ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix index 13aae58d0f..d228b5cc2d 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix @@ -16,7 +16,7 @@ in { package = mkOption { default = pkgs.telegraf; defaultText = literalExpression "pkgs.telegraf"; - description = "Which telegraf derivation to use"; + description = lib.mdDoc "Which telegraf derivation to use"; type = types.package; }; @@ -24,17 +24,17 @@ in { type = types.listOf types.path; default = []; example = [ "/run/keys/telegraf.env" ]; - description = '' + description = lib.mdDoc '' File to load as environment file. Environment variables from this file will be interpolated into the config file using envsubst with this - syntax: $ENVIRONMENT or ''${VARIABLE}. + syntax: `$ENVIRONMENT` or `''${VARIABLE}`. This is useful to avoid putting secrets into the nix store. ''; }; extraConfig = mkOption { default = {}; - description = "Extra configuration options for telegraf"; + description = lib.mdDoc "Extra configuration options for telegraf"; type = settingsFormat.type; example = { outputs.influxdb = { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix index 9e93d8dbb0..c7404241fb 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/thanos.nix @@ -86,11 +86,11 @@ let defaultText = literalDocBook '' calculated from config.services.thanos.${cmd} ''; - description = '' - Arguments to the thanos ${cmd} command. + description = lib.mdDoc '' + Arguments to the `thanos ${cmd}` command. Defaults to a list of arguments formed by converting the structured - options of to a list of arguments. + options of {option}`services.thanos.${cmd}` to a list of arguments. Overriding this option will cause none of the structured options to have any effect. So only set this if you know what you're doing! @@ -127,10 +127,10 @@ let if config.services.thanos..tracing.config == null then null else toString (toYAML "tracing.yaml" config.services.thanos..tracing.config); ''; - description = '' + description = lib.mdDoc '' Path to YAML file that contains tracing configuration. - See format details: + See format details: ''; }; }; @@ -192,10 +192,10 @@ let if config.services.thanos..objstore.config == null then null else toString (toYAML "objstore.yaml" config.services.thanos..objstore.config); ''; - description = '' + description = lib.mdDoc '' Path to YAML file that contains object store configuration. - See format details: + See format details: ''; }; }; @@ -231,7 +231,7 @@ let type = types.str; default = "/var/lib/${config.services.prometheus.stateDir}/data"; defaultText = literalExpression ''"/var/lib/''${config.services.prometheus.stateDir}/data"''; - description = '' + description = lib.mdDoc '' Data directory of TSDB. ''; }; @@ -660,7 +660,7 @@ in { type = types.package; default = pkgs.thanos; defaultText = literalExpression "pkgs.thanos"; - description = '' + description = lib.mdDoc '' The thanos package that should be used. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix index de80282559..ffe24c0ef0 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/tuptime.nix @@ -16,13 +16,13 @@ in { enable = mkOption { type = types.bool; default = true; - description = "Whether to regularly log uptime to detect bad shutdowns."; + description = lib.mdDoc "Whether to regularly log uptime to detect bad shutdowns."; }; period = mkOption { type = types.str; default = "*:0/5"; - description = "systemd calendar event"; + description = lib.mdDoc "systemd calendar event"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix index cca4a0e720..a955bf4907 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/unifi-poller.nix @@ -17,7 +17,7 @@ in { debug = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Turns on line numbers, microsecond logging, and a per-device log. This may be noisy if you have a lot of devices. It adds one line per device. ''; @@ -25,14 +25,14 @@ in { quiet = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Turns off per-interval logs. Only startup and error logs will be emitted. ''; }; plugins = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Load additional plugins. ''; }; @@ -42,21 +42,21 @@ in { disable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to disable the prometheus ouput plugin. ''; }; http_listen = mkOption { type = types.str; default = "[::]:9130"; - description = '' + description = lib.mdDoc '' Bind the prometheus exporter to this IP or hostname. ''; }; report_errors = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to report errors. ''; }; @@ -66,21 +66,21 @@ in { disable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to disable the influxdb ouput plugin. ''; }; url = mkOption { type = types.str; default = "http://127.0.0.1:8086"; - description = '' + description = lib.mdDoc '' URL of the influxdb host. ''; }; user = mkOption { type = types.str; default = "unifipoller"; - description = '' + description = lib.mdDoc '' Username for the influxdb. ''; }; @@ -88,7 +88,7 @@ in { type = types.path; default = pkgs.writeText "unifi-poller-influxdb-default.password" "unifipoller"; defaultText = literalExpression "unifi-poller-influxdb-default.password"; - description = '' + description = lib.mdDoc '' Path of a file containing the password for influxdb. This file needs to be readable by the unifi-poller user. ''; @@ -97,21 +97,21 @@ in { db = mkOption { type = types.str; default = "unifi"; - description = '' + description = lib.mdDoc '' Database name. Database should exist. ''; }; verify_ssl = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Verify the influxdb's certificate. ''; }; interval = mkOption { type = types.str; default = "30s"; - description = '' + description = lib.mdDoc '' Setting this lower than the Unifi controller's refresh interval may lead to zeroes in your database. ''; @@ -122,14 +122,14 @@ in { url = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' URL of the Loki host. ''; }; user = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Username for Loki. ''; }; @@ -137,7 +137,7 @@ in { type = types.path; default = pkgs.writeText "unifi-poller-loki-default.password" ""; defaultText = "unifi-poller-influxdb-default.password"; - description = '' + description = lib.mdDoc '' Path of a file containing the password for Loki. This file needs to be readable by the unifi-poller user. ''; @@ -146,28 +146,28 @@ in { verify_ssl = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Verify Loki's certificate. ''; }; tenant_id = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Tenant ID to use in Loki. ''; }; interval = mkOption { type = types.str; default = "2m"; - description = '' + description = lib.mdDoc '' How often the events are polled and pushed to Loki. ''; }; timeout = mkOption { type = types.str; default = "10s"; - description = '' + description = lib.mdDoc '' Should be increased in case of timeout errors. ''; }; @@ -178,7 +178,7 @@ in { user = mkOption { type = types.str; default = "unifi"; - description = '' + description = lib.mdDoc '' Unifi service user name. ''; }; @@ -186,7 +186,7 @@ in { type = types.path; default = pkgs.writeText "unifi-poller-unifi-default.password" "unifi"; defaultText = literalExpression "unifi-poller-unifi-default.password"; - description = '' + description = lib.mdDoc '' Path of a file containing the password for the unifi service user. This file needs to be readable by the unifi-poller user. ''; @@ -195,14 +195,14 @@ in { url = mkOption { type = types.str; default = "https://unifi:8443"; - description = '' + description = lib.mdDoc '' URL of the Unifi controller. ''; }; sites = mkOption { type = with types; either (enum [ "default" "all" ]) (listOf str); default = "all"; - description = '' + description = lib.mdDoc '' List of site names for which statistics should be exported. Or the string "default" for the default site or the string "all" for all sites. ''; @@ -211,35 +211,35 @@ in { save_ids = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Collect and save data from the intrusion detection system to influxdb and Loki. ''; }; save_events = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Collect and save data from UniFi events to influxdb and Loki. ''; }; save_alarms = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Collect and save data from UniFi alarms to influxdb and Loki. ''; }; save_anomalies = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Collect and save data from UniFi anomalies to influxdb and Loki. ''; }; save_dpi = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Collect and save data from deep packet inspection. Adds around 150 data points and impacts performance. ''; @@ -247,14 +247,14 @@ in { save_sites = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Collect and save site data. ''; }; hash_pii = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Hash, with md5, client names and MAC addresses. This attempts to protect personally identifiable information. ''; @@ -262,7 +262,7 @@ in { verify_ssl = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Verify the Unifi controller's certificate. ''; }; @@ -272,7 +272,7 @@ in { dynamic = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Let prometheus select which controller to poll when scraping. Use with default credentials. See unifi-poller wiki for more. ''; @@ -283,7 +283,7 @@ in { controllers = mkOption { type = with types; listOf (submodule { options = controllerOptions; }); default = []; - description = '' + description = lib.mdDoc '' List of Unifi controllers to poll. Use defaults if empty. ''; apply = map (flip removeAttrs [ "_module" ]); diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix index ae5097c544..8af2c2a1f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/ups.nix @@ -16,7 +16,7 @@ let # /nix/store/nut/share/driver.list driver = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Specify the program to run to talk to this UPS. apcsmart, bestups, and sec are some examples. ''; @@ -24,7 +24,7 @@ let port = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The serial port to which your UPS is connected. /dev/ttyS0 is usually the first port on Linux boxes, for example. ''; @@ -33,7 +33,7 @@ let shutdownOrder = mkOption { default = 0; type = types.int; - description = '' + description = lib.mdDoc '' When you have multiple UPSes on your system, you usually need to turn them off in a certain order. upsdrvctl shuts down all the 0s, then the 1s, 2s, and so on. To exclude a UPS from the @@ -44,7 +44,7 @@ let maxStartDelay = mkOption { default = null; type = types.uniq (types.nullOr types.int); - description = '' + description = lib.mdDoc '' This can be set as a global variable above your first UPS definition and it can also be set in a UPS section. This value controls how long upsdrvctl will wait for the driver to finish @@ -56,7 +56,7 @@ let description = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Description of the UPS. ''; }; @@ -64,7 +64,7 @@ let directives = mkOption { default = []; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of configuration directives for this UPS. ''; }; @@ -72,7 +72,7 @@ let summary = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Lines which would be added inside ups.conf for handling this UPS. ''; }; @@ -106,7 +106,7 @@ in enable = mkOption { default = false; type = with types; bool; - description = '' + description = lib.mdDoc '' Enables support for Power Devices, such as Uninterruptible Power Supplies, Power Distribution Units and Solar Controllers. ''; @@ -143,7 +143,7 @@ in schedulerRules = mkOption { example = "/etc/nixos/upssched.conf"; type = types.str; - description = '' + description = lib.mdDoc '' File which contains the rules to handle UPS events. ''; }; @@ -152,7 +152,7 @@ in maxStartDelay = mkOption { default = 45; type = types.int; - description = '' + description = lib.mdDoc '' This can be set as a global variable above your first UPS definition and it can also be set in a UPS section. This value controls how long upsdrvctl will wait for the driver to finish @@ -164,7 +164,7 @@ in ups = mkOption { default = {}; # see nut/etc/ups.conf.sample - description = '' + description = lib.mdDoc '' This is where you configure all the UPSes that this system will be monitoring directly. These are usually attached to serial ports, but USB devices are also supported. diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/uptime.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/uptime.nix index 79b86be6cc..24ca7c3763 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/uptime.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/uptime.nix @@ -26,7 +26,7 @@ let in { options.services.uptime = { configFile = mkOption { - description = '' + description = lib.mdDoc '' The uptime configuration file If mongodb: server != localhost, please set usesRemoteMongo = true @@ -44,7 +44,7 @@ in { }; usesRemoteMongo = mkOption { - description = "Whether the configuration file specifies a remote mongo instance"; + description = lib.mdDoc "Whether the configuration file specifies a remote mongo instance"; default = false; @@ -59,7 +59,7 @@ in { }; nodeEnv = mkOption { - description = "The node environment to run in (development, production, etc.)"; + description = lib.mdDoc "The node environment to run in (development, production, etc.)"; type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix index c48b973f1e..f2a8adace6 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-agent.nix @@ -35,7 +35,7 @@ in type = types.package; default = pkgs.zabbix.agent; defaultText = literalExpression "pkgs.zabbix.agent"; - description = "The Zabbix package to use."; + description = lib.mdDoc "The Zabbix package to use."; }; extraPackages = mkOption { @@ -51,7 +51,7 @@ in modules = mkOption { type = types.attrsOf types.package; - description = "A set of modules to load."; + description = lib.mdDoc "A set of modules to load."; default = {}; example = literalExpression '' { @@ -71,7 +71,7 @@ in server = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The IP address or hostname of the Zabbix server to connect to. ''; }; @@ -80,7 +80,7 @@ in ip = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' List of comma delimited IP addresses that the agent should listen on. ''; }; @@ -88,7 +88,7 @@ in port = mkOption { type = types.port; default = 10050; - description = '' + description = lib.mdDoc '' Agent will listen on this port for connections from the server. ''; }; @@ -97,7 +97,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for the Zabbix Agent. ''; }; @@ -105,9 +105,9 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ int str (listOf str) ]); default = {}; - description = '' + description = lib.mdDoc '' Zabbix Agent configuration. Refer to - + for details on supported values. ''; example = { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix index 0ebd7bcff8..9cfe1bdaa2 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-proxy.nix @@ -42,7 +42,7 @@ in server = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The IP address or hostname of the Zabbix server to connect to. ''; }; @@ -54,7 +54,7 @@ in else if cfg.database.type == "pgsql" then pkgs.zabbix.proxy-pgsql else pkgs.zabbix.proxy-sqlite; defaultText = literalExpression "pkgs.zabbix.proxy-pgsql"; - description = "The Zabbix package to use."; + description = lib.mdDoc "The Zabbix package to use."; }; extraPackages = mkOption { @@ -69,7 +69,7 @@ in modules = mkOption { type = types.attrsOf types.package; - description = "A set of modules to load."; + description = lib.mdDoc "A set of modules to load."; default = {}; example = literalExpression '' { @@ -92,13 +92,13 @@ in type = types.enum [ "mysql" "pgsql" "sqlite" ]; example = "mysql"; default = "pgsql"; - description = "Database engine to use."; + description = lib.mdDoc "Database engine to use."; }; host = mkOption { type = types.str; default = "localhost"; - description = "Database host address."; + description = lib.mdDoc "Database host address."; }; port = mkOption { @@ -109,29 +109,29 @@ in then config.${options.services.mysql.port} else config.${options.services.postgresql.port} ''; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = mkOption { type = types.str; default = if cfg.database.type == "sqlite" then "${stateDir}/zabbix.db" else "zabbix"; defaultText = literalExpression "zabbix"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = mkOption { type = types.str; default = "zabbix"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; example = "/run/keys/zabbix-dbpassword"; - description = '' + description = lib.mdDoc '' A file containing the password corresponding to - . + {option}`database.user`. ''; }; @@ -139,13 +139,13 @@ in type = types.nullOr types.path; default = null; example = "/run/postgresql"; - description = "Path to the unix socket file to use for authentication."; + description = lib.mdDoc "Path to the unix socket file to use for authentication."; }; createLocally = mkOption { type = types.bool; default = true; - description = "Whether to create a local database automatically."; + description = lib.mdDoc "Whether to create a local database automatically."; }; }; @@ -153,7 +153,7 @@ in ip = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' List of comma delimited IP addresses that the trapper should listen on. Trapper will listen on all network interfaces if this parameter is missing. ''; @@ -162,7 +162,7 @@ in port = mkOption { type = types.port; default = 10051; - description = '' + description = lib.mdDoc '' Listen port for trapper. ''; }; @@ -171,7 +171,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for the Zabbix Proxy. ''; }; @@ -179,9 +179,9 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ int str (listOf str) ]); default = {}; - description = '' + description = lib.mdDoc '' Zabbix Proxy configuration. Refer to - + for details on supported values. ''; example = { diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix index 9f960517a8..566ec4ab2f 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/zabbix-server.nix @@ -46,7 +46,7 @@ in type = types.package; default = if cfg.database.type == "mysql" then pkgs.zabbix.server-mysql else pkgs.zabbix.server-pgsql; defaultText = literalExpression "pkgs.zabbix.server-pgsql"; - description = "The Zabbix package to use."; + description = lib.mdDoc "The Zabbix package to use."; }; extraPackages = mkOption { @@ -61,7 +61,7 @@ in modules = mkOption { type = types.attrsOf types.package; - description = "A set of modules to load."; + description = lib.mdDoc "A set of modules to load."; default = {}; example = literalExpression '' { @@ -84,13 +84,13 @@ in type = types.enum [ "mysql" "pgsql" ]; example = "mysql"; default = "pgsql"; - description = "Database engine to use."; + description = lib.mdDoc "Database engine to use."; }; host = mkOption { type = types.str; default = "localhost"; - description = "Database host address."; + description = lib.mdDoc "Database host address."; }; port = mkOption { @@ -101,28 +101,28 @@ in then config.${options.services.mysql.port} else config.${options.services.postgresql.port} ''; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = mkOption { type = types.str; default = "zabbix"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = mkOption { type = types.str; default = "zabbix"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; example = "/run/keys/zabbix-dbpassword"; - description = '' + description = lib.mdDoc '' A file containing the password corresponding to - . + {option}`database.user`. ''; }; @@ -130,13 +130,13 @@ in type = types.nullOr types.path; default = null; example = "/run/postgresql"; - description = "Path to the unix socket file to use for authentication."; + description = lib.mdDoc "Path to the unix socket file to use for authentication."; }; createLocally = mkOption { type = types.bool; default = true; - description = "Whether to create a local database automatically."; + description = lib.mdDoc "Whether to create a local database automatically."; }; }; @@ -144,7 +144,7 @@ in ip = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' List of comma delimited IP addresses that the trapper should listen on. Trapper will listen on all network interfaces if this parameter is missing. ''; @@ -153,7 +153,7 @@ in port = mkOption { type = types.port; default = 10051; - description = '' + description = lib.mdDoc '' Listen port for trapper. ''; }; @@ -162,7 +162,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for the Zabbix Server. ''; }; @@ -170,9 +170,9 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ int str (listOf str) ]); default = {}; - description = '' + description = lib.mdDoc '' Zabbix Server configuration. Refer to - + for details on supported values. ''; example = { diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix index 229c966541..da5a79a062 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/cachefilesd.nix @@ -20,20 +20,20 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable cachefilesd network filesystems caching daemon."; + description = lib.mdDoc "Whether to enable cachefilesd network filesystems caching daemon."; }; cacheDir = mkOption { type = types.str; default = "/var/cache/fscache"; - description = "Directory to contain filesystem cache."; + description = lib.mdDoc "Directory to contain filesystem cache."; }; extraConfig = mkOption { type = types.lines; default = ""; example = "brun 10%"; - description = "Additional configuration file entries. See cachefilesd.conf(5) for more information."; + description = lib.mdDoc "Additional configuration file entries. See cachefilesd.conf(5) for more information."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix index 7a1444deca..2437aba86e 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ceph.nix @@ -80,7 +80,7 @@ in example = '' 433a2193-4f8a-47a0-95d2-209d7ca2cca5 ''; - description = '' + description = lib.mdDoc '' Filesystem ID, a generated uuid, its must be generated and set before attempting to start a cluster ''; @@ -89,7 +89,7 @@ in clusterName = mkOption { type = types.str; default = "ceph"; - description = '' + description = lib.mdDoc '' Name of cluster ''; }; @@ -98,7 +98,7 @@ in type = types.path; default = "${pkgs.ceph.lib}/lib/ceph/mgr"; defaultText = literalExpression ''"''${pkgs.ceph.lib}/lib/ceph/mgr"''; - description = '' + description = lib.mdDoc '' Path at which to find ceph-mgr modules. ''; }; @@ -109,7 +109,7 @@ in example = '' node0, node1, node2 ''; - description = '' + description = lib.mdDoc '' List of hosts that will be used as monitors at startup. ''; }; @@ -120,7 +120,7 @@ in example = '' 10.10.0.1, 10.10.0.2, 10.10.0.3 ''; - description = '' + description = lib.mdDoc '' List of hostname shortnames/IP addresses of the initial monitors. ''; }; @@ -128,7 +128,7 @@ in maxOpenFiles = mkOption { type = types.int; default = 131072; - description = '' + description = lib.mdDoc '' Max open files for each OSD daemon. ''; }; @@ -136,7 +136,7 @@ in authClusterRequired = mkOption { type = types.enum [ "cephx" "none" ]; default = "cephx"; - description = '' + description = lib.mdDoc '' Enables requiring daemons to authenticate with eachother in the cluster. ''; }; @@ -144,7 +144,7 @@ in authServiceRequired = mkOption { type = types.enum [ "cephx" "none" ]; default = "cephx"; - description = '' + description = lib.mdDoc '' Enables requiring clients to authenticate with the cluster to access services in the cluster (e.g. radosgw, mds or osd). ''; }; @@ -152,7 +152,7 @@ in authClientRequired = mkOption { type = types.enum [ "cephx" "none" ]; default = "cephx"; - description = '' + description = lib.mdDoc '' Enables requiring the cluster to authenticate itself to the client. ''; }; @@ -163,7 +163,7 @@ in example = '' 10.20.0.0/24, 192.168.1.0/24 ''; - description = '' + description = lib.mdDoc '' A comma-separated list of subnets that will be used as public networks in the cluster. ''; }; @@ -174,7 +174,7 @@ in example = '' 10.10.0.0/24, 192.168.0.0/24 ''; - description = '' + description = lib.mdDoc '' A comma-separated list of subnets that will be used as cluster networks in the cluster. ''; }; @@ -183,7 +183,7 @@ in type = with types; nullOr path; default = "${pkgs.mailcap}/etc/mime.types"; defaultText = literalExpression ''"''${pkgs.mailcap}/etc/mime.types"''; - description = '' + description = lib.mdDoc '' Path to mime types used by radosgw. ''; }; @@ -195,7 +195,7 @@ in example = { "ms bind ipv6" = "true"; }; - description = '' + description = lib.mdDoc '' Extra configuration to add to the global section. Use for setting values that are common for all daemons in the cluster. ''; }; @@ -206,7 +206,7 @@ in type = with types; listOf str; default = []; example = [ "name1" "name2" ]; - description = '' + description = lib.mdDoc '' A list of names for manager daemons that should have a service created. The names correspond to the id part in ceph i.e. [ "name1" ] would result in mgr.name1 ''; @@ -214,7 +214,7 @@ in extraConfig = mkOption { type = with types; attrsOf str; default = {}; - description = '' + description = lib.mdDoc '' Extra configuration to add to the global section for manager daemons. ''; }; @@ -226,7 +226,7 @@ in type = with types; listOf str; default = []; example = [ "name1" "name2" ]; - description = '' + description = lib.mdDoc '' A list of monitor daemons that should have a service created. The names correspond to the id part in ceph i.e. [ "name1" ] would result in mon.name1 ''; @@ -234,7 +234,7 @@ in extraConfig = mkOption { type = with types; attrsOf str; default = {}; - description = '' + description = lib.mdDoc '' Extra configuration to add to the monitor section. ''; }; @@ -246,7 +246,7 @@ in type = with types; listOf str; default = []; example = [ "name1" "name2" ]; - description = '' + description = lib.mdDoc '' A list of OSD daemons that should have a service created. The names correspond to the id part in ceph i.e. [ "name1" ] would result in osd.name1 ''; @@ -262,7 +262,7 @@ in "osd pool default pgp num" = "200"; "osd crush chooseleaf type" = "1"; }; - description = '' + description = lib.mdDoc '' Extra configuration to add to the OSD section. ''; }; @@ -274,7 +274,7 @@ in type = with types; listOf str; default = []; example = [ "name1" "name2" ]; - description = '' + description = lib.mdDoc '' A list of metadata service daemons that should have a service created. The names correspond to the id part in ceph i.e. [ "name1" ] would result in mds.name1 ''; @@ -282,7 +282,7 @@ in extraConfig = mkOption { type = with types; attrsOf str; default = {}; - description = '' + description = lib.mdDoc '' Extra configuration to add to the MDS section. ''; }; @@ -294,7 +294,7 @@ in type = with types; listOf str; default = []; example = [ "name1" "name2" ]; - description = '' + description = lib.mdDoc '' A list of rados gateway daemons that should have a service created. The names correspond to the id part in ceph i.e. [ "name1" ] would result in client.name1, radosgw daemons aren't daemons to cluster in the sense that OSD, MGR or MON daemons are. They are simply @@ -315,7 +315,7 @@ in "client.radosgw.node0" = { "some config option" = "true"; }; }; ''; - description = '' + description = lib.mdDoc '' Extra configuration to add to the client section. Configuration for rados gateways would be added here, with their own sections, see example. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/davfs2.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/davfs2.nix index 8cf314fe63..8024cfba08 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/davfs2.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/davfs2.nix @@ -15,7 +15,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable davfs2. ''; }; @@ -23,7 +23,7 @@ in davUser = mkOption { type = types.str; default = "davfs2"; - description = '' + description = lib.mdDoc '' When invoked by root the mount.davfs daemon will run as this user. Value must be given as name, not as numerical id. ''; @@ -32,7 +32,7 @@ in davGroup = mkOption { type = types.str; default = "davfs2"; - description = '' + description = lib.mdDoc '' The group of the running mount.davfs daemon. Ordinary users must be member of this group in order to mount a davfs2 file system. Value must be given as name, not as numerical id. @@ -47,7 +47,7 @@ in proxy foo.bar:8080 use_locks 0 ''; - description = '' + description = lib.mdDoc '' Extra lines appended to the configuration of davfs2. '' ; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/diod.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/diod.nix index 063bae6ddb..541b4ffd6b 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/diod.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/diod.nix @@ -26,13 +26,13 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the diod 9P file server."; + description = lib.mdDoc "Whether to enable the diod 9P file server."; }; listen = mkOption { type = types.listOf types.str; default = [ "0.0.0.0:564" ]; - description = '' + description = lib.mdDoc '' [ "IP:PORT" [,"IP:PORT",...] ] List the interfaces and ports that diod should listen on. ''; @@ -41,7 +41,7 @@ in exports = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' List the file systems that clients will be allowed to mount. All paths should be fully qualified. The exports table can include two types of element: a string element (as above), @@ -57,7 +57,7 @@ in exportall = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Export all file systems listed in /proc/mounts. If new file systems are mounted after diod has started, they will become immediately mountable. If there is a duplicate entry for a file system in the exports list, any options listed in @@ -68,7 +68,7 @@ in exportopts = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Establish a default set of export options. These are overridden, not appended to, by opts attributes in an "exports" entry. ''; @@ -77,7 +77,7 @@ in nwthreads = mkOption { type = types.int; default = 16; - description = '' + description = lib.mdDoc '' Sets the (fixed) number of worker threads created to handle 9P requests for a unique aname. ''; @@ -86,7 +86,7 @@ in authRequired = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allow clients to connect without authentication, i.e. without a valid MUNGE credential. ''; }; @@ -94,7 +94,7 @@ in userdb = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This option disables password/group lookups. It allows any uid to attach and assumes gid=uid, and supplementary groups contain only the primary gid. ''; @@ -103,7 +103,7 @@ in allsquash = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Remap all users to "nobody". The attaching user need not be present in the password file. ''; @@ -112,7 +112,7 @@ in squashuser = mkOption { type = types.str; default = "nobody"; - description = '' + description = lib.mdDoc '' Change the squash user. The squash user must be present in the password file. ''; }; @@ -120,7 +120,7 @@ in logdest = mkOption { type = types.str; default = "syslog:daemon:err"; - description = '' + description = lib.mdDoc '' Set the destination for logging. The value has the form of "syslog:facility:level" or "filename". ''; @@ -130,7 +130,7 @@ in statfsPassthru = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This option configures statfs to return the host file system's type rather than V9FS_MAGIC. ''; @@ -139,7 +139,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra configuration options for diod.conf."; + description = lib.mdDoc "Extra configuration options for diod.conf."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/drbd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/drbd.nix index c730e0b34e..e74ed391d4 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/drbd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/drbd.nix @@ -15,7 +15,7 @@ let cfg = config.services.drbd; in services.drbd.enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable support for DRBD, the Distributed Replicated Block Device. ''; @@ -24,8 +24,8 @@ let cfg = config.services.drbd; in services.drbd.config = mkOption { default = ""; type = types.lines; - description = '' - Contents of the drbd.conf configuration file. + description = lib.mdDoc '' + Contents of the {file}`drbd.conf` configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/glusterfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/glusterfs.nix index 38be098de5..99aa26feb6 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/glusterfs.nix @@ -37,13 +37,13 @@ in logLevel = mkOption { type = types.enum ["DEBUG" "INFO" "WARNING" "ERROR" "CRITICAL" "TRACE" "NONE"]; - description = "Log level used by the GlusterFS daemon"; + description = lib.mdDoc "Log level used by the GlusterFS daemon"; default = "INFO"; }; useRpcbind = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Enable use of rpcbind. This is required for Gluster's NFS functionality. You may want to turn it off to reduce the attack surface for DDoS reflection attacks. @@ -56,13 +56,13 @@ in enableGlustereventsd = mkOption { type = types.bool; - description = "Whether to enable the GlusterFS Events Daemon"; + description = lib.mdDoc "Whether to enable the GlusterFS Events Daemon"; default = true; }; killMode = mkOption { type = types.enum ["control-group" "process" "mixed" "none"]; - description = '' + description = lib.mdDoc '' The systemd KillMode to use for glusterd. glusterd spawns other daemons like gsyncd. @@ -79,7 +79,7 @@ in stopKillTimeout = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The systemd TimeoutStopSec to use. After this time after having been asked to shut down, glusterd @@ -94,17 +94,17 @@ in extraFlags = mkOption { type = types.listOf types.str; - description = "Extra flags passed to the GlusterFS daemon"; + description = lib.mdDoc "Extra flags passed to the GlusterFS daemon"; default = []; }; tlsSettings = mkOption { - description = '' + description = lib.mdDoc '' Make the server communicate via TLS. This means it will only connect to other gluster servers having certificates signed by the same CA. - Enabling this will create a file /var/lib/glusterd/secure-access. + Enabling this will create a file {file}`/var/lib/glusterd/secure-access`. Disabling will delete this file again. See also: https://gluster.readthedocs.io/en/latest/Administrator%20Guide/SSL/ @@ -114,17 +114,17 @@ in options = { tlsKeyPath = mkOption { type = types.str; - description = "Path to the private key used for TLS."; + description = lib.mdDoc "Path to the private key used for TLS."; }; tlsPem = mkOption { type = types.path; - description = "Path to the certificate used for TLS."; + description = lib.mdDoc "Path to the certificate used for TLS."; }; caCert = mkOption { type = types.path; - description = "Path certificate authority used to sign the cluster certificates."; + description = lib.mdDoc "Path certificate authority used to sign the cluster certificates."; }; }; }); @@ -159,9 +159,10 @@ in install -m 0755 -d /var/log/glusterfs '' # The copying of hooks is due to upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761 + # Excludes one hook due to missing SELinux binaries. + '' mkdir -p /var/lib/glusterd/hooks/ - ${rsync}/bin/rsync -a ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/ + ${rsync}/bin/rsync -a --exclude="S10selinux-label-brick.sh" ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/ ${tlsCmd} '' diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix index b7e6a787cf..af4b725bf2 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix @@ -58,19 +58,19 @@ in type = types.package; default = pkgs.ipfs; defaultText = literalExpression "pkgs.ipfs"; - description = "Which IPFS package to use."; + description = lib.mdDoc "Which IPFS package to use."; }; user = mkOption { type = types.str; default = "ipfs"; - description = "User under which the IPFS daemon runs"; + description = lib.mdDoc "User under which the IPFS daemon runs"; }; group = mkOption { type = types.str; default = "ipfs"; - description = "Group under which the IPFS daemon runs"; + description = lib.mdDoc "Group under which the IPFS daemon runs"; }; dataDir = mkOption { @@ -84,49 +84,49 @@ in then "/var/lib/ipfs" else "/var/lib/ipfs/.ipfs" ''; - description = "The data dir for IPFS"; + description = lib.mdDoc "The data dir for IPFS"; }; defaultMode = mkOption { type = types.enum [ "online" "offline" "norouting" ]; default = "online"; - description = "systemd service that is enabled by default"; + description = lib.mdDoc "systemd service that is enabled by default"; }; autoMount = mkOption { type = types.bool; default = false; - description = "Whether IPFS should try to mount /ipfs and /ipns at startup."; + description = lib.mdDoc "Whether IPFS should try to mount /ipfs and /ipns at startup."; }; autoMigrate = mkOption { type = types.bool; default = true; - description = "Whether IPFS should try to run the fs-repo-migration at startup."; + description = lib.mdDoc "Whether IPFS should try to run the fs-repo-migration at startup."; }; ipfsMountDir = mkOption { type = types.str; default = "/ipfs"; - description = "Where to mount the IPFS namespace to"; + description = lib.mdDoc "Where to mount the IPFS namespace to"; }; ipnsMountDir = mkOption { type = types.str; default = "/ipns"; - description = "Where to mount the IPNS namespace to"; + description = lib.mdDoc "Where to mount the IPNS namespace to"; }; gatewayAddress = mkOption { type = types.str; default = "/ip4/127.0.0.1/tcp/8080"; - description = "Where the IPFS Gateway can be reached"; + description = lib.mdDoc "Where the IPFS Gateway can be reached"; }; apiAddress = mkOption { type = types.str; default = "/ip4/127.0.0.1/tcp/5001"; - description = "Where IPFS exposes its API to"; + description = lib.mdDoc "Where IPFS exposes its API to"; }; swarmAddress = mkOption { @@ -137,25 +137,25 @@ in "/ip4/0.0.0.0/udp/4001/quic" "/ip6/::/udp/4001/quic" ]; - description = "Where IPFS listens for incoming p2p connections"; + description = lib.mdDoc "Where IPFS listens for incoming p2p connections"; }; enableGC = mkOption { type = types.bool; default = false; - description = "Whether to enable automatic garbage collection"; + description = lib.mdDoc "Whether to enable automatic garbage collection"; }; emptyRepo = mkOption { type = types.bool; default = false; - description = "If set to true, the repo won't be initialized with help files"; + description = lib.mdDoc "If set to true, the repo won't be initialized with help files"; }; extraConfig = mkOption { type = types.attrs; - description = '' - Attrset of daemon configuration to set using ipfs config, every time the daemon starts. + description = lib.mdDoc '' + Attrset of daemon configuration to set using {command}`ipfs config`, every time the daemon starts. These are applied last, so may override configuration set by other options in this module. Keep in mind that this configuration is stateful; i.e., unsetting anything in here does not reset the value to the default! ''; @@ -174,13 +174,13 @@ in extraFlags = mkOption { type = types.listOf types.str; - description = "Extra flags passed to the IPFS daemon"; + description = lib.mdDoc "Extra flags passed to the IPFS daemon"; default = [ ]; }; localDiscovery = mkOption { type = types.bool; - description = ''Whether to enable local discovery for the ipfs daemon. + description = lib.mdDoc ''Whether to enable local discovery for the ipfs daemon. This will allow ipfs to scan ports on your local network. Some hosting services will ban you if you do this. ''; default = false; @@ -189,14 +189,14 @@ in serviceFdlimit = mkOption { type = types.nullOr types.int; default = null; - description = "The fdlimit for the IPFS systemd unit or null to have the daemon attempt to manage it"; + description = lib.mdDoc "The fdlimit for the IPFS systemd unit or `null` to have the daemon attempt to manage it"; example = 64 * 1024; }; startWhenNeeded = mkOption { type = types.bool; default = false; - description = "Whether to use socket activation to start IPFS when needed."; + description = lib.mdDoc "Whether to use socket activation to start IPFS when needed."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/kbfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/kbfs.nix index a43ac656f6..33ff283d5e 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/kbfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/kbfs.nix @@ -15,15 +15,15 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to mount the Keybase filesystem."; + description = lib.mdDoc "Whether to mount the Keybase filesystem."; }; enableRedirector = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the Keybase root redirector service, allowing - any user to access KBFS files via /keybase, + any user to access KBFS files via `/keybase`, which will show different contents depending on the requester. ''; }; @@ -32,7 +32,7 @@ in { type = types.str; default = "%h/keybase"; example = "/keybase"; - description = "Mountpoint for the Keybase filesystem."; + description = lib.mdDoc "Mountpoint for the Keybase filesystem."; }; extraFlags = mkOption { @@ -42,7 +42,7 @@ in { "-label kbfs" "-mount-type normal" ]; - description = '' + description = lib.mdDoc '' Additional flags to pass to the Keybase filesystem on launch. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix index 51eb920d77..25744b9196 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/litestream/default.nix @@ -11,15 +11,15 @@ in enable = mkEnableOption "litestream"; package = mkOption { - description = "Package to use."; + description = lib.mdDoc "Package to use."; default = pkgs.litestream; defaultText = literalExpression "pkgs.litestream"; type = types.package; }; settings = mkOption { - description = '' - See the documentation. + description = lib.mdDoc '' + See the [documentation](https://litestream.io/reference/config/). ''; type = settingsFormat.type; example = { diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/moosefs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/moosefs.nix index 88b2ada37e..6ad4b37761 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/moosefs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/moosefs.nix @@ -75,14 +75,14 @@ in { masterHost = mkOption { type = types.str; default = null; - description = "IP or DNS name of master host."; + description = lib.mdDoc "IP or DNS name of master host."; }; runAsUser = mkOption { type = types.bool; default = true; example = true; - description = "Run daemons as user moosefs instead of root."; + description = lib.mdDoc "Run daemons as user moosefs instead of root."; }; client.enable = mkEnableOption "Moosefs client."; @@ -90,11 +90,11 @@ in { master = { enable = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Enable Moosefs master daemon. - You need to run mfsmaster-init on a freshly installed master server to - initialize the DATA_PATH direcory. + You need to run `mfsmaster-init` on a freshly installed master server to + initialize the `DATA_PATH` direcory. ''; default = false; }; @@ -102,7 +102,7 @@ in { exports = mkOption { type = with types; listOf str; default = null; - description = "Paths to export (see mfsexports.cfg)."; + description = lib.mdDoc "Paths to export (see mfsexports.cfg)."; example = [ "* / rw,alldirs,admin,maproot=0:0" "* . rw" @@ -111,7 +111,7 @@ in { openFirewall = mkOption { type = types.bool; - description = "Whether to automatically open the necessary ports in the firewall."; + description = lib.mdDoc "Whether to automatically open the necessary ports in the firewall."; default = false; }; @@ -122,11 +122,11 @@ in { options.DATA_PATH = mkOption { type = types.str; default = "/var/lib/mfs"; - description = "Data storage directory."; + description = lib.mdDoc "Data storage directory."; }; }; - description = "Contents of config file (mfsmaster.cfg)."; + description = lib.mdDoc "Contents of config file (mfsmaster.cfg)."; }; }; @@ -140,11 +140,11 @@ in { options.DATA_PATH = mkOption { type = types.str; default = "/var/lib/mfs"; - description = "Data storage directory"; + description = lib.mdDoc "Data storage directory"; }; }; - description = "Contents of metalogger config file (mfsmetalogger.cfg)."; + description = lib.mdDoc "Contents of metalogger config file (mfsmetalogger.cfg)."; }; }; @@ -153,14 +153,14 @@ in { openFirewall = mkOption { type = types.bool; - description = "Whether to automatically open the necessary ports in the firewall."; + description = lib.mdDoc "Whether to automatically open the necessary ports in the firewall."; default = false; }; hdds = mkOption { type = with types; listOf str; default = null; - description = "Mount points to be used by chunkserver for storage (see mfshdd.cfg)."; + description = lib.mdDoc "Mount points to be used by chunkserver for storage (see mfshdd.cfg)."; example = [ "/mnt/hdd1" ]; }; @@ -171,11 +171,11 @@ in { options.DATA_PATH = mkOption { type = types.str; default = "/var/lib/mfs"; - description = "Directory for lock file."; + description = lib.mdDoc "Directory for lock file."; }; }; - description = "Contents of chunkserver config file (mfschunkserver.cfg)."; + description = lib.mdDoc "Contents of chunkserver config file (mfschunkserver.cfg)."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix index 06a36eb30c..e870056e1d 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/netatalk.nix @@ -15,7 +15,7 @@ in { port = mkOption { type = types.port; default = 548; - description = "TCP port to be used for AFP."; + description = lib.mdDoc "TCP port to be used for AFP."; }; settings = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/nfsd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/nfsd.nix index 1b62bfa820..22c7c8790c 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/nfsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/nfsd.nix @@ -26,7 +26,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the kernel's NFS server. ''; }; @@ -34,7 +34,7 @@ in extraNfsdConfig = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration options for the [nfsd] section of /etc/nfs.conf. ''; }; @@ -63,7 +63,7 @@ in nproc = mkOption { type = types.int; default = 8; - description = '' + description = lib.mdDoc '' Number of NFS server threads. Defaults to the recommended value of 8. ''; }; @@ -71,14 +71,14 @@ in createMountPoints = mkOption { type = types.bool; default = false; - description = "Whether to create the mount points in the exports file at startup time."; + description = lib.mdDoc "Whether to create the mount points in the exports file at startup time."; }; mountdPort = mkOption { type = types.nullOr types.int; default = null; example = 4002; - description = '' + description = lib.mdDoc '' Use fixed port for rpc.mountd, useful if server is behind firewall. ''; }; @@ -87,9 +87,9 @@ in type = types.nullOr types.int; default = null; example = 4001; - description = '' + description = lib.mdDoc '' Use a fixed port for the NFS lock manager kernel module - (lockd/nlockmgr). This is useful if the + (`lockd/nlockmgr`). This is useful if the NFS server is behind a firewall. ''; }; @@ -98,8 +98,8 @@ in type = types.nullOr types.int; default = null; example = 4000; - description = '' - Use a fixed port for rpc.statd. This is + description = lib.mdDoc '' + Use a fixed port for {command}`rpc.statd`. This is useful if the NFS server is behind a firewall. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/client.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/client.nix index 36ea5af216..26cc0e169a 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/client.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/client.nix @@ -15,13 +15,13 @@ in { extraOptions = mkOption { type = with types; listOf str; default = []; - description = "Extra command line options for pvfs2-client."; + description = lib.mdDoc "Extra command line options for pvfs2-client."; }; fileSystems = mkOption { - description = '' + description = lib.mdDoc '' The orangefs file systems to be mounted. - This option is prefered over using directly since + This option is prefered over using {option}`fileSystems` directly since the pvfs client service needs to be running for it to be mounted. ''; @@ -36,19 +36,19 @@ in { mountPoint = mkOption { type = types.str; default = "/orangefs"; - description = "Mount point."; + description = lib.mdDoc "Mount point."; }; options = mkOption { type = with types; listOf str; default = []; - description = "Mount options"; + description = lib.mdDoc "Mount options"; }; target = mkOption { type = types.str; example = "tcp://server:3334/orangefs"; - description = "Target URL"; + description = lib.mdDoc "Target URL"; }; }; })); diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix index 621c2fe8f7..3bc3325e18 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/orangefs/server.nix @@ -79,40 +79,40 @@ in { logType = mkOption { type = with types; enum [ "file" "syslog" ]; default = "syslog"; - description = "Destination for log messages."; + description = lib.mdDoc "Destination for log messages."; }; dataStorageSpace = mkOption { type = types.nullOr types.str; default = null; example = "/data/storage"; - description = "Directory for data storage."; + description = lib.mdDoc "Directory for data storage."; }; metadataStorageSpace = mkOption { type = types.nullOr types.str; default = null; example = "/data/meta"; - description = "Directory for meta data storage."; + description = lib.mdDoc "Directory for meta data storage."; }; BMIModules = mkOption { type = with types; listOf str; default = [ "bmi_tcp" ]; example = [ "bmi_tcp" "bmi_ib"]; - description = "List of BMI modules to load."; + description = lib.mdDoc "List of BMI modules to load."; }; extraDefaults = mkOption { type = types.lines; default = ""; - description = "Extra config for <Defaults> section."; + description = lib.mdDoc "Extra config for `` section."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra config for the global section."; + description = lib.mdDoc "Extra config for the global section."; }; servers = mkOption { @@ -122,12 +122,12 @@ in { node1 = "tcp://node1:3334"; node2 = "tcp://node2:3334"; }; - description = "URLs for storage server including port. The attribute names define the server alias."; + description = lib.mdDoc "URLs for storage server including port. The attribute names define the server alias."; }; fileSystems = mkOption { - description = '' - These options will create the <FileSystem> sections of config file. + description = lib.mdDoc '' + These options will create the `` sections of config file. ''; default = { orangefs = {}; }; example = literalExpression '' @@ -146,37 +146,37 @@ in { id = mkOption { type = types.int; default = 1; - description = "File system ID (must be unique within configuration)."; + description = lib.mdDoc "File system ID (must be unique within configuration)."; }; rootHandle = mkOption { type = types.int; default = 3; - description = "File system root ID."; + description = lib.mdDoc "File system root ID."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra config for <FileSystem> section."; + description = lib.mdDoc "Extra config for `` section."; }; troveSyncMeta = mkOption { type = types.bool; default = true; - description = "Sync meta data."; + description = lib.mdDoc "Sync meta data."; }; troveSyncData = mkOption { type = types.bool; default = false; - description = "Sync data."; + description = lib.mdDoc "Sync data."; }; extraStorageHints = mkOption { type = types.lines; default = ""; - description = "Extra config for <StorageHints> section."; + description = lib.mdDoc "Extra config for `` section."; }; }; })); diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix index e72f9b54cd..ab24ebfee2 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/rsyncd.nix @@ -15,7 +15,7 @@ in { port = mkOption { default = 873; type = types.port; - description = "TCP port the daemon will listen on."; + description = lib.mdDoc "TCP port the daemon will listen on."; }; settings = mkOption { @@ -50,7 +50,7 @@ in { default = false; type = types.bool; description = - "If enabled Rsync will be socket-activated rather than run persistently."; + lib.mdDoc "If enabled Rsync will be socket-activated rather than run persistently."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix index 800ef448d3..38980593e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba-wsdd.nix @@ -23,46 +23,46 @@ in { type = types.nullOr types.str; default = null; example = "eth0"; - description = "Interface or address to use."; + description = lib.mdDoc "Interface or address to use."; }; hoplimit = mkOption { type = types.nullOr types.int; default = null; example = 2; - description = "Hop limit for multicast packets (default = 1)."; + description = lib.mdDoc "Hop limit for multicast packets (default = 1)."; }; workgroup = mkOption { type = types.nullOr types.str; default = null; example = "HOME"; - description = "Set workgroup name (default WORKGROUP)."; + description = lib.mdDoc "Set workgroup name (default WORKGROUP)."; }; hostname = mkOption { type = types.nullOr types.str; default = null; example = "FILESERVER"; - description = "Override (NetBIOS) hostname to be used (default hostname)."; + description = lib.mdDoc "Override (NetBIOS) hostname to be used (default hostname)."; }; domain = mkOption { type = types.nullOr types.str; default = null; - description = "Set domain name (disables workgroup)."; + description = lib.mdDoc "Set domain name (disables workgroup)."; }; discovery = mkOption { type = types.bool; default = false; - description = "Enable discovery operation mode."; + description = lib.mdDoc "Enable discovery operation mode."; }; listen = mkOption { type = types.str; default = "/run/wsdd/wsdd.sock"; - description = "Listen on path or localhost port in discovery mode."; + description = lib.mdDoc "Listen on path or localhost port in discovery mode."; }; extraOptions = mkOption { type = types.listOf types.str; default = [ "--shortlog" ]; example = [ "--verbose" "--no-http" "--ipv4only" "--no-host" ]; - description = "Additional wsdd options."; + description = lib.mdDoc "Additional wsdd options."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix index 992f948e8c..7a07b04385 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/samba.nix @@ -96,7 +96,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to automatically open the necessary ports in the firewall. ''; }; @@ -104,7 +104,7 @@ in enableNmbd = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable Samba's nmbd, which replies to NetBIOS over IP name service requests. It also participates in the browsing protocols which make up the Windows "Network Neighborhood" view. @@ -114,7 +114,7 @@ in enableWinbindd = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable Samba's winbindd, which provides a number of services to the Name Service Switch capability found in most modern C libraries, to arbitrary applications via PAM and ntlm_auth and to Samba itself. @@ -126,7 +126,7 @@ in default = pkgs.samba; defaultText = literalExpression "pkgs.samba"; example = literalExpression "pkgs.samba4Full"; - description = '' + description = lib.mdDoc '' Defines which package should be used for the samba server. ''; }; @@ -134,7 +134,7 @@ in invalidUsers = mkOption { type = types.listOf types.str; default = [ "root" ]; - description = '' + description = lib.mdDoc '' List of users who are denied to login via Samba. ''; }; @@ -142,7 +142,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Additional global section and extra section lines go in here. ''; example = '' @@ -154,7 +154,7 @@ in configText = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Verbatim contents of smb.conf. If null (default), use the autogenerated file from NixOS instead. ''; @@ -163,13 +163,13 @@ in securityType = mkOption { type = types.str; default = "user"; - description = "Samba security type"; + description = lib.mdDoc "Samba security type"; }; nsswins = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable the WINS NSS (Name Service Switch) plug-in. Enabling it allows applications to resolve WINS/NetBIOS names (a.k.a. Windows machine names) by transparently querying the winbindd daemon. @@ -178,9 +178,9 @@ in shares = mkOption { default = {}; - description = '' + description = lib.mdDoc '' A set describing shared resources. - See man smb.conf for options. + See {command}`man smb.conf` for options. ''; type = types.attrsOf (types.attrsOf types.unspecified); example = literalExpression '' diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/tahoe.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/tahoe.nix index 5426463dff..a816b5757f 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/tahoe.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/tahoe.nix @@ -12,21 +12,21 @@ in options = { nickname = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The nickname of this Tahoe introducer. ''; }; tub.port = mkOption { default = 3458; type = types.int; - description = '' + description = lib.mdDoc '' The port on which the introducer will listen. ''; }; tub.location = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The external location that the introducer should listen on. If specified, the port should be included. @@ -36,13 +36,13 @@ in default = pkgs.tahoelafs; defaultText = literalExpression "pkgs.tahoelafs"; type = types.package; - description = '' + description = lib.mdDoc '' The package to use for the Tahoe LAFS daemon. ''; }; }; }); - description = '' + description = lib.mdDoc '' The Tahoe introducers. ''; }; @@ -52,14 +52,14 @@ in options = { nickname = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The nickname of this Tahoe node. ''; }; tub.port = mkOption { default = 3457; type = types.int; - description = '' + description = lib.mdDoc '' The port on which the tub will listen. This is the correct setting to tweak if you want Tahoe's storage @@ -69,7 +69,7 @@ in tub.location = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The external location that the node should listen on. This is the setting to tweak if there are multiple interfaces @@ -81,7 +81,7 @@ in web.port = mkOption { default = 3456; type = types.int; - description = '' + description = lib.mdDoc '' The port on which the Web server will listen. This is the correct setting to tweak if you want Tahoe's WUI to @@ -91,7 +91,7 @@ in client.introducer = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The furl for a Tahoe introducer node. Like all furls, keep this safe and don't share it. @@ -100,7 +100,7 @@ in client.helper = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The furl for a Tahoe helper node. Like all furls, keep this safe and don't share it. @@ -109,14 +109,14 @@ in client.shares.needed = mkOption { default = 3; type = types.int; - description = '' + description = lib.mdDoc '' The number of shares required to reconstitute a file. ''; }; client.shares.happy = mkOption { default = 7; type = types.int; - description = '' + description = lib.mdDoc '' The number of distinct storage nodes required to store a file. ''; @@ -124,7 +124,7 @@ in client.shares.total = mkOption { default = 10; type = types.int; - description = '' + description = lib.mdDoc '' The number of shares required to store a file. ''; }; @@ -132,7 +132,7 @@ in storage.reservedSpace = mkOption { default = "1G"; type = types.str; - description = '' + description = lib.mdDoc '' The amount of filesystem space to not use for storage. ''; }; @@ -141,7 +141,7 @@ in sftpd.port = mkOption { default = null; type = types.nullOr types.int; - description = '' + description = lib.mdDoc '' The port on which the SFTP server will listen. This is the correct setting to tweak if you want Tahoe's SFTP @@ -151,28 +151,28 @@ in sftpd.hostPublicKeyFile = mkOption { default = null; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Path to the SSH host public key. ''; }; sftpd.hostPrivateKeyFile = mkOption { default = null; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Path to the SSH host private key. ''; }; sftpd.accounts.file = mkOption { default = null; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Path to the accounts file. ''; }; sftpd.accounts.url = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' URL of the accounts server. ''; }; @@ -180,13 +180,13 @@ in default = pkgs.tahoelafs; defaultText = literalExpression "pkgs.tahoelafs"; type = types.package; - description = '' + description = lib.mdDoc '' The package to use for the Tahoe LAFS daemon. ''; }; }; }); - description = '' + description = lib.mdDoc '' The Tahoe nodes. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/u9fs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/u9fs.nix index 77961b78ca..d6968b2cb8 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/u9fs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/u9fs.nix @@ -14,16 +14,16 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to run the u9fs 9P server for Unix."; + description = lib.mdDoc "Whether to run the u9fs 9P server for Unix."; }; listenStreams = mkOption { type = types.listOf types.str; default = [ "564" ]; example = [ "192.168.16.1:564" ]; - description = '' + description = lib.mdDoc '' Sockets to listen for clients on. - See man 5 systemd.socket for socket syntax. + See {command}`man 5 systemd.socket` for socket syntax. ''; }; @@ -31,7 +31,7 @@ in type = types.str; default = "nobody"; description = - "User to run u9fs under."; + lib.mdDoc "User to run u9fs under."; }; extraArgs = mkOption { @@ -39,9 +39,9 @@ in default = ""; example = "-a none"; description = - '' + lib.mdDoc '' Extra arguments to pass on invocation, - see man 4 u9fs + see {command}`man 4 u9fs` ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/webdav-server-rs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/webdav-server-rs.nix index 1c5c299cb6..bd07b8d438 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/webdav-server-rs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/webdav-server-rs.nix @@ -19,22 +19,22 @@ in user = mkOption { type = types.str; default = "webdav"; - description = "User to run under when setuid is not enabled."; + description = lib.mdDoc "User to run under when setuid is not enabled."; }; group = mkOption { type = types.str; default = "webdav"; - description = "Group to run under when setuid is not enabled."; + description = lib.mdDoc "Group to run under when setuid is not enabled."; }; settings = mkOption { type = format.type; default = { }; - description = '' + description = lib.mdDoc '' Attrset that is converted and passed as config file. Available options can be found at - here. + [here](https://github.com/miquels/webdav-server-rs/blob/master/webdav-server.toml). ''; example = literalExpression '' { @@ -73,7 +73,7 @@ in type = types.path; default = format.generate "webdav-server.toml" settings; defaultText = "Config file generated from services.webdav-server-rs.settings"; - description = '' + description = lib.mdDoc '' Path to config file. If this option is set, it will override any configuration done in services.webdav-server-rs.settings. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/webdav.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/webdav.nix index a810af40fd..5628fd1e6c 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/webdav.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/webdav.nix @@ -13,27 +13,27 @@ in user = mkOption { type = types.str; default = "webdav"; - description = "User account under which WebDAV runs."; + description = lib.mdDoc "User account under which WebDAV runs."; }; group = mkOption { type = types.str; default = "webdav"; - description = "Group under which WebDAV runs."; + description = lib.mdDoc "Group under which WebDAV runs."; }; settings = mkOption { type = format.type; default = { }; - description = '' + description = lib.mdDoc '' Attrset that is converted and passed as config file. Available options can be found at - here. + [here](https://github.com/hacdias/webdav). This program supports reading username and password configuration from environment variables, so it's strongly recommended to store username and password in a separate - EnvironmentFile. + [EnvironmentFile](https://www.freedesktop.org/software/systemd/man/systemd.exec.html#EnvironmentFile=). This prevents adding secrets to the world-readable Nix store. ''; example = literalExpression '' @@ -57,7 +57,7 @@ in type = types.path; default = format.generate "webdav.yaml" cfg.settings; defaultText = "Config file generated from services.webdav.settings"; - description = '' + description = lib.mdDoc '' Path to config file. If this option is set, it will override any configuration done in options.services.webdav.settings. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix index fc07231157..7b476fc7ac 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -94,7 +94,7 @@ in homeDir = mkOption { type = types.path; default = "/var/lib/xtreemfs"; - description = '' + description = lib.mdDoc '' XtreemFS home dir for the xtreemfs user. ''; }; @@ -103,7 +103,7 @@ in enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable XtreemFS DIR service. ''; }; @@ -120,7 +120,7 @@ in port = mkOption { default = 32638; type = types.port; - description = '' + description = lib.mdDoc '' The port to listen on for incoming connections (TCP). ''; }; @@ -128,7 +128,7 @@ in type = types.str; example = "127.0.0.1"; default = ""; - description = '' + description = lib.mdDoc '' If specified, it defines the interface to listen on. If not specified, the service will listen on all interfaces (any). ''; @@ -136,7 +136,7 @@ in httpPort = mkOption { default = 30638; type = types.port; - description = '' + description = lib.mdDoc '' Specifies the listen port for the HTTP service that returns the status page. ''; @@ -145,7 +145,7 @@ in type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "FSYNC" ]; default = "FSYNC"; example = "FDATASYNC"; - description = '' + description = lib.mdDoc '' The sync mode influences how operations are committed to the disk log before the operation is acknowledged to the caller. @@ -173,7 +173,7 @@ in ssl.trusted_certs.pw = jks_passphrase ssl.trusted_certs.container = jks ''; - description = '' + description = lib.mdDoc '' Configuration of XtreemFS DIR service. WARNING: configuration is saved as plaintext inside nix store. For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html @@ -215,7 +215,7 @@ in babudb.ssl.authenticationWithoutEncryption = false ''; - description = '' + description = lib.mdDoc '' Configuration of XtreemFS DIR replication plugin. WARNING: configuration is saved as plaintext inside nix store. For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html @@ -228,7 +228,7 @@ in enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable XtreemFS MRC service. ''; }; @@ -245,7 +245,7 @@ in port = mkOption { default = 32636; type = types.port; - description = '' + description = lib.mdDoc '' The port to listen on for incoming connections (TCP). ''; }; @@ -253,7 +253,7 @@ in example = "127.0.0.1"; type = types.str; default = ""; - description = '' + description = lib.mdDoc '' If specified, it defines the interface to listen on. If not specified, the service will listen on all interfaces (any). ''; @@ -261,7 +261,7 @@ in httpPort = mkOption { default = 30636; type = types.port; - description = '' + description = lib.mdDoc '' Specifies the listen port for the HTTP service that returns the status page. ''; @@ -270,7 +270,7 @@ in default = "FSYNC"; type = types.enum [ "ASYNC" "SYNC_WRITE_METADATA" "SYNC_WRITE" "FDATASYNC" "FSYNC" ]; example = "FDATASYNC"; - description = '' + description = lib.mdDoc '' The sync mode influences how operations are committed to the disk log before the operation is acknowledged to the caller. @@ -316,7 +316,7 @@ in ssl.trusted_certs.pw = jks_passphrase ssl.trusted_certs.container = jks ''; - description = '' + description = lib.mdDoc '' Configuration of XtreemFS MRC service. WARNING: configuration is saved as plaintext inside nix store. For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html @@ -358,7 +358,7 @@ in babudb.ssl.authenticationWithoutEncryption = false ''; - description = '' + description = lib.mdDoc '' Configuration of XtreemFS MRC replication plugin. WARNING: configuration is saved as plaintext inside nix store. For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html @@ -371,7 +371,7 @@ in enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable XtreemFS OSD service. ''; }; @@ -388,7 +388,7 @@ in port = mkOption { default = 32640; type = types.port; - description = '' + description = lib.mdDoc '' The port to listen on for incoming connections (TCP and UDP). ''; }; @@ -396,7 +396,7 @@ in example = "127.0.0.1"; type = types.str; default = ""; - description = '' + description = lib.mdDoc '' If specified, it defines the interface to listen on. If not specified, the service will listen on all interfaces (any). ''; @@ -404,7 +404,7 @@ in httpPort = mkOption { default = 30640; type = types.port; - description = '' + description = lib.mdDoc '' Specifies the listen port for the HTTP service that returns the status page. ''; @@ -435,7 +435,7 @@ in ssl.trusted_certs.pw = jks_passphrase ssl.trusted_certs.container = jks ''; - description = '' + description = lib.mdDoc '' Configuration of XtreemFS OSD service. WARNING: configuration is saved as plaintext inside nix store. For more options: http://www.xtreemfs.org/xtfs-guide-1.5.1/index.html diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/yandex-disk.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/yandex-disk.nix index a5b1f9d4ab..94f806a617 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -31,7 +31,7 @@ in username = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Your yandex.com login name. ''; }; @@ -39,7 +39,7 @@ in password = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Your yandex.com password. Warning: it will be world-readable in /nix/store. ''; }; @@ -47,7 +47,7 @@ in user = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The user the yandex-disk daemon should run as. ''; }; @@ -55,14 +55,14 @@ in directory = mkOption { type = types.path; default = "/home/Yandex.Disk"; - description = "The directory to use for Yandex.Disk storage"; + description = lib.mdDoc "The directory to use for Yandex.Disk storage"; }; excludes = mkOption { default = ""; type = types.commas; example = "data,backup"; - description = '' + description = lib.mdDoc '' Comma-separated list of directories which are excluded from synchronization. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix index 326a8671fc..9fc1dac7c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/3proxy.nix @@ -10,7 +10,7 @@ in { confFile = mkOption { type = types.path; example = "/var/lib/3proxy/3proxy.conf"; - description = '' + description = lib.mdDoc '' Ignore all other 3proxy options and load configuration from this file. ''; }; @@ -90,7 +90,7 @@ in { type = types.str; default = "[::]"; example = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Address used for service. ''; }; @@ -98,7 +98,7 @@ in { type = types.nullOr types.int; default = null; example = 3128; - description = '' + description = lib.mdDoc '' Override default port used for service. ''; }; @@ -106,7 +106,7 @@ in { type = types.int; default = 100; example = 1000; - description = '' + description = lib.mdDoc '' Maximum number of simulationeous connections to this service. ''; }; @@ -171,7 +171,7 @@ in { type = types.listOf types.str; default = [ ]; example = [ "user1" "user2" "user3" ]; - description = '' + description = lib.mdDoc '' List of users, use empty list for any. ''; }; @@ -179,7 +179,7 @@ in { type = types.listOf types.str; default = [ ]; example = [ "127.0.0.1" "192.168.1.0/24" ]; - description = '' + description = lib.mdDoc '' List of source IP range, use empty list for any. ''; }; @@ -198,7 +198,7 @@ in { type = types.listOf types.int; default = [ ]; example = [ 80 443 ]; - description = '' + description = lib.mdDoc '' List of target ports, use empty list for any. ''; }; @@ -220,7 +220,7 @@ in { } ] ''; - description = '' + description = lib.mdDoc '' Use this option to limit user access to resources. ''; }; @@ -228,17 +228,17 @@ in { type = types.nullOr types.str; default = null; example = "-46"; - description = '' + description = lib.mdDoc '' Extra arguments for service. - Consult "Options" section in documentation for available arguments. + Consult "Options" section in [documentation](https://github.com/z3APA3A/3proxy/wiki/3proxy.cfg) for available arguments. ''; }; extraConfig = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Extra configuration for service. Use this to configure things like bandwidth limiter or ACL-based redirection. - Consult documentation for available options. + Consult [documentation](https://github.com/z3APA3A/3proxy/wiki/3proxy.cfg) for available options. ''; }; }; @@ -266,14 +266,14 @@ in { } ] ''; - description = '' + description = lib.mdDoc '' Use this option to define 3proxy services. ''; }; denyPrivate = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to deny access to private IP ranges including loopback. ''; }; @@ -290,7 +290,7 @@ in { "::1" "fc00::/7" ]; - description = '' + description = lib.mdDoc '' What IP ranges to deny access when denyPrivate is set tu true. ''; }; @@ -301,7 +301,7 @@ in { type = types.listOf types.str; default = [ ]; example = [ "127.0.0.53" "192.168.1.3:5353/tcp" ]; - description = '' + description = lib.mdDoc '' List of nameservers to use. Up to 5 nservers may be specified. If no nserver is configured, @@ -311,12 +311,12 @@ in { nscache = mkOption { type = types.int; default = 65535; - description = "Set name cache size for IPv4."; + description = lib.mdDoc "Set name cache size for IPv4."; }; nscache6 = mkOption { type = types.int; default = 65535; - description = "Set name cache size for IPv6."; + description = lib.mdDoc "Set name cache size for IPv6."; }; nsrecord = mkOption { type = types.attrsOf types.str; @@ -327,21 +327,21 @@ in { "site.local" = "192.168.1.43"; } ''; - description = "Adds static nsrecords."; + description = lib.mdDoc "Adds static nsrecords."; }; }; }; default = { }; - description = '' + description = lib.mdDoc '' Use this option to configure name resolution and DNS caching. ''; }; extraConfig = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Extra configuration, appended to the 3proxy configuration file. - Consult documentation for available options. + Consult [documentation](https://github.com/z3APA3A/3proxy/wiki/3proxy.cfg) for available options. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix b/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix index 98ddf07160..13ef78c10c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/adguardhome.nix @@ -30,7 +30,7 @@ in { host = mkOption { default = "0.0.0.0"; type = str; - description = '' + description = lib.mdDoc '' Host address to bind HTTP server to. ''; }; @@ -38,7 +38,7 @@ in { port = mkOption { default = 3000; type = port; - description = '' + description = lib.mdDoc '' Port to serve HTTP pages on. ''; }; @@ -46,7 +46,7 @@ in { openFirewall = mkOption { default = false; type = bool; - description = '' + description = lib.mdDoc '' Open ports in the firewall for the AdGuard Home web interface. Does not open the port needed to access the DNS resolver. ''; @@ -55,7 +55,7 @@ in { mutableSettings = mkOption { default = true; type = bool; - description = '' + description = lib.mdDoc '' Allow changes made on the AdGuard Home web interface to persist between service restarts. ''; @@ -80,7 +80,7 @@ in { extraArgs = mkOption { default = [ ]; type = listOf str; - description = '' + description = lib.mdDoc '' Extra command line parameters to be passed to the adguardhome binary. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/amuled.nix b/third_party/nixpkgs/nixos/modules/services/networking/amuled.nix index aa72a04752..1cd5433581 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/amuled.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/amuled.nix @@ -19,7 +19,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time. ''; }; @@ -30,7 +30,7 @@ in defaultText = literalExpression '' "/home/''${config.${opt.user}}/" ''; - description = '' + description = lib.mdDoc '' The directory holding configuration, incoming and temporary files. ''; }; @@ -38,7 +38,7 @@ in user = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The user the AMule daemon should run as. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/antennas.nix b/third_party/nixpkgs/nixos/modules/services/networking/antennas.nix index ef98af22f2..e3bde2b67d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/antennas.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/antennas.nix @@ -13,25 +13,25 @@ in tvheadendUrl = mkOption { type = types.str; default = "http://localhost:9981"; - description = "URL of Tvheadend."; + description = lib.mdDoc "URL of Tvheadend."; }; antennasUrl = mkOption { type = types.str; default = "http://127.0.0.1:5004"; - description = "URL of Antennas."; + description = lib.mdDoc "URL of Antennas."; }; tunerCount = mkOption { type = types.int; default = 6; - description = "Numbers of tuners in tvheadend."; + description = lib.mdDoc "Numbers of tuners in tvheadend."; }; deviceUUID = mkOption { type = types.str; default = "2f70c0d7-90a3-4429-8275-cbeeee9cd605"; - description = "Device tuner UUID. Change this if you are running multiple instances."; + description = lib.mdDoc "Device tuner UUID. Change this if you are running multiple instances."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/aria2.nix b/third_party/nixpkgs/nixos/modules/services/networking/aria2.nix index 156fef1447..e848869cc0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/aria2.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/aria2.nix @@ -28,7 +28,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether or not to enable the headless Aria2 daemon service. Aria2 daemon can be controlled via the RPC interface using @@ -41,7 +41,7 @@ in openPorts = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open listen and RPC ports found in listenPortRange and rpcListenPort options in the firewall. ''; @@ -49,26 +49,26 @@ in downloadDir = mkOption { type = types.path; default = downloadDir; - description = '' + description = lib.mdDoc '' Directory to store downloaded files. ''; }; listenPortRange = mkOption { type = types.listOf types.attrs; default = [ { from = 6881; to = 6999; } ]; - description = '' + description = lib.mdDoc '' Set UDP listening port range used by DHT(IPv4, IPv6) and UDP tracker. ''; }; rpcListenPort = mkOption { type = types.int; default = 6800; - description = "Specify a port number for JSON-RPC/XML-RPC server to listen to. Possible Values: 1024-65535"; + description = lib.mdDoc "Specify a port number for JSON-RPC/XML-RPC server to listen to. Possible Values: 1024-65535"; }; rpcSecret = mkOption { type = types.str; default = "aria2rpc"; - description = '' + description = lib.mdDoc '' Set RPC secret authorization token. Read https://aria2.github.io/manual/en/html/aria2c.html#rpc-auth to know how this option value is used. ''; @@ -77,7 +77,7 @@ in type = types.separatedString " "; example = "--rpc-listen-all --remote-time=true"; default = ""; - description = '' + description = lib.mdDoc '' Additional arguments to be passed to Aria2. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix b/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix index 297d0b3b2d..5a1d03f072 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/asterisk.nix @@ -59,7 +59,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the Asterisk PBX server. ''; }; @@ -72,9 +72,9 @@ in verbose=3 debug=3 ''; - description = '' + description = lib.mdDoc '' Extra configuration options appended to the default - asterisk.conf file. + `asterisk.conf` file. ''; }; @@ -127,19 +127,19 @@ in '''; } ''; - description = '' + description = lib.mdDoc '' Sets the content of config files (typically ending with - .conf) in the Asterisk configuration directory. + `.conf`) in the Asterisk configuration directory. - Note that if you want to change asterisk.conf, it - is preferable to use the - option over this option. If "asterisk.conf" is - specified with the option (not recommended), - you must be prepared to set your own astetcdir + Note that if you want to change `asterisk.conf`, it + is preferable to use the {option}`services.asterisk.extraConfig` + option over this option. If `"asterisk.conf"` is + specified with the {option}`confFiles` option (not recommended), + you must be prepared to set your own `astetcdir` path. See - + for more examples of what is possible here. ''; }; @@ -148,9 +148,9 @@ in default = [ "ari.conf" "acl.conf" "agents.conf" "amd.conf" "calendar.conf" "cdr.conf" "cdr_syslog.conf" "cdr_custom.conf" "cel.conf" "cel_custom.conf" "cli_aliases.conf" "confbridge.conf" "dundi.conf" "features.conf" "hep.conf" "iax.conf" "pjsip.conf" "pjsip_wizard.conf" "phone.conf" "phoneprov.conf" "queues.conf" "res_config_sqlite3.conf" "res_parking.conf" "statsd.conf" "udptl.conf" "unistim.conf" ]; type = types.listOf types.str; example = [ "sip.conf" "dundi.conf" ]; - description = ''Sets these config files to the default content. The default value for + description = lib.mdDoc ''Sets these config files to the default content. The default value for this option contains all necesscary files to avoid errors at startup. - This does not override settings via . + This does not override settings via {option}`services.asterisk.confFiles`. ''; }; @@ -159,7 +159,7 @@ in type = types.listOf types.str; example = [ "-vvvddd" "-e" "1024" ]; - description = '' + description = lib.mdDoc '' Additional command line arguments to pass to Asterisk. ''; }; @@ -167,7 +167,7 @@ in type = types.package; default = pkgs.asterisk; defaultText = literalExpression "pkgs.asterisk"; - description = "The Asterisk package to use."; + description = lib.mdDoc "The Asterisk package to use."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/atftpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/atftpd.nix index da5e305201..e31b447e6c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/atftpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/atftpd.nix @@ -19,7 +19,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable the atftpd TFTP server. By default, the server binds to address 0.0.0.0. ''; @@ -33,7 +33,7 @@ in "--verbose=7" ] ''; - description = '' + description = lib.mdDoc '' Extra command line arguments to pass to atftp. ''; }; @@ -41,7 +41,7 @@ in root = mkOption { default = "/srv/tftp"; type = types.path; - description = '' + description = lib.mdDoc '' Document root directory for the atftpd. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/autossh.nix b/third_party/nixpkgs/nixos/modules/services/networking/autossh.nix index 245f2bfc2c..ed9c07d9a1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/autossh.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/autossh.nix @@ -22,18 +22,18 @@ in name = mkOption { type = types.str; example = "socks-peer"; - description = "Name of the local AutoSSH session"; + description = lib.mdDoc "Name of the local AutoSSH session"; }; user = mkOption { type = types.str; example = "bill"; - description = "Name of the user the AutoSSH session should run as"; + description = lib.mdDoc "Name of the user the AutoSSH session should run as"; }; monitoringPort = mkOption { type = types.int; default = 0; example = 20000; - description = '' + description = lib.mdDoc '' Port to be used by AutoSSH for peer monitoring. Note, that AutoSSH also uses mport+1. Value of 0 disables the keep-alive style monitoring @@ -42,7 +42,7 @@ in extraArguments = mkOption { type = types.separatedString " "; example = "-N -D4343 bill@socks.example.net"; - description = '' + description = lib.mdDoc '' Arguments to be passed to AutoSSH and retransmitted to SSH process. Some meaningful options include -N (don't run remote command), -D (open SOCKS proxy on local port), -R (forward @@ -54,7 +54,7 @@ in }); default = []; - description = '' + description = lib.mdDoc '' List of AutoSSH sessions to start as systemd services. Each service is named 'autossh-{session.name}'. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix index 50c4ffdedc..498e5a4767 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/avahi-daemon.nix @@ -43,7 +43,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run the Avahi daemon, which allows Avahi clients to use Avahi's service discovery facilities and also allows the local machine to advertise its presence and services @@ -55,16 +55,16 @@ in type = types.str; default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; - description = '' + description = lib.mdDoc '' Host name advertised on the LAN. If not set, avahi will use the value - of . + of {option}`config.networking.hostName`. ''; }; domainName = mkOption { type = types.str; default = "local"; - description = '' + description = lib.mdDoc '' Domain name for all advertisements. ''; }; @@ -73,7 +73,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "0pointer.de" "zeroconf.org" ]; - description = '' + description = lib.mdDoc '' List of non-local DNS domains to be browsed. ''; }; @@ -81,22 +81,22 @@ in ipv4 = mkOption { type = types.bool; default = true; - description = "Whether to use IPv4."; + description = lib.mdDoc "Whether to use IPv4."; }; ipv6 = mkOption { type = types.bool; default = config.networking.enableIPv6; defaultText = literalExpression "config.networking.enableIPv6"; - description = "Whether to use IPv6."; + description = lib.mdDoc "Whether to use IPv6."; }; interfaces = mkOption { type = types.nullOr (types.listOf types.str); default = null; - description = '' - List of network interfaces that should be used by the avahi-daemon. - Other interfaces will be ignored. If null, all local interfaces + description = lib.mdDoc '' + List of network interfaces that should be used by the {command}`avahi-daemon`. + Other interfaces will be ignored. If `null`, all local interfaces except loopback and point-to-point will be used. ''; }; @@ -104,7 +104,7 @@ in openFirewall = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to open the firewall for UDP port 5353. ''; }; @@ -112,7 +112,7 @@ in allowPointToPoint = mkOption { type = types.bool; default = false; - description= '' + description= lib.mdDoc '' Whether to use POINTTOPOINT interfaces. Might make mDNS unreliable due to usually large latencies with such links and opens a potential security hole by allowing mDNS access from Internet connections. @@ -122,13 +122,13 @@ in wideArea = mkOption { type = types.bool; default = true; - description = "Whether to enable wide-area service discovery."; + description = lib.mdDoc "Whether to enable wide-area service discovery."; }; reflector = mkOption { type = types.bool; default = false; - description = "Reflect incoming mDNS requests to all allowed network interfaces."; + description = lib.mdDoc "Reflect incoming mDNS requests to all allowed network interfaces."; }; extraServiceFiles = mkOption { @@ -161,25 +161,25 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to allow publishing in general."; + description = lib.mdDoc "Whether to allow publishing in general."; }; userServices = mkOption { type = types.bool; default = false; - description = "Whether to publish user services. Will set addresses=true."; + description = lib.mdDoc "Whether to publish user services. Will set `addresses=true`."; }; addresses = mkOption { type = types.bool; default = false; - description = "Whether to register mDNS address records for all local IP addresses."; + description = lib.mdDoc "Whether to register mDNS address records for all local IP addresses."; }; hinfo = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to register a mDNS HINFO record which contains information about the local operating system and CPU. ''; @@ -188,7 +188,7 @@ in workstation = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to register a service of type "_workstation._tcp" on the local LAN. ''; }; @@ -196,14 +196,14 @@ in domain = mkOption { type = types.bool; default = false; - description = "Whether to announce the locally used domain name for browsing by other hosts."; + description = lib.mdDoc "Whether to announce the locally used domain name for browsing by other hosts."; }; }; nssmdns = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the mDNS NSS (Name Service Switch) plug-in. Enabling it allows applications to resolve names in the `.local' domain by transparently querying the Avahi daemon. @@ -213,7 +213,7 @@ in cacheEntriesMax = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Number of resource records to be cached per interface. Use 0 to disable caching. Avahi daemon defaults to 4096 if not set. ''; @@ -222,7 +222,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra config to append to avahi-daemon.conf. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/babeld.nix b/third_party/nixpkgs/nixos/modules/services/networking/babeld.nix index aae6f1498a..b393b6e059 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/babeld.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/babeld.nix @@ -44,9 +44,9 @@ in interfaceDefaults = mkOption { default = null; - description = '' + description = lib.mdDoc '' A set describing default parameters for babeld interfaces. - See babeld8 for options. + See {manpage}`babeld(8)` for options. ''; type = types.nullOr (types.attrsOf types.unspecified); example = @@ -58,9 +58,9 @@ in interfaces = mkOption { default = {}; - description = '' + description = lib.mdDoc '' A set describing babeld interfaces. - See babeld8 for options. + See {manpage}`babeld(8)` for options. ''; type = types.attrsOf (types.attrsOf types.unspecified); example = @@ -75,9 +75,9 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Options that will be copied to babeld.conf. - See babeld8 for details. + See {manpage}`babeld(8)` for details. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bee-clef.nix b/third_party/nixpkgs/nixos/modules/services/networking/bee-clef.nix index 719714b289..852e1396b9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bee-clef.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bee-clef.nix @@ -19,7 +19,7 @@ in { dataDir = mkOption { type = types.nullOr types.str; default = "/var/lib/bee-clef"; - description = '' + description = lib.mdDoc '' Data dir for bee-clef. Beware that some helper scripts may not work when changed! The service itself should work fine, though. ''; @@ -28,13 +28,13 @@ in { passwordFile = mkOption { type = types.nullOr types.str; default = "/var/lib/bee-clef/password"; - description = "Password file for bee-clef."; + description = lib.mdDoc "Password file for bee-clef."; }; user = mkOption { type = types.str; default = "bee-clef"; - description = '' + description = lib.mdDoc '' User the bee-clef daemon should execute under. ''; }; @@ -42,7 +42,7 @@ in { group = mkOption { type = types.str; default = "bee-clef"; - description = '' + description = lib.mdDoc '' Group the bee-clef daemon should execute under. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bee.nix b/third_party/nixpkgs/nixos/modules/services/networking/bee.nix index d6efade063..a99513cb8c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bee.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bee.nix @@ -22,14 +22,14 @@ in { default = pkgs.bee; defaultText = literalExpression "pkgs.bee"; example = literalExpression "pkgs.bee-unstable"; - description = "The package providing the bee binary for the service."; + description = lib.mdDoc "The package providing the bee binary for the service."; }; settings = mkOption { type = format.type; - description = '' + description = lib.mdDoc '' Ethereum Swarm Bee configuration. Refer to - + for details on supported values. ''; }; @@ -37,7 +37,7 @@ in { daemonNiceLevel = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Daemon process priority for bee. 0 is the default Unix process priority, 19 is the lowest. ''; @@ -46,7 +46,7 @@ in { user = mkOption { type = types.str; default = "bee"; - description = '' + description = lib.mdDoc '' User the bee binary should execute under. ''; }; @@ -54,7 +54,7 @@ in { group = mkOption { type = types.str; default = "bee"; - description = '' + description = lib.mdDoc '' Group the bee binary should execute under. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix b/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix index 3f46b95eaf..24e0c0328f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/biboumi.nix @@ -19,8 +19,8 @@ in enable = mkEnableOption "the Biboumi XMPP gateway to IRC"; settings = mkOption { - description = '' - See biboumi 8.5 + description = lib.mdDoc '' + See [biboumi 8.5](https://lab.louiz.org/louiz/biboumi/blob/8.5/doc/biboumi.1.rst) for documentation. ''; default = {}; @@ -34,7 +34,7 @@ in default = []; example = ["admin@example.org"]; apply = concatStringsSep ":"; - description = '' + description = lib.mdDoc '' The bare JID of the gateway administrator. This JID will have more privileges than other standard users, for example some administration ad-hoc commands will only be available to that JID. @@ -43,7 +43,7 @@ in options.ca_file = mkOption { type = types.path; default = "/etc/ssl/certs/ca-certificates.crt"; - description = '' + description = lib.mdDoc '' Specifies which file should be used as the list of trusted CA when negociating a TLS session. ''; @@ -51,7 +51,7 @@ in options.db_name = mkOption { type = with types; either path str; default = "${stateDir}/biboumi.sqlite"; - description = '' + description = lib.mdDoc '' The name of the database to use. ''; example = "postgresql://user:secret@localhost"; @@ -59,7 +59,7 @@ in options.hostname = mkOption { type = types.str; example = "biboumi.example.org"; - description = '' + description = lib.mdDoc '' The hostname served by the XMPP gateway. This domain must be configured in the XMPP server as an external component. @@ -69,34 +69,34 @@ in type = types.port; default = 113; example = 0; - description = '' + description = lib.mdDoc '' The TCP port on which to listen for identd queries. ''; }; options.log_level = mkOption { type = types.ints.between 0 3; default = 1; - description = '' + description = lib.mdDoc '' Indicate what type of log messages to write in the logs. 0 is debug, 1 is info, 2 is warning, 3 is error. ''; }; options.password = mkOption { type = with types; nullOr str; - description = '' + description = lib.mdDoc '' The password used to authenticate the XMPP component to your XMPP server. This password must be configured in the XMPP server, associated with the external component on - hostname. + [hostname](#opt-services.biboumi.settings.hostname). - Set it to null and use credentialsFile + Set it to null and use [credentialsFile](#opt-services.biboumi.credentialsFile) if you do not want this password to go into the Nix store. ''; }; options.persistent_by_default = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether all rooms will be persistent by default: the value of the “persistent” option in the global configuration of each user will be “true”, but the value of each individual room will still @@ -108,7 +108,7 @@ in type = types.path; default = "${pkgs.biboumi}/etc/biboumi"; defaultText = literalExpression ''"''${pkgs.biboumi}/etc/biboumi"''; - description = '' + description = lib.mdDoc '' A directory that should contain the policy files, used to customize Botan’s behaviour when negociating the TLS connections with the IRC servers. @@ -117,14 +117,14 @@ in options.port = mkOption { type = types.port; default = 5347; - description = '' + description = lib.mdDoc '' The TCP port to use to connect to the local XMPP component. ''; }; options.realname_customization = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the users will be able to use the ad-hoc commands that lets them configure their realname and username. @@ -133,7 +133,7 @@ in options.realname_from_jid = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether the realname and username of each biboumi user will be extracted from their JID. Otherwise they will be set to the nick @@ -143,7 +143,7 @@ in options.xmpp_server_ip = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' The IP address to connect to the XMPP server on. The connection to the XMPP server is unencrypted, so the biboumi instance and the server should @@ -155,12 +155,12 @@ in credentialsFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to a configuration file to be merged with the settings. Beware not to surround "=" with spaces when setting biboumi's options in this file. Useful to merge a file which is better kept out of the Nix store because it contains sensible data like - password. + [password](#opt-services.biboumi.settings.password). ''; default = "/dev/null"; example = "/run/keys/biboumi.cfg"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bind.nix b/third_party/nixpkgs/nixos/modules/services/networking/bind.nix index 2045612ec0..0966332f7d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bind.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bind.nix @@ -17,28 +17,28 @@ let name = mkOption { type = types.str; default = name; - description = "Name of the zone."; + description = lib.mdDoc "Name of the zone."; }; master = mkOption { - description = "Master=false means slave server"; + description = lib.mdDoc "Master=false means slave server"; type = types.bool; }; file = mkOption { type = types.either types.str types.path; - description = "Zone file resource records contain columns of data, separated by whitespace, that define the record."; + description = lib.mdDoc "Zone file resource records contain columns of data, separated by whitespace, that define the record."; }; masters = mkOption { type = types.listOf types.str; - description = "List of servers for inclusion in stub and secondary zones."; + description = lib.mdDoc "List of servers for inclusion in stub and secondary zones."; }; slaves = mkOption { type = types.listOf types.str; - description = "Addresses who may request zone transfers."; + description = lib.mdDoc "Addresses who may request zone transfers."; default = [ ]; }; extraConfig = mkOption { type = types.str; - description = "Extra zone config to be appended at the end of the zone section."; + description = lib.mdDoc "Extra zone config to be appended at the end of the zone section."; default = ""; }; }; @@ -111,7 +111,7 @@ in type = types.package; default = pkgs.bind; defaultText = literalExpression "pkgs.bind"; - description = "The BIND package to use."; + description = lib.mdDoc "The BIND package to use."; }; cacheNetworks = mkOption { @@ -178,7 +178,7 @@ in directory = mkOption { type = types.str; default = "/run/named"; - description = "Working directory of BIND."; + description = lib.mdDoc "Working directory of BIND."; }; zones = mkOption { @@ -209,7 +209,7 @@ in extraOptions = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra lines to be added verbatim to the options section of the generated named configuration file. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bird-lg.nix b/third_party/nixpkgs/nixos/modules/services/networking/bird-lg.nix index 515ef38608..1440deb62b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bird-lg.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bird-lg.nix @@ -12,19 +12,19 @@ in type = types.package; default = pkgs.bird-lg; defaultText = literalExpression "pkgs.bird-lg"; - description = "The Bird Looking Glass package to use."; + description = lib.mdDoc "The Bird Looking Glass package to use."; }; user = mkOption { type = types.str; default = "bird-lg"; - description = "User to run the service."; + description = lib.mdDoc "User to run the service."; }; group = mkOption { type = types.str; default = "bird-lg"; - description = "Group to run the service."; + description = lib.mdDoc "Group to run the service."; }; frontend = { @@ -33,112 +33,112 @@ in listenAddress = mkOption { type = types.str; default = "127.0.0.1:5000"; - description = "Address to listen on."; + description = lib.mdDoc "Address to listen on."; }; proxyPort = mkOption { type = types.port; default = 8000; - description = "Port bird-lg-proxy is running on."; + description = lib.mdDoc "Port bird-lg-proxy is running on."; }; domain = mkOption { type = types.str; default = ""; example = "dn42.lantian.pub"; - description = "Server name domain suffixes."; + description = lib.mdDoc "Server name domain suffixes."; }; servers = mkOption { type = types.listOf types.str; default = [ ]; example = [ "gigsgigscloud" "hostdare" ]; - description = "Server name prefixes."; + description = lib.mdDoc "Server name prefixes."; }; whois = mkOption { type = types.str; default = "whois.verisign-grs.com"; - description = "Whois server for queries."; + description = lib.mdDoc "Whois server for queries."; }; dnsInterface = mkOption { type = types.str; default = "asn.cymru.com"; - description = "DNS zone to query ASN information."; + description = lib.mdDoc "DNS zone to query ASN information."; }; bgpMapInfo = mkOption { type = types.listOf types.str; default = [ "asn" "as-name" "ASName" "descr" ]; - description = "Information displayed in bgpmap."; + description = lib.mdDoc "Information displayed in bgpmap."; }; titleBrand = mkOption { type = types.str; default = "Bird-lg Go"; - description = "Prefix of page titles in browser tabs."; + description = lib.mdDoc "Prefix of page titles in browser tabs."; }; netSpecificMode = mkOption { type = types.str; default = ""; example = "dn42"; - description = "Apply network-specific changes for some networks."; + description = lib.mdDoc "Apply network-specific changes for some networks."; }; protocolFilter = mkOption { type = types.listOf types.str; default = [ ]; example = [ "ospf" ]; - description = "Information displayed in bgpmap."; + description = lib.mdDoc "Information displayed in bgpmap."; }; nameFilter = mkOption { type = types.str; default = ""; example = "^ospf"; - description = "Protocol names to hide in summary tables (RE2 syntax),"; + description = lib.mdDoc "Protocol names to hide in summary tables (RE2 syntax),"; }; timeout = mkOption { type = types.int; default = 120; - description = "Time before request timed out, in seconds."; + description = lib.mdDoc "Time before request timed out, in seconds."; }; navbar = { brand = mkOption { type = types.str; default = "Bird-lg Go"; - description = "Brand to show in the navigation bar ."; + description = lib.mdDoc "Brand to show in the navigation bar ."; }; brandURL = mkOption { type = types.str; default = "/"; - description = "URL of the brand to show in the navigation bar."; + description = lib.mdDoc "URL of the brand to show in the navigation bar."; }; allServers = mkOption { type = types.str; default = "ALL Servers"; - description = "Text of 'All server' button in the navigation bar."; + description = lib.mdDoc "Text of 'All server' button in the navigation bar."; }; allServersURL = mkOption { type = types.str; default = "all"; - description = "URL of 'All servers' button."; + description = lib.mdDoc "URL of 'All servers' button."; }; }; extraArgs = mkOption { type = types.lines; default = ""; - description = " - Extra parameters documented here. - "; + description = lib.mdDoc '' + Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#frontend). + ''; }; }; @@ -148,21 +148,21 @@ in listenAddress = mkOption { type = types.str; default = "127.0.0.1:8000"; - description = "Address to listen on."; + description = lib.mdDoc "Address to listen on."; }; allowedIPs = mkOption { type = types.listOf types.str; default = [ ]; example = [ "192.168.25.52" "192.168.25.53" ]; - description = "List of IPs to allow (default all allowed)."; + description = lib.mdDoc "List of IPs to allow (default all allowed)."; }; birdSocket = mkOption { type = types.str; default = "/run/bird.ctl"; example = "/var/run/bird/bird.ctl"; - description = "Bird control socket path."; + description = lib.mdDoc "Bird control socket path."; }; traceroute = { @@ -170,22 +170,22 @@ in type = types.str; default = "${pkgs.traceroute}/bin/traceroute"; defaultText = literalExpression ''"''${pkgs.traceroute}/bin/traceroute"''; - description = "Traceroute's binary path."; + description = lib.mdDoc "Traceroute's binary path."; }; rawOutput = mkOption { type = types.bool; default = false; - description = "Display traceroute output in raw format."; + description = lib.mdDoc "Display traceroute output in raw format."; }; }; extraArgs = mkOption { type = types.lines; default = ""; - description = " - Extra parameters documented here. - "; + description = lib.mdDoc '' + Extra parameters documented [here](https://github.com/xddxdd/bird-lg-go#proxy). + ''; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix index d409f06022..7708aaa476 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bird.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bird.nix @@ -13,18 +13,18 @@ in enable = mkEnableOption "BIRD Internet Routing Daemon"; config = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' BIRD Internet Routing Daemon configuration file. - + ''; }; checkConfig = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the config should be checked at build time. When the config can't be checked during build time, for example when it includes - other files, either disable this option or use preCheckConfig to create + other files, either disable this option or use `preCheckConfig` to create the included files before checking. ''; }; @@ -34,9 +34,9 @@ in example = '' echo "cost 100;" > include.conf ''; - description = '' + description = lib.mdDoc '' Commands to execute before the config file check. The file to be checked will be - available as bird2.conf in the current directory. + available as `bird2.conf` in the current directory. Files created with this option will not be available at service runtime, only during build time checking. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix b/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix index 80033d9586..1788d5fcf5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bitcoind.nix @@ -11,7 +11,7 @@ let name = mkOption { type = types.str; example = "alice"; - description = '' + description = lib.mdDoc '' Username for JSON-RPC connections. ''; }; @@ -41,14 +41,14 @@ let type = types.package; default = pkgs.bitcoind; defaultText = literalExpression "pkgs.bitcoind"; - description = "The package providing bitcoin binaries."; + description = lib.mdDoc "The package providing bitcoin binaries."; }; configFile = mkOption { type = types.nullOr types.path; default = null; example = "/var/lib/${name}/bitcoin.conf"; - description = "The configuration file path to supply bitcoind."; + description = lib.mdDoc "The configuration file path to supply bitcoind."; }; extraConfig = mkOption { @@ -59,32 +59,32 @@ let rpcthreads=16 logips=1 ''; - description = "Additional configurations to be appended to bitcoin.conf."; + description = lib.mdDoc "Additional configurations to be appended to {file}`bitcoin.conf`."; }; dataDir = mkOption { type = types.path; default = "/var/lib/bitcoind-${name}"; - description = "The data directory for bitcoind."; + description = lib.mdDoc "The data directory for bitcoind."; }; user = mkOption { type = types.str; default = "bitcoind-${name}"; - description = "The user as which to run bitcoind."; + description = lib.mdDoc "The user as which to run bitcoind."; }; group = mkOption { type = types.str; default = config.user; - description = "The group as which to run bitcoind."; + description = lib.mdDoc "The group as which to run bitcoind."; }; rpc = { port = mkOption { type = types.nullOr types.port; default = null; - description = "Override the default port on which to listen for JSON-RPC connections."; + description = lib.mdDoc "Override the default port on which to listen for JSON-RPC connections."; }; users = mkOption { default = {}; @@ -95,33 +95,33 @@ let } ''; type = types.attrsOf (types.submodule rpcUserOpts); - description = "RPC user information for JSON-RPC connnections."; + description = lib.mdDoc "RPC user information for JSON-RPC connnections."; }; }; pidFile = mkOption { type = types.path; default = "${config.dataDir}/bitcoind.pid"; - description = "Location of bitcoind pid file."; + description = lib.mdDoc "Location of bitcoind pid file."; }; testnet = mkOption { type = types.bool; default = false; - description = "Whether to use the testnet instead of mainnet."; + description = lib.mdDoc "Whether to use the testnet instead of mainnet."; }; port = mkOption { type = types.nullOr types.port; default = null; - description = "Override the default port on which to listen for connections."; + description = lib.mdDoc "Override the default port on which to listen for connections."; }; dbCache = mkOption { type = types.nullOr (types.ints.between 4 16384); default = null; example = 4000; - description = "Override the default database cache size in MiB."; + description = lib.mdDoc "Override the default database cache size in MiB."; }; prune = mkOption { @@ -132,7 +132,7 @@ let ); default = null; example = 10000; - description = '' + description = lib.mdDoc '' Reduce storage requirements by enabling pruning (deleting) of old blocks. This allows the pruneblockchain RPC to be called to delete specific blocks, and enables automatic pruning of old blocks if a @@ -147,7 +147,7 @@ let extraCmdlineOptions = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Extra command line options to pass to bitcoind. Run bitcoind --help to list all available options. ''; @@ -161,7 +161,7 @@ in services.bitcoind = mkOption { type = types.attrsOf (types.submodule bitcoindOpts); default = {}; - description = "Specification of one or more bitcoind instances."; + description = lib.mdDoc "Specification of one or more bitcoind instances."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bitlbee.nix b/third_party/nixpkgs/nixos/modules/services/networking/bitlbee.nix index f76cffc79b..e2844feda0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/bitlbee.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/bitlbee.nix @@ -49,7 +49,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run the BitlBee IRC to other chat network gateway. Running it allows you to access the MSN, Jabber, Yahoo! and ICQ chat networks via an IRC client. @@ -69,7 +69,7 @@ in portNumber = mkOption { default = 6667; type = types.int; - description = '' + description = lib.mdDoc '' Number of the port BitlBee will be listening to. ''; }; @@ -77,7 +77,7 @@ in authBackend = mkOption { default = "storage"; type = types.enum [ "storage" "pam" ]; - description = '' + description = lib.mdDoc '' How users are authenticated storage -- save passwords internally pam -- Linux PAM authentication @@ -87,7 +87,7 @@ in authMode = mkOption { default = "Open"; type = types.enum [ "Open" "Closed" "Registered" ]; - description = '' + description = lib.mdDoc '' The following authentication modes are available: Open -- Accept connections from anyone, use NickServ for user authentication. Closed -- Require authorization (using the PASS command during login) before allowing the user to connect at all. @@ -98,7 +98,7 @@ in hostName = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Normally, BitlBee gets a hostname using getsockname(). If you have a nicer alias for your BitlBee daemon, you can set it here and BitlBee will identify itself with that name instead. @@ -109,7 +109,7 @@ in type = types.listOf types.package; default = []; example = literalExpression "[ pkgs.bitlbee-facebook ]"; - description = '' + description = lib.mdDoc '' The list of bitlbee plugins to install. ''; }; @@ -118,7 +118,7 @@ in type = types.listOf types.package; default = []; example = literalExpression "[ pkgs.purple-matrix ]"; - description = '' + description = lib.mdDoc '' The list of libpurple plugins to install. ''; }; @@ -126,7 +126,7 @@ in configDir = mkOption { default = "/var/lib/bitlbee"; type = types.path; - description = '' + description = lib.mdDoc '' Specify an alternative directory to store all the per-user configuration files. ''; @@ -135,7 +135,7 @@ in protocols = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' This option allows to remove the support of protocol, even if compiled in. If nothing is given, there are no restrictions. ''; @@ -144,7 +144,7 @@ in extraSettings = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Will be inserted in the Settings section of the config file. ''; }; @@ -152,7 +152,7 @@ in extraDefaults = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Will be inserted in the Default section of the config file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix b/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix index eeea521c8d..0164883c74 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/blockbook-frontend.nix @@ -16,28 +16,28 @@ let type = types.package; default = pkgs.blockbook; defaultText = literalExpression "pkgs.blockbook"; - description = "Which blockbook package to use."; + description = lib.mdDoc "Which blockbook package to use."; }; user = mkOption { type = types.str; default = "blockbook-frontend-${name}"; - description = "The user as which to run blockbook-frontend-${name}."; + description = lib.mdDoc "The user as which to run blockbook-frontend-${name}."; }; group = mkOption { type = types.str; default = "${config.user}"; - description = "The group as which to run blockbook-frontend-${name}."; + description = lib.mdDoc "The group as which to run blockbook-frontend-${name}."; }; certFile = mkOption { type = types.nullOr types.path; default = null; example = "/etc/secrets/blockbook-frontend-${name}/certFile"; - description = '' + description = lib.mdDoc '' To enable SSL, specify path to the name of certificate files without extension. - Expecting certFile.crt and certFile.key. + Expecting {file}`certFile.crt` and {file}`certFile.key`. ''; }; @@ -45,14 +45,14 @@ let type = with types; nullOr path; default = null; example = "${config.dataDir}/config.json"; - description = "Location of the blockbook configuration file."; + description = lib.mdDoc "Location of the blockbook configuration file."; }; coinName = mkOption { type = types.str; default = "Bitcoin"; - description = '' - See + description = lib.mdDoc '' + See for current of coins supported in master (Note: may differ from release). ''; }; @@ -62,8 +62,8 @@ let default = "${config.package}/share/css/"; defaultText = literalExpression ''"''${package}/share/css/"''; example = literalExpression ''"''${dataDir}/static/css/"''; - description = '' - Location of the dir with main.css CSS file. + description = lib.mdDoc '' + Location of the dir with {file}`main.css` CSS file. By default, the one shipped with the package is used. ''; }; @@ -71,68 +71,68 @@ let dataDir = mkOption { type = types.path; default = "/var/lib/blockbook-frontend-${name}"; - description = "Location of blockbook-frontend-${name} data directory."; + description = lib.mdDoc "Location of blockbook-frontend-${name} data directory."; }; debug = mkOption { type = types.bool; default = false; - description = "Debug mode, return more verbose errors, reload templates on each request."; + description = lib.mdDoc "Debug mode, return more verbose errors, reload templates on each request."; }; internal = mkOption { type = types.nullOr types.str; default = ":9030"; - description = "Internal http server binding [address]:port."; + description = lib.mdDoc "Internal http server binding `[address]:port`."; }; messageQueueBinding = mkOption { type = types.str; default = "tcp://127.0.0.1:38330"; - description = "Message Queue Binding address:port."; + description = lib.mdDoc "Message Queue Binding `address:port`."; }; public = mkOption { type = types.nullOr types.str; default = ":9130"; - description = "Public http server binding [address]:port."; + description = lib.mdDoc "Public http server binding `[address]:port`."; }; rpc = { url = mkOption { type = types.str; default = "http://127.0.0.1"; - description = "URL for JSON-RPC connections."; + description = lib.mdDoc "URL for JSON-RPC connections."; }; port = mkOption { type = types.port; default = 8030; - description = "Port for JSON-RPC connections."; + description = lib.mdDoc "Port for JSON-RPC connections."; }; user = mkOption { type = types.str; default = "rpc"; - description = "Username for JSON-RPC connections."; + description = lib.mdDoc "Username for JSON-RPC connections."; }; password = mkOption { type = types.str; default = "rpc"; - description = '' + description = lib.mdDoc '' RPC password for JSON-RPC connections. Warning: this is stored in cleartext in the Nix store!!! - Use configFile or passwordFile if needed. + Use `configFile` or `passwordFile` if needed. ''; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' File containing password of the RPC user. - Note: This options is ignored when configFile is used. + Note: This options is ignored when `configFile` is used. ''; }; }; @@ -140,7 +140,7 @@ let sync = mkOption { type = types.bool; default = true; - description = "Synchronizes until tip, if together with zeromq, keeps index synchronized."; + description = lib.mdDoc "Synchronizes until tip, if together with zeromq, keeps index synchronized."; }; templateDir = mkOption { @@ -148,7 +148,7 @@ let default = "${config.package}/share/templates/"; defaultText = literalExpression ''"''${package}/share/templates/"''; example = literalExpression ''"''${dataDir}/templates/static/"''; - description = "Location of the HTML templates. By default, ones shipped with the package are used."; + description = lib.mdDoc "Location of the HTML templates. By default, ones shipped with the package are used."; }; extraConfig = mkOption { @@ -171,10 +171,10 @@ let "mempool_sub_workers" = 2; "block_addresses_to_keep" = 300; }''; - description = '' - Additional configurations to be appended to coin.conf. + description = lib.mdDoc '' + Additional configurations to be appended to {file}`coin.conf`. Overrides any already defined configuration options. - See + See for current configuration options supported in master (Note: may differ from release). ''; }; @@ -183,7 +183,7 @@ let type = types.listOf types.str; default = []; example = [ "-workers=1" "-dbcache=0" "-logtosderr" ]; - description = '' + description = lib.mdDoc '' Extra command line options to pass to Blockbook. Run blockbook --help to list all available options. ''; @@ -198,7 +198,7 @@ in services.blockbook-frontend = mkOption { type = types.attrsOf (types.submodule blockbookOpts); default = {}; - description = "Specification of one or more blockbook-frontend instances."; + description = lib.mdDoc "Specification of one or more blockbook-frontend instances."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/blocky.nix b/third_party/nixpkgs/nixos/modules/services/networking/blocky.nix index 7488e05fc0..42eab14596 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/blocky.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/blocky.nix @@ -15,9 +15,9 @@ in settings = mkOption { type = format.type; default = { }; - description = '' + description = lib.mdDoc '' Blocky configuration. Refer to - + for details on supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/charybdis.nix b/third_party/nixpkgs/nixos/modules/services/networking/charybdis.nix index ff09c0160c..c875557a1a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/charybdis.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/charybdis.nix @@ -22,7 +22,7 @@ in config = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Charybdis IRC daemon configuration file. ''; }; @@ -30,7 +30,7 @@ in statedir = mkOption { type = types.path; default = "/var/lib/charybdis"; - description = '' + description = lib.mdDoc '' Location of the state directory of charybdis. ''; }; @@ -38,7 +38,7 @@ in user = mkOption { type = types.str; default = "ircd"; - description = '' + description = lib.mdDoc '' Charybdis IRC daemon user. ''; }; @@ -46,7 +46,7 @@ in group = mkOption { type = types.str; default = "ircd"; - description = '' + description = lib.mdDoc '' Charybdis IRC daemon group. ''; }; @@ -54,7 +54,7 @@ in motd = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Charybdis MOTD text. Charybdis will read its MOTD from /etc/charybdis/ircd.motd . diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix index 0d97d379e9..5a19475161 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/cjdns.nix @@ -13,27 +13,27 @@ let { options = { password = mkOption { type = types.str; - description = "Authorized password to the opposite end of the tunnel."; + description = lib.mdDoc "Authorized password to the opposite end of the tunnel."; }; login = mkOption { default = ""; type = types.str; - description = "(optional) name your peer has for you"; + description = lib.mdDoc "(optional) name your peer has for you"; }; peerName = mkOption { default = ""; type = types.str; - description = "(optional) human-readable name for peer"; + description = lib.mdDoc "(optional) human-readable name for peer"; }; publicKey = mkOption { type = types.str; - description = "Public key at the opposite end of the tunnel."; + description = lib.mdDoc "Public key at the opposite end of the tunnel."; }; hostname = mkOption { default = ""; example = "foobar.hype"; type = types.str; - description = "Optional hostname to add to /etc/hosts; prevents reverse lookup failures."; + description = lib.mdDoc "Optional hostname to add to /etc/hosts; prevents reverse lookup failures."; }; }; }; @@ -87,7 +87,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the cjdns network encryption and routing engine. A file at /etc/cjdns.keys will be created if it does not exist to contain a random @@ -99,7 +99,7 @@ in type = types.attrs; default = {}; example = { router.interface.tunDevice = "tun10"; }; - description = '' + description = lib.mdDoc '' Extra configuration, given as attrs, that will be merged recursively with the rest of the JSON generated by this module, at the root node. ''; @@ -109,7 +109,7 @@ in type = types.nullOr types.path; default = null; example = "/etc/cjdroute.conf"; - description = '' + description = lib.mdDoc '' Ignore all other cjdns options and load configuration from this file. ''; }; @@ -122,7 +122,7 @@ in "z9md3t4p45mfrjzdjurxn4wuj0d8swv" "49275fut6tmzu354pq70sr5b95qq0vj" ]; - description = '' + description = lib.mdDoc '' Any remote cjdns nodes that offer these passwords on connection will be allowed to route through this node. ''; @@ -132,7 +132,7 @@ in bind = mkOption { type = types.str; default = "127.0.0.1:11234"; - description = '' + description = lib.mdDoc '' Bind the administration port to this address and port. ''; }; @@ -143,7 +143,7 @@ in type = types.str; default = ""; example = "192.168.1.32:43211"; - description = '' + description = lib.mdDoc '' Address and port to bind UDP tunnels to. ''; }; @@ -159,7 +159,7 @@ in }; } ''; - description = '' + description = lib.mdDoc '' Credentials for making UDP tunnels. ''; }; @@ -171,16 +171,16 @@ in default = ""; example = "eth0"; description = - '' + lib.mdDoc '' Bind to this device for native ethernet operation. - all is a pseudo-name which will try to connect to all devices. + `all` is a pseudo-name which will try to connect to all devices. ''; }; beacon = mkOption { type = types.int; default = 2; - description = '' + description = lib.mdDoc '' Auto-connect to other cjdns nodes on the same network. Options: 0: Disabled. @@ -206,7 +206,7 @@ in }; } ''; - description = '' + description = lib.mdDoc '' Credentials for connecting look similar to UDP credientials except they begin with the mac address. ''; @@ -216,9 +216,9 @@ in addExtraHosts = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to add cjdns peers with an associated hostname to - /etc/hosts. Beware that enabling this + {file}`/etc/hosts`. Beware that enabling this incurs heavy eval-time costs. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cloudflare-dyndns.nix b/third_party/nixpkgs/nixos/modules/services/networking/cloudflare-dyndns.nix index ab5b1a0853..5dd90cfe35 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/cloudflare-dyndns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/cloudflare-dyndns.nix @@ -23,7 +23,7 @@ in domains = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' List of domain names to update records for. ''; }; @@ -31,7 +31,7 @@ in proxied = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether this is a DNS-only record, or also being proxied through CloudFlare. ''; }; @@ -39,7 +39,7 @@ in ipv4 = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable setting IPv4 A records. ''; }; @@ -47,7 +47,7 @@ in ipv6 = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable setting IPv6 AAAA records. ''; }; @@ -55,7 +55,7 @@ in deleteMissing = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to delete the record when no IP address is found. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cntlm.nix b/third_party/nixpkgs/nixos/modules/services/networking/cntlm.nix index eea28e12ce..2b5d0583c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/cntlm.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/cntlm.nix @@ -37,33 +37,33 @@ in username = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Proxy account name, without the possibility to include domain name ('at' sign is interpreted literally). ''; }; domain = mkOption { type = types.str; - description = "Proxy account domain/workgroup name."; + description = lib.mdDoc "Proxy account domain/workgroup name."; }; password = mkOption { default = "/etc/cntlm.password"; type = types.str; - description = "Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security."; + description = lib.mdDoc "Proxy account password. Note: use chmod 0600 on /etc/cntlm.password for security."; }; netbios_hostname = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' The hostname of your machine. ''; }; proxy = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' A list of NTLM/NTLMv2 authenticating HTTP proxies. Parent proxy, which requires authentication. The same as proxy on the command-line, can be used more than once to specify unlimited @@ -74,7 +74,7 @@ in }; noproxy = mkOption { - description = '' + description = lib.mdDoc '' A list of domains where the proxy is skipped. ''; default = []; @@ -85,19 +85,19 @@ in port = mkOption { default = [3128]; type = types.listOf types.port; - description = "Specifies on which ports the cntlm daemon listens."; + description = lib.mdDoc "Specifies on which ports the cntlm daemon listens."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Additional config appended to the end of the generated cntlm.conf."; + description = lib.mdDoc "Additional config appended to the end of the generated {file}`cntlm.conf`."; }; configText = mkOption { type = types.lines; default = ""; - description = "Verbatim contents of cntlm.conf."; + description = lib.mdDoc "Verbatim contents of {file}`cntlm.conf`."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/connman.nix b/third_party/nixpkgs/nixos/modules/services/networking/connman.nix index 9945dc83a2..4989914195 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/connman.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/connman.nix @@ -27,7 +27,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use ConnMan for managing your network connections. ''; }; @@ -35,7 +35,7 @@ in { enableVPN = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable ConnMan VPN service. ''; }; @@ -43,7 +43,7 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Configuration lines appended to the generated connman configuration file. ''; }; @@ -51,7 +51,7 @@ in { networkInterfaceBlacklist = mkOption { type = with types; listOf str; default = [ "vmnet" "vboxnet" "virbr" "ifb" "ve" ]; - description = '' + description = lib.mdDoc '' Default blacklisted interfaces, this includes NixOS containers interfaces (ve). ''; }; @@ -60,9 +60,9 @@ in { backend = mkOption { type = types.enum [ "wpa_supplicant" "iwd" ]; default = "wpa_supplicant"; - description = '' + description = lib.mdDoc '' Specify the Wi-Fi backend used. - Currently supported are or . + Currently supported are {option}`wpa_supplicant` or {option}`iwd`. ''; }; }; @@ -71,14 +71,14 @@ in { type = with types; listOf str; default = [ ]; example = [ "--nodnsproxy" ]; - description = '' + description = lib.mdDoc '' Extra flags to pass to connmand ''; }; package = mkOption { type = types.package; - description = "The connman package / build flavor"; + description = lib.mdDoc "The connman package / build flavor"; default = connman; defaultText = literalExpression "pkgs.connman"; example = literalExpression "pkgs.connmanFull"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/consul.nix b/third_party/nixpkgs/nixos/modules/services/networking/consul.nix index cb53cc01f5..16f1b5eec8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/consul.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/consul.nix @@ -28,7 +28,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables the consul daemon. ''; }; @@ -37,7 +37,7 @@ in type = types.package; default = pkgs.consul; defaultText = literalExpression "pkgs.consul"; - description = '' + description = lib.mdDoc '' The package used for the Consul agent and CLI. ''; }; @@ -46,7 +46,7 @@ in webUi = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables the web interface on the consul http port. ''; }; @@ -54,7 +54,7 @@ in leaveOnStop = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, causes a leave action to be sent when closing consul. This allows a clean termination of the node, but permanently removes it from the cluster. You probably don't want this option unless you @@ -68,7 +68,7 @@ in advertise = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The name of the interface to pull the advertise_addr from. ''; }; @@ -76,7 +76,7 @@ in bind = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The name of the interface to pull the bind_addr from. ''; }; @@ -85,7 +85,7 @@ in forceAddrFamily = mkOption { type = types.enum [ "any" "ipv4" "ipv6" ]; default = "any"; - description = '' + description = lib.mdDoc '' Whether to bind ipv4/ipv6 or both kind of addresses. ''; }; @@ -93,7 +93,7 @@ in forceIpv4 = mkOption { type = types.nullOr types.bool; default = null; - description = '' + description = lib.mdDoc '' Deprecated: Use consul.forceAddrFamily instead. Whether we should force the interfaces to only pull ipv4 addresses. ''; @@ -102,7 +102,7 @@ in dropPrivileges = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the consul agent should be run as a non-root consul user. ''; }; @@ -110,7 +110,7 @@ in extraConfig = mkOption { default = { }; type = types.attrsOf types.anything; - description = '' + description = lib.mdDoc '' Extra configuration options which are serialized to json and added to the config.json file. ''; @@ -119,7 +119,7 @@ in extraConfigFiles = mkOption { default = [ ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Additional configuration files to pass to consul NOTE: These will not trigger the service to be restarted when altered. ''; @@ -129,32 +129,32 @@ in enable = mkEnableOption "consul-alerts"; package = mkOption { - description = "Package to use for consul-alerts."; + description = lib.mdDoc "Package to use for consul-alerts."; default = pkgs.consul-alerts; defaultText = literalExpression "pkgs.consul-alerts"; type = types.package; }; listenAddr = mkOption { - description = "Api listening address."; + description = lib.mdDoc "Api listening address."; default = "localhost:9000"; type = types.str; }; consulAddr = mkOption { - description = "Consul api listening adddress"; + description = lib.mdDoc "Consul api listening adddress"; default = "localhost:8500"; type = types.str; }; watchChecks = mkOption { - description = "Whether to enable check watcher."; + description = lib.mdDoc "Whether to enable check watcher."; default = true; type = types.bool; }; watchEvents = mkOption { - description = "Whether to enable event watcher."; + description = lib.mdDoc "Whether to enable event watcher."; default = true; type = types.bool; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix b/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix index 88615d8e61..deaba69e99 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/coredns.nix @@ -17,14 +17,17 @@ in { } ''; type = types.lines; - description = "Verbatim Corefile to use. See for details."; + description = lib.mdDoc '' + Verbatim Corefile to use. + See for details. + ''; }; package = mkOption { default = pkgs.coredns; defaultText = literalExpression "pkgs.coredns"; type = types.package; - description = "Coredns package to use."; + description = lib.mdDoc "Coredns package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix b/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix index 9d79d5d768..88428eba55 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/corerad.nix @@ -36,8 +36,8 @@ in { }; } ''; - description = '' - Configuration for CoreRAD, see + description = lib.mdDoc '' + Configuration for CoreRAD, see for supported values. Ignored if configFile is set. ''; }; @@ -45,14 +45,14 @@ in { configFile = mkOption { type = types.path; example = literalExpression ''"''${pkgs.corerad}/etc/corerad/corerad.toml"''; - description = "Path to CoreRAD TOML configuration file."; + description = lib.mdDoc "Path to CoreRAD TOML configuration file."; }; package = mkOption { default = pkgs.corerad; defaultText = literalExpression "pkgs.corerad"; type = types.package; - description = "CoreRAD package to use."; + description = lib.mdDoc "CoreRAD package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix b/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix index ce563c3113..788c51aed6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/coturn.nix @@ -44,7 +44,7 @@ in { listening-port = mkOption { type = types.int; default = 3478; - description = '' + description = lib.mdDoc '' TURN listener port for UDP and TCP. Note: actually, TLS and DTLS sessions can connect to the "plain" TCP and UDP port(s), too - if allowed by configuration. @@ -53,7 +53,7 @@ in { tls-listening-port = mkOption { type = types.int; default = 5349; - description = '' + description = lib.mdDoc '' TURN listener port for TLS. Note: actually, "plain" TCP and UDP sessions can connect to the TLS and DTLS port(s), too - if allowed by configuration. The TURN server @@ -69,7 +69,7 @@ in { type = types.int; default = cfg.listening-port + 1; defaultText = literalExpression "listening-port + 1"; - description = '' + description = lib.mdDoc '' Alternative listening port for UDP and TCP listeners; default (or zero) value means "listening port plus one". This is needed for RFC 5780 support @@ -84,7 +84,7 @@ in { type = types.int; default = cfg.tls-listening-port + 1; defaultText = literalExpression "tls-listening-port + 1"; - description = '' + description = lib.mdDoc '' Alternative listening port for TLS and DTLS protocols. ''; }; @@ -92,7 +92,7 @@ in { type = types.listOf types.str; default = []; example = [ "203.0.113.42" "2001:DB8::42" ]; - description = '' + description = lib.mdDoc '' Listener IP addresses of relay server. If no IP(s) specified in the config file or in the command line options, then all IPv4 and IPv6 system IPs will be used for listening. @@ -102,7 +102,7 @@ in { type = types.listOf types.str; default = []; example = [ "203.0.113.42" "2001:DB8::42" ]; - description = '' + description = lib.mdDoc '' Relay address (the local IP address that will be used to relay the packets to the peer). Multiple relay addresses may be used. @@ -118,28 +118,28 @@ in { min-port = mkOption { type = types.int; default = 49152; - description = '' + description = lib.mdDoc '' Lower bound of UDP relay endpoints ''; }; max-port = mkOption { type = types.int; default = 65535; - description = '' + description = lib.mdDoc '' Upper bound of UDP relay endpoints ''; }; lt-cred-mech = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Use long-term credential mechanism. ''; }; no-auth = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This option is opposite to lt-cred-mech. (TURN Server with no-auth option allows anonymous access). If neither option is defined, and no users are defined, @@ -151,7 +151,7 @@ in { use-auth-secret = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' TURN REST API flag. Flag that sets a special authorization option that is based upon authentication secret. This feature can be used with the long-term authentication mechanism, only. @@ -175,7 +175,7 @@ in { static-auth-secret = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' 'Static' authentication secret value (a string) for TURN REST API only. If not set, then the turn server will try to use the 'dynamic' value in turn_secret table @@ -186,7 +186,7 @@ in { static-auth-secret-file = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Path to the file containing the static authentication secret. ''; }; @@ -195,7 +195,7 @@ in { default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; example = "example.com"; - description = '' + description = lib.mdDoc '' The default realm to be used for the users when no explicit origin/realm relationship was found in the database, or if the TURN server is not using any database (just the commands-line settings @@ -207,7 +207,7 @@ in { type = types.nullOr types.str; default = null; example = "/var/lib/acme/example.com/fullchain.pem"; - description = '' + description = lib.mdDoc '' Certificate file in PEM format. ''; }; @@ -215,21 +215,21 @@ in { type = types.nullOr types.str; default = null; example = "/var/lib/acme/example.com/key.pem"; - description = '' + description = lib.mdDoc '' Private key file in PEM format. ''; }; dh-file = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Use custom DH TLS key, stored in PEM format in the file. ''; }; secure-stun = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Require authentication of the STUN Binding request. By default, the clients are allowed anonymous access to the STUN Binding functionality. ''; @@ -237,28 +237,28 @@ in { no-cli = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Turn OFF the CLI support. ''; }; cli-ip = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Local system IP address to be used for CLI server endpoint. ''; }; cli-port = mkOption { type = types.int; default = 5766; - description = '' + description = lib.mdDoc '' CLI server port. ''; }; cli-password = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' CLI access password. For the security reasons, it is recommended to use the encrypted for of the password (see the -P command in the turnadmin utility). @@ -267,37 +267,37 @@ in { no-udp = mkOption { type = types.bool; default = false; - description = "Disable UDP client listener"; + description = lib.mdDoc "Disable UDP client listener"; }; no-tcp = mkOption { type = types.bool; default = false; - description = "Disable TCP client listener"; + description = lib.mdDoc "Disable TCP client listener"; }; no-tls = mkOption { type = types.bool; default = false; - description = "Disable TLS client listener"; + description = lib.mdDoc "Disable TLS client listener"; }; no-dtls = mkOption { type = types.bool; default = false; - description = "Disable DTLS client listener"; + description = lib.mdDoc "Disable DTLS client listener"; }; no-udp-relay = mkOption { type = types.bool; default = false; - description = "Disable UDP relay endpoints"; + description = lib.mdDoc "Disable UDP relay endpoints"; }; no-tcp-relay = mkOption { type = types.bool; default = false; - description = "Disable TCP relay endpoints"; + description = lib.mdDoc "Disable TCP relay endpoints"; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Additional configuration options"; + description = lib.mdDoc "Additional configuration options"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/croc.nix b/third_party/nixpkgs/nixos/modules/services/networking/croc.nix index d044979e10..8203585673 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/croc.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/croc.nix @@ -10,12 +10,12 @@ in ports = lib.mkOption { type = with types; listOf port; default = [9009 9010 9011 9012 9013]; - description = "Ports of the relay."; + description = lib.mdDoc "Ports of the relay."; }; pass = lib.mkOption { type = with types; either path str; default = "pass123"; - description = "Password or passwordfile for the relay."; + description = lib.mdDoc "Password or passwordfile for the relay."; }; openFirewall = lib.mkEnableOption "opening of the peer port(s) in the firewall"; debug = lib.mkEnableOption "debug logs"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dante.nix b/third_party/nixpkgs/nixos/modules/services/networking/dante.nix index 20d4faa1cd..5ddbee8860 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dante.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dante.nix @@ -23,7 +23,7 @@ in config = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' Contents of Dante's configuration file. NOTE: user.privileged, user.unprivileged and logoutput are set by the service. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix b/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix index 43a50af8f9..a0e9405343 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ddclient.nix @@ -63,7 +63,7 @@ with lib; enable = mkOption { default = false; type = bool; - description = '' + description = lib.mdDoc '' Whether to synchronise your machine's IP address with a dynamic DNS provider (e.g. dyndns.org). ''; }; @@ -72,7 +72,7 @@ with lib; type = package; default = pkgs.ddclient; defaultText = "pkgs.ddclient"; - description = '' + description = lib.mdDoc '' The ddclient executable package run by the service. ''; }; @@ -80,7 +80,7 @@ with lib; domains = mkOption { default = [ "" ]; type = listOf str; - description = '' + description = lib.mdDoc '' Domain name(s) to synchronize. ''; }; @@ -90,7 +90,7 @@ with lib; default = lib.optionalString (config.services.ddclient.protocol == "nsupdate") "${pkgs.bind.dnsutils}/bin/nsupdate"; defaultText = ""; type = str; - description = '' + description = lib.mdDoc '' User name. ''; }; @@ -98,7 +98,7 @@ with lib; passwordFile = mkOption { default = null; type = nullOr str; - description = '' + description = lib.mdDoc '' A file containing the password or a TSIG key in named format when using the nsupdate protocol. ''; }; @@ -106,16 +106,16 @@ with lib; interval = mkOption { default = "10min"; type = str; - description = '' + description = lib.mdDoc '' The interval at which to run the check and update. - See man 7 systemd.time for the format. + See {command}`man 7 systemd.time` for the format. ''; }; configFile = mkOption { default = null; type = nullOr path; - description = '' + description = lib.mdDoc '' Path to configuration file. When set this overrides the generated configuration from module options. ''; @@ -125,7 +125,7 @@ with lib; protocol = mkOption { default = "dyndns2"; type = str; - description = '' + description = lib.mdDoc '' Protocol to use with dynamic DNS provider (see https://sourceforge.net/p/ddclient/wiki/protocols). ''; }; @@ -133,7 +133,7 @@ with lib; server = mkOption { default = ""; type = str; - description = '' + description = lib.mdDoc '' Server address. ''; }; @@ -141,7 +141,7 @@ with lib; ssl = mkOption { default = true; type = bool; - description = '' + description = lib.mdDoc '' Whether to use SSL/TLS to connect to dynamic DNS provider. ''; }; @@ -149,7 +149,7 @@ with lib; ipv6 = mkOption { default = false; type = bool; - description = '' + description = lib.mdDoc '' Whether to use IPv6. ''; }; @@ -158,7 +158,7 @@ with lib; quiet = mkOption { default = false; type = bool; - description = '' + description = lib.mdDoc '' Print no messages for unnecessary updates. ''; }; @@ -166,7 +166,7 @@ with lib; script = mkOption { default = ""; type = str; - description = '' + description = lib.mdDoc '' script as required by some providers. ''; }; @@ -174,7 +174,7 @@ with lib; use = mkOption { default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '"; type = str; - description = '' + description = lib.mdDoc '' Method to determine the IP address to send to the dynamic DNS provider. ''; }; @@ -182,7 +182,7 @@ with lib; verbose = mkOption { default = false; type = bool; - description = '' + description = lib.mdDoc '' Print verbose information. ''; }; @@ -190,7 +190,7 @@ with lib; zone = mkOption { default = ""; type = str; - description = '' + description = lib.mdDoc '' zone as required by some providers. ''; }; @@ -198,7 +198,7 @@ with lib; extraConfig = mkOption { default = ""; type = lines; - description = '' + description = lib.mdDoc '' Extra configuration. Contents will be added verbatim to the configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix index a4c8608c31..6b7ce82891 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix @@ -103,7 +103,7 @@ in networking.dhcpcd.enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable dhcpcd for device configuration. This is mainly to explicitly disable dhcpcd (for example when using networkd). ''; @@ -112,7 +112,7 @@ in networking.dhcpcd.persistent = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whenever to leave interfaces configured on dhcpcd daemon shutdown. Set to true if you have your root or store mounted over the network or this machine accepts SSH connections @@ -124,7 +124,7 @@ in networking.dhcpcd.denyInterfaces = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Disable the DHCP client for any interface whose name matches any of the shell glob patterns in this list. The purpose of this option is to blacklist virtual interfaces such as those @@ -135,7 +135,7 @@ in networking.dhcpcd.allowInterfaces = mkOption { type = types.nullOr (types.listOf types.str); default = null; - description = '' + description = lib.mdDoc '' Enable the DHCP client for any interface whose name matches any of the shell glob patterns in this list. Any interface not explicitly matched by this pattern will be denied. This pattern only @@ -146,7 +146,7 @@ in networking.dhcpcd.extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Literal string to append to the config file generated for dhcpcd. ''; }; @@ -164,7 +164,7 @@ in networking.dhcpcd.wait = mkOption { type = types.enum [ "background" "any" "ipv4" "ipv6" "both" "if-carrier-up" ]; default = "any"; - description = '' + description = lib.mdDoc '' This option specifies when the dhcpcd service will fork to background. If set to "background", dhcpcd will fork to background immediately. If set to "ipv4" or "ipv6", dhcpcd will wait for the corresponding IP diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix index 49950efc0a..0bd5e4ef55 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dhcpd.nix @@ -77,7 +77,7 @@ let hostName = mkOption { type = types.str; example = "foo"; - description = '' + description = lib.mdDoc '' Hostname which is assigned statically to the machine. ''; }; @@ -85,7 +85,7 @@ let ethernetAddress = mkOption { type = types.str; example = "00:16:76:9a:32:1d"; - description = '' + description = lib.mdDoc '' MAC address of the machine. ''; }; @@ -93,7 +93,7 @@ let ipAddress = mkOption { type = types.str; example = "192.168.1.10"; - description = '' + description = lib.mdDoc '' IP address of the machine. ''; }; @@ -106,7 +106,7 @@ let enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the DHCPv${postfix} server. ''; }; @@ -124,7 +124,7 @@ let range 192.168.1.100 192.168.1.200; } ''; - description = '' + description = lib.mdDoc '' Extra text to be appended to the DHCP server configuration file. Currently, you almost certainly need to specify something there, such as the options specifying the subnet mask, DNS servers, @@ -135,7 +135,7 @@ let extraFlags = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Additional command line flags to be passed to the dhcpd daemon. ''; }; @@ -143,7 +143,7 @@ let configFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' The path of the DHCP server configuration file. If no file is specified, a file is generated using the other options. ''; @@ -152,7 +152,7 @@ let interfaces = mkOption { type = types.listOf types.str; default = ["eth0"]; - description = '' + description = lib.mdDoc '' The interfaces on which the DHCP server should listen. ''; }; @@ -170,7 +170,7 @@ let ipAddress = "192.168.1.11"; } ]; - description = '' + description = lib.mdDoc '' A list mapping Ethernet addresses to IPv${postfix} addresses for the DHCP server. ''; @@ -179,7 +179,7 @@ let authoritative = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the DHCP server shall send DHCPNAK messages to misconfigured clients. If this is not done, clients may be unable to get a correct IP address after changing subnets until their old lease has expired. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscache.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscache.nix index 7452210de4..eff13f69f4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscache.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscache.nix @@ -38,26 +38,26 @@ in { enable = mkOption { default = false; type = types.bool; - description = "Whether to run the dnscache caching dns server."; + description = lib.mdDoc "Whether to run the dnscache caching dns server."; }; ip = mkOption { default = "0.0.0.0"; type = types.str; - description = "IP address on which to listen for connections."; + description = lib.mdDoc "IP address on which to listen for connections."; }; clientIps = mkOption { default = [ "127.0.0.1" ]; type = types.listOf types.str; - description = "Client IP addresses (or prefixes) from which to accept connections."; + description = lib.mdDoc "Client IP addresses (or prefixes) from which to accept connections."; example = ["192.168" "172.23.75.82"]; }; domainServers = mkOption { default = { }; type = types.attrsOf (types.listOf types.str); - description = '' + description = lib.mdDoc '' Table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts). If entry for @ is not specified predefined list of root servers is used. ''; @@ -72,7 +72,7 @@ in { forwardOnly = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to treat root servers (for @) as caching servers, requesting addresses the same way a client does. This is needed if you want to use e.g. Google DNS as your upstream DNS. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix index 316e6e37f9..ff79341010 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-proxy2.nix @@ -9,9 +9,9 @@ in enable = mkEnableOption "dnscrypt-proxy2"; settings = mkOption { - description = '' + description = lib.mdDoc '' Attrset that is converted and passed as TOML config file. - For available params, see: + For available params, see: ''; example = literalExpression '' { @@ -28,8 +28,8 @@ in }; upstreamDefaults = mkOption { - description = '' - Whether to base the config declared in on the upstream example config () + description = lib.mdDoc '' + Whether to base the config declared in {option}`services.dnscrypt-proxy2.settings` on the upstream example config () Disable this if you want to declare your dnscrypt config from scratch. ''; @@ -38,8 +38,8 @@ in }; configFile = mkOption { - description = '' - Path to TOML config file. See: + description = lib.mdDoc '' + Path to TOML config file. See: If this option is set, it will override any configuration done in options.services.dnscrypt-proxy2.settings. ''; example = "/etc/dnscrypt-proxy/dnscrypt-proxy.toml"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix index c2add170e9..5df1e8b51a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnscrypt-wrapper.nix @@ -129,7 +129,7 @@ in { address = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' The DNSCrypt wrapper will bind to this IP address. ''; }; @@ -137,7 +137,7 @@ in { port = mkOption { type = types.int; default = 5353; - description = '' + description = lib.mdDoc '' The DNSCrypt wrapper will listen for DNS queries on this port. ''; }; @@ -147,9 +147,9 @@ in { default = "2.dnscrypt-cert.${config.networking.hostName}"; defaultText = literalExpression ''"2.dnscrypt-cert.''${config.networking.hostName}"''; example = "2.dnscrypt-cert.myresolver"; - description = '' + description = lib.mdDoc '' The name that will be given to this DNSCrypt resolver. - Note: the resolver name must start with 2.dnscrypt-cert.. + Note: the resolver name must start with `2.dnscrypt-cert.`. ''; }; @@ -157,7 +157,7 @@ in { type = types.nullOr types.path; default = null; example = "/etc/secrets/public.key"; - description = '' + description = lib.mdDoc '' The filepath to the provider public key. If not given a new provider key pair will be generated on the first run. ''; @@ -167,7 +167,7 @@ in { type = types.nullOr types.path; default = null; example = "/etc/secrets/secret.key"; - description = '' + description = lib.mdDoc '' The filepath to the provider secret key. If not given a new provider key pair will be generated on the first run. ''; @@ -176,7 +176,7 @@ in { upstream.address = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' The IP address of the upstream DNS server DNSCrypt will "wrap". ''; }; @@ -184,7 +184,7 @@ in { upstream.port = mkOption { type = types.int; default = 53; - description = '' + description = lib.mdDoc '' The port of the upstream DNS server DNSCrypt will "wrap". ''; }; @@ -192,7 +192,7 @@ in { keys.expiration = mkOption { type = types.int; default = 30; - description = '' + description = lib.mdDoc '' The duration (in days) of the time-limited secret key. This will be automatically rotated before expiration. ''; @@ -201,7 +201,7 @@ in { keys.checkInterval = mkOption { type = types.int; default = 1440; - description = '' + description = lib.mdDoc '' The time interval (in minutes) between key expiration checks. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnsdist.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnsdist.nix index c7c6a79864..44503248cf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnsdist.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnsdist.nix @@ -15,19 +15,19 @@ in { listenAddress = mkOption { type = types.str; - description = "Listen IP Address"; + description = lib.mdDoc "Listen IP Address"; default = "0.0.0.0"; }; listenPort = mkOption { type = types.int; - description = "Listen port"; + description = lib.mdDoc "Listen port"; default = 53; }; extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra lines to be added verbatim to dnsdist.conf. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix b/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix index 59a3ca2f28..cfc37b74b9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dnsmasq.nix @@ -32,7 +32,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run dnsmasq. ''; }; @@ -40,7 +40,7 @@ in resolveLocalQueries = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to /etc/resolv.conf). ''; @@ -50,7 +50,7 @@ in type = types.listOf types.str; default = []; example = [ "8.8.8.8" "8.8.4.4" ]; - description = '' + description = lib.mdDoc '' The DNS servers which dnsmasq should query. ''; }; @@ -58,7 +58,7 @@ in alwaysKeepRunning = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, systemd will always respawn dnsmasq even if shut down manually. The default, disabled, will only restart it on error. ''; }; @@ -66,9 +66,9 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration directives that should be added to - dnsmasq.conf. + `dnsmasq.conf`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/doh-proxy-rust.nix b/third_party/nixpkgs/nixos/modules/services/networking/doh-proxy-rust.nix index efd492e23f..bfd88430d7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/doh-proxy-rust.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/doh-proxy-rust.nix @@ -16,9 +16,9 @@ in { type = types.listOf types.str; default = []; example = [ "--server-address=9.9.9.9:53" ]; - description = '' + description = lib.mdDoc '' A list of command-line flags to pass to doh-proxy. For details on the - available options, see . + available options, see . ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ejabberd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ejabberd.nix index daf8d5c424..3feafc3bb3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ejabberd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ejabberd.nix @@ -26,63 +26,63 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable ejabberd server"; + description = lib.mdDoc "Whether to enable ejabberd server"; }; package = mkOption { type = types.package; default = pkgs.ejabberd; defaultText = literalExpression "pkgs.ejabberd"; - description = "ejabberd server package to use"; + description = lib.mdDoc "ejabberd server package to use"; }; user = mkOption { type = types.str; default = "ejabberd"; - description = "User under which ejabberd is ran"; + description = lib.mdDoc "User under which ejabberd is ran"; }; group = mkOption { type = types.str; default = "ejabberd"; - description = "Group under which ejabberd is ran"; + description = lib.mdDoc "Group under which ejabberd is ran"; }; spoolDir = mkOption { type = types.path; default = "/var/lib/ejabberd"; - description = "Location of the spooldir of ejabberd"; + description = lib.mdDoc "Location of the spooldir of ejabberd"; }; logsDir = mkOption { type = types.path; default = "/var/log/ejabberd"; - description = "Location of the logfile directory of ejabberd"; + description = lib.mdDoc "Location of the logfile directory of ejabberd"; }; configFile = mkOption { type = types.nullOr types.path; - description = "Configuration file for ejabberd in YAML format"; + description = lib.mdDoc "Configuration file for ejabberd in YAML format"; default = null; }; ctlConfig = mkOption { type = types.lines; default = ""; - description = "Configuration of ejabberdctl"; + description = lib.mdDoc "Configuration of ejabberdctl"; }; loadDumps = mkOption { type = types.listOf types.path; default = []; - description = "Configuration dumps that should be loaded on the first startup"; + description = lib.mdDoc "Configuration dumps that should be loaded on the first startup"; example = literalExpression "[ ./myejabberd.dump ]"; }; imagemagick = mkOption { type = types.bool; default = false; - description = "Add ImageMagick to server's path; allows for image thumbnailing"; + description = lib.mdDoc "Add ImageMagick to server's path; allows for image thumbnailing"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/envoy.nix b/third_party/nixpkgs/nixos/modules/services/networking/envoy.nix index b7f859c73d..6f3080d19e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/envoy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/envoy.nix @@ -39,7 +39,7 @@ in }; } ''; - description = '' + description = lib.mdDoc '' Specify the configuration for Envoy in Nix. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix b/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix index 75d78476e5..534b809062 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/epmd.nix @@ -11,7 +11,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable socket activation for Erlang Port Mapper Daemon (epmd), which acts as a name server on all hosts involved in distributed Erlang computations. @@ -21,7 +21,7 @@ in type = types.package; default = pkgs.erlang; defaultText = literalExpression "pkgs.erlang"; - description = '' + description = lib.mdDoc '' The Erlang package to use to get epmd binary. That way you can re-use an Erlang runtime that is already installed for other purposes. ''; @@ -30,7 +30,7 @@ in { type = types.str; default = "[::]:4369"; - description = '' + description = lib.mdDoc '' the listenStream used by the systemd socket. see https://www.freedesktop.org/software/systemd/man/systemd.socket.html#ListenStream= for more informations. use this to change the port epmd will run on. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ergo.nix b/third_party/nixpkgs/nixos/modules/services/networking/ergo.nix index 6e55a7cfff..0dbb862b8e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ergo.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ergo.nix @@ -38,20 +38,20 @@ in { dataDir = mkOption { type = types.path; default = "/var/lib/ergo"; - description = "The data directory for the Ergo node."; + description = lib.mdDoc "The data directory for the Ergo node."; }; listen = { ip = mkOption { type = types.str; default = "0.0.0.0"; - description = "IP address on which the Ergo node should listen."; + description = lib.mdDoc "IP address on which the Ergo node should listen."; }; port = mkOption { type = types.port; default = 9006; - description = "Listen port for the Ergo node."; + description = lib.mdDoc "Listen port for the Ergo node."; }; }; @@ -60,20 +60,20 @@ in { type = types.nullOr types.str; default = null; example = "324dcf027dd4a30a932c441f365a25e86b173defa4b8e58948253471b81b72cf"; - description = "Hex-encoded Blake2b256 hash of an API key as a 64-chars long Base16 string."; + description = lib.mdDoc "Hex-encoded Blake2b256 hash of an API key as a 64-chars long Base16 string."; }; listen = { ip = mkOption { type = types.str; default = "0.0.0.0"; - description = "IP address that the Ergo node API should listen on if is defined."; + description = lib.mdDoc "IP address that the Ergo node API should listen on if {option}`api.keyHash` is defined."; }; port = mkOption { type = types.port; default = 9052; - description = "Listen port for the API endpoint if is defined."; + description = lib.mdDoc "Listen port for the API endpoint if {option}`api.keyHash` is defined."; }; }; }; @@ -81,26 +81,26 @@ in { testnet = mkOption { type = types.bool; default = false; - description = "Connect to testnet network instead of the default mainnet."; + description = lib.mdDoc "Connect to testnet network instead of the default mainnet."; }; user = mkOption { type = types.str; default = "ergo"; - description = "The user as which to run the Ergo node."; + description = lib.mdDoc "The user as which to run the Ergo node."; }; group = mkOption { type = types.str; default = cfg.user; defaultText = literalExpression "config.${opt.user}"; - description = "The group as which to run the Ergo node."; + description = lib.mdDoc "The group as which to run the Ergo node."; }; openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the Ergo node as well as the API."; + description = lib.mdDoc "Open ports in the firewall for the Ergo node as well as the API."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ergochat.nix b/third_party/nixpkgs/nixos/modules/services/networking/ergochat.nix index cfaf69fc61..5e815a9eff 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ergochat.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ergochat.nix @@ -9,7 +9,7 @@ in { openFilesLimit = lib.mkOption { type = lib.types.int; default = 1024; - description = '' + description = lib.mdDoc '' Maximum number of open files. Limits the clients and server connections. ''; }; @@ -18,15 +18,15 @@ in { type = lib.types.path; default = (pkgs.formats.yaml {}).generate "ergo.conf" cfg.settings; defaultText = "generated config file from .settings"; - description = '' + description = lib.mdDoc '' Path to configuration file. - Setting this will skip any configuration done via .settings + Setting this will skip any configuration done via `.settings` ''; }; settings = lib.mkOption { type = (pkgs.formats.yaml {}).type; - description = '' + description = lib.mdDoc '' Ergo IRC daemon configuration file. https://raw.githubusercontent.com/ergochat/ergo/master/default.yaml ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/eternal-terminal.nix b/third_party/nixpkgs/nixos/modules/services/networking/eternal-terminal.nix index 0dcf3d28f4..e90b6103a2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/eternal-terminal.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/eternal-terminal.nix @@ -21,7 +21,7 @@ in port = mkOption { default = 2022; type = types.int; - description = '' + description = lib.mdDoc '' The port the server should listen on. Will use the server's default (2022) if not specified. Make sure to open this port in the firewall if necessary. @@ -31,7 +31,7 @@ in verbosity = mkOption { default = 0; type = types.enum (lib.range 0 9); - description = '' + description = lib.mdDoc '' The verbosity level (0-9). ''; }; @@ -39,7 +39,7 @@ in silent = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If enabled, disables all logging. ''; }; @@ -47,7 +47,7 @@ in logSize = mkOption { default = 20971520; type = types.int; - description = '' + description = lib.mdDoc '' The maximum log size. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/expressvpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/expressvpn.nix index d8ae6528a4..30de6987d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/expressvpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/expressvpn.nix @@ -5,7 +5,7 @@ with lib; options.services.expressvpn.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the ExpressVPN daemon. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/fakeroute.nix b/third_party/nixpkgs/nixos/modules/services/networking/fakeroute.nix index 7916ad4098..ed6b1a3c4d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/fakeroute.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/fakeroute.nix @@ -19,7 +19,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the fakeroute service. ''; }; @@ -33,7 +33,7 @@ in "198.116.142.34" "63.199.8.242" ]; - description = '' + description = lib.mdDoc '' Fake route that will appear after the real one to any host running a traceroute. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ferm.nix b/third_party/nixpkgs/nixos/modules/services/networking/ferm.nix index 8e03f30efc..7faebcef63 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ferm.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ferm.nix @@ -28,13 +28,13 @@ in { ''; }; config = mkOption { - description = "Verbatim ferm.conf configuration."; + description = lib.mdDoc "Verbatim ferm.conf configuration."; default = ""; defaultText = literalDocBook "empty firewall, allows any traffic"; type = types.lines; }; package = mkOption { - description = "The ferm package."; + description = lib.mdDoc "The ferm package."; type = types.package; default = pkgs.ferm; defaultText = literalExpression "pkgs.ferm"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.md b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.md new file mode 100644 index 0000000000..3ee863343e --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.md @@ -0,0 +1,55 @@ +# Firefox Sync server {#module-services-firefox-syncserver} + +A storage server for Firefox Sync that you can easily host yourself. + +## Quickstart {#module-services-firefox-syncserver-quickstart} + +The absolute minimal configuration for the sync server looks like this: + +```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"; + }; +}; +``` + +This will start a sync server that is only accessible locally. Once the services is +running you can navigate to `about:config` in your Firefox profile and set +`identity.sync.tokenserver.uri` to `http://localhost:5000/1.0/sync/1.5`. Your browser +will now use your local sync server for data storage. + +::: {.warning} +This configuration should never be used in production. It is not encrypted and +stores its secrets in a world-readable location. +::: + +## More detailed setup {#module-services-firefox-syncserver-configuration} + +The `firefox-syncserver` service provides a number of options to make setting up +small deployment easier. These are grouped under the `singleNode` element of the +option tree and allow simple configuration of the most important parameters. + +Single node setup is split into two kinds of options: those that affect the sync +server itself, and those that affect its surroundings. Options that affect the +sync server are `capacity`, which configures how many accounts may be active on +this instance, and `url`, which holds the URL under which the sync server can be +accessed. The `url` can be configured automatically when using nginx. + +Options that affect the surroundings of the sync server are `enableNginx`, +`enableTLS` and `hostnam`. If `enableNginx` is set the sync server module will +automatically add an nginx virtual host to the system using `hostname` as the +domain and set `url` accordingly. If `enableTLS` is set the module will also +enable ACME certificates on the new virtual host and force all connections to +be made via TLS. + +For actual deployment it is also recommended to store the `secrets` file in a +secure location. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix new file mode 100644 index 0000000000..254d5c1dc6 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix @@ -0,0 +1,328 @@ +{ config, pkgs, lib, options, ... }: + +let + cfg = config.services.firefox-syncserver; + opt = options.services.firefox-syncserver; + defaultDatabase = "firefox_syncserver"; + defaultUser = "firefox-syncserver"; + + dbIsLocal = cfg.database.host == "localhost"; + dbURL = "mysql://${cfg.database.user}@${cfg.database.host}/${cfg.database.name}"; + + format = pkgs.formats.toml {}; + settings = { + database_url = dbURL; + human_logs = true; + tokenserver = { + node_type = "mysql"; + database_url = dbURL; + fxa_email_domain = "api.accounts.firefox.com"; + fxa_oauth_server_url = "https://oauth.accounts.firefox.com/v1"; + run_migrations = true; + } // lib.optionalAttrs cfg.singleNode.enable { + # Single-node mode is likely to be used on small instances with little + # capacity. The default value (0.1) can only ever release capacity when + # accounts are removed if the total capacity is 10 or larger to begin + # with. + # https://github.com/mozilla-services/syncstorage-rs/issues/1313#issuecomment-1145293375 + node_capacity_release_rate = 1; + }; + }; + configFile = format.generate "syncstorage.toml" (lib.recursiveUpdate settings cfg.settings); +in + +{ + options = { + services.firefox-syncserver = { + enable = lib.mkEnableOption '' + the Firefox Sync storage service. + + Out of the box this will not be very useful unless you also configure at least + one service and one nodes by inserting them into the mysql database manually, e.g. + by running + + + INSERT INTO `services` (`id`, `service`, `pattern`) VALUES ('1', 'sync-1.5', '{node}/1.5/{uid}'); + INSERT INTO `nodes` (`id`, `service`, `node`, `available`, `current_load`, + `capacity`, `downed`, `backoff`) + VALUES ('1', '1', 'https://mydomain.tld', '1', '0', '10', '0', '0'); + + + does this automatically when enabled + ''; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.syncstorage-rs; + defaultText = lib.literalExpression "pkgs.syncstorage-rs"; + description = '' + Package to use. + ''; + }; + + database.name = lib.mkOption { + # the mysql module does not allow `-quoting without resorting to shell + # escaping, so we restrict db names for forward compaitiblity should this + # behavior ever change. + type = lib.types.strMatching "[a-z_][a-z0-9_]*"; + default = defaultDatabase; + description = '' + Database to use for storage. Will be created automatically if it does not exist + and config.${opt.database.createLocally} is set. + ''; + }; + + database.user = lib.mkOption { + type = lib.types.str; + default = defaultUser; + description = '' + Username for database connections. + ''; + }; + + database.host = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = '' + Database host name. localhost is treated specially and inserts + systemd dependencies, other hostnames or IP addresses of the local machine do not. + ''; + }; + + database.createLocally = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to create database and user on the local machine if they do not exist. + This includes enabling unix domain socket authentication for the configured user. + ''; + }; + + logLevel = lib.mkOption { + type = lib.types.str; + default = "error"; + description = '' + Log level to run with. This can be a simple log level like error + or trace, or a more complicated logging expression. + ''; + }; + + secrets = lib.mkOption { + type = lib.types.path; + description = '' + A file containing the various secrets. Should be in the format expected by systemd's + EnvironmentFile directory. Two secrets are currently available: + SYNC_MASTER_SECRET and + SYNC_TOKENSERVER__FXA_METRICS_HASH_SECRET. + ''; + }; + + singleNode = { + enable = lib.mkEnableOption "auto-configuration for a simple single-node setup"; + + enableTLS = lib.mkEnableOption "automatic TLS setup"; + + enableNginx = lib.mkEnableOption "nginx virtualhost definitions"; + + hostname = lib.mkOption { + type = lib.types.str; + description = '' + Host name to use for this service. + ''; + }; + + capacity = lib.mkOption { + type = lib.types.ints.unsigned; + default = 10; + description = '' + How many sync accounts are allowed on this server. Setting this value + equal to or less than the number of currently active accounts will + effectively deny service to accounts not yet registered here. + ''; + }; + + url = lib.mkOption { + type = lib.types.str; + default = "${if cfg.singleNode.enableTLS then "https" else "http"}://${cfg.singleNode.hostname}"; + defaultText = lib.literalExpression '' + ''${if cfg.singleNode.enableTLS then "https" else "http"}://''${config.${opt.singleNode.hostname}} + ''; + description = '' + URL of the host. If you are not using the automatic webserver proxy setup you will have + to change this setting or your sync server may not be functional. + ''; + }; + }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = format.type; + + options = { + port = lib.mkOption { + type = lib.types.port; + default = 5000; + description = '' + Port to bind to. + ''; + }; + + tokenserver.enabled = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to enable the token service as well. + ''; + }; + }; + }; + default = { }; + description = '' + Settings for the sync server. These take priority over values computed + from NixOS options. + + See the doc comments on the Settings structs in + + and + + for available options. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.mysql = lib.mkIf cfg.database.createLocally { + enable = true; + ensureDatabases = [ cfg.database.name ]; + ensureUsers = [{ + name = cfg.database.user; + ensurePermissions = { + "${cfg.database.name}.*" = "all privileges"; + }; + }]; + }; + + systemd.services.firefox-syncserver = { + wantedBy = [ "multi-user.target" ]; + requires = lib.mkIf dbIsLocal [ "mysql.service" ]; + after = lib.mkIf dbIsLocal [ "mysql.service" ]; + environment.RUST_LOG = cfg.logLevel; + serviceConfig = { + User = defaultUser; + Group = defaultUser; + ExecStart = "${cfg.package}/bin/syncstorage --config ${configFile}"; + Stderr = "journal"; + EnvironmentFile = lib.mkIf (cfg.secrets != null) "${cfg.secrets}"; + + # hardening + RemoveIPC = true; + CapabilityBoundingSet = [ "" ]; + DynamicUser = true; + NoNewPrivileges = true; + PrivateDevices = true; + ProtectClock = true; + ProtectKernelLogs = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + SystemCallArchitectures = "native"; + # syncstorage-rs uses python-cffi internally, and python-cffi does not + # work with MemoryDenyWriteExecute=true + MemoryDenyWriteExecute = false; + RestrictNamespaces = true; + RestrictSUIDSGID = true; + ProtectHostname = true; + LockPersonality = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictRealtime = true; + ProtectSystem = "strict"; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectHome = true; + PrivateUsers = true; + PrivateTmp = true; + SystemCallFilter = [ "@system-service" "~ @privileged @resources" ]; + UMask = "0077"; + }; + }; + + systemd.services.firefox-syncserver-setup = lib.mkIf cfg.singleNode.enable { + wantedBy = [ "firefox-syncserver.service" ]; + requires = [ "firefox-syncserver.service" ] ++ lib.optional dbIsLocal "mysql.service"; + after = [ "firefox-syncserver.service" ] ++ lib.optional dbIsLocal "mysql.service"; + path = [ config.services.mysql.package ]; + script = '' + set -euo pipefail + shopt -s inherit_errexit + + schema_configured() { + mysql ${cfg.database.name} -Ne 'SHOW TABLES' | grep -q services + } + + services_configured() { + [ 1 != $(mysql ${cfg.database.name} -Ne 'SELECT COUNT(*) < 1 FROM `services`') ] + } + + create_services() { + mysql ${cfg.database.name} <<"EOF" + BEGIN; + + INSERT INTO `services` (`id`, `service`, `pattern`) + VALUES (1, 'sync-1.5', '{node}/1.5/{uid}'); + INSERT INTO `nodes` (`id`, `service`, `node`, `available`, `current_load`, + `capacity`, `downed`, `backoff`) + VALUES (1, 1, '${cfg.singleNode.url}', ${toString cfg.singleNode.capacity}, + 0, ${toString cfg.singleNode.capacity}, 0, 0); + + COMMIT; + EOF + } + + update_nodes() { + mysql ${cfg.database.name} <<"EOF" + UPDATE `nodes` + SET `capacity` = ${toString cfg.singleNode.capacity} + WHERE `id` = 1; + EOF + } + + for (( try = 0; try < 60; try++ )); do + if ! schema_configured; then + sleep 2 + elif services_configured; then + update_nodes + exit 0 + else + create_services + exit 0 + fi + done + + echo "Single-node setup failed" + exit 1 + ''; + }; + + services.nginx.virtualHosts = lib.mkIf cfg.singleNode.enableNginx { + ${cfg.singleNode.hostname} = { + enableACME = cfg.singleNode.enableTLS; + forceSSL = cfg.singleNode.enableTLS; + locations."/" = { + proxyPass = "http://localhost:${toString cfg.settings.port}"; + # source mentions that this header should be set + extraConfig = '' + add_header X-Content-Type-Options nosniff; + ''; + }; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ pennae ]; + # Don't edit the docbook xml directly, edit the md and generate it: + # `pandoc firefox-syncserver.md -t docbook --top-level-division=chapter --extract-media=media -f markdown+smart > firefox-syncserver.xml` + doc = ./firefox-syncserver.xml; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.xml b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.xml new file mode 100644 index 0000000000..66c8122669 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.xml @@ -0,0 +1,77 @@ + + Firefox Sync server + + A storage server for Firefox Sync that you can easily host yourself. + +
+ Quickstart + + The absolute minimal configuration for the sync server looks like + this: + + +services.mysql.package = pkgs.mariadb; + +services.firefox-syncserver = { + enable = true; + secrets = builtins.toFile "sync-secrets" '' + SYNC_MASTER_SECRET=this-secret-is-actually-leaked-to-/nix/store + ''; + singleNode = { + enable = true; + hostname = "localhost"; + url = "http://localhost:5000"; + }; +}; + + + This will start a sync server that is only accessible locally. + Once the services is running you can navigate to + about:config in your Firefox profile and set + identity.sync.tokenserver.uri to + http://localhost:5000/1.0/sync/1.5. Your + browser will now use your local sync server for data storage. + + + + This configuration should never be used in production. It is not + encrypted and stores its secrets in a world-readable location. + + +
+
+ More detailed setup + + The firefox-syncserver service provides a + number of options to make setting up small deployment easier. + These are grouped under the singleNode element + of the option tree and allow simple configuration of the most + important parameters. + + + Single node setup is split into two kinds of options: those that + affect the sync server itself, and those that affect its + surroundings. Options that affect the sync server are + capacity, which configures how many accounts + may be active on this instance, and url, which + holds the URL under which the sync server can be accessed. The + url can be configured automatically when using + nginx. + + + Options that affect the surroundings of the sync server are + enableNginx, enableTLS and + hostnam. If enableNginx is + set the sync server module will automatically add an nginx virtual + host to the system using hostname as the domain + and set url accordingly. If + enableTLS is set the module will also enable + ACME certificates on the new virtual host and force all + connections to be made via TLS. + + + For actual deployment it is also recommended to store the + secrets file in a secure location. + +
+
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/fireqos.nix b/third_party/nixpkgs/nixos/modules/services/networking/fireqos.nix index 0b34f0b6b8..5469bce58c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/fireqos.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/fireqos.nix @@ -28,7 +28,7 @@ in { class web commit 50kbit match tcp ports 80,443 ''; - description = '' + description = lib.mdDoc '' The FireQOS configuration goes here. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix b/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix index c213a5516a..48cb83e344 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/firewall.nix @@ -258,7 +258,7 @@ let apply = canonicalizePortList; example = [ 22 80 ]; description = - '' + lib.mdDoc '' List of TCP ports on which incoming connections are accepted. ''; @@ -269,7 +269,7 @@ let default = [ ]; example = [ { from = 8999; to = 9003; } ]; description = - '' + lib.mdDoc '' A range of TCP ports on which incoming connections are accepted. ''; @@ -281,7 +281,7 @@ let apply = canonicalizePortList; example = [ 53 ]; description = - '' + lib.mdDoc '' List of open UDP ports. ''; }; @@ -291,7 +291,7 @@ let default = [ ]; example = [ { from = 60000; to = 61000; } ]; description = - '' + lib.mdDoc '' Range of open UDP ports. ''; }; @@ -310,7 +310,7 @@ in type = types.bool; default = true; description = - '' + lib.mdDoc '' Whether to enable the firewall. This is a simple stateful firewall that blocks connection attempts to unauthorised TCP or UDP ports on this machine. It does not affect packet @@ -324,7 +324,7 @@ in defaultText = literalExpression "pkgs.iptables"; example = literalExpression "pkgs.iptables-legacy"; description = - '' + lib.mdDoc '' The iptables package to use for running the firewall service." ''; }; @@ -333,7 +333,7 @@ in type = types.bool; default = true; description = - '' + lib.mdDoc '' Whether to log rejected or dropped incoming connections. Note: The logs are found in the kernel logs, i.e. dmesg or journalctl -k. @@ -344,7 +344,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Whether to log all rejected or dropped incoming packets. This tends to give a lot of log messages, so it's mostly useful for debugging. @@ -357,8 +357,8 @@ in type = types.bool; default = true; description = - '' - If + lib.mdDoc '' + If {option}`networking.firewall.logRefusedPackets` and this option are enabled, then only log packets specifically directed at this machine, i.e., not broadcasts or multicasts. @@ -369,7 +369,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' If set, refused packets are rejected rather than dropped (ignored). This means that an ICMP "port unreachable" error message is sent back to the client (or a TCP RST packet in @@ -383,7 +383,7 @@ in default = [ ]; example = [ "enp0s2" ]; description = - '' + lib.mdDoc '' Traffic coming in from these interfaces will be accepted unconditionally. Traffic from the loopback (lo) interface will always be accepted. @@ -394,7 +394,7 @@ in type = types.bool; default = true; description = - '' + lib.mdDoc '' Whether to respond to incoming ICMPv4 echo requests ("pings"). ICMPv6 pings are always allowed because the larger address space of IPv6 makes network scanning much @@ -407,7 +407,7 @@ in default = null; example = "--limit 1/minute --limit-burst 5"; description = - '' + lib.mdDoc '' If pings are allowed, this allows setting rate limits on them. If non-null, this option should be in the form of flags like "--limit 1/minute --limit-burst 5" @@ -420,7 +420,7 @@ in defaultText = literalDocBook "true if supported by the chosen kernel"; example = "loose"; description = - '' + lib.mdDoc '' Performs a reverse path filter test on a packet. If a reply to the packet would not be sent via the same interface that the packet arrived on, it is refused. @@ -440,7 +440,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Logs dropped packets failing the reverse path filter test if the option networking.firewall.checkReversePath is enabled. ''; @@ -451,7 +451,7 @@ in default = [ ]; example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ]; description = - '' + lib.mdDoc '' List of connection-tracking helpers that are auto-loaded. The complete list of possible values is given in the example. @@ -471,7 +471,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Whether to auto-load connection-tracking helpers. See the description at networking.firewall.connectionTrackingModules @@ -484,7 +484,7 @@ in default = ""; example = "iptables -A INPUT -p icmp -j ACCEPT"; description = - '' + lib.mdDoc '' Additional shell commands executed as part of the firewall initialisation script. These are executed just before the final "reject" firewall rule is added, so they can be used @@ -497,7 +497,7 @@ in default = [ ]; example = literalExpression "[ pkgs.ipset ]"; description = - '' + lib.mdDoc '' Additional packages to be included in the environment of the system as well as the path of networking.firewall.extraCommands. ''; @@ -508,7 +508,7 @@ in default = ""; example = "iptables -P INPUT ACCEPT"; description = - '' + lib.mdDoc '' Additional shell commands executed as part of the firewall shutdown script. These are executed just after the removal of the NixOS input rule, or if the service enters a failed @@ -520,7 +520,7 @@ in default = { }; type = with types; attrsOf (submodule [ { options = commonOptions; } ]); description = - '' + lib.mdDoc '' Interface-specific open ports. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix b/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix index ac84b3d35a..547b6e0394 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/flannel.nix @@ -17,14 +17,14 @@ in { enable = mkEnableOption "flannel"; package = mkOption { - description = "Package to use for flannel"; + description = lib.mdDoc "Package to use for flannel"; type = types.package; default = pkgs.flannel; defaultText = literalExpression "pkgs.flannel"; }; publicIp = mkOption { - description = '' + description = lib.mdDoc '' IP accessible by other nodes for inter-host communication. Defaults to the IP of the interface being used for communication. ''; @@ -33,7 +33,7 @@ in { }; iface = mkOption { - description = '' + description = lib.mdDoc '' Interface to use (IP or name) for inter-host communication. Defaults to the interface for the default route on the machine. ''; @@ -43,38 +43,38 @@ in { etcd = { endpoints = mkOption { - description = "Etcd endpoints"; + description = lib.mdDoc "Etcd endpoints"; type = types.listOf types.str; default = ["http://127.0.0.1:2379"]; }; prefix = mkOption { - description = "Etcd key prefix"; + description = lib.mdDoc "Etcd key prefix"; type = types.str; default = "/coreos.com/network"; }; caFile = mkOption { - description = "Etcd certificate authority file"; + description = lib.mdDoc "Etcd certificate authority file"; type = types.nullOr types.path; default = null; }; certFile = mkOption { - description = "Etcd cert file"; + description = lib.mdDoc "Etcd cert file"; type = types.nullOr types.path; default = null; }; keyFile = mkOption { - description = "Etcd key file"; + description = lib.mdDoc "Etcd key file"; type = types.nullOr types.path; default = null; }; }; kubeconfig = mkOption { - description = '' + description = lib.mdDoc '' Path to kubeconfig to use for storing flannel config using the Kubernetes API ''; @@ -88,7 +88,7 @@ in { }; nodeName = mkOption { - description = '' + description = lib.mdDoc '' Needed when running with Kubernetes as backend as this cannot be auto-detected"; ''; type = types.nullOr types.str; @@ -100,13 +100,13 @@ in { }; storageBackend = mkOption { - description = "Determines where flannel stores its configuration at runtime"; + description = lib.mdDoc "Determines where flannel stores its configuration at runtime"; type = types.enum ["etcd" "kubernetes"]; default = "etcd"; }; subnetLen = mkOption { - description = '' + description = lib.mdDoc '' The size of the subnet allocated to each host. Defaults to 24 (i.e. /24) unless the Network was configured to be smaller than a /24 in which case it is one less than the network. @@ -116,7 +116,7 @@ in { }; subnetMin = mkOption { - description = '' + description = lib.mdDoc '' The beginning of IP range which the subnet allocation should start with. Defaults to the first subnet of Network. ''; @@ -125,7 +125,7 @@ in { }; subnetMax = mkOption { - description = '' + description = lib.mdDoc '' The end of IP range which the subnet allocation should start with. Defaults to the last subnet of Network. ''; @@ -134,7 +134,7 @@ in { }; backend = mkOption { - description = "Type of backend to use and specific configurations for that backend."; + description = lib.mdDoc "Type of backend to use and specific configurations for that backend."; type = types.attrs; default = { Type = "vxlan"; @@ -155,10 +155,11 @@ in { FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile; FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile; FLANNELD_ETCD_CAFILE = cfg.etcd.caFile; - ETCDCTL_CERT_FILE = cfg.etcd.certFile; - ETCDCTL_KEY_FILE = cfg.etcd.keyFile; - ETCDCTL_CA_FILE = cfg.etcd.caFile; - ETCDCTL_PEERS = concatStringsSep "," cfg.etcd.endpoints; + ETCDCTL_CERT = cfg.etcd.certFile; + ETCDCTL_KEY = cfg.etcd.keyFile; + ETCDCTL_CACERT = cfg.etcd.caFile; + ETCDCTL_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints; + ETCDCTL_API = "3"; } // optionalAttrs (cfg.storageBackend == "kubernetes") { FLANNELD_KUBE_SUBNET_MGR = "true"; FLANNELD_KUBECONFIG_FILE = cfg.kubeconfig; @@ -167,7 +168,7 @@ in { path = [ pkgs.iptables ]; preStart = optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" - until ${pkgs.etcd}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' + until ${pkgs.etcd}/bin/etcdctl put /coreos.com/network/config '${builtins.toJSON networkConfig}' do echo "setting network configuration, retry" sleep 1 diff --git a/third_party/nixpkgs/nixos/modules/services/networking/freenet.nix b/third_party/nixpkgs/nixos/modules/services/networking/freenet.nix index 3da3ab0c7d..e1737e820a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/freenet.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/freenet.nix @@ -22,13 +22,13 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the Freenet daemon"; + description = lib.mdDoc "Enable the Freenet daemon"; }; nice = mkOption { type = types.int; default = 10; - description = "Set the nice level for the Freenet daemon"; + description = lib.mdDoc "Set the nice level for the Freenet daemon"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/freeradius.nix b/third_party/nixpkgs/nixos/modules/services/networking/freeradius.nix index 7fa3a8fa17..6c6777c8a5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/freeradius.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/freeradius.nix @@ -38,7 +38,7 @@ let configDir = mkOption { type = types.path; default = "/etc/raddb"; - description = '' + description = lib.mdDoc '' The path of the freeradius server configuration directory. ''; }; @@ -46,7 +46,7 @@ let debug = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable debug logging for freeradius (-xx option). This should not be left on, since it includes sensitive data such as passwords in the logs. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/frr.nix b/third_party/nixpkgs/nixos/modules/services/networking/frr.nix index 98452123f0..71b66b71ee 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/frr.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/frr.nix @@ -57,7 +57,7 @@ let type = types.nullOr types.path; default = null; example = "/etc/frr/${daemonName service}.conf"; - description = '' + description = lib.mdDoc '' Configuration file to use for FRR ${daemonName service}. By default the NixOS generated files are used. ''; @@ -86,7 +86,7 @@ let }; in examples.${service} or ""; - description = '' + description = lib.mdDoc '' ${daemonName service} configuration statements. ''; }; @@ -94,7 +94,7 @@ let vtyListenAddress = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Address to bind to for the VTY interface. ''; }; @@ -102,7 +102,7 @@ let vtyListenPort = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' TCP Port to bind to for the VTY interface. ''; }; @@ -110,7 +110,7 @@ let extraOptions = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Extra options for the daemon. ''; }; @@ -128,7 +128,7 @@ in enable = mkOption { type = types.bool; default = any isEnabled services; - description = '' + description = lib.mdDoc '' Whether to enable the Zebra routing manager. The Zebra routing manager is automatically enabled diff --git a/third_party/nixpkgs/nixos/modules/services/networking/gateone.nix b/third_party/nixpkgs/nixos/modules/services/networking/gateone.nix index e68f8a47d5..dc4a65f020 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/gateone.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/gateone.nix @@ -10,12 +10,12 @@ options = { pidDir = mkOption { default = "/run/gateone"; type = types.path; - description = "Path of pid files for GateOne."; + description = lib.mdDoc "Path of pid files for GateOne."; }; settingsDir = mkOption { default = "/var/lib/gateone"; type = types.path; - description = "Path of configuration files for GateOne."; + description = lib.mdDoc "Path of configuration files for GateOne."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix b/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix index 7a62d378e2..79cf80e57b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ghostunnel.nix @@ -23,14 +23,14 @@ let options = { listen = mkOption { - description = '' + description = lib.mdDoc '' Address and port to listen on (can be HOST:PORT, unix:PATH). ''; type = types.str; }; target = mkOption { - description = '' + description = lib.mdDoc '' Address to forward connections to (can be HOST:PORT or unix:PATH). ''; type = types.str; @@ -40,43 +40,43 @@ let description = '' Path to keystore (combined PEM with cert/key, or PKCS12 keystore). - NB: storepass is not supported because it would expose credentials via /proc/*/cmdline. + NB: storepass is not supported because it would expose credentials via /proc/*/cmdline. - Specify this or cert and key. + Specify this or cert and key. ''; type = types.nullOr types.str; default = null; }; cert = mkOption { - description = '' + description = lib.mdDoc '' Path to certificate (PEM with certificate chain). - Not required if keystore is set. + Not required if `keystore` is set. ''; type = types.nullOr types.str; default = null; }; key = mkOption { - description = '' + description = lib.mdDoc '' Path to certificate private key (PEM with private key). - Not required if keystore is set. + Not required if `keystore` is set. ''; type = types.nullOr types.str; default = null; }; cacert = mkOption { - description = '' - Path to CA bundle file (PEM/X509). Uses system trust store if null. + description = lib.mdDoc '' + Path to CA bundle file (PEM/X509). Uses system trust store if `null`. ''; type = types.nullOr types.str; }; disableAuthentication = mkOption { - description = '' + description = lib.mdDoc '' Disable client authentication, no client certificate will be required. ''; type = types.bool; @@ -84,7 +84,7 @@ let }; allowAll = mkOption { - description = '' + description = lib.mdDoc '' If true, allow all clients, do not check client cert subject. ''; type = types.bool; @@ -92,7 +92,7 @@ let }; allowCN = mkOption { - description = '' + description = lib.mdDoc '' Allow client if common name appears in the list. ''; type = types.listOf types.str; @@ -100,7 +100,7 @@ let }; allowOU = mkOption { - description = '' + description = lib.mdDoc '' Allow client if organizational unit name appears in the list. ''; type = types.listOf types.str; @@ -108,7 +108,7 @@ let }; allowDNS = mkOption { - description = '' + description = lib.mdDoc '' Allow client if DNS subject alternative name appears in the list. ''; type = types.listOf types.str; @@ -116,7 +116,7 @@ let }; allowURI = mkOption { - description = '' + description = lib.mdDoc '' Allow client if URI subject alternative name appears in the list. ''; type = types.listOf types.str; @@ -124,13 +124,13 @@ let }; extraArguments = mkOption { - description = "Extra arguments to pass to ghostunnel server"; + description = lib.mdDoc "Extra arguments to pass to `ghostunnel server`"; type = types.separatedString " "; default = ""; }; unsafeTarget = mkOption { - description = '' + description = lib.mdDoc '' If set, does not limit target to localhost, 127.0.0.1, [::1], or UNIX sockets. This is meant to protect against accidental unencrypted traffic on @@ -216,14 +216,14 @@ in services.ghostunnel.enable = mkEnableOption "ghostunnel"; services.ghostunnel.package = mkOption { - description = "The ghostunnel package to use."; + description = lib.mdDoc "The ghostunnel package to use."; type = types.package; default = pkgs.ghostunnel; defaultText = literalExpression "pkgs.ghostunnel"; }; services.ghostunnel.servers = mkOption { - description = '' + description = lib.mdDoc '' Server mode ghostunnels (TLS listener -> plain TCP/UNIX target) ''; type = types.attrsOf (types.submodule module); diff --git a/third_party/nixpkgs/nixos/modules/services/networking/git-daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/git-daemon.nix index 6be72505c2..80b15eedbb 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/git-daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/git-daemon.nix @@ -15,7 +15,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable Git daemon, which allows public hosting of git repositories without any access controls. This is mostly intended for read-only access. @@ -31,7 +31,7 @@ in type = types.str; default = ""; example = "/srv/git/"; - description = '' + description = lib.mdDoc '' Remap all the path requests as relative to the given path. For example, if you set base-path to /srv/git, then if you later try to pull git://example.com/hello.git, Git daemon will interpret the path as /srv/git/hello.git. @@ -41,7 +41,7 @@ in exportAll = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Publish all directories that look like Git repositories (have the objects and refs subdirectories), even if they do not have the git-daemon-export-ok file. @@ -57,7 +57,7 @@ in type = types.listOf types.str; default = []; example = [ "/srv/git" "/home/user/git/repo2" ]; - description = '' + description = lib.mdDoc '' A whitelist of paths of git repositories, or directories containing repositories all of which would be published. Paths must not end in "/". @@ -70,31 +70,31 @@ in type = types.str; default = ""; example = "example.com"; - description = "Listen on a specific IP address or hostname."; + description = lib.mdDoc "Listen on a specific IP address or hostname."; }; port = mkOption { type = types.port; default = 9418; - description = "Port to listen on."; + description = lib.mdDoc "Port to listen on."; }; options = mkOption { type = types.str; default = ""; - description = "Extra configuration options to be passed to Git daemon."; + description = lib.mdDoc "Extra configuration options to be passed to Git daemon."; }; user = mkOption { type = types.str; default = "git"; - description = "User under which Git daemon would be running."; + description = lib.mdDoc "User under which Git daemon would be running."; }; group = mkOption { type = types.str; default = "git"; - description = "Group under which Git daemon would be running."; + description = lib.mdDoc "Group under which Git daemon would be running."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix index 976fdf2b96..19d6e8bfac 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/globalprotect-vpn.nix @@ -16,9 +16,9 @@ in enable = mkEnableOption "globalprotect"; csdWrapper = mkOption { - description = '' + description = lib.mdDoc '' A script that will produce a Host Integrity Protection (HIP) report, - as described at + as described at ''; default = null; example = literalExpression ''"''${pkgs.openconnect}/libexec/openconnect/hipreport.sh"''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix b/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix index 5c41967d27..2ab9097e7f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/gnunet.nix @@ -47,7 +47,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run the GNUnet daemon. GNUnet is GNU's anonymous peer-to-peer communication and file sharing framework. ''; @@ -57,7 +57,7 @@ in quota = mkOption { type = types.int; default = 1024; - description = '' + description = lib.mdDoc '' Maximum file system usage (in MiB) for file sharing. ''; }; @@ -67,7 +67,7 @@ in port = mkOption { type = types.port; default = 2086; # assigned by IANA - description = '' + description = lib.mdDoc '' The UDP port for use by GNUnet. ''; }; @@ -77,7 +77,7 @@ in port = mkOption { type = types.port; default = 2086; # assigned by IANA - description = '' + description = lib.mdDoc '' The TCP port for use by GNUnet. ''; }; @@ -87,7 +87,7 @@ in maxNetDownBandwidth = mkOption { type = types.int; default = 50000; - description = '' + description = lib.mdDoc '' Maximum bandwidth usage (in bits per second) for GNUnet when downloading data. ''; @@ -96,7 +96,7 @@ in maxNetUpBandwidth = mkOption { type = types.int; default = 50000; - description = '' + description = lib.mdDoc '' Maximum bandwidth usage (in bits per second) for GNUnet when downloading data. ''; @@ -105,7 +105,7 @@ in hardNetUpBandwidth = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Hard bandwidth limit (in bits per second) when uploading data. ''; @@ -116,7 +116,7 @@ in type = types.package; default = pkgs.gnunet; defaultText = literalExpression "pkgs.gnunet"; - description = "Overridable attribute of the gnunet package to use."; + description = lib.mdDoc "Overridable attribute of the gnunet package to use."; example = literalExpression "pkgs.gnunet_git"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix b/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix index 765834fad8..ffa7923d6f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/go-neb.nix @@ -13,7 +13,7 @@ in { bindAddress = mkOption { type = types.str; - description = "Port (and optionally address) to listen on."; + description = lib.mdDoc "Port (and optionally address) to listen on."; default = ":4050"; }; @@ -21,25 +21,25 @@ in { type = types.nullOr types.path; default = null; example = "/run/keys/go-neb.env"; - description = '' + description = lib.mdDoc '' Environment variables from this file will be interpolated into the - final config file using envsubst with this syntax: $ENVIRONMENT - or ''${VARIABLE}. - The file should contain lines formatted as SECRET_VAR=SECRET_VALUE. + final config file using envsubst with this syntax: `$ENVIRONMENT` + or `''${VARIABLE}`. + The file should contain lines formatted as `SECRET_VAR=SECRET_VALUE`. This is useful to avoid putting secrets into the nix store. ''; }; baseUrl = mkOption { type = types.str; - description = "Public-facing endpoint that can receive webhooks."; + description = lib.mdDoc "Public-facing endpoint that can receive webhooks."; }; config = mkOption { inherit (settingsFormat) type; - description = '' - Your config.yaml as a Nix attribute set. - See config.sample.yaml + description = lib.mdDoc '' + Your {file}`config.yaml` as a Nix attribute set. + See [config.sample.yaml](https://github.com/matrix-org/go-neb/blob/master/config.sample.yaml) for possible options. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/go-shadowsocks2.nix b/third_party/nixpkgs/nixos/modules/services/networking/go-shadowsocks2.nix index afbd7ea27c..e3f99f68d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/go-shadowsocks2.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/go-shadowsocks2.nix @@ -9,7 +9,7 @@ in { listenAddress = mkOption { type = types.str; - description = "Server listen address or URL"; + description = lib.mdDoc "Server listen address or URL"; example = "ss://AEAD_CHACHA20_POLY1305:your-password@:8488"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/gobgpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/gobgpd.nix index 29ef9a5cf1..f1e2095708 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/gobgpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/gobgpd.nix @@ -13,9 +13,9 @@ in { settings = mkOption { type = format.type; default = { }; - description = '' + description = lib.mdDoc '' GoBGP configuration. Refer to - + for details on supported values. ''; example = literalExpression '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/gvpe.nix b/third_party/nixpkgs/nixos/modules/services/networking/gvpe.nix index 4fad37ba15..5ecf78d09e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/gvpe.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/gvpe.nix @@ -47,7 +47,7 @@ in nodename = mkOption { default = null; type = types.nullOr types.str; - description ='' + description =lib.mdDoc '' GVPE node name ''; }; @@ -68,7 +68,7 @@ in on alpha if-up = if-up-0 on alpha pid-file = /var/gvpe/gvpe.pid ''; - description = '' + description = lib.mdDoc '' GVPE config contents ''; }; @@ -76,14 +76,14 @@ in default = null; type = types.nullOr types.path; example = "/root/my-gvpe-conf"; - description = '' + description = lib.mdDoc '' GVPE config file, if already present ''; }; ipAddress = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' IP address to assign to GVPE interface ''; }; @@ -91,14 +91,14 @@ in default = null; type = types.nullOr types.str; example = "10.0.0.0/8"; - description = '' + description = lib.mdDoc '' IP subnet assigned to GVPE network ''; }; customIFSetup = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Additional commands to apply in ifup script ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hans.nix b/third_party/nixpkgs/nixos/modules/services/networking/hans.nix index 2639b4b680..ffb2ee841c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hans.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hans.nix @@ -19,12 +19,12 @@ in services.hans = { clients = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Each attribute of this option defines a systemd service that runs hans. Many or none may be defined. The name of each service is - hans-name - where name is the name of the + `hans-«name»` + where «name» is the name of the corresponding attribute name. ''; example = literalExpression '' @@ -41,21 +41,21 @@ in server = mkOption { type = types.str; default = ""; - description = "IP address of server running hans"; + description = lib.mdDoc "IP address of server running hans"; example = "192.0.2.1"; }; extraConfig = mkOption { type = types.str; default = ""; - description = "Additional command line parameters"; + description = lib.mdDoc "Additional command line parameters"; example = "-v"; }; passwordFile = mkOption { type = types.str; default = ""; - description = "File that containts password"; + description = lib.mdDoc "File that containts password"; }; }; @@ -66,33 +66,33 @@ in enable = mkOption { type = types.bool; default = false; - description = "enable hans server"; + description = lib.mdDoc "enable hans server"; }; ip = mkOption { type = types.str; default = ""; - description = "The assigned ip range"; + description = lib.mdDoc "The assigned ip range"; example = "198.51.100.0"; }; respondToSystemPings = mkOption { type = types.bool; default = false; - description = "Force hans respond to ordinary pings"; + description = lib.mdDoc "Force hans respond to ordinary pings"; }; extraConfig = mkOption { type = types.str; default = ""; - description = "Additional command line parameters"; + description = lib.mdDoc "Additional command line parameters"; example = "-v"; }; passwordFile = mkOption { type = types.str; default = ""; - description = "File that containts password"; + description = lib.mdDoc "File that containts password"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/haproxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/haproxy.nix index e9d72b3549..e0b686434b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/haproxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/haproxy.nix @@ -20,7 +20,7 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable HAProxy, the reliable, high performance TCP/HTTP load balancer. ''; @@ -29,21 +29,21 @@ with lib; user = mkOption { type = types.str; default = "haproxy"; - description = "User account under which haproxy runs."; + description = lib.mdDoc "User account under which haproxy runs."; }; group = mkOption { type = types.str; default = "haproxy"; - description = "Group account under which haproxy runs."; + description = lib.mdDoc "Group account under which haproxy runs."; }; config = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Contents of the HAProxy configuration file, - haproxy.conf. + {file}`haproxy.conf`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix index 5b07beadb4..f7141de97b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/headscale.nix @@ -18,7 +18,7 @@ in type = types.package; default = pkgs.headscale; defaultText = literalExpression "pkgs.headscale"; - description = '' + description = lib.mdDoc '' Which headscale package to use for the running server. ''; }; @@ -52,7 +52,7 @@ in serverUrl = mkOption { type = types.str; default = "http://127.0.0.1:8080"; - description = '' + description = lib.mdDoc '' The url clients will connect to. ''; example = "https://myheadscale.example.com:443"; @@ -61,7 +61,7 @@ in address = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Listening address of headscale. ''; example = "0.0.0.0"; @@ -70,7 +70,7 @@ in port = mkOption { type = types.port; default = 8080; - description = '' + description = lib.mdDoc '' Listening port of headscale. ''; example = 443; @@ -79,7 +79,7 @@ in privateKeyFile = mkOption { type = types.path; default = "${dataDir}/private.key"; - description = '' + description = lib.mdDoc '' Path to private key file, generated automatically if it does not exist. ''; }; @@ -88,18 +88,18 @@ in urls = mkOption { type = types.listOf types.str; default = [ "https://controlplane.tailscale.com/derpmap/default" ]; - description = '' + description = lib.mdDoc '' List of urls containing DERP maps. - See How Tailscale works for more information on DERP maps. + See [How Tailscale works](https://tailscale.com/blog/how-tailscale-works/) for more information on DERP maps. ''; }; paths = mkOption { type = types.listOf types.path; default = [ ]; - description = '' + description = lib.mdDoc '' List of file paths containing DERP maps. - See How Tailscale works for more information on DERP maps. + See [How Tailscale works](https://tailscale.com/blog/how-tailscale-works/) for more information on DERP maps. ''; }; @@ -107,7 +107,7 @@ in autoUpdate = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to automatically update DERP maps on a set frequency. ''; example = false; @@ -116,7 +116,7 @@ in updateFrequency = mkOption { type = types.str; default = "24h"; - description = '' + description = lib.mdDoc '' Frequency to update DERP maps. ''; example = "5m"; @@ -127,7 +127,7 @@ in ephemeralNodeInactivityTimeout = mkOption { type = types.str; default = "30m"; - description = '' + description = lib.mdDoc '' Time before an inactive ephemeral node is deleted. ''; example = "5m"; @@ -138,58 +138,58 @@ in type = types.enum [ "sqlite3" "postgres" ]; example = "postgres"; default = "sqlite3"; - description = "Database engine to use."; + description = lib.mdDoc "Database engine to use."; }; host = mkOption { type = types.nullOr types.str; default = null; example = "127.0.0.1"; - description = "Database host address."; + description = lib.mdDoc "Database host address."; }; port = mkOption { type = types.nullOr types.port; default = null; example = 3306; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = mkOption { type = types.nullOr types.str; default = null; example = "headscale"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = mkOption { type = types.nullOr types.str; default = null; example = "headscale"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; example = "/run/keys/headscale-dbpassword"; - description = '' + description = lib.mdDoc '' A file containing the password corresponding to - . + {option}`database.user`. ''; }; path = mkOption { type = types.nullOr types.str; default = "${dataDir}/db.sqlite"; - description = "Path to the sqlite3 database file."; + description = lib.mdDoc "Path to the sqlite3 database file."; }; }; logLevel = mkOption { type = types.str; default = "info"; - description = '' + description = lib.mdDoc '' headscale log level. ''; example = "debug"; @@ -199,7 +199,7 @@ in nameservers = mkOption { type = types.listOf types.str; default = [ "1.1.1.1" ]; - description = '' + description = lib.mdDoc '' List of nameservers to pass to Tailscale clients. ''; }; @@ -207,7 +207,7 @@ in domains = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' Search domains to inject to Tailscale clients. ''; example = [ "mydomain.internal" ]; @@ -226,12 +226,12 @@ in baseDomain = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Defines the base domain to create the hostnames for MagicDNS. - must be a FQDNs, without the trailing dot. + {option}`baseDomain` must be a FQDNs, without the trailing dot. The FQDN of the hosts will be - hostname.namespace.base_domain (e.g. - myhost.mynamespace.example.com). + `hostname.namespace.base_domain` (e.g. + `myhost.mynamespace.example.com`). ''; }; }; @@ -240,7 +240,7 @@ in issuer = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' URL to OpenID issuer. ''; example = "https://openid.example.com"; @@ -249,7 +249,7 @@ in clientId = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' OpenID Connect client ID. ''; }; @@ -257,7 +257,7 @@ in clientSecretFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to OpenID Connect client secret file. ''; }; @@ -265,7 +265,7 @@ in domainMap = mkOption { type = types.attrsOf types.str; default = { }; - description = '' + 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. ''; @@ -281,25 +281,25 @@ in hostname = mkOption { type = types.nullOr types.str; default = ""; - description = '' + description = lib.mdDoc '' Domain name to request a TLS certificate for. ''; }; challengeType = mkOption { type = types.enum [ "TLS_ALPN-01" "HTTP-01" ]; default = "HTTP-01"; - description = '' + description = lib.mdDoc '' Type of ACME challenge to use, currently supported types: - HTTP-01 or TLS_ALPN-01. + `HTTP-01` or `TLS_ALPN-01`. ''; }; httpListen = mkOption { type = types.nullOr types.str; default = ":http"; - description = '' + description = lib.mdDoc '' When HTTP-01 challenge is chosen, letsencrypt must set up a verification endpoint, and it will be listening on: - :http = port 80. + `:http = port 80`. ''; }; }; @@ -307,14 +307,14 @@ in certFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to already created certificate. ''; }; keyFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to key for already created certificate. ''; }; @@ -323,7 +323,7 @@ in aclPolicyFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to a file containg ACL policies. ''; }; @@ -331,10 +331,10 @@ in settings = mkOption { type = settingsFormat.type; default = { }; - description = '' - Overrides to config.yaml as a Nix attribute set. + description = lib.mdDoc '' + Overrides to {file}`config.yaml` as a Nix attribute set. This option is ideal for overriding settings not exposed as Nix options. - Check the example config + Check the [example config](https://github.com/juanfont/headscale/blob/main/config-example.yaml) for possible options. ''; }; @@ -429,12 +429,16 @@ in wantedBy = [ "multi-user.target" ]; restartTriggers = [ configFile ]; + environment.GIN_MODE = "release"; + script = '' ${optionalString (cfg.database.passwordFile != null) '' export HEADSCALE_DB_PASS="$(head -n1 ${escapeShellArg cfg.database.passwordFile})" ''} - export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.openIdConnect.clientSecretFile})" + ${optionalString (cfg.openIdConnect.clientSecretFile != null) '' + export HEADSCALE_OIDC_CLIENT_SECRET="$(head -n1 ${escapeShellArg cfg.openIdConnect.clientSecretFile})" + ''} exec ${cfg.package}/bin/headscale serve ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix index f719ff59cc..ec1a7a58b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hostapd.nix @@ -53,13 +53,13 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable putting a wireless interface into infrastructure mode, allowing other wireless devices to associate with the wireless interface and do wireless networking. A simple access point will - , - , and - , as well as DHCP on the wireless + {option}`enable hostapd.wpa`, + {option}`hostapd.wpaPassphrase`, and + {option}`hostapd.ssid`, as well as DHCP on the wireless interface to provide IP addresses to the associated stations, and NAT (from the wireless interface to an upstream interface). ''; @@ -69,15 +69,15 @@ in default = ""; example = "wlp2s0"; type = types.str; - description = '' - The interfaces hostapd will use. + description = lib.mdDoc '' + The interfaces {command}`hostapd` will use. ''; }; noScan = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Do not scan for overlapping BSSs in HT40+/- mode. Caution: turning this on will violate regulatory requirements! ''; @@ -87,8 +87,8 @@ in default = "nl80211"; example = "hostapd"; type = types.str; - description = '' - Which driver hostapd will use. + description = lib.mdDoc '' + Which driver {command}`hostapd` will use. Most applications will probably use the default. ''; }; @@ -97,13 +97,13 @@ in default = "nixos"; example = "mySpecialSSID"; type = types.str; - description = "SSID to be used in IEEE 802.11 management frames."; + description = lib.mdDoc "SSID to be used in IEEE 802.11 management frames."; }; hwMode = mkOption { default = "g"; type = types.enum [ "a" "b" "g" ]; - description = '' + description = lib.mdDoc '' Operation mode. (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE 802.11g). ''; @@ -113,11 +113,11 @@ in default = 7; example = 11; type = types.int; - description = '' + description = lib.mdDoc '' Channel number (IEEE 802.11) Please note that some drivers do not use this value from - hostapd and the channel will need to be configured - separately with iwconfig. + {command}`hostapd` and the channel will need to be configured + separately with {command}`iwconfig`. ''; }; @@ -125,15 +125,15 @@ in default = "wheel"; example = "network"; type = types.str; - description = '' - Members of this group can control hostapd. + description = lib.mdDoc '' + Members of this group can control {command}`hostapd`. ''; }; wpa = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point. ''; }; @@ -142,7 +142,7 @@ in default = "my_sekret"; example = "any_64_char_string"; type = types.str; - description = '' + description = lib.mdDoc '' WPA-PSK (pre-shared-key) passphrase. Clients will need this passphrase to associate with this access point. Warning: This passphrase will get put into a world-readable file in @@ -153,7 +153,7 @@ in logLevel = mkOption { default = 2; type = types.int; - description = '' + description = lib.mdDoc '' Levels (minimum value for logged events): 0 = verbose debugging 1 = debugging @@ -167,7 +167,7 @@ in default = null; example = "US"; type = with types; nullOr str; - description = '' + description = lib.mdDoc '' Country code (ISO/IEC 3166-1). Used to set regulatory domain. Set as needed to indicate country in which device is operating. This can limit available channels and transmit power. @@ -187,7 +187,7 @@ in ht_capab=[HT40-][SHORT-GI-40][DSSS_CCK-40] ''; type = types.lines; - description = "Extra configuration options to put in hostapd.conf."; + description = lib.mdDoc "Extra configuration options to put in hostapd.conf."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/htpdate.nix b/third_party/nixpkgs/nixos/modules/services/networking/htpdate.nix index 6954e5b060..8b9bb2888d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/htpdate.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/htpdate.nix @@ -19,7 +19,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable htpdate daemon. ''; }; @@ -27,7 +27,7 @@ in extraOptions = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Additional command line arguments to pass to htpdate. ''; }; @@ -35,7 +35,7 @@ in servers = mkOption { type = types.listOf types.str; default = [ "www.google.com" ]; - description = '' + description = lib.mdDoc '' HTTP servers to use for time synchronization. ''; }; @@ -44,7 +44,7 @@ in type = types.str; default = ""; example = "127.0.0.1:8118"; - description = '' + description = lib.mdDoc '' HTTP proxy used for requests. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/https-dns-proxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/https-dns-proxy.nix index 85d6c362b4..4b6e302e44 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/https-dns-proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/https-dns-proxy.nix @@ -45,20 +45,20 @@ in enable = mkEnableOption "https-dns-proxy daemon"; address = mkOption { - description = "The address on which to listen"; + description = lib.mdDoc "The address on which to listen"; type = types.str; default = "127.0.0.1"; }; port = mkOption { - description = "The port on which to listen"; + description = lib.mdDoc "The port on which to listen"; type = types.port; default = 5053; }; provider = { kind = mkOption { - description = '' + description = lib.mdDoc '' The upstream provider to use or custom in case you do not trust any of the predefined providers or just want to use your own. @@ -74,18 +74,18 @@ in }; ips = mkOption { - description = "The custom provider IPs"; + description = lib.mdDoc "The custom provider IPs"; type = types.listOf types.str; }; url = mkOption { - description = "The custom provider URL"; + description = lib.mdDoc "The custom provider URL"; type = types.str; }; }; preferIPv4 = mkOption { - description = '' + description = lib.mdDoc '' https_dns_proxy will by default use IPv6 and fail if it is not available. To play it safe, we choose IPv4. ''; @@ -94,7 +94,7 @@ in }; extraArgs = mkOption { - description = "Additional arguments to pass to the process."; + description = lib.mdDoc "Additional arguments to pass to the process."; type = types.listOf types.str; default = [ "-v" ]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix b/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix index 8f621b6100..bc289132a7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/hylafax/options.nix @@ -37,17 +37,17 @@ let name = mkOption { type = nonEmptyStr; example = "ttyS1"; - description = '' + description = lib.mdDoc '' Name of modem device, - will be searched for in /dev. + will be searched for in {file}`/dev`. ''; }; type = mkOption { type = nonEmptyStr; example = "cirrus"; - description = '' + description = lib.mdDoc '' Name of modem configuration file, - will be searched for in config + will be searched for in {file}`config` in the spooling area directory. ''; }; @@ -59,11 +59,11 @@ let FAXNumber = "123456"; LocalIdentifier = "LostInBerlin"; }; - description = '' + description = lib.mdDoc '' Attribute set of values for the given modem. ${commonDescr} Options defined here override options in - for this modem. + {option}`commonModemConfig` for this modem. ''; }; }; @@ -124,9 +124,9 @@ in type = bool; default = true; example = false; - description = '' + description = lib.mdDoc '' Autostart the HylaFAX queue manager at system start. - If this is false, the queue manager + If this is `false`, the queue manager will still be started if there are pending jobs or if a user tries to connect to it. ''; @@ -136,34 +136,34 @@ in type = nullOr nonEmptyStr; default = null; example = "49"; - description = "Country code for server and all modems."; + description = lib.mdDoc "Country code for server and all modems."; }; areaCode = mkOption { type = nullOr nonEmptyStr; default = null; example = "30"; - description = "Area code for server and all modems."; + description = lib.mdDoc "Area code for server and all modems."; }; longDistancePrefix = mkOption { type = nullOr str; default = null; example = "0"; - description = "Long distance prefix for server and all modems."; + description = lib.mdDoc "Long distance prefix for server and all modems."; }; internationalPrefix = mkOption { type = nullOr str; default = null; example = "00"; - description = "International prefix for server and all modems."; + description = lib.mdDoc "International prefix for server and all modems."; }; spoolAreaPath = mkOption { type = path; default = "/var/spool/fax"; - description = '' + description = lib.mdDoc '' The spooling area will be created/maintained at the location given here. ''; @@ -197,11 +197,11 @@ in type = path; example = literalExpression ''"''${pkgs.postfix}/bin/sendmail"''; # '' ; # fix vim - description = '' - Path to sendmail program. + description = lib.mdDoc '' + Path to {file}`sendmail` program. The default uses the local sendmail wrapper - (see ), - otherwise the false + (see {option}`config.services.mail.sendmailSetuidWrapper`), + otherwise the {file}`false` binary to cause an error if used. ''; }; @@ -209,9 +209,9 @@ in hfaxdConfig = mkOption { type = configAttrType; example.RecvqProtection = "0400"; - description = '' + description = lib.mdDoc '' Attribute set of lines for the global - hfaxd config file etc/hfaxd.conf. + hfaxd config file {file}`etc/hfaxd.conf`. ${commonDescr} ''; }; @@ -222,9 +222,9 @@ in InternationalPrefix = "00"; LongDistancePrefix = "0"; }; - description = '' + description = lib.mdDoc '' Attribute set of lines for the global - faxq config file etc/config. + faxq config file {file}`etc/config`. ${commonDescr} ''; }; @@ -254,7 +254,7 @@ in LocalIdentifier = "Smith"; }; }; - description = '' + description = lib.mdDoc '' Description of installed modems. At least on modem must be defined to enable the HylaFAX server. @@ -265,7 +265,7 @@ in type = lines; default = ""; example = "chmod 0755 . # everyone may read my faxes"; - description = '' + description = lib.mdDoc '' Additional shell code that is executed within the spooling area directory right after its setup. ''; @@ -280,16 +280,16 @@ in type = nullOr nonEmptyStr; default = null; example = "daily"; - description = '' + description = lib.mdDoc '' Purge old files from the spooling area with - faxcron with the given frequency + {file}`faxcron` with the given frequency (see systemd.time(7)). ''; }; faxcron.infoDays = mkOption { type = ints.positive; default = 30; - description = '' + description = lib.mdDoc '' Set the expiration time for data in the remote machine information directory in days. ''; @@ -297,7 +297,7 @@ in faxcron.logDays = mkOption { type = ints.positive; default = 30; - description = '' + description = lib.mdDoc '' Set the expiration time for session trace log files in days. ''; @@ -305,7 +305,7 @@ in faxcron.rcvDays = mkOption { type = ints.positive; default = 7; - description = '' + description = lib.mdDoc '' Set the expiration time for files in the received facsimile queue in days. ''; @@ -320,9 +320,9 @@ in type = nullOr nonEmptyStr; default = null; example = "daily"; - description = '' + description = lib.mdDoc '' Purge old files from the spooling area with - faxcron with the given frequency + {file}`faxcron` with the given frequency (see systemd.time(7)). ''; }; @@ -330,12 +330,12 @@ in type = enum [ "never" "as-flagged" "always" ]; default = "as-flagged"; example = "always"; - description = '' + description = lib.mdDoc '' Enable or suppress job archiving: - never disables job archiving, - as-flagged archives jobs that + `never` disables job archiving, + `as-flagged` archives jobs that have been flagged for archiving by sendfax, - always forces archiving of all jobs. + `always` forces archiving of all jobs. See also sendfax(1) and faxqclean(8). ''; }; @@ -343,7 +343,7 @@ in type = ints.positive; default = 15; example = literalExpression "24*60"; - description = '' + description = lib.mdDoc '' Set the job age threshold (in minutes) that controls how long jobs may reside in the doneq directory. @@ -353,7 +353,7 @@ in type = ints.positive; default = 60; example = literalExpression "24*60"; - description = '' + description = lib.mdDoc '' Set the document age threshold (in minutes) that controls how long unreferenced files may reside in the docq directory. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix index 06f3420b8f..fb83778fcf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix @@ -24,29 +24,29 @@ let name = mkOption { type = types.str; default = name; - description = "The endpoint name."; + description = lib.mdDoc "The endpoint name."; }; address = mkOption { type = types.str; default = addr; - description = "Bind address for ${name} endpoint."; + description = lib.mdDoc "Bind address for ${name} endpoint."; }; port = mkOption { type = types.port; default = port; - description = "Bind port for ${name} endpoint."; + description = lib.mdDoc "Bind port for ${name} endpoint."; }; }; i2cpOpts = name: { length = mkOption { type = types.int; - description = "Guaranteed minimum hops for ${name} tunnels."; + description = lib.mdDoc "Guaranteed minimum hops for ${name} tunnels."; default = 3; }; quantity = mkOption { type = types.int; - description = "Number of simultaneous ${name} tunnels."; + description = lib.mdDoc "Number of simultaneous ${name} tunnels."; default = 5; }; }; @@ -56,7 +56,7 @@ let keys = mkOption { type = with types; nullOr str; default = keyloc; - description = '' + description = lib.mdDoc '' File to persist ${lib.toUpper name} keys. ''; }; @@ -64,12 +64,12 @@ let outbound = i2cpOpts name; latency.min = mkOption { type = with types; nullOr int; - description = "Min latency for tunnels."; + description = lib.mdDoc "Min latency for tunnels."; default = null; }; latency.max = mkOption { type = with types; nullOr int; - description = "Max latency for tunnels."; + description = lib.mdDoc "Max latency for tunnels."; default = null; }; }; @@ -79,17 +79,17 @@ let inbound = i2cpOpts name; crypto.tagsToSend = mkOption { type = types.int; - description = "Number of ElGamal/AES tags to send."; + description = lib.mdDoc "Number of ElGamal/AES tags to send."; default = 40; }; destination = mkOption { type = types.str; - description = "Remote endpoint, I2P hostname or b32.i2p address."; + description = lib.mdDoc "Remote endpoint, I2P hostname or b32.i2p address."; }; keys = mkOption { type = types.str; default = name + "-keys.dat"; - description = "Keyset used for tunnel identity."; + description = lib.mdDoc "Keyset used for tunnel identity."; }; } // mkEndpointOpt name "127.0.0.1" 0; @@ -259,7 +259,7 @@ in type = types.package; default = pkgs.i2pd; defaultText = literalExpression "pkgs.i2pd"; - description = '' + description = lib.mdDoc '' i2pd package to use. ''; }; @@ -267,12 +267,12 @@ in logLevel = mkOption { type = types.enum ["debug" "info" "warn" "error"]; default = "error"; - description = '' - The log level. i2pd defaults to "info" + description = lib.mdDoc '' + The log level. {command}`i2pd` defaults to "info" but that generates copious amounts of log messages. We default to "error" which is similar to the default log - level of tor. + level of {command}`tor`. ''; }; @@ -281,7 +281,7 @@ in address = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Your external IP or hostname. ''; }; @@ -289,7 +289,7 @@ in family = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specify a family the router belongs to. ''; }; @@ -297,7 +297,7 @@ in dataDir = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Alternative path to storage of i2pd data (RI, keys, peer profiles, ...) ''; }; @@ -305,7 +305,7 @@ in share = mkOption { type = types.int; default = 100; - description = '' + description = lib.mdDoc '' Limit of transit traffic from max bandwidth in percents. ''; }; @@ -313,7 +313,7 @@ in ifname = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Network interface to bind to. ''; }; @@ -321,7 +321,7 @@ in ifname4 = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' IPv4 interface to bind to. ''; }; @@ -329,7 +329,7 @@ in ifname6 = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' IPv6 interface to bind to. ''; }; @@ -337,7 +337,7 @@ in ntcpProxy = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Proxy URL for NTCP transport. ''; }; @@ -360,7 +360,7 @@ in netid = mkOption { type = types.int; default = 2; - description = '' + description = lib.mdDoc '' I2P overlay netid. ''; }; @@ -368,16 +368,16 @@ in bandwidth = mkOption { type = with types; nullOr int; default = null; - description = '' + description = lib.mdDoc '' Set a router bandwidth limit integer in KBps. - If not set, i2pd defaults to 32KBps. + If not set, {command}`i2pd` defaults to 32KBps. ''; }; port = mkOption { type = with types; nullOr int; default = null; - description = '' + description = lib.mdDoc '' I2P listen port. If no one is given the router will pick between 9111 and 30777. ''; }; @@ -390,7 +390,7 @@ in upnp.name = mkOption { type = types.str; default = "I2Pd"; - description = '' + description = lib.mdDoc '' Name i2pd appears in UPnP forwardings list. ''; }; @@ -411,7 +411,7 @@ in reseed.file = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Full path to SU3 file to reseed from. ''; }; @@ -419,7 +419,7 @@ in reseed.urls = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Reseed URLs. ''; }; @@ -427,7 +427,7 @@ in reseed.floodfill = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Path to router info of floodfill to reseed from. ''; }; @@ -435,7 +435,7 @@ in reseed.zipfile = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Path to local .zip file to reseed from. ''; }; @@ -443,7 +443,7 @@ in reseed.proxy = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' URL for reseed proxy, supports http/socks. ''; }; @@ -451,7 +451,7 @@ in addressbook.defaulturl = mkOption { type = types.str; default = "http://joajgazyztfssty4w2on5oaqksz6tqoxbduy553y34mf4byv6gpq.b32.i2p/export/alive-hosts.txt"; - description = '' + description = lib.mdDoc '' AddressBook subscription URL for initial setup ''; }; @@ -462,7 +462,7 @@ in "http://i2p-projekt.i2p/hosts.txt" "http://stats.i2p/cgi-bin/newhosts.txt" ]; - description = '' + description = lib.mdDoc '' AddressBook subscription URLs ''; }; @@ -472,7 +472,7 @@ in trust.family = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Router Familiy to trust for first hops. ''; }; @@ -480,7 +480,7 @@ in trust.routers = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Only connect to the listed routers. ''; }; @@ -497,7 +497,7 @@ in ntcp2.port = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Port to listen for incoming NTCP2 connections (0=auto). ''; }; @@ -505,7 +505,7 @@ in limits.transittunnels = mkOption { type = types.int; default = 2500; - description = '' + description = lib.mdDoc '' Maximum number of active transit sessions. ''; }; @@ -513,7 +513,7 @@ in limits.coreSize = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Maximum size of corefile in Kb (0 - use system limit). ''; }; @@ -521,7 +521,7 @@ in limits.openFiles = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Maximum number of open files (0 - use system default). ''; }; @@ -529,7 +529,7 @@ in limits.ntcpHard = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Maximum number of active transit sessions. ''; }; @@ -537,7 +537,7 @@ in limits.ntcpSoft = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Threshold to start probabalistic backoff with ntcp sessions (default: use system limit). ''; }; @@ -545,7 +545,7 @@ in limits.ntcpThreads = mkOption { type = types.int; default = 1; - description = '' + description = lib.mdDoc '' Maximum number of threads used by NTCP DH worker. ''; }; @@ -555,7 +555,7 @@ in yggdrasil.address = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Your local yggdrasil address. Specify it if you want to bind your router to a particular address. ''; @@ -568,7 +568,7 @@ in user = mkOption { type = types.str; default = "i2pd"; - description = '' + description = lib.mdDoc '' Username for webconsole access ''; }; @@ -576,7 +576,7 @@ in pass = mkOption { type = types.str; default = "i2pd"; - description = '' + description = lib.mdDoc '' Password for webconsole access. ''; }; @@ -584,7 +584,7 @@ in strictHeaders = mkOption { type = with types; nullOr bool; default = null; - description = '' + description = lib.mdDoc '' Enable strict host checking on WebUI. ''; }; @@ -592,7 +592,7 @@ in hostname = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Expected hostname for WebUI. ''; }; @@ -603,7 +603,7 @@ in outproxy = mkOption { type = with types; nullOr str; default = null; - description = "Upstream outproxy bind address."; + description = lib.mdDoc "Upstream outproxy bind address."; }; }; proto.socksProxy = (mkKeyedEndpointOpt "socksproxy" "127.0.0.1" 4447 "socksproxy-keys.dat") @@ -612,12 +612,12 @@ in outproxy = mkOption { type = types.str; default = "127.0.0.1"; - description = "Upstream outproxy bind address."; + description = lib.mdDoc "Upstream outproxy bind address."; }; outproxyPort = mkOption { type = types.int; default = 4444; - description = "Upstream outproxy bind port."; + description = lib.mdDoc "Upstream outproxy bind port."; }; }; @@ -634,7 +634,7 @@ in destinationPort = mkOption { type = with types; nullOr int; default = null; - description = "Connect to particular port at destination."; + description = lib.mdDoc "Connect to particular port at destination."; }; } // commonTunOpts name; config = { @@ -642,7 +642,7 @@ in }; } )); - description = '' + description = lib.mdDoc '' Connect to someone as a client and establish a local accept endpoint ''; }; @@ -655,12 +655,12 @@ in inPort = mkOption { type = types.int; default = 0; - description = "Service port. Default to the tunnel's listen port."; + description = lib.mdDoc "Service port. Default to the tunnel's listen port."; }; accessList = mkOption { type = with types; listOf str; default = []; - description = "I2P nodes that are allowed to connect to this service."; + description = lib.mdDoc "I2P nodes that are allowed to connect to this service."; }; } // commonTunOpts name; config = { @@ -668,7 +668,7 @@ in }; } )); - description = '' + description = lib.mdDoc '' Serve something on I2P network at port and delegate requests to address inPort. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix b/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix index 8593c94e34..f94832c477 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/icecream/daemon.nix @@ -16,14 +16,14 @@ in { openFirewall = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Whether to automatically open receive port in the firewall. ''; }; openBroadcast = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Whether to automatically open the firewall for scheduler discovery. ''; }; @@ -31,7 +31,7 @@ in { cacheLimit = mkOption { type = types.ints.u16; default = 256; - description = '' + description = lib.mdDoc '' Maximum size in Megabytes of cache used to store compile environments of compile clients. ''; }; @@ -39,7 +39,7 @@ in { netName = mkOption { type = types.str; default = "ICECREAM"; - description = '' + description = lib.mdDoc '' Network name to connect to. A scheduler with the same name needs to be running. ''; }; @@ -47,7 +47,7 @@ in { noRemote = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Prevent jobs from other nodes being scheduled on this daemon. ''; }; @@ -55,7 +55,7 @@ in { schedulerHost = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Explicit scheduler hostname, useful in firewalled environments. Uses scheduler autodiscovery via broadcast if set to null. @@ -65,7 +65,7 @@ in { maxProcesses = mkOption { type = types.nullOr types.ints.u16; default = null; - description = '' + description = lib.mdDoc '' Maximum number of compile jobs started in parallel for this daemon. Uses the number of CPUs if set to null. @@ -75,7 +75,7 @@ in { nice = mkOption { type = types.int; default = 5; - description = '' + description = lib.mdDoc '' The level of niceness to use. ''; }; @@ -83,7 +83,7 @@ in { hostname = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Hostname of the daemon in the icecream infrastructure. Uses the hostname retrieved via uname if set to null. @@ -93,7 +93,7 @@ in { user = mkOption { type = types.str; default = "icecc"; - description = '' + description = lib.mdDoc '' User to run the icecream daemon as. Set to root to enable receive of remote compile environments. ''; @@ -103,13 +103,13 @@ in { default = pkgs.icecream; defaultText = literalExpression "pkgs.icecream"; type = types.package; - description = "Icecream package to use."; + description = lib.mdDoc "Icecream package to use."; }; extraArgs = mkOption { type = types.listOf types.str; default = []; - description = "Additional command line parameters."; + description = lib.mdDoc "Additional command line parameters."; example = [ "-v" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix b/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix index 14fbc966b9..51f3988fe5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/icecream/scheduler.nix @@ -16,7 +16,7 @@ in { netName = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Network name for the icecream scheduler. Uses the default ICECREAM if null. @@ -26,14 +26,14 @@ in { port = mkOption { type = types.port; default = 8765; - description = '' + description = lib.mdDoc '' Server port to listen for icecream daemon requests. ''; }; openFirewall = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Whether to automatically open the daemon port in the firewall. ''; }; @@ -41,7 +41,7 @@ in { openTelnet = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open the telnet TCP port on 8766. ''; }; @@ -49,7 +49,7 @@ in { persistentClientConnection = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to prevent clients from connecting to a better scheduler. ''; }; @@ -58,13 +58,13 @@ in { default = pkgs.icecream; defaultText = literalExpression "pkgs.icecream"; type = types.package; - description = "Icecream package to use."; + description = lib.mdDoc "Icecream package to use."; }; extraArgs = mkOption { type = types.listOf types.str; default = []; - description = "Additional command line parameters"; + description = lib.mdDoc "Additional command line parameters"; example = [ "-v" ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix b/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix index 81c367ec8f..f2464b9a11 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/inspircd.nix @@ -19,10 +19,10 @@ in { default = pkgs.inspircd; defaultText = lib.literalExpression "pkgs.inspircd"; example = lib.literalExpression "pkgs.inspircdMinimal"; - description = '' + description = lib.mdDoc '' The InspIRCd package to use. This is mainly useful to specify an overridden version of the - pkgs.inspircd dervivation, for + `pkgs.inspircd` dervivation, for example if you want to use a more minimal InspIRCd distribution with less modules enabled or with modules enabled which can't be distributed in binary @@ -32,13 +32,13 @@ in { config = lib.mkOption { type = lib.types.lines; - description = '' - Verbatim inspircd.conf file. + description = lib.mdDoc '' + Verbatim `inspircd.conf` file. For a list of options, consult the - InspIRCd documentation, the - Module documentation + [InspIRCd documentation](https://docs.inspircd.org/3/configuration/), the + [Module documentation](https://docs.inspircd.org/3/modules/) and the example configuration files distributed - with pkgs.inspircd.doc + with `pkgs.inspircd.doc` ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iodine.nix b/third_party/nixpkgs/nixos/modules/services/networking/iodine.nix index e241afe326..ea2fa3ac4b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/iodine.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/iodine.nix @@ -28,12 +28,12 @@ in services.iodine = { clients = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Each attribute of this option defines a systemd service that runs iodine. Many or none may be defined. The name of each service is - iodine-name - where name is the name of the + `iodine-«name»` + where «name» is the name of the corresponding attribute name. ''; example = literalExpression '' @@ -52,28 +52,28 @@ in server = mkOption { type = types.str; default = ""; - description = "Hostname of server running iodined"; + description = lib.mdDoc "Hostname of server running iodined"; example = "tunnel.mydomain.com"; }; relay = mkOption { type = types.str; default = ""; - description = "DNS server to use as an intermediate relay to the iodined server"; + description = lib.mdDoc "DNS server to use as an intermediate relay to the iodined server"; example = "8.8.8.8"; }; extraConfig = mkOption { type = types.str; default = ""; - description = "Additional command line parameters"; + description = lib.mdDoc "Additional command line parameters"; example = "-l 192.168.1.10 -p 23"; }; passwordFile = mkOption { type = types.str; default = ""; - description = "Path to a file containing the password."; + description = lib.mdDoc "Path to a file containing the password."; }; }; } @@ -85,34 +85,34 @@ in enable = mkOption { type = types.bool; default = false; - description = "enable iodined server"; + description = lib.mdDoc "enable iodined server"; }; ip = mkOption { type = types.str; default = ""; - description = "The assigned ip address or ip range"; + description = lib.mdDoc "The assigned ip address or ip range"; example = "172.16.10.1/24"; }; domain = mkOption { type = types.str; default = ""; - description = "Domain or subdomain of which nameservers point to us"; + description = lib.mdDoc "Domain or subdomain of which nameservers point to us"; example = "tunnel.mydomain.com"; }; extraConfig = mkOption { type = types.str; default = ""; - description = "Additional command line parameters"; + description = lib.mdDoc "Additional command line parameters"; example = "-l 192.168.1.10 -p 23"; }; passwordFile = mkOption { type = types.str; default = ""; - description = "File that contains password"; + description = lib.mdDoc "File that contains password"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iperf3.nix b/third_party/nixpkgs/nixos/modules/services/networking/iperf3.nix index 0fe378b225..0c308f8e7c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/iperf3.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/iperf3.nix @@ -7,52 +7,52 @@ let port = mkOption { type = types.ints.u16; default = 5201; - description = "Server port to listen on for iperf3 client requsts."; + description = lib.mdDoc "Server port to listen on for iperf3 client requsts."; }; affinity = mkOption { type = types.nullOr types.ints.unsigned; default = null; - description = "CPU affinity for the process."; + description = lib.mdDoc "CPU affinity for the process."; }; bind = mkOption { type = types.nullOr types.str; default = null; - description = "Bind to the specific interface associated with the given address."; + description = lib.mdDoc "Bind to the specific interface associated with the given address."; }; openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for iperf3."; + description = lib.mdDoc "Open ports in the firewall for iperf3."; }; verbose = mkOption { type = types.bool; default = false; - description = "Give more detailed output."; + description = lib.mdDoc "Give more detailed output."; }; forceFlush = mkOption { type = types.bool; default = false; - description = "Force flushing output at every interval."; + description = lib.mdDoc "Force flushing output at every interval."; }; debug = mkOption { type = types.bool; default = false; - description = "Emit debugging output."; + description = lib.mdDoc "Emit debugging output."; }; rsaPrivateKey = mkOption { type = types.nullOr types.path; default = null; - description = "Path to the RSA private key (not password-protected) used to decrypt authentication credentials from the client."; + description = lib.mdDoc "Path to the RSA private key (not password-protected) used to decrypt authentication credentials from the client."; }; authorizedUsersFile = mkOption { type = types.nullOr types.path; default = null; - description = "Path to the configuration file containing authorized users credentials to run iperf tests."; + description = lib.mdDoc "Path to the configuration file containing authorized users credentials to run iperf tests."; }; extraFlags = mkOption { type = types.listOf types.str; default = [ ]; - description = "Extra flags to pass to iperf3(1)."; + description = lib.mdDoc "Extra flags to pass to iperf3(1)."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix index 051c9c7bff..7414a705a2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/initiator.nix @@ -12,16 +12,16 @@ in discoverPortal = mkOption { type = nullOr str; default = null; - description = "Portal to discover targets on"; + description = lib.mdDoc "Portal to discover targets on"; }; name = mkOption { type = str; - description = "Name of this iscsi initiator"; + description = lib.mdDoc "Name of this iscsi initiator"; example = "iqn.2020-08.org.linux-iscsi.initiatorhost:example"; }; package = mkOption { type = package; - description = "openiscsi package to use"; + description = lib.mdDoc "openiscsi package to use"; default = pkgs.openiscsi; defaultText = literalExpression "pkgs.openiscsi"; }; @@ -29,11 +29,11 @@ in extraConfig = mkOption { type = str; default = ""; - description = "Lines to append to default iscsid.conf"; + description = lib.mdDoc "Lines to append to default iscsid.conf"; }; extraConfigFile = mkOption { - description = '' + description = lib.mdDoc '' Append an additional file's contents to /etc/iscsid.conf. Use a non-store path and store passwords in this file. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix index c12aca1bc2..b55fda6725 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/root-initiator.nix @@ -19,7 +19,7 @@ in # machines to be up. options.boot.iscsi-initiator = with types; { name = mkOption { - description = '' + description = lib.mdDoc '' Name of the iSCSI initiator to boot from. Note, booting from iscsi requires networkd based networking. ''; @@ -29,7 +29,7 @@ in }; discoverPortal = mkOption { - description = '' + description = lib.mdDoc '' iSCSI portal to boot from. ''; default = null; @@ -38,7 +38,7 @@ in }; target = mkOption { - description = '' + description = lib.mdDoc '' Name of the iSCSI target to boot from. ''; default = null; @@ -47,7 +47,7 @@ in }; logLevel = mkOption { - description = '' + description = lib.mdDoc '' Higher numbers elicits more logs. ''; default = 1; @@ -56,7 +56,7 @@ in }; loginAll = mkOption { - description = '' + description = lib.mdDoc '' Do not log into a specific target on the portal, but to all that we discover. This overrides setting target. ''; @@ -65,13 +65,13 @@ in }; extraIscsiCommands = mkOption { - description = "Extra iscsi commands to run in the initrd."; + description = lib.mdDoc "Extra iscsi commands to run in the initrd."; default = ""; type = lines; }; extraConfig = mkOption { - description = "Extra lines to append to /etc/iscsid.conf"; + description = lib.mdDoc "Extra lines to append to /etc/iscsid.conf"; default = null; type = nullOr lines; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/target.nix b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/target.nix index 8a10e7d346..5bdac4336c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/iscsi/target.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/iscsi/target.nix @@ -14,7 +14,7 @@ in config = mkOption { type = attrs; default = {}; - description = '' + description = lib.mdDoc '' Content of /etc/target/saveconfig.json This file is normally read and written by targetcli ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/iwd.nix b/third_party/nixpkgs/nixos/modules/services/networking/iwd.nix index 5c1480e7e2..4921fe2c76 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/iwd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/iwd.nix @@ -32,9 +32,9 @@ in }; }; - description = '' + description = lib.mdDoc '' Options passed to iwd. - See here for supported options. + See [here](https://iwd.wiki.kernel.org/networkconfigurationsettings) for supported options. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/jibri/default.nix b/third_party/nixpkgs/nixos/modules/services/networking/jibri/default.nix index 113a7aa438..4ac5bae22c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/jibri/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/jibri/default.nix @@ -93,9 +93,9 @@ in config = mkOption { type = attrs; default = { }; - description = '' + description = lib.mdDoc '' Jibri configuration. - See + See for default configuration with comments. ''; }; @@ -136,7 +136,7 @@ in exit 0 ''''''; ''; - description = '' + description = lib.mdDoc '' This script runs when jibri finishes recording a video of a conference. ''; }; @@ -145,14 +145,14 @@ in type = bool; default = false; example = true; - description = '' + description = lib.mdDoc '' Whether to enable the flag "--ignore-certificate-errors" for the Chromium browser opened by Jibri. Intended for use in automated tests or anywhere else where using a verified cert for Jitsi-Meet is not possible. ''; }; xmppEnvironments = mkOption { - description = '' + description = lib.mdDoc '' XMPP servers to connect to. ''; example = literalExpression '' @@ -189,54 +189,54 @@ in xmppServerHosts = mkOption { type = listOf str; example = [ "xmpp.example.org" ]; - description = '' + description = lib.mdDoc '' Hostnames of the XMPP servers to connect to. ''; }; xmppDomain = mkOption { type = str; example = "xmpp.example.org"; - description = '' + description = lib.mdDoc '' The base XMPP domain. ''; }; control.muc.domain = mkOption { type = str; - description = '' + description = lib.mdDoc '' The domain part of the MUC to connect to for control. ''; }; control.muc.roomName = mkOption { type = str; default = "JibriBrewery"; - description = '' + description = lib.mdDoc '' The room name of the MUC to connect to for control. ''; }; control.muc.nickname = mkOption { type = str; default = "jibri"; - description = '' + description = lib.mdDoc '' The nickname for this Jibri instance in the MUC. ''; }; control.login.domain = mkOption { type = str; - description = '' + description = lib.mdDoc '' The domain part of the JID for this Jibri instance. ''; }; control.login.username = mkOption { type = str; default = "jvb"; - description = '' + description = lib.mdDoc '' User part of the JID. ''; }; control.login.passwordFile = mkOption { type = str; example = "/run/keys/jibri-xmpp1"; - description = '' + description = lib.mdDoc '' File containing the password for the user. ''; }; @@ -244,28 +244,28 @@ in call.login.domain = mkOption { type = str; example = "recorder.xmpp.example.org"; - description = '' + description = lib.mdDoc '' The domain part of the JID for the recorder. ''; }; call.login.username = mkOption { type = str; default = "recorder"; - description = '' + description = lib.mdDoc '' User part of the JID for the recorder. ''; }; call.login.passwordFile = mkOption { type = str; example = "/run/keys/jibri-recorder-xmpp1"; - description = '' + description = lib.mdDoc '' File containing the password for the user. ''; }; disableCertificateVerification = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' Whether to skip validation of the server's certificate. ''; }; @@ -274,7 +274,7 @@ in type = str; default = "0"; example = "conference."; - description = '' + description = lib.mdDoc '' The prefix to strip from the room's JID domain to derive the call URL. ''; }; @@ -282,7 +282,7 @@ in type = str; default = "0"; example = "1 hour"; - description = '' + description = lib.mdDoc '' The duration that the Jibri session can be. A value of zero means indefinitely. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/jicofo.nix b/third_party/nixpkgs/nixos/modules/services/networking/jicofo.nix index 647119b903..3b9038f567 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/jicofo.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/jicofo.nix @@ -12,7 +12,7 @@ in xmppHost = mkOption { type = str; example = "localhost"; - description = '' + description = lib.mdDoc '' Hostname of the XMPP server to connect to. ''; }; @@ -20,17 +20,17 @@ in xmppDomain = mkOption { type = nullOr str; example = "meet.example.org"; - description = '' + description = lib.mdDoc '' Domain name of the XMMP server to which to connect as a component. - If null, is used. + If null, {option}`xmppHost` is used. ''; }; componentPasswordFile = mkOption { type = str; example = "/run/keys/jicofo-component"; - description = '' + description = lib.mdDoc '' Path to file containing component secret. ''; }; @@ -38,7 +38,7 @@ in userName = mkOption { type = str; default = "focus"; - description = '' + description = lib.mdDoc '' User part of the JID for XMPP user connection. ''; }; @@ -46,7 +46,7 @@ in userDomain = mkOption { type = str; example = "auth.meet.example.org"; - description = '' + description = lib.mdDoc '' Domain part of the JID for XMPP user connection. ''; }; @@ -54,7 +54,7 @@ in userPasswordFile = mkOption { type = str; example = "/run/keys/jicofo-user"; - description = '' + description = lib.mdDoc '' Path to file containing password for XMPP user connection. ''; }; @@ -62,7 +62,7 @@ in bridgeMuc = mkOption { type = str; example = "jvbbrewery@internal.meet.example.org"; - description = '' + description = lib.mdDoc '' JID of the internal MUC used to communicate with Videobridges. ''; }; @@ -75,8 +75,8 @@ in "org.jitsi.jicofo.auth.URL" = "XMPP:jitsi-meet.example.com"; } ''; - description = '' - Contents of the sip-communicator.properties configuration file for jicofo. + description = lib.mdDoc '' + Contents of the {file}`sip-communicator.properties` configuration file for jicofo. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix b/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix index abb0bd0a25..36e7616d75 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/jitsi-videobridge.nix @@ -67,19 +67,19 @@ in }; } ''; - description = '' + description = lib.mdDoc '' Videobridge configuration. - See + See for default configuration with comments. ''; }; xmppConfigs = mkOption { - description = '' + description = lib.mdDoc '' XMPP servers to connect to. - See for more information. + See for more information. ''; default = { }; example = literalExpression '' @@ -98,7 +98,7 @@ in hostName = mkOption { type = str; example = "xmpp.example.org"; - description = '' + description = lib.mdDoc '' Hostname of the XMPP server to connect to. Name of the attribute set is used by default. ''; }; @@ -106,35 +106,35 @@ in type = nullOr str; default = null; example = "auth.xmpp.example.org"; - description = '' + description = lib.mdDoc '' Domain part of JID of the XMPP user, if it is different from hostName. ''; }; userName = mkOption { type = str; default = "jvb"; - description = '' + description = lib.mdDoc '' User part of the JID. ''; }; passwordFile = mkOption { type = str; example = "/run/keys/jitsi-videobridge-xmpp1"; - description = '' + description = lib.mdDoc '' File containing the password for the user. ''; }; mucJids = mkOption { type = str; example = "jvbbrewery@internal.xmpp.example.org"; - description = '' + description = lib.mdDoc '' JID of the MUC to join. JiCoFo needs to be configured to join the same MUC. ''; }; mucNickname = mkOption { # Upstream DEBs use UUID, let's use hostname instead. type = str; - description = '' + description = lib.mdDoc '' Videobridges use the same XMPP account and need to be distinguished by the nickname (aka resource part of the JID). By default, system hostname is used. ''; @@ -142,7 +142,7 @@ in disableCertificateVerification = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' Whether to skip validation of the server's certificate. ''; }; @@ -161,7 +161,7 @@ in type = nullOr str; default = null; example = "192.168.1.42"; - description = '' + description = lib.mdDoc '' Local address when running behind NAT. ''; }; @@ -170,7 +170,7 @@ in type = nullOr str; default = null; example = "1.2.3.4"; - description = '' + description = lib.mdDoc '' Public address when running behind NAT. ''; }; @@ -179,7 +179,7 @@ in extraProperties = mkOption { type = attrsOf str; default = { }; - description = '' + description = lib.mdDoc '' Additional Java properties passed to jitsi-videobridge. ''; }; @@ -187,14 +187,14 @@ in openFirewall = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open ports in the firewall for the videobridge. ''; }; apis = mkOption { type = with types; listOf str; - description = '' + description = lib.mdDoc '' What is passed as --apis= parameter. If this is empty, "none" is passed. Needed for monitoring jitsi. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kea.nix b/third_party/nixpkgs/nixos/modules/services/networking/kea.nix index 994c511bdc..d674a97391 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/kea.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/kea.nix @@ -35,7 +35,7 @@ in { options.services.kea = with types; { ctrl-agent = mkOption { - description = '' + description = lib.mdDoc '' Kea Control Agent configuration ''; default = {}; @@ -46,7 +46,7 @@ in extraArgs = mkOption { type = listOf str; default = []; - description = '' + description = lib.mdDoc '' List of additonal arguments to pass to the daemon. ''; }; @@ -54,19 +54,19 @@ in configFile = mkOption { type = nullOr path; default = null; - description = '' - Kea Control Agent configuration as a path, see . + description = lib.mdDoc '' + Kea Control Agent configuration as a path, see . - Takes preference over settings. - Most users should prefer using settings instead. + Takes preference over [settings](#opt-services.kea.ctrl-agent.settings). + Most users should prefer using [settings](#opt-services.kea.ctrl-agent.settings) instead. ''; }; settings = mkOption { type = format.type; default = null; - description = '' - Kea Control Agent configuration as an attribute set, see . + description = lib.mdDoc '' + Kea Control Agent configuration as an attribute set, see . ''; }; }; @@ -74,7 +74,7 @@ in }; dhcp4 = mkOption { - description = '' + description = lib.mdDoc '' DHCP4 Server configuration ''; default = {}; @@ -85,7 +85,7 @@ in extraArgs = mkOption { type = listOf str; default = []; - description = '' + description = lib.mdDoc '' List of additonal arguments to pass to the daemon. ''; }; @@ -93,11 +93,11 @@ in configFile = mkOption { type = nullOr path; default = null; - description = '' - Kea DHCP4 configuration as a path, see . + description = lib.mdDoc '' + Kea DHCP4 configuration as a path, see . - Takes preference over settings. - Most users should prefer using settings instead. + Takes preference over [settings](#opt-services.kea.dhcp4.settings). + Most users should prefer using [settings](#opt-services.kea.dhcp4.settings) instead. ''; }; @@ -125,8 +125,8 @@ in } ]; } ]; }; - description = '' - Kea DHCP4 configuration as an attribute set, see . + description = lib.mdDoc '' + Kea DHCP4 configuration as an attribute set, see . ''; }; }; @@ -134,7 +134,7 @@ in }; dhcp6 = mkOption { - description = '' + description = lib.mdDoc '' DHCP6 Server configuration ''; default = {}; @@ -145,7 +145,7 @@ in extraArgs = mkOption { type = listOf str; default = []; - description = '' + description = lib.mdDoc '' List of additonal arguments to pass to the daemon. ''; }; @@ -153,11 +153,11 @@ in configFile = mkOption { type = nullOr path; default = null; - description = '' - Kea DHCP6 configuration as a path, see . + description = lib.mdDoc '' + Kea DHCP6 configuration as a path, see . - Takes preference over settings. - Most users should prefer using settings instead. + Takes preference over [settings](#opt-services.kea.dhcp6.settings). + Most users should prefer using [settings](#opt-services.kea.dhcp6.settings) instead. ''; }; @@ -186,8 +186,8 @@ in } ]; } ]; }; - description = '' - Kea DHCP6 configuration as an attribute set, see . + description = lib.mdDoc '' + Kea DHCP6 configuration as an attribute set, see . ''; }; }; @@ -195,7 +195,7 @@ in }; dhcp-ddns = mkOption { - description = '' + description = lib.mdDoc '' Kea DHCP-DDNS configuration ''; default = {}; @@ -206,7 +206,7 @@ in extraArgs = mkOption { type = listOf str; default = []; - description = '' + description = lib.mdDoc '' List of additonal arguments to pass to the daemon. ''; }; @@ -214,11 +214,11 @@ in configFile = mkOption { type = nullOr path; default = null; - description = '' - Kea DHCP-DDNS configuration as a path, see . + description = lib.mdDoc '' + Kea DHCP-DDNS configuration as a path, see . - Takes preference over settings. - Most users should prefer using settings instead. + Takes preference over [settings](#opt-services.kea.dhcp-ddns.settings). + Most users should prefer using [settings](#opt-services.kea.dhcp-ddns.settings) instead. ''; }; @@ -239,8 +239,8 @@ in ddns-domains = [ ]; }; }; - description = '' - Kea DHCP-DDNS configuration as an attribute set, see . + description = lib.mdDoc '' + Kea DHCP-DDNS configuration as an attribute set, see . ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/keybase.nix b/third_party/nixpkgs/nixos/modules/services/networking/keybase.nix index 495102cb7e..ae10aebb86 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/keybase.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/keybase.nix @@ -14,7 +14,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to start the Keybase service."; + description = lib.mdDoc "Whether to start the Keybase service."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/knot.nix b/third_party/nixpkgs/nixos/modules/services/networking/knot.nix index a58a03997b..20f11f0cd5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/knot.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/knot.nix @@ -42,7 +42,7 @@ in { extraArgs = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' List of additional command line paramters for knotd ''; }; @@ -50,7 +50,7 @@ in { keyFiles = mkOption { type = types.listOf types.path; default = []; - description = '' + description = lib.mdDoc '' A list of files containing additional configuration to be included using the include directive. This option allows to include configuration like TSIG keys without @@ -63,7 +63,7 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra lines to be added verbatim to knot.conf ''; }; @@ -72,7 +72,7 @@ in { type = types.package; default = pkgs.knot-dns; defaultText = literalExpression "pkgs.knot-dns"; - description = '' + description = lib.mdDoc '' Which Knot DNS package to use ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix index 28b8be7a9a..623e477ca7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/kresd.nix @@ -50,10 +50,10 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable knot-resolver domain name server. DNSSEC validation is turned on by default. - You can run sudo nc -U /run/knot-resolver/control/1 + You can run `sudo nc -U /run/knot-resolver/control/1` and give commands interactively to kresd@1.service. ''; }; @@ -69,7 +69,7 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra lines to be added verbatim to the generated configuration file. ''; }; @@ -77,7 +77,7 @@ in { type = with types; listOf str; default = [ "[::1]:53" "127.0.0.1:53" ]; example = [ "53" ]; - description = '' + description = lib.mdDoc '' What addresses and ports the server should listen on. For detailed syntax see ListenStream in man systemd.socket. ''; @@ -86,7 +86,7 @@ in { type = with types; listOf str; default = []; example = [ "198.51.100.1:853" "[2001:db8::1]:853" "853" ]; - description = '' + description = lib.mdDoc '' Addresses and ports on which kresd should provide DNS over TLS (see RFC 7858). For detailed syntax see ListenStream in man systemd.socket. ''; @@ -95,7 +95,7 @@ in { type = with types; listOf str; default = []; example = [ "198.51.100.1:443" "[2001:db8::1]:443" "443" ]; - description = '' + description = lib.mdDoc '' Addresses and ports on which kresd should provide DNS over HTTPS/2 (see RFC 8484). For detailed syntax see ListenStream in man systemd.socket. ''; @@ -103,7 +103,7 @@ in { instances = mkOption { type = types.ints.unsigned; default = 1; - description = '' + description = lib.mdDoc '' The number of instances to start. They will be called kresd@{1,2,...}.service. Knot Resolver uses no threads, so this is the way to scale. You can dynamically start/stop them at will, so this is just system default. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/lambdabot.nix b/third_party/nixpkgs/nixos/modules/services/networking/lambdabot.nix index 3005e58245..8609bc9719 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/lambdabot.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/lambdabot.nix @@ -21,20 +21,20 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the Lambdabot IRC bot"; + description = lib.mdDoc "Enable the Lambdabot IRC bot"; }; package = mkOption { type = types.package; default = pkgs.lambdabot; defaultText = literalExpression "pkgs.lambdabot"; - description = "Used lambdabot package"; + description = lib.mdDoc "Used lambdabot package"; }; script = mkOption { type = types.str; default = ""; - description = "Lambdabot script"; + description = lib.mdDoc "Lambdabot script"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix index 429167aed9..08ffcca8a5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/libreswan.nix @@ -60,7 +60,7 @@ in protostack=netkey virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12,%v4:25.0.0.0/8,%v4:100.64.0.0/10,%v6:fd00::/8,%v6:fe80::/10 ''; - description = "Options to go in the 'config setup' section of the Libreswan IPsec configuration"; + description = lib.mdDoc "Options to go in the 'config setup' section of the Libreswan IPsec configuration"; }; connections = mkOption { @@ -79,7 +79,7 @@ in '''; } ''; - description = "A set of connections to define for the Libreswan IPsec service"; + description = lib.mdDoc "A set of connections to define for the Libreswan IPsec service"; }; policies = mkOption { @@ -105,10 +105,10 @@ in disableRedirects = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to disable send and accept redirects for all nework interfaces. - See the Libreswan - FAQ page for why this is recommended. + See the Libreswan [ + FAQ](https://libreswan.org/wiki/FAQ#Why_is_it_recommended_to_disable_send_redirects_in_.2Fproc.2Fsys.2Fnet_.3F) page for why this is recommended. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/lldpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/lldpd.nix index d5de9c45d8..41a3713fce 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/lldpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/lldpd.nix @@ -15,7 +15,7 @@ in type = types.listOf types.str; default = []; example = [ "-c" "-k" "-I eth0" ]; - description = "List of command line parameters for lldpd"; + description = lib.mdDoc "List of command line parameters for lldpd"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/logmein-hamachi.nix b/third_party/nixpkgs/nixos/modules/services/networking/logmein-hamachi.nix index 11cbdda2f8..7c00b82e3b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/logmein-hamachi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/logmein-hamachi.nix @@ -18,7 +18,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Whether to enable LogMeIn Hamachi, a proprietary (closed source) commercial VPN software. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/lokinet.nix b/third_party/nixpkgs/nixos/modules/services/networking/lokinet.nix index cf091341c8..6dc33faa82 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/lokinet.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/lokinet.nix @@ -13,14 +13,14 @@ in with lib; { type = types.package; default = pkgs.lokinet; defaultText = literalExpression "pkgs.lokinet"; - description = "Lokinet package to use."; + description = lib.mdDoc "Lokinet package to use."; }; useLocally = mkOption { type = types.bool; default = false; example = true; - description = "Whether to use Lokinet locally."; + description = lib.mdDoc "Whether to use Lokinet locally."; }; settings = mkOption { @@ -33,14 +33,14 @@ in with lib; { bind = mkOption { type = str; default = "127.3.2.1"; - description = "Address to bind to for handling DNS requests."; + description = lib.mdDoc "Address to bind to for handling DNS requests."; }; upstream = mkOption { type = listOf str; default = [ "9.9.9.10" ]; example = [ "1.1.1.1" "8.8.8.8" ]; - description = '' + description = lib.mdDoc '' Upstream resolver(s) to use as fallback for non-loki addresses. Multiple values accepted. ''; @@ -51,7 +51,7 @@ in with lib; { exit = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' Whether to act as an exit node. Beware that this increases demand on the server and may pose liability concerns. Enable at your own risk. @@ -76,7 +76,7 @@ in with lib; { type = nullOr str; default = null; example = "snappkey.private"; - description = '' + description = lib.mdDoc '' The private key to persist address with. If not specified the address will be ephemeral. This keyfile is generated automatically if the specified file doesn't exist. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/lxd-image-server.nix b/third_party/nixpkgs/nixos/modules/services/networking/lxd-image-server.nix index d326626eed..44f93a5c56 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/lxd-image-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/lxd-image-server.nix @@ -15,17 +15,17 @@ in group = mkOption { type = types.str; - description = "Group assigned to the user and the webroot directory."; + description = lib.mdDoc "Group assigned to the user and the webroot directory."; default = "nginx"; example = "www-data"; }; settings = mkOption { type = format.type; - description = '' + description = lib.mdDoc '' Configuration for lxd-image-server. - Example see . + Example see . ''; default = {}; }; @@ -34,7 +34,7 @@ in enable = mkEnableOption "nginx"; domain = mkOption { type = types.str; - description = "Domain to use for nginx virtual host."; + description = lib.mdDoc "Domain to use for nginx virtual host."; example = "images.example.org"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/matterbridge.nix b/third_party/nixpkgs/nixos/modules/services/networking/matterbridge.nix index 9186eee26a..f75be9b4e3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/matterbridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/matterbridge.nix @@ -23,7 +23,7 @@ in type = with types; nullOr str; default = null; example = "/etc/nixos/matterbridge.toml"; - description = '' + description = lib.mdDoc '' The path to the matterbridge configuration file. ''; }; @@ -62,10 +62,10 @@ in account="mattermost.work" channel="off-topic" ''; - description = '' + description = lib.mdDoc '' WARNING: THIS IS INSECURE, as your password will end up in - /nix/store, thus publicly readable. Use - services.matterbridge.configPath instead. + {file}`/nix/store`, thus publicly readable. Use + `services.matterbridge.configPath` instead. The matterbridge configuration file in the TOML file format. ''; @@ -73,7 +73,7 @@ in user = mkOption { type = types.str; default = "matterbridge"; - description = '' + description = lib.mdDoc '' User which runs the matterbridge service. ''; }; @@ -81,7 +81,7 @@ in group = mkOption { type = types.str; default = "matterbridge"; - description = '' + description = lib.mdDoc '' Group which runs the matterbridge service. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix b/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix index 57c37718e7..0cac41f58d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix @@ -14,25 +14,25 @@ in options.services.minidlna.enable = mkOption { type = types.bool; default = false; - description = '' + 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 - adding the following: services.minidlna.openFirewall = true; + adding the following: `services.minidlna.openFirewall = true;` ''; }; options.services.minidlna.openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open both HTTP (TCP) and SSDP (UDP) ports in the firewall. ''; }; options.services.minidlna.settings = mkOption { default = {}; - description = '' + description = lib.mdDoc '' The contents of MiniDLNA's configuration file. When the service is activated, a basic template is generated from the current options opened here. @@ -44,21 +44,21 @@ in type = types.listOf types.str; default = []; example = [ "/data/media" "V,/home/alice/video" ]; - description = '' + description = lib.mdDoc '' Directories to be scanned for media files. - The prefixes A,,V, and - P, restrict a directory to audio, video + The prefixes `A,`,`V,` and + `P,` restrict a directory to audio, video or image files. The directories must be accessible to the - minidlna user account. + `minidlna` user account. ''; }; options.notify_interval = mkOption { type = types.int; default = 90000; - description = '' + description = lib.mdDoc '' The interval between announces (in seconds). Instead of waiting on announces, one can open port UDP 1900 or - set openFirewall option to use SSDP discovery. + set `openFirewall` option to use SSDP discovery. Furthermore announce interval has now been set as 90000 in order to prevent disconnects with certain clients and to rely solely on the SSDP method. @@ -76,47 +76,47 @@ in options.port = mkOption { type = types.port; default = 8200; - description = "Port number for HTTP traffic (descriptions, SOAP, media transfer)."; + description = lib.mdDoc "Port number for HTTP traffic (descriptions, SOAP, media transfer)."; }; options.db_dir = mkOption { type = types.path; default = "/var/cache/minidlna"; example = "/tmp/minidlna"; - description = "Specify the directory where you want MiniDLNA to store its database and album art cache."; + description = lib.mdDoc "Specify the directory where you want MiniDLNA to store its database and album art cache."; }; options.friendly_name = mkOption { type = types.str; default = "${config.networking.hostName} MiniDLNA"; defaultText = literalExpression "config.networking.hostName"; example = "rpi3"; - description = "Name that the DLNA server presents to clients."; + description = lib.mdDoc "Name that the DLNA server presents to clients."; }; options.root_container = mkOption { type = types.str; default = "."; example = "B"; - description = "Use a different container as the root of the directory tree presented to clients."; + description = lib.mdDoc "Use a different container as the root of the directory tree presented to clients."; }; options.log_level = mkOption { type = types.str; default = "warn"; example = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn"; - description = "Defines the type of messages that should be logged and down to which level of importance."; + description = lib.mdDoc "Defines the type of messages that should be logged and down to which level of importance."; }; options.inotify = mkOption { type = types.enum [ "yes" "no" ]; default = "no"; - description = "Whether to enable inotify monitoring to automatically discover new files."; + description = lib.mdDoc "Whether to enable inotify monitoring to automatically discover new files."; }; options.enable_tivo = mkOption { type = types.enum [ "yes" "no" ]; default = "no"; - description = "Support for streaming .jpg and .mp3 files to a TiVo supporting HMO."; + description = lib.mdDoc "Support for streaming .jpg and .mp3 files to a TiVo supporting HMO."; }; options.wide_links = mkOption { type = types.enum [ "yes" "no" ]; default = "no"; - description = "Set this to yes to allow symlinks that point outside user-defined media_dirs."; + description = lib.mdDoc "Set this to yes to allow symlinks that point outside user-defined media_dirs."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/miniupnpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/miniupnpd.nix index c095d99485..524270edd1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/miniupnpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/miniupnpd.nix @@ -23,7 +23,7 @@ in externalInterface = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Name of the external interface. ''; }; @@ -31,7 +31,7 @@ in internalIPs = mkOption { type = types.listOf types.str; example = [ "192.168.1.1/24" "enp1s0" ]; - description = '' + description = lib.mdDoc '' The IP address ranges to listen on. ''; }; @@ -41,7 +41,7 @@ in upnp = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable UPNP support. ''; }; @@ -49,7 +49,7 @@ in appendConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Configuration lines appended to the MiniUPnP config. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/miredo.nix b/third_party/nixpkgs/nixos/modules/services/networking/miredo.nix index b7f657efb7..5e42678c32 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/miredo.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/miredo.nix @@ -26,7 +26,7 @@ in type = types.package; default = pkgs.miredo; defaultText = literalExpression "pkgs.miredo"; - description = '' + description = lib.mdDoc '' The package to use for the miredo daemon's binary. ''; }; @@ -34,7 +34,7 @@ in serverAddress = mkOption { default = "teredo.remlab.net"; type = types.str; - description = '' + description = lib.mdDoc '' The hostname or primary IPv4 address of the Teredo server. This setting is required if Miredo runs as a Teredo client. "teredo.remlab.net" is an experimental service for testing only. @@ -45,7 +45,7 @@ in interfaceName = mkOption { default = "teredo"; type = types.str; - description = '' + description = lib.mdDoc '' Name of the network tunneling interface. ''; }; @@ -53,7 +53,7 @@ in bindAddress = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Depending on the local firewall/NAT rules, you might need to force Miredo to use a fixed UDP port and or IPv4 address. ''; @@ -62,7 +62,7 @@ in bindPort = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Depending on the local firewall/NAT rules, you might need to force Miredo to use a fixed UDP port and or IPv4 address. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mjpg-streamer.nix b/third_party/nixpkgs/nixos/modules/services/networking/mjpg-streamer.nix index dbc35e2e71..8b490f0248 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mjpg-streamer.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mjpg-streamer.nix @@ -17,7 +17,7 @@ in { inputPlugin = mkOption { type = types.str; default = "input_uvc.so"; - description = '' + description = lib.mdDoc '' Input plugin. See plugins documentation for more information. ''; }; @@ -25,8 +25,8 @@ in { outputPlugin = mkOption { type = types.str; default = "output_http.so -w @www@ -n -p 5050"; - description = '' - Output plugin. @www@ is substituted for default mjpg-streamer www directory. + description = lib.mdDoc '' + Output plugin. `@www@` is substituted for default mjpg-streamer www directory. See plugins documentation for more information. ''; }; @@ -34,13 +34,13 @@ in { user = mkOption { type = types.str; default = "mjpg-streamer"; - description = "mjpg-streamer user name."; + description = lib.mdDoc "mjpg-streamer user name."; }; group = mkOption { type = types.str; default = "video"; - description = "mjpg-streamer group name."; + description = lib.mdDoc "mjpg-streamer group name."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/monero.nix b/third_party/nixpkgs/nixos/modules/services/networking/monero.nix index 8bed89917c..032f6df4e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/monero.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/monero.nix @@ -55,7 +55,7 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/monero"; - description = '' + description = lib.mdDoc '' The directory where Monero stores its data files. ''; }; @@ -63,7 +63,7 @@ in mining.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to mine monero. ''; }; @@ -71,7 +71,7 @@ in mining.address = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Monero address where to send mining rewards. ''; }; @@ -79,16 +79,16 @@ in mining.threads = mkOption { type = types.addCheck types.int (x: x>=0); default = 0; - description = '' + description = lib.mdDoc '' Number of threads used for mining. - Set to 0 to use all available. + Set to `0` to use all available. ''; }; rpc.user = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' User name for RPC connections. ''; }; @@ -96,7 +96,7 @@ in rpc.password = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Password for RPC connections. ''; }; @@ -104,7 +104,7 @@ in rpc.address = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' IP address the RPC server will bind to. ''; }; @@ -112,7 +112,7 @@ in rpc.port = mkOption { type = types.port; default = 18081; - description = '' + description = lib.mdDoc '' Port the RPC server will bind to. ''; }; @@ -120,7 +120,7 @@ in rpc.restricted = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to restrict RPC to view only commands. ''; }; @@ -128,43 +128,43 @@ in limits.upload = mkOption { type = types.addCheck types.int (x: x>=-1); default = -1; - description = '' + description = lib.mdDoc '' Limit of the upload rate in kB/s. - Set to -1 to leave unlimited. + Set to `-1` to leave unlimited. ''; }; limits.download = mkOption { type = types.addCheck types.int (x: x>=-1); default = -1; - description = '' + description = lib.mdDoc '' Limit of the download rate in kB/s. - Set to -1 to leave unlimited. + Set to `-1` to leave unlimited. ''; }; limits.threads = mkOption { type = types.addCheck types.int (x: x>=0); default = 0; - description = '' + description = lib.mdDoc '' Maximum number of threads used for a parallel job. - Set to 0 to leave unlimited. + Set to `0` to leave unlimited. ''; }; limits.syncSize = mkOption { type = types.addCheck types.int (x: x>=0); default = 0; - description = '' + description = lib.mdDoc '' Maximum number of blocks to sync at once. - Set to 0 for adaptive. + Set to `0` for adaptive. ''; }; extraNodes = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' List of additional peer IP addresses to add to the local list. ''; }; @@ -172,7 +172,7 @@ in priorityNodes = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' List of peer IP addresses to connect to and attempt to keep the connection open. ''; @@ -190,7 +190,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra lines to be added verbatim to monerod configuration. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/morty.nix b/third_party/nixpkgs/nixos/modules/services/networking/morty.nix index dff2f482ca..cc5d7998f3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/morty.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/morty.nix @@ -22,43 +22,43 @@ in ipv6 = mkOption { type = types.bool; default = true; - description = "Allow IPv6 HTTP requests?"; + description = lib.mdDoc "Allow IPv6 HTTP requests?"; }; key = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' HMAC url validation key (hexadecimal encoded). Leave blank to disable. Without validation key, anyone can submit proxy requests. Leave blank to disable. - Generate with printf %s somevalue | openssl dgst -sha1 -hmac somekey + Generate with `printf %s somevalue | openssl dgst -sha1 -hmac somekey` ''; }; timeout = mkOption { type = types.int; default = 2; - description = "Request timeout in seconds."; + description = lib.mdDoc "Request timeout in seconds."; }; package = mkOption { type = types.package; default = pkgs.morty; defaultText = literalExpression "pkgs.morty"; - description = "morty package to use."; + description = lib.mdDoc "morty package to use."; }; port = mkOption { type = types.int; default = 3000; - description = "Listing port"; + description = lib.mdDoc "Listing port"; }; listenAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = "The address on which the service listens"; + description = lib.mdDoc "The address on which the service listens"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix index 70c6725d10..49f0cc9012 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix @@ -36,7 +36,7 @@ let password = mkOption { type = uniq (nullOr str); default = null; - description = '' + description = lib.mdDoc '' Specifies the (clear text) password for the MQTT User. ''; }; @@ -45,7 +45,7 @@ let type = uniq (nullOr types.path); example = "/path/to/file"; default = null; - description = '' + description = lib.mdDoc '' Specifies the path to a file containing the clear text password for the MQTT user. ''; @@ -77,7 +77,7 @@ let type = listOf str; example = [ "read A/B" "readwrite A/#" ]; default = []; - description = '' + description = lib.mdDoc '' Control client access to topics on the broker. ''; }; @@ -231,7 +231,7 @@ let options = { port = mkOption { type = port; - description = '' + description = lib.mdDoc '' Port to listen on. Must be set to 0 to listen on a unix domain socket. ''; default = 1883; @@ -259,7 +259,7 @@ let users = mkOption { type = attrsOf userOptions; example = { john = { password = "123456"; acl = [ "readwrite john/#" ]; }; }; - description = '' + description = lib.mdDoc '' A set of users and their passwords and ACLs. ''; default = {}; @@ -267,7 +267,7 @@ let omitPasswordAuth = mkOption { type = bool; - description = '' + description = lib.mdDoc '' Omits password checking, allowing anyone to log in with any user name unless other mandatory authentication methods (eg TLS client certificates) are configured. ''; @@ -276,7 +276,7 @@ let acl = mkOption { type = listOf str; - description = '' + description = lib.mdDoc '' Additional ACL items to prepend to the generated ACL file. ''; example = [ "pattern read #" "topic readwrite anon/report/#" ]; @@ -287,7 +287,7 @@ let type = submodule { freeformType = attrsOf optionType; }; - description = '' + description = lib.mdDoc '' Additional settings for this listener. ''; default = {}; @@ -354,14 +354,14 @@ let options = { address = mkOption { type = str; - description = '' + description = lib.mdDoc '' Address of the remote MQTT broker. ''; }; port = mkOption { type = port; - description = '' + description = lib.mdDoc '' Port of the remote MQTT broker. ''; default = 1883; @@ -369,17 +369,17 @@ let }; }); default = []; - description = '' + description = lib.mdDoc '' Remote endpoints for the bridge. ''; }; topics = mkOption { type = listOf str; - description = '' + description = lib.mdDoc '' Topic patterns to be shared between the two brokers. - Refer to the - mosquitto.conf documentation for details on the format. + Refer to the [ + mosquitto.conf documentation](https://mosquitto.org/man/mosquitto-conf-5.html) for details on the format. ''; default = []; example = [ "# both 2 local/topic/ remote/topic/" ]; @@ -389,7 +389,7 @@ let type = submodule { freeformType = attrsOf optionType; }; - description = '' + description = lib.mdDoc '' Additional settings for this bridge. ''; default = {}; @@ -449,7 +449,7 @@ let type = package; default = pkgs.mosquitto; defaultText = literalExpression "pkgs.mosquitto"; - description = '' + description = lib.mdDoc '' Mosquitto package to use. ''; }; @@ -457,7 +457,7 @@ let bridges = mkOption { type = attrsOf bridgeOptions; default = {}; - description = '' + description = lib.mdDoc '' Bridges to build to other MQTT brokers. ''; }; @@ -465,7 +465,7 @@ let listeners = mkOption { type = listOf listenerOptions; default = {}; - description = '' + description = lib.mdDoc '' Listeners to configure on this broker. ''; }; @@ -483,7 +483,7 @@ let logDest = mkOption { type = listOf (either path (enum [ "stdout" "stderr" "syslog" "topic" "dlt" ])); - description = '' + description = lib.mdDoc '' Destinations to send log messages to. ''; default = [ "stderr" ]; @@ -492,7 +492,7 @@ let logType = mkOption { type = listOf (enum [ "debug" "error" "warning" "notice" "information" "subscribe" "unsubscribe" "websockets" "none" "all" ]); - description = '' + description = lib.mdDoc '' Types of messages to log. ''; default = []; @@ -500,7 +500,7 @@ let persistence = mkOption { type = bool; - description = '' + description = lib.mdDoc '' Enable persistent storage of subscriptions and messages. ''; default = true; @@ -509,7 +509,7 @@ let dataDir = mkOption { default = "/var/lib/mosquitto"; type = types.path; - description = '' + description = lib.mdDoc '' The data directory. ''; }; @@ -518,7 +518,7 @@ let type = submodule { freeformType = attrsOf optionType; }; - description = '' + description = lib.mdDoc '' Global configuration options for the mosquitto broker. ''; default = {}; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mozillavpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/mozillavpn.nix index e35ba65314..71cbb04704 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mozillavpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mozillavpn.nix @@ -4,7 +4,7 @@ options.services.mozillavpn.enable = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the Mozilla VPN daemon. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mstpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/mstpd.nix index bd71010ce5..ba82c5ac82 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mstpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mstpd.nix @@ -9,7 +9,7 @@ with lib; enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable the multiple spanning tree protocol daemon. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix index d896f227b8..7ff1cb0b2d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mtprotoproxy.nix @@ -42,7 +42,7 @@ in port = mkOption { type = types.int; default = 3256; - description = '' + description = lib.mdDoc '' TCP port to accept mtproto connections on. ''; }; @@ -53,7 +53,7 @@ in tg = "00000000000000000000000000000000"; tg2 = "0123456789abcdef0123456789abcdef"; }; - description = '' + description = lib.mdDoc '' Allowed users and their secrets. A secret is a 32 characters long hex string. ''; }; @@ -61,7 +61,7 @@ in secureOnly = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Don't allow users to connect in non-secure mode (without random padding). ''; }; @@ -71,7 +71,7 @@ in default = null; # Taken from mtproxyproto's repo. example = "3c09c680b76ee91a4c25ad51f742267d"; - description = '' + description = lib.mdDoc '' Tag for advertising that can be obtained from @MTProxybot. ''; }; @@ -82,7 +82,7 @@ in example = { STATS_PRINT_PERIOD = 600; }; - description = '' + description = lib.mdDoc '' Extra configuration options for mtprotoproxy. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mtr-exporter.nix b/third_party/nixpkgs/nixos/modules/services/networking/mtr-exporter.nix index ca261074eb..b95af08d36 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mtr-exporter.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mtr-exporter.nix @@ -14,32 +14,32 @@ in { target = mkOption { type = types.str; example = "example.org"; - description = "Target to check using MTR."; + description = lib.mdDoc "Target to check using MTR."; }; interval = mkOption { type = types.int; default = 60; - description = "Interval between MTR checks in seconds."; + description = lib.mdDoc "Interval between MTR checks in seconds."; }; port = mkOption { type = types.port; default = 8080; - description = "Listen port for MTR exporter."; + description = lib.mdDoc "Listen port for MTR exporter."; }; address = mkOption { type = types.str; default = "127.0.0.1"; - description = "Listen address for MTR exporter."; + description = lib.mdDoc "Listen address for MTR exporter."; }; mtrFlags = mkOption { type = with types; listOf str; default = []; example = ["-G1"]; - description = "Additional flags to pass to MTR."; + description = lib.mdDoc "Additional flags to pass to MTR."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix index 9ec1ddc929..ca60682b4b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mullvad-vpn.nix @@ -7,9 +7,9 @@ with lib; options.services.mullvad-vpn.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This option enables Mullvad VPN daemon. - This sets to "loose", which might be undesirable for security. + This sets {option}`networking.firewall.checkReversePath` to "loose", which might be undesirable for security. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix b/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix index 1a44184ff6..3dc6be96e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/multipath.nix @@ -26,7 +26,7 @@ in { package = mkOption { type = package; - description = "multipath-tools package to use"; + description = lib.mdDoc "multipath-tools package to use"; default = pkgs.multipath-tools; defaultText = "pkgs.multipath-tools"; }; @@ -44,7 +44,7 @@ in { }, ... ] ''; - description = '' + description = lib.mdDoc '' This option allows you to define arrays for use in multipath groups. ''; @@ -54,62 +54,62 @@ in { vendor = mkOption { type = str; example = "COMPELNT"; - description = "Regular expression to match the vendor name"; + description = lib.mdDoc "Regular expression to match the vendor name"; }; product = mkOption { type = str; example = "Compellent Vol"; - description = "Regular expression to match the product name"; + description = lib.mdDoc "Regular expression to match the product name"; }; revision = mkOption { type = nullOr str; default = null; - description = "Regular expression to match the product revision"; + description = lib.mdDoc "Regular expression to match the product revision"; }; product_blacklist = mkOption { type = nullOr str; default = null; - description = "Products with the given vendor matching this string are blacklisted"; + description = lib.mdDoc "Products with the given vendor matching this string are blacklisted"; }; alias_prefix = mkOption { type = nullOr str; default = null; - description = "The user_friendly_names prefix to use for this device type, instead of the default mpath"; + description = lib.mdDoc "The user_friendly_names prefix to use for this device type, instead of the default mpath"; }; vpd_vendor = mkOption { type = nullOr str; default = null; - description = "The vendor specific vpd page information, using the vpd page abbreviation"; + description = lib.mdDoc "The vendor specific vpd page information, using the vpd page abbreviation"; }; hardware_handler = mkOption { type = nullOr (enum [ "emc" "rdac" "hp_sw" "alua" "ana" ]); default = null; - description = "The hardware handler to use for this device type"; + description = lib.mdDoc "The hardware handler to use for this device type"; }; # Optional arguments path_grouping_policy = mkOption { type = nullOr (enum [ "failover" "multibus" "group_by_serial" "group_by_prio" "group_by_node_name" ]); default = null; # real default: "failover" - description = "The default path grouping policy to apply to unspecified multipaths"; + description = lib.mdDoc "The default path grouping policy to apply to unspecified multipaths"; }; uid_attribute = mkOption { type = nullOr str; default = null; - description = "The udev attribute providing a unique path identifier (WWID)"; + description = lib.mdDoc "The udev attribute providing a unique path identifier (WWID)"; }; getuid_callout = mkOption { type = nullOr str; default = null; - description = '' + description = lib.mdDoc '' (Superseded by uid_attribute) The default program and args to callout to obtain a unique path identifier. Should be specified with an absolute path. ''; @@ -123,13 +123,13 @@ in { ''"historical-service-time 0"'' ]); default = null; # real default: "service-time 0" - description = "The default path selector algorithm to use; they are offered by the kernel multipath target"; + description = lib.mdDoc "The default path selector algorithm to use; they are offered by the kernel multipath target"; }; path_checker = mkOption { type = enum [ "readsector0" "tur" "emc_clariion" "hp_sw" "rdac" "directio" "cciss_tur" "none" ]; default = "tur"; - description = "The default method used to determine the paths state"; + description = lib.mdDoc "The default method used to determine the paths state"; }; prio = mkOption { @@ -138,31 +138,31 @@ in { "random" "weightedpath" "path_latency" "ana" "datacore" "iet" ]); default = null; # real default: "const" - description = "The name of the path priority routine"; + description = lib.mdDoc "The name of the path priority routine"; }; prio_args = mkOption { type = nullOr str; default = null; - description = "Arguments to pass to to the prio function"; + description = lib.mdDoc "Arguments to pass to to the prio function"; }; features = mkOption { type = nullOr str; default = null; - description = "Specify any device-mapper features to be used"; + description = lib.mdDoc "Specify any device-mapper features to be used"; }; failback = mkOption { type = nullOr str; default = null; # real default: "manual" - description = "Tell multipathd how to manage path group failback. Quote integers as strings"; + description = lib.mdDoc "Tell multipathd how to manage path group failback. Quote integers as strings"; }; rr_weight = mkOption { type = nullOr (enum [ "priorities" "uniform" ]); default = null; # real default: "uniform" - description = '' + description = lib.mdDoc '' If set to priorities the multipath configurator will assign path weights as "path prio * rr_min_io". ''; @@ -171,13 +171,13 @@ in { no_path_retry = mkOption { type = nullOr str; default = null; # real default: "fail" - description = "Specify what to do when all paths are down. Quote integers as strings"; + description = lib.mdDoc "Specify what to do when all paths are down. Quote integers as strings"; }; rr_min_io = mkOption { type = nullOr int; default = null; # real default: 1000 - description = '' + description = lib.mdDoc '' Number of I/O requests to route to a path before switching to the next in the same path group. This is only for Block I/O (BIO) based multipath and only apply to round-robin path_selector. @@ -187,7 +187,7 @@ in { rr_min_io_rq = mkOption { type = nullOr int; default = null; # real default: 1 - description = '' + description = lib.mdDoc '' Number of I/O requests to route to a path before switching to the next in the same path group. This is only for Request based multipath and only apply to round-robin path_selector. @@ -197,7 +197,7 @@ in { fast_io_fail_tmo = mkOption { type = nullOr str; default = null; # real default: 5 - description = '' + description = lib.mdDoc '' Specify the number of seconds the SCSI layer will wait after a problem has been detected on a FC remote port before failing I/O to devices on that remote port. This should be smaller than dev_loss_tmo. Setting this to "off" will disable @@ -208,7 +208,7 @@ in { dev_loss_tmo = mkOption { type = nullOr str; default = null; # real default: 600 - description = '' + description = lib.mdDoc '' Specify the number of seconds the SCSI layer will wait after a problem has been detected on a FC remote port before removing it from the system. This can be set to "infinity" which sets it to the max value of 2147483647 @@ -224,7 +224,7 @@ in { flush_on_last_del = mkOption { type = nullOr (enum [ "yes" "no" ]); default = null; # real default: "no" - description = '' + description = lib.mdDoc '' If set to "yes" multipathd will disable queueing when the last path to a device has been deleted. ''; @@ -233,7 +233,7 @@ in { user_friendly_names = mkOption { type = nullOr (enum [ "yes" "no" ]); default = null; # real default: "no" - description = '' + description = lib.mdDoc '' If set to "yes", using the bindings file /etc/multipath/bindings to assign a persistent and unique alias to the multipath, in the form of mpath. If set to "no" use the WWID as the alias. In either @@ -245,7 +245,7 @@ in { detect_prio = mkOption { type = nullOr (enum [ "yes" "no" ]); default = null; # real default: "yes" - description = '' + description = lib.mdDoc '' If set to "yes", multipath will try to detect if the device supports SCSI-3 ALUA. If so, the device will automatically use the sysfs prioritizer if the required sysf attributes access_state and @@ -257,7 +257,7 @@ in { detect_checker = mkOption { type = nullOr (enum [ "yes" "no" ]); default = null; # real default: "yes" - description = '' + description = lib.mdDoc '' If set to "yes", multipath will try to detect if the device supports SCSI-3 ALUA. If so, the device will automatically use the tur checker. If set to "no", the checker will be selected as usual. @@ -267,7 +267,7 @@ in { deferred_remove = mkOption { type = nullOr (enum [ "yes" "no" ]); default = null; # real default: "no" - description = '' + description = lib.mdDoc '' If set to "yes", multipathd will do a deferred remove instead of a regular remove when the last path device has been deleted. This means that if the multipath device is still in use, it will be freed when @@ -279,7 +279,7 @@ in { san_path_err_threshold = mkOption { type = nullOr str; default = null; - description = '' + description = lib.mdDoc '' If set to a value greater than 0, multipathd will watch paths and check how many times a path has been failed due to errors.If the number of failures on a particular path is greater then the san_path_err_threshold, @@ -292,7 +292,7 @@ in { san_path_err_forget_rate = mkOption { type = nullOr str; default = null; - description = '' + description = lib.mdDoc '' If set to a value greater than 0, multipathd will check whether the path failures has exceeded the san_path_err_threshold within this many checks i.e san_path_err_forget_rate. If so we will not reinstante the path till @@ -303,7 +303,7 @@ in { san_path_err_recovery_time = mkOption { type = nullOr str; default = null; - description = '' + description = lib.mdDoc '' If set to a value greater than 0, multipathd will make sure that when path failures has exceeded the san_path_err_threshold within san_path_err_forget_rate then the path will be placed in failed state @@ -316,61 +316,61 @@ in { marginal_path_err_sample_time = mkOption { type = nullOr int; default = null; - description = "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; + description = lib.mdDoc "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; }; marginal_path_err_rate_threshold = mkOption { type = nullOr int; default = null; - description = "The error rate threshold as a permillage (1/1000)"; + description = lib.mdDoc "The error rate threshold as a permillage (1/1000)"; }; marginal_path_err_recheck_gap_time = mkOption { type = nullOr str; default = null; - description = "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; + description = lib.mdDoc "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; }; marginal_path_double_failed_time = mkOption { type = nullOr str; default = null; - description = "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; + description = lib.mdDoc "One of the four parameters of supporting path check based on accounting IO error such as intermittent error"; }; delay_watch_checks = mkOption { type = nullOr str; default = null; - description = "This option is deprecated, and mapped to san_path_err_forget_rate"; + description = lib.mdDoc "This option is deprecated, and mapped to san_path_err_forget_rate"; }; delay_wait_checks = mkOption { type = nullOr str; default = null; - description = "This option is deprecated, and mapped to san_path_err_recovery_time"; + description = lib.mdDoc "This option is deprecated, and mapped to san_path_err_recovery_time"; }; skip_kpartx = mkOption { type = nullOr (enum [ "yes" "no" ]); default = null; # real default: "no" - description = "If set to yes, kpartx will not automatically create partitions on the device"; + description = lib.mdDoc "If set to yes, kpartx will not automatically create partitions on the device"; }; max_sectors_kb = mkOption { type = nullOr int; default = null; - description = "Sets the max_sectors_kb device parameter on all path devices and the multipath device to the specified value"; + description = lib.mdDoc "Sets the max_sectors_kb device parameter on all path devices and the multipath device to the specified value"; }; ghost_delay = mkOption { type = nullOr int; default = null; - description = "Sets the number of seconds that multipath will wait after creating a device with only ghost paths before marking it ready for use in systemd"; + description = lib.mdDoc "Sets the number of seconds that multipath will wait after creating a device with only ghost paths before marking it ready for use in systemd"; }; all_tg_pt = mkOption { type = nullOr str; default = null; - description = "Set the 'all targets ports' flag when registering keys with mpathpersist"; + description = lib.mdDoc "Set the 'all targets ports' flag when registering keys with mpathpersist"; }; }; @@ -380,7 +380,7 @@ in { defaults = mkOption { type = nullOr str; default = null; - description = '' + description = lib.mdDoc '' This section defines default values for attributes which are used whenever no values are given in the appropriate device or multipath sections. @@ -390,7 +390,7 @@ in { blacklist = mkOption { type = nullOr str; default = null; - description = '' + description = lib.mdDoc '' This section defines which devices should be excluded from the multipath topology discovery. ''; @@ -399,7 +399,7 @@ in { blacklist_exceptions = mkOption { type = nullOr str; default = null; - description = '' + description = lib.mdDoc '' This section defines which devices should be included in the multipath topology discovery, despite being listed in the blacklist section. @@ -409,7 +409,7 @@ in { overrides = mkOption { type = nullOr str; default = null; - description = '' + description = lib.mdDoc '' This section defines values for attributes that should override the device-specific settings for all devices. ''; @@ -418,13 +418,13 @@ in { extraConfig = mkOption { type = nullOr str; default = null; - description = "Lines to append to default multipath.conf"; + description = lib.mdDoc "Lines to append to default multipath.conf"; }; extraConfigFile = mkOption { type = nullOr str; default = null; - description = "Append an additional file's contents to /etc/multipath.conf"; + description = lib.mdDoc "Append an additional file's contents to /etc/multipath.conf"; }; pathGroups = mkOption { @@ -439,7 +439,7 @@ in { }, ... ] ''; - description = '' + description = lib.mdDoc '' This option allows you to define multipath groups as described in http://christophe.varoqui.free.fr/usage.html. ''; @@ -449,34 +449,34 @@ in { alias = mkOption { type = int; example = 1001234; - description = "The name of the multipath device"; + description = lib.mdDoc "The name of the multipath device"; }; wwid = mkOption { type = hexStr; example = "360080e500043b35c0123456789abcdef"; - description = "The identifier for the multipath device"; + description = lib.mdDoc "The identifier for the multipath device"; }; array = mkOption { type = str; default = null; example = "bigarray.example.com"; - description = "The DNS name of the storage array"; + description = lib.mdDoc "The DNS name of the storage array"; }; fsType = mkOption { type = nullOr str; default = null; example = "zfs"; - description = "Type of the filesystem"; + description = lib.mdDoc "Type of the filesystem"; }; options = mkOption { type = nullOr str; default = null; example = "ro"; - description = "Options used to mount the file system"; + description = lib.mdDoc "Options used to mount the file system"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix index 06ec04dbbf..3bff9faa6a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/murmur.nix @@ -56,23 +56,31 @@ in enable = mkOption { type = types.bool; default = false; - description = "If enabled, start the Murmur Mumble server."; + description = lib.mdDoc "If enabled, start the Murmur Mumble server."; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Open ports in the firewall for the Murmur Mumble server. + ''; }; autobanAttempts = mkOption { type = types.int; default = 10; - description = '' + description = lib.mdDoc '' Number of attempts a client is allowed to make in - autobanTimeframe seconds, before being - banned for autobanTime. + `autobanTimeframe` seconds, before being + banned for `autobanTime`. ''; }; autobanTimeframe = mkOption { type = types.int; default = 120; - description = '' + description = lib.mdDoc '' Timeframe in which a client can connect without being banned for repeated attempts (in seconds). ''; @@ -81,51 +89,51 @@ in autobanTime = mkOption { type = types.int; default = 300; - description = "The amount of time an IP ban lasts (in seconds)."; + description = lib.mdDoc "The amount of time an IP ban lasts (in seconds)."; }; logFile = mkOption { type = types.nullOr types.path; default = null; example = "/var/log/murmur/murmurd.log"; - description = "Path to the log file for Murmur daemon. Empty means log to journald."; + description = lib.mdDoc "Path to the log file for Murmur daemon. Empty means log to journald."; }; welcometext = mkOption { type = types.str; default = ""; - description = "Welcome message for connected clients."; + description = lib.mdDoc "Welcome message for connected clients."; }; port = mkOption { type = types.port; default = 64738; - description = "Ports to bind to (UDP and TCP)."; + description = lib.mdDoc "Ports to bind to (UDP and TCP)."; }; hostName = mkOption { type = types.str; default = ""; - description = "Host to bind to. Defaults binding on all addresses."; + description = lib.mdDoc "Host to bind to. Defaults binding on all addresses."; }; package = mkOption { type = types.package; default = pkgs.murmur; defaultText = literalExpression "pkgs.murmur"; - description = "Overridable attribute of the murmur package to use."; + description = lib.mdDoc "Overridable attribute of the murmur package to use."; }; password = mkOption { type = types.str; default = ""; - description = "Required password to join server, if specified."; + description = lib.mdDoc "Required password to join server, if specified."; }; bandwidth = mkOption { type = types.int; default = 72000; - description = '' + description = lib.mdDoc '' Maximum bandwidth (in bits per second) that clients may send speech at. ''; @@ -134,25 +142,25 @@ in users = mkOption { type = types.int; default = 100; - description = "Maximum number of concurrent clients allowed."; + description = lib.mdDoc "Maximum number of concurrent clients allowed."; }; textMsgLength = mkOption { type = types.int; default = 5000; - description = "Max length of text messages. Set 0 for no limit."; + description = lib.mdDoc "Max length of text messages. Set 0 for no limit."; }; imgMsgLength = mkOption { type = types.int; default = 131072; - description = "Max length of image messages. Set 0 for no limit."; + description = lib.mdDoc "Max length of image messages. Set 0 for no limit."; }; allowHtml = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Allow HTML in client messages, comments, and channel descriptions. ''; @@ -161,7 +169,7 @@ in logDays = mkOption { type = types.int; default = 31; - description = '' + description = lib.mdDoc '' How long to store RPC logs for in the database. Set 0 to keep logs forever, or -1 to disable DB logging. ''; @@ -170,7 +178,7 @@ in bonjour = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable Bonjour auto-discovery, which allows clients over your LAN to automatically discover Murmur servers. ''; @@ -179,13 +187,13 @@ in sendVersion = mkOption { type = types.bool; default = true; - description = "Send Murmur version in UDP response."; + description = lib.mdDoc "Send Murmur version in UDP response."; }; registerName = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Public server registration name, and also the name of the Root channel. Even if you don't publicly register your server, you probably still want to set this. @@ -195,7 +203,7 @@ in registerPassword = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Public server registry password, used authenticate your server to the registry to prevent impersonation; required for subsequent registry updates. @@ -205,7 +213,7 @@ in registerUrl = mkOption { type = types.str; default = ""; - description = "URL website for your server."; + description = lib.mdDoc "URL website for your server."; }; registerHostname = mkOption { @@ -222,31 +230,31 @@ in clientCertRequired = mkOption { type = types.bool; default = false; - description = "Require clients to authenticate via certificates."; + description = lib.mdDoc "Require clients to authenticate via certificates."; }; sslCert = mkOption { type = types.str; default = ""; - description = "Path to your SSL certificate."; + description = lib.mdDoc "Path to your SSL certificate."; }; sslKey = mkOption { type = types.str; default = ""; - description = "Path to your SSL key."; + description = lib.mdDoc "Path to your SSL key."; }; sslCa = mkOption { type = types.str; default = ""; - description = "Path to your SSL CA certificate."; + description = lib.mdDoc "Path to your SSL CA certificate."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra configuration to put into murmur.ini."; + description = lib.mdDoc "Extra configuration to put into murmur.ini."; }; environmentFile = mkOption { @@ -291,6 +299,11 @@ in gid = config.ids.gids.murmur; }; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + allowedUDPPorts = [ cfg.port ]; + }; + systemd.services.murmur = { description = "Murmur Chat Service"; wantedBy = [ "multi-user.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix b/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix index 5b1e0dee8e..9ddc2094b6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix @@ -43,7 +43,7 @@ in { type = types.package; default = pkgs.ma1sd; defaultText = literalExpression "pkgs.ma1sd"; - description = "The mxisd/ma1sd package to use"; + description = lib.mdDoc "The mxisd/ma1sd package to use"; }; environmentFile = mkOption { @@ -58,20 +58,20 @@ in { dataDir = mkOption { type = types.str; default = "/var/lib/mxisd"; - description = "Where data mxisd/ma1sd uses resides"; + description = lib.mdDoc "Where data mxisd/ma1sd uses resides"; }; extraConfig = mkOption { type = types.attrs; default = {}; - description = "Extra options merged into the mxisd/ma1sd configuration"; + description = lib.mdDoc "Extra options merged into the mxisd/ma1sd configuration"; }; matrix = { domain = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' the domain of the matrix homeserver ''; }; @@ -83,7 +83,7 @@ in { name = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Public hostname of mxisd/ma1sd, if different from the Matrix domain. ''; }; @@ -91,7 +91,7 @@ in { port = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' HTTP port to listen on (unencrypted) ''; }; @@ -130,6 +130,7 @@ in { EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; ExecStart = "${cfg.package}/bin/${executable} -c ${cfg.dataDir}/mxisd-config.yaml"; ExecStartPre = "${pkgs.writeShellScript "mxisd-substitute-secrets" '' + umask 0077 ${pkgs.envsubst}/bin/envsubst -o ${cfg.dataDir}/mxisd-config.yaml \ -i ${configFile} ''}"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/namecoind.nix b/third_party/nixpkgs/nixos/modules/services/networking/namecoind.nix index 8f7a5123f7..45a9074146 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/namecoind.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/namecoind.nix @@ -49,7 +49,7 @@ in wallet = mkOption { type = types.path; default = "${dataDir}/wallet.dat"; - description = '' + description = lib.mdDoc '' Wallet file. The ownership of the file has to be namecoin:namecoin, and the permissions must be 0640. ''; @@ -58,7 +58,7 @@ in generate = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to generate (mine) Namecoins. ''; }; @@ -66,7 +66,7 @@ in extraNodes = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' List of additional peer IP addresses to connect to. ''; }; @@ -74,7 +74,7 @@ in trustedNodes = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' List of the only peer IP addresses to connect to. If specified no other connection will be made. ''; @@ -83,7 +83,7 @@ in rpc.user = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' User name for RPC connections. ''; }; @@ -91,7 +91,7 @@ in rpc.password = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Password for RPC connections. ''; }; @@ -99,7 +99,7 @@ in rpc.address = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' IP address the RPC server will bind to. ''; }; @@ -107,7 +107,7 @@ in rpc.port = mkOption { type = types.port; default = 8332; - description = '' + description = lib.mdDoc '' Port the RPC server will bind to. ''; }; @@ -116,7 +116,7 @@ in type = types.nullOr types.path; default = null; example = "/var/lib/namecoind/server.cert"; - description = '' + description = lib.mdDoc '' Certificate file for securing RPC connections. ''; }; @@ -125,7 +125,7 @@ in type = types.nullOr types.path; default = null; example = "/var/lib/namecoind/server.pem"; - description = '' + description = lib.mdDoc '' Key file for securing RPC connections. ''; }; @@ -134,7 +134,7 @@ in rpc.allowFrom = mkOption { type = types.listOf types.str; default = [ "127.0.0.1" ]; - description = '' + description = lib.mdDoc '' List of IP address ranges allowed to use the RPC API. Wiledcards (*) can be user to specify a range. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix b/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix index 745138186a..09f019d41b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix @@ -15,7 +15,7 @@ in port = mkOption { type = types.port; default = 8383; - description = '' + description = lib.mdDoc '' Port number where nar-serve will listen on. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nat.nix b/third_party/nixpkgs/nixos/modules/services/networking/nat.nix index 2e58cd699b..0eb9b158e6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nat.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nat.nix @@ -136,7 +136,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Whether to enable Network Address Translation (NAT). ''; }; @@ -145,7 +145,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Whether to enable IPv6 NAT. ''; }; @@ -155,7 +155,7 @@ in default = []; example = [ "eth0" ]; description = - '' + lib.mdDoc '' The interfaces for which to perform NAT. Packets coming from these interface and destined for the external interface will be rewritten. @@ -167,7 +167,7 @@ in default = []; example = [ "192.168.1.0/24" ]; description = - '' + lib.mdDoc '' The IP address ranges for which to perform NAT. Packets coming from these addresses (on any interface) and destined for the external interface will be rewritten. @@ -179,7 +179,7 @@ in default = []; example = [ "fc00::/64" ]; description = - '' + lib.mdDoc '' The IPv6 address ranges for which to perform NAT. Packets coming from these addresses (on any interface) and destined for the external interface will be rewritten. @@ -191,7 +191,7 @@ in default = null; example = "eth1"; description = - '' + lib.mdDoc '' The name of the external network interface. ''; }; @@ -201,7 +201,7 @@ in default = null; example = "203.0.113.123"; description = - '' + lib.mdDoc '' The public IP address to which packets from the local network are to be rewritten. If this is left empty, the IP address associated with the external interface will be @@ -214,7 +214,7 @@ in default = null; example = "2001:dc0:2001:11::175"; description = - '' + lib.mdDoc '' The public IPv6 address to which packets from the local network are to be rewritten. If this is left empty, the IP address associated with the external interface will be @@ -228,27 +228,27 @@ in sourcePort = mkOption { type = types.either types.int (types.strMatching "[[:digit:]]+:[[:digit:]]+"); example = 8080; - description = "Source port of the external interface; to specify a port range, use a string with a colon (e.g. \"60000:61000\")"; + description = lib.mdDoc "Source port of the external interface; to specify a port range, use a string with a colon (e.g. \"60000:61000\")"; }; destination = mkOption { type = types.str; example = "10.0.0.1:80"; - description = "Forward connection to destination ip:port (or [ipv6]:port); to specify a port range, use ip:start-end"; + description = lib.mdDoc "Forward connection to destination ip:port (or [ipv6]:port); to specify a port range, use ip:start-end"; }; proto = mkOption { type = types.str; default = "tcp"; example = "udp"; - description = "Protocol of forwarded connection"; + description = lib.mdDoc "Protocol of forwarded connection"; }; loopbackIPs = mkOption { type = types.listOf types.str; default = []; example = literalExpression ''[ "55.1.2.3" ]''; - description = "Public IPs for NAT reflection; for connections to `loopbackip:sourcePort' from the host itself and from other hosts behind NAT"; + description = lib.mdDoc "Public IPs for NAT reflection; for connections to `loopbackip:sourcePort' from the host itself and from other hosts behind NAT"; }; }; }); @@ -258,7 +258,7 @@ in { sourcePort = 8080; destination = "[fc00::2]:80"; proto = "tcp"; } ]; description = - '' + lib.mdDoc '' List of forwarded ports from the external interface to internal destinations by using DNAT. Destination can be IPv6 if IPv6 NAT is enabled. @@ -270,7 +270,7 @@ in default = null; example = "10.0.0.1"; description = - '' + lib.mdDoc '' The local IP address to which all traffic that does not match any forwarding rule is forwarded. ''; @@ -281,7 +281,7 @@ in default = ""; example = "iptables -A INPUT -p icmp -j ACCEPT"; description = - '' + lib.mdDoc '' Additional shell commands executed as part of the nat initialisation script. ''; @@ -292,7 +292,7 @@ in default = ""; example = "iptables -D INPUT -p icmp -j ACCEPT || true"; description = - '' + lib.mdDoc '' Additional shell commands executed as part of the nat teardown script. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nats.nix b/third_party/nixpkgs/nixos/modules/services/networking/nats.nix index 3e86a4f07b..41e38add69 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nats.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nats.nix @@ -21,20 +21,20 @@ in { user = mkOption { type = types.str; default = "nats"; - description = "User account under which NATS runs."; + description = lib.mdDoc "User account under which NATS runs."; }; group = mkOption { type = types.str; default = "nats"; - description = "Group under which NATS runs."; + description = lib.mdDoc "Group under which NATS runs."; }; serverName = mkOption { default = "nats"; example = "n1-c3"; type = types.str; - description = '' + description = lib.mdDoc '' Name of the NATS server, must be unique if clustered. ''; }; @@ -44,7 +44,7 @@ in { port = mkOption { default = 4222; type = types.port; - description = '' + description = lib.mdDoc '' Port on which to listen. ''; }; @@ -52,7 +52,7 @@ in { dataDir = mkOption { default = "/var/lib/nats"; type = types.path; - description = '' + description = lib.mdDoc '' The NATS data directory. Only used if JetStream is enabled, for storing stream metadata and messages. @@ -74,10 +74,10 @@ in { }; }; ''; - description = '' + description = lib.mdDoc '' Declarative NATS configuration. See the - - NATS documentation for a list of options. + [ + NATS documentation](https://docs.nats.io/nats-server/configuration) for a list of options. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nbd.nix b/third_party/nixpkgs/nixos/modules/services/networking/nbd.nix index df3358f518..3a813d1025 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nbd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nbd.nix @@ -48,7 +48,7 @@ in listenPort = mkOption { type = types.port; default = 10809; - description = "Port to listen on. The port is NOT automatically opened in the firewall."; + description = lib.mdDoc "Port to listen on. The port is NOT automatically opened in the firewall."; }; extraOptions = mkOption { @@ -64,14 +64,14 @@ in }; exports = mkOption { - description = "Files or block devices to make available over the network."; + description = lib.mdDoc "Files or block devices to make available over the network."; default = { }; type = with types; attrsOf (submodule { options = { path = mkOption { type = str; - description = "File or block device to export."; + description = lib.mdDoc "File or block device to export."; example = "/dev/sdb1"; }; @@ -79,7 +79,7 @@ in type = nullOr (listOf str); default = null; example = [ "10.10.0.0/24" "127.0.0.1" ]; - description = "IPs and subnets that are authorized to connect for this device. If not specified, the server will allow all connections."; + description = lib.mdDoc "IPs and subnets that are authorized to connect for this device. If not specified, the server will allow all connections."; }; extraOptions = mkOption { @@ -100,7 +100,7 @@ in listenAddress = mkOption { type = with types; nullOr str; - description = "Address to listen on. If not specified, the server will listen on all interfaces."; + description = lib.mdDoc "Address to listen on. If not specified, the server will listen on all interfaces."; default = null; example = "10.10.0.1"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix index c8d1b6718e..958231963c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ncdns.nix @@ -59,7 +59,7 @@ in address = mkOption { type = types.str; default = "[::1]"; - description = '' + description = lib.mdDoc '' The IP address the ncdns resolver will bind to. Leave this unchanged if you do not wish to directly expose the resolver. ''; @@ -68,7 +68,7 @@ in port = mkOption { type = types.port; default = 5333; - description = '' + description = lib.mdDoc '' The port the ncdns resolver will bind to. ''; }; @@ -96,7 +96,7 @@ in type = types.str; default = ""; example = "root@example.com"; - description = '' + description = lib.mdDoc '' An email address for the SOA record at the bit zone. If you are only using ncdns locally you can ignore this. ''; @@ -105,9 +105,9 @@ in identity.address = mkOption { type = types.str; default = "127.127.127.127"; - description = '' + description = lib.mdDoc '' The IP address the hostname specified in - should resolve to. + {option}`services.ncdns.identity.hostname` should resolve to. If you are only using ncdns locally you can ignore this. ''; }; @@ -136,7 +136,7 @@ in dnssec.keys.private = mkOption { type = types.path; default = defaultFiles.private; - description = '' + description = lib.mdDoc '' Path to the file containing the KSK private key. ''; }; @@ -157,7 +157,7 @@ in dnssec.keys.zonePrivate = mkOption { type = types.path; default = defaultFiles.zonePrivate; - description = '' + description = lib.mdDoc '' Path to the file containing the ZSK private key. ''; }; @@ -176,11 +176,11 @@ in certstore.nssdbdir = "../../home/alice/.pki/nssdb"; } ''; - description = '' + description = lib.mdDoc '' ncdns settings. Use this option to configure ncds settings not exposed in a NixOS option or to bypass one. - See the example ncdns.conf file at for the available options. + See the example ncdns.conf file at + for the available options. ''; }; @@ -189,8 +189,8 @@ in services.pdns-recursor.resolveNamecoin = mkOption { type = types.bool; default = false; - description = '' - Resolve .bit top-level domains using ncdns and namecoin. + description = lib.mdDoc '' + Resolve `.bit` top-level domains using ncdns and namecoin. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix index 6046ac860c..ed97fe233b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ndppd.nix @@ -26,7 +26,7 @@ let options = { interface = mkOption { type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Listen for any Neighbor Solicitation messages on this interface, and respond to them according to a set of rules. Defaults to the name of the attrset. @@ -35,14 +35,14 @@ let }; router = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Turns on or off the router flag for Neighbor Advertisement Messages. ''; default = true; }; timeout = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' Controls how long to wait for a Neighbor Advertisment Message before invalidating the entry, in milliseconds. ''; @@ -50,7 +50,7 @@ let }; ttl = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' Controls how long a valid or invalid entry remains in the cache, in milliseconds. ''; @@ -58,7 +58,7 @@ let }; rules = mkOption { type = types.attrsOf rule; - description = '' + description = lib.mdDoc '' This is a rule that the target address is to match against. If no netmask is provided, /128 is assumed. You may have several rule sections, and the addresses may or may not overlap. @@ -72,7 +72,7 @@ let options = { network = mkOption { type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' This is the target address is to match against. If no netmask is provided, /128 is assumed. The addresses of serveral rules may or may not overlap. @@ -82,7 +82,7 @@ let }; method = mkOption { type = types.enum [ "static" "iface" "auto" ]; - description = '' + description = lib.mdDoc '' static: Immediately answer any Neighbor Solicitation Messages (if they match the IP rule). iface: Forward the Neighbor Solicitation Message through the specified @@ -95,7 +95,7 @@ let }; interface = mkOption { type = types.nullOr types.str; - description = "Interface to use when method is iface."; + description = lib.mdDoc "Interface to use when method is iface."; default = null; }; }; @@ -124,12 +124,12 @@ in { }; configFile = mkOption { type = types.nullOr types.path; - description = "Path to configuration file."; + description = lib.mdDoc "Path to configuration file."; default = null; }; routeTTL = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' This tells 'ndppd' how often to reload the route file /proc/net/ipv6_route, in milliseconds. ''; @@ -137,7 +137,7 @@ in { }; proxies = mkOption { type = types.attrsOf proxy; - description = '' + description = lib.mdDoc '' This sets up a listener, that will listen for any Neighbor Solicitation messages, and respond to them according to a set of rules. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix b/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix index c83cd9d521..2bedafc5d9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nebula.nix @@ -17,45 +17,45 @@ in options = { services.nebula = { networks = mkOption { - description = "Nebula network definitions."; + description = lib.mdDoc "Nebula network definitions."; default = {}; type = types.attrsOf (types.submodule { options = { enable = mkOption { type = types.bool; default = true; - description = "Enable or disable this network."; + description = lib.mdDoc "Enable or disable this network."; }; package = mkOption { type = types.package; default = pkgs.nebula; defaultText = literalExpression "pkgs.nebula"; - description = "Nebula derivation to use."; + description = lib.mdDoc "Nebula derivation to use."; }; ca = mkOption { type = types.path; - description = "Path to the certificate authority certificate."; + description = lib.mdDoc "Path to the certificate authority certificate."; example = "/etc/nebula/ca.crt"; }; cert = mkOption { type = types.path; - description = "Path to the host certificate."; + description = lib.mdDoc "Path to the host certificate."; example = "/etc/nebula/host.crt"; }; key = mkOption { type = types.path; - description = "Path to the host key."; + description = lib.mdDoc "Path to the host key."; example = "/etc/nebula/host.key"; }; staticHostMap = mkOption { type = types.attrsOf (types.listOf (types.str)); default = {}; - description = '' + description = lib.mdDoc '' The static host map defines a set of hosts with fixed IP addresses on the internet (or any network). A host can have multiple fixed IP addresses defined here, and nebula will try each when establishing a tunnel. ''; @@ -65,13 +65,13 @@ in isLighthouse = mkOption { type = types.bool; default = false; - description = "Whether this node is a lighthouse."; + description = lib.mdDoc "Whether this node is a lighthouse."; }; lighthouses = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' List of IPs of lighthouse hosts this node should report to and query from. This should be empty on lighthouse nodes. The IPs should be the lighthouse's Nebula IPs, not their external IPs. ''; @@ -81,19 +81,19 @@ in listen.host = mkOption { type = types.str; default = "0.0.0.0"; - description = "IP address to listen on."; + description = lib.mdDoc "IP address to listen on."; }; listen.port = mkOption { type = types.port; default = 4242; - description = "Port number to listen on."; + description = lib.mdDoc "Port number to listen on."; }; tun.disable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' When tun is disabled, a lighthouse can be started without a local tun interface (and therefore without root). ''; }; @@ -101,29 +101,29 @@ in tun.device = mkOption { type = types.nullOr types.str; default = null; - description = "Name of the tun device. Defaults to nebula.\${networkName}."; + description = lib.mdDoc "Name of the tun device. Defaults to nebula.\${networkName}."; }; firewall.outbound = mkOption { type = types.listOf types.attrs; default = []; - description = "Firewall rules for outbound traffic."; + description = lib.mdDoc "Firewall rules for outbound traffic."; example = [ { port = "any"; proto = "any"; host = "any"; } ]; }; firewall.inbound = mkOption { type = types.listOf types.attrs; default = []; - description = "Firewall rules for inbound traffic."; + description = lib.mdDoc "Firewall rules for inbound traffic."; example = [ { port = "any"; proto = "any"; host = "any"; } ]; }; settings = mkOption { type = format.type; default = {}; - description = '' + description = lib.mdDoc '' Nebula configuration. Refer to - + for details on supported values. ''; example = literalExpression '' diff --git a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix index 242afd548d..e77fa97d24 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/networkmanager.nix @@ -157,10 +157,10 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use NetworkManager to obtain an IP address and other configuration for all network interfaces that are not manually - configured. If enabled, a group networkmanager + configured. If enabled, a group `networkmanager` will be created. Add all users that should have permission to change network settings to this group. ''; @@ -243,7 +243,7 @@ in { in types.listOf networkManagerPluginPackage; default = [ ]; - description = '' + description = lib.mdDoc '' List of NetworkManager plug-ins to enable. Some plug-ins are enabled by the NetworkManager module by default. ''; @@ -252,7 +252,7 @@ in { dhcp = mkOption { type = types.enum [ "dhcpcd" "internal" ]; default = "internal"; - description = '' + description = lib.mdDoc '' Which program (or internal library) should be used for DHCP. ''; }; @@ -260,7 +260,7 @@ in { firewallBackend = mkOption { type = types.enum [ "iptables" "nftables" "none" ]; default = "iptables"; - description = '' + description = lib.mdDoc '' Which firewall backend should be used for configuring masquerading with shared mode. If set to none, NetworkManager doesn't manage the configuration at all. ''; @@ -269,7 +269,7 @@ in { logLevel = mkOption { type = types.enum [ "OFF" "ERR" "WARN" "INFO" "DEBUG" "TRACE" ]; default = "WARN"; - description = '' + description = lib.mdDoc '' Set the default logging verbosity level. ''; }; @@ -277,7 +277,7 @@ in { appendNameservers = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' A list of name servers that should be appended to the ones configured in NetworkManager or received by DHCP. ''; @@ -286,7 +286,7 @@ in { insertNameservers = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' A list of name servers that should be inserted before the ones configured in NetworkManager or received by DHCP. ''; @@ -300,16 +300,16 @@ in { backend = mkOption { type = types.enum [ "wpa_supplicant" "iwd" ]; default = "wpa_supplicant"; - description = '' + description = lib.mdDoc '' Specify the Wi-Fi backend used for the device. - Currently supported are or (experimental). + Currently supported are {option}`wpa_supplicant` or {option}`iwd` (experimental). ''; }; powersave = mkOption { type = types.nullOr types.bool; default = null; - description = '' + description = lib.mdDoc '' Whether to enable Wi-Fi power saving. ''; }; @@ -317,7 +317,7 @@ in { scanRandMacAddress = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable MAC address randomization of a Wi-Fi device during scanning. ''; @@ -329,8 +329,7 @@ in { default = "default"; description = '' Set the DNS (resolv.conf) processing mode. -
- + A description of these modes can be found in the main section of https://developer.gnome.org/NetworkManager/stable/NetworkManager.conf.html @@ -348,7 +347,7 @@ in { options = { source = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to the hook script. ''; }; @@ -380,7 +379,7 @@ in { '''; type = "basic"; } ]''; - description = '' + description = lib.mdDoc '' A list of scripts which will be executed in response to network events. ''; }; @@ -388,12 +387,12 @@ in { enableStrongSwan = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the StrongSwan plugin. - + If you enable this option the - networkmanager_strongswan plugin will be added to - the option + `networkmanager_strongswan` plugin will be added to + the {option}`networking.networkmanager.plugins` option so you don't need to to that yourself. ''; }; @@ -401,10 +400,10 @@ in { enableFccUnlock = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable FCC unlock procedures. Since release 1.18.4, the ModemManager daemon no longer automatically performs the FCC unlock procedure by default. See - the docs + [the docs](https://modemmanager.org/docs/modemmanager/fcc-unlock/) for more details. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nextdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/nextdns.nix index b070eeec89..697fa60504 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nextdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nextdns.nix @@ -10,13 +10,13 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the NextDNS DNS/53 to DoH Proxy service."; + description = lib.mdDoc "Whether to enable the NextDNS DNS/53 to DoH Proxy service."; }; arguments = mkOption { type = types.listOf types.str; default = []; example = [ "-config" "10.0.3.0/24=abcdef" ]; - description = "Additional arguments to be passed to nextdns run."; + description = lib.mdDoc "Additional arguments to be passed to nextdns run."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix index b911f97491..4e7d5ce59c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nftables.nix @@ -77,7 +77,7 @@ in } ''; description = - '' + lib.mdDoc '' The ruleset to be used with nftables. Should be in a format that can be loaded using "/bin/nft -f". The ruleset is updated atomically. ''; @@ -90,7 +90,7 @@ in }; defaultText = literalDocBook ''a file with the contents of ''; description = - '' + lib.mdDoc '' The ruleset file to be used with nftables. Should be in a format that can be loaded using "nft -f". The ruleset is updated atomically. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix b/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix index 6523f4b8b9..510dc02b5c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/backend-params-submodule.nix @@ -3,7 +3,7 @@ proto = lib.mkOption { type = lib.types.enum [ "h2" "http/1.1" ]; default = "http/1.1"; - description = '' + description = lib.mdDoc '' This option configures the protocol the backend server expects to use. @@ -15,7 +15,7 @@ tls = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' This option determines whether nghttpx will negotiate its connection with a backend server using TLS or not. The burden is on the backend server to provide the TLS certificate! @@ -28,7 +28,7 @@ sni = lib.mkOption { type = lib.types.nullOr lib.types.str; default = null; - description = '' + description = lib.mdDoc '' Override the TLS SNI field value. This value (in nghttpx) defaults to the host value of the backend configuration. @@ -40,7 +40,7 @@ fall = lib.mkOption { type = lib.types.int; default = 0; - description = '' + description = lib.mdDoc '' If nghttpx cannot connect to the backend N times in a row, the backend is assumed to be offline and is excluded from load balancing. If N is 0 the backend is never excluded from load @@ -54,7 +54,7 @@ rise = lib.mkOption { type = lib.types.int; default = 0; - description = '' + description = lib.mdDoc '' If the backend is excluded from load balancing, nghttpx will periodically attempt to make a connection to the backend. If the connection is successful N times in a row the backend is @@ -69,7 +69,7 @@ affinity = lib.mkOption { type = lib.types.enum [ "ip" "none" ]; default = "none"; - description = '' + description = lib.mdDoc '' If "ip" is given, client IP based session affinity is enabled. If "none" is given, session affinity is disabled. @@ -91,7 +91,7 @@ dns = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Name resolution of a backends host name is done at start up, or configuration reload. If "dns" is true, name resolution takes place dynamically. @@ -108,7 +108,7 @@ redirect-if-not-tls = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' If true, a backend match requires the frontend connection be TLS encrypted. If it is not, nghttpx responds to the request with a 308 status code and https URI the client should use diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix b/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix index 33c8572bd1..66c6d7efa6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/frontend-params-submodule.nix @@ -3,7 +3,7 @@ tls = lib.mkOption { type = lib.types.enum [ "tls" "no-tls" ]; default = "tls"; - description = '' + description = lib.mdDoc '' Enable or disable TLS. If true (enabled) the key and certificate must be configured for nghttpx. @@ -15,7 +15,7 @@ sni-fwd = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' When performing a match to select a backend server, SNI host name received from the client is used instead of the request host. See --backend option about the pattern match. @@ -28,7 +28,7 @@ api = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable API access for this frontend. This enables you to dynamically modify nghttpx at run-time therefore this feature is disabled by default and should be turned on with care. @@ -41,7 +41,7 @@ healthmon = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Make this frontend a health monitor endpoint. Any request received on this frontend is responded to with a 200 OK. @@ -53,7 +53,7 @@ proxyproto = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Accept PROXY protocol version 1 on frontend connection. Please see https://nghttp2.org/documentation/nghttpx.1.html#cmdoption-nghttpx-f diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/server-options.nix b/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/server-options.nix index ef23bfd793..48e2a30455 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/server-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/server-options.nix @@ -3,14 +3,14 @@ host = lib.mkOption { type = lib.types.str; example = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Server host address. ''; }; port = lib.mkOption { type = lib.types.int; example = 5088; - description = '' + description = lib.mdDoc '' Server host port. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/tls-submodule.nix b/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/tls-submodule.nix index 8f3cdaae2c..bb6cdae07e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/tls-submodule.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nghttpx/tls-submodule.nix @@ -4,7 +4,7 @@ type = lib.types.str; example = "/etc/ssl/keys/mykeyfile.key"; default = "/etc/ssl/keys/server.key"; - description = '' + description = lib.mdDoc '' Path to the TLS key file. ''; }; @@ -13,7 +13,7 @@ type = lib.types.str; example = "/etc/ssl/certs/mycert.crt"; default = "/etc/ssl/certs/server.crt"; - description = '' + description = lib.mdDoc '' Path to the TLS certificate file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ngircd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ngircd.nix index c0b9c98fb4..f6c7415c1d 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ngircd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ngircd.nix @@ -23,13 +23,13 @@ in { enable = mkEnableOption "the ngircd IRC server"; config = mkOption { - description = "The ngircd configuration (see ngircd.conf(5))."; + description = lib.mdDoc "The ngircd configuration (see ngircd.conf(5))."; type = types.lines; }; package = mkOption { - description = "The ngircd package."; + description = lib.mdDoc "The ngircd package."; type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix b/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix index 432938d59d..04cbc0c0d8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix @@ -13,7 +13,7 @@ in port = mkOption { type = types.port; default = 5000; - description = '' + description = lib.mdDoc '' Port number where nix-serve will listen on. ''; }; @@ -21,7 +21,7 @@ in bindAddress = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' IP address where nix-serve will bind its listening socket. ''; }; @@ -29,7 +29,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for nix-serve."; + description = lib.mdDoc "Open ports in the firewall for nix-serve."; }; secretKeyFile = mkOption { @@ -50,7 +50,7 @@ in extraParams = mkOption { type = types.separatedString " "; default = ""; - description = '' + description = lib.mdDoc '' Extra command line parameters for nix-serve. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nix-store-gcs-proxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/nix-store-gcs-proxy.nix index 0012302db2..531b2bde76 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nix-store-gcs-proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nix-store-gcs-proxy.nix @@ -9,18 +9,18 @@ let default = true; type = types.bool; example = true; - description = "Whether to enable proxy for this bucket"; + description = lib.mdDoc "Whether to enable proxy for this bucket"; }; bucketName = mkOption { type = types.str; default = name; example = "my-bucket-name"; - description = "Name of Google storage bucket"; + description = lib.mdDoc "Name of Google storage bucket"; }; address = mkOption { type = types.str; example = "localhost:3000"; - description = "The address of the proxy."; + description = lib.mdDoc "The address of the proxy."; }; }; }; @@ -31,7 +31,7 @@ in options.services.nix-store-gcs-proxy = mkOption { type = types.attrsOf (types.submodule opts); default = {}; - description = '' + description = lib.mdDoc '' An attribute set describing an HTTP to GCS proxy that allows us to use GCS bucket via HTTP protocol. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nixops-dns.nix b/third_party/nixpkgs/nixos/modules/services/networking/nixops-dns.nix index 5e33d872ea..4abdb50d69 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nixops-dns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nixops-dns.nix @@ -12,7 +12,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the nixops-dns resolution of NixOps virtual machines via dnsmasq and fake domain name. ''; @@ -20,7 +20,7 @@ in user = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The user the nixops-dns daemon should run as. This should be the user, which is also used for nixops and have the .nixops directory in its home. @@ -29,7 +29,7 @@ in domain = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Fake domain name to resolve to NixOps virtual machines. For example "ops" will resolve "vm.ops". diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix index a5973cd593..4dd2922e83 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nntp-proxy.nix @@ -65,7 +65,7 @@ in type = types.str; default = ""; example = "ssl-eu.astraweb.com"; - description = '' + description = lib.mdDoc '' Upstream server address ''; }; @@ -73,7 +73,7 @@ in upstreamPort = mkOption { type = types.int; default = 563; - description = '' + description = lib.mdDoc '' Upstream server port ''; }; @@ -81,7 +81,7 @@ in upstreamMaxConnections = mkOption { type = types.int; default = 20; - description = '' + description = lib.mdDoc '' Upstream server maximum allowed concurrent connections ''; }; @@ -89,7 +89,7 @@ in upstreamUser = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Upstream server username ''; }; @@ -97,7 +97,7 @@ in upstreamPassword = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Upstream server password ''; }; @@ -106,7 +106,7 @@ in type = types.str; default = "127.0.0.1"; example = "[::]"; - description = '' + description = lib.mdDoc '' Proxy listen address (IPv6 literal addresses need to be enclosed in "[" and "]" characters) ''; }; @@ -114,7 +114,7 @@ in port = mkOption { type = types.int; default = 5555; - description = '' + description = lib.mdDoc '' Proxy listen port ''; }; @@ -123,7 +123,7 @@ in type = types.str; default = "key.pem"; example = "/path/to/your/key.file"; - description = '' + description = lib.mdDoc '' Proxy ssl key path ''; }; @@ -132,7 +132,7 @@ in type = types.str; default = "cert.pem"; example = "/path/to/your/cert.file"; - description = '' + description = lib.mdDoc '' Proxy ssl certificate path ''; }; @@ -140,7 +140,7 @@ in prohibitPosting = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to prohibit posting to the upstream server ''; }; @@ -149,7 +149,7 @@ in type = types.enum [ "error" "warning" "notice" "info" "debug" ]; default = "info"; example = "error"; - description = '' + description = lib.mdDoc '' Verbosity level ''; }; @@ -159,7 +159,7 @@ in options = { username = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Username ''; }; @@ -167,22 +167,22 @@ in passwordHash = mkOption { type = types.str; example = "$6$GtzE7FrpE$wwuVgFYU.TZH4Rz.Snjxk9XGua89IeVwPQ/fEUD8eujr40q5Y021yhn0aNcsQ2Ifw.BLclyzvzgegopgKcneL0"; - description = '' + description = lib.mdDoc '' SHA-512 password hash (can be generated by - mkpasswd -m sha-512 <password>) + `mkpasswd -m sha-512 `) ''; }; maxConnections = mkOption { type = types.int; default = 1; - description = '' + description = lib.mdDoc '' Maximum number of concurrent connections to the proxy for this user ''; }; }; }); - description = '' + description = lib.mdDoc '' NNTP-Proxy user configuration ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix b/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix index 43333af5e2..73b6f13327 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nomad.nix @@ -14,7 +14,7 @@ in type = types.package; default = pkgs.nomad; defaultText = literalExpression "pkgs.nomad"; - description = '' + description = lib.mdDoc '' The package used for the Nomad agent and CLI. ''; }; @@ -33,7 +33,7 @@ in dropPrivileges = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the nomad agent should be run as a non-root nomad user. ''; }; @@ -41,7 +41,7 @@ in enableDocker = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Enable Docker support. Needed for Nomad's docker driver. Note that the docker group membership is effectively equivalent @@ -52,7 +52,7 @@ in extraSettingsPaths = mkOption { type = types.listOf types.path; default = [ ]; - description = '' + description = lib.mdDoc '' Additional settings paths used to configure nomad. These can be files or directories. ''; example = literalExpression '' @@ -63,7 +63,7 @@ in extraSettingsPlugins = mkOption { type = types.listOf (types.either types.package types.path); default = [ ]; - description = '' + description = lib.mdDoc '' Additional plugins dir used to configure nomad. ''; example = literalExpression '' @@ -75,23 +75,23 @@ in settings = mkOption { type = format.type; default = { }; - description = '' - Configuration for Nomad. See the documentation + description = lib.mdDoc '' + Configuration for Nomad. See the [documentation](https://www.nomadproject.io/docs/configuration) for supported values. - Notes about data_dir: + Notes about `data_dir`: - If data_dir is set to a value other than the - default value of "/var/lib/nomad" it is the Nomad + If `data_dir` is set to a value other than the + default value of `"/var/lib/nomad"` it is the Nomad cluster manager's responsibility to make sure that this directory exists and has the appropriate permissions. - Additionally, if dropPrivileges is - true then data_dir - cannot be customized. Setting - dropPrivileges to true enables - the DynamicUser feature of systemd which directly - manages and operates on StateDirectory. + Additionally, if `dropPrivileges` is + `true` then `data_dir` + *cannot* be customized. Setting + `dropPrivileges` to `true` enables + the `DynamicUser` feature of systemd which directly + manages and operates on `StateDirectory`. ''; example = literalExpression '' { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix index a51fc53453..cf2afcacc5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nsd.nix @@ -201,7 +201,7 @@ let allowAXFRFallback = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' If NSD as secondary server should be allowed to AXFR if the primary server does not allow IXFR. ''; @@ -243,7 +243,7 @@ let # to default values, breaking the parent inheriting function. type = types.attrsOf types.anything; default = {}; - description = '' + description = lib.mdDoc '' Children zones inherit all options of their parents. Attributes defined in a child will overwrite the ones of its parent. Only leaf zones will be actually served. This way it's possible to @@ -256,7 +256,7 @@ let data = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' The actual zone data. This is the content of your zone file. Use imports or pkgs.lib.readFile if you don't want this data in your config file. ''; @@ -268,17 +268,17 @@ let algorithm = mkOption { type = types.str; default = "RSASHA256"; - description = "Which algorithm to use for DNSSEC"; + description = lib.mdDoc "Which algorithm to use for DNSSEC"; }; keyttl = mkOption { type = types.str; default = "1h"; - description = "TTL for dnssec records"; + description = lib.mdDoc "TTL for dnssec records"; }; coverage = mkOption { type = types.str; default = "1y"; - description = '' + description = lib.mdDoc '' The length of time to ensure that keys will be correct; no action will be taken to create new keys to be activated after this time. ''; }; @@ -289,7 +289,7 @@ let postPublish = "1w"; rollPeriod = "1mo"; }; - description = "Key policy for zone signing keys"; + description = lib.mdDoc "Key policy for zone signing keys"; }; ksk = mkOption { type = keyPolicy; @@ -298,14 +298,14 @@ let postPublish = "1mo"; rollPeriod = "0"; }; - description = "Key policy for key signing keys"; + description = lib.mdDoc "Key policy for key signing keys"; }; }; maxRefreshSecs = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Limit refresh time for secondary zones. This is the timer which checks to see if the zone has to be refetched when it expires. Normally the value from the SOA record is used, but this option @@ -316,7 +316,7 @@ let minRefreshSecs = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Limit refresh time for secondary zones. ''; }; @@ -324,7 +324,7 @@ let maxRetrySecs = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Limit retry time for secondary zones. This is the timeout after a failed fetch attempt for the zone. Normally the value from the SOA record is used, but this option restricts that value. @@ -334,7 +334,7 @@ let minRetrySecs = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Limit retry time for secondary zones. ''; }; @@ -362,7 +362,7 @@ let notifyRetry = mkOption { type = types.int; default = 5; - description = '' + description = lib.mdDoc '' Specifies the number of retries for failed notifies. Set this along with notify. ''; }; @@ -371,7 +371,7 @@ let type = types.nullOr types.str; default = null; example = "2000::1@1234"; - description = '' + description = lib.mdDoc '' This address will be used for zone-transfere requests if configured as a secondary server or notifications in case of a primary server. Supply either a plain IPv4 or IPv6 address with an optional port @@ -392,15 +392,15 @@ let requestXFR = mkOption { type = types.listOf types.str; default = []; - description = '' - Format: [AXFR|UDP] <ip-address> <key-name | NOKEY> + description = lib.mdDoc '' + Format: `[AXFR|UDP] ` ''; }; rrlWhitelist = mkOption { type = with types; listOf (enum [ "nxdomain" "error" "referral" "any" "rrsig" "wildcard" "nodata" "dnskey" "positive" "all" ]); default = []; - description = '' + description = lib.mdDoc '' Whitelists the given rrl-types. ''; }; @@ -409,7 +409,7 @@ let type = types.nullOr types.str; default = null; example = "%s"; - description = '' + description = lib.mdDoc '' When set to something distinct to null NSD is able to collect statistics per zone. All statistics of this zone(s) will be added to the group specified by this given name. Use "%s" to use the zones @@ -424,19 +424,19 @@ let options = { keySize = mkOption { type = types.int; - description = "Key size in bits"; + description = lib.mdDoc "Key size in bits"; }; prePublish = mkOption { type = types.str; - description = "How long in advance to publish new keys"; + description = lib.mdDoc "How long in advance to publish new keys"; }; postPublish = mkOption { type = types.str; - description = "How long after deactivation to keep a key in the zone"; + description = lib.mdDoc "How long after deactivation to keep a key in the zone"; }; rollPeriod = mkOption { type = types.str; - description = "How frequently to change keys"; + description = lib.mdDoc "How frequently to change keys"; }; }; }; @@ -486,7 +486,7 @@ in dnssecInterval = mkOption { type = types.str; default = "1h"; - description = '' + description = lib.mdDoc '' How often to check whether dnssec key rollover is required ''; }; @@ -494,7 +494,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra nsd config. ''; }; @@ -502,7 +502,7 @@ in hideVersion = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether NSD should answer VERSION.BIND and VERSION.SERVER CHAOS class queries. ''; }; @@ -510,7 +510,7 @@ in identity = mkOption { type = types.str; default = "unidentified server"; - description = '' + description = lib.mdDoc '' Identify the server (CH TXT ID.SERVER entry). ''; }; @@ -518,7 +518,7 @@ in interfaces = mkOption { type = types.listOf types.str; default = [ "127.0.0.0" "::1" ]; - description = '' + description = lib.mdDoc '' What addresses the server should listen to. ''; }; @@ -526,7 +526,7 @@ in ipFreebind = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to bind to nonlocal addresses and interfaces that are down. Similar to ip-transparent. ''; @@ -535,7 +535,7 @@ in ipTransparent = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allow binding to non local addresses. ''; }; @@ -543,7 +543,7 @@ in ipv4 = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to listen on IPv4 connections. ''; }; @@ -551,7 +551,7 @@ in ipv4EDNSSize = mkOption { type = types.int; default = 4096; - description = '' + description = lib.mdDoc '' Preferred EDNS buffer size for IPv4. ''; }; @@ -559,7 +559,7 @@ in ipv6 = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to listen on IPv6 connections. ''; }; @@ -567,7 +567,7 @@ in ipv6EDNSSize = mkOption { type = types.int; default = 4096; - description = '' + description = lib.mdDoc '' Preferred EDNS buffer size for IPv6. ''; }; @@ -575,7 +575,7 @@ in logTimeAscii = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Log time in ascii, if false then in unix epoch seconds. ''; }; @@ -583,7 +583,7 @@ in nsid = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' NSID identity (hex string, or "ascii_somestring"). ''; }; @@ -591,7 +591,7 @@ in port = mkOption { type = types.int; default = 53; - description = '' + description = lib.mdDoc '' Port the service should bind do. ''; }; @@ -600,7 +600,7 @@ in type = types.bool; default = pkgs.stdenv.isLinux; defaultText = literalExpression "pkgs.stdenv.isLinux"; - description = '' + description = lib.mdDoc '' Whether to enable SO_REUSEPORT on all used sockets. This lets multiple processes bind to the same port. This speeds up operation especially if the server count is greater than one and makes fast restarts less @@ -611,7 +611,7 @@ in rootServer = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether this server will be a root server (a DNS root server, you usually don't want that). ''; @@ -622,7 +622,7 @@ in serverCount = mkOption { type = types.int; default = 1; - description = '' + description = lib.mdDoc '' Number of NSD servers to fork. Put the number of CPUs to use here. ''; }; @@ -630,7 +630,7 @@ in statistics = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Statistics are produced every number of seconds. Prints to log. If null no statistics are logged. ''; @@ -639,7 +639,7 @@ in tcpCount = mkOption { type = types.int; default = 100; - description = '' + description = lib.mdDoc '' Maximum number of concurrent TCP connections per server. ''; }; @@ -647,7 +647,7 @@ in tcpQueryCount = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Maximum number of queries served on a single TCP connection. 0 means no maximum. ''; @@ -656,7 +656,7 @@ in tcpTimeout = mkOption { type = types.int; default = 120; - description = '' + description = lib.mdDoc '' TCP timeout in seconds. ''; }; @@ -664,7 +664,7 @@ in verbosity = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Verbosity level. ''; }; @@ -672,7 +672,7 @@ in version = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The version string replied for CH TXT version.server and version.bind queries. Will use the compiled package version on null. See hideVersion for enabling/disabling this responses. @@ -682,7 +682,7 @@ in xfrdReloadTimeout = mkOption { type = types.int; default = 1; - description = '' + description = lib.mdDoc '' Number of seconds between reloads triggered by xfrd. ''; }; @@ -690,7 +690,7 @@ in zonefilesCheck = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to check mtime of all zone files on start and sighup. ''; }; @@ -703,14 +703,14 @@ in algorithm = mkOption { type = types.str; default = "hmac-sha256"; - description = '' + description = lib.mdDoc '' Authentication algorithm for this key. ''; }; keyFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to the file which contains the actual base64 encoded key. The key will be copied into "${stateDir}/private" before NSD starts. The copied file is only accessibly by the NSD @@ -728,7 +728,7 @@ in }; } ''; - description = '' + description = lib.mdDoc '' Define your TSIG keys here. ''; }; @@ -741,7 +741,7 @@ in ipv4PrefixLength = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' IPv4 prefix length. Addresses are grouped by netblock. ''; }; @@ -749,7 +749,7 @@ in ipv6PrefixLength = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' IPv6 prefix length. Addresses are grouped by netblock. ''; }; @@ -757,7 +757,7 @@ in ratelimit = mkOption { type = types.int; default = 200; - description = '' + description = lib.mdDoc '' Max qps allowed from any query source. 0 means unlimited. With an verbosity of 2 blocked and unblocked subnets will be logged. @@ -767,7 +767,7 @@ in slip = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Number of packets that get discarded before replying a SLIP response. 0 disables SLIP responses. 1 will make every response a SLIP response. ''; @@ -776,7 +776,7 @@ in size = mkOption { type = types.int; default = 1000000; - description = '' + description = lib.mdDoc '' Size of the hashtable. More buckets use more memory but lower the chance of hash hash collisions. ''; @@ -785,7 +785,7 @@ in whitelistRatelimit = mkOption { type = types.int; default = 2000; - description = '' + description = lib.mdDoc '' Max qps allowed from whitelisted sources. 0 means unlimited. Set the rrl-whitelist option for specific queries to apply this limit instead of the default to them. @@ -802,7 +802,7 @@ in controlCertFile = mkOption { type = types.path; default = "/etc/nsd/nsd_control.pem"; - description = '' + description = lib.mdDoc '' Path to the client certificate signed with the server certificate. This file is used by nsd-control and generated by nsd-control-setup. ''; @@ -811,7 +811,7 @@ in controlKeyFile = mkOption { type = types.path; default = "/etc/nsd/nsd_control.key"; - description = '' + description = lib.mdDoc '' Path to the client private key, which is used by nsd-control but not by the server. This file is generated by nsd-control-setup. ''; @@ -820,7 +820,7 @@ in interfaces = mkOption { type = types.listOf types.str; default = [ "127.0.0.1" "::1" ]; - description = '' + description = lib.mdDoc '' Which interfaces NSD should bind to for remote control. ''; }; @@ -828,7 +828,7 @@ in port = mkOption { type = types.int; default = 8952; - description = '' + description = lib.mdDoc '' Port number for remote control operations (uses TLS over TCP). ''; }; @@ -836,7 +836,7 @@ in serverCertFile = mkOption { type = types.path; default = "/etc/nsd/nsd_server.pem"; - description = '' + description = lib.mdDoc '' Path to the server self signed certificate, which is used by the server but and by nsd-control. This file is generated by nsd-control-setup. ''; @@ -845,7 +845,7 @@ in serverKeyFile = mkOption { type = types.path; default = "/etc/nsd/nsd_server.key"; - description = '' + description = lib.mdDoc '' Path to the server private key, which is used by the server but not by nsd-control. This file is generated by nsd-control-setup. ''; @@ -887,7 +887,7 @@ in }; } ''; - description = '' + description = lib.mdDoc '' Define your zones here. Zones can cascade other zones and therefore inherit settings from parent zones. Look at the definition of children to learn about inheritance and child zones. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntopng.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntopng.nix index 022fc923ed..e6344d7ff3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntopng.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntopng.nix @@ -43,7 +43,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable ntopng, a high-speed web-based traffic analysis and flow collection tool. @@ -63,7 +63,7 @@ in default = [ "any" ]; example = [ "eth0" "wlan0" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of interfaces to monitor. Use "any" to monitor all interfaces. ''; }; @@ -71,7 +71,7 @@ in httpPort = mkOption { default = 3000; type = types.int; - description = '' + description = lib.mdDoc '' Sets the HTTP port of the embedded web server. ''; }; @@ -79,7 +79,7 @@ in redis.address = mkOption { type = types.str; example = literalExpression "config.services.redis.ntopng.unixSocket"; - description = '' + description = lib.mdDoc '' Redis address - may be a Unix socket or a network host and port. ''; }; @@ -87,10 +87,10 @@ in redis.createInstance = mkOption { type = types.nullOr types.str; default = if versionAtLeast config.system.stateVersion "22.05" then "ntopng" else ""; - description = '' - Local Redis instance name. Set to null to disable - local Redis instance. Defaults to "" for - system.stateVersion older than 22.05. + description = lib.mdDoc '' + Local Redis instance name. Set to `null` to disable + local Redis instance. Defaults to `""` for + `system.stateVersion` older than 22.05. ''; }; @@ -102,7 +102,7 @@ in --disable-login ''; type = types.lines; - description = '' + description = lib.mdDoc '' Overridable configuration file contents to use for ntopng. By default, use the contents automatically generated by NixOS. ''; @@ -111,10 +111,10 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Configuration lines that will be appended to the generated ntopng configuration file. Note that this mechanism does not work when the - manual option is used. + manual {option}`configText` option is used. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix index 34728455a2..a89c776915 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix @@ -35,7 +35,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to synchronise your machine's time using chrony. Make sure you disable NTP if you enable this service. ''; @@ -45,7 +45,7 @@ in type = types.package; default = pkgs.chrony; defaultText = literalExpression "pkgs.chrony"; - description = '' + description = lib.mdDoc '' Which chrony package to use. ''; }; @@ -54,7 +54,7 @@ in default = config.networking.timeServers; defaultText = literalExpression "config.networking.timeServers"; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The set of NTP servers from which to synchronise. ''; }; @@ -62,7 +62,7 @@ in serverOption = mkOption { default = "iburst"; type = types.enum [ "iburst" "offline" ]; - description = '' + description = lib.mdDoc '' Set option for server directives. Use "iburst" to rapidly poll on startup. Recommended if your machine @@ -76,7 +76,7 @@ in enableNTS = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Network Time Security authentication. Make sure it is supported by your selected NTP server(s). ''; @@ -86,7 +86,7 @@ in enabled = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Allow chronyd to make a rapid measurement of the system clock error at boot time, and to correct the system clock by stepping before normal operation begins. @@ -96,7 +96,7 @@ in threshold = mkOption { type = types.either types.float types.int; default = 1000; # by default, same threshold as 'ntpd -g' (1000s) - description = '' + description = lib.mdDoc '' The threshold of system clock error (in seconds) above which the clock will be stepped. If the correction required is less than the threshold, a slew is used instead. @@ -107,15 +107,15 @@ in directory = mkOption { type = types.str; default = "/var/lib/chrony"; - description = "Directory where chrony state is stored."; + description = lib.mdDoc "Directory where chrony state is stored."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration directives that should be added to - chrony.conf + `chrony.conf` ''; }; @@ -123,7 +123,7 @@ in default = []; example = [ "-s" ]; type = types.listOf types.str; - description = "Extra flags passed to the chronyd command."; + description = lib.mdDoc "Extra flags passed to the chronyd command."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix index 12be0d045a..a9dae2c866 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/ntpd.nix @@ -40,21 +40,19 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to synchronise your machine's time using ntpd, as a peer in the NTP network. - - - Disables systemd.timesyncd if enabled. + + Disables `systemd.timesyncd` if enabled. ''; }; restrictDefault = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The restriction flags to be set by default. - - + The default flags prevent external hosts from using ntpd as a DDoS reflector, setting system time, and querying OS/ntpd version. As recommended in section 6.5.1.1.3, answer "No" of @@ -65,10 +63,9 @@ in restrictSource = mkOption { type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The restriction flags to be set on source. - - + The default flags allow peers to be added by ntpd from configured pool(s), but not by other means. ''; @@ -79,7 +76,7 @@ in default = config.networking.timeServers; defaultText = literalExpression "config.networking.timeServers"; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The set of NTP servers from which to synchronise. ''; }; @@ -90,14 +87,14 @@ in example = '' fudge 127.127.1.0 stratum 10 ''; - description = '' - Additional text appended to ntp.conf. + description = lib.mdDoc '' + Additional text appended to {file}`ntp.conf`. ''; }; extraFlags = mkOption { type = types.listOf types.str; - description = "Extra flags passed to the ntpd command."; + description = lib.mdDoc "Extra flags passed to the ntpd command."; example = literalExpression ''[ "--interface=eth0" ]''; default = []; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/openntpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/openntpd.nix index e86b71291f..2a766a134f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/openntpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/openntpd.nix @@ -35,8 +35,8 @@ in listen on 127.0.0.1 listen on ::1 ''; - description = '' - Additional text appended to openntpd.conf. + description = lib.mdDoc '' + Additional text appended to {file}`openntpd.conf`. ''; }; @@ -44,7 +44,7 @@ in type = with types; separatedString " "; default = ""; example = "-s"; - description = '' + description = lib.mdDoc '' Extra options used when launching openntpd. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nullidentdmod.nix b/third_party/nixpkgs/nixos/modules/services/networking/nullidentdmod.nix index b0d338a279..85f5c799a3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nullidentdmod.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nullidentdmod.nix @@ -7,7 +7,7 @@ in { userid = mkOption { type = nullOr str; - description = "User ID to return. Set to null to return a random string each time."; + description = lib.mdDoc "User ID to return. Set to null to return a random string each time."; default = null; example = "alice"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nylon.nix b/third_party/nixpkgs/nixos/modules/services/networking/nylon.nix index a20fa615af..3eb15c23be 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nylon.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nylon.nix @@ -29,7 +29,7 @@ let enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables nylon as a running service upon activation. ''; }; @@ -37,13 +37,13 @@ let name = mkOption { type = types.str; default = ""; - description = "The name of this nylon instance."; + description = lib.mdDoc "The name of this nylon instance."; }; nrConnections = mkOption { type = types.int; default = 10; - description = '' + description = lib.mdDoc '' The number of allowed simultaneous connections to the daemon, default 10. ''; }; @@ -51,7 +51,7 @@ let logging = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable logging, default is no logging. ''; }; @@ -59,7 +59,7 @@ let verbosity = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable verbose output, default is to not be verbose. ''; }; @@ -67,7 +67,7 @@ let acceptInterface = mkOption { type = types.str; default = "lo"; - description = '' + description = lib.mdDoc '' Tell nylon which interface to listen for client requests on, default is "lo". ''; }; @@ -75,7 +75,7 @@ let bindInterface = mkOption { type = types.str; default = "enp3s0f0"; - description = '' + description = lib.mdDoc '' Tell nylon which interface to use as an uplink, default is "enp3s0f0". ''; }; @@ -83,7 +83,7 @@ let port = mkOption { type = types.int; default = 1080; - description = '' + description = lib.mdDoc '' What port to listen for client requests, default is 1080. ''; }; @@ -91,7 +91,7 @@ let allowedIPRanges = mkOption { type = with types; listOf str; default = [ "192.168.0.0/16" "127.0.0.1/8" "172.16.0.1/12" "10.0.0.0/8" ]; - description = '' + description = lib.mdDoc '' Allowed client IP ranges are evaluated first, defaults to ARIN IPv4 private ranges: [ "192.168.0.0/16" "127.0.0.0/8" "172.16.0.0/12" "10.0.0.0/8" ] ''; @@ -100,7 +100,7 @@ let deniedIPRanges = mkOption { type = with types; listOf str; default = [ "0.0.0.0/0" ]; - description = '' + description = lib.mdDoc '' Denied client IP ranges, these gets evaluated after the allowed IP ranges, defaults to all IPv4 addresses: [ "0.0.0.0/0" ] To block all other access than the allowed. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ofono.nix b/third_party/nixpkgs/nixos/modules/services/networking/ofono.nix index 460b06443c..6192857cd3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ofono.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ofono.nix @@ -25,7 +25,7 @@ in type = types.listOf types.package; default = []; example = literalExpression "[ pkgs.modem-manager-gui ]"; - description = '' + description = lib.mdDoc '' The list of plugins to install. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/oidentd.nix b/third_party/nixpkgs/nixos/modules/services/networking/oidentd.nix index feb84806ba..7c7883c946 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/oidentd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/oidentd.nix @@ -11,7 +11,7 @@ with lib; services.oidentd.enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable ‘oidentd’, an implementation of the Ident protocol (RFC 1413). It allows remote systems to identify the name of the user associated with a TCP connection. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix b/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix index 0256a6a411..5a531d7a47 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/onedrive.nix @@ -29,14 +29,14 @@ in { enable = lib.mkOption { type = lib.types.bool; default = false; - description = "Enable OneDrive service"; + description = lib.mdDoc "Enable OneDrive service"; }; package = lib.mkOption { type = lib.types.package; default = pkgs.onedrive; defaultText = lib.literalExpression "pkgs.onedrive"; - description = '' + description = lib.mdDoc '' OneDrive package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/openconnect.nix b/third_party/nixpkgs/nixos/modules/services/networking/openconnect.nix index bc873b2198..469f0a3bc3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/openconnect.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/openconnect.nix @@ -11,25 +11,25 @@ let options = { autoStart = mkOption { default = true; - description = "Whether this VPN connection should be started automatically."; + description = lib.mdDoc "Whether this VPN connection should be started automatically."; type = types.bool; }; gateway = mkOption { - description = "Gateway server to connect to."; + description = lib.mdDoc "Gateway server to connect to."; example = "gateway.example.com"; type = types.str; }; protocol = mkOption { - description = "Protocol to use."; + description = lib.mdDoc "Protocol to use."; example = "anyconnect"; type = types.enum [ "anyconnect" "array" "nc" "pulse" "gp" "f5" "fortinet" ]; }; user = mkOption { - description = "Username to authenticate with."; + description = lib.mdDoc "Username to authenticate with."; example = "example-user"; type = types.nullOr types.str; }; @@ -38,10 +38,10 @@ let # set an authentication cookie, because they have to be requested # for every new connection and would only work once. passwordFile = mkOption { - description = '' + description = lib.mdDoc '' File containing the password to authenticate with. This - is passed to openconnect via the - --passwd-on-stdin option. + is passed to `openconnect` via the + `--passwd-on-stdin` option. ''; default = null; example = "/var/lib/secrets/openconnect-passwd"; @@ -49,27 +49,27 @@ let }; certificate = mkOption { - description = "Certificate to authenticate with."; + description = lib.mdDoc "Certificate to authenticate with."; default = null; example = "/var/lib/secrets/openconnect_certificate.pem"; type = with types; nullOr (either path pkcs11); }; privateKey = mkOption { - description = "Private key to authenticate with."; + description = lib.mdDoc "Private key to authenticate with."; example = "/var/lib/secrets/openconnect_private_key.pem"; default = null; type = with types; nullOr (either path pkcs11); }; extraOptions = mkOption { - description = '' + description = lib.mdDoc '' Extra config to be appended to the interface config. It should contain long-format options as would be accepted on the command - line by openconnect + line by `openconnect` (see https://www.infradead.org/openconnect/manual.html). - Non-key-value options like deflate can be used by - declaring them as booleans, i. e. deflate = true;. + Non-key-value options like `deflate` can be used by + declaring them as booleans, i. e. `deflate = true;`. ''; default = { }; example = { @@ -118,7 +118,7 @@ in { package = mkPackageOption pkgs "openconnect" { }; interfaces = mkOption { - description = "OpenConnect interfaces."; + description = lib.mdDoc "OpenConnect interfaces."; default = { }; example = { openconnect0 = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix index cf3f79fc57..492a0936fd 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/openvpn.nix @@ -115,12 +115,12 @@ in } ''; - description = '' + description = lib.mdDoc '' Each attribute of this option defines a systemd service that runs an OpenVPN instance. These can be OpenVPN servers or clients. The name of each systemd service is - openvpn-name.service, - where name is the corresponding + `openvpn-«name».service`, + where «name» is the corresponding attribute name. ''; @@ -130,20 +130,20 @@ in config = mkOption { type = types.lines; - description = '' + description = lib.mdDoc '' Configuration of this OpenVPN instance. See - openvpn8 + {manpage}`openvpn(8)` for details. To import an external config file, use the following definition: - config = "config /path/to/config.ovpn" + `config = "config /path/to/config.ovpn"` ''; }; up = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands executed when the instance is starting. ''; }; @@ -151,7 +151,7 @@ in down = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands executed when the instance is shutting down. ''; }; @@ -159,13 +159,13 @@ in autoStart = mkOption { default = true; type = types.bool; - description = "Whether this OpenVPN instance should be started automatically."; + description = lib.mdDoc "Whether this OpenVPN instance should be started automatically."; }; updateResolvConf = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Use the script from the update-resolv-conf package to automatically update resolv.conf with the DNS information provided by openvpn. The script will be run after the "up" commands and before the "down" commands. @@ -174,7 +174,7 @@ in authUserPass = mkOption { default = null; - description = '' + description = lib.mdDoc '' This option can be used to store the username / password credentials with the "auth-user-pass" authentication method. @@ -184,12 +184,12 @@ in options = { username = mkOption { - description = "The username to store inside the credentials file."; + description = lib.mdDoc "The username to store inside the credentials file."; type = types.str; }; password = mkOption { - description = "The password to store inside the credentials file."; + description = lib.mdDoc "The password to store inside the credentials file."; type = types.str; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ostinato.nix b/third_party/nixpkgs/nixos/modules/services/networking/ostinato.nix index 4da11984b9..808ccdd4e0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ostinato.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ostinato.nix @@ -31,7 +31,7 @@ in port = mkOption { type = types.int; default = 7878; - description = '' + description = lib.mdDoc '' Port to listen on. ''; }; @@ -39,7 +39,7 @@ in rateAccuracy = mkOption { type = types.enum [ "High" "Low" ]; default = "High"; - description = '' + description = lib.mdDoc '' To ensure that the actual transmit rate is as close as possible to the configured transmit rate, Drone runs a busy-wait loop. While this provides the maximum accuracy possible, the CPU @@ -52,7 +52,7 @@ in address = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' By default, the Drone RPC server will listen on all interfaces and local IPv4 adresses for incoming connections from clients. Specify a single IPv4 or IPv6 address if you want to restrict that. @@ -66,7 +66,7 @@ in type = types.listOf types.str; default = []; example = [ "eth*" "lo*" ]; - description = '' + description = lib.mdDoc '' For a port to pass the filter and appear on the port list managed by drone, it be allowed by this include list. ''; @@ -75,7 +75,7 @@ in type = types.listOf types.str; default = []; example = [ "usbmon*" "eth0" ]; - description = '' + description = lib.mdDoc '' A list of ports does not appear on the port list managed by drone. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix b/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix index a986f83141..7319793101 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pdns-recursor.nix @@ -32,7 +32,7 @@ in { dns.address = mkOption { type = oneOrMore types.str; default = [ "::" "0.0.0.0" ]; - description = '' + description = lib.mdDoc '' IP addresses Recursor DNS server will bind to. ''; }; @@ -40,7 +40,7 @@ in { dns.port = mkOption { type = types.int; default = 53; - description = '' + description = lib.mdDoc '' Port number Recursor DNS server will bind to. ''; }; @@ -53,7 +53,7 @@ in { "::1/128" "fc00::/7" "fe80::/10" ]; example = [ "0.0.0.0/0" "::/0" ]; - description = '' + description = lib.mdDoc '' IP address ranges of clients allowed to make DNS queries. ''; }; @@ -61,7 +61,7 @@ in { api.address = mkOption { type = types.str; default = "0.0.0.0"; - description = '' + description = lib.mdDoc '' IP address Recursor REST API server will bind to. ''; }; @@ -69,7 +69,7 @@ in { api.port = mkOption { type = types.int; default = 8082; - description = '' + description = lib.mdDoc '' Port number Recursor REST API server will bind to. ''; }; @@ -78,7 +78,7 @@ in { type = types.listOf types.str; default = [ "127.0.0.1" "::1" ]; example = [ "0.0.0.0/0" "::/0" ]; - description = '' + description = lib.mdDoc '' IP address ranges of clients allowed to make API requests. ''; }; @@ -86,7 +86,7 @@ in { exportHosts = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to export names and IP addresses defined in /etc/hosts. ''; }; @@ -94,7 +94,7 @@ in { forwardZones = mkOption { type = types.attrs; default = {}; - description = '' + description = lib.mdDoc '' DNS zones to be forwarded to other authoritative servers. ''; }; @@ -103,7 +103,7 @@ in { type = types.attrs; example = { eth = "[::1]:5353"; }; default = {}; - description = '' + description = lib.mdDoc '' DNS zones to be forwarded to other recursive servers. ''; }; @@ -111,7 +111,7 @@ in { dnssecValidation = mkOption { type = types.enum ["off" "process-no-validate" "process" "log-fail" "validate"]; default = "validate"; - description = '' + description = lib.mdDoc '' Controls the level of DNSSEC processing done by the PowerDNS Recursor. See https://doc.powerdns.com/md/recursor/dnssec/ for a detailed explanation. ''; @@ -120,11 +120,11 @@ in { serveRFC1918 = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to directly resolve the RFC1918 reverse-mapping domains: - 10.in-addr.arpa, - 168.192.in-addr.arpa, - 16-31.172.in-addr.arpa + `10.in-addr.arpa`, + `168.192.in-addr.arpa`, + `16-31.172.in-addr.arpa` This saves load on the AS112 servers. ''; }; @@ -138,11 +138,11 @@ in { log-common-errors = true; } ''; - description = '' + description = lib.mdDoc '' PowerDNS Recursor settings. Use this option to configure Recursor settings not exposed in a NixOS option or to bypass one. See the full documentation at - + for the available options. ''; }; @@ -150,9 +150,9 @@ in { luaConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' The content Lua configuration file for PowerDNS Recursor. See - . + . ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pdnsd.nix b/third_party/nixpkgs/nixos/modules/services/networking/pdnsd.nix index 24b5bbc510..03c9005413 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pdnsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pdnsd.nix @@ -29,33 +29,33 @@ in cacheDir = mkOption { type = types.str; default = "/var/cache/pdnsd"; - description = "Directory holding the pdnsd cache"; + description = lib.mdDoc "Directory holding the pdnsd cache"; }; globalConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Global configuration that should be added to the global directory - of pdnsd.conf. + of `pdnsd.conf`. ''; }; serverConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Server configuration that should be added to the server directory - of pdnsd.conf. + of `pdnsd.conf`. ''; }; extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration directives that should be added to - pdnsd.conf. + `pdnsd.conf`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix b/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix index d2642c82c2..c88081af62 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pixiecore.nix @@ -15,13 +15,13 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports (67, 69 UDP and 4011, 'port', 'statusPort' TCP) in the firewall for Pixiecore. ''; }; mode = mkOption { - description = "Which mode to use"; + description = lib.mdDoc "Which mode to use"; default = "boot"; type = types.enum [ "api" "boot" ]; }; @@ -29,61 +29,61 @@ in debug = mkOption { type = types.bool; default = false; - description = "Log more things that aren't directly related to booting a recognized client"; + description = lib.mdDoc "Log more things that aren't directly related to booting a recognized client"; }; dhcpNoBind = mkOption { type = types.bool; default = false; - description = "Handle DHCP traffic without binding to the DHCP server port"; + description = lib.mdDoc "Handle DHCP traffic without binding to the DHCP server port"; }; kernel = mkOption { type = types.str or types.path; default = ""; - description = "Kernel path. Ignored unless mode is set to 'boot'"; + description = lib.mdDoc "Kernel path. Ignored unless mode is set to 'boot'"; }; initrd = mkOption { type = types.str or types.path; default = ""; - description = "Initrd path. Ignored unless mode is set to 'boot'"; + description = lib.mdDoc "Initrd path. Ignored unless mode is set to 'boot'"; }; cmdLine = mkOption { type = types.str; default = ""; - description = "Kernel commandline arguments. Ignored unless mode is set to 'boot'"; + description = lib.mdDoc "Kernel commandline arguments. Ignored unless mode is set to 'boot'"; }; listen = mkOption { type = types.str; default = "0.0.0.0"; - description = "IPv4 address to listen on"; + description = lib.mdDoc "IPv4 address to listen on"; }; port = mkOption { type = types.port; default = 80; - description = "Port to listen on for HTTP"; + description = lib.mdDoc "Port to listen on for HTTP"; }; statusPort = mkOption { type = types.port; default = 80; - description = "HTTP port for status information (can be the same as --port)"; + description = lib.mdDoc "HTTP port for status information (can be the same as --port)"; }; apiServer = mkOption { type = types.str; example = "localhost:8080"; - description = "host:port to connect to the API. Ignored unless mode is set to 'api'"; + description = lib.mdDoc "host:port to connect to the API. Ignored unless mode is set to 'api'"; }; extraArguments = mkOption { type = types.listOf types.str; default = []; - description = "Additional command line arguments to pass to Pixiecore"; + description = lib.mdDoc "Additional command line arguments to pass to Pixiecore"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix index 9b8382392c..de9d0821c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pleroma.nix @@ -10,31 +10,31 @@ in { type = types.package; default = pkgs.pleroma; defaultText = literalExpression "pkgs.pleroma"; - description = "Pleroma package to use."; + description = lib.mdDoc "Pleroma package to use."; }; user = mkOption { type = types.str; default = "pleroma"; - description = "User account under which pleroma runs."; + description = lib.mdDoc "User account under which pleroma runs."; }; group = mkOption { type = types.str; default = "pleroma"; - description = "Group account under which pleroma runs."; + description = lib.mdDoc "Group account under which pleroma runs."; }; stateDir = mkOption { type = types.str; default = "/var/lib/pleroma"; readOnly = true; - description = "Directory where the pleroma service will save the uploads and static files."; + description = lib.mdDoc "Directory where the pleroma service will save the uploads and static files."; }; configs = mkOption { type = with types; listOf str; - description = '' + description = lib.mdDoc '' Pleroma public configuration. This list gets appended from left to @@ -42,9 +42,9 @@ in { configuration imperatively, meaning you can override a setting by appending a new str to this NixOS option list. - DO NOT STORE ANY PLEROMA SECRET - HERE, use - services.pleroma.secretConfigFile + *DO NOT STORE ANY PLEROMA SECRET + HERE*, use + [services.pleroma.secretConfigFile](#opt-services.pleroma.secretConfigFile) instead. This setting is going to be stored in a file part of @@ -59,11 +59,11 @@ in { secretConfigFile = mkOption { type = types.str; default = "/var/lib/pleroma/secrets.exs"; - description = '' + description = lib.mdDoc '' Path to the file containing your secret pleroma configuration. - DO NOT POINT THIS OPTION TO THE NIX - STORE, the store being world-readable, it'll + *DO NOT POINT THIS OPTION TO THE NIX + STORE*, the store being world-readable, it'll compromise all your secrets. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/polipo.nix b/third_party/nixpkgs/nixos/modules/services/networking/polipo.nix index 1ff9388346..d820e1b397 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/polipo.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/polipo.nix @@ -26,26 +26,26 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to run the polipo caching web proxy."; + description = lib.mdDoc "Whether to run the polipo caching web proxy."; }; proxyAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = "IP address on which Polipo will listen."; + description = lib.mdDoc "IP address on which Polipo will listen."; }; proxyPort = mkOption { type = types.int; default = 8123; - description = "TCP port on which Polipo will listen."; + description = lib.mdDoc "TCP port on which Polipo will listen."; }; allowedClients = mkOption { type = types.listOf types.str; default = [ "127.0.0.1" "::1" ]; example = [ "127.0.0.1" "::1" "134.157.168.0/24" "2001:660:116::/48" ]; - description = '' + description = lib.mdDoc '' List of IP addresses or network addresses that may connect to Polipo. ''; }; @@ -54,7 +54,7 @@ in type = types.str; default = ""; example = "localhost:8124"; - description = '' + description = lib.mdDoc '' Hostname and port number of an HTTP parent proxy; it should have the form ‘host:port’. ''; @@ -64,7 +64,7 @@ in type = types.str; default = ""; example = "localhost:9050"; - description = '' + description = lib.mdDoc '' Hostname and port number of an SOCKS parent proxy; it should have the form ‘host:port’. ''; @@ -73,7 +73,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Polio configuration. Contents will be added verbatim to the configuration file. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/powerdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/powerdns.nix index b035698456..f7c72361df 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/powerdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/powerdns.nix @@ -13,9 +13,9 @@ in { extraConfig = mkOption { type = types.lines; default = "launch=bind"; - description = '' + description = lib.mdDoc '' PowerDNS configuration. Refer to - + for details on supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix b/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix index d1ed25b023..d923b49dda 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix @@ -18,12 +18,12 @@ in default = pkgs.ppp; defaultText = literalExpression "pkgs.ppp"; type = types.package; - description = "pppd package to use."; + description = lib.mdDoc "pppd package to use."; }; peers = mkOption { default = {}; - description = "pppd peers."; + description = lib.mdDoc "pppd peers."; type = types.attrsOf (types.submodule ( { name, ... }: { @@ -32,27 +32,27 @@ in type = types.str; default = name; example = "dialup"; - description = "Name of the PPP peer."; + description = lib.mdDoc "Name of the PPP peer."; }; enable = mkOption { type = types.bool; default = true; example = false; - description = "Whether to enable this PPP peer."; + description = lib.mdDoc "Whether to enable this PPP peer."; }; autostart = mkOption { type = types.bool; default = true; example = false; - description = "Whether the PPP session is automatically started at boot time."; + description = lib.mdDoc "Whether the PPP session is automatically started at boot time."; }; config = mkOption { type = types.lines; default = ""; - description = "pppd configuration for this peer, see the pppd(8) man page."; + description = lib.mdDoc "pppd configuration for this peer, see the pppd(8) man page."; }; }; })); diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pptpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/pptpd.nix index 423e14e998..d16496a2cb 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/pptpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/pptpd.nix @@ -9,31 +9,31 @@ with lib; serverIp = mkOption { type = types.str; - description = "The server-side IP address."; + description = lib.mdDoc "The server-side IP address."; default = "10.124.124.1"; }; clientIpRange = mkOption { type = types.str; - description = "The range from which client IPs are drawn."; + description = lib.mdDoc "The range from which client IPs are drawn."; default = "10.124.124.2-11"; }; maxClients = mkOption { type = types.int; - description = "The maximum number of simultaneous connections."; + description = lib.mdDoc "The maximum number of simultaneous connections."; default = 10; }; extraPptpdOptions = mkOption { type = types.lines; - description = "Adds extra lines to the pptpd configuration file."; + description = lib.mdDoc "Adds extra lines to the pptpd configuration file."; default = ""; }; extraPppdOptions = mkOption { type = types.lines; - description = "Adds extra lines to the pppd options file."; + description = lib.mdDoc "Adds extra lines to the pppd options file."; default = ""; example = '' ms-dns 8.8.8.8 diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prayer.nix b/third_party/nixpkgs/nixos/modules/services/networking/prayer.nix index 513509eaca..01e961997a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/prayer.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/prayer.nix @@ -46,7 +46,7 @@ in port = mkOption { default = 2080; type = types.port; - description = '' + description = lib.mdDoc '' Port the prayer http server is listening to. ''; }; @@ -54,7 +54,7 @@ in extraConfig = mkOption { type = types.lines; default = "" ; - description = '' + description = lib.mdDoc '' Extra configuration. Contents will be added verbatim to the configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix index 7bc964d5f3..1ad5b155fe 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix @@ -58,7 +58,7 @@ in enableTor = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to configure Privoxy to use Tor's faster SOCKS port, suitable for HTTP. ''; @@ -106,8 +106,8 @@ in userActions = mkOption { type = types.lines; default = ""; - description = '' - Actions to be included in a user.action file. This + description = lib.mdDoc '' + Actions to be included in a `user.action` file. This will have a higher priority and can be used to override all other actions. ''; @@ -116,8 +116,8 @@ in userFilters = mkOption { type = types.lines; default = ""; - description = '' - Filters to be included in a user.filter file. This + description = lib.mdDoc '' + Filters to be included in a `user.filter` file. This will have a higher priority and can be used to override all other filters definitions. ''; @@ -130,13 +130,13 @@ in options.listen-address = mkOption { type = types.str; default = "127.0.0.1:8118"; - description = "Pair of address:port the proxy server is listening to."; + description = lib.mdDoc "Pair of address:port the proxy server is listening to."; }; options.enable-edit-actions = mkOption { type = types.bool; default = false; - description = "Whether the web-based actions file editor may be used."; + description = lib.mdDoc "Whether the web-based actions file editor may be used."; }; options.actionsfile = mkOption { @@ -146,7 +146,7 @@ in apply = x: x ++ optional (cfg.userActions != "") (toString (pkgs.writeText "user.actions" cfg.userActions)); default = [ "match-all.action" "default.action" ]; - description = '' + description = lib.mdDoc '' List of paths to Privoxy action files. These paths may either be absolute or relative to the privoxy configuration directory. ''; @@ -157,7 +157,7 @@ in default = [ "default.filter" ]; apply = x: x ++ optional (cfg.userFilters != "") (toString (pkgs.writeText "user.filter" cfg.userFilters)); - description = '' + description = lib.mdDoc '' List of paths to Privoxy filter files. These paths may either be absolute or relative to the privoxy configuration directory. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix index 9e8db04e62..f32c7adbd2 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/prosody.nix @@ -10,19 +10,19 @@ let key = mkOption { type = types.path; - description = "Path to the key file."; + description = lib.mdDoc "Path to the key file."; }; # TODO: rename to certificate to match the prosody config cert = mkOption { type = types.path; - description = "Path to the certificate file."; + description = lib.mdDoc "Path to the certificate file."; }; extraOptions = mkOption { type = types.attrs; default = {}; - description = "Extra SSL configuration options."; + description = lib.mdDoc "Extra SSL configuration options."; }; }; @@ -32,11 +32,11 @@ let options = { url = mkOption { type = types.str; - description = "URL of the endpoint you want to make discoverable"; + description = lib.mdDoc "URL of the endpoint you want to make discoverable"; }; description = mkOption { type = types.str; - description = "A short description of the endpoint you want to advertise"; + description = lib.mdDoc "A short description of the endpoint you want to advertise"; }; }; }; @@ -46,216 +46,216 @@ let roster = mkOption { type = types.bool; default = true; - description = "Allow users to have a roster"; + description = lib.mdDoc "Allow users to have a roster"; }; saslauth = mkOption { type = types.bool; default = true; - description = "Authentication for clients and servers. Recommended if you want to log in."; + description = lib.mdDoc "Authentication for clients and servers. Recommended if you want to log in."; }; tls = mkOption { type = types.bool; default = true; - description = "Add support for secure TLS on c2s/s2s connections"; + description = lib.mdDoc "Add support for secure TLS on c2s/s2s connections"; }; dialback = mkOption { type = types.bool; default = true; - description = "s2s dialback support"; + description = lib.mdDoc "s2s dialback support"; }; disco = mkOption { type = types.bool; default = true; - description = "Service discovery"; + description = lib.mdDoc "Service discovery"; }; # Not essential, but recommended carbons = mkOption { type = types.bool; default = true; - description = "Keep multiple clients in sync"; + description = lib.mdDoc "Keep multiple clients in sync"; }; csi = mkOption { type = types.bool; default = true; - description = "Implements the CSI protocol that allows clients to report their active/inactive state to the server"; + description = lib.mdDoc "Implements the CSI protocol that allows clients to report their active/inactive state to the server"; }; cloud_notify = mkOption { type = types.bool; default = true; - description = "Push notifications to inform users of new messages or other pertinent information even when they have no XMPP clients online"; + description = lib.mdDoc "Push notifications to inform users of new messages or other pertinent information even when they have no XMPP clients online"; }; pep = mkOption { type = types.bool; default = true; - description = "Enables users to publish their mood, activity, playing music and more"; + description = lib.mdDoc "Enables users to publish their mood, activity, playing music and more"; }; private = mkOption { type = types.bool; default = true; - description = "Private XML storage (for room bookmarks, etc.)"; + description = lib.mdDoc "Private XML storage (for room bookmarks, etc.)"; }; blocklist = mkOption { type = types.bool; default = true; - description = "Allow users to block communications with other users"; + description = lib.mdDoc "Allow users to block communications with other users"; }; vcard = mkOption { type = types.bool; default = false; - description = "Allow users to set vCards"; + description = lib.mdDoc "Allow users to set vCards"; }; vcard_legacy = mkOption { type = types.bool; default = true; - description = "Converts users profiles and Avatars between old and new formats"; + description = lib.mdDoc "Converts users profiles and Avatars between old and new formats"; }; bookmarks = mkOption { type = types.bool; default = true; - description = "Allows interop between older clients that use XEP-0048: Bookmarks in its 1.0 version and recent clients which use it in PEP"; + description = lib.mdDoc "Allows interop between older clients that use XEP-0048: Bookmarks in its 1.0 version and recent clients which use it in PEP"; }; # Nice to have version = mkOption { type = types.bool; default = true; - description = "Replies to server version requests"; + description = lib.mdDoc "Replies to server version requests"; }; uptime = mkOption { type = types.bool; default = true; - description = "Report how long server has been running"; + description = lib.mdDoc "Report how long server has been running"; }; time = mkOption { type = types.bool; default = true; - description = "Let others know the time here on this server"; + description = lib.mdDoc "Let others know the time here on this server"; }; ping = mkOption { type = types.bool; default = true; - description = "Replies to XMPP pings with pongs"; + description = lib.mdDoc "Replies to XMPP pings with pongs"; }; register = mkOption { type = types.bool; default = true; - description = "Allow users to register on this server using a client and change passwords"; + description = lib.mdDoc "Allow users to register on this server using a client and change passwords"; }; mam = mkOption { type = types.bool; default = true; - description = "Store messages in an archive and allow users to access it"; + description = lib.mdDoc "Store messages in an archive and allow users to access it"; }; smacks = mkOption { type = types.bool; default = true; - description = "Allow a client to resume a disconnected session, and prevent message loss"; + description = lib.mdDoc "Allow a client to resume a disconnected session, and prevent message loss"; }; # Admin interfaces admin_adhoc = mkOption { type = types.bool; default = true; - description = "Allows administration via an XMPP client that supports ad-hoc commands"; + description = lib.mdDoc "Allows administration via an XMPP client that supports ad-hoc commands"; }; http_files = mkOption { type = types.bool; default = true; - description = "Serve static files from a directory over HTTP"; + description = lib.mdDoc "Serve static files from a directory over HTTP"; }; proxy65 = mkOption { type = types.bool; default = true; - description = "Enables a file transfer proxy service which clients behind NAT can use"; + description = lib.mdDoc "Enables a file transfer proxy service which clients behind NAT can use"; }; admin_telnet = mkOption { type = types.bool; default = false; - description = "Opens telnet console interface on localhost port 5582"; + description = lib.mdDoc "Opens telnet console interface on localhost port 5582"; }; # HTTP modules bosh = mkOption { type = types.bool; default = false; - description = "Enable BOSH clients, aka 'Jabber over HTTP'"; + description = lib.mdDoc "Enable BOSH clients, aka 'Jabber over HTTP'"; }; websocket = mkOption { type = types.bool; default = false; - description = "Enable WebSocket support"; + description = lib.mdDoc "Enable WebSocket support"; }; # Other specific functionality limits = mkOption { type = types.bool; default = false; - description = "Enable bandwidth limiting for XMPP connections"; + description = lib.mdDoc "Enable bandwidth limiting for XMPP connections"; }; groups = mkOption { type = types.bool; default = false; - description = "Shared roster support"; + description = lib.mdDoc "Shared roster support"; }; server_contact_info = mkOption { type = types.bool; default = false; - description = "Publish contact information for this service"; + description = lib.mdDoc "Publish contact information for this service"; }; announce = mkOption { type = types.bool; default = false; - description = "Send announcement to all online users"; + description = lib.mdDoc "Send announcement to all online users"; }; welcome = mkOption { type = types.bool; default = false; - description = "Welcome users who register accounts"; + description = lib.mdDoc "Welcome users who register accounts"; }; watchregistrations = mkOption { type = types.bool; default = false; - description = "Alert admins of registrations"; + description = lib.mdDoc "Alert admins of registrations"; }; motd = mkOption { type = types.bool; default = false; - description = "Send a message to users when they log in"; + description = lib.mdDoc "Send a message to users when they log in"; }; legacyauth = mkOption { type = types.bool; default = false; - description = "Legacy authentication. Only used by some old clients and bots"; + description = lib.mdDoc "Legacy authentication. Only used by some old clients and bots"; }; }; @@ -279,27 +279,27 @@ let options = { domain = mkOption { type = types.str; - description = "Domain name of the MUC"; + description = lib.mdDoc "Domain name of the MUC"; }; name = mkOption { type = types.str; - description = "The name to return in service discovery responses for the MUC service itself"; + description = lib.mdDoc "The name to return in service discovery responses for the MUC service itself"; default = "Prosody Chatrooms"; }; restrictRoomCreation = mkOption { type = types.enum [ true false "admin" "local" ]; default = false; - description = "Restrict room creation to server admins"; + description = lib.mdDoc "Restrict room creation to server admins"; }; maxHistoryMessages = mkOption { type = types.int; default = 20; - description = "Specifies a limit on what each room can be configured to keep"; + description = lib.mdDoc "Specifies a limit on what each room can be configured to keep"; }; roomLocking = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Enables room locking, which means that a room must be configured before it can be used. Locked rooms are invisible and cannot be entered by anyone but the creator @@ -308,7 +308,7 @@ let roomLockTimeout = mkOption { type = types.int; default = 300; - description = '' + description = lib.mdDoc '' Timout after which the room is destroyed or unlocked if not configured, in seconds ''; @@ -316,7 +316,7 @@ let tombstones = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' When a room is destroyed, it leaves behind a tombstone which prevents the room being entered or recreated. It also allows anyone who was not in the room at the time it was destroyed @@ -329,7 +329,7 @@ let tombstoneExpiry = mkOption { type = types.int; default = 2678400; - description = '' + description = lib.mdDoc '' This settings controls how long a tombstone is considered valid. It defaults to 31 days. After this time, the room in question can be created again. @@ -339,7 +339,7 @@ let vcard_muc = mkOption { type = types.bool; default = true; - description = "Adds the ability to set vCard for Multi User Chat rooms"; + description = lib.mdDoc "Adds the ability to set vCard for Multi User Chat rooms"; }; # Extra parameters. Defaulting to prosody default values. @@ -350,42 +350,42 @@ let roomDefaultPublic = mkOption { type = types.bool; default = true; - description = "If set, the MUC rooms will be public by default."; + description = lib.mdDoc "If set, the MUC rooms will be public by default."; }; roomDefaultMembersOnly = mkOption { type = types.bool; default = false; - description = "If set, the MUC rooms will only be accessible to the members by default."; + description = lib.mdDoc "If set, the MUC rooms will only be accessible to the members by default."; }; roomDefaultModerated = mkOption { type = types.bool; default = false; - description = "If set, the MUC rooms will be moderated by default."; + description = lib.mdDoc "If set, the MUC rooms will be moderated by default."; }; roomDefaultPublicJids = mkOption { type = types.bool; default = false; - description = "If set, the MUC rooms will display the public JIDs by default."; + description = lib.mdDoc "If set, the MUC rooms will display the public JIDs by default."; }; roomDefaultChangeSubject = mkOption { type = types.bool; default = false; - description = "If set, the rooms will display the public JIDs by default."; + description = lib.mdDoc "If set, the rooms will display the public JIDs by default."; }; roomDefaultHistoryLength = mkOption { type = types.int; default = 20; - description = "Number of history message sent to participants by default."; + description = lib.mdDoc "Number of history message sent to participants by default."; }; roomDefaultLanguage = mkOption { type = types.str; default = "en"; - description = "Default room language."; + description = lib.mdDoc "Default room language."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Additional MUC specific configuration"; + description = lib.mdDoc "Additional MUC specific configuration"; }; }; }; @@ -394,30 +394,30 @@ let options = { domain = mkOption { type = types.nullOr types.str; - description = "Domain name for the http-upload service"; + description = lib.mdDoc "Domain name for the http-upload service"; }; uploadFileSizeLimit = mkOption { type = types.str; default = "50 * 1024 * 1024"; - description = "Maximum file size, in bytes. Defaults to 50MB."; + description = lib.mdDoc "Maximum file size, in bytes. Defaults to 50MB."; }; uploadExpireAfter = mkOption { type = types.str; default = "60 * 60 * 24 * 7"; - description = "Max age of a file before it gets deleted, in seconds."; + description = lib.mdDoc "Max age of a file before it gets deleted, in seconds."; }; userQuota = mkOption { type = types.nullOr types.int; default = null; example = 1234; - description = '' + description = lib.mdDoc '' Maximum size of all uploaded files per user, in bytes. There will be no quota if this option is set to null. ''; }; httpUploadPath = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Directory where the uploaded files will be stored. By default, uploaded files are put in a sub-directory of the default Prosody storage path (usually /var/lib/prosody). @@ -434,25 +434,25 @@ let # TODO: require attribute domain = mkOption { type = types.str; - description = "Domain name"; + description = lib.mdDoc "Domain name"; }; enabled = mkOption { type = types.bool; default = false; - description = "Whether to enable the virtual host"; + description = lib.mdDoc "Whether to enable the virtual host"; }; ssl = mkOption { type = types.nullOr (types.submodule sslOpts); default = null; - description = "Paths to SSL files"; + description = lib.mdDoc "Paths to SSL files"; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Additional virtual host specific configuration"; + description = lib.mdDoc "Additional virtual host specific configuration"; }; }; @@ -472,13 +472,13 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the prosody server"; + description = lib.mdDoc "Whether to enable the prosody server"; }; xmppComplianceSuite = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' The XEP-0423 defines a set of recommended XEPs to implement for a server. It's generally a good idea to implement this set of extensions if you want to provide your users with a @@ -498,7 +498,7 @@ in package = mkOption { type = types.package; - description = "Prosody package to use"; + description = lib.mdDoc "Prosody package to use"; default = pkgs.prosody; defaultText = literalExpression "pkgs.prosody"; example = literalExpression '' @@ -512,7 +512,7 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/prosody"; - description = '' + description = lib.mdDoc '' The prosody home directory used to store all data. If left as the default value this directory will automatically be created before the prosody server starts, otherwise you are responsible for ensuring the directory exists with appropriate ownership @@ -523,7 +523,7 @@ in disco_items = mkOption { type = types.listOf (types.submodule discoOpts); default = []; - description = "List of discoverable items you want to advertise."; + description = lib.mdDoc "List of discoverable items you want to advertise."; }; user = mkOption { @@ -557,38 +557,38 @@ in allowRegistration = mkOption { type = types.bool; default = false; - description = "Allow account creation"; + description = lib.mdDoc "Allow account creation"; }; # HTTP server-related options httpPorts = mkOption { type = types.listOf types.int; - description = "Listening HTTP ports list for this service."; + description = lib.mdDoc "Listening HTTP ports list for this service."; default = [ 5280 ]; }; httpInterfaces = mkOption { type = types.listOf types.str; default = [ "*" "::" ]; - description = "Interfaces on which the HTTP server will listen on."; + description = lib.mdDoc "Interfaces on which the HTTP server will listen on."; }; httpsPorts = mkOption { type = types.listOf types.int; - description = "Listening HTTPS ports list for this service."; + description = lib.mdDoc "Listening HTTPS ports list for this service."; default = [ 5281 ]; }; httpsInterfaces = mkOption { type = types.listOf types.str; default = [ "*" "::" ]; - description = "Interfaces on which the HTTPS server will listen on."; + description = lib.mdDoc "Interfaces on which the HTTPS server will listen on."; }; c2sRequireEncryption = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Force clients to use encrypted connections? This option will prevent clients from authenticating unless they are using encryption. ''; @@ -597,7 +597,7 @@ in s2sRequireEncryption = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Force servers to use encrypted connections? This option will prevent servers from authenticating unless they are using encryption. Note that this is different from authentication. @@ -607,7 +607,7 @@ in s2sSecureAuth = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Force certificate authentication for server-to-server connections? This provides ideal security, but requires servers you communicate with to support encryption AND present valid, trusted certificates. @@ -619,7 +619,7 @@ in type = types.listOf types.str; default = []; example = [ "insecure.example.com" ]; - description = '' + description = lib.mdDoc '' Some servers have invalid or self-signed certificates. You can list remote domains here that will not be required to authenticate using certificates. They will be authenticated using DNS instead, even @@ -631,7 +631,7 @@ in type = types.listOf types.str; default = []; example = [ "jabber.org" ]; - description = '' + description = lib.mdDoc '' Even if you leave s2s_secure_auth disabled, you can still require valid certificates for some domains by specifying a list here. ''; @@ -643,17 +643,17 @@ in extraModules = mkOption { type = types.listOf types.str; default = []; - description = "Enable custom modules"; + description = lib.mdDoc "Enable custom modules"; }; extraPluginPaths = mkOption { type = types.listOf types.path; default = []; - description = "Addtional path in which to look find plugins/modules"; + description = lib.mdDoc "Addtional path in which to look find plugins/modules"; }; uploadHttp = mkOption { - description = '' + description = lib.mdDoc '' Configures the Prosody builtin HTTP server to handle user uploads. ''; type = types.nullOr (types.submodule uploadHttpOpts); @@ -669,12 +669,12 @@ in example = [ { domain = "conference.my-xmpp-example-host.org"; } ]; - description = "Multi User Chat (MUC) configuration"; + description = lib.mdDoc "Multi User Chat (MUC) configuration"; }; virtualHosts = mkOption { - description = "Define the virtual hosts"; + description = lib.mdDoc "Define the virtual hosts"; type = with types; attrsOf (submodule vHostOpts); @@ -697,27 +697,27 @@ in ssl = mkOption { type = types.nullOr (types.submodule sslOpts); default = null; - description = "Paths to SSL files"; + description = lib.mdDoc "Paths to SSL files"; }; admins = mkOption { type = types.listOf types.str; default = []; example = [ "admin1@example.com" "admin2@example.com" ]; - description = "List of administrators of the current host"; + description = lib.mdDoc "List of administrators of the current host"; }; authentication = mkOption { type = types.enum [ "internal_plain" "internal_hashed" "cyrus" "anonymous" ]; default = "internal_hashed"; example = "internal_plain"; - description = "Authentication mechanism used for logins."; + description = lib.mdDoc "Authentication mechanism used for logins."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Additional prosody configuration"; + description = lib.mdDoc "Additional prosody configuration"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/quassel.nix b/third_party/nixpkgs/nixos/modules/services/networking/quassel.nix index 844c9a6b8b..a4b203ea00 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/quassel.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/quassel.nix @@ -22,7 +22,7 @@ in certificateFile = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Path to the certificate used for SSL connections with clients. ''; }; @@ -30,7 +30,7 @@ in requireSSL = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Require SSL for connections from clients. ''; }; @@ -39,7 +39,7 @@ in type = types.package; default = pkgs.quasselDaemon; defaultText = literalExpression "pkgs.quasselDaemon"; - description = '' + description = lib.mdDoc '' The package of the quassel daemon. ''; }; @@ -57,7 +57,7 @@ in portNumber = mkOption { type = types.port; default = 4242; - description = '' + description = lib.mdDoc '' The port number the Quassel daemon will be listening to. ''; }; @@ -68,7 +68,7 @@ in "/home/''${config.${opt.user}}/.config/quassel-irc.org" ''; type = types.str; - description = '' + description = lib.mdDoc '' The directory holding configuration files, the SQlite database and the SSL Cert. ''; }; @@ -76,7 +76,7 @@ in user = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The existing user the Quassel daemon should run as. If left empty, a default "quassel" user will be created. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/quicktun.nix b/third_party/nixpkgs/nixos/modules/services/networking/quicktun.nix index 438e67d5eb..e2282b9aaf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/quicktun.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/quicktun.nix @@ -13,7 +13,7 @@ with lib; services.quicktun = mkOption { default = { }; - description = "QuickTun tunnels"; + description = lib.mdDoc "QuickTun tunnels"; type = types.attrsOf (types.submodule { options = { tunMode = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/quorum.nix b/third_party/nixpkgs/nixos/modules/services/networking/quorum.nix index bddcd18c7f..67027ae3f8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/quorum.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/quorum.nix @@ -18,82 +18,82 @@ in { user = mkOption { type = types.str; default = "quorum"; - description = "The user as which to run quorum."; + description = lib.mdDoc "The user as which to run quorum."; }; group = mkOption { type = types.str; default = cfg.user; defaultText = literalExpression "config.${opt.user}"; - description = "The group as which to run quorum."; + description = lib.mdDoc "The group as which to run quorum."; }; port = mkOption { type = types.port; default = 21000; - description = "Override the default port on which to listen for connections."; + description = lib.mdDoc "Override the default port on which to listen for connections."; }; nodekeyFile = mkOption { type = types.path; default = "${dataDir}/nodekey"; - description = "Path to the nodekey."; + description = lib.mdDoc "Path to the nodekey."; }; staticNodes = mkOption { type = types.listOf types.str; default = []; example = [ "enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0" ]; - description = "List of validator nodes."; + description = lib.mdDoc "List of validator nodes."; }; privateconfig = mkOption { type = types.str; default = "ignore"; - description = "Configuration of privacy transaction manager."; + description = lib.mdDoc "Configuration of privacy transaction manager."; }; syncmode = mkOption { type = types.enum [ "fast" "full" "light" ]; default = "full"; - description = "Blockchain sync mode."; + description = lib.mdDoc "Blockchain sync mode."; }; blockperiod = mkOption { type = types.int; default = 5; - description = "Default minimum difference between two consecutive block's timestamps in seconds."; + description = lib.mdDoc "Default minimum difference between two consecutive block's timestamps in seconds."; }; permissioned = mkOption { type = types.bool; default = true; - description = "Allow only a defined list of nodes to connect."; + description = lib.mdDoc "Allow only a defined list of nodes to connect."; }; rpc = { enable = mkOption { type = types.bool; default = true; - description = "Enable RPC interface."; + description = lib.mdDoc "Enable RPC interface."; }; address = mkOption { type = types.str; default = "0.0.0.0"; - description = "Listening address for RPC connections."; + description = lib.mdDoc "Listening address for RPC connections."; }; port = mkOption { type = types.port; default = 22004; - description = "Override the default port on which to listen for RPC connections."; + description = lib.mdDoc "Override the default port on which to listen for RPC connections."; }; api = mkOption { type = types.str; default = "admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul"; - description = "API's offered over the HTTP-RPC interface."; + description = lib.mdDoc "API's offered over the HTTP-RPC interface."; }; }; @@ -101,31 +101,31 @@ in { enable = mkOption { type = types.bool; default = true; - description = "Enable WS-RPC interface."; + description = lib.mdDoc "Enable WS-RPC interface."; }; address = mkOption { type = types.str; default = "0.0.0.0"; - description = "Listening address for WS-RPC connections."; + description = lib.mdDoc "Listening address for WS-RPC connections."; }; port = mkOption { type = types.port; default = 8546; - description = "Override the default port on which to listen for WS-RPC connections."; + description = lib.mdDoc "Override the default port on which to listen for WS-RPC connections."; }; api = mkOption { type = types.str; default = "admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul"; - description = "API's offered over the WS-RPC interface."; + description = lib.mdDoc "API's offered over the WS-RPC interface."; }; origins = mkOption { type = types.str; default = "*"; - description = "Origins from which to accept websockets requests"; + description = lib.mdDoc "Origins from which to accept websockets requests"; }; }; @@ -160,7 +160,7 @@ in { parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000"; timestamp = "0x00"; }''; - description = "Blockchain genesis settings."; + description = lib.mdDoc "Blockchain genesis settings."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/r53-ddns.nix b/third_party/nixpkgs/nixos/modules/services/networking/r53-ddns.nix index a8839762d5..77738c7553 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/r53-ddns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/r53-ddns.nix @@ -15,22 +15,22 @@ in interval = mkOption { type = types.str; default = "15min"; - description = "How often to update the entry"; + description = lib.mdDoc "How often to update the entry"; }; zoneID = mkOption { type = types.str; - description = "The ID of your zone in Route53"; + description = lib.mdDoc "The ID of your zone in Route53"; }; domain = mkOption { type = types.str; - description = "The name of your domain in Route53"; + description = lib.mdDoc "The name of your domain in Route53"; }; hostname = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Manually specify the hostname. Otherwise the tool will try to use the name returned by the OS (Call to gethostname) ''; @@ -38,7 +38,7 @@ in environmentFile = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' File containing the AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY in the format of an EnvironmentFile as described by systemd.exec(5) ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix b/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix index 227bafc1d0..687cf206e1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/radicale.nix @@ -28,7 +28,7 @@ in { enable = mkEnableOption "Radicale CalDAV and CardDAV server"; package = mkOption { - description = "Radicale package to use."; + description = lib.mdDoc "Radicale package to use."; # Default cannot be pkgs.radicale because non-null values suppress # warnings about incompatible configuration and storage formats. type = with types; nullOr package // { inherit (package) description; }; @@ -39,21 +39,21 @@ in { config = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Radicale configuration, this will set the service configuration file. - This option is mutually exclusive with . - This option is deprecated. Use instead. + This option is mutually exclusive with {option}`settings`. + This option is deprecated. Use {option}`settings` instead. ''; }; settings = mkOption { type = format.type; default = { }; - description = '' + description = lib.mdDoc '' Configuration for Radicale. See - . - This option is mutually exclusive with . + . + This option is mutually exclusive with {option}`config`. ''; example = literalExpression '' server = { @@ -72,12 +72,12 @@ in { rights = mkOption { type = format.type; - description = '' + description = lib.mdDoc '' Configuration for Radicale's rights file. See - . - This option only works in conjunction with . - Setting this will also set and - to approriate values. + . + This option only works in conjunction with {option}`settings`. + Setting this will also set {option}`settings.rights.type` and + {option}`settings.rights.file` to approriate values. ''; default = { }; example = literalExpression '' @@ -102,7 +102,7 @@ in { extraArgs = mkOption { type = types.listOf types.str; default = []; - description = "Extra arguments passed to the Radicale daemon."; + description = lib.mdDoc "Extra arguments passed to the Radicale daemon."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/radvd.nix b/third_party/nixpkgs/nixos/modules/services/networking/radvd.nix index fb3eb71a8c..72590eda4e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/radvd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/radvd.nix @@ -22,9 +22,9 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Whether to enable the Router Advertisement Daemon - (radvd), which provides link-local + ({command}`radvd`), which provides link-local advertisements of IPv6 router addresses and prefixes using the Neighbor Discovery Protocol (NDP). This enables stateless address autoconfiguration in IPv6 clients on the @@ -36,7 +36,7 @@ in type = types.package; default = pkgs.radvd; defaultText = literalExpression "pkgs.radvd"; - description = '' + description = lib.mdDoc '' The RADVD package to use for the RADVD service. ''; }; @@ -51,7 +51,7 @@ in }; ''; description = - '' + lib.mdDoc '' The contents of the radvd configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/rdnssd.nix b/third_party/nixpkgs/nixos/modules/services/networking/rdnssd.nix index fd04bb8108..c63356e734 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/rdnssd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/rdnssd.nix @@ -21,10 +21,10 @@ in default = false; #default = config.networking.enableIPv6; description = - '' + lib.mdDoc '' Whether to enable the RDNSS daemon - (rdnssd), which configures DNS servers in - /etc/resolv.conf from RDNSS + ({command}`rdnssd`), which configures DNS servers in + {file}`/etc/resolv.conf` from RDNSS advertisements sent by IPv6 routers. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/redsocks.nix b/third_party/nixpkgs/nixos/modules/services/networking/redsocks.nix index 8481f9debf..5aa9f003ba 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/redsocks.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/redsocks.nix @@ -11,19 +11,19 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable redsocks."; + description = lib.mdDoc "Whether to enable redsocks."; }; log_debug = mkOption { type = types.bool; default = false; - description = "Log connection progress."; + description = lib.mdDoc "Log connection progress."; }; log_info = mkOption { type = types.bool; default = false; - description = "Log start and end of client sessions."; + description = lib.mdDoc "Log start and end of client sessions."; }; log = mkOption { @@ -45,7 +45,7 @@ in type = with types; nullOr str; default = null; description = - '' + lib.mdDoc '' Chroot under which to run redsocks. Log file is opened before chroot, but if logging to syslog /etc/localtime may be required. ''; @@ -53,7 +53,7 @@ in redsocks = mkOption { description = - '' + lib.mdDoc '' Local port to proxy associations to be performed. The example shows how to configure a proxy to handle port 80 as HTTP @@ -74,7 +74,7 @@ in type = types.str; default = "127.0.0.1"; description = - '' + lib.mdDoc '' IP on which redsocks should listen. Defaults to 127.0.0.1 for security reasons. ''; @@ -83,13 +83,13 @@ in port = mkOption { type = types.int; default = 12345; - description = "Port on which redsocks should listen."; + description = lib.mdDoc "Port on which redsocks should listen."; }; proxy = mkOption { type = types.str; description = - '' + lib.mdDoc '' Proxy through which redsocks should forward incoming traffic. Example: "example.org:8080" ''; @@ -97,20 +97,20 @@ in type = mkOption { type = types.enum [ "socks4" "socks5" "http-connect" "http-relay" ]; - description = "Type of proxy."; + description = lib.mdDoc "Type of proxy."; }; login = mkOption { type = with types; nullOr str; default = null; - description = "Login to send to proxy."; + description = lib.mdDoc "Login to send to proxy."; }; password = mkOption { type = with types; nullOr str; default = null; description = - '' + lib.mdDoc '' Password to send to proxy. WARNING, this will end up world-readable in the store! Awaiting https://github.com/NixOS/nix/issues/8 to be able to fix. @@ -135,14 +135,14 @@ in redirectInternetOnly = mkOption { type = types.bool; default = true; - description = "Exclude all non-globally-routable IPs from redsocks"; + description = lib.mdDoc "Exclude all non-globally-routable IPs from redsocks"; }; doNotRedirect = mkOption { type = with types; listOf str; default = []; description = - '' + lib.mdDoc '' Iptables filters that if matched will get the packet off of redsocks. ''; @@ -153,7 +153,7 @@ in type = with types; either bool str; default = false; description = - '' + lib.mdDoc '' Conditions to make outbound packets go through this redsocks instance. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix b/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix index 8912785064..05798a2c83 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix @@ -47,7 +47,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If enabled, start the Resilio Sync daemon. Once enabled, you can interact with the service through the Web UI, or configure it in your NixOS configuration. @@ -59,7 +59,7 @@ in example = "Voltron"; default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; - description = '' + description = lib.mdDoc '' Name of the Resilio Sync device. ''; }; @@ -68,7 +68,7 @@ in type = types.int; default = 0; example = 44444; - description = '' + description = lib.mdDoc '' Listening port. Defaults to 0 which randomizes the port. ''; }; @@ -76,7 +76,7 @@ in checkForUpdates = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Determines whether to check for updates and alert the user about them in the UI. ''; @@ -85,7 +85,7 @@ in useUpnp = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Use Universal Plug-n-Play (UPnP) ''; }; @@ -94,7 +94,7 @@ in type = types.int; default = 0; example = 1024; - description = '' + description = lib.mdDoc '' Download speed limit. 0 is unlimited (default). ''; }; @@ -103,7 +103,7 @@ in type = types.int; default = 0; example = 1024; - description = '' + description = lib.mdDoc '' Upload speed limit. 0 is unlimited (default). ''; }; @@ -112,7 +112,7 @@ in type = types.str; default = "[::1]"; example = "0.0.0.0"; - description = '' + description = lib.mdDoc '' HTTP address to bind to. ''; }; @@ -120,7 +120,7 @@ in httpListenPort = mkOption { type = types.int; default = 9000; - description = '' + description = lib.mdDoc '' HTTP port to bind on. ''; }; @@ -129,7 +129,7 @@ in type = types.str; example = "allyourbase"; default = ""; - description = '' + description = lib.mdDoc '' HTTP web login username. ''; }; @@ -138,7 +138,7 @@ in type = types.str; example = "arebelongtous"; default = ""; - description = '' + description = lib.mdDoc '' HTTP web login password. ''; }; @@ -146,23 +146,23 @@ in encryptLAN = mkOption { type = types.bool; default = true; - description = "Encrypt LAN data."; + description = lib.mdDoc "Encrypt LAN data."; }; enableWebUI = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable Web UI for administration. Bound to the specified - httpListenAddress and - httpListenPort. + `httpListenAddress` and + `httpListenPort`. ''; }; storagePath = mkOption { type = types.path; default = "/var/lib/resilio-sync/"; - description = '' + description = lib.mdDoc '' Where BitTorrent Sync will store it's database files (containing things like username info and licenses). Generally, you should not need to ever change this. @@ -172,14 +172,14 @@ in apiKey = mkOption { type = types.str; default = ""; - description = "API key, which enables the developer API."; + description = lib.mdDoc "API key, which enables the developer API."; }; directoryRoot = mkOption { type = types.str; default = ""; example = "/media"; - description = "Default directory to add folders in the web UI."; + description = lib.mdDoc "Default directory to add folders in the web UI."; }; sharedFolders = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/robustirc-bridge.nix b/third_party/nixpkgs/nixos/modules/services/networking/robustirc-bridge.nix index 255af79ec0..c5afbaf8ea 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/robustirc-bridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/robustirc-bridge.nix @@ -13,7 +13,7 @@ in extraFlags = mkOption { type = types.listOf types.str; default = []; - description = ''Extra flags passed to the robustirc-bridge command. See RobustIRC Documentation or robustirc-bridge(1) for details.''; + description = lib.mdDoc ''Extra flags passed to the {command}`robustirc-bridge` command. See [RobustIRC Documentation](https://robustirc.net/docs/adminguide.html#_bridge) or robustirc-bridge(1) for details.''; example = [ "-network robustirc.net" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/routedns.nix b/third_party/nixpkgs/nixos/modules/services/networking/routedns.nix index e0f5eedd2c..6f3d769e86 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/routedns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/routedns.nix @@ -38,8 +38,8 @@ in }; } ''; - description = '' - Configuration for RouteDNS, see + description = lib.mdDoc '' + Configuration for RouteDNS, see for more information. ''; }; @@ -49,14 +49,14 @@ in defaultText = "A RouteDNS configuration file automatically generated by values from services.routedns.*"; type = types.path; example = literalExpression ''"''${pkgs.routedns}/cmd/routedns/example-config/use-case-1.toml"''; - description = "Path to RouteDNS TOML configuration file."; + description = lib.mdDoc "Path to RouteDNS TOML configuration file."; }; package = mkOption { default = pkgs.routedns; defaultText = literalExpression "pkgs.routedns"; type = types.package; - description = "RouteDNS package to use."; + description = lib.mdDoc "RouteDNS package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/sabnzbd.nix b/third_party/nixpkgs/nixos/modules/services/networking/sabnzbd.nix index 54eeba1a9e..18e1d9f48b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/sabnzbd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/sabnzbd.nix @@ -21,25 +21,25 @@ in type = types.package; default = pkgs.sabnzbd; defaultText = "pkgs.sabnzbd"; - description = "The sabnzbd executable package run by the service."; + description = lib.mdDoc "The sabnzbd executable package run by the service."; }; configFile = mkOption { type = types.path; default = "/var/lib/sabnzbd/sabnzbd.ini"; - description = "Path to config file."; + description = lib.mdDoc "Path to config file."; }; user = mkOption { default = "sabnzbd"; type = types.str; - description = "User to run the service as"; + description = lib.mdDoc "User to run the service as"; }; group = mkOption { type = types.str; default = "sabnzbd"; - description = "Group to run the service as"; + description = lib.mdDoc "Group to run the service as"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/seafile.nix b/third_party/nixpkgs/nixos/modules/services/networking/seafile.nix index 2839ffb60a..d9617952ea 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/seafile.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/seafile.nix @@ -19,6 +19,8 @@ let MEDIA_ROOT = '${seahubDir}/media/' THUMBNAIL_ROOT = '${seahubDir}/thumbnail/' + SERVICE_URL = '${cfg.ccnetSettings.General.SERVICE_URL}' + with open('${seafRoot}/.seahubSecret') as f: SECRET_KEY = f.readline().rstrip() @@ -46,7 +48,7 @@ in { SERVICE_URL = mkOption { type = types.str; example = "https://www.example.com"; - description = '' + description = lib.mdDoc '' Seahub public URL. ''; }; @@ -54,9 +56,9 @@ in { }; }; default = { }; - description = '' + description = lib.mdDoc '' Configuration for ccnet, see - + for supported values. ''; }; @@ -70,7 +72,7 @@ in { port = mkOption { type = types.port; default = 8082; - description = '' + description = lib.mdDoc '' The tcp port used by seafile fileserver. ''; }; @@ -78,7 +80,7 @@ in { type = types.str; default = "127.0.0.1"; example = "0.0.0.0"; - description = '' + description = lib.mdDoc '' The binding address used by seafile fileserver. ''; }; @@ -86,9 +88,9 @@ in { }; }; default = { }; - description = '' + description = lib.mdDoc '' Configuration for seafile-server, see - + for supported values. ''; }; @@ -97,7 +99,7 @@ in { type = types.int; default = 4; example = 10; - description = '' + description = lib.mdDoc '' The number of gunicorn worker processes for handling requests. ''; }; @@ -105,7 +107,7 @@ in { adminEmail = mkOption { example = "john@example.com"; type = types.str; - description = '' + description = lib.mdDoc '' Seafile Seahub Admin Account Email. ''; }; @@ -113,7 +115,7 @@ in { initialAdminPassword = mkOption { example = "someStrongPass"; type = types.str; - description = '' + description = lib.mdDoc '' Seafile Seahub Admin Account initial password. Should be change via Seahub web front-end. ''; @@ -121,7 +123,7 @@ in { seafilePackage = mkOption { type = types.package; - description = "Which package to use for the seafile server."; + description = lib.mdDoc "Which package to use for the seafile server."; default = pkgs.seafile-server; defaultText = literalExpression "pkgs.seafile-server"; }; @@ -131,7 +133,7 @@ in { type = types.lines; description = '' Extra config to append to `seahub_settings.py` file. - Refer to + Refer to for all available options. ''; }; @@ -177,6 +179,7 @@ in { after = [ "network.target" ]; wantedBy = [ "seafile.target" ]; restartTriggers = [ ccnetConf seafileConf ]; + path = [ pkgs.sqlite ]; serviceConfig = securityOptions // { User = "seafile"; Group = "seafile"; @@ -200,11 +203,11 @@ in { if [ ! -f "${seafRoot}/server-setup" ]; then mkdir -p ${dataDir}/library-template mkdir -p ${ccnetDir}/{GroupMgr,misc,OrgMgr,PeerMgr} - ${pkgs.sqlite}/bin/sqlite3 ${ccnetDir}/GroupMgr/groupmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/groupmgr.sql" - ${pkgs.sqlite}/bin/sqlite3 ${ccnetDir}/misc/config.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/config.sql" - ${pkgs.sqlite}/bin/sqlite3 ${ccnetDir}/OrgMgr/orgmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/org.sql" - ${pkgs.sqlite}/bin/sqlite3 ${ccnetDir}/PeerMgr/usermgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/user.sql" - ${pkgs.sqlite}/bin/sqlite3 ${dataDir}/seafile.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/seafile.sql" + sqlite3 ${ccnetDir}/GroupMgr/groupmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/groupmgr.sql" + sqlite3 ${ccnetDir}/misc/config.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/config.sql" + sqlite3 ${ccnetDir}/OrgMgr/orgmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/org.sql" + sqlite3 ${ccnetDir}/PeerMgr/usermgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/user.sql" + sqlite3 ${dataDir}/seafile.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/seafile.sql" echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup fi # checking for upgrades and handling them @@ -213,7 +216,14 @@ in { installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) pkgMajor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f1) pkgMinor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f2) - if [ $installedMajor != $pkgMajor ] || [ $installedMinor != $pkgMinor ]; then + + if [[ $installedMajor == $pkgMajor && $installedMinor == $pkgMinor ]]; then + : + elif [[ $installedMajor == 8 && $installedMinor == 0 && $pkgMajor == 9 && $pkgMinor == 0 ]]; then + # Upgrade from 8.0 to 9.0 + sqlite3 ${dataDir}/seafile.db ".read ${pkgs.seahub}/scripts/upgrade/sql/9.0.0/sqlite3/seafile.sql" + echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup + else echo "Unsupported upgrade" >&2 exit 1 fi diff --git a/third_party/nixpkgs/nixos/modules/services/networking/searx.nix b/third_party/nixpkgs/nixos/modules/services/networking/searx.nix index b73f255eb9..238479864f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/searx.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/searx.nix @@ -51,14 +51,14 @@ in type = types.bool; default = false; relatedPackages = [ "searx" ]; - description = "Whether to enable Searx, the meta search engine."; + description = lib.mdDoc "Whether to enable Searx, the meta search engine."; }; environmentFile = mkOption { type = types.nullOr types.path; default = null; - description = '' - Environment file (see systemd.exec(5) + description = lib.mdDoc '' + Environment file (see `systemd.exec(5)` "EnvironmentFile=" section for the syntax) to define variables for Searx. This option can be used to safely include secret keys into the Searx configuration. @@ -117,7 +117,7 @@ in type = types.package; default = pkgs.searx; defaultText = literalExpression "pkgs.searx"; - description = "searx package to use."; + description = lib.mdDoc "searx package to use."; }; runInUwsgi = mkOption { @@ -143,9 +143,10 @@ in disable-logging = true; http = ":8080"; # serve via HTTP... socket = "/run/searx/searx.sock"; # ...or UNIX socket + chmod-socket = "660"; # allow the searx group to read/write to the socket } ''; - description = '' + description = lib.mdDoc '' Additional configuration of the uWSGI vassal running searx. It should notably specify on which interfaces and ports the vassal should listen. @@ -220,7 +221,12 @@ in lazy-apps = true; enable-threads = true; module = "searx.webapp"; - env = [ "SEARX_SETTINGS_PATH=${cfg.settingsFile}" ]; + env = [ + "SEARX_SETTINGS_PATH=${cfg.settingsFile}" + # searxng compatiblity https://github.com/searxng/searxng/issues/1519 + "SEARXNG_SETTINGS_PATH=${cfg.settingsFile}" + ]; + buffer-size = 32768; pythonPackages = self: [ cfg.package ]; } // cfg.uwsgiConfig; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix b/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix index 7bea269a9e..8eee40711a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shadowsocks.nix @@ -34,7 +34,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run shadowsocks-libev shadowsocks server. ''; }; @@ -42,7 +42,7 @@ in localAddress = mkOption { type = types.coercedTo types.str singleton (types.listOf types.str); default = [ "[::0]" "0.0.0.0" ]; - description = '' + description = lib.mdDoc '' Local addresses to which the server binds. ''; }; @@ -50,7 +50,7 @@ in port = mkOption { type = types.int; default = 8388; - description = '' + description = lib.mdDoc '' Port which the server uses. ''; }; @@ -58,7 +58,7 @@ in password = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Password for connecting clients. ''; }; @@ -66,7 +66,7 @@ in passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Password file with a password for connecting clients. ''; }; @@ -74,7 +74,7 @@ in mode = mkOption { type = types.enum [ "tcp_only" "tcp_and_udp" "udp_only" ]; default = "tcp_and_udp"; - description = '' + description = lib.mdDoc '' Relay protocols. ''; }; @@ -82,7 +82,7 @@ in fastOpen = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' use TCP fast-open ''; }; @@ -90,8 +90,8 @@ in encryptionMethod = mkOption { type = types.str; default = "chacha20-ietf-poly1305"; - description = '' - Encryption method. See . + description = lib.mdDoc '' + Encryption method. See . ''; }; @@ -99,7 +99,7 @@ in type = types.nullOr types.str; default = null; example = literalExpression ''"''${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"''; - description = '' + description = lib.mdDoc '' SIP003 plugin for shadowsocks ''; }; @@ -108,7 +108,7 @@ in type = types.str; default = ""; example = "server;host=example.com"; - description = '' + description = lib.mdDoc '' Options to pass to the plugin if one was specified ''; }; @@ -119,13 +119,13 @@ in example = { nameserver = "8.8.8.8"; }; - description = '' + description = lib.mdDoc '' Additional configuration for shadowsocks that is not covered by the provided options. The provided attrset will be serialized to JSON and has to contain valid shadowsocks options. Unfortunately most additional options are undocumented but it's easy to find out what is available by looking into the source code of - + ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shairport-sync.nix b/third_party/nixpkgs/nixos/modules/services/networking/shairport-sync.nix index eb61663e4d..75684eea3a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shairport-sync.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shairport-sync.nix @@ -19,7 +19,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the shairport-sync daemon. Running with a local system-wide or remote pulseaudio server @@ -30,7 +30,7 @@ in arguments = mkOption { type = types.str; default = "-v -o pa"; - description = '' + description = lib.mdDoc '' Arguments to pass to the daemon. Defaults to a local pulseaudio server. ''; @@ -39,7 +39,7 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to automatically open ports in the firewall. ''; }; @@ -47,7 +47,7 @@ in user = mkOption { type = types.str; default = "shairport"; - description = '' + description = lib.mdDoc '' User account name under which to run shairport-sync. The account will be created. ''; @@ -56,7 +56,7 @@ in group = mkOption { type = types.str; default = "shairport"; - description = '' + description = lib.mdDoc '' Group account name under which to run shairport-sync. The account will be created. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shellhub-agent.nix b/third_party/nixpkgs/nixos/modules/services/networking/shellhub-agent.nix index 57825945d9..c13f183d4f 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shellhub-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shellhub-agent.nix @@ -19,7 +19,7 @@ in preferredHostname = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Set the device preferred hostname. This provides a hint to the server to use this as hostname if it is available. ''; @@ -28,7 +28,7 @@ in keepAliveInterval = mkOption { type = types.int; default = 30; - description = '' + description = lib.mdDoc '' Determine the interval to send the keep alive message to the server. This has a direct impact of the bandwidth used by the device. @@ -38,7 +38,7 @@ in tenantId = mkOption { type = types.str; example = "ba0a880c-2ada-11eb-a35e-17266ef329d6"; - description = '' + description = lib.mdDoc '' The tenant ID to use when connecting to the ShellHub Gateway. ''; @@ -47,7 +47,7 @@ in server = mkOption { type = types.str; default = "https://cloud.shellhub.io"; - description = '' + description = lib.mdDoc '' Server address of ShellHub Gateway to connect. ''; }; @@ -55,7 +55,7 @@ in privateKey = mkOption { type = types.path; default = "/var/lib/shellhub-agent/private.key"; - description = '' + description = lib.mdDoc '' Location where to store the ShellHub Agent private key. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix b/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix index ac732d4b12..795295d162 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shorewall.nix @@ -23,12 +23,12 @@ in { type = types.package; default = pkgs.shorewall; defaultText = lib.literalExpression "pkgs.shorewall"; - description = "The shorewall package to use."; + description = lib.mdDoc "The shorewall package to use."; }; configs = lib.mkOption { type = types.attrsOf types.lines; default = {}; - description = '' + description = lib.mdDoc '' This option defines the Shorewall configs. The attribute name defines the name of the config, and the attribute value defines the content of the config. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix b/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix index 4235c74a3f..1d6d84eb89 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shorewall6.nix @@ -23,12 +23,12 @@ in { type = types.package; default = pkgs.shorewall; defaultText = lib.literalExpression "pkgs.shorewall"; - description = "The shorewall package to use."; + description = lib.mdDoc "The shorewall package to use."; }; configs = lib.mkOption { type = types.attrsOf types.lines; default = {}; - description = '' + description = lib.mdDoc '' This option defines the Shorewall configs. The attribute name defines the name of the config, and the attribute value defines the content of the config. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/shout.nix b/third_party/nixpkgs/nixos/modules/services/networking/shout.nix index cca03a8f88..1ef21ad5bf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/shout.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/shout.nix @@ -28,32 +28,32 @@ in { private = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Make your shout instance private. You will need to configure user - accounts by adding entries in ${shoutHome}/users. + accounts by adding entries in {file}`${shoutHome}/users`. ''; }; listenAddress = mkOption { type = types.str; default = "0.0.0.0"; - description = "IP interface to listen on for http connections."; + description = lib.mdDoc "IP interface to listen on for http connections."; }; port = mkOption { type = types.port; default = 9000; - description = "TCP port to listen on for http connections."; + description = lib.mdDoc "TCP port to listen on for http connections."; }; configFile = mkOption { type = types.nullOr types.lines; default = null; - description = '' - Contents of Shout's config.js file. + description = lib.mdDoc '' + Contents of Shout's {file}`config.js` file. Used for backward compatibility, recommended way is now to use - the config option. + the `config` option. Documentation: http://shout-irc.com/docs/server/configuration.html ''; @@ -70,8 +70,8 @@ in { port = 6697; }; }; - description = '' - Shout config.js contents as attribute set (will be + description = lib.mdDoc '' + Shout {file}`config.js` contents as attribute set (will be converted to JSON to generate the configuration file). The options defined here will be merged to the default configuration file. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/skydns.nix b/third_party/nixpkgs/nixos/modules/services/networking/skydns.nix index dea60a3862..f73a871884 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/skydns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/skydns.nix @@ -13,45 +13,45 @@ in { machines = mkOption { default = [ "http://127.0.0.1:2379" ]; type = types.listOf types.str; - description = "Skydns list of etcd endpoints to connect to."; + description = lib.mdDoc "Skydns list of etcd endpoints to connect to."; }; tlsKey = mkOption { default = null; type = types.nullOr types.path; - description = "Skydns path of TLS client certificate - private key."; + description = lib.mdDoc "Skydns path of TLS client certificate - private key."; }; tlsPem = mkOption { default = null; type = types.nullOr types.path; - description = "Skydns path of TLS client certificate - public key."; + description = lib.mdDoc "Skydns path of TLS client certificate - public key."; }; caCert = mkOption { default = null; type = types.nullOr types.path; - description = "Skydns path of TLS certificate authority public key."; + description = lib.mdDoc "Skydns path of TLS certificate authority public key."; }; }; address = mkOption { default = "0.0.0.0:53"; type = types.str; - description = "Skydns address to bind to."; + description = lib.mdDoc "Skydns address to bind to."; }; domain = mkOption { default = "skydns.local."; type = types.str; - description = "Skydns default domain if not specified by etcd config."; + description = lib.mdDoc "Skydns default domain if not specified by etcd config."; }; nameservers = mkOption { default = map (n: n + ":53") config.networking.nameservers; defaultText = literalExpression ''map (n: n + ":53") config.networking.nameservers''; type = types.listOf types.str; - description = "Skydns list of nameservers to forward DNS requests to when not authoritative for a domain."; + description = lib.mdDoc "Skydns list of nameservers to forward DNS requests to when not authoritative for a domain."; example = ["8.8.8.8:53" "8.8.4.4:53"]; }; @@ -59,13 +59,13 @@ in { default = pkgs.skydns; defaultText = literalExpression "pkgs.skydns"; type = types.package; - description = "Skydns package to use."; + description = lib.mdDoc "Skydns package to use."; }; extraConfig = mkOption { default = {}; type = types.attrsOf types.str; - description = "Skydns attribute set of extra config options passed as environment variables."; + description = lib.mdDoc "Skydns attribute set of extra config options passed as environment variables."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/smartdns.nix b/third_party/nixpkgs/nixos/modules/services/networking/smartdns.nix index 7f9df42ce9..aa13274788 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/smartdns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/smartdns.nix @@ -25,7 +25,7 @@ in { bindPort = mkOption { type = types.port; default = 53; - description = "DNS listening port number."; + description = lib.mdDoc "DNS listening port number."; }; settings = mkOption { @@ -42,9 +42,9 @@ in { speed-check-mode = "ping,tcp:80"; }; ''; - description = '' - A set that will be generated into configuration file, see the SmartDNS README for details of configuration parameters. - You could override the options here like by writing settings.bind = ":5353 -no-rule -group example";. + description = lib.mdDoc '' + A set that will be generated into configuration file, see the [SmartDNS README](https://github.com/pymumu/smartdns/blob/master/ReadMe_en.md#configuration-parameter) for details of configuration parameters. + You could override the options here like {option}`services.smartdns.bindPort` by writing `settings.bind = ":5353 -no-rule -group example";`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix index bd71b158db..7f1abcc682 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix @@ -52,7 +52,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the smokeping service"; + description = lib.mdDoc "Enable the smokeping service"; }; alertConfig = mkOption { type = types.lines; @@ -70,14 +70,14 @@ in pattern = >0%,*12*,>0%,*12*,>0% comment = loss 3 times in a row; ''; - description = "Configuration for alerts."; + description = lib.mdDoc "Configuration for alerts."; }; cgiUrl = mkOption { type = types.str; default = "http://${cfg.hostName}:${toString cfg.port}/smokeping.cgi"; defaultText = literalExpression ''"http://''${hostName}:''${toString port}/smokeping.cgi"''; example = "https://somewhere.example.com/smokeping.cgi"; - description = "URL to the smokeping cgi."; + description = lib.mdDoc "URL to the smokeping cgi."; }; config = mkOption { type = types.nullOr types.lines; @@ -113,28 +113,28 @@ in MAX 0.5 144 7200 MIN 0.5 144 7200 ''; - description = ''Configure the ping frequency and retention of the rrd files. + description = lib.mdDoc ''Configure the ping frequency and retention of the rrd files. Once set, changing the interval will require deletion or migration of all the collected data.''; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Any additional customization not already included."; + description = lib.mdDoc "Any additional customization not already included."; }; hostName = mkOption { type = types.str; default = config.networking.fqdn; defaultText = literalExpression "config.networking.fqdn"; example = "somewhere.example.com"; - description = "DNS name for the urls generated in the cgi."; + description = lib.mdDoc "DNS name for the urls generated in the cgi."; }; imgUrl = mkOption { type = types.str; default = "cache"; defaultText = literalExpression ''"cache"''; example = "https://somewhere.example.com/cache"; - description = '' + description = lib.mdDoc '' Base url for images generated in the cgi. The default is a relative URL to ensure it works also when e.g. forwarding @@ -145,48 +145,48 @@ in type = types.enum ["original" "absolute" "relative"]; default = "relative"; example = "absolute"; - description = "DNS name for the urls generated in the cgi."; + description = lib.mdDoc "DNS name for the urls generated in the cgi."; }; mailHost = mkOption { type = types.str; default = ""; example = "localhost"; - description = "Use this SMTP server to send alerts"; + description = lib.mdDoc "Use this SMTP server to send alerts"; }; owner = mkOption { type = types.str; default = "nobody"; - example = "Joe Admin"; - description = "Real name of the owner of the instance"; + example = "Bob Foobawr"; + description = lib.mdDoc "Real name of the owner of the instance"; }; ownerEmail = mkOption { type = types.str; default = "no-reply@${cfg.hostName}"; defaultText = literalExpression ''"no-reply@''${hostName}"''; example = "no-reply@yourdomain.com"; - description = "Email contact for owner"; + description = lib.mdDoc "Email contact for owner"; }; package = mkOption { type = types.package; default = pkgs.smokeping; defaultText = literalExpression "pkgs.smokeping"; - description = "Specify a custom smokeping package"; + description = lib.mdDoc "Specify a custom smokeping package"; }; host = mkOption { type = types.nullOr types.str; default = "localhost"; example = "192.0.2.1"; # rfc5737 example IP for documentation - description = '' + description = lib.mdDoc '' Host/IP to bind to for the web server. - Setting it to null skips passing the -h option to thttpd, + Setting it to `null` skips passing the -h option to thttpd, which makes it bind to all interfaces. ''; }; port = mkOption { type = types.int; default = 8081; - description = "TCP port to use for the web server."; + description = lib.mdDoc "TCP port to use for the web server."; }; presentationConfig = mkOption { type = types.lines; @@ -227,13 +227,13 @@ in "Last 10 Days" 10d "Last 360 Days" 360d ''; - description = "presentation graph style"; + description = lib.mdDoc "presentation graph style"; }; presentationTemplate = mkOption { type = types.str; default = "${pkgs.smokeping}/etc/basepage.html.dist"; defaultText = literalExpression ''"''${pkgs.smokeping}/etc/basepage.html.dist"''; - description = "Default page layout for the web UI."; + description = lib.mdDoc "Default page layout for the web UI."; }; probeConfig = mkOption { type = types.lines; @@ -247,19 +247,19 @@ in binary = ''${config.security.wrapperDir}/fping ''' ''; - description = "Probe configuration"; + description = lib.mdDoc "Probe configuration"; }; sendmail = mkOption { type = types.nullOr types.path; default = null; example = "/run/wrappers/bin/sendmail"; - description = "Use this sendmail compatible script to deliver alerts"; + description = lib.mdDoc "Use this sendmail compatible script to deliver alerts"; }; smokeMailTemplate = mkOption { type = types.str; default = "${cfg.package}/etc/smokemail.dist"; defaultText = literalExpression ''"''${package}/etc/smokemail.dist"''; - description = "Specify the smokemail template for alerts."; + description = lib.mdDoc "Specify the smokemail template for alerts."; }; targetConfig = mkOption { type = types.lines; @@ -277,17 +277,17 @@ in title = This host host = localhost ''; - description = "Target configuration"; + description = lib.mdDoc "Target configuration"; }; user = mkOption { type = types.str; default = "smokeping"; - description = "User that runs smokeping and (optionally) thttpd. A group of the same name will be created as well."; + description = lib.mdDoc "User that runs smokeping and (optionally) thttpd. A group of the same name will be created as well."; }; webService = mkOption { type = types.bool; default = true; - description = "Enable a smokeping web interface"; + description = lib.mdDoc "Enable a smokeping web interface"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/sniproxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/sniproxy.nix index adca5398e4..dedeb96f73 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/sniproxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/sniproxy.nix @@ -23,19 +23,19 @@ in user = mkOption { type = types.str; default = "sniproxy"; - description = "User account under which sniproxy runs."; + description = lib.mdDoc "User account under which sniproxy runs."; }; group = mkOption { type = types.str; default = "sniproxy"; - description = "Group under which sniproxy runs."; + description = lib.mdDoc "Group under which sniproxy runs."; }; config = mkOption { type = types.lines; default = ""; - description = "sniproxy.conf configuration excluding the daemon username and pid file."; + description = lib.mdDoc "sniproxy.conf configuration excluding the daemon username and pid file."; example = '' error_log { filename /var/log/sniproxy/error.log diff --git a/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix index 2124644ed9..d759b07e8b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/snowflake-proxy.nix @@ -11,25 +11,25 @@ in enable = mkEnableOption "System to defeat internet censorship"; broker = mkOption { - description = "Broker URL (default \"https://snowflake-broker.torproject.net/\")"; + description = lib.mdDoc "Broker URL (default \"https://snowflake-broker.torproject.net/\")"; type = with types; nullOr str; default = null; }; capacity = mkOption { - description = "Limits the amount of maximum concurrent clients allowed."; + description = lib.mdDoc "Limits the amount of maximum concurrent clients allowed."; type = with types; nullOr int; default = null; }; relay = mkOption { - description = "websocket relay URL (default \"wss://snowflake.bamsoftware.com/\")"; + description = lib.mdDoc "websocket relay URL (default \"wss://snowflake.bamsoftware.com/\")"; type = with types; nullOr str; default = null; }; stun = mkOption { - description = "STUN broker URL (default \"stun:stun.stunprotocol.org:3478\")"; + description = lib.mdDoc "STUN broker URL (default \"stun:stun.stunprotocol.org:3478\")"; type = with types; nullOr str; default = null; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/softether.nix b/third_party/nixpkgs/nixos/modules/services/networking/softether.nix index 5405f56871..47d10bf64c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/softether.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/softether.nix @@ -22,7 +22,7 @@ in type = types.package; default = pkgs.softether; defaultText = literalExpression "pkgs.softether"; - description = '' + description = lib.mdDoc '' softether derivation to use. ''; }; @@ -36,14 +36,14 @@ in up = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Shell commands executed when the Virtual Network Adapter(s) is/are starting. ''; }; down = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Shell commands executed when the Virtual Network Adapter(s) is/are shutting down. ''; }; @@ -52,7 +52,7 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/softether"; - description = '' + description = lib.mdDoc '' Data directory for SoftEther VPN. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/soju.nix b/third_party/nixpkgs/nixos/modules/services/networking/soju.nix index cb0acf4765..32ace43660 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/soju.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/soju.nix @@ -44,25 +44,27 @@ in type = types.str; default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; - description = "Server hostname."; + description = lib.mdDoc "Server hostname."; }; tlsCertificate = mkOption { type = types.nullOr types.path; + default = null; example = "/var/host.cert"; - description = "Path to server TLS certificate."; + description = lib.mdDoc "Path to server TLS certificate."; }; tlsCertificateKey = mkOption { type = types.nullOr types.path; + default = null; example = "/var/host.key"; - description = "Path to server TLS certificate key."; + description = lib.mdDoc "Path to server TLS certificate key."; }; enableMessageLogging = mkOption { type = types.bool; default = true; - description = "Whether to enable message logging."; + description = lib.mdDoc "Whether to enable message logging."; }; httpOrigins = mkOption { @@ -90,13 +92,23 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = "Lines added verbatim to the configuration file."; + description = lib.mdDoc "Lines added verbatim to the configuration file."; }; }; ###### implementation config = mkIf cfg.enable { + assertions = [ + { + assertion = (cfg.tlsCertificate != null) == (cfg.tlsCertificateKey != null); + message = '' + services.soju.tlsCertificate and services.soju.tlsCertificateKey + must both be specified to enable TLS. + ''; + } + ]; + systemd.services.soju = { description = "soju IRC bouncer"; wantedBy = [ "multi-user.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/solanum.nix b/third_party/nixpkgs/nixos/modules/services/networking/solanum.nix index dc066a2454..daa3650fc9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/solanum.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/solanum.nix @@ -44,16 +44,16 @@ in default_split_user_count = 0; }; ''; - description = '' + description = lib.mdDoc '' Solanum IRC daemon configuration file. - check for all options. + check for all options. ''; }; openFilesLimit = mkOption { type = types.int; default = 1024; - description = '' + description = lib.mdDoc '' Maximum number of open files. Limits the clients and server connections. ''; }; @@ -61,10 +61,10 @@ in motd = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Solanum MOTD text. - Solanum will read its MOTD from /etc/solanum/ircd.motd. + Solanum will read its MOTD from `/etc/solanum/ircd.motd`. If set, the value of this option will be written to this path. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/spacecookie.nix b/third_party/nixpkgs/nixos/modules/services/networking/spacecookie.nix index 400f3e26cc..4aa76de6f4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/spacecookie.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/spacecookie.nix @@ -32,7 +32,7 @@ in { default = pkgs.spacecookie; defaultText = literalExpression "pkgs.spacecookie"; example = literalExpression "pkgs.haskellPackages.spacecookie"; - description = '' + description = lib.mdDoc '' The spacecookie derivation to use. This can be used to override the used package or to use another version. ''; @@ -41,7 +41,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open the necessary port in the firewall for spacecookie. ''; }; @@ -49,7 +49,7 @@ in { port = mkOption { type = types.port; default = 70; - description = '' + description = lib.mdDoc '' Port the gopher service should be exposed on. ''; }; @@ -57,10 +57,10 @@ in { address = mkOption { type = types.str; default = "[::]"; - description = '' + description = lib.mdDoc '' Address to listen on. Must be in the - ListenStream= syntax of - systemd.socket(5). + `ListenStream=` syntax of + [systemd.socket(5)](https://www.freedesktop.org/software/systemd/man/systemd.socket.html). ''; }; @@ -71,7 +71,7 @@ in { options.hostname = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' The hostname the service is reachable via. Clients will use this hostname for further requests after loading the initial gopher menu. @@ -81,11 +81,11 @@ in { options.root = mkOption { type = types.path; default = "/srv/gopher"; - description = '' + description = lib.mdDoc '' The directory spacecookie should serve via gopher. Files in there need to be world-readable since the spacecookie service file sets - DynamicUser=true. + `DynamicUser=true`. ''; }; @@ -96,7 +96,7 @@ in { hide-ips = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' If enabled, spacecookie will hide personal information of users like IP addresses from log output. @@ -110,7 +110,7 @@ in { # journald will add timestamps, so no need # to double up. default = true; - description = '' + description = lib.mdDoc '' If enabled, spacecookie will not print timestamps at the beginning of every log line. ''; @@ -123,18 +123,18 @@ in { "error" ]; default = "info"; - description = '' + description = lib.mdDoc '' Log level for the spacecookie service. ''; }; }; }; - description = '' + description = lib.mdDoc '' Settings for spacecookie. The settings set here are directly translated to the spacecookie JSON config file. See - spacecookie.json(5) + [spacecookie.json(5)](https://sternenseemann.github.io/spacecookie/spacecookie.json.5.html) for explanations of all options. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix b/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix index 3c229ecfc7..3e01ace54a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/spiped.nix @@ -11,7 +11,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the spiped service module."; + description = lib.mdDoc "Enable the spiped service module."; }; config = mkOption { @@ -21,32 +21,32 @@ in encrypt = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Take unencrypted connections from the - source socket and send encrypted - connections to the target socket. + `source` socket and send encrypted + connections to the `target` socket. ''; }; decrypt = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Take encrypted connections from the - source socket and send unencrypted - connections to the target socket. + `source` socket and send unencrypted + connections to the `target` socket. ''; }; source = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Address on which spiped should listen for incoming connections. Must be in one of the following formats: - /absolute/path/to/unix/socket, - host.name:port, - [ip.v4.ad.dr]:port or - [ipv6::addr]:port - note that + `/absolute/path/to/unix/socket`, + `host.name:port`, + `[ip.v4.ad.dr]:port` or + `[ipv6::addr]:port` - note that hostnames are resolved when spiped is launched and are not re-resolved later; thus if DNS entries change spiped will continue to connect to the expired @@ -56,24 +56,24 @@ in target = mkOption { type = types.str; - description = "Address to which spiped should connect."; + description = lib.mdDoc "Address to which spiped should connect."; }; keyfile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Name of a file containing the spiped key. As the - daemon runs as the spiped user, the + daemon runs as the `spiped` user, the key file must be somewhere owned by that user. By default, we recommend putting the keys for any spipe - services in /var/lib/spiped. + services in `/var/lib/spiped`. ''; }; timeout = mkOption { type = types.int; default = 5; - description = '' + description = lib.mdDoc '' Timeout, in seconds, after which an attempt to connect to the target or a protocol handshake will be aborted (and the connection dropped) if not completed @@ -83,7 +83,7 @@ in maxConns = mkOption { type = types.int; default = 100; - description = '' + description = lib.mdDoc '' Limit on the number of simultaneous connections allowed. ''; }; @@ -91,14 +91,14 @@ in waitForDNS = mkOption { type = types.bool; default = false; - description = '' - Wait for DNS. Normally when spiped is + description = lib.mdDoc '' + Wait for DNS. Normally when `spiped` is launched it resolves addresses and binds to its source socket before the parent process returns; with this option it will daemonize first and retry failed DNS lookups until - they succeed. This allows spiped to + they succeed. This allows `spiped` to launch even if DNS isn't set up yet, but at the expense of - losing the guarantee that once spiped has + losing the guarantee that once `spiped` has finished launching it will be ready to create pipes. ''; }; @@ -106,13 +106,13 @@ in disableKeepalives = mkOption { type = types.bool; default = false; - description = "Disable transport layer keep-alives."; + description = lib.mdDoc "Disable transport layer keep-alives."; }; weakHandshake = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Use fast/weak handshaking: This reduces the CPU time spent in the initial connection setup, at the expense of losing perfect forward secrecy. @@ -122,7 +122,7 @@ in resolveRefresh = mkOption { type = types.int; default = 60; - description = '' + description = lib.mdDoc '' Resolution refresh time for the target socket, in seconds. ''; }; @@ -130,7 +130,7 @@ in disableReresolution = mkOption { type = types.bool; default = false; - description = "Disable target address re-resolution."; + description = lib.mdDoc "Disable target address re-resolution."; }; }; } @@ -155,11 +155,11 @@ in } ''; - description = '' + description = lib.mdDoc '' Configuration for a secure pipe daemon. The daemon can be started, stopped, or examined using - systemctl, under the name - spiped@foo. + `systemctl`, under the name + `spiped@foo`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/squid.nix b/third_party/nixpkgs/nixos/modules/services/networking/squid.nix index db4f0d26b6..914cd7f320 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/squid.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/squid.nix @@ -108,32 +108,32 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to run squid web proxy."; + description = lib.mdDoc "Whether to run squid web proxy."; }; package = mkOption { default = pkgs.squid; defaultText = literalExpression "pkgs.squid"; type = types.package; - description = "Squid package to use."; + description = lib.mdDoc "Squid package to use."; }; proxyAddress = mkOption { type = types.nullOr types.str; default = null; - description = "IP address on which squid will listen."; + description = lib.mdDoc "IP address on which squid will listen."; }; proxyPort = mkOption { type = types.int; default = 3128; - description = "TCP port on which squid will listen."; + description = lib.mdDoc "TCP port on which squid will listen."; }; extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Squid configuration. Contents will be added verbatim to the configuration file. ''; @@ -142,7 +142,7 @@ in configText = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Verbatim contents of squid.conf. If null (default), use the autogenerated file from NixOS instead. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix index 862ff7df05..41c4ec2d29 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/lshd.nix @@ -21,7 +21,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the GNU lshd SSH2 daemon, which allows secure remote login. ''; @@ -30,7 +30,7 @@ in portNumber = mkOption { default = 22; type = types.port; - description = '' + description = lib.mdDoc '' The port on which to listen for connections. ''; }; @@ -38,7 +38,7 @@ in interfaces = mkOption { default = []; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of network interfaces where listening for connections. When providing the empty list, `[]', lshd listens on all network interfaces. @@ -49,7 +49,7 @@ in hostKey = mkOption { default = "/etc/lsh/host-key"; type = types.str; - description = '' + description = lib.mdDoc '' Path to the server's private key. Note that this key must have been created, e.g., using "lsh-keygen --server | lsh-writekey --server", so that you can run lshd. @@ -59,31 +59,31 @@ in syslog = mkOption { type = types.bool; default = true; - description = "Whether to enable syslog output."; + description = lib.mdDoc "Whether to enable syslog output."; }; passwordAuthentication = mkOption { type = types.bool; default = true; - description = "Whether to enable password authentication."; + description = lib.mdDoc "Whether to enable password authentication."; }; publicKeyAuthentication = mkOption { type = types.bool; default = true; - description = "Whether to enable public key authentication."; + description = lib.mdDoc "Whether to enable public key authentication."; }; rootLogin = mkOption { type = types.bool; default = false; - description = "Whether to enable remote root login."; + description = lib.mdDoc "Whether to enable remote root login."; }; loginShell = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' If non-null, override the default login shell with the specified value. ''; @@ -93,7 +93,7 @@ in srpKeyExchange = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable SRP key exchange and user authentication. ''; }; @@ -101,18 +101,18 @@ in tcpForwarding = mkOption { type = types.bool; default = true; - description = "Whether to enable TCP/IP forwarding."; + description = lib.mdDoc "Whether to enable TCP/IP forwarding."; }; x11Forwarding = mkOption { type = types.bool; default = true; - description = "Whether to enable X11 forwarding."; + description = lib.mdDoc "Whether to enable X11 forwarding."; }; subsystems = mkOption { type = types.listOf types.path; - description = '' + description = lib.mdDoc '' List of subsystem-path pairs, where the head of the pair denotes the subsystem name, and the tail denotes the path to an executable implementing it. diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix index 6b69d55974..00ec15c54b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ssh/sshd.nix @@ -32,13 +32,13 @@ let keys = mkOption { type = types.listOf types.singleLineStr; default = []; - description = '' + description = lib.mdDoc '' A list of verbatim OpenSSH public keys that should be added to the user's authorized keys. The keys are added to a file that the SSH daemon reads in addition to the the user's authorized_keys file. - You can combine the keys and - keyFiles options. - Warning: If you are using NixOps then don't use this + You can combine the `keys` and + `keyFiles` options. + Warning: If you are using `NixOps` then don't use this option since it will replace the key required for deployment via ssh. ''; example = [ @@ -50,12 +50,12 @@ let keyFiles = mkOption { type = types.listOf types.path; default = []; - description = '' + description = lib.mdDoc '' A list of files each containing one OpenSSH public key that should be added to the user's authorized keys. The contents of the files are read at build time and added to a file that the SSH daemon reads in addition to the the user's authorized_keys file. You can combine the - keyFiles and keys options. + `keyFiles` and `keys` options. ''; }; }; @@ -93,7 +93,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the OpenSSH secure shell daemon, which allows secure remote logins. ''; @@ -102,8 +102,8 @@ in startWhenNeeded = mkOption { type = types.bool; default = false; - description = '' - If set, sshd is socket-activated; that + description = lib.mdDoc '' + If set, {command}`sshd` is socket-activated; that is, instead of having it permanently running as a daemon, systemd will start an instance for each incoming connection. ''; @@ -112,7 +112,7 @@ in forwardX11 = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to allow X11 connections to be forwarded. ''; }; @@ -120,17 +120,17 @@ in allowSFTP = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable the SFTP subsystem in the SSH daemon. This - enables the use of commands such as sftp and - sshfs. + enables the use of commands such as {command}`sftp` and + {command}`sshfs`. ''; }; sftpServerExecutable = mkOption { type = types.str; example = "internal-sftp"; - description = '' + description = lib.mdDoc '' The sftp server executable. Can be a path or "internal-sftp" to use the sftp server built into the sshd binary. ''; @@ -140,7 +140,7 @@ in type = with types; listOf str; default = []; example = [ "-f AUTHPRIV" "-l INFO" ]; - description = '' + description = lib.mdDoc '' Commandline flags to add to sftp-server. ''; }; @@ -148,7 +148,7 @@ in permitRootLogin = mkOption { default = "prohibit-password"; type = types.enum ["yes" "without-password" "prohibit-password" "forced-commands-only" "no"]; - description = '' + description = lib.mdDoc '' Whether the root user can login using ssh. ''; }; @@ -167,7 +167,7 @@ in ports = mkOption { type = types.listOf types.port; default = [22]; - description = '' + description = lib.mdDoc '' Specifies on which ports the SSH daemon listens. ''; }; @@ -175,7 +175,7 @@ in openFirewall = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to automatically open the specified ports in the firewall. ''; }; @@ -186,14 +186,14 @@ in addr = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Host, IPv4 or IPv6 address to listen to. ''; }; port = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Port to listen to. ''; }; @@ -201,10 +201,10 @@ in }); default = []; example = [ { addr = "192.168.3.1"; port = 22; } { addr = "0.0.0.0"; port = 64022; } ]; - description = '' + description = lib.mdDoc '' List of addresses and ports to listen on (ListenAddress directive in config). If port is not specified for address sshd will listen - on all ports specified by ports option. + on all ports specified by `ports` option. NOTE: this will override default listening on all local addresses and port 22. NOTE: setting this option won't automatically enable given ports in firewall configuration. @@ -214,7 +214,7 @@ in passwordAuthentication = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Specifies whether password authentication is allowed. ''; }; @@ -222,7 +222,7 @@ in kbdInteractiveAuthentication = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Specifies whether keyboard-interactive authentication is allowed. ''; }; @@ -249,7 +249,7 @@ in banner = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Message to display to the remote user before authentication is allowed. ''; }; @@ -257,12 +257,12 @@ in authorizedKeysFiles = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Specify the rules for which files to read on the host. This is an advanced option. If you're looking to configure user - keys, you can generally use - or . + keys, you can generally use [](#opt-users.users._name_.openssh.authorizedKeys.keys) + or [](#opt-users.users._name_.openssh.authorizedKeys.keyFiles). These are paths relative to the host root file system or home directories and they are subject to certain token expansion rules. @@ -273,7 +273,7 @@ in authorizedKeysCommand = mkOption { type = types.str; default = "none"; - description = '' + description = lib.mdDoc '' Specifies a program to be used to look up the user's public keys. The program must be owned by root, not writable by group or others and specified by an absolute path. @@ -283,7 +283,7 @@ in authorizedKeysCommandUser = mkOption { type = types.str; default = "nobody"; - description = '' + description = lib.mdDoc '' Specifies the user under whose account the AuthorizedKeysCommand is run. It is recommended to use a dedicated user that has no other role on the host than running authorized keys commands. @@ -298,14 +298,13 @@ in "curve25519-sha256@libssh.org" "diffie-hellman-group-exchange-sha256" ]; - description = '' + description = lib.mdDoc '' Allowed key exchange algorithms - - + Uses the lower bound recommended in both - + and - + ''; }; @@ -319,14 +318,13 @@ in "aes192-ctr" "aes128-ctr" ]; - description = '' + description = lib.mdDoc '' Allowed ciphers - - + Defaults to recommended settings from both - + and - + ''; }; @@ -340,21 +338,20 @@ in "hmac-sha2-256" "umac-128@openssh.com" ]; - description = '' + description = lib.mdDoc '' Allowed MACs - - + Defaults to recommended settings from both - + and - + ''; }; logLevel = mkOption { type = types.enum [ "QUIET" "FATAL" "ERROR" "INFO" "VERBOSE" "DEBUG" "DEBUG1" "DEBUG2" "DEBUG3" ]; default = "INFO"; # upstream default - description = '' + description = lib.mdDoc '' Gives the verbosity level that is used when logging messages from sshd(8). The possible values are: QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2, and DEBUG3. The default is INFO. DEBUG and DEBUG1 are equivalent. DEBUG2 and DEBUG3 each specify higher levels of debugging output. Logging with a DEBUG level @@ -365,7 +362,7 @@ in useDns = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Specifies whether sshd(8) should look up the remote host name, and to check that the resolved host name for the remote IP address maps back to the very same IP address. If this option is set to no (the default) then only addresses and not host names may be used in @@ -376,16 +373,16 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = "Verbatim contents of sshd_config."; + description = lib.mdDoc "Verbatim contents of {file}`sshd_config`."; }; moduliFile = mkOption { example = "/etc/my-local-ssh-moduli;"; type = types.path; - description = '' - Path to moduli file to install in - /etc/ssh/moduli. If this option is unset, then - the moduli file shipped with OpenSSH will be used. + description = lib.mdDoc '' + Path to `moduli` file to install in + `/etc/ssh/moduli`. If this option is unset, then + the `moduli` file shipped with OpenSSH will be used. ''; }; @@ -438,11 +435,12 @@ in # socket activation, it goes to the remote side (#19589). exec >&2 - mkdir -m 0755 -p /etc/ssh - ${flip concatMapStrings cfg.hostKeys (k: '' if ! [ -s "${k.path}" ]; then - rm -f "${k.path}" + if ! [ -h "${k.path}" ]; then + rm -f "${k.path}" + fi + mkdir -m 0755 -p "$(dirname '${k.path}')" ssh-keygen \ -t "${k.type}" \ ${if k ? bits then "-b ${toString k.bits}" else ""} \ diff --git a/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix b/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix index abe96f60f8..03c0bd2314 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/sslh.nix @@ -48,37 +48,37 @@ in verbose = mkOption { type = types.bool; default = false; - description = "Verbose logs."; + description = lib.mdDoc "Verbose logs."; }; timeout = mkOption { type = types.int; default = 2; - description = "Timeout in seconds."; + description = lib.mdDoc "Timeout in seconds."; }; transparent = mkOption { type = types.bool; default = false; - description = "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them"; + description = lib.mdDoc "Will the services behind sslh (Apache, sshd and so on) see the external IP and ports as if the external world connected directly to them"; }; listenAddresses = mkOption { type = types.coercedTo types.str singleton (types.listOf types.str); default = [ "0.0.0.0" "[::]" ]; - description = "Listening addresses or hostnames."; + description = lib.mdDoc "Listening addresses or hostnames."; }; port = mkOption { type = types.int; default = 443; - description = "Listening port."; + description = lib.mdDoc "Listening port."; }; appendConfig = mkOption { type = types.str; default = defaultAppendConfig; - description = "Verbatim configuration file."; + description = lib.mdDoc "Verbatim configuration file."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix index dfdfc50d8a..d5a8daf98e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix @@ -59,7 +59,8 @@ rec { if strongswanDefault == null then description else description + '' - + + StrongSwan default: ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix index cca61b9ce9..737d0331f1 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix @@ -15,14 +15,14 @@ let file = mkOptionalStrParam '' Absolute path to the certificate to load. Passed as-is to the daemon, so it must be readable by it. - + Configure either this or , but not both, in one section. ''; handle = mkOptionalHexParam '' Hex-encoded CKA_ID or handle of the certificate on a token or TPM, respectively. - + Configure either this or , but not both, in one section. ''; @@ -40,7 +40,7 @@ in { cacert = mkOptionalStrParam '' The certificates may use a relative path from the swanctl x509ca directory or an absolute path. - + Configure one of , , or per section. @@ -82,11 +82,11 @@ in { local_addrs = mkCommaSepListParam [] '' Local address(es) to use for IKE communication. Takes single IPv4/IPv6 addresses, DNS names, CIDR subnets or IP address ranges. - + As initiator, the first non-range/non-subnet is used to initiate the connection from. As responder, the local destination address must match at least to one of the specified addresses, subnets or ranges. - + If FQDNs are assigned they are resolved every time a configuration lookup is done. If DNS resolution times out, the lookup is delayed for that time. ''; @@ -94,11 +94,11 @@ in { remote_addrs = mkCommaSepListParam [] '' Remote address(es) to use for IKE communication. Takes single IPv4/IPv6 addresses, DNS names, CIDR subnets or IP address ranges. - + As initiator, the first non-range/non-subnet is used to initiate the connection to. As responder, the initiator source address must match at least to one of the specified addresses, subnets or ranges. - + If FQDNs are assigned they are resolved every time a configuration lookup is done. If DNS resolution times out, the lookup is delayed for that time. To initiate a connection, at least one specific address or DNS name must @@ -110,7 +110,7 @@ in { backend is used, which is usually 500. If port 500 is used, automatic IKE port floating to port 4500 is used to work around NAT issues. - + Using a non-default local IKE port requires support from the socket backend in use (socket-dynamic). ''; @@ -126,13 +126,13 @@ in { for IKE an encryption algorithm, an integrity algorithm, a pseudo random function and a Diffie-Hellman group. For AEAD algorithms, instead of encryption and integrity algorithms, a combined algorithm is used. - + In IKEv2, multiple algorithms of the same kind can be specified in a single proposal, from which one gets selected. In IKEv1, only one algorithm per kind is allowed per proposal, more algorithms get implicitly stripped. Use multiple proposals to offer different algorithms combinations in IKEv1. - + Algorithm keywords get separated using dashes. Multiple proposals may be specified in a list. The special value default forms a default proposal of supported algorithms considered safe, and is usually a @@ -159,7 +159,7 @@ in { If the default of yes is used, Mode Config works in pull mode, where the initiator actively requests a virtual IP. With no, push mode is used, where the responder pushes down a virtual IP to the initiating peer. - + Push mode is currently supported for IKEv1, but not in IKEv2. It is used by a few implementations only, pull mode is recommended. ''; @@ -174,7 +174,7 @@ in { To enforce UDP encapsulation of ESP packets, the IKE daemon can fake the NAT detection payloads. This makes the peer believe that NAT takes place on the path, forcing it to encapsulate ESP packets in UDP. - + Usually this is not required, but it can help to work around connectivity issues with too restrictive intermediary firewalls. ''; @@ -183,7 +183,7 @@ in { Enables MOBIKE on IKEv2 connections. MOBIKE is enabled by default on IKEv2 connections, and allows mobility of clients and multi-homing on servers by migrating active IPsec tunnels. - + Usually keeping MOBIKE enabled is unproblematic, as it is not used if the peer does not indicate support for it. However, due to the design of MOBIKE, IKEv2 always floats to port 4500 starting from the second @@ -222,7 +222,7 @@ in { Finally, setting the option to no will disable announcing support for this feature. - + Note that fragmented IKE messages sent by a peer are always processed irrespective of the value of this option (even when set to no). ''; @@ -284,7 +284,7 @@ in { unique = mkEnumParam ["no" "never" "keep" "replace"] "no" '' Connection uniqueness policy to enforce. To avoid multiple connections from the same user, a uniqueness policy can be enforced. - + The value never does never enforce such a policy, even @@ -306,7 +306,7 @@ in { To compare connections for uniqueness, the remote IKE identity is used. If EAP or XAuth authentication is involved, the EAP-Identity or XAuth username is used to enforce the uniqueness policy instead. - + On initiators this setting specifies whether an INITIAL_CONTACT notify is sent during IKE_AUTH if no existing connection is found with the remote peer (determined by the identities of the first authentication @@ -320,7 +320,7 @@ in { possible to actively reauthenticate as responder. The IKEv2 reauthentication lifetime negotiation can instruct the client to perform reauthentication. - + Reauthentication is disabled by default. Enabling it usually may lead to small connection interruptions, as strongSwan uses a break-before-make policy with IKEv2 to avoid any conflicts with associated tunnel resources. @@ -330,7 +330,7 @@ in { IKE rekeying refreshes key material using a Diffie-Hellman exchange, but does not re-check associated credentials. It is supported in IKEv2 only, IKEv1 performs a reauthentication procedure instead. - + With the default value IKE rekeying is scheduled every 4 hours, minus the configured rand_time. If a reauth_time is configured, rekey_time defaults to zero, disabling rekeying; explicitly set both to enforce rekeying and @@ -343,10 +343,10 @@ in { perpetually, a maximum hard lifetime may be specified. If the IKE_SA fails to rekey or reauthenticate within the specified time, the IKE_SA gets closed. - + In contrast to CHILD_SA rekeying, over_time is relative in time to the rekey_time and reauth_time values, as it applies to both. - + The default is 10% of the longer of and . ''; @@ -356,7 +356,7 @@ in { rekey/reauth times. To avoid having both peers initiating the rekey/reauth procedure simultaneously, a random time gets subtracted from the rekey/reauth times. - + The default is equal to the configured . ''; @@ -410,7 +410,7 @@ in { List of certificate candidates to use for authentication. The certificates may use a relative path from the swanctl x509 directory or an absolute path. - + The certificate used for authentication is selected based on the received certificate request payloads. If no appropriate CA can be located, the first certificate is used. @@ -426,7 +426,7 @@ in { List of raw public key candidates to use for authentication. The public keys may use a relative path from the swanctl pubkey directory or an absolute path. - + Even though multiple local public keys could be defined in principle, only the first public key in the list is used for authentication. ''; @@ -504,7 +504,7 @@ in { authentication. This identity may differ from the IKE identity, especially when EAP authentication is delegated from the IKE responder to an AAA backend. - + For EAP-(T)TLS, this defines the identity for which the server must provide a certificate in the TLS exchange. ''; @@ -518,7 +518,7 @@ in { defines the rules how authentication is performed for the local peer. Multiple rounds may be defined to use IKEv2 RFC 4739 Multiple Authentication or IKEv1 XAuth. - + Each round is defined in a section having local as prefix, and an optional unique suffix. To define a single authentication round, the suffix may be omitted. @@ -620,7 +620,7 @@ in { Authentication to expect from remote. See the section's keyword description about the details of supported mechanisms. - + Since 5.4.0, to require a trustchain public key strength for the remote side, specify the key type followed by the minimum strength in bits (for example ecdsa-384 or @@ -641,7 +641,7 @@ in { pubkey or rsa constraints are configured RSASSA-PSS signatures will only be accepted if enabled in strongswan.conf(5). - + To specify trust chain constraints for EAP-(T)TLS, append a colon to the EAP method, followed by the key type/size and hash algorithm as discussed above (e.g. eap-tls:ecdsa-384-sha384). @@ -652,7 +652,7 @@ in { defines the constraints how the peers must authenticate to use this connection. Multiple rounds may be defined to use IKEv2 RFC 4739 Multiple Authentication or IKEv1 XAuth. - + Each round is defined in a section having remote as prefix, and an optional unique suffix. To define a single authentication round, the suffix may be omitted. @@ -665,13 +665,13 @@ in { Diffie-Hellman group. If a DH group is specified, CHILD_SA/Quick Mode rekeying and initial negotiation uses a separate Diffie-Hellman exchange using the specified group (refer to esp_proposals for details). - + In IKEv2, multiple algorithms of the same kind can be specified in a single proposal, from which one gets selected. In IKEv1, only one algorithm per kind is allowed per proposal, more algorithms get implicitly stripped. Use multiple proposals to offer different algorithms combinations in IKEv1. - + Algorithm keywords get separated using dashes. Multiple proposals may be specified in a list. The special value default forms a default proposal of supported algorithms considered safe, and is @@ -686,7 +686,7 @@ in { an optional Extended Sequence Number Mode indicator. For AEAD proposals, a combined mode algorithm is used instead of the separate encryption/integrity algorithms. - + If a DH group is specified, CHILD_SA/Quick Mode rekeying and initial negotiation use a separate Diffie-Hellman exchange using the specified group. However, for IKEv2, the keys of the CHILD_SA created implicitly @@ -695,18 +695,18 @@ in { rekeyed or is created with a separate CREATE_CHILD_SA exchange. A proposal mismatch might, therefore, not immediately be noticed when the SA is established, but may later cause rekeying to fail. - + Extended Sequence Number support may be indicated with the esn and noesn values, both may be included to indicate support for both modes. If omitted, noesn is assumed. - + In IKEv2, multiple algorithms of the same kind can be specified in a single proposal, from which one gets selected. In IKEv1, only one algorithm per kind is allowed per proposal, more algorithms get implicitly stripped. Use multiple proposals to offer different algorithms combinations in IKEv1. - + Algorithm keywords get separated using dashes. Multiple proposals may be specified as a list. The special value default forms a default proposal of supported algorithms considered safe, and is @@ -729,7 +729,7 @@ in { selector. The special value dynamic may be used instead of a subnet definition, which gets replaced by the tunnel outer address or the virtual IP, if negotiated. This is the default. - + A protocol/port selector is surrounded by opening and closing square brackets. Between these brackets, a numeric or getservent(3) protocol name may be specified. After the optional protocol restriction, an @@ -738,7 +738,7 @@ in { special value opaque for RFC 4301 OPAQUE selectors. Port ranges may be specified as well, none of the kernel backends currently support port ranges, though. - + When IKEv1 is used only the first selector is interpreted, except if the Cisco Unity extension plugin is used. This is due to a limitation of the IKEv1 protocol, which only allows a single pair of selectors per @@ -761,7 +761,7 @@ in { specified in the proposal. To avoid rekey collisions initiated by both ends simultaneously, a value in the range of gets subtracted to form the effective soft lifetime. - + By default CHILD_SA rekeying is scheduled every hour, minus . ''; @@ -783,11 +783,11 @@ in { Number of bytes processed before initiating CHILD_SA rekeying. CHILD_SA rekeying refreshes key material, optionally using a Diffie-Hellman exchange if a group is specified in the proposal. - + To avoid rekey collisions initiated by both ends simultaneously, a value in the range of gets subtracted to form the effective soft volume limit. - + Volume based CHILD_SA rekeying is disabled by default. ''; @@ -808,11 +808,11 @@ in { Number of packets processed before initiating CHILD_SA rekeying. CHILD_SA rekeying refreshes key material, optionally using a Diffie-Hellman exchange if a group is specified in the proposal. - + To avoid rekey collisions initiated by both ends simultaneously, a value in the range of gets subtracted to form the effective soft packet count limit. - + Packet count based CHILD_SA rekeying is disabled by default. ''; @@ -821,7 +821,7 @@ in { this hard packets limit is never reached, because the CHILD_SA gets rekeyed before. If that fails for whatever reason, this limit closes the CHILD_SA. - + The default is 10% more than . ''; @@ -936,7 +936,7 @@ in { %unique sets a unique mark on each CHILD_SA instance, beyond that the value %unique-dir assigns a different unique mark for each - + An additional mask may be appended to the mark, separated by /. The default mask if omitted is 0xffffffff. @@ -960,7 +960,7 @@ in { value %unique sets a unique mark on each CHILD_SA instance, beyond that the value %unique-dir assigns a different unique mark for each CHILD_SA direction (in/out). - + An additional mask may be appended to the mark, separated by /. The default mask if omitted is 0xffffffff. @@ -1102,7 +1102,7 @@ in { start tries to re-create the CHILD_SA. - + does not provide any guarantee that the CHILD_SA is kept alive. It acts on explicit close messages only, but not on negotiation failures. Use trap policies to reliably re-create failed diff --git a/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix b/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix index e3a97207be..f1b0a3f0d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/strongswan.nix @@ -57,10 +57,10 @@ in type = types.listOf types.str; default = []; example = [ "/run/keys/ipsec-foo.secret" ]; - description = '' + description = lib.mdDoc '' A list of paths to IPSec secret files. These files will be included into the main ipsec.secrets file with - the include directive. It is safer if these + the `include` directive. It is safer if these paths are absolute. ''; }; @@ -69,9 +69,9 @@ in type = types.attrsOf types.str; default = {}; example = { cachecrls = "yes"; strictcrlpolicy = "yes"; }; - description = '' + description = lib.mdDoc '' A set of options for the ‘config setup’ section of the - ipsec.conf file. Defines general + {file}`ipsec.conf` file. Defines general configuration parameters. ''; }; @@ -94,9 +94,9 @@ in }; } ''; - description = '' + description = lib.mdDoc '' A set of connections and their options for the ‘conn xxx’ - sections of the ipsec.conf file. + sections of the {file}`ipsec.conf` file. ''; }; @@ -110,9 +110,9 @@ in crluri = "http://crl2.strongswan.org/strongswan.crl"; }; }; - description = '' + description = lib.mdDoc '' A set of CAs (certification authorities) and their options for - the ‘ca xxx’ sections of the ipsec.conf + the ‘ca xxx’ sections of the {file}`ipsec.conf` file. ''; }; @@ -120,19 +120,19 @@ in managePlugins = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If set to true, this option will disable automatic plugin loading and then tell strongSwan to enable the plugins specified in the - option. + {option}`enabledPlugins` option. ''; }; enabledPlugins = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' A list of additional plugins to enable if - is true. + {option}`managePlugins` is true. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/stubby.nix b/third_party/nixpkgs/nixos/modules/services/networking/stubby.nix index 78c13798dd..f9d6869ad9 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/stubby.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/stubby.nix @@ -39,20 +39,20 @@ in { }]; }; ''; - description = '' + description = lib.mdDoc '' Content of the Stubby configuration file. All Stubby settings may be set or queried here. The default settings are available at - pkgs.stubby.passthru.settingsExample. See - . + `pkgs.stubby.passthru.settingsExample`. See + . A list of the public recursive servers can be found here: - . + . ''; }; debugLogging = mkOption { default = false; type = types.bool; - description = "Enable or disable debug level logging."; + description = lib.mdDoc "Enable or disable debug level logging."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix b/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix index df4908a0ff..d7311a24bb 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix @@ -7,80 +7,27 @@ let cfg = config.services.stunnel; yesNo = val: if val then "yes" else "no"; + verifyRequiredField = type: field: n: c: { + assertion = hasAttr field c; + message = "stunnel: \"${n}\" ${type} configuration - Field ${field} is required."; + }; + verifyChainPathAssert = n: c: { - assertion = c.verifyHostname == null || (c.verifyChain || c.verifyPeer); + assertion = (c.verifyHostname or null) == null || (c.verifyChain || c.verifyPeer); message = "stunnel: \"${n}\" client configuration - hostname verification " + "is not possible without either verifyChain or verifyPeer enabled"; }; - serverConfig = { - options = { - accept = mkOption { - type = types.either types.str types.int; - description = '' - On which [host:]port stunnel should listen for incoming TLS connections. - Note that unlike other softwares stunnel ipv6 address need no brackets, - so to listen on all IPv6 addresses on port 1234 one would use ':::1234'. - ''; - }; - - connect = mkOption { - type = types.either types.str types.int; - description = "Port or IP:Port to which the decrypted connection should be forwarded."; - }; - - cert = mkOption { - type = types.path; - description = "File containing both the private and public keys."; - }; - }; - }; - - clientConfig = { - options = { - accept = mkOption { - type = types.str; - description = "IP:Port on which connections should be accepted."; - }; - - connect = mkOption { - type = types.str; - description = "IP:Port destination to connect to."; - }; - - verifyChain = mkOption { - type = types.bool; - default = true; - description = "Check if the provided certificate has a valid certificate chain (against CAPath)."; - }; - - verifyPeer = mkOption { - type = types.bool; - default = false; - description = "Check if the provided certificate is contained in CAPath."; - }; - - CAPath = mkOption { - type = types.nullOr types.path; - default = null; - description = "Path to a directory containing certificates to validate against."; - }; - - CAFile = mkOption { - type = types.nullOr types.path; - default = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - defaultText = literalExpression ''"''${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"''; - description = "Path to a file containing certificates to validate against."; - }; - - verifyHostname = mkOption { - type = with types; nullOr str; - default = null; - description = "If set, stunnel checks if the provided certificate is valid for the given hostname."; - }; - }; - }; - + removeNulls = mapAttrs (_: filterAttrs (_: v: v != null)); + mkValueString = v: + if v == true then "yes" + else if v == false then "no" + else generators.mkValueStringDefault {} v; + generateConfig = c: + generators.toINI { + mkSectionName = id; + mkKeyValue = k: v: "${k} = ${mkValueString v}"; + } (removeNulls c); in @@ -95,43 +42,48 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the stunnel TLS tunneling service."; + description = lib.mdDoc "Whether to enable the stunnel TLS tunneling service."; }; user = mkOption { type = with types; nullOr str; default = "nobody"; - description = "The user under which stunnel runs."; + description = lib.mdDoc "The user under which stunnel runs."; }; group = mkOption { type = with types; nullOr str; default = "nogroup"; - description = "The group under which stunnel runs."; + description = lib.mdDoc "The group under which stunnel runs."; }; logLevel = mkOption { type = types.enum [ "emerg" "alert" "crit" "err" "warning" "notice" "info" "debug" ]; default = "info"; - description = "Verbosity of stunnel output."; + description = lib.mdDoc "Verbosity of stunnel output."; }; fipsMode = mkOption { type = types.bool; default = false; - description = "Enable FIPS 140-2 mode required for compliance."; + description = lib.mdDoc "Enable FIPS 140-2 mode required for compliance."; }; enableInsecureSSLv3 = mkOption { type = types.bool; default = false; - description = "Enable support for the insecure SSLv3 protocol."; + description = lib.mdDoc "Enable support for the insecure SSLv3 protocol."; }; servers = mkOption { - description = "Define the server configuations."; - type = with types; attrsOf (submodule serverConfig); + description = '' + Define the server configuations. + + See "SERVICE-LEVEL OPTIONS" in stunnel + 8. + ''; + type = with types; attrsOf (attrsOf (nullOr (oneOf [bool int str]))); example = { fancyWebserver = { accept = 443; @@ -143,8 +95,33 @@ in }; clients = mkOption { - description = "Define the client configurations."; - type = with types; attrsOf (submodule clientConfig); + description = '' + Define the client configurations. + + By default, verifyChain and OCSPaia are enabled and a CAFile is provided from pkgs.cacert. + + See "SERVICE-LEVEL OPTIONS" in stunnel + 8. + ''; + type = with types; attrsOf (attrsOf (nullOr (oneOf [bool int str]))); + + apply = let + applyDefaults = c: + { + CAFile = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; + OCSPaia = true; + verifyChain = true; + } // c; + setCheckHostFromVerifyHostname = c: + # To preserve backward-compatibility with the old NixOS stunnel module + # definition, allow "verifyHostname" as an alias for "checkHost". + c // { + checkHost = c.checkHost or c.verifyHostname or null; + verifyHostname = null; # Not a real stunnel configuration setting + }; + forceClient = c: c // { client = true; }; + in mapAttrs (_: c: forceClient (setCheckHostFromVerifyHostname (applyDefaults c))); + example = { foobar = { accept = "0.0.0.0:8080"; @@ -169,6 +146,11 @@ in }) (mapAttrsToList verifyChainPathAssert cfg.clients) + (mapAttrsToList (verifyRequiredField "client" "accept") cfg.clients) + (mapAttrsToList (verifyRequiredField "client" "connect") cfg.clients) + (mapAttrsToList (verifyRequiredField "server" "accept") cfg.servers) + (mapAttrsToList (verifyRequiredField "server" "cert") cfg.servers) + (mapAttrsToList (verifyRequiredField "server" "connect") cfg.servers) ]; environment.systemPackages = [ pkgs.stunnel ]; @@ -183,36 +165,10 @@ in ${ optionalString cfg.enableInsecureSSLv3 "options = -NO_SSLv3" } ; ----- SERVER CONFIGURATIONS ----- - ${ lib.concatStringsSep "\n" - (lib.mapAttrsToList - (n: v: '' - [${n}] - accept = ${toString v.accept} - connect = ${toString v.connect} - cert = ${v.cert} - - '') - cfg.servers) - } + ${ generateConfig cfg.servers } ; ----- CLIENT CONFIGURATIONS ----- - ${ lib.concatStringsSep "\n" - (lib.mapAttrsToList - (n: v: '' - [${n}] - client = yes - accept = ${v.accept} - connect = ${v.connect} - verifyChain = ${yesNo v.verifyChain} - verifyPeer = ${yesNo v.verifyPeer} - ${optionalString (v.CAPath != null) "CApath = ${v.CAPath}"} - ${optionalString (v.CAFile != null) "CAFile = ${v.CAFile}"} - ${optionalString (v.verifyHostname != null) "checkHost = ${v.verifyHostname}"} - OCSPaia = yes - - '') - cfg.clients) - } + ${ generateConfig cfg.clients } ''; systemd.services.stunnel = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix index e111b311d6..0a48e73932 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/supplicant.nix @@ -74,19 +74,19 @@ in type = types.nullOr types.path; default = null; example = literalExpression "/etc/wpa_supplicant.conf"; - description = '' - External wpa_supplicant.conf configuration file. - The configuration options defined declaratively within networking.supplicant have - precedence over options defined in configFile. + description = lib.mdDoc '' + External `wpa_supplicant.conf` configuration file. + The configuration options defined declaratively within `networking.supplicant` have + precedence over options defined in `configFile`. ''; }; writable = mkOption { type = types.bool; default = false; - description = '' - Whether the configuration file at configFile.path should be written to by - wpa_supplicant. + description = lib.mdDoc '' + Whether the configuration file at `configFile.path` should be written to by + `wpa_supplicant`. ''; }; @@ -109,12 +109,12 @@ in model_name=NixOS_Unstable model_number=2015 ''; - description = '' - Configuration options for wpa_supplicant.conf. - Options defined here have precedence over options in configFile. - NOTE: Do not write sensitive data into extraConf as it will - be world-readable in the nix-store. For sensitive information - use the configFile instead. + description = lib.mdDoc '' + Configuration options for `wpa_supplicant.conf`. + Options defined here have precedence over options in `configFile`. + NOTE: Do not write sensitive data into `extraConf` as it will + be world-readable in the `nix-store`. For sensitive information + use the `configFile` instead. ''; }; @@ -123,19 +123,19 @@ in default = ""; example = "-e/run/wpa_supplicant/entropy.bin"; description = - "Command line arguments to add when executing wpa_supplicant."; + lib.mdDoc "Command line arguments to add when executing `wpa_supplicant`."; }; driver = mkOption { type = types.nullOr types.str; default = "nl80211,wext"; - description = "Force a specific wpa_supplicant driver."; + description = lib.mdDoc "Force a specific wpa_supplicant driver."; }; bridge = mkOption { type = types.str; default = ""; - description = "Name of the bridge interface that wpa_supplicant should listen at."; + description = lib.mdDoc "Name of the bridge interface that wpa_supplicant should listen at."; }; userControlled = { @@ -143,7 +143,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allow normal users to control wpa_supplicant through wpa_gui or wpa_cli. This is useful for laptop users that switch networks a lot and don't want to depend on a large package such as NetworkManager just to pick nearby @@ -154,14 +154,14 @@ in socketDir = mkOption { type = types.str; default = "/run/wpa_supplicant"; - description = "Directory of sockets for controlling wpa_supplicant."; + description = lib.mdDoc "Directory of sockets for controlling wpa_supplicant."; }; group = mkOption { type = types.str; default = "wheel"; example = "network"; - description = "Members of this group can control wpa_supplicant."; + description = lib.mdDoc "Members of this group can control wpa_supplicant."; }; }; @@ -184,21 +184,21 @@ in } ''; - description = '' - Interfaces for which to start wpa_supplicant. + description = lib.mdDoc '' + Interfaces for which to start {command}`wpa_supplicant`. The supplicant is used to scan for and associate with wireless networks, or to authenticate with 802.1x capable network switches. The value of this option is an attribute set. Each attribute configures a - wpa_supplicant service, where the attribute name specifies - the name of the interface that wpa_supplicant operates on. + {command}`wpa_supplicant` service, where the attribute name specifies + the name of the interface that {command}`wpa_supplicant` operates on. The attribute name can be a space separated list of interfaces. - The attribute names WLAN, LAN and DBUS - have a special meaning. WLAN and LAN are - configurations for universal wpa_supplicant service that is + The attribute names `WLAN`, `LAN` and `DBUS` + have a special meaning. `WLAN` and `LAN` are + configurations for universal {command}`wpa_supplicant` service that is started for each WLAN interface or for each LAN interface, respectively. - DBUS defines a device-unrelated wpa_supplicant - service that can be accessed through D-Bus. + `DBUS` defines a device-unrelated {command}`wpa_supplicant` + service that can be accessed through `D-Bus`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/supybot.nix b/third_party/nixpkgs/nixos/modules/services/networking/supybot.nix index 94b79c7e24..df7d92189a 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/supybot.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/supybot.nix @@ -16,7 +16,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable Supybot, an IRC bot (also known as Limnoria)."; + description = lib.mdDoc "Enable Supybot, an IRC bot (also known as Limnoria)."; }; stateDir = mkOption { @@ -25,12 +25,12 @@ in then "/var/lib/supybot" else "/home/supybot"; defaultText = literalExpression "/var/lib/supybot"; - description = "The root directory, logs and plugins are stored here"; + description = lib.mdDoc "The root directory, logs and plugins are stored here"; }; configFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to initial supybot config file. This can be generated by running supybot-wizard. @@ -42,12 +42,12 @@ in plugins = mkOption { type = types.attrsOf types.path; default = {}; - description = '' + description = lib.mdDoc '' Attribute set of additional plugins that will be symlinked to the - plugin subdirectory. + {file}`plugin` subdirectory. Please note that you still need to add the plugins to the config - file (or with !load) using their attribute name. + file (or with `!load`) using their attribute name. ''; example = literalExpression '' let diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncplay.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncplay.nix index 7694b4bf99..726f656710 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncplay.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncplay.nix @@ -17,13 +17,13 @@ in enable = mkOption { type = types.bool; default = false; - description = "If enabled, start the Syncplay server."; + description = lib.mdDoc "If enabled, start the Syncplay server."; }; port = mkOption { type = types.port; default = 8999; - description = '' + description = lib.mdDoc '' TCP port to bind to. ''; }; @@ -31,7 +31,7 @@ in salt = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Salt to allow room operator passwords generated by this server instance to still work when the server is restarted. ''; @@ -40,16 +40,16 @@ in certDir = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' TLS certificates directory to use for encryption. See - . + . ''; }; user = mkOption { type = types.str; default = "nobody"; - description = '' + description = lib.mdDoc '' User to use when running Syncplay. ''; }; @@ -57,7 +57,7 @@ in group = mkOption { type = types.str; default = "nogroup"; - description = '' + description = lib.mdDoc '' Group to use when running Syncplay. ''; }; @@ -65,9 +65,9 @@ in passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to the file that contains the server password. If - null, the server doesn't require a password. + `null`, the server doesn't require a password. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncthing-relay.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncthing-relay.nix index f5ca63e789..e92557d654 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncthing-relay.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncthing-relay.nix @@ -28,7 +28,7 @@ in { type = types.str; default = ""; example = "1.2.3.4"; - description = '' + description = lib.mdDoc '' Address to listen on for relay traffic. ''; }; @@ -36,9 +36,9 @@ in { port = mkOption { type = types.port; default = 22067; - description = '' + description = lib.mdDoc '' Port to listen on for relay traffic. This port should be added to - networking.firewall.allowedTCPPorts. + `networking.firewall.allowedTCPPorts`. ''; }; @@ -46,7 +46,7 @@ in { type = types.str; default = ""; example = "1.2.3.4"; - description = '' + description = lib.mdDoc '' Address to listen on for serving the relay status API. ''; }; @@ -54,16 +54,16 @@ in { statusPort = mkOption { type = types.port; default = 22070; - description = '' + description = lib.mdDoc '' Port to listen on for serving the relay status API. This port should be - added to networking.firewall.allowedTCPPorts. + added to `networking.firewall.allowedTCPPorts`. ''; }; pools = mkOption { type = types.nullOr (types.listOf types.str); default = null; - description = '' + description = lib.mdDoc '' Relay pools to join. If null, uses the default global pool. ''; }; @@ -71,7 +71,7 @@ in { providedBy = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Human-readable description of the provider of the relay (you). ''; }; @@ -79,7 +79,7 @@ in { globalRateBps = mkOption { type = types.nullOr types.ints.positive; default = null; - description = '' + description = lib.mdDoc '' Global bandwidth rate limit in bytes per second. ''; }; @@ -87,7 +87,7 @@ in { perSessionRateBps = mkOption { type = types.nullOr types.ints.positive; default = null; - description = '' + description = lib.mdDoc '' Per session bandwidth rate limit in bytes per second. ''; }; @@ -95,7 +95,7 @@ in { extraOptions = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Extra command line arguments to pass to strelaysrv. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix index 0f697c0cc2..373fd03223 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/syncthing.nix @@ -30,15 +30,22 @@ let updateConfig = pkgs.writers.writeDash "merge-syncthing-config" '' set -efu + # be careful not to leak secrets in the filesystem or in process listings + + umask 0077 + # get the api key by parsing the config.xml while - ! api_key=$(${pkgs.libxml2}/bin/xmllint \ + ! ${pkgs.libxml2}/bin/xmllint \ --xpath 'string(configuration/gui/apikey)' \ - ${cfg.configDir}/config.xml) + ${cfg.configDir}/config.xml \ + >"$RUNTIME_DIRECTORY/api_key" do sleep 1; done + (printf "X-API-Key: "; cat "$RUNTIME_DIRECTORY/api_key") >"$RUNTIME_DIRECTORY/headers" + curl() { - ${pkgs.curl}/bin/curl -sSLk -H "X-API-Key: $api_key" \ + ${pkgs.curl}/bin/curl -sSLk -H "@$RUNTIME_DIRECTORY/headers" \ --retry 1000 --retry-delay 1 --retry-all-errors \ "$@" } @@ -119,7 +126,7 @@ in { name = mkOption { type = types.str; default = name; - description = '' + description = lib.mdDoc '' The name of the device. ''; }; @@ -127,7 +134,7 @@ in { addresses = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' The addresses used to connect to the device. If this is left empty, dynamic configuration is attempted. ''; @@ -197,7 +204,7 @@ in { enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to share this folder. This option is useful when you want to define all folders in one place, but not every machine should share all folders. @@ -207,7 +214,7 @@ in { path = mkOption { type = types.str; default = name; - description = '' + description = lib.mdDoc '' The path to the folder which should be shared. ''; }; @@ -215,7 +222,7 @@ in { id = mkOption { type = types.str; default = name; - description = '' + description = lib.mdDoc '' The ID of the folder. Must be the same on all devices. ''; }; @@ -223,7 +230,7 @@ in { label = mkOption { type = types.str; default = name; - description = '' + description = lib.mdDoc '' The label of the folder. ''; }; @@ -304,7 +311,7 @@ in { rescanInterval = mkOption { type = types.int; default = 3600; - description = '' + description = lib.mdDoc '' How often the folder should be rescanned for changes. ''; }; @@ -312,7 +319,7 @@ in { type = mkOption { type = types.enum [ "sendreceive" "sendonly" "receiveonly" ]; default = "sendreceive"; - description = '' + description = lib.mdDoc '' Whether to only send changes for this folder, only receive them or both. ''; @@ -321,7 +328,7 @@ in { watch = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the folder should be watched for changes by inotify. ''; }; @@ -329,7 +336,7 @@ in { watchDelay = mkOption { type = types.int; default = 10; - description = '' + description = lib.mdDoc '' The delay after an inotify event is triggered. ''; }; @@ -337,7 +344,7 @@ in { ignorePerms = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to ignore permission changes. ''; }; @@ -370,7 +377,7 @@ in { guiAddress = mkOption { type = types.str; default = "127.0.0.1:8384"; - description = '' + description = lib.mdDoc '' The address to serve the web interface at. ''; }; @@ -378,7 +385,7 @@ in { systemService = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to auto-launch Syncthing as a system service. ''; }; @@ -419,7 +426,7 @@ in { type = types.path; default = "/var/lib/syncthing"; example = "/home/yourUser"; - description = '' + description = lib.mdDoc '' The path where synchronised directories will exist. ''; }; @@ -428,7 +435,7 @@ in { cond = versionAtLeast config.system.stateVersion "19.03"; in mkOption { type = types.path; - description = '' + description = lib.mdDoc '' The path where the settings and keys will exist. ''; default = cfg.dataDir + optionalString cond "/.config/syncthing"; @@ -446,7 +453,7 @@ in { type = types.listOf types.str; default = []; example = [ "--reset-deltas" ]; - description = '' + description = lib.mdDoc '' Extra flags passed to the syncthing command in the service definition. ''; }; @@ -455,7 +462,7 @@ in { type = types.bool; default = false; example = true; - description = '' + description = lib.mdDoc '' Whether to open the default ports in the firewall: TCP/UDP 22000 for transfers and UDP 21027 for discovery. @@ -470,7 +477,7 @@ in { type = types.package; default = pkgs.syncthing; defaultText = literalExpression "pkgs.syncthing"; - description = '' + description = lib.mdDoc '' The Syncthing package to use. ''; }; @@ -576,6 +583,7 @@ in { serviceConfig = { User = cfg.user; RemainAfterExit = true; + RuntimeDirectory = "syncthing-init"; Type = "oneshot"; ExecStart = updateConfig; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix index 39c9c6fc5b..12ac6d6da5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix @@ -17,26 +17,26 @@ in { port = mkOption { type = types.port; default = 41641; - description = "The port to listen on for tunnel traffic (0=autoselect)."; + description = lib.mdDoc "The port to listen on for tunnel traffic (0=autoselect)."; }; interfaceName = mkOption { type = types.str; default = "tailscale0"; - description = ''The interface name for tunnel traffic. Use "userspace-networking" (beta) to not use TUN.''; + description = lib.mdDoc ''The interface name for tunnel traffic. Use "userspace-networking" (beta) to not use TUN.''; }; permitCertUid = mkOption { type = types.nullOr types.nonEmptyStr; default = null; - description = "Username or user ID of the user allowed to to fetch Tailscale TLS certificates for the node."; + description = lib.mdDoc "Username or user ID of the user allowed to to fetch Tailscale TLS certificates for the node."; }; package = mkOption { type = types.package; default = pkgs.tailscale; defaultText = literalExpression "pkgs.tailscale"; - description = "The package to use for tailscale"; + description = lib.mdDoc "The package to use for tailscale"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tcpcrypt.nix b/third_party/nixpkgs/nixos/modules/services/networking/tcpcrypt.nix index 5a91054e16..f2115a6660 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tcpcrypt.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tcpcrypt.nix @@ -17,7 +17,7 @@ in networking.tcpcrypt.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable opportunistic TCP encryption. If the other end speaks Tcpcrypt, then your traffic will be encrypted; otherwise it will be sent in clear text. Thus, Tcpcrypt alone provides no diff --git a/third_party/nixpkgs/nixos/modules/services/networking/teamspeak3.nix b/third_party/nixpkgs/nixos/modules/services/networking/teamspeak3.nix index c0ed08282a..3be9fb31ec 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/teamspeak3.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/teamspeak3.nix @@ -19,7 +19,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run the Teamspeak3 voice communication server daemon. ''; }; @@ -27,7 +27,7 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/teamspeak3-server"; - description = '' + description = lib.mdDoc '' Directory to store TS3 database and other state/data files. ''; }; @@ -35,7 +35,7 @@ in logPath = mkOption { type = types.path; default = "/var/log/teamspeak3-server/"; - description = '' + description = lib.mdDoc '' Directory to store log files in. ''; }; @@ -44,7 +44,7 @@ in type = types.nullOr types.str; default = null; example = "[::]"; - description = '' + description = lib.mdDoc '' IP on which the server instance will listen for incoming voice connections. Defaults to any IP. ''; }; @@ -52,7 +52,7 @@ in defaultVoicePort = mkOption { type = types.int; default = 9987; - description = '' + description = lib.mdDoc '' Default UDP port for clients to connect to virtual servers - used for first virtual server, subsequent ones will open on incrementing port numbers by default. ''; }; @@ -61,7 +61,7 @@ in type = types.nullOr types.str; default = null; example = "[::]"; - description = '' + description = lib.mdDoc '' IP on which the server instance will listen for incoming file transfer connections. Defaults to any IP. ''; }; @@ -69,7 +69,7 @@ in fileTransferPort = mkOption { type = types.int; default = 30033; - description = '' + description = lib.mdDoc '' TCP port opened for file transfers. ''; }; @@ -78,7 +78,7 @@ in type = types.nullOr types.str; default = null; example = "0.0.0.0"; - description = '' + description = lib.mdDoc '' IP on which the server instance will listen for incoming ServerQuery connections. Defaults to any IP. ''; }; @@ -86,7 +86,7 @@ in queryPort = mkOption { type = types.int; default = 10011; - description = '' + description = lib.mdDoc '' TCP port opened for ServerQuery connections. ''; }; @@ -94,13 +94,13 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the TeamSpeak3 server."; + description = lib.mdDoc "Open ports in the firewall for the TeamSpeak3 server."; }; openFirewallServerQuery = mkOption { type = types.bool; default = false; - description = "Open ports in the firewall for the TeamSpeak3 serverquery (administration) system. Requires openFirewall."; + description = lib.mdDoc "Open ports in the firewall for the TeamSpeak3 serverquery (administration) system. Requires openFirewall."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix b/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix index c7830289dc..3d7f298efa 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tedicross.nix @@ -57,9 +57,9 @@ in { debug = false; } ''; - description = '' - settings.yaml configuration as a Nix attribute set. - Secret tokens should be specified using + description = lib.mdDoc '' + {file}`settings.yaml` configuration as a Nix attribute set. + Secret tokens should be specified using {option}`environmentFile` instead of this world-readable file. ''; }; @@ -67,10 +67,10 @@ in { environmentFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' File containing environment variables to be passed to the TediCross service, in which secret tokens can be specified securely using the - TELEGRAM_BOT_TOKEN and DISCORD_BOT_TOKEN + `TELEGRAM_BOT_TOKEN` and `DISCORD_BOT_TOKEN` keys. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/teleport.nix b/third_party/nixpkgs/nixos/modules/services/networking/teleport.nix index 4547916218..d03648df34 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/teleport.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/teleport.nix @@ -33,11 +33,11 @@ in auth_service.enabled = false; } ''; - description = '' - Contents of the teleport.yaml config file. - The --config arguments will only be passed if this set is not empty. + description = lib.mdDoc '' + Contents of the `teleport.yaml` config file. + The `--config` arguments will only be passed if this set is not empty. - See . + See . ''; }; @@ -61,13 +61,13 @@ in addr = mkOption { type = str; default = "127.0.0.1"; - description = "Metrics and diagnostics address."; + description = lib.mdDoc "Metrics and diagnostics address."; }; port = mkOption { type = int; default = 3000; - description = "Metrics and diagnostics port."; + description = lib.mdDoc "Metrics and diagnostics port."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tftpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/tftpd.nix index c9c0a2b321..a4dc137daa 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tftpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tftpd.nix @@ -11,7 +11,7 @@ with lib; services.tftpd.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable tftpd, a Trivial File Transfer Protocol server. The server will be run as an xinetd service. ''; @@ -20,7 +20,7 @@ with lib; services.tftpd.path = mkOption { type = types.path; default = "/srv/tftp"; - description = '' + description = lib.mdDoc '' Where the tftp server files are stored. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix b/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix index a5118fd8b3..8db541d807 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/thelounge.nix @@ -28,11 +28,11 @@ in public = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Make your The Lounge instance public. - Setting this to false will require you to configure user - accounts by using the (thelounge) command or by adding - entries in ${dataDir}/users. You might need to restart + Setting this to `false` will require you to configure user + accounts by using the ({command}`thelounge`) command or by adding + entries in {file}`${dataDir}/users`. You might need to restart The Lounge after making changes to the state directory. ''; }; @@ -40,7 +40,7 @@ in port = mkOption { type = types.port; default = 9000; - description = "TCP port to listen on for http connections."; + description = lib.mdDoc "TCP port to listen on for http connections."; }; extraConfig = mkOption { @@ -54,14 +54,14 @@ in port = 6697; }; }''; - description = '' - The Lounge's config.js contents as attribute set (will be + description = lib.mdDoc '' + The Lounge's {file}`config.js` contents as attribute set (will be converted to JSON to generate the configuration file). The options defined here will be merged to the default configuration file. - Note: In case of duplicate configuration, options from have priority. + Note: In case of duplicate configuration, options from {option}`extraConfig` have priority. - Documentation: + Documentation: ''; }; @@ -69,9 +69,9 @@ in default = [ ]; type = types.listOf types.package; example = literalExpression "[ pkgs.theLoungePlugins.themes.solarized ]"; - description = '' + description = lib.mdDoc '' The Lounge plugins to install. Plugins can be found in - pkgs.theLoungePlugins.plugins and pkgs.theLoungePlugins.themes. + `pkgs.theLoungePlugins.plugins` and `pkgs.theLoungePlugins.themes`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix b/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix index 31731b60d4..1f93d82f96 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tinc.nix @@ -24,13 +24,13 @@ let options = { address = mkOption { type = types.str; - description = "The external IP address or hostname where the host can be reached."; + description = lib.mdDoc "The external IP address or hostname where the host can be reached."; }; port = mkOption { type = types.nullOr types.port; default = null; - description = '' + description = lib.mdDoc '' The port where the host can be reached. If no port is specified, the default Port is used. @@ -43,7 +43,7 @@ let options = { address = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The subnet of this host. Subnets can either be single MAC, IPv4 or IPv6 addresses, in which case @@ -60,7 +60,7 @@ let prefixLength = mkOption { type = with types; nullOr (addCheck int (n: n >= 0 && n <= 128)); default = null; - description = '' + description = lib.mdDoc '' The prefix length of the subnet. If null, a subnet consisting of only that single address is assumed. @@ -72,7 +72,7 @@ let weight = mkOption { type = types.ints.unsigned; default = 10; - description = '' + description = lib.mdDoc '' Indicates the priority over identical Subnets owned by different nodes. Lower values indicate higher priority. Packets will be sent to the @@ -89,9 +89,9 @@ let addresses = mkOption { type = types.listOf (types.submodule addressSubmodule); default = [ ]; - description = '' + description = lib.mdDoc '' The external address where the host can be reached. This will set this - host's option. + host's {option}`settings.Address` option. This variable is only required if you want to connect to this host. ''; @@ -100,9 +100,9 @@ let subnets = mkOption { type = types.listOf (types.submodule subnetSubmodule); default = [ ]; - description = '' + description = lib.mdDoc '' The subnets which this tinc daemon will serve. This will set this - host's option. + host's {option}`settings.Subnet` option. Tinc tries to look up which other daemon it should send a packet to by searching the appropriate subnet. If the packet matches a subnet, it @@ -114,24 +114,24 @@ let rsaPublicKey = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Legacy RSA public key of the host in PEM format, including start and end markers. This will be appended as-is in the host's configuration file. The ed25519 public key can be specified using the - option instead. + {option}`settings.Ed25519PublicKey` option instead. ''; }; settings = mkOption { default = { }; type = types.submodule { freeformType = tincConfType; }; - description = '' + description = lib.mdDoc '' Configuration for this host. - See + See for supported values. ''; }; @@ -167,10 +167,10 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra lines to add to the tinc service configuration file. - Note that using the declarative + Note that using the declarative {option}`service.tinc.networks..settings` option is preferred. ''; }; @@ -178,7 +178,7 @@ in name = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The name of the node which is used as an identifier when communicating with the remote nodes in the mesh. If null then the hostname of the system is used to derive a name (note that tinc may replace non-alphanumeric characters in @@ -189,7 +189,7 @@ in ed25519PrivateKeyFile = mkOption { default = null; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Path of the private ed25519 keyfile. ''; }; @@ -197,7 +197,7 @@ in rsaPrivateKeyFile = mkOption { default = null; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Path of the private RSA keyfile. ''; }; @@ -205,9 +205,9 @@ in debugLevel = mkOption { default = 0; type = types.addCheck types.int (l: l >= 0 && l <= 5); - description = '' + description = lib.mdDoc '' The amount of debugging information to add to the log. 0 means little - logging while 5 is the most logging. man tincd for + logging while 5 is the most logging. {command}`man tincd` for more details. ''; }; @@ -215,11 +215,11 @@ in hosts = mkOption { default = { }; type = types.attrsOf types.lines; - description = '' + description = lib.mdDoc '' The name of the host in the network as well as the configuration for that host. This name should only contain alphanumerics and underscores. - Note that using the declarative + Note that using the declarative {option}`service.tinc.networks..hostSettings` option is preferred. ''; }; @@ -249,7 +249,7 @@ in } ''; type = types.attrsOf (types.submodule hostSubmodule); - description = '' + description = lib.mdDoc '' The name of the host in the network as well as the configuration for that host. This name should only contain alphanumerics and underscores. ''; @@ -258,7 +258,7 @@ in interfaceType = mkOption { default = "tun"; type = types.enum [ "tun" "tap" ]; - description = '' + description = lib.mdDoc '' The type of virtual interface used for the network connection. ''; }; @@ -266,7 +266,7 @@ in listenAddress = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The ip address to listen on for incoming connections. ''; }; @@ -274,7 +274,7 @@ in bindToAddress = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The ip address to bind to (both listen on and send packets from). ''; }; @@ -283,7 +283,7 @@ in type = types.package; default = pkgs.tinc_pre; defaultText = literalExpression "pkgs.tinc_pre"; - description = '' + description = lib.mdDoc '' The package to use for the tinc daemon's binary. ''; }; @@ -291,7 +291,7 @@ in chroot = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Change process root directory to the directory where the config file is located (/etc/tinc/netname/), for added security. The chroot is performed after all the initialization is done, after writing pid files and opening network sockets. @@ -309,10 +309,10 @@ in Mode = "switch"; } ''; - description = '' + description = lib.mdDoc '' Configuration of the Tinc daemon for this network. - See + See for supported values. ''; }; @@ -337,7 +337,7 @@ in }; })); - description = '' + description = lib.mdDoc '' Defines the tinc networks which will be started. Each network invokes a different daemon. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tinydns.nix b/third_party/nixpkgs/nixos/modules/services/networking/tinydns.nix index 2c44ad4929..ea91af5f19 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tinydns.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tinydns.nix @@ -10,19 +10,19 @@ with lib; enable = mkOption { default = false; type = types.bool; - description = "Whether to run the tinydns dns server"; + description = lib.mdDoc "Whether to run the tinydns dns server"; }; data = mkOption { type = types.lines; default = ""; - description = "The DNS data to serve, in the format described by tinydns-data(8)"; + description = lib.mdDoc "The DNS data to serve, in the format described by tinydns-data(8)"; }; ip = mkOption { default = "0.0.0.0"; type = types.str; - description = "IP address on which to listen for connections"; + description = lib.mdDoc "IP address on which to listen for connections"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix b/third_party/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix index 7c13724e08..e6dc36bf9e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tox-bootstrapd.nix @@ -23,7 +23,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' Whether to enable the Tox DHT bootstrap daemon. ''; }; @@ -31,23 +31,23 @@ in port = mkOption { type = types.int; default = 33445; - description = "Listening port (UDP)."; + description = lib.mdDoc "Listening port (UDP)."; }; keysFile = mkOption { type = types.str; default = "${WorkingDirectory}/keys"; - description = "Node key file."; + description = lib.mdDoc "Node key file."; }; extraConfig = mkOption { type = types.lines; default = ""; description = - '' + lib.mdDoc '' Configuration for bootstrap daemon. - See - and . + See + and . ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tox-node.nix b/third_party/nixpkgs/nixos/modules/services/networking/tox-node.nix index c6e5c2d6e8..9371066be8 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tox-node.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tox-node.nix @@ -33,42 +33,42 @@ in { logType = mkOption { type = types.enum [ "Stderr" "Stdout" "Syslog" "None" ]; default = "Stderr"; - description = "Logging implementation."; + description = lib.mdDoc "Logging implementation."; }; keysFile = mkOption { type = types.str; default = "${homeDir}/keys"; - description = "Path to the file where DHT keys are stored."; + description = lib.mdDoc "Path to the file where DHT keys are stored."; }; udpAddress = mkOption { type = types.str; default = "0.0.0.0:33445"; - description = "UDP address to run DHT node."; + description = lib.mdDoc "UDP address to run DHT node."; }; tcpAddresses = mkOption { type = types.listOf types.str; default = [ "0.0.0.0:33445" ]; - description = "TCP addresses to run TCP relay."; + description = lib.mdDoc "TCP addresses to run TCP relay."; }; tcpConnectionLimit = mkOption { type = types.int; default = 8192; - description = "Maximum number of active TCP connections relay can hold"; + description = lib.mdDoc "Maximum number of active TCP connections relay can hold"; }; lanDiscovery = mkOption { type = types.bool; default = true; - description = "Enable local network discovery."; + description = lib.mdDoc "Enable local network discovery."; }; threads = mkOption { type = types.int; default = 1; - description = "Number of threads for execution"; + description = lib.mdDoc "Number of threads for execution"; }; motd = mkOption { type = types.str; default = "Hi from tox-rs! I'm up {{uptime}}. TCP: incoming {{tcp_packets_in}}, outgoing {{tcp_packets_out}}, UDP: incoming {{udp_packets_in}}, outgoing {{udp_packets_out}}"; - description = "Message of the day"; + description = lib.mdDoc "Message of the day"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/toxvpn.nix b/third_party/nixpkgs/nixos/modules/services/networking/toxvpn.nix index 18cf7672d5..618726b064 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/toxvpn.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/toxvpn.nix @@ -10,20 +10,20 @@ with lib; localip = mkOption { type = types.str; default = "10.123.123.1"; - description = "your ip on the vpn"; + description = lib.mdDoc "your ip on the vpn"; }; port = mkOption { type = types.int; default = 33445; - description = "udp port for toxcore, port-forward to help with connectivity if you run many nodes behind one NAT"; + description = lib.mdDoc "udp port for toxcore, port-forward to help with connectivity if you run many nodes behind one NAT"; }; auto_add_peers = mkOption { type = types.listOf types.str; default = []; example = [ "toxid1" "toxid2" ]; - description = "peers to automatically connect to on startup"; + description = lib.mdDoc "peers to automatically connect to on startup"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/trickster.nix b/third_party/nixpkgs/nixos/modules/services/networking/trickster.nix index ac260a14d9..0b696e412b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/trickster.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/trickster.nix @@ -15,7 +15,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable Trickster. ''; }; @@ -24,7 +24,7 @@ in type = types.package; default = pkgs.trickster; defaultText = literalExpression "pkgs.trickster"; - description = '' + description = lib.mdDoc '' Package that should be used for trickster. ''; }; @@ -32,7 +32,7 @@ in configFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to configuration file. ''; }; @@ -40,7 +40,7 @@ in instance-id = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' Instance ID for when running multiple processes (default null). ''; }; @@ -48,7 +48,7 @@ in log-level = mkOption { type = types.str; default = "info"; - description = '' + description = lib.mdDoc '' Level of Logging to use (debug, info, warn, error) (default "info"). ''; }; @@ -56,7 +56,7 @@ in metrics-port = mkOption { type = types.port; default = 8082; - description = '' + description = lib.mdDoc '' Port that the /metrics endpoint will listen on. ''; }; @@ -64,7 +64,7 @@ in origin-type = mkOption { type = types.enum [ "prometheus" "influxdb" ]; default = "prometheus"; - description = '' + description = lib.mdDoc '' Type of origin (prometheus, influxdb) ''; }; @@ -72,7 +72,7 @@ in origin-url = mkOption { type = types.str; default = "http://prometheus:9090"; - description = '' + description = lib.mdDoc '' URL to the Origin. Enter it like you would in grafana, e.g., http://prometheus:9090 (default http://prometheus:9090). ''; }; @@ -80,7 +80,7 @@ in profiler-port = mkOption { type = types.nullOr types.port; default = null; - description = '' + description = lib.mdDoc '' Port that the /debug/pprof endpoint will listen on. ''; }; @@ -88,7 +88,7 @@ in proxy-port = mkOption { type = types.port; default = 9090; - description = '' + description = lib.mdDoc '' Port that the Proxy server will listen on. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tvheadend.nix b/third_party/nixpkgs/nixos/modules/services/networking/tvheadend.nix index 19a10a03bd..dd5fa209be 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tvheadend.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tvheadend.nix @@ -13,13 +13,13 @@ in httpPort = mkOption { type = types.int; default = 9981; - description = "Port to bind HTTP to."; + description = lib.mdDoc "Port to bind HTTP to."; }; htspPort = mkOption { type = types.int; default = 9982; - description = "Port to bind HTSP to."; + description = lib.mdDoc "Port to bind HTSP to."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ucarp.nix b/third_party/nixpkgs/nixos/modules/services/networking/ucarp.nix index 189e4f99ce..7e8b1026db 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ucarp.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ucarp.nix @@ -32,30 +32,30 @@ in { interface = mkOption { type = types.str; - description = "Network interface to bind to."; + description = lib.mdDoc "Network interface to bind to."; example = "eth0"; }; srcIp = mkOption { type = types.str; - description = "Source (real) IP address of this host."; + description = lib.mdDoc "Source (real) IP address of this host."; }; vhId = mkOption { type = types.ints.between 1 255; - description = "Virtual IP identifier shared between CARP hosts."; + description = lib.mdDoc "Virtual IP identifier shared between CARP hosts."; example = 1; }; passwordFile = mkOption { type = types.str; - description = "File containing shared password between CARP hosts."; + description = lib.mdDoc "File containing shared password between CARP hosts."; example = "/run/keys/ucarp-password"; }; preempt = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Enable preemptive failover. Thus, this host becomes the CARP master as soon as possible. ''; @@ -64,30 +64,30 @@ in { neutral = mkOption { type = types.bool; - description = "Do not run downscript at start if the host is the backup."; + description = lib.mdDoc "Do not run downscript at start if the host is the backup."; default = false; }; addr = mkOption { type = types.str; - description = "Virtual shared IP address."; + description = lib.mdDoc "Virtual shared IP address."; }; advBase = mkOption { type = types.ints.unsigned; - description = "Advertisement frequency in seconds."; + description = lib.mdDoc "Advertisement frequency in seconds."; default = 1; }; advSkew = mkOption { type = types.ints.unsigned; - description = "Advertisement skew in seconds."; + description = lib.mdDoc "Advertisement skew in seconds."; default = 0; }; upscript = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Command to run after become master, the interface name, virtual address and optional extra parameters are passed as arguments. ''; @@ -101,7 +101,7 @@ in { downscript = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Command to run after become backup, the interface name, virtual address and optional extra parameters are passed as arguments. ''; @@ -115,37 +115,37 @@ in { deadratio = mkOption { type = types.ints.unsigned; - description = "Ratio to consider a host as dead."; + description = lib.mdDoc "Ratio to consider a host as dead."; default = 3; }; shutdown = mkOption { type = types.bool; - description = "Call downscript at exit."; + description = lib.mdDoc "Call downscript at exit."; default = false; }; ignoreIfState = mkOption { type = types.bool; - description = "Ignore interface state, e.g., down or no carrier."; + description = lib.mdDoc "Ignore interface state, e.g., down or no carrier."; default = false; }; noMcast = mkOption { type = types.bool; - description = "Use broadcast instead of multicast advertisements."; + description = lib.mdDoc "Use broadcast instead of multicast advertisements."; default = false; }; extraParam = mkOption { type = types.nullOr types.str; - description = "Extra parameter to pass to the up/down scripts."; + description = lib.mdDoc "Extra parameter to pass to the up/down scripts."; default = null; }; package = mkOption { type = types.package; - description = '' + description = lib.mdDoc '' Package that should be used for ucarp. Please note that the default package, pkgs.ucarp, has not received any diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix index 87873c8c1e..7460ba3df7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unbound.nix @@ -46,31 +46,31 @@ in { type = types.package; default = pkgs.unbound-with-systemd; defaultText = literalExpression "pkgs.unbound-with-systemd"; - description = "The unbound package to use"; + description = lib.mdDoc "The unbound package to use"; }; user = mkOption { type = types.str; default = "unbound"; - description = "User account under which unbound runs."; + description = lib.mdDoc "User account under which unbound runs."; }; group = mkOption { type = types.str; default = "unbound"; - description = "Group under which unbound runs."; + description = lib.mdDoc "Group under which unbound runs."; }; stateDir = mkOption { type = types.path; default = "/var/lib/unbound"; - description = "Directory holding all state for unbound to run."; + description = lib.mdDoc "Directory holding all state for unbound to run."; }; resolveLocalQueries = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether unbound should resolve local queries (i.e. add 127.0.0.1 to /etc/resolv.conf). ''; @@ -79,7 +79,7 @@ in { enableRootTrustAnchor = mkOption { default = true; type = types.bool; - description = "Use and update root trust anchor for DNSSEC validation."; + description = lib.mdDoc "Use and update root trust anchor for DNSSEC validation."; }; localControlSocketPath = mkOption { @@ -90,16 +90,16 @@ in { # but I haven't verified yet. type = types.nullOr types.str; example = "/run/unbound/unbound.ctl"; - description = '' - When not set to null this option defines the path + description = lib.mdDoc '' + When not set to `null` this option defines the path at which the unbound remote control socket should be created at. The - socket will be owned by the unbound user (unbound) - and group will be nogroup. + socket will be owned by the unbound user (`unbound`) + and group will be `nogroup`. Users that should be permitted to access the socket must be in the - config.services.unbound.group group. + `config.services.unbound.group` group. - If this option is null remote control will not be + If this option is `null` remote control will not be enabled. Unbounds default values apply. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix index e88daae1fb..d30f7c8963 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/unifi.nix @@ -17,7 +17,7 @@ in services.unifi.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether or not to enable the unifi controller service. ''; }; @@ -26,7 +26,7 @@ in type = types.package; default = pkgs.jre8; defaultText = literalExpression "pkgs.jre8"; - description = '' + description = lib.mdDoc '' The JRE package to use. Check the release notes to ensure it is supported. ''; }; @@ -35,7 +35,7 @@ in type = types.package; default = pkgs.unifiLTS; defaultText = literalExpression "pkgs.unifiLTS"; - description = '' + description = lib.mdDoc '' The unifi package to use. ''; }; @@ -44,7 +44,7 @@ in type = types.package; default = pkgs.mongodb; defaultText = literalExpression "pkgs.mongodb"; - description = '' + description = lib.mdDoc '' The mongodb package to use. ''; }; @@ -52,7 +52,7 @@ in services.unifi.openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether or not to open the minimum required ports on the firewall. This is necessary to allow firmware upgrades and device discovery to @@ -65,7 +65,7 @@ in type = types.nullOr types.int; default = null; example = 1024; - description = '' + description = lib.mdDoc '' Set the initial heap size for the JVM in MB. If this option isn't set, the JVM will decide this value at runtime. ''; @@ -75,7 +75,7 @@ in type = types.nullOr types.int; default = null; example = 4096; - description = '' + description = lib.mdDoc '' Set the maximimum heap size for the JVM in MB. If this option isn't set, the JVM will decide this value at runtime. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/uptermd.nix b/third_party/nixpkgs/nixos/modules/services/networking/uptermd.nix index b845a00649..387478de99 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/uptermd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/uptermd.nix @@ -13,15 +13,15 @@ in openFirewall = mkOption { type = types.bool; default = false; - description = '' - Whether to open the firewall for the port in . + description = lib.mdDoc '' + Whether to open the firewall for the port in {option}`services.uptermd.port`. ''; }; port = mkOption { type = types.port; default = 2222; - description = '' + description = lib.mdDoc '' Port the server will listen on. ''; }; @@ -30,7 +30,7 @@ in type = types.str; default = "[::]"; example = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Address the server will listen on. ''; }; @@ -39,7 +39,7 @@ in type = types.nullOr types.path; default = null; example = "/run/keys/upterm_host_ed25519_key"; - description = '' + description = lib.mdDoc '' Path to SSH host key. If not defined, an ed25519 keypair is generated automatically. ''; }; @@ -48,7 +48,7 @@ in type = types.listOf types.str; default = []; example = [ "--debug" ]; - description = '' + description = lib.mdDoc '' Extra flags passed to the uptermd command. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/v2ray.nix b/third_party/nixpkgs/nixos/modules/services/networking/v2ray.nix index 95e8761ba5..f063ddfed0 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/v2ray.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/v2ray.nix @@ -9,10 +9,10 @@ with lib; enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run v2ray server. - Either configFile or config must be specified. + Either `configFile` or `config` must be specified. ''; }; @@ -20,7 +20,7 @@ with lib; type = types.package; default = pkgs.v2ray; defaultText = literalExpression "pkgs.v2ray"; - description = '' + description = lib.mdDoc '' Which v2ray package to use. ''; }; @@ -29,12 +29,12 @@ with lib; type = types.nullOr types.str; default = null; example = "/etc/v2ray/config.json"; - description = '' + description = lib.mdDoc '' The absolute path to the configuration file. - Either configFile or config must be specified. + Either `configFile` or `config` must be specified. - See . + See . ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix index d205302051..b26adbf871 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/vsftpd.nix @@ -154,18 +154,18 @@ in userlist = mkOption { default = []; type = types.listOf types.str; - description = "See ."; + description = lib.mdDoc "See {option}`userlistFile`."; }; userlistFile = mkOption { type = types.path; default = pkgs.writeText "userlist" (concatMapStrings (x: "${x}\n") cfg.userlist); defaultText = literalExpression ''pkgs.writeText "userlist" (concatMapStrings (x: "''${x}\n") cfg.userlist)''; - description = '' - Newline separated list of names to be allowed/denied if - is true. Meaning see . + description = lib.mdDoc '' + Newline separated list of names to be allowed/denied if {option}`userlistEnable` + is `true`. Meaning see {option}`userlistDeny`. - The default is a file containing the users from . + The default is a file containing the users from {option}`userlist`. If explicitely set to null userlist_file will not be set in vsftpd's config file. ''; @@ -174,8 +174,8 @@ in enableVirtualUsers = mkOption { type = types.bool; default = false; - description = '' - Whether to enable the pam_userdb-based + description = lib.mdDoc '' + Whether to enable the `pam_userdb`-based virtual user system ''; }; @@ -218,7 +218,7 @@ in type = types.nullOr types.str; default = null; example = "/var/www/$USER"; - description = '' + description = lib.mdDoc '' This option represents a directory which vsftpd will try to change into after a local (i.e. non- anonymous) login. @@ -229,7 +229,7 @@ in anonymousUserHome = mkOption { type = types.path; default = "/home/ftp/"; - description = '' + description = lib.mdDoc '' Directory to consider the HOME of the anonymous user. ''; }; @@ -237,27 +237,27 @@ in rsaCertFile = mkOption { type = types.nullOr types.path; default = null; - description = "RSA certificate file."; + description = lib.mdDoc "RSA certificate file."; }; rsaKeyFile = mkOption { type = types.nullOr types.path; default = null; - description = "RSA private key file."; + description = lib.mdDoc "RSA private key file."; }; anonymousUmask = mkOption { type = types.str; default = "077"; example = "002"; - description = "Anonymous write umask."; + description = lib.mdDoc "Anonymous write umask."; }; extraConfig = mkOption { type = types.lines; default = ""; example = "ftpd_banner=Hello"; - description = "Extra configuration to add at the bottom of the generated configuration file."; + description = lib.mdDoc "Extra configuration to add at the bottom of the generated configuration file."; }; } // (listToAttrs (catAttrs "nixosOption" optionDescription)); diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wasabibackend.nix b/third_party/nixpkgs/nixos/modules/services/networking/wasabibackend.nix index b6dcd94091..00d772a718 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wasabibackend.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wasabibackend.nix @@ -34,32 +34,32 @@ in { dataDir = mkOption { type = types.path; default = "/var/lib/wasabibackend"; - description = "The data directory for the Wasabi backend node."; + description = lib.mdDoc "The data directory for the Wasabi backend node."; }; customConfigFile = mkOption { type = types.nullOr types.path; default = null; - description = "Defines the path to a custom configuration file that is copied to the user's directory. Overrides any config options."; + description = lib.mdDoc "Defines the path to a custom configuration file that is copied to the user's directory. Overrides any config options."; }; network = mkOption { type = types.enum [ "mainnet" "testnet" "regtest" ]; default = "mainnet"; - description = "The network to use for the Wasabi backend service."; + description = lib.mdDoc "The network to use for the Wasabi backend service."; }; endpoint = { ip = mkOption { type = types.str; default = "127.0.0.1"; - description = "IP address for P2P connection to bitcoind."; + description = lib.mdDoc "IP address for P2P connection to bitcoind."; }; port = mkOption { type = types.port; default = 8333; - description = "Port for P2P connection to bitcoind."; + description = lib.mdDoc "Port for P2P connection to bitcoind."; }; }; @@ -67,45 +67,45 @@ in { ip = mkOption { type = types.str; default = "127.0.0.1"; - description = "IP address for RPC connection to bitcoind."; + description = lib.mdDoc "IP address for RPC connection to bitcoind."; }; port = mkOption { type = types.port; default = 8332; - description = "Port for RPC connection to bitcoind."; + description = lib.mdDoc "Port for RPC connection to bitcoind."; }; user = mkOption { type = types.str; default = "bitcoin"; - description = "RPC user for the bitcoin endpoint."; + description = lib.mdDoc "RPC user for the bitcoin endpoint."; }; password = mkOption { type = types.str; default = "password"; - description = "RPC password for the bitcoin endpoint. Warning: this is stored in cleartext in the Nix store! Use configFile or passwordFile if needed."; + description = lib.mdDoc "RPC password for the bitcoin endpoint. Warning: this is stored in cleartext in the Nix store! Use `configFile` or `passwordFile` if needed."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = "File that contains the password of the RPC user."; + description = lib.mdDoc "File that contains the password of the RPC user."; }; }; user = mkOption { type = types.str; default = "wasabibackend"; - description = "The user as which to run the wasabibackend node."; + description = lib.mdDoc "The user as which to run the wasabibackend node."; }; group = mkOption { type = types.str; default = cfg.user; defaultText = literalExpression "config.${opt.user}"; - description = "The group as which to run the wasabibackend node."; + description = lib.mdDoc "The group as which to run the wasabibackend node."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix b/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix index f7e014e03e..45a3487bd3 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/websockify.nix @@ -6,7 +6,7 @@ let cfg = config.services.networking.websockify; in { options = { services.networking.websockify = { enable = mkOption { - description = "Whether to enable websockify to forward websocket connections to TCP connections."; + description = lib.mdDoc "Whether to enable websockify to forward websocket connections to TCP connections."; default = false; @@ -14,19 +14,19 @@ let cfg = config.services.networking.websockify; in { }; sslCert = mkOption { - description = "Path to the SSL certificate."; + description = lib.mdDoc "Path to the SSL certificate."; type = types.path; }; sslKey = mkOption { - description = "Path to the SSL key."; + description = lib.mdDoc "Path to the SSL key."; default = cfg.sslCert; defaultText = literalExpression "config.services.networking.websockify.sslCert"; type = types.path; }; portMap = mkOption { - description = "Ports to map by default."; + description = lib.mdDoc "Ports to map by default."; default = {}; type = types.attrsOf types.int; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix b/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix index d44fad4202..b43c3e8513 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wg-quick.nix @@ -15,7 +15,7 @@ let example = "/secret/wg0.conf"; default = null; type = with types; nullOr str; - description = '' + description = lib.mdDoc '' wg-quick .conf file, describing the interface. This overrides any other configuration interface configuration options. See wg-quick manpage for more details. @@ -26,11 +26,11 @@ let example = [ "192.168.2.1/24" ]; default = []; type = with types; listOf str; - description = "The IP addresses of the interface."; + description = lib.mdDoc "The IP addresses of the interface."; }; autostart = mkOption { - description = "Whether to bring up this interface automatically during boot."; + description = lib.mdDoc "Whether to bring up this interface automatically during boot."; default = true; example = false; type = types.bool; @@ -40,15 +40,15 @@ let example = [ "192.168.2.2" ]; default = []; type = with types; listOf str; - description = "The IP addresses of DNS servers to configure."; + description = lib.mdDoc "The IP addresses of DNS servers to configure."; }; privateKey = mkOption { example = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk="; type = with types; nullOr str; default = null; - description = '' - Base64 private key generated by wg genkey. + description = lib.mdDoc '' + Base64 private key generated by {command}`wg genkey`. Warning: Consider using privateKeyFile instead if you do not want to store the key in the world-readable Nix store. @@ -59,8 +59,8 @@ let example = "/private/wireguard_key"; type = with types; nullOr str; default = null; - description = '' - Private key file as generated by wg genkey. + description = lib.mdDoc '' + Private key file as generated by {command}`wg genkey`. ''; }; @@ -68,7 +68,7 @@ let default = null; type = with types; nullOr int; example = 51820; - description = '' + description = lib.mdDoc '' 16-bit port for listening. Optional; if not specified, automatically generated based on interface name. ''; @@ -78,7 +78,7 @@ let example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns add foo"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; - description = '' + description = lib.mdDoc '' Commands called at the start of the interface setup. ''; }; @@ -87,7 +87,7 @@ let example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns del foo"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; - description = '' + description = lib.mdDoc '' Command called before the interface is taken down. ''; }; @@ -96,7 +96,7 @@ let example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns add foo"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; - description = '' + description = lib.mdDoc '' Commands called after the interface setup. ''; }; @@ -105,7 +105,7 @@ let example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns del foo"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; - description = '' + description = lib.mdDoc '' Command called after the interface is taken down. ''; }; @@ -114,7 +114,7 @@ let example = "main"; default = null; type = with types; nullOr str; - description = '' + description = lib.mdDoc '' The kernel routing table to add this interface's associated routes to. Setting this is useful for e.g. policy routing ("ip rule") or virtual routing and forwarding ("ip vrf"). Both @@ -127,7 +127,7 @@ let example = 1248; default = null; type = with types; nullOr int; - description = '' + description = lib.mdDoc '' If not specified, the MTU is automatically determined from the endpoint addresses or the system default route, which is usually a sane choice. However, to manually specify an MTU to override this @@ -137,7 +137,7 @@ let peers = mkOption { default = []; - description = "Peers linked to the interface."; + description = lib.mdDoc "Peers linked to the interface."; type = with types; listOf (submodule peerOpts); }; }; @@ -150,15 +150,15 @@ let publicKey = mkOption { example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg="; type = types.str; - description = "The base64 public key to the peer."; + description = lib.mdDoc "The base64 public key to the peer."; }; presharedKey = mkOption { default = null; example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; type = with types; nullOr str; - description = '' - Base64 preshared key generated by wg genpsk. + description = lib.mdDoc '' + Base64 preshared key generated by {command}`wg genpsk`. Optional, and may be omitted. This option adds an additional layer of symmetric-key cryptography to be mixed into the already existing public-key cryptography, for post-quantum resistance. @@ -172,8 +172,8 @@ let default = null; example = "/private/wireguard_psk"; type = with types; nullOr str; - description = '' - File pointing to preshared key as generated by wg genpsk. + description = lib.mdDoc '' + File pointing to preshared key as generated by {command}`wg genpsk`. Optional, and may be omitted. This option adds an additional layer of symmetric-key cryptography to be mixed into the already existing public-key cryptography, for post-quantum resistance. @@ -183,7 +183,7 @@ let allowedIPs = mkOption { example = [ "10.192.122.3/32" "10.192.124.1/24" ]; type = with types; listOf str; - description = ''List of IP (v4 or v6) addresses with CIDR masks from + description = lib.mdDoc ''List of IP (v4 or v6) addresses with CIDR masks from which this peer is allowed to send incoming traffic and to which outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may be specified for matching all IPv4 addresses, and ::/0 may be specified @@ -194,7 +194,7 @@ let default = null; example = "demo.wireguard.io:12913"; type = with types; nullOr str; - description = ''Endpoint IP or hostname of the peer, followed by a colon, + description = lib.mdDoc ''Endpoint IP or hostname of the peer, followed by a colon, and then a port number of the peer.''; }; @@ -202,7 +202,7 @@ let default = null; type = with types; nullOr int; example = 25; - description = ''This is optional and is by default off, because most + description = lib.mdDoc ''This is optional and is by default off, because most users will not need it. It represents, in seconds, between 1 and 65535 inclusive, how often to send an authenticated empty packet to the peer, for the purpose of keeping a stateful firewall or NAT mapping valid @@ -304,7 +304,7 @@ in { options = { networking.wg-quick = { interfaces = mkOption { - description = "Wireguard interfaces."; + description = lib.mdDoc "Wireguard interfaces."; default = {}; example = { wg0 = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix index a3c3c245f1..9017c53f4e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wireguard.nix @@ -19,15 +19,15 @@ let example = [ "192.168.2.1/24" ]; default = []; type = with types; listOf str; - description = "The IP addresses of the interface."; + description = lib.mdDoc "The IP addresses of the interface."; }; privateKey = mkOption { example = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk="; type = with types; nullOr str; default = null; - description = '' - Base64 private key generated by wg genkey. + description = lib.mdDoc '' + Base64 private key generated by {command}`wg genkey`. Warning: Consider using privateKeyFile instead if you do not want to store the key in the world-readable Nix store. @@ -37,9 +37,9 @@ let generatePrivateKeyFile = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Automatically generate a private key with - wg genkey, at the privateKeyFile location. + {command}`wg genkey`, at the privateKeyFile location. ''; }; @@ -47,8 +47,8 @@ let example = "/private/wireguard_key"; type = with types; nullOr str; default = null; - description = '' - Private key file as generated by wg genkey. + description = lib.mdDoc '' + Private key file as generated by {command}`wg genkey`. ''; }; @@ -56,7 +56,7 @@ let default = null; type = with types; nullOr int; example = 51820; - description = '' + description = lib.mdDoc '' 16-bit port for listening. Optional; if not specified, automatically generated based on interface name. ''; @@ -66,7 +66,7 @@ let example = literalExpression ''"''${pkgs.iproute2}/bin/ip netns add foo"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; - description = '' + description = lib.mdDoc '' Commands called at the start of the interface setup. ''; }; @@ -77,20 +77,20 @@ let ''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; - description = "Commands called at the end of the interface setup."; + description = lib.mdDoc "Commands called at the end of the interface setup."; }; postShutdown = mkOption { example = literalExpression ''"''${pkgs.openresolv}/bin/resolvconf -d wg0"''; default = ""; type = with types; coercedTo (listOf str) (concatStringsSep "\n") lines; - description = "Commands called after shutting down the interface."; + description = lib.mdDoc "Commands called after shutting down the interface."; }; table = mkOption { default = "main"; type = types.str; - description = '' + description = lib.mdDoc '' The kernel routing table to add this interface's associated routes to. Setting this is useful for e.g. policy routing ("ip rule") or virtual routing and forwarding ("ip vrf"). Both @@ -101,7 +101,7 @@ let peers = mkOption { default = []; - description = "Peers linked to the interface."; + description = lib.mdDoc "Peers linked to the interface."; type = with types; listOf (submodule peerOpts); }; @@ -109,7 +109,7 @@ let example = false; default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Determines whether to add allowed IPs as routes or not. ''; }; @@ -118,12 +118,11 @@ let default = null; type = with types; nullOr str; example = "container"; - description = ''The pre-existing network namespace in which the + description = lib.mdDoc ''The pre-existing network namespace in which the WireGuard interface is created, and which retains the socket even if the - interface is moved via . When - null, the interface is created in the init namespace. - See documentation. + interface is moved via {option}`interfaceNamespace`. When + `null`, the interface is created in the init namespace. + See [documentation](https://www.wireguard.com/netns/). ''; }; @@ -131,12 +130,11 @@ let default = null; type = with types; nullOr str; example = "init"; - description = ''The pre-existing network namespace the WireGuard - interface is moved to. The special value init means - the init namespace. When null, the interface is not + description = lib.mdDoc ''The pre-existing network namespace the WireGuard + interface is moved to. The special value `init` means + the init namespace. When `null`, the interface is not moved. - See documentation. + See [documentation](https://www.wireguard.com/netns/). ''; }; }; @@ -152,15 +150,15 @@ let publicKey = mkOption { example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg="; type = types.str; - description = "The base64 public key of the peer."; + description = lib.mdDoc "The base64 public key of the peer."; }; presharedKey = mkOption { default = null; example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; type = with types; nullOr str; - description = '' - Base64 preshared key generated by wg genpsk. + description = lib.mdDoc '' + Base64 preshared key generated by {command}`wg genpsk`. Optional, and may be omitted. This option adds an additional layer of symmetric-key cryptography to be mixed into the already existing public-key cryptography, for post-quantum resistance. @@ -174,8 +172,8 @@ let default = null; example = "/private/wireguard_psk"; type = with types; nullOr str; - description = '' - File pointing to preshared key as generated by wg genpsk. + description = lib.mdDoc '' + File pointing to preshared key as generated by {command}`wg genpsk`. Optional, and may be omitted. This option adds an additional layer of symmetric-key cryptography to be mixed into the already existing public-key cryptography, for post-quantum resistance. @@ -185,7 +183,7 @@ let allowedIPs = mkOption { example = [ "10.192.122.3/32" "10.192.124.1/24" ]; type = with types; listOf str; - description = ''List of IP (v4 or v6) addresses with CIDR masks from + description = lib.mdDoc ''List of IP (v4 or v6) addresses with CIDR masks from which this peer is allowed to send incoming traffic and to which outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may be specified for matching all IPv4 addresses, and ::/0 may be specified @@ -216,12 +214,12 @@ let default = 0; example = 5; type = with types; int; - description = '' - Periodically re-execute the wg utility every + description = lib.mdDoc '' + Periodically re-execute the `wg` utility every this many seconds in order to let WireGuard notice DNS / hostname changes. - Setting this to 0 disables periodic reexecution. + Setting this to `0` disables periodic reexecution. ''; }; @@ -229,7 +227,7 @@ let default = null; type = with types; nullOr int; example = 25; - description = ''This is optional and is by default off, because most + description = lib.mdDoc ''This is optional and is by default off, because most users will not need it. It represents, in seconds, between 1 and 65535 inclusive, how often to send an authenticated empty packet to the peer, for the purpose of keeping a stateful firewall or NAT mapping valid @@ -437,7 +435,7 @@ in networking.wireguard = { enable = mkOption { - description = "Whether to enable WireGuard."; + description = lib.mdDoc "Whether to enable WireGuard."; type = types.bool; # 2019-05-25: Backwards compatibility. default = cfg.interfaces != {}; @@ -446,7 +444,7 @@ in }; interfaces = mkOption { - description = "WireGuard interfaces."; + description = lib.mdDoc "WireGuard interfaces."; default = {}; example = { wg0 = { diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix index 5a7975ae17..ac5f597b47 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/wpa_supplicant.nix @@ -183,14 +183,14 @@ in { driver = mkOption { type = types.str; default = "nl80211,wext"; - description = "Force a specific wpa_supplicant driver."; + description = lib.mdDoc "Force a specific wpa_supplicant driver."; }; allowAuxiliaryImperativeNetworks = mkEnableOption "support for imperative & declarative networks" // { description = '' Whether to allow configuring networks "imperatively" (e.g. via wpa_supplicant_gui) and declaratively via - . + . Please note that this adds a custom patch to wpa_supplicant. ''; @@ -199,7 +199,7 @@ in { scanOnLowSignal = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to periodically scan for (better) networks when the signal of the current one is low. This will make roaming between access points faster, but will consume more power. @@ -209,7 +209,7 @@ in { fallbackToWPA2 = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to fall back to WPA2 authentication protocols if WPA3 failed. This allows old wireless cards (that lack recent features required by WPA3) to connect to mixed WPA2/WPA3 access points. @@ -331,9 +331,9 @@ in { "OWE" "DPP" ]); - description = '' + description = lib.mdDoc '' The list of authentication protocols accepted by this network. - This corresponds to the key_mgmt option in wpa_supplicant. + This corresponds to the `key_mgmt` option in wpa_supplicant. ''; }; @@ -369,8 +369,8 @@ in { hidden = mkOption { type = types.bool; default = false; - description = '' - Set this to true if the SSID of the network is hidden. + description = lib.mdDoc '' + Set this to `true` if the SSID of the network is hidden. ''; example = literalExpression '' { echelon = { @@ -384,7 +384,7 @@ in { priority = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' By default, all networks will get same priority group (0). If some of the networks are more desirable, this field can be used to change the order in which wpa_supplicant goes through the networks when selecting a BSS. The @@ -414,9 +414,9 @@ in { }; }); - description = '' + description = lib.mdDoc '' The network definitions to automatically connect to when - wpa_supplicant is running. If this + {command}`wpa_supplicant` is running. If this parameter is left empty wpa_supplicant will use /etc/wpa_supplicant.conf as the configuration file. ''; @@ -443,7 +443,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allow normal users to control wpa_supplicant through wpa_gui or wpa_cli. This is useful for laptop users that switch networks a lot and don't want to depend on a large package such as NetworkManager just to pick nearby @@ -458,7 +458,7 @@ in { type = types.str; default = "wheel"; example = "network"; - description = "Members of this group can control wpa_supplicant."; + description = lib.mdDoc "Members of this group can control wpa_supplicant."; }; }; @@ -466,7 +466,7 @@ in { type = types.bool; default = lib.length cfg.interfaces < 2; defaultText = literalExpression "length config.${opt.interfaces} < 2"; - description = '' + description = lib.mdDoc '' Whether to enable the DBus control interface. This is only needed when using NetworkManager or connman. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/x2goserver.nix b/third_party/nixpkgs/nixos/modules/services/networking/x2goserver.nix index d4adf6c565..3c2424b6f4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/x2goserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/x2goserver.nix @@ -42,7 +42,7 @@ in { nxagentDefaultOptions = mkOption { type = types.listOf types.str; default = [ "-extension GLX" "-nolisten tcp" ]; - description = '' + description = lib.mdDoc '' List of default nx agent options. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix b/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix index 4bd45a76e6..649e9c7a66 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/xandikos.nix @@ -15,13 +15,13 @@ in type = types.package; default = pkgs.xandikos; defaultText = literalExpression "pkgs.xandikos"; - description = "The Xandikos package to use."; + description = lib.mdDoc "The Xandikos package to use."; }; address = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' The IP address on which Xandikos will listen. By default listens on localhost. ''; @@ -30,13 +30,13 @@ in port = mkOption { type = types.port; default = 8080; - description = "The port of the Xandikos web application"; + description = lib.mdDoc "The port of the Xandikos web application"; }; routePrefix = mkOption { type = types.str; default = "/"; - description = '' + description = lib.mdDoc '' Path to Xandikos. Useful when Xandikos is behind a reverse proxy. ''; @@ -52,14 +52,14 @@ in "--dump-dav-xml" ] ''; - description = '' + description = lib.mdDoc '' Extra command line arguments to pass to xandikos. ''; }; nginx = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Configuration for nginx reverse proxy. ''; @@ -68,14 +68,14 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Configure the nginx reverse proxy settings. ''; }; hostName = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The hostname use to setup the virtualhost configuration ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xinetd.nix b/third_party/nixpkgs/nixos/modules/services/networking/xinetd.nix index 2f527ab156..6c633d4ead 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xinetd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/xinetd.nix @@ -49,14 +49,14 @@ in services.xinetd.extraDefaults = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Additional configuration lines added to the default section of xinetd's configuration. ''; }; services.xinetd.services = mkOption { default = []; - description = '' + description = lib.mdDoc '' A list of services provided by xinetd. ''; @@ -67,39 +67,39 @@ in name = mkOption { type = types.str; example = "login"; - description = "Name of the service."; + description = lib.mdDoc "Name of the service."; }; protocol = mkOption { type = types.str; default = "tcp"; description = - "Protocol of the service. Usually tcp or udp."; + lib.mdDoc "Protocol of the service. Usually `tcp` or `udp`."; }; port = mkOption { type = types.int; default = 0; example = 123; - description = "Port number of the service."; + description = lib.mdDoc "Port number of the service."; }; user = mkOption { type = types.str; default = "nobody"; - description = "User account for the service"; + description = lib.mdDoc "User account for the service"; }; server = mkOption { type = types.str; example = "/foo/bin/ftpd"; - description = "Path of the program that implements the service."; + description = lib.mdDoc "Path of the program that implements the service."; }; serverArgs = mkOption { type = types.separatedString " "; default = ""; - description = "Command-line arguments for the server program."; + description = lib.mdDoc "Command-line arguments for the server program."; }; flags = mkOption { @@ -111,9 +111,9 @@ in unlisted = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether this server is listed in - /etc/services. If so, the port + {file}`/etc/services`. If so, the port number can be omitted. ''; }; @@ -121,7 +121,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra configuration-lines added to the section of the service."; + description = lib.mdDoc "Extra configuration-lines added to the section of the service."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xl2tpd.nix b/third_party/nixpkgs/nixos/modules/services/networking/xl2tpd.nix index 9418488c1e..c30a541d30 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xl2tpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/xl2tpd.nix @@ -9,25 +9,25 @@ with lib; serverIp = mkOption { type = types.str; - description = "The server-side IP address."; + description = lib.mdDoc "The server-side IP address."; default = "10.125.125.1"; }; clientIpRange = mkOption { type = types.str; - description = "The range from which client IPs are drawn."; + description = lib.mdDoc "The range from which client IPs are drawn."; default = "10.125.125.2-11"; }; extraXl2tpOptions = mkOption { type = types.lines; - description = "Adds extra lines to the xl2tpd configuration file."; + description = lib.mdDoc "Adds extra lines to the xl2tpd configuration file."; default = ""; }; extraPppdOptions = mkOption { type = types.lines; - description = "Adds extra lines to the pppd options file."; + description = lib.mdDoc "Adds extra lines to the pppd options file."; default = ""; example = '' ms-dns 8.8.8.8 diff --git a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix index 747fb7a1f9..17caeab272 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/xrdp.nix @@ -48,7 +48,7 @@ in type = types.package; default = pkgs.xrdp; defaultText = literalExpression "pkgs.xrdp"; - description = '' + description = lib.mdDoc '' The package to use for the xrdp daemon's binary. ''; }; @@ -56,7 +56,7 @@ in port = mkOption { type = types.int; default = 3389; - description = '' + description = lib.mdDoc '' Specifies on which port the xrdp daemon listens. ''; }; @@ -64,14 +64,14 @@ in openFirewall = mkOption { default = false; type = types.bool; - description = "Whether to open the firewall for the specified RDP port."; + description = lib.mdDoc "Whether to open the firewall for the specified RDP port."; }; sslKey = mkOption { type = types.str; default = "/etc/xrdp/key.pem"; example = "/path/to/your/key.pem"; - description = '' + description = lib.mdDoc '' ssl private key path A self-signed certificate will be generated if file not exists. ''; @@ -81,7 +81,7 @@ in type = types.str; default = "/etc/xrdp/cert.pem"; example = "/path/to/your/cert.pem"; - description = '' + description = lib.mdDoc '' ssl certificate path A self-signed certificate will be generated if file not exists. ''; @@ -91,7 +91,7 @@ in type = types.str; default = "xterm"; example = "xfce4-session"; - description = '' + description = lib.mdDoc '' The script to run when user log in, usually a window manager, e.g. "icewm", "xfce4-session" This is per-user overridable, if file ~/startwm.sh exists it will be used instead. ''; @@ -101,7 +101,7 @@ in type = types.path; default = confDir; defaultText = literalDocBook "generated from configuration"; - description = "The location of the config files for xrdp."; + description = lib.mdDoc "The location of the config files for xrdp."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix index 99c18ae691..81ed6d1dd5 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/yggdrasil.nix @@ -4,16 +4,23 @@ let keysPath = "/var/lib/yggdrasil/keys.json"; cfg = config.services.yggdrasil; - configProvided = cfg.config != { }; + settingsProvided = cfg.settings != { }; configFileProvided = cfg.configFile != null; + format = pkgs.formats.json { }; in { + imports = [ + (mkRenamedOptionModule + [ "services" "yggdrasil" "config" ] + [ "services" "yggdrasil" "settings" ]) + ]; + options = with types; { services.yggdrasil = { enable = mkEnableOption "the yggdrasil system service"; - config = mkOption { - type = attrs; + settings = mkOption { + type = format.type; default = {}; example = { Peers = [ @@ -44,8 +51,8 @@ in { are supplied, they will be combined, with values from taking precedence. - You can use the command nix-shell -p yggdrasil --run - "yggdrasil -genconf" to generate default + You can use the command nix-shell -p yggdrasil --run + "yggdrasil -genconf" to generate default configuration values with documentation. ''; }; @@ -54,31 +61,31 @@ in { type = nullOr path; default = null; example = "/run/keys/yggdrasil.conf"; - description = '' + description = lib.mdDoc '' A file which contains JSON configuration for yggdrasil. - See the option for more information. + See the {option}`config` option for more information. ''; }; group = mkOption { - type = types.str; - default = "root"; + type = types.nullOr types.str; + default = null; example = "wheel"; - description = "Group to grant access to the Yggdrasil control socket."; + description = lib.mdDoc "Group to grant access to the Yggdrasil control socket. If `null`, only root can access the socket."; }; openMulticastPort = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' Whether to open the UDP port used for multicast peer discovery. The NixOS firewall blocks link-local communication, so in order to make local peering work you - will also need to set LinkLocalTCPPort in your - yggdrasil configuration ( or - ) to a port number other than 0, + will also need to set `LinkLocalTCPPort` in your + yggdrasil configuration ({option}`config` or + {option}`configFile`) to a port number other than 0, and then add that port to - . + {option}`networking.firewall.allowedTCPPorts`. ''; }; @@ -86,7 +93,7 @@ in { type = listOf str; default = []; example = [ "tap*" ]; - description = '' + description = lib.mdDoc '' Disable the DHCP client for any interface whose name matches any of the shell glob patterns in this list. Use this option to prevent the DHCP client from broadcasting requests @@ -100,7 +107,7 @@ in { type = package; default = pkgs.yggdrasil; defaultText = literalExpression "pkgs.yggdrasil"; - description = "Yggdrasil package to use."; + description = lib.mdDoc "Yggdrasil package to use."; }; persistentKeys = mkEnableOption '' @@ -132,16 +139,17 @@ in { systemd.services.yggdrasil = { description = "Yggdrasil Network Service"; - bindsTo = [ "network-online.target" ]; - after = [ "network-online.target" ]; + after = [ "network-pre.target" ]; + wants = [ "network.target" ]; + before = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = - (if configProvided || configFileProvided || cfg.persistentKeys then + (if settingsProvided || configFileProvided || cfg.persistentKeys then "echo " - + (lib.optionalString configProvided - "'${builtins.toJSON cfg.config}'") + + (lib.optionalString settingsProvided + "'${builtins.toJSON cfg.settings}'") + (lib.optionalString configFileProvided "$(cat ${cfg.configFile})") + (lib.optionalString cfg.persistentKeys "$(cat ${keysPath})") + " | ${pkgs.jq}/bin/jq -s add | ${binYggdrasil} -normaliseconf -useconf" @@ -154,27 +162,16 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "always"; - Group = cfg.group; + DynamicUser = true; + StateDirectory = "yggdrasil"; RuntimeDirectory = "yggdrasil"; RuntimeDirectoryMode = "0750"; BindReadOnlyPaths = lib.optional configFileProvided cfg.configFile ++ lib.optional cfg.persistentKeys keysPath; + ReadWritePaths = "/run/yggdrasil"; - # TODO: as of yggdrasil 0.3.8 and systemd 243, yggdrasil fails - # to set up the network adapter when DynamicUser is set. See - # github.com/yggdrasil-network/yggdrasil-go/issues/557. The - # following options are implied by DynamicUser according to - # the systemd.exec documentation, and can be removed if the - # upstream issue is fixed and DynamicUser is set to true: - PrivateTmp = true; - RemoveIPC = true; - NoNewPrivileges = true; - ProtectSystem = "strict"; - RestrictSUIDSGID = true; - # End of list of options implied by DynamicUser. - - AmbientCapabilities = "CAP_NET_ADMIN"; - CapabilityBoundingSet = "CAP_NET_ADMIN"; + AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE"; + CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE"; MemoryDenyWriteExecute = true; ProtectControlGroups = true; ProtectHome = "tmpfs"; @@ -185,7 +182,9 @@ in { RestrictRealtime = true; SystemCallArchitectures = "native"; SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @resources"; - }; + } // (if (cfg.group != null) then { + Group = cfg.group; + } else {}); }; networking.dhcpcd.denyInterfaces = cfg.denyDhcpcdInterfaces; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/zerobin.nix b/third_party/nixpkgs/nixos/modules/services/networking/zerobin.nix index 16db25d623..0be694915c 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/zerobin.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/zerobin.nix @@ -17,7 +17,7 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/zerobin"; - description = '' + description = lib.mdDoc '' Path to the 0bin data directory ''; }; @@ -25,7 +25,7 @@ in user = mkOption { type = types.str; default = "zerobin"; - description = '' + description = lib.mdDoc '' The user 0bin should run as ''; }; @@ -33,7 +33,7 @@ in group = mkOption { type = types.str; default = "zerobin"; - description = '' + description = lib.mdDoc '' The group 0bin should run as ''; }; @@ -42,7 +42,7 @@ in type = types.int; default = 8000; example = 1357; - description = '' + description = lib.mdDoc '' The port zerobin should listen on ''; }; @@ -51,7 +51,7 @@ in type = types.str; default = "localhost"; example = "127.0.0.1"; - description = '' + description = lib.mdDoc '' The address zerobin should listen to ''; }; @@ -65,7 +65,7 @@ in ) COMPRESSED_STATIC_FILE = True ''; - description = '' + description = lib.mdDoc '' Extra configuration to be appended to the 0bin config file (see https://0bin.readthedocs.org/en/latest/en/options.html) ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/zeronet.nix b/third_party/nixpkgs/nixos/modules/services/networking/zeronet.nix index 8be6692561..2245204d45 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/zeronet.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/zeronet.nix @@ -23,7 +23,7 @@ in with lib; { type = types.package; default = pkgs.zeronet; defaultText = literalExpression "pkgs.zeronet"; - description = "ZeroNet package to use"; + description = lib.mdDoc "ZeroNet package to use"; }; settings = mkOption { @@ -31,9 +31,9 @@ in with lib; { default = {}; example = literalExpression "{ global.tor = enable; }"; - description = '' - zeronet.conf configuration. Refer to - + description = lib.mdDoc '' + {file}`zeronet.conf` configuration. Refer to + for details on supported values; ''; }; @@ -41,7 +41,7 @@ in with lib; { port = mkOption { type = types.port; default = 43110; - description = "Optional zeronet web UI port."; + description = lib.mdDoc "Optional zeronet web UI port."; }; fileserverPort = mkOption { @@ -49,19 +49,19 @@ in with lib; { # read-only config file and crashes type = types.port; default = 12261; - description = "Zeronet fileserver port."; + description = lib.mdDoc "Zeronet fileserver port."; }; tor = mkOption { type = types.bool; default = false; - description = "Use TOR for zeronet traffic where possible."; + description = lib.mdDoc "Use TOR for zeronet traffic where possible."; }; torAlways = mkOption { type = types.bool; default = false; - description = "Use TOR for all zeronet traffic."; + description = lib.mdDoc "Use TOR for all zeronet traffic."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix b/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix index 3bc7d3ac0d..572ae2e929 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/zerotierone.nix @@ -12,7 +12,7 @@ in default = []; example = [ "a8a2c3c10c1a68de" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of ZeroTier Network IDs to join on startup ''; }; @@ -20,7 +20,7 @@ in options.services.zerotierone.port = mkOption { default = 9993; type = types.int; - description = '' + description = lib.mdDoc '' Network port used by ZeroTier. ''; }; @@ -29,7 +29,7 @@ in default = pkgs.zerotierone; defaultText = literalExpression "pkgs.zerotierone"; type = types.package; - description = '' + description = lib.mdDoc '' ZeroTier One package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix b/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix index a98f92d2d7..42a332d6bf 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/znc/default.nix @@ -156,22 +156,18 @@ in format ZNC expects. This is much more flexible than the legacy options under , but also can't do any type checking. - - + You can use nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.services.znc.config to view the current value. By default it contains a listener for port 5000 with SSL enabled. - - + Nix attributes called extraConfig will be inserted verbatim into the resulting config file. - - + If is turned on, the option values in will be gracefully be applied to this option. - - + If you intend to update the configuration through this option, be sure to enable , otherwise none of the changes here will be applied after the initial deploy. @@ -184,8 +180,7 @@ in description = '' Configuration file for ZNC. It is recommended to use the option instead. - - + Setting this option will override any auto-generated config file through the or options. @@ -208,13 +203,11 @@ in Indicates whether to allow the contents of the dataDir directory to be changed by the user at run-time. - - + If enabled, modifications to the ZNC configuration after its initial creation are not overwritten by a NixOS rebuild. If disabled, the ZNC configuration is rebuilt on every NixOS rebuild. - - + If the user wants to manage the ZNC service using the web admin interface, this option should be enabled. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix b/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix index 0db051126e..021fea9819 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/znc/options.nix @@ -12,7 +12,7 @@ let server = mkOption { type = types.str; example = "irc.libera.chat"; - description = '' + description = lib.mdDoc '' IRC server address. ''; }; @@ -20,7 +20,7 @@ let port = mkOption { type = types.ints.u16; default = 6697; - description = '' + description = lib.mdDoc '' IRC server port. ''; }; @@ -28,7 +28,7 @@ let password = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' IRC server password, such as for a Slack gateway. ''; }; @@ -36,7 +36,7 @@ let useSSL = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to use SSL to connect to the IRC server. ''; }; @@ -45,7 +45,7 @@ let type = types.listOf types.str; default = [ "simple_away" ]; example = literalExpression ''[ "simple_away" "sasl" ]''; - description = '' + description = lib.mdDoc '' ZNC network modules to load. ''; }; @@ -54,7 +54,7 @@ let type = types.listOf types.str; default = []; example = [ "nixos" ]; - description = '' + description = lib.mdDoc '' IRC channels to join. ''; }; @@ -62,7 +62,7 @@ let hasBitlbeeControlChannel = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to add the special Bitlbee operations channel. ''; }; @@ -79,9 +79,9 @@ let JoinDelay = 0 Nick = johntron ''; - description = '' + description = lib.mdDoc '' Extra config for the network. Consider using - instead. + {option}`services.znc.config` instead. ''; }; }; @@ -106,8 +106,7 @@ in options. You can use nix-instantiate --eval --strict '<nixpkgs/nixos>' -A config.services.znc.config to view the current value of the config. - - + In any case, if you need more flexibility, can be used to override/add to all of the legacy options. @@ -137,7 +136,7 @@ in default = "znc"; example = "johntron"; type = types.str; - description = '' + description = lib.mdDoc '' The user name used to log in to the ZNC web admin interface. ''; }; @@ -145,7 +144,7 @@ in networks = mkOption { default = { }; type = with types; attrsOf (submodule networkOpts); - description = '' + description = lib.mdDoc '' IRC networks to connect the user to. ''; example = literalExpression '' @@ -164,7 +163,7 @@ in default = "znc-user"; example = "john"; type = types.str; - description = '' + description = lib.mdDoc '' The IRC nick. ''; }; @@ -190,7 +189,7 @@ in port = mkOption { default = 5000; type = types.int; - description = '' + description = lib.mdDoc '' Specifies the port on which to listen. ''; }; @@ -198,7 +197,7 @@ in useSSL = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Indicates whether the ZNC server should use SSL when listening on the specified port. A self-signed certificate will be generated. ''; @@ -208,7 +207,7 @@ in type = types.nullOr types.str; default = null; example = "/znc/"; - description = '' + description = lib.mdDoc '' An optional URI prefix for the ZNC web interface. Can be used to make ZNC available behind a reverse proxy. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix index 53091d8e2a..8f1c3d9c52 100644 --- a/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix +++ b/third_party/nixpkgs/nixos/modules/services/printing/cupsd.nix @@ -129,7 +129,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable printing support through the CUPS daemon. ''; }; @@ -137,7 +137,7 @@ in startWhenNeeded = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' If set, CUPS is socket-activated; that is, instead of having it permanently running as a daemon, systemd will start it on the first incoming connection. @@ -148,7 +148,7 @@ in type = types.listOf types.str; default = [ "localhost:631" ]; example = [ "*:631" ]; - description = '' + description = lib.mdDoc '' A list of addresses and ports on which to listen. ''; }; @@ -158,7 +158,7 @@ in default = [ "localhost" ]; example = [ "all" ]; apply = concatMapStringsSep "\n" (x: "Allow ${x}"); - description = '' + description = lib.mdDoc '' From which hosts to allow unconditional access. ''; }; @@ -176,7 +176,7 @@ in defaultShared = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Specifies whether local printers are shared by default. ''; }; @@ -184,7 +184,7 @@ in browsing = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Specifies whether shared printers are advertised. ''; }; @@ -192,7 +192,7 @@ in webInterface = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Specifies whether the web interface is enabled. ''; }; @@ -201,7 +201,7 @@ in type = types.str; default = "info"; example = "debug"; - description = '' + description = lib.mdDoc '' Specifies the cupsd logging verbosity. ''; }; @@ -209,9 +209,9 @@ in extraFilesConf = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra contents of the configuration file of the CUPS daemon - (cups-files.conf). + ({file}`cups-files.conf`). ''; }; @@ -223,9 +223,9 @@ in BrowsePoll cups.example.com MaxCopies 42 ''; - description = '' + description = lib.mdDoc '' Extra contents of the configuration file of the CUPS daemon - (cupsd.conf). + ({file}`cupsd.conf`). ''; }; @@ -237,9 +237,9 @@ in ServerName server.example.com Encryption Never ''; - description = '' + description = lib.mdDoc '' The contents of the client configuration. - (client.conf) + ({file}`client.conf`) ''; }; @@ -250,9 +250,9 @@ in '' BrowsePoll cups.example.com ''; - description = '' + description = lib.mdDoc '' The contents of the configuration. file of the CUPS Browsed daemon - (cups-browsed.conf) + ({file}`cups-browsed.conf`) ''; }; @@ -261,8 +261,8 @@ in default = '' Address @LOCAL ''; - description = '' - The contents of /etc/cups/snmp.conf. See "man + description = lib.mdDoc '' + The contents of {file}`/etc/cups/snmp.conf`. See "man cups-snmp.conf" for a complete description. ''; }; @@ -271,12 +271,12 @@ in type = types.listOf types.path; default = []; example = literalExpression "with pkgs; [ gutenprint hplip splix ]"; - description = '' + description = lib.mdDoc '' CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript and Samba are added unconditionally. If this list contains Gutenprint (i.e. a derivation with - meta.isGutenprint = true) the PPD files in - /var/lib/cups/ppd will be updated automatically + `meta.isGutenprint = true`) the PPD files in + {file}`/var/lib/cups/ppd` will be updated automatically to avoid errors due to incompatible versions. ''; }; @@ -285,7 +285,7 @@ in type = types.path; default = "/tmp"; example = "/tmp/cups"; - description = '' + description = lib.mdDoc '' CUPSd temporary directory. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/scheduling/atd.nix b/third_party/nixpkgs/nixos/modules/services/scheduling/atd.nix index 9bb0191ee4..235d4f348e 100644 --- a/third_party/nixpkgs/nixos/modules/services/scheduling/atd.nix +++ b/third_party/nixpkgs/nixos/modules/services/scheduling/atd.nix @@ -19,19 +19,19 @@ in services.atd.enable = mkOption { type = types.bool; default = false; - description = '' - Whether to enable the at daemon, a command scheduler. + description = lib.mdDoc '' + Whether to enable the {command}`at` daemon, a command scheduler. ''; }; services.atd.allowEveryone = mkOption { type = types.bool; default = false; - description = '' - Whether to make /var/spool/at{jobs,spool} + description = lib.mdDoc '' + Whether to make {file}`/var/spool/at{jobs,spool}` writeable by everyone (and sticky). This is normally not - needed since the at commands are - setuid/setgid atd. + needed since the {command}`at` commands are + setuid/setgid `atd`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/scheduling/cron.nix b/third_party/nixpkgs/nixos/modules/services/scheduling/cron.nix index 1fac54003c..6e8fe5d9d0 100644 --- a/third_party/nixpkgs/nixos/modules/services/scheduling/cron.nix +++ b/third_party/nixpkgs/nixos/modules/services/scheduling/cron.nix @@ -40,13 +40,13 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the Vixie cron daemon."; + description = lib.mdDoc "Whether to enable the Vixie cron daemon."; }; mailto = mkOption { type = types.nullOr types.str; default = null; - description = "Email address to which job output will be mailed."; + description = lib.mdDoc "Email address to which job output will be mailed."; }; systemCronJobs = mkOption { @@ -57,11 +57,11 @@ in "* * * * * eelco echo Hello World > /home/eelco/cronout" ] ''; - description = '' + description = lib.mdDoc '' A list of Cron jobs to be appended to the system-wide crontab. See the manual page for crontab for the expected format. If you want to get the results mailed you must setuid - sendmail. See + sendmail. See {option}`security.wrappers` If neither /var/cron/cron.deny nor /var/cron/cron.allow exist only root is allowed to have its own crontab file. The /var/cron/cron.deny file @@ -76,7 +76,7 @@ in cronFiles = mkOption { type = types.listOf types.path; default = []; - description = '' + description = lib.mdDoc '' A list of extra crontab files that will be read and appended to the main crontab file when the cron service starts. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix b/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix index acaa995f73..f1d2f462a7 100644 --- a/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix +++ b/third_party/nixpkgs/nixos/modules/services/scheduling/fcron.nix @@ -40,40 +40,40 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the fcron daemon."; + description = lib.mdDoc "Whether to enable the {command}`fcron` daemon."; }; allow = mkOption { type = types.listOf types.str; default = [ "all" ]; - description = '' + description = lib.mdDoc '' Users allowed to use fcrontab and fcrondyn (one name per - line, all for everyone). + line, `all` for everyone). ''; }; deny = mkOption { type = types.listOf types.str; default = []; - description = "Users forbidden from using fcron."; + description = lib.mdDoc "Users forbidden from using fcron."; }; maxSerialJobs = mkOption { type = types.int; default = 1; - description = "Maximum number of serial jobs which can run simultaneously."; + description = lib.mdDoc "Maximum number of serial jobs which can run simultaneously."; }; queuelen = mkOption { type = types.nullOr types.int; default = null; - description = "Number of jobs the serial queue and the lavg queue can contain."; + description = lib.mdDoc "Number of jobs the serial queue and the lavg queue can contain."; }; systab = mkOption { type = types.lines; default = ""; - description = ''The "system" crontab contents.''; + description = lib.mdDoc ''The "system" crontab contents.''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/search/elasticsearch-curator.nix b/third_party/nixpkgs/nixos/modules/services/search/elasticsearch-curator.nix index bb2612322b..da3b0dc9d7 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/elasticsearch-curator.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/elasticsearch-curator.nix @@ -39,22 +39,22 @@ in { enable = mkEnableOption "elasticsearch curator"; interval = mkOption { - description = "The frequency to run curator, a systemd.time such as 'hourly'"; + description = lib.mdDoc "The frequency to run curator, a systemd.time such as 'hourly'"; default = "hourly"; type = types.str; }; hosts = mkOption { - description = "a list of elasticsearch hosts to connect to"; + description = lib.mdDoc "a list of elasticsearch hosts to connect to"; type = types.listOf types.str; default = ["localhost"]; }; port = mkOption { - description = "the port that elasticsearch is listening on"; + description = lib.mdDoc "the port that elasticsearch is listening on"; type = types.int; default = 9200; }; actionYAML = mkOption { - description = "curator action.yaml file contents, alternatively use curator-cli which takes a simple action command"; + description = lib.mdDoc "curator action.yaml file contents, alternatively use curator-cli which takes a simple action command"; type = types.lines; example = '' --- diff --git a/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix b/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix index 041d0b3c43..4a9dd50310 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/elasticsearch.nix @@ -45,50 +45,50 @@ in options.services.elasticsearch = { enable = mkOption { - description = "Whether to enable elasticsearch."; + description = lib.mdDoc "Whether to enable elasticsearch."; default = false; type = types.bool; }; package = mkOption { - description = "Elasticsearch package to use."; + description = lib.mdDoc "Elasticsearch package to use."; default = pkgs.elasticsearch; defaultText = literalExpression "pkgs.elasticsearch"; type = types.package; }; listenAddress = mkOption { - description = "Elasticsearch listen address."; + description = lib.mdDoc "Elasticsearch listen address."; default = "127.0.0.1"; type = types.str; }; port = mkOption { - description = "Elasticsearch port to listen for HTTP traffic."; + description = lib.mdDoc "Elasticsearch port to listen for HTTP traffic."; default = 9200; type = types.int; }; tcp_port = mkOption { - description = "Elasticsearch port for the node to node communication."; + description = lib.mdDoc "Elasticsearch port for the node to node communication."; default = 9300; type = types.int; }; cluster_name = mkOption { - description = "Elasticsearch name that identifies your cluster for auto-discovery."; + description = lib.mdDoc "Elasticsearch name that identifies your cluster for auto-discovery."; default = "elasticsearch"; type = types.str; }; single_node = mkOption { - description = "Start a single-node cluster"; + description = lib.mdDoc "Start a single-node cluster"; default = true; type = types.bool; }; extraConf = mkOption { - description = "Extra configuration for elasticsearch."; + description = lib.mdDoc "Extra configuration for elasticsearch."; default = ""; type = types.str; example = '' @@ -99,7 +99,7 @@ in }; logging = mkOption { - description = "Elasticsearch logging configuration."; + description = lib.mdDoc "Elasticsearch logging configuration."; default = '' logger.action.name = org.elasticsearch.action logger.action.level = info @@ -118,26 +118,26 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/elasticsearch"; - description = '' + description = lib.mdDoc '' Data directory for elasticsearch. ''; }; extraCmdLineOptions = mkOption { - description = "Extra command line options for the elasticsearch launcher."; + description = lib.mdDoc "Extra command line options for the elasticsearch launcher."; default = [ ]; type = types.listOf types.str; }; extraJavaOptions = mkOption { - description = "Extra command line options for Java."; + description = lib.mdDoc "Extra command line options for Java."; default = [ ]; type = types.listOf types.str; example = [ "-Djava.net.preferIPv4Stack=true" ]; }; plugins = mkOption { - description = "Extra elasticsearch plugins"; + description = lib.mdDoc "Extra elasticsearch plugins"; default = [ ]; type = types.listOf types.package; example = lib.literalExpression "[ pkgs.elasticsearchPlugins.discovery-ec2 ]"; @@ -145,7 +145,7 @@ in restartIfChanged = mkOption { type = types.bool; - description = '' + 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, diff --git a/third_party/nixpkgs/nixos/modules/services/search/hound.nix b/third_party/nixpkgs/nixos/modules/services/search/hound.nix index ef62175b0a..c81ceee546 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/hound.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/hound.nix @@ -8,7 +8,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the hound code search daemon. ''; }; @@ -16,7 +16,7 @@ in { user = mkOption { default = "hound"; type = types.str; - description = '' + description = lib.mdDoc '' User the hound daemon should execute under. ''; }; @@ -24,7 +24,7 @@ in { group = mkOption { default = "hound"; type = types.str; - description = '' + description = lib.mdDoc '' Group the hound daemon should execute under. ''; }; @@ -33,7 +33,7 @@ in { type = types.listOf types.str; default = [ ]; example = [ "dialout" ]; - description = '' + description = lib.mdDoc '' List of extra groups that the "hound" user should be a part of. ''; }; @@ -41,7 +41,7 @@ in { home = mkOption { default = "/var/lib/hound"; type = types.path; - description = '' + description = lib.mdDoc '' The path to use as hound's $HOME. If the default user "hound" is configured then this is the home of the "hound" user. @@ -52,14 +52,14 @@ in { default = pkgs.hound; defaultText = literalExpression "pkgs.hound"; type = types.package; - description = '' + description = lib.mdDoc '' Package for running hound. ''; }; config = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The full configuration of the Hound daemon. Note the dbpath should be an absolute path to a writable location on disk. ''; @@ -82,7 +82,7 @@ in { type = types.str; default = "0.0.0.0:6080"; example = "127.0.0.1:6080 or just :6080"; - description = '' + description = lib.mdDoc '' Listen on this IP:port / :port ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/search/kibana.nix b/third_party/nixpkgs/nixos/modules/services/search/kibana.nix index e4ab85be9e..c945ef4c89 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/kibana.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/kibana.nix @@ -35,50 +35,50 @@ in { enable = mkEnableOption "kibana service"; listenAddress = mkOption { - description = "Kibana listening host"; + description = lib.mdDoc "Kibana listening host"; default = "127.0.0.1"; type = types.str; }; port = mkOption { - description = "Kibana listening port"; + description = lib.mdDoc "Kibana listening port"; default = 5601; type = types.int; }; cert = mkOption { - description = "Kibana ssl certificate."; + description = lib.mdDoc "Kibana ssl certificate."; default = null; type = types.nullOr types.path; }; key = mkOption { - description = "Kibana ssl key."; + description = lib.mdDoc "Kibana ssl key."; default = null; type = types.nullOr types.path; }; index = mkOption { - description = "Elasticsearch index to use for saving kibana config."; + description = lib.mdDoc "Elasticsearch index to use for saving kibana config."; default = ".kibana"; type = types.str; }; defaultAppId = mkOption { - description = "Elasticsearch default application id."; + description = lib.mdDoc "Elasticsearch default application id."; default = "discover"; type = types.str; }; elasticsearch = { url = mkOption { - description = '' + description = lib.mdDoc '' Elasticsearch url. - Defaults to "http://localhost:9200". + Defaults to `"http://localhost:9200"`. Don't set this when using Kibana >= 7.0.0 because it will result in a - configuration error. Use + configuration error. Use {option}`services.kibana.elasticsearch.hosts` instead. ''; default = null; @@ -86,11 +86,11 @@ in { }; hosts = mkOption { - description = '' + description = lib.mdDoc '' The URLs of the Elasticsearch instances to use for all your queries. All nodes listed here must be on the same cluster. - Defaults to [ "http://localhost:9200" ]. + Defaults to `[ "http://localhost:9200" ]`. This option is only valid when using kibana >= 6.6. ''; @@ -99,22 +99,22 @@ in { }; username = mkOption { - description = "Username for elasticsearch basic auth."; + description = lib.mdDoc "Username for elasticsearch basic auth."; default = null; type = types.nullOr types.str; }; password = mkOption { - description = "Password for elasticsearch basic auth."; + description = lib.mdDoc "Password for elasticsearch basic auth."; default = null; type = types.nullOr types.str; }; ca = mkOption { - description = '' + description = lib.mdDoc '' CA file to auth against elasticsearch. - It's recommended to use the option + It's recommended to use the {option}`certificateAuthorities` option when using kibana-5.4 or newer. ''; default = null; @@ -138,33 +138,33 @@ in { }; cert = mkOption { - description = "Certificate file to auth against elasticsearch."; + description = lib.mdDoc "Certificate file to auth against elasticsearch."; default = null; type = types.nullOr types.path; }; key = mkOption { - description = "Key file to auth against elasticsearch."; + description = lib.mdDoc "Key file to auth against elasticsearch."; default = null; type = types.nullOr types.path; }; }; package = mkOption { - description = "Kibana package to use"; + description = lib.mdDoc "Kibana package to use"; default = pkgs.kibana; defaultText = literalExpression "pkgs.kibana"; type = types.package; }; dataDir = mkOption { - description = "Kibana data directory"; + description = lib.mdDoc "Kibana data directory"; default = "/var/lib/kibana"; type = types.path; }; extraConf = mkOption { - description = "Kibana extra configuration"; + description = lib.mdDoc "Kibana extra configuration"; default = {}; type = types.attrs; }; diff --git a/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix b/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix index f6210f6f16..9a03fc1f71 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/meilisearch.nix @@ -19,33 +19,33 @@ in enable = mkEnableOption "MeiliSearch - a RESTful search API"; package = mkOption { - description = "The package to use for meilisearch. Use this if you require specific features to be enabled. The default package has no features."; + description = lib.mdDoc "The package to use for meilisearch. Use this if you require specific features to be enabled. The default package has no features."; default = pkgs.meilisearch; defaultText = "pkgs.meilisearch"; type = types.package; }; listenAddress = mkOption { - description = "MeiliSearch listen address."; + description = lib.mdDoc "MeiliSearch listen address."; default = "127.0.0.1"; type = types.str; }; listenPort = mkOption { - description = "MeiliSearch port to listen on."; + description = lib.mdDoc "MeiliSearch port to listen on."; default = 7700; type = types.port; }; environment = mkOption { - description = "Defines the running environment of MeiliSearch."; + description = lib.mdDoc "Defines the running environment of MeiliSearch."; default = "development"; type = types.enum [ "development" "production" ]; }; # TODO change this to LoadCredentials once possible masterKeyEnvironmentFile = mkOption { - description = '' + description = lib.mdDoc '' Path to file which contains the master key. By doing so, all routes will be protected and will require a key to be accessed. If no master key is provided, all routes can be accessed without requiring any key. @@ -57,7 +57,7 @@ in }; noAnalytics = mkOption { - description = '' + description = lib.mdDoc '' Deactivates analytics. Analytics allow MeiliSearch to know how many users are using MeiliSearch, which versions and which platforms are used. @@ -82,7 +82,7 @@ in }; maxIndexSize = mkOption { - description = '' + description = lib.mdDoc '' Sets the maximum size of the index. Value must be given in bytes or explicitly stating a base unit. For example, the default value can be written as 107374182400, '107.7Gb', or '107374 Mb'. @@ -93,7 +93,7 @@ in }; payloadSizeLimit = mkOption { - description = '' + description = lib.mdDoc '' Sets the maximum size of accepted JSON payloads. Value must be given in bytes or explicitly stating a base unit. For example, the default value can be written as 107374182400, '107.7Gb', or '107374 Mb'. diff --git a/third_party/nixpkgs/nixos/modules/services/search/solr.nix b/third_party/nixpkgs/nixos/modules/services/search/solr.nix index ea76bfc929..ea8a2d6f92 100644 --- a/third_party/nixpkgs/nixos/modules/services/search/solr.nix +++ b/third_party/nixpkgs/nixos/modules/services/search/solr.nix @@ -17,37 +17,37 @@ in type = types.package; default = pkgs.solr; defaultText = literalExpression "pkgs.solr"; - description = "Which Solr package to use."; + description = lib.mdDoc "Which Solr package to use."; }; port = mkOption { type = types.int; default = 8983; - description = "Port on which Solr is ran."; + description = lib.mdDoc "Port on which Solr is ran."; }; stateDir = mkOption { type = types.path; default = "/var/lib/solr"; - description = "The solr home directory containing config, data, and logging files."; + description = lib.mdDoc "The solr home directory containing config, data, and logging files."; }; extraJavaOptions = mkOption { type = types.listOf types.str; default = []; - description = "Extra command line options given to the java process running Solr."; + description = lib.mdDoc "Extra command line options given to the java process running Solr."; }; user = mkOption { type = types.str; default = "solr"; - description = "User under which Solr is ran."; + description = lib.mdDoc "User under which Solr is ran."; }; group = mkOption { type = types.str; default = "solr"; - description = "Group under which Solr is ran."; + description = lib.mdDoc "Group under which Solr is ran."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/aesmd.nix b/third_party/nixpkgs/nixos/modules/services/security/aesmd.nix index 8268b034a1..2f7deb7c84 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/aesmd.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/aesmd.nix @@ -23,23 +23,23 @@ in debug = mkOption { type = types.bool; default = false; - description = "Whether to build the PSW package in debug mode."; + description = lib.mdDoc "Whether to build the PSW package in debug mode."; }; settings = mkOption { - description = "AESM configuration"; + description = lib.mdDoc "AESM configuration"; default = { }; type = types.submodule { options.whitelistUrl = mkOption { type = with types; nullOr str; default = null; example = "http://whitelist.trustedservices.intel.com/SGX/LCWL/Linux/sgx_white_list_cert.bin"; - description = "URL to retrieve authorized Intel SGX enclave signers."; + description = lib.mdDoc "URL to retrieve authorized Intel SGX enclave signers."; }; options.proxy = mkOption { type = with types; nullOr str; default = null; example = "http://proxy_url:1234"; - description = "HTTP network proxy."; + description = lib.mdDoc "HTTP network proxy."; }; options.proxyType = mkOption { type = with types; nullOr (enum [ "default" "direct" "manual" ]); @@ -48,18 +48,18 @@ in if (config.${opt.settings}.proxy != null) then "manual" else null ''; example = "default"; - description = '' - Type of proxy to use. The default uses the system's default proxy. - If direct is given, uses no proxy. - A value of manual uses the proxy from - . + description = lib.mdDoc '' + Type of proxy to use. The `default` uses the system's default proxy. + If `direct` is given, uses no proxy. + A value of `manual` uses the proxy from + {option}`services.aesmd.settings.proxy`. ''; }; options.defaultQuotingType = mkOption { type = with types; nullOr (enum [ "ecdsa_256" "epid_linkable" "epid_unlinkable" ]); default = null; example = "ecdsa_256"; - description = "Attestation quote type."; + description = lib.mdDoc "Attestation quote type."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/certmgr.nix b/third_party/nixpkgs/nixos/modules/services/security/certmgr.nix index d302a4e000..40a566bc96 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/certmgr.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/certmgr.nix @@ -41,37 +41,37 @@ in type = types.package; default = pkgs.certmgr; defaultText = literalExpression "pkgs.certmgr"; - description = "Which certmgr package to use in the service."; + description = lib.mdDoc "Which certmgr package to use in the service."; }; defaultRemote = mkOption { type = types.str; default = "127.0.0.1:8888"; - description = "The default CA host:port to use."; + description = lib.mdDoc "The default CA host:port to use."; }; validMin = mkOption { default = "72h"; type = types.str; - description = "The interval before a certificate expires to start attempting to renew it."; + description = lib.mdDoc "The interval before a certificate expires to start attempting to renew it."; }; renewInterval = mkOption { default = "30m"; type = types.str; - description = "How often to check certificate expirations and how often to update the cert_next_expires metric."; + description = lib.mdDoc "How often to check certificate expirations and how often to update the cert_next_expires metric."; }; metricsAddress = mkOption { default = "127.0.0.1"; type = types.str; - description = "The address for the Prometheus HTTP endpoint."; + description = lib.mdDoc "The address for the Prometheus HTTP endpoint."; }; metricsPort = mkOption { default = 9488; type = types.ints.u16; - description = "The port for the Prometheus HTTP endpoint."; + description = lib.mdDoc "The port for the Prometheus HTTP endpoint."; }; specs = mkOption { @@ -149,9 +149,9 @@ in }; }; })); - description = '' + description = lib.mdDoc '' Certificate specs as described by: - + These will be added to the Nix store, so they will be world readable. ''; }; @@ -159,11 +159,11 @@ in svcManager = mkOption { default = "systemd"; type = types.enum [ "circus" "command" "dummy" "openrc" "systemd" "sysv" ]; - description = '' + description = lib.mdDoc '' This specifies the service manager to use for restarting or reloading services. - See: . + See: . For how to use the "command" service manager in particular, - see: . + see: . ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix b/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix index 6df2343b84..9408a602f1 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/cfssl.nix @@ -26,49 +26,49 @@ in { address = mkOption { default = "127.0.0.1"; type = types.str; - description = "Address to bind."; + description = lib.mdDoc "Address to bind."; }; port = mkOption { default = 8888; type = types.port; - description = "Port to bind."; + description = lib.mdDoc "Port to bind."; }; ca = mkOption { defaultText = literalExpression ''"''${cfg.dataDir}/ca.pem"''; type = types.str; - description = "CA used to sign the new certificate -- accepts '[file:]fname' or 'env:varname'."; + description = lib.mdDoc "CA used to sign the new certificate -- accepts '[file:]fname' or 'env:varname'."; }; caKey = mkOption { defaultText = literalExpression ''"file:''${cfg.dataDir}/ca-key.pem"''; type = types.str; - description = "CA private key -- accepts '[file:]fname' or 'env:varname'."; + description = lib.mdDoc "CA private key -- accepts '[file:]fname' or 'env:varname'."; }; caBundle = mkOption { default = null; type = types.nullOr types.path; - description = "Path to root certificate store."; + description = lib.mdDoc "Path to root certificate store."; }; intBundle = mkOption { default = null; type = types.nullOr types.path; - description = "Path to intermediate certificate store."; + description = lib.mdDoc "Path to intermediate certificate store."; }; intDir = mkOption { default = null; type = types.nullOr types.path; - description = "Intermediates directory."; + description = lib.mdDoc "Intermediates directory."; }; metadata = mkOption { default = null; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Metadata file for root certificate presence. The content of the file is a json dictionary (k,v): each key k is a SHA-1 digest of a root certificate while value v is a list of key @@ -79,79 +79,79 @@ in { remote = mkOption { default = null; type = types.nullOr types.str; - description = "Remote CFSSL server."; + description = lib.mdDoc "Remote CFSSL server."; }; configFile = mkOption { default = null; type = types.nullOr types.str; - description = "Path to configuration file. Do not put this in nix-store as it might contain secrets."; + description = lib.mdDoc "Path to configuration file. Do not put this in nix-store as it might contain secrets."; }; responder = mkOption { default = null; type = types.nullOr types.path; - description = "Certificate for OCSP responder."; + description = lib.mdDoc "Certificate for OCSP responder."; }; responderKey = mkOption { default = null; type = types.nullOr types.str; - description = "Private key for OCSP responder certificate. Do not put this in nix-store."; + description = lib.mdDoc "Private key for OCSP responder certificate. Do not put this in nix-store."; }; tlsKey = mkOption { default = null; type = types.nullOr types.str; - description = "Other endpoint's CA private key. Do not put this in nix-store."; + description = lib.mdDoc "Other endpoint's CA private key. Do not put this in nix-store."; }; tlsCert = mkOption { default = null; type = types.nullOr types.path; - description = "Other endpoint's CA to set up TLS protocol."; + description = lib.mdDoc "Other endpoint's CA to set up TLS protocol."; }; mutualTlsCa = mkOption { default = null; type = types.nullOr types.path; - description = "Mutual TLS - require clients be signed by this CA."; + description = lib.mdDoc "Mutual TLS - require clients be signed by this CA."; }; mutualTlsCn = mkOption { default = null; type = types.nullOr types.str; - description = "Mutual TLS - regex for whitelist of allowed client CNs."; + description = lib.mdDoc "Mutual TLS - regex for whitelist of allowed client CNs."; }; tlsRemoteCa = mkOption { default = null; type = types.nullOr types.path; - description = "CAs to trust for remote TLS requests."; + description = lib.mdDoc "CAs to trust for remote TLS requests."; }; mutualTlsClientCert = mkOption { default = null; type = types.nullOr types.path; - description = "Mutual TLS - client certificate to call remote instance requiring client certs."; + description = lib.mdDoc "Mutual TLS - client certificate to call remote instance requiring client certs."; }; mutualTlsClientKey = mkOption { default = null; type = types.nullOr types.path; - description = "Mutual TLS - client key to call remote instance requiring client certs. Do not put this in nix-store."; + description = lib.mdDoc "Mutual TLS - client key to call remote instance requiring client certs. Do not put this in nix-store."; }; dbConfig = mkOption { default = null; type = types.nullOr types.path; - description = "Certificate db configuration file. Path must be writeable."; + description = lib.mdDoc "Certificate db configuration file. Path must be writeable."; }; logLevel = mkOption { default = 1; type = types.enum [ 0 1 2 3 4 5 ]; - description = "Log level (0 = DEBUG, 5 = FATAL)."; + description = lib.mdDoc "Log level (0 = DEBUG, 5 = FATAL)."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/clamav.nix b/third_party/nixpkgs/nixos/modules/services/security/clamav.nix index 95a0ad8770..1b1194d311 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/clamav.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/clamav.nix @@ -31,8 +31,8 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); default = { }; - description = '' - ClamAV configuration. Refer to , + description = lib.mdDoc '' + ClamAV configuration. Refer to , for details on supported values. ''; }; @@ -43,7 +43,7 @@ in frequency = mkOption { type = types.int; default = 12; - description = '' + description = lib.mdDoc '' Number of database checks per day. ''; }; @@ -51,7 +51,7 @@ in interval = mkOption { type = types.str; default = "hourly"; - description = '' + description = lib.mdDoc '' How often freshclam is invoked. See systemd.time(7) for more information about the format. ''; @@ -60,8 +60,8 @@ in settings = mkOption { type = with types; attrsOf (oneOf [ bool int str (listOf str) ]); default = { }; - description = '' - freshclam configuration. Refer to , + description = lib.mdDoc '' + freshclam configuration. Refer to , for details on supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix index 67e1026dce..24c84151bc 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/fail2ban.nix @@ -45,10 +45,10 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable the fail2ban service. - See the documentation of + See the documentation of {option}`services.fail2ban.jails` for what jails are enabled by default. ''; }; @@ -58,7 +58,7 @@ in defaultText = literalExpression "pkgs.fail2ban"; type = types.package; example = literalExpression "pkgs.fail2ban_0_11"; - description = "The fail2ban package to use for running the fail2ban service."; + description = lib.mdDoc "The fail2ban package to use for running the fail2ban service."; }; packageFirewall = mkOption { @@ -66,7 +66,7 @@ in defaultText = literalExpression "pkgs.iptables"; type = types.package; example = literalExpression "pkgs.nftables"; - description = "The firewall package used by fail2ban service."; + description = lib.mdDoc "The firewall package used by fail2ban service."; }; extraPackages = mkOption { @@ -82,14 +82,14 @@ in maxretry = mkOption { default = 3; type = types.ints.unsigned; - description = "Number of failures before a host gets banned."; + description = lib.mdDoc "Number of failures before a host gets banned."; }; banaction = mkOption { default = "iptables-multiport"; type = types.str; example = "nftables-multiport"; - description = '' + description = lib.mdDoc '' Default banning action (e.g. iptables, iptables-new, iptables-multiport, shorewall, etc) It is used to define action_* variables. Can be overridden globally or per section within jail.local file @@ -100,7 +100,7 @@ in default = "iptables-allport"; type = types.str; example = "nftables-allport"; - description = '' + description = lib.mdDoc '' Default banning action (e.g. iptables, iptables-new, iptables-multiport, shorewall, etc) It is used to define action_* variables. Can be overridden globally or per section within jail.local file @@ -110,7 +110,7 @@ in bantime-increment.enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Allows to use database for searching of previously banned ip's to increase a default ban time using special formula, default it is banTime * 1, 2, 4, 8, 16, 32... ''; @@ -120,7 +120,7 @@ in default = "4m"; type = types.str; example = "8m"; - description = '' + description = lib.mdDoc '' "bantime-increment.rndtime" is the max number of seconds using for mixing with random time to prevent "clever" botnets calculate exact time IP can be unbanned again ''; @@ -130,7 +130,7 @@ in default = "10h"; type = types.str; example = "48h"; - description = '' + description = lib.mdDoc '' "bantime-increment.maxtime" is the max number of seconds using the ban time can reach (don't grows further) ''; }; @@ -139,7 +139,7 @@ in default = "1"; type = types.str; example = "4"; - description = '' + description = lib.mdDoc '' "bantime-increment.factor" is a coefficient to calculate exponent growing of the formula or common multiplier, default value of factor is 1 and with default value of formula, the ban time grows by 1, 2, 4, 8, 16 ... ''; @@ -149,7 +149,7 @@ in default = "ban.Time * (1<<(ban.Count if ban.Count<20 else 20)) * banFactor"; type = types.str; example = "ban.Time * math.exp(float(ban.Count+1)*banFactor)/math.exp(1*banFactor)"; - description = '' + description = lib.mdDoc '' "bantime-increment.formula" used by default to calculate next value of ban time, default value bellow, the same ban time growing will be reached by multipliers 1, 2, 4, 8, 16, 32... ''; @@ -159,7 +159,7 @@ in default = "1 2 4 8 16 32 64"; type = types.str; example = "2 4 16 128"; - description = '' + description = lib.mdDoc '' "bantime-increment.multipliers" used to calculate next value of ban time instead of formula, coresponding previously ban count and given "bantime.factor" (for multipliers default is 1); following example grows ban time by 1, 2, 4, 8, 16 ... and if last ban count greater as multipliers count, @@ -171,7 +171,7 @@ in default = false; type = types.bool; example = true; - description = '' + description = lib.mdDoc '' "bantime-increment.overalljails" (if true) specifies the search of IP in the database will be executed cross over all jails, if false (dafault), only current jail of the ban IP will be searched ''; @@ -181,7 +181,7 @@ in default = [ ]; type = types.listOf types.str; example = [ "192.168.0.0/16" "2001:DB8::42" ]; - description = '' + description = lib.mdDoc '' "ignoreIP" can be a list of IP addresses, CIDR masks or DNS hosts. Fail2ban will not ban a host which matches an address in this list. Several addresses can be defined using space (and/or comma) separator. ''; @@ -196,7 +196,7 @@ in dbfile = /var/lib/fail2ban/fail2ban.sqlite3 ''; type = types.lines; - description = '' + description = lib.mdDoc '' The contents of Fail2ban's main configuration file. It's generally not necessary to change it. ''; @@ -219,22 +219,22 @@ in } ''; type = types.attrsOf types.lines; - description = '' + description = lib.mdDoc '' The configuration of each Fail2ban “jail”. A jail consists of an action (such as blocking a port using - iptables) that is triggered when a + {command}`iptables`) that is triggered when a filter applied to a log file triggers more than a certain number of times in a certain time period. Actions are - defined in /etc/fail2ban/action.d, + defined in {file}`/etc/fail2ban/action.d`, while filters are defined in - /etc/fail2ban/filter.d. + {file}`/etc/fail2ban/filter.d`. - NixOS comes with a default sshd jail; + NixOS comes with a default `sshd` jail; for it to work well, - should be set to - "VERBOSE" or higher so that fail2ban + {option}`services.openssh.logLevel` should be set to + `"VERBOSE"` or higher so that fail2ban can observe failed login attempts. - This module sets it to "VERBOSE" if + This module sets it to `"VERBOSE"` if not set otherwise, so enabling fail2ban can make SSH logs more verbose. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix b/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix index 87c3f1f6f9..45b370009c 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/fprintd.nix @@ -24,7 +24,7 @@ in type = types.package; default = fprintdPkg; defaultText = literalExpression "if config.services.fprintd.tod.enable then pkgs.fprintd-tod else pkgs.fprintd"; - description = '' + description = lib.mdDoc '' fprintd package to use. ''; }; @@ -36,7 +36,7 @@ in driver = mkOption { type = types.package; example = literalExpression "pkgs.libfprint-2-tod1-goodix"; - description = '' + description = lib.mdDoc '' Touch OEM Drivers (TOD) package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/haka.nix b/third_party/nixpkgs/nixos/modules/services/security/haka.nix index 2cfc05f303..10b7cef54d 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/haka.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/haka.nix @@ -70,7 +70,7 @@ in default = "empty.lua"; example = "/srv/haka/myfilter.lua"; type = types.str; - description = '' + description = lib.mdDoc '' Specify which configuration file Haka uses. It can be absolute path or a path relative to the sample directory of the haka git repo. @@ -81,7 +81,7 @@ in default = [ "eth0" ]; example = [ "any" ]; type = with types; listOf str; - description = '' + description = lib.mdDoc '' Specify which interface(s) Haka listens to. Use 'any' to listen to all interfaces. ''; @@ -91,7 +91,7 @@ in default = 0; example = 4; type = types.int; - description = '' + description = lib.mdDoc '' The number of threads that will be used. All system threads are used by default. ''; @@ -100,7 +100,7 @@ in pcap = mkOption { default = true; type = types.bool; - description = "Whether to enable pcap"; + description = lib.mdDoc "Whether to enable pcap"; }; nfqueue = mkEnableOption "nfqueue"; @@ -110,14 +110,14 @@ in default = "/tmp/input.pcap"; example = "/path/to/file.pcap"; type = types.path; - description = "Path to file where incoming packets are dumped"; + description = lib.mdDoc "Path to file where incoming packets are dumped"; }; dump.output = mkOption { default = "/tmp/output.pcap"; example = "/path/to/file.pcap"; type = types.path; - description = "Path to file where outgoing packets are dumped"; + description = lib.mdDoc "Path to file where outgoing packets are dumped"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/haveged.nix b/third_party/nixpkgs/nixos/modules/services/security/haveged.nix index 57cef7e44d..c65d5ab292 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/haveged.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/haveged.nix @@ -24,7 +24,7 @@ in refill_threshold = mkOption { type = types.int; default = 1024; - description = '' + description = lib.mdDoc '' The number of bits of available entropy beneath which haveged should refill the entropy pool. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/hockeypuck.nix b/third_party/nixpkgs/nixos/modules/services/security/hockeypuck.nix index d0e152934f..6fdad13f25 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/hockeypuck.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/hockeypuck.nix @@ -12,7 +12,7 @@ in { port = lib.mkOption { default = 11371; type = lib.types.port; - description = "HKP port to listen on."; + description = lib.mdDoc "HKP port to listen on."; }; settings = lib.mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix b/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix index e29267e500..666d95b9b9 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix @@ -14,19 +14,19 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the Hologram agent for AWS instance credentials"; + description = lib.mdDoc "Whether to enable the Hologram agent for AWS instance credentials"; }; dialAddress = mkOption { type = types.str; default = "localhost:3100"; - description = "Hologram server and port."; + description = lib.mdDoc "Hologram server and port."; }; httpPort = mkOption { type = types.str; default = "80"; - description = "Port for metadata service to listen on."; + description = lib.mdDoc "Port for metadata service to listen on."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/hologram-server.nix b/third_party/nixpkgs/nixos/modules/services/security/hologram-server.nix index 4acf6ae0e2..e995bc79b1 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/hologram-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/hologram-server.nix @@ -33,85 +33,85 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the Hologram server for AWS instance credentials"; + description = lib.mdDoc "Whether to enable the Hologram server for AWS instance credentials"; }; listenAddress = mkOption { type = types.str; default = "0.0.0.0:3100"; - description = "Address and port to listen on"; + description = lib.mdDoc "Address and port to listen on"; }; ldapHost = mkOption { type = types.str; - description = "Address of the LDAP server to use"; + description = lib.mdDoc "Address of the LDAP server to use"; }; ldapInsecure = mkOption { type = types.bool; default = false; - description = "Whether to connect to LDAP over SSL or not"; + description = lib.mdDoc "Whether to connect to LDAP over SSL or not"; }; ldapUserAttr = mkOption { type = types.str; default = "cn"; - description = "The LDAP attribute for usernames"; + description = lib.mdDoc "The LDAP attribute for usernames"; }; ldapBaseDN = mkOption { type = types.str; - description = "The base DN for your Hologram users"; + description = lib.mdDoc "The base DN for your Hologram users"; }; ldapBindDN = mkOption { type = types.str; - description = "DN of account to use to query the LDAP server"; + description = lib.mdDoc "DN of account to use to query the LDAP server"; }; ldapBindPassword = mkOption { type = types.str; - description = "Password of account to use to query the LDAP server"; + description = lib.mdDoc "Password of account to use to query the LDAP server"; }; enableLdapRoles = mkOption { type = types.bool; default = false; - description = "Whether to assign user roles based on the user's LDAP group memberships"; + description = lib.mdDoc "Whether to assign user roles based on the user's LDAP group memberships"; }; groupClassAttr = mkOption { type = types.str; default = "groupOfNames"; - description = "The objectclass attribute to search for groups when enableLdapRoles is true"; + description = lib.mdDoc "The objectclass attribute to search for groups when enableLdapRoles is true"; }; roleAttr = mkOption { type = types.str; default = "businessCategory"; - description = "Which LDAP group attribute to search for authorized role ARNs"; + description = lib.mdDoc "Which LDAP group attribute to search for authorized role ARNs"; }; awsAccount = mkOption { type = types.str; - description = "AWS account number"; + description = lib.mdDoc "AWS account number"; }; awsDefaultRole = mkOption { type = types.str; - description = "AWS default role"; + description = lib.mdDoc "AWS default role"; }; statsAddress = mkOption { type = types.str; default = ""; - description = "Address of statsd server"; + description = lib.mdDoc "Address of statsd server"; }; cacheTimeoutSeconds = mkOption { type = types.int; default = 3600; - description = "How often (in seconds) to refresh the LDAP cache"; + description = lib.mdDoc "How often (in seconds) to refresh the LDAP cache"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix index a7c51b9a87..6429273705 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/kanidm.nix @@ -63,60 +63,60 @@ in options = { bindaddress = lib.mkOption { - description = "Address/port combination the webserver binds to."; + description = lib.mdDoc "Address/port combination the webserver binds to."; example = "[::1]:8443"; type = lib.types.str; }; # Should be optional but toml does not accept null ldapbindaddress = lib.mkOption { - description = '' - Address and port the LDAP server is bound to. Setting this to null disables the LDAP interface. + description = lib.mdDoc '' + Address and port the LDAP server is bound to. Setting this to `null` disables the LDAP interface. ''; example = "[::1]:636"; default = null; type = lib.types.nullOr lib.types.str; }; origin = lib.mkOption { - description = "The origin of your Kanidm instance. Must have https as protocol."; + description = lib.mdDoc "The origin of your Kanidm instance. Must have https as protocol."; example = "https://idm.example.org"; type = lib.types.strMatching "^https://.*"; }; domain = lib.mkOption { - description = '' - The domain that Kanidm manages. Must be below or equal to the domain - specified in serverSettings.origin. - This can be left at null, only if your instance has the role ReadOnlyReplica. + description = lib.mdDoc '' + The `domain` that Kanidm manages. Must be below or equal to the domain + specified in `serverSettings.origin`. + This can be left at `null`, only if your instance has the role `ReadOnlyReplica`. While it is possible to change the domain later on, it requires extra steps! Please consider the warnings and execute the steps described - in the documentation. + [in the documentation](https://kanidm.github.io/kanidm/stable/administrivia.html#rename-the-domain). ''; example = "example.org"; default = null; type = lib.types.nullOr lib.types.str; }; db_path = lib.mkOption { - description = "Path to Kanidm database."; + description = lib.mdDoc "Path to Kanidm database."; default = "/var/lib/kanidm/kanidm.db"; readOnly = true; type = lib.types.path; }; log_level = lib.mkOption { - description = "Log level of the server."; + description = lib.mdDoc "Log level of the server."; default = "default"; type = lib.types.enum [ "default" "verbose" "perfbasic" "perffull" ]; }; role = lib.mkOption { - description = "The role of this server. This affects the replication relationship and thereby available features."; + description = lib.mdDoc "The role of this server. This affects the replication relationship and thereby available features."; default = "WriteReplica"; type = lib.types.enum [ "WriteReplica" "WriteReplicaNoUI" "ReadOnlyReplica" ]; }; }; }; default = { }; - description = '' + description = lib.mdDoc '' Settings for Kanidm, see - the documentation - and example configuration + [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/server_configuration.md) + and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/server.toml) for possible values. ''; }; @@ -126,15 +126,15 @@ in freeformType = settingsFormat.type; options.uri = lib.mkOption { - description = "Address of the Kanidm server."; + description = lib.mdDoc "Address of the Kanidm server."; example = "http://127.0.0.1:8080"; type = lib.types.str; }; }; - description = '' + description = lib.mdDoc '' Configure Kanidm clients, needed for the PAM daemon. See - the documentation - and example configuration + [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/client_tools.md#kanidm-configuration) + and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/config) for possible values. ''; }; @@ -144,15 +144,15 @@ in freeformType = settingsFormat.type; options.pam_allowed_login_groups = lib.mkOption { - description = "Kanidm groups that are allowed to login using PAM."; + description = lib.mdDoc "Kanidm groups that are allowed to login using PAM."; example = "my_pam_group"; type = lib.types.listOf lib.types.str; }; }; - description = '' + description = lib.mdDoc '' Configure Kanidm unix daemon. - See the documentation - and example configuration + See [the documentation](https://github.com/kanidm/kanidm/blob/master/kanidm_book/src/pam_and_nsswitch.md#the-unix-daemon) + and [example configuration](https://github.com/kanidm/kanidm/blob/master/examples/unixd) for possible values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/munge.nix b/third_party/nixpkgs/nixos/modules/services/security/munge.nix index 8917888647..e2b0921b4b 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/munge.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/munge.nix @@ -20,7 +20,7 @@ in password = mkOption { default = "/etc/munge/munge.key"; type = types.path; - description = '' + description = lib.mdDoc '' The path to a daemon's secret key. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix b/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix index b4de1d36ed..1c23c29781 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/nginx-sso.nix @@ -14,7 +14,7 @@ in { type = types.package; default = pkgs.nginx-sso; defaultText = literalExpression "pkgs.nginx-sso"; - description = '' + description = lib.mdDoc '' The nginx-sso package that should be used. ''; }; @@ -40,9 +40,9 @@ in { }; } ''; - description = '' + description = lib.mdDoc '' nginx-sso configuration - (documentation) + ([documentation](https://github.com/Luzifer/nginx-sso/wiki/Main-Configuration)) as a Nix attribute set. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix index 5c89d58723..8b2c7fa214 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy.nix @@ -92,7 +92,7 @@ in type = types.package; default = pkgs.oauth2-proxy; defaultText = literalExpression "pkgs.oauth2-proxy"; - description = '' + description = lib.mdDoc '' The package that provides oauth2-proxy. ''; }; @@ -118,7 +118,7 @@ in "oidc" ]; default = "google"; - description = '' + description = lib.mdDoc '' OAuth provider. ''; }; @@ -126,14 +126,14 @@ in approvalPrompt = mkOption { type = types.enum ["force" "auto"]; default = "force"; - description = '' + description = lib.mdDoc '' OAuth approval_prompt. ''; }; clientID = mkOption { type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The OAuth Client ID. ''; example = "123456.apps.googleusercontent.com"; @@ -141,7 +141,7 @@ in clientSecret = mkOption { type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The OAuth Client Secret. ''; }; @@ -149,7 +149,7 @@ in skipAuthRegexes = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Skip authentication for requests matching any of these regular expressions. ''; @@ -169,7 +169,7 @@ in addresses = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' Line-separated email addresses that are allowed to authenticate. ''; }; @@ -178,7 +178,7 @@ in loginURL = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Authentication endpoint. You only need to set this if you are using a self-hosted provider (e.g. @@ -191,7 +191,7 @@ in redeemURL = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Token redemption endpoint. You only need to set this if you are using a self-hosted provider (e.g. @@ -204,7 +204,7 @@ in validateURL = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Access token validation endpoint. You only need to set this if you are using a self-hosted provider (e.g. @@ -219,7 +219,7 @@ in # doesn't require it so making it optional. type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The OAuth2 redirect URL. ''; example = "https://internalapp.yourcompany.com/oauth2/callback"; @@ -229,14 +229,14 @@ in tenant = mkOption { type = types.str; default = "common"; - description = '' + description = lib.mdDoc '' Go to a tenant-specific or common (tenant-independent) endpoint. ''; }; resource = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The resource that is protected. ''; }; @@ -245,28 +245,28 @@ in google = { adminEmail = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The Google Admin to impersonate for API calls. Only users with access to the Admin APIs can access the Admin SDK Directory API, thus the service account needs to impersonate one of those users to access the Admin SDK Directory API. - See . + See . ''; }; groups = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Restrict logins to members of these Google groups. ''; }; serviceAccountJSON = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' The path to the service account JSON credentials. ''; }; @@ -276,7 +276,7 @@ in org = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Restrict logins to members of this organisation. ''; }; @@ -284,7 +284,7 @@ in team = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Restrict logins to members of this team. ''; }; @@ -296,8 +296,8 @@ in upstream = mkOption { type = with types; coercedTo str (x: [x]) (listOf str); default = []; - description = '' - The http url(s) of the upstream endpoint or file:// + description = lib.mdDoc '' + The http url(s) of the upstream endpoint or `file://` paths for static files. Routing is based on the path. ''; }; @@ -305,7 +305,7 @@ in passAccessToken = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Pass OAuth access_token to upstream via X-Forwarded-Access-Token header. ''; }; @@ -313,7 +313,7 @@ in passBasicAuth = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Pass HTTP Basic Auth, X-Forwarded-User and X-Forwarded-Email information to upstream. ''; }; @@ -321,7 +321,7 @@ in basicAuthPassword = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The password to set when passing the HTTP Basic Auth header. ''; }; @@ -329,7 +329,7 @@ in passHostHeader = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Pass the request Host Header to upstream. ''; }; @@ -337,7 +337,7 @@ in signatureKey = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' GAP-Signature request signature key. ''; example = "sha1:secret0"; @@ -358,7 +358,7 @@ in expire = mkOption { type = types.str; default = "168h0m0s"; - description = '' + description = lib.mdDoc '' Expire timeframe for cookie. ''; }; @@ -366,7 +366,7 @@ in httpOnly = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Set HttpOnly cookie flag. ''; }; @@ -374,7 +374,7 @@ in name = mkOption { type = types.str; default = "_oauth2_proxy"; - description = '' + description = lib.mdDoc '' The name of the cookie that the oauth_proxy creates. ''; }; @@ -383,7 +383,7 @@ in # XXX: Unclear what the behavior is when this is not specified. type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Refresh the cookie after this duration; 0 to disable. ''; example = "168h0m0s"; @@ -391,7 +391,7 @@ in secret = mkOption { type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The seed string for secure cookies. ''; }; @@ -399,7 +399,7 @@ in secure = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Set secure (HTTPS) cookie flag. ''; }; @@ -411,10 +411,10 @@ in httpAddress = mkOption { type = types.str; default = "http://127.0.0.1:4180"; - description = '' + description = lib.mdDoc '' HTTPS listening address. This module does not expose the port by default. If you want this URL to be accessible to other machines, please - add the port to networking.firewall.allowedTCPPorts. + add the port to `networking.firewall.allowedTCPPorts`. ''; }; @@ -422,16 +422,16 @@ in file = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Additionally authenticate against a htpasswd file. Entries must be - created with htpasswd -s for SHA encryption. + created with `htpasswd -s` for SHA encryption. ''; }; displayForm = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Display username / password login form if an htpasswd file is provided. ''; }; @@ -440,7 +440,7 @@ in customTemplatesDir = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to custom HTML templates. ''; }; @@ -448,9 +448,9 @@ in reverseProxy = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' In case when running behind a reverse proxy, controls whether headers - like X-Real-Ip are accepted. Usage behind a reverse + like `X-Real-Ip` are accepted. Usage behind a reverse proxy will require this flag to be set to avoid logging the reverse proxy IP address. ''; @@ -459,7 +459,7 @@ in proxyPrefix = mkOption { type = types.str; default = "/oauth2"; - description = '' + description = lib.mdDoc '' The url root path that this proxy should be nested under. ''; }; @@ -468,21 +468,21 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to serve over TLS. ''; }; certificate = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to certificate file. ''; }; key = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to private key file. ''; }; @@ -490,11 +490,11 @@ in httpsAddress = mkOption { type = types.str; default = ":443"; - description = '' - addr:port to listen on for HTTPS clients. + description = lib.mdDoc '' + `addr:port` to listen on for HTTPS clients. - Remember to add port to - allowedTCPPorts if you want other machines to be + Remember to add `port` to + `allowedTCPPorts` if you want other machines to be able to connect to it. ''; }; @@ -503,7 +503,7 @@ in requestLogging = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Log requests to stdout. ''; }; @@ -517,7 +517,7 @@ in # doesn't require it so making it optional. type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' OAuth scope specification. ''; }; @@ -525,7 +525,7 @@ in profileURL = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Profile access endpoint. ''; }; @@ -533,7 +533,7 @@ in setXauthrequest = mkOption { type = types.nullOr types.bool; default = false; - description = '' + description = lib.mdDoc '' Set X-Auth-Request-User and X-Auth-Request-Email response headers (useful in Nginx auth_request mode). Setting this to 'null' means using the upstream default (false). ''; }; @@ -541,7 +541,7 @@ in extraConfig = mkOption { default = {}; type = types.attrsOf types.anything; - description = '' + description = lib.mdDoc '' Extra config to pass to oauth2-proxy. ''; }; @@ -549,7 +549,7 @@ in keyFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' oauth2-proxy allows passing sensitive configuration via environment variables. Make a file that contains lines like OAUTH2_PROXY_CLIENT_SECRET=asdfasdfasdf.apps.googleuserscontent.com diff --git a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix index 5853c5a123..b8e45f67cf 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/oauth2_proxy_nginx.nix @@ -9,14 +9,14 @@ in type = types.str; default = config.services.oauth2_proxy.httpAddress; defaultText = literalExpression "config.services.oauth2_proxy.httpAddress"; - description = '' + description = lib.mdDoc '' The address of the reverse proxy endpoint for oauth2_proxy ''; }; virtualHosts = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' A list of nginx virtual hosts to put behind the oauth2 proxy ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix b/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix index f9b4985e19..4558236339 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/opensnitch.nix @@ -18,7 +18,7 @@ in { Address = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Unix socket path (unix:///tmp/osui.sock, the "unix:///" part is mandatory) or TCP socket (192.168.1.100:50051). ''; @@ -26,7 +26,7 @@ in { LogFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' File to write logs to (use /dev/stdout to write logs to standard output). ''; @@ -36,7 +36,7 @@ in { DefaultAction = mkOption { type = types.enum [ "allow" "deny" ]; - description = '' + description = lib.mdDoc '' Default action whether to block or allow application internet access. ''; @@ -46,28 +46,28 @@ in { type = types.enum [ "once" "always" "until restart" "30s" "5m" "15m" "30m" "1h" ]; - description = '' + description = lib.mdDoc '' Default duration of firewall rule. ''; }; InterceptUnknown = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Wheter to intercept spare connections. ''; }; ProcMonitorMethod = mkOption { type = types.enum [ "ebpf" "proc" "ftrace" "audit" ]; - description = '' + description = lib.mdDoc '' Which process monitoring method to use. ''; }; LogLevel = mkOption { type = types.enum [ 0 1 2 3 4 ]; - description = '' + description = lib.mdDoc '' Default log level from 0 to 4 (debug, info, important, warning, error). ''; @@ -75,7 +75,7 @@ in { Firewall = mkOption { type = types.enum [ "iptables" "nftables" ]; - description = '' + description = lib.mdDoc '' Which firewall backend to use. ''; }; @@ -84,14 +84,14 @@ in { MaxEvents = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' Max events to send to the GUI. ''; }; MaxStats = mkOption { type = types.int; - description = '' + description = lib.mdDoc '' Max stats per item to keep in backlog. ''; }; @@ -99,9 +99,9 @@ in { }; }; }; - description = '' + description = lib.mdDoc '' opensnitchd configuration. Refer to - + for details on supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/pass-secret-service.nix b/third_party/nixpkgs/nixos/modules/services/security/pass-secret-service.nix index 6ae190eb95..611cea48ee 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/pass-secret-service.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/pass-secret-service.nix @@ -13,7 +13,7 @@ in type = types.package; default = pkgs.pass-secret-service; defaultText = literalExpression "pkgs.pass-secret-service"; - description = "Which pass-secret-service package to use."; + description = lib.mdDoc "Which pass-secret-service package to use."; example = literalExpression "pkgs.pass-secret-service.override { python3 = pkgs.python310 }"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/physlock.nix b/third_party/nixpkgs/nixos/modules/services/security/physlock.nix index 760e80f147..3db9e0ac44 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/physlock.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/physlock.nix @@ -17,15 +17,15 @@ in enable = mkOption { type = types.bool; default = false; - description = '' - Whether to enable the physlock screen locking mechanism. + description = lib.mdDoc '' + Whether to enable the {command}`physlock` screen locking mechanism. - Enable this and then run systemctl start physlock + Enable this and then run {command}`systemctl start physlock` to securely lock the screen. This will switch to a new virtual terminal, turn off console switching and disable SysRq mechanism (when - is set) + {option}`services.physlock.disableSysRq` is set) until the root or user password is given. ''; }; @@ -33,7 +33,7 @@ in allowAnyUser = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to allow any user to lock the screen. This will install a setuid wrapper to allow any user to start physlock as root, which is a minor security risk. Call the physlock binary to use this instead @@ -44,7 +44,7 @@ in disableSysRq = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to disable SysRq when locked with physlock. ''; }; @@ -52,7 +52,7 @@ in lockMessage = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Message to show on physlock login terminal. ''; }; @@ -62,7 +62,7 @@ in suspend = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to lock screen with physlock just before suspend. ''; }; @@ -70,7 +70,7 @@ in hibernate = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to lock screen with physlock just before hibernate. ''; }; @@ -79,11 +79,11 @@ in type = types.listOf types.str; default = []; example = [ "display-manager.service" ]; - description = '' + description = lib.mdDoc '' Other targets to lock the screen just before. Useful if you want to e.g. both autologin to X11 so that - your ~/.xsession gets executed and + your {file}`~/.xsession` gets executed and still to have the screen locked so that the system can be booted relatively unattended. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix index 13e27f2550..29c499e33a 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix @@ -78,7 +78,7 @@ in using envsubst which is helpful for specifying secrets: - { = "$SECRET"; } + { = "$SECRET"; } The environment-file can now specify the actual secret key: @@ -91,7 +91,7 @@ in stateDir = mkOption { type = types.str; default = "/var/lib/privacyidea"; - description = '' + description = lib.mdDoc '' Directory where all PrivacyIDEA files will be placed by default. ''; }; @@ -99,7 +99,7 @@ in superuserRealm = mkOption { type = types.listOf types.str; default = [ "super" "administrators" ]; - description = '' + description = lib.mdDoc '' The realm where users are allowed to login as administrators. ''; }; @@ -107,7 +107,7 @@ in secretKey = mkOption { type = types.str; example = "t0p s3cr3t"; - description = '' + description = lib.mdDoc '' This is used to encrypt the auth_token. ''; }; @@ -115,7 +115,7 @@ in pepper = mkOption { type = types.str; example = "Never know..."; - description = '' + description = lib.mdDoc '' This is used to encrypt the admin passwords. ''; }; @@ -124,7 +124,7 @@ in type = types.str; default = "${cfg.stateDir}/enckey"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/enckey"''; - description = '' + description = lib.mdDoc '' This is used to encrypt the token data and token passwords ''; }; @@ -133,7 +133,7 @@ in type = types.str; default = "${cfg.stateDir}/private.pem"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/private.pem"''; - description = '' + description = lib.mdDoc '' Private Key for signing the audit log. ''; }; @@ -142,26 +142,26 @@ in type = types.str; default = "${cfg.stateDir}/public.pem"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/public.pem"''; - description = '' + description = lib.mdDoc '' Public key for checking signatures of the audit log. ''; }; adminPasswordFile = mkOption { type = types.path; - description = "File containing password for the admin user"; + description = lib.mdDoc "File containing password for the admin user"; }; adminEmail = mkOption { type = types.str; example = "admin@example.com"; - description = "Mail address for the admin user"; + description = lib.mdDoc "Mail address for the admin user"; }; extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration options for pi.cfg. ''; }; @@ -169,13 +169,13 @@ in user = mkOption { type = types.str; default = "privacyidea"; - description = "User account under which PrivacyIDEA runs."; + description = lib.mdDoc "User account under which PrivacyIDEA runs."; }; group = mkOption { type = types.str; default = "privacyidea"; - description = "Group account under which PrivacyIDEA runs."; + description = lib.mdDoc "Group account under which PrivacyIDEA runs."; }; ldap-proxy = { @@ -184,7 +184,7 @@ in configFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to PrivacyIDEA LDAP Proxy configuration (proxy.ini). ''; }; @@ -192,13 +192,13 @@ in user = mkOption { type = types.str; default = "pi-ldap-proxy"; - description = "User account under which PrivacyIDEA LDAP proxy runs."; + description = lib.mdDoc "User account under which PrivacyIDEA LDAP proxy runs."; }; group = mkOption { type = types.str; default = "pi-ldap-proxy"; - description = "Group account under which PrivacyIDEA LDAP proxy runs."; + description = lib.mdDoc "Group account under which PrivacyIDEA LDAP proxy runs."; }; settings = mkOption { @@ -207,7 +207,7 @@ in description = '' Attribute-set containing the settings for privacyidea-ldap-proxy. It's possible to pass secrets using env-vars as substitutes and - use the option + use the option to inject them via envsubst. ''; }; @@ -215,9 +215,9 @@ in environmentFile = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Environment file containing secrets to be substituted into - . + [](#opt-services.privacyidea.ldap-proxy.settings). ''; }; }; @@ -332,6 +332,7 @@ in [ cfg.ldap-proxy.environmentFile ]; ExecStartPre = "${pkgs.writeShellScript "substitute-secrets-ldap-proxy" '' + umask 0077 ${pkgs.envsubst}/bin/envsubst \ -i ${ldapProxyConfig} \ -o $STATE_DIRECTORY/ldap-proxy.ini diff --git a/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix b/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix index fea2a855e2..6626ea2136 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix @@ -9,31 +9,31 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the shibboleth service"; + description = lib.mdDoc "Whether to enable the shibboleth service"; }; configFile = mkOption { type = types.path; example = literalExpression ''"''${pkgs.shibboleth-sp}/etc/shibboleth/shibboleth2.xml"''; - description = "Path to shibboleth config file"; + description = lib.mdDoc "Path to shibboleth config file"; }; fastcgi.enable = mkOption { type = types.bool; default = false; - description = "Whether to include the shibauthorizer and shibresponder FastCGI processes"; + description = lib.mdDoc "Whether to include the shibauthorizer and shibresponder FastCGI processes"; }; fastcgi.shibAuthorizerPort = mkOption { type = types.int; default = 9100; - description = "Port for shibauthorizer FastCGI proccess to bind to"; + description = lib.mdDoc "Port for shibauthorizer FastCGI proccess to bind to"; }; fastcgi.shibResponderPort = mkOption { type = types.int; default = 9101; - description = "Port for shibauthorizer FastCGI proccess to bind to"; + description = lib.mdDoc "Port for shibauthorizer FastCGI proccess to bind to"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/sks.nix b/third_party/nixpkgs/nixos/modules/services/security/sks.nix index f491159756..e9205e4855 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/sks.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/sks.nix @@ -25,7 +25,7 @@ in { default = pkgs.sks; defaultText = literalExpression "pkgs.sks"; type = types.package; - description = "Which SKS derivation to use."; + description = lib.mdDoc "Which SKS derivation to use."; }; dataDir = mkOption { @@ -35,7 +35,7 @@ in { # TODO: The default might change to "/var/lib/sks" as this is more # common. There's also https://github.com/NixOS/nixpkgs/issues/26256 # and "/var/db" is not FHS compliant (seems to come from BSD). - description = '' + description = lib.mdDoc '' Data directory (-basedir) for SKS, where the database and all configuration files are located (e.g. KDB, PTree, membership and sksconf). @@ -45,7 +45,7 @@ in { extraDbConfig = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Set contents of the files "KDB/DB_CONFIG" and "PTree/DB_CONFIG" within the ''${dataDir} directory. This is used to configure options for the database for the sks key server. @@ -59,7 +59,7 @@ in { hkpAddress = mkOption { default = [ "127.0.0.1" "::1" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Domain names, IPv4 and/or IPv6 addresses to listen on for HKP requests. ''; @@ -68,14 +68,14 @@ in { hkpPort = mkOption { default = 11371; type = types.ints.u16; - description = "HKP port to listen on."; + description = lib.mdDoc "HKP port to listen on."; }; webroot = mkOption { type = types.nullOr types.path; default = "${sksPkg.webSamples}/OpenPKG"; defaultText = literalExpression ''"''${package.webSamples}/OpenPKG"''; - description = '' + description = lib.mdDoc '' Source directory (will be symlinked, if not null) for the files the built-in webserver should serve. SKS (''${pkgs.sks.webSamples}) provides the following examples: "HTML5", "OpenPKG", and "XHTML+ES". diff --git a/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix b/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix index 3be0a8c700..4e9d9571de 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/sshguard.nix @@ -30,13 +30,13 @@ in { enable = mkOption { default = false; type = types.bool; - description = "Whether to enable the sshguard service."; + description = lib.mdDoc "Whether to enable the sshguard service."; }; attack_threshold = mkOption { default = 30; type = types.int; - description = '' + description = lib.mdDoc '' Block attackers when their cumulative attack score exceeds threshold. Most attacks have a score of 10. ''; }; @@ -45,7 +45,7 @@ in { default = null; example = 120; type = types.nullOr types.int; - description = '' + description = lib.mdDoc '' Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file. ''; }; @@ -53,7 +53,7 @@ in { blacklist_file = mkOption { default = "/var/lib/sshguard/blacklist.db"; type = types.path; - description = '' + description = lib.mdDoc '' Blacklist an attacker when its score exceeds threshold. Blacklisted addresses are loaded from and added to blacklist-file. ''; }; @@ -61,7 +61,7 @@ in { blocktime = mkOption { default = 120; type = types.int; - description = '' + description = lib.mdDoc '' Block attackers for initially blocktime seconds after exceeding threshold. Subsequent blocks increase by a factor of 1.5. sshguard unblocks attacks at random intervals, so actual block times will be longer. @@ -71,7 +71,7 @@ in { detection_time = mkOption { default = 1800; type = types.int; - description = '' + description = lib.mdDoc '' Remember potential attackers for up to detection_time seconds before resetting their score. ''; }; @@ -80,7 +80,7 @@ in { default = [ ]; example = [ "198.51.100.56" "198.51.100.2" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Whitelist a list of addresses, hostnames, or address blocks. ''; }; @@ -89,7 +89,7 @@ in { default = [ "sshd" ]; example = [ "sshd" "exim" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Systemd services sshguard should receive logs of. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix b/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix index 95183078d7..1afcf65963 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix @@ -14,30 +14,30 @@ in type = lib.types.package; default = pkgs.step-ca; defaultText = lib.literalExpression "pkgs.step-ca"; - description = "Which step-ca package to use."; + description = lib.mdDoc "Which step-ca package to use."; }; address = lib.mkOption { type = lib.types.str; example = "127.0.0.1"; - description = '' + description = lib.mdDoc '' The address (without port) the certificate authority should listen at. - This combined with overrides . + This combined with {option}`services.step-ca.port` overrides {option}`services.step-ca.settings.address`. ''; }; port = lib.mkOption { type = lib.types.port; example = 8443; - description = '' + description = lib.mdDoc '' The port the certificate authority should listen on. - This combined with overrides . + This combined with {option}`services.step-ca.address` overrides {option}`services.step-ca.settings.address`. ''; }; settings = lib.mkOption { type = with lib.types; attrsOf anything; description = '' Settings that go into ca.json. See - - the step-ca manual for more information. The easiest way to + the step-ca manual + for more information. The easiest way to configure this module would be to run step ca init to generate ca.json and then import it using builtins.fromJSON. diff --git a/third_party/nixpkgs/nixos/modules/services/security/tor.nix b/third_party/nixpkgs/nixos/modules/services/security/tor.nix index a5822c0279..84f577c385 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/tor.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/tor.nix @@ -234,7 +234,7 @@ in type = types.package; default = pkgs.tor; defaultText = literalExpression "pkgs.tor"; - description = "Tor package to use."; + description = lib.mdDoc "Tor package to use."; }; enableGeoIP = mkEnableOption ''use of GeoIP databases. @@ -255,7 +255,7 @@ in type = optionSOCKSPort false; default = {addr = "127.0.0.1"; port = 9050; IsolateDestAddr = true;}; example = {addr = "192.168.0.1"; port = 9090; IsolateDestAddr = true;}; - description = '' + description = lib.mdDoc '' Bind to this address to listen for connections from Socks-speaking applications. ''; @@ -287,7 +287,7 @@ in relay = { enable = mkEnableOption ''relaying of Tor traffic for others. - See + See for details. Setting this to true requires setting @@ -348,7 +348,7 @@ in See - + for more info.
@@ -366,7 +366,7 @@ in Using this option will make Tor advertise your bridge to users through various mechanisms like - , though. + , though. @@ -384,7 +384,7 @@ in - See + See for more info. @@ -419,7 +419,7 @@ in - See + See for more info. @@ -442,20 +442,20 @@ in type = types.attrsOf (types.submodule ({name, config, ...}: { options.path = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path where to store the data files of the hidden service. - If the is null - this defaults to ${stateDir}/onion/$onion, - otherwise to ${runDir}/onion/$onion. + If the {option}`secretKey` is null + this defaults to `${stateDir}/onion/$onion`, + otherwise to `${runDir}/onion/$onion`. ''; }; options.secretKey = mkOption { type = with types; nullOr path; default = null; example = "/run/keys/tor/onion/expyuzz4wqqyqhjn/hs_ed25519_secret_key"; - description = '' + description = lib.mdDoc '' Secret key of the onion service. - If null, Tor reuses any preexisting secret key (in ) + If null, Tor reuses any preexisting secret key (in {option}`path`) or generates a new one. The associated public key and hostname are deterministically regenerated from this file if they do not exist. @@ -468,19 +468,19 @@ in options = { authType = mkOption { type = types.enum [ "basic" "stealth" ]; - description = '' - Either "basic" for a general-purpose authorization protocol - or "stealth" for a less scalable protocol + description = lib.mdDoc '' + Either `"basic"` for a general-purpose authorization protocol + or `"stealth"` for a less scalable protocol that also hides service activity from unauthorized clients. ''; }; clientNames = mkOption { type = with types; nonEmptyListOf (strMatching "[A-Za-z0-9+-_]+"); - description = '' + description = lib.mdDoc '' Only clients that are listed here are authorized to access the hidden service. - Generated authorization data can be found in ${stateDir}/onion/$name/hostname. + Generated authorization data can be found in {file}`${stateDir}/onion/$name/hostname`. Clients need to put this authorization data in their configuration file using - . + [](#opt-services.tor.settings.HidServAuth). ''; }; }; @@ -569,8 +569,8 @@ in }; settings = mkOption { - description = '' - See torrc manual + description = lib.mdDoc '' + See [torrc manual](https://2019.www.torproject.org/docs/tor-manual.html.en) for documentation. ''; default = {}; @@ -716,12 +716,12 @@ in options = { onion = mkOption { type = strMatching "[a-z2-7]{16}\\.onion"; - description = "Onion address."; + description = lib.mdDoc "Onion address."; example = "xxxxxxxxxxxxxxxx.onion"; }; auth = mkOption { type = strMatching "[A-Za-z0-9+/]{22}"; - description = "Authentication cookie."; + description = lib.mdDoc "Authentication cookie."; }; }; }) @@ -783,13 +783,13 @@ in type = with types; nullOr (submodule ({...}: { options = { transports = mkOption { - description = "List of pluggable transports."; + description = lib.mdDoc "List of pluggable transports."; type = listOf str; example = ["obfs2" "obfs3" "obfs4" "scramblesuit"]; }; exec = mkOption { type = types.str; - description = "Command of pluggable transport."; + description = lib.mdDoc "Command of pluggable transport."; }; }; })); diff --git a/third_party/nixpkgs/nixos/modules/services/security/torify.nix b/third_party/nixpkgs/nixos/modules/services/security/torify.nix index 39551190dd..770e445d73 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/torify.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/torify.nix @@ -44,7 +44,7 @@ in type = types.str; default = "localhost:9050"; example = "192.168.0.20"; - description = '' + description = lib.mdDoc '' IP address of TOR client to use. ''; }; @@ -52,7 +52,7 @@ in config = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration. Contents will be added verbatim to TSocks configuration file. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/security/torsocks.nix b/third_party/nixpkgs/nixos/modules/services/security/torsocks.nix index fdd6ac32cc..0647d7eb49 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/torsocks.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/torsocks.nix @@ -38,8 +38,8 @@ in type = types.bool; default = config.services.tor.enable && config.services.tor.client.enable; defaultText = literalExpression "config.services.tor.enable && config.services.tor.client.enable"; - description = '' - Whether to build /etc/tor/torsocks.conf + description = lib.mdDoc '' + Whether to build `/etc/tor/torsocks.conf` containing the specified global torsocks configuration. ''; }; @@ -48,7 +48,7 @@ in type = types.str; default = "127.0.0.1:9050"; example = "192.168.0.20:1234"; - description = '' + description = lib.mdDoc '' IP/Port of the Tor SOCKS server. Currently, hostnames are NOT supported by torsocks. ''; @@ -58,7 +58,7 @@ in type = types.str; default = "127.0.0.1:9063"; example = "192.168.0.20:1234"; - description = '' + description = lib.mdDoc '' IP/Port of the Tor SOCKS server for torsocks-faster wrapper suitable for HTTP. Currently, hostnames are NOT supported by torsocks. ''; @@ -67,7 +67,7 @@ in onionAddrRange = mkOption { type = types.str; default = "127.42.42.0/24"; - description = '' + description = lib.mdDoc '' Tor hidden sites do not have real IP addresses. This specifies what range of IP addresses will be handed to the application as "cookies" for .onion names. Of course, you @@ -81,8 +81,8 @@ in type = types.nullOr types.str; default = null; example = "bob"; - description = '' - SOCKS5 username. The TORSOCKS_USERNAME + description = lib.mdDoc '' + SOCKS5 username. The `TORSOCKS_USERNAME` environment variable overrides this option if it is set. ''; }; @@ -91,8 +91,8 @@ in type = types.nullOr types.str; default = null; example = "sekret"; - description = '' - SOCKS5 password. The TORSOCKS_PASSWORD + description = lib.mdDoc '' + SOCKS5 password. The `TORSOCKS_PASSWORD` environment variable overrides this option if it is set. ''; }; @@ -100,9 +100,9 @@ in allowInbound = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Set Torsocks to accept inbound connections. If set to - true, listen() and accept() will be + `true`, listen() and accept() will be allowed to be used with non localhost address. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix b/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix index 201b37f17b..eb3c335d97 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/usbguard.nix @@ -45,9 +45,9 @@ in type = types.package; default = pkgs.usbguard; defaultText = literalExpression "pkgs.usbguard"; - description = '' + description = lib.mdDoc '' The usbguard package to use. If you do not need the Qt GUI, use - pkgs.usbguard-nox to save disk space. + `pkgs.usbguard-nox` to save disk space. ''; }; @@ -78,7 +78,7 @@ in implictPolicyTarget = mkOption { type = policy; default = "block"; - description = '' + description = lib.mdDoc '' How to treat USB devices that don't match any rule in the policy. Target should be one of allow, block or reject (logically remove the device node from the system). @@ -88,7 +88,7 @@ in presentDevicePolicy = mkOption { type = policy; default = "apply-policy"; - description = '' + description = lib.mdDoc '' How to treat USB devices that are already connected when the daemon starts. Policy should be one of allow, block, reject, keep (keep whatever state the device is currently in) or apply-policy (evaluate @@ -99,7 +99,7 @@ in presentControllerPolicy = mkOption { type = policy; default = "keep"; - description = '' + description = lib.mdDoc '' How to treat USB controller devices that are already connected when the daemon starts. One of allow, block, reject, keep or apply-policy. ''; @@ -108,7 +108,7 @@ in insertedDevicePolicy = mkOption { type = policy; default = "apply-policy"; - description = '' + description = lib.mdDoc '' How to treat USB devices that are already connected after the daemon starts. One of block, reject, apply-policy. ''; @@ -117,7 +117,7 @@ in restoreControllerDeviceState = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' The USBGuard daemon modifies some attributes of controller devices like the default authorization state of new child device instances. Using this setting, you can controll whether the daemon @@ -130,7 +130,7 @@ in type = types.listOf types.str; default = [ "root" ]; example = [ "root" "yourusername" ]; - description = '' + description = lib.mdDoc '' A list of usernames that the daemon will accept IPC connections from. ''; }; @@ -139,7 +139,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "wheel" ]; - description = '' + description = lib.mdDoc '' A list of groupnames that the daemon will accept IPC connections from. ''; @@ -148,7 +148,7 @@ in deviceRulesWithPort = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Generate device specific rules including the "via-port" attribute. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/vault.nix b/third_party/nixpkgs/nixos/modules/services/security/vault.nix index 4942a05fe7..ef98296302 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vault.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vault.nix @@ -49,13 +49,13 @@ in type = types.package; default = pkgs.vault; defaultText = literalExpression "pkgs.vault"; - description = "This option specifies the vault package to use."; + description = lib.mdDoc "This option specifies the vault package to use."; }; dev = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' In this mode, Vault runs in-memory and starts unsealed. This option is not meant production but for development and testing i.e. for nixos tests. ''; }; @@ -63,29 +63,29 @@ in devRootTokenID = mkOption { type = types.str; default = false; - description = '' - Initial root token. This only applies when is true + description = lib.mdDoc '' + Initial root token. This only applies when {option}`services.vault.dev` is true ''; }; address = mkOption { type = types.str; default = "127.0.0.1:8200"; - description = "The name of the ip interface to listen to"; + description = lib.mdDoc "The name of the ip interface to listen to"; }; tlsCertFile = mkOption { type = types.nullOr types.str; default = null; example = "/path/to/your/cert.pem"; - description = "TLS certificate file. TLS will be disabled unless this option is set"; + description = lib.mdDoc "TLS certificate file. TLS will be disabled unless this option is set"; }; tlsKeyFile = mkOption { type = types.nullOr types.str; default = null; example = "/path/to/your/key.pem"; - description = "TLS private key file. TLS will be disabled unless this option is set"; + description = lib.mdDoc "TLS private key file. TLS will be disabled unless this option is set"; }; listenerExtraConfig = mkOption { @@ -93,13 +93,13 @@ in default = '' tls_min_version = "tls12" ''; - description = "Extra text appended to the listener section."; + description = lib.mdDoc "Extra text appended to the listener section."; }; storageBackend = mkOption { type = types.enum [ "inmem" "file" "consul" "zookeeper" "s3" "azure" "dynamodb" "etcd" "mssql" "mysql" "postgresql" "swift" "gcs" "raft" ]; default = "inmem"; - description = "The name of the type of storage backend"; + description = lib.mdDoc "The name of the type of storage backend"; }; storagePath = mkOption { @@ -110,32 +110,32 @@ in then "/var/lib/vault" else null ''; - description = "Data directory for file backend"; + description = lib.mdDoc "Data directory for file backend"; }; storageConfig = mkOption { type = types.nullOr types.lines; default = null; - description = '' + description = lib.mdDoc '' HCL configuration to insert in the storageBackend section. Confidential values should not be specified here because this option's value is written to the Nix store, which is publicly readable. Provide credentials and such in a separate file using - . + [](#opt-services.vault.extraSettingsPaths). ''; }; telemetryConfig = mkOption { type = types.lines; default = ""; - description = "Telemetry configuration"; + description = lib.mdDoc "Telemetry configuration"; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Extra text appended to vault.hcl."; + description = lib.mdDoc "Extra text appended to {file}`vault.hcl`."; }; extraSettingsPaths = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix index 756e0ee93b..1433438ba0 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/vaultwarden/default.nix @@ -44,7 +44,7 @@ in { dbBackend = mkOption { type = enum [ "sqlite" "mysql" "postgresql" ]; default = "sqlite"; - description = '' + description = lib.mdDoc '' Which database backend vaultwarden will be using. ''; }; @@ -52,7 +52,7 @@ in { backupDir = mkOption { type = nullOr str; default = null; - description = '' + description = lib.mdDoc '' The directory under which vaultwarden will backup its persistent data. ''; }; @@ -116,7 +116,7 @@ in { The available configuration options can be found in the environment template file. - See for how + See for how to set up access to the Admin UI to invite initial users. ''; }; @@ -159,14 +159,14 @@ ADMIN_TOKEN=...copy-paste a unique generated secret token here... type = package; default = pkgs.vaultwarden; defaultText = literalExpression "pkgs.vaultwarden"; - description = "Vaultwarden package to use."; + description = lib.mdDoc "Vaultwarden package to use."; }; webVaultPackage = mkOption { type = package; default = pkgs.vaultwarden-vault; defaultText = literalExpression "pkgs.vaultwarden-vault"; - description = "Web vault package to use."; + description = lib.mdDoc "Web vault package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix b/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix index 8be2457e1e..c91ff3e69a 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/yubikey-agent.nix @@ -21,7 +21,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to start yubikey-agent when you log in. Also sets SSH_AUTH_SOCK to point at yubikey-agent. @@ -34,7 +34,7 @@ in type = types.package; default = pkgs.yubikey-agent; defaultText = literalExpression "pkgs.yubikey-agent"; - description = '' + description = lib.mdDoc '' The package used for the yubikey-agent daemon. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix b/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix index ed37c5784c..b730118d46 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/cachix-agent/default.nix @@ -12,34 +12,34 @@ in { name = mkOption { type = types.str; - description = "Agent name, usually same as the hostname"; + description = lib.mdDoc "Agent name, usually same as the hostname"; default = config.networking.hostName; defaultText = "config.networking.hostName"; }; verbose = mkOption { type = types.bool; - description = "Enable verbose output"; + description = lib.mdDoc "Enable verbose output"; default = false; }; profile = mkOption { type = types.nullOr types.str; default = null; - description = "Profile name, defaults to 'system' (NixOS)."; + description = lib.mdDoc "Profile name, defaults to 'system' (NixOS)."; }; package = mkOption { type = types.package; default = pkgs.cachix; defaultText = literalExpression "pkgs.cachix"; - description = "Cachix Client package to use."; + description = lib.mdDoc "Cachix Client package to use."; }; credentialsFile = mkOption { type = types.path; default = "/etc/cachix-agent.token"; - description = '' + description = lib.mdDoc '' Required file that needs to contain CACHIX_AGENT_TOKEN=... ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix b/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix index 8c6a6e294e..111cfa83c2 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/cloud-init.nix @@ -20,7 +20,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the cloud-init service. This services reads configuration metadata in a cloud environment and configures the machine according to this metadata. @@ -55,7 +55,7 @@ in network.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allow the cloud-init service to configure network interfaces through systemd-networkd. ''; @@ -109,7 +109,7 @@ in - final-message - power-state-change ''; - description = "cloud-init configuration."; + description = lib.mdDoc "cloud-init configuration."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/system/dbus.nix b/third_party/nixpkgs/nixos/modules/services/system/dbus.nix index d4cacb8569..def04d944f 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/dbus.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/dbus.nix @@ -38,29 +38,29 @@ in packages = mkOption { type = types.listOf types.path; default = [ ]; - description = '' + description = lib.mdDoc '' Packages whose D-Bus configuration files should be included in the configuration of the D-Bus system-wide or session-wide message bus. Specifically, files in the following directories will be included into their respective DBus configuration paths: - pkg/etc/dbus-1/system.d - pkg/share/dbus-1/system.d - pkg/share/dbus-1/system-services - pkg/etc/dbus-1/session.d - pkg/share/dbus-1/session.d - pkg/share/dbus-1/services + {file}`«pkg»/etc/dbus-1/system.d` + {file}`«pkg»/share/dbus-1/system.d` + {file}`«pkg»/share/dbus-1/system-services` + {file}`«pkg»/etc/dbus-1/session.d` + {file}`«pkg»/share/dbus-1/session.d` + {file}`«pkg»/share/dbus-1/services` ''; }; apparmor = mkOption { type = types.enum [ "enabled" "disabled" "required" ]; - description = '' + description = lib.mdDoc '' AppArmor mode for dbus. - enabled enables mediation when it's - supported in the kernel, disabled + `enabled` enables mediation when it's + supported in the kernel, `disabled` always disables AppArmor even with kernel support, and - required fails when AppArmor was not found + `required` fails when AppArmor was not found in the kernel. ''; default = "disabled"; diff --git a/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix b/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix index 6293585598..b2e2d21002 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/earlyoom.nix @@ -16,55 +16,55 @@ in freeMemThreshold = mkOption { type = types.ints.between 1 100; default = 10; - description = '' + description = lib.mdDoc '' Minimum available memory (in percent). If the available memory falls below this threshold (and the analog is true for - ) the killing begins. + {option}`freeSwapThreshold`) the killing begins. SIGTERM is sent first to the process that uses the most memory; then, if the available - memory falls below (and the analog is true for - ), SIGKILL is sent. + memory falls below {option}`freeMemKillThreshold` (and the analog is true for + {option}`freeSwapKillThreshold`), SIGKILL is sent. - See README for details. + See [README](https://github.com/rfjakob/earlyoom#command-line-options) for details. ''; }; freeMemKillThreshold = mkOption { type = types.nullOr (types.ints.between 1 100); default = null; - description = '' + description = lib.mdDoc '' Minimum available memory (in percent) before sending SIGKILL. - If unset, this defaults to half of . + If unset, this defaults to half of {option}`freeMemThreshold`. - See the description of . + See the description of [](#opt-services.earlyoom.freeMemThreshold). ''; }; freeSwapThreshold = mkOption { type = types.ints.between 1 100; default = 10; - description = '' + description = lib.mdDoc '' Minimum free swap space (in percent) before sending SIGTERM. - See the description of . + See the description of [](#opt-services.earlyoom.freeMemThreshold). ''; }; freeSwapKillThreshold = mkOption { type = types.nullOr (types.ints.between 1 100); default = null; - description = '' + description = lib.mdDoc '' Minimum free swap space (in percent) before sending SIGKILL. - If unset, this defaults to half of . + If unset, this defaults to half of {option}`freeSwapThreshold`. - See the description of . + See the description of [](#opt-services.earlyoom.freeMemThreshold). ''; }; enableDebugInfo = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable debugging messages. ''; }; @@ -95,11 +95,11 @@ in echo "Process $EARLYOOM_NAME ($EARLYOOM_PID) was killed" >> /path/to/log ''' ''; - description = '' + description = lib.mdDoc '' An absolute path to an executable to be run for each process killed. Some environment variables are available, see - README and - the man page + [README](https://github.com/rfjakob/earlyoom#notifications) and + [the man page](https://github.com/rfjakob/earlyoom/blob/master/MANPAGE.md#-n-pathtoscript) for details. ''; }; @@ -108,14 +108,14 @@ in type = types.int; default = 3600; example = 0; - description = "Interval (in seconds) at which a memory report is printed (set to 0 to disable)."; + description = lib.mdDoc "Interval (in seconds) at which a memory report is printed (set to 0 to disable)."; }; extraArgs = mkOption { type = types.listOf types.str; default = []; example = [ "-g" "--prefer '(^|/)(java|chromium)$'" ]; - description = "Extra command-line arguments to be passed to earlyoom."; + description = lib.mdDoc "Extra command-line arguments to be passed to earlyoom."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/system/localtime.nix b/third_party/nixpkgs/nixos/modules/services/system/localtime.nix index 689453375f..c80fe36645 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/localtime.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/localtime.nix @@ -12,8 +12,8 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' - Enable localtimed, a simple daemon for keeping the + description = lib.mdDoc '' + Enable `localtimed`, a simple daemon for keeping the system timezone up-to-date based on the current location. It uses geoclue2 to determine the current location. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/system/saslauthd.nix b/third_party/nixpkgs/nixos/modules/services/system/saslauthd.nix index 466b0ca60a..c3fa7f7aef 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/saslauthd.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/saslauthd.nix @@ -22,19 +22,19 @@ in default = pkgs.cyrus_sasl.bin; defaultText = literalExpression "pkgs.cyrus_sasl.bin"; type = types.package; - description = "Cyrus SASL package to use."; + description = lib.mdDoc "Cyrus SASL package to use."; }; mechanism = mkOption { type = types.str; default = "pam"; - description = "Auth mechanism to use"; + description = lib.mdDoc "Auth mechanism to use"; }; config = mkOption { type = types.lines; default = ""; - description = "Configuration to use for Cyrus SASL authentication daemon."; + description = lib.mdDoc "Configuration to use for Cyrus SASL authentication daemon."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix b/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix index d7130a13c7..ff56206573 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/self-deploy.nix @@ -30,7 +30,7 @@ in default = "/default.nix"; - description = '' + description = lib.mdDoc '' Path to nix file in repository. Leading '/' refers to root of git repository. ''; @@ -88,7 +88,7 @@ in default = null; - description = '' + description = lib.mdDoc '' Path to SSH private key used to fetch private repositories over SSH. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/system/uptimed.nix b/third_party/nixpkgs/nixos/modules/services/system/uptimed.nix index 67a03876e1..df08c0f26e 100644 --- a/third_party/nixpkgs/nixos/modules/services/system/uptimed.nix +++ b/third_party/nixpkgs/nixos/modules/services/system/uptimed.nix @@ -12,8 +12,8 @@ in enable = mkOption { type = types.bool; default = false; - description = '' - Enable uptimed, allowing you to track + description = lib.mdDoc '' + Enable `uptimed`, allowing you to track your highest uptimes. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix b/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix index cb0da9e83b..3f4cd2ff6e 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/deluge.nix @@ -42,7 +42,7 @@ in { openFilesLimit = mkOption { default = openFilesLimit; type = types.either types.int types.str; - description = '' + description = lib.mdDoc '' Number of files to allow deluged to open. ''; }; @@ -60,12 +60,12 @@ in { listen_ports = [ ${toString listenPortsDefault} ]; } ''; - description = '' + description = lib.mdDoc '' Deluge core configuration for the core.conf file. Only has an effect - when is set to - true. String values must be quoted, integer and + when {option}`services.deluge.declarative` is set to + `true`. String values must be quoted, integer and boolean values must not. See - + for the availaible options. ''; }; @@ -73,12 +73,12 @@ in { declarative = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use a declarative deluge configuration. - Only if set to true, the options - , - and - will be + Only if set to `true`, the options + {option}`services.deluge.config`, + {option}`services.deluge.openFirewall` and + {option}`services.deluge.authFile` will be applied. ''; }; @@ -86,15 +86,15 @@ in { openFirewall = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to open the firewall for the ports in - . It only takes effet if - is set to - true. + {option}`services.deluge.config.listen_ports`. It only takes effet if + {option}`services.deluge.declarative` is set to + `true`. It does NOT apply to the daemon port nor the web UI port. To access those ports secuerly check the documentation - + or use a VPN or configure certificates for deluge. ''; }; @@ -102,7 +102,7 @@ in { dataDir = mkOption { type = types.path; default = "/var/lib/deluge"; - description = '' + description = lib.mdDoc '' The directory where deluge will create files. ''; }; @@ -110,13 +110,13 @@ in { authFile = mkOption { type = types.path; example = "/run/keys/deluge-auth"; - description = '' + description = lib.mdDoc '' The file managing the authentication for deluge, the format of this file is straightforward, each line contains a username:password:level tuple in plaintext. It only has an effect - when is set to - true. - See for + when {option}`services.deluge.declarative` is set to + `true`. + See for more informations. ''; }; @@ -124,7 +124,7 @@ in { user = mkOption { type = types.str; default = "deluge"; - description = '' + description = lib.mdDoc '' User account under which deluge runs. ''; }; @@ -132,7 +132,7 @@ in { group = mkOption { type = types.str; default = "deluge"; - description = '' + description = lib.mdDoc '' Group under which deluge runs. ''; }; @@ -140,7 +140,7 @@ in { extraPackages = mkOption { type = types.listOf types.package; default = []; - description = '' + description = lib.mdDoc '' Extra packages available at runtime to enable Deluge's plugins. For example, extraction utilities are required for the built-in "Extractor" plugin. This always contains unzip, gnutar, xz and bzip2. @@ -150,7 +150,7 @@ in { package = mkOption { type = types.package; example = literalExpression "pkgs.deluge-2_x"; - description = '' + description = lib.mdDoc '' Deluge package to use. ''; }; @@ -162,7 +162,7 @@ in { port = mkOption { type = types.port; default = 8112; - description = '' + description = lib.mdDoc '' Deluge web UI port. ''; }; @@ -170,7 +170,7 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for deluge web daemon ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix b/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix index e500e02d86..17d77bfae5 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/flexget.nix @@ -20,34 +20,34 @@ in { default = "deluge"; example = "some_user"; type = types.str; - description = "The user under which to run flexget."; + description = lib.mdDoc "The user under which to run flexget."; }; homeDir = mkOption { default = "/var/lib/deluge"; example = "/home/flexget"; type = types.path; - description = "Where files live."; + description = lib.mdDoc "Where files live."; }; interval = mkOption { default = "10m"; example = "1h"; type = types.str; - description = "When to perform a flexget run. See man 7 systemd.time for the format."; + description = lib.mdDoc "When to perform a {command}`flexget` run. See {command}`man 7 systemd.time` for the format."; }; systemScheduler = mkOption { default = true; example = false; type = types.bool; - description = "When true, execute the runs via the flexget-runner.timer. If false, you have to specify the settings yourself in the YML file."; + description = lib.mdDoc "When true, execute the runs via the flexget-runner.timer. If false, you have to specify the settings yourself in the YML file."; }; config = mkOption { default = ""; type = types.lines; - description = "The YAML configuration for FlexGet."; + description = lib.mdDoc "The YAML configuration for FlexGet."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix b/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix index 3dd7b1ece7..11f1c71e3f 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/magnetico.nix @@ -49,7 +49,7 @@ in { type = types.str; default = "0.0.0.0"; example = "1.2.3.4"; - description = '' + description = lib.mdDoc '' Address to be used for indexing DHT nodes. ''; }; @@ -57,17 +57,17 @@ in { crawler.port = mkOption { type = types.port; default = 0; - description = '' + description = lib.mdDoc '' Port to be used for indexing DHT nodes. This port should be added to - . + {option}`networking.firewall.allowedTCPPorts`. ''; }; crawler.maxNeighbors = mkOption { type = types.ints.positive; default = 1000; - description = '' + description = lib.mdDoc '' Maximum number of simultaneous neighbors of an indexer. Be careful changing this number: high values can very easily cause your network to be congested or even crash @@ -78,7 +78,7 @@ in { crawler.maxLeeches = mkOption { type = types.ints.positive; default = 200; - description = '' + description = lib.mdDoc '' Maximum number of simultaneous leeches. ''; }; @@ -86,7 +86,7 @@ in { crawler.extraOptions = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Extra command line arguments to pass to magneticod. ''; }; @@ -95,7 +95,7 @@ in { type = types.str; default = "localhost"; example = "1.2.3.4"; - description = '' + description = lib.mdDoc '' Address the web interface will listen to. ''; }; @@ -103,7 +103,7 @@ in { web.port = mkOption { type = types.port; default = 8080; - description = '' + description = lib.mdDoc '' Port the web interface will listen to. ''; }; @@ -159,7 +159,7 @@ in { web.extraOptions = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Extra command line arguments to pass to magneticow. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/opentracker.nix b/third_party/nixpkgs/nixos/modules/services/torrent/opentracker.nix index d76d61dfe8..20b3d35a60 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/opentracker.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/opentracker.nix @@ -9,7 +9,7 @@ in { package = mkOption { type = types.package; - description = '' + description = lib.mdDoc '' opentracker package to use ''; default = pkgs.opentracker; @@ -18,7 +18,7 @@ in { extraOptions = mkOption { type = types.separatedString " "; - description = '' + description = lib.mdDoc '' Configuration Arguments for opentracker See https://erdgeist.org/arts/software/opentracker/ for all params ''; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/peerflix.nix b/third_party/nixpkgs/nixos/modules/services/torrent/peerflix.nix index 821c829f6b..ea74d0f8b9 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/peerflix.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/peerflix.nix @@ -19,19 +19,19 @@ in { options.services.peerflix = { enable = mkOption { - description = "Whether to enable peerflix service."; + description = lib.mdDoc "Whether to enable peerflix service."; default = false; type = types.bool; }; stateDir = mkOption { - description = "Peerflix state directory."; + description = lib.mdDoc "Peerflix state directory."; default = "/var/lib/peerflix"; type = types.path; }; downloadDir = mkOption { - description = "Peerflix temporary download directory."; + description = lib.mdDoc "Peerflix temporary download directory."; default = "${cfg.stateDir}/torrents"; defaultText = literalExpression ''"''${config.${opt.stateDir}}/torrents"''; type = types.path; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix b/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix index 759dcfe2e6..a805e09923 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/rtorrent.nix @@ -14,7 +14,7 @@ in { dataDir = mkOption { type = types.str; default = "/var/lib/rtorrent"; - description = '' + description = lib.mdDoc '' The directory where rtorrent stores its data files. ''; }; @@ -23,7 +23,7 @@ in { type = types.str; default = "${cfg.dataDir}/download"; defaultText = literalExpression ''"''${config.${opt.dataDir}}/download"''; - description = '' + description = lib.mdDoc '' Where to put downloaded files. ''; }; @@ -31,7 +31,7 @@ in { user = mkOption { type = types.str; default = "rtorrent"; - description = '' + description = lib.mdDoc '' User account under which rtorrent runs. ''; }; @@ -39,7 +39,7 @@ in { group = mkOption { type = types.str; default = "rtorrent"; - description = '' + description = lib.mdDoc '' Group under which rtorrent runs. ''; }; @@ -48,7 +48,7 @@ in { type = types.package; default = pkgs.rtorrent; defaultText = literalExpression "pkgs.rtorrent"; - description = '' + description = lib.mdDoc '' The rtorrent package to use. ''; }; @@ -56,7 +56,7 @@ in { port = mkOption { type = types.port; default = 50000; - description = '' + description = lib.mdDoc '' The rtorrent port. ''; }; @@ -64,8 +64,8 @@ in { openFirewall = mkOption { type = types.bool; default = false; - description = '' - Whether to open the firewall for the port in . + description = lib.mdDoc '' + Whether to open the firewall for the port in {option}`services.rtorrent.port`. ''; }; @@ -73,7 +73,7 @@ in { type = types.str; readOnly = true; default = "/run/rtorrent/rpc.sock"; - description = '' + description = lib.mdDoc '' RPC socket path. ''; }; @@ -81,8 +81,8 @@ in { configText = mkOption { type = types.lines; default = ""; - description = '' - The content of rtorrent.rc. The modernized configuration template with the values specified in this module will be prepended using mkBefore. You can use mkForce to overwrite the config completly. + description = lib.mdDoc '' + The content of {file}`rtorrent.rc`. The [modernized configuration template](https://rtorrent-docs.readthedocs.io/en/latest/cookbook.html#modernized-configuration-template) with the values specified in this module will be prepended using mkBefore. You can use mkForce to overwrite the config completly. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix index d12d8aa239..6a038dc0a3 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix @@ -34,12 +34,12 @@ in accessible to users in the "transmission" group''; settings = mkOption { - description = '' + description = lib.mdDoc '' Settings whose options overwrite fields in - .config/transmission-daemon/settings.json + `.config/transmission-daemon/settings.json` (each time the service starts). - See Transmission's Wiki + See [Transmission's Wiki](https://github.com/transmission/transmission/wiki/Editing-Configuration-Files) for documentation of settings not explicitely covered by this module. ''; default = {}; @@ -49,19 +49,19 @@ in type = types.path; default = "${cfg.home}/${downloadsDir}"; defaultText = literalExpression ''"''${config.${opt.home}}/${downloadsDir}"''; - description = "Directory where to download torrents."; + description = lib.mdDoc "Directory where to download torrents."; }; options.incomplete-dir = mkOption { type = types.path; default = "${cfg.home}/${incompleteDir}"; defaultText = literalExpression ''"''${config.${opt.home}}/${incompleteDir}"''; - description = '' + description = lib.mdDoc '' When enabled with services.transmission.home - , + [](#opt-services.transmission.settings.incomplete-dir-enabled), new torrents will download the files to this directory. When complete, the files will be moved to download-dir - . + [](#opt-services.transmission.settings.download-dir). ''; }; options.incomplete-dir-enabled = mkOption { @@ -72,33 +72,33 @@ in options.message-level = mkOption { type = types.ints.between 0 3; default = 2; - description = "Set verbosity of transmission messages."; + description = lib.mdDoc "Set verbosity of transmission messages."; }; options.peer-port = mkOption { type = types.port; default = 51413; - description = "The peer port to listen for incoming connections."; + description = lib.mdDoc "The peer port to listen for incoming connections."; }; options.peer-port-random-high = mkOption { type = types.port; default = 65535; - description = '' + description = lib.mdDoc '' The maximum peer port to listen to for incoming connections - when is enabled. + when [](#opt-services.transmission.settings.peer-port-random-on-start) is enabled. ''; }; options.peer-port-random-low = mkOption { type = types.port; default = 65535; - description = '' + description = lib.mdDoc '' The minimal peer port to listen to for incoming connections - when is enabled. + when [](#opt-services.transmission.settings.peer-port-random-on-start) is enabled. ''; }; options.peer-port-random-on-start = mkOption { type = types.bool; default = false; - description = "Randomize the peer port."; + description = lib.mdDoc "Randomize the peer port."; }; options.rpc-bind-address = mkOption { type = types.str; @@ -112,26 +112,26 @@ in options.rpc-port = mkOption { type = types.port; default = 9091; - description = "The RPC port to listen to."; + description = lib.mdDoc "The RPC port to listen to."; }; options.script-torrent-done-enabled = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to run - + [](#opt-services.transmission.settings.script-torrent-done-filename) at torrent completion. ''; }; options.script-torrent-done-filename = mkOption { type = types.nullOr types.path; default = null; - description = "Executable to be run at torrent completion."; + description = lib.mdDoc "Executable to be run at torrent completion."; }; options.umask = mkOption { type = types.int; default = 2; - description = '' + description = lib.mdDoc '' Sets transmission's file mode creation mask. See the umask(2) manpage for more information. Users who want their saved torrents to be world-writable @@ -143,28 +143,28 @@ in options.utp-enabled = mkOption { type = types.bool; default = true; - description = '' - Whether to enable Micro Transport Protocol (µTP). + description = lib.mdDoc '' + Whether to enable [Micro Transport Protocol (µTP)](http://en.wikipedia.org/wiki/Micro_Transport_Protocol). ''; }; options.watch-dir = mkOption { type = types.path; default = "${cfg.home}/${watchDir}"; defaultText = literalExpression ''"''${config.${opt.home}}/${watchDir}"''; - description = "Watch a directory for torrent files and add them to transmission."; + description = lib.mdDoc "Watch a directory for torrent files and add them to transmission."; }; options.watch-dir-enabled = mkOption { type = types.bool; default = false; - description = ''Whether to enable the - . + description = lib.mdDoc ''Whether to enable the + [](#opt-services.transmission.settings.watch-dir). ''; }; options.trash-original-torrent-files = mkOption { type = types.bool; default = false; - description = ''Whether to delete torrents added from the - . + description = lib.mdDoc ''Whether to delete torrents added from the + [](#opt-services.transmission.settings.watch-dir). ''; }; }; @@ -174,47 +174,47 @@ in type = with types; nullOr str; default = null; example = "770"; - description = '' - If not null, is used as the permissions - set by systemd.activationScripts.transmission-daemon - on the directories , - . - and . + description = lib.mdDoc '' + If not `null`, is used as the permissions + set by `systemd.activationScripts.transmission-daemon` + on the directories [](#opt-services.transmission.settings.download-dir), + [](#opt-services.transmission.settings.incomplete-dir). + and [](#opt-services.transmission.settings.watch-dir). Note that you may also want to change - . + [](#opt-services.transmission.settings.umask). ''; }; home = mkOption { type = types.path; default = "/var/lib/transmission"; - description = '' - The directory where Transmission will create ${settingsDir}. - as well as ${downloadsDir}/ unless - is changed, - and ${incompleteDir}/ unless - is changed. + description = lib.mdDoc '' + The directory where Transmission will create `${settingsDir}`. + as well as `${downloadsDir}/` unless + [](#opt-services.transmission.settings.download-dir) is changed, + and `${incompleteDir}/` unless + [](#opt-services.transmission.settings.incomplete-dir) is changed. ''; }; user = mkOption { type = types.str; default = "transmission"; - description = "User account under which Transmission runs."; + description = lib.mdDoc "User account under which Transmission runs."; }; group = mkOption { type = types.str; default = "transmission"; - description = "Group account under which Transmission runs."; + description = lib.mdDoc "Group account under which Transmission runs."; }; credentialsFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to a JSON file to be merged with the settings. Useful to merge a file which is better kept out of the Nix store - to set secret config parameters like rpc-password. + to set secret config parameters like `rpc-password`. ''; default = "/dev/null"; example = "/var/lib/secrets/transmission/settings.json"; @@ -224,7 +224,7 @@ in type = types.listOf types.str; default = []; example = [ "--log-debug" ]; - description = '' + description = lib.mdDoc '' Extra flags passed to the transmission command in the service definition. ''; }; @@ -237,7 +237,7 @@ in to open many more connections at the same time. Note that you may also want to increase - peer-limit-global". + peer-limit-global". And be aware that these settings are quite aggressive and might not suite your regular desktop use. For instance, SSH sessions may time out more easily''; diff --git a/third_party/nixpkgs/nixos/modules/services/tracing/tempo.nix b/third_party/nixpkgs/nixos/modules/services/tracing/tempo.nix index 15491a51c8..201f850656 100644 --- a/third_party/nixpkgs/nixos/modules/services/tracing/tempo.nix +++ b/third_party/nixpkgs/nixos/modules/services/tracing/tempo.nix @@ -13,7 +13,7 @@ in { settings = mkOption { type = settingsFormat.type; default = {}; - description = '' + description = lib.mdDoc '' Specify the configuration for Tempo in Nix. See https://grafana.com/docs/tempo/latest/configuration/ for available options. @@ -23,7 +23,7 @@ in { configFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Specify a path to a configuration file that Tempo should use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix b/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix index 7021a2c80f..e8efe72577 100644 --- a/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix +++ b/third_party/nixpkgs/nixos/modules/services/ttys/getty.nix @@ -34,7 +34,7 @@ in autologinUser = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Username of the account that will be automatically logged in at the console. If unspecified, a login prompt is shown as usual. ''; @@ -44,7 +44,7 @@ in type = types.path; default = "${pkgs.shadow}/bin/login"; defaultText = literalExpression ''"''${pkgs.shadow}/bin/login"''; - description = '' + description = lib.mdDoc '' Path to the login binary executed by agetty. ''; }; @@ -69,7 +69,7 @@ in extraArgs = mkOption { type = types.listOf types.str; default = [ ]; - description = '' + description = lib.mdDoc '' Additional arguments passed to agetty. ''; example = [ "--nohostname" ]; @@ -77,7 +77,7 @@ in greetingLine = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Welcome line printed by agetty. The default shows current NixOS version label, machine type and tty. ''; @@ -86,7 +86,7 @@ in helpLine = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Help line printed by agetty below the welcome line. Used by the installation CD to give some hints on how to proceed. @@ -104,6 +104,7 @@ in # Note: this is set here rather than up there so that changing # nixos.label would not rebuild manual pages services.getty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>''; + services.getty.helpLine = mkIf (config.documentation.nixos.enable && config.documentation.doc.enable) "\nRun 'nixos-help' for the NixOS manual."; systemd.services."getty@" = { serviceConfig.ExecStart = [ diff --git a/third_party/nixpkgs/nixos/modules/services/ttys/gpm.nix b/third_party/nixpkgs/nixos/modules/services/ttys/gpm.nix index 308a6d3643..378f6b1773 100644 --- a/third_party/nixpkgs/nixos/modules/services/ttys/gpm.nix +++ b/third_party/nixpkgs/nixos/modules/services/ttys/gpm.nix @@ -19,7 +19,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable GPM, the General Purpose Mouse daemon, which enables mouse support in virtual consoles. ''; @@ -28,7 +28,7 @@ in protocol = mkOption { type = types.str; default = "ps/2"; - description = "Mouse protocol to use."; + description = lib.mdDoc "Mouse protocol to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix b/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix index e02ab3cb6b..f5a8d8b104 100644 --- a/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix +++ b/third_party/nixpkgs/nixos/modules/services/ttys/kmscon.nix @@ -11,7 +11,7 @@ in { options = { services.kmscon = { enable = mkOption { - description = '' + description = lib.mdDoc '' Use kmscon as the virtual console instead of gettys. kmscon is a kms/dri-based userspace virtual terminal implementation. It supports a richer feature set than the standard linux console VT, @@ -23,33 +23,33 @@ in { }; hwRender = mkOption { - description = "Whether to use 3D hardware acceleration to render the console."; + description = lib.mdDoc "Whether to use 3D hardware acceleration to render the console."; type = types.bool; default = false; }; fonts = mkOption { - description = "Fonts used by kmscon, in order of priority."; + description = lib.mdDoc "Fonts used by kmscon, in order of priority."; default = null; example = lib.literalExpression ''[ { name = "Source Code Pro"; package = pkgs.source-code-pro; } ]''; type = with types; let fontType = submodule { options = { - name = mkOption { type = str; description = "Font name, as used by fontconfig."; }; - package = mkOption { type = package; description = "Package providing the font."; }; + name = mkOption { type = str; description = lib.mdDoc "Font name, as used by fontconfig."; }; + package = mkOption { type = package; description = lib.mdDoc "Package providing the font."; }; }; }; in nullOr (nonEmptyListOf fontType); }; extraConfig = mkOption { - description = "Extra contents of the kmscon.conf file."; + description = lib.mdDoc "Extra contents of the kmscon.conf file."; type = types.lines; default = ""; example = "font-size=14"; }; extraOptions = mkOption { - description = "Extra flags to pass to kmscon."; + description = lib.mdDoc "Extra flags to pass to kmscon."; type = types.separatedString " "; default = ""; example = "--term xterm-256color"; @@ -58,7 +58,7 @@ in { autologinUser = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Username of the account that will be automatically logged in at the console. If unspecified, a login prompt is shown as usual. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix b/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix index 191f6eb52e..51f7138926 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/epgstation/default.nix @@ -84,17 +84,17 @@ in default = pkgs.epgstation; type = lib.types.package; defaultText = lib.literalExpression "pkgs.epgstation"; - description = "epgstation package to use"; + description = lib.mdDoc "epgstation package to use"; }; usePreconfiguredStreaming = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Use preconfigured default streaming options. Upstream defaults: - + ''; }; @@ -118,7 +118,7 @@ in name = lib.mkOption { type = lib.types.str; default = "epgstation"; - description = '' + description = lib.mdDoc '' Name of the MySQL database that holds EPGStation's data. ''; }; @@ -126,9 +126,9 @@ in passwordFile = lib.mkOption { type = lib.types.path; example = "/run/keys/epgstation-db-password"; - description = '' + description = lib.mdDoc '' A file containing the password for the database named - . + {option}`database.name`. ''; }; }; @@ -144,11 +144,11 @@ in # configure them according to their needs. In these cases, the value in the # upstream template configuration should serve as a "good enough" default. settings = lib.mkOption { - description = '' + description = lib.mdDoc '' Options to add to config.yml. Documentation: - + ''; default = { }; @@ -163,7 +163,7 @@ in options.port = lib.mkOption { type = lib.types.port; default = 20772; - description = '' + description = lib.mdDoc '' HTTP port for EPGStation to listen on. ''; }; @@ -172,9 +172,9 @@ in type = lib.types.port; default = cfg.settings.port + 1; defaultText = lib.literalExpression "config.${opt.settings}.port + 1"; - description = '' + description = lib.mdDoc '' Socket.io port for EPGStation to listen on. It is valid to share - ports with . + ports with {option}`${opt.settings}.port`. ''; }; @@ -182,9 +182,9 @@ in type = lib.types.port; default = cfg.settings.socketioPort; defaultText = lib.literalExpression "config.${opt.settings}.socketioPort"; - description = '' + description = lib.mdDoc '' Socket.io port that the web client is going to connect to. This may - be different from if + be different from {option}`${opt.settings}.socketioPort` if EPGStation is hidden behind a reverse proxy. ''; }; @@ -196,13 +196,13 @@ in "http+unix://''${lib.replaceStrings ["/"] ["%2F"] config.${option}}" ''; example = "http://localhost:40772"; - description = "URL to connect to Mirakurun."; + description = lib.mdDoc "URL to connect to Mirakurun."; }; options.encodeProcessNum = lib.mkOption { type = lib.types.ints.positive; default = 4; - description = '' + description = lib.mdDoc '' The maximum number of processes that EPGStation would allow to run at the same time for encoding or streaming videos. ''; @@ -211,7 +211,7 @@ in options.concurrentEncodeNum = lib.mkOption { type = lib.types.ints.positive; default = 1; - description = '' + description = lib.mdDoc '' The maximum number of encoding jobs that EPGStation would run at the same time. ''; @@ -219,7 +219,7 @@ in options.encode = lib.mkOption { type = with lib.types; listOf attrs; - description = "Encoding presets for recorded videos."; + description = lib.mdDoc "Encoding presets for recorded videos."; default = [ { name = "H.264"; diff --git a/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix b/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix index 35303b2332..90119361af 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/mirakurun.nix @@ -29,8 +29,8 @@ in port = mkOption { type = with types; nullOr port; default = 40772; - description = '' - Port to listen on. If null, it won't listen on + description = lib.mdDoc '' + Port to listen on. If `null`, it won't listen on any port. ''; }; @@ -54,8 +54,8 @@ in unixSocket = mkOption { type = with types; nullOr path; default = "/var/run/mirakurun/mirakurun.sock"; - description = '' - Path to unix socket to listen on. If null, it + description = lib.mdDoc '' + Path to unix socket to listen on. If `null`, it won't listen on any unix sockets. ''; }; @@ -63,7 +63,7 @@ in allowSmartCardAccess = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Install polkit rules to allow Mirakurun to access smart card readers which is commonly used along with tuner devices. ''; @@ -78,11 +78,11 @@ in overflowTimeLimit = 30000; }; ''; - description = '' + description = lib.mdDoc '' Options for server.yml. Documentation: - + ''; }; @@ -98,12 +98,12 @@ in } ]; ''; - description = '' + description = lib.mdDoc '' Options which are added to tuners.yml. If none is specified, it will automatically be generated at runtime. Documentation: - + ''; }; @@ -119,12 +119,12 @@ in } ]; ''; - description = '' + description = lib.mdDoc '' Options which are added to channels.yml. If none is specified, it will automatically be generated at runtime. Documentation: - + ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/video/replay-sorcery.nix b/third_party/nixpkgs/nixos/modules/services/video/replay-sorcery.nix index abe7202a4a..f3cecfc248 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/replay-sorcery.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/replay-sorcery.nix @@ -19,13 +19,13 @@ in autoStart = mkOption { type = bool; default = false; - description = "Automatically start ReplaySorcery when graphical-session.target starts."; + description = lib.mdDoc "Automatically start ReplaySorcery when graphical-session.target starts."; }; settings = mkOption { type = attrsOf (oneOf [ str int ]); default = {}; - description = "System-wide configuration for ReplaySorcery (/etc/replay-sorcery.conf)."; + description = lib.mdDoc "System-wide configuration for ReplaySorcery (/etc/replay-sorcery.conf)."; example = literalExpression '' { videoInput = "hwaccel"; # requires `services.replay-sorcery.enableSysAdminCapability = true` diff --git a/third_party/nixpkgs/nixos/modules/services/video/rtsp-simple-server.nix b/third_party/nixpkgs/nixos/modules/services/video/rtsp-simple-server.nix index 644b1945a1..db6f0441bb 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/rtsp-simple-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/rtsp-simple-server.nix @@ -13,9 +13,9 @@ in enable = mkEnableOption "RTSP Simple Server"; settings = mkOption { - description = '' + description = lib.mdDoc '' Settings for rtsp-simple-server. - Read more at + Read more at ''; type = format.type; @@ -40,7 +40,7 @@ in env = mkOption { type = with types; attrsOf anything; - description = "Extra environment variables for RTSP Simple Server"; + description = lib.mdDoc "Extra environment variables for RTSP Simple Server"; default = {}; example = { RTSP_CONFKEY = "mykey"; diff --git a/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix b/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix index 11d9fe3054..fcc3cb02a1 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix +++ b/third_party/nixpkgs/nixos/modules/services/video/unifi-video.nix @@ -98,7 +98,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether or not to enable the unifi-video service. ''; }; @@ -107,7 +107,7 @@ in type = types.package; default = pkgs.jre8; defaultText = literalExpression "pkgs.jre8"; - description = '' + description = lib.mdDoc '' The JRE package to use. Check the release notes to ensure it is supported. ''; }; @@ -116,7 +116,7 @@ in type = types.package; default = pkgs.unifi-video; defaultText = literalExpression "pkgs.unifi-video"; - description = '' + description = lib.mdDoc '' The unifi-video package to use. ''; }; @@ -125,7 +125,7 @@ in type = types.package; default = pkgs.mongodb-4_0; defaultText = literalExpression "pkgs.mongodb"; - description = '' + description = lib.mdDoc '' The mongodb package to use. ''; }; @@ -133,7 +133,7 @@ in logDir = mkOption { type = types.str; default = "${stateDir}/logs"; - description = '' + description = lib.mdDoc '' Where to store the logs. ''; }; @@ -141,7 +141,7 @@ in dataDir = mkOption { type = types.str; default = "${stateDir}/data"; - description = '' + description = lib.mdDoc '' Where to store the database and other data. ''; }; @@ -149,7 +149,7 @@ in openFirewall = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether or not to open the required ports on the firewall. ''; }; @@ -158,7 +158,7 @@ in type = types.nullOr types.int; default = 1024; example = 4096; - description = '' + description = lib.mdDoc '' Set the maximimum heap size for the JVM in MB. ''; }; @@ -167,7 +167,7 @@ in type = types.path; default = "${cfg.dataDir}/unifi-video.pid"; defaultText = literalExpression ''"''${config.${opt.dataDir}}/unifi-video.pid"''; - description = "Location of unifi-video pid file."; + description = lib.mdDoc "Location of unifi-video pid file."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix index b818f5c463..c7accc5f9e 100644 --- a/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix +++ b/third_party/nixpkgs/nixos/modules/services/wayland/cage.nix @@ -10,7 +10,7 @@ in { options.services.cage.user = mkOption { type = types.str; default = "demo"; - description = '' + description = lib.mdDoc '' User to log-in as. ''; }; @@ -19,7 +19,7 @@ in { type = types.listOf types.str; default = []; defaultText = literalExpression "[]"; - description = "Additional command line arguments to pass to Cage."; + description = lib.mdDoc "Additional command line arguments to pass to Cage."; example = ["-d"]; }; @@ -27,7 +27,7 @@ in { type = types.path; default = "${pkgs.xterm}/bin/xterm"; defaultText = literalExpression ''"''${pkgs.xterm}/bin/xterm"''; - description = '' + description = lib.mdDoc '' Program to run in cage. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix index 28491fb3a4..6c5de3fbe4 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -8,21 +8,22 @@ let pkg = cfg.package.override (optionalAttrs cfg.sso.enable { enableSSO = cfg.sso.enable; - crowdProperties = '' - application.name ${cfg.sso.applicationName} - application.password ${cfg.sso.applicationPassword} - application.login.url ${cfg.sso.crowd}/console/ - - crowd.server.url ${cfg.sso.crowd}/services/ - crowd.base.url ${cfg.sso.crowd}/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval ${toString cfg.sso.validationInterval} - session.lastvalidation session.lastvalidation - ''; }); + crowdProperties = pkgs.writeText "crowd.properties" '' + application.name ${cfg.sso.applicationName} + application.password ${if cfg.sso.applicationPassword != null then cfg.sso.applicationPassword else "@NIXOS_CONFLUENCE_CROWD_SSO_PWD@"} + application.login.url ${cfg.sso.crowd}/console/ + + crowd.server.url ${cfg.sso.crowd}/services/ + crowd.base.url ${cfg.sso.crowd}/ + + session.isauthenticated session.isauthenticated + session.tokenkey session.tokenkey + session.validationinterval ${toString cfg.sso.validationInterval} + session.lastvalidation session.lastvalidation + ''; + in { @@ -33,38 +34,38 @@ in user = mkOption { type = types.str; default = "confluence"; - description = "User which runs confluence."; + description = lib.mdDoc "User which runs confluence."; }; group = mkOption { type = types.str; default = "confluence"; - description = "Group which runs confluence."; + description = lib.mdDoc "Group which runs confluence."; }; home = mkOption { type = types.str; default = "/var/lib/confluence"; - description = "Home directory of the confluence instance."; + description = lib.mdDoc "Home directory of the confluence instance."; }; listenAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = "Address to listen on."; + description = lib.mdDoc "Address to listen on."; }; listenPort = mkOption { type = types.int; default = 8090; - description = "Port to listen on."; + description = lib.mdDoc "Port to listen on."; }; catalinaOptions = mkOption { type = types.listOf types.str; default = []; example = [ "-Xms1024m" "-Xmx2048m" "-Dconfluence.disable.peopledirectory.all=true" ]; - description = "Java options to pass to catalina/tomcat."; + description = lib.mdDoc "Java options to pass to catalina/tomcat."; }; proxy = { @@ -73,21 +74,21 @@ in name = mkOption { type = types.str; example = "confluence.example.com"; - description = "Virtual hostname at the proxy"; + description = lib.mdDoc "Virtual hostname at the proxy"; }; port = mkOption { type = types.int; default = 443; example = 80; - description = "Port used at the proxy"; + description = lib.mdDoc "Port used at the proxy"; }; scheme = mkOption { type = types.str; default = "https"; example = "http"; - description = "Protocol used at the proxy."; + description = lib.mdDoc "Protocol used at the proxy."; }; }; @@ -97,25 +98,32 @@ in crowd = mkOption { type = types.str; example = "http://localhost:8095/crowd"; - description = "Crowd Base URL without trailing slash"; + description = lib.mdDoc "Crowd Base URL without trailing slash"; }; applicationName = mkOption { type = types.str; example = "jira"; - description = "Exact name of this Confluence instance in Crowd"; + description = lib.mdDoc "Exact name of this Confluence instance in Crowd"; }; applicationPassword = mkOption { - type = types.str; - description = "Application password of this Confluence instance in Crowd"; + type = types.nullOr types.str; + default = null; + description = lib.mdDoc "Application password of this Confluence instance in Crowd"; + }; + + applicationPasswordFile = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc "Path to the application password for Crowd of Confluence."; }; validationInterval = mkOption { type = types.int; default = 2; example = 0; - description = '' + description = lib.mdDoc '' Set to 0, if you want authentication checks to occur on each request. Otherwise set to the number of minutes between request to validate if the user is logged in or out of the Crowd SSO @@ -129,14 +137,14 @@ in type = types.package; default = pkgs.atlassian-confluence; defaultText = literalExpression "pkgs.atlassian-confluence"; - description = "Atlassian Confluence package to use."; + description = lib.mdDoc "Atlassian Confluence package to use."; }; jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; defaultText = literalExpression "pkgs.oraclejre8"; - description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; + description = lib.mdDoc "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; }; @@ -147,6 +155,16 @@ in group = cfg.group; }; + assertions = [ + { assertion = cfg.sso.enable -> ((cfg.sso.applicationPassword == null) != (cfg.sso.applicationPasswordFile)); + message = "Please set either applicationPassword or applicationPasswordFile"; + } + ]; + + warnings = mkIf (cfg.sso.enable && cfg.sso.applicationPassword != null) [ + "Using `services.confluence.sso.applicationPassword` is deprecated! Use `applicationPasswordFile` instead!" + ]; + users.groups.${cfg.group} = {}; systemd.tmpfiles.rules = [ @@ -173,6 +191,7 @@ in CONF_USER = cfg.user; JAVA_HOME = "${cfg.jrePackage}"; CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; + JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties"; }; preStart = '' @@ -183,6 +202,16 @@ in -e 's,protocol="org.apache.coyote.http11.Http11NioProtocol",protocol="org.apache.coyote.http11.Http11NioProtocol" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}",' \ '') + '' ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml + + ${optionalString cfg.sso.enable '' + install -m660 ${crowdProperties} ${cfg.home}/crowd.properties + ${optionalString (cfg.sso.applicationPasswordFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret \ + '@NIXOS_CONFLUENCE_CROWD_SSO_PWD@' \ + ${cfg.sso.applicationPasswordFile} \ + ${cfg.home}/crowd.properties + ''} + ''} ''; serviceConfig = { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix index 79306541b8..abe3a8bdb2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -14,6 +14,21 @@ let proxyUrl = "${cfg.proxy.scheme}://${cfg.proxy.name}:${toString cfg.proxy.port}"; }); + crowdPropertiesFile = pkgs.writeText "crowd.properties" '' + application.name crowd-openid-server + application.password @NIXOS_CROWD_OPENID_PW@ + application.base.url http://localhost:${toString cfg.listenPort}/openidserver + application.login.url http://localhost:${toString cfg.listenPort}/openidserver + application.login.url.template http://localhost:${toString cfg.listenPort}/openidserver?returnToUrl=''${RETURN_TO_URL} + + crowd.server.url http://localhost:${toString cfg.listenPort}/crowd/services/ + + session.isauthenticated session.isauthenticated + session.tokenkey session.tokenkey + session.validationinterval 0 + session.lastvalidation session.lastvalidation + ''; + in { @@ -24,43 +39,50 @@ in user = mkOption { type = types.str; default = "crowd"; - description = "User which runs Crowd."; + description = lib.mdDoc "User which runs Crowd."; }; group = mkOption { type = types.str; default = "crowd"; - description = "Group which runs Crowd."; + description = lib.mdDoc "Group which runs Crowd."; }; home = mkOption { type = types.str; default = "/var/lib/crowd"; - description = "Home directory of the Crowd instance."; + description = lib.mdDoc "Home directory of the Crowd instance."; }; listenAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = "Address to listen on."; + description = lib.mdDoc "Address to listen on."; }; listenPort = mkOption { type = types.int; default = 8092; - description = "Port to listen on."; + description = lib.mdDoc "Port to listen on."; }; openidPassword = mkOption { type = types.str; - description = "Application password for OpenID server."; + default = "WILL_NEVER_BE_SET"; + description = lib.mdDoc "Application password for OpenID server."; + }; + + openidPasswordFile = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc "Path to the file containing the application password for OpenID server."; }; catalinaOptions = mkOption { type = types.listOf types.str; default = []; example = [ "-Xms1024m" "-Xmx2048m" ]; - description = "Java options to pass to catalina/tomcat."; + description = lib.mdDoc "Java options to pass to catalina/tomcat."; }; proxy = { @@ -69,27 +91,27 @@ in name = mkOption { type = types.str; example = "crowd.example.com"; - description = "Virtual hostname at the proxy"; + description = lib.mdDoc "Virtual hostname at the proxy"; }; port = mkOption { type = types.int; default = 443; example = 80; - description = "Port used at the proxy"; + description = lib.mdDoc "Port used at the proxy"; }; scheme = mkOption { type = types.str; default = "https"; example = "http"; - description = "Protocol used at the proxy."; + description = lib.mdDoc "Protocol used at the proxy."; }; secure = mkOption { type = types.bool; default = true; - description = "Whether the connections to the proxy should be considered secure."; + description = lib.mdDoc "Whether the connections to the proxy should be considered secure."; }; }; @@ -97,14 +119,14 @@ in type = types.package; default = pkgs.atlassian-crowd; defaultText = literalExpression "pkgs.atlassian-crowd"; - description = "Atlassian Crowd package to use."; + description = lib.mdDoc "Atlassian Crowd package to use."; }; jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; defaultText = literalExpression "pkgs.oraclejre8"; - description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; + description = lib.mdDoc "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; }; @@ -140,6 +162,7 @@ in JAVA_HOME = "${cfg.jrePackage}"; CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; CATALINA_TMPDIR = "/tmp"; + JAVA_OPTS = mkIf (cfg.openidPasswordFile != null) "-Dcrowd.properties=${cfg.home}/crowd.properties"; }; preStart = '' @@ -151,6 +174,14 @@ in -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${boolToString cfg.proxy.secure}",' \ '') + '' ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml + + ${optionalString (cfg.openidPasswordFile != null) '' + install -m660 ${crowdPropertiesFile} ${cfg.home}/crowd.properties + ${pkgs.replace-secret}/bin/replace-secret \ + '@NIXOS_CROWD_OPENID_PW@' \ + ${cfg.openidPasswordFile} \ + ${cfg.home}/crowd.properties + ''} ''; serviceConfig = { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix index fd89d763c7..5d62160ffb 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix @@ -34,38 +34,38 @@ in user = mkOption { type = types.str; default = "jira"; - description = "User which runs JIRA."; + description = lib.mdDoc "User which runs JIRA."; }; group = mkOption { type = types.str; default = "jira"; - description = "Group which runs JIRA."; + description = lib.mdDoc "Group which runs JIRA."; }; home = mkOption { type = types.str; default = "/var/lib/jira"; - description = "Home directory of the JIRA instance."; + description = lib.mdDoc "Home directory of the JIRA instance."; }; listenAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = "Address to listen on."; + description = lib.mdDoc "Address to listen on."; }; listenPort = mkOption { type = types.int; default = 8091; - description = "Port to listen on."; + description = lib.mdDoc "Port to listen on."; }; catalinaOptions = mkOption { type = types.listOf types.str; default = []; example = [ "-Xms1024m" "-Xmx2048m" ]; - description = "Java options to pass to catalina/tomcat."; + description = lib.mdDoc "Java options to pass to catalina/tomcat."; }; proxy = { @@ -74,27 +74,27 @@ in name = mkOption { type = types.str; example = "jira.example.com"; - description = "Virtual hostname at the proxy"; + description = lib.mdDoc "Virtual hostname at the proxy"; }; port = mkOption { type = types.int; default = 443; example = 80; - description = "Port used at the proxy"; + description = lib.mdDoc "Port used at the proxy"; }; scheme = mkOption { type = types.str; default = "https"; example = "http"; - description = "Protocol used at the proxy."; + description = lib.mdDoc "Protocol used at the proxy."; }; secure = mkOption { type = types.bool; default = true; - description = "Whether the connections to the proxy should be considered secure."; + description = lib.mdDoc "Whether the connections to the proxy should be considered secure."; }; }; @@ -104,25 +104,25 @@ in crowd = mkOption { type = types.str; example = "http://localhost:8095/crowd"; - description = "Crowd Base URL without trailing slash"; + description = lib.mdDoc "Crowd Base URL without trailing slash"; }; applicationName = mkOption { type = types.str; example = "jira"; - description = "Exact name of this JIRA instance in Crowd"; + description = lib.mdDoc "Exact name of this JIRA instance in Crowd"; }; applicationPasswordFile = mkOption { type = types.str; - description = "Path to the file containing the application password of this JIRA instance in Crowd"; + description = lib.mdDoc "Path to the file containing the application password of this JIRA instance in Crowd"; }; validationInterval = mkOption { type = types.int; default = 2; example = 0; - description = '' + description = lib.mdDoc '' Set to 0, if you want authentication checks to occur on each request. Otherwise set to the number of minutes between request to validate if the user is logged in or out of the Crowd SSO @@ -136,14 +136,14 @@ in type = types.package; default = pkgs.atlassian-jira; defaultText = literalExpression "pkgs.atlassian-jira"; - description = "Atlassian JIRA package to use."; + description = lib.mdDoc "Atlassian JIRA package to use."; }; jrePackage = mkOption { type = types.package; default = pkgs.oraclejre8; defaultText = literalExpression "pkgs.oraclejre8"; - description = "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; + description = lib.mdDoc "Note that Atlassian only support the Oracle JRE (JRASERVER-46152)."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/baget.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/baget.nix index 3007dd4fbb..dd70d462d5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/baget.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/baget.nix @@ -58,7 +58,7 @@ in apiKeyFile = mkOption { type = types.path; example = "/root/baget.key"; - description = '' + description = lib.mdDoc '' Private API key for BaGet. ''; }; @@ -112,8 +112,8 @@ in }; } ''; - description = '' - Extra configuration options for BaGet. Refer to for details. + description = lib.mdDoc '' + Extra configuration options for BaGet. Refer to for details. Default value is merged with values from here. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix index 64a2767fab..5d22a3b9a8 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/bookstack.nix @@ -52,7 +52,7 @@ in { description = '' A file containing the Laravel APP_KEY - a 32 character long, base64 encoded key used for encryption where needed. Can be - generated with head -c 32 /dev/urandom | base64. + generated with head -c 32 /dev/urandom | base64. ''; example = "/run/keys/bookstack-appkey"; type = types.path; @@ -74,7 +74,7 @@ in { appURL = mkOption { description = '' The root URL that you want to host BookStack on. All URLs in BookStack will be generated using this value. - If you change this in the future you may need to run a command to update stored URLs in the database. Command example: php artisan bookstack:update-url https://old.example.com https://new.example.com + If you change this in the future you may need to run a command to update stored URLs in the database. Command example: php artisan bookstack:update-url https://old.example.com https://new.example.com ''; default = "http${lib.optionalString tlsEnabled "s"}://${cfg.hostname}"; defaultText = ''http''${lib.optionalString tlsEnabled "s"}://''${cfg.hostname}''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix index 2bc817343a..6bcf733452 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/calibre-web.nix @@ -14,7 +14,7 @@ in ip = mkOption { type = types.str; default = "::1"; - description = '' + description = lib.mdDoc '' IP address that Calibre-Web should listen on. ''; }; @@ -22,7 +22,7 @@ in port = mkOption { type = types.port; default = 8083; - description = '' + description = lib.mdDoc '' Listen port for Calibre-Web. ''; }; @@ -31,27 +31,27 @@ in dataDir = mkOption { type = types.str; default = "calibre-web"; - description = '' - The directory below /var/lib where Calibre-Web stores its data. + description = lib.mdDoc '' + The directory below {file}`/var/lib` where Calibre-Web stores its data. ''; }; user = mkOption { type = types.str; default = "calibre-web"; - description = "User account under which Calibre-Web runs."; + description = lib.mdDoc "User account under which Calibre-Web runs."; }; group = mkOption { type = types.str; default = "calibre-web"; - description = "Group account under which Calibre-Web runs."; + description = lib.mdDoc "Group account under which Calibre-Web runs."; }; openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for the server. ''; }; @@ -60,7 +60,7 @@ in calibreLibrary = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' Path to Calibre library. ''; }; @@ -68,7 +68,7 @@ in enableBookConversion = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Configure path to the Calibre's ebook-convert in the DB. ''; }; @@ -76,7 +76,7 @@ in enableBookUploading = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allow books to be uploaded via Calibre-Web UI. ''; }; @@ -85,7 +85,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable authorization using auth proxy. ''; }; @@ -93,7 +93,7 @@ in header = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Auth proxy header name. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/code-server.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/code-server.nix index 474e9140ae..84fc03deab 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/code-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/code-server.nix @@ -16,13 +16,13 @@ in { package = mkOption { default = pkgs.code-server; defaultText = "pkgs.code-server"; - description = "Which code-server derivation to use."; + description = lib.mdDoc "Which code-server derivation to use."; type = types.package; }; extraPackages = mkOption { default = [ ]; - description = "Packages that are available in the PATH of code-server."; + description = lib.mdDoc "Packages that are available in the PATH of code-server."; example = "[ pkgs.go ]"; type = types.listOf types.package; }; @@ -30,49 +30,49 @@ in { extraEnvironment = mkOption { type = types.attrsOf types.str; description = - "Additional environment variables to passed to code-server."; + lib.mdDoc "Additional environment variables to passed to code-server."; default = { }; example = { PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig"; }; }; extraArguments = mkOption { default = [ "--disable-telemetry" ]; - description = "Additional arguments that passed to code-server"; + description = lib.mdDoc "Additional arguments that passed to code-server"; example = ''[ "--verbose" ]''; type = types.listOf types.str; }; host = mkOption { default = "127.0.0.1"; - description = "The host-ip to bind to."; + description = lib.mdDoc "The host-ip to bind to."; type = types.str; }; port = mkOption { default = 4444; - description = "The port where code-server runs."; + description = lib.mdDoc "The port where code-server runs."; type = types.port; }; auth = mkOption { default = "password"; - description = "The type of authentication to use."; + description = lib.mdDoc "The type of authentication to use."; type = types.enum [ "none" "password" ]; }; hashedPassword = mkOption { default = ""; description = - "Create the password with: 'echo -n 'thisismypassword' | npx argon2-cli -e'."; + lib.mdDoc "Create the password with: 'echo -n 'thisismypassword' | npx argon2-cli -e'."; type = types.str; }; user = mkOption { default = defaultUser; example = "yourUser"; - description = '' + description = lib.mdDoc '' The user to run code-server as. - By default, a user named ${defaultUser} will be created. + By default, a user named `${defaultUser}` will be created. ''; type = types.str; }; @@ -80,9 +80,9 @@ in { group = mkOption { default = defaultGroup; example = "yourGroup"; - description = '' + description = lib.mdDoc '' The group to run code-server under. - By default, a group named ${defaultGroup} will be created. + By default, a group named `${defaultGroup}` will be created. ''; type = types.str; }; @@ -90,7 +90,7 @@ in { extraGroups = mkOption { default = [ ]; description = - "An array of additional groups for the ${defaultUser} user."; + lib.mdDoc "An array of additional groups for the `${defaultUser}` user."; example = [ "docker" ]; type = types.listOf types.str; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/convos.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/convos.nix index 8be11eec9f..120481c640 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/convos.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/convos.nix @@ -12,21 +12,21 @@ in type = types.port; default = 3000; example = 8080; - description = "Port the web interface should listen on"; + description = lib.mdDoc "Port the web interface should listen on"; }; listenAddress = mkOption { type = types.str; default = "*"; example = "127.0.0.1"; - description = "Address or host the web interface should listen on"; + description = lib.mdDoc "Address or host the web interface should listen on"; }; reverseProxy = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables reverse proxy support. This will allow Convos to automatically - pick up the X-Forwarded-For and - X-Request-Base HTTP headers set in your reverse proxy + pick up the `X-Forwarded-For` and + `X-Request-Base` HTTP headers set in your reverse proxy web server. Note that enabling this option without a reverse proxy in front will be a security issue. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix index 4d4689a4cf..eebf4b740c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dex.nix @@ -45,9 +45,9 @@ in ]; } ''; - description = '' + description = lib.mdDoc '' The available options can be found in - the example configuration. + [the example configuration](https://github.com/dexidp/dex/blob/v${pkgs.dex.version}/config.yaml.dist). ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix index 7dbbf4a12f..20ad653429 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/discourse.nix @@ -35,7 +35,7 @@ in plugins = lib.unique (p.enabledPlugins ++ cfg.plugins); }; defaultText = lib.literalExpression "pkgs.discourse"; - description = '' + description = lib.mdDoc '' The discourse package to use. ''; }; @@ -48,7 +48,7 @@ in config.networking.hostName; defaultText = lib.literalExpression "config.networking.fqdn"; example = "discourse.example.com"; - description = '' + description = lib.mdDoc '' The hostname to serve Discourse on. ''; }; @@ -81,7 +81,7 @@ in type = with lib.types; nullOr path; default = null; example = "/run/keys/ssl.cert"; - description = '' + description = lib.mdDoc '' The path to the server SSL certificate. Set this to enable SSL. ''; @@ -91,7 +91,7 @@ in type = with lib.types; nullOr path; default = null; example = "/run/keys/ssl.key"; - description = '' + description = lib.mdDoc '' The path to the server SSL certificate key. Set this to enable SSL. ''; @@ -104,7 +104,7 @@ in true, unless and are set. ''; - description = '' + description = lib.mdDoc '' Whether an ACME certificate should be used to secure connections to the server. ''; @@ -151,26 +151,26 @@ in }; }; ''; - description = '' + description = lib.mdDoc '' Discourse site settings. These are the settings that can be changed from the UI. This only defines their default values: they can still be overridden from the UI. Available settings can be found by looking in the - site_settings.yml + [site_settings.yml](https://github.com/discourse/discourse/blob/master/config/site_settings.yml) file of the upstream distribution. To find a setting's path, you only need to care about the first two levels; i.e. its category and name. See the example. Settings containing secret data should be set to an attribute set containing the attribute - _secret - a string pointing to a file + `_secret` - a string pointing to a file containing the value the option should be set to. See the example to get a better picture of this: in the resulting - config/nixos_site_settings.json file, - the login.github_client_secret key will + {file}`config/nixos_site_settings.json` file, + the `login.github_client_secret` key will be set to the contents of the - /run/keys/discourse_github_client_secret + {file}`/run/keys/discourse_github_client_secret` file. ''; }; @@ -179,7 +179,7 @@ in skipCreate = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Do not create the admin account, instead rely on other existing admin accounts. ''; @@ -188,7 +188,7 @@ in email = lib.mkOption { type = lib.types.str; example = "admin@example.com"; - description = '' + description = lib.mdDoc '' The admin user email address. ''; }; @@ -196,21 +196,21 @@ in username = lib.mkOption { type = lib.types.str; example = "admin"; - description = '' + description = lib.mdDoc '' The admin user username. ''; }; fullName = lib.mkOption { type = lib.types.str; - description = '' + description = lib.mdDoc '' The admin user's full name. ''; }; passwordFile = lib.mkOption { type = lib.types.path; - description = '' + description = lib.mdDoc '' A path to a file containing the admin user's password. This should be a string, not a nix path, since nix paths are @@ -222,8 +222,8 @@ in nginx.enable = lib.mkOption { type = lib.types.bool; default = true; - description = '' - Whether an nginx virtual host should be + description = lib.mdDoc '' + Whether an `nginx` virtual host should be set up to serve Discourse. Only disable if you're planning to use a different web server, which is not recommended. ''; @@ -233,7 +233,7 @@ in pool = lib.mkOption { type = lib.types.int; default = 8; - description = '' + description = lib.mdDoc '' Database connection pool size. ''; }; @@ -250,7 +250,7 @@ in passwordFile = lib.mkOption { type = with lib.types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' File containing the Discourse database user password. This should be a string, not a nix path, since nix paths are @@ -261,18 +261,18 @@ in createLocally = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether a database should be automatically created on the - local host. Set this to false if you plan + local host. Set this to `false` if you plan on provisioning a local database yourself. This has no effect - if is customized. + if {option}`services.discourse.database.host` is customized. ''; }; name = lib.mkOption { type = lib.types.str; default = "discourse"; - description = '' + description = lib.mdDoc '' Discourse database name. ''; }; @@ -280,7 +280,7 @@ in username = lib.mkOption { type = lib.types.str; default = "discourse"; - description = '' + description = lib.mdDoc '' Discourse database user. ''; }; @@ -288,10 +288,10 @@ in ignorePostgresqlVersion = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to allow other versions of PostgreSQL than the recommended one. Only effective when - + {option}`services.discourse.database.createLocally` is enabled. ''; }; @@ -301,7 +301,7 @@ in host = lib.mkOption { type = lib.types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Redis server hostname. ''; }; @@ -309,7 +309,7 @@ in passwordFile = lib.mkOption { type = with lib.types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' File containing the Redis password. This should be a string, not a nix path, since nix paths are @@ -320,7 +320,7 @@ in dbNumber = lib.mkOption { type = lib.types.int; default = 0; - description = '' + description = lib.mdDoc '' Redis database number. ''; }; @@ -329,7 +329,7 @@ in type = lib.types.bool; default = cfg.redis.host != "localhost"; defaultText = lib.literalExpression ''config.${opt.redis.host} != "localhost"''; - description = '' + description = lib.mdDoc '' Connect to Redis with SSL. ''; }; @@ -342,8 +342,8 @@ in defaultText = lib.literalExpression '' "''${if config.services.discourse.mail.incoming.enable then "notifications" else "noreply"}@''${config.services.discourse.hostname}" ''; - description = '' - The from: email address used when + description = lib.mdDoc '' + The `from:` email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive. @@ -353,10 +353,10 @@ in contactEmailAddress = lib.mkOption { type = lib.types.str; default = ""; - description = '' + description = lib.mdDoc '' Email address of key contact responsible for this site. Used for critical notifications, as well as on the - /about contact form for urgent matters. + `/about` contact form for urgent matters. ''; }; @@ -364,7 +364,7 @@ in serverAddress = lib.mkOption { type = lib.types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' The address of the SMTP server Discourse should use to send email. ''; @@ -373,7 +373,7 @@ in port = lib.mkOption { type = lib.types.port; default = 25; - description = '' + description = lib.mdDoc '' The port of the SMTP server Discourse should use to send email. ''; @@ -382,7 +382,7 @@ in username = lib.mkOption { type = with lib.types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' The username of the SMTP server. ''; }; @@ -390,7 +390,7 @@ in passwordFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; - description = '' + description = lib.mdDoc '' A file containing the password of the SMTP server account. This should be a string, not a nix path, since nix paths @@ -402,7 +402,7 @@ in type = lib.types.str; default = cfg.hostname; defaultText = lib.literalExpression "config.${opt.hostname}"; - description = '' + description = lib.mdDoc '' HELO domain to use for outgoing mail. ''; }; @@ -410,7 +410,7 @@ in authentication = lib.mkOption { type = with lib.types; nullOr (enum ["plain" "login" "cram_md5"]); default = null; - description = '' + description = lib.mdDoc '' Authentication type to use, see http://api.rubyonrails.org/classes/ActionMailer/Base.html ''; }; @@ -418,7 +418,7 @@ in enableStartTLSAuto = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to try to use StartTLS. ''; }; @@ -426,7 +426,7 @@ in opensslVerifyMode = lib.mkOption { type = lib.types.str; default = "peer"; - description = '' + description = lib.mdDoc '' How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html ''; }; @@ -434,7 +434,7 @@ in forceTLS = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Force implicit TLS as per RFC 8314 3.3. ''; }; @@ -444,7 +444,7 @@ in enable = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to set up Postfix to receive incoming mail. ''; }; @@ -453,7 +453,7 @@ in type = lib.types.str; default = "%{reply_key}@${cfg.hostname}"; defaultText = lib.literalExpression ''"%{reply_key}@''${config.services.discourse.hostname}"''; - description = '' + description = lib.mdDoc '' Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com @@ -464,7 +464,7 @@ in type = lib.types.package; default = pkgs.discourse-mail-receiver; defaultText = lib.literalExpression "pkgs.discourse-mail-receiver"; - description = '' + description = lib.mdDoc '' The discourse-mail-receiver package to use. ''; }; @@ -472,10 +472,10 @@ in apiKeyFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; - description = '' + description = lib.mdDoc '' A file containing the Discourse API key used to add posts and messages from mail. If left at its default - value null, one will be automatically + value `null`, one will be automatically generated. This should be a string, not a nix path, since nix paths @@ -504,7 +504,7 @@ in sidekiqProcesses = lib.mkOption { type = lib.types.int; default = 1; - description = '' + description = lib.mdDoc '' How many Sidekiq processes should be spawned. ''; }; @@ -512,7 +512,7 @@ in unicornTimeout = lib.mkOption { type = lib.types.int; default = 30; - description = '' + description = lib.mdDoc '' Time in seconds before a request to Unicorn times out. This can be raised if the system Discourse is running on is diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/documize.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/documize.nix index 7f2ed82ee3..4353e3c244 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/documize.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/documize.nix @@ -17,8 +17,8 @@ in { stateDirectoryName = mkOption { type = types.str; default = "documize"; - description = '' - The name of the directory below /var/lib/private + description = lib.mdDoc '' + The name of the directory below {file}`/var/lib/private` where documize runs in and stores, for example, backups. ''; }; @@ -27,7 +27,7 @@ in { type = types.package; default = pkgs.documize-community; defaultText = literalExpression "pkgs.documize-community"; - description = '' + description = lib.mdDoc '' Which package to use for documize. ''; }; @@ -36,7 +36,7 @@ in { type = types.nullOr types.str; default = null; example = "3edIYV6c8B28b19fh"; - description = '' + description = lib.mdDoc '' The salt string used to encode JWT tokens, if not set a random value will be generated. ''; }; @@ -44,23 +44,23 @@ in { cert = mkOption { type = types.nullOr types.str; default = null; - description = '' - The cert.pem file used for https. + description = lib.mdDoc '' + The {file}`cert.pem` file used for https. ''; }; key = mkOption { type = types.nullOr types.str; default = null; - description = '' - The key.pem file used for https. + description = lib.mdDoc '' + The {file}`key.pem` file used for https. ''; }; port = mkOption { type = types.port; default = 5001; - description = '' + description = lib.mdDoc '' The http/https port number. ''; }; @@ -68,7 +68,7 @@ in { forcesslport = mkOption { type = types.nullOr types.port; default = null; - description = '' + description = lib.mdDoc '' Redirect given http port number to TLS. ''; }; @@ -76,8 +76,8 @@ in { offline = mkOption { type = types.bool; default = false; - description = '' - Set true for offline mode. + description = lib.mdDoc '' + Set `true` for offline mode. ''; apply = v: if true == v then 1 else 0; }; @@ -122,7 +122,7 @@ in { location = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' reserved ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix index d8fc978774..a148dec819 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/dokuwiki.nix @@ -66,21 +66,21 @@ let type = types.package; default = pkgs.dokuwiki; defaultText = literalExpression "pkgs.dokuwiki"; - description = "Which DokuWiki package to use."; + description = lib.mdDoc "Which DokuWiki package to use."; }; stateDir = mkOption { type = types.path; default = "/var/lib/dokuwiki/${name}/data"; - description = "Location of the DokuWiki state directory."; + description = lib.mdDoc "Location of the DokuWiki state directory."; }; acl = mkOption { type = types.nullOr types.lines; default = null; example = "* @ALL 8"; - description = '' - Access Control Lists: see + description = lib.mdDoc '' + Access Control Lists: see Mutually exclusive with services.dokuwiki.aclFile Set this to a value other than null to take precedence over aclFile option. @@ -92,11 +92,11 @@ let aclFile = mkOption { type = with types; nullOr str; default = if (config.aclUse && config.acl == null) then "/var/lib/dokuwiki/${name}/acl.auth.php" else null; - description = '' + description = lib.mdDoc '' Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl Mutually exclusive with services.dokuwiki.acl which is preferred. - Consult documentation for further instructions. - Example: + Consult documentation for further instructions. + Example: ''; example = "/var/lib/dokuwiki/${name}/acl.auth.php"; }; @@ -104,7 +104,7 @@ let aclUse = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Necessary for users to log in into the system. Also limits anonymous users. When disabled, everyone is able to create and edit content. @@ -119,7 +119,7 @@ let $plugins['authmysql'] = 0; $plugins['authpgsql'] = 0; ''; - description = '' + description = lib.mdDoc '' List of the dokuwiki (un)loaded plugins. ''; }; @@ -127,10 +127,10 @@ let superUser = mkOption { type = types.nullOr types.str; default = "@admin"; - description = '' + description = lib.mdDoc '' You can set either a username, a list of usernames (“admin1,admin2”), or the name of a group by prepending an @ char to the groupname - Consult documentation for further instructions. + Consult documentation for further instructions. ''; }; @@ -150,9 +150,9 @@ let type = types.nullOr types.str; default = ""; example = "search,register"; - description = '' + description = lib.mdDoc '' Disable individual action modes. Refer to - + for details on supported values. ''; }; @@ -222,8 +222,8 @@ let "pm.max_spare_servers" = 4; "pm.max_requests" = 500; }; - description = '' - Options for the DokuWiki PHP pool. See the documentation on php-fpm.conf + description = lib.mdDoc '' + Options for the DokuWiki PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives. ''; }; @@ -235,9 +235,9 @@ let $conf['title'] = 'My Wiki'; $conf['userewrite'] = 1; ''; - description = '' + description = lib.mdDoc '' DokuWiki configuration. Refer to - + for details on supported values. ''; }; @@ -254,20 +254,20 @@ in sites = mkOption { type = types.attrsOf (types.submodule siteOpts); default = {}; - description = "Specification of one or more DokuWiki sites to serve"; + description = lib.mdDoc "Specification of one or more DokuWiki sites to serve"; }; webserver = mkOption { type = types.enum [ "nginx" "caddy" ]; default = "nginx"; - description = '' + description = lib.mdDoc '' Whether to use nginx or caddy for virtual host management. - Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. - See for further information. + Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`. + See [](#opt-services.nginx.virtualHosts) for further information. - Further apache2 configuration can be done by adapting services.httpd.virtualHosts.<name>. - See for further information. + Further apache2 configuration can be done by adapting `services.httpd.virtualHosts.`. + See [](#opt-services.httpd.virtualHosts) for further information. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix index 06c3c6dfc3..f1d71f1744 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/engelsystem.nix @@ -9,7 +9,7 @@ in { enable = mkOption { default = false; example = true; - description = '' + description = lib.mdDoc '' Whether to enable engelsystem, an online tool for coordinating volunteers and shifts on large events. ''; @@ -19,12 +19,12 @@ in { domain = mkOption { type = types.str; example = "engelsystem.example.com"; - description = "Domain to serve on."; + description = lib.mdDoc "Domain to serve on."; }; package = mkOption { type = types.package; - description = "Engelsystem package used for the service."; + description = lib.mdDoc "Engelsystem package used for the service."; default = pkgs.engelsystem; defaultText = literalExpression "pkgs.engelsystem"; }; @@ -32,9 +32,9 @@ in { createDatabase = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to create a local database automatically. - This will override every database setting in . + This will override every database setting in {option}`services.engelsystem.config`. ''; }; }; @@ -70,7 +70,7 @@ in { min_password_length = 6; default_locale = "de_DE"; }; - description = '' + description = lib.mdDoc '' Options to be added to config.php, as a nix attribute set. Options containing secret data should be set to an attribute set containing the attribute _secret - a string pointing to a file containing the value the option should be set to. See the example to get a better diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/ethercalc.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/ethercalc.nix index d74def59c6..a5be86a34a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/ethercalc.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/ethercalc.nix @@ -10,11 +10,11 @@ in { enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' ethercalc, an online collaborative spreadsheet server. Persistent state will be maintained under - /var/lib/ethercalc. Upstream supports using a + {file}`/var/lib/ethercalc`. Upstream supports using a redis server for storage and recommends the redis backend for intensive use; however, the Nix module doesn't currently support redis. @@ -28,19 +28,19 @@ in { default = pkgs.ethercalc; defaultText = literalExpression "pkgs.ethercalc"; type = types.package; - description = "Ethercalc package to use."; + description = lib.mdDoc "Ethercalc package to use."; }; host = mkOption { type = types.str; default = "0.0.0.0"; - description = "Address to listen on (use 0.0.0.0 to allow access from any address)."; + description = lib.mdDoc "Address to listen on (use 0.0.0.0 to allow access from any address)."; }; port = mkOption { type = types.port; default = 8000; - description = "Port to bind to."; + description = lib.mdDoc "Port to bind to."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix index 38c3392014..2fef43753d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/galene.nix @@ -17,7 +17,7 @@ in stateDir = mkOption { default = defaultstateDir; type = types.str; - description = '' + description = lib.mdDoc '' The directory where Galene stores its internal state. If left as the default value this directory will automatically be created before the Galene server starts, otherwise the sysadmin is responsible for ensuring the directory @@ -28,19 +28,19 @@ in user = mkOption { type = types.str; default = "galene"; - description = "User account under which galene runs."; + description = lib.mdDoc "User account under which galene runs."; }; group = mkOption { type = types.str; default = "galene"; - description = "Group under which galene runs."; + description = lib.mdDoc "Group under which galene runs."; }; insecure = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether Galene should listen in http or in https. If left as the default value (false), Galene needs to be fed a private key and a certificate. ''; @@ -50,7 +50,7 @@ in type = types.nullOr types.str; default = null; example = "/path/to/your/cert.pem"; - description = '' + description = lib.mdDoc '' Path to the server's certificate. The file is copied at runtime to Galene's data directory where it needs to reside. ''; @@ -60,7 +60,7 @@ in type = types.nullOr types.str; default = null; example = "/path/to/your/key.pem"; - description = '' + description = lib.mdDoc '' Path to the server's private key. The file is copied at runtime to Galene's data directory where it needs to reside. ''; @@ -69,13 +69,13 @@ in httpAddress = mkOption { type = types.str; default = ""; - description = "HTTP listen address for galene."; + description = lib.mdDoc "HTTP listen address for galene."; }; httpPort = mkOption { type = types.port; default = 8443; - description = "HTTP listen port."; + description = lib.mdDoc "HTTP listen port."; }; staticDir = mkOption { @@ -83,7 +83,7 @@ in default = "${cfg.package.static}/static"; defaultText = literalExpression ''"''${package.static}/static"''; example = "/var/lib/galene/static"; - description = "Web server directory."; + description = lib.mdDoc "Web server directory."; }; recordingsDir = mkOption { @@ -91,7 +91,7 @@ in default = defaultrecordingsDir; defaultText = literalExpression ''"''${config.${opt.stateDir}}/recordings"''; example = "/var/lib/galene/recordings"; - description = "Recordings directory."; + description = lib.mdDoc "Recordings directory."; }; dataDir = mkOption { @@ -99,7 +99,7 @@ in default = defaultdataDir; defaultText = literalExpression ''"''${config.${opt.stateDir}}/data"''; example = "/var/lib/galene/data"; - description = "Data directory."; + description = lib.mdDoc "Data directory."; }; groupsDir = mkOption { @@ -107,14 +107,14 @@ in default = defaultgroupsDir; defaultText = literalExpression ''"''${config.${opt.stateDir}}/groups"''; example = "/var/lib/galene/groups"; - description = "Web server directory."; + description = lib.mdDoc "Web server directory."; }; package = mkOption { default = pkgs.galene; defaultText = literalExpression "pkgs.galene"; type = types.package; - description = '' + description = lib.mdDoc '' Package for running Galene. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix index 6bfc67368d..5b36204ff0 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/gerrit.nix @@ -65,14 +65,14 @@ in type = types.package; default = pkgs.gerrit; defaultText = literalExpression "pkgs.gerrit"; - description = "Gerrit package to use"; + description = lib.mdDoc "Gerrit package to use"; }; jvmPackage = mkOption { type = types.package; default = pkgs.jre_headless; defaultText = literalExpression "pkgs.jre_headless"; - description = "Java Runtime Environment package to use"; + description = lib.mdDoc "Java Runtime Environment package to use"; }; jvmOpts = mkOption { @@ -81,13 +81,13 @@ in "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance" "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance" ]; - description = "A list of JVM options to start gerrit with."; + description = lib.mdDoc "A list of JVM options to start gerrit with."; }; jvmHeapLimit = mkOption { type = types.str; default = "1024m"; - description = '' + description = lib.mdDoc '' How much memory to allocate to the JVM heap ''; }; @@ -95,8 +95,8 @@ in listenAddress = mkOption { type = types.str; default = "[::]:8080"; - description = '' - hostname:port to listen for HTTP traffic. + description = lib.mdDoc '' + `hostname:port` to listen for HTTP traffic. This is bound using the systemd socket activation. ''; @@ -105,25 +105,25 @@ in settings = mkOption { type = gitIniType; default = {}; - description = '' + description = lib.mdDoc '' Gerrit configuration. This will be generated to the - etc/gerrit.config file. + `etc/gerrit.config` file. ''; }; replicationSettings = mkOption { type = gitIniType; default = {}; - description = '' + description = lib.mdDoc '' Replication configuration. This will be generated to the - etc/replication.config file. + `etc/replication.config` file. ''; }; plugins = mkOption { type = types.listOf types.package; default = []; - description = '' + description = lib.mdDoc '' List of plugins to add to Gerrit. Each derivation is a jar file itself where the name of the derivation is the name of plugin. ''; @@ -132,19 +132,19 @@ in builtinPlugins = mkOption { type = types.listOf (types.enum cfg.package.passthru.plugins); default = []; - description = '' + description = lib.mdDoc '' List of builtins plugins to install. Those are shipped in the - gerrit.war file. + `gerrit.war` file. ''; }; serverId = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Set a UUID that uniquely identifies the server. This can be generated with - nix-shell -p util-linux --run uuidgen. + `nix-shell -p util-linux --run uuidgen`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/gotify-server.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/gotify-server.nix index 03e01f46a9..9e278b41ad 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/gotify-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/gotify-server.nix @@ -11,7 +11,7 @@ in { port = mkOption { type = types.port; - description = '' + description = lib.mdDoc '' Port the server listens to. ''; }; @@ -19,8 +19,8 @@ in { stateDirectoryName = mkOption { type = types.str; default = "gotify-server"; - description = '' - The name of the directory below /var/lib where + description = lib.mdDoc '' + The name of the directory below {file}`/var/lib` where gotify stores its runtime data. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix index a77fddf1f2..173dd63dda 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/grocy.nix @@ -10,7 +10,7 @@ in { hostName = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' FQDN for the grocy instance. ''; }; @@ -18,7 +18,7 @@ in { nginx.enableSSL = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether or not to enable SSL (with ACME and let's encrypt) for the grocy vhost. ''; @@ -39,7 +39,7 @@ in { "pm.max_requests" = "500"; }; - description = '' + description = lib.mdDoc '' Options for grocy's PHPFPM pool. ''; }; @@ -47,8 +47,8 @@ in { dataDir = mkOption { type = types.str; default = "/var/lib/grocy"; - description = '' - Home directory of the grocy user which contains + description = lib.mdDoc '' + Home directory of the `grocy` user which contains the application's state. ''; }; @@ -58,7 +58,7 @@ in { type = types.str; default = "USD"; example = "EUR"; - description = '' + description = lib.mdDoc '' ISO 4217 code for the currency to display. ''; }; @@ -66,7 +66,7 @@ in { culture = mkOption { type = types.enum [ "de" "en" "da" "en_GB" "es" "fr" "hu" "it" "nl" "no" "pl" "pt_BR" "ru" "sk_SK" "sv_SE" "tr" ]; default = "en"; - description = '' + description = lib.mdDoc '' Display language of the frontend. ''; }; @@ -75,14 +75,14 @@ in { showWeekNumber = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Show the number of the weeks in the calendar views. ''; }; firstDayOfWeek = mkOption { default = null; type = types.nullOr (types.enum (range 0 6)); - description = '' + description = lib.mdDoc '' Which day of the week (0=Sunday, 1=Monday etc.) should be the first day. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix index be025e7dd5..e58cc6f202 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/healthchecks.nix @@ -37,7 +37,7 @@ in default = pkgs.healthchecks; defaultText = literalExpression "pkgs.healthchecks"; type = types.package; - description = "healthchecks package to use."; + description = lib.mdDoc "healthchecks package to use."; }; user = mkOption { @@ -71,13 +71,13 @@ in listenAddress = mkOption { type = types.str; default = "localhost"; - description = "Address the server will listen on."; + description = lib.mdDoc "Address the server will listen on."; }; port = mkOption { type = types.port; default = 8000; - description = "Port the server will listen on."; + description = lib.mdDoc "Port the server will listen on."; }; dataDir = mkOption { @@ -114,26 +114,26 @@ in ALLOWED_HOSTS = lib.mkOption { type = types.listOf types.str; default = [ "*" ]; - description = "The host/domain names that this site can serve."; + description = lib.mdDoc "The host/domain names that this site can serve."; apply = lib.concatStringsSep ","; }; SECRET_KEY_FILE = mkOption { type = types.path; - description = "Path to a file containing the secret key."; + description = lib.mdDoc "Path to a file containing the secret key."; }; DEBUG = mkOption { type = types.bool; default = false; - description = "Enable debug mode."; + description = lib.mdDoc "Enable debug mode."; apply = boolToPython; }; REGISTRATION_OPEN = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' A boolean that controls whether site visitors can create new accounts. Set it to false if you are setting up a private Healthchecks instance, but it needs to be publicly accessible (so, for example, your cloud diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix index 909b51750d..6f579b365c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hedgedoc.nix @@ -37,7 +37,7 @@ in groups = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Groups to which the service user should be added. ''; }; @@ -45,7 +45,7 @@ in workDir = mkOption { type = types.path; default = "/var/lib/${name}"; - description = '' + description = lib.mdDoc '' Working directory for the HedgeDoc service. ''; }; @@ -56,7 +56,7 @@ in type = types.nullOr types.str; default = null; example = "hedgedoc.org"; - description = '' + description = lib.mdDoc '' Domain name for the HedgeDoc instance. ''; }; @@ -64,14 +64,14 @@ in type = types.nullOr types.str; default = null; example = "/url/path/to/hedgedoc"; - description = '' + description = lib.mdDoc '' Path under which HedgeDoc is accessible. ''; }; host = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Address to listen on. ''; }; @@ -79,7 +79,7 @@ in type = types.int; default = 3000; example = 80; - description = '' + description = lib.mdDoc '' Port to listen on. ''; }; @@ -87,7 +87,7 @@ in type = types.nullOr types.str; default = null; example = "/run/hedgedoc.sock"; - description = '' + description = lib.mdDoc '' Specify where a UNIX domain socket should be placed. ''; }; @@ -95,44 +95,44 @@ in type = types.listOf types.str; default = []; example = [ "localhost" "hedgedoc.org" ]; - description = '' + description = lib.mdDoc '' List of domains to whitelist. ''; }; useSSL = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable to use SSL server. This will also enable - . + {option}`protocolUseSSL`. ''; }; hsts = { enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable HSTS if HTTPS is also enabled. ''; }; maxAgeSeconds = mkOption { type = types.int; default = 31536000; - description = '' + description = lib.mdDoc '' Max duration for clients to keep the HSTS status. ''; }; includeSubdomains = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to include subdomains in HSTS. ''; }; preload = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to allow preloading of the site's HSTS status. ''; }; @@ -150,40 +150,39 @@ in addDefaults = true; } ''; - description = '' + description = lib.mdDoc '' Specify the Content Security Policy which is passed to Helmet. - For configuration details see https://helmetjs.github.io/docs/csp/. + For configuration details see . ''; }; protocolUseSSL = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable to use TLS for resource paths. - This only applies when is set. + This only applies when {option}`domain` is set. ''; }; urlAddPort = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable to add the port to callback URLs. - This only applies when is set + This only applies when {option}`domain` is set and only for ports other than 80 and 443. ''; }; useCDN = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use CDN resources or not. ''; }; allowAnonymous = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to allow anonymous usage. ''; }; @@ -198,21 +197,21 @@ in allowFreeURL = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to allow note creation by accessing a nonexistent note URL. ''; }; requireFreeURLAuthentication = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to require authentication for FreeURL mode style note creation. ''; }; defaultPermission = mkOption { type = types.enum [ "freely" "editable" "limited" "locked" "private" ]; default = "editable"; - description = '' + description = lib.mdDoc '' Default permissions for notes. This only applies for signed-in users. ''; @@ -223,12 +222,12 @@ in example = '' postgres://user:pass@host:5432/dbname ''; - description = '' + description = lib.mdDoc '' Specify which database to use. HedgeDoc supports mysql, postgres, sqlite and mssql. - See - https://sequelize.readthedocs.io/en/v3/ for more information. - Note: This option overrides . + See [ + https://sequelize.readthedocs.io/en/v3/](https://sequelize.readthedocs.io/en/v3/) for more information. + Note: This option overrides {option}`db`. ''; }; db = mkOption { @@ -240,52 +239,52 @@ in storage = "/var/lib/${name}/db.${name}.sqlite"; } ''; - description = '' + description = lib.mdDoc '' Specify the configuration for sequelize. HedgeDoc supports mysql, postgres, sqlite and mssql. - See - https://sequelize.readthedocs.io/en/v3/ for more information. - Note: This option overrides . + See [ + https://sequelize.readthedocs.io/en/v3/](https://sequelize.readthedocs.io/en/v3/) for more information. + Note: This option overrides {option}`db`. ''; }; sslKeyPath= mkOption { type = types.nullOr types.str; default = null; example = "/var/lib/hedgedoc/hedgedoc.key"; - description = '' - Path to the SSL key. Needed when is enabled. + description = lib.mdDoc '' + Path to the SSL key. Needed when {option}`useSSL` is enabled. ''; }; sslCertPath = mkOption { type = types.nullOr types.str; default = null; example = "/var/lib/hedgedoc/hedgedoc.crt"; - description = '' - Path to the SSL cert. Needed when is enabled. + description = lib.mdDoc '' + Path to the SSL cert. Needed when {option}`useSSL` is enabled. ''; }; sslCAPath = mkOption { type = types.listOf types.str; default = []; example = [ "/var/lib/hedgedoc/ca.crt" ]; - description = '' - SSL ca chain. Needed when is enabled. + description = lib.mdDoc '' + SSL ca chain. Needed when {option}`useSSL` is enabled. ''; }; dhParamPath = mkOption { type = types.nullOr types.str; default = null; example = "/var/lib/hedgedoc/dhparam.pem"; - description = '' - Path to the SSL dh params. Needed when is enabled. + description = lib.mdDoc '' + Path to the SSL dh params. Needed when {option}`useSSL` is enabled. ''; }; tmpPath = mkOption { type = types.str; default = "/tmp"; - description = '' + description = lib.mdDoc '' Path to the temp directory HedgeDoc should use. - Note that is enabled for + Note that {option}`serviceConfig.PrivateTmp` is enabled for the HedgeDoc systemd service by default. (Non-canonical paths are relative to HedgeDoc's base directory) ''; @@ -293,7 +292,7 @@ in defaultNotePath = mkOption { type = types.nullOr types.str; default = "./public/default.md"; - description = '' + description = lib.mdDoc '' Path to the default Note file. (Non-canonical paths are relative to HedgeDoc's base directory) ''; @@ -301,7 +300,7 @@ in docsPath = mkOption { type = types.nullOr types.str; default = "./public/docs"; - description = '' + description = lib.mdDoc '' Path to the docs directory. (Non-canonical paths are relative to HedgeDoc's base directory) ''; @@ -309,7 +308,7 @@ in indexPath = mkOption { type = types.nullOr types.str; default = "./public/views/index.ejs"; - description = '' + description = lib.mdDoc '' Path to the index template file. (Non-canonical paths are relative to HedgeDoc's base directory) ''; @@ -317,7 +316,7 @@ in hackmdPath = mkOption { type = types.nullOr types.str; default = "./public/views/hackmd.ejs"; - description = '' + description = lib.mdDoc '' Path to the hackmd template file. (Non-canonical paths are relative to HedgeDoc's base directory) ''; @@ -326,7 +325,7 @@ in type = types.nullOr types.str; default = null; defaultText = literalExpression "./public/views/error.ejs"; - description = '' + description = lib.mdDoc '' Path to the error template file. (Non-canonical paths are relative to HedgeDoc's base directory) ''; @@ -335,7 +334,7 @@ in type = types.nullOr types.str; default = null; defaultText = literalExpression "./public/views/pretty.ejs"; - description = '' + description = lib.mdDoc '' Path to the pretty template file. (Non-canonical paths are relative to HedgeDoc's base directory) ''; @@ -344,7 +343,7 @@ in type = types.nullOr types.str; default = null; defaultText = literalExpression "./public/views/slide.hbs"; - description = '' + description = lib.mdDoc '' Path to the slide template file. (Non-canonical paths are relative to HedgeDoc's base directory) ''; @@ -353,21 +352,21 @@ in type = types.str; default = "${cfg.workDir}/uploads"; defaultText = literalExpression "/var/lib/${name}/uploads"; - description = '' + description = lib.mdDoc '' Path under which uploaded files are saved. ''; }; sessionName = mkOption { type = types.str; default = "connect.sid"; - description = '' + description = lib.mdDoc '' Specify the name of the session cookie. ''; }; sessionSecret = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Specify the secret used to sign the session cookie. If unset, one will be generated on startup. ''; @@ -375,56 +374,56 @@ in sessionLife = mkOption { type = types.int; default = 1209600000; - description = '' + description = lib.mdDoc '' Session life time in milliseconds. ''; }; heartbeatInterval = mkOption { type = types.int; default = 5000; - description = '' + description = lib.mdDoc '' Specify the socket.io heartbeat interval. ''; }; heartbeatTimeout = mkOption { type = types.int; default = 10000; - description = '' + description = lib.mdDoc '' Specify the socket.io heartbeat timeout. ''; }; documentMaxLength = mkOption { type = types.int; default = 100000; - description = '' + description = lib.mdDoc '' Specify the maximum document length. ''; }; email = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable email sign-in. ''; }; allowEmailRegister = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable email registration. ''; }; allowGravatar = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to use gravatar as profile picture source. ''; }; imageUploadType = mkOption { type = types.enum [ "imgur" "s3" "minio" "filesystem" ]; default = "filesystem"; - description = '' + description = lib.mdDoc '' Specify where to upload images. ''; }; @@ -433,85 +432,85 @@ in options = { accessKey = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Minio access key. ''; }; secretKey = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Minio secret key. ''; }; endPoint = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Minio endpoint. ''; }; port = mkOption { type = types.int; default = 9000; - description = '' + description = lib.mdDoc '' Minio listen port. ''; }; secure = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to use HTTPS for Minio. ''; }; }; }); default = null; - description = "Configure the minio third-party integration."; + description = lib.mdDoc "Configure the minio third-party integration."; }; s3 = mkOption { type = types.nullOr (types.submodule { options = { accessKeyId = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' AWS access key id. ''; }; secretAccessKey = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' AWS access key. ''; }; region = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' AWS S3 region. ''; }; }; }); default = null; - description = "Configure the s3 third-party integration."; + description = lib.mdDoc "Configure the s3 third-party integration."; }; s3bucket = mkOption { type = types.nullOr types.str; default = null; - description = '' - Specify the bucket name for upload types s3 and minio. + description = lib.mdDoc '' + Specify the bucket name for upload types `s3` and `minio`. ''; }; allowPDFExport = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable PDF exports. ''; }; imgur.clientId = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Imgur API client ID. ''; }; @@ -520,13 +519,13 @@ in options = { connectionString = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Azure Blob Storage connection string. ''; }; container = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Azure Blob Storage container name. It will be created if non-existent. ''; @@ -534,162 +533,162 @@ in }; }); default = null; - description = "Configure the azure third-party integration."; + description = lib.mdDoc "Configure the azure third-party integration."; }; oauth2 = mkOption { type = types.nullOr (types.submodule { options = { authorizationURL = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Specify the OAuth authorization URL. ''; }; tokenURL = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Specify the OAuth token URL. ''; }; baseURL = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specify the OAuth base URL. ''; }; userProfileURL = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specify the OAuth userprofile URL. ''; }; userProfileUsernameAttr = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specify the name of the attribute for the username from the claim. ''; }; userProfileDisplayNameAttr = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specify the name of the attribute for the display name from the claim. ''; }; userProfileEmailAttr = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specify the name of the attribute for the email from the claim. ''; }; scope = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specify the OAuth scope. ''; }; providerName = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specify the name to be displayed for this strategy. ''; }; rolesClaim = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specify the role claim name. ''; }; accessRole = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Specify role which should be included in the ID token roles claim to grant access ''; }; clientID = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Specify the OAuth client ID. ''; }; clientSecret = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Specify the OAuth client secret. ''; }; }; }); default = null; - description = "Configure the OAuth integration."; + description = lib.mdDoc "Configure the OAuth integration."; }; facebook = mkOption { type = types.nullOr (types.submodule { options = { clientID = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Facebook API client ID. ''; }; clientSecret = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Facebook API client secret. ''; }; }; }); default = null; - description = "Configure the facebook third-party integration"; + description = lib.mdDoc "Configure the facebook third-party integration"; }; twitter = mkOption { type = types.nullOr (types.submodule { options = { consumerKey = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Twitter API consumer key. ''; }; consumerSecret = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Twitter API consumer secret. ''; }; }; }); default = null; - description = "Configure the Twitter third-party integration."; + description = lib.mdDoc "Configure the Twitter third-party integration."; }; github = mkOption { type = types.nullOr (types.submodule { options = { clientID = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' GitHub API client ID. ''; }; clientSecret = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Github API client secret. ''; }; }; }); default = null; - description = "Configure the GitHub third-party integration."; + description = lib.mdDoc "Configure the GitHub third-party integration."; }; gitlab = mkOption { type = types.nullOr (types.submodule { @@ -697,27 +696,27 @@ in baseURL = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' GitLab API authentication endpoint. Only needed for other endpoints than gitlab.com. ''; }; clientID = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' GitLab API client ID. ''; }; clientSecret = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' GitLab API client secret. ''; }; scope = mkOption { type = types.enum [ "api" "read_user" ]; default = "api"; - description = '' + description = lib.mdDoc '' GitLab API requested scope. GitLab snippet import/export requires api scope. ''; @@ -725,79 +724,79 @@ in }; }); default = null; - description = "Configure the GitLab third-party integration."; + description = lib.mdDoc "Configure the GitLab third-party integration."; }; mattermost = mkOption { type = types.nullOr (types.submodule { options = { baseURL = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Mattermost authentication endpoint. ''; }; clientID = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Mattermost API client ID. ''; }; clientSecret = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Mattermost API client secret. ''; }; }; }); default = null; - description = "Configure the Mattermost third-party integration."; + description = lib.mdDoc "Configure the Mattermost third-party integration."; }; dropbox = mkOption { type = types.nullOr (types.submodule { options = { clientID = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Dropbox API client ID. ''; }; clientSecret = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Dropbox API client secret. ''; }; appKey = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Dropbox app key. ''; }; }; }); default = null; - description = "Configure the Dropbox third-party integration."; + description = lib.mdDoc "Configure the Dropbox third-party integration."; }; google = mkOption { type = types.nullOr (types.submodule { options = { clientID = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Google API client ID. ''; }; clientSecret = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Google API client secret. ''; }; }; }); default = null; - description = "Configure the Google third-party integration."; + description = lib.mdDoc "Configure the Google third-party integration."; }; ldap = mkOption { type = types.nullOr (types.submodule { @@ -805,76 +804,78 @@ in providerName = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Optional name to be displayed at login form, indicating the LDAP provider. ''; }; url = mkOption { type = types.str; example = "ldap://localhost"; - description = '' + description = lib.mdDoc '' URL of LDAP server. ''; }; bindDn = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Bind DN for LDAP access. ''; }; bindCredentials = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Bind credentials for LDAP access. ''; }; searchBase = mkOption { type = types.str; example = "o=users,dc=example,dc=com"; - description = '' + description = lib.mdDoc '' LDAP directory to begin search from. ''; }; searchFilter = mkOption { type = types.str; example = "(uid={{username}})"; - description = '' + description = lib.mdDoc '' LDAP filter to search with. ''; }; searchAttributes = mkOption { - type = types.listOf types.str; + type = types.nullOr (types.listOf types.str); + default = null; example = [ "displayName" "mail" ]; - description = '' + description = lib.mdDoc '' LDAP attributes to search with. ''; }; userNameField = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' LDAP field which is used as the username on HedgeDoc. - By default is used. + By default {option}`useridField` is used. ''; }; useridField = mkOption { type = types.str; example = "uid"; - description = '' + description = lib.mdDoc '' LDAP field which is a unique identifier for users on HedgeDoc. ''; }; tlsca = mkOption { type = types.str; + default = "/etc/ssl/certs/ca-certificates.crt"; example = "server-cert.pem,root.pem"; - description = '' + description = lib.mdDoc '' Root CA for LDAP TLS in PEM format. ''; }; }; }); default = null; - description = "Configure the LDAP integration."; + description = lib.mdDoc "Configure the LDAP integration."; }; saml = mkOption { type = types.nullOr (types.submodule { @@ -882,21 +883,21 @@ in idpSsoUrl = mkOption { type = types.str; example = "https://idp.example.com/sso"; - description = '' + description = lib.mdDoc '' IdP authentication endpoint. ''; }; idpCert = mkOption { type = types.path; example = "/path/to/cert.pem"; - description = '' + description = lib.mdDoc '' Path to IdP certificate file in PEM format. ''; }; issuer = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Optional identity of the service provider. This defaults to the server URL. ''; @@ -904,7 +905,7 @@ in identifierFormat = mkOption { type = types.str; default = "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"; - description = '' + description = lib.mdDoc '' Optional name identifier format. ''; }; @@ -912,7 +913,7 @@ in type = types.str; default = ""; example = "memberOf"; - description = '' + description = lib.mdDoc '' Optional attribute name for group list. ''; }; @@ -920,7 +921,7 @@ in type = types.listOf types.str; default = []; example = [ "Temporary-staff" "External-users" ]; - description = '' + description = lib.mdDoc '' Excluded group names. ''; }; @@ -928,7 +929,7 @@ in type = types.listOf types.str; default = []; example = [ "Hedgedoc-Users" ]; - description = '' + description = lib.mdDoc '' Required group names. ''; }; @@ -963,16 +964,16 @@ in }; }); default = null; - description = "Configure the SAML integration."; + description = lib.mdDoc "Configure the SAML integration."; }; }; in lib.mkOption { type = lib.types.submodule { freeformType = settingsFormat.type; inherit options; }; - description = '' + description = lib.mdDoc '' HedgeDoc configuration, see - + for documentation. ''; }; @@ -1011,7 +1012,7 @@ in type = types.package; default = pkgs.hedgedoc; defaultText = literalExpression "pkgs.hedgedoc"; - description = '' + description = lib.mdDoc '' Package that provides HedgeDoc. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix index 4f6a34e6d2..4f02a637cd 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/hledger-web.nix @@ -12,7 +12,7 @@ in { host = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' Address to listen on. ''; }; @@ -21,7 +21,7 @@ in { type = types.port; default = 5000; example = 80; - description = '' + description = lib.mdDoc '' Port to listen on. ''; }; @@ -30,21 +30,21 @@ in { view = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Enable the view capability. ''; }; add = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the add capability. ''; }; manage = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable the manage capability. ''; }; @@ -53,7 +53,7 @@ in { stateDir = mkOption { type = types.path; default = "/var/lib/hledger-web"; - description = '' + description = lib.mdDoc '' Path the service has access to. If left as the default value this directory will automatically be created before the hledger-web server starts, otherwise the sysadmin is responsible for ensuring the @@ -64,8 +64,8 @@ in { journalFiles = mkOption { type = types.listOf types.str; default = [ ".hledger.journal" ]; - description = '' - Paths to journal files relative to . + description = lib.mdDoc '' + Paths to journal files relative to {option}`services.hledger-web.stateDir`. ''; }; @@ -73,7 +73,7 @@ in { type = with types; nullOr str; default = null; example = "https://example.org"; - description = '' + description = lib.mdDoc '' Base URL, when sharing over a network. ''; }; @@ -82,7 +82,7 @@ in { type = types.listOf types.str; default = []; example = [ "--forecast" ]; - description = '' + description = lib.mdDoc '' Extra command line arguments to pass to hledger-web. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix index b9761061aa..b96baaec76 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/icingaweb2.nix @@ -17,7 +17,7 @@ in { pool = mkOption { type = str; default = poolName; - description = '' + description = lib.mdDoc '' Name of existing PHP-FPM pool that is used to run Icingaweb2. If not specified, a pool will automatically created with default values. ''; @@ -26,7 +26,7 @@ in { libraryPaths = mkOption { type = attrsOf package; default = { }; - description = '' + description = lib.mdDoc '' Libraries to add to the Icingaweb2 library path. The name of the attribute is the name of the library, the value is the package to add. @@ -36,7 +36,7 @@ in { virtualHost = mkOption { type = nullOr str; default = "icingaweb2"; - description = '' + description = lib.mdDoc '' Name of the nginx virtualhost to use and setup. If null, no virtualhost is set up. ''; }; @@ -45,7 +45,7 @@ in { type = str; default = "UTC"; example = "Europe/Berlin"; - description = "PHP-compliant timezone specification"; + description = lib.mdDoc "PHP-compliant timezone specification"; }; modules = { @@ -64,7 +64,7 @@ in { "snow" = icingaweb2Modules.theme-snow; } ''; - description = '' + description = lib.mdDoc '' Name-package attrset of Icingaweb 2 modules packages to enable. If you enable modules manually (e.g. via the web ui), they will not be touched. @@ -84,7 +84,7 @@ in { level = "CRITICAL"; }; }; - description = '' + description = lib.mdDoc '' config.ini contents. Will automatically be converted to a .ini file. If you don't set global.module_path, the module will take care of it. @@ -108,7 +108,7 @@ in { dbname = "icingaweb2"; }; }; - description = '' + description = lib.mdDoc '' resources.ini contents. Will automatically be converted to a .ini file. @@ -127,7 +127,7 @@ in { resource = "icingaweb_db"; }; }; - description = '' + description = lib.mdDoc '' authentication.ini contents. Will automatically be converted to a .ini file. @@ -145,7 +145,7 @@ in { resource = "icingaweb_db"; }; }; - description = '' + description = lib.mdDoc '' groups.ini contents. Will automatically be converted to a .ini file. @@ -163,7 +163,7 @@ in { permissions = "*"; }; }; - description = '' + description = lib.mdDoc '' roles.ini contents. Will automatically be converted to a .ini file. diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix index e9c1d4ffe5..0579c60221 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/icingaweb2/module-monitoring.nix @@ -34,32 +34,32 @@ in { enable = mkOption { type = bool; default = true; - description = "Whether to enable the icingaweb2 monitoring module."; + description = lib.mdDoc "Whether to enable the icingaweb2 monitoring module."; }; generalConfig = { mutable = mkOption { type = bool; default = false; - description = "Make config.ini of the monitoring module mutable (e.g. via the web interface)."; + description = lib.mdDoc "Make config.ini of the monitoring module mutable (e.g. via the web interface)."; }; protectedVars = mkOption { type = listOf str; default = [ "*pw*" "*pass*" "community" ]; - description = "List of string patterns for custom variables which should be excluded from user’s view."; + description = lib.mdDoc "List of string patterns for custom variables which should be excluded from user’s view."; }; }; mutableBackends = mkOption { type = bool; default = false; - description = "Make backends.ini of the monitoring module mutable (e.g. via the web interface)."; + description = lib.mdDoc "Make backends.ini of the monitoring module mutable (e.g. via the web interface)."; }; backends = mkOption { default = { icinga = { resource = "icinga_ido"; }; }; - description = "Monitoring backends to define"; + description = lib.mdDoc "Monitoring backends to define"; type = attrsOf (submodule ({ name, ... }: { options = { name = mkOption { @@ -71,13 +71,13 @@ in { resource = mkOption { type = str; - description = "Name of the IDO resource"; + description = lib.mdDoc "Name of the IDO resource"; }; disabled = mkOption { type = bool; default = false; - description = "Disable this backend"; + description = lib.mdDoc "Disable this backend"; }; }; })); @@ -86,12 +86,12 @@ in { mutableTransports = mkOption { type = bool; default = true; - description = "Make commandtransports.ini of the monitoring module mutable (e.g. via the web interface)."; + description = lib.mdDoc "Make commandtransports.ini of the monitoring module mutable (e.g. via the web interface)."; }; transports = mkOption { default = {}; - description = "Command transports to define"; + description = lib.mdDoc "Command transports to define"; type = attrsOf (submodule ({ name, ... }: { options = { name = mkOption { @@ -104,44 +104,44 @@ in { type = mkOption { type = enum [ "api" "local" "remote" ]; default = "api"; - description = "Type of this transport"; + description = lib.mdDoc "Type of this transport"; }; instance = mkOption { type = nullOr str; default = null; - description = "Assign a icinga instance to this transport"; + description = lib.mdDoc "Assign a icinga instance to this transport"; }; path = mkOption { type = str; - description = "Path to the socket for local or remote transports"; + description = lib.mdDoc "Path to the socket for local or remote transports"; }; host = mkOption { type = str; - description = "Host for the api or remote transport"; + description = lib.mdDoc "Host for the api or remote transport"; }; port = mkOption { type = nullOr str; default = null; - description = "Port to connect to for the api or remote transport"; + description = lib.mdDoc "Port to connect to for the api or remote transport"; }; username = mkOption { type = str; - description = "Username for the api or remote transport"; + description = lib.mdDoc "Username for the api or remote transport"; }; password = mkOption { type = str; - description = "Password for the api transport"; + description = lib.mdDoc "Password for the api transport"; }; resource = mkOption { type = str; - description = "SSH identity resource for the remote transport"; + description = lib.mdDoc "SSH identity resource for the remote transport"; }; }; })); diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/ihatemoney/default.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/ihatemoney/default.nix index ad314c885b..c771f0afa2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/ihatemoney/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/ihatemoney/default.nix @@ -51,42 +51,42 @@ in backend = mkOption { type = types.enum [ "sqlite" "postgresql" ]; default = "sqlite"; - description = '' + description = lib.mdDoc '' The database engine to use for ihatemoney. - If postgresql is selected, then a database called - ${db} will be created. If you disable this option, + If `postgresql` is selected, then a database called + `${db}` will be created. If you disable this option, it will however not be removed. ''; }; adminHashedPassword = mkOption { type = types.nullOr types.str; default = null; - description = "The hashed password of the administrator. To obtain it, run ihatemoney generate_password_hash"; + description = lib.mdDoc "The hashed password of the administrator. To obtain it, run `ihatemoney generate_password_hash`"; }; uwsgiConfig = mkOption { type = types.attrs; example = { http = ":8000"; }; - description = "Additionnal configuration of the UWSGI vassal running ihatemoney. It should notably specify on which interfaces and ports the vassal should listen."; + description = lib.mdDoc "Additionnal configuration of the UWSGI vassal running ihatemoney. It should notably specify on which interfaces and ports the vassal should listen."; }; defaultSender = { name = mkOption { type = types.str; default = "Budget manager"; - description = "The display name of the sender of ihatemoney emails"; + description = lib.mdDoc "The display name of the sender of ihatemoney emails"; }; email = mkOption { type = types.str; default = "ihatemoney@${config.networking.hostName}"; defaultText = literalExpression ''"ihatemoney@''${config.networking.hostName}"''; - description = "The email of the sender of ihatemoney emails"; + description = lib.mdDoc "The email of the sender of ihatemoney emails"; }; }; secureCookie = mkOption { type = types.bool; default = true; - description = "Use secure cookies. Disable this when ihatemoney is served via http instead of https"; + description = lib.mdDoc "Use secure cookies. Disable this when ihatemoney is served via http instead of https"; }; enableDemoProject = mkEnableOption "access to the demo project in ihatemoney"; enablePublicProjectCreation = mkEnableOption "permission to create projects in ihatemoney by anyone"; @@ -95,12 +95,12 @@ in legalLink = mkOption { type = types.nullOr types.str; default = null; - description = "The URL to a page explaining legal statements about your service, eg. GDPR-related information."; + description = lib.mdDoc "The URL to a page explaining legal statements about your service, eg. GDPR-related information."; }; extraConfig = mkOption { type = types.str; default = ""; - description = "Extra configuration appended to ihatemoney's configuration file. It is a python file, so pay attention to indentation."; + description = lib.mdDoc "Extra configuration appended to ihatemoney's configuration file. It is a python file, so pay attention to indentation."; }; }; config = mkIf cfg.enable { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix index 10b30bf1fd..0b9d9b03c6 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/invidious.nix @@ -152,27 +152,27 @@ in type = types.package; default = pkgs.invidious; defaultText = "pkgs.invidious"; - description = "The Invidious package to use."; + description = lib.mdDoc "The Invidious package to use."; }; settings = lib.mkOption { type = settingsFormat.type; default = { }; - description = '' + description = lib.mdDoc '' The settings Invidious should use. - See config.example.yml for a list of all possible options. + See [config.example.yml](https://github.com/iv-org/invidious/blob/master/config/config.example.yml) for a list of all possible options. ''; }; extraSettingsFile = lib.mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' A file including Invidious settings. - It gets merged with the setttings specified in - and can be used to store secrets like hmac_key outside of the nix store. + It gets merged with the setttings specified in {option}`services.invidious.settings` + and can be used to store secrets like `hmac_key` outside of the nix store. ''; }; @@ -182,7 +182,7 @@ in domain = lib.mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The FQDN Invidious is reachable on. This is used to configure nginx and for building absolute URLs. @@ -193,12 +193,12 @@ in type = types.port; # Default from https://docs.invidious.io/Configuration.md default = 3000; - description = '' + description = lib.mdDoc '' The port Invidious should listen on. To allow access from outside, - you can use either - or add config.services.invidious.port to . + you can use either {option}`services.invidious.nginx` + or add `config.services.invidious.port` to {option}`networking.firewall.allowedTCPPorts`. ''; }; @@ -206,7 +206,7 @@ in createLocally = lib.mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to create a local database with PostgreSQL. ''; }; @@ -214,10 +214,10 @@ in host = lib.mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The database host Invidious should use. - If null, the local unix socket is used. Otherwise + If `null`, the local unix socket is used. Otherwise TCP is used. ''; }; @@ -226,7 +226,7 @@ in type = types.port; default = options.services.postgresql.port.default; defaultText = lib.literalExpression "options.services.postgresql.port.default"; - description = '' + description = lib.mdDoc '' The port of the database Invidious should use. Defaults to the the default postgresql port. @@ -237,7 +237,7 @@ in type = types.nullOr types.str; apply = lib.mapNullable toString; default = null; - description = '' + description = lib.mdDoc '' Path to file containing the database password. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix index 527e248f65..2a936027bd 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/invoiceplane.nix @@ -72,7 +72,7 @@ let stateDir = mkOption { type = types.path; default = "/var/lib/invoiceplane/${name}"; - description = '' + description = lib.mdDoc '' This directory is used for uploads of attachements and cache. The directory passed here is automatically created and permissions adjusted as required. @@ -83,41 +83,41 @@ let host = mkOption { type = types.str; default = "localhost"; - description = "Database host address."; + description = lib.mdDoc "Database host address."; }; port = mkOption { type = types.port; default = 3306; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = mkOption { type = types.str; default = "invoiceplane"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = mkOption { type = types.str; default = "invoiceplane"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; example = "/run/keys/invoiceplane-dbpassword"; - description = '' + description = lib.mdDoc '' A file containing the password corresponding to - . + {option}`database.user`. ''; }; createLocally = mkOption { type = types.bool; default = true; - description = "Create the database and database user locally."; + description = lib.mdDoc "Create the database and database user locally."; }; }; @@ -160,8 +160,8 @@ let "pm.max_spare_servers" = 4; "pm.max_requests" = 500; }; - description = '' - Options for the InvoicePlane PHP pool. See the documentation on php-fpm.conf + description = lib.mdDoc '' + Options for the InvoicePlane PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives. ''; }; @@ -174,9 +174,9 @@ let DISABLE_SETUP=true IP_URL=https://invoice.example.com ''; - description = '' + description = lib.mdDoc '' InvoicePlane configuration. Refer to - + for details on supported values. ''; }; @@ -194,20 +194,20 @@ in options.sites = mkOption { type = types.attrsOf (types.submodule siteOpts); default = {}; - description = "Specification of one or more WordPress sites to serve"; + description = lib.mdDoc "Specification of one or more WordPress sites to serve"; }; options.webserver = mkOption { type = types.enum [ "caddy" ]; default = "caddy"; - description = '' + description = lib.mdDoc '' Which webserver to use for virtual host management. Currently only caddy is supported. ''; }; }; default = {}; - description = "InvoicePlane configuration."; + description = lib.mdDoc "InvoicePlane configuration."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix index 8ad92706b0..b38a510bb8 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/jitsi-meet.nix @@ -51,7 +51,7 @@ in hostName = mkOption { type = str; example = "meet.example.org"; - description = '' + description = lib.mdDoc '' FQDN of the Jitsi Meet instance. ''; }; @@ -65,10 +65,10 @@ in defaultLang = "fi"; } ''; - description = '' - Client-side web application settings that override the defaults in config.js. + description = lib.mdDoc '' + Client-side web application settings that override the defaults in {file}`config.js`. - See for default + See for default configuration with comments. ''; }; @@ -76,8 +76,8 @@ in extraConfig = mkOption { type = lines; default = ""; - description = '' - Text to append to config.js web application config file. + description = lib.mdDoc '' + Text to append to {file}`config.js` web application config file. Can be used to insert JavaScript logic to determine user's region in cascading bridges setup. ''; @@ -92,10 +92,10 @@ in SHOW_WATERMARK_FOR_GUESTS = false; } ''; - description = '' - Client-side web-app interface settings that override the defaults in interface_config.js. + description = lib.mdDoc '' + Client-side web-app interface settings that override the defaults in {file}`interface_config.js`. - See for + See for default configuration with comments. ''; }; @@ -104,10 +104,10 @@ in enable = mkOption { type = bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable Jitsi Videobridge instance and configure it to connect to Prosody. - Additional configuration is possible with . + Additional configuration is possible with {option}`services.jitsi-videobridge`. ''; }; @@ -115,10 +115,10 @@ in type = nullOr str; default = null; example = "/run/keys/videobridge"; - description = '' + description = lib.mdDoc '' File containing password to the Prosody account for videobridge. - If null, a file with password will be generated automatically. Setting + If `null`, a file with password will be generated automatically. Setting this option is useful if you plan to connect additional videobridges to the XMPP server. ''; }; @@ -127,35 +127,35 @@ in jicofo.enable = mkOption { type = bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable JiCoFo instance and configure it to connect to Prosody. - Additional configuration is possible with . + Additional configuration is possible with {option}`services.jicofo`. ''; }; jibri.enable = mkOption { type = bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable a Jibri instance and configure it to connect to Prosody. - Additional configuration is possible with , and - is especially useful. + Additional configuration is possible with {option}`services.jibri`, and + {option}`services.jibri.finalizeScript` is especially useful. ''; }; nginx.enable = mkOption { type = bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable nginx virtual host that will serve the javascript application and act as a proxy for the XMPP server. Further nginx configuration can be done by adapting - . + {option}`services.nginx.virtualHosts.`. When this is enabled, ACME will be used to retrieve a TLS certificate by default. To disable - this, set the to - false and if appropriate do the same for - . + this, set the {option}`services.nginx.virtualHosts..enableACME` to + `false` and if appropriate do the same for + {option}`services.nginx.virtualHosts..forceSSL`. ''; }; @@ -164,7 +164,7 @@ in prosody.enable = mkOption { type = bool; default = true; - description = '' + description = lib.mdDoc '' Whether to configure Prosody to relay XMPP messages between Jitsi Meet components. Turn this off if you want to configure it manually. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix index a1855e1c1a..c1091bc09a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix @@ -98,7 +98,7 @@ in type = bool; default = false; example = true; - description = '' + description = lib.mdDoc '' Whether to enable the Keycloak identity and access management server. ''; @@ -109,7 +109,7 @@ in default = null; example = "/run/keys/ssl_cert"; apply = assertStringPath "sslCertificate"; - description = '' + description = lib.mdDoc '' The path to a PEM formatted certificate to use for TLS/SSL connections. ''; @@ -120,7 +120,7 @@ in default = null; example = "/run/keys/ssl_key"; apply = assertStringPath "sslCertificateKey"; - description = '' + description = lib.mdDoc '' The path to a PEM formatted private key to use for TLS/SSL connections. ''; @@ -129,10 +129,10 @@ in plugins = lib.mkOption { type = lib.types.listOf lib.types.path; default = [ ]; - description = '' + description = lib.mdDoc '' Keycloak plugin jar, ear files or derivations containing them. Packaged plugins are available through - pkgs.keycloak.plugins. + `pkgs.keycloak.plugins`. ''; }; @@ -141,7 +141,7 @@ in type = enum [ "mysql" "mariadb" "postgresql" ]; default = "postgresql"; example = "mariadb"; - description = '' + description = lib.mdDoc '' The type of database Keycloak should connect to. ''; }; @@ -149,7 +149,7 @@ in host = mkOption { type = str; default = "localhost"; - description = '' + description = lib.mdDoc '' Hostname of the database to connect to. ''; }; @@ -166,7 +166,7 @@ in type = port; default = dbPorts.${cfg.database.type}; defaultText = literalDocBook "default port of selected database"; - description = '' + description = lib.mdDoc '' Port of the database to connect to. ''; }; @@ -175,7 +175,7 @@ in type = bool; default = cfg.database.host != "localhost"; defaultText = literalExpression ''config.${opt.database.host} != "localhost"''; - description = '' + description = lib.mdDoc '' Whether the database connection should be secured by SSL / TLS. ''; @@ -184,13 +184,13 @@ in caCert = mkOption { type = nullOr path; default = null; - description = '' + description = lib.mdDoc '' The SSL / TLS CA certificate that verifies the identity of the database server. Required when PostgreSQL is used and SSL is turned on. - For MySQL, if left at null, the default + For MySQL, if left at `null`, the default Java keystore is used, which should suffice if the server certificate is issued by an official CA. ''; @@ -199,7 +199,7 @@ in createLocally = mkOption { type = bool; default = true; - description = '' + description = lib.mdDoc '' Whether a database should be automatically created on the local host. Set this to false if you plan on provisioning a local database yourself. This has no effect if @@ -210,14 +210,13 @@ in name = mkOption { type = str; default = "keycloak"; - description = '' + description = lib.mdDoc '' Database name to use when connecting to an external or manually provisioned database; has no effect when a local database is automatically provisioned. - To use this with a local database, set to - false and create the database and user + To use this with a local database, set [](#opt-services.keycloak.database.createLocally) to + `false` and create the database and user manually. ''; }; @@ -225,14 +224,13 @@ in username = mkOption { type = str; default = "keycloak"; - description = '' + description = lib.mdDoc '' Username to use when connecting to an external or manually provisioned database; has no effect when a local database is automatically provisioned. - To use this with a local database, set to - false and create the database and user + To use this with a local database, set [](#opt-services.keycloak.database.createLocally) to + `false` and create the database and user manually. ''; }; @@ -241,7 +239,7 @@ in type = path; example = "/run/keys/db_password"; apply = assertStringPath "passwordFile"; - description = '' + description = lib.mdDoc '' The path to a file containing the database password. ''; }; @@ -251,7 +249,7 @@ in type = package; default = pkgs.keycloak; defaultText = literalExpression "pkgs.keycloak"; - description = '' + description = lib.mdDoc '' Keycloak package to use. ''; }; @@ -259,8 +257,8 @@ in initialAdminPassword = mkOption { type = str; default = "changeme"; - description = '' - Initial password set for the admin + description = lib.mdDoc '' + Initial password set for the `admin` user. The password is not stored safely and should be changed immediately in the admin panel. ''; @@ -269,13 +267,13 @@ in themes = mkOption { type = attrsOf package; default = { }; - description = '' + description = lib.mdDoc '' Additional theme packages for Keycloak. Each theme is linked into subdirectory with a corresponding attribute name. Theme packages consist of several subdirectories which provide - different theme types: for example, account, - login etc. After adding a theme to this option you + different theme types: for example, `account`, + `login` etc. After adding a theme to this option you can select it by its name in Keycloak administration console. ''; }; @@ -289,7 +287,7 @@ in type = str; default = "0.0.0.0"; example = "127.0.0.1"; - description = '' + description = lib.mdDoc '' On which address Keycloak should accept new connections. ''; }; @@ -298,7 +296,7 @@ in type = port; default = 80; example = 8080; - description = '' + description = lib.mdDoc '' On which port Keycloak should listen for new HTTP connections. ''; }; @@ -307,7 +305,7 @@ in type = port; default = 443; example = 8443; - description = '' + description = lib.mdDoc '' On which port Keycloak should listen for new HTTPS connections. ''; }; @@ -329,10 +327,8 @@ in want to set this to /auth to keep compatibility with your clients. - See for more information on migrating from Wildfly - to Quarkus. + See + for more information on migrating from Wildfly to Quarkus. ''; @@ -341,11 +337,11 @@ in hostname = mkOption { type = str; example = "keycloak.example.com"; - description = '' + description = lib.mdDoc '' The hostname part of the public URL used as base for all frontend requests. - See + See for more information about hostname configuration. ''; }; @@ -354,14 +350,14 @@ in type = bool; default = false; example = true; - description = '' + description = lib.mdDoc '' 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. - See + See for more information about hostname configuration. ''; }; @@ -404,9 +400,7 @@ in - See for more information. + See for more information. ''; }; }; @@ -421,22 +415,21 @@ in } ''; - description = '' + description = lib.mdDoc '' Configuration options corresponding to parameters set in - conf/keycloak.conf. + {file}`conf/keycloak.conf`. - Most available options are documented at . + Most available options are documented at . Options containing secret data should be set to an attribute - set containing the attribute _secret - a + set containing the attribute `_secret` - a string pointing to a file containing the value the option should be set to. See the example to get a better picture of this: in the resulting - conf/keycloak.conf file, the - https-key-store-password key will be set + {file}`conf/keycloak.conf` file, the + `https-key-store-password` key will be set to the contents of the - /run/keys/store_password file. + {file}`/run/keys/store_password` file. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix index 7cd2357c45..3e726149e9 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/lemmy.nix @@ -16,14 +16,14 @@ in jwtSecretPath = mkOption { type = types.path; - description = "Path to read the jwt secret from."; + description = lib.mdDoc "Path to read the jwt secret from."; }; ui = { port = mkOption { type = types.port; default = 1234; - description = "Port where lemmy-ui should listen for incoming requests."; + description = lib.mdDoc "Port where lemmy-ui should listen for incoming requests."; }; }; @@ -31,7 +31,7 @@ in settings = mkOption { default = { }; - description = "Lemmy configuration"; + description = lib.mdDoc "Lemmy configuration"; type = types.submodule { freeformType = settingsFormat.type; @@ -39,13 +39,13 @@ in options.hostname = mkOption { type = types.str; default = null; - description = "The domain name of your instance (eg 'lemmy.ml')."; + description = lib.mdDoc "The domain name of your instance (eg 'lemmy.ml')."; }; options.port = mkOption { type = types.port; default = 8536; - description = "Port where lemmy should listen for incoming requests."; + description = lib.mdDoc "Port where lemmy should listen for incoming requests."; }; options.federation = { @@ -56,12 +56,12 @@ in enabled = mkOption { type = types.bool; default = true; - description = "Enable Captcha."; + description = lib.mdDoc "Enable Captcha."; }; difficulty = mkOption { type = types.enum [ "easy" "medium" "hard" ]; default = "medium"; - description = "The difficultly of the captcha to solve."; + description = lib.mdDoc "The difficultly of the captcha to solve."; }; }; @@ -164,7 +164,7 @@ in wantedBy = [ "multi-user.target" ]; - after = [ "pict-rs.service " ] ++ lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ]; + after = [ "pict-rs.service" ] ++ lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ]; requires = lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix index 03adaadff9..d0594ff741 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mastodon.nix @@ -113,17 +113,17 @@ in { affect other virtualHosts running on your nginx instance, if any. Alternatively you can configure a reverse-proxy of your choice to serve these paths: - / -> $(nix-instantiate --eval '<nixpkgs>' -A mastodon.outPath)/public + / -> $(nix-instantiate --eval '<nixpkgs>' -A mastodon.outPath)/public - / -> 127.0.0.1:{{ webPort }} (If there was no file in the directory above.) + / -> 127.0.0.1:{{ webPort }} (If there was no file in the directory above.) - /system/ -> /var/lib/mastodon/public-system/ + /system/ -> /var/lib/mastodon/public-system/ - /api/v1/streaming/ -> 127.0.0.1:{{ streamingPort }} + /api/v1/streaming/ -> 127.0.0.1:{{ streamingPort }} Make sure that websockets are forwarded properly. You might want to set up caching of some requests. Take a look at mastodon's provided nginx configuration at - https://github.com/mastodon/mastodon/blob/master/dist/nginx.conf. + https://github.com/mastodon/mastodon/blob/master/dist/nginx.conf. ''; type = lib.types.bool; default = false; @@ -135,20 +135,20 @@ in { that user will be created, otherwise it should be set to the name of a user created elsewhere. In both cases, mastodon and a package containing only - the shell script mastodon-env will be added to + the shell script mastodon-env will be added to the user's package set. To run a command from - mastodon such as tootctl + mastodon such as tootctl with the environment configured by this module use - mastodon-env, as in: + mastodon-env, as in: - mastodon-env tootctl accounts create newuser --email newuser@example.com + mastodon-env tootctl accounts create newuser --email newuser@example.com ''; type = lib.types.str; default = "mastodon"; }; group = lib.mkOption { - description = '' + description = lib.mdDoc '' Group under which mastodon runs. ''; type = lib.types.str; @@ -156,12 +156,12 @@ in { }; streamingPort = lib.mkOption { - description = "TCP port used by the mastodon-streaming service."; + description = lib.mdDoc "TCP port used by the mastodon-streaming service."; type = lib.types.port; default = 55000; }; streamingProcesses = lib.mkOption { - description = '' + description = lib.mdDoc '' Processes used by the mastodon-streaming service. Defaults to the number of CPU cores minus one. ''; @@ -170,41 +170,41 @@ in { }; webPort = lib.mkOption { - description = "TCP port used by the mastodon-web service."; + description = lib.mdDoc "TCP port used by the mastodon-web service."; type = lib.types.port; default = 55001; }; webProcesses = lib.mkOption { - description = "Processes used by the mastodon-web service."; + description = lib.mdDoc "Processes used by the mastodon-web service."; type = lib.types.int; default = 2; }; webThreads = lib.mkOption { - description = "Threads per process used by the mastodon-web service."; + description = lib.mdDoc "Threads per process used by the mastodon-web service."; type = lib.types.int; default = 5; }; sidekiqPort = lib.mkOption { - description = "TCP port used by the mastodon-sidekiq service."; + description = lib.mdDoc "TCP port used by the mastodon-sidekiq service."; type = lib.types.port; default = 55002; }; sidekiqThreads = lib.mkOption { - description = "Worker threads used by the mastodon-sidekiq service."; + description = lib.mdDoc "Worker threads used by the mastodon-sidekiq service."; type = lib.types.int; default = 25; }; vapidPublicKeyFile = lib.mkOption { - description = '' + description = lib.mdDoc '' Path to file containing the public key used for Web Push Voluntary Application Server Identification. A new keypair can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys + `nix build -f '' mastodon; cd result; bin/rake webpush:generate_keys` - If does not + If {option}`mastodon.vapidPrivateKeyFile`does not exist, it and this file will be created with a new keypair. ''; default = "/var/lib/mastodon/secrets/vapid-public-key"; @@ -212,17 +212,17 @@ in { }; localDomain = lib.mkOption { - description = "The domain serving your Mastodon instance."; + description = lib.mdDoc "The domain serving your Mastodon instance."; example = "social.example.org"; type = lib.types.str; }; secretKeyBaseFile = lib.mkOption { - description = '' + description = lib.mdDoc '' Path to file containing the secret key base. A new secret key base can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret + `nix build -f '' mastodon; cd result; bin/rake secret` If this file does not exist, it will be created with a new secret key base. ''; @@ -231,11 +231,11 @@ in { }; otpSecretFile = lib.mkOption { - description = '' + description = lib.mdDoc '' Path to file containing the OTP secret. A new OTP secret can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake secret + `nix build -f '' mastodon; cd result; bin/rake secret` If this file does not exist, it will be created with a new OTP secret. ''; @@ -244,12 +244,12 @@ in { }; vapidPrivateKeyFile = lib.mkOption { - description = '' + description = lib.mdDoc '' Path to file containing the private key used for Web Push Voluntary Application Server Identification. A new keypair can be generated by running: - nix build -f '<nixpkgs>' mastodon; cd result; bin/rake webpush:generate_keys + `nix build -f '' mastodon; cd result; bin/rake webpush:generate_keys` If this file does not exist, it will be created with a new private key. @@ -259,7 +259,7 @@ in { }; trustedProxy = lib.mkOption { - description = '' + description = lib.mdDoc '' You need to set it to the IP from which your reverse proxy sends requests to Mastodon's web process, otherwise Mastodon will record the reverse proxy's own IP as the IP of all requests, which would be bad because IP addresses are used for important rate limits and security functions. @@ -269,7 +269,7 @@ in { }; enableUnixSocket = lib.mkOption { - description = '' + description = lib.mdDoc '' Instead of binding to an IP address like 127.0.0.1, you may bind to a Unix socket. This variable is process-specific, e.g. you need different values for every process, and it works for both web (Puma) processes and streaming API (Node.js) processes. @@ -280,19 +280,19 @@ in { redis = { createLocally = lib.mkOption { - description = "Configure local Redis server for Mastodon."; + description = lib.mdDoc "Configure local Redis server for Mastodon."; type = lib.types.bool; default = true; }; host = lib.mkOption { - description = "Redis host."; + description = lib.mdDoc "Redis host."; type = lib.types.str; default = "127.0.0.1"; }; port = lib.mkOption { - description = "Redis port."; + description = lib.mdDoc "Redis port."; type = lib.types.port; default = 31637; }; @@ -300,7 +300,7 @@ in { database = { createLocally = lib.mkOption { - description = "Configure local PostgreSQL database server for Mastodon."; + description = lib.mdDoc "Configure local PostgreSQL database server for Mastodon."; type = lib.types.bool; default = true; }; @@ -309,75 +309,75 @@ in { type = lib.types.str; default = "/run/postgresql"; example = "192.168.23.42"; - description = "Database host address or unix socket."; + description = lib.mdDoc "Database host address or unix socket."; }; port = lib.mkOption { type = lib.types.int; default = 5432; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = lib.mkOption { type = lib.types.str; default = "mastodon"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = lib.mkOption { type = lib.types.str; default = "mastodon"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; passwordFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = "/var/lib/mastodon/secrets/db-password"; example = "/run/keys/mastodon-db-password"; - description = '' + description = lib.mdDoc '' A file containing the password corresponding to - . + {option}`database.user`. ''; }; }; smtp = { createLocally = lib.mkOption { - description = "Configure local Postfix SMTP server for Mastodon."; + description = lib.mdDoc "Configure local Postfix SMTP server for Mastodon."; type = lib.types.bool; default = true; }; authenticate = lib.mkOption { - description = "Authenticate with the SMTP server using username and password."; + description = lib.mdDoc "Authenticate with the SMTP server using username and password."; type = lib.types.bool; default = false; }; host = lib.mkOption { - description = "SMTP host used when sending emails to users."; + description = lib.mdDoc "SMTP host used when sending emails to users."; type = lib.types.str; default = "127.0.0.1"; }; port = lib.mkOption { - description = "SMTP port used when sending emails to users."; + description = lib.mdDoc "SMTP port used when sending emails to users."; type = lib.types.port; default = 25; }; fromAddress = lib.mkOption { - description = ''"From" address used when sending Emails to users.''; + description = lib.mdDoc ''"From" address used when sending Emails to users.''; type = lib.types.str; }; user = lib.mkOption { - description = "SMTP login name."; + description = lib.mdDoc "SMTP login name."; type = lib.types.str; }; passwordFile = lib.mkOption { - description = '' + description = lib.mdDoc '' Path to file containing the SMTP password. ''; default = "/var/lib/mastodon/secrets/smtp-password"; @@ -388,7 +388,7 @@ in { elasticsearch = { host = lib.mkOption { - description = '' + description = lib.mdDoc '' Elasticsearch host. If it is not null, Elasticsearch full text search will be enabled. ''; @@ -397,7 +397,7 @@ in { }; port = lib.mkOption { - description = "Elasticsearch port."; + description = lib.mdDoc "Elasticsearch port."; type = lib.types.port; default = 9200; }; @@ -407,13 +407,13 @@ in { type = lib.types.package; default = pkgs.mastodon; defaultText = lib.literalExpression "pkgs.mastodon"; - description = "Mastodon package to use."; + description = lib.mdDoc "Mastodon package to use."; }; extraConfig = lib.mkOption { type = lib.types.attrs; default = {}; - description = '' + description = lib.mdDoc '' Extra environment variables to pass to all mastodon services. ''; }; @@ -421,7 +421,7 @@ in { automaticMigrations = lib.mkOption { type = lib.types.bool; default = true; - description = '' + description = lib.mdDoc '' Do automatic database migrations. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mattermost.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mattermost.nix index 2901f307dc..6e9e2abcaa 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mattermost.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mattermost.nix @@ -107,19 +107,19 @@ in type = types.package; default = pkgs.mattermost; defaultText = "pkgs.mattermost"; - description = "Mattermost derivation to use."; + description = lib.mdDoc "Mattermost derivation to use."; }; statePath = mkOption { type = types.str; default = "/var/lib/mattermost"; - description = "Mattermost working directory"; + description = lib.mdDoc "Mattermost working directory"; }; siteUrl = mkOption { type = types.str; example = "https://chat.example.com"; - description = '' + description = lib.mdDoc '' URL this Mattermost instance is reachable under, without trailing slash. ''; }; @@ -127,14 +127,14 @@ in siteName = mkOption { type = types.str; default = "Mattermost"; - description = "Name of this Mattermost site."; + description = lib.mdDoc "Name of this Mattermost site."; }; listenAddress = mkOption { type = types.str; default = ":8065"; example = "[::1]:8065"; - description = '' + description = lib.mdDoc '' Address and port this Mattermost instance listens to. ''; }; @@ -142,7 +142,7 @@ in mutableConfig = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether the Mattermost config.json is writeable by Mattermost. Most of the settings can be edited in the system console of @@ -159,7 +159,7 @@ in preferNixConfig = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If both mutableConfig and this option are set, the Nix configuration will take precedence over any settings configured in the server console. @@ -169,7 +169,7 @@ in extraConfig = mkOption { type = types.attrs; default = { }; - description = '' + description = lib.mdDoc '' Addtional configuration options as Nix attribute set in config.json schema. ''; }; @@ -178,7 +178,7 @@ in type = types.listOf (types.oneOf [types.path types.package]); default = []; example = "[ ./com.github.moussetc.mattermost.plugin.giphy-2.0.0.tar.gz ]"; - description = '' + description = lib.mdDoc '' Plugins to add to the configuration. Overrides any installed if non-null. This is a list of paths to .tar.gz files or derivations evaluating to .tar.gz files. @@ -188,7 +188,7 @@ in localDatabaseCreate = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Create a local PostgreSQL database for Mattermost automatically. ''; }; @@ -196,7 +196,7 @@ in localDatabaseName = mkOption { type = types.str; default = "mattermost"; - description = '' + description = lib.mdDoc '' Local Mattermost database name. ''; }; @@ -204,7 +204,7 @@ in localDatabaseUser = mkOption { type = types.str; default = "mattermost"; - description = '' + description = lib.mdDoc '' Local Mattermost database username. ''; }; @@ -212,7 +212,7 @@ in localDatabasePassword = mkOption { type = types.str; default = "mmpgsecret"; - description = '' + description = lib.mdDoc '' Password for local Mattermost database user. ''; }; @@ -220,7 +220,7 @@ in user = mkOption { type = types.str; default = "mattermost"; - description = '' + description = lib.mdDoc '' User which runs the Mattermost service. ''; }; @@ -228,7 +228,7 @@ in group = mkOption { type = types.str; default = "mattermost"; - description = '' + description = lib.mdDoc '' Group which runs the Mattermost service. ''; }; @@ -239,13 +239,13 @@ in type = types.package; default = pkgs.matterircd; defaultText = "pkgs.matterircd"; - description = "matterircd derivation to use."; + description = lib.mdDoc "matterircd derivation to use."; }; parameters = mkOption { type = types.listOf types.str; default = [ ]; example = [ "-mmserver chat.example.com" "-bind [::]:6667" ]; - description = '' + description = lib.mdDoc '' Set commandline parameters to pass to matterircd. See https://github.com/42wim/matterircd#usage for more information. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix index 977b6f60b2..7115455594 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/mediawiki.nix @@ -280,7 +280,7 @@ in one version of MediaWiki, or have other applications that also use the database, you can give the table names a unique prefix to stop any naming conflicts or confusion. - See . + See . ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix index 641c9be85d..55e3664bee 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/miniflux.nix @@ -29,9 +29,9 @@ in LISTEN_ADDR = "localhost:8080"; } ''; - description = '' + description = lib.mdDoc '' Configuration for Miniflux, refer to - + for documentation on the supported values. Correct configuration for the database is already provided. @@ -41,7 +41,7 @@ in adminCredentialsFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' File containing the ADMIN_USERNAME and ADMIN_PASSWORD (length >= 6) in the format of an EnvironmentFile=, as described by systemd.exec(5). diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/netbox.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/netbox.nix index a7d8bede74..2826e57f2c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/netbox.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/netbox.nix @@ -59,18 +59,18 @@ in { enable = mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable Netbox. - This module requires a reverse proxy that serves /static separately. - See this example on how to configure this. + This module requires a reverse proxy that serves `/static` separately. + See this [example](https://github.com/netbox-community/netbox/blob/develop/contrib/nginx.conf/) on how to configure this. ''; }; listenAddress = mkOption { type = types.str; default = "[::1]"; - description = '' + description = lib.mdDoc '' Address the server will listen on. ''; }; @@ -78,7 +78,7 @@ in { port = mkOption { type = types.port; default = 8001; - description = '' + description = lib.mdDoc '' Port the server will listen on. ''; }; @@ -89,7 +89,7 @@ in { defaultText = literalExpression '' python3Packages: with python3Packages; []; ''; - description = '' + description = lib.mdDoc '' List of plugin packages to install. ''; }; @@ -97,14 +97,14 @@ in { dataDir = mkOption { type = types.str; default = "/var/lib/netbox"; - description = '' + description = lib.mdDoc '' Storage path of netbox. ''; }; secretKeyFile = mkOption { type = types.path; - description = '' + description = lib.mdDoc '' Path to a file containing the secret key. ''; }; @@ -112,28 +112,28 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' - Additional lines of configuration appended to the configuration.py. - See the documentation for more possible options. + description = lib.mdDoc '' + Additional lines of configuration appended to the `configuration.py`. + See the [documentation](https://netbox.readthedocs.io/en/stable/configuration/optional-settings/) for more possible options. ''; }; enableLdap = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable LDAP-Authentication for Netbox. - This requires a configuration file being pass through ldapConfigPath. + This requires a configuration file being pass through `ldapConfigPath`. ''; }; ldapConfigPath = mkOption { type = types.path; default = ""; - description = '' - Path to the Configuration-File for LDAP-Authentification, will be loaded as ldap_config.py. - See the documentation for possible options. + description = lib.mdDoc '' + Path to the Configuration-File for LDAP-Authentification, will be loaded as `ldap_config.py`. + See the [documentation](https://netbox.readthedocs.io/en/stable/installation/6-ldap/#configuration) for possible options. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 2130ec252d..feee7494a7 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -6,6 +6,8 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; + jsonFormat = pkgs.formats.json {}; + inherit (cfg) datadir; phpPackage = cfg.phpPackage.buildEnv { @@ -80,19 +82,19 @@ in { enable = mkEnableOption "nextcloud"; hostName = mkOption { type = types.str; - description = "FQDN for the nextcloud instance."; + description = lib.mdDoc "FQDN for the nextcloud instance."; }; home = mkOption { type = types.str; default = "/var/lib/nextcloud"; - description = "Storage path of nextcloud."; + description = lib.mdDoc "Storage path of nextcloud."; }; datadir = mkOption { type = types.str; default = config.services.nextcloud.home; defaultText = literalExpression "config.services.nextcloud.home"; - description = '' - Data storage path of nextcloud. Will be by default. + description = lib.mdDoc '' + Data storage path of nextcloud. Will be [](#opt-services.nextcloud.home) by default. This folder will be populated with a config.php and data folder which contains the state of the instance (excl the database)."; ''; example = "/mnt/nextcloud-file"; @@ -100,10 +102,10 @@ in { extraApps = mkOption { type = types.attrsOf types.package; default = { }; - description = '' + description = lib.mdDoc '' Extra apps to install. Should be an attrSet of appid to packages generated by fetchNextcloudApp. The appid must be identical to the "id" value in the apps appinfo/info.xml. - Using this will disable the appstore to prevent Nextcloud from updating these apps (see ). + Using this will disable the appstore to prevent Nextcloud from updating these apps (see [](#opt-services.nextcloud.appstoreEnable)). ''; example = literalExpression '' { @@ -125,8 +127,8 @@ in { extraAppsEnable = mkOption { type = types.bool; default = true; - description = '' - Automatically enable the apps in every time nextcloud starts. + description = lib.mdDoc '' + Automatically enable the apps in [](#opt-services.nextcloud.extraApps) every time nextcloud starts. If set to false, apps need to be enabled in the Nextcloud user interface or with nextcloud-occ app:enable. ''; }; @@ -134,33 +136,33 @@ in { type = types.nullOr types.bool; default = null; example = true; - description = '' + description = lib.mdDoc '' Allow the installation of apps and app updates from the store. - Enabled by default unless there are packages in . - Set to true to force enable the store even if is used. + Enabled by default unless there are packages in [](#opt-services.nextcloud.extraApps). + Set to true to force enable the store even if [](#opt-services.nextcloud.extraApps) is used. Set to false to disable the installation of apps from the global appstore. App management is always enabled regardless of this setting. ''; }; logLevel = mkOption { type = types.ints.between 0 4; default = 2; - description = "Log level value between 0 (DEBUG) and 4 (FATAL)."; + description = lib.mdDoc "Log level value between 0 (DEBUG) and 4 (FATAL)."; }; https = mkOption { type = types.bool; default = false; - description = "Use https for generated links."; + description = lib.mdDoc "Use https for generated links."; }; package = mkOption { type = types.package; - description = "Which package to use for the Nextcloud instance."; + description = lib.mdDoc "Which package to use for the Nextcloud instance."; relatedPackages = [ "nextcloud23" "nextcloud24" ]; }; phpPackage = mkOption { type = types.package; relatedPackages = [ "php80" "php81" ]; defaultText = "pkgs.php"; - description = '' + description = lib.mdDoc '' PHP package to use for Nextcloud. ''; }; @@ -168,7 +170,7 @@ in { maxUploadSize = mkOption { default = "512M"; type = types.str; - description = '' + description = lib.mdDoc '' Defines the upload limit for files. This changes the relevant options in php.ini and nginx if enabled. ''; @@ -177,7 +179,7 @@ in { skeletonDirectory = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' The directory where the skeleton files are located. These files will be copied to the data directory of new users. Leave empty to not copy any skeleton files. @@ -187,7 +189,7 @@ in { webfinger = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable this option if you plan on using the webfinger plugin. The appropriate nginx rewrite rules will be added to your configuration. ''; @@ -197,7 +199,7 @@ in { type = with types; functionTo (listOf package); default = all: []; defaultText = literalExpression "all: []"; - description = '' + description = lib.mdDoc '' Additional PHP extensions to use for nextcloud. By default, only extensions necessary for a vanilla nextcloud installation are enabled, but you may choose from the list of available extensions and add further ones. @@ -224,7 +226,7 @@ in { "openssl.cafile" = "/etc/ssl/certs/ca-certificates.crt"; catch_workers_output = "yes"; }; - description = '' + description = lib.mdDoc '' Options for PHP's php.ini file for nextcloud. ''; }; @@ -239,16 +241,16 @@ in { "pm.max_spare_servers" = "4"; "pm.max_requests" = "500"; }; - description = '' - Options for nextcloud's PHP pool. See the documentation on php-fpm.conf for details on configuration directives. + description = lib.mdDoc '' + Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives. ''; }; poolConfig = mkOption { type = types.nullOr types.lines; default = null; - description = '' - Options for nextcloud's PHP pool. See the documentation on php-fpm.conf for details on configuration directives. + description = lib.mdDoc '' + Options for nextcloud's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives. ''; }; @@ -257,7 +259,7 @@ in { createLocally = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Create the database and database user locally. Only available for mysql database. Note that this option will use the latest version of MariaDB which @@ -273,72 +275,72 @@ in { dbtype = mkOption { type = types.enum [ "sqlite" "pgsql" "mysql" ]; default = "sqlite"; - description = "Database type."; + description = lib.mdDoc "Database type."; }; dbname = mkOption { type = types.nullOr types.str; default = "nextcloud"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; dbuser = mkOption { type = types.nullOr types.str; default = "nextcloud"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; dbpassFile = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The full path to a file that contains the database password. ''; }; dbhost = mkOption { type = types.nullOr types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Database host. Note: for using Unix authentication with PostgreSQL, this should be - set to /run/postgresql. + set to `/run/postgresql`. ''; }; dbport = mkOption { type = with types; nullOr (either int str); default = null; - description = "Database port."; + description = lib.mdDoc "Database port."; }; dbtableprefix = mkOption { type = types.nullOr types.str; default = null; - description = "Table prefix in Nextcloud database."; + description = lib.mdDoc "Table prefix in Nextcloud database."; }; adminuser = mkOption { type = types.str; default = "root"; - description = "Admin username."; + description = lib.mdDoc "Admin username."; }; adminpassFile = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The full path to a file that contains the admin's password. Must be - readable by user nextcloud. + readable by user `nextcloud`. ''; }; extraTrustedDomains = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Trusted domains, from which the nextcloud installation will be acessible. You don't need to add - services.nextcloud.hostname here. + `services.nextcloud.hostname` here. ''; }; trustedProxies = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' Trusted proxies, to provide if the nextcloud installation is being proxied to secure against e.g. spoofing. ''; @@ -349,10 +351,10 @@ in { default = null; example = "https"; - description = '' + description = lib.mdDoc '' Force Nextcloud to always use HTTPS i.e. for link generation. Nextcloud uses the currently used protocol by default, but when behind a reverse-proxy, - it may use http for everything although Nextcloud + it may use `http` for everything although Nextcloud may be served via HTTPS. ''; }; @@ -389,50 +391,50 @@ in { bucket = mkOption { type = types.str; example = "nextcloud"; - description = '' + description = lib.mdDoc '' The name of the S3 bucket. ''; }; autocreate = mkOption { type = types.bool; - description = '' + description = lib.mdDoc '' Create the objectstore if it does not exist. ''; }; key = mkOption { type = types.str; example = "EJ39ITYZEUH5BGWDRUFY"; - description = '' + description = lib.mdDoc '' The access key for the S3 bucket. ''; }; secretFile = mkOption { type = types.str; example = "/var/nextcloud-objectstore-s3-secret"; - description = '' + description = lib.mdDoc '' The full path to a file that contains the access secret. Must be - readable by user nextcloud. + readable by user `nextcloud`. ''; }; hostname = mkOption { type = types.nullOr types.str; default = null; example = "example.com"; - description = '' + description = lib.mdDoc '' Required for some non-Amazon implementations. ''; }; port = mkOption { type = types.nullOr types.port; default = null; - description = '' + description = lib.mdDoc '' Required for some non-Amazon implementations. ''; }; useSsl = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Use SSL for objectstore access. ''; }; @@ -440,20 +442,20 @@ in { type = types.nullOr types.str; default = null; example = "REGION"; - description = '' + description = lib.mdDoc '' Required for some non-Amazon implementations. ''; }; usePathStyle = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Required for some non-Amazon S3 implementations. Ordinarily, requests will be made with - http://bucket.hostname.domain/, but with path style + `http://bucket.hostname.domain/`, but with path style enabled requests are made with - http://hostname.domain/bucket instead. + `http://hostname.domain/bucket` instead. ''; }; }; @@ -465,7 +467,7 @@ in { This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF). You may want to disable it for increased security. In that case, previews will still be available for some images (e.g. JPEG and PNG). - See . + See . '' // { default = true; }; @@ -474,14 +476,14 @@ in { apcu = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to load the APCu module into PHP. ''; }; redis = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to load the Redis module into PHP. You still need to enable Redis in your config.php. See https://docs.nextcloud.com/server/14/admin_manual/configuration_server/caching_configuration.html @@ -490,7 +492,7 @@ in { memcached = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to load the Memcached module into PHP. You still need to enable Memcached in your config.php. See https://docs.nextcloud.com/server/14/admin_manual/configuration_server/caching_configuration.html @@ -501,7 +503,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Run regular auto update of all apps installed from the nextcloud app store. ''; }; @@ -547,18 +549,45 @@ in { ''; }; + extraOptions = mkOption { + type = jsonFormat.type; + default = {}; + description = lib.mdDoc '' + Extra options which should be appended to nextcloud's config.php file. + ''; + example = literalExpression '' { + redis = { + host = "/run/redis/redis.sock"; + port = 0; + dbindex = 0; + password = "secret"; + timeout = 1.5; + }; + } ''; + }; + + secretFile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Secret options which will be appended to nextcloud's config.php file (written as JSON, in the same + form as the option), for example + {"redis":{"password":"secret"}}. + ''; + }; + nginx = { recommendedHttpHeaders = mkOption { type = types.bool; default = true; - description = "Enable additional recommended HTTP response headers"; + description = lib.mdDoc "Enable additional recommended HTTP response headers"; }; hstsMaxAge = mkOption { type = types.ints.positive; default = 15552000; - description = '' - Value for the max-age directive of the HTTP - Strict-Transport-Security header. + description = lib.mdDoc '' + Value for the `max-age` directive of the HTTP + `Strict-Transport-Security` header. See section 6.1.1 of IETF RFC 6797 for detailed information on this directive and header. @@ -706,10 +735,20 @@ in { $file )); } - return trim(file_get_contents($file)); + }''} + function nix_decode_json_file($file, $error) { + if (!file_exists($file)) { + throw new \RuntimeException(sprintf($error, $file)); } - ''} + $decoded = json_decode(file_get_contents($file), true); + + if (json_last_error() !== JSON_ERROR_NONE) { + throw new \RuntimeException(sprintf("Cannot decode %s, because: %s", $file, json_last_error_msg())); + } + + return $decoded; + } $CONFIG = [ 'apps_paths' => [ ${optionalString (cfg.extraApps != { }) "[ 'path' => '${cfg.home}/nix-apps', 'url' => '/nix-apps', 'writable' => false ],"} @@ -728,7 +767,12 @@ in { ${optionalString (c.dbport != null) "'dbport' => '${toString c.dbport}',"} ${optionalString (c.dbuser != null) "'dbuser' => '${c.dbuser}',"} ${optionalString (c.dbtableprefix != null) "'dbtableprefix' => '${toString c.dbtableprefix}',"} - ${optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_secret('${c.dbpassFile}'),"} + ${optionalString (c.dbpassFile != null) '' + 'dbpassword' => nix_read_secret( + "${c.dbpassFile}" + ), + '' + } 'dbtype' => '${c.dbtype}', 'trusted_domains' => ${writePhpArrary ([ cfg.hostName ] ++ c.extraTrustedDomains)}, 'trusted_proxies' => ${writePhpArrary (c.trustedProxies)}, @@ -736,6 +780,18 @@ in { ${optionalString (nextcloudGreaterOrEqualThan "23") "'profile.enabled' => ${boolToString cfg.globalProfiles},"} ${objectstoreConfig} ]; + + $CONFIG = array_replace_recursive($CONFIG, nix_decode_json_file( + "${jsonFormat.generate "nextcloud-extraOptions.json" cfg.extraOptions}", + "impossible: this should never happen (decoding generated extraOptions file %s failed)" + )); + + ${optionalString (cfg.secretFile != null) '' + $CONFIG = array_replace_recursive($CONFIG, nix_decode_json_file( + "${cfg.secretFile}", + "Cannot start Nextcloud, secrets file %s set by NixOS doesn't exist!" + )); + ''} ''; occInstallCmd = let mkExport = { arg, value }: "export ${arg}=${value}"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix index dc50a06705..cfa137e77d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nexus.nix @@ -17,37 +17,37 @@ in type = types.package; default = pkgs.nexus; defaultText = literalExpression "pkgs.nexus"; - description = "Package which runs Nexus3"; + description = lib.mdDoc "Package which runs Nexus3"; }; user = mkOption { type = types.str; default = "nexus"; - description = "User which runs Nexus3."; + description = lib.mdDoc "User which runs Nexus3."; }; group = mkOption { type = types.str; default = "nexus"; - description = "Group which runs Nexus3."; + description = lib.mdDoc "Group which runs Nexus3."; }; home = mkOption { type = types.str; default = "/var/lib/sonatype-work"; - description = "Home directory of the Nexus3 instance."; + description = lib.mdDoc "Home directory of the Nexus3 instance."; }; listenAddress = mkOption { type = types.str; default = "127.0.0.1"; - description = "Address to listen on."; + description = lib.mdDoc "Address to listen on."; }; listenPort = mkOption { type = types.int; default = 8081; - description = "Port to listen on."; + description = lib.mdDoc "Port to listen on."; }; jvmOpts = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nifi.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nifi.nix index 21a6312726..e3f30c710e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nifi.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nifi.nix @@ -33,25 +33,25 @@ in { type = lib.types.package; default = pkgs.nifi; defaultText = lib.literalExpression "pkgs.nifi"; - description = "Apache NiFi package to use."; + description = lib.mdDoc "Apache NiFi package to use."; }; user = lib.mkOption { type = lib.types.str; default = "nifi"; - description = "User account where Apache NiFi runs."; + description = lib.mdDoc "User account where Apache NiFi runs."; }; group = lib.mkOption { type = lib.types.str; default = "nifi"; - description = "Group account where Apache NiFi runs."; + description = lib.mdDoc "Group account where Apache NiFi runs."; }; enableHTTPS = lib.mkOption { type = lib.types.bool; default = true; - description = "Enable HTTPS protocol. Don`t use in production."; + description = lib.mdDoc "Enable HTTPS protocol. Don`t use in production."; }; listenHost = lib.mkOption { @@ -62,7 +62,7 @@ in { then "0.0.0.0" else "127.0.0.1" ''; - description = "Bind to an ip for Apache NiFi web-ui."; + description = lib.mdDoc "Bind to an ip for Apache NiFi web-ui."; }; listenPort = lib.mkOption { @@ -73,7 +73,7 @@ in { then "8443" else "8000" ''; - description = "Bind to a port for Apache NiFi web-ui."; + description = lib.mdDoc "Bind to a port for Apache NiFi web-ui."; }; proxyHost = lib.mkOption { @@ -84,7 +84,7 @@ in { then "0.0.0.0" else null ''; - description = "Allow requests from a specific host."; + description = lib.mdDoc "Allow requests from a specific host."; }; proxyPort = lib.mkOption { @@ -95,34 +95,34 @@ in { then "8443" else null ''; - description = "Allow requests from a specific port."; + description = lib.mdDoc "Allow requests from a specific port."; }; initUser = lib.mkOption { type = lib.types.nullOr lib.types.str; default = null; - description = "Initial user account for Apache NiFi. Username must be at least 4 characters."; + description = lib.mdDoc "Initial user account for Apache NiFi. Username must be at least 4 characters."; }; initPasswordFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; example = "/run/keys/nifi/password-nifi"; - description = "nitial password for Apache NiFi. Password must be at least 12 characters."; + description = lib.mdDoc "nitial password for Apache NiFi. Password must be at least 12 characters."; }; initJavaHeapSize = lib.mkOption { type = lib.types.nullOr lib.types.int; default = null; example = 1024; - description = "Set the initial heap size for the JVM in MB."; + description = lib.mdDoc "Set the initial heap size for the JVM in MB."; }; maxJavaHeapSize = lib.mkOption { type = lib.types.nullOr lib.types.int; default = null; example = 2048; - description = "Set the initial heap size for the JVM in MB."; + description = lib.mdDoc "Set the initial heap size for the JVM in MB."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix index 4512907f02..e5b0998d3c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/node-red.nix @@ -23,13 +23,13 @@ in default = pkgs.nodePackages.node-red; defaultText = literalExpression "pkgs.nodePackages.node-red"; type = types.package; - description = "Node-RED package to use."; + description = lib.mdDoc "Node-RED package to use."; }; openFirewall = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Open ports in the firewall for the server. ''; }; @@ -37,7 +37,7 @@ in withNpmAndGcc = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Give Node-RED access to NPM and GCC at runtime, so 'Nodes' can be downloaded and managed imperatively via the 'Palette Manager'. ''; @@ -47,10 +47,9 @@ in type = types.path; default = "${cfg.package}/lib/node_modules/node-red/settings.js"; defaultText = literalExpression ''"''${package}/lib/node_modules/node-red/settings.js"''; - description = '' + description = lib.mdDoc '' Path to the JavaScript configuration file. - See + See for a configuration example. ''; }; @@ -58,13 +57,13 @@ in port = mkOption { type = types.port; default = 1880; - description = "Listening port."; + description = lib.mdDoc "Listening port."; }; user = mkOption { type = types.str; default = defaultUser; - description = '' + description = lib.mdDoc '' User under which Node-RED runs.If left as the default value this user will automatically be created on system activation, otherwise the sysadmin is responsible for ensuring the user exists. @@ -74,7 +73,7 @@ in group = mkOption { type = types.str; default = defaultUser; - description = '' + description = lib.mdDoc '' Group under which Node-RED runs.If left as the default value this group will automatically be created on system activation, otherwise the sysadmin is responsible for ensuring the group exists. @@ -84,7 +83,7 @@ in userDir = mkOption { type = types.path; default = "/var/lib/node-red"; - description = '' + description = lib.mdDoc '' The directory to store all user data, such as flow and credential files and all library data. If left as the default value this directory will automatically be created before the node-red service starts, otherwise the sysadmin is responsible for ensuring the directory exists with appropriate ownership @@ -95,13 +94,13 @@ in safe = mkOption { type = types.bool; default = false; - description = "Whether to launch Node-RED in --safe mode."; + description = lib.mdDoc "Whether to launch Node-RED in --safe mode."; }; define = mkOption { type = types.attrs; default = {}; - description = "List of settings.js overrides to pass via -D to Node-RED."; + description = lib.mdDoc "List of settings.js overrides to pass via -D to Node-RED."; example = literalExpression '' { "logging.console.level" = "trace"; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/onlyoffice.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/onlyoffice.nix new file mode 100644 index 0000000000..15fc3b03a8 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/onlyoffice.nix @@ -0,0 +1,288 @@ +{ lib, config, pkgs, ... }: + +with lib; + +let + cfg = config.services.onlyoffice; +in +{ + options.services.onlyoffice = { + enable = mkEnableOption "OnlyOffice DocumentServer"; + + enableExampleServer = mkEnableOption "OnlyOffice example server"; + + hostname = mkOption { + type = types.str; + default = "localhost"; + description = lib.mdDoc "FQDN for the onlyoffice instance."; + }; + + jwtSecretFile = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc '' + Path to a file that contains the secret to sign web requests using JSON Web Tokens. + If left at the default value null signing is disabled. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.onlyoffice-documentserver; + defaultText = "pkgs.onlyoffice-documentserver"; + description = lib.mdDoc "Which package to use for the OnlyOffice instance."; + }; + + port = mkOption { + type = types.port; + default = 8000; + description = lib.mdDoc "Port the OnlyOffice DocumentServer should listens on."; + }; + + examplePort = mkOption { + type = types.port; + default = null; + description = lib.mdDoc "Port the OnlyOffice Example server should listens on."; + }; + + postgresHost = mkOption { + type = types.str; + default = "/run/postgresql"; + description = lib.mdDoc "The Postgresql hostname or socket path OnlyOffice should connect to."; + }; + + postgresName = mkOption { + type = types.str; + default = "onlyoffice"; + description = lib.mdDoc "The name of databse OnlyOffice should user."; + }; + + postgresPasswordFile = mkOption { + type = types.nullOr types.str; + default = null; + description = lib.mdDoc '' + Path to a file that contains the password OnlyOffice should use to connect to Postgresql. + Unused when using socket authentication. + ''; + }; + + postgresUser = mkOption { + type = types.str; + default = "onlyoffice"; + description = lib.mdDoc '' + The username OnlyOffice should use to connect to Postgresql. + Unused when using socket authentication. + ''; + }; + + rabbitmqUrl = mkOption { + type = types.str; + default = "amqp://guest:guest@localhost:5672"; + description = lib.mdDoc "The Rabbitmq in amqp URI style OnlyOffice should connect to."; + }; + }; + + config = lib.mkIf cfg.enable { + services = { + nginx = { + enable = mkDefault true; + # misses text/csv, font/ttf, application/x-font-ttf, application/rtf, application/wasm + recommendedGzipSettings = mkDefault true; + recommendedProxySettings = mkDefault true; + + upstreams = { + # /etc/nginx/includes/http-common.conf + onlyoffice-docservice = { + servers = { "localhost:${toString cfg.port}" = { }; }; + }; + onlyoffice-example = lib.mkIf cfg.enableExampleServer { + servers = { "localhost:${toString cfg.examplePort}" = { }; }; + }; + }; + + virtualHosts.${cfg.hostname} = { + locations = { + # /etc/nginx/includes/ds-docservice.conf + "~ ^(\/[\d]+\.[\d]+\.[\d]+[\.|-][\d]+)?\/(web-apps\/apps\/api\/documents\/api\.js)$".extraConfig = '' + expires -1; + alias ${cfg.package}/var/www/onlyoffice/documentserver/$2; + ''; + "~ ^(\/[\d]+\.[\d]+\.[\d]+[\.|-][\d]+)?\/(web-apps)(\/.*\.json)$".extraConfig = '' + expires 365d; + error_log /dev/null crit; + alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3; + ''; + "~ ^(\/[\d]+\.[\d]+\.[\d]+[\.|-][\d]+)?\/(sdkjs-plugins)(\/.*\.json)$".extraConfig = '' + expires 365d; + error_log /dev/null crit; + alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3; + ''; + "~ ^(\/[\d]+\.[\d]+\.[\d]+[\.|-][\d]+)?\/(web-apps|sdkjs|sdkjs-plugins|fonts)(\/.*)$".extraConfig = '' + expires 365d; + alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3; + ''; + "~* ^(\/cache\/files.*)(\/.*)".extraConfig = '' + alias /var/lib/onlyoffice/documentserver/App_Data$1; + add_header Content-Disposition "attachment; filename*=UTF-8''$arg_filename"; + + set $secret_string verysecretstring; + secure_link $arg_md5,$arg_expires; + secure_link_md5 "$secure_link_expires$uri$secret_string"; + + if ($secure_link = "") { + return 403; + } + + if ($secure_link = "0") { + return 410; + } + ''; + "~* ^(\/[\d]+\.[\d]+\.[\d]+[\.|-][\d]+)?\/(internal)(\/.*)$".extraConfig = '' + allow 127.0.0.1; + deny all; + proxy_pass http://onlyoffice-docservice/$2$3; + ''; + "~* ^(\/[\d]+\.[\d]+\.[\d]+[\.|-][\d]+)?\/(info)(\/.*)$".extraConfig = '' + allow 127.0.0.1; + deny all; + proxy_pass http://onlyoffice-docservice/$2$3; + ''; + "/".extraConfig = '' + proxy_pass http://onlyoffice-docservice; + ''; + "~ ^(\/[\d]+\.[\d]+\.[\d]+[\.|-][\d]+)?(\/doc\/.*)".extraConfig = '' + proxy_pass http://onlyoffice-docservice$2; + proxy_http_version 1.1; + ''; + "/${cfg.package.version}/".extraConfig = '' + proxy_pass http://onlyoffice-docservice/; + ''; + "~ ^(\/[\d]+\.[\d]+\.[\d]+[\.|-][\d]+)?\/(dictionaries)(\/.*)$".extraConfig = '' + expires 365d; + alias ${cfg.package}/var/www/onlyoffice/documentserver/$2$3; + ''; + # /etc/nginx/includes/ds-example.conf + "~ ^(\/welcome\/.*)$".extraConfig = '' + expires 365d; + alias ${cfg.package}/var/www/onlyoffice/documentserver-example$1; + index docker.html; + ''; + "/example/".extraConfig = lib.mkIf cfg.enableExampleServer '' + proxy_pass http://onlyoffice-example/; + proxy_set_header X-Forwarded-Path /example; + ''; + }; + extraConfig = '' + rewrite ^/$ /welcome/ redirect; + rewrite ^\/OfficeWeb(\/apps\/.*)$ /${cfg.package.version}/web-apps$1 redirect; + rewrite ^(\/web-apps\/apps\/(?!api\/).*)$ /${cfg.package.version}$1 redirect; + + # based on https://github.com/ONLYOFFICE/document-server-package/blob/master/common/documentserver/nginx/includes/http-common.conf.m4#L29-L34 + # without variable indirection and correct variable names + proxy_set_header Host $host; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Proto $scheme; + # required for CSP to take effect + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + # required for websocket + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; + ''; + }; + }; + + rabbitmq.enable = lib.mkDefault true; + + postgresql = { + enable = lib.mkDefault true; + ensureDatabases = [ "onlyoffice" ]; + ensureUsers = [{ + name = "onlyoffice"; + ensurePermissions = { "DATABASE \"onlyoffice\"" = "ALL PRIVILEGES"; }; + }]; + }; + }; + + systemd.services = { + onlyoffice-converter = { + description = "onlyoffice converter"; + after = [ "network.target" "onlyoffice-docservice.service" "postgresql.service" ]; + requires = [ "network.target" "onlyoffice-docservice.service" "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${cfg.package.fhs}/bin/onlyoffice-wrapper FileConverter/converter /run/onlyoffice/config"; + Group = "onlyoffice"; + Restart = "always"; + RuntimeDirectory = "onlyoffice"; + StateDirectory = "onlyoffice"; + Type = "simple"; + User = "onlyoffice"; + }; + }; + + onlyoffice-docservice = + let + onlyoffice-prestart = pkgs.writeShellScript "onlyoffice-prestart" '' + PATH=$PATH:${lib.makeBinPath (with pkgs; [ jq moreutils config.services.postgresql.package ])} + umask 077 + mkdir -p /run/onlyoffice/config/ /var/lib/onlyoffice/documentserver/sdkjs/{slide/themes,common}/ /var/lib/onlyoffice/documentserver/{fonts,server/FileConverter/bin}/ + cp -r ${cfg.package}/etc/onlyoffice/documentserver/* /run/onlyoffice/config/ + chmod u+w /run/onlyoffice/config/default.json + + cp /run/onlyoffice/config/default.json{,.orig} + + # for a mapping of environment variables from the docker container to json options see + # https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/run-document-server.sh + jq ' + .services.CoAuthoring.server.port = ${toString cfg.port} | + .services.CoAuthoring.sql.dbHost = "${cfg.postgresHost}" | + .services.CoAuthoring.sql.dbName = "${cfg.postgresName}" | + ${lib.optionalString (cfg.postgresPasswordFile != null) '' + .services.CoAuthoring.sql.dbPass = "'"$(cat ${cfg.postgresPasswordFile})"'" | + ''} + .services.CoAuthoring.sql.dbUser = "${cfg.postgresUser}" | + ${lib.optionalString (cfg.jwtSecretFile != null) '' + .services.CoAuthoring.token.enable.browser = true | + .services.CoAuthoring.token.enable.request.inbox = true | + .services.CoAuthoring.token.enable.request.outbox = true | + .services.CoAuthoring.secret.inbox.string = "'"$(cat ${cfg.jwtSecretFile})"'" | + .services.CoAuthoring.secret.outbox.string = "'"$(cat ${cfg.jwtSecretFile})"'" | + .services.CoAuthoring.secret.session.string = "'"$(cat ${cfg.jwtSecretFile})"'" | + ''} + .rabbitmq.url = "${cfg.rabbitmqUrl}" + ' /run/onlyoffice/config/default.json | sponge /run/onlyoffice/config/default.json + + if ! psql -d onlyoffice -c "SELECT 'task_result'::regclass;" >/dev/null; then + psql -f ${cfg.package}/var/www/onlyoffice/documentserver/server/schema/postgresql/createdb.sql + fi + ''; + in + { + description = "onlyoffice documentserver"; + after = [ "network.target" "postgresql.service" ]; + requires = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${cfg.package.fhs}/bin/onlyoffice-wrapper DocService/docservice /run/onlyoffice/config"; + ExecStartPre = onlyoffice-prestart; + Group = "onlyoffice"; + Restart = "always"; + RuntimeDirectory = "onlyoffice"; + StateDirectory = "onlyoffice"; + Type = "simple"; + User = "onlyoffice"; + }; + }; + }; + + users.users = { + onlyoffice = { + description = "OnlyOffice Service"; + group = "onlyoffice"; + isSystemUser = true; + }; + }; + + users.groups.onlyoffice = { }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/openwebrx.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/openwebrx.nix index 8a7972a3fc..c409adbc71 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/openwebrx.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/openwebrx.nix @@ -10,7 +10,7 @@ in type = types.package; default = pkgs.openwebrx; defaultText = literalExpression "pkgs.openwebrx"; - description = "OpenWebRX package to use for the service"; + description = lib.mdDoc "OpenWebRX package to use for the service"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix index e6b6aa273e..c5a80e2d7d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/peertube.nix @@ -11,6 +11,7 @@ let NODE_CONFIG_DIR = "/var/lib/peertube/config"; NODE_ENV = "production"; NODE_EXTRA_CA_CERTS = "/etc/ssl/certs/ca-certificates.crt"; + NPM_CONFIG_CACHE = "/var/cache/peertube/.npm"; NPM_CONFIG_PREFIX = cfg.package; HOME = cfg.package; }; @@ -73,51 +74,51 @@ in { user = lib.mkOption { type = lib.types.str; default = "peertube"; - description = "User account under which Peertube runs."; + description = lib.mdDoc "User account under which Peertube runs."; }; group = lib.mkOption { type = lib.types.str; default = "peertube"; - description = "Group under which Peertube runs."; + description = lib.mdDoc "Group under which Peertube runs."; }; localDomain = lib.mkOption { type = lib.types.str; example = "peertube.example.com"; - description = "The domain serving your PeerTube instance."; + description = lib.mdDoc "The domain serving your PeerTube instance."; }; listenHttp = lib.mkOption { type = lib.types.int; default = 9000; - description = "listen port for HTTP server."; + description = lib.mdDoc "listen port for HTTP server."; }; listenWeb = lib.mkOption { type = lib.types.int; default = 9000; - description = "listen port for WEB server."; + description = lib.mdDoc "listen port for WEB server."; }; enableWebHttps = lib.mkOption { type = lib.types.bool; default = false; - description = "Enable or disable HTTPS protocol."; + description = lib.mdDoc "Enable or disable HTTPS protocol."; }; dataDirs = lib.mkOption { type = lib.types.listOf lib.types.path; default = [ ]; example = [ "/opt/peertube/storage" "/var/cache/peertube" ]; - description = "Allow access to custom data locations."; + description = lib.mdDoc "Allow access to custom data locations."; }; serviceEnvironmentFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; example = "/run/keys/peertube/password-init-root"; - description = '' + description = lib.mdDoc '' Set environment variables for the service. Mainly useful for setting the initial root password. For example write to file: PT_INITIAL_ROOT_PASSWORD=changeme @@ -141,14 +142,14 @@ in { }; } ''; - description = "Configuration for peertube."; + description = lib.mdDoc "Configuration for peertube."; }; database = { createLocally = lib.mkOption { type = lib.types.bool; default = false; - description = "Configure local PostgreSQL database server for PeerTube."; + description = lib.mdDoc "Configure local PostgreSQL database server for PeerTube."; }; host = lib.mkOption { @@ -160,32 +161,32 @@ in { else null ''; example = "192.168.15.47"; - description = "Database host address or unix socket."; + description = lib.mdDoc "Database host address or unix socket."; }; port = lib.mkOption { type = lib.types.int; default = 5432; - description = "Database host port."; + description = lib.mdDoc "Database host port."; }; name = lib.mkOption { type = lib.types.str; default = "peertube"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; user = lib.mkOption { type = lib.types.str; default = "peertube"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; passwordFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; example = "/run/keys/peertube/password-posgressql-db"; - description = "Password for PostgreSQL database."; + description = lib.mdDoc "Password for PostgreSQL database."; }; }; @@ -193,7 +194,7 @@ in { createLocally = lib.mkOption { type = lib.types.bool; default = false; - description = "Configure local Redis server for PeerTube."; + description = lib.mdDoc "Configure local Redis server for PeerTube."; }; host = lib.mkOption { @@ -204,7 +205,7 @@ in { then "127.0.0.1" else null ''; - description = "Redis host."; + description = lib.mdDoc "Redis host."; }; port = lib.mkOption { @@ -215,21 +216,21 @@ in { then null else 6379 ''; - description = "Redis port."; + description = lib.mdDoc "Redis port."; }; passwordFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; example = "/run/keys/peertube/password-redis-db"; - description = "Password for redis database."; + description = lib.mdDoc "Password for redis database."; }; enableUnixSocket = lib.mkOption { type = lib.types.bool; default = cfg.redis.createLocally; defaultText = lib.literalExpression "config.${opt.redis.createLocally}"; - description = "Use Unix socket."; + description = lib.mdDoc "Use Unix socket."; }; }; @@ -237,14 +238,14 @@ in { createLocally = lib.mkOption { type = lib.types.bool; default = false; - description = "Configure local Postfix SMTP server for PeerTube."; + description = lib.mdDoc "Configure local Postfix SMTP server for PeerTube."; }; passwordFile = lib.mkOption { type = lib.types.nullOr lib.types.path; default = null; example = "/run/keys/peertube/password-smtp"; - description = "Password for smtp server."; + description = lib.mdDoc "Password for smtp server."; }; }; @@ -252,7 +253,7 @@ in { type = lib.types.package; default = pkgs.peertube; defaultText = lib.literalExpression "pkgs.peertube"; - description = "Peertube package to use."; + description = lib.mdDoc "Peertube package to use."; }; }; @@ -425,6 +426,9 @@ in { # State directory and mode StateDirectory = "peertube"; StateDirectoryMode = "0750"; + # Cache directory and mode + CacheDirectory = "peertube"; + CacheDirectoryMode = "0750"; # Access write directories ReadWritePaths = cfg.dataDirs; # Environment diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/phylactery.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/phylactery.nix index f0e97da1f2..d512b48539 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/phylactery.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/phylactery.nix @@ -9,24 +9,24 @@ in { host = mkOption { type = types.str; default = "localhost"; - description = "Listen host for Phylactery"; + description = lib.mdDoc "Listen host for Phylactery"; }; port = mkOption { type = types.port; - description = "Listen port for Phylactery"; + description = lib.mdDoc "Listen port for Phylactery"; }; library = mkOption { type = types.path; - description = "Path to CBZ library"; + description = lib.mdDoc "Path to CBZ library"; }; package = mkOption { type = types.package; default = pkgs.phylactery; defaultText = literalExpression "pkgs.phylactery"; - description = "The Phylactery package to use"; + description = lib.mdDoc "The Phylactery package to use"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix index e1847fbd53..ab5a9ed073 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/pict-rs.nix @@ -14,21 +14,21 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/pict-rs"; - description = '' + description = lib.mdDoc '' The directory where to store the uploaded images. ''; }; address = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' The IPv4 address to deploy the service to. ''; }; port = mkOption { type = types.port; default = 8080; - description = '' + description = lib.mdDoc '' The port which to bind the service to. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix index 9ea37b8a4c..acd9292ceb 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/plantuml-server.nix @@ -17,7 +17,7 @@ in type = types.package; default = pkgs.plantuml-server; defaultText = literalExpression "pkgs.plantuml-server"; - description = "PlantUML server package to use"; + description = lib.mdDoc "PlantUML server package to use"; }; packages = { @@ -25,75 +25,75 @@ in type = types.package; default = pkgs.jdk; defaultText = literalExpression "pkgs.jdk"; - description = "JDK package to use for the server"; + description = lib.mdDoc "JDK package to use for the server"; }; jetty = mkOption { type = types.package; default = pkgs.jetty; defaultText = literalExpression "pkgs.jetty"; - description = "Jetty package to use for the server"; + description = lib.mdDoc "Jetty package to use for the server"; }; }; user = mkOption { type = types.str; default = "plantuml"; - description = "User which runs PlantUML server."; + description = lib.mdDoc "User which runs PlantUML server."; }; group = mkOption { type = types.str; default = "plantuml"; - description = "Group which runs PlantUML server."; + description = lib.mdDoc "Group which runs PlantUML server."; }; home = mkOption { type = types.str; default = "/var/lib/plantuml"; - description = "Home directory of the PlantUML server instance."; + description = lib.mdDoc "Home directory of the PlantUML server instance."; }; listenHost = mkOption { type = types.str; default = "127.0.0.1"; - description = "Host to listen on."; + description = lib.mdDoc "Host to listen on."; }; listenPort = mkOption { type = types.int; default = 8080; - description = "Port to listen on."; + description = lib.mdDoc "Port to listen on."; }; plantumlLimitSize = mkOption { type = types.int; default = 4096; - description = "Limits image width and height."; + description = lib.mdDoc "Limits image width and height."; }; graphvizPackage = mkOption { type = types.package; default = pkgs.graphviz; defaultText = literalExpression "pkgs.graphviz"; - description = "Package containing the dot executable."; + description = lib.mdDoc "Package containing the dot executable."; }; plantumlStats = mkOption { type = types.bool; default = false; - description = "Set it to on to enable statistics report (https://plantuml.com/statistics-report)."; + description = lib.mdDoc "Set it to on to enable statistics report (https://plantuml.com/statistics-report)."; }; httpAuthorization = mkOption { type = types.nullOr types.str; default = null; - description = "When calling the proxy endpoint, the value of HTTP_AUTHORIZATION will be used to set the HTTP Authorization header."; + description = lib.mdDoc "When calling the proxy endpoint, the value of HTTP_AUTHORIZATION will be used to set the HTTP Authorization header."; }; allowPlantumlInclude = mkOption { type = types.bool; default = false; - description = "Enables !include processing which can read files from the server into diagrams. Files are read relative to the current working directory."; + description = lib.mdDoc "Enables !include processing which can read files from the server into diagrams. Files are read relative to the current working directory."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix index 5d550ae5ca..6f098134c9 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/plausible.nix @@ -11,7 +11,7 @@ in { releaseCookiePath = mkOption { type = with types; either str path; - description = '' + description = lib.mdDoc '' The path to the file with release cookie. (used for remote connection to the running node). ''; }; @@ -20,7 +20,7 @@ in { name = mkOption { default = "admin"; type = types.str; - description = '' + description = lib.mdDoc '' Name of the admin user that plausible will created on initial startup. ''; }; @@ -28,14 +28,14 @@ in { email = mkOption { type = types.str; example = "admin@localhost"; - description = '' + description = lib.mdDoc '' Email-address of the admin-user. ''; }; passwordFile = mkOption { type = types.either types.str types.path; - description = '' + description = lib.mdDoc '' Path to the file which contains the password of the admin user. ''; }; @@ -59,7 +59,7 @@ in { dbname = mkOption { default = "plausible"; type = types.str; - description = '' + description = lib.mdDoc '' Name of the database to use. ''; }; @@ -77,35 +77,35 @@ in { disableRegistration = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to prohibit creating an account in plausible's UI. ''; }; secretKeybaseFile = mkOption { type = types.either types.path types.str; - description = '' - Path to the secret used by the phoenix-framework. Instructions + description = lib.mdDoc '' + Path to the secret used by the `phoenix`-framework. Instructions how to generate one are documented in the - - framework docs. + [ + framework docs](https://hexdocs.pm/phoenix/Mix.Tasks.Phx.Gen.Secret.html#content). ''; }; port = mkOption { default = 8000; type = types.port; - description = '' + description = lib.mdDoc '' Port where the service should be available. ''; }; baseUrl = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Public URL where plausible is available. - Note that /path components are currently ignored: - + Note that `/path` components are currently ignored: + [ https://github.com/plausible/analytics/issues/1182 - . + ](https://github.com/plausible/analytics/issues/1182). ''; }; }; @@ -114,8 +114,8 @@ in { email = mkOption { default = "hello@plausible.local"; type = types.str; - description = '' - The email id to use for as from address of all communications + description = lib.mdDoc '' + The email id to use for as *from* address of all communications from Plausible. ''; }; @@ -123,28 +123,28 @@ in { hostAddr = mkOption { default = "localhost"; type = types.str; - description = '' + description = lib.mdDoc '' The host address of your smtp server. ''; }; hostPort = mkOption { default = 25; type = types.port; - description = '' + description = lib.mdDoc '' The port of your smtp server. ''; }; user = mkOption { default = null; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The username/email in case SMTP auth is enabled. ''; }; passwordFile = mkOption { default = null; type = with types; nullOr (either str path); - description = '' + description = lib.mdDoc '' The path to the file with the password in case SMTP auth is enabled. ''; }; @@ -152,7 +152,7 @@ in { retries = mkOption { type = types.ints.unsigned; default = 2; - description = '' + description = lib.mdDoc '' Number of retries to make until mailer gives up. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/powerdns-admin.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/powerdns-admin.nix index 4661ba80c5..c2d65f59e4 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/powerdns-admin.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/powerdns-admin.nix @@ -27,7 +27,7 @@ in example = literalExpression '' [ "-b" "127.0.0.1:8000" ] ''; - description = '' + description = lib.mdDoc '' Extra arguments passed to powerdns-admin. ''; }; @@ -40,9 +40,9 @@ in PORT = 8000 SQLALCHEMY_DATABASE_URI = 'postgresql://powerdnsadmin@/powerdnsadmin?host=/run/postgresql' ''; - description = '' + description = lib.mdDoc '' Configuration python file. - See the example configuration + See [the example configuration](https://github.com/ngoduykhanh/PowerDNS-Admin/blob/v${pkgs.powerdns-admin.version}/configs/development.py) for options. ''; }; @@ -50,7 +50,7 @@ in secretKeyFile = mkOption { type = types.nullOr types.path; example = "/etc/powerdns-admin/secret"; - description = '' + description = lib.mdDoc '' The secret used to create cookies. This needs to be set, otherwise the default is used and everyone can forge valid login cookies. Set this to null to ignore this setting and configure it through another way. @@ -60,7 +60,7 @@ in saltFile = mkOption { type = types.nullOr types.path; example = "/etc/powerdns-admin/salt"; - description = '' + description = lib.mdDoc '' The salt used for serialization. This should be set, otherwise the default is used. Set this to null to ignore this setting and configure it through another way. diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/prosody-filer.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/prosody-filer.nix index a901a95fd5..1d40809c42 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/prosody-filer.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/prosody-filer.nix @@ -14,9 +14,9 @@ in { enable = mkEnableOption "Prosody Filer XMPP upload file server"; settings = mkOption { - description = '' + description = lib.mdDoc '' Configuration for Prosody Filer. - Refer to for details on supported values. + Refer to for details on supported values. ''; type = settingsFormat.type; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/restya-board.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/restya-board.nix index 1a8199ab3b..ae80a7866a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/restya-board.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/restya-board.nix @@ -30,7 +30,7 @@ in dataDir = mkOption { type = types.path; default = "/var/lib/restya-board"; - description = '' + description = lib.mdDoc '' Data of the application. ''; }; @@ -38,7 +38,7 @@ in user = mkOption { type = types.str; default = "restya-board"; - description = '' + description = lib.mdDoc '' User account under which the web-application runs. ''; }; @@ -46,7 +46,7 @@ in group = mkOption { type = types.str; default = "nginx"; - description = '' + description = lib.mdDoc '' Group account under which the web-application runs. ''; }; @@ -55,7 +55,7 @@ in serverName = mkOption { type = types.str; default = "restya.board"; - description = '' + description = lib.mdDoc '' Name of the nginx virtualhost to use. ''; }; @@ -63,7 +63,7 @@ in listenHost = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Listen address for the virtualhost to use. ''; }; @@ -71,7 +71,7 @@ in listenPort = mkOption { type = types.int; default = 3000; - description = '' + description = lib.mdDoc '' Listen port for the virtualhost to use. ''; }; @@ -81,7 +81,7 @@ in host = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Host of the database. Leave 'null' to use a local PostgreSQL database. A local PostgreSQL database is initialized automatically. ''; @@ -90,7 +90,7 @@ in port = mkOption { type = types.nullOr types.int; default = 5432; - description = '' + description = lib.mdDoc '' The database's port. ''; }; @@ -98,7 +98,7 @@ in name = mkOption { type = types.str; default = "restya_board"; - description = '' + description = lib.mdDoc '' Name of the database. The database must exist. ''; }; @@ -106,7 +106,7 @@ in user = mkOption { type = types.str; default = "restya_board"; - description = '' + description = lib.mdDoc '' The database user. The user must exist and have access to the specified database. ''; @@ -115,7 +115,7 @@ in passwordFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' The database user's password. 'null' if no password is set. ''; }; @@ -126,7 +126,7 @@ in type = types.nullOr types.str; default = null; example = "localhost"; - description = '' + description = lib.mdDoc '' Hostname to send outgoing mail. Null to use the system MTA. ''; }; @@ -134,7 +134,7 @@ in port = mkOption { type = types.int; default = 25; - description = '' + description = lib.mdDoc '' Port used to connect to SMTP server. ''; }; @@ -142,7 +142,7 @@ in login = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' SMTP authentication login used when sending outgoing mail. ''; }; @@ -150,7 +150,7 @@ in password = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' SMTP authentication password used when sending outgoing mail. ATTENTION: The password is stored world-readable in the nix-store! @@ -161,7 +161,7 @@ in timezone = mkOption { type = types.lines; default = "GMT"; - description = '' + description = lib.mdDoc '' Timezone the web-app runs in. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/rss-bridge.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/rss-bridge.nix index f2b6d95598..b1a3907d19 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/rss-bridge.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/rss-bridge.nix @@ -16,7 +16,7 @@ in user = mkOption { type = types.str; default = "nginx"; - description = '' + description = lib.mdDoc '' User account under which both the service and the web-application run. ''; }; @@ -24,7 +24,7 @@ in group = mkOption { type = types.str; default = "nginx"; - description = '' + description = lib.mdDoc '' Group under which the web-application run. ''; }; @@ -32,7 +32,7 @@ in pool = mkOption { type = types.str; default = poolName; - description = '' + description = lib.mdDoc '' Name of existing phpfpm pool that is used to run web-application. If not specified a pool will be created automatically with default values. @@ -42,16 +42,16 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/rss-bridge"; - description = '' + description = lib.mdDoc '' Location in which cache directory will be created. - You can put config.ini.php in here. + You can put `config.ini.php` in here. ''; }; virtualHost = mkOption { type = types.nullOr types.str; default = "rss-bridge"; - description = '' + description = lib.mdDoc '' Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/selfoss.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/selfoss.nix index 899976ac69..016e053c80 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/selfoss.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/selfoss.nix @@ -35,7 +35,7 @@ in user = mkOption { type = types.str; default = "nginx"; - description = '' + description = lib.mdDoc '' User account under which both the service and the web-application run. ''; }; @@ -43,7 +43,7 @@ in pool = mkOption { type = types.str; default = "${poolName}"; - description = '' + description = lib.mdDoc '' Name of existing phpfpm pool that is used to run web-application. If not specified a pool will be created automatically with default values. @@ -54,7 +54,7 @@ in type = mkOption { type = types.enum ["pgsql" "mysql" "sqlite"]; default = "sqlite"; - description = '' + description = lib.mdDoc '' Database to store feeds. Supported are sqlite, pgsql and mysql. ''; }; @@ -62,7 +62,7 @@ in host = mkOption { type = types.str; default = "localhost"; - description = '' + description = lib.mdDoc '' Host of the database (has no effect if type is "sqlite"). ''; }; @@ -70,7 +70,7 @@ in name = mkOption { type = types.str; default = "tt_rss"; - description = '' + description = lib.mdDoc '' Name of the existing database (has no effect if type is "sqlite"). ''; }; @@ -78,7 +78,7 @@ in user = mkOption { type = types.str; default = "tt_rss"; - description = '' + description = lib.mdDoc '' The database user. The user must exist and has access to the specified database (has no effect if type is "sqlite"). ''; @@ -87,7 +87,7 @@ in password = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The database user's password (has no effect if type is "sqlite"). ''; }; @@ -95,7 +95,7 @@ in port = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' The database's port. If not set, the default ports will be provided (5432 and 3306 for pgsql and mysql respectively) (has no effect if type is "sqlite"). @@ -105,7 +105,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration added to config.ini ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix index bb2fc684e8..494f858730 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/shiori.nix @@ -12,13 +12,13 @@ in { type = types.package; default = pkgs.shiori; defaultText = literalExpression "pkgs.shiori"; - description = "The Shiori package to use."; + description = lib.mdDoc "The Shiori package to use."; }; address = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' The IP address on which Shiori will listen. If empty, listens on all interfaces. ''; @@ -27,7 +27,7 @@ in { port = mkOption { type = types.port; default = 8080; - description = "The port of the Shiori web application"; + description = lib.mdDoc "The port of the Shiori web application"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/snipe-it.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/snipe-it.nix index 842e0715c0..e2562ddd98 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/snipe-it.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/snipe-it.nix @@ -46,7 +46,7 @@ in { description = '' A file containing the Laravel APP_KEY - a 32 character long, base64 encoded key used for encryption where needed. Can be - generated with head -c 32 /dev/urandom | base64. + generated with head -c 32 /dev/urandom | base64. ''; example = "/run/keys/snipe-it/appkey"; type = types.path; @@ -69,7 +69,7 @@ in { description = '' The root URL that you want to host Snipe-IT on. All URLs in Snipe-IT will be generated using this value. If you change this in the future you may need to run a command to update stored URLs in the database. - Command example: snipe-it snipe-it:update-url https://old.example.com https://new.example.com + Command example: snipe-it snipe-it:update-url https://old.example.com https://new.example.com ''; default = "http${lib.optionalString tlsEnabled "s"}://${cfg.hostName}"; defaultText = '' @@ -472,6 +472,7 @@ in { "d ${cfg.dataDir}/storage/framework/views 0700 ${user} ${group} - -" "d ${cfg.dataDir}/storage/logs 0700 ${user} ${group} - -" "d ${cfg.dataDir}/storage/uploads 0700 ${user} ${group} - -" + "d ${cfg.dataDir}/storage/private_uploads 0700 ${user} ${group} - -" ]; users = { diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix index 4610bb96cb..a134282de8 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/sogo.nix @@ -21,31 +21,31 @@ in { enable = mkEnableOption "SOGo groupware"; vhostName = mkOption { - description = "Name of the nginx vhost"; + description = lib.mdDoc "Name of the nginx vhost"; type = str; default = "sogo"; }; timezone = mkOption { - description = "Timezone of your SOGo instance"; + description = lib.mdDoc "Timezone of your SOGo instance"; type = str; example = "America/Montreal"; }; language = mkOption { - description = "Language of SOGo"; + description = lib.mdDoc "Language of SOGo"; type = str; default = "English"; }; ealarmsCredFile = mkOption { - description = "Optional path to a credentials file for email alarms"; + description = lib.mdDoc "Optional path to a credentials file for email alarms"; type = nullOr str; default = null; }; configReplaces = mkOption { - description = '' + description = lib.mdDoc '' Replacement-filepath mapping for sogo.conf. Every key is replaced with the contents of the file specified as value. @@ -60,7 +60,7 @@ in { }; extraConfig = mkOption { - description = "Extra sogo.conf configuration lines"; + description = lib.mdDoc "Extra sogo.conf configuration lines"; type = lines; default = ""; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/trilium.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/trilium.nix index 35383c992f..bb1061cf27 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/trilium.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/trilium.nix @@ -10,6 +10,7 @@ let # Disable automatically generating desktop icon noDesktopIcon=true noBackup=${lib.boolToString cfg.noBackup} + noAuthentication=${lib.boolToString cfg.noAuthentication} [Network] # host setting is relevant only for web deployments - set the host on which the server will listen @@ -28,7 +29,7 @@ in dataDir = mkOption { type = types.str; default = "/var/lib/trilium"; - description = '' + description = lib.mdDoc '' The directory storing the notes database and the configuration. ''; }; @@ -36,7 +37,7 @@ in instanceName = mkOption { type = types.str; default = "Trilium"; - description = '' + description = lib.mdDoc '' Instance name used to distinguish between different instances ''; }; @@ -44,15 +45,23 @@ in noBackup = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Disable periodic database backups. ''; }; + noAuthentication = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + If set to true, no password is required to access the web frontend. + ''; + }; + host = mkOption { type = types.str; default = "127.0.0.1"; - description = '' + description = lib.mdDoc '' The host address to bind to (defaults to localhost). ''; }; @@ -60,14 +69,14 @@ in port = mkOption { type = types.int; default = 8080; - description = '' + description = lib.mdDoc '' The port number to bind to. ''; }; nginx = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Configuration for nginx reverse proxy. ''; @@ -76,14 +85,14 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Configure the nginx reverse proxy settings. ''; }; hostName = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The hostname use to setup the virtualhost configuration ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix index c441a2a776..f105b0aa3f 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/tt-rss.nix @@ -126,7 +126,7 @@ let root = mkOption { type = types.path; default = "/var/lib/tt-rss"; - description = '' + description = lib.mdDoc '' Root of the application. ''; }; @@ -134,7 +134,7 @@ let user = mkOption { type = types.str; default = "tt_rss"; - description = '' + description = lib.mdDoc '' User account under which both the update daemon and the web-application run. ''; }; @@ -142,7 +142,7 @@ let pool = mkOption { type = types.str; default = "${poolName}"; - description = '' + description = lib.mdDoc '' Name of existing phpfpm pool that is used to run web-application. If not specified a pool will be created automatically with default values. @@ -152,7 +152,7 @@ let virtualHost = mkOption { type = types.nullOr types.str; default = "tt-rss"; - description = '' + description = lib.mdDoc '' Name of the nginx virtualhost to use and setup. If null, do not setup any virtualhost. ''; }; @@ -161,7 +161,7 @@ let type = mkOption { type = types.enum ["pgsql" "mysql"]; default = "pgsql"; - description = '' + description = lib.mdDoc '' Database to store feeds. Supported are pgsql and mysql. ''; }; @@ -169,7 +169,7 @@ let host = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Host of the database. Leave null to use Unix domain socket. ''; }; @@ -177,7 +177,7 @@ let name = mkOption { type = types.str; default = "tt_rss"; - description = '' + description = lib.mdDoc '' Name of the existing database. ''; }; @@ -185,7 +185,7 @@ let user = mkOption { type = types.str; default = "tt_rss"; - description = '' + description = lib.mdDoc '' The database user. The user must exist and has access to the specified database. ''; @@ -194,7 +194,7 @@ let password = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The database user's password. ''; }; @@ -202,7 +202,7 @@ let passwordFile = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The database user's password. ''; }; @@ -210,7 +210,7 @@ let port = mkOption { type = types.nullOr types.int; default = null; - description = '' + description = lib.mdDoc '' The database's port. If not set, the default ports will be provided (5432 and 3306 for pgsql and mysql respectively). ''; @@ -219,7 +219,7 @@ let createLocally = mkOption { type = types.bool; default = true; - description = "Create the database and database user locally."; + description = lib.mdDoc "Create the database and database user locally."; }; }; @@ -227,7 +227,7 @@ let autoCreate = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Allow authentication modules to auto-create users in tt-rss internal database when authenticated successfully. ''; @@ -236,7 +236,7 @@ let autoLogin = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Automatically login user on remote or other kind of externally supplied authentication, otherwise redirect to login form as normal. If set to true, users won't be able to set application language @@ -249,7 +249,7 @@ let hub = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' URL to a PubSubHubbub-compatible hub server. If defined, "Published articles" generated feed would automatically become PUSH-enabled. ''; @@ -258,7 +258,7 @@ let enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable client PubSubHubbub support in tt-rss. When disabled, tt-rss won't try to subscribe to PUSH feed updates. ''; @@ -269,7 +269,7 @@ let server = mkOption { type = types.str; default = "localhost:9312"; - description = '' + description = lib.mdDoc '' Hostname:port combination for the Sphinx server. ''; }; @@ -277,7 +277,7 @@ let index = mkOption { type = types.listOf types.str; default = ["ttrss" "delta"]; - description = '' + description = lib.mdDoc '' Index names in Sphinx configuration. Example configuration files are available on tt-rss wiki. ''; @@ -288,7 +288,7 @@ let enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allow users to register themselves. Please be aware that allowing random people to access your tt-rss installation is a security risk and potentially might lead to data loss or server exploit. Disabled @@ -299,7 +299,7 @@ let notifyAddress = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Email address to send new user notifications to. ''; }; @@ -307,7 +307,7 @@ let maxUsers = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Maximum amount of users which will be allowed to register on this system. 0 - no limit. ''; @@ -319,7 +319,7 @@ let type = types.str; default = ""; example = "localhost:25"; - description = '' + description = lib.mdDoc '' Hostname:port combination to send outgoing mail. Blank - use system MTA. ''; @@ -328,7 +328,7 @@ let login = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' SMTP authentication login used when sending outgoing mail. ''; }; @@ -336,7 +336,7 @@ let password = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' SMTP authentication password used when sending outgoing mail. ''; }; @@ -344,7 +344,7 @@ let security = mkOption { type = types.enum ["" "ssl" "tls"]; default = ""; - description = '' + description = lib.mdDoc '' Used to select a secure SMTP connection. Allowed values: ssl, tls, or empty. ''; @@ -353,7 +353,7 @@ let fromName = mkOption { type = types.str; default = "Tiny Tiny RSS"; - description = '' + description = lib.mdDoc '' Name for sending outgoing mail. This applies to password reset notifications, digest emails and any other mail. ''; @@ -362,7 +362,7 @@ let fromAddress = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Address for sending outgoing mail. This applies to password reset notifications, digest emails and any other mail. ''; @@ -371,7 +371,7 @@ let digestSubject = mkOption { type = types.str; default = "[tt-rss] New headlines for last 24 hours"; - description = '' + description = lib.mdDoc '' Subject line for email digests. ''; }; @@ -380,7 +380,7 @@ let sessionCookieLifetime = mkOption { type = types.int; default = 86400; - description = '' + description = lib.mdDoc '' Default lifetime of a session (e.g. login) cookie. In seconds, 0 means cookie will be deleted when browser closes. ''; @@ -388,7 +388,7 @@ let selfUrlPath = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Full URL of your tt-rss installation. This should be set to the location of tt-rss directory, e.g. http://example.org/tt-rss/ You need to set this option correctly otherwise several features @@ -400,7 +400,7 @@ let feedCryptKey = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Key used for encryption of passwords for password-protected feeds in the database. A string of 24 random characters. If left blank, encryption is not used. Requires mcrypt functions. @@ -413,7 +413,7 @@ let type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Operate in single user mode, disables all functionality related to multiple users and authentication. Enabling this assumes you have your tt-rss directory protected by other means (e.g. http auth). @@ -423,7 +423,7 @@ let simpleUpdateMode = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables fallback update mode where tt-rss tries to update feeds in background while tt-rss is open in your browser. If you don't have a lot of feeds and don't want to or can't run @@ -437,7 +437,7 @@ let forceArticlePurge = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' When this option is not 0, users ability to control feed purging intervals is disabled and all articles (which are not starred) older than this amount of days are purged. @@ -447,7 +447,7 @@ let enableGZipOutput = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Selectively gzip output to improve wire performance. This requires PHP Zlib extension on the server. Enabling this can break tt-rss in several httpd/php configurations, @@ -459,7 +459,7 @@ let plugins = mkOption { type = types.listOf types.str; default = ["auth_internal" "note"]; - description = '' + description = lib.mdDoc '' List of plugins to load automatically for all users. System plugins have to be specified here. Please enable at least one authentication plugin here (auth_*). @@ -473,27 +473,27 @@ let pluginPackages = mkOption { type = types.listOf types.package; default = []; - description = '' + description = lib.mdDoc '' List of plugins to install. The list elements are expected to be derivations. All elements in this derivation are automatically - copied to the plugins.local directory. + copied to the `plugins.local` directory. ''; }; themePackages = mkOption { type = types.listOf types.package; default = []; - description = '' + description = lib.mdDoc '' List of themes to install. The list elements are expected to be derivations. All elements in this derivation are automatically - copied to the themes.local directory. + copied to the `themes.local` directory. ''; }; logDestination = mkOption { type = types.enum ["" "sql" "syslog"]; default = "sql"; - description = '' + description = lib.mdDoc '' Log destination to use. Possible values: sql (uses internal logging you can read in Preferences -> System), syslog - logs to system log. Setting this to blank uses PHP logging (usually to http server @@ -504,8 +504,8 @@ let extraConfig = mkOption { type = types.lines; default = ""; - description = '' - Additional lines to append to config.php. + description = lib.mdDoc '' + Additional lines to append to `config.php`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/vikunja.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/vikunja.nix index 7575e96ca8..7db6101598 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/vikunja.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/vikunja.nix @@ -15,18 +15,18 @@ in { default = pkgs.vikunja-api; type = types.package; defaultText = literalExpression "pkgs.vikunja-api"; - description = "vikunja-api derivation to use."; + description = lib.mdDoc "vikunja-api derivation to use."; }; package-frontend = mkOption { default = pkgs.vikunja-frontend; type = types.package; defaultText = literalExpression "pkgs.vikunja-frontend"; - description = "vikunja-frontend derivation to use."; + description = lib.mdDoc "vikunja-frontend derivation to use."; }; environmentFiles = mkOption { type = types.listOf types.path; default = [ ]; - description = '' + description = lib.mdDoc '' List of environment files set in the vikunja systemd service. For example passwords should be set in one of these files. ''; @@ -35,34 +35,34 @@ in { type = types.bool; default = config.services.nginx.enable; defaultText = literalExpression "config.services.nginx.enable"; - description = '' + description = lib.mdDoc '' Whether to setup NGINX. Further nginx configuration can be done by changing - . + {option}`services.nginx.virtualHosts.`. This does not enable TLS or ACME by default. To enable this, set the - to - true and if appropriate do the same for - . + {option}`services.nginx.virtualHosts..enableACME` to + `true` and if appropriate do the same for + {option}`services.nginx.virtualHosts..forceSSL`. ''; }; frontendScheme = mkOption { type = types.enum [ "http" "https" ]; - description = '' + description = lib.mdDoc '' Whether the site is available via http or https. This does not configure https or ACME in nginx! ''; }; frontendHostname = mkOption { type = types.str; - description = "The Hostname under which the frontend is running."; + description = lib.mdDoc "The Hostname under which the frontend is running."; }; settings = mkOption { type = format.type; default = {}; - description = '' + description = lib.mdDoc '' Vikunja configuration. Refer to - + for details on supported values. ''; }; @@ -71,27 +71,27 @@ in { type = types.enum [ "sqlite" "mysql" "postgres" ]; example = "postgres"; default = "sqlite"; - description = "Database engine to use."; + description = lib.mdDoc "Database engine to use."; }; host = mkOption { type = types.str; default = "localhost"; - description = "Database host address. Can also be a socket."; + description = lib.mdDoc "Database host address. Can also be a socket."; }; user = mkOption { type = types.str; default = "vikunja"; - description = "Database user."; + description = lib.mdDoc "Database user."; }; database = mkOption { type = types.str; default = "vikunja"; - description = "Database name."; + description = lib.mdDoc "Database name."; }; path = mkOption { type = types.str; default = "/var/lib/vikunja/vikunja.db"; - description = "Path to the sqlite3 database file."; + description = lib.mdDoc "Path to the sqlite3 database file."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/virtlyst.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/virtlyst.nix deleted file mode 100644 index 37bdbb0e3b..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/virtlyst.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.virtlyst; - stateDir = "/var/lib/virtlyst"; - - ini = pkgs.writeText "virtlyst-config.ini" '' - [wsgi] - master = true - threads = auto - http-socket = ${cfg.httpSocket} - application = ${pkgs.virtlyst}/lib/libVirtlyst.so - chdir2 = ${stateDir} - static-map = /static=${pkgs.virtlyst}/root/static - - [Cutelyst] - production = true - DatabasePath = virtlyst.sqlite - TemplatePath = ${pkgs.virtlyst}/root/src - - [Rules] - cutelyst.* = true - virtlyst.* = true - ''; - -in - -{ - - options.services.virtlyst = { - enable = mkEnableOption "Virtlyst libvirt web interface"; - - adminPassword = mkOption { - type = types.str; - description = '' - Initial admin password with which the database will be seeded. - ''; - }; - - httpSocket = mkOption { - type = types.str; - default = "localhost:3000"; - description = '' - IP and/or port to which to bind the http socket. - ''; - }; - }; - - config = mkIf cfg.enable { - users.users.virtlyst = { - home = stateDir; - createHome = true; - group = mkIf config.virtualisation.libvirtd.enable "libvirtd"; - isSystemUser = true; - }; - - systemd.services.virtlyst = { - wantedBy = [ "multi-user.target" ]; - environment = { - VIRTLYST_ADMIN_PASSWORD = cfg.adminPassword; - }; - serviceConfig = { - ExecStart = "${pkgs.cutelyst}/bin/cutelyst-wsgi2 --ini ${ini}"; - User = "virtlyst"; - WorkingDirectory = stateDir; - }; - }; - }; - -} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/whitebophir.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/whitebophir.nix index f9db6fe379..c4dee3c6ee 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/whitebophir.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/whitebophir.nix @@ -13,19 +13,19 @@ in { default = pkgs.whitebophir; defaultText = literalExpression "pkgs.whitebophir"; type = types.package; - description = "Whitebophir package to use."; + description = lib.mdDoc "Whitebophir package to use."; }; listenAddress = mkOption { type = types.str; default = "0.0.0.0"; - description = "Address to listen on (use 0.0.0.0 to allow access from any address)."; + description = lib.mdDoc "Address to listen on (use 0.0.0.0 to allow access from any address)."; }; port = mkOption { type = types.port; default = 5001; - description = "Port to bind to."; + description = lib.mdDoc "Port to bind to."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix index 1a6259dffe..5dc0bb7325 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wiki-js.nix @@ -16,7 +16,7 @@ in { type = types.nullOr types.path; default = null; example = "/root/wiki-js.env"; - description = '' + description = lib.mdDoc '' Environment fiel to inject e.g. secrets into the configuration. ''; }; @@ -24,8 +24,8 @@ in { stateDirectoryName = mkOption { default = "wiki-js"; type = types.str; - description = '' - Name of the directory in /var/lib. + description = lib.mdDoc '' + Name of the directory in {file}`/var/lib`. ''; }; @@ -37,7 +37,7 @@ in { port = mkOption { type = types.port; default = 3000; - description = '' + description = lib.mdDoc '' TCP port the process should listen to. ''; }; @@ -45,7 +45,7 @@ in { bindIP = mkOption { default = "0.0.0.0"; type = types.str; - description = '' + description = lib.mdDoc '' IPs the service should listen to. ''; }; @@ -64,14 +64,14 @@ in { host = mkOption { type = types.str; example = "/run/postgresql"; - description = '' + description = lib.mdDoc '' Hostname or socket-path to connect to. ''; }; db = mkOption { default = "wiki"; type = types.str; - description = '' + description = lib.mdDoc '' Name of the database to use. ''; }; @@ -80,7 +80,7 @@ in { logLevel = mkOption { default = "info"; type = types.enum [ "error" "warn" "info" "verbose" "debug" "silly" ]; - description = '' + description = lib.mdDoc '' Define how much detail is supposed to be logged at runtime. ''; }; @@ -95,12 +95,11 @@ in { }; description = '' Settings to configure wiki-js. This directly - corresponds to the upstream - configuration options. + corresponds to the upstream configuration options. Secrets can be injected via the environment by - specifying + specifying to contain secrets and setting sensitive values to $(ENVIRONMENT_VAR) with this value defined in the environment-file. diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix index 59471a739c..b1ae4deb27 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/wordpress.nix @@ -192,7 +192,7 @@ let prefix. Typically this is changed if you are installing multiple WordPress blogs in the same database. - See . + See . ''; }; @@ -246,7 +246,7 @@ let description = '' Any additional text to be appended to the wp-config.php configuration file. This is a PHP script. For configuration - settings, see . + settings, see . ''; example = '' define( 'AUTOSAVE_INTERVAL', 60 ); // Seconds diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix index b83265ffea..789880d61f 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/youtrack.nix @@ -24,7 +24,7 @@ in enable = mkEnableOption "YouTrack service"; address = mkOption { - description = '' + description = lib.mdDoc '' The interface youtrack will listen on. ''; default = "127.0.0.1"; @@ -32,7 +32,7 @@ in }; baseUrl = mkOption { - description = '' + description = lib.mdDoc '' Base URL for youtrack. Will be auto-detected and stored in database. ''; type = types.nullOr types.str; @@ -41,7 +41,7 @@ in extraParams = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Extra parameters to pass to youtrack. See https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html for more information. @@ -55,7 +55,7 @@ in }; package = mkOption { - description = '' + description = lib.mdDoc '' Package to use. ''; type = types.package; @@ -64,7 +64,7 @@ in }; port = mkOption { - description = '' + description = lib.mdDoc '' The port youtrack will listen on. ''; default = 8080; @@ -72,7 +72,7 @@ in }; statePath = mkOption { - description = '' + description = lib.mdDoc '' Where to keep the youtrack database. ''; type = types.path; @@ -80,7 +80,7 @@ in }; virtualHost = mkOption { - description = '' + description = lib.mdDoc '' Name of the nginx virtual host to use and setup. If null, do not setup anything. ''; @@ -89,7 +89,7 @@ in }; jvmOpts = mkOption { - description = '' + description = lib.mdDoc '' Extra options to pass to the JVM. See https://www.jetbrains.com/help/youtrack/standalone/Configure-JVM-Options.html for more information. @@ -100,7 +100,7 @@ in }; maxMemory = mkOption { - description = '' + description = lib.mdDoc '' Maximum Java heap size ''; type = types.str; @@ -108,7 +108,7 @@ in }; maxMetaspaceSize = mkOption { - description = '' + description = lib.mdDoc '' Maximum java Metaspace memory. ''; type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/agate.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/agate.nix index 3afdb561c0..3f7b298fa9 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/agate.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/agate.nix @@ -14,13 +14,13 @@ in type = types.package; default = pkgs.agate; defaultText = literalExpression "pkgs.agate"; - description = "The package to use"; + description = lib.mdDoc "The package to use"; }; addresses = mkOption { type = types.listOf types.str; default = [ "0.0.0.0:1965" ]; - description = '' + description = lib.mdDoc '' Addresses to listen on, IP:PORT, if you haven't disabled forwarding only set IPv4. ''; @@ -29,19 +29,19 @@ in contentDir = mkOption { default = "/var/lib/agate/content"; type = types.path; - description = "Root of the content directory."; + description = lib.mdDoc "Root of the content directory."; }; certificatesDir = mkOption { default = "/var/lib/agate/certificates"; type = types.path; - description = "Root of the certificate directory."; + description = lib.mdDoc "Root of the certificate directory."; }; hostnames = mkOption { default = [ ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Domain name of this Gemini server, enables checking hostname and port in requests. (multiple occurences means basic vhosts) ''; @@ -50,20 +50,20 @@ in language = mkOption { default = null; type = types.nullOr types.str; - description = "RFC 4646 Language code for text/gemini documents."; + description = lib.mdDoc "RFC 4646 Language code for text/gemini documents."; }; onlyTls_1_3 = mkOption { default = false; type = types.bool; - description = "Only use TLSv1.3 (default also allows TLSv1.2)."; + description = lib.mdDoc "Only use TLSv1.3 (default also allows TLSv1.2)."; }; extraArgs = mkOption { type = types.listOf types.str; default = [ "" ]; example = [ "--log-ip" ]; - description = "Extra arguments to use running agate."; + description = lib.mdDoc "Extra arguments to use running agate."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/location-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/location-options.nix index 8ea88f94f9..726ad2683d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/location-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/location-options.nix @@ -9,8 +9,8 @@ in type = with types; nullOr str; default = null; example = "http://www.example.org/"; - description = '' - Sets up a simple reverse proxy as described by . + description = lib.mdDoc '' + Sets up a simple reverse proxy as described by . ''; }; @@ -18,8 +18,8 @@ in type = with types; nullOr str; default = null; example = "index.php index.html"; - description = '' - Adds DirectoryIndex directive. See . + description = lib.mdDoc '' + Adds DirectoryIndex directive. See . ''; }; @@ -27,15 +27,15 @@ in type = with types; nullOr path; default = null; example = "/your/alias/directory"; - description = '' - Alias directory for requests. See . + description = lib.mdDoc '' + Alias directory for requests. See . ''; }; extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' These lines go to the end of the location verbatim. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index c52ab2c596..559210a141 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -233,7 +233,7 @@ in default = false; description = '' Whether to enable serving ~/public_html as - /~username. + /~«username». ''; }; @@ -261,8 +261,7 @@ in default = ""; example = "Disallow: /foo/"; description = '' - Specification of pages to be ignored by web crawlers. See for details. + Specification of pages to be ignored by web crawlers. See for details. ''; }; @@ -280,8 +279,7 @@ in }; ''; description = '' - Declarative location config. See for details. + Declarative location config. See for details. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix index f6b693139a..5663e9ca9d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/darkhttpd.nix @@ -20,7 +20,7 @@ in { port = mkOption { default = 80; type = types.port; - description = '' + description = lib.mdDoc '' Port to listen on. Pass 0 to let the system choose any free port for you. ''; @@ -37,7 +37,7 @@ in { rootDir = mkOption { type = path; - description = '' + description = lib.mdDoc '' Path from which to serve files. ''; }; @@ -45,7 +45,7 @@ in { hideServerId = mkOption { type = bool; default = true; - description = '' + description = lib.mdDoc '' Don't identify the server type in headers or directory listings. ''; }; @@ -53,7 +53,7 @@ in { extraArgs = mkOption { type = listOf str; default = []; - description = '' + description = lib.mdDoc '' Additional configuration passed to the executable. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix index a64a187255..f9c91fb35d 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix @@ -11,38 +11,38 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable fcgiwrap, a server for running CGI applications over FastCGI."; + description = lib.mdDoc "Whether to enable fcgiwrap, a server for running CGI applications over FastCGI."; }; preforkProcesses = mkOption { type = types.int; default = 1; - description = "Number of processes to prefork."; + description = lib.mdDoc "Number of processes to prefork."; }; socketType = mkOption { type = types.enum [ "unix" "tcp" "tcp6" ]; default = "unix"; - description = "Socket type: 'unix', 'tcp' or 'tcp6'."; + description = lib.mdDoc "Socket type: 'unix', 'tcp' or 'tcp6'."; }; socketAddress = mkOption { type = types.str; default = "/run/fcgiwrap.sock"; example = "1.2.3.4:5678"; - description = "Socket address. In case of a UNIX socket, this should be its filesystem path."; + description = lib.mdDoc "Socket address. In case of a UNIX socket, this should be its filesystem path."; }; user = mkOption { type = types.nullOr types.str; default = null; - description = "User permissions for the socket."; + description = lib.mdDoc "User permissions for the socket."; }; group = mkOption { type = types.nullOr types.str; default = null; - description = "Group permissions for the socket."; + description = lib.mdDoc "Group permissions for the socket."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/hitch/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/hitch/default.nix index 1812f225b7..78bae14055 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/hitch/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/hitch/default.nix @@ -21,7 +21,7 @@ with lib; backend = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' The host and port Hitch connects to when receiving a connection in the form [HOST]:PORT ''; @@ -30,7 +30,7 @@ with lib; ciphers = mkOption { type = types.str; default = "EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH"; - description = "The list of ciphers to use"; + description = lib.mdDoc "The list of ciphers to use"; }; frontend = mkOption { @@ -46,33 +46,33 @@ with lib; pem-files = mkOption { type = types.listOf types.path; default = []; - description = "PEM files to use"; + description = lib.mdDoc "PEM files to use"; }; ocsp-stapling = { enabled = mkOption { type = types.bool; default = true; - description = "Whether to enable OCSP Stapling"; + description = lib.mdDoc "Whether to enable OCSP Stapling"; }; }; user = mkOption { type = types.str; default = "hitch"; - description = "The user to run as"; + description = lib.mdDoc "The user to run as"; }; group = mkOption { type = types.str; default = "hitch"; - description = "The group to run as"; + description = lib.mdDoc "The group to run as"; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Additional configuration lines"; + description = lib.mdDoc "Additional configuration lines"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/hydron.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/hydron.nix index 46f62a9119..046d527b2a 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/hydron.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/hydron.nix @@ -10,7 +10,7 @@ in with lib; { type = types.path; default = "/var/lib/hydron"; example = "/home/okina/hydron"; - description = "Location where hydron runs and stores data."; + description = lib.mdDoc "Location where hydron runs and stores data."; }; interval = mkOption { @@ -30,19 +30,19 @@ in with lib; { type = types.str; default = "hydron"; example = "dumbpass"; - description = "Password for the hydron database."; + description = lib.mdDoc "Password for the hydron database."; }; passwordFile = mkOption { type = types.path; default = "/run/keys/hydron-password-file"; example = "/home/okina/hydron/keys/pass"; - description = "Password file for the hydron database."; + description = lib.mdDoc "Password file for the hydron database."; }; postgresArgs = mkOption { type = types.str; - description = "Postgresql connection arguments."; + description = lib.mdDoc "Postgresql connection arguments."; example = '' { "driver": "postgres", @@ -55,27 +55,27 @@ in with lib; { type = types.path; default = "/run/keys/hydron-postgres-args"; example = "/home/okina/hydron/keys/postgres"; - description = "Postgresql connection arguments file."; + description = lib.mdDoc "Postgresql connection arguments file."; }; listenAddress = mkOption { type = types.nullOr types.str; default = null; example = "127.0.0.1:8010"; - description = "Listen on a specific IP address and port."; + description = lib.mdDoc "Listen on a specific IP address and port."; }; importPaths = mkOption { type = types.listOf types.path; default = []; example = [ "/home/okina/Pictures" ]; - description = "Paths that hydron will recursively import."; + description = lib.mdDoc "Paths that hydron will recursively import."; }; fetchTags = mkOption { type = types.bool; default = true; - description = "Fetch tags for imported images and webm from gelbooru."; + description = lib.mdDoc "Fetch tags for imported images and webm from gelbooru."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/default.nix index d243e0f3f1..05b354d567 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/jboss/default.nix @@ -26,49 +26,49 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities."; + description = lib.mdDoc "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities."; }; tempDir = mkOption { default = "/tmp"; type = types.str; - description = "Location where JBoss stores its temp files"; + description = lib.mdDoc "Location where JBoss stores its temp files"; }; logDir = mkOption { default = "/var/log/jboss"; type = types.str; - description = "Location of the logfile directory of JBoss"; + description = lib.mdDoc "Location of the logfile directory of JBoss"; }; serverDir = mkOption { - description = "Location of the server instance files"; + description = lib.mdDoc "Location of the server instance files"; default = "/var/jboss/server"; type = types.str; }; deployDir = mkOption { - description = "Location of the deployment files"; + description = lib.mdDoc "Location of the deployment files"; default = "/nix/var/nix/profiles/default/server/default/deploy/"; type = types.str; }; libUrl = mkOption { default = "file:///nix/var/nix/profiles/default/server/default/lib"; - description = "Location where the shared library JARs are stored"; + description = lib.mdDoc "Location where the shared library JARs are stored"; type = types.str; }; user = mkOption { default = "nobody"; - description = "User account under which jboss runs."; + description = lib.mdDoc "User account under which jboss runs."; type = types.str; }; useJK = mkOption { type = types.bool; default = false; - description = "Whether to use to connector to the Apache HTTP server"; + description = lib.mdDoc "Whether to use to connector to the Apache HTTP server"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix index 8cd6d02094..5042fbf1f8 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/cgit.nix @@ -23,7 +23,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If true, enable cgit (fast web interface for git repositories) as a sub-service in lighttpd. ''; @@ -33,7 +33,7 @@ in default = "cgit"; example = ""; type = types.str; - description = '' + description = lib.mdDoc '' The subdirectory in which to serve cgit. The web application will be accessible at http://yourserver/''${subdir} ''; @@ -50,7 +50,7 @@ in ''' ''; type = types.lines; - description = '' + description = lib.mdDoc '' Verbatim contents of the cgit runtime configuration file. Documentation (with cgitrc example file) is available in "man cgitrc". Or online: http://git.zx2c4.com/cgit/tree/cgitrc.5.txt diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/collectd.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/collectd.nix index 5f091591da..270517a4e2 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/collectd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/collectd.nix @@ -33,7 +33,7 @@ in defaultText = literalDocBook '' config.${options.services.collectd.package} configured for lighttpd ''; - description = '' + description = lib.mdDoc '' Path to collection.cgi script from (collectd sources)/contrib/collection.cgi This option allows to use a customized version ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix index 05e897c8cc..ec847495d7 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/default.nix @@ -130,7 +130,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable the lighttpd web server. ''; }; @@ -139,7 +139,7 @@ in default = pkgs.lighttpd; defaultText = "pkgs.lighttpd"; type = types.package; - description = '' + description = lib.mdDoc '' lighttpd package to use. ''; }; @@ -147,7 +147,7 @@ in port = mkOption { default = 80; type = types.port; - description = '' + description = lib.mdDoc '' TCP port number for lighttpd to bind to. ''; }; @@ -155,7 +155,7 @@ in document-root = mkOption { default = "/srv/www"; type = types.path; - description = '' + description = lib.mdDoc '' Document-root of the web server. Must be readable by the "lighttpd" user. ''; }; @@ -163,7 +163,7 @@ in mod_userdir = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If true, requests in the form /~user/page.html are rewritten to take the file public_html/page.html from the home directory of the user. ''; @@ -173,11 +173,11 @@ in type = types.listOf types.str; default = [ ]; example = [ "mod_cgi" "mod_status" ]; - description = '' + description = lib.mdDoc '' List of lighttpd modules to enable. Sub-services take care of enabling modules as needed, so this option is mainly for when you want to add custom stuff to - that depends on a + {option}`services.lighttpd.extraConfig` that depends on a certain module. ''; }; @@ -185,18 +185,18 @@ in enableUpstreamMimeTypes = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to include the list of mime types bundled with lighttpd (upstream). If you disable this, no mime types will be added by NixOS and you will have to add your own mime types in - . + {option}`services.lighttpd.extraConfig`. ''; }; mod_status = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Show server status overview at /server-status, statistics at /server-statistics and list of loaded modules at /server-config. ''; @@ -206,7 +206,7 @@ in default = ""; type = types.lines; example = "...verbatim config file contents..."; - description = '' + description = lib.mdDoc '' Overridable config file contents to use for lighttpd. By default, use the contents automatically generated by NixOS. ''; @@ -215,10 +215,10 @@ in extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' These configuration lines will be appended to the generated lighttpd config file. Note that this mechanism does not work when the manual - option is used. + {option}`configText` option is used. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/gitweb.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/gitweb.nix index c494d6966a..e129e8bc16 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/gitweb.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/lighttpd/gitweb.nix @@ -16,7 +16,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If true, enable gitweb in lighttpd. Access it at http://yourserver/gitweb ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix index f9b1a8b6cc..523b5de2d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/mighttpd2.nix @@ -42,7 +42,7 @@ in { Service: 0 # 0 is HTTP only, 1 is HTTPS only, 2 is both ''; type = types.lines; - description = '' + description = lib.mdDoc '' Verbatim config file to use (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html) ''; @@ -76,7 +76,7 @@ in { / -> /export/www/ ''; type = types.lines; - description = '' + description = lib.mdDoc '' Verbatim routing file to use (see http://www.mew.org/~kazu/proj/mighttpd/en/config.html) ''; @@ -85,7 +85,7 @@ in { cores = mkOption { default = null; type = types.nullOr types.int; - description = '' + description = lib.mdDoc '' How many cores to use. If null it will be determined automatically ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/minio.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/minio.nix index c345e3f246..f4fca2275e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/minio.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/minio.nix @@ -19,51 +19,51 @@ in listenAddress = mkOption { default = ":9000"; type = types.str; - description = "IP address and port of the server."; + description = lib.mdDoc "IP address and port of the server."; }; consoleAddress = mkOption { default = ":9001"; type = types.str; - description = "IP address and port of the web UI (console)."; + description = lib.mdDoc "IP address and port of the web UI (console)."; }; dataDir = mkOption { default = [ "/var/lib/minio/data" ]; type = types.listOf types.path; - description = "The list of data directories for storing the objects. Use one path for regular operation and the minimum of 4 endpoints for Erasure Code mode."; + description = lib.mdDoc "The list of data directories for storing the objects. Use one path for regular operation and the minimum of 4 endpoints for Erasure Code mode."; }; configDir = mkOption { default = "/var/lib/minio/config"; type = types.path; - description = "The config directory, for the access keys and other settings."; + description = lib.mdDoc "The config directory, for the access keys and other settings."; }; accessKey = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Access key of 5 to 20 characters in length that clients use to access the server. This overrides the access key that is generated by minio on first startup and stored inside the - configDir directory. + `configDir` directory. ''; }; secretKey = mkOption { default = ""; type = types.str; - description = '' + description = lib.mdDoc '' Specify the Secret key of 8 to 40 characters in length that clients use to access the server. This overrides the secret key that is generated by minio on first startup and stored inside the - configDir directory. + `configDir` directory. ''; }; rootCredentialsFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' File containing the MINIO_ROOT_USER, default is "minioadmin", and MINIO_ROOT_PASSWORD (length >= 8), default is "minioadmin"; in the format of an EnvironmentFile=, as described by systemd.exec(5). @@ -74,7 +74,7 @@ in region = mkOption { default = "us-east-1"; type = types.str; - description = '' + description = lib.mdDoc '' The physical location of the server. By default it is set to us-east-1, which is same as AWS S3's and Minio's default region. ''; }; @@ -82,14 +82,14 @@ in browser = mkOption { default = true; type = types.bool; - description = "Enable or disable access to web UI."; + description = lib.mdDoc "Enable or disable access to web UI."; }; package = mkOption { default = pkgs.minio; defaultText = literalExpression "pkgs.minio"; type = types.package; - description = "Minio package to use."; + description = lib.mdDoc "Minio package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix index 0bd8b3316c..31a2e856db 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/molly-brown.nix @@ -15,7 +15,7 @@ in { port = mkOption { default = 1965; type = types.port; - description = '' + description = lib.mdDoc '' TCP port for molly-brown to bind to. ''; }; @@ -24,7 +24,7 @@ in { type = types.str; default = config.networking.hostName; defaultText = literalExpression "config.networking.hostName"; - description = '' + description = lib.mdDoc '' The hostname to respond to requests for. Requests for URLs with other hosts will result in a status 53 (PROXY REQUEST REFUSED) response. @@ -50,21 +50,21 @@ in { keyPath = mkOption { type = types.path; example = "/var/lib/acme/example.com/key.pem"; - description = "Path to TLS key. See ."; + description = lib.mdDoc "Path to TLS key. See {option}`CertPath`."; }; docBase = mkOption { type = types.path; example = "/var/lib/molly-brown"; - description = "Base directory for Gemini content."; + description = lib.mdDoc "Base directory for Gemini content."; }; settings = mkOption { inherit (settingsFormat) type; default = { }; - description = '' + description = lib.mdDoc '' molly-brown configuration. Refer to - + for details on supported values. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix index 5ccbaf7748..166f38f9ea 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/default.nix @@ -504,16 +504,16 @@ in This is mutually exclusive to any other config option for nginx.conf except for - + - + - + If additional verbatim config in addition to other options is needed, - should be used instead. + should be used instead. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix index db45577a46..ec2c432ca5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix @@ -17,7 +17,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If true, enable gitweb in nginx. ''; }; @@ -25,7 +25,7 @@ in location = mkOption { default = "/gitweb"; type = types.str; - description = '' + description = lib.mdDoc '' Location to serve gitweb on. ''; }; @@ -33,7 +33,7 @@ in user = mkOption { default = "nginx"; type = types.str; - description = '' + description = lib.mdDoc '' Existing user that the CGI process will belong to. (Default almost surely will do.) ''; }; @@ -41,15 +41,15 @@ in group = mkOption { default = "nginx"; type = types.str; - description = '' - Group that the CGI process will belong to. (Set to config.services.gitolite.group if you are using gitolite.) + description = lib.mdDoc '' + Group that the CGI process will belong to. (Set to `config.services.gitolite.group` if you are using gitolite.) ''; }; virtualHost = mkOption { default = "_"; type = types.str; - description = '' + description = lib.mdDoc '' VirtualHost to serve gitweb on. Default is catch-all. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix index a9929297a2..61eef9f7ac 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/vhost-options.nix @@ -60,7 +60,7 @@ with lib; Note: This option overrides enableIPv6 ''; default = []; - example = [ "127.0.0.1" "::1" ]; + example = [ "127.0.0.1" "[::1]" ]; }; enableACME = mkOption { diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix index 87c68fa074..e24c77d056 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/phpfpm/default.nix @@ -51,7 +51,7 @@ let type = types.str; default = ""; example = "/path/to/unix/socket"; - description = '' + description = lib.mdDoc '' The address on which to accept FastCGI requests. ''; }; @@ -60,22 +60,22 @@ let type = types.package; default = cfg.phpPackage; defaultText = literalExpression "config.services.phpfpm.phpPackage"; - description = '' + description = lib.mdDoc '' The PHP package to use for running this PHP-FPM pool. ''; }; phpOptions = mkOption { type = types.lines; - description = '' - "Options appended to the PHP configuration file php.ini used for this PHP-FPM pool." + description = lib.mdDoc '' + "Options appended to the PHP configuration file {file}`php.ini` used for this PHP-FPM pool." ''; }; phpEnv = lib.mkOption { type = with types; attrsOf str; default = {}; - description = '' + description = lib.mdDoc '' Environment variables used for this PHP-FPM pool. ''; example = literalExpression '' @@ -90,22 +90,22 @@ let user = mkOption { type = types.str; - description = "User account under which this pool runs."; + description = lib.mdDoc "User account under which this pool runs."; }; group = mkOption { type = types.str; - description = "Group account under which this pool runs."; + description = lib.mdDoc "Group account under which this pool runs."; }; settings = mkOption { type = with types; attrsOf (oneOf [ str int bool ]); default = {}; - description = '' + description = lib.mdDoc '' PHP-FPM pool directives. Refer to the "List of pool directives" section of - + for details. Note that settings names must be enclosed in quotes (e.g. - "pm.max_children" instead of pm.max_children). + `"pm.max_children"` instead of `pm.max_children`). ''; example = literalExpression '' { @@ -122,9 +122,9 @@ let extraConfig = mkOption { type = with types; nullOr lines; default = null; - description = '' + description = lib.mdDoc '' Extra lines that go into the pool configuration. - See the documentation on php-fpm.conf for + See the documentation on `php-fpm.conf` for details on configuration directives. ''; }; @@ -154,24 +154,24 @@ in { settings = mkOption { type = with types; attrsOf (oneOf [ str int bool ]); default = {}; - description = '' + description = lib.mdDoc '' PHP-FPM global directives. Refer to the "List of global php-fpm.conf directives" section of - + for details. Note that settings names must be enclosed in quotes (e.g. - "pm.max_children" instead of pm.max_children). - You need not specify the options error_log or - daemonize here, since they are generated by NixOS. + `"pm.max_children"` instead of `pm.max_children`). + You need not specify the options `error_log` or + `daemonize` here, since they are generated by NixOS. ''; }; extraConfig = mkOption { type = with types; nullOr lines; default = null; - description = '' + description = lib.mdDoc '' Extra configuration that should be put in the global section of the PHP-FPM configuration file. Do not specify the options - error_log or - daemonize here, since they are generated by + `error_log` or + `daemonize` here, since they are generated by NixOS. ''; }; @@ -180,7 +180,7 @@ in { type = types.package; default = pkgs.php; defaultText = literalExpression "pkgs.php"; - description = '' + description = lib.mdDoc '' The PHP package to use for running the PHP-FPM service. ''; }; @@ -192,8 +192,8 @@ in { '' date.timezone = "CET" ''; - description = '' - Options appended to the PHP configuration file php.ini. + description = lib.mdDoc '' + Options appended to the PHP configuration file {file}`php.ini`. ''; }; @@ -216,7 +216,7 @@ in { }; } }''; - description = '' + description = lib.mdDoc '' PHP-FPM pools. If no pools are defined, the PHP-FPM service is disabled. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/pomerium.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/pomerium.nix index 0b460755f5..209de55e36 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/pomerium.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/pomerium.nix @@ -12,13 +12,13 @@ in configFile = mkOption { type = with types; nullOr path; default = null; - description = "Path to Pomerium config YAML. If set, overrides services.pomerium.settings."; + description = lib.mdDoc "Path to Pomerium config YAML. If set, overrides services.pomerium.settings."; }; useACMEHost = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' If set, use a NixOS-generated ACME certificate with the specified name. Note that this will require you to use a non-HTTP-based challenge, or @@ -32,13 +32,13 @@ in }; settings = mkOption { - description = '' + description = lib.mdDoc '' The contents of Pomerium's config.yaml, in Nix expressions. Specifying configFile will override this in its entirety. - See the Pomerium - configuration reference for more information about what to put + See [the Pomerium + configuration reference](https://pomerium.io/reference/) for more information about what to put here. ''; default = {}; @@ -48,7 +48,7 @@ in secretsFile = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' Path to file containing secrets for Pomerium, in systemd EnvironmentFile format. See the systemd.exec(5) man page. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix index 877097cf37..ec7f46e25e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/tomcat.nix @@ -26,7 +26,7 @@ in default = pkgs.tomcat9; defaultText = literalExpression "pkgs.tomcat9"; example = lib.literalExpression "pkgs.tomcat9"; - description = '' + description = lib.mdDoc '' Which tomcat package to use. ''; }; @@ -56,57 +56,57 @@ in logDirs = mkOption { default = []; type = types.listOf types.path; - description = "Directories to create in baseDir/logs/"; + description = lib.mdDoc "Directories to create in baseDir/logs/"; }; extraConfigFiles = mkOption { default = []; type = types.listOf types.path; - description = "Extra configuration files to pull into the tomcat conf directory"; + description = lib.mdDoc "Extra configuration files to pull into the tomcat conf directory"; }; extraEnvironment = mkOption { type = types.listOf types.str; default = []; example = [ "ENVIRONMENT=production" ]; - description = "Environment Variables to pass to the tomcat service"; + description = lib.mdDoc "Environment Variables to pass to the tomcat service"; }; extraGroups = mkOption { default = []; type = types.listOf types.str; example = [ "users" ]; - description = "Defines extra groups to which the tomcat user belongs."; + description = lib.mdDoc "Defines extra groups to which the tomcat user belongs."; }; user = mkOption { type = types.str; default = "tomcat"; - description = "User account under which Apache Tomcat runs."; + description = lib.mdDoc "User account under which Apache Tomcat runs."; }; group = mkOption { type = types.str; default = "tomcat"; - description = "Group account under which Apache Tomcat runs."; + description = lib.mdDoc "Group account under which Apache Tomcat runs."; }; javaOpts = mkOption { type = types.either (types.listOf types.str) types.str; default = ""; - description = "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat"; + description = lib.mdDoc "Parameters to pass to the Java Virtual Machine which spawns Apache Tomcat"; }; catalinaOpts = mkOption { type = types.either (types.listOf types.str) types.str; default = ""; - description = "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container"; + description = lib.mdDoc "Parameters to pass to the Java Virtual Machine which spawns the Catalina servlet container"; }; sharedLibs = mkOption { type = types.listOf types.str; default = []; - description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications"; + description = lib.mdDoc "List containing JAR files or directories with JAR files which are libraries shared by the web applications"; }; serverXml = mkOption { @@ -121,14 +121,14 @@ in commonLibs = mkOption { type = types.listOf types.str; default = []; - description = "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container"; + description = lib.mdDoc "List containing JAR files or directories with JAR files which are libraries shared by the web applications and the servlet container"; }; webapps = mkOption { type = types.listOf types.path; default = [ tomcat.webapps ]; defaultText = literalExpression "[ config.services.tomcat.package.webapps ]"; - description = "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; + description = lib.mdDoc "List containing WAR files or directories with WAR files which are web applications to be deployed on Tomcat"; }; virtualHosts = mkOption { @@ -136,16 +136,16 @@ in options = { name = mkOption { type = types.str; - description = "name of the virtualhost"; + description = lib.mdDoc "name of the virtualhost"; }; aliases = mkOption { type = types.listOf types.str; - description = "aliases of the virtualhost"; + description = lib.mdDoc "aliases of the virtualhost"; default = []; }; webapps = mkOption { type = types.listOf types.path; - description = '' + description = lib.mdDoc '' List containing web application WAR files and/or directories containing web applications and configuration files for the virtual host. ''; @@ -154,20 +154,20 @@ in }; }); default = []; - description = "List consisting of a virtual host name and a list of web applications to deploy on each virtual host"; + description = lib.mdDoc "List consisting of a virtual host name and a list of web applications to deploy on each virtual host"; }; logPerVirtualHost = mkOption { type = types.bool; default = false; - description = "Whether to enable logging per virtual host."; + description = lib.mdDoc "Whether to enable logging per virtual host."; }; jdk = mkOption { type = types.package; default = pkgs.jdk; defaultText = literalExpression "pkgs.jdk"; - description = "Which JDK to use."; + description = lib.mdDoc "Which JDK to use."; }; axis2 = { @@ -175,13 +175,13 @@ in enable = mkOption { default = false; type = types.bool; - description = "Whether to enable an Apache Axis2 container"; + description = lib.mdDoc "Whether to enable an Apache Axis2 container"; }; services = mkOption { default = []; type = types.listOf types.str; - description = "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2"; + description = lib.mdDoc "List containing AAR files or directories with AAR files which are web services to be deployed on Axis2"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix index eb7fd0995d..abef963201 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/traefik.nix @@ -56,14 +56,14 @@ in { default = null; example = literalExpression "/path/to/static_config.toml"; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Path to traefik's static configuration to use. - (Using that option has precedence over staticConfigOptions and dynamicConfigOptions) + (Using that option has precedence over `staticConfigOptions` and `dynamicConfigOptions`) ''; }; staticConfigOptions = mkOption { - description = '' + description = lib.mdDoc '' Static configuration for Traefik. ''; type = jsonValue; @@ -80,14 +80,14 @@ in { default = null; example = literalExpression "/path/to/dynamic_config.toml"; type = types.nullOr types.path; - description = '' + description = lib.mdDoc '' Path to traefik's dynamic configuration to use. - (Using that option has precedence over dynamicConfigOptions) + (Using that option has precedence over `dynamicConfigOptions`) ''; }; dynamicConfigOptions = mkOption { - description = '' + description = lib.mdDoc '' Dynamic configuration for Traefik. ''; type = jsonValue; @@ -106,7 +106,7 @@ in { dataDir = mkOption { default = "/var/lib/traefik"; type = types.path; - description = '' + description = lib.mdDoc '' Location for any persistent data traefik creates, ie. acme ''; }; @@ -115,9 +115,9 @@ in { default = "traefik"; type = types.str; example = "docker"; - description = '' + description = lib.mdDoc '' Set the group that traefik runs under. - For the docker backend this needs to be set to docker instead. + For the docker backend this needs to be set to `docker` instead. ''; }; @@ -125,7 +125,7 @@ in { default = pkgs.traefik; defaultText = literalExpression "pkgs.traefik"; type = types.package; - description = "Traefik package to use."; + description = lib.mdDoc "Traefik package to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/default.nix index b52087fa03..beb5e437c5 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/trafficserver/default.nix @@ -39,11 +39,11 @@ in type = types.lines; default = ""; example = "dest_domain=example.com suffix=js action=never-cache"; - description = '' + description = lib.mdDoc '' Caching rules that overrule the origin's caching policy. - Consult the upstream - documentation for more details. + Consult the [upstream + documentation](${getManualUrl "cache.config"}) for more details. ''; }; @@ -51,11 +51,11 @@ in type = types.lines; default = ""; example = "domain=example.com volume=1"; - description = '' + description = lib.mdDoc '' Partition the cache according to origin server or domain - Consult the - upstream documentation for more details. + Consult the [ + upstream documentation](${getManualUrl "hosting.config"}) for more details. ''; }; @@ -73,12 +73,12 @@ in }]; } ''; - description = '' + description = lib.mdDoc '' Control client access to Traffic Server and Traffic Server connections to upstream servers. - Consult the upstream - documentation for more details. + Consult the [upstream + documentation](${getManualUrl "ip_allow.yaml"}) for more details. ''; }; @@ -87,11 +87,11 @@ in default = lib.importJSON ./logging.json; defaultText = literalDocBook "upstream defaults"; example = { }; - description = '' + description = lib.mdDoc '' Configure logs. - Consult the upstream - documentation for more details. + Consult the [upstream + documentation](${getManualUrl "logging.yaml"}) for more details. ''; }; @@ -101,23 +101,23 @@ in example = '' dest_domain=. method=get parent="p1.example:8080; p2.example:8080" round_robin=true ''; - description = '' + description = lib.mdDoc '' Identify the parent proxies used in an cache hierarchy. - Consult the upstream - documentation for more details. + Consult the [upstream + documentation](${getManualUrl "parent.config"}) for more details. ''; }; plugins = mkOption { default = [ ]; - description = '' + description = lib.mdDoc '' Controls run-time loadable plugins available to Traffic Server, as well as their configuration. - Consult the upstream - documentation for more details. + Consult the [upstream + documentation](${getManualUrl "plugin.config"}) for more details. ''; type = with types; @@ -125,7 +125,7 @@ in options.path = mkOption { type = str; example = "xdebug.so"; - description = '' + description = lib.mdDoc '' Path to plugin. The path can either be absolute, or relative to the plugin directory. ''; @@ -134,7 +134,7 @@ in type = str; default = ""; example = "--header=ATS-My-Debug"; - description = "arguments to pass to the plugin"; + description = lib.mdDoc "arguments to pass to the plugin"; }; }); }; @@ -148,11 +148,11 @@ in valueType; default = { }; example = { proxy.config.proxy_name = "my_server"; }; - description = '' + description = lib.mdDoc '' List of configurable variables used by Traffic Server. - Consult the - upstream documentation for more details. + Consult the [ + upstream documentation](${getManualUrl "records.config"}) for more details. ''; }; @@ -160,11 +160,11 @@ in type = types.lines; default = ""; example = "map http://from.example http://origin.example"; - description = '' + description = lib.mdDoc '' URL remapping rules used by Traffic Server. - Consult the - upstream documentation for more details. + Consult the [ + upstream documentation](${getManualUrl "remap.config"}) for more details. ''; }; @@ -175,12 +175,12 @@ in dest_domain=internal.corp.example named="255.255.255.255:212 255.255.255.254" def_domain=corp.example search_list="corp.example corp1.example" dest_domain=!internal.corp.example named=255.255.255.253 ''; - description = '' + description = lib.mdDoc '' Specify the DNS server that Traffic Server should use under specific conditions. - Consult the - upstream documentation for more details. + Consult the [ + upstream documentation](${getManualUrl "splitdns.config"}) for more details. ''; }; @@ -188,11 +188,11 @@ in type = types.lines; default = ""; example = "dest_ip=* ssl_cert_name=default.pem"; - description = '' + description = lib.mdDoc '' Configure SSL server certificates to terminate the SSL sessions. - Consult the - upstream documentation for more details. + Consult the [ + upstream documentation](${getManualUrl "ssl_multicert.config"}) for more details. ''; }; @@ -207,12 +207,12 @@ in }]; } ''; - description = '' + description = lib.mdDoc '' Configure aspects of TLS connection handling for both inbound and outbound connections. - Consult the upstream - documentation for more details. + Consult the [upstream + documentation](${getManualUrl "sni.yaml"}) for more details. ''; }; @@ -220,23 +220,23 @@ in type = types.lines; default = "/var/cache/trafficserver 256M"; example = "/dev/disk/by-id/XXXXX volume=1"; - description = '' + description = lib.mdDoc '' List all the storage that make up the Traffic Server cache. - Consult the - upstream documentation for more details. + Consult the [ + upstream documentation](${getManualUrl "storage.config"}) for more details. ''; }; strategies = mkOption { type = types.nullOr yaml.type; default = null; - description = '' + description = lib.mdDoc '' Specify the next hop proxies used in an cache hierarchy and the algorithms used to select the next proxy. - Consult the - upstream documentation for more details. + Consult the [ + upstream documentation](${getManualUrl "strategies.yaml"}) for more details. ''; }; @@ -244,12 +244,12 @@ in type = types.nullOr yaml.type; default = ""; example = "volume=1 scheme=http size=20%"; - description = '' + description = lib.mdDoc '' Manage cache space more efficiently and restrict disk usage by creating cache volumes of different sizes. - Consult the - upstream documentation for more details. + Consult the [ + upstream documentation](${getManualUrl "volume.config"}) for more details. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/ttyd.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/ttyd.nix index 431509f7fd..0c47d9583c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/ttyd.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/ttyd.nix @@ -35,44 +35,44 @@ in port = mkOption { type = types.port; default = 7681; - description = "Port to listen on (use 0 for random port)"; + description = lib.mdDoc "Port to listen on (use 0 for random port)"; }; socket = mkOption { type = types.nullOr types.path; default = null; example = "/var/run/ttyd.sock"; - description = "UNIX domain socket path to bind."; + description = lib.mdDoc "UNIX domain socket path to bind."; }; interface = mkOption { type = types.nullOr types.str; default = null; example = "eth0"; - description = "Network interface to bind."; + description = lib.mdDoc "Network interface to bind."; }; username = mkOption { type = types.nullOr types.str; default = null; - description = "Username for basic authentication."; + description = lib.mdDoc "Username for basic authentication."; }; passwordFile = mkOption { type = types.nullOr types.path; default = null; apply = value: if value == null then null else toString value; - description = '' + description = lib.mdDoc '' File containing the password to use for basic authentication. For insecurely putting the password in the globally readable store use - pkgs.writeText "ttydpw" "MyPassword". + `pkgs.writeText "ttydpw" "MyPassword"`. ''; }; signal = mkOption { type = types.ints.u8; default = 1; - description = "Signal to send to the command on session close."; + description = lib.mdDoc "Signal to send to the command on session close."; }; clientOptions = mkOption { @@ -83,75 +83,75 @@ in fontFamily = "Fira Code"; }''; - description = '' + description = lib.mdDoc '' Attribute set of client options for xtermjs. - + ''; }; terminalType = mkOption { type = types.str; default = "xterm-256color"; - description = "Terminal type to report."; + description = lib.mdDoc "Terminal type to report."; }; checkOrigin = mkOption { type = types.bool; default = false; - description = "Whether to allow a websocket connection from a different origin."; + description = lib.mdDoc "Whether to allow a websocket connection from a different origin."; }; maxClients = mkOption { type = types.int; default = 0; - description = "Maximum clients to support (0, no limit)"; + description = lib.mdDoc "Maximum clients to support (0, no limit)"; }; indexFile = mkOption { type = types.nullOr types.path; default = null; - description = "Custom index.html path"; + description = lib.mdDoc "Custom index.html path"; }; enableIPv6 = mkOption { type = types.bool; default = false; - description = "Whether or not to enable IPv6 support."; + description = lib.mdDoc "Whether or not to enable IPv6 support."; }; enableSSL = mkOption { type = types.bool; default = false; - description = "Whether or not to enable SSL (https) support."; + description = lib.mdDoc "Whether or not to enable SSL (https) support."; }; certFile = mkOption { type = types.nullOr types.path; default = null; - description = "SSL certificate file path."; + description = lib.mdDoc "SSL certificate file path."; }; keyFile = mkOption { type = types.nullOr types.path; default = null; apply = value: if value == null then null else toString value; - description = '' + description = lib.mdDoc '' SSL key file path. For insecurely putting the keyFile in the globally readable store use - pkgs.writeText "ttydKeyFile" "SSLKEY". + `pkgs.writeText "ttydKeyFile" "SSLKEY"`. ''; }; caFile = mkOption { type = types.nullOr types.path; default = null; - description = "SSL CA file path for client certificate verification."; + description = lib.mdDoc "SSL CA file path for client certificate verification."; }; logLevel = mkOption { type = types.int; default = 7; - description = "Set log level."; + description = lib.mdDoc "Set log level."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/unit/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/unit/default.nix index b2eecdbb53..5ad4a240be 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/unit/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/unit/default.nix @@ -15,27 +15,27 @@ in { type = types.package; default = pkgs.unit; defaultText = literalExpression "pkgs.unit"; - description = "Unit package to use."; + description = lib.mdDoc "Unit package to use."; }; user = mkOption { type = types.str; default = "unit"; - description = "User account under which unit runs."; + description = lib.mdDoc "User account under which unit runs."; }; group = mkOption { type = types.str; default = "unit"; - description = "Group account under which unit runs."; + description = lib.mdDoc "Group account under which unit runs."; }; stateDir = mkOption { type = types.path; default = "/var/spool/unit"; - description = "Unit data directory."; + description = lib.mdDoc "Unit data directory."; }; logDir = mkOption { type = types.path; default = "/var/log/unit"; - description = "Unit log directory."; + description = lib.mdDoc "Unit log directory."; }; config = mkOption { type = types.str; @@ -75,7 +75,7 @@ in { } } ''; - description = "Unit configuration in JSON format. More details here https://unit.nginx.org/configuration"; + description = lib.mdDoc "Unit configuration in JSON format. More details here https://unit.nginx.org/configuration"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix index 1b3474f2f5..af6c6c0661 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/uwsgi.nix @@ -75,13 +75,13 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Enable uWSGI"; + description = lib.mdDoc "Enable uWSGI"; }; runDir = mkOption { type = types.path; default = "/run/uwsgi"; - description = "Where uWSGI communication sockets can live"; + description = lib.mdDoc "Where uWSGI communication sockets can live"; }; package = mkOption { @@ -124,37 +124,37 @@ in { }; } ''; - description = '' - uWSGI configuration. It awaits an attribute type inside which can be either - normal or emperor. + description = lib.mdDoc '' + uWSGI configuration. It awaits an attribute `type` inside which can be either + `normal` or `emperor`. - For normal mode you can specify pythonPackages as a function - from libraries set into a list of libraries. pythonpath will be set accordingly. + For `normal` mode you can specify `pythonPackages` as a function + from libraries set into a list of libraries. `pythonpath` will be set accordingly. - For emperor mode, you should use vassals attribute + For `emperor` mode, you should use `vassals` attribute which should be either a set of names and configurations or a path to a directory. Other attributes will be used in configuration file as-is. Notice that you can redefine - plugins setting here. + `plugins` setting here. ''; }; plugins = mkOption { type = types.listOf types.str; default = []; - description = "Plugins used with uWSGI"; + description = lib.mdDoc "Plugins used with uWSGI"; }; user = mkOption { type = types.str; default = "uwsgi"; - description = "User account under which uWSGI runs."; + description = lib.mdDoc "User account under which uWSGI runs."; }; group = mkOption { type = types.str; default = "uwsgi"; - description = "Group account under which uWSGI runs."; + description = lib.mdDoc "Group account under which uWSGI runs."; }; capabilities = mkOption { @@ -179,8 +179,7 @@ in { When in Emperor mode, any capability to be inherited by a vassal must be specified again in the vassal configuration using cap. - See the uWSGI docs + See the uWSGI docs for more information. diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/varnish/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/varnish/default.nix index fe817313a9..39ebe63387 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/varnish/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/varnish/default.nix @@ -19,7 +19,7 @@ in type = types.package; default = pkgs.varnish; defaultText = literalExpression "pkgs.varnish"; - description = '' + description = lib.mdDoc '' The package to use ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/zope2.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/zope2.nix index 9221091602..a80fe882f1 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/zope2.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/zope2.nix @@ -12,31 +12,31 @@ let name = mkOption { default = "${name}"; type = types.str; - description = "The name of the zope2 instance. If undefined, the name of the attribute set will be used."; + description = lib.mdDoc "The name of the zope2 instance. If undefined, the name of the attribute set will be used."; }; threads = mkOption { default = 2; type = types.int; - description = "Specify the number of threads that Zope's ZServer web server will use to service requests. "; + description = lib.mdDoc "Specify the number of threads that Zope's ZServer web server will use to service requests. "; }; http_address = mkOption { default = "localhost:8080"; type = types.str; - description = "Give a port and address for the HTTP server."; + description = lib.mdDoc "Give a port and address for the HTTP server."; }; user = mkOption { default = "zope2"; type = types.str; - description = "The name of the effective user for the Zope process."; + description = lib.mdDoc "The name of the effective user for the Zope process."; }; clientHome = mkOption { default = "/var/lib/zope2/${name}"; type = types.path; - description = "Home directory of zope2 instance."; + description = lib.mdDoc "Home directory of zope2 instance."; }; extra = mkOption { default = @@ -53,12 +53,12 @@ let ''; type = types.lines; - description = "Extra zope.conf"; + description = lib.mdDoc "Extra zope.conf"; }; packages = mkOption { type = types.listOf types.package; - description = "The list of packages you want to make available to the zope2 instance."; + description = lib.mdDoc "The list of packages you want to make available to the zope2 instance."; }; }; @@ -95,7 +95,7 @@ in }; } ''; - description = "zope2 instances to be created automaticaly by the system."; + description = lib.mdDoc "zope2 instances to be created automaticaly by the system."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/clight.nix b/third_party/nixpkgs/nixos/modules/services/x11/clight.nix index d994a658cb..8a17b7e801 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/clight.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/clight.nix @@ -31,7 +31,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable clight or not. ''; }; @@ -40,17 +40,17 @@ in { day = mkOption { type = types.int; default = 5500; - description = '' + description = lib.mdDoc '' Colour temperature to use during the day, between - 1000 and 25000 K. + `1000` and `25000` K. ''; }; night = mkOption { type = types.int; default = 3700; - description = '' + description = lib.mdDoc '' Colour temperature to use at night, between - 1000 and 25000 K. + `1000` and `25000` K. ''; }; }; @@ -62,9 +62,9 @@ in { type = with types; attrsOf (nullOr (either collectionTypes (attrsOf collectionTypes))); default = {}; example = { captures = 20; gamma_long_transition = true; ac_capture_timeouts = [ 120 300 60 ]; }; - description = '' + description = lib.mdDoc '' Additional configuration to extend clight.conf. See - for a + for a sample configuration file. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix index 6c7105729c..05cf011f62 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cde.nix @@ -19,7 +19,7 @@ in { xclock bitmap xlsfonts xfd xrefresh xload xwininfo xdpyinfo xwd xwud ] ''; - description = '' + description = lib.mdDoc '' Extra packages to be installed system wide. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 705dbec5e7..5a7d9e28b5 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -27,7 +27,7 @@ in default = []; type = types.listOf types.package; example = literalExpression "[ pkgs.gnome.gpaste ]"; - description = '' + description = lib.mdDoc '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -38,13 +38,13 @@ in extraGSettingsOverrides = mkOption { default = ""; type = types.lines; - description = "Additional gsettings overrides."; + description = lib.mdDoc "Additional gsettings overrides."; }; extraGSettingsOverridePackages = mkOption { default = []; type = types.listOf types.path; - description = "List of packages for which gsettings are overridden."; + description = lib.mdDoc "List of packages for which gsettings are overridden."; }; }; @@ -52,7 +52,7 @@ in default = []; example = literalExpression "[ pkgs.cinnamon.blueberry ]"; type = types.listOf types.package; - description = "Which packages cinnamon should exclude from the default environment"; + description = lib.mdDoc "Which packages cinnamon should exclude from the default environment"; }; }; @@ -82,6 +82,7 @@ in ''; # Default services + services.blueman.enable = mkDefault true; hardware.bluetooth.enable = mkDefault true; hardware.pulseaudio.enable = mkDefault true; security.polkit.enable = true; @@ -91,7 +92,7 @@ in cinnamon-common cinnamon-screensaver nemo - xapps + xapp ]; services.cinnamon.apps.enable = mkDefault true; services.gnome.glib-networking.enable = true; @@ -199,13 +200,12 @@ in environment.systemPackages = with pkgs // pkgs.gnome // pkgs.cinnamon; utils.removePackagesByName [ # cinnamon team apps bulky - blueberry warpinator - # cinnamon xapps + # cinnamon xapp xviewer xreader - xed + xed-editor xplayer pix diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 991616bd19..2de5d845d6 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -29,7 +29,7 @@ in services.xserver.desktopManager.enlightenment.enable = mkOption { type = types.bool; default = false; - description = "Enable the Enlightenment desktop environment."; + description = lib.mdDoc "Enable the Enlightenment desktop environment."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix index ff9d08ea99..bbecd2796a 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -176,14 +176,14 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable GNOME desktop manager."; + description = lib.mdDoc "Enable GNOME desktop manager."; }; sessionPath = mkOption { default = []; type = types.listOf types.package; example = literalExpression "[ pkgs.gnome.gpaste ]"; - description = '' + description = lib.mdDoc '' Additional list of packages to be added to the session search path. Useful for GNOME Shell extensions or GSettings-conditional autostart. @@ -207,13 +207,13 @@ in extraGSettingsOverrides = mkOption { default = ""; type = types.lines; - description = "Additional gsettings overrides."; + description = lib.mdDoc "Additional gsettings overrides."; }; extraGSettingsOverridePackages = mkOption { default = []; type = types.listOf types.path; - description = "List of packages for which gsettings are overridden."; + description = lib.mdDoc "List of packages for which gsettings are overridden."; }; debug = mkEnableOption "gnome-session debug messages"; @@ -226,19 +226,19 @@ in options = { wmName = mkOption { type = types.strMatching "[a-zA-Z0-9_-]+"; - description = "A unique identifier for the window manager."; + description = lib.mdDoc "A unique identifier for the window manager."; example = "xmonad"; }; wmLabel = mkOption { type = types.str; - description = "The name of the window manager to show in the session chooser."; + description = lib.mdDoc "The name of the window manager to show in the session chooser."; example = "XMonad"; }; wmCommand = mkOption { type = types.str; - description = "The executable of the window manager to use."; + description = lib.mdDoc "The executable of the window manager to use."; example = literalExpression ''"''${pkgs.haskellPackages.xmonad}/bin/xmonad"''; }; @@ -246,22 +246,22 @@ in type = types.bool; default = true; example = false; - description = "Whether to enable the GNOME panel in this session."; + description = lib.mdDoc "Whether to enable the GNOME panel in this session."; }; }; }); default = []; - description = "Other GNOME Flashback sessions to enable."; + description = lib.mdDoc "Other GNOME Flashback sessions to enable."; }; panelModulePackages = mkOption { default = [ pkgs.gnome.gnome-applets ]; defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]"; type = types.listOf types.path; - description = '' - Packages containing modules that should be made available to gnome-panel (usually for applets). + description = lib.mdDoc '' + Packages containing modules that should be made available to `gnome-panel` (usually for applets). - If you're packaging something to use here, please install the modules in $out/lib/gnome-panel/modules. + If you're packaging something to use here, please install the modules in `$out/lib/gnome-panel/modules`. ''; }; }; @@ -271,7 +271,7 @@ in default = []; example = literalExpression "[ pkgs.gnome.totem ]"; type = types.listOf types.package; - description = "Which packages gnome should exclude from the default environment"; + description = lib.mdDoc "Which packages gnome should exclude from the default environment"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix index b853c94d6f..43904cd00e 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -12,7 +12,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the kodi multimedia center."; + description = lib.mdDoc "Enable the kodi multimedia center."; }; package = mkOption { @@ -20,7 +20,7 @@ in default = pkgs.kodi; defaultText = literalExpression "pkgs.kodi"; example = literalExpression "pkgs.kodi.withPackages (p: with p; [ jellyfin pvr-iptvsimple vfs-sftp ])"; - description = '' + description = lib.mdDoc '' Package that should be used for Kodi. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lumina.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lumina.nix index faa83b8bc5..7b694106bf 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lumina.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lumina.nix @@ -19,7 +19,7 @@ in services.xserver.desktopManager.lumina.enable = mkOption { type = types.bool; default = false; - description = "Enable the Lumina desktop manager"; + description = lib.mdDoc "Enable the Lumina desktop manager"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix index 2aa9e5ab33..b69da41c9f 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -18,14 +18,14 @@ in services.xserver.desktopManager.lxqt.enable = mkOption { type = types.bool; default = false; - description = "Enable the LXQt desktop manager"; + description = lib.mdDoc "Enable the LXQt desktop manager"; }; environment.lxqt.excludePackages = mkOption { default = []; example = literalExpression "[ pkgs.lxqt.qterminal ]"; type = types.listOf types.package; - description = "Which LXQt packages to exclude from the default environment"; + description = lib.mdDoc "Which LXQt packages to exclude from the default environment"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix index b63510475e..1ca47313ad 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/mate.nix @@ -16,7 +16,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the MATE desktop environment"; + description = lib.mdDoc "Enable the MATE desktop environment"; }; debug = mkEnableOption "mate-session debug messages"; @@ -26,7 +26,7 @@ in default = []; example = literalExpression "[ pkgs.mate.mate-terminal pkgs.mate.pluma ]"; type = types.listOf types.package; - description = "Which MATE packages to exclude from the default environment"; + description = lib.mdDoc "Which MATE packages to exclude from the default environment"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix index d04e565f7d..2ada36c12a 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -37,14 +37,14 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the pantheon desktop manager"; + description = lib.mdDoc "Enable the pantheon desktop manager"; }; sessionPath = mkOption { default = []; type = types.listOf types.package; example = literalExpression "[ pkgs.gnome.gpaste ]"; - description = '' + description = lib.mdDoc '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -55,25 +55,25 @@ in extraWingpanelIndicators = mkOption { default = null; type = with types; nullOr (listOf package); - description = "Indicators to add to Wingpanel."; + description = lib.mdDoc "Indicators to add to Wingpanel."; }; extraSwitchboardPlugs = mkOption { default = null; type = with types; nullOr (listOf package); - description = "Plugs to add to Switchboard."; + description = lib.mdDoc "Plugs to add to Switchboard."; }; extraGSettingsOverrides = mkOption { default = ""; type = types.lines; - description = "Additional gsettings overrides."; + description = lib.mdDoc "Additional gsettings overrides."; }; extraGSettingsOverridePackages = mkOption { default = []; type = types.listOf types.path; - description = "List of packages for which gsettings are overridden."; + description = lib.mdDoc "List of packages for which gsettings are overridden."; }; debug = mkEnableOption "gnome-session debug messages"; @@ -84,7 +84,7 @@ in default = []; example = literalExpression "[ pkgs.pantheon.elementary-camera ]"; type = types.listOf types.package; - description = "Which packages pantheon should exclude from the default environment"; + description = lib.mdDoc "Which packages pantheon should exclude from the default environment"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix index 5efe645d8a..0ff5d6fd1b 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -132,7 +132,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the Phone Shell."; + description = lib.mdDoc "Enable the Phone Shell."; }; package = mkOption { @@ -140,25 +140,25 @@ in default = pkgs.phosh; defaultText = literalExpression "pkgs.phosh"; example = literalExpression "pkgs.phosh"; - description = '' + description = lib.mdDoc '' Package that should be used for Phosh. ''; }; user = mkOption { - description = "The user to run the Phosh service."; + description = lib.mdDoc "The user to run the Phosh service."; type = types.str; example = "alice"; }; group = mkOption { - description = "The group to run the Phosh service."; + description = lib.mdDoc "The group to run the Phosh service."; type = types.str; example = "users"; }; phocConfig = mkOption { - description = '' + description = lib.mdDoc '' Configurations for the Phoc compositor. ''; type = types.oneOf [ types.lines types.path phocConfigType ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 0d17d13679..2c4b0b8f3b 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -157,23 +157,22 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the Plasma 5 (KDE 5) desktop environment."; + description = lib.mdDoc "Enable the Plasma 5 (KDE 5) desktop environment."; }; phononBackend = mkOption { type = types.enum [ "gstreamer" "vlc" ]; default = "gstreamer"; example = "vlc"; - description = "Phonon audio backend to install."; + description = lib.mdDoc "Phonon audio backend to install."; }; supportDDC = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Support setting monitor brightness via DDC. - - + This is not needed for controlling brightness of the internal monitor of a laptop and as it is considered experimental by upstream, it is disabled by default. @@ -183,17 +182,17 @@ in useQtScaling = mkOption { type = types.bool; default = false; - description = "Enable HiDPI scaling in Qt."; + description = lib.mdDoc "Enable HiDPI scaling in Qt."; }; runUsingSystemd = mkOption { - description = "Use systemd to manage the Plasma session"; + description = lib.mdDoc "Use systemd to manage the Plasma session"; type = types.bool; - default = false; + default = true; }; excludePackages = mkOption { - description = "List of default packages to exclude from the configuration"; + description = lib.mdDoc "List of default packages to exclude from the configuration"; type = types.listOf types.package; default = []; example = literalExpression "[ pkgs.plasma5Packages.oxygen ]"; @@ -216,7 +215,7 @@ in mobile.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable support for running the Plasma Mobile shell. ''; }; @@ -224,7 +223,7 @@ in mobile.installRecommendedSoftware = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Installs software recommended for use with Plasma Mobile, but which is not strictly required for Plasma Mobile to run. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/retroarch.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/retroarch.nix index d471673d45..c5504e5149 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/retroarch.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/retroarch.nix @@ -13,14 +13,14 @@ in { default = pkgs.retroarch; defaultText = literalExpression "pkgs.retroarch"; example = literalExpression "pkgs.retroarch-full"; - description = "RetroArch package to use."; + description = lib.mdDoc "RetroArch package to use."; }; extraArgs = mkOption { type = types.listOf types.str; default = [ ]; example = [ "--verbose" "--host" ]; - description = "Extra arguments to pass to RetroArch."; + description = lib.mdDoc "Extra arguments to pass to RetroArch."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/surf-display.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/surf-display.nix index 4b5a04f988..7d2ad5a3f2 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/surf-display.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/surf-display.nix @@ -52,14 +52,14 @@ in { default = "${pkgs.surf-display}/share/surf-display/empty-page.html"; defaultText = literalExpression ''"''${pkgs.surf-display}/share/surf-display/empty-page.html"''; example = "https://www.example.com/"; - description = "Default URI to display."; + description = lib.mdDoc "Default URI to display."; }; inactivityInterval = mkOption { type = types.int; default = 300; example = 0; - description = '' + description = lib.mdDoc '' Setting for internal inactivity timer to restart surf-display if the user goes inactive/idle to get a fresh session for the next user of the kiosk. @@ -72,18 +72,18 @@ in { screensaverSettings = mkOption { type = types.separatedString " "; default = ""; - description = '' - Screensaver settings, see man 1 xset for possible options. + description = lib.mdDoc '' + Screensaver settings, see `man 1 xset` for possible options. ''; }; pointerButtonMap = mkOption { type = types.str; default = "1 0 0 4 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0"; - description = '' + description = lib.mdDoc '' Disable right and middle pointer device click in browser sessions while keeping scrolling wheels' functionality intact. See pointer - subcommand on man xmodmap for details. + subcommand on `man xmodmap` for details. ''; }; @@ -91,7 +91,7 @@ in { type = types.str; default = "yes"; example = "no"; - description = "Hide idle mouse pointer."; + description = lib.mdDoc "Hide idle mouse pointer."; }; extraConfig = mkOption { @@ -111,8 +111,8 @@ in { DISPLAYS['display-host-3']="www_uri=https://www.displayserver.comany.net/display-4/index.html"|res=1280x1024" DISPLAYS['display-host-local-file']="www_uri=file:///usr/share/doc/surf-display/empty-page.html" ''; - description = '' - Extra configuration options to append to /etc/default/surf-display. + description = lib.mdDoc '' + Extra configuration options to append to `/etc/default/surf-display`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix index 3a468b5506..eee1f63ebd 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -48,25 +48,25 @@ in enable = mkOption { type = types.bool; default = false; - description = "Enable the Xfce desktop environment."; + description = lib.mdDoc "Enable the Xfce desktop environment."; }; noDesktop = mkOption { type = types.bool; default = false; - description = "Don't install XFCE desktop components (xfdesktop and panel)."; + description = lib.mdDoc "Don't install XFCE desktop components (xfdesktop and panel)."; }; enableXfwm = mkOption { type = types.bool; default = true; - description = "Enable the XFWM (default) window manager."; + description = lib.mdDoc "Enable the XFWM (default) window manager."; }; enableScreensaver = mkOption { type = types.bool; default = true; - description = "Enable the XFCE screensaver."; + description = lib.mdDoc "Enable the XFCE screensaver."; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xterm.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xterm.nix index 3424ee1b0e..2b439effab 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xterm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/xterm.nix @@ -16,7 +16,7 @@ in type = types.bool; default = versionOlder config.system.stateVersion "19.09" && xSessionEnabled; defaultText = literalExpression ''versionOlder config.system.stateVersion "19.09" && config.services.xserver.enable;''; - description = "Enable a xterm terminal as a desktop manager."; + description = lib.mdDoc "Enable a xterm terminal as a desktop manager."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix index a5db3dd5dd..cc94fe7c0b 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/default.nix @@ -154,20 +154,20 @@ in xserverBin = mkOption { type = types.path; - description = "Path to the X server used by display managers."; + description = lib.mdDoc "Path to the X server used by display managers."; }; xserverArgs = mkOption { type = types.listOf types.str; default = []; example = [ "-ac" "-logverbose" "-verbose" "-nolisten tcp" ]; - description = "List of arguments for the X server."; + description = lib.mdDoc "List of arguments for the X server."; }; setupCommands = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Shell commands executed just after the X server has started. This option is only effective for display managers for which this feature @@ -182,7 +182,7 @@ in '' xmessage "Hello World!" & ''; - description = '' + description = lib.mdDoc '' Shell commands executed just before the window or desktop manager is started. These commands are not currently sourced for Wayland sessions. ''; @@ -191,7 +191,7 @@ in hiddenUsers = mkOption { type = types.listOf types.str; default = [ "nobody" ]; - description = '' + description = lib.mdDoc '' A list of users which will not be shown in the display manager. ''; }; @@ -212,7 +212,7 @@ in ''; }); default = []; - description = '' + description = lib.mdDoc '' A list of packages containing x11 or wayland session files to be passed to the display manager. ''; }; @@ -285,7 +285,7 @@ in Taken from display manager settings or window manager settings, if either is set. ''; example = "gnome"; - description = '' + description = lib.mdDoc '' Graphical session to pre-select in the session chooser (only effective for GDM, LightDM and SDDM). On GDM, LightDM and SDDM, it will also be used as a session for auto-login. @@ -306,34 +306,34 @@ in type = types.lines; default = ""; example = "rm -f /var/log/my-display-manager.log"; - description = "Script executed before the display manager is started."; + description = lib.mdDoc "Script executed before the display manager is started."; }; execCmd = mkOption { type = types.str; example = literalExpression ''"''${pkgs.lightdm}/bin/lightdm"''; - description = "Command to start the display manager."; + description = lib.mdDoc "Command to start the display manager."; }; environment = mkOption { type = types.attrsOf types.unspecified; default = {}; - description = "Additional environment variables needed by the display manager."; + description = lib.mdDoc "Additional environment variables needed by the display manager."; }; logToFile = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether the display manager redirects the output of the - session script to ~/.xsession-errors. + session script to {file}`~/.xsession-errors`. ''; }; logToJournal = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether the display manager redirects the output of the session script to the systemd journal. ''; @@ -349,15 +349,15 @@ in type = types.bool; default = config.user != null; defaultText = literalExpression "config.${options.user} != null"; - description = '' - Automatically log in as . + description = lib.mdDoc '' + Automatically log in as {option}`autoLogin.user`. ''; }; user = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' User to be used for the automatic login. ''; }; @@ -365,7 +365,7 @@ in }); default = {}; - description = '' + description = lib.mdDoc '' Auto login configuration attrset. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix index 45e3d84afa..025d572957 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/gdm.nix @@ -75,7 +75,7 @@ in autoLogin.delay = mkOption { type = types.int; default = 0; - description = '' + description = lib.mdDoc '' Seconds of inactivity after which the autologin will be performed. ''; }; @@ -83,14 +83,14 @@ in wayland = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Allow GDM to run on Wayland instead of Xserver. ''; }; autoSuspend = mkOption { default = true; - description = '' + description = lib.mdDoc '' On the GNOME Display Manager login screen, suspend the machine after inactivity. (Does not affect automatic suspend while logged in, or at lock screen.) ''; @@ -103,9 +103,9 @@ in example = { debug.enable = true; }; - description = '' + description = lib.mdDoc '' Options passed to the gdm daemon. - See here for supported options. + See [here](https://help.gnome.org/admin/gdm/stable/configuration.html.en#daemonconfig) for supported options. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix index 930ee96b38..412bcc4091 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -26,7 +26,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable enso-os-greeter as the lightdm greeter ''; }; @@ -36,7 +36,7 @@ in { type = types.package; default = pkgs.gnome.gnome-themes-extra; defaultText = literalExpression "pkgs.gnome.gnome-themes-extra"; - description = '' + description = lib.mdDoc '' The package path that contains the theme given in the name option. ''; }; @@ -44,7 +44,7 @@ in { name = mkOption { type = types.str; default = "Adwaita"; - description = '' + description = lib.mdDoc '' Name of the theme to use for the lightdm-enso-os-greeter ''; }; @@ -55,7 +55,7 @@ in { type = types.package; default = pkgs.papirus-icon-theme; defaultText = literalExpression "pkgs.papirus-icon-theme"; - description = '' + description = lib.mdDoc '' The package path that contains the icon theme given in the name option. ''; }; @@ -63,7 +63,7 @@ in { name = mkOption { type = types.str; default = "ePapirus"; - description = '' + description = lib.mdDoc '' Name of the icon theme to use for the lightdm-enso-os-greeter ''; }; @@ -74,7 +74,7 @@ in { type = types.package; default = pkgs.capitaine-cursors; defaultText = literalExpression "pkgs.capitaine-cursors"; - description = '' + description = lib.mdDoc '' The package path that contains the cursor theme given in the name option. ''; }; @@ -82,7 +82,7 @@ in { name = mkOption { type = types.str; default = "capitane-cursors"; - description = '' + description = lib.mdDoc '' Name of the cursor theme to use for the lightdm-enso-os-greeter ''; }; @@ -91,7 +91,7 @@ in { blur = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether or not to enable blur ''; }; @@ -99,7 +99,7 @@ in { brightness = mkOption { type = types.int; default = 7; - description = '' + description = lib.mdDoc '' Brightness ''; }; @@ -107,7 +107,7 @@ in { extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration that should be put in the greeter.conf configuration file ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index debd4b568b..c050367e74 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -38,7 +38,7 @@ in enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable lightdm-gtk-greeter as the lightdm greeter. ''; }; @@ -49,7 +49,7 @@ in type = types.package; default = pkgs.gnome.gnome-themes-extra; defaultText = literalExpression "pkgs.gnome.gnome-themes-extra"; - description = '' + description = lib.mdDoc '' The package path that contains the theme given in the name option. ''; }; @@ -57,7 +57,7 @@ in name = mkOption { type = types.str; default = "Adwaita"; - description = '' + description = lib.mdDoc '' Name of the theme to use for the lightdm-gtk-greeter. ''; }; @@ -70,7 +70,7 @@ in type = types.package; default = pkgs.gnome.adwaita-icon-theme; defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme"; - description = '' + description = lib.mdDoc '' The package path that contains the icon theme given in the name option. ''; }; @@ -78,7 +78,7 @@ in name = mkOption { type = types.str; default = "Adwaita"; - description = '' + description = lib.mdDoc '' Name of the icon theme to use for the lightdm-gtk-greeter. ''; }; @@ -91,7 +91,7 @@ in type = types.package; default = pkgs.gnome.adwaita-icon-theme; defaultText = literalExpression "pkgs.gnome.adwaita-icon-theme"; - description = '' + description = lib.mdDoc '' The package path that contains the cursor theme given in the name option. ''; }; @@ -99,7 +99,7 @@ in name = mkOption { type = types.str; default = "Adwaita"; - description = '' + description = lib.mdDoc '' Name of the cursor theme to use for the lightdm-gtk-greeter. ''; }; @@ -107,7 +107,7 @@ in size = mkOption { type = types.int; default = 16; - description = '' + description = lib.mdDoc '' Size of the cursor theme to use for the lightdm-gtk-greeter. ''; }; @@ -117,7 +117,7 @@ in type = types.nullOr types.str; default = null; example = "%F"; - description = '' + description = lib.mdDoc '' Clock format string (as expected by strftime, e.g. "%H:%M") to use with the lightdm gtk greeter panel. @@ -129,7 +129,7 @@ in type = types.nullOr (types.listOf types.str); default = null; example = [ "~host" "~spacer" "~clock" "~spacer" "~session" "~language" "~a11y" "~power" ]; - description = '' + description = lib.mdDoc '' List of allowed indicator modules to use for the lightdm gtk greeter panel. @@ -145,7 +145,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration that should be put in the lightdm-gtk-greeter.conf configuration file. ''; @@ -158,7 +158,7 @@ in config = mkIf (ldmcfg.enable && cfg.enable) { services.xserver.displayManager.lightdm.greeter = mkDefault { - package = pkgs.lightdm_gtk_greeter.xgreeters; + package = pkgs.lightdm-gtk-greeter.xgreeters; name = "lightdm-gtk-greeter"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix index 16d7fdf15c..f4195c4c2d 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/mini.nix @@ -55,19 +55,19 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable lightdm-mini-greeter as the lightdm greeter. Note that this greeter starts only the default X session. You can configure the default X session using - . + [](#opt-services.xserver.displayManager.defaultSession). ''; }; user = mkOption { type = types.str; default = "root"; - description = '' + description = lib.mdDoc '' The user to login as. ''; }; @@ -75,7 +75,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra configuration that should be put in the lightdm-mini-greeter.conf configuration file. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index f18e4a914e..10707e001e 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -21,7 +21,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable elementary-greeter as the lightdm greeter. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix index a9ba8e6280..8d6bfa98a7 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/lightdm-greeters/tiny.nix @@ -17,12 +17,12 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable lightdm-tiny-greeter as the lightdm greeter. Note that this greeter starts only the default X session. You can configure the default X session using - . + [](#opt-services.xserver.displayManager.defaultSession). ''; }; @@ -30,7 +30,7 @@ in user = mkOption { type = types.str; default = "Username"; - description = '' + description = lib.mdDoc '' The string to represent the user_text label. ''; }; @@ -38,7 +38,7 @@ in pass = mkOption { type = types.str; default = "Password"; - description = '' + description = lib.mdDoc '' The string to represent the pass_text label. ''; }; @@ -48,7 +48,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Section to describe style and ui. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix index c44f24002e..3423922131 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/sddm.nix @@ -100,7 +100,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable sddm as the display manager. ''; }; @@ -108,7 +108,7 @@ in enableHidpi = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable automatic HiDPI mode. ''; }; @@ -122,7 +122,7 @@ in Session = "plasma.desktop"; }; }; - description = '' + description = lib.mdDoc '' Extra settings merged in and overwritting defaults in sddm.conf. ''; }; @@ -130,7 +130,7 @@ in theme = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' Greeter theme to use. ''; }; @@ -138,7 +138,7 @@ in autoNumlock = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable numlock at login. ''; }; @@ -151,16 +151,16 @@ in xrandr --setprovideroutputsource modesetting NVIDIA-0 xrandr --auto ''; - description = '' + description = lib.mdDoc '' A script to execute when starting the display server. DEPRECATED, please - use . + use {option}`services.xserver.displayManager.setupCommands`. ''; }; stopScript = mkOption { type = types.str; default = ""; - description = '' + description = lib.mdDoc '' A script to execute when stopping the display server. ''; }; @@ -170,7 +170,7 @@ in relogin = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' If true automatic login will kick in again on session exit (logout), otherwise it will only log in automatically when the display-manager is started. ''; @@ -179,7 +179,7 @@ in minimumUid = mkOption { type = types.ints.u16; default = 1000; - description = '' + description = lib.mdDoc '' Minimum user ID for auto-login user. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/startx.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/startx.nix index a48566ae06..f4bb7a89d0 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/startx.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/startx.nix @@ -17,7 +17,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the dummy "startx" pseudo-display manager, which allows users to start X manually via the "startx" command from a vt shell. The X server runs under the user's id, not as root. diff --git a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix index 1566e38da0..15b3f70d46 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/display-managers/xpra.nix @@ -16,34 +16,34 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable xpra as display manager."; + description = lib.mdDoc "Whether to enable xpra as display manager."; }; bindTcp = mkOption { default = "127.0.0.1:10000"; example = "0.0.0.0:10000"; type = types.nullOr types.str; - description = "Bind xpra to TCP"; + description = lib.mdDoc "Bind xpra to TCP"; }; desktop = mkOption { type = types.nullOr types.str; default = null; example = "gnome-shell"; - description = "Start a desktop environment instead of seamless mode"; + description = lib.mdDoc "Start a desktop environment instead of seamless mode"; }; auth = mkOption { type = types.str; default = "pam"; example = "password:value=mysecret"; - description = "Authentication to use when connecting to xpra"; + description = lib.mdDoc "Authentication to use when connecting to xpra"; }; pulseaudio = mkEnableOption "pulseaudio audio streaming"; extraOptions = mkOption { - description = "Extra xpra options"; + description = lib.mdDoc "Extra xpra options"; default = []; type = types.listOf types.str; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix b/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix index 159bed63e1..574657a50c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/extra-layouts.nix @@ -9,13 +9,13 @@ let options = { description = mkOption { type = types.str; - description = "A short description of the layout."; + description = lib.mdDoc "A short description of the layout."; }; languages = mkOption { type = types.listOf types.str; description = - '' + lib.mdDoc '' A list of languages provided by the layout. (Use ISO 639-2 codes, for example: "eng" for english) ''; @@ -24,55 +24,55 @@ let compatFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' The path to the xkb compat file. This file sets the compatibility state, used to preserve compatibility with xkb-unaware programs. - It must contain a xkb_compat "name" { ... } block. + It must contain a `xkb_compat "name" { ... }` block. ''; }; geometryFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' The path to the xkb geometry file. This (completely optional) file describes the physical layout of keyboard, which maybe be used by programs to depict it. - It must contain a xkb_geometry "name" { ... } block. + It must contain a `xkb_geometry "name" { ... }` block. ''; }; keycodesFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' The path to the xkb keycodes file. This file specifies the range and the interpretation of the raw keycodes sent by the keyboard. - It must contain a xkb_keycodes "name" { ... } block. + It must contain a `xkb_keycodes "name" { ... }` block. ''; }; symbolsFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' The path to the xkb symbols file. This is the most important file: it defines which symbol or action maps to each key and must contain a - xkb_symbols "name" { ... } block. + `xkb_symbols "name" { ... }` block. ''; }; typesFile = mkOption { type = types.nullOr types.path; default = null; - description = '' + description = lib.mdDoc '' The path to the xkb types file. This file specifies the key types that can be associated with the various keyboard keys. - It must contain a xkb_types "name" { ... } block. + It must contain a `xkb_types "name" { ... }` block. ''; }; @@ -103,12 +103,12 @@ in }; } ''; - description = '' + 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). For more examples see - + [](https://wiki.archlinux.org/index.php/X_KeyBoard_extension#Basic_examples) ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/fractalart.nix b/third_party/nixpkgs/nixos/modules/services/x11/fractalart.nix index 448248a587..f7fc1ec962 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/fractalart.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/fractalart.nix @@ -8,21 +8,21 @@ in { type = types.bool; default = false; example = true; - description = "Enable FractalArt for generating colorful wallpapers on login"; + description = lib.mdDoc "Enable FractalArt for generating colorful wallpapers on login"; }; width = mkOption { type = types.nullOr types.int; default = null; example = 1920; - description = "Screen width"; + description = lib.mdDoc "Screen width"; }; height = mkOption { type = types.nullOr types.int; default = null; example = 1080; - description = "Screen height"; + description = lib.mdDoc "Screen height"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/gdk-pixbuf.nix b/third_party/nixpkgs/nixos/modules/services/x11/gdk-pixbuf.nix index 3fd6fed91e..c80e2b2279 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/gdk-pixbuf.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/gdk-pixbuf.nix @@ -30,7 +30,7 @@ in services.xserver.gdk-pixbuf.modulePackages = mkOption { type = types.listOf types.package; default = [ ]; - description = "Packages providing GDK-Pixbuf modules, for cache generation."; + description = lib.mdDoc "Packages providing GDK-Pixbuf modules, for cache generation."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix b/third_party/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix index 5ac824c5e4..a44221141c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/hardware/cmt.nix @@ -15,14 +15,14 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Enable chrome multitouch input (cmt). Touchpad drivers that are configured for chromebooks."; + description = lib.mdDoc "Enable chrome multitouch input (cmt). Touchpad drivers that are configured for chromebooks."; }; models = mkOption { type = types.enum [ "atlas" "banjo" "candy" "caroline" "cave" "celes" "clapper" "cyan" "daisy" "elan" "elm" "enguarde" "eve" "expresso" "falco" "gandof" "glimmer" "gnawty" "heli" "kevin" "kip" "leon" "lulu" "orco" "pbody" "peppy" "pi" "pit" "puppy" "quawks" "rambi" "samus" "snappy" "spring" "squawks" "swanky" "winky" "wolf" "auron_paine" "auron_yuna" "daisy_skate" "nyan_big" "nyan_blaze" "veyron_jaq" "veyron_jerry" "veyron_mighty" "veyron_minnie" "veyron_speedy" ]; example = "banjo"; - description = '' + description = lib.mdDoc '' Which models to enable cmt for. Enter the Code Name for your Chromebook. - Code Name can be found at . + Code Name can be found at . ''; }; }; #closes services diff --git a/third_party/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix b/third_party/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix index efdb7c61df..6603498eea 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/hardware/libinput.nix @@ -12,8 +12,8 @@ let cfg = config.services.xserver.libinput; default = null; example = "/dev/input/event0"; description = - '' - Path for ${deviceType} device. Set to null to apply to any + lib.mdDoc '' + Path for ${deviceType} device. Set to `null` to apply to any auto-detected ${deviceType}. ''; }; @@ -23,14 +23,14 @@ let cfg = config.services.xserver.libinput; default = "adaptive"; example = "flat"; description = - '' + lib.mdDoc '' Sets the pointer acceleration profile to the given profile. - Permitted values are adaptive, flat. + Permitted values are `adaptive`, `flat`. Not all devices support this option or all profiles. If a profile is unsupported, the default profile for this is used. - flat: Pointer motion is accelerated by a constant + `flat`: Pointer motion is accelerated by a constant (device-specific) factor, depending on the current speed. - adaptive: Pointer acceleration depends on the input speed. + `adaptive`: Pointer acceleration depends on the input speed. This is the default profile for most devices. ''; }; @@ -39,7 +39,7 @@ let cfg = config.services.xserver.libinput; type = types.nullOr types.str; default = null; example = "-0.5"; - description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; + description = lib.mdDoc "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; }; buttonMapping = mkOption { @@ -47,7 +47,7 @@ let cfg = config.services.xserver.libinput; default = null; example = "1 6 3 4 5 0 7"; description = - '' + lib.mdDoc '' Sets the logical button mapping for this device, see XSetPointerMapping(3). The string must be a space-separated list of button mappings in the order of the logical buttons on the device, starting with button 1. The default mapping is "1 2 3 ... 32". A mapping of 0 deac‐ @@ -62,7 +62,7 @@ let cfg = config.services.xserver.libinput; default = null; example = "0.5 0 0 0 0.8 0.1 0 0 1"; description = - '' + lib.mdDoc '' A string of 9 space-separated floating point numbers. Sets the calibration matrix to the 3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi). ''; @@ -73,9 +73,9 @@ let cfg = config.services.xserver.libinput; default = null; example = "buttonareas"; description = - '' - Enables a click method. Permitted values are none, - buttonareas, clickfinger. + lib.mdDoc '' + Enables a click method. Permitted values are `none`, + `buttonareas`, `clickfinger`. Not all devices support all methods, if an option is unsupported, the default click method for this device is used. ''; @@ -84,14 +84,14 @@ let cfg = config.services.xserver.libinput; leftHanded = mkOption { type = types.bool; default = false; - description = "Enables left-handed button orientation, i.e. swapping left and right buttons."; + description = lib.mdDoc "Enables left-handed button orientation, i.e. swapping left and right buttons."; }; middleEmulation = mkOption { type = types.bool; default = true; description = - '' + lib.mdDoc '' Enables middle button emulation. When enabled, pressing the left and right buttons simultaneously produces a middle mouse button click. ''; @@ -100,7 +100,7 @@ let cfg = config.services.xserver.libinput; naturalScrolling = mkOption { type = types.bool; default = false; - description = "Enables or disables natural scrolling behavior."; + description = lib.mdDoc "Enables or disables natural scrolling behavior."; }; scrollButton = mkOption { @@ -108,7 +108,7 @@ let cfg = config.services.xserver.libinput; default = null; example = 1; description = - '' + lib.mdDoc '' Designates a button as scroll button. If the ScrollMethod is button and the button is logically held down, x/y axis movement is converted into scroll events. ''; @@ -119,9 +119,9 @@ let cfg = config.services.xserver.libinput; default = "twofinger"; example = "edge"; description = - '' - Specify the scrolling method: twofinger, edge, - button, or none + lib.mdDoc '' + Specify the scrolling method: `twofinger`, `edge`, + `button`, or `none` ''; }; @@ -129,7 +129,7 @@ let cfg = config.services.xserver.libinput; type = types.bool; default = true; description = - '' + lib.mdDoc '' Disables horizontal scrolling. When disabled, this driver will discard any horizontal scroll events from libinput. Note that this does not disable horizontal scrolling, it merely discards the horizontal axis from any scroll events. @@ -141,9 +141,9 @@ let cfg = config.services.xserver.libinput; default = "enabled"; example = "disabled"; description = - '' - Sets the send events mode to disabled, enabled, - or disabled-on-external-mouse + lib.mdDoc '' + Sets the send events mode to `disabled`, `enabled`, + or `disabled-on-external-mouse` ''; }; @@ -151,7 +151,7 @@ let cfg = config.services.xserver.libinput; type = types.bool; default = true; description = - '' + lib.mdDoc '' Enables or disables tap-to-click behavior. ''; }; @@ -160,7 +160,7 @@ let cfg = config.services.xserver.libinput; type = types.bool; default = true; description = - '' + lib.mdDoc '' Enables or disables drag lock during tapping behavior. When enabled, a finger up during tap- and-drag will not immediately release the button. If the finger is set down again within the timeout, the draging process continues. @@ -171,7 +171,7 @@ let cfg = config.services.xserver.libinput; type = types.nullOr types.str; default = null; example = "0.5 0 0 0 0.8 0.1 0 0 1"; - description = '' + description = lib.mdDoc '' A string of 9 space-separated floating point numbers. Sets the transformation matrix to the 3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi). ''; @@ -181,7 +181,7 @@ let cfg = config.services.xserver.libinput; type = types.bool; default = false; description = - '' + lib.mdDoc '' Disable input method while typing. ''; }; @@ -193,9 +193,9 @@ let cfg = config.services.xserver.libinput; '' Option "DragLockButtons" "L1 B1 L2 B2" ''; - description = '' + description = lib.mdDoc '' Additional options for libinput ${deviceType} driver. See - libinput4 + {manpage}`libinput(4)` for available options."; ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix b/third_party/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix index 93dd560bca..7b45222ac6 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/hardware/synaptics.nix @@ -30,7 +30,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable touchpad support. Deprecated: Consider services.xserver.libinput.enable."; + description = lib.mdDoc "Whether to enable touchpad support. Deprecated: Consider services.xserver.libinput.enable."; }; dev = mkOption { @@ -38,7 +38,7 @@ in { default = null; example = "/dev/input/event0"; description = - '' + lib.mdDoc '' Path for touchpad device. Set to null to apply to any auto-detected touchpad. ''; @@ -47,73 +47,73 @@ in { accelFactor = mkOption { type = types.nullOr types.str; default = "0.001"; - description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; + description = lib.mdDoc "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed)."; }; minSpeed = mkOption { type = types.nullOr types.str; default = "0.6"; - description = "Cursor speed factor for precision finger motion."; + description = lib.mdDoc "Cursor speed factor for precision finger motion."; }; maxSpeed = mkOption { type = types.nullOr types.str; default = "1.0"; - description = "Cursor speed factor for highest-speed finger motion."; + description = lib.mdDoc "Cursor speed factor for highest-speed finger motion."; }; scrollDelta = mkOption { type = types.nullOr types.int; default = null; example = 75; - description = "Move distance of the finger for a scroll event."; + description = lib.mdDoc "Move distance of the finger for a scroll event."; }; twoFingerScroll = mkOption { type = types.bool; default = false; - description = "Whether to enable two-finger drag-scrolling. Overridden by horizTwoFingerScroll and vertTwoFingerScroll."; + description = lib.mdDoc "Whether to enable two-finger drag-scrolling. Overridden by horizTwoFingerScroll and vertTwoFingerScroll."; }; horizTwoFingerScroll = mkOption { type = types.bool; default = cfg.twoFingerScroll; defaultText = literalExpression "config.${opt.twoFingerScroll}"; - description = "Whether to enable horizontal two-finger drag-scrolling."; + description = lib.mdDoc "Whether to enable horizontal two-finger drag-scrolling."; }; vertTwoFingerScroll = mkOption { type = types.bool; default = cfg.twoFingerScroll; defaultText = literalExpression "config.${opt.twoFingerScroll}"; - description = "Whether to enable vertical two-finger drag-scrolling."; + description = lib.mdDoc "Whether to enable vertical two-finger drag-scrolling."; }; horizEdgeScroll = mkOption { type = types.bool; default = ! cfg.horizTwoFingerScroll; defaultText = literalExpression "! config.${opt.horizTwoFingerScroll}"; - description = "Whether to enable horizontal edge drag-scrolling."; + description = lib.mdDoc "Whether to enable horizontal edge drag-scrolling."; }; vertEdgeScroll = mkOption { type = types.bool; default = ! cfg.vertTwoFingerScroll; defaultText = literalExpression "! config.${opt.vertTwoFingerScroll}"; - description = "Whether to enable vertical edge drag-scrolling."; + description = lib.mdDoc "Whether to enable vertical edge drag-scrolling."; }; tapButtons = mkOption { type = types.bool; default = true; - description = "Whether to enable tap buttons."; + description = lib.mdDoc "Whether to enable tap buttons."; }; buttonsMap = mkOption { type = types.listOf types.int; default = [1 2 3]; example = [1 3 2]; - description = "Remap touchpad buttons."; + description = lib.mdDoc "Remap touchpad buttons."; apply = map toString; }; @@ -121,34 +121,34 @@ in { type = types.listOf types.int; default = [1 2 3]; example = [1 3 2]; - description = "Remap several-fingers taps."; + description = lib.mdDoc "Remap several-fingers taps."; apply = map toString; }; palmDetect = mkOption { type = types.bool; default = false; - description = "Whether to enable palm detection (hardware support required)"; + description = lib.mdDoc "Whether to enable palm detection (hardware support required)"; }; palmMinWidth = mkOption { type = types.nullOr types.int; default = null; example = 5; - description = "Minimum finger width at which touch is considered a palm"; + description = lib.mdDoc "Minimum finger width at which touch is considered a palm"; }; palmMinZ = mkOption { type = types.nullOr types.int; default = null; example = 20; - description = "Minimum finger pressure at which touch is considered a palm"; + description = lib.mdDoc "Minimum finger pressure at which touch is considered a palm"; }; horizontalScroll = mkOption { type = types.bool; default = true; - description = "Whether to enable horizontal scrolling (on touchpad)"; + description = lib.mdDoc "Whether to enable horizontal scrolling (on touchpad)"; }; additionalOptions = mkOption { @@ -158,7 +158,7 @@ in { Option "RTCornerButton" "2" Option "RBCornerButton" "3" ''; - description = '' + description = lib.mdDoc '' Additional options for synaptics touchpad driver. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/hardware/wacom.nix b/third_party/nixpkgs/nixos/modules/services/x11/hardware/wacom.nix index dad2b308d1..4994e5c1a2 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/hardware/wacom.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/hardware/wacom.nix @@ -17,13 +17,13 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable the Wacom touchscreen/digitizer/tablet. If you ever have any issues such as, try switching to terminal (ctrl-alt-F1) and back which will make Xorg reconfigure the device ? If you're not satisfied by the default behaviour you can override - in + {option}`environment.etc."X11/xorg.conf.d/70-wacom.conf"` in configuration.nix easily. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix b/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix index ae990141a5..9f4fc7e90c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/imwheel.nix @@ -12,9 +12,9 @@ in type = types.listOf types.str; default = [ "--buttons=45" ]; example = [ "--debug" ]; - description = '' + description = lib.mdDoc '' Additional command-line arguments to pass to - imwheel. + {command}`imwheel`. ''; }; @@ -33,11 +33,11 @@ in '''; } ''; - description = '' + description = lib.mdDoc '' Window class translation rules. /etc/X11/imwheelrc is generated based on this config which means this config is global for all users. - See offical man pages + See [offical man pages](http://imwheel.sourceforge.net/imwheel.1.html) for more informations. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/picom.nix b/third_party/nixpkgs/nixos/modules/services/x11/picom.nix index 2eef71f71f..99bde5e1f0 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/picom.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/picom.nix @@ -62,7 +62,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether or not to enable Picom as the X.org composite manager. ''; }; @@ -70,7 +70,7 @@ in { experimentalBackends = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to use the unstable new reimplementation of the backends. ''; }; @@ -78,7 +78,7 @@ in { fade = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Fade windows in and out. ''; }; @@ -87,7 +87,7 @@ in { type = types.ints.positive; default = 10; example = 5; - description = '' + description = lib.mdDoc '' Time between fade animation step (in ms). ''; }; @@ -96,7 +96,7 @@ in { type = pairOf (floatBetween 0.01 1); default = [ 0.028 0.03 ]; example = [ 0.04 0.04 ]; - description = '' + description = lib.mdDoc '' Opacity change between fade steps (in and out). ''; }; @@ -109,16 +109,16 @@ in { "name ~= 'Firefox$'" "focused = 1" ]; - description = '' + description = lib.mdDoc '' List of conditions of windows that should not be faded. - See picom(1) man page for more examples. + See `picom(1)` man page for more examples. ''; }; shadow = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Draw window shadows. ''; }; @@ -127,7 +127,7 @@ in { type = pairOf types.int; default = [ (-15) (-15) ]; example = [ (-10) (-15) ]; - description = '' + description = lib.mdDoc '' Left and right offset for shadows (in pixels). ''; }; @@ -136,7 +136,7 @@ in { type = floatBetween 0 1; default = 0.75; example = 0.8; - description = '' + description = lib.mdDoc '' Window shadows opacity. ''; }; @@ -149,9 +149,9 @@ in { "name ~= 'Firefox$'" "focused = 1" ]; - description = '' + description = lib.mdDoc '' List of conditions of windows that should have no shadow. - See picom(1) man page for more examples. + See `picom(1)` man page for more examples. ''; }; @@ -159,7 +159,7 @@ in { type = floatBetween 0 1; default = 1.0; example = 0.8; - description = '' + description = lib.mdDoc '' Opacity of active windows. ''; }; @@ -168,7 +168,7 @@ in { type = floatBetween 0.1 1; default = 1.0; example = 0.8; - description = '' + description = lib.mdDoc '' Opacity of inactive windows. ''; }; @@ -177,7 +177,7 @@ in { type = floatBetween 0 1; default = 1.0; example = 0.8; - description = '' + description = lib.mdDoc '' Opacity of dropdown and popup menu. ''; }; @@ -195,7 +195,7 @@ in { } ''; example = {}; - description = '' + description = lib.mdDoc '' Rules for specific window types. ''; }; @@ -207,7 +207,7 @@ in { "95:class_g = 'URxvt' && !_NET_WM_STATE@:32a" "0:_NET_WM_STATE@:32a *= '_NET_WM_STATE_HIDDEN'" ]; - description = '' + description = lib.mdDoc '' Rules that control the opacity of windows, in format PERCENT:PATTERN. ''; }; @@ -215,8 +215,8 @@ in { backend = mkOption { type = types.enum [ "glx" "xrender" "xr_glx_hybrid" ]; default = "xrender"; - description = '' - Backend to use: glx, xrender or xr_glx_hybrid. + description = lib.mdDoc '' + Backend to use: `glx`, `xrender` or `xr_glx_hybrid`. ''; }; @@ -233,7 +233,7 @@ in { if isBool x then x else warn msg res; - description = '' + description = lib.mdDoc '' Enable vertical synchronization. Chooses the best method (drm, opengl, opengl-oml, opengl-swc, opengl-mswc) automatically. The bool value should be used, the others are just for backwards compatibility. @@ -267,10 +267,10 @@ in { deviation = 5.0; }; ''; - description = '' + description = lib.mdDoc '' Picom settings. Use this option to configure Picom settings not exposed in a NixOS option or to bypass one. For the available options see the - CONFIGURATION FILES section at picom(1). + CONFIGURATION FILES section at `picom(1)`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/redshift.nix b/third_party/nixpkgs/nixos/modules/services/x11/redshift.nix index cc9f964754..3eb9e28eda 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/redshift.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/redshift.nix @@ -29,7 +29,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable Redshift to change your screen's colour temperature depending on the time of day. ''; @@ -39,17 +39,17 @@ in { day = mkOption { type = types.int; default = 5500; - description = '' + description = lib.mdDoc '' Colour temperature to use during the day, between - 1000 and 25000 K. + `1000` and `25000` K. ''; }; night = mkOption { type = types.int; default = 3700; - description = '' + description = lib.mdDoc '' Colour temperature to use at night, between - 1000 and 25000 K. + `1000` and `25000` K. ''; }; }; @@ -58,17 +58,17 @@ in { day = mkOption { type = types.str; default = "1"; - description = '' + description = lib.mdDoc '' Screen brightness to apply during the day, - between 0.1 and 1.0. + between `0.1` and `1.0`. ''; }; night = mkOption { type = types.str; default = "1"; - description = '' + description = lib.mdDoc '' Screen brightness to apply during the night, - between 0.1 and 1.0. + between `0.1` and `1.0`. ''; }; }; @@ -77,7 +77,7 @@ in { type = types.package; default = pkgs.redshift; defaultText = literalExpression "pkgs.redshift"; - description = '' + description = lib.mdDoc '' redshift derivation to use. ''; }; @@ -86,7 +86,7 @@ in { type = types.str; default = "/bin/redshift"; example = "/bin/redshift-gtk"; - description = '' + description = lib.mdDoc '' Redshift executable to use within the package. ''; }; @@ -95,9 +95,9 @@ in { type = types.listOf types.str; default = []; example = [ "-v" "-m randr" ]; - description = '' + description = lib.mdDoc '' Additional command-line arguments to pass to - redshift. + {command}`redshift`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/touchegg.nix b/third_party/nixpkgs/nixos/modules/services/x11/touchegg.nix index 9d3678e769..905e8521cf 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/touchegg.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/touchegg.nix @@ -17,7 +17,7 @@ in { type = types.package; default = pkgs.touchegg; defaultText = literalExpression "pkgs.touchegg"; - description = "touchegg derivation to use."; + description = lib.mdDoc "touchegg derivation to use."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/unclutter-xfixes.nix b/third_party/nixpkgs/nixos/modules/services/x11/unclutter-xfixes.nix index 0b4d06f640..4a35176c58 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/unclutter-xfixes.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/unclutter-xfixes.nix @@ -8,32 +8,32 @@ in { options.services.unclutter-xfixes = { enable = mkOption { - description = "Enable unclutter-xfixes to hide your mouse cursor when inactive."; + description = lib.mdDoc "Enable unclutter-xfixes to hide your mouse cursor when inactive."; type = types.bool; default = false; }; package = mkOption { - description = "unclutter-xfixes derivation to use."; + description = lib.mdDoc "unclutter-xfixes derivation to use."; type = types.package; default = pkgs.unclutter-xfixes; defaultText = literalExpression "pkgs.unclutter-xfixes"; }; timeout = mkOption { - description = "Number of seconds before the cursor is marked inactive."; + description = lib.mdDoc "Number of seconds before the cursor is marked inactive."; type = types.int; default = 1; }; threshold = mkOption { - description = "Minimum number of pixels considered cursor movement."; + description = lib.mdDoc "Minimum number of pixels considered cursor movement."; type = types.int; default = 1; }; extraOptions = mkOption { - description = "More arguments to pass to the unclutter-xfixes command."; + description = lib.mdDoc "More arguments to pass to the unclutter-xfixes command."; type = types.listOf types.str; default = []; example = [ "exclude-root" "ignore-scrolling" "fork" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/unclutter.nix b/third_party/nixpkgs/nixos/modules/services/x11/unclutter.nix index bdb5fa7b50..039214a575 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/unclutter.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/unclutter.nix @@ -8,7 +8,7 @@ in { options.services.unclutter = { enable = mkOption { - description = "Enable unclutter to hide your mouse cursor when inactive"; + description = lib.mdDoc "Enable unclutter to hide your mouse cursor when inactive"; type = types.bool; default = false; }; @@ -17,36 +17,36 @@ in { type = types.package; default = pkgs.unclutter; defaultText = literalExpression "pkgs.unclutter"; - description = "unclutter derivation to use."; + description = lib.mdDoc "unclutter derivation to use."; }; keystroke = mkOption { - description = "Wait for a keystroke before hiding the cursor"; + description = lib.mdDoc "Wait for a keystroke before hiding the cursor"; type = types.bool; default = false; }; timeout = mkOption { - description = "Number of seconds before the cursor is marked inactive"; + description = lib.mdDoc "Number of seconds before the cursor is marked inactive"; type = types.int; default = 1; }; threshold = mkOption { - description = "Minimum number of pixels considered cursor movement"; + description = lib.mdDoc "Minimum number of pixels considered cursor movement"; type = types.int; default = 1; }; excluded = mkOption { - description = "Names of windows where unclutter should not apply"; + description = lib.mdDoc "Names of windows where unclutter should not apply"; type = types.listOf types.str; default = []; example = [ "" ]; }; extraOptions = mkOption { - description = "More arguments to pass to the unclutter command"; + description = lib.mdDoc "More arguments to pass to the unclutter command"; type = types.listOf types.str; default = []; example = [ "noevent" "grab" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/urxvtd.nix b/third_party/nixpkgs/nixos/modules/services/x11/urxvtd.nix index 0a0df447f4..fedcb6c729 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/urxvtd.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/urxvtd.nix @@ -11,7 +11,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable urxvtd, the urxvt terminal daemon. To use urxvtd, run "urxvtc". ''; @@ -20,7 +20,7 @@ in { package = mkOption { default = pkgs.rxvt-unicode; defaultText = literalExpression "pkgs.rxvt-unicode"; - description = '' + description = lib.mdDoc '' Package to install. Usually pkgs.rxvt-unicode. ''; type = types.package; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/awesome.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/awesome.nix index c6c0c934f9..8db7d86c72 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/awesome.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/awesome.nix @@ -26,21 +26,21 @@ in luaModules = mkOption { default = []; type = types.listOf types.package; - description = "List of lua packages available for being used in the Awesome configuration."; + description = lib.mdDoc "List of lua packages available for being used in the Awesome configuration."; example = literalExpression "[ pkgs.luaPackages.vicious ]"; }; package = mkOption { default = null; type = types.nullOr types.package; - description = "Package to use for running the Awesome WM."; + description = lib.mdDoc "Package to use for running the Awesome WM."; apply = pkg: if pkg == null then pkgs.awesome else pkg; }; noArgb = mkOption { default = false; type = types.bool; - description = "Disable client transparency support, which can be greatly detrimental to performance in some setups"; + description = lib.mdDoc "Disable client transparency support, which can be greatly detrimental to performance in some setups"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/bspwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/bspwm.nix index ade24061a0..4fcd2b7c72 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/bspwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/bspwm.nix @@ -16,7 +16,7 @@ in default = pkgs.bspwm; defaultText = literalExpression "pkgs.bspwm"; example = literalExpression "pkgs.bspwm-unstable"; - description = '' + description = lib.mdDoc '' bspwm package to use. ''; }; @@ -24,7 +24,7 @@ in type = with types; nullOr path; example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"''; default = null; - description = '' + description = lib.mdDoc '' Path to the bspwm configuration file. If null, $HOME/.config/bspwm/bspwmrc will be used. ''; @@ -36,7 +36,7 @@ in default = pkgs.sxhkd; defaultText = literalExpression "pkgs.sxhkd"; example = literalExpression "pkgs.sxhkd-unstable"; - description = '' + description = lib.mdDoc '' sxhkd package to use. ''; }; @@ -44,7 +44,7 @@ in type = with types; nullOr path; example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"''; default = null; - description = '' + description = lib.mdDoc '' Path to the sxhkd configuration file. If null, $HOME/.config/sxhkd/sxhkdrc will be used. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix index 78772c7997..cf8eec249c 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/clfswm.nix @@ -14,7 +14,7 @@ in type = types.package; default = pkgs.lispPackages.clfswm; defaultText = literalExpression "pkgs.lispPackages.clfswm"; - description = '' + description = lib.mdDoc '' clfswm package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix index d71738ea63..52083dcaaa 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/default.nix @@ -19,7 +19,9 @@ in ./evilwm.nix ./exwm.nix ./fluxbox.nix - ./fvwm.nix + ./fvwm2.nix + ./fvwm3.nix + ./hackedbox.nix ./herbstluftwm.nix ./i3.nix ./jwm.nix diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix index b505f720f0..5b0a15804e 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix @@ -26,7 +26,7 @@ in (require 'exwm) (exwm-enable) ''; - description = '' + description = lib.mdDoc '' Emacs lisp code to be run after loading the user's init file. If enableDefaultConfig is true, this will be run before loading the default config. @@ -35,7 +35,7 @@ in enableDefaultConfig = mkOption { default = true; type = lib.types.bool; - description = "Enable an uncustomised exwm configuration."; + description = lib.mdDoc "Enable an uncustomised exwm configuration."; }; extraPackages = mkOption { type = types.functionTo (types.listOf types.package); diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/fvwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/fvwm.nix deleted file mode 100644 index e283886ecc..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/fvwm.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.xserver.windowManager.fvwm; - fvwm = pkgs.fvwm.override { enableGestures = cfg.gestures; }; -in - -{ - - ###### interface - - options = { - services.xserver.windowManager.fvwm = { - enable = mkEnableOption "Fvwm window manager"; - - gestures = mkOption { - default = false; - type = types.bool; - description = "Whether or not to enable libstroke for gesture support"; - }; - }; - }; - - - ###### implementation - - config = mkIf cfg.enable { - services.xserver.windowManager.session = singleton - { name = "fvwm"; - start = - '' - ${fvwm}/bin/fvwm & - waitPID=$! - ''; - }; - - environment.systemPackages = [ fvwm ]; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/fvwm2.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/fvwm2.nix new file mode 100644 index 0000000000..b5ef36f58d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/fvwm2.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.fvwm2; + fvwm2 = pkgs.fvwm2.override { enableGestures = cfg.gestures; }; +in + +{ + + imports = [ + (mkRenamedOptionModule + [ "services" "xserver" "windowManager" "fvwm" ] + [ "services" "xserver" "windowManager" "fvwm2" ]) + ]; + + ###### interface + + options = { + services.xserver.windowManager.fvwm2 = { + enable = mkEnableOption "Fvwm2 window manager"; + + gestures = mkOption { + default = false; + type = types.bool; + description = lib.mdDoc "Whether or not to enable libstroke for gesture support"; + }; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton + { name = "fvwm2"; + start = + '' + ${fvwm2}/bin/fvwm & + waitPID=$! + ''; + }; + + environment.systemPackages = [ fvwm2 ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/fvwm3.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/fvwm3.nix new file mode 100644 index 0000000000..43111f917d --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/fvwm3.nix @@ -0,0 +1,35 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.fvwm3; + inherit (pkgs) fvwm3; +in + +{ + + ###### interface + + options = { + services.xserver.windowManager.fvwm3 = { + enable = mkEnableOption "Fvwm3 window manager"; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton + { name = "fvwm3"; + start = + '' + ${fvwm3}/bin/fvwm3 & + waitPID=$! + ''; + }; + + environment.systemPackages = [ fvwm3 ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/hackedbox.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/hackedbox.nix new file mode 100644 index 0000000000..641cf1bdcb --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/hackedbox.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.hackedbox; +in +{ + ###### interface + options = { + services.xserver.windowManager.hackedbox.enable = mkEnableOption "hackedbox"; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "hackedbox"; + start = '' + ${pkgs.hackedbox}/bin/hackedbox & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.hackedbox ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix index 354d70c695..af077c4d22 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/herbstluftwm.nix @@ -15,7 +15,7 @@ in type = types.package; default = pkgs.herbstluftwm; defaultText = literalExpression "pkgs.herbstluftwm"; - description = '' + description = lib.mdDoc '' Herbstluftwm package to use. ''; }; @@ -23,7 +23,7 @@ in configFile = mkOption { default = null; type = with types; nullOr path; - description = '' + description = lib.mdDoc '' Path to the herbstluftwm configuration file. If left at the default value, $XDG_CONFIG_HOME/herbstluftwm/autostart will be used. diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/i3.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/i3.nix index 99f9997024..87479f2ac4 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/i3.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/i3.nix @@ -13,7 +13,7 @@ in configFile = mkOption { default = null; type = with types; nullOr path; - description = '' + description = lib.mdDoc '' Path to the i3 configuration file. If left at the default value, $HOME/.i3/config will be used. ''; @@ -22,7 +22,7 @@ in extraSessionCommands = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands executed just before i3 is started. ''; }; @@ -32,7 +32,7 @@ in default = pkgs.i3; defaultText = literalExpression "pkgs.i3"; example = literalExpression "pkgs.i3-gaps"; - description = '' + description = lib.mdDoc '' i3 package to use. ''; }; @@ -47,7 +47,7 @@ in i3lock ] ''; - description = '' + description = lib.mdDoc '' Extra packages to be installed system wide. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/mlvwm.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/mlvwm.nix index 08dd040202..0ee1d7b097 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/mlvwm.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/mlvwm.nix @@ -13,7 +13,7 @@ in configFile = mkOption { default = null; type = with types; nullOr path; - description = '' + description = lib.mdDoc '' Path to the mlvwm configuration file. If left at the default value, $HOME/.mlvwmrc will be used. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/wmderland.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/wmderland.nix index 56b6922096..835c1b3028 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/wmderland.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/wmderland.nix @@ -13,7 +13,7 @@ in extraSessionCommands = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands executed just before wmderland is started. ''; }; @@ -38,7 +38,7 @@ in rxvt-unicode ] ''; - description = '' + description = lib.mdDoc '' Extra packages to be installed system wide. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix index 66d1113139..f616802acc 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/window-managers/xmonad.nix @@ -30,7 +30,7 @@ let install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz makeWrapper ${configured}/bin/xmonad $out/bin/xmonad \ '' + optionalString cfg.enableConfiguredRecompile '' - --set NIX_GHC "${xmonadEnv}/bin/ghc" \ + --set XMONAD_GHC "${xmonadEnv}/bin/ghc" \ '' + '' --set XMONAD_XMESSAGE "${pkgs.xorg.xmessage}/bin/xmessage" ''); @@ -46,7 +46,7 @@ in { haskellPackages = mkOption { default = pkgs.haskellPackages; defaultText = literalExpression "pkgs.haskellPackages"; - example = literalExpression "pkgs.haskell.packages.ghc784"; + example = literalExpression "pkgs.haskell.packages.ghc8107"; type = types.attrs; description = '' haskellPackages used to build Xmonad and other packages. @@ -76,13 +76,13 @@ in { enableContribAndExtras = mkOption { default = false; type = lib.types.bool; - description = "Enable xmonad-{contrib,extras} in Xmonad."; + description = lib.mdDoc "Enable xmonad-{contrib,extras} in Xmonad."; }; config = mkOption { default = null; type = with lib.types; nullOr (either path str); - description = '' + description = lib.mdDoc '' Configuration from which XMonad gets compiled. If no value is specified, a vanilla xmonad binary is put in PATH, which will attempt to recompile and exec your xmonad config from $HOME/.xmonad. @@ -94,17 +94,17 @@ in { "mod+q" restart key binding dysfunctional though, because that attempts to call your binary with the "--restart" command line option, unless you implement that yourself. You way mant to bind "mod+q" to - (restart "xmonad" True) instead, which will just restart + `(restart "xmonad" True)` instead, which will just restart xmonad from PATH. This allows e.g. switching to the new xmonad binary after rebuilding your system with nixos-rebuild. For the same reason, ghc is not added to the environment when this - option is set, unless is - set to true. + option is set, unless {option}`enableConfiguredRecompile` is + set to `true`. If you actually want to run xmonad with a config specified here, but also be able to recompile and restart it from a copy of that source in - $HOME/.xmonad on the fly, set - to true and implement something like "compileRestart" + $HOME/.xmonad on the fly, set {option}`enableConfiguredRecompile` + to `true` and implement something like "compileRestart" from the example. This should allow you to switch at will between the local xmonad and the one NixOS puts in your PATH. @@ -162,8 +162,8 @@ in { enableConfiguredRecompile = mkOption { default = false; type = lib.types.bool; - description = '' - Enable recompilation even if is set to a + description = lib.mdDoc '' + Enable recompilation even if {option}`config` is set to a non-null value. This adds the necessary Haskell dependencies (GHC with packages) to the xmonad binary's environment. ''; @@ -172,7 +172,7 @@ in { xmonadCliArgs = mkOption { default = []; type = with lib.types; listOf str; - description = '' + description = lib.mdDoc '' Command line arguments passed to the xmonad binary. ''; }; @@ -180,7 +180,7 @@ in { ghcArgs = mkOption { default = []; type = with lib.types; listOf str; - description = '' + description = lib.mdDoc '' Command line arguments passed to the compiler (ghc) invocation when xmonad.config is set. ''; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix b/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix index 947d8f4edf..ca3909d7b8 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xautolock.nix @@ -20,7 +20,7 @@ in default = 15; type = types.int; - description = '' + description = lib.mdDoc '' Idle time (in minutes) to wait until xautolock locks the computer. ''; }; @@ -31,7 +31,7 @@ in example = literalExpression ''"''${pkgs.i3lock}/bin/i3lock -i /path/to/img"''; type = types.str; - description = '' + description = lib.mdDoc '' The script to use when automatically locking the computer. ''; }; @@ -41,8 +41,8 @@ in example = literalExpression ''"''${pkgs.i3lock}/bin/i3lock -i /path/to/img"''; type = types.nullOr types.str; - description = '' - The script to use when manually locking the computer with xautolock -locknow. + description = lib.mdDoc '' + The script to use when manually locking the computer with {command}`xautolock -locknow`. ''; }; @@ -50,7 +50,7 @@ in default = 10; type = types.int; - description = '' + description = lib.mdDoc '' Time (in seconds) before the actual lock when the notification about the pending lock should be published. ''; }; @@ -60,7 +60,7 @@ in example = literalExpression ''"''${pkgs.libnotify}/bin/notify-send 'Locking in 10 seconds'"''; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' Notification script to be used to warn about the pending autolock. ''; }; @@ -70,8 +70,8 @@ in example = "/run/current-system/systemd/bin/systemctl suspend"; type = types.nullOr types.str; - description = '' - The script to use when nothing has happend for as long as + description = lib.mdDoc '' + The script to use when nothing has happend for as long as {option}`killtime` ''; }; @@ -79,8 +79,8 @@ in default = 20; # default according to `man xautolock` type = types.int; - description = '' - Minutes xautolock waits until it executes the script specified in + description = lib.mdDoc '' + Minutes xautolock waits until it executes the script specified in {option}`killer` (Has to be at least 10 minutes) ''; }; @@ -89,9 +89,9 @@ in type = types.listOf types.str; default = [ ]; example = [ "-detectsleep" ]; - description = '' + description = lib.mdDoc '' Additional command-line arguments to pass to - xautolock. + {command}`xautolock`. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xbanish.nix b/third_party/nixpkgs/nixos/modules/services/x11/xbanish.nix index b95fac68f1..f494f2054a 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xbanish.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xbanish.nix @@ -10,7 +10,7 @@ in { enable = mkEnableOption "xbanish"; arguments = mkOption { - description = "Arguments to pass to xbanish command"; + description = lib.mdDoc "Arguments to pass to xbanish command"; default = ""; example = "-d -i shift"; type = types.str; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xfs.nix b/third_party/nixpkgs/nixos/modules/services/x11/xfs.nix index ea7cfa1aa4..591bf46149 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xfs.nix @@ -19,7 +19,7 @@ in enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the X Font Server."; + description = lib.mdDoc "Whether to enable the X Font Server."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix b/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix index c04d0fc16b..88b3ac1d18 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix @@ -123,12 +123,12 @@ in } ''; - description = '' + description = lib.mdDoc '' A set of shell script fragments that are executed when a NixOS system configuration is activated. Examples are updating /etc, creating accounts, and so on. Since these are executed every time you boot the system or run - nixos-rebuild, it's important that they are + {command}`nixos-rebuild`, it's important that they are idempotent and fast. ''; @@ -159,12 +159,12 @@ in } ''; - description = '' + description = lib.mdDoc '' A set of shell script fragments that are executed by a systemd user service when a NixOS system configuration is activated. Examples are rebuilding the .desktop file cache for showing applications in the menu. Since these are executed every time you run - nixos-rebuild, it's important that they are + {command}`nixos-rebuild`, it's important that they are idempotent and fast. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl index 3f0d976e70..f39549db88 100755 --- a/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl +++ b/third_party/nixpkgs/nixos/modules/system/activation/switch-to-configuration.pl @@ -18,7 +18,8 @@ use Config::IniFiles; use File::Path qw(make_path); use File::Basename; use File::Slurp qw(read_file write_file edit_file); -use Net::DBus; +use JSON::PP; +use IPC::Cmd; use Sys::Syslog qw(:standard :macros); use Cwd qw(abs_path); @@ -124,12 +125,29 @@ EOF # virtual console 1 and we restart the "tty1" unit. $SIG{PIPE} = "IGNORE"; +# Replacement for Net::DBus that calls busctl of the current systemd, parses +# it's json output and returns the response using only core modules to reduce +# dependencies on perlPackages in baseSystem +sub busctl_call_systemd1_mgr { + my (@args) = @_; + my $cmd = [ + "$cur_systemd/busctl", "--json=short", "call", "org.freedesktop.systemd1", + "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager", + @args + ]; + + my ($ok, $err, undef, $stdout) = IPC::Cmd::run(command => $cmd); + die $err unless $ok; + + my $res = decode_json(join "", @$stdout); + return $res; +} + # Asks the currently running systemd instance via dbus which units are active. # Returns a hash where the key is the name of each unit and the value a hash # of load, state, substate. sub get_active_units { - my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1"); - my $units = $mgr->ListUnitsByPatterns([], []); + my $units = busctl_call_systemd1_mgr("ListUnitsByPatterns", "asas", 0, 0)->{data}->[0]; my $res = {}; for my $item (@{$units}) { my ($id, $description, $load_state, $active_state, $sub_state, @@ -149,9 +167,7 @@ sub get_active_units { # Takes the name of the unit as an argument and returns a bool whether the unit is active or not. sub unit_is_active { my ($unit_name) = @_; - - my $mgr = Net::DBus->system->get_service("org.freedesktop.systemd1")->get_object("/org/freedesktop/systemd1"); - my $units = $mgr->ListUnitsByNames([$unit_name]); + my $units = busctl_call_systemd1_mgr("ListUnitsByNames", "as", 1, $unit_name)->{data}->[0]; if (scalar(@{$units}) == 0) { return 0; } diff --git a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix index 84f560691f..0ceaed9ea6 100644 --- a/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix +++ b/third_party/nixpkgs/nixos/modules/system/activation/top-level.nix @@ -124,7 +124,7 @@ let configurationName = config.boot.loader.grub.configurationName; # Needed by switch-to-configuration. - perl = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp NetDBus ]); + perl = pkgs.perl.withPackages (p: with p; [ ConfigIniFiles FileSlurp ]); }; # Handle assertions and warnings @@ -335,7 +335,7 @@ in ''; description = '' The name of the system used in the derivation. - + That derivation has the following name: "nixos-system-''${config.system.name}-''${config.system.nixos.label}" ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix index 33748358e4..4d95af61ac 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/binfmt.nix @@ -153,7 +153,7 @@ in { registrations = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Extra binary formats to register with the kernel. See https://www.kernel.org/doc/html/latest/admin-guide/binfmt-misc.html for more details. ''; @@ -162,30 +162,30 @@ in { options = { recognitionType = mkOption { default = "magic"; - description = "Whether to recognize executables by magic number or extension."; + description = lib.mdDoc "Whether to recognize executables by magic number or extension."; type = types.enum [ "magic" "extension" ]; }; offset = mkOption { default = null; - description = "The byte offset of the magic number used for recognition."; + description = lib.mdDoc "The byte offset of the magic number used for recognition."; type = types.nullOr types.int; }; magicOrExtension = mkOption { - description = "The magic number or extension to match on."; + description = lib.mdDoc "The magic number or extension to match on."; type = types.str; }; mask = mkOption { default = null; description = - "A mask to be ANDed with the byte sequence of the file before matching"; + lib.mdDoc "A mask to be ANDed with the byte sequence of the file before matching"; type = types.nullOr types.str; }; interpreter = mkOption { - description = '' + description = lib.mdDoc '' The interpreter to invoke to run the program. Note that the actual registration will point to @@ -197,7 +197,7 @@ in { preserveArgvZero = mkOption { default = false; - description = '' + description = lib.mdDoc '' Whether to pass the original argv[0] to the interpreter. See the description of the 'P' flag in the kernel docs @@ -208,7 +208,7 @@ in { openBinary = mkOption { default = config.matchCredentials; - description = '' + description = lib.mdDoc '' Whether to pass the binary to the interpreter as an open file descriptor, instead of a path. ''; @@ -217,7 +217,7 @@ in { matchCredentials = mkOption { default = false; - description = '' + description = lib.mdDoc '' Whether to launch with the credentials and security token of the binary, not the interpreter (e.g. setuid bit). @@ -232,7 +232,7 @@ in { fixBinary = mkOption { default = false; - description = '' + description = lib.mdDoc '' Whether to open the interpreter file as soon as the registration is loaded, rather than waiting for a relevant file to be invoked. @@ -245,7 +245,7 @@ in { wrapInterpreterInShell = mkOption { default = true; - description = '' + description = lib.mdDoc '' Whether to wrap the interpreter in a shell script. This allows a shell command to be set as the interpreter. @@ -268,7 +268,7 @@ in { emulatedSystems = mkOption { default = []; example = [ "wasm32-wasi" "x86_64-windows" "aarch64-linux" ]; - description = '' + description = lib.mdDoc '' List of systems to emulate. Will also configure Nix to support your new systems. Warning: the builder can execute all emulated systems within the same build, which introduces impurities in the case of cross compilation. diff --git a/third_party/nixpkgs/nixos/modules/system/boot/emergency-mode.nix b/third_party/nixpkgs/nixos/modules/system/boot/emergency-mode.nix index ec697bcee2..a2163aa5ff 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/emergency-mode.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/emergency-mode.nix @@ -11,9 +11,9 @@ with lib; systemd.enableEmergencyMode = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable emergency mode, which is an - sulogin shell started on the console if + {command}`sulogin` shell started on the console if mounting a filesystem fails. Since some machines (like EC2 instances) have no console of any kind, emergency mode doesn't make sense, and it's better to continue with the boot insofar diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix index 2a7417ed37..a1017c3e24 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-network.nix @@ -50,18 +50,17 @@ in boot.initrd.network.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Add network connectivity support to initrd. The network may be - configured using the ip kernel parameter, - as described in the - kernel documentation. Otherwise, if - is enabled, an IP address + configured using the `ip` kernel parameter, + as described in [the kernel documentation](https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt). + Otherwise, if + {option}`networking.useDHCP` is enabled, an IP address is acquired using DHCP. You should add the module(s) required for your network card to boot.initrd.availableKernelModules. - lspci -v | grep -iA8 'network\|ethernet' + `lspci -v | grep -iA8 'network\|ethernet'` will tell you which. ''; }; @@ -69,7 +68,7 @@ in boot.initrd.network.flushBeforeStage2 = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to clear the configuration of the interfaces that were set up in the initrd right before stage 2 takes over. Stage 2 will do the regular network configuration based on the NixOS networking options. @@ -79,9 +78,9 @@ in boot.initrd.network.udhcpc.extraArgs = mkOption { default = []; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Additional command-line arguments passed verbatim to udhcpc if - and + {option}`boot.initrd.network.enable` and {option}`networking.useDHCP` are enabled. ''; }; @@ -89,7 +88,7 @@ in boot.initrd.network.postCommands = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands to be executed after stage 1 of the boot has initialised the network. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix index 9b52d4bbdb..9f476e0720 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-openvpn.nix @@ -15,10 +15,10 @@ in boot.initrd.network.openvpn.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Starts an OpenVPN client during initrd boot. It can be used to e.g. remotely accessing the SSH service controlled by - or other network services + {option}`boot.initrd.network.ssh` or other network services included. Service is killed when stage-1 boot is finished. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix index 0999142de8..265399e562 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/initrd-ssh.nix @@ -14,20 +14,20 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Start SSH service during initrd boot. It can be used to debug failing boot on a remote server, enter pasphrase for an encrypted partition etc. Service is killed when stage-1 boot is finished. The sshd configuration is largely inherited from - . + {option}`services.openssh`. ''; }; port = mkOption { type = types.int; default = 22; - description = '' + description = lib.mdDoc '' Port on which SSH initrd service should listen. ''; }; @@ -35,7 +35,7 @@ in shell = mkOption { type = types.str; default = "/bin/ash"; - description = '' + description = lib.mdDoc '' Login shell of the remote user. Can be used to limit actions user can do. ''; }; @@ -79,7 +79,7 @@ in type = types.listOf types.str; default = config.users.users.root.openssh.authorizedKeys.keys; defaultText = literalExpression "config.users.users.root.openssh.authorizedKeys.keys"; - description = '' + description = lib.mdDoc '' Authorized keys for the root user on initrd. ''; }; @@ -87,7 +87,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = "Verbatim contents of sshd_config."; + description = lib.mdDoc "Verbatim contents of {file}`sshd_config`."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix index b2c92a85f7..33e9eca62b 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -66,7 +66,7 @@ in type = types.listOf types.attrs; default = []; example = literalExpression "[ pkgs.kernelPatches.ubuntu_fan_4_4 ]"; - description = "A list of additional patches to apply to the kernel."; + description = lib.mdDoc "A list of additional patches to apply to the kernel."; }; boot.kernel.randstructSeed = mkOption { @@ -88,14 +88,14 @@ in description = "string, with spaces inside double quotes"; }); default = [ ]; - description = "Parameters added to the kernel command line."; + description = lib.mdDoc "Parameters added to the kernel command line."; }; boot.consoleLogLevel = mkOption { type = types.int; default = 4; - description = '' - The kernel console loglevel. All Kernel Messages with a log level smaller + description = lib.mdDoc '' + The kernel console `loglevel`. All Kernel Messages with a log level smaller than this setting will be printed to the console. ''; }; @@ -103,11 +103,11 @@ in boot.vesa = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' (Deprecated) This option, if set, activates the VESA 800x600 video mode on boot and disables kernel modesetting. It is equivalent to - specifying [ "vga=0x317" "nomodeset" ] in the - option. This option is + specifying `[ "vga=0x317" "nomodeset" ]` in the + {option}`boot.kernelParams` option. This option is deprecated as of 2020: Xorg now works better with modesetting, and you might want a different VESA vga setting, anyway. ''; @@ -117,18 +117,18 @@ in type = types.listOf types.package; default = []; example = literalExpression "[ config.boot.kernelPackages.nvidia_x11 ]"; - description = "A list of additional packages supplying kernel modules."; + description = lib.mdDoc "A list of additional packages supplying kernel modules."; }; boot.kernelModules = mkOption { type = types.listOf types.str; default = []; - description = '' + description = lib.mdDoc '' The set of kernel modules to be loaded in the second stage of the boot process. Note that modules that are needed to mount the root file system should be added to - or - . + {option}`boot.initrd.availableKernelModules` or + {option}`boot.initrd.kernelModules`. ''; }; @@ -136,7 +136,7 @@ in type = types.listOf types.str; default = []; example = [ "sata_nv" "ext3" ]; - description = '' + description = lib.mdDoc '' The set of kernel modules in the initial ramdisk used during the boot process. This set must include all modules necessary for mounting the root device. That is, it should include modules @@ -149,23 +149,23 @@ in loaded automatically when an ext3 filesystem is mounted, and modules for PCI devices are loaded when they match the PCI ID of a device in your system). To force a module to be loaded, - include it in . + include it in {option}`boot.initrd.kernelModules`. ''; }; boot.initrd.kernelModules = mkOption { type = types.listOf types.str; default = []; - description = "List of modules that are always loaded by the initrd."; + description = lib.mdDoc "List of modules that are always loaded by the initrd."; }; boot.initrd.includeDefaultModules = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' This option, if set, adds a collection of default kernel modules - to and - . + to {option}`boot.initrd.availableKernelModules` and + {option}`boot.initrd.kernelModules`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix index 495fe74bc2..448835c3e6 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel_config.nix @@ -25,7 +25,7 @@ let }; default = null; example = ''MMC_BLOCK_MINORS.freeform = "32";''; - description = '' + description = lib.mdDoc '' Freeform description of a kernel configuration item value. ''; }; @@ -33,7 +33,7 @@ let optional = mkOption { type = types.bool // { merge = mergeFalseByDefault; }; default = false; - description = '' + description = lib.mdDoc '' Whether option should generate a failure when unused. Upon merging values, mandatory wins over optional. ''; @@ -105,7 +105,7 @@ in USB = option yes; MMC_BLOCK_MINORS = freeform "32"; }''; - description = '' + description = lib.mdDoc '' Structured kernel configuration. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/efi.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/efi.nix index 6043c904c4..2661f36224 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/efi.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/efi.nix @@ -8,13 +8,13 @@ with lib; canTouchEfiVariables = mkOption { default = false; type = types.bool; - description = "Whether the installation process is allowed to modify EFI boot variables."; + description = lib.mdDoc "Whether the installation process is allowed to modify EFI boot variables."; }; efiSysMountPoint = mkOption { default = "/boot"; type = types.str; - description = "Where the EFI System Partition is mounted."; + description = lib.mdDoc "Where the EFI System Partition is mounted."; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix index 1437ab3877..5ace5dd06f 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/generations-dir/generations-dir.nix @@ -22,11 +22,11 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to create symlinks to the system generations under - /boot. When enabled, - /boot/default/kernel, - /boot/default/initrd, etc., are updated to + `/boot`. When enabled, + `/boot/default/kernel`, + `/boot/default/initrd`, etc., are updated to point to the current generation's kernel image, initial RAM disk, and other bootstrap files. @@ -41,7 +41,7 @@ in copyKernels = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether copy the necessary boot files into /boot, so /nix/store is not needed by the boot loader. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix index 1f915d1f41..1ad7cd8109 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/grub.nix @@ -103,7 +103,7 @@ in default = !config.boot.isContainer; defaultText = literalExpression "!config.boot.isContainer"; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable the GNU GRUB boot loader. ''; }; @@ -112,9 +112,9 @@ in default = 2; example = 1; type = types.int; - description = '' - The version of GRUB to use: 1 for GRUB - Legacy (versions 0.9x), or 2 (the + description = lib.mdDoc '' + The version of GRUB to use: `1` for GRUB + Legacy (versions 0.9x), or `2` (the default) for GRUB 2. ''; }; @@ -123,12 +123,12 @@ in default = ""; example = "/dev/disk/by-id/wwn-0x500001234567890a"; type = types.str; - description = '' + description = lib.mdDoc '' The device on which the GRUB boot loader will be installed. - The special value nodev means that a GRUB + The special value `nodev` means that a GRUB boot menu will be generated, but GRUB itself will not actually be installed. To install GRUB on multiple devices, - use boot.loader.grub.devices. + use `boot.loader.grub.devices`. ''; }; @@ -136,9 +136,9 @@ in default = []; example = [ "/dev/disk/by-id/wwn-0x500001234567890a" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The devices on which the boot loader, GRUB, will be - installed. Can be used instead of device to + installed. Can be used instead of `device` to install GRUB onto multiple devices. ''; }; @@ -148,7 +148,7 @@ in example = { root = { hashedPasswordFile = "/path/to/file"; }; }; - description = '' + description = lib.mdDoc '' User accounts for GRUB. When specified, the GRUB command line and all boot options except the default are password-protected. All passwords and hashes provided will be stored in /boot/grub/grub.cfg, @@ -163,7 +163,7 @@ in example = "/path/to/file"; default = null; type = with types; uniq (nullOr str); - description = '' + description = lib.mdDoc '' Specifies the path to a file containing the password hash for the account, generated with grub-mkpasswd-pbkdf2. This hash will be stored in /boot/grub/grub.cfg, and will @@ -174,7 +174,7 @@ in example = "grub.pbkdf2.sha512.10000.674DFFDEF76E13EA...2CC972B102CF4355"; default = null; type = with types; uniq (nullOr str); - description = '' + description = lib.mdDoc '' Specifies the password hash for the account, generated with grub-mkpasswd-pbkdf2. This hash will be copied to the Nix store, and will be visible to all local users. @@ -184,7 +184,7 @@ in example = "/path/to/file"; default = null; type = with types; uniq (nullOr str); - description = '' + description = lib.mdDoc '' Specifies the path to a file containing the clear text password for the account. This password will be stored in /boot/grub/grub.cfg, and will @@ -195,7 +195,7 @@ in example = "Pa$$w0rd!"; default = null; type = with types; uniq (nullOr str); - description = '' + description = lib.mdDoc '' Specifies the clear text password for the account. This password will be copied to the Nix store, and will be visible to all local users. ''; @@ -210,7 +210,7 @@ in { path = "/boot1"; devices = [ "/dev/disk/by-id/wwn-0x500001234567890a" ]; } { path = "/boot2"; devices = [ "/dev/disk/by-id/wwn-0x500009876543210a" ]; } ]; - description = '' + description = lib.mdDoc '' Mirror the boot configuration to multiple partitions and install grub to the respective devices corresponding to those partitions. ''; @@ -221,7 +221,7 @@ in path = mkOption { example = "/boot1"; type = types.str; - description = '' + description = lib.mdDoc '' The path to the boot directory where GRUB will be written. Generally this boot path should double as an EFI path. ''; @@ -231,7 +231,7 @@ in default = null; example = "/boot1/efi"; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The path to the efi system mount point. Usually this is the same partition as the above path and can be left as null. ''; @@ -241,10 +241,10 @@ in default = null; example = "NixOS-fsid"; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The id of the bootloader to store in efi nvram. The default is to name it NixOS and append the path or efiSysMountPoint. - This is only used if boot.loader.efi.canTouchEfiVariables is true. + This is only used if `boot.loader.efi.canTouchEfiVariables` is true. ''; }; @@ -252,7 +252,7 @@ in default = [ ]; example = [ "/dev/disk/by-id/wwn-0x500001234567890a" "/dev/disk/by-id/wwn-0x500009876543210a" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The path to the devices which will have the GRUB MBR written. Note these are typically device paths and not paths to partitions. ''; @@ -266,7 +266,7 @@ in default = ""; example = "Stable 2.6.21"; type = types.str; - description = '' + description = lib.mdDoc '' GRUB entry name instead of default. ''; }; @@ -274,7 +274,7 @@ in storePath = mkOption { default = "/nix/store"; type = types.str; - description = '' + description = lib.mdDoc '' Path to the Nix store when looking for kernels at boot. Only makes sense when copyKernels is false. ''; @@ -283,7 +283,7 @@ in extraPrepareConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Additional bash commands to be run at the script that prepares the GRUB menu entries. ''; @@ -297,7 +297,7 @@ in terminal_output --append serial ''; type = types.lines; - description = '' + description = lib.mdDoc '' Additional GRUB commands inserted in the configuration file just before the menu entries. ''; @@ -307,26 +307,26 @@ in default = [ ]; example = [ "--modules=nativedisk ahci pata part_gpt part_msdos diskfilter mdraid1x lvm ext2" ]; type = types.listOf types.str; - description = '' - Additional arguments passed to grub-install. + description = lib.mdDoc '' + Additional arguments passed to `grub-install`. A use case for this is to build specific GRUB2 modules directly into the GRUB2 kernel image, so that they are available - and activated even in the grub rescue shell. + and activated even in the `grub rescue` shell. They are also necessary when the BIOS/UEFI is bugged and cannot correctly read large disks (e.g. above 2 TB), so GRUB2's own - nativedisk and related modules can be used + `nativedisk` and related modules can be used to use its own disk drivers. The example shows one such case. This is also useful for booting from USB. See the - + [ GRUB source code - + ](http://git.savannah.gnu.org/cgit/grub.git/tree/grub-core/commands/nativedisk.c?h=grub-2.04#n326) for which disk modules are available. - The list elements are passed directly as argv - arguments to the grub-install program, in order. + The list elements are passed directly as `argv` + arguments to the `grub-install` program, in order. ''; }; @@ -344,7 +344,7 @@ in export GNUPGHOME=$old_gpg_home ''; type = types.lines; - description = '' + description = lib.mdDoc '' Additional shell commands inserted in the bootloader installer script after generating menu entries. ''; @@ -354,7 +354,7 @@ in default = ""; example = "root (hd0)"; type = types.lines; - description = '' + description = lib.mdDoc '' Additional GRUB commands inserted in the configuration file at the start of each NixOS menu entry. ''; @@ -379,7 +379,7 @@ in chainloader /efi/fedora/grubx64.efi } ''; - description = '' + description = lib.mdDoc '' Any additional entries you want added to the GRUB boot menu. ''; }; @@ -387,7 +387,7 @@ in extraEntriesBeforeNixOS = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether extraEntries are included before the default option. ''; }; @@ -398,10 +398,10 @@ in example = literalExpression '' { "memtest.bin" = "''${pkgs.memtest86plus}/memtest.bin"; } ''; - description = '' - A set of files to be copied to /boot. + description = lib.mdDoc '' + A set of files to be copied to {file}`/boot`. Each attribute name denotes the destination file name in - /boot, while the corresponding + {file}`/boot`, while the corresponding attribute value specifies the source file. ''; }; @@ -409,7 +409,7 @@ in useOSProber = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If set to true, append entries for other OSs detected by os-prober. ''; }; @@ -503,7 +503,7 @@ in type = types.nullOr types.path; default = "${realGrub}/share/grub/unicode.pf2"; defaultText = literalExpression ''"''${pkgs.grub2}/share/grub/unicode.pf2"''; - description = '' + description = lib.mdDoc '' Path to a TrueType, OpenType, or pf2 font to be used by Grub. ''; }; @@ -512,8 +512,8 @@ in type = types.nullOr types.int; example = 16; default = null; - description = '' - Font size for the grub menu. Ignored unless font + description = lib.mdDoc '' + Font size for the grub menu. Ignored unless `font` is set to a ttf or otf font. ''; }; @@ -522,7 +522,7 @@ in default = "auto"; example = "1024x768"; type = types.str; - description = '' + description = lib.mdDoc '' The gfxmode to pass to GRUB when loading a graphical boot interface under EFI. ''; }; @@ -531,7 +531,7 @@ in default = "1024x768"; example = "auto"; type = types.str; - description = '' + description = lib.mdDoc '' The gfxmode to pass to GRUB when loading a graphical boot interface under BIOS. ''; }; @@ -540,7 +540,7 @@ in default = "keep"; example = "text"; type = types.str; - description = '' + description = lib.mdDoc '' The gfxpayload to pass to GRUB when loading a graphical boot interface under EFI. ''; }; @@ -549,7 +549,7 @@ in default = "text"; example = "keep"; type = types.str; - description = '' + description = lib.mdDoc '' The gfxpayload to pass to GRUB when loading a graphical boot interface under BIOS. ''; }; @@ -558,7 +558,7 @@ in default = 100; example = 120; type = types.int; - description = '' + description = lib.mdDoc '' Maximum of configurations in boot menu. GRUB has problems when there are too many entries. ''; @@ -567,7 +567,7 @@ in copyKernels = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether the GRUB menu builder should copy kernels and initial ramdisks to /boot. This is done automatically if /boot is on a different partition than /. @@ -578,7 +578,7 @@ in default = "0"; type = types.either types.int types.str; apply = toString; - description = '' + description = lib.mdDoc '' Index of the default menu item to be booted. Can also be set to "saved", which will make GRUB select the menu item that was used at the last boot. @@ -588,13 +588,13 @@ in fsIdentifier = mkOption { default = "uuid"; type = types.enum [ "uuid" "label" "provided" ]; - description = '' + description = lib.mdDoc '' Determines how GRUB will identify devices when generating the configuration file. A value of uuid / label signifies that grub will always resolve the uuid or label of the device before using it in the configuration. A value of provided means that GRUB will - use the device name as show in df or - mount. Note, zfs zpools / datasets are ignored + use the device name as show in {command}`df` or + {command}`mount`. Note, zfs zpools / datasets are ignored and will always be mounted using their labels. ''; }; @@ -602,7 +602,7 @@ in zfsSupport = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether GRUB should be built against libzfs. ZFS support is only available for GRUB v2. This option is ignored for GRUB v1. @@ -612,7 +612,7 @@ in efiSupport = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether GRUB should be built with EFI support. EFI support is only available for GRUB v2. This option is ignored for GRUB v1. @@ -624,9 +624,9 @@ in type = types.bool; description = '' Whether to invoke grub-install with - --removable. + --removable. - Unless you turn this on, GRUB will install itself somewhere in + Unless you turn this on, GRUB will install itself somewhere in boot.loader.efi.efiSysMountPoint (exactly where depends on other config variables). If you've set boot.loader.efi.canTouchEfiVariables *AND* you @@ -637,14 +637,14 @@ in NVRAM will not be modified, and your system will not find GRUB at boot time. However, GRUB will still return success so you may miss the warning that gets printed ("efibootmgr: EFI variables - are not supported on this system."). + are not supported on this system."). - If you turn this feature on, GRUB will install itself in a + If you turn this feature on, GRUB will install itself in a special location within efiSysMountPoint (namely EFI/boot/boot$arch.efi) which the firmwares - are hardcoded to try first, regardless of NVRAM EFI variables. + are hardcoded to try first, regardless of NVRAM EFI variables. - To summarize, turn this on if: + To summarize, turn this on if: You are installing NixOS and want it to boot in UEFI mode, but you are currently booted in legacy mode @@ -659,7 +659,7 @@ in enableCryptodisk = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable support for encrypted partitions. GRUB should automatically unlock the correct encrypted partition and look for filesystems. ''; @@ -668,7 +668,7 @@ in forceInstall = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to try and forcibly install GRUB even if problems are detected. It is not recommended to enable this unless you know what you are doing. @@ -678,7 +678,7 @@ in forcei686 = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to force the use of a ia32 boot loader on x64 systems. Required to install and run NixOS on 64bit x86 systems with 32bit (U)EFI. ''; @@ -689,7 +689,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable trusted boot. GRUB will measure all critical components during the boot process to offer TCG (TPM) support. ''; @@ -699,7 +699,7 @@ in default = ""; example = "YES_TPM_is_activated"; type = types.str; - description = '' + description = lib.mdDoc '' Assertion that the target system has an activated TPM. It is a safety check before allowing the activation of 'trustedBoot.enable'. TrustedBoot WILL FAIL TO BOOT YOUR SYSTEM if no TPM is available. @@ -709,7 +709,7 @@ in isHPLaptop = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Use a special version of TrustedGRUB that is needed by some HP laptops and works only for the HP laptops. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/ipxe.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/ipxe.nix index ef8595592f..adddcbee01 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/ipxe.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/ipxe.nix @@ -28,7 +28,7 @@ in { boot.loader.grub.ipxe = mkOption { type = types.attrsOf (types.either types.path types.str); description = - '' + lib.mdDoc '' Set of iPXE scripts available for booting from the GRUB boot menu. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/memtest.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/memtest.nix index 71e50dd057..150068e0e9 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/memtest.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/grub/memtest.nix @@ -18,12 +18,12 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Make Memtest86+ (or MemTest86 if EFI support is enabled), a memory testing program, available from the GRUB boot menu. MemTest86 is an unfree program, so - this requires allowUnfree to be set to - true. + this requires `allowUnfree` to be set to + `true`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script.nix index 374d9524ff..8287131d32 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/init-script/init-script.nix @@ -24,7 +24,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Some systems require a /sbin/init script which is started. Or having it makes starting NixOS easier. This applies to some kind of hosting services and user mode linux. diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/loader.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/loader.nix index 01475f79b9..0e33264271 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/loader.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/loader.nix @@ -12,7 +12,7 @@ with lib; boot.loader.timeout = mkOption { default = 5; type = types.nullOr types.int; - description = '' + description = lib.mdDoc '' Timeout (in seconds) until loader boots the default menu item. Use null if the loader menu should be displayed indefinitely. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 367feb5e88..426aa021c8 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -48,10 +48,10 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to create files with the system generations in - /boot. - /boot/old will hold files from old generations. + `/boot`. + `/boot/old` will hold files from old generations. ''; }; @@ -65,7 +65,7 @@ in enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable using uboot as bootmanager for the raspberry pi. ''; }; @@ -74,7 +74,7 @@ in default = 20; example = 10; type = types.int; - description = '' + description = lib.mdDoc '' Maximum number of configurations in the boot menu. ''; }; @@ -84,8 +84,8 @@ in firmwareConfig = mkOption { default = null; type = types.nullOr types.lines; - description = '' - Extra options that will be appended to /boot/config.txt file. + description = lib.mdDoc '' + Extra options that will be appended to `/boot/config.txt` file. For possible values, see: https://www.raspberrypi.com/documentation/computers/config_txt.html ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 1a1dcaea9c..baf0a9fe9c 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -69,7 +69,7 @@ in { type = types.bool; - description = "Whether to enable the systemd-boot (formerly gummiboot) EFI boot manager"; + description = lib.mdDoc "Whether to enable the systemd-boot (formerly gummiboot) EFI boot manager"; }; editor = mkOption { @@ -77,7 +77,7 @@ in { type = types.bool; - description = '' + description = lib.mdDoc '' Whether to allow editing the kernel command-line before boot. It is recommended to set this to false, as it allows gaining root access by passing init=/bin/sh as a kernel @@ -90,11 +90,11 @@ in { default = null; example = 120; type = types.nullOr types.int; - description = '' + description = lib.mdDoc '' Maximum number of latest generations in the boot menu. Useful to prevent boot partition running out of disk space. - null means no limit i.e. all generations + `null` means no limit i.e. all generations that were not garbage collected yet. ''; }; @@ -134,21 +134,21 @@ in { enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Make MemTest86 available from the systemd-boot menu. MemTest86 is a program for testing memory. MemTest86 is an unfree program, so - this requires allowUnfree to be set to - true. + this requires `allowUnfree` to be set to + `true`. ''; }; entryFilename = mkOption { default = "memtest86.conf"; type = types.str; - description = '' - systemd-boot orders the menu entries by the config file names, + description = lib.mdDoc '' + `systemd-boot` orders the menu entries by the config file names, so if you want something to appear after all the NixOS entries, - it should start with o or onwards. + it should start with {file}`o` or onwards. ''; }; }; @@ -157,9 +157,9 @@ in { enable = mkOption { default = false; type = types.bool; - description = '' - Make netboot.xyz available from the - systemd-boot menu. netboot.xyz + description = lib.mdDoc '' + Make `netboot.xyz` available from the + `systemd-boot` menu. `netboot.xyz` is a menu system that allows you to boot OS installers and utilities over the network. ''; @@ -168,10 +168,10 @@ in { entryFilename = mkOption { default = "o_netbootxyz.conf"; type = types.str; - description = '' - systemd-boot orders the menu entries by the config file names, + description = lib.mdDoc '' + `systemd-boot` orders the menu entries by the config file names, so if you want something to appear after all the NixOS entries, - it should start with o or onwards. + it should start with {file}`o` or onwards. ''; }; }; @@ -185,15 +185,15 @@ in { efi /efi/memtest86/memtest86.efi '''; } ''; - description = '' - Any additional entries you want added to the systemd-boot menu. - These entries will be copied to /boot/loader/entries. + description = lib.mdDoc '' + Any additional entries you want added to the `systemd-boot` menu. + These entries will be copied to {file}`/boot/loader/entries`. Each attribute name denotes the destination file name, and the corresponding attribute value is the contents of the entry. - systemd-boot orders the menu entries by the config file names, + `systemd-boot` orders the menu entries by the config file names, so if you want something to appear after all the NixOS entries, - it should start with o or onwards. + it should start with {file}`o` or onwards. ''; }; @@ -203,10 +203,10 @@ in { example = literalExpression '' { "efi/memtest86/memtest86.efi" = "''${pkgs.memtest86-efi}/BOOTX64.efi"; } ''; - description = '' - A set of files to be copied to /boot. + description = lib.mdDoc '' + A set of files to be copied to {file}`/boot`. Each attribute name denotes the destination file name in - /boot, while the corresponding + {file}`/boot`, while the corresponding attribute value specifies the source file. ''; }; @@ -216,13 +216,13 @@ in { type = types.bool; - description = '' - Invoke bootctl install with the --graceful option, + description = lib.mdDoc '' + Invoke `bootctl install` with the `--graceful` option, which ignores errors when EFI variables cannot be written or when the EFI System Partition cannot be found. Currently only applies to random seed operations. - Only enable this option if systemd-boot otherwise fails to install, as the - scope or implication of the --graceful option may change in the future. + Only enable this option if `systemd-boot` otherwise fails to install, as the + scope or implication of the `--graceful` option may change in the future. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix index 4103a7af57..78301a57bd 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/luksroot.nix @@ -433,7 +433,7 @@ let echo "Please move your mouse to create needed randomness." ''} echo "Waiting for your FIDO2 device..." - fido2luks open ${dev.device} ${dev.name} ${dev.fido2.credential} --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase + fido2luks open${optionalString dev.allowDiscards " --allow-discards"} ${dev.device} ${dev.name} ${dev.fido2.credential} --await-dev ${toString dev.fido2.gracePeriod} --salt string:$passphrase if [ $? -ne 0 ]; then echo "No FIDO2 key found, falling back to normal open procedure" open_normally @@ -496,10 +496,10 @@ in boot.initrd.luks.mitigateDMAAttacks = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Unless enabled, encryption keys can be easily recovered by an attacker with physical access to any machine with PCMCIA, ExpressCard, ThunderBolt or FireWire port. - More information is available at . + More information is available at . This option blacklists FireWire drivers, but doesn't remove them. You can manually load the drivers if you need to use a FireWire device, but don't forget to unload them! @@ -513,7 +513,7 @@ in "serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512" "af_alg" "algif_skcipher" ]; - description = '' + description = lib.mdDoc '' A list of cryptographic kernel modules needed to decrypt the root device(s). The default includes all common modules. ''; @@ -548,11 +548,11 @@ in boot.initrd.luks.devices = mkOption { default = { }; example = { luksroot.device = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; }; - description = '' + description = lib.mdDoc '' The encrypted disk that should be opened before the root filesystem is mounted. Both LVM-over-LUKS and LUKS-over-LVM setups are supported. The unencrypted devices can be accessed as - /dev/mapper/name. + {file}`/dev/mapper/«name»`. ''; type = with types; attrsOf (submodule ( @@ -569,14 +569,14 @@ in device = mkOption { example = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; type = types.str; - description = "Path of the underlying encrypted block device."; + description = lib.mdDoc "Path of the underlying encrypted block device."; }; header = mkOption { default = null; example = "/root/header.img"; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The name of the file or block device that should be used as header for the encrypted device. ''; @@ -586,7 +586,7 @@ in default = null; example = "/dev/sdb1"; type = types.nullOr types.str; - description = '' + description = lib.mdDoc '' The name of the file (can be a raw device or a partition) that should be used as the decryption key for the encrypted device. If not specified, you will be prompted for a passphrase instead. @@ -597,12 +597,12 @@ in default = null; example = 4096; type = types.nullOr types.int; - description = '' + description = lib.mdDoc '' The size of the key file. Use this if only the beginning of the key file should be used as a key (often the case if a raw device or partition is used as key file). If not specified, the whole - keyFile will be used decryption, instead of just - the first keyFileSize bytes. + `keyFile` will be used decryption, instead of just + the first `keyFileSize` bytes. ''; }; @@ -610,12 +610,12 @@ in default = null; example = 4096; type = types.nullOr types.int; - description = '' + description = lib.mdDoc '' The offset of the key file. Use this in combination with - keyFileSize to use part of a file as key file + `keyFileSize` to use part of a file as key file (often the case if a raw device or partition is used as a key file). If not specified, the key begins at the first byte of - keyFile. + `keyFile`. ''; }; @@ -623,13 +623,13 @@ in preLVM = mkOption { default = true; type = types.bool; - description = "Whether the luksOpen will be attempted before LVM scan or after it."; + description = lib.mdDoc "Whether the luksOpen will be attempted before LVM scan or after it."; }; allowDiscards = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to allow TRIM requests to the underlying device. This option has security implications; please read the LUKS documentation before activating it. @@ -641,10 +641,10 @@ in bypassWorkqueues = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to bypass dm-crypt's internal read and write workqueues. Enabling this should improve performance on SSDs; see - here + [here](https://wiki.archlinux.org/index.php/Dm-crypt/Specialties#Disable_workqueue_for_increased_solid_state_drive_(SSD)_performance) for more information. Needs Linux 5.9 or later. ''; }; @@ -652,7 +652,7 @@ in fallbackToPassword = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to fallback to interactive passphrase prompt if the keyfile cannot be found. This will prevent unattended boot should the keyfile go missing. @@ -661,7 +661,7 @@ in gpgCard = mkOption { default = null; - description = '' + description = lib.mdDoc '' The option to use this LUKS device with a GPG encrypted luks password by the GPG Smartcard. If null (the default), GPG-Smartcard will be disabled for this device. ''; @@ -671,17 +671,17 @@ in gracePeriod = mkOption { default = 10; type = types.int; - description = "Time in seconds to wait for the GPG Smartcard."; + description = lib.mdDoc "Time in seconds to wait for the GPG Smartcard."; }; encryptedPass = mkOption { type = types.path; - description = "Path to the GPG encrypted passphrase."; + description = lib.mdDoc "Path to the GPG encrypted passphrase."; }; publicKey = mkOption { type = types.path; - description = "Path to the Public Key."; + description = lib.mdDoc "Path to the Public Key."; }; }; }); @@ -692,29 +692,29 @@ in default = null; example = "f1d00200d8dc783f7fb1e10ace8da27f8312d72692abfca2f7e4960a73f48e82e1f7571f6ebfcee9fb434f9886ccc8fcc52a6614d8d2"; type = types.nullOr types.str; - description = "The FIDO2 credential ID."; + description = lib.mdDoc "The FIDO2 credential ID."; }; gracePeriod = mkOption { default = 10; type = types.int; - description = "Time in seconds to wait for the FIDO2 key."; + description = lib.mdDoc "Time in seconds to wait for the FIDO2 key."; }; passwordLess = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Defines whatever to use an empty string as a default salt. - Enable only when your device is PIN protected, such as Trezor. + Enable only when your device is PIN protected, such as [Trezor](https://trezor.io/). ''; }; }; yubikey = mkOption { default = null; - description = '' + description = lib.mdDoc '' The options to use for this LUKS device in YubiKey-PBA. If null (the default), YubiKey-PBA will be disabled for this device. ''; @@ -724,37 +724,37 @@ in twoFactor = mkOption { default = true; type = types.bool; - description = "Whether to use a passphrase and a YubiKey (true), or only a YubiKey (false)."; + description = lib.mdDoc "Whether to use a passphrase and a YubiKey (true), or only a YubiKey (false)."; }; slot = mkOption { default = 2; type = types.int; - description = "Which slot on the YubiKey to challenge."; + description = lib.mdDoc "Which slot on the YubiKey to challenge."; }; saltLength = mkOption { default = 16; type = types.int; - description = "Length of the new salt in byte (64 is the effective maximum)."; + description = lib.mdDoc "Length of the new salt in byte (64 is the effective maximum)."; }; keyLength = mkOption { default = 64; type = types.int; - description = "Length of the LUKS slot key derived with PBKDF2 in byte."; + description = lib.mdDoc "Length of the LUKS slot key derived with PBKDF2 in byte."; }; iterationStep = mkOption { default = 0; type = types.int; - description = "How much the iteration count for PBKDF2 is increased at each successful authentication."; + description = lib.mdDoc "How much the iteration count for PBKDF2 is increased at each successful authentication."; }; gracePeriod = mkOption { default = 10; type = types.int; - description = "Time in seconds to wait for the YubiKey."; + description = lib.mdDoc "Time in seconds to wait for the YubiKey."; }; /* TODO: Add to the documentation of the current module: @@ -765,7 +765,7 @@ in device = mkOption { default = "/dev/sda1"; type = types.path; - description = '' + description = lib.mdDoc '' An unencrypted device that will temporarily be mounted in stage-1. Must contain the current salt to create the challenge for this LUKS device. ''; @@ -774,13 +774,13 @@ in fsType = mkOption { default = "vfat"; type = types.str; - description = "The filesystem of the unencrypted device."; + description = lib.mdDoc "The filesystem of the unencrypted device."; }; path = mkOption { default = "/crypt-storage/default"; type = types.str; - description = '' + description = lib.mdDoc '' Absolute path of the salt on the unencrypted device with that device's root directory as "/". ''; @@ -797,7 +797,7 @@ in mkdir -p /tmp/persistent mount -t zfs rpool/safe/persistent /tmp/persistent ''; - description = '' + description = lib.mdDoc '' Commands that should be run right before we try to mount our LUKS device. This can be useful, if the keys needed to open the drive is on another partion. ''; @@ -809,7 +809,7 @@ in example = '' umount /tmp/persistent ''; - description = '' + description = lib.mdDoc '' Commands that should be run right after we have mounted our LUKS device. ''; }; @@ -832,7 +832,7 @@ in boot.initrd.luks.gpgSupport = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enables support for authenticating with a GPG encrypted password. ''; }; @@ -840,7 +840,7 @@ in boot.initrd.luks.yubikeySupport = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enables support for authenticating with a YubiKey on LUKS devices. See the NixOS wiki for information on how to properly setup a LUKS device and a YubiKey to work with this feature. @@ -850,7 +850,7 @@ in boot.initrd.luks.fido2Support = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enables support for authenticating with FIDO2 devices. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix b/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix index 21be18ef86..4438afe4b3 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/modprobe.nix @@ -12,7 +12,7 @@ with lib; type = types.listOf types.str; default = []; example = [ "cirrusfb" "i2c_piix4" ]; - description = '' + description = lib.mdDoc '' List of names of kernel modules that should not be loaded automatically by the hardware probing code. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix index 0336930b3a..dd4c63ab72 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix @@ -452,13 +452,16 @@ let "AllMulticast" "Unmanaged" "RequiredForOnline" + "RequiredFamilyForOnline" "ActivationPolicy" + "Promiscuous" ]) (assertMacAddress "MACAddress") (assertByteFormat "MTUBytes") (assertValueOneOf "ARP" boolValues) (assertValueOneOf "Multicast" boolValues) (assertValueOneOf "AllMulticast" boolValues) + (assertValueOneOf "Promiscuous" boolValues) (assertValueOneOf "Unmanaged" boolValues) (assertValueOneOf "RequiredForOnline" (boolValues ++ [ "missing" @@ -471,6 +474,12 @@ let "enslaved" "routable" ])) + (assertValueOneOf "RequiredFamilyForOnline" [ + "ipv4" + "ipv6" + "both" + "any" + ]) (assertValueOneOf "ActivationPolicy" ([ "up" "always-up" @@ -876,8 +885,8 @@ let enable = mkOption { default = true; type = types.bool; - description = '' - Whether to manage network configuration using systemd-network. + description = lib.mdDoc '' + Whether to manage network configuration using {command}`systemd-network`. ''; }; @@ -885,12 +894,12 @@ let default = {}; example = { Name = "eth0"; }; type = types.attrsOf unitOption; - description = '' + description = lib.mdDoc '' Each attribute in this set specifies an option in the - [Match] section of the unit. See - systemd.link5 - systemd.netdev5 - systemd.network5 + `[Match]` section of the unit. See + {manpage}`systemd.link(5)` + {manpage}`systemd.netdev(5)` + {manpage}`systemd.network(5)` for details. ''; }; @@ -898,7 +907,7 @@ let extraConfig = mkOption { default = ""; type = types.lines; - description = "Extra configuration append to unit"; + description = lib.mdDoc "Extra configuration append to unit"; }; }; @@ -945,8 +954,8 @@ let enable = mkOption { default = true; type = types.bool; - description = '' - Whether to enable this .link unit. It's handled by udev no matter if systemd-networkd is enabled or not + description = lib.mdDoc '' + Whether to enable this .link unit. It's handled by udev no matter if {command}`systemd-networkd` is enabled or not ''; }; @@ -1161,8 +1170,7 @@ let systemd.netdev 5 for details. A detailed explanation about how VRFs work can be found in the - kernel - docs. + kernel docs. ''; }; @@ -1379,7 +1387,7 @@ let dhcpServerStaticLeases = mkOption { default = []; - example = [ { MACAddress = "65:43:4a:5b:d8:5f"; Address = "192.168.1.42"; } ]; + example = [ { dhcpServerStaticLeaseConfig = { MACAddress = "65:43:4a:5b:d8:5f"; Address = "192.168.1.42"; }; } ]; type = with types; listOf (submodule dhcpServerStaticLeaseOptions); description = '' A list of DHCPServerStaticLease sections to be added to the unit. See @@ -1390,7 +1398,7 @@ let ipv6Prefixes = mkOption { default = []; - example = [ { AddressAutoconfiguration = true; OnLink = true; } ]; + example = [ { ipv6PrefixConfig = { AddressAutoconfiguration = true; OnLink = true; }; } ]; type = with types; listOf (submodule ipv6PrefixOptions); description = '' A list of ipv6Prefix sections to be added to the unit. See @@ -1402,7 +1410,7 @@ let name = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' The name of the network interface to match against. ''; }; @@ -1410,7 +1418,7 @@ let DHCP = mkOption { type = types.nullOr types.str; default = null; - description = '' + description = lib.mdDoc '' Whether to enable DHCP on the interfaces matched. ''; }; @@ -1418,7 +1426,7 @@ let domains = mkOption { type = types.nullOr (types.listOf types.str); default = null; - description = '' + description = lib.mdDoc '' A list of domains to pass to the network config. ''; }; @@ -1605,7 +1613,7 @@ let default = true; example = false; type = types.bool; - description = '' + description = lib.mdDoc '' If true and routeTables are set, then the specified route tables will also be installed into /etc/iproute2/rt_tables. ''; @@ -1825,7 +1833,7 @@ in systemd.network.enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable networkd or not. ''; }; @@ -1833,25 +1841,25 @@ in systemd.network.links = mkOption { default = {}; type = with types; attrsOf (submodule [ { options = linkOptions; } ]); - description = "Definition of systemd network links."; + description = lib.mdDoc "Definition of systemd network links."; }; systemd.network.netdevs = mkOption { default = {}; type = with types; attrsOf (submodule [ { options = netdevOptions; } ]); - description = "Definition of systemd network devices."; + description = lib.mdDoc "Definition of systemd network devices."; }; systemd.network.networks = mkOption { default = {}; type = with types; attrsOf (submodule [ { options = networkOptions; } networkConfig ]); - description = "Definition of systemd networks."; + description = lib.mdDoc "Definition of systemd networks."; }; systemd.network.config = mkOption { default = {}; type = with types; submodule [ { options = networkdOptions; } networkdConfig ]; - description = "Definition of global systemd network config."; + description = lib.mdDoc "Definition of global systemd network config."; }; systemd.network.units = mkOption { @@ -1869,7 +1877,7 @@ in systemd.network.wait-online = { anyInterface = mkOption { - description = '' + description = lib.mdDoc '' Whether to consider the network online when any interface is online, as opposed to all of them. This is useful on portable machines with a wired and a wireless interface, for example. ''; @@ -1878,7 +1886,7 @@ in }; ignoredInterfaces = mkOption { - description = '' + description = lib.mdDoc '' Network interfaces to be ignored when deciding if the system is online. ''; type = with types; listOf str; @@ -1887,7 +1895,7 @@ in }; timeout = mkOption { - description = '' + description = lib.mdDoc '' Time to wait for the network to come online, in seconds. Set to 0 to disable. ''; type = types.ints.unsigned; @@ -1896,13 +1904,11 @@ in }; extraArgs = mkOption { - description = '' + description = lib.mdDoc '' Extra command-line arguments to pass to systemd-networkd-wait-online. - These also affect per-interface systemd-network-wait-online@ services. + These also affect per-interface `systemd-network-wait-online@` services. - See - systemd-networkd-wait-online.service8 - for all available options. + See [{manpage}`systemd-networkd-wait-online.service(8)`](https://www.freedesktop.org/software/systemd/man/systemd-networkd-wait-online.service.html) for all available options. ''; type = with types; listOf str; default = []; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix index 59037d4e6b..02d8fcf479 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix @@ -68,7 +68,7 @@ in default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"; defaultText = literalExpression ''"''${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"''; type = types.path; - description = '' + description = lib.mdDoc '' Font file made available for displaying text on the splash screen. ''; }; @@ -81,7 +81,7 @@ in [ ]. ''; type = types.listOf types.package; - description = '' + description = lib.mdDoc '' Extra theme packages for plymouth. ''; }; @@ -89,7 +89,7 @@ in theme = mkOption { default = "bgrt"; type = types.str; - description = '' + description = lib.mdDoc '' Splash screen theme. ''; }; @@ -102,7 +102,7 @@ in url = "https://nixos.org/logo/nixos-hires.png"; sha256 = "1ivzgd7iz0i06y36p8m5w48fd8pjqwxhdaavc0pxs7w1g7mcy5si"; }''; - description = '' + description = lib.mdDoc '' Logo which is displayed on the splash screen. ''; }; @@ -110,8 +110,8 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' - Literal string to append to configFile + description = lib.mdDoc '' + Literal string to append to `configFile` and the config file generated by the plymouth module. ''; }; @@ -184,9 +184,14 @@ in mkdir $out cp -r ${themesEnv}/share/plymouth/themes/${cfg.theme} $out # Copy more themes if the theme depends on others - for theme in $(grep -hRo '/etc/plymouth/themes/.*$' ${themesEnv} | xargs -n1 basename); do - if [[ -d "${themesEnv}/theme" ]]; then - cp -r "${themesEnv}/theme" $out + for theme in $(grep -hRo '/etc/plymouth/themes/.*$' $out | xargs -n1 basename); do + if [[ -d "${themesEnv}/share/plymouth/themes/$theme" ]]; then + if [[ ! -d "$out/$theme" ]]; then + echo "Adding dependent theme: $theme" + cp -r "${themesEnv}/share/plymouth/themes/$theme" $out + fi + else + echo "Missing theme dependency: $theme" fi done ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix b/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix index 3a38201ff6..0ab2a87597 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix @@ -15,7 +15,7 @@ in services.resolved.enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable the systemd DNS resolver daemon. ''; }; @@ -24,7 +24,7 @@ in default = [ ]; example = [ "8.8.8.8" "2001:4860:4860::8844" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' A list of IPv4 and IPv6 addresses to use as the fallback DNS servers. If this option is empty, a compiled-in list of DNS servers is used instead. ''; @@ -35,7 +35,7 @@ in defaultText = literalExpression "config.networking.search"; example = [ "example.com" ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' A list of domains. These domains are used as search suffixes when resolving single-label host names (domain names which contain no dot), in order to qualify them into fully-qualified @@ -43,7 +43,7 @@ in For compatibility reasons, if this setting is not specified, the search domains listed in - /etc/resolv.conf are used instead, if + {file}`/etc/resolv.conf` are used instead, if that file exists and any domains are configured in it. ''; }; @@ -52,32 +52,14 @@ in default = "true"; example = "false"; type = types.enum [ "true" "resolve" "false" ]; - description = '' + description = lib.mdDoc '' Controls Link-Local Multicast Name Resolution support (RFC 4795) on the local host. If set to - - - - "true" - - Enables full LLMNR responder and resolver support. - - - - "false" - - Disables both. - - - - "resolve" - - Only resolution support is enabled, but responding is disabled. - - - + - `"true"`: Enables full LLMNR responder and resolver support. + - `"false"`: Disables both. + - `"resolve"`: Only resolution support is enabled, but responding is disabled. ''; }; @@ -85,21 +67,14 @@ in default = "allow-downgrade"; example = "true"; type = types.enum [ "true" "allow-downgrade" "false" ]; - description = '' + description = lib.mdDoc '' If set to - - - "true" - + - `"true"`: all DNS lookups are DNSSEC-validated locally (excluding LLMNR and Multicast DNS). Note that this mode requires a DNS server that supports DNSSEC. If the DNS server does not properly support DNSSEC all validations will fail. - - - - "allow-downgrade" - + - `"allow-downgrade"`: DNSSEC validation is attempted, but if the server does not support DNSSEC properly, DNSSEC mode is automatically disabled. Note that this mode makes DNSSEC validation @@ -107,22 +82,14 @@ in be able to trigger a downgrade to non-DNSSEC mode by synthesizing a DNS response that suggests DNSSEC was not supported. - - - - "false" - - DNS lookups are not DNSSEC validated. - - - + - `"false"`: DNS lookups are not DNSSEC validated. ''; }; services.resolved.extraConfig = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Extra config to append to resolved.conf. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix index e35ccff290..37adcc531d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix @@ -219,7 +219,7 @@ let # Strip binaries further than normal. chmod -R u+w $out - stripDirs "$STRIP" "lib bin" "-s" + stripDirs "$STRIP" "$RANLIB" "lib bin" "-s" # Run patchelf to make the programs refer to the copied libraries. find $out/bin $out/lib -type f | while read i; do @@ -480,7 +480,7 @@ in if you want to resume from file. If left empty, the swap partitions are used. Specify here the device where the file resides. You should also use boot.kernelParams to specify - resume_offset. + «resume_offset». ''; }; @@ -488,7 +488,7 @@ in type = types.bool; default = !config.boot.isContainer; defaultText = literalExpression "!config.boot.isContainer"; - description = '' + description = lib.mdDoc '' Whether to enable the NixOS initial RAM disk (initrd). This may be needed to perform some initialisation tasks (like mounting network/encrypted file systems) before continuing the boot process. @@ -502,11 +502,11 @@ in options = { source = mkOption { type = types.package; - description = "The object to make available inside the initrd."; + description = lib.mdDoc "The object to make available inside the initrd."; }; }; }); - description = '' + description = lib.mdDoc '' Extra files to link and copy in to the initrd. ''; }; @@ -514,7 +514,7 @@ in boot.initrd.prepend = mkOption { default = [ ]; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Other initrd files to prepend to the final initrd we are building. ''; }; @@ -522,15 +522,15 @@ in boot.initrd.checkJournalingFS = mkOption { default = true; type = types.bool; - description = '' - Whether to run fsck on journaling filesystems such as ext3. + description = lib.mdDoc '' + Whether to run {command}`fsck` on journaling filesystems such as ext3. ''; }; boot.initrd.preLVMCommands = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands to be executed immediately before LVM discovery. ''; }; @@ -538,7 +538,7 @@ in boot.initrd.preDeviceCommands = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands to be executed before udev is started to create device nodes. ''; @@ -547,17 +547,17 @@ in boot.initrd.postDeviceCommands = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands to be executed immediately after stage 1 of the boot has loaded kernel modules and created device nodes in - /dev. + {file}`/dev`. ''; }; boot.initrd.postMountCommands = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands to be executed immediately after the stage 1 filesystems have been mounted. ''; @@ -566,7 +566,7 @@ in boot.initrd.preFailCommands = mkOption { default = ""; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands to be executed before the failure prompt is shown. ''; }; @@ -630,14 +630,14 @@ in boot.initrd.compressorArgs = mkOption { default = null; type = types.nullOr (types.listOf types.str); - description = "Arguments to pass to the compressor for the initrd image, or null to use the compressor's defaults."; + description = lib.mdDoc "Arguments to pass to the compressor for the initrd image, or null to use the compressor's defaults."; }; boot.initrd.secrets = mkOption { default = {}; type = types.attrsOf (types.nullOr types.path); description = - '' + lib.mdDoc '' Secrets to append to the initrd. The attribute name is the path the secret should have inside the initrd, the value is the path it should be copied from (or null for the same @@ -655,7 +655,7 @@ in default = [ ]; example = [ "btrfs" ]; type = types.listOf types.str; - description = "Names of supported filesystem types in the initial ramdisk."; + description = lib.mdDoc "Names of supported filesystem types in the initial ramdisk."; }; boot.initrd.verbose = mkOption { @@ -692,12 +692,12 @@ in options.neededForBoot = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' If set, this file system will be mounted in the initial ramdisk. Note that the file system will always be mounted in the initial ramdisk if its mount point is one of the following: ${concatStringsSep ", " ( - forEach utils.pathsNeededForBoot (i: "${i}") + forEach utils.pathsNeededForBoot (i: "{file}`${i}`") )}. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix index f6461daf31..6b4193ea29 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-2.nix @@ -37,7 +37,7 @@ in default = ""; example = "rm -f /var/log/messages"; type = types.lines; - description = '' + description = lib.mdDoc '' Shell commands to be executed just before systemd is started. ''; }; @@ -45,7 +45,7 @@ in systemdExecutable = mkOption { default = "/run/current-system/systemd/lib/systemd/systemd"; type = types.str; - description = '' + description = lib.mdDoc '' The program to execute to start systemd. ''; }; @@ -53,7 +53,7 @@ in extraSystemdUnitPaths = mkOption { default = []; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' Additional paths that get appended to the SYSTEMD_UNIT_PATH environment variable that can contain mutable unit files. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix index 645fbc2b71..35280ee073 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix @@ -177,11 +177,11 @@ in default = pkgs.systemd; defaultText = literalExpression "pkgs.systemd"; type = types.package; - description = "The systemd package."; + description = lib.mdDoc "The systemd package."; }; systemd.units = mkOption { - description = "Definition of systemd units."; + description = lib.mdDoc "Definition of systemd units."; default = {}; type = systemdUtils.types.units; }; @@ -190,43 +190,43 @@ in default = []; type = types.listOf types.package; example = literalExpression "[ pkgs.systemd-cryptsetup-generator ]"; - description = "Packages providing systemd units and hooks."; + description = lib.mdDoc "Packages providing systemd units and hooks."; }; systemd.targets = mkOption { default = {}; type = systemdUtils.types.targets; - description = "Definition of systemd target units."; + description = lib.mdDoc "Definition of systemd target units."; }; systemd.services = mkOption { default = {}; type = systemdUtils.types.services; - description = "Definition of systemd service units."; + description = lib.mdDoc "Definition of systemd service units."; }; systemd.sockets = mkOption { default = {}; type = systemdUtils.types.sockets; - description = "Definition of systemd socket units."; + description = lib.mdDoc "Definition of systemd socket units."; }; systemd.timers = mkOption { default = {}; type = systemdUtils.types.timers; - description = "Definition of systemd timer units."; + description = lib.mdDoc "Definition of systemd timer units."; }; systemd.paths = mkOption { default = {}; type = systemdUtils.types.paths; - description = "Definition of systemd path units."; + description = lib.mdDoc "Definition of systemd path units."; }; systemd.mounts = mkOption { default = []; type = systemdUtils.types.mounts; - description = '' + description = lib.mdDoc '' Definition of systemd mount units. This is a list instead of an attrSet, because systemd mandates the names to be derived from the 'where' attribute. @@ -236,7 +236,7 @@ in systemd.automounts = mkOption { default = []; type = systemdUtils.types.automounts; - description = '' + description = lib.mdDoc '' Definition of systemd automount units. This is a list instead of an attrSet, because systemd mandates the names to be derived from the 'where' attribute. @@ -246,41 +246,41 @@ in systemd.slices = mkOption { default = {}; type = systemdUtils.types.slices; - description = "Definition of slice configurations."; + description = lib.mdDoc "Definition of slice configurations."; }; systemd.generators = mkOption { type = types.attrsOf types.path; default = {}; example = { systemd-gpt-auto-generator = "/dev/null"; }; - description = '' + description = lib.mdDoc '' Definition of systemd generators. - For each NAME = VALUE pair of the attrSet, a link is generated from - /etc/systemd/system-generators/NAME to VALUE. + For each `NAME = VALUE` pair of the attrSet, a link is generated from + `/etc/systemd/system-generators/NAME` to `VALUE`. ''; }; systemd.shutdown = mkOption { type = types.attrsOf types.path; default = {}; - description = '' + description = lib.mdDoc '' Definition of systemd shutdown executables. - For each NAME = VALUE pair of the attrSet, a link is generated from - /etc/systemd/system-shutdown/NAME to VALUE. + For each `NAME = VALUE` pair of the attrSet, a link is generated from + `/etc/systemd/system-shutdown/NAME` to `VALUE`. ''; }; systemd.defaultUnit = mkOption { default = "multi-user.target"; type = types.str; - description = "Default unit started when the system boots."; + description = lib.mdDoc "Default unit started when the system boots."; }; systemd.ctrlAltDelUnit = mkOption { default = "reboot.target"; type = types.str; example = "poweroff.target"; - description = '' + description = lib.mdDoc '' Target that should be started when Ctrl-Alt-Delete is pressed. ''; }; @@ -289,8 +289,8 @@ in type = with types; attrsOf (nullOr (oneOf [ str path package ])); default = {}; example = { TZ = "CET"; }; - description = '' - Environment variables passed to all systemd units. + description = lib.mdDoc '' + Environment variables passed to *all* systemd units. ''; }; @@ -298,16 +298,16 @@ in type = with types; attrsOf (nullOr (oneOf [ str path package ])); default = {}; example = { SYSTEMD_LOG_LEVEL = "debug"; }; - description = '' + description = lib.mdDoc '' Environment variables of PID 1. These variables are - not passed to started units. + *not* passed to started units. ''; }; systemd.enableCgroupAccounting = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable cgroup accounting. ''; }; @@ -315,7 +315,7 @@ in systemd.enableUnifiedCgroupHierarchy = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable the unified cgroup hierarchy (cgroupsv2). ''; }; @@ -324,7 +324,7 @@ in default = ""; type = types.lines; example = "DefaultLimitCORE=infinity"; - description = '' + description = lib.mdDoc '' Extra config options for systemd. See man systemd-system.conf for available options. ''; @@ -334,7 +334,7 @@ in default = ""; type = types.lines; example = "HibernateDelaySec=1h"; - description = '' + description = lib.mdDoc '' Extra config options for systemd sleep state logic. See sleep.conf.d(5) man page for available options. ''; @@ -344,7 +344,7 @@ in default = [ ]; type = types.listOf types.str; example = [ "debug-shell.service" "systemd-quotacheck.service" ]; - description = '' + description = lib.mdDoc '' Additional units shipped with systemd that shall be enabled. ''; }; @@ -353,10 +353,10 @@ in default = [ ]; type = types.listOf types.str; example = [ "systemd-backlight@.service" ]; - description = '' + description = lib.mdDoc '' A list of units to skip when generating system systemd configuration directory. This has - priority over upstream units, , and - . The main purpose of this is to + priority over upstream units, {option}`systemd.units`, and + {option}`systemd.additionalUpstreamSystemUnits`. The main purpose of this is to prevent a upstream systemd unit from being added to the initrd with any modifications made to it by other NixOS modules. ''; @@ -366,7 +366,7 @@ in type = types.nullOr types.path; default = null; example = "/dev/watchdog"; - description = '' + description = lib.mdDoc '' The path to a hardware watchdog device which will be managed by systemd. If not specified, systemd will default to /dev/watchdog. ''; @@ -376,7 +376,7 @@ in type = types.nullOr types.str; default = null; example = "30s"; - description = '' + description = lib.mdDoc '' The amount of time which can elapse before a watchdog hardware device will automatically reboot the system. Valid time units include "ms", "s", "min", "h", "d", and "w". @@ -387,7 +387,7 @@ in type = types.nullOr types.str; default = null; example = "10m"; - description = '' + description = lib.mdDoc '' The amount of time which can elapse after a reboot has been triggered before a watchdog hardware device will automatically reboot the system. Valid time units include "ms", "s", "min", "h", "d", and "w". @@ -398,7 +398,7 @@ in type = types.nullOr types.str; default = null; example = "10m"; - description = '' + description = lib.mdDoc '' The amount of time which can elapse when kexec is being executed before a watchdog hardware device will automatically reboot the system. This option should only be enabled if reloadTime is also enabled. Valid @@ -592,6 +592,12 @@ in systemd.services.systemd-importd.environment = proxy_env; systemd.services.systemd-pstore.wantedBy = [ "sysinit.target" ]; # see #81138 + # NixOS has kernel modules in a different location, so override that here. + systemd.services.kmod-static-nodes.unitConfig.ConditionFileNotEmpty = [ + "" # required to unset the previous value! + "/run/booted-system/kernel-modules/lib/modules/%v/modules.devname" + ]; + # Don't bother with certain units in containers. systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; systemd.services.systemd-random-seed.unitConfig.ConditionVirtualization = "!container"; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix index b6ee2cff1f..c2ca973d38 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/coredump.nix @@ -10,9 +10,9 @@ in { systemd.coredump.enable = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Whether core dumps should be processed by - systemd-coredump. If disabled, core dumps + {command}`systemd-coredump`. If disabled, core dumps appear in the current directory of the crashing process. ''; }; @@ -21,37 +21,44 @@ in { default = ""; type = types.lines; example = "Storage=journal"; - description = '' + description = lib.mdDoc '' Extra config options for systemd-coredump. See coredump.conf(5) man page for available options. ''; }; }; - config = { - systemd.additionalUpstreamSystemUnits = [ - "systemd-coredump.socket" - "systemd-coredump@.service" - ]; + config = mkMerge [ - environment.etc = { - "systemd/coredump.conf".text = - '' - [Coredump] - ${cfg.extraConfig} - ''; + (mkIf cfg.enable { + systemd.additionalUpstreamSystemUnits = [ + "systemd-coredump.socket" + "systemd-coredump@.service" + ]; - # install provided sysctl snippets - "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; - "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; - }; + environment.etc = { + "systemd/coredump.conf".text = + '' + [Coredump] + ${cfg.extraConfig} + ''; - users.users.systemd-coredump = { - uid = config.ids.uids.systemd-coredump; - group = "systemd-coredump"; - }; - users.groups.systemd-coredump = {}; + # install provided sysctl snippets + "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; + "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; + }; + + users.users.systemd-coredump = { + uid = config.ids.uids.systemd-coredump; + group = "systemd-coredump"; + }; + users.groups.systemd-coredump = {}; + }) + + (mkIf (!cfg.enable) { + boot.kernel.sysctl."kernel.core_pattern" = mkDefault "core"; + }) + + ]; - boot.kernel.sysctl."kernel.core_pattern" = mkIf (!cfg.enable) "core"; - }; } diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix index cdec7f5329..888653469e 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix @@ -103,7 +103,8 @@ let fstab = pkgs.writeText "initrd-fstab" (lib.concatMapStringsSep "\n" ({ fsType, mountPoint, device, options, autoFormat, autoResize, ... }@fs: let opts = options ++ optional autoFormat "x-systemd.makefs" ++ optional autoResize "x-systemd.growfs"; - in "${device} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems); + finalDevice = if (lib.elem "bind" options) then "/sysroot${device}" else device; + in "${finalDevice} /sysroot${mountPoint} ${fsType} ${lib.concatStringsSep "," opts}") fileSystems); needMakefs = lib.any (fs: fs.autoFormat) fileSystems; needGrowfs = lib.any (fs: fs.autoResize) fileSystems; @@ -129,6 +130,7 @@ let initialRamdisk = pkgs.makeInitrdNG { name = "initrd-${kernel-name}"; inherit (config.boot.initrd) compressor compressorArgs prepend; + inherit (cfg) strip; contents = map (path: { object = path; symlink = ""; }) (subtractLists cfg.suppressedStorePaths cfg.storePaths) ++ mapAttrsToList (_: v: { object = v.source; symlink = v.target; }) (filterAttrs (_: v: v.enable) cfg.contents); @@ -150,7 +152,7 @@ in { }; contents = mkOption { - description = "Set of files that have to be linked into the initrd"; + description = lib.mdDoc "Set of files that have to be linked into the initrd"; example = literalExpression '' { "/etc/hostname".text = "mymachine"; @@ -162,15 +164,28 @@ in { }; storePaths = mkOption { - description = '' + description = lib.mdDoc '' Store paths to copy into the initrd as well. ''; type = with types; listOf (oneOf [ singleLineStr package ]); default = []; }; + strip = mkOption { + description = lib.mdDoc '' + Whether to completely strip executables and libraries copied to the initramfs. + + Setting this to false may save on the order of 30MiB on the + machine building the system (by avoiding a binutils + reference), at the cost of ~1MiB of initramfs size. This puts + this option firmly in the territory of micro-optimisation. + ''; + type = types.bool; + default = true; + }; + extraBin = mkOption { - description = '' + description = lib.mdDoc '' Tools to add to /bin ''; example = literalExpression '' @@ -183,7 +198,7 @@ in { }; suppressedStorePaths = mkOption { - description = '' + description = lib.mdDoc '' Store paths specified in the storePaths option that should not be copied. ''; @@ -192,9 +207,9 @@ in { }; emergencyAccess = mkOption { - type = with types; oneOf [ bool singleLineStr ]; + type = with types; oneOf [ bool (nullOr (passwdEntry str)) ]; visible = false; - description = '' + description = lib.mdDoc '' Set to true for unauthenticated emergency access, and false for no emergency access. @@ -208,7 +223,7 @@ in { type = types.listOf types.package; default = []; visible = false; - description = '' + description = lib.mdDoc '' Packages to include in /bin for the stage 1 emergency shell. ''; }; @@ -218,7 +233,7 @@ in { type = types.listOf types.str; visible = false; example = [ "debug-shell.service" "systemd-quotacheck.service" ]; - description = '' + description = lib.mdDoc '' Additional units shipped with systemd that shall be enabled. ''; }; @@ -228,17 +243,17 @@ in { type = types.listOf types.str; example = [ "systemd-backlight@.service" ]; visible = false; - description = '' + description = lib.mdDoc '' A list of units to skip when generating system systemd configuration directory. This has - priority over upstream units, , and - . The main purpose of this is to + priority over upstream units, {option}`boot.initrd.systemd.units`, and + {option}`boot.initrd.systemd.additionalUpstreamUnits`. The main purpose of this is to prevent a upstream systemd unit from being added to the initrd with any modifications made to it by other NixOS modules. ''; }; units = mkOption { - description = "Definition of systemd units."; + description = lib.mdDoc "Definition of systemd units."; default = {}; visible = false; type = systemdUtils.types.units; @@ -249,49 +264,49 @@ in { visible = false; type = types.listOf types.package; example = literalExpression "[ pkgs.systemd-cryptsetup-generator ]"; - description = "Packages providing systemd units and hooks."; + description = lib.mdDoc "Packages providing systemd units and hooks."; }; targets = mkOption { default = {}; visible = false; type = systemdUtils.types.initrdTargets; - description = "Definition of systemd target units."; + description = lib.mdDoc "Definition of systemd target units."; }; services = mkOption { default = {}; type = systemdUtils.types.initrdServices; visible = false; - description = "Definition of systemd service units."; + description = lib.mdDoc "Definition of systemd service units."; }; sockets = mkOption { default = {}; type = systemdUtils.types.initrdSockets; visible = false; - description = "Definition of systemd socket units."; + description = lib.mdDoc "Definition of systemd socket units."; }; timers = mkOption { default = {}; type = systemdUtils.types.initrdTimers; visible = false; - description = "Definition of systemd timer units."; + description = lib.mdDoc "Definition of systemd timer units."; }; paths = mkOption { default = {}; type = systemdUtils.types.initrdPaths; visible = false; - description = "Definition of systemd path units."; + description = lib.mdDoc "Definition of systemd path units."; }; mounts = mkOption { default = []; type = systemdUtils.types.initrdMounts; visible = false; - description = '' + description = lib.mdDoc '' Definition of systemd mount units. This is a list instead of an attrSet, because systemd mandates the names to be derived from the 'where' attribute. @@ -302,7 +317,7 @@ in { default = []; type = systemdUtils.types.automounts; visible = false; - description = '' + description = lib.mdDoc '' Definition of systemd automount units. This is a list instead of an attrSet, because systemd mandates the names to be derived from the 'where' attribute. @@ -313,7 +328,7 @@ in { default = {}; type = systemdUtils.types.slices; visible = false; - description = "Definition of slice configurations."; + description = lib.mdDoc "Definition of slice configurations."; }; }; @@ -359,6 +374,9 @@ in { ''; "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases; + "/etc/os-release".source = config.boot.initrd.osRelease; + "/etc/initrd-release".source = config.boot.initrd.osRelease; + }; storePaths = [ @@ -420,6 +438,9 @@ in { services."systemd-makefs@" = lib.mkIf needMakefs { unitConfig.IgnoreOnIsolate = true; }; services."systemd-growfs@" = lib.mkIf needGrowfs { unitConfig.IgnoreOnIsolate = true; }; + # make sure all the /dev nodes are set up + services.systemd-tmpfiles-setup-dev.wantedBy = ["sysinit.target"]; + services.initrd-nixos-activation = { after = [ "initrd-fs.target" ]; requiredBy = [ "initrd.target" ]; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix index 7e14c8ae40..773163bbcb 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix @@ -9,13 +9,13 @@ in { services.journald.console = mkOption { default = ""; type = types.str; - description = "If non-empty, write log messages to the specified TTY device."; + description = lib.mdDoc "If non-empty, write log messages to the specified TTY device."; }; services.journald.rateLimitInterval = mkOption { default = "30s"; type = types.str; - description = '' + description = lib.mdDoc '' Configures the rate limiting interval that is applied to all messages generated on the system. This rate limiting is applied per-service, so that two services which log do not interfere with @@ -23,7 +23,7 @@ in { units: s, min, h, ms, us. To turn off any kind of rate limiting, set either value to 0. - See for important + See {option}`services.journald.rateLimitBurst` for important considerations when setting this value. ''; }; @@ -31,7 +31,7 @@ in { services.journald.rateLimitBurst = mkOption { default = 10000; type = types.int; - description = '' + description = lib.mdDoc '' Configures the rate limiting burst limit (number of messages per interval) that is applied to all messages generated on the system. This rate limiting is applied per-service, so that two services @@ -39,11 +39,11 @@ in { Note that the effective rate limit is multiplied by a factor derived from the available free disk space for the journal as described on - - journald.conf(5). + [ + journald.conf(5)](https://www.freedesktop.org/software/systemd/man/journald.conf.html). Note that the total amount of logs stored is limited by journald settings - such as SystemMaxUse, which defaults to a 4 GB cap. + such as `SystemMaxUse`, which defaults to a 4 GB cap. It is thus recommended to compute what period of time that you will be able to store logs for when an application logs at full burst rate. @@ -56,7 +56,7 @@ in { default = ""; type = types.lines; example = "Storage=volatile"; - description = '' + description = lib.mdDoc '' Extra config options for systemd-journald. See man journald.conf for available options. ''; @@ -65,7 +65,7 @@ in { services.journald.enableHttpGateway = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to enable the HTTP gateway to the journal. ''; }; @@ -74,7 +74,7 @@ in { default = config.services.rsyslogd.enable || config.services.syslog-ng.enable; defaultText = literalExpression "services.rsyslogd.enable || services.syslog-ng.enable"; type = types.bool; - description = '' + description = lib.mdDoc '' Whether to forward log messages to syslog. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/logind.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/logind.nix index 97ac588bce..5980160321 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/logind.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/logind.nix @@ -16,27 +16,24 @@ in default = ""; type = types.lines; example = "IdleAction=lock"; - description = '' + description = lib.mdDoc '' Extra config options for systemd-logind. See - - logind.conf(5) for available options. + [ + logind.conf(5)](https://www.freedesktop.org/software/systemd/man/logind.conf.html) for available options. ''; }; services.logind.killUserProcesses = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Specifies whether the processes of a user should be killed when the user logs out. If true, the scope unit corresponding to the session and all processes inside that scope will be terminated. If false, the scope is "abandoned" (see - - systemd.scope(5)), and processes are not killed. - + [systemd.scope(5)](https://www.freedesktop.org/software/systemd/man/systemd.scope.html#)), and processes are not killed. - - See logind.conf(5) + See [logind.conf(5)](https://www.freedesktop.org/software/systemd/man/logind.conf.html#KillUserProcesses=) for more details. ''; }; @@ -46,7 +43,7 @@ in example = "ignore"; type = logindHandlerType; - description = '' + description = lib.mdDoc '' Specifies what to be done when the laptop lid is closed. ''; }; @@ -56,7 +53,7 @@ in example = "suspend"; type = logindHandlerType; - description = '' + description = lib.mdDoc '' Specifies what to be done when the laptop lid is closed and another screen is added. ''; @@ -68,7 +65,7 @@ in example = "ignore"; type = logindHandlerType; - description = '' + description = lib.mdDoc '' Specifies what to do when the laptop lid is closed and the system is on external power. By default use the same action as specified in services.logind.lidSwitch. diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/nspawn.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/nspawn.nix index da03c60db5..c17dc951cc 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/nspawn.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/nspawn.nix @@ -107,7 +107,7 @@ in { systemd.nspawn = mkOption { default = {}; type = with types; attrsOf (submodule instanceOptions); - description = "Definition of systemd-nspawn configurations."; + description = lib.mdDoc "Definition of systemd-nspawn configurations."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix index ca4cdf827d..cb257dce6f 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix @@ -11,7 +11,7 @@ in { options.systemd.shutdownRamfs = { enable = lib.mkEnableOption "pivoting back to an initramfs for shutdown" // { default = true; }; contents = lib.mkOption { - description = "Set of files that have to be linked into the shutdown ramfs"; + description = lib.mdDoc "Set of files that have to be linked into the shutdown ramfs"; example = lib.literalExpression '' { "/lib/systemd/system-shutdown/zpool-sync-shutdown".source = writeShellScript "zpool" "exec ''${zfs}/bin/zpool sync" @@ -21,7 +21,7 @@ in { }; storePaths = lib.mkOption { - description = '' + description = lib.mdDoc '' Store paths to copy into the shutdown ramfs as well. ''; type = lib.types.listOf lib.types.singleLineStr; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix index 97d60e9d65..e990e953b0 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -12,10 +12,10 @@ in type = types.listOf types.str; default = []; example = [ "d /tmp 1777 root root 10d" ]; - description = '' + description = lib.mdDoc '' Rules for creation, deletion and cleaning of volatile and temporary files automatically. See - tmpfiles.d5 + {manpage}`tmpfiles.d(5)` for the exact format. ''; }; @@ -25,16 +25,16 @@ in default = []; example = literalExpression "[ pkgs.lvm2 ]"; apply = map getLib; - description = '' - List of packages containing systemd-tmpfiles rules. + description = lib.mdDoc '' + List of packages containing {command}`systemd-tmpfiles` rules. All files ending in .conf found in - pkg/lib/tmpfiles.d + {file}`«pkg»/lib/tmpfiles.d` will be included. If this folder does not exist or does not contain any files an error will be returned instead. - If a lib output is available, rules are searched there and only there. - If there is no lib output it will fall back to out + If a {file}`lib` output is available, rules are searched there and only there. + If there is no {file}`lib` output it will fall back to {file}`out` and if that does not exist either, the default output will be used. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix index 0b1e6277c2..3200a58d73 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/user.nix @@ -45,14 +45,14 @@ in { default = ""; type = types.lines; example = "DefaultCPUAccounting=yes"; - description = '' + description = lib.mdDoc '' Extra config options for systemd user instances. See man systemd-user.conf for available options. ''; }; systemd.user.units = mkOption { - description = "Definition of systemd per-user units."; + description = lib.mdDoc "Definition of systemd per-user units."; default = {}; type = systemdUtils.types.units; }; @@ -60,37 +60,37 @@ in { systemd.user.paths = mkOption { default = {}; type = systemdUtils.types.paths; - description = "Definition of systemd per-user path units."; + description = lib.mdDoc "Definition of systemd per-user path units."; }; systemd.user.services = mkOption { default = {}; type = systemdUtils.types.services; - description = "Definition of systemd per-user service units."; + description = lib.mdDoc "Definition of systemd per-user service units."; }; systemd.user.slices = mkOption { default = {}; type = systemdUtils.types.slices; - description = "Definition of systemd per-user slice units."; + description = lib.mdDoc "Definition of systemd per-user slice units."; }; systemd.user.sockets = mkOption { default = {}; type = systemdUtils.types.sockets; - description = "Definition of systemd per-user socket units."; + description = lib.mdDoc "Definition of systemd per-user socket units."; }; systemd.user.targets = mkOption { default = {}; type = systemdUtils.types.targets; - description = "Definition of systemd per-user target units."; + description = lib.mdDoc "Definition of systemd per-user target units."; }; systemd.user.timers = mkOption { default = {}; type = systemdUtils.types.timers; - description = "Definition of systemd per-user timer units."; + description = lib.mdDoc "Definition of systemd per-user timer units."; }; systemd.additionalUpstreamUserUnits = mkOption { @@ -145,6 +145,10 @@ in { { # Ensure that pam_systemd gets included. This is special-cased # in systemd to provide XDG_RUNTIME_DIR. startSession = true; + # Disable pam_mount in systemd-user to prevent it from being called + # multiple times during login, because it will prevent pam_mount from + # unmounting the previously mounted volumes. + pamMount = false; }; # Some overrides to upstream units. diff --git a/third_party/nixpkgs/nixos/modules/system/boot/timesyncd.nix b/third_party/nixpkgs/nixos/modules/system/boot/timesyncd.nix index 6279957fcd..a6604802c3 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/timesyncd.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/timesyncd.nix @@ -11,7 +11,7 @@ with lib; default = !config.boot.isContainer; defaultText = literalExpression "!config.boot.isContainer"; type = types.bool; - description = '' + description = lib.mdDoc '' Enables the systemd NTP client daemon. ''; }; @@ -19,7 +19,7 @@ with lib; default = config.networking.timeServers; defaultText = literalExpression "config.networking.timeServers"; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' The set of NTP servers from which to synchronise. ''; }; @@ -29,10 +29,10 @@ with lib; example = '' PollIntervalMaxSec=180 ''; - description = '' + description = lib.mdDoc '' Extra config options for systemd-timesyncd. See - - timesyncd.conf(5) for available options. + [ + timesyncd.conf(5)](https://www.freedesktop.org/software/systemd/man/timesyncd.conf.html) for available options. ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/tmp.nix b/third_party/nixpkgs/nixos/modules/system/boot/tmp.nix index cf6d19eb5f..1f9431710a 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/tmp.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/tmp.nix @@ -14,23 +14,23 @@ in boot.cleanTmpDir = mkOption { type = types.bool; default = false; - description = '' - Whether to delete all files in /tmp during boot. + description = lib.mdDoc '' + Whether to delete all files in {file}`/tmp` during boot. ''; }; boot.tmpOnTmpfs = mkOption { type = types.bool; default = false; - description = '' - Whether to mount a tmpfs on /tmp during boot. + description = lib.mdDoc '' + Whether to mount a tmpfs on {file}`/tmp` during boot. ''; }; boot.tmpOnTmpfsSize = mkOption { type = types.oneOf [ types.str types.types.ints.positive ]; default = "50%"; - description = '' + description = lib.mdDoc '' Size of tmpfs in percentage. Percentage is defined by systemd. ''; diff --git a/third_party/nixpkgs/nixos/modules/system/build.nix b/third_party/nixpkgs/nixos/modules/system/build.nix index 58dc3f0d41..41c0258a5a 100644 --- a/third_party/nixpkgs/nixos/modules/system/build.nix +++ b/third_party/nixpkgs/nixos/modules/system/build.nix @@ -7,7 +7,7 @@ in system.build = mkOption { default = {}; - description = '' + description = lib.mdDoc '' Attribute set of derivations used to set up the system. ''; type = types.submoduleWith { diff --git a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix index ed552fecec..cfb9c39458 100644 --- a/third_party/nixpkgs/nixos/modules/system/etc/etc.nix +++ b/third_party/nixpkgs/nixos/modules/system/etc/etc.nix @@ -82,8 +82,8 @@ in "default/useradd".text = "GROUP=100 ..."; } ''; - description = '' - Set of files that have to be linked in /etc. + description = lib.mdDoc '' + Set of files that have to be linked in {file}`/etc`. ''; type = with types; attrsOf (submodule ( @@ -93,7 +93,7 @@ in enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether this /etc file should be generated. This option allows specific /etc files to be disabled. ''; @@ -101,9 +101,9 @@ in target = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' Name of symlink (relative to - /etc). Defaults to the attribute + {file}`/etc`). Defaults to the attribute name. ''; }; @@ -111,20 +111,20 @@ in text = mkOption { default = null; type = types.nullOr types.lines; - description = "Text of the file."; + description = lib.mdDoc "Text of the file."; }; source = mkOption { type = types.path; - description = "Path of the source file."; + description = lib.mdDoc "Path of the source file."; }; mode = mkOption { type = types.str; default = "symlink"; example = "0600"; - description = '' - If set to something else than symlink, + description = lib.mdDoc '' + If set to something else than `symlink`, the file is copied instead of symlinked, with the given file mode. ''; @@ -133,7 +133,7 @@ in uid = mkOption { default = 0; type = types.int; - description = '' + description = lib.mdDoc '' UID of created file. Only takes effect when the file is copied (that is, the mode is not 'symlink'). ''; @@ -142,7 +142,7 @@ in gid = mkOption { default = 0; type = types.int; - description = '' + description = lib.mdDoc '' GID of created file. Only takes effect when the file is copied (that is, the mode is not 'symlink'). ''; @@ -151,20 +151,20 @@ in user = mkOption { default = "+${toString config.uid}"; type = types.str; - description = '' + description = lib.mdDoc '' User name of created file. Only takes effect when the file is copied (that is, the mode is not 'symlink'). - Changing this option takes precedence over uid. + Changing this option takes precedence over `uid`. ''; }; group = mkOption { default = "+${toString config.gid}"; type = types.str; - description = '' + description = lib.mdDoc '' Group name of created file. Only takes effect when the file is copied (that is, the mode is not 'symlink'). - Changing this option takes precedence over gid. + Changing this option takes precedence over `gid`. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix b/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix index 21a25cbfa9..ca26901678 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/auto-upgrade.nix @@ -13,21 +13,32 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to periodically upgrade NixOS to the latest version. If enabled, a systemd timer will run - nixos-rebuild switch --upgrade once a + `nixos-rebuild switch --upgrade` once a day. ''; }; + operation = mkOption { + type = types.enum ["switch" "boot"]; + default = "switch"; + example = "boot"; + description = lib.mdDoc '' + Whether to run + `nixos-rebuild switch --upgrade` or run + `nixos-rebuild boot --upgrade` + ''; + }; + flake = mkOption { type = types.nullOr types.str; default = null; example = "github:kloenk/nix"; - description = '' + description = lib.mdDoc '' The Flake URI of the NixOS configuration to build. - Disables the option . + Disables the option {option}`system.autoUpgrade.channel`. ''; }; @@ -53,11 +64,11 @@ in { "extra-binary-caches" "http://my-cache.example.org/" ]; - description = '' - Any additional flags passed to nixos-rebuild. + description = lib.mdDoc '' + Any additional flags passed to {command}`nixos-rebuild`. If you are using flakes and use a local repo you can add - [ "--update-input" "nixpkgs" "--commit-lock-file" ] + {command}`[ "--update-input" "nixpkgs" "--commit-lock-file" ]` to update nixpkgs. ''; }; @@ -79,11 +90,11 @@ in { allowReboot = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Reboot the system into the new generation instead of a switch if the new generation uses a different kernel, kernel modules or initrd than the booted system. - See for configuring the times at which a reboot is allowed. + See {option}`rebootWindow` for configuring the times at which a reboot is allowed. ''; }; @@ -101,24 +112,24 @@ in { }; rebootWindow = mkOption { - description = '' + description = lib.mdDoc '' Define a lower and upper time value (in HH:MM format) which constitute a time window during which reboots are allowed after an upgrade. - This option only has an effect when is enabled. - The default value of null means that reboots are allowed at any time. + This option only has an effect when {option}`allowReboot` is enabled. + The default value of `null` means that reboots are allowed at any time. ''; default = null; example = { lower = "01:00"; upper = "05:00"; }; type = with types; nullOr (submodule { options = { lower = mkOption { - description = "Lower limit of the reboot window"; + description = lib.mdDoc "Lower limit of the reboot window"; type = types.strMatching "[[:digit:]]{2}:[[:digit:]]{2}"; example = "01:00"; }; upper = mkOption { - description = "Upper limit of the reboot window"; + description = lib.mdDoc "Upper limit of the reboot window"; type = types.strMatching "[[:digit:]]{2}:[[:digit:]]{2}"; example = "05:00"; }; @@ -130,7 +141,7 @@ in { default = true; type = types.bool; example = false; - description = '' + description = lib.mdDoc '' Takes a boolean argument. If true, the time when the service unit was last triggered is stored on disk. When the timer is activated, the service unit is triggered immediately if it @@ -223,7 +234,7 @@ in { ''} if [ "''${booted}" = "''${built}" ]; then - ${nixos-rebuild} switch ${toString cfg.flags} + ${nixos-rebuild} ${cfg.operation} ${toString cfg.flags} ${optionalString (cfg.rebootWindow != null) '' elif [ "''${do_reboot}" != true ]; then echo "Outside of configured reboot window, skipping." @@ -232,7 +243,7 @@ in { ${shutdown} -r +1 fi '' else '' - ${nixos-rebuild} switch ${toString (cfg.flags ++ upgradeFlag)} + ${nixos-rebuild} ${cfg.operation} ${toString (cfg.flags ++ upgradeFlag)} ''; startAt = cfg.dates; diff --git a/third_party/nixpkgs/nixos/modules/tasks/cpu-freq.nix b/third_party/nixpkgs/nixos/modules/tasks/cpu-freq.nix index f1219c07c5..6869ef8b79 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/cpu-freq.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/cpu-freq.nix @@ -18,7 +18,7 @@ in type = types.nullOr types.str; default = null; example = "ondemand"; - description = '' + description = lib.mdDoc '' Configure the governor used to regulate the frequency of the available CPUs. By default, the kernel configures the performance governor, although this may be overwritten in your @@ -34,7 +34,7 @@ in type = types.nullOr types.ints.unsigned; default = null; example = 2200000; - description = '' + description = lib.mdDoc '' The maximum frequency the CPU will use. Defaults to the maximum possible. ''; }; @@ -43,7 +43,7 @@ in type = types.nullOr types.ints.unsigned; default = null; example = 800000; - description = '' + description = lib.mdDoc '' The minimum frequency the CPU will use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix b/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix index 06117d19af..7837a34b49 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/encrypted-devices.nix @@ -16,33 +16,33 @@ let enable = mkOption { default = false; type = types.bool; - description = "The block device is backed by an encrypted one, adds this device as a initrd luks entry."; + description = lib.mdDoc "The block device is backed by an encrypted one, adds this device as a initrd luks entry."; }; blkDev = mkOption { default = null; example = "/dev/sda1"; type = types.nullOr types.str; - description = "Location of the backing encrypted device."; + description = lib.mdDoc "Location of the backing encrypted device."; }; label = mkOption { default = null; example = "rootfs"; type = types.nullOr types.str; - description = "Label of the unlocked encrypted device. Set fileSystems.<name?>.device to /dev/mapper/<label> to mount the unlocked device."; + description = lib.mdDoc "Label of the unlocked encrypted device. Set `fileSystems..device` to `/dev/mapper/ + "med_power_with_dipm" is supported by kernel versions 4.15 and newer. ''; diff --git a/third_party/nixpkgs/nixos/modules/tasks/snapraid.nix b/third_party/nixpkgs/nixos/modules/tasks/snapraid.nix index c8dde5b489..634ffa0311 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/snapraid.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/snapraid.nix @@ -14,7 +14,7 @@ in d2 = "/mnt/disk2/"; d3 = "/mnt/disk3/"; }; - description = "SnapRAID data disks."; + description = lib.mdDoc "SnapRAID data disks."; type = attrsOf str; }; parityFiles = mkOption { @@ -27,7 +27,7 @@ in "/mnt/diskt/snapraid.5-parity" "/mnt/disku/snapraid.6-parity" ]; - description = "SnapRAID parity files."; + description = lib.mdDoc "SnapRAID parity files."; type = listOf str; }; contentFiles = mkOption { @@ -37,46 +37,46 @@ in "/mnt/disk1/snapraid.content" "/mnt/disk2/snapraid.content" ]; - description = "SnapRAID content list files."; + description = lib.mdDoc "SnapRAID content list files."; type = listOf str; }; exclude = mkOption { default = [ ]; example = [ "*.unrecoverable" "/tmp/" "/lost+found/" ]; - description = "SnapRAID exclude directives."; + description = lib.mdDoc "SnapRAID exclude directives."; type = listOf str; }; touchBeforeSync = mkOption { default = true; example = false; - description = - "Whether snapraid touch should be run before snapraid sync."; + description = lib.mdDoc + "Whether {command}`snapraid touch` should be run before {command}`snapraid sync`."; type = bool; }; sync.interval = mkOption { default = "01:00"; example = "daily"; - description = "How often to run snapraid sync."; + description = lib.mdDoc "How often to run {command}`snapraid sync`."; type = str; }; scrub = { interval = mkOption { default = "Mon *-*-* 02:00:00"; example = "weekly"; - description = "How often to run snapraid scrub."; + description = lib.mdDoc "How often to run {command}`snapraid scrub`."; type = str; }; plan = mkOption { default = 8; example = 5; - description = - "Percent of the array that should be checked by snapraid scrub."; + description = lib.mdDoc + "Percent of the array that should be checked by {command}`snapraid scrub`."; type = int; }; olderThan = mkOption { default = 10; example = 20; - description = + description = lib.mdDoc "Number of days since data was last scrubbed before it can be scrubbed again."; type = int; }; @@ -90,7 +90,7 @@ in autosave 500 pool /pool ''; - description = "Extra config options for SnapRAID."; + description = lib.mdDoc "Extra config options for SnapRAID."; type = lines; }; }; diff --git a/third_party/nixpkgs/nixos/modules/tasks/swraid.nix b/third_party/nixpkgs/nixos/modules/tasks/swraid.nix index 0b53a6d152..26d6bd914d 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/swraid.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/swraid.nix @@ -10,7 +10,7 @@ in { }; mdadmConf = lib.mkOption { - description = "Contents of /etc/mdadm.conf in initrd."; + description = lib.mdDoc "Contents of {file}`/etc/mdadm.conf` in initrd."; type = lib.types.lines; default = ""; }; diff --git a/third_party/nixpkgs/nixos/modules/tasks/trackpoint.nix b/third_party/nixpkgs/nixos/modules/tasks/trackpoint.nix index 029d8a0029..d197a0feb3 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/trackpoint.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/trackpoint.nix @@ -12,7 +12,7 @@ with lib; enable = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable sensitivity and speed configuration for trackpoints. ''; }; @@ -21,7 +21,7 @@ with lib; default = 128; example = 255; type = types.int; - description = '' + description = lib.mdDoc '' Configure the trackpoint sensitivity. By default, the kernel configures 128. ''; @@ -31,7 +31,7 @@ with lib; default = 97; example = 255; type = types.int; - description = '' + description = lib.mdDoc '' Configure the trackpoint speed. By default, the kernel configures 97. ''; @@ -40,7 +40,7 @@ with lib; emulateWheel = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Enable scrolling while holding the middle mouse button. ''; }; @@ -48,7 +48,7 @@ with lib; fakeButtons = mkOption { default = false; type = types.bool; - description = '' + description = lib.mdDoc '' Switch to "bare" PS/2 mouse support in case Trackpoint buttons are not recognized properly. This can happen for example on models like the L430, T450, T450s, on which the Trackpoint buttons are actually a part of the Synaptics touchpad. @@ -58,7 +58,7 @@ with lib; device = mkOption { default = "TPPS/2 IBM TrackPoint"; type = types.str; - description = '' + description = lib.mdDoc '' The device name of the trackpoint. You can check with xinput. Some newer devices (example x1c6) use "TPPS/2 Elan TrackPoint". ''; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-init.nix b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-init.nix index 9c2adb90bf..8b98f2e32d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-init.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-init.nix @@ -60,7 +60,7 @@ in { enable = mkOption { default = true; type = types.bool; - description = '' + description = lib.mdDoc '' Enable or disable the amazon-init service. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix index 0465571ca9..52c960d453 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix @@ -27,13 +27,13 @@ in { type = types.attrsOf (types.submodule { options = { mount = lib.mkOption { - description = "Where to mount this dataset."; + description = lib.mdDoc "Where to mount this dataset."; type = types.nullOr types.string; default = null; }; properties = lib.mkOption { - description = "Properties to set on this dataset."; + description = lib.mdDoc "Properties to set on this dataset."; type = types.attrsOf types.string; default = {}; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix b/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix index c70da57353..6ba71ede7d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/anbox.nix @@ -10,7 +10,7 @@ let address = mkOption { default = addr; type = types.str; - description = '' + description = lib.mdDoc '' IPv${toString v} ${name} address. ''; }; @@ -18,9 +18,9 @@ let prefixLength = mkOption { default = pref; type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); - description = '' + description = lib.mdDoc '' Subnet mask of the ${name} address, specified as the number of - bits in the prefix (${if v == 4 then "24" else "64"}). + bits in the prefix (`${if v == 4 then "24" else "64"}`). ''; }; }; @@ -37,7 +37,7 @@ in default = pkgs.anbox.image; defaultText = literalExpression "pkgs.anbox.image"; type = types.package; - description = '' + description = lib.mdDoc '' Base android image for Anbox. ''; }; @@ -45,7 +45,7 @@ in extraInit = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra shell commands to be run inside the container image during init. ''; }; @@ -57,7 +57,7 @@ in dns = mkOption { default = "1.1.1.1"; type = types.str; - description = '' + description = lib.mdDoc '' Container DNS server. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/appvm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/appvm.nix index 24315a85d0..b23b321095 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/appvm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/appvm.nix @@ -13,13 +13,13 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This enables AppVMs and related virtualisation settings. ''; }; user = mkOption { type = types.str; - description = '' + description = lib.mdDoc '' AppVM user login. Currenly only AppVMs are supported for a single user only. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/build-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/build-vm.nix index 4a4694950f..e942544163 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/build-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/build-vm.nix @@ -25,8 +25,8 @@ in options = { virtualisation.vmVariant = mkOption { - description = '' - Machine configuration to be added for the vm script produced by nixos-rebuild build-vm. + description = lib.mdDoc '' + Machine configuration to be added for the vm script produced by `nixos-rebuild build-vm`. ''; inherit (vmVariant) type; default = {}; @@ -34,8 +34,8 @@ in }; virtualisation.vmVariantWithBootLoader = mkOption { - description = '' - Machine configuration to be added for the vm script produced by nixos-rebuild build-vm-with-bootloader. + description = lib.mdDoc '' + Machine configuration to be added for the vm script produced by `nixos-rebuild build-vm-with-bootloader`. ''; inherit (vmVariantWithBootLoader) type; default = {}; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/container-config.nix b/third_party/nixpkgs/nixos/modules/virtualisation/container-config.nix index 0966ef8482..94f28ea80d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/container-config.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/container-config.nix @@ -8,7 +8,6 @@ with lib; # Disable some features that are not useful in a container. nix.optimise.automatic = mkDefault false; # the store is host managed - services.udisks2.enable = mkDefault false; powerManagement.enable = mkDefault false; documentation.nixos.enable = mkDefault false; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix index ea89a994b1..96fa676129 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/containerd.nix @@ -23,7 +23,7 @@ in configFile = lib.mkOption { default = null; - description = '' + description = lib.mdDoc '' Path to containerd config file. Setting this option will override any configuration applied by the settings option. ''; @@ -33,14 +33,14 @@ in settings = lib.mkOption { type = settingsFormat.type; default = {}; - description = '' + description = lib.mdDoc '' Verbatim lines to add to containerd.toml ''; }; args = lib.mkOption { default = {}; - description = "extra args to append to the containerd cmdline"; + description = lib.mdDoc "extra args to append to the containerd cmdline"; type = attrsOf str; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix index cea3d51d3a..a9a2f3c148 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/containers.nix @@ -31,7 +31,7 @@ in mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This option enables the common /etc/containers configuration module. ''; }; @@ -39,13 +39,13 @@ in ociSeccompBpfHook.enable = mkOption { type = types.bool; default = false; - description = "Enable the OCI seccomp BPF hook"; + description = lib.mdDoc "Enable the OCI seccomp BPF hook"; }; containersConf.settings = mkOption { type = toml.type; default = { }; - description = "containers.conf configuration"; + description = lib.mdDoc "containers.conf configuration"; }; containersConf.cniPlugins = mkOption { @@ -60,7 +60,7 @@ in pkgs.cniPlugins.dnsname ] ''; - description = '' + description = lib.mdDoc '' CNI plugins to install on the system. ''; }; @@ -74,14 +74,14 @@ in runroot = "/run/containers/storage"; }; }; - description = "storage.conf configuration"; + description = lib.mdDoc "storage.conf configuration"; }; registries = { search = mkOption { type = types.listOf types.str; default = [ "docker.io" "quay.io" ]; - description = '' + description = lib.mdDoc '' List of repositories to search. ''; }; @@ -89,7 +89,7 @@ in insecure = mkOption { default = []; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of insecure repositories. ''; }; @@ -97,7 +97,7 @@ in block = mkOption { default = []; type = types.listOf types.str; - description = '' + description = lib.mdDoc '' List of blocked repositories. ''; }; @@ -116,10 +116,10 @@ in }; } ''; - description = '' + description = lib.mdDoc '' Signature verification policy file. If this option is empty the default policy file from - skopeo will be used. + `skopeo` will be used. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix index 38766113f3..3c9b0a061d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix @@ -25,33 +25,33 @@ in storageDriver = mkOption { type = types.enum [ "btrfs" "overlay" "vfs" ]; default = "overlay"; - description = "Storage driver to be used"; + description = lib.mdDoc "Storage driver to be used"; }; logLevel = mkOption { type = types.enum [ "trace" "debug" "info" "warn" "error" "fatal" ]; default = "info"; - description = "Log level to be used"; + description = lib.mdDoc "Log level to be used"; }; pauseImage = mkOption { type = types.nullOr types.str; default = null; - description = "Override the default pause image for pod sandboxes"; + description = lib.mdDoc "Override the default pause image for pod sandboxes"; example = "k8s.gcr.io/pause:3.2"; }; pauseCommand = mkOption { type = types.nullOr types.str; default = null; - description = "Override the default pause command"; + description = lib.mdDoc "Override the default pause command"; example = "/pause"; }; runtime = mkOption { type = types.nullOr types.str; default = null; - description = "Override the default runtime"; + description = lib.mdDoc "Override the default runtime"; example = "crun"; }; @@ -63,7 +63,7 @@ in pkgs.gvisor ] ''; - description = '' + description = lib.mdDoc '' Extra packages to be installed in the CRI-O wrapper. ''; }; @@ -87,9 +87,9 @@ in settings = mkOption { type = format.type; default = { }; - description = '' + description = lib.mdDoc '' Configuration for cri-o, see - . + . ''; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-config.nix b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-config.nix index 88cb0cd450..754bc1a518 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-config.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-config.nix @@ -10,19 +10,19 @@ with lib; type = bool; default = false; example = true; - description = "Whether to set the root password from the Digital Ocean metadata"; + description = lib.mdDoc "Whether to set the root password from the Digital Ocean metadata"; }; setSshKeys = mkOption { type = bool; default = true; example = true; - description = "Whether to fetch ssh keys from Digital Ocean"; + description = lib.mdDoc "Whether to fetch ssh keys from Digital Ocean"; }; seedEntropy = mkOption { type = bool; default = true; example = true; - description = "Whether to run the kernel RNG entropy seeding script from the Digital Ocean vendor data"; + description = lib.mdDoc "Whether to run the kernel RNG entropy seeding script from the Digital Ocean vendor data"; }; }; config = diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix index 0ff2ee591f..a57c89245f 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-image.nix @@ -13,7 +13,7 @@ in type = with types; either (enum [ "auto" ]) int; default = "auto"; example = 4096; - description = '' + description = lib.mdDoc '' Size of disk image. Unit is MB. ''; }; @@ -21,12 +21,12 @@ in virtualisation.digitalOceanImage.configFile = mkOption { type = with types; nullOr path; default = null; - description = '' + description = lib.mdDoc '' A path to a configuration file which will be placed at - /etc/nixos/configuration.nix and be used when switching - to a new configuration. If set to null, a default + `/etc/nixos/configuration.nix` and be used when switching + to a new configuration. If set to `null`, a default configuration is used that imports - (modulesPath + "/virtualisation/digital-ocean-config.nix"). + `(modulesPath + "/virtualisation/digital-ocean-config.nix")`. ''; }; @@ -34,7 +34,7 @@ in type = types.enum [ "gzip" "bzip2" ]; default = "gzip"; example = "bzip2"; - description = '' + description = lib.mdDoc '' Disk image compression method. Choose bzip2 to generate smaller images that take longer to generate but will consume less metered storage space on your Digital Ocean account. diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-init.nix b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-init.nix index df30104b7d..e29e34c477 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-init.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/digital-ocean-init.nix @@ -15,18 +15,18 @@ in { type = types.bool; default = true; example = true; - description = "Whether to reconfigure the system from Digital Ocean user data"; + description = lib.mdDoc "Whether to reconfigure the system from Digital Ocean user data"; }; options.virtualisation.digitalOcean.defaultConfigFile = mkOption { type = types.path; default = defaultConfigFile; defaultText = literalDocBook '' The default configuration imports user-data if applicable and - (modulesPath + "/virtualisation/digital-ocean-config.nix"). + `(modulesPath + "/virtualisation/digital-ocean-config.nix")`. ''; - description = '' + description = lib.mdDoc '' A path to a configuration file which will be placed at - /etc/nixos/configuration.nix and be used when switching to + `/etc/nixos/configuration.nix` and be used when switching to a new configuration. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker-rootless.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker-rootless.nix index b814fa1c43..f4e4bdc096 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/docker-rootless.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/docker-rootless.nix @@ -18,18 +18,18 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This option enables docker in a rootless mode, a daemon that manages linux containers. To interact with the daemon, one needs to set - DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock. + {command}`DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.sock`. ''; }; setSocketVariable = mkOption { type = types.bool; default = false; - description = '' - Point DOCKER_HOST to rootless Docker instance for + description = lib.mdDoc '' + Point {command}`DOCKER_HOST` to rootless Docker instance for normal users by default. ''; }; @@ -41,7 +41,7 @@ in ipv6 = true; "fixed-cidr-v6" = "fd00::/80"; }; - description = '' + description = lib.mdDoc '' Configuration for docker daemon. The attributes are serialized to JSON used as daemon.conf. See https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file ''; @@ -51,7 +51,7 @@ in default = pkgs.docker; defaultText = literalExpression "pkgs.docker"; type = types.package; - description = '' + description = lib.mdDoc '' Docker package to be used in the module. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix index c6eca4d6ed..062ad7f53c 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix @@ -21,11 +21,11 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' This option enables docker, a daemon that manages linux containers. Users in the "docker" group can interact with the daemon (e.g. to start or stop containers) using the - docker command line tool. + {command}`docker` command line tool. ''; }; @@ -34,7 +34,7 @@ in type = types.listOf types.str; default = ["/run/docker.sock"]; description = - '' + lib.mdDoc '' A list of unix and tcp docker should listen to. The format follows ListenStream as described in systemd.socket(5). ''; @@ -45,10 +45,10 @@ in type = types.bool; default = true; description = - '' + lib.mdDoc '' When enabled dockerd is started on boot. This is required for containers which are created with the - --restart=always flag to work. If this option is + `--restart=always` flag to work. If this option is disabled, docker might be started on demand by socket activation. ''; }; @@ -61,7 +61,7 @@ in ipv6 = true; "fixed-cidr-v6" = "fd00::/80"; }; - description = '' + description = lib.mdDoc '' Configuration for docker daemon. The attributes are serialized to JSON used as daemon.conf. See https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file ''; @@ -71,7 +71,7 @@ in mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable nvidia-docker wrapper, supporting NVIDIA GPUs inside docker containers. ''; }; @@ -81,7 +81,7 @@ in type = types.bool; default = true; description = - '' + lib.mdDoc '' Allow dockerd to be restarted without affecting running container. This option is incompatible with docker swarm. ''; @@ -92,7 +92,7 @@ in type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]); default = null; description = - '' + lib.mdDoc '' This option determines which Docker storage driver to use. By default it let's docker automatically choose preferred storage driver. ''; @@ -103,7 +103,7 @@ in type = types.enum ["none" "json-file" "syslog" "journald" "gelf" "fluentd" "awslogs" "splunk" "etwlogs" "gcplogs"]; default = "journald"; description = - '' + lib.mdDoc '' This option determines which Docker log driver to use. ''; }; @@ -113,9 +113,9 @@ in type = types.separatedString " "; default = ""; description = - '' + lib.mdDoc '' The extra command-line options to pass to - docker daemon. + {command}`docker` daemon. ''; }; @@ -123,10 +123,10 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to periodically prune Docker resources. If enabled, a - systemd timer will run docker system prune -f - as specified by the dates option. + systemd timer will run `docker system prune -f` + as specified by the `dates` option. ''; }; @@ -134,8 +134,8 @@ in type = types.listOf types.str; default = []; example = [ "--all" ]; - description = '' - Any additional flags passed to docker system prune. + description = lib.mdDoc '' + Any additional flags passed to {command}`docker system prune`. ''; }; @@ -155,7 +155,7 @@ in default = pkgs.docker; defaultText = literalExpression "pkgs.docker"; type = types.package; - description = '' + description = lib.mdDoc '' Docker package to be used in the module. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/ecs-agent.nix b/third_party/nixpkgs/nixos/modules/virtualisation/ecs-agent.nix index aa38a02ea0..af1736fcf0 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/ecs-agent.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/ecs-agent.nix @@ -10,14 +10,14 @@ in { package = mkOption { type = types.path; - description = "The ECS agent package to use"; + description = lib.mdDoc "The ECS agent package to use"; default = pkgs.ecs-agent; defaultText = literalExpression "pkgs.ecs-agent"; }; extra-environment = mkOption { type = types.attrsOf types.str; - description = "The environment the ECS agent should run with. See the ECS agent documentation for keys that work here."; + description = lib.mdDoc "The environment the ECS agent should run with. See the ECS agent documentation for keys that work here."; default = {}; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-guest.nix index fb6502644b..e6ba38370f 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/hyperv-guest.nix @@ -14,7 +14,7 @@ in { type = types.str; default = "1152x864"; example = "1024x768"; - description = '' + description = lib.mdDoc '' Resolution at which to initialize the video adapter. Supports screen resolution up to Full HD 1920x1080 with 32 bit color diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/kvmgt.nix b/third_party/nixpkgs/nixos/modules/virtualisation/kvmgt.nix index 5e7a73bec9..5ea71c3a91 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/kvmgt.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/kvmgt.nix @@ -26,7 +26,7 @@ in { device = mkOption { type = types.str; default = "0000:00:02.0"; - description = "PCI ID of graphics card. You can figure it with ls /sys/class/mdev_bus."; + description = lib.mdDoc "PCI ID of graphics card. You can figure it with {command}`ls /sys/class/mdev_bus`."; }; vgpus = mkOption { default = {}; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix index 31d18ae734..f7d0ef39c5 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/libvirtd.nix @@ -29,7 +29,7 @@ let enable = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Allows libvirtd to take advantage of OVMF when creating new QEMU VMs with UEFI boot. ''; @@ -47,7 +47,7 @@ let default = [ pkgs.OVMF.fd ]; defaultText = literalExpression "[ pkgs.OVMF.fd ]"; example = literalExpression "[ pkgs.OVMFFull.fd pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd ]"; - description = '' + description = lib.mdDoc '' List of OVMF packages to use. Each listed package must contain files names FV/OVMF_CODE.fd and FV/OVMF_VARS.fd or FV/AAVMF_CODE.fd and FV/AAVMF_VARS.fd ''; }; @@ -59,7 +59,7 @@ let enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allows libvirtd to use swtpm to create an emulated TPM. ''; }; @@ -68,7 +68,7 @@ let type = types.package; default = pkgs.swtpm; defaultText = literalExpression "pkgs.swtpm"; - description = '' + description = lib.mdDoc '' swtpm package to use. ''; }; @@ -91,7 +91,7 @@ let runAsRoot = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' If true, libvirtd runs qemu as root. If false, libvirtd runs qemu as unprivileged user qemu-libvirtd. Changing this option to false may cause file permission issues @@ -105,7 +105,7 @@ let default = '' namespaces = [] ''; - description = '' + description = lib.mdDoc '' Contents written to the qemu configuration file, qemu.conf. Make sure to include a proper namespace configuration when supplying custom configuration. @@ -115,7 +115,7 @@ let ovmf = mkOption { type = ovmfModule; default = { }; - description = '' + description = lib.mdDoc '' QEMU's OVMF options. ''; }; @@ -123,7 +123,7 @@ let swtpm = mkOption { type = swtpmModule; default = { }; - description = '' + description = lib.mdDoc '' QEMU's swtpm options. ''; }; @@ -162,11 +162,11 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This option enables libvirtd, a daemon that manages virtual machines. Users in the "libvirtd" group can interact with the daemon (e.g. to start or stop VMs) using the - virsh command line tool, among others. + {command}`virsh` command line tool, among others. ''; }; @@ -174,7 +174,7 @@ in type = types.package; default = pkgs.libvirt; defaultText = literalExpression "pkgs.libvirt"; - description = '' + description = lib.mdDoc '' libvirt package to use. ''; }; @@ -182,7 +182,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = '' + description = lib.mdDoc '' Extra contents appended to the libvirtd configuration file, libvirtd.conf. ''; @@ -192,7 +192,7 @@ in type = types.listOf types.str; default = [ ]; example = [ "--verbose" ]; - description = '' + description = lib.mdDoc '' Extra command line arguments passed to libvirtd on startup. ''; }; @@ -200,7 +200,7 @@ in onBoot = mkOption { type = types.enum [ "start" "ignore" ]; default = "start"; - description = '' + description = lib.mdDoc '' Specifies the action to be done to / on the guests when the host boots. The "start" option starts all guests that were running prior to shutdown regardless of their autostart settings. The "ignore" option will not @@ -212,7 +212,7 @@ in onShutdown = mkOption { type = types.enum [ "shutdown" "suspend" ]; default = "suspend"; - description = '' + description = lib.mdDoc '' When shutting down / restarting the host what method should be used to gracefully halt the guests. Setting to "shutdown" will cause an ACPI shutdown of each guest. "suspend" will @@ -223,7 +223,7 @@ in allowedBridges = mkOption { type = types.listOf types.str; default = [ "virbr0" ]; - description = '' + description = lib.mdDoc '' List of bridge devices that can be used by qemu:///session ''; }; @@ -231,7 +231,7 @@ in qemu = mkOption { type = qemuModule; default = { }; - description = '' + description = lib.mdDoc '' QEMU related options. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix index 0f8b22a45d..2b184960da 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxc.nix @@ -19,7 +19,7 @@ in type = types.bool; default = false; description = - '' + lib.mdDoc '' This enables Linux Containers (LXC), which provides tools for creating and managing system or application containers on Linux. diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix index 18451b147f..f1eabee5ff 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/lxd.nix @@ -36,7 +36,7 @@ in { type = types.package; default = pkgs.lxd; defaultText = literalExpression "pkgs.lxd"; - description = '' + description = lib.mdDoc '' The LXD package to use. ''; }; @@ -45,7 +45,7 @@ in { type = types.package; default = pkgs.lxc; defaultText = literalExpression "pkgs.lxc"; - description = '' + description = lib.mdDoc '' The LXC package to use with LXD (required for AppArmor profiles). ''; }; @@ -54,7 +54,7 @@ in { type = types.bool; default = config.boot.zfs.enabled; defaultText = literalExpression "config.boot.zfs.enabled"; - description = '' + description = lib.mdDoc '' Enables lxd to use zfs as a storage for containers. This option is enabled by default if a zfs pool is configured @@ -65,7 +65,7 @@ in { recommendedSysctlSettings = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enables various settings to avoid common pitfalls when running containers requiring many file operations. Fixes errors like "Too many open files" or @@ -79,7 +79,7 @@ in { type = types.int; default = 600; apply = toString; - description = '' + description = lib.mdDoc '' Time to wait (in seconds) for LXD to become ready to process requests. If LXD does not reply within the configured time, lxd.service will be considered failed and systemd will attempt to restart it. diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix index b930151571..a4cd41e45d 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/nixos-containers.nix @@ -132,7 +132,7 @@ let # If the host is 64-bit and the container is 32-bit, add a # --personality flag. - ${optionalString (config.nixpkgs.localSystem.system == "x86_64-linux") '' + ${optionalString (pkgs.stdenv.hostPlatform.system == "x86_64-linux") '' if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then extraFlags+=" --personality=x86" fi @@ -293,18 +293,18 @@ let mountPoint = mkOption { example = "/mnt/usb"; type = types.str; - description = "Mount point on the container file system."; + description = lib.mdDoc "Mount point on the container file system."; }; hostPath = mkOption { default = null; example = "/home/alice"; type = types.nullOr types.str; - description = "Location of the host path to be mounted."; + description = lib.mdDoc "Location of the host path to be mounted."; }; isReadOnly = mkOption { default = true; type = types.bool; - description = "Determine whether the mounted path will be accessed in read-only mode."; + description = lib.mdDoc "Determine whether the mounted path will be accessed in read-only mode."; }; }; @@ -319,16 +319,16 @@ let node = mkOption { example = "/dev/net/tun"; type = types.str; - description = "Path to device node"; + description = lib.mdDoc "Path to device node"; }; modifier = mkOption { example = "rw"; type = types.str; - description = '' + description = lib.mdDoc '' Device node access modifier. Takes a combination - r (read), w (write), and - m (mknod). See the - systemd.resource-control(5) man page for more + `r` (read), `w` (write), and + `m` (mknod). See the + `systemd.resource-control(5)` man page for more information.''; }; }; @@ -346,7 +346,7 @@ let type = types.nullOr types.str; default = null; example = "br0"; - description = '' + description = lib.mdDoc '' Put the host-side of the veth-pair into the named bridge. Only one of hostAddress* or hostBridge can be given. ''; @@ -358,22 +358,22 @@ let protocol = mkOption { type = types.str; default = "tcp"; - description = "The protocol specifier for port forwarding between host and container"; + description = lib.mdDoc "The protocol specifier for port forwarding between host and container"; }; hostPort = mkOption { type = types.int; - description = "Source port of the external interface on host"; + description = lib.mdDoc "Source port of the external interface on host"; }; containerPort = mkOption { type = types.nullOr types.int; default = null; - description = "Target port of container"; + description = lib.mdDoc "Target port of container"; }; }; }); default = []; example = [ { protocol = "tcp"; hostPort = 8080; containerPort = 80; } ]; - description = '' + description = lib.mdDoc '' List of forwarded ports from host to container. Each forwarded port is specified by protocol, hostPort and containerPort. By default, protocol is tcp and hostPort and containerPort are assumed to be @@ -386,7 +386,7 @@ let type = types.nullOr types.str; default = null; example = "10.231.136.1"; - description = '' + description = lib.mdDoc '' The IPv4 address assigned to the host interface. (Not used when hostBridge is set.) ''; @@ -396,7 +396,7 @@ let type = types.nullOr types.str; default = null; example = "fc00::1"; - description = '' + description = lib.mdDoc '' The IPv6 address assigned to the host interface. (Not used when hostBridge is set.) ''; @@ -406,7 +406,7 @@ let type = types.nullOr types.str; default = null; example = "10.231.136.2"; - description = '' + description = lib.mdDoc '' The IPv4 address assigned to the interface in the container. If a hostBridge is used, this should be given with netmask to access the whole network. Otherwise the default netmask is /32 and routing is @@ -418,7 +418,7 @@ let type = types.nullOr types.str; default = null; example = "fc00::2"; - description = '' + description = lib.mdDoc '' The IPv6 address assigned to the interface in the container. If a hostBridge is used, this should be given with netmask to access the whole network. Otherwise the default netmask is /128 and routing is @@ -450,7 +450,7 @@ in boot.isContainer = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether this NixOS machine is a lightweight container running in another NixOS system. ''; @@ -459,7 +459,7 @@ in boot.enableContainers = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Whether to enable support for NixOS containers. Defaults to true (at no cost if containers are not actually used). ''; @@ -471,7 +471,7 @@ in { options = { config = mkOption { - description = '' + description = lib.mdDoc '' A specification of the desired configuration of this container, as a NixOS module. ''; @@ -513,9 +513,9 @@ in path = mkOption { type = types.path; example = "/nix/var/nix/profiles/per-container/webserver"; - description = '' + description = lib.mdDoc '' As an alternative to specifying - , you can specify the path to + {option}`config`, you can specify the path to the evaluated NixOS system configuration, typically a symlink to a system profile. ''; @@ -525,7 +525,7 @@ in type = types.listOf types.str; default = []; example = [ "CAP_NET_ADMIN" "CAP_MKNOD" ]; - description = '' + description = lib.mdDoc '' Grant additional capabilities to the container. See the capabilities(7) and systemd-nspawn(1) man pages for more information. @@ -569,21 +569,21 @@ in enableTun = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Allows the container to create and setup tunnel interfaces - by granting the NET_ADMIN capability and - enabling access to /dev/net/tun. + by granting the `NET_ADMIN` capability and + enabling access to `/dev/net/tun`. ''; }; privateNetwork = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to give the container its own private virtual Ethernet interface. The interface is called - eth0, and is hooked up to the interface - ve-container-name + `eth0`, and is hooked up to the interface + `ve-«container-name»` on the host. If this option is not set, then the container shares the network interfaces of the host, and can bind to any port on any interface. @@ -594,7 +594,7 @@ in type = types.listOf types.str; default = []; example = [ "eth1" "eth2" ]; - description = '' + description = lib.mdDoc '' The list of interfaces to be moved into the container. ''; }; @@ -603,7 +603,7 @@ in type = types.listOf types.str; default = []; example = [ "eth1" "eth2" ]; - description = '' + description = lib.mdDoc '' The list of host interfaces from which macvlans will be created. For each interface specified, a macvlan interface will be created and moved to the container. @@ -613,7 +613,7 @@ in extraVeths = mkOption { type = with types; attrsOf (submodule { options = networkOptions; }); default = {}; - description = '' + description = lib.mdDoc '' Extra veth-pairs to be created for the container. ''; }; @@ -621,7 +621,7 @@ in autoStart = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether the container is automatically started at boot-time. ''; }; @@ -648,7 +648,7 @@ in ''; description = - '' + lib.mdDoc '' An extra list of directories that is bound to the container. ''; }; @@ -657,7 +657,7 @@ in type = with types; listOf (submodule allowedDeviceOpts); default = []; example = [ { node = "/dev/net/tun"; modifier = "rw"; } ]; - description = '' + description = lib.mdDoc '' A list of device nodes to which the containers has access to. ''; }; @@ -666,7 +666,7 @@ in type = types.listOf types.str; default = []; example = [ "/var" ]; - description = '' + description = lib.mdDoc '' Mounts a set of tmpfs file systems into the container. Multiple paths can be specified. Valid items must conform to the --tmpfs argument @@ -678,7 +678,7 @@ in type = types.listOf types.str; default = []; example = [ "--drop-capability=CAP_SYS_CHROOT" ]; - description = '' + description = lib.mdDoc '' Extra flags passed to the systemd-nspawn command. See systemd-nspawn(1) for details. ''; @@ -728,12 +728,12 @@ in }; } ''; - description = '' + description = lib.mdDoc '' A set of NixOS system configurations to be run as lightweight containers. Each container appears as a service - container-name + `container-«name»` on the host system, allowing it to be started and stopped via - systemctl. + {command}`systemctl`. ''; }; @@ -742,12 +742,6 @@ in config = mkIf (config.boot.enableContainers) (let - warnings = flatten [ - (optional (config.virtualisation.containers.enable && versionOlder config.system.stateVersion "22.05") '' - Enabling both boot.enableContainers & virtualisation.containers on system.stateVersion < 22.05 is unsupported. - '') - ]; - unit = { description = "Container '%i'"; @@ -771,6 +765,11 @@ in serviceConfig = serviceDirectives dummyConfig; }; in { + warnings = + (optional (config.virtualisation.containers.enable && versionOlder config.system.stateVersion "22.05") '' + Enabling both boot.enableContainers & virtualisation.containers on system.stateVersion < 22.05 is unsupported. + ''); + systemd.targets.multi-user.wants = [ "machines.target" ]; systemd.services = listToAttrs (filter (x: x.value != null) ( diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix b/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix index fa5fe99730..81cdf1dd72 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/oci-containers.nix @@ -14,18 +14,18 @@ let image = mkOption { type = with types; str; - description = "OCI image to run."; + description = lib.mdDoc "OCI image to run."; example = "library/hello-world"; }; imageFile = mkOption { type = with types; nullOr package; default = null; - description = '' + description = lib.mdDoc '' Path to an image file to load before running the image. This can be used to bypass pulling the image from the registry. - The image attribute must match the name and + The `image` attribute must match the name and tag of the image contained in this file, as they will be used to run the container with that image. If they do not match, the image will be pulled from the registry as usual. @@ -38,20 +38,20 @@ let username = mkOption { type = with types; nullOr str; default = null; - description = "Username for login."; + description = lib.mdDoc "Username for login."; }; passwordFile = mkOption { type = with types; nullOr str; default = null; - description = "Path to file containing password."; + description = lib.mdDoc "Path to file containing password."; example = "/etc/nixos/dockerhub-password.txt"; }; registry = mkOption { type = with types; nullOr str; default = null; - description = "Registry where to login to."; + description = lib.mdDoc "Registry where to login to."; example = "https://docker.pkg.github.com"; }; @@ -60,7 +60,7 @@ let cmd = mkOption { type = with types; listOf str; default = []; - description = "Commandline arguments to pass to the image's entrypoint."; + description = lib.mdDoc "Commandline arguments to pass to the image's entrypoint."; example = literalExpression '' ["--port=9000"] ''; @@ -68,7 +68,7 @@ let entrypoint = mkOption { type = with types; nullOr str; - description = "Override the default entrypoint of the image."; + description = lib.mdDoc "Override the default entrypoint of the image."; default = null; example = "/bin/my-app"; }; @@ -76,7 +76,7 @@ let environment = mkOption { type = with types; attrsOf str; default = {}; - description = "Environment variables to set for this container."; + description = lib.mdDoc "Environment variables to set for this container."; example = literalExpression '' { DATABASE_HOST = "db.example.com"; @@ -88,7 +88,7 @@ let environmentFiles = mkOption { type = with types; listOf path; default = []; - description = "Environment files for this container."; + description = lib.mdDoc "Environment files for this container."; example = literalExpression '' [ /path/to/.env @@ -100,15 +100,15 @@ let log-driver = mkOption { type = types.str; default = "journald"; - description = '' + description = lib.mdDoc '' Logging driver for the container. The default of - "journald" means that the container's logs will be + `"journald"` means that the container's logs will be handled as part of the systemd unit. For more details and a full list of logging drivers, refer to respective backends documentation. For Docker: - Docker engine documentation + [Docker engine documentation](https://docs.docker.com/engine/reference/run/#logging-drivers---log-driver) For Podman: Refer to the docker-run(1) man page. @@ -118,49 +118,27 @@ let ports = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Network ports to publish from the container to the outer host. Valid formats: + - `::` + - `::` + - `:` + - `` - - - - <ip>:<hostPort>:<containerPort> - - - - - <ip>::<containerPort> - - - - - <hostPort>:<containerPort> - - - - - <containerPort> - - - - - Both hostPort and - containerPort can be specified as a range of + Both `hostPort` and `containerPort` can be specified as a range of ports. When specifying ranges for both, the number of container ports in the range must match the number of host ports in the - range. Example: 1234-1236:1234-1236/tcp + range. Example: `1234-1236:1234-1236/tcp` - When specifying a range for hostPort only, the - containerPort must not be a - range. In this case, the container port is published somewhere - within the specified hostPort range. Example: - 1234-1236:1234/tcp + When specifying a range for `hostPort` only, the `containerPort` + must *not* be a range. In this case, the container port is published + somewhere within the specified `hostPort` range. + Example: `1234-1236:1234/tcp` Refer to the - - Docker engine documentation for full details. + [Docker engine documentation](https://docs.docker.com/engine/reference/run/#expose-incoming-ports) for full details. ''; example = literalExpression '' [ @@ -172,7 +150,7 @@ let user = mkOption { type = with types; nullOr str; default = null; - description = '' + description = lib.mdDoc '' Override the username or UID (and optionally groupname or GID) used in the container. ''; @@ -182,16 +160,15 @@ let volumes = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' List of volumes to attach to this container. - Note that this is a list of "src:dst" strings to - allow for src to refer to - /nix/store paths, which would be difficult with an - attribute set. There are also a variety of mount options available - as a third field; please refer to the - - docker engine documentation for details. + Note that this is a list of `"src:dst"` strings to + allow for `src` to refer to `/nix/store` paths, which + would be difficult with an attribute set. There are + also a variety of mount options available as a third + field; please refer to the + [docker engine documentation](https://docs.docker.com/engine/reference/run/#volume-shared-filesystems) for details. ''; example = literalExpression '' [ @@ -204,17 +181,17 @@ let workdir = mkOption { type = with types; nullOr str; default = null; - description = "Override the default working directory for the container."; + description = lib.mdDoc "Override the default working directory for the container."; example = "/var/lib/hello_world"; }; dependsOn = mkOption { type = with types; listOf str; default = []; - description = '' + description = lib.mdDoc '' Define which other containers this one depends on. They will be added to both After and Requires for the unit. - Use the same name as the attribute under virtualisation.oci-containers.containers. + Use the same name as the attribute under `virtualisation.oci-containers.containers`. ''; example = literalExpression '' virtualisation.oci-containers.containers = { @@ -229,7 +206,7 @@ let extraOptions = mkOption { type = with types; listOf str; default = []; - description = "Extra options for ${defaultBackend} run."; + description = lib.mdDoc "Extra options for {command}`${defaultBackend} run`."; example = literalExpression '' ["--network=host"] ''; @@ -238,7 +215,7 @@ let autoStart = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' When enabled, the container is automatically started on boot. If this option is set to false, the container has to be started on-demand via its service. ''; @@ -339,13 +316,13 @@ in { backend = mkOption { type = types.enum [ "podman" "docker" ]; default = if versionAtLeast config.system.stateVersion "22.05" then "podman" else "docker"; - description = "The underlying Docker implementation to use."; + description = lib.mdDoc "The underlying Docker implementation to use."; }; containers = mkOption { default = {}; type = types.attrsOf (types.submodule containerOptions); - description = "OCI (Docker) containers to run as systemd services."; + description = lib.mdDoc "OCI (Docker) containers to run as systemd services."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/openstack-options.nix b/third_party/nixpkgs/nixos/modules/virtualisation/openstack-options.nix index cbc779f27c..eded418c9c 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/openstack-options.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/openstack-options.nix @@ -28,13 +28,13 @@ in type = types.attrsOf (types.submodule { options = { mount = lib.mkOption { - description = "Where to mount this dataset."; + description = lib.mdDoc "Where to mount this dataset."; type = types.nullOr types.string; default = null; }; properties = lib.mkOption { - description = "Properties to set on this dataset."; + description = lib.mdDoc "Properties to set on this dataset."; type = types.attrsOf types.string; default = { }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix b/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix index 436a375fb5..32646f60f8 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/openvswitch.nix @@ -13,7 +13,7 @@ in { enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to enable Open vSwitch. A configuration daemon (ovs-server) will be started. ''; @@ -22,9 +22,9 @@ in { resetOnStart = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Whether to reset the Open vSwitch configuration database to a default - configuration on every start of the systemd ovsdb.service. + configuration on every start of the systemd `ovsdb.service`. ''; }; @@ -32,7 +32,7 @@ in { type = types.package; default = pkgs.openvswitch; defaultText = literalExpression "pkgs.openvswitch"; - description = '' + description = lib.mdDoc '' Open vSwitch package to use. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix index 53ad2ac708..d3affe2b8f 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix @@ -14,7 +14,7 @@ in enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' This enables Parallels Tools for Linux guests, along with provided video, mouse and other hardware drivers. ''; @@ -36,7 +36,7 @@ in default = config.boot.kernelPackages.prl-tools; defaultText = "config.boot.kernelPackages.prl-tools"; example = literalExpression "config.boot.kernelPackages.prl-tools"; - description = '' + description = lib.mdDoc '' Defines which package to use for prl-tools. Override to change the version. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix index 361caeff70..1e2f8a7fae 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix @@ -74,7 +74,7 @@ in Podman implements the Docker API. - Users must be in the podman group in order to connect. As + Users must be in the podman group in order to connect. As with Docker, members of this group can gain root access. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman/dnsname.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman/dnsname.nix index beef197550..3e7d35ae1e 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/podman/dnsname.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman/dnsname.nix @@ -16,7 +16,7 @@ in defaultNetwork.dnsname.enable = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Enable DNS resolution in the default podman network. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman/network-socket.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman/network-socket.nix index 94d8da9d2b..5f6ce49355 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/podman/network-socket.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman/network-socket.nix @@ -22,7 +22,7 @@ in with TLS client certificate authentication. This allows Docker clients to connect with the equivalents of the Docker - CLI -H and --tls* family of options. + CLI -H and --tls* family of options. For certificate setup, see https://docs.docker.com/engine/security/protect-access/ diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix index 39273e523e..650fb24191 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-guest-agent.nix @@ -10,13 +10,13 @@ in { enable = mkOption { type = types.bool; default = false; - description = "Whether to enable the qemu guest agent."; + description = lib.mdDoc "Whether to enable the qemu guest agent."; }; package = mkOption { type = types.package; default = pkgs.qemu_kvm.ga; defaultText = literalExpression "pkgs.qemu_kvm.ga"; - description = "The QEMU guest agent package."; + description = lib.mdDoc "The QEMU guest agent package."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix index e87f540fd5..98617a397a 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/qemu-vm.nix @@ -516,12 +516,12 @@ in description = '' Virtual networks to which the VM is connected. Each - number N in this list causes + number «N» in this list causes the VM to have a virtual Ethernet interface attached to a separate virtual network on which it will be assigned IP address - 192.168.N.M, - where M is the index of this VM + 192.168.«N».«M», + where «M» is the index of this VM in the list of VMs. ''; }; @@ -870,7 +870,7 @@ in (mkIf pkgs.stdenv.hostPlatform.isx86 [ "-usb" "-device usb-tablet,bus=usb-bus.0" ]) - (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ + (mkIf pkgs.stdenv.hostPlatform.isAarch [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" ]) (let diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix b/third_party/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix index 255327f262..ab2b058c68 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/spice-usb-redirection.nix @@ -3,7 +3,7 @@ options.virtualisation.spiceUSBRedirection.enable = lib.mkOption { type = lib.types.bool; default = false; - description = '' + description = lib.mdDoc '' Install the SPICE USB redirection helper with setuid privileges. This allows unprivileged users to pass USB devices connected to this machine to libvirt VMs, both local and diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix index 7b55b3b975..94f70c6543 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-guest.nix @@ -19,13 +19,13 @@ in enable = mkOption { default = false; type = types.bool; - description = "Whether to enable the VirtualBox service and other guest additions."; + description = lib.mdDoc "Whether to enable the VirtualBox service and other guest additions."; }; x11 = mkOption { default = true; type = types.bool; - description = "Whether to enable x11 graphics"; + description = lib.mdDoc "Whether to enable x11 graphics"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix index 2acf54aae2..4e47febed1 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-host.nix @@ -44,7 +44,7 @@ in type = types.package; default = pkgs.virtualbox; defaultText = literalExpression "pkgs.virtualbox"; - description = '' + description = lib.mdDoc '' Which VirtualBox package to use. ''; }; @@ -52,7 +52,7 @@ in addNetworkInterface = mkOption { type = types.bool; default = true; - description = '' + description = lib.mdDoc '' Automatically set up a vboxnet0 host-only network interface. ''; }; @@ -75,7 +75,7 @@ in headless = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Use VirtualBox installation without GUI and Qt dependency. Useful to enable on servers and when virtual machines are controlled only via SSH. ''; @@ -84,7 +84,7 @@ in enableWebService = mkOption { type = types.bool; default = false; - description = '' + description = lib.mdDoc '' Build VirtualBox web service tool (vboxwebsrv) to allow managing VMs via other webpage frontend tools. Useful for headless servers. ''; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix index 1a0c4df42c..0c095c01ad 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/virtualbox-image.nix @@ -14,42 +14,42 @@ in { type = with types; either (enum [ "auto" ]) int; default = "auto"; example = 50 * 1024; - description = '' + description = lib.mdDoc '' The size of the VirtualBox base image in MiB. ''; }; baseImageFreeSpace = mkOption { type = with types; int; default = 30 * 1024; - description = '' + description = lib.mdDoc '' Free space in the VirtualBox base image in MiB. ''; }; memorySize = mkOption { type = types.int; default = 1536; - description = '' + description = lib.mdDoc '' The amount of RAM the VirtualBox appliance can use in MiB. ''; }; vmDerivationName = mkOption { type = types.str; default = "nixos-ova-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}"; - description = '' + description = lib.mdDoc '' The name of the derivation for the VirtualBox appliance. ''; }; vmName = mkOption { type = types.str; default = "NixOS ${config.system.nixos.label} (${pkgs.stdenv.hostPlatform.system})"; - description = '' + description = lib.mdDoc '' The name of the VirtualBox appliance. ''; }; vmFileName = mkOption { type = types.str; default = "nixos-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.ova"; - description = '' + description = lib.mdDoc '' The file name of the VirtualBox appliance. ''; }; @@ -60,10 +60,10 @@ in { rtcuseutc = "on"; usb = "off"; }; - description = '' + description = lib.mdDoc '' Parameters passed to the Virtualbox appliance. - Run VBoxManage modifyvm --help to see more options. + Run `VBoxManage modifyvm --help` to see more options. ''; }; exportParams = mkOption { @@ -72,14 +72,14 @@ in { "--vsys" "0" "--vendor" "ACME Inc." ]; default = []; - description = '' + description = lib.mdDoc '' Parameters passed to the Virtualbox export command. - Run VBoxManage export --help to see more options. + Run `VBoxManage export --help` to see more options. ''; }; extraDisk = mkOption { - description = '' + description = lib.mdDoc '' Optional extra disk/hdd configuration. The disk will be an 'ext4' partition on a separate VMDK file. ''; @@ -93,16 +93,16 @@ in { options = { size = mkOption { type = types.int; - description = "Size in MiB"; + description = lib.mdDoc "Size in MiB"; }; label = mkOption { type = types.str; default = "vm-extra-storage"; - description = "Label for the disk partition"; + description = lib.mdDoc "Label for the disk partition"; }; mountPoint = mkOption { type = types.str; - description = "Path where to mount this disk."; + description = lib.mdDoc "Path where to mount this disk."; }; }; }); diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix index d468a20087..61ff9da65a 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/vmware-guest.nix @@ -17,7 +17,7 @@ in headless = mkOption { type = types.bool; default = false; - description = "Whether to disable X11-related features."; + description = lib.mdDoc "Whether to disable X11-related features."; }; }; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/vmware-host.nix b/third_party/nixpkgs/nixos/modules/virtualisation/vmware-host.nix index faa0d455c9..b4869f0210 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/vmware-host.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/vmware-host.nix @@ -41,18 +41,18 @@ in type = types.package; default = pkgs.vmware-workstation; defaultText = literalExpression "pkgs.vmware-workstation"; - description = "VMware host virtualisation package to use"; + description = lib.mdDoc "VMware host virtualisation package to use"; }; extraPackages = mkOption { type = with types; listOf package; default = with pkgs; [ ]; - description = "Extra packages to be used with VMware host."; + description = lib.mdDoc "Extra packages to be used with VMware host."; example = "with pkgs; [ ntfs3g ]"; }; extraConfig = mkOption { type = types.lines; default = ""; - description = "Add extra config to /etc/vmware/config"; + description = lib.mdDoc "Add extra config to /etc/vmware/config"; example = '' # Allow unsupported device's OpenGL and Vulkan acceleration for guest vGPU mks.gl.allowUnsupportedDrivers = "TRUE" diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/waydroid.nix b/third_party/nixpkgs/nixos/modules/virtualisation/waydroid.nix index 2c0b658948..84abf60658 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/waydroid.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/waydroid.nix @@ -34,7 +34,7 @@ in system.requiredKernelConfig = with config.lib.kernelConfig; [ (isEnabled "ANDROID_BINDER_IPC") (isEnabled "ANDROID_BINDERFS") - (isEnabled "ASHMEM") + (isEnabled "ASHMEM") # FIXME Needs memfd support instead on Linux 5.18 and waydroid 1.2.1 ]; /* NOTE: we always enable this flag even if CONFIG_PSI_DEFAULT_DISABLED is not on diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix index a999efcb44..25d06e3c72 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/xen-dom0.nix @@ -37,7 +37,7 @@ in type = types.package; defaultText = literalExpression "pkgs.xen"; example = literalExpression "pkgs.xen-light"; - description = '' + description = lib.mdDoc '' The package used for Xen binary. ''; relatedPackages = [ "xen" "xen-light" ]; @@ -47,7 +47,7 @@ in type = types.package; defaultText = literalExpression "pkgs.xen"; example = literalExpression "pkgs.qemu_xen-light"; - description = '' + description = lib.mdDoc '' The package with qemu binaries for dom0 qemu and xendomains. ''; relatedPackages = [ "xen" @@ -59,7 +59,7 @@ in mkOption { default = []; type = types.listOf types.str; - description = + description = lib.mdDoc '' Parameters passed to the Xen hypervisor at boot time. ''; @@ -70,7 +70,7 @@ in default = 0; example = 512; type = types.addCheck types.int (n: n >= 0); - description = + description = lib.mdDoc '' Amount of memory (in MiB) allocated to Domain 0 on boot. If set to 0, all memory is assigned to Domain 0. @@ -81,7 +81,7 @@ in name = mkOption { default = "xenbr0"; type = types.str; - description = '' + description = lib.mdDoc '' Name of bridge the Xen domUs connect to. ''; }; @@ -89,7 +89,7 @@ in address = mkOption { type = types.str; default = "172.16.0.1"; - description = '' + description = lib.mdDoc '' IPv4 address of the bridge. ''; }; @@ -97,9 +97,9 @@ in prefixLength = mkOption { type = types.addCheck types.int (n: n >= 0 && n <= 32); default = 16; - description = '' + description = lib.mdDoc '' Subnet mask of the bridge interface, specified as the number of - bits in the prefix (24). + bits in the prefix (`24`). A DHCP server will provide IP addresses for the whole, remaining subnet. ''; @@ -108,8 +108,8 @@ in forwardDns = mkOption { type = types.bool; default = false; - description = '' - If set to true, the DNS queries from the + description = lib.mdDoc '' + If set to `true`, the DNS queries from the hosts connected to the bridge will be forwarded to the DNS servers specified in /etc/resolv.conf . ''; @@ -120,7 +120,7 @@ in virtualisation.xen.stored = mkOption { type = types.path; - description = + description = lib.mdDoc '' Xen Store daemon to use. Defaults to oxenstored of the xen package. ''; @@ -130,7 +130,7 @@ in extraConfig = mkOption { type = types.lines; default = ""; - description = + description = lib.mdDoc '' Options defined here will override the defaults for xendomains. The default options can be seen in the file included from diff --git a/third_party/nixpkgs/nixos/release-combined.nix b/third_party/nixpkgs/nixos/release-combined.nix index 7f81ca1c69..e8677f7e1e 100644 --- a/third_party/nixpkgs/nixos/release-combined.nix +++ b/third_party/nixpkgs/nixos/release-combined.nix @@ -43,7 +43,7 @@ in rec { name = "nixos-${nixos.channel.version}"; meta = { description = "Release-critical builds for the NixOS channel"; - maintainers = with pkgs.lib.maintainers; [ eelco fpletz ]; + maintainers = with pkgs.lib.maintainers; [ eelco ]; }; constituents = pkgs.lib.concatLists [ [ "nixos.channel" ] diff --git a/third_party/nixpkgs/nixos/tests/airsonic.nix b/third_party/nixpkgs/nixos/tests/airsonic.nix index 2f60c56f64..69f979726b 100644 --- a/third_party/nixpkgs/nixos/tests/airsonic.nix +++ b/third_party/nixpkgs/nixos/tests/airsonic.nix @@ -15,7 +15,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = '' def airsonic_is_up(_) -> bool: - return machine.succeed("curl --fail http://localhost:4040/login") + status, _ = machine.execute("curl --fail http://localhost:4040/login") + return status == 0 machine.start() diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 03a7f17c07..affb179a92 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -127,6 +127,7 @@ in { docker-tools-cross = handleTestOn ["x86_64-linux" "aarch64-linux"] ./docker-tools-cross.nix {}; docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {}; documize = handleTest ./documize.nix {}; + documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; }; doh-proxy-rust = handleTest ./doh-proxy-rust.nix {}; dokuwiki = handleTest ./dokuwiki.nix {}; domination = handleTest ./domination.nix {}; @@ -254,7 +255,7 @@ in { jibri = handleTest ./jibri.nix {}; jirafeau = handleTest ./jirafeau.nix {}; jitsi-meet = handleTest ./jitsi-meet.nix {}; - k3s-single-node = handleTest ./k3s-single-node.nix {}; + k3s = handleTest ./k3s {}; kafka = handleTest ./kafka.nix {}; kanidm = handleTest ./kanidm.nix {}; kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {}; @@ -282,6 +283,7 @@ in { libuiohook = handleTest ./libuiohook.nix {}; lidarr = handleTest ./lidarr.nix {}; lightdm = handleTest ./lightdm.nix {}; + lighttpd = handleTest ./lighttpd.nix {}; limesurvey = handleTest ./limesurvey.nix {}; litestream = handleTest ./litestream.nix {}; locate = handleTest ./locate.nix {}; @@ -522,6 +524,7 @@ in { starship = handleTest ./starship.nix {}; step-ca = handleTestOn ["x86_64-linux"] ./step-ca.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; + stunnel = handleTest ./stunnel.nix {}; sudo = handleTest ./sudo.nix {}; swap-partition = handleTest ./swap-partition.nix {}; sway = handleTest ./sway.nix {}; @@ -535,6 +538,7 @@ in { systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {}; systemd-boot = handleTest ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; + systemd-coredump = handleTest ./systemd-coredump.nix {}; systemd-cryptenroll = handleTest ./systemd-cryptenroll.nix {}; systemd-escaping = handleTest ./systemd-escaping.nix {}; systemd-initrd-btrfs-raid = handleTest ./systemd-initrd-btrfs-raid.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/convos.nix b/third_party/nixpkgs/nixos/tests/convos.nix index cc0c2e7589..a5dafed8f6 100644 --- a/third_party/nixpkgs/nixos/tests/convos.nix +++ b/third_party/nixpkgs/nixos/tests/convos.nix @@ -24,7 +24,7 @@ in testScript = '' machine.wait_for_unit("convos") machine.wait_for_open_port(${toString port}) - machine.succeed("journalctl -u convos | grep -q 'Listening at.*${toString port}'") + machine.succeed("journalctl -u convos | grep -q 'application available at.*${toString port}'") machine.succeed("curl -f http://localhost:${toString port}/") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/couchdb.nix b/third_party/nixpkgs/nixos/tests/couchdb.nix index 453f5dcd66..b57072d6be 100644 --- a/third_party/nixpkgs/nixos/tests/couchdb.nix +++ b/third_party/nixpkgs/nixos/tests/couchdb.nix @@ -20,7 +20,7 @@ with lib; { name = "couchdb"; meta = with pkgs.lib.maintainers; { - maintainers = [ fpletz ]; + maintainers = [ ]; }; nodes = { diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix index 99a968f17a..d76f70b791 100644 --- a/third_party/nixpkgs/nixos/tests/docker-tools.nix +++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix @@ -346,7 +346,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker load --input='${examples.layeredImageWithFakeRootCommands}'" ) docker.succeed( - "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" + "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/alice | grep -E ^1000$'" ) with subtest("Ensure docker load on merged images loads all of the constituent images"): @@ -389,7 +389,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker load --input='${examples.mergedBashFakeRoot}'" ) docker.succeed( - "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/jane | grep -E ^1000$'" + "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} sh -c 'stat -c '%u' /home/alice | grep -E ^1000$'" ) with subtest("The image contains store paths referenced by the fakeRootCommands output"): diff --git a/third_party/nixpkgs/nixos/tests/documize.nix b/third_party/nixpkgs/nixos/tests/documize.nix index 528bf5338c..fda79b1a09 100644 --- a/third_party/nixpkgs/nixos/tests/documize.nix +++ b/third_party/nixpkgs/nixos/tests/documize.nix @@ -47,9 +47,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { " --data 'dbhash={}'" " --data 'title=NixOS'" " --data 'message=Docs'" - " --data 'firstname=John'" - " --data 'lastname=Doe'" - " --data 'email=john.doe@nixos.org'" + " --data 'firstname=Bob'" + " --data 'lastname=Foobar'" + " --data 'email=bob.foobar@nixos.org'" " --data 'password=verysafe'" " -f localhost:3000/api/setup" ).format(dbhash) diff --git a/third_party/nixpkgs/nixos/tests/firefox.nix b/third_party/nixpkgs/nixos/tests/firefox.nix index 9bb78a97f3..3f9cea6662 100644 --- a/third_party/nixpkgs/nixos/tests/firefox.nix +++ b/third_party/nixpkgs/nixos/tests/firefox.nix @@ -8,7 +8,7 @@ let firefoxPackage' = firefoxPackage.override (args: { in { - name = firefoxPackage'.unwrapped.binaryName; + name = firefoxPackage'.unwrapped.pname; meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; diff --git a/third_party/nixpkgs/nixos/tests/hadoop/default.nix b/third_party/nixpkgs/nixos/tests/hadoop/default.nix index d2a97cbeff..479690adc0 100644 --- a/third_party/nixpkgs/nixos/tests/hadoop/default.nix +++ b/third_party/nixpkgs/nixos/tests/hadoop/default.nix @@ -4,4 +4,5 @@ all = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hadoop.nix { inherit package; }; hdfs = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hdfs.nix { inherit package; }; yarn = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./yarn.nix { inherit package; }; + hbase = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./hbase.nix { inherit package; }; } diff --git a/third_party/nixpkgs/nixos/tests/hadoop/hbase.nix b/third_party/nixpkgs/nixos/tests/hadoop/hbase.nix new file mode 100644 index 0000000000..d9d2dac0f6 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/hadoop/hbase.nix @@ -0,0 +1,84 @@ +# Test a minimal hbase cluster +{ pkgs, ... }: +import ../make-test-python.nix ({ hadoop ? pkgs.hadoop, hbase ? pkgs.hbase, ... }: +with pkgs.lib; +{ + name = "hadoop-hbase"; + + nodes = let + coreSite = { + "fs.defaultFS" = "hdfs://namenode:8020"; + }; + defOpts = { + enable = true; + openFirewall = true; + }; + zookeeperQuorum = "zookeeper"; + in { + zookeeper = { ... }: { + services.zookeeper.enable = true; + networking.firewall.allowedTCPPorts = [ 2181 ]; + }; + namenode = { ... }: { + services.hadoop = { + hdfs = { + namenode = defOpts // { formatOnInit = true; }; + }; + inherit coreSite; + }; + }; + datanode = { ... }: { + virtualisation.diskSize = 8192; + services.hadoop = { + hdfs.datanode = defOpts; + inherit coreSite; + }; + }; + + master = { ... }:{ + services.hadoop = { + inherit coreSite; + hbase = { + inherit zookeeperQuorum; + master = defOpts // { initHDFS = true; }; + }; + }; + }; + regionserver = { ... }:{ + services.hadoop = { + inherit coreSite; + hbase = { + inherit zookeeperQuorum; + regionServer = defOpts; + }; + }; + }; + }; + + testScript = '' + start_all() + + # wait for HDFS cluster + namenode.wait_for_unit("hdfs-namenode") + namenode.wait_for_unit("network.target") + namenode.wait_for_open_port(8020) + namenode.wait_for_open_port(9870) + datanode.wait_for_unit("hdfs-datanode") + datanode.wait_for_unit("network.target") + datanode.wait_for_open_port(9864) + datanode.wait_for_open_port(9866) + datanode.wait_for_open_port(9867) + + # wait for ZK + zookeeper.wait_for_unit("zookeeper") + zookeeper.wait_for_open_port(2181) + + # wait for HBase to start up + master.wait_for_unit("hbase-master") + regionserver.wait_for_unit("hbase-regionserver") + + assert "1 active master, 0 backup masters, 1 servers" in master.succeed("echo status | HADOOP_USER_NAME=hbase hbase shell -n") + regionserver.wait_until_succeeds("echo \"create 't1','f1'\" | HADOOP_USER_NAME=hbase hbase shell -n") + assert "NAME => 'f1'" in regionserver.succeed("echo \"describe 't1'\" | HADOOP_USER_NAME=hbase hbase shell -n") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/hadoop/yarn.nix b/third_party/nixpkgs/nixos/tests/hadoop/yarn.nix index 1bf8e3831f..08c8ff857d 100644 --- a/third_party/nixpkgs/nixos/tests/hadoop/yarn.nix +++ b/third_party/nixpkgs/nixos/tests/hadoop/yarn.nix @@ -19,7 +19,7 @@ import ../make-test-python.nix ({ package, ... }: { enable = true; openFirewall = true; }; - yarnSite = options.services.hadoop.yarnSite.default // { + yarnSite = { "yarn.resourcemanager.hostname" = "resourcemanager"; "yarn.nodemanager.log-dirs" = "/tmp/userlogs"; }; diff --git a/third_party/nixpkgs/nixos/tests/hbase.nix b/third_party/nixpkgs/nixos/tests/hbase.nix index a449d24dd6..7d8e32f816 100644 --- a/third_party/nixpkgs/nixos/tests/hbase.nix +++ b/third_party/nixpkgs/nixos/tests/hbase.nix @@ -1,6 +1,6 @@ import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.hbase, ... }: { - name = "hbase"; + name = "hbase-standalone"; meta = with lib.maintainers; { maintainers = [ illustris ]; @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, lib, package ? pkgs.hbase, ... }: nodes = { hbase = { pkgs, ... }: { - services.hbase = { + services.hbase-standalone = { enable = true; inherit package; # Needed for standalone mode in hbase 2+ diff --git a/third_party/nixpkgs/nixos/tests/jenkins.nix b/third_party/nixpkgs/nixos/tests/jenkins.nix index 63b5860f0d..3f111426db 100644 --- a/third_party/nixpkgs/nixos/tests/jenkins.nix +++ b/third_party/nixpkgs/nixos/tests/jenkins.nix @@ -81,7 +81,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { in '' start_all() - master.wait_for_unit("jenkins") + master.wait_for_unit("default.target") assert "Authentication required" in master.succeed("curl http://localhost:8080") @@ -96,8 +96,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { with subtest("jobs are declarative"): # Check that jobs are created on disk. - master.wait_for_unit("jenkins-job-builder") - master.wait_until_fails("systemctl is-active jenkins-job-builder") master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/job-1/config.xml") master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/config.xml") master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") @@ -115,8 +113,6 @@ import ./make-test-python.nix ({ pkgs, ...} : { ) # Check that jobs are removed from disk. - master.wait_for_unit("jenkins-job-builder") - master.wait_until_fails("systemctl is-active jenkins-job-builder") master.wait_until_fails("test -f /var/lib/jenkins/jobs/job-1/config.xml") master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/config.xml") master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") diff --git a/third_party/nixpkgs/nixos/tests/k3s/default.nix b/third_party/nixpkgs/nixos/tests/k3s/default.nix new file mode 100644 index 0000000000..07d93c41c7 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/k3s/default.nix @@ -0,0 +1,9 @@ +{ system ? builtins.currentSystem +, pkgs ? import ../../.. { inherit system; } +}: +{ + # Run a single node k3s cluster and verify a pod can run + single-node = import ./single-node.nix { inherit system pkgs; }; + # Run a multi-node k3s cluster and verify pod networking works across nodes + multi-node = import ./multi-node.nix { inherit system pkgs; }; +} diff --git a/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix b/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix new file mode 100644 index 0000000000..afb8c78f23 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/k3s/multi-node.nix @@ -0,0 +1,137 @@ +import ../make-test-python.nix ({ pkgs, ... }: + let + imageEnv = pkgs.buildEnv { + name = "k3s-pause-image-env"; + paths = with pkgs; [ tini bashInteractive coreutils socat ]; + }; + pauseImage = pkgs.dockerTools.streamLayeredImage { + name = "test.local/pause"; + tag = "local"; + contents = imageEnv; + config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ]; + }; + # A daemonset that responds 'server' on port 8000 + networkTestDaemonset = pkgs.writeText "test.yml" '' + apiVersion: apps/v1 + kind: DaemonSet + metadata: + name: test + labels: + name: test + spec: + selector: + matchLabels: + name: test + template: + metadata: + labels: + name: test + spec: + containers: + - name: test + image: test.local/pause:local + imagePullPolicy: Never + resources: + limits: + memory: 20Mi + command: ["socat", "TCP4-LISTEN:8000,fork", "EXEC:echo server"] + ''; + tokenFile = pkgs.writeText "token" "p@s$w0rd"; + in + { + name = "k3s-multi-node"; + + nodes = { + server = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ gzip jq ]; + # k3s uses enough resources the default vm fails. + virtualisation.memorySize = 1536; + virtualisation.diskSize = 4096; + + services.k3s = { + inherit tokenFile; + enable = true; + role = "server"; + package = pkgs.k3s; + extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local --node-ip 192.168.1.1"; + }; + networking.firewall.allowedTCPPorts = [ 6443 ]; + networking.firewall.allowedUDPPorts = [ 8472 ]; + networking.firewall.trustedInterfaces = [ "flannel.1" ]; + networking.useDHCP = false; + networking.defaultGateway = "192.168.1.1"; + networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + + agent = { pkgs, ... }: { + virtualisation.memorySize = 1024; + virtualisation.diskSize = 2048; + services.k3s = { + inherit tokenFile; + enable = true; + role = "agent"; + serverAddr = "https://192.168.1.1:6443"; + extraFlags = "--pause-image test.local/pause:local --node-ip 192.168.1.2"; + }; + networking.firewall.allowedTCPPorts = [ 6443 ]; + networking.firewall.allowedUDPPorts = [ 8472 ]; + networking.firewall.trustedInterfaces = [ "flannel.1" ]; + networking.useDHCP = false; + networking.defaultGateway = "192.168.1.2"; + networking.interfaces.eth1.ipv4.addresses = pkgs.lib.mkForce [ + { address = "192.168.1.2"; prefixLength = 24; } + ]; + }; + }; + + meta = with pkgs.lib.maintainers; { + maintainers = [ euank ]; + }; + + testScript = '' + start_all() + machines = [server, agent] + for m in machines: + m.wait_for_unit("k3s") + + # wait for the agent to show up + server.wait_until_succeeds("k3s kubectl get node agent") + + for m in machines: + m.succeed("k3s check-config") + m.succeed( + "${pauseImage} | k3s ctr image import -" + ) + + server.succeed("k3s kubectl cluster-info") + # Also wait for our service account to show up; it takes a sec + server.wait_until_succeeds("k3s kubectl get serviceaccount default") + + # Now create a pod on each node via a daemonset and verify they can talk to each other. + server.succeed("k3s kubectl apply -f ${networkTestDaemonset}") + server.wait_until_succeeds(f'[ "$(k3s kubectl get ds test -o json | jq .status.numberReady)" -eq {len(machines)} ]') + + # Get pod IPs + pods = server.succeed("k3s kubectl get po -o json | jq '.items[].metadata.name' -r").splitlines() + pod_ips = [server.succeed(f"k3s kubectl get po {name} -o json | jq '.status.podIP' -cr").strip() for name in pods] + + # Verify each server can ping each pod ip + for pod_ip in pod_ips: + server.succeed(f"ping -c 1 {pod_ip}") + agent.succeed(f"ping -c 1 {pod_ip}") + + # Verify the pods can talk to each other + resp = server.wait_until_succeeds(f"k3s kubectl exec {pods[0]} -- socat TCP:{pod_ips[1]}:8000 -") + assert resp.strip() == "server" + resp = server.wait_until_succeeds(f"k3s kubectl exec {pods[1]} -- socat TCP:{pod_ips[0]}:8000 -") + assert resp.strip() == "server" + + # Cleanup + server.succeed("k3s kubectl delete -f ${networkTestDaemonset}") + + for m in machines: + m.shutdown() + ''; + }) diff --git a/third_party/nixpkgs/nixos/tests/k3s-single-node.nix b/third_party/nixpkgs/nixos/tests/k3s/single-node.nix similarity index 81% rename from third_party/nixpkgs/nixos/tests/k3s-single-node.nix rename to third_party/nixpkgs/nixos/tests/k3s/single-node.nix index fb6510ee08..27e1e455e6 100644 --- a/third_party/nixpkgs/nixos/tests/k3s-single-node.nix +++ b/third_party/nixpkgs/nixos/tests/k3s/single-node.nix @@ -1,5 +1,4 @@ -import ./make-test-python.nix ({ pkgs, ... }: - +import ../make-test-python.nix ({ pkgs, ... }: let imageEnv = pkgs.buildEnv { name = "k3s-pause-image-env"; @@ -11,20 +10,12 @@ import ./make-test-python.nix ({ pkgs, ... }: contents = imageEnv; config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ]; }; - # Don't use the default service account because there's a race where it may - # not be created yet; make our own instead. testPodYaml = pkgs.writeText "test.yml" '' - apiVersion: v1 - kind: ServiceAccount - metadata: - name: test - --- apiVersion: v1 kind: Pod metadata: name: test spec: - serviceAccountName: test containers: - name: test image: test.local/pause:local @@ -66,13 +57,14 @@ import ./make-test-python.nix ({ pkgs, ... }: machine.wait_for_unit("k3s") machine.succeed("k3s kubectl cluster-info") machine.fail("sudo -u noprivs k3s kubectl cluster-info") - # FIXME: this fails with the current nixos kernel config; once it passes, we should uncomment it - # machine.succeed("k3s check-config") + machine.succeed("k3s check-config") machine.succeed( "${pauseImage} | k3s ctr image import -" ) + # Also wait for our service account to show up; it takes a sec + machine.wait_until_succeeds("k3s kubectl get serviceaccount default") machine.succeed("k3s kubectl apply -f ${testPodYaml}") machine.succeed("k3s kubectl wait --for 'condition=Ready' pod/test") machine.succeed("k3s kubectl delete -f ${testPodYaml}") diff --git a/third_party/nixpkgs/nixos/tests/kea.nix b/third_party/nixpkgs/nixos/tests/kea.nix index 6b34589310..b1d5894cc7 100644 --- a/third_party/nixpkgs/nixos/tests/kea.nix +++ b/third_party/nixpkgs/nixos/tests/kea.nix @@ -1,6 +1,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: { meta.maintainers = with lib.maintainers; [ hexa ]; + name = "kea"; + nodes = { router = { config, pkgs, ... }: { virtualisation.vlans = [ 1 ]; diff --git a/third_party/nixpkgs/nixos/tests/lighttpd.nix b/third_party/nixpkgs/nixos/tests/lighttpd.nix new file mode 100644 index 0000000000..36e2745c55 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/lighttpd.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "lighttpd"; + meta.maintainers = with lib.maintainers; [ bjornfor ]; + + nodes = { + server = { + services.lighttpd.enable = true; + services.lighttpd.document-root = pkgs.runCommand "document-root" {} '' + mkdir -p "$out" + echo "hello nixos test" > "$out/file.txt" + ''; + }; + }; + + testScript = '' + start_all() + server.wait_for_unit("lighttpd.service") + res = server.succeed("curl --fail http://localhost/file.txt") + assert "hello nixos test" in res, f"bad server response: '{res}'" + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/minecraft-server.nix b/third_party/nixpkgs/nixos/tests/minecraft-server.nix index dbe2cd6d56..a51b36ff53 100644 --- a/third_party/nixpkgs/nixos/tests/minecraft-server.nix +++ b/third_party/nixpkgs/nixos/tests/minecraft-server.nix @@ -33,5 +33,6 @@ in import ./make-test-python.nix ({ pkgs, ... }: { assert "${seed}" in server.succeed( "mcrcon -H localhost -P ${toString rcon-port} -p '${rcon-pass}' -c 'seed'" ) + server.succeed("systemctl stop minecraft-server") ''; }) diff --git a/third_party/nixpkgs/nixos/tests/networking.nix b/third_party/nixpkgs/nixos/tests/networking.nix index a00ff165d4..71b82b8712 100644 --- a/third_party/nixpkgs/nixos/tests/networking.nix +++ b/third_party/nixpkgs/nixos/tests/networking.nix @@ -682,6 +682,46 @@ let client2.succeed("ip addr show dev vlan >&2") ''; }; + vlan-ping = let + baseIP = number: "10.10.10.${number}"; + vlanIP = number: "10.1.1.${number}"; + baseInterface = "eth1"; + vlanInterface = "vlan42"; + node = number: {pkgs, ... }: with pkgs.lib; { + virtualisation.vlans = [ 1 ]; + networking = { + #useNetworkd = networkd; + useDHCP = false; + vlans.${vlanInterface} = { id = 42; interface = baseInterface; }; + interfaces.${baseInterface}.ipv4.addresses = mkOverride 0 [{ address = baseIP number; prefixLength = 24; }]; + interfaces.${vlanInterface}.ipv4.addresses = mkOverride 0 [{ address = vlanIP number; prefixLength = 24; }]; + }; + }; + + serverNodeNum = "1"; + clientNodeNum = "2"; + + in { + name = "vlan-ping"; + nodes.server = node serverNodeNum; + nodes.client = node clientNodeNum; + testScript = { ... }: + '' + start_all() + + with subtest("Wait for networking to be configured"): + server.wait_for_unit("network.target") + client.wait_for_unit("network.target") + + with subtest("Test ping on base interface in setup"): + client.succeed("ping -I ${baseInterface} -c 1 ${baseIP serverNodeNum}") + server.succeed("ping -I ${baseInterface} -c 1 ${baseIP clientNodeNum}") + + with subtest("Test ping on vlan subinterface in setup"): + client.succeed("ping -I ${vlanInterface} -c 1 ${vlanIP serverNodeNum}") + server.succeed("ping -I ${vlanInterface} -c 1 ${vlanIP clientNodeNum}") + ''; + }; virtual = { name = "Virtual"; nodes.machine = { diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix index 45165b04bf..9e378fe6a5 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/default.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/default.nix @@ -16,6 +16,10 @@ foldl inherit system pkgs; nextcloudVersion = ver; }; + "with-declarative-redis-and-secrets${toString ver}" = import ./with-declarative-redis-and-secrets.nix { + inherit system pkgs; + nextcloudVersion = ver; + }; }) { } [ 23 24 ] diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix new file mode 100644 index 0000000000..fda05bacb4 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix @@ -0,0 +1,118 @@ +import ../make-test-python.nix ({ pkgs, ...}: let + adminpass = "hunter2"; + adminuser = "custom-admin-username"; +in { + name = "nextcloud-with-declarative-redis"; + meta = with pkgs.lib.maintainers; { + maintainers = [ eqyiel ]; + }; + + nodes = { + # The only thing the client needs to do is download a file. + client = { ... }: {}; + + nextcloud = { config, pkgs, ... }: { + networking.firewall.allowedTCPPorts = [ 80 ]; + + services.nextcloud = { + enable = true; + hostName = "nextcloud"; + caching = { + apcu = false; + redis = true; + memcached = false; + }; + config = { + dbtype = "pgsql"; + dbname = "nextcloud"; + dbuser = "nextcloud"; + dbhost = "/run/postgresql"; + inherit adminuser; + adminpassFile = toString (pkgs.writeText "admin-pass-file" '' + ${adminpass} + ''); + }; + secretFile = "/etc/nextcloud-secrets.json"; + + extraOptions.redis = { + host = "/run/redis/redis.sock"; + port = 0; + dbindex = 0; + timeout = 1.5; + # password handled via secretfile below + }; + extraOptions.memcache = { + local = "\OC\Memcache\Redis"; + locking = "\OC\Memcache\Redis"; + }; + }; + + services.redis = { + enable = true; + }; + + systemd.services.nextcloud-setup= { + requires = ["postgresql.service"]; + after = [ + "postgresql.service" + ]; + }; + + services.postgresql = { + enable = true; + ensureDatabases = [ "nextcloud" ]; + ensureUsers = [ + { name = "nextcloud"; + ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + } + ]; + }; + + # This file is meant to contain secret options which should + # not go into the nix store. Here it is just used to set the + # databyse type to postgres. + environment.etc."nextcloud-secrets.json".text = '' + { + "redis": { + "password": "secret" + } + } + ''; + }; + }; + + testScript = let + withRcloneEnv = pkgs.writeScript "with-rclone-env" '' + #!${pkgs.runtimeShell} + export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav + export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/" + export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" + export RCLONE_CONFIG_NEXTCLOUD_USER="${adminuser}" + export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" + "''${@}" + ''; + copySharedFile = pkgs.writeScript "copy-shared-file" '' + #!${pkgs.runtimeShell} + echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file + ''; + + diffSharedFile = pkgs.writeScript "diff-shared-file" '' + #!${pkgs.runtimeShell} + diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) + ''; + in '' + start_all() + nextcloud.wait_for_unit("multi-user.target") + nextcloud.succeed("curl -sSf http://nextcloud/login") + nextcloud.succeed( + "${withRcloneEnv} ${copySharedFile}" + ) + client.wait_for_unit("multi-user.target") + client.succeed( + "${withRcloneEnv} ${diffSharedFile}" + ) + + # redis cache should not be empty + nextcloud.fail("redis-cli KEYS * | grep -q 'empty array'") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/nginx-auth.nix b/third_party/nixpkgs/nixos/tests/nginx-auth.nix index c0d24a20dd..a85426dda8 100644 --- a/third_party/nixpkgs/nixos/tests/nginx-auth.nix +++ b/third_party/nixpkgs/nixos/tests/nginx-auth.nix @@ -13,14 +13,14 @@ import ./make-test-python.nix ({ pkgs, ... }: { virtualHosts.lockedroot = { inherit root; - basicAuth.alice = "jane"; + basicAuth.alice = "pwofa"; }; virtualHosts.lockedsubdir = { inherit root; locations."/sublocation/" = { alias = "${root}/"; - basicAuth.bob = "john"; + basicAuth.bob = "pwofb"; }; }; }; @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { webserver.fail("curl --fail --resolve lockedroot:80:127.0.0.1 http://lockedroot") webserver.succeed( - "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:jane@lockedroot" + "curl --fail --resolve lockedroot:80:127.0.0.1 http://alice:pwofa@lockedroot" ) webserver.succeed("curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir") @@ -41,7 +41,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://lockedsubdir/sublocation/index.html" ) webserver.succeed( - "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:john@lockedsubdir/sublocation/index.html" + "curl --fail --resolve lockedsubdir:80:127.0.0.1 http://bob:pwofb@lockedsubdir/sublocation/index.html" ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/nginx-etag.nix b/third_party/nixpkgs/nixos/tests/nginx-etag.nix index b69511d081..6f45eacf8b 100644 --- a/third_party/nixpkgs/nixos/tests/nginx-etag.nix +++ b/third_party/nixpkgs/nixos/tests/nginx-etag.nix @@ -53,14 +53,14 @@ import ./make-test-python.nix { driver.implicitly_wait(20) driver.get('http://server/') - driver.find_element_by_xpath('//div[@foo="bar"]') + driver.find_element('xpath', '//div[@foo="bar"]') open('/tmp/passed_stage1', 'w') while not os.path.exists('/tmp/proceed'): time.sleep(0.5) driver.get('http://server/') - driver.find_element_by_xpath('//div[@foo="yay"]') + driver.find_element('xpath', '//div[@foo="yay"]') open('/tmp/passed', 'w') ''; in [ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ]; diff --git a/third_party/nixpkgs/nixos/tests/openldap.nix b/third_party/nixpkgs/nixos/tests/openldap.nix index 3c388119d5..075bb5d1f6 100644 --- a/third_party/nixpkgs/nixos/tests/openldap.nix +++ b/third_party/nixpkgs/nixos/tests/openldap.nix @@ -1,9 +1,4 @@ -{ pkgs ? (import ../.. { inherit system; config = { }; }) -, system ? builtins.currentSystem -, ... -}: - -let +import ./make-test-python.nix ({ pkgs, ... }: let dbContents = '' dn: dc=example objectClass: domain @@ -13,118 +8,149 @@ let objectClass: organizationalUnit ou: users ''; - testScript = '' - machine.wait_for_unit("openldap.service") - machine.succeed( - 'ldapsearch -LLL -D "cn=root,dc=example" -w notapassword -b "dc=example"', - ) - ''; -in { - # New-style configuration - current = import ./make-test-python.nix ({ pkgs, ... }: { - inherit testScript; - name = "openldap"; - nodes.machine = { pkgs, ... }: { - environment.etc."openldap/root_password".text = "notapassword"; - services.openldap = { - enable = true; - settings = { - children = { - "cn=schema".includes = [ - "${pkgs.openldap}/etc/schema/core.ldif" - "${pkgs.openldap}/etc/schema/cosine.ldif" - "${pkgs.openldap}/etc/schema/inetorgperson.ldif" - "${pkgs.openldap}/etc/schema/nis.ldif" - ]; - "olcDatabase={1}mdb" = { - # This tests string, base64 and path values, as well as lists of string values - attrs = { - objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; - olcDatabase = "{1}mdb"; - olcDbDirectory = "/var/db/openldap"; - olcSuffix = "dc=example"; - olcRootDN = { - # cn=root,dc=example - base64 = "Y249cm9vdCxkYz1leGFtcGxl"; - }; - olcRootPW = { - path = "/etc/openldap/root_password"; - }; + ldifConfig = '' + dn: cn=config + cn: config + objectClass: olcGlobal + olcLogLevel: stats + + dn: cn=schema,cn=config + cn: schema + objectClass: olcSchemaConfig + + include: file://${pkgs.openldap}/etc/schema/core.ldif + include: file://${pkgs.openldap}/etc/schema/cosine.ldif + include: file://${pkgs.openldap}/etc/schema/inetorgperson.ldif + + dn: olcDatabase={0}config,cn=config + olcDatabase: {0}config + objectClass: olcDatabaseConfig + olcRootDN: cn=root,cn=config + olcRootPW: configpassword + + dn: olcDatabase={1}mdb,cn=config + objectClass: olcDatabaseConfig + objectClass: olcMdbConfig + olcDatabase: {1}mdb + olcDbDirectory: /var/db/openldap + olcDbIndex: objectClass eq + olcSuffix: dc=example + olcRootDN: cn=root,dc=example + olcRootPW: notapassword + ''; + + ldapClientConfig = { + enable = true; + loginPam = false; + nsswitch = false; + server = "ldap://"; + base = "dc=example"; + }; + +in { + name = "openldap"; + + nodes.machine = { pkgs, ... }: { + environment.etc."openldap/root_password".text = "notapassword"; + + users.ldap = ldapClientConfig; + + services.openldap = { + enable = true; + urlList = [ "ldapi:///" "ldap://" ]; + settings = { + children = { + "cn=schema".includes = [ + "${pkgs.openldap}/etc/schema/core.ldif" + "${pkgs.openldap}/etc/schema/cosine.ldif" + "${pkgs.openldap}/etc/schema/inetorgperson.ldif" + "${pkgs.openldap}/etc/schema/nis.ldif" + ]; + "olcDatabase={0}config" = { + attrs = { + objectClass = [ "olcDatabaseConfig" ]; + olcDatabase = "{0}config"; + olcRootDN = "cn=root,cn=config"; + olcRootPW = "configpassword"; + }; + }; + "olcDatabase={1}mdb" = { + # This tests string, base64 and path values, as well as lists of string values + attrs = { + objectClass = [ "olcDatabaseConfig" "olcMdbConfig" ]; + olcDatabase = "{1}mdb"; + olcDbDirectory = "/var/lib/openldap/db"; + olcSuffix = "dc=example"; + olcRootDN = { + # cn=root,dc=example + base64 = "Y249cm9vdCxkYz1leGFtcGxl"; + }; + olcRootPW = { + path = "/etc/openldap/root_password"; }; }; }; }; - declarativeContents."dc=example" = dbContents; - }; - }; - }) { inherit pkgs system; }; - - # Old-style configuration - oldOptions = import ./make-test-python.nix ({ pkgs, ... }: { - inherit testScript; - name = "openldap"; - - nodes.machine = { pkgs, ... }: { - services.openldap = { - enable = true; - logLevel = "stats acl"; - defaultSchemas = true; - database = "mdb"; - suffix = "dc=example"; - rootdn = "cn=root,dc=example"; - rootpw = "notapassword"; - declarativeContents."dc=example" = dbContents; - }; - }; - }) { inherit system pkgs; }; - - # Manually managed configDir, for example if dynamic config is essential - manualConfigDir = import ./make-test-python.nix ({ pkgs, ... }: { - name = "openldap"; - - nodes.machine = { pkgs, ... }: { - services.openldap = { - enable = true; - configDir = "/var/db/slapd.d"; }; }; - testScript = let - contents = pkgs.writeText "data.ldif" dbContents; - config = pkgs.writeText "config.ldif" '' - dn: cn=config - cn: config - objectClass: olcGlobal - olcLogLevel: stats - olcPidFile: /run/slapd/slapd.pid + specialisation = { + declarativeContents.configuration = { ... }: { + services.openldap.declarativeContents."dc=example" = dbContents; + }; + mutableConfig.configuration = { ... }: { + services.openldap = { + declarativeContents."dc=example" = dbContents; + mutableConfig = true; + }; + }; + manualConfigDir = { + inheritParentConfig = false; + configuration = { ... }: { + users.ldap = ldapClientConfig; + services.openldap = { + enable = true; + configDir = "/var/db/slapd.d"; + }; + }; + }; + }; + }; + testScript = { nodes, ... }: let + specializations = "${nodes.machine.config.system.build.toplevel}/specialisation"; + changeRootPw = '' + dn: olcDatabase={1}mdb,cn=config + changetype: modify + replace: olcRootPW + olcRootPW: foobar + ''; + in '' + # Test startup with empty DB + machine.wait_for_unit("openldap.service") - dn: cn=schema,cn=config - cn: schema - objectClass: olcSchemaConfig + with subtest("declarative contents"): + machine.succeed('${specializations}/declarativeContents/bin/switch-to-configuration test') + machine.wait_for_unit("openldap.service") + machine.succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword') + machine.fail('ldapmodify -D cn=root,cn=config -w configpassword -f ${pkgs.writeText "rootpw.ldif" changeRootPw}') - include: file://${pkgs.openldap}/etc/schema/core.ldif - include: file://${pkgs.openldap}/etc/schema/cosine.ldif - include: file://${pkgs.openldap}/etc/schema/inetorgperson.ldif + with subtest("mutable config"): + machine.succeed('${specializations}/mutableConfig/bin/switch-to-configuration test') + machine.succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword') + machine.succeed('ldapmodify -D cn=root,cn=config -w configpassword -f ${pkgs.writeText "rootpw.ldif" changeRootPw}') + machine.succeed('ldapsearch -LLL -D "cn=root,dc=example" -w foobar') - dn: olcDatabase={1}mdb,cn=config - objectClass: olcDatabaseConfig - objectClass: olcMdbConfig - olcDatabase: {1}mdb - olcDbDirectory: /var/db/openldap - olcDbIndex: objectClass eq - olcSuffix: dc=example - olcRootDN: cn=root,dc=example - olcRootPW: notapassword - ''; - in '' + with subtest("manual config dir"): machine.succeed( - "mkdir -p /var/db/slapd.d /var/db/openldap", - "slapadd -F /var/db/slapd.d -n0 -l ${config}", - "slapadd -F /var/db/slapd.d -n1 -l ${contents}", - "chown -R openldap:openldap /var/db/slapd.d /var/db/openldap", - "systemctl restart openldap", + 'mkdir /var/db/slapd.d /var/db/openldap', + 'slapadd -F /var/db/slapd.d -n0 -l ${pkgs.writeText "config.ldif" ldifConfig}', + 'slapadd -F /var/db/slapd.d -n1 -l ${pkgs.writeText "contents.ldif" dbContents}', + 'chown -R openldap:openldap /var/db/slapd.d /var/db/openldap', + '${specializations}/manualConfigDir/bin/switch-to-configuration test', ) - '' + testScript; - }) { inherit system pkgs; }; -} + machine.succeed('ldapsearch -LLL -D "cn=root,dc=example" -w notapassword') + machine.succeed('ldapmodify -D cn=root,cn=config -w configpassword -f ${pkgs.writeText "rootpw.ldif" changeRootPw}') + machine.succeed('ldapsearch -LLL -D "cn=root,dc=example" -w foobar') + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/podgrab.nix b/third_party/nixpkgs/nixos/tests/podgrab.nix index e5a340dc2a..dc9dfebaf4 100644 --- a/third_party/nixpkgs/nixos/tests/podgrab.nix +++ b/third_party/nixpkgs/nixos/tests/podgrab.nix @@ -22,11 +22,11 @@ import ./make-test-python.nix ({ pkgs, ... }: { start_all() default.wait_for_unit("podgrab") - default.wait_for_open_port(defaultPort) + default.wait_for_open_port(${toString defaultPort}) default.succeed("curl --fail http://localhost:${toString defaultPort}") customized.wait_for_unit("podgrab") - customized.wait_for_open_port(customPort) + customized.wait_for_open_port(${toString customPort}) customized.succeed("curl --fail http://localhost:${toString customPort}") ''; diff --git a/third_party/nixpkgs/nixos/tests/polaris.nix b/third_party/nixpkgs/nixos/tests/polaris.nix index 62f0fb6a9c..fb2e67f075 100644 --- a/third_party/nixpkgs/nixos/tests/polaris.nix +++ b/third_party/nixpkgs/nixos/tests/polaris.nix @@ -24,7 +24,7 @@ with lib; testScript = '' machine.wait_for_unit("polaris.service") - machine.wait_for_open_port("5050") + machine.wait_for_open_port(5050) machine.succeed("curl http://localhost:5050/api/version") machine.succeed("curl -X GET http://localhost:5050/api/initial_setup -H 'accept: application/json' | jq -e '.has_any_users == true'") ''; diff --git a/third_party/nixpkgs/nixos/tests/privacyidea.nix b/third_party/nixpkgs/nixos/tests/privacyidea.nix index fb072514dd..401ad72c37 100644 --- a/third_party/nixpkgs/nixos/tests/privacyidea.nix +++ b/third_party/nixpkgs/nixos/tests/privacyidea.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : rec { name = "privacyidea"; meta = with pkgs.lib.maintainers; { - maintainers = [ fpletz ]; + maintainers = [ ]; }; nodes.machine = { ... }: { diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index a3092d101d..4fdff7dbda 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -35,7 +35,7 @@ let * }; * exporterTest = '' * wait_for_unit("prometheus--exporter.service") - * wait_for_open_port("1234") + * wait_for_open_port(1234) * succeed("curl -sSf 'localhost:1234/metrics'") * ''; * }; @@ -557,10 +557,12 @@ let systemd.services.prometheus-mail-exporter = { after = [ "postfix.service" ]; requires = [ "postfix.service" ]; - preStart = '' - mkdir -p -m 0700 mail-exporter/new - ''; serviceConfig = { + ExecStartPre = [ + "${pkgs.writeShellScript "create-maildir" '' + mkdir -p -m 0700 mail-exporter/new + ''}" + ]; ProtectHome = true; ReadOnlyPaths = "/"; ReadWritePaths = "/var/spool/mail"; @@ -1061,7 +1063,7 @@ let }; exporterTest = '' wait_for_unit("prometheus-smartctl-exporter.service") - wait_for_open_port("9633") + wait_for_open_port(9633) wait_until_succeeds( "curl -sSf 'localhost:9633/metrics'" ) @@ -1179,21 +1181,21 @@ let enable = true; extraFlags = [ - "--collector.enable-restart-count" + "--systemd.collector.enable-restart-count" ]; }; metricProvider = { }; exporterTest = '' wait_for_unit("prometheus-systemd-exporter.service") wait_for_open_port(9558) - succeed( + wait_until_succeeds( "curl -sSf localhost:9558/metrics | grep '{}'".format( 'systemd_unit_state{name="basic.target",state="active",type="target"} 1' ) ) succeed( "curl -sSf localhost:9558/metrics | grep '{}'".format( - 'systemd_service_restart_total{state="prometheus-systemd-exporter.service"} 0' + 'systemd_service_restart_total{name="prometheus-systemd-exporter.service"} 0' ) ) ''; diff --git a/third_party/nixpkgs/nixos/tests/restic.nix b/third_party/nixpkgs/nixos/tests/restic.nix index 7523d5e5ed..75fffe9d9a 100644 --- a/third_party/nixpkgs/nixos/tests/restic.nix +++ b/third_party/nixpkgs/nixos/tests/restic.nix @@ -63,6 +63,12 @@ import ./make-test-python.nix ( inherit repository passwordFile; pruneOpts = [ "--keep-last 1" ]; }; + custompackage = { + inherit repository passwordFile paths; + package = pkgs.writeShellScriptBin "restic" '' + echo "$@" >> /tmp/fake-restic.log; + ''; + }; }; environment.sessionVariables.RCLONE_CONFIG_LOCAL_TYPE = "local"; @@ -76,6 +82,7 @@ import ./make-test-python.nix ( "${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots", '${pkgs.restic}/bin/restic --repository-file ${repositoryFile} -p ${passwordFile} snapshots"', "${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots", + "grep 'backup .* /opt' /tmp/fake-restic.log", ) server.succeed( "mkdir -p /opt", @@ -89,6 +96,8 @@ import ./make-test-python.nix ( '${pkgs.restic}/bin/restic -r ${repository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', '${pkgs.restic}/bin/restic --repository-file ${repositoryFile} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', '${pkgs.restic}/bin/restic -r ${rcloneRepository} -p ${passwordFile} snapshots -c | grep -e "^1 snapshot"', + "systemctl start restic-backups-custompackage.service", + "grep 'backup .* /opt' /tmp/fake-restic.log", "timedatectl set-time '2017-12-13 13:45'", "systemctl start restic-backups-remotebackup.service", "rm /opt/backupCleanupCommand", diff --git a/third_party/nixpkgs/nixos/tests/signal-desktop.nix b/third_party/nixpkgs/nixos/tests/signal-desktop.nix index fbe9cdf84d..5e2b648c7c 100644 --- a/third_party/nixpkgs/nixos/tests/signal-desktop.nix +++ b/third_party/nixpkgs/nixos/tests/signal-desktop.nix @@ -60,7 +60,7 @@ in { ) # Only SQLCipher should be able to read the encrypted DB: machine.fail( - "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .databases'" + "su - alice -c 'sqlite3 ~/.config/Signal/sql/db.sqlite .tables'" ) print(machine.succeed( "su - alice -c 'sqlcipher ~/.config/Signal/sql/db.sqlite'" diff --git a/third_party/nixpkgs/nixos/tests/stunnel.nix b/third_party/nixpkgs/nixos/tests/stunnel.nix new file mode 100644 index 0000000000..22c087290f --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/stunnel.nix @@ -0,0 +1,174 @@ +{ system ? builtins.currentSystem, config ? { } +, pkgs ? import ../.. { inherit system config; } }: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +let + stunnelCommon = { + services.stunnel = { + enable = true; + user = "stunnel"; + }; + users.groups.stunnel = { }; + users.users.stunnel = { + isSystemUser = true; + group = "stunnel"; + }; + }; + makeCert = { config, pkgs, ... }: { + system.activationScripts.create-test-cert = stringAfter [ "users" ] '' + ${pkgs.openssl}/bin/openssl req -batch -x509 -newkey rsa -nodes -out /test-cert.pem -keyout /test-key.pem -subj /CN=${config.networking.hostName} + ( umask 077; cat /test-key.pem /test-cert.pem > /test-key-and-cert.pem ) + chown stunnel /test-key.pem /test-key-and-cert.pem + ''; + }; + serverCommon = { pkgs, ... }: { + networking.firewall.allowedTCPPorts = [ 443 ]; + services.stunnel.servers.https = { + accept = "443"; + connect = 80; + cert = "/test-key-and-cert.pem"; + }; + systemd.services.simple-webserver = { + wantedBy = [ "multi-user.target" ]; + script = '' + cd /etc/webroot + ${pkgs.python3}/bin/python -m http.server 80 + ''; + }; + }; + copyCert = src: dest: filename: '' + from shlex import quote + ${src}.wait_for_file("/test-key-and-cert.pem") + server_cert = ${src}.succeed("cat /test-cert.pem") + ${dest}.succeed("echo %s > ${filename}" % quote(server_cert)) + ''; + +in { + basicServer = makeTest { + name = "basicServer"; + + nodes = { + client = { }; + server = { + imports = [ makeCert serverCommon stunnelCommon ]; + environment.etc."webroot/index.html".text = "well met"; + }; + }; + + testScript = '' + start_all() + + ${copyCert "server" "client" "/authorized-server-cert.crt"} + + server.wait_for_unit("simple-webserver") + server.wait_for_unit("stunnel") + + client.succeed("curl --fail --cacert /authorized-server-cert.crt https://server/ > out") + client.succeed('[[ "$(< out)" == "well met" ]]') + ''; + }; + + serverAndClient = makeTest { + name = "serverAndClient"; + + nodes = { + client = { + imports = [ stunnelCommon ]; + services.stunnel.clients = { + httpsClient = { + accept = "80"; + connect = "server:443"; + CAFile = "/authorized-server-cert.crt"; + }; + httpsClientWithHostVerify = { + accept = "81"; + connect = "server:443"; + CAFile = "/authorized-server-cert.crt"; + verifyHostname = "server"; + }; + httpsClientWithHostVerifyFail = { + accept = "82"; + connect = "server:443"; + CAFile = "/authorized-server-cert.crt"; + verifyHostname = "wronghostname"; + }; + }; + }; + server = { + imports = [ makeCert serverCommon stunnelCommon ]; + environment.etc."webroot/index.html".text = "hello there"; + }; + }; + + testScript = '' + start_all() + + ${copyCert "server" "client" "/authorized-server-cert.crt"} + + server.wait_for_unit("simple-webserver") + server.wait_for_unit("stunnel") + + # In case stunnel came up before we got the server's cert copied over + client.succeed("systemctl reload-or-restart stunnel") + + client.succeed("curl --fail http://localhost/ > out") + client.succeed('[[ "$(< out)" == "hello there" ]]') + + client.succeed("curl --fail http://localhost:81/ > out") + client.succeed('[[ "$(< out)" == "hello there" ]]') + + client.fail("curl --fail http://localhost:82/ > out") + client.succeed('[[ "$(< out)" == "" ]]') + ''; + }; + + mutualAuth = makeTest { + name = "mutualAuth"; + + nodes = rec { + client = { + imports = [ makeCert stunnelCommon ]; + services.stunnel.clients.authenticated-https = { + accept = "80"; + connect = "server:443"; + verifyPeer = true; + CAFile = "/authorized-server-cert.crt"; + cert = "/test-cert.pem"; + key = "/test-key.pem"; + }; + }; + wrongclient = client; + server = { + imports = [ makeCert serverCommon stunnelCommon ]; + services.stunnel.servers.https = { + CAFile = "/authorized-client-certs.crt"; + verifyPeer = true; + }; + environment.etc."webroot/index.html".text = "secret handshake"; + }; + }; + + testScript = '' + start_all() + + ${copyCert "server" "client" "/authorized-server-cert.crt"} + ${copyCert "client" "server" "/authorized-client-certs.crt"} + ${copyCert "server" "wrongclient" "/authorized-server-cert.crt"} + + # In case stunnel came up before we got the cross-certs in place + client.succeed("systemctl reload-or-restart stunnel") + server.succeed("systemctl reload-or-restart stunnel") + wrongclient.succeed("systemctl reload-or-restart stunnel") + + server.wait_for_unit("simple-webserver") + client.fail("curl --fail --insecure https://server/ > out") + client.succeed('[[ "$(< out)" == "" ]]') + client.succeed("curl --fail http://localhost/ > out") + client.succeed('[[ "$(< out)" == "secret handshake" ]]') + wrongclient.fail("curl --fail http://localhost/ > out") + wrongclient.succeed('[[ "$(< out)" == "" ]]') + ''; + }; +} diff --git a/third_party/nixpkgs/nixos/tests/sympa.nix b/third_party/nixpkgs/nixos/tests/sympa.nix index 76ca17d0a1..80daa4134f 100644 --- a/third_party/nixpkgs/nixos/tests/sympa.nix +++ b/third_party/nixpkgs/nixos/tests/sympa.nix @@ -13,7 +13,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { webHost = "localhost"; }; }; - listMasters = [ "joe@example.org" ]; + listMasters = [ "bob@example.org" ]; web.enable = true; web.https = false; database = { diff --git a/third_party/nixpkgs/nixos/tests/systemd-coredump.nix b/third_party/nixpkgs/nixos/tests/systemd-coredump.nix new file mode 100644 index 0000000000..6213782087 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/systemd-coredump.nix @@ -0,0 +1,44 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + + crasher = pkgs.writeCBin "crasher" "int main;"; + + commonConfig = { + systemd.services.crasher.serviceConfig = { + ExecStart = "${crasher}/bin/crasher"; + StateDirectory = "crasher"; + WorkingDirectory = "%S/crasher"; + Restart = "no"; + }; + }; + +in + +{ + name = "systemd-coredump"; + meta = with pkgs.lib.maintainers; { + maintainers = [ squalus ]; + }; + + nodes.machine1 = { pkgs, lib, ... }: commonConfig; + nodes.machine2 = { pkgs, lib, ... }: lib.recursiveUpdate commonConfig { + systemd.coredump.enable = false; + systemd.package = pkgs.systemd.override { + withCoredump = false; + }; + }; + + testScript = '' + with subtest("systemd-coredump enabled"): + machine1.wait_for_unit("multi-user.target") + machine1.wait_for_unit("systemd-coredump.socket") + machine1.systemctl("start crasher"); + machine1.wait_until_succeeds("coredumpctl list | grep crasher", timeout=10) + machine1.fail("stat /var/lib/crasher/core") + + with subtest("systemd-coredump disabled"): + machine2.systemctl("start crasher"); + machine2.wait_until_succeeds("stat /var/lib/crasher/core", timeout=10) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix b/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix index ce0c56a360..d4a23877aa 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-machinectl.nix @@ -32,7 +32,6 @@ import ./make-test-python.nix ( # use networkd to obtain systemd network setup networking.useNetworkd = true; networking.useDHCP = false; - services.resolved.enable = false; # open DHCP server on interface to container networking.firewall.trustedInterfaces = [ "ve-+" ]; @@ -64,7 +63,7 @@ import ./make-test-python.nix ( machine.succeed("ping -n -c 1 ${containerName}"); # Test systemd-nspawn uses a user namespace - machine.succeed("test `stat ${containerRoot}/var/empty -c %u%g` != 00"); + machine.succeed("test $(machinectl status ${containerName} | grep 'UID Shift: ' | wc -l) = 1") # Test systemd-nspawn reboot machine.succeed("machinectl shell ${containerName} /run/current-system/sw/bin/reboot"); @@ -76,6 +75,7 @@ import ./make-test-python.nix ( # Test machinectl stop machine.succeed("machinectl stop ${containerName}"); + machine.wait_until_succeeds("test $(systemctl is-active systemd-nspawn@${containerName}) = inactive"); # Show to to delete the container machine.succeed("chattr -i ${containerRoot}/var/empty"); diff --git a/third_party/nixpkgs/nixos/tests/systemd-nspawn.nix b/third_party/nixpkgs/nixos/tests/systemd-nspawn.nix index c2cb92d113..bc77ee2a4d 100644 --- a/third_party/nixpkgs/nixos/tests/systemd-nspawn.nix +++ b/third_party/nixpkgs/nixos/tests/systemd-nspawn.nix @@ -10,8 +10,8 @@ let Key-Length: 1024 Subkey-Type: ELG-E Subkey-Length: 1024 - Name-Real: Joe Tester - Name-Email: joe@foo.bar + Name-Real: Bob Foobar + Name-Email: bob@foo.bar Expire-Date: 0 # Do a commit here, so that we can later print "done" %commit @@ -19,7 +19,7 @@ let EOF gpg --batch --generate-key foo rm $out/S.gpg-agent $out/S.gpg-agent.* - gpg --export joe@foo.bar -a > $out/pubkey.gpg + gpg --export bob@foo.bar -a > $out/pubkey.gpg ''); nspawnImages = (pkgs.runCommand "localhost" { buildInputs = [ pkgs.coreutils pkgs.gnupg ]; } '' diff --git a/third_party/nixpkgs/nixos/tests/vaultwarden.nix b/third_party/nixpkgs/nixos/tests/vaultwarden.nix index 814d8d7c0a..408019666d 100644 --- a/third_party/nixpkgs/nixos/tests/vaultwarden.nix +++ b/third_party/nixpkgs/nixos/tests/vaultwarden.nix @@ -74,7 +74,10 @@ let services.vaultwarden = { enable = true; dbBackend = backend; - config.rocketPort = 80; + config = { + rocketAddress = "0.0.0.0"; + rocketPort = 80; + }; }; networking.firewall.allowedTCPPorts = [ 80 ]; @@ -85,6 +88,8 @@ let { libraries = [ pkgs.python3Packages.selenium ]; } '' + + from selenium.webdriver.common.by import By from selenium.webdriver import Firefox from selenium.webdriver.firefox.options import Options from selenium.webdriver.support.ui import WebDriverWait @@ -101,40 +106,40 @@ let wait.until(EC.title_contains("Create Account")) - driver.find_element_by_css_selector('input#email').send_keys( + driver.find_element(By.CSS_SELECTOR, 'input#email').send_keys( '${userEmail}' ) - driver.find_element_by_css_selector('input#name').send_keys( + driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys( 'A Cat' ) - driver.find_element_by_css_selector('input#masterPassword').send_keys( + driver.find_element(By.CSS_SELECTOR, 'input#masterPassword').send_keys( '${userPassword}' ) - driver.find_element_by_css_selector('input#masterPasswordRetype').send_keys( + driver.find_element(By.CSS_SELECTOR, 'input#masterPasswordRetype').send_keys( '${userPassword}' ) - driver.find_element_by_xpath("//button[contains(., 'Submit')]").click() + driver.find_element(By.XPATH, "//button[contains(., 'Submit')]").click() wait.until_not(EC.title_contains("Create Account")) - driver.find_element_by_css_selector('input#masterPassword').send_keys( + driver.find_element(By.CSS_SELECTOR, 'input#masterPassword').send_keys( '${userPassword}' ) - driver.find_element_by_xpath("//button[contains(., 'Log In')]").click() + driver.find_element(By.XPATH, "//button[contains(., 'Log In')]").click() - wait.until(EC.title_contains("My Vault")) + wait.until(EC.title_contains("Bitwarden Web Vault")) - driver.find_element_by_xpath("//button[contains(., 'Add Item')]").click() + driver.find_element(By.XPATH, "//button[contains(., 'Add Item')]").click() - driver.find_element_by_css_selector('input#name').send_keys( + driver.find_element(By.CSS_SELECTOR, 'input#name').send_keys( 'secrets' ) - driver.find_element_by_css_selector('input#loginPassword').send_keys( + driver.find_element(By.CSS_SELECTOR, 'input#loginPassword').send_keys( '${storedPassword}' ) - driver.find_element_by_xpath("//button[contains(., 'Save')]").click() + driver.find_element(By.XPATH, "//button[contains(., 'Save')]").click() ''; in [ pkgs.firefox-unwrapped pkgs.geckodriver testRunner ]; diff --git a/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix b/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix index 80dfcff2d0..4c009464b7 100644 --- a/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/third_party/nixpkgs/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -6,7 +6,7 @@ let Please find this *really* important attachment. Yours truly, - John + Bob ''; in writeScriptBin "send-message" '' #!${(python3.withPackages (ps: [ ps.slixmpp ])).interpreter} diff --git a/third_party/nixpkgs/nixos/tests/yggdrasil.nix b/third_party/nixpkgs/nixos/tests/yggdrasil.nix index b409d9ed78..b60a0e6b06 100644 --- a/third_party/nixpkgs/nixos/tests/yggdrasil.nix +++ b/third_party/nixpkgs/nixos/tests/yggdrasil.nix @@ -42,7 +42,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { services.yggdrasil = { enable = true; - config = { + settings = { Listen = ["tcp://0.0.0.0:12345"]; MulticastInterfaces = [ ]; }; @@ -112,7 +112,7 @@ in import ./make-test-python.nix ({ pkgs, ...} : { services.yggdrasil = { enable = true; denyDhcpcdInterfaces = [ "ygg0" ]; - config = { + settings = { IfTAPMode = true; IfName = "ygg0"; MulticastInterfaces = [ "eth1" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix index 757c3dcf5d..0c5523c0a3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/amberol/default.nix @@ -19,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.8.1"; + version = "0.9.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - hash = "sha256-27jXpx79JNF5FjVKERNrQFS7VHZHWh57jjBWvX5IRio="; + hash = "sha256-/kZYzUzycHKre6/dvZgeqXu6mrkblftV51Z7866fZVY="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-M5T+imP7up3RRiXOJRrqimcjs8r81V5jfQMjR02skko="; + hash = "sha256-1+RWL9MD6aX+zI2rtQUQCqemCephLKGEAf5xNCb+jo4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch b/third_party/nixpkgs/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch new file mode 100644 index 0000000000..49f1208eb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch @@ -0,0 +1,25 @@ +From b64b03be9edf23a80fce0c76de61ffff0914ddce Mon Sep 17 00:00:00 2001 +From: Thiago Kenji Okada +Date: Mon, 8 Aug 2022 10:28:33 +0100 +Subject: [PATCH] Set plugindir to $PREFIX/lib/audacious + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3f7996f72..ab09d6476 100644 +--- a/meson.build ++++ b/meson.build +@@ -160,7 +160,7 @@ if (cxx.has_header('libintl.h')) + endif + + +-install_plugindir = audacious_dep.get_variable(pkgconfig: 'plugin_dir') ++install_plugindir = join_paths(get_option('prefix'), 'lib/audacious') + + + conf.set_quoted('INSTALL_PLUGINDIR', install_plugindir) +-- +2.36.0 + diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacious/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacious/default.nix index 7ccdc4eced..eb404041d9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacious/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacious/default.nix @@ -1,15 +1,16 @@ -{ - mkDerivation, lib, fetchurl, fetchpatch, - gettext, pkg-config, - qtbase, - alsa-lib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b, - libcddb, libcdio, libcdio-paranoia, libcue, libjack2, libmad, libmms, libmodplug, - libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp, - libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr, - wavpack, libopenmpt +{ lib +, stdenv +, audacious-plugins +, fetchurl +, gettext +, meson +, ninja +, pkg-config +, qtbase +, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "audacious"; version = "4.2"; @@ -17,54 +18,39 @@ mkDerivation rec { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; sha256 = "sha256-/rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM="; }; - pluginsSrc = fetchurl { - url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8="; - }; - nativeBuildInputs = [ gettext pkg-config ]; - - buildInputs = [ - # Core dependencies - qtbase - - # Plugin dependencies - alsa-lib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb - libcdio libcdio-paranoia libcue libjack2 libmad libmms libmodplug libmowgli - libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile - libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack - libopenmpt + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + wrapQtAppsHook ]; - configureFlags = [ "--disable-gtk" ]; + buildInputs = [ + qtbase + ]; - # Here we build both audacious and audacious-plugins in one - # derivation, since they really expect to be in the same prefix. - # This is slighly tricky. - builder = builtins.toFile "builder.sh" '' - # First build audacious. - ( - source $stdenv/setup - genericBuild - ) - # Then build the plugins. - ( - nativeBuildInputs="$out $nativeBuildInputs" # to find audacious - source $stdenv/setup - rm -rfv audacious-* - src=$pluginsSrc - genericBuild - ) + mesonFlags = [ + "-Dgtk=false" + "-Dbuildstamp=NixOS" + ]; + + postInstall = lib.optionalString (audacious-plugins != null) '' + ln -s ${audacious-plugins}/lib/audacious $out/lib ''; meta = with lib; { - description = "Audio player"; + description = "A lightweight and versatile audio player"; homepage = "https://audacious-media-player.org/"; - maintainers = with maintainers; [ eelco ramkromberg ttuegel ]; + maintainers = with maintainers; [ eelco ramkromberg ttuegel thiagokokada ]; platforms = with platforms; linux; license = with licenses; [ - bsd2 bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING - gpl2 gpl3 lgpl2Plus #http://redmine.audacious-media-player.org/issues/46 + bsd2 + bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING + gpl2 + gpl3 + lgpl2Plus #http://redmine.audacious-media-player.org/issues/46 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacious/plugins.nix b/third_party/nixpkgs/pkgs/applications/audio/audacious/plugins.nix new file mode 100644 index 0000000000..9021404653 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/audacious/plugins.nix @@ -0,0 +1,111 @@ +{ stdenv +, fetchurl +, alsa-lib +, audacious +, curl +, faad2 +, ffmpeg +, flac +, fluidsynth +, gdk-pixbuf +, gettext +, lame +, libbs2b +, libcddb +, libcdio +, libcdio-paranoia +, libcue +, libjack2 +, libmad +, libmms +, libmodplug +, libmowgli +, libnotify +, libogg +, libopenmpt +, libpulseaudio +, libsamplerate +, libsidplayfp +, libsndfile +, libvorbis +, libxml2 +, lirc +, meson +, mpg123 +, neon +, ninja +, pkg-config +, qtbase +, qtmultimedia +, qtx11extras +, soxr +, wavpack +}: + +stdenv.mkDerivation rec { + pname = "audacious-plugins"; + version = "4.2"; + + src = fetchurl { + url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; + sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8="; + }; + + patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; + + nativeBuildInputs = [ + gettext + meson + ninja + pkg-config + ]; + + buildInputs = [ + audacious + alsa-lib + curl + faad2 + ffmpeg + flac + fluidsynth + gdk-pixbuf + lame + libbs2b + libcddb + libcdio + libcdio-paranoia + libcue + libjack2 + libmad + libmms + libmodplug + libmowgli + libnotify + libogg + libpulseaudio + libsamplerate + libsidplayfp + libsndfile + libvorbis + libxml2 + lirc + mpg123 + neon + qtbase + qtmultimedia + qtx11extras + soxr + wavpack + libopenmpt + ]; + + mesonFlags = [ + "-Dgtk=false" + ]; + + dontWrapQtApps = true; + + meta = audacious.meta // { + description = "Plugins for Audacious music player"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix index 653d5555eb..953e9887f5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/audacity/default.nix @@ -167,6 +167,9 @@ in stdenv.mkDerivation rec { "-DDISABLE_DYNAMIC_LOADING_FFMPEG=ON" "-Daudacity_conan_enabled=Off" "-Daudacity_use_ffmpeg=loaded" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; doCheck = false; # Test fails diff --git a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix index b2cce97bbc..7408f57a1a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bambootracker/default.nix @@ -12,14 +12,14 @@ mkDerivation rec { pname = "bambootracker"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "BambooTracker"; repo = "BambooTracker"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "1mpbvhsmrn0wdmxfp3n5dwv4474qlhy47r3vwc2jwdslq6vgl1fa"; + sha256 = "sha256-AEELUJYiapF/sBWRXXuBXUHwnKp0szdIOCNVMYufv94="; }; nativeBuildInputs = [ qmake qttools pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 2f177c2f8c..2ad0b6bf6a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.2.3"; + version = "4.3.4"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-UCafrjrEwwHkhPum7sTOjtXzy7PNeK5/aeKg+b3CGJU="; + sha256 = "sha256-2CCxpQPZB5F5jwJCux1OqGuxCuFZus5vlCrmStmI0F8="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix b/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix index f09a9169c9..4cef30602a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/cardinal/default.nix @@ -21,12 +21,12 @@ stdenv.mkDerivation rec { pname = "cardinal"; - version = "22.06"; + version = "22.07"; src = fetchurl { url = "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz"; - sha256 = "sha256-h7pNoLpB7XkWHZUCQfvJsSnOn37DcP9xuH9kxtfmCos="; + sha256 = "sha256-4PpqGfycIwJ7g7gnogPYUO1BnlW7dkwYzw/9QV3R3+g="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix index 9e4e6a2880..291c3875ce 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/carla/default.nix @@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null; stdenv.mkDerivation rec { pname = "carla"; - version = "2.4.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "falkTX"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FAQTIM5NpcOhLNMf62qiKaxg6QtK5uIJF/XT6KJVnUc="; + sha256 = "sha256-KcwEuiy58wjTr+RWPmpMaPgM0olzxiWp9MMYiKwmIcI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix index 46b801bba3..aa3162df91 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/easyeffects/default.nix @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { pname = "easyeffects"; - version = "6.2.6"; + version = "6.2.8"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; rev = "v${version}"; - sha256 = "sha256-1kXYh2Qk0Wj0LgHTcRVAKro7LAPV/UM5i9VmHjmxTx0="; + sha256 = "sha256-iADECt0m74Irm3JEQgZVLCr6Z2SKATAh9SvPwzd7HCo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix b/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix index eb6dd47105..5ac4e1cbf4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/exaile/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals documentationSupport [ help2man python3.pkgs.sphinx - python3.pkgs.sphinx_rtd_theme + python3.pkgs.sphinx-rtd-theme ] ++ lib.optional translationSupport gettext; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix index fd6726e9ac..7aef140da6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fdkaac/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdkaac"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "nu774"; repo = pname; rev = "v${version}"; - sha256 = "tHhICq/FzbkvWkDdNzGqGoo7nIDb+DJXmkFwtPIA89c="; + sha256 = "sha256-7a8JlQtMGuMWgU/HePd31/EvtBNc2tBMz8V8NQivuNo="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix index 1e55dbe8f8..45b25ec3d8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/fluidsynth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fluidsynth"; - version = "2.2.5"; + version = "2.2.8"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; rev = "v${version}"; - sha256 = "sha256-aR8TLxl6OziP+DMSNro0DB/UtvzXDeDYQ3o/iy70XD4="; + sha256 = "sha256-zJMe2skFeXhrAx9vBcTXWJLfivI/iXyc0JFlNKpBETQ="; }; nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index addc931352..f6a1ef821b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.55"; + version = "1.56"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "sha256-qk6SHL9K4+9Em1jjrPOm14msOoqRiAahlRoiRiAMLC0="; + sha256 = "sha256-kSnsep6abE07Q1EpGEeX8e/2APc60TxR2MhLZxqW9WY="; }; # Adapt the linux-only CMakeLists to darwin (more reliable than make-macos.sh) diff --git a/third_party/nixpkgs/pkgs/applications/audio/in-formant/default.nix b/third_party/nixpkgs/pkgs/applications/audio/in-formant/default.nix index 7cf0fb8c14..5fb36b0345 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/in-formant/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/in-formant/default.nix @@ -35,6 +35,9 @@ stdenv.mkDerivation rec { cp in-formant $out/bin ''; + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; + meta = with lib; { description = "A real-time pitch and formant tracking software"; homepage = "https://github.com/in-formant/in-formant"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/jellycli/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jellycli/default.nix index ec60998ec8..3654eacfbd 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/jellycli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/jellycli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1awzcxnf175a794rhzbmqxxjss77mfa1yrr0wgdxaivrlkibxjys"; }; - vendorSha256 = "02fwsnrhj09m0aa199plpqlsjrwpmrk4c80fszzm07s5vmjqvnfy"; + vendorHash = "sha256-3tmNZd1FH1D/1w4gRmaul2epKb70phSUAjUBCbPV3Ak="; patches = [ # Fixes log file path for tests. diff --git a/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix b/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix index 37bb05d903..b496138408 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/kid3/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "kid3"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-N/HDwfJn7Py4y/GZcIDbeoMEqG+SuRGO23ITZMot8cc="; + sha256 = "sha256-R4Xv+PmzKZQF1tFtSQTFjaisGug2EKM6mPVoGutNnok="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix index 8b6e1c7aa4..9557aa65c1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lollypop/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.4.31"; + version = "1.4.34"; format = "other"; doCheck = false; @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "sha256-kWqTDhk7QDmN0yr6x8ER5oHkUAkP3i5yOabnNXSHSqA="; + sha256 = "sha256-nkrnmpM/mVrXVGkfwzmbSxsO1L890LgsjxSXAYjevCs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/lv2lint/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lv2lint/default.nix index ada996866c..e643343d8b 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/lv2lint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/lv2lint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lv2lint"; - version = "0.14.0"; + version = "0.16.2"; src = fetchurl { url = "https://git.open-music-kontrollers.ch/lv2/${pname}/snapshot/${pname}-${version}.tar.xz"; - sha256 = "sha256-yPKM7RToLNBT+AXSjfxxpncESmv89/wcGCt//pnEGqI="; + sha256 = "sha256-sjgQVx8uGNPWcUwKzGUhChpfzXj/8D8cggVTpcHEXPQ="; }; nativeBuildInputs = [ pkg-config meson ninja ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix index 6f518dac9c..679062fccf 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "1885qxyfkpslzk0aaaaws0x73b10h9nbr04jkk7xhkya25gf280m"; + sha256 = "sha256-Dj8yPmuEtDVgu6Gm6aEY+dgJ0dtwB8RPg9EuaVAsiIs="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/midi-trigger/default.nix b/third_party/nixpkgs/pkgs/applications/audio/midi-trigger/default.nix new file mode 100644 index 0000000000..9fcf49e5ae --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/midi-trigger/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, lv2 }: + +stdenv.mkDerivation rec { + pname = "midi-trigger"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "unclechu"; + repo = "MIDI-Trigger"; + rev = "v${version}"; + sha256 = "sha256-tMnN8mTd6Bm46ZIDy0JPSVe77xCZws2XwQLQexDWPgU="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ lv2 ]; + + makeFlags = [ + "CXX=cc" + "BUILD_DIR=." + ]; + + installPhase = '' + mkdir -p "$out/lib/lv2" + mv midi-trigger.lv2 "$out/lib/lv2" + ''; + + meta = with lib; { + homepage = "https://github.com/unclechu/MIDI-Trigger"; + description = "LV2 plugin which generates MIDI notes by detected audio signal peaks"; + maintainers = with maintainers; [ unclechu ]; + license = licenses.gpl3Only; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix index 8b1acc9d0b..ce12b239e5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mixxx/default.nix @@ -53,13 +53,13 @@ mkDerivation rec { pname = "mixxx"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = version; - sha256 = "sha256-EnOO5OGcaIITqfF9gpGktarzYOx128C1M2VmYNzdRsA="; + sha256 = "sha256-NRtrEobdJMFgDXrEeb2t1zeVN8pQP7+pda2DSU/yNX8="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -117,7 +117,7 @@ mkDerivation rec { # mixxx installs udev rules to DATADIR instead of SYSCONFDIR # let's disable this and install udev rules manually via postInstall - # see https://github.com/mixxxdj/mixxx/blob/2.3.2/CMakeLists.txt#L1381-L1392 + # see https://github.com/mixxxdj/mixxx/blob/2.3.3/CMakeLists.txt#L1381-L1392 cmakeFlags = [ "-DINSTALL_USER_UDEV_RULES=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix index 4abf799d01..bd524b6d93 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/moc/default.nix @@ -24,11 +24,7 @@ , withDebug ? false }: -let - opt = lib.optional; - mkFlag = c: f: if c then "--with-${f}" else "--without-${f}"; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "moc"; version = "2.5.2"; @@ -39,56 +35,56 @@ in stdenv.mkDerivation rec { }; patches = [] - ++ opt ffmpegSupport ./moc-ffmpeg4.patch - ++ opt pulseSupport ./pulseaudio.patch; + ++ lib.optional ffmpegSupport ./moc-ffmpeg4.patch + ++ lib.optional pulseSupport ./pulseaudio.patch; nativeBuildInputs = [ pkg-config ] - ++ opt pulseSupport autoreconfHook; + ++ lib.optional pulseSupport autoreconfHook; buildInputs = [ ncurses db popt libtool ] # Sound sub-systems - ++ opt alsaSupport alsa-lib - ++ opt pulseSupport libpulseaudio - ++ opt jackSupport libjack2 + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseSupport libpulseaudio + ++ lib.optional jackSupport libjack2 # Audio formats - ++ opt (aacSupport || mp3Support) libid3tag - ++ opt aacSupport faad2 - ++ opt flacSupport flac - ++ opt midiSupport timidity - ++ opt modplugSupport libmodplug - ++ opt mp3Support libmad + ++ lib.optional (aacSupport || mp3Support) libid3tag + ++ lib.optional aacSupport faad2 + ++ lib.optional flacSupport flac + ++ lib.optional midiSupport timidity + ++ lib.optional modplugSupport libmodplug + ++ lib.optional mp3Support libmad ++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ] - ++ opt vorbisSupport libvorbis - ++ opt speexSupport speex - ++ opt ffmpegSupport ffmpeg - ++ opt sndfileSupport libsndfile - ++ opt wavpackSupport wavpack + ++ lib.optional vorbisSupport libvorbis + ++ lib.optional speexSupport speex + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional sndfileSupport libsndfile + ++ lib.optional wavpackSupport wavpack # Misc - ++ opt curlSupport curl - ++ opt samplerateSupport libsamplerate + ++ lib.optional curlSupport curl + ++ lib.optional samplerateSupport libsamplerate ++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; configureFlags = [ # Sound sub-systems - (mkFlag alsaSupport "alsa") - (mkFlag pulseSupport "pulse") - (mkFlag jackSupport "jack") - (mkFlag ossSupport "oss") + (lib.withFeature alsaSupport "alsa") + (lib.withFeature pulseSupport "pulse") + (lib.withFeature jackSupport "jack") + (lib.withFeature ossSupport "oss") # Audio formats - (mkFlag aacSupport "aac") - (mkFlag flacSupport "flac") - (mkFlag midiSupport "timidity") - (mkFlag modplugSupport "modplug") - (mkFlag mp3Support "mp3") - (mkFlag musepackSupport "musepack") - (mkFlag vorbisSupport "vorbis") - (mkFlag speexSupport "speex") - (mkFlag ffmpegSupport "ffmpeg") - (mkFlag sndfileSupport "sndfile") - (mkFlag wavpackSupport "wavpack") + (lib.withFeature aacSupport "aac") + (lib.withFeature flacSupport "flac") + (lib.withFeature midiSupport "timidity") + (lib.withFeature modplugSupport "modplug") + (lib.withFeature mp3Support "mp3") + (lib.withFeature musepackSupport "musepack") + (lib.withFeature vorbisSupport "vorbis") + (lib.withFeature speexSupport "speex") + (lib.withFeature ffmpegSupport "ffmpeg") + (lib.withFeature sndfileSupport "sndfile") + (lib.withFeature wavpackSupport "wavpack") # Misc - (mkFlag curlSupport "curl") - (mkFlag samplerateSupport "samplerate") + (lib.withFeature curlSupport "curl") + (lib.withFeature samplerateSupport "samplerate") ("--enable-debug=" + (if withDebug then "yes" else "no")) "--disable-cache" "--without-rcc" diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/bandcamp.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/bandcamp.nix new file mode 100644 index 0000000000..a28f1cca36 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/bandcamp.nix @@ -0,0 +1,19 @@ +{ lib, python3Packages, mopidy }: + +python3Packages.buildPythonApplication rec { + pname = "Mopidy-Bandcamp"; + version = "1.1.5"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-wg9zcOKfZQRhpyA1Cu5wvdwKpmrlcr2m9mrqBHgUXAQ="; + }; + + propagatedBuildInputs = with python3Packages; [ mopidy pykka ]; + + meta = with lib; { + description = "Mopidy extension for playing music from bandcamp"; + homepage = "https://github.com/impliedchaos/mopidy-bandcamp"; + license = licenses.mit; + maintainers = with maintainers; [ desttinghim ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix index facad88796..05857ce014 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/default.nix @@ -7,6 +7,8 @@ lib.makeScope newScope (self: with self; { mopidy = callPackage ./mopidy.nix { }; + mopidy-bandcamp = callPackage ./bandcamp.nix { }; + mopidy-iris = callPackage ./iris.nix { }; mopidy-jellyfin = callPackage ./jellyfin.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix index 09d5e83567..6d3db5d509 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix @@ -35,6 +35,10 @@ pythonPackages.buildPythonApplication rec { ] ++ lib.optional (!stdenv.isDarwin) dbus-python ); + propagatedNativeBuildInputs = [ + gobject-introspection + ]; + # There are no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix index 386e372d79..5110d6ace9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mopidy-youtube"; - version = "3.5"; + version = "3.6"; format = "setuptools"; src = fetchFromGitHub { owner = "natumbri"; repo = pname; - rev = "v${version}"; - hash = "sha256-hlokysFFgZZYY7flghgRq6wVG824kpcLkXxk6nMhxn4="; + rev = "refs/tags/v${version}"; + hash = "sha256-Mp8eCVNGokJRwmYiZYCYRwV1QVDV02Uqfh6fGcPgJss="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix b/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix index 58fb9cddc9..fdd9e6fac8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/munt/libmt32emu.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libmt32emu"; - version = "2.6.3"; + version = "2.7.0"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; rev = "${pname}_${lib.replaceChars [ "." ] [ "_" ] version}"; - sha256 = "0ncy55fj9l2s750clxjpv102hrgcndz4qba9w2sf8lwzgy6d1xmp"; + sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/musikcube/0001-apple-cmake.patch b/third_party/nixpkgs/pkgs/applications/audio/musikcube/0001-apple-cmake.patch deleted file mode 100644 index 3c4630af4a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/audio/musikcube/0001-apple-cmake.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/musikcube/CMakeLists.txt b/src/musikcube/CMakeLists.txt -index f42748aa..ae339946 100644 ---- a/src/musikcube/CMakeLists.txt -+++ b/src/musikcube/CMakeLists.txt -@@ -98,9 +98,6 @@ else() - endif() - - if (APPLE) -- message(STATUS "[ncurses] detected Darwin, linking statically") -- set(CURSES_LIBRARY_NAME "lib${CURSES_LIBRARY_NAME}.a") -- set(PANEL_LIBRARY_NAME "lib${PANEL_LIBRARY_NAME}.a") - else() - message(STATUS "[ncurses] not Darwin! will attempt to link against libtinfo") - find_library(LIBTINFO NAMES tinfo) diff --git a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix index 0894a6410d..273b62401e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musikcube/default.nix @@ -9,6 +9,8 @@ , lame , libev , libmicrohttpd +, libopenmpt +, mpg123 , ncurses , lib , stdenv @@ -25,25 +27,25 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.97.0"; + version = "0.98.0"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "sha256-W9Ng1kqai5qhaDs5KWg/1sOTIAalBXLng1MG8sl/ZOg="; + sha256 = "sha256-bnwOxEcvRXWPuqtkv8YlpclvH/6ZtQvyvHy4mqJCwik="; }; - patches = [ - # Fix pending upstream inclusion for ncurses-6.3 support: - # https://github.com/clangen/musikcube/pull/474 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/clangen/musikcube/commit/1240720e27232fdb199a4da93ca6705864442026.patch"; - sha256 = "0bhjgwnj6d24wb1m9xz1vi1k9xk27arba1absjbcimggn54pinid"; - }) - ./0001-apple-cmake.patch - ]; + patches = [] + ++ lib.optionals stdenv.isDarwin [ + # Fix pending upstream inclusion for Darwin nixpkgs builds: + # https://github.com/clangen/musikcube/pull/531 + (fetchpatch { + name = "darwin-build.patch"; + url = "https://github.com/clangen/musikcube/commit/9077bb9fa6ddfe93ebb14bb8feebc8a0ef9b7ee4.patch"; + sha256 = "sha256-Am9AGKDGMN5z+JJFJKdsBLrHf2neHFovgF/8I5EXLDA="; + }) + ]; nativeBuildInputs = [ cmake @@ -58,6 +60,8 @@ stdenv.mkDerivation rec { lame libev libmicrohttpd + libopenmpt + mpg123 ncurses taglib ] ++ lib.optionals systemdSupport [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index 67c4efc04b..739d0c3c49 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -18,13 +18,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.46"; + version = "0.47"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "sha256-FyuN0jkHaJLXqcVbW+OggHkNBjmqH7bS7W/QXUoDjJk="; + sha256 = "sha256-7vywLMiIUfRx9/fCmUH1AGUB63bT8z7wabgm3CuLLUs="; }; buildInputs = [ glib ncurses libmpdclient boost ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix index c929f1da5b..14042fc205 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-lZ7wFhXJ9I4IcHLLoyMTnq3MJDtUNcVdMHYLThuN7c8="; + sha256 = "sha256-KETLPBMBWGqmuczF5BG7WZ15szWqQHx7uKwDA2KyN/U="; }; - cargoSha256 = "sha256-JLNB196GWpLyCrZ8fBH8+1RF1fa6PhdwFw6RW3fUARM="; + cargoSha256 = "sha256-95IFRFZySpyyF3k3RpGeV+sDXkg38kcHyPYxuxTfJJA="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/noise-repellent/default.nix b/third_party/nixpkgs/pkgs/applications/audio/noise-repellent/default.nix index 9a2a2f109b..bcd2f8e4c4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/noise-repellent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/noise-repellent/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "noise-repellent"; - version = "0.2.1"; + version = "0.2.3"; src = fetchFromGitHub { owner = "lucianodato"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hMNVzhJZFGFeu5aygLkfq495O0zpaIk41ddzejvDITE="; + sha256 = "sha256-d8csYC3z3vXdmN/G6mAK+H8ia0vOCsoUpoA3W8/OADc="; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/noisetorch/default.nix b/third_party/nixpkgs/pkgs/applications/audio/noisetorch/default.nix index 9fcd35a9de..f422ad7fe1 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/noisetorch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/noisetorch/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { fetchSubmodules = true; }; - vendorSha256 = null; + vendorHash = null; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix index 9c258f69f6..26c62f3e30 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pianoteq/default.nix @@ -162,20 +162,20 @@ in { # TODO currently can't install more than one because `lame` clashes stage-trial = mkPianoteq rec { name = "stage-trial"; - version = "7.4.1"; + version = "7.5.4"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; - sha256 = "14mbaz6i1rxqayrjjkck9yx8iijkm4q1qz29ymkd7sz2gpk7fcpa"; + sha256 = "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc="; }; }; standard-trial = mkPianoteq rec { name = "standard-trial"; - version = "7.4.1"; + version = "7.5.4"; archdir = "x86-64bit"; src = fetchPianoteqTrial { name = "pianoteq_linux_trial_v${versionForFile version}.7z"; - sha256 = "01xh4n0h7dd3xqhm0bx0a62mqmfvxvmr5cm5r2g249c9wqg5i32a"; + sha256 = "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ="; }; }; stage-6 = mkPianoteq rec { diff --git a/third_party/nixpkgs/pkgs/applications/audio/pipecontrol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pipecontrol/default.nix index 4acba5d75e..a2abab72ec 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pipecontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pipecontrol/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "pipecontrol"; - version = "0.2.2"; + version = "0.2.4"; src = fetchFromGitHub { owner = "portaloffreedom"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BeubRDx82MQX1gB7GnGJlQ2FyYX1S83C3gqPZgIjgoM="; + sha256 = "sha256-F3faJMkvjAY6A5ieNpAxjk6BHPb6uCvYYfwrI9/Iskg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index 91634cdf3f..ed20c1d7a7 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -2,12 +2,12 @@ let pname = "plexamp"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha512 = "S2/T+T24X6D0oTbGPMp2BVfWTvzsUCWS1xsigLT/vFr12PlZgPfOWgo987W3YE30WJJDdybLqnkTl+uhNndC+A=="; + sha512 = "c9d2rp7tibb73tZdoFONW7eoy+u+GaUZ0RPhYWCBk5MYwtY81xrsdka64x60xzxOopWZ6JkmGs9AWI1XifqBTQ=="; }; 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/44"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/45"; license = licenses.unfree; maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix index 70c6dd12ed..c51d50fdc4 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.49"; + version = "1.50"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-mE7mcaQCJlMzFTec9/faTyIZ7aoA4ygn60wS5QgVF7k="; + sha256 = "sha256-IZakhYVtVXmcKwUMl/v1w6Huu5XWQfaBCatTN4hQAbM="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix index e7e8c73c9c..b2faf62b0f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.6.1.0"; + version = "0.6.1.1"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-zkDMZT1kKCLqNvvxZFKVuXFqZptX/LG/R9kRUcNJphw="; + sha256 = "sha256-ydn3qKOK0GwA/mBPbGwSIac09b9cz6YOFbuDFFV8jJs="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/radioboat/default.nix b/third_party/nixpkgs/pkgs/applications/audio/radioboat/default.nix index f96339848d..e121527152 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/radioboat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/radioboat/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "radioboat"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "slashformotion"; repo = "radioboat"; rev = "v${version}"; - sha256 = "sha256-ZAKTWmK3hCJxm/578cjtdgMA2ZRhCFtzfGdta0gmuFY="; + sha256 = "sha256-e6SZv5gb7NOpCU3blFsH7A6ETWL8QlxtpDmmk8DKn8I="; }; vendorSha256 = "sha256-X3KiqaiOQYQBfVckh50C+4oxIVN6gXyNuQtBwGvjdFQ="; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix index 26825f2dcc..051a326c60 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonic-pi/default.nix @@ -1,115 +1,185 @@ -{ mkDerivation +{ stdenv , lib -, qtbase , fetchFromGitHub -, ruby -, erlang -, aubio -, alsa-lib -, rtmidi -, libsndfile +, wrapQtAppsHook +, makeDesktopItem +, copyDesktopItems , cmake , pkg-config +, catch2_3 +, qtbase +, qtsvg +, qttools +, qwt +, qscintilla +, kissfftFloat +, crossguid +, reproc +, platform-folders +, ruby +, erlang +, elixir +, beamPackages +, alsa-lib +, rtmidi , boost -, bash +, aubio , jack2 , supercollider-with-sc3-plugins -, qwt +, parallel + +, withTauWidget ? false +, qtwebengine + +, withImGui ? false +, gl3w +, SDL2 +, fmt }: -let +stdenv.mkDerivation rec { pname = "sonic-pi"; - version = "3.3.1"; + version = "4.0.3"; + src = fetchFromGitHub { owner = "sonic-pi-net"; - repo = "sonic-pi"; + repo = pname; rev = "v${version}"; - sha256 = "sha256-AE7iuSNnW1SAtBMplReGzXKcqD4GG23i10MIAWnlcPo="; + hash = "sha256-kTuW+i/kdPhyG3L6SkgQTE9UvADY49KahJcw3+5Uz4k="; }; - # sonic pi uses it's own aubioonset with hardcoded parameters but will compile a whole aubio for it - # let's just build the aubioonset instead and link against aubio from nixpkgs - aubioonset = mkDerivation { - name = "aubioonset"; - src = src; - sourceRoot = "source/app/external/aubio/examples"; - buildInputs = [jack2 aubio libsndfile]; - patchPhase = '' - sed -i "s@@@" jackio.c utils.h - ''; - buildPhase = '' - gcc -o aubioonset -laubio jackio.c utils.c aubioonset.c - ''; - installPhase = '' - install -D aubioonset $out/aubioonset - ''; + mixFodDeps = beamPackages.fetchMixDeps { + inherit version; + pname = "mix-deps-${pname}"; + mixEnv = "test"; + src = "${src}/app/server/beam/tau"; + sha256 = "sha256-MvwUyVTS23vQKLpGxz46tEVCs/OyYk5dDaBlv+kYg1M="; }; -in + strictDeps = true; -mkDerivation rec { - inherit pname version src; + nativeBuildInputs = [ + wrapQtAppsHook + copyDesktopItems - nativeBuildInputs = [ cmake ]; - buildInputs = [ - bash + cmake pkg-config - qtbase - qwt - ruby - aubio - supercollider-with-sc3-plugins - boost + erlang - alsa-lib - rtmidi + elixir + beamPackages.hex ]; - dontUseCmakeConfigure = true; + buildInputs = [ + qtbase + qtsvg + qttools + qwt + qscintilla + kissfftFloat + catch2_3 + crossguid + reproc + platform-folders + ruby + alsa-lib + rtmidi + boost + aubio + ] ++ lib.optionals withTauWidget [ + qtwebengine + ] ++ lib.optionals withImGui [ + gl3w + SDL2 + fmt + ]; - prePatch = '' - sed -i '/aubio/d' app/external/linux_build_externals.sh - sed -i '/aubio/d' app/linux-prebuild.sh - patchShebangs app + checkInputs = [ + parallel + ruby + supercollider-with-sc3-plugins + jack2 + ]; + + cmakeFlags = [ + "-DUSE_SYSTEM_LIBS=ON" + "-DBUILD_IMGUI_INTERFACE=${if withImGui then "ON" else "OFF"}" + "-DWITH_QT_GUI_WEBENGINE=${if withTauWidget then "ON" else "OFF"}" + ]; + + doCheck = true; + + postPatch = '' + # Fix shebangs on files in app and bin scripts + patchShebangs app bin ''; - configurePhase = '' - runHook preConfigure + preConfigure = '' + # Set build environment + export SONIC_PI_HOME="$TMPDIR/spi" - ./app/linux-prebuild.sh - ./app/linux-config.sh + export HEX_HOME="$TEMPDIR/hex" + export HEX_OFFLINE=1 + export MIX_REBAR3='${beamPackages.rebar3}/bin/rebar3' + export REBAR_GLOBAL_CONFIG_DIR="$TEMPDIR/rebar3" + export REBAR_CACHE_DIR="$TEMPDIR/rebar3.cache" + export MIX_HOME="$TEMPDIR/mix" + export MIX_DEPS_PATH="$TEMPDIR/deps" + export MIX_ENV=prod - runHook postConfigure + # Copy Mix dependency sources + echo 'Copying ${mixFodDeps} to Mix deps' + cp --no-preserve=mode -R '${mixFodDeps}' "$MIX_DEPS_PATH" + + # Change to project base directory + cd app + + # Prebuild Ruby vendored dependencies and Qt docs + ./linux-prebuild.sh -o + + # Append CMake flag depending on the value of $out + cmakeFlags+=" -DAPP_INSTALL_ROOT=$out/app" ''; - buildPhase = '' - runHook preBuild + postBuild = '' + # Build BEAM server + ../linux-post-tau-prod-release.sh -o + ''; - pushd app/build - cmake --build . --config Release + checkPhase = '' + runHook preCheck + + # BEAM tests + pushd ../server/beam/tau + MIX_ENV=test TAU_ENV=test mix test popd - runHook postBuild + # Ruby tests + pushd ../server/ruby + rake test + popd + + # API tests + pushd api-tests + # run JACK parallel to tests and quit both when one exits + SONIC_PI_ENV=test parallel --no-notice -j2 --halt now,done=1 ::: 'jackd -rd dummy' 'ctest --verbose' + popd + + runHook postCheck ''; installPhase = '' runHook preInstall + # Run Linux release script + ../linux-release.sh + + # Copy dist directory to output mkdir $out - cp -r {bin,etc} $out/ + cp -r linux_dist/* $out/ - # Copy server whole. - mkdir -p $out/app - cp -r app/server $out/app/ - - # We didn't build this during linux-prebuild.sh so copy from the separate derivation - cp ${aubioonset}/aubioonset $out/app/server/native/ - - # Copy only necessary files for the gui app. - mkdir -p $out/app/gui/qt - cp -r app/gui/qt/{book,fonts,help,html,images,image_source,info,lang,theme} $out/app/gui/qt/ - mkdir -p $out/app/build/gui/qt - cp app/build/gui/qt/sonic-pi $out/app/build/gui/qt/sonic-pi + # Copy icon + install -Dm644 ../gui/qt/images/icon-smaller.png $out/share/icons/hicolor/256x256/apps/sonic-pi.png runHook postInstall ''; @@ -117,19 +187,42 @@ mkDerivation rec { # $out/bin/sonic-pi is a shell script, and wrapQtAppsHook doesn't wrap them. dontWrapQtApps = true; preFixup = '' - wrapQtApp "$out/bin/sonic-pi" \ - --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang] } - makeWrapper \ - $out/app/server/ruby/bin/sonic-pi-server.rb \ - $out/bin/sonic-pi-server \ - --prefix PATH : ${lib.makeBinPath [ bash jack2 ruby supercollider-with-sc3-plugins erlang ] } + # Wrap Qt GUI (distributed binary) + wrapQtApp $out/bin/sonic-pi \ + --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 ]} + + # If ImGui was built + if [ -e $out/app/build/gui/imgui/sonic-pi-imgui ]; then + # Wrap ImGui into bin + makeWrapper $out/app/build/gui/imgui/sonic-pi-imgui $out/bin/sonic-pi-imgui \ + --inherit-argv0 \ + --prefix PATH : ${lib.makeBinPath [ ruby supercollider-with-sc3-plugins jack2 ]} + fi + + # Remove runtime Erlang references + for file in $(grep -FrIl '${erlang}/lib/erlang' $out/app/server/beam/tau); do + substituteInPlace "$file" --replace '${erlang}/lib/erlang' $out/app/server/beam/tau/_build/prod/rel/tau + done ''; - meta = { + stripDebugList = [ "app" "bin" ]; + + desktopItems = [ + (makeDesktopItem { + name = "sonic-pi"; + exec = "sonic-pi"; + icon = "sonic-pi"; + desktopName = "Sonic Pi"; + comment = meta.description; + categories = [ "Audio" "AudioVideo" "Education" ]; + }) + ]; + + meta = with lib; { homepage = "https://sonic-pi.net/"; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ]; - platforms = lib.platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ Phlogistique kamilchm c0deaddict sohalt lilyinstarlight ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix b/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix index 466457c607..8bce5c83a6 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/speech-denoiser/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ lv2 rnnoise-nu ]; - mesonFlags = ("--prefix=${placeholder "out"}/lib/lv2"); + mesonFlags = [ "--prefix=${placeholder "out"}/lib/lv2" ]; postPatch = '' substituteInPlace meson.build \ diff --git a/third_party/nixpkgs/pkgs/applications/audio/sptlrx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sptlrx/default.nix index 4daab47047..7b31325164 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sptlrx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sptlrx/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sptlrx"; - version = "0.2.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "raitonoberu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b38DACSdnjwPsLMrkt0Ubpqpn/4SDAgrdSlp9iAcxfE="; + sha256 = "sha256-UDxmUc902A6+DC254wyvjSzNs95K7QIuDW+24o8VCCc="; }; - vendorSha256 = "sha256-/fqWnRQBpLNoTwqrFDKqQuv1r9do1voysBhLuj223S0="; + vendorSha256 = "sha256-t9Mkszzuw7YtBnADsZDjwN2AA6MuQH4+zzDiHe302A4="; ldflags = [ "-s" "-w" ]; @@ -19,8 +19,7 @@ buildGoModule rec { updateScript = nix-update-script { attrPath = pname; }; tests.version = testers.testVersion { package = sptlrx; - # TODO Wrong version in `0.2.0`. Has been fixed upstream. - version = "v0.1.0"; + version = "v${version}"; # needed because testVersion uses grep -Fw }; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ssrc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ssrc/default.nix index 3516c6e4db..1ac1d6658f 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ssrc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ssrc/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = "http://shibatch.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars]; - platforms = with platforms; [ linux ] ; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix index fc02833207..b3dd4bee21 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/strawberry/default.nix @@ -1,9 +1,9 @@ -{ mkDerivation -, stdenv +{ stdenv , lib , fetchFromGitHub , cmake , pkg-config +, wrapQtAppsHook , alsa-lib , boost , chromaprint @@ -20,13 +20,14 @@ , sqlite , taglib , libgpod +, libidn2 , libpulseaudio , libselinux , libsepol , p11-kit , util-linux , qtbase -, qtx11extras +, qtx11extras ? null # doesn't exist in qt6 , qttools , withGstreamer ? true , glib-networking @@ -35,15 +36,19 @@ , libvlc }: -mkDerivation rec { +let + inherit (lib) optionals; + +in +stdenv.mkDerivation rec { pname = "strawberry"; - version = "1.0.5"; + version = "1.0.7"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - hash = "sha256-6d7oB54IPI+G5Mhkj+PdQQY93r1SBE2R06qSGIacj8Q="; + hash = "sha256-TAt/P9nykUtOoHmprFiUJnip8mAnJlvkufD0v9ZWrp4="; }; # the big strawberry shown in the context menu is *very* much in your face, so use the grey version instead @@ -59,6 +64,7 @@ mkDerivation rec { fftw gnutls libcdio + libidn2 libmtp libpthreadstubs libtasn1 @@ -69,13 +75,13 @@ mkDerivation rec { taglib qtbase qtx11extras - ] ++ lib.optionals stdenv.isLinux [ + ] ++ optionals stdenv.isLinux [ libgpod libpulseaudio libselinux libsepol p11-kit - ] ++ lib.optionals withGstreamer (with gst_all_1; [ + ] ++ optionals withGstreamer (with gst_all_1; [ glib-networking gstreamer gst-libav @@ -90,7 +96,8 @@ mkDerivation rec { ninja pkg-config qttools - ] ++ lib.optionals stdenv.isLinux [ + wrapQtAppsHook + ] ++ optionals stdenv.isLinux [ util-linux ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix b/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix index 849b07d67e..f1d8600ed0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/surge/default.nix @@ -1,6 +1,22 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub, cmake, git, pkg-config, python3 -, cairo, libsndfile, libxcb, libxkbcommon, xcbutil, xcbutilcursor, xcbutilkeysyms, zenity -, curl, rsync +{ stdenv +, lib +, fetchurl +, fetchpatch +, fetchFromGitHub +, cmake +, git +, pkg-config +, python3 +, cairo +, libsndfile +, libxcb +, libxkbcommon +, xcbutil +, xcbutilcursor +, xcbutilkeysyms +, zenity +, curl +, rsync }: stdenv.mkDerivation rec { @@ -21,12 +37,43 @@ stdenv.mkDerivation rec { rev = "afc591cc06d9adc3dc8dc515a55c66873fa10296"; sha256 = "1wqv86l70nwlrb10n47rib80f47a96j9qqg8w5dv46ys1sq2nz7z"; }; - nativeBuildInputs = [ cmake git pkg-config python3 ]; - buildInputs = [ cairo libsndfile libxcb libxkbcommon xcbutil xcbutilcursor xcbutilkeysyms zenity curl rsync ]; + + patches = [ + # Fix build error due to newer glibc version by upgrading lib "catch 2" + # Issue: https://github.com/surge-synthesizer/surge/pull/4843 + # Patch: https://github.com/surge-synthesizer/surge/pull/4845 + (fetchpatch { + url = "https://github.com/surge-synthesizer/surge/commit/7a552038bab4b000d188ae425aa97963dc91db17.patch"; + sha256 = "sha256-5Flf0uJqEK6e+sadB+vr6phdvvdZYXcFFfm4ywhAeW0="; + name = "glibc_build_fix.patch"; + }) + ]; + + nativeBuildInputs = [ + cmake + git + pkg-config + python3 + ]; + + buildInputs = [ + cairo + libsndfile + libxcb + libxkbcommon + xcbutil + xcbutilcursor + xcbutilkeysyms + zenity + curl + rsync + ]; postPatch = '' - substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge" - substituteInPlace src/linux/UserInteractionsLinux.cpp --replace '"zenity' '"${zenity}/bin/zenity' + substituteInPlace src/common/SurgeStorage.cpp \ + --replace "/usr/share/Surge" "$out/share/surge" + substituteInPlace src/linux/UserInteractionsLinux.cpp \ + --replace '"zenity' '"${zenity}/bin/zenity' patchShebangs scripts/linux/ cp -r $extraContent/Skins/ resources/data/skins ''; @@ -38,6 +85,7 @@ stdenv.mkDerivation rec { ''; doInstallCheck = true; + installCheckPhase = '' export HOME=$(mktemp -d) export SURGE_DISABLE_NETWORK_TESTS=TRUE @@ -45,7 +93,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)"; + description = '' + LV2 & VST3 synthesizer plug-in (previously released as Vember Audio + Surge) + ''; homepage = "https://surge-synthesizer.github.io"; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix index fbf13c1748..89051e70b5 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix @@ -138,6 +138,11 @@ stdenv.mkDerivation rec { util-linux ]; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Sound editor with graphical UI"; homepage = "https://tenacityaudio.org/"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix b/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix index 3d89289c74..64ad86825e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/termusic/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.6.17"; + version = "0.7.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-diZl+izb55EFQaL6soLVNrFhoi7AOFkFnVcAU2XlI+c="; + sha256 = "sha256-n5Z6LnZ0x+V46Exa9vSMrndZHperJlcXl1unfeTuo9M="; }; - cargoHash = "sha256-VW+tMnjuVnf/PsBAoMnOxbyNna1UpGB/5V52XSzBJr8="; + cargoHash = "sha256-eIM0/SWLZVyVsHyQ4GzKSjVTvK7oActAiBEv56+JqK4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix index 09b5c3f410..1af5357cf0 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tidal-hifi/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "tidal-hifi"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb"; - sha256 = "1azxdr2m84ci6ppzy0j17wmza7prlnw055fks6s4i77sjw45rhlq"; + sha256 = "1lvdym7wcg9042an03zxvckq6kmcd5v5snp2ma54f4knj9kmzwyf"; }; nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix new file mode 100644 index 0000000000..1a2cc43e4d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix @@ -0,0 +1,108 @@ +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, dpkg +, alsa-lib +, curl +, avahi +, jack2 +, libxcb +, libX11 +, libXcursor +, libXext +, libXi +, libXinerama +, libXrandr +, libXrender +, libXxf86vm +, libglvnd +, gnome +}: + +let + runLibDeps = [ + curl + avahi + jack2 + libxcb + libX11 + libXcursor + libXext + libXi + libXinerama + libXrandr + libXrender + libXxf86vm + libglvnd + ]; + + runBinDeps = [ + gnome.zenity + ]; +in + +stdenv.mkDerivation rec { + pname = "touchosc"; + version = "1.1.4.143"; + + suffix = { + aarch64-linux = "linux-arm64"; + armv7l-linux = "linux-armhf"; + x86_64-linux = "linux-x86_64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; + hash = { + aarch64-linux = "sha256-BLPTCaFtsvYzesFvOJVCCofgRVpT2hCvrpYbceh95J4="; + armv7l-linux = "sha256-RpHAXj2biZDqeE9xy3Q+fcGTIvCXfTJNn/jMObfL44g="; + x86_64-linux = "sha256-CD8JR1QVMBe//MyrNfo8RE1ogoVU0H87IU5rTg5rDAU="; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + unpackCmd = "mkdir root; dpkg-deb -x $curSrc root"; + + strictDeps = true; + + nativeBuildInputs = [ + makeWrapper + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r usr/share $out/share + + mkdir -p $out/bin + cp opt/touchosc/TouchOSC $out/bin/TouchOSC + + wrapProgram $out/bin/TouchOSC \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runLibDeps} \ + --prefix PATH : ${lib.makeBinPath runBinDeps} + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://hexler.net/touchosc"; + description = "Next generation modular control surface"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; + mainProgram = "TouchOSC"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix index 868241b923..fbe09b8aac 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/pika-backup/default.nix @@ -18,20 +18,20 @@ stdenv.mkDerivation rec { pname = "pika-backup"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "pika-backup"; rev = "v${version}"; - hash = "sha256-D5QkNgscvNaPEykbcR451Wx8Mvn7HTuQE/22lp95Kbo="; + hash = "sha256-EiXu5xv42at4NBwpCbij0+YsxVlNvIYrnxmlB9ItqZc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-c4nYlPyc7D1AMOfHjhoDJox+i83+H1YKfWzR3i6bmng="; + hash = "sha256-2IDkVkzH5qQM+XiyxuST5p0y4N/Sz+4+Sj3Smotaf8M="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/backup/timeshift/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/backup/timeshift/unwrapped.nix index 65db240626..61964370b3 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/timeshift/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/timeshift/unwrapped.nix @@ -10,18 +10,18 @@ , libgee , util-linux , vte -, xapps +, xapp }: stdenv.mkDerivation rec { pname = "timeshift"; - version = "22.06.1"; + version = "22.06.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = "timeshift"; - rev = "v${version}"; - sha256 = "XcxwVBKMv2YwbrI3FFWDQFs8hHruhkZq3YqzkptE6KE="; + rev = version; + sha256 = "IHX/F3tnl3ckX20mnPHmuK/W4pRTFHzBUfaJg2sMpqc="; }; patches = [ @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { json-glib libgee vte - xapps + xapp ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix b/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix new file mode 100644 index 0000000000..07e078b588 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/backup/unifi-protect-backup/default.nix @@ -0,0 +1,41 @@ +{ fetchFromGitHub, python3, lib }: + +python3.pkgs.buildPythonApplication rec { + pname = "unifi-protect-backup"; + version = "0.7.1"; + + format = "pyproject"; + + src = fetchFromGitHub { + owner = "ep1cman"; + repo = pname; + rev = "v${version}"; + hash = "sha256-HAiyNFWLs1McrlAB48me/iI15LssO8ec7BiWuJbRlbs="; + }; + + preBuild = '' + sed -i 's_click = "8.0.1"_click = "^8"_' pyproject.toml + sed -i 's_pyunifiprotect = .*_pyunifiprotect = "*"_' pyproject.toml + ''; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + aiocron + click + pyunifiprotect + ]; + + checkInputs = with python3.pkgs; [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python tool to backup unifi event clips in realtime"; + homepage = "https://github.com/ep1cman/unifi-protect-backup"; + maintainers = with maintainers; [ ajs124 ]; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix index bde3bb71e9..0fd55594f2 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-g9oaUdmwHGU2EIqSYLGlSN8597ORTzm8XzTxBbiKUNA="; + sha256 = "sha256-I9vJc3J3OoUA6GOc8NkWBKSCkjHC4KOztglJOg9S0Eo="; }; - cargoSha256 = "sha256-SNROmuChSOHUMhMCTKPOOuoYOATx9JEwuVP0mtGZ/G8="; + cargoSha256 = "sha256-VVBO2w6iwZ+K4gnN6+TckgBXCCc/dGO6/yZEunWGK8g="; checkFlags = [ # these want internet access, disable them diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix index d91f201f66..f7d186ffea 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bisq-desktop/default.nix @@ -34,11 +34,11 @@ let in stdenv.mkDerivation rec { pname = "bisq-desktop"; - version = "1.9.1"; + version = "1.9.4"; src = fetchurl { url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; - sha256 = "0gzfcp255z542adk1g6gsmfpp5zpivv6n1f5kzqgwgm5qmr24049"; + sha256 = "sha256-8CgbJ5gfzIEh5ppwvQxYz1IES7Dd4MZCac0uVLh/YaY="; }; nativeBuildInputs = [ makeWrapper copyDesktopItems imagemagick dpkg zip xz ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited/default.nix index fe7acb0bbe..d019c3f02d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin-unlimited/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, openssl, db48, boost +{ lib, stdenv, fetchFromGitLab, pkg-config, autoreconfHook, openssl, db48, boost , zlib, miniupnpc, util-linux, protobuf, qrencode, libevent, python3 , withGui, wrapQtAppsHook ? null, qtbase ? null, qttools ? null , Foundation, ApplicationServices, AppKit }: @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "bitcoin" + optionalString (!withGui) "d" + "-unlimited"; - version = "1.9.2.0"; + version = "1.10.0.0"; - src = fetchFromGitHub { + src = fetchFromGitLab { owner = "bitcoinunlimited"; - repo = "bitcoinunlimited"; + repo = "BCHUnlimited"; rev = "BCHunlimited${version}"; - sha256 = "sha256-qUf/GWZHpI57ATTlvRhjDtAjRa8a4uvUb0G9Xcf0j7w="; + sha256 = "sha256-d+giTXq/6HpysRAPT7yOl/B1x4zie9irs4O7cJsBqHg="; }; nativeBuildInputs = [ pkg-config autoreconfHook python3 ] diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix index cb7355aac1..d039d4d5ec 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/bitcoin/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { # fix "Killed: 9 test/test_bitcoin" # https://github.com/NixOS/nixpkgs/issues/179474 - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "fortify" "stackprotector" ]; checkInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix index 0a8414a966..942c411762 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.6.1"; + version = "1.6.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-lz42emfVBWas1A2YuEkjGAX8V1Qe2YAZMEgMYwIhhKM="; + sha256 = "sha256-790/XBeFS1iM73WuBMXcEoB3gjBlU1dMPRwtQNB7taE="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix index a99f04a4f9..4dcbafb87d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/btcpayserver/deps.nix @@ -106,18 +106,18 @@ }) (fetchNuGet { pname = "Fido2.AspNet"; - version = "2.0.1"; - sha256 = "1d6bjyck3mlhb9b4c75xhzr2pcs47vdqg2ayi5wnjh1aszyam3nq"; + version = "2.0.2"; + sha256 = "0x2k1wyd0p7cy4ir15m2bxiggckl98znc65b4vq75ckjyd6dm1a1"; }) (fetchNuGet { pname = "Fido2.Models"; - version = "2.0.1"; - sha256 = "0llpzkik82n5gpgjawx181j85d2lizimkbdkxj1wyrjvxb2xbg3q"; + version = "2.0.2"; + sha256 = "1vk4h9sv2dhdr0jvh2a7yk6v9rhxk9y8hxz4mkal8vd9psajz5cg"; }) (fetchNuGet { pname = "Fido2"; - version = "2.0.1"; - sha256 = "1s829n970lxngbhac9lvarwa9n9hqxr79kwv8i12amnmg6ir8ny5"; + version = "2.0.2"; + sha256 = "1wqlk48apm7h637da7sav0r1a8yz2yy2gxhifpvydjqk1n3qybz4"; }) (fetchNuGet { pname = "Google.Api.Gax.Rest"; @@ -209,11 +209,6 @@ version = "2.4.3"; sha256 = "1whxcmxydcxjkw84sqk5idd406v3ia0xj2m4ia4b6wqbvkdqn7rf"; }) - (fetchNuGet { - pname = "Microsoft.AspNet.WebApi.Client"; - version = "5.2.7"; - sha256 = "1j0wbdmycj5xbk06p32f7xrddc40sbj3yca4d7ywg611yk26mvi1"; - }) (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; @@ -226,13 +221,13 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.Internal"; - version = "6.0.1"; - sha256 = "1mj04ynr6bxvmq9nrggi832n8hbcr9j9kjr9y2rgiq91y6skzg37"; + version = "6.0.7"; + sha256 = "0g9n5f0p9grjl1fzd7h6dd4ywkc1r7irqyjslkrrvnjqzqg7a2mp"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Cryptography.KeyDerivation"; - version = "6.0.1"; - sha256 = "0aqaviwbnwg0vpwwdbif7b9ncpckwpclm77l3ac11s8fsq3vb3sm"; + version = "6.0.7"; + sha256 = "0n6l22yp6qrq3wjgkgrlxf5zmpcx0cz8s9hh99g6i88fmhav7dxh"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Hosting.Abstractions"; @@ -271,33 +266,33 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.Identity.EntityFrameworkCore"; - version = "6.0.1"; - sha256 = "1j9z0xzj2hlffhg28ijp33flljq75js8dvlchbpggvvd789hm4il"; + version = "6.0.7"; + sha256 = "1sygbi88w9kkypq3nr7i81mxll8xdnjw9dp6h1dyyr7wr37yhr81"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; - version = "6.0.1"; - sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r"; + version = "6.0.7"; + sha256 = "0l235hs1j24iqvk79p95sfrsfbj6l2kb10x9zi34jinvldyn5ln6"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "6.0.1"; - sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1"; + version = "6.0.7"; + sha256 = "08g3aq8gn917r55hnx1i36jfwy51311yns0x6wpvs9d2y4ncygk4"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.Extensions"; - version = "6.0.1"; - sha256 = "1grhlksdd7mwv72g78kx86mzba8mgza3i53x9jv16bkc1wxqwfcd"; + version = "6.0.7"; + sha256 = "0zsyqfywa6c01aflqdj4bc8cdwlcz4xiafkn6f07xbsl3p9v0lk5"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"; - version = "6.0.1"; - sha256 = "0778xw230flwqkjjydp73gb6r3brrlqwqdrf4m0b92b083bysh59"; + version = "6.0.7"; + sha256 = "1bfrdwvz12fs31pdjxhj8arjw8pvawsp64wlj2sfmll7q3618jgp"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Razor.Language"; - version = "6.0.1"; - sha256 = "11spvrnp2mz5kc11ycv2wpgn8bilwpinbl6vkvvr7jjrqlm36lk1"; + version = "6.0.7"; + sha256 = "0757507ivh8q6xfrbihnhnfya0g4wd5j033i2fcsinfyn576wc8c"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; @@ -324,6 +319,11 @@ version = "3.3.2"; sha256 = "162vb5894zxps0cf5n9gc08an7gwybzz87allx3lsszvllr9ldx4"; }) + (fetchNuGet { + pname = "Microsoft.CodeAnalysis.Analyzers"; + version = "3.3.3"; + sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; + }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.0.0"; @@ -331,8 +331,8 @@ }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; - version = "4.0.1"; - sha256 = "0axjv1nhk1z9d4c51d9yxdp09l8yqqnqaifhqcwnxnv0r4y5cka9"; + version = "4.2.0"; + sha256 = "0ld6xxgaqc3c6zgyimlvpgrxncsykbz8irqs01jyj40rv150kp8s"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; @@ -341,18 +341,18 @@ }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; - version = "4.0.1"; - sha256 = "1h6jfifg7pw2vacpdds4v4jqnaydg9b108irf315wzx6rh8yv9cb"; + version = "4.2.0"; + sha256 = "0i1c7055j3f5k1765bl66amp72dcw0zapczfszdldbg91iqmmkxg"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Razor"; - version = "6.0.1"; - sha256 = "0dwwhiv28wyzq3177qg961ll2q3ggiw2k0zdashgym5cl67p93lm"; + version = "6.0.7"; + sha256 = "1jnwch6vb7v95q005wq2z7fv5pisbdi2yn0n9hmxwz3kaiqcqjdm"; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "17.0.0"; - sha256 = "18gdbsqf6i79ld4ikqr4jhx9ndsggm865b5xj1xmnmgg12ydp19a"; + version = "17.2.0"; + sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; @@ -371,8 +371,8 @@ }) (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; - version = "6.0.1"; - sha256 = "0gzn3rynp9k6mx4h4dhq124b7ra8m11rkjh40r2r8z4gkr0shjv1"; + version = "6.0.7"; + sha256 = "0r5njqyl10dv0akwl5y32ik0rpzs9lwj151j6ayz358pn4x26akk"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; @@ -386,43 +386,53 @@ }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Abstractions"; - version = "6.0.1"; - sha256 = "15mx86i7gqlak604vr853x7a4b4l48wz5vqh9qbib7wh4pkf4rp3"; + version = "6.0.5"; + sha256 = "1vziijdf6kmv61i09bk0yxnbn08b48dy1jn4qbmhxaka745z1w6x"; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Abstractions"; + version = "6.0.7"; + sha256 = "0xhkh9k3xpgjdsizg1wdncwz4rdjvffq3x0sfcarscmg2j5fa4yj"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Analyzers"; - version = "6.0.1"; - sha256 = "16739crhjky22j53v8varninz9bqdmdfwjnzj6xvfxqfl858jja5"; + version = "6.0.7"; + sha256 = "0fdh0w5c51kkpvh1p5f0dn90kikh3zdyc1k4hjvv1z8kr603nd1b"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Design"; - version = "6.0.1"; - sha256 = "13bi91lkasy4qj04jn2hmbwpsc6fybgllwsr87qhz5p86ig9ryq9"; - }) - (fetchNuGet { - pname = "Microsoft.EntityFrameworkCore.Relational"; - version = "6.0.0"; - sha256 = "1v2r8004isvz4d8qxh5clgkbnlwivjlsqhn7skw0y9b5i61y2mwk"; + version = "6.0.7"; + sha256 = "0mdb2gqmb94sw38cpqm972vdhh88n7q81xhq4gq771hp2wspn5ap"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Relational"; version = "6.0.1"; sha256 = "0224qas1rl3jv02ribb2lwfqcd64ij40v6q10369h4mrwr071zr2"; }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Relational"; + version = "6.0.5"; + sha256 = "027j472gmqkrazy7b044qllsh8zbvl7lv3mdgnbghrhj06jfasm6"; + }) + (fetchNuGet { + pname = "Microsoft.EntityFrameworkCore.Relational"; + version = "6.0.7"; + sha256 = "1kx0ac7jgf8nmp5nra4cd6h2xbwvb3zkyzx7cds60y1j9nm7lx1g"; + }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite.Core"; - version = "6.0.1"; - sha256 = "1snpa3pzpqfsnf2dpmvhv08lzcdiqcl5af6aldlxrm82dpif95q5"; + version = "6.0.7"; + sha256 = "15l36dgq6rzvgx7i9g9jm3298p9g1pdahwa2dxblmm0gzsp65wpl"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore.Sqlite"; - version = "6.0.1"; - sha256 = "14r1j8bamfwnjzx6igc5nzqvp5gzl2wyfbi53pznkw61xcf6hnch"; + version = "6.0.7"; + sha256 = "1mam4qg6yq6qnlkx3i45gs3nwgd7njfm9r5gjs1p9wm6bm953dad"; }) (fetchNuGet { pname = "Microsoft.EntityFrameworkCore"; - version = "6.0.1"; - sha256 = "0ynspdv0f199ppwcg7hnjv6hp01qyaxfcmh1phy9nwjjxlrkwkjc"; + version = "6.0.7"; + sha256 = "1wcjjn70v8cyy5flga0nlnhg973s6pzb3rpnzv905ix3g70zdp4k"; }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Abstractions"; @@ -436,8 +446,8 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Caching.Memory"; - version = "6.0.0"; - sha256 = "0dq1x7962zsp926rj76i4akk4hsy7r5ldys8r4xsd78rq5f67rhq"; + version = "6.0.1"; + sha256 = "0ra0ldbg09r40jzvfqhpb3h42h80nafvka9hg51dja32k3mxn5gk"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; @@ -606,13 +616,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Identity.Core"; - version = "6.0.1"; - sha256 = "1kwn30a024fqi9gpap8g2wifjzij0bcz70lgz7bdz4vy3sp9mn99"; + version = "6.0.7"; + sha256 = "1xxqqh3flx0g8fzi9v0565amfvc72ci8vkya08gf2h67syn63s6l"; }) (fetchNuGet { pname = "Microsoft.Extensions.Identity.Stores"; - version = "6.0.1"; - sha256 = "1l2njmcg4fvg6jr9gjvcr7yfj0r0ndwsa8r1dwlaciz3a2x2pfg8"; + version = "6.0.7"; + sha256 = "0lsvbbfppxkz5xxq9q77k7222szy7g5974q7nr1c39gwdsy0j22d"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; @@ -756,8 +766,8 @@ }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "17.0.0"; - sha256 = "0bknyf5kig5icwjxls7pcn51x2b2qf91dz9qv67fl70v6cczaz2r"; + version = "17.2.0"; + sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) (fetchNuGet { pname = "Microsoft.NetCore.Analyzers"; @@ -796,13 +806,13 @@ }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; - version = "17.0.0"; - sha256 = "1bh5scbvl6ndldqv20sl34h4y257irm9ziv2wyfc3hka6912fhn7"; + version = "17.2.0"; + sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "17.0.0"; - sha256 = "06mn31cgpp7d8lwdyjanh89prc66j37dchn74vrd9s588rq0y70r"; + version = "17.2.0"; + sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; @@ -821,8 +831,8 @@ }) (fetchNuGet { pname = "MySqlConnector"; - version = "2.0.0"; - sha256 = "0l0r4wr1h176w6hcsfjp5kx05fpzhhgzxcmirv8zfyk899vfgqkz"; + version = "2.1.2"; + sha256 = "12wgwns172vjldp1cvcq212zizpw18za7z3438rdh40zkq55s5yz"; }) (fetchNuGet { pname = "NBitcoin.Altcoins"; @@ -849,6 +859,11 @@ version = "7.0.1"; sha256 = "05kqpjyp3ckb2183g9vfsdv362y5xg5j21p36zls0x3b0jgrwxw7"; }) + (fetchNuGet { + pname = "NBitcoin"; + version = "7.0.10"; + sha256 = "1yp43n18b9qwh1ck3hxkarncbfn7r3indfdyjimapxibk3f8jm1v"; + }) (fetchNuGet { pname = "NBitpayClient"; version = "1.0.0.39"; @@ -926,13 +941,13 @@ }) (fetchNuGet { pname = "Npgsql.EntityFrameworkCore.PostgreSQL"; - version = "6.0.3"; - sha256 = "0mgwm9psxvrq6vs2cy7m72wnknydgrs71hir2jqal5wbdh8g01np"; + version = "6.0.5"; + sha256 = "0b50hzzhd8igibxm3vkmq0h7cljx13l1fxrgznh6k2v57r0vvfnq"; }) (fetchNuGet { pname = "Npgsql"; - version = "6.0.3"; - sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q"; + version = "6.0.5"; + sha256 = "1555xj2725kkg4jyxhz6pkqwirdqyw5j5h1q3vaykpns61i2h48q"; }) (fetchNuGet { pname = "NSec.Cryptography"; @@ -941,8 +956,8 @@ }) (fetchNuGet { pname = "NuGet.Frameworks"; - version = "5.0.0"; - sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + version = "5.11.0"; + sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "NUglify"; @@ -966,8 +981,8 @@ }) (fetchNuGet { pname = "Pomelo.EntityFrameworkCore.MySql"; - version = "6.0.0"; - sha256 = "0qvm5rh9kv8znsp8wbss81w5a2afh0dl13pwkc824j7ywklz0gzz"; + version = "6.0.1"; + sha256 = "1g212yfzlphn97gn7v4zcpi4ihfk1xp014kw498pcma49dqirn54"; }) (fetchNuGet { pname = "Portable.BouncyCastle"; @@ -1341,8 +1356,8 @@ }) (fetchNuGet { pname = "System.IO.Pipelines"; - version = "6.0.1"; - sha256 = "0b6zvhhfdxx0wx3bzyvxbq0mk8l5lbjak5124sn0gkif5jb388w4"; + version = "6.0.3"; + sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) (fetchNuGet { pname = "System.IO"; @@ -1719,6 +1734,11 @@ version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { + pname = "System.Text.Encoding.CodePages"; + version = "6.0.0"; + sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; + }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; @@ -1921,8 +1941,8 @@ }) (fetchNuGet { pname = "xunit.runner.visualstudio"; - version = "2.4.3"; - sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; + version = "2.4.5"; + sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; }) (fetchNuGet { pname = "xunit"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix index 1571e09e3e..83b3c0c29b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/charge-lnd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "charge-lnd"; - version = "0.2.4"; + version = "0.2.12"; src = fetchFromGitHub { owner = "accumulator"; repo = pname; rev = "v${version}"; - sha256 = "1d1cbpmpppp7z1bmsarwfs314c7ypchlyr4calx0fzxfpxzfks5k"; + sha256 = "uiXmLdQAglgLxOX6IoF1iNZvje4EM7Tr25Okx9TPyzI="; }; propagatedBuildInputs = with python3Packages; [ @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { ]; postInstall = '' - install README.md charge.config.example -Dt $out/share/doc/charge-lnd + install README.md -Dt $out/share/doc/charge-lnd ''; doInstallCheck = true; @@ -34,6 +34,6 @@ python3Packages.buildPythonApplication rec { description = "Simple policy-based fee manager for lightning network daemon"; homepage = "https://github.com/accumulator/charge-lnd"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ mmilata ]; + maintainers = with maintainers; [ mmilata mariaa144 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix index e8527559c3..d10287f3e3 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/chia/default.nix @@ -6,16 +6,21 @@ let chia = python3Packages.buildPythonApplication rec { pname = "chia"; - version = "1.3.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "chia-blockchain"; rev = version; fetchSubmodules = true; - hash = "sha256-nH6rCzIQu5oWsdEHa+UkvbWeUGjrtpEKVEcLmSoor5k="; + hash = "sha256-OlaAnUy16QBff81XMoYQaZA0wKnsr+/3XEQLBP8IMug="; }; + patches = [ + # chia tries to put lock files in the python modules directory + ./dont_lock_in_store.patch + ]; + postPatch = '' substituteInPlace setup.py \ --replace "==" ">=" @@ -39,10 +44,12 @@ let chia = python3Packages.buildPythonApplication rec { chiapos chiavdf chiabip158 + chia-rs click clvm clvm-rs clvm-tools + clvm-tools-rs colorama colorlog concurrent-log-handler diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/chia/dont_lock_in_store.patch b/third_party/nixpkgs/pkgs/applications/blockchains/chia/dont_lock_in_store.patch new file mode 100644 index 0000000000..f923b11801 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/chia/dont_lock_in_store.patch @@ -0,0 +1,21 @@ +--- a/chia/wallet/puzzles/load_clvm.py ++++ b/chia/wallet/puzzles/load_clvm.py +@@ -82,18 +82,6 @@ def load_serialized_clvm(clvm_filename, package_or_requirement=__name__) -> Seri + """ + hex_filename = f"{clvm_filename}.hex" + +- try: +- if pkg_resources.resource_exists(package_or_requirement, clvm_filename): +- # Establish whether the size is zero on entry +- full_path = pathlib.Path(pkg_resources.resource_filename(package_or_requirement, clvm_filename)) +- output = full_path.parent / hex_filename +- compile_clvm(full_path, output, search_paths=[full_path.parent]) +- +- except NotImplementedError: +- # pyinstaller doesn't support `pkg_resources.resource_exists` +- # so we just fall through to loading the hex clvm +- pass +- + clvm_hex = pkg_resources.resource_string(package_or_requirement, hex_filename).decode("utf8") + assert len(clvm_hex.strip()) != 0 + clvm_blob = bytes.fromhex(clvm_hex) diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin/default.nix index 8094959a24..7c92cc0831 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/dogecoin/default.nix @@ -1,29 +1,47 @@ { lib, stdenv , fetchFromGitHub , pkg-config, autoreconfHook , db5, openssl, boost, zlib, miniupnpc, libevent -, protobuf, util-linux, qt4, qrencode -, withGui }: +, protobuf, qtbase ? null +, wrapQtAppsHook ? null, qttools, qmake ? null, qrencode +, withGui, withUpnp ? true, withUtils ? true, withWallet ? true +, withZmq ? true, zeromq, util-linux ? null, Cocoa ? null }: with lib; stdenv.mkDerivation rec { pname = "dogecoin" + optionalString (!withGui) "d"; - version = "1.14.5"; + version = "1.14.6"; src = fetchFromGitHub { owner = "dogecoin"; repo = "dogecoin"; rev = "v${version}"; - sha256 = "sha256-Ewefy6sptSQDJVbvQqFoawhA/ujKEn9W2JWyoPYD7d0="; + sha256 = "sha256-PmbmmA2Mq07dwB3cI7A9c/ewtu0I+sWvQT39Yekm/sU="; }; - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ openssl db5 openssl util-linux - protobuf boost zlib miniupnpc libevent ] - ++ optionals withGui [ qt4 qrencode ]; + preConfigure = optionalString withGui '' + export LRELEASE=${getDev qttools}/bin/lrelease + ''; - configureFlags = [ "--with-incompatible-bdb" - "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui" ]; + nativeBuildInputs = [ pkg-config autoreconfHook util-linux ] + ++ optionals withGui [ wrapQtAppsHook qttools ]; + + buildInputs = [ openssl protobuf boost zlib libevent ] + ++ optionals withGui [ qtbase qrencode ] + ++ optionals withUpnp [ miniupnpc ] + ++ optionals withWallet [ db5 ] + ++ optionals withZmq [ zeromq ] + ++ optionals stdenv.isDarwin [ Cocoa ]; + + configureFlags = [ + "--with-incompatible-bdb" + "--with-boost-libdir=${boost.out}/lib" + ] ++ optionals (!withGui) [ "--with-gui=no" ] + ++ optionals (!withUpnp) [ "--without-miniupnpc" ] + ++ optionals (!withUtils) [ "--without-utils" ] + ++ optionals (!withWallet) [ "--disable-wallet" ] + ++ optionals (!withZmq) [ "--disable-zmq" ]; + + enableParallelBuilding = true; meta = { description = "Wow, such coin, much shiba, very rich"; @@ -33,9 +51,9 @@ stdenv.mkDerivation rec { internet currency." It is named after a famous Internet meme, the "Doge" - a Shiba Inu dog. ''; - homepage = "http://www.dogecoin.com/"; + homepage = "https://www.dogecoin.com/"; license = licenses.mit; maintainers = with maintainers; [ edwtjo offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index 1ebcf47146..4bd870fc5d 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.30"; + version = "4.0.38"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-Jeufmt2Dso13Z/TQnSA8IPNxTfha+wcklKZb+BF/dNE="; + sha256 = "sha256-FdgF2xxqk9n1la6Lu4g6n+3O5pgIUKSYC3KzH0yM2Ok="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix index 0f127c4f0d..e17baf49dc 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "erigon"; - version = "2022.07.02"; + version = "2022.07.03"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/aT8E60dCk5spj5l5Zw/8FL1LfzXWYi7agiLflLYI5c="; + sha256 = "sha256-zWygG06H5+QuG11klRq+7T2v40FNMxmYENdsK3KB+ko="; fetchSubmodules = true; }; - vendorSha256 = "sha256-NBWK0wsUbv4bFbmW3xGaQ7LCgmgfRF5zbc/awm8ZZZY="; + vendorSha256 = "sha256-vxLe8uEjuQ96JiIDxlSrpVATScNl2fscXVUqFKmMPxs="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix index 3a85544705..82da3f2917 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix @@ -1,24 +1,18 @@ -{ stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, pango, +{ stdenv, lib, fetchzip, glib, systemd, nss, nspr, gtk3-x11, pango, atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, util-linux, alsa-lib, dbus, at-spi2-atk, cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "22.6.17"; + version = "22.7.29"; - src = fetchurl { + src = fetchzip { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "1gllmrmc1gylw54yrgy1ggpn3kvkyxf7ydjvd5n5kvd8d9xh78ng"; + sha256 = "sha256-vshcXuFuOuXlmdgqK+pj6dAbeYGNR2YA79AzkeUzNtk="; }; - sourceRoot = "."; - unpackCmd = '' - ${unzip}/bin/unzip "$src" -x "Exodus*/lib*so" - ''; - installPhase = '' mkdir -p $out/bin $out/share/applications - cd Exodus-linux-x64 cp -r . $out ln -s $out/Exodus $out/bin/Exodus ln -s $out/bin/Exodus $out/bin/exodus @@ -79,6 +73,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = platforms.linux; - maintainers = with maintainers; [ mmahut rople380 ]; + maintainers = with maintainers; [ mmahut rople380 Crafter ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix index 2acc88fc93..a1ded4cc7c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix @@ -2,10 +2,10 @@ let pname = "framesh"; - version = "0.5.0-beta.20"; + version = "0.5.0-beta.22"; src = fetchurl { url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; - sha256 = "sha256-4PU3f5e9NJYnP49nVtCjbGXxWJDCJIArzuaLsWB3Cx0="; + sha256 = "sha256-/y7Pf1ADtz0CBeKKCHtSPOYvU7HCpq7hM/J4Ddq1XiA="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix index 767d8e7ba0..7766158193 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.20"; + version = "1.10.21"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PIQP08QxGJmla7LKEtnEXmwJxDYh02q4fmRHZsYtthU="; + sha256 = "sha256-qaM1I3ytMZN+5v/Oj47n3Oc21Jk7DtjfWA/xDprbn/M="; }; - vendorSha256 = "sha256-AlXfKytDrQrp0gvnC5/gTlJAVJBAQNHm4MoBu9O9jM4="; + vendorSha256 = "sha256-Dj+xN8lr98LJyYr2FwJ7yUIJkUeUrr1fkcbj4hShJI0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d9bde2a543..18909852ac 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.44.0"; + version = "2.45.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-STUkvQ22WnMm8AApz9zjfNeFXhtEUsl/OJIZkFgkd5s="; + hash = "sha256-jw4ocBtyxhPhI2GnhL9tbduY4iIQK53vUHB64qSGXKI="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix index 7efba6de07..4e696ddbda 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lightning-loop/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "lightning-loop"; - version = "0.19.1-beta"; + version = "0.20.0-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${version}"; - sha256 = "08jn1ybh9l9qy4j9b3psvgk7b869aaabpxh73v81980qflb9snnc"; + sha256 = "1nx7i4i96982z756r79655hjf0yyz5l9lqjkvyvb62pbzqgm6my8"; }; - vendorSha256 = "0wirlf43jl888bh2qxis1ihsr1g2lp2rx7p100dsb3imqbm25q3b"; + vendorSha256 = "0gp89fw6g8mz2ifn9wcbj84dgm736cspfxj2x34b524l2d8wz3lb"; subPackages = [ "cmd/loop" "cmd/loopd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix index 728f28dee8..a563703c6b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lndhub-go/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "lndhub-go"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "lndhub.go"; rev = "${version}"; - sha256 = "sha256-QtLSI5xjXevTTr85Zsylabhay52ul8jFq1j6WzgSLcs="; + sha256 = "sha256-f/CkmO0KHupmi4XZDWRbvesLnYIxT6DlThgX3S/kdJ8="; }; - vendorSha256 = "sha256-12RTaXStvx29JjE1u3AjBTrPf6gKfLHJHMJpbQysEew="; + vendorSha256 = "sha256-SWQudULFRMrKmxY6ZgH0NL8d6UPxowQnovhRx+209D4="; doCheck = false; # tests require networking diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/masari/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/masari/default.nix index bf995da36a..175cd7a31b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/masari/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/masari/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "scalability-focused, untraceable, secure, and fungible cryptocurrency using the RingCT protocol"; homepage = "https://www.getmasari.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix index 0520101c4c..5d8e887209 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "miniscript"; - version = "unstable-2020-12-01"; + version = "unstable-2022-07-19"; src = fetchFromGitHub { owner = "sipa"; repo = pname; - rev = "02682a398a35b410571b10cde7f39837141ddad6"; - sha256 = "079jz4g88cfzfm9a6ykby9haxwcs033c1288mgr8cl2hw4qd2sjl"; + rev = "ca675488c4aa9605f6ae70c0e68a148a6fb277b4"; + sha256 = "sha256-kzLIJ0os6UnC0RPEybfw6wGrZpgmRCgj3zifmZjieoU="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix index e9b9d10441..a42e474c25 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "namecoin" + lib.optionalString (!withGui) "d"; - version = "22.0"; + version = "23.0"; src = fetchFromGitHub { owner = "namecoin"; repo = "namecoin-core"; rev = "nc${version}"; - sha256 = "sha256-Z3CLDe0c4IpFPPTie8yoh0kcuvGmiegSgl4ITNSDkgY="; + sha256 = "sha256-MfqJ7EcJvlQ01Mr1RQpXVNUlGIwNqFTxrVwGa+Hus+A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix index 17cf43f8af..9ff2a65acf 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "nbxplorer"; - version = "2.3.28"; + version = "2.3.33"; src = fetchFromGitHub { owner = "dgarage"; repo = "NBXplorer"; rev = "v${version}"; - sha256 = "sha256-4KedlU+TMwO6C/dgNa23N4uPk8gPq2SQKzYkCZS508I="; + sha256 = "sha256-yvnWSmf4FJoZ7ajZQQJFLleIQ/hmHD+rDoktJeIll+U="; }; projectFile = "NBXplorer/NBXplorer.csproj"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix index 3bc5e06a15..76fd74f6c5 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nbxplorer/deps.nix @@ -11,13 +11,13 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.JsonPatch"; - version = "6.0.1"; - sha256 = "0rsqng2b8a3zaha9c2x1195das5wwvmnz31xf14ancgha4lxq68r"; + version = "6.0.7"; + sha256 = "0l235hs1j24iqvk79p95sfrsfbj6l2kb10x9zi34jinvldyn5ln6"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Mvc.NewtonsoftJson"; - version = "6.0.1"; - sha256 = "179b2774s68im71r32lv4nydcp586x86zggs8ml6jcfjrd9fs5b1"; + version = "6.0.7"; + sha256 = "08g3aq8gn917r55hnx1i36jfwy51311yns0x6wpvs9d2y4ncygk4"; }) (fetchNuGet { pname = "Microsoft.Azure.Amqp"; @@ -36,8 +36,8 @@ }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "16.11.0"; - sha256 = "0f41l3kks6wk5vjaxpjh8m2flnrvlbvqgqflamhv8rfz4y8ifgdv"; + version = "17.2.0"; + sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; @@ -56,43 +56,43 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; - version = "2.1.0"; - sha256 = "03gzlr3z9j1xnr1k6y91zgxpz3pj27i3zsvjwj7i8jqnlqmk7pxd"; + version = "6.0.0"; + sha256 = "0w6wwxv12nbc3sghvr68847wc9skkdgsicrz3fx4chgng1i3xy0j"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.EnvironmentVariables"; - version = "2.1.0"; - sha256 = "0xx3idb1l5y1da5zynlys5gyarijmw5pc9hgci8xdxbrcv6rzbjb"; + version = "6.0.0"; + sha256 = "19w2vxliz1xangbach3hkx72x2pxqhc9n9c3kc3l8mhicl8w6vdl"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; - version = "2.1.0"; - sha256 = "1lz2xwm63clbh9dfhmygbqvcp4dsrwh5jihv82dmqd5h7lqngl40"; + version = "6.0.0"; + sha256 = "02nna984iwnyyz4jjh9vs405nlj0yk1g5vz4v2x30z2c89mx5f9w"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Ini"; - version = "2.1.0"; - sha256 = "0bchsljywcq36si4zs2dcx2gj8x98ww93dh2bx2z6x5ilxyjnfip"; + version = "6.0.0"; + sha256 = "18qg1f7yvgvrgsq40cgc1yvpb9av84ma80k3grhvwn1cyam2img6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; - version = "2.1.0"; - sha256 = "04rjl38wlr1jjjpbzgf64jp0ql6sbzbil0brwq9mgr3hdgwd7vx2"; + version = "6.0.0"; + sha256 = "1zdyai2rzngmsp3706d12qrdk315c1s3ja218fzb3nc3wd1vz0s8"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; - version = "2.1.0"; - sha256 = "1sxls5f5cgb0wr8cwb05skqmz074683hrhmd3hhq6m5dasnzb8n3"; + version = "6.0.0"; + sha256 = "1fbqmfapxdz77drcv1ndyj2ybvd2rv4c9i9pgiykcpl4fa6dc65q"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; - version = "2.1.0"; - sha256 = "1firpsl5bk219i9gdfgiqw1zm68146h1dzx9hvawfpw9slfaa56w"; + version = "6.0.0"; + sha256 = "1ikc3kf325xig6njbi2aj5kmww4xlaq9lsrpc8v764fsm4x10474"; }) (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; - version = "2.1.0"; - sha256 = "1d2622qp22x1cnlwycnzjbc3sgi9jria26fk78zwzsa08npa3avv"; + version = "6.0.0"; + sha256 = "09gyyv4fwy9ys84z3aq4lm9y09b7bd1d4l4gfdinmg0z9678f1a4"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; @@ -101,13 +101,13 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; - version = "2.1.0"; - sha256 = "1gvgif1wcx4k6pv7gc00qv1hid945jdywy1s50s33q0hfd91hbnj"; + version = "6.0.0"; + sha256 = "0b75fmins171zi6bfdcq1kcvyrirs8n91mknjnxy4c3ygi1rrnj0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; - version = "2.1.0"; - sha256 = "1r9gzwdfmb8ysnc4nzmyz5cyar1lw0qmizsvrsh252nhlyg06nmb"; + version = "6.0.0"; + sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Clients.ActiveDirectory"; @@ -131,8 +131,8 @@ }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "16.11.0"; - sha256 = "1a2y6vw6p9xp3w72zq2lwrjl8bxv87s9d7zd2dh4zwbzh1c5slxl"; + version = "17.2.0"; + sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; @@ -161,13 +161,13 @@ }) (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; - version = "16.11.0"; - sha256 = "1fc0ghk1cny4i8w43b94pxhl0srxisv6kaflkkp30ncsa9szhkxh"; + version = "17.2.0"; + sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "16.11.0"; - sha256 = "0hp1vndf2jhyg1f3miq4g2068z5kpfzy6nmswm25vymghxp1ws4k"; + version = "17.2.0"; + sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; @@ -186,29 +186,29 @@ }) (fetchNuGet { pname = "NBitcoin.Altcoins"; - version = "3.0.8"; - sha256 = "1qck2nfj8494pxwzhccslq4cbypsgnwcv3nvz24czsd87wn8n618"; + version = "3.0.11"; + sha256 = "1l8v07k862apyfr7h37jl7nrlr8mlscsqdqsmp2qdl0502x0gms3"; }) (fetchNuGet { pname = "NBitcoin.TestFramework"; - version = "3.0.9"; - sha256 = "08pwab9f2565day9b0fjzfv5ik3pbwvgvl190gh0bmwi5xv4vq93"; + version = "3.0.11"; + sha256 = "1v3g323vs65qk190dgcm3v6lzhq1ng9p1ywd39jq53hcny76fgcb"; }) (fetchNuGet { pname = "NBitcoin"; - version = "7.0.8"; - sha256 = "0h76a5wha3rqchjzhvslmm8f7qkya77n8avh5i05nvnrigf0bj5q"; + version = "7.0.10"; + sha256 = "1yp43n18b9qwh1ck3hxkarncbfn7r3indfdyjimapxibk3f8jm1v"; + }) + (fetchNuGet { + pname = "NBitcoin"; + version = "7.0.9"; + sha256 = "0bdw54q4d5vbyrgj7r4rs8322z1knl79hmhzmq3knqf68yidi87g"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { - pname = "NETStandard.Library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; @@ -236,28 +236,28 @@ }) (fetchNuGet { pname = "NicolasDorier.CommandLine.Configuration"; - version = "1.0.0.3"; - sha256 = "0al0pd4zhjpmn8m208xjmy17cbyab68grzdvzr2lhsckwkl6b1jg"; + version = "2.0.0"; + sha256 = "1cng096r3kb85lf5wjill4yhxx8nv9v0d6ksbn1i1vvdawwl6fkw"; }) (fetchNuGet { pname = "NicolasDorier.CommandLine"; - version = "1.0.0.2"; - sha256 = "08a9l18zkhcfa6f56xqylzvmqjzgxsmgkpm2r3ckvxfyml6w0qyy"; + version = "2.0.0"; + sha256 = "0gywvl0gqs3crlzwgwzcqf0qsrbhk3dxjycpimxqvs1ihg4dhb1f"; }) (fetchNuGet { pname = "NicolasDorier.StandardConfiguration"; - version = "1.0.0.18"; - sha256 = "0lgssxafv6cqlw21fb79fm0fcln0clgsk6zadcwrnjv9vampfw7b"; + version = "2.0.0"; + sha256 = "0058dx34ja2idw468bmw7l3w21wr2am6yx57sqp7llhjl5ayy0wv"; }) (fetchNuGet { pname = "Npgsql"; - version = "6.0.3"; - sha256 = "1crzgi4dfbn8r381m9rvkma5xi2q7gqdzgxhc36hy3r0y63v1l8q"; + version = "6.0.5"; + sha256 = "1555xj2725kkg4jyxhz6pkqwirdqyw5j5h1q3vaykpns61i2h48q"; }) (fetchNuGet { pname = "NuGet.Frameworks"; - version = "5.0.0"; - sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; + version = "5.11.0"; + sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "RabbitMQ.Client"; @@ -374,16 +374,6 @@ version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.4.0"; - sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; - }) - (fetchNuGet { - pname = "System.Buffers"; - version = "4.5.0"; - sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; - }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; @@ -579,11 +569,6 @@ version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) - (fetchNuGet { - pname = "System.Memory"; - version = "4.5.0"; - sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; - }) (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; @@ -644,11 +629,6 @@ version = "4.3.0"; sha256 = "1gfj800078kggcgl0xyl00a6y5k4wwh2k2qm69rjy22wbmq7fy4p"; }) - (fetchNuGet { - pname = "System.Numerics.Vectors"; - version = "4.4.0"; - sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; - }) (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; @@ -754,11 +734,6 @@ version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) - (fetchNuGet { - pname = "System.Runtime.CompilerServices.Unsafe"; - version = "4.5.0"; - sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; - }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; @@ -1081,8 +1056,8 @@ }) (fetchNuGet { pname = "xunit.runner.visualstudio"; - version = "2.4.3"; - sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; + version = "2.4.5"; + sha256 = "0y8w33ci80z8k580pp24mfnaw1r8ji0w3az543xxcz6aagax9zhs"; }) (fetchNuGet { pname = "xunit"; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch b/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch new file mode 100644 index 0000000000..38292349f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/0001-make-near-test-contracts-optional.patch @@ -0,0 +1,42 @@ +From 14635f8a87423f7682e22c4d4bc34551cfe1d10d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Thu, 30 Jun 2022 07:33:44 +0000 +Subject: [PATCH] make near-test-contracts optional +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim +--- + Cargo.lock | 1 - + tools/state-viewer/Cargo.toml | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index e1d8b2a83..3317587f5 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -5253,7 +5253,6 @@ dependencies = [ + "near-primitives", + "near-primitives-core", + "near-store", +- "near-test-contracts", + "nearcore", + "node-runtime", + "once_cell", +diff --git a/tools/state-viewer/Cargo.toml b/tools/state-viewer/Cargo.toml +index 02346bf71..51cfc4cb5 100644 +--- a/tools/state-viewer/Cargo.toml ++++ b/tools/state-viewer/Cargo.toml +@@ -30,7 +30,7 @@ near-network = { path = "../../chain/network" } + near-primitives = { path = "../../core/primitives" } + near-primitives-core = { path = "../../core/primitives-core" } + near-store = { path = "../../core/store" } +-near-test-contracts = { path = "../../runtime/near-test-contracts" } ++#near-test-contracts = { path = "../../runtime/near-test-contracts" } + nearcore = { path = "../../nearcore" } + node-runtime = { path = "../../runtime/runtime" } + +-- +2.36.1 + diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/default.nix index 2c5f97c9c7..c0c2e18677 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nearcore/default.nix @@ -4,7 +4,7 @@ }: rustPlatform.buildRustPackage rec { pname = "nearcore"; - version = "1.27.0"; + version = "1.28.0"; # https://github.com/near/nearcore/tags src = fetchFromGitHub { @@ -12,10 +12,12 @@ rustPlatform.buildRustPackage rec { repo = "nearcore"; # there is also a branch for this version number, so we need to be explicit rev = "refs/tags/${version}"; - sha256 = "sha256-B9HqUa0mBSvsCPzxPt4NqpV99rV4lmQ9Q/z9lxob9oM="; + + sha256 = "sha256-DRVlD74XTYgy3GeUd/7OIl2aie8nEJLmrmmkwPRkrA8="; }; - cargoSha256 = "sha256-6GIt3J6y/O8XaHQJKRSPRgK2XbghMLif4e2Btdww9Ng="; + cargoSha256 = "sha256-hTqje17EdVkgqReuLnizaK3cBJuqXJXC6x5NuoKJLbs="; + cargoPatches = [ ./0001-make-near-test-contracts-optional.patch ]; postPatch = '' substituteInPlace neard/build.rs \ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix index 2bcc6c62be..fb9fc3dc4b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/particl-core/default.nix @@ -18,13 +18,13 @@ with lib; stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.19.2.14"; + version = "0.19.2.20"; src = fetchFromGitHub { owner = "particl"; repo = "particl-core"; rev = "v${version}"; - sha256 = "sha256-gJLEMfEvQ35xjKt8iN/FXi2T/GBMSS7eUqOC8XHKPBg="; + sha256 = "sha256-gvpqOCJTUIhzrNbOaYFftx/G/dO0BCfHAMUrBk6pczc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index f586b6cfd3..abf56d54fe 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -10,13 +10,13 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.21"; + version = "0.9.27"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "HCj5WwfKa4QsfO+1u4ciukDg6Rzv/uvc8h+V/Duhksg="; + sha256 = "sha256-abDkDkFXBG4C7lvE9g6cvUYTfQt7ObZ+Ya8V0W7ASBE="; # the build process of polkadot requires a .git folder in order to determine # the git commit hash that is being built and add it to the version string. @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "tHU8KygIhJDgID/tGGssYTnY8raI5qTdLEDwOKox3No="; + cargoSha256 = "sha256-xDjHu6JARIFy2fVQMGhkdU9Qcz/aqumBFe4MjlH0TCY="; buildInputs = lib.optional stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix index f89ad0eb78..d57b94e653 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/stellar-core/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "stellar-core"; - version = "18.5.0"; + version = "19.3.0"; src = fetchFromGitHub { owner = "stellar"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wEi22R4zb8d5CJV5eWb776Yob8B6Ok4FrbYI0SGM0H8="; + sha256 = "sha256-6untHS4+2CyYfGQdbACjEbE+aSirjNk7LxOO2BWDZEM="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix index ee817b5819..8a193d906e 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/sumokoin/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "A fork of Monero and a truely fungible cryptocurrency"; homepage = "https://www.sumokoin.org/"; license = licenses.bsd3; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix index 71ee383282..70c67db31c 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.13.1"; + version = "2.0.1.3"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-AtsNbUqEBQx0DPWR2LjNl7pdviYmvkv3bYKNBoeJHbw="; + sha256 = "sha256-cATqg/n4/BDQtuCVjHAx3EfMLmlX5EjeQ01gavy/L8o="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix index 5a72462b14..20520037a6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/default.nix @@ -1,19 +1,17 @@ -{ rust, rustPlatform, stdenv, lib, fetchFromGitHub, fetchpatch, autoreconfHook -, makeWrapper, cargo, pkg-config, curl, coreutils, boost179, db62, hexdump -, libsodium, libevent, testers, utf8cpp, util-linux, withDaemon ? true -, withMining ? true, withUtils ? true, withWallet ? true, withZmq ? true, zcash -, zeromq +{ autoreconfHook, boost179, cargo, coreutils, curl, cxx-rs, db62, fetchFromGitHub +, hexdump, lib, libevent, libsodium, makeWrapper, rust, rustPlatform, pkg-config +, stdenv, testers, utf8cpp, util-linux, zcash, zeromq }: -rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { +rustPlatform.buildRustPackage.override { inherit stdenv; } rec { pname = "zcash"; - version = "5.0.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = "zcash"; repo = "zcash"; rev = "v${version}"; - sha256 = "sha256-5PlqFs2njqNeZgmNz0VKMWcRY5lPaF9oTsoh/uLEWi8="; + sha256 = "sha256-tU6DuWpe8Vlx0qIilAKWuO7WFp1ucbxtvOxoWLA0gdc="; }; prePatch = lib.optionalString stdenv.isAarch64 '' @@ -22,12 +20,15 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { --replace "linker = \"aarch64-linux-gnu-gcc\"" "" ''; - cargoSha256 = "sha256-eRRRjUbOieRC88wf+f1jAYvqGFmogBEla67NnImicEc="; + patches = [ + ./patches/fix-missing-header.patch + ]; - nativeBuildInputs = [ autoreconfHook cargo hexdump makeWrapper pkg-config ]; - buildInputs = [ boost179 libevent libsodium utf8cpp ] - ++ lib.optional withWallet db62 - ++ lib.optional withZmq zeromq; + cargoSha256 = "sha256-ZWmkveDEENdXRirGmnUWSjtPNJvX0Jpgfxhzk44F7Q0="; + + nativeBuildInputs = [ autoreconfHook cargo cxx-rs hexdump makeWrapper pkg-config ]; + + buildInputs = [ boost179 db62 libevent libsodium utf8cpp zeromq ]; # Use the stdenv default phases (./configure; make) instead of the # ones from buildRustPackage. @@ -42,15 +43,16 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { configureFlagsArray+=("RUST_VENDORED_SOURCES=$NIX_BUILD_TOP/$cargoDepsCopy") ''; + CXXFLAGS = [ + "-I${lib.getDev utf8cpp}/include/utf8cpp" + "-I${lib.getDev cxx-rs}/include" + ]; + configureFlags = [ "--disable-tests" "--with-boost-libdir=${lib.getLib boost179}/lib" - "CXXFLAGS=-I${lib.getDev utf8cpp}/include/utf8cpp" "RUST_TARGET=${rust.toRustTargetSpec stdenv.hostPlatform}" - ] ++ lib.optional (!withWallet) "--disable-wallet" - ++ lib.optional (!withDaemon) "--without-daemon" - ++ lib.optional (!withUtils) "--without-utils" - ++ lib.optional (!withMining) "--disable-mining"; + ]; enableParallelBuilding = true; @@ -73,6 +75,5 @@ rustPlatform.buildRustPackage.override { stdenv = stdenv; } rec { homepage = "https://z.cash/"; maintainers = with maintainers; [ rht tkerber centromere ]; license = licenses.mit; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zcash/patches/fix-missing-header.patch b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/patches/fix-missing-header.patch new file mode 100644 index 0000000000..6850d78ef1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/zcash/patches/fix-missing-header.patch @@ -0,0 +1,10 @@ +--- a/src/uint256.h 2022-07-20 10:07:39.191319302 +0000 ++++ b/src/uint256.h 2022-07-20 10:07:11.809632293 +0000 +@@ -7,6 +7,7 @@ + #ifndef BITCOIN_UINT256_H + #define BITCOIN_UINT256_H + ++#include + #include + #include + #include diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix new file mode 100644 index 0000000000..2a15d2fa92 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/zecwallet-lite/default.nix @@ -0,0 +1,30 @@ +{ lib, fetchurl, appimageTools }: + +appimageTools.wrapType2 rec { + pname = "zecwallet-lite"; + version = "1.7.13"; + + src = fetchurl { + url = "https://github.com/adityapk00/zecwallet-lite/releases/download/v${version}/Zecwallet.Lite-${version}.AppImage"; + hash = "sha256-uBiLGHBgm0vurfvOJjJ+RqVoGnVccEHTFO2T7LDqUzU="; + }; + + extraInstallCommands = + let contents = appimageTools.extract { inherit pname version src; }; + in '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${contents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "A fully featured shielded wallet for Zcash"; + homepage = "https://www.zecwallet.co/"; + license = licenses.mit; + maintainers = with maintainers; [ colinsane ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix index d49dd646fc..1817910c29 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, buildPackages , fetchFromGitHub , nix-update-script , substituteAll @@ -24,8 +25,6 @@ , gobject-introspection , vala , fetchpatch -, withQt4 ? false -, qt4 , withQt5 ? false , qtbase , yelp-tools @@ -35,15 +34,15 @@ with lib; stdenv.mkDerivation rec { pname = "lightdm"; - version = "1.30.0"; + version = "1.32.0"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { - owner = "CanonicalLtd"; + owner = "canonical"; repo = pname; rev = version; - sha256 = "0i1yygmjbkdjnqdl9jn8zsa1mfs2l19qc4k2capd8q1ndhnjm2dx"; + sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM="; }; nativeBuildInputs = [ @@ -70,8 +69,7 @@ stdenv.mkDerivation rec { libxklavier pam polkit - ] ++ optional withQt4 qt4 - ++ optional withQt5 qtbase; + ] ++ optional withQt5 qtbase; patches = [ # Adds option to disable writing dmrc files @@ -80,18 +78,6 @@ stdenv.mkDerivation rec { sha256 = "06f7iabagrsiws2l75sx2jyljknr9js7ydn151p3qfi104d1541n"; }) - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://github.com/canonical/lightdm/commit/a99376f5f51aa147aaf81287d7ce70db76022c47.patch"; - sha256 = "1zyx1qqajrmqcf9hbsapd39gmdanswd9l78rq7q6rdy4692il3yn"; - }) - - # https://github.com/canonical/lightdm/pull/104 - (fetchpatch { - url = "https://github.com/canonical/lightdm/commit/03f218981733e50d810767f9d04e42ee156f7feb.patch"; - sha256 = "07w18m2gpk29z6ym4y3lzsmg5dk3ffn39sq6lac26ap7narf4ma7"; - }) - # Hardcode plymouth to fix transitions. # For some reason it can't find `plymouth` # even when it's in PATH in environment.systemPackages. @@ -110,8 +96,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--disable-tests" "--disable-dmrc" - ] ++ optional withQt4 "--enable-liblightdm-qt" - ++ optional withQt5 "--enable-liblightdm-qt5"; + ] ++ optional withQt5 "--enable-liblightdm-qt5"; installFlags = [ "sysconfdir=${placeholder "out"}/etc" @@ -120,7 +105,7 @@ stdenv.mkDerivation rec { prePatch = '' substituteInPlace autogen.sh \ - --replace "which" "${busybox}/bin/which" + --replace "which" "${buildPackages.busybox}/bin/which" substituteInPlace src/shared-data-manager.c \ --replace /bin/rm ${busybox}/bin/rm @@ -138,7 +123,7 @@ stdenv.mkDerivation rec { meta = { - homepage = "https://github.com/CanonicalLtd/lightdm"; + homepage = "https://github.com/canonical/lightdm"; description = "A cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index b012699a16..1a949c4dc0 100644 --- a/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/third_party/nixpkgs/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -1,60 +1,54 @@ -{ lib, stdenv -, lightdm_gtk_greeter +{ stdenv +, lib +, lightdm-gtk-greeter , fetchurl , lightdm , pkg-config , intltool , linkFarm , wrapGAppsHook -, useGTK2 ? false -, gtk2 -, gtk3 # gtk3 seems better supported +, gtk3 , xfce4-dev-tools , at-spi2-core , librsvg , hicolor-icon-theme }: -#ToDo: bad icons with gtk2; -# avatar icon is missing in standard hicolor theme, I don't know where gtk3 takes it from - -let - ver_branch = "2.0"; - version = "2.0.7"; -in stdenv.mkDerivation rec { pname = "lightdm-gtk-greeter"; - inherit version; + version = "2.0.8"; src = fetchurl { - url = "${meta.homepage}/${ver_branch}/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "1g7wc3d3vqfa7mrdhx1w9ywydgjbffla6rbrxq9k3sc62br97qms"; + # Release tarball differs from source tarball. + url = "https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-${version}/lightdm-gtk-greeter-${version}.tar.gz"; + sha256 = "vvuzAMezT/IYZf28iBIB9zD8fFYOngHRfomelHcVBhM="; }; - nativeBuildInputs = [ pkg-config intltool xfce4-dev-tools wrapGAppsHook ]; - buildInputs = [ lightdm librsvg hicolor-icon-theme ] - ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); + nativeBuildInputs = [ + pkg-config + intltool + xfce4-dev-tools + wrapGAppsHook + ]; + + buildInputs = [ + lightdm + librsvg + hicolor-icon-theme + gtk3 + ]; configureFlags = [ "--localstatedir=/var" "--sysconfdir=/etc" "--disable-indicator-services-command" "--sbindir=${placeholder "out"}/bin" # for wrapGAppsHook to wrap automatically - ] ++ lib.optional useGTK2 "--with-gtk2"; - - postPatch = '' - # exo-csource has been dropped from exo, and replaced by xdt-csource from xfce4-dev-tools - for f in configure.ac src/Makefile.am; do - substituteInPlace $f --replace exo-csource xdt-csource - done - ''; + ]; preConfigure = '' configureFlagsArray+=( --enable-at-spi-command="${at-spi2-core}/libexec/at-spi-bus-launcher --launch-immediately" ) ''; - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - installFlags = [ "localstatedir=\${TMPDIR}" "sysconfdir=${placeholder "out"}/etc" @@ -66,14 +60,15 @@ stdenv.mkDerivation rec { ''; passthru.xgreeters = linkFarm "lightdm-gtk-greeter-xgreeters" [{ - path = "${lightdm_gtk_greeter}/share/xgreeters/lightdm-gtk-greeter.desktop"; + path = "${lightdm-gtk-greeter}/share/xgreeters/lightdm-gtk-greeter.desktop"; name = "lightdm-gtk-greeter.desktop"; }]; meta = with lib; { - homepage = "https://launchpad.net/lightdm-gtk-greeter"; + homepage = "https://github.com/Xubuntu/lightdm-gtk-greeter"; + description = "A GTK greeter for LightDM"; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ bobby285271 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix index d966db2027..1289ee7549 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "cudatext"; - version = "1.166.5"; + version = "1.168.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; rev = version; - sha256 = "sha256-mFSVYC6a9iAiUcWZOlxuVxFwuwIgH8eQmh8YKaMw2Wg="; + sha256 = "sha256-/06eZ79Zeq6jtcfq+lOcumBgP59bqCX/Km7k21FroSc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json index 89e6a0f79c..012f504e0e 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json +++ b/third_party/nixpkgs/pkgs/applications/editors/cudatext/deps.json @@ -11,13 +11,13 @@ }, "ATFlatControls": { "owner": "Alexey-T", - "rev": "2022.06.19", - "sha256": "sha256-4pkwgg2U6NAGv+fVFKIli2Qe3fyDMiliFLJSgsh1hsQ=" + "rev": "2022.07.17", + "sha256": "sha256-KMGmimbtUQHa8i5wt4KLA/HotLbb/ISzdznmdqPXkNU=" }, "ATSynEdit": { "owner": "Alexey-T", - "rev": "2022.07.01", - "sha256": "sha256-Il8NMBoShJtY5itDr9EBJ8NpfiPux/pNzs9LUc/nn30=" + "rev": "2022.07.27", + "sha256": "sha256-SGozuk0pvp0+PwAFbGG+QMUhQ2A6mXKr31u10WIveh0=" }, "ATSynEdit_Cmp": { "owner": "Alexey-T", @@ -26,13 +26,13 @@ }, "EControl": { "owner": "Alexey-T", - "rev": "2022.06.14", - "sha256": "sha256-P21Tb/hhQvXvT3LhM3lw4B0joQ2cFxsOXjljKaut6OM=" + "rev": "2022.07.20", + "sha256": "sha256-pCIt21m34BuDbWLn+CQwqsMQHVWHtctME63Bjx1B9hE=" }, "ATSynEdit_Ex": { "owner": "Alexey-T", - "rev": "2022.06.14", - "sha256": "sha256-Kcl3y5SN9DKUDL3ozjMrlsObsMVtGuU5iWrpLoMbPz4=" + "rev": "2022.07.20", + "sha256": "sha256-f/BdOMcx7NTpKgaFTz4MbK3O0GcUepyMPyRdhnZImjU=" }, "Python-for-Lazarus": { "owner": "Alexey-T", diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix index b91d124019..f5657b0a4d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/default.nix @@ -14,11 +14,11 @@ let platform_major = "4"; - platform_minor = "23"; + platform_minor = "24"; year = "2022"; - month = "03"; #release month - buildmonth = "03"; #sometimes differs from release month - timestamp = "${year}${buildmonth}080310"; + month = "06"; #release month + buildmonth = "06"; #sometimes differs from release month + timestamp = "${year}${buildmonth}070700"; gtk = gtk3; in rec { @@ -38,7 +38,7 @@ in rec { 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-IKoHGBH8pQ1mkdMz11exO1u5T3hCPk662nPYoFunCyrQHOVA6KDAVHzEo1dxNUSJVGvW9YHDbGlZphXniTBJHw=="; + hash = "sha512-mqoeP6BwmTWGy6qp/+BSfjTaMfAEKtlyqHwn1GrihRCXQyDNeVWRkBNa7JTCUs+yve2rokgisZNVSwpgAqqHYQ=="; }; }; @@ -50,7 +50,7 @@ in rec { 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-cG3mMEJiuNrVfFy5nNkVqC2OpMeE5C1iu26E+LKGwwIBwqPoJtFBPRhLdGVC73KwDDRK8DEyurXsiFal60dv/g=="; + hash = "sha512-RbvqIUnJ00/qvqsw1s5mcZ2SQhhT2y+S9J9xOB+t8bK+1SOhUOFvU/HcDAmHBl88L1qBCF0ckAKd7jETYPeXnw=="; }; }; @@ -62,7 +62,7 @@ in rec { 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-AEGENE5AXXUmIRwv8Hp3LByfPtuG/HvipqkMoq+K4A+8Y7NZCRQM9YSf8zr42S0aYTr6rwP6VJajpFiz4ixULg=="; + hash = "sha512-PPgFti6UUSkIDEUBGY4tDVfnaFXxTUIRIvfMOVXVxIr+ciGK2dOHpQ7K9hcYnWqoIulxa/fV+TXQI3hzcIRVAA=="; }; }; @@ -88,7 +88,7 @@ in rec { 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-CTSuI6Dc2wKe0RduPKAacQmXbEBtF4J7Q5b9gC1MIkXXWPLW7Yp+lL/a167TXgDHG3kqNWbonjZ2JwU2T0FRjg=="; + hash = "sha512-IVSdZI4QnMtj7HdWAXATeJSQt950qNkiSL7n/+f9bPioCA2NtNbDUlBBxnownMKnr+C+iJH2phzPabT9Ar6plA=="; }; }; @@ -100,7 +100,7 @@ in rec { 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-6QOtNFYCRhdSiclEwijBcp2EODnlp8qtO56NJLuRdgwpEe+3A567L/vsZe/E72YTGZOFh9yJ7+XehIEjonfUIw=="; + hash = "sha512-ace+zpz5tjLA89gHLyBrjldKU7+kb85uJX4y4IQdVkrskrA+uCv0z9lzB/qbgrH51ZFN2xz04z1nFLJd09WacA=="; }; }; @@ -112,7 +112,7 @@ in rec { 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-bgaRM7l4WOoGA8doR/nqjV4Hnszx3N4cZANYfq/Fq5Agspocu4m1F4ofetQC4BdlLkx0o+moKSN6sm34aT5H4Q=="; + hash = "sha512-Xo1dk8+BLUoUVrnMm9XC+IBzoS9bKde2waRaYxjCRBOykUiZ4npGgquh3bEbsk1GZ3cKlwuxLxr9Y9+RGw3UTA=="; }; }; @@ -124,7 +124,7 @@ in rec { 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-YyyATAL0pJVrinrLixIW3p+bz3WfD7L/WL0EGnUWgCGsiVDzF2CGoXXT8YsH34uc+6Hn8z23JCoNX4Sqdo8i7Q=="; + hash = "sha512-rkjLwexI352G8CYkaF/1dl26wF58IuPMan76gR/3Fx/CMywtv25Tueu8NWZGkHd6Zwdpv/h25D8fu9tbM2NExg=="; }; }; @@ -136,7 +136,7 @@ in rec { 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-1Go3e1HDRJlba8ySYRfi0+aU6aHjKmd3fc/IgeKw18c="; + hash = "sha256-8FaVTzjvtT17pYUYfKJgVd55nd2ngrsLY+7AJnXu/BI="; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix index 2571f4e0b4..1d1406160c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/eclipse/plugins.nix @@ -255,12 +255,12 @@ rec { cdt = buildEclipseUpdateSite rec { name = "cdt-${version}"; # find current version at https://www.eclipse.org/cdt/downloads.php - version = "10.6.0"; + version = "10.7.0"; src = fetchzip { stripRoot = false; url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/${lib.versions.majorMinor version}/${name}/${name}.zip"; - hash = "sha256-eMvZ2UvPpUq1J4DDg6f+R1g217bnRjxmr5zWUAhef/c="; + hash = "sha256-/lQ3TLFQ1IgwYM540gxAFiEGOfHQIQQMf/pqCZ29ztQ="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 186cfb476a..dd91eff370 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -335,16 +335,16 @@ license = lib.licenses.free; }; }) {}; - beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: + beacon = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "beacon"; ename = "beacon"; - version = "1.3.3"; + version = "1.3.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/beacon-1.3.3.el"; - sha256 = "10r4fpf8pcf1qn5ncpm5g7skzba749mrc1ggykq92jlha3q98s02"; + url = "https://elpa.gnu.org/packages/beacon-1.3.4.tar"; + sha256 = "1fy76c2x0xpnx7wfpsxfawdlrspan4dbj2157k9sa62i6a1c8f21"; }; - packageRequires = [ seq ]; + packageRequires = [ emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/beacon.html"; license = lib.licenses.free; @@ -399,10 +399,10 @@ elpaBuild { pname = "boxy"; ename = "boxy"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/boxy-1.1.0.tar"; - sha256 = "17z0amn1klbzvq0z5g20a5gjq5agrrhnkp8amqlqzj7p0p31nbns"; + url = "https://elpa.gnu.org/packages/boxy-1.1.1.tar"; + sha256 = "08jb5v93l3y9cx48qhpv20i7kdxvl5dinxj3z0pxkx0ckvml7cvd"; }; packageRequires = [ emacs ]; meta = { @@ -440,16 +440,16 @@ license = lib.licenses.free; }; }) {}; - buffer-env = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + buffer-env = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "buffer-env"; ename = "buffer-env"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/buffer-env-0.3.tar"; - sha256 = "0h92pia258fndihnwmnak10ix00dmfanadnsnzbdah3q64416qhz"; + url = "https://elpa.gnu.org/packages/buffer-env-0.4.tar"; + sha256 = "0y8ik87dqldhn6q631zp2ln9z5byqgm9icrvr4xrdx6g8mr9c56z"; }; - packageRequires = [ emacs ]; + packageRequires = [ compat emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/buffer-env.html"; license = lib.licenses.free; @@ -771,10 +771,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "28.1.1.3"; + version = "28.1.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-28.1.1.3.tar"; - sha256 = "11g27n0103j1xmj1s3m49jcqxn4n4wd9pm69i2g3ikijxs1qw18n"; + url = "https://elpa.gnu.org/packages/compat-28.1.2.0.tar"; + sha256 = "0gm2drvxdlmc3fjlapb5z8k1ymr6q7mrj9z7mb686jfy931b9mwr"; }; packageRequires = [ emacs nadvice ]; meta = { @@ -797,6 +797,21 @@ license = lib.licenses.free; }; }) {}; + consult-recoll = callPackage ({ consult, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "consult-recoll"; + ename = "consult-recoll"; + version = "0.6.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/consult-recoll-0.6.2.tar"; + sha256 = "0ngisaxdsfmjcincxdjrpgj6q6vh4dav7b2bpfls9a7107rb2ycp"; + }; + packageRequires = [ consult emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/consult-recoll.html"; + license = lib.licenses.free; + }; + }) {}; context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "context-coloring"; @@ -1056,10 +1071,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "0.3.1"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-0.3.1.tar"; - sha256 = "0zdxflmm62gkg6nbrpaxinwb60ghr19pvr3jbgnvbca3bd5yg5wk"; + url = "https://elpa.gnu.org/packages/denote-0.4.0.tar"; + sha256 = "031ia1k5fqzq154jhi4icvivhdg8yn7zfkwy81yf0ivcsivri54s"; }; packageRequires = [ emacs ]; meta = { @@ -1086,10 +1101,10 @@ elpaBuild { pname = "devdocs"; ename = "devdocs"; - version = "0.4"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/devdocs-0.4.tar"; - sha256 = "05xmxqpp1cpf03y7idpqdsmbj30cissscy80ng5hqc3028kr2jqm"; + url = "https://elpa.gnu.org/packages/devdocs-0.5.tar"; + sha256 = "0qyp8lhf76yv2ym7cryvygvf2m9jah5nsl1g79gqjrsin6vlhqka"; }; packageRequires = [ emacs ]; meta = { @@ -1429,10 +1444,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eldoc-1.12.0.tar"; - sha256 = "1npggpisqnfkc3gx7dr3pjnif7gf571z7s9g7n6vnb213353qskk"; + url = "https://elpa.gnu.org/packages/eldoc-1.13.0.tar"; + sha256 = "0c05dzrs7vrhibj46jpz625482ah6xywji7way6wcvwc711y74fz"; }; packageRequires = [ emacs ]; meta = { @@ -2333,10 +2348,10 @@ elpaBuild { pname = "javaimp"; ename = "javaimp"; - version = "0.8"; + version = "0.9.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/javaimp-0.8.tar"; - sha256 = "1i6k0yz6r7v774qgnkzinia783fwx73y3brxr31sbip3b5dbpmsn"; + url = "https://elpa.gnu.org/packages/javaimp-0.9.1.tar"; + sha256 = "106wn53z39fcna3sv4p0idmjg9lg5lijm5hyb4lbibp4s5yh2y3b"; }; packageRequires = []; meta = { @@ -2764,6 +2779,21 @@ license = lib.licenses.free; }; }) {}; + minibuffer-header = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "minibuffer-header"; + ename = "minibuffer-header"; + version = "0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/minibuffer-header-0.5.tar"; + sha256 = "1nw53h34izm0z8njsf6jacc40fhg4x5l8r403ysmw2ps89i80p36"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/minibuffer-header.html"; + license = lib.licenses.free; + }; + }) {}; minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "minibuffer-line"; @@ -2832,10 +2862,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-2.4.1.tar"; - sha256 = "0wm4wj2dsv93p8yq7byrwni079caxny9cgn8d5xz0a6g1igqzx4q"; + url = "https://elpa.gnu.org/packages/modus-themes-2.5.0.tar"; + sha256 = "0j2mx47fpbqvpwhkdskgrnyj5nzg25sqgxwsdvrvw22c7gxhirxn"; }; packageRequires = [ emacs ]; meta = { @@ -3100,10 +3130,10 @@ elpaBuild { pname = "num3-mode"; ename = "num3-mode"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/num3-mode-1.3.el"; - sha256 = "0x2jpnzvpbj03pbmhsny5gygh63c4dbl4g3k0cfs3vh4qmp2dg6w"; + url = "https://elpa.gnu.org/packages/num3-mode-1.4.tar"; + sha256 = "01cl5wc5xzf4milq6r5ps2f4ikpkdbdidk880svby9mhiw6agydh"; }; packageRequires = []; meta = { @@ -3246,6 +3276,21 @@ license = lib.licenses.free; }; }) {}; + org-notify = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "org-notify"; + ename = "org-notify"; + version = "0.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/org-notify-0.1.0.tar"; + sha256 = "1ijwlv8493g19cascv7fl23sjljvdcak6pg4y1wbs595mmsmh409"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/org-notify.html"; + license = lib.licenses.free; + }; + }) {}; org-real = callPackage ({ boxy, elpaBuild, emacs, fetchurl, lib, org }: elpaBuild { pname = "org-real"; @@ -3370,10 +3415,10 @@ elpaBuild { pname = "pabbrev"; ename = "pabbrev"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pabbrev-4.2.1.el"; - sha256 = "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh"; + url = "https://elpa.gnu.org/packages/pabbrev-4.2.2.tar"; + sha256 = "0iydz8yz866krxv1qv32k88w4464xpymh0wxgrxv6nvniwvhvd0s"; }; packageRequires = []; meta = { @@ -3456,6 +3501,21 @@ license = lib.licenses.free; }; }) {}; + perl-doc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "perl-doc"; + ename = "perl-doc"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/perl-doc-0.2.tar"; + sha256 = "1p5bbkwllh91a0vg5aisqa9kbms7l9vxk14lm09bav952xxn6gdl"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/perl-doc.html"; + license = lib.licenses.free; + }; + }) {}; persist = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "persist"; @@ -3475,10 +3535,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.4.22"; + version = "0.4.25"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.4.22.tar"; - sha256 = "1094dmvihx0ff7fyjldd2zfn47nq89p6bjp90ma0xf01hf6ggn6c"; + url = "https://elpa.gnu.org/packages/phps-mode-0.4.25.tar"; + sha256 = "1sqwh7lkpgwc8m7vrbzjk8vc2p3b9gq6smyz6zx8pq4pf1rqkzrd"; }; packageRequires = [ emacs ]; meta = { @@ -3505,10 +3565,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.1"; + version = "0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/plz-0.1.tar"; - sha256 = "083qz6kfg4q8xy3vsfwlk2g9vbg8iym2axmyhh54naivrc096ghc"; + url = "https://elpa.gnu.org/packages/plz-0.2.tar"; + sha256 = "1b45m9b9gzx5ylpxcppkiikk5lfya7ngiqsap4a7m1b2cr8rqxcj"; }; packageRequires = [ emacs ]; meta = { @@ -3595,10 +3655,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "0.3.1"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pulsar-0.3.1.tar"; - sha256 = "0v3bdw0sgic98b7xj19g37hw1vinanagsbhyf5qpajx3gm2im9wx"; + url = "https://elpa.gnu.org/packages/pulsar-0.4.0.tar"; + sha256 = "027kpywdjfd1xm1fxkprbc04iq96lnyzw2f3499wyrfj4vxk2dn2"; }; packageRequires = [ emacs ]; meta = { @@ -4530,10 +4590,10 @@ elpaBuild { pname = "taxy"; ename = "taxy"; - version = "0.9"; + version = "0.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-0.9.tar"; - sha256 = "1nzafs3yvcnmg07zi345n2yvjsw9wixlybzibnhf5k6jnd0vvpjh"; + url = "https://elpa.gnu.org/packages/taxy-0.10.tar"; + sha256 = "1jamry2p3qhswq8prd2g7ljh4yqk0wwblyd9fhnaclakahrn5vi3"; }; packageRequires = [ emacs ]; meta = { @@ -4545,16 +4605,17 @@ , emacs , fetchurl , lib - , magit-section }: + , magit-section + , taxy }: elpaBuild { pname = "taxy-magit-section"; ename = "taxy-magit-section"; - version = "0.9.1"; + version = "0.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/taxy-magit-section-0.9.1.tar"; - sha256 = "0ybkz5nqjdrg2z9bfd07xg4k49hrl26vsrwz2vqpfbsqqg5vr4pr"; + url = "https://elpa.gnu.org/packages/taxy-magit-section-0.10.tar"; + sha256 = "1g58nvpb04ldhn5qnjw2q5idrv6vhlfa0qmb46cvis6bkz46cxkw"; }; - packageRequires = [ emacs magit-section ]; + packageRequires = [ emacs magit-section taxy ]; meta = { homepage = "https://elpa.gnu.org/packages/taxy-magit-section.html"; license = lib.licenses.free; @@ -4673,10 +4734,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.3"; + version = "2.5.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.3.tar"; - sha256 = "16bs90h7b1d188v6glhfp0y4wgxvwn3dl6l4sbswlf1zq3y61zy7"; + url = "https://elpa.gnu.org/packages/tramp-2.5.3.1.tar"; + sha256 = "0dqc5gmp20isrlanccvj6nhalmmsfg7bmm690gxfgrbqcc2vj69a"; }; packageRequires = [ emacs ]; meta = { @@ -4892,10 +4953,10 @@ elpaBuild { pname = "vc-got"; ename = "vc-got"; - version = "1.1.2"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vc-got-1.1.2.tar"; - sha256 = "1824d5c217qimsg4aw8adjvv06gkhv5f3918fi0lkhya1jsvfrx9"; + url = "https://elpa.gnu.org/packages/vc-got-1.2.tar"; + sha256 = "074di4bchhnpfixkjdis8dwxx6r32j1qypxk647q1z7lvd92j39s"; }; packageRequires = [ emacs ]; meta = { @@ -5327,10 +5388,10 @@ elpaBuild { pname = "xref"; ename = "xref"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xref-1.4.1.tar"; - sha256 = "1vbpplw0sngymmawi940nlqmncqznb5vp7zi0ib8v66g3y33ijrf"; + url = "https://elpa.gnu.org/packages/xref-1.5.0.tar"; + sha256 = "0xl6aiwkjbgs44c3wxk6s85diydm3y5lsd7znb0dhbqb7milid2d"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 80809de08c..07ffad496c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -49,10 +49,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "1.7.0"; + version = "1.7.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-1.7.0.tar"; - sha256 = "0bpicd0m9h1n56ywinfa0wykhx86sxn8i1f2j5vwhwcidap42qaa"; + url = "https://elpa.nongnu.org/nongnu/annotate-1.7.1.tar"; + sha256 = "0jyzx5z10mv9b134jz4hkp1mbc9f1ki794cr5na9zwvpd9q3j9iy"; }; packageRequires = []; meta = { @@ -144,10 +144,10 @@ elpaBuild { pname = "autothemer"; ename = "autothemer"; - version = "0.2.3"; + version = "0.2.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.3.tar"; - sha256 = "10r4lf3nl7mk6yzfcyld5k0njslw8ly2sd0iz1zkzywnv31lsxnd"; + url = "https://elpa.nongnu.org/nongnu/autothemer-0.2.5.tar"; + sha256 = "1g07j8fmyqhhas0ci2f9l7i5l238cpb02vr93gyn2a3r3lq6wn4d"; }; packageRequires = [ cl-lib dash emacs ]; meta = { @@ -296,10 +296,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.14.0"; + version = "5.15.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.14.0.tar"; - sha256 = "1lirhp6m5r050dm73nrslgzdgy6rdbxn02wal8n52q37m2armra2"; + url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.15.1.tar"; + sha256 = "14j6v32cbj52n91f7ckbjlam60rszh05r09bwv579p1xs2m7s7q3"; }; packageRequires = [ emacs ]; meta = { @@ -473,10 +473,10 @@ elpaBuild { pname = "dockerfile-mode"; ename = "dockerfile-mode"; - version = "1.5"; + version = "1.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.5.tar"; - sha256 = "0dz91i4ak3v0x1v75ibhjjz211k9g6qimz4lxn3x424j7dlpa9f3"; + url = "https://elpa.nongnu.org/nongnu/dockerfile-mode-1.7.tar"; + sha256 = "1kb768kv48ypw7fm5xcvkw4pq9mfkvv0bg1inlhfifkb4i9kmz3l"; }; packageRequires = [ emacs ]; meta = { @@ -1123,10 +1123,10 @@ elpaBuild { pname = "gruvbox-theme"; ename = "gruvbox-theme"; - version = "1.26.0"; + version = "1.27.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.26.0.tar"; - sha256 = "19q5i0jz01hdn09wwg929yva6278fhyvk68id5p9dyi8h2n73djn"; + url = "https://elpa.nongnu.org/nongnu/gruvbox-theme-1.27.0.tar"; + sha256 = "0p36b2rrhizfrj8i86zm810bh0w7qikb5cwpyn106yfvgcv39jl8"; }; packageRequires = [ autothemer ]; meta = { @@ -1198,10 +1198,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.8.6.tar"; - sha256 = "0h0l36wmzxi03viy0jd3zri84big0syiilvjm639nqhzsr1lbvy2"; + url = "https://elpa.nongnu.org/nongnu/helm-3.8.7.tar"; + sha256 = "1n0m061amrzm0xpgqy2mp9vrk2960gqhl5hi6c1smcmm7nxqwz12"; }; packageRequires = [ helm-core popup ]; meta = { @@ -1213,10 +1213,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.8.6"; + version = "3.8.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.6.tar"; - sha256 = "0yzzwdggd37m7kv0gh4amc7l5x0r5x2pxi3lfs36hq2hfsqlfkza"; + url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.7.tar"; + sha256 = "1sak74v3gg34zzlbbgvlzvg7gw32fhcbxp5kigigmwvvbj5imgs7"; }; packageRequires = [ async emacs ]; meta = { @@ -1330,10 +1330,10 @@ elpaBuild { pname = "inf-clojure"; ename = "inf-clojure"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.0.tar"; - sha256 = "1a9hr28l8cxf5j9b5z0mwds4jd36bhdqz9r86c85rylgaibx5ky7"; + url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.1.tar"; + sha256 = "0p1q51wn67abwhn6qa01f190czaq33nmy4ir1jrcxsny4vnbxvx4"; }; packageRequires = [ clojure-mode emacs ]; meta = { @@ -1959,10 +1959,10 @@ elpaBuild { pname = "popon"; ename = "popon"; - version = "0.7"; + version = "0.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/popon-0.7.tar"; - sha256 = "0sr0cv9jlaj83sgk1cb7wd6r12g6gmzdjzm077gxa6jy9p4qrv0q"; + url = "https://elpa.nongnu.org/nongnu/popon-0.9.tar"; + sha256 = "1vnrdjg63fcpgzzc45l9cx67yb2lnk5prfp5js4dpdhz93d14qck"; }; packageRequires = [ emacs ]; meta = { @@ -2338,10 +2338,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.0.5"; + version = "1.0.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.0.5.tar"; - sha256 = "1wpkwab6scmc9d3bzp5161d8agmcjacpijs8xqb1mpbyvl1jvavc"; + url = "https://elpa.nongnu.org/nongnu/subed-1.0.7.tar"; + sha256 = "0js48yar8xgj3wjmlkv3k5208q1zvv74sg4lhk6asiy4cq3pqjia"; }; packageRequires = [ emacs ]; meta = { @@ -2712,10 +2712,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "17.17.20220709145456"; + version = "17.19.20220806194323"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.17.20220709145456.tar"; - sha256 = "1npgdc9f1vj1d9nyfh30vskybqs2lwhd31b2a7i79ifrxs48kqr4"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.19.20220806194323.tar"; + sha256 = "1cflsvp1cpyr3zsj2dij3mc36lprwjdhrvxx2k8ilavhzi4dn64v"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index ff65a903ed..48f2183fcb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -285,11 +285,11 @@ "repo": "jdtsmith/abridge-diff", "unstable": { "version": [ - 20220419, - 2358 + 20220716, + 1641 ], - "commit": "996d921da0a0ee651b3486c2afe29447f48be50f", - "sha256": "19k23326dwnnbf8gdm1b8zm1p8qx0515ak939vdp6falhqa9x4rn" + "commit": "994bd47a8de5200018450ea19a610782eff3fafc", + "sha256": "0zzsagar75yw0i56djc2x9f95fdji39bnv0qkr226nh77bp0kjhx" }, "stable": { "version": [ @@ -1263,8 +1263,8 @@ "deps": [ "popup" ], - "commit": "6b502df6940587dae2dfbd349c22dfd44c803a86", - "sha256": "0q4cf4w0gm933ph4r2glw40vgfiz1v9r043w6lms3z2a0b3p6sdb" + "commit": "23af25e3f1629755b1b245364fbb93bf4ba933b9", + "sha256": "08w63a5zawa1myf7a34qacjf0r17x0yk6lsqxip6y3hyg1ms8lmr" } }, { @@ -1305,11 +1305,11 @@ "repo": "tam17aki/ace-isearch", "unstable": { "version": [ - 20210830, - 746 + 20220809, + 1748 ], - "commit": "8439136206a42e41ef95af923e0dc3bbd4fa306c", - "sha256": "00mqd02l3fx5jicjwm27xwmr98l3f8v08q4jfxdzh1cjqpi8c5pp" + "commit": "a24bfc626100f183dbad016bd7723eb12e238534", + "sha256": "00p8nh7084ifjiqzvm8zy0x0dqdz6i9qym9pfi7db2js17ym8pjc" }, "stable": { "version": [ @@ -1840,14 +1840,14 @@ "repo": "emacsorphanage/adoc-mode", "unstable": { "version": [ - 20220529, - 551 + 20220720, + 622 ], "deps": [ "markup-faces" ], - "commit": "cacd4e8f6773da85ebe17b733eb5e74f2f7c379c", - "sha256": "08w8xirp2frkap74d646j6pbaby72j1233hlz0nk3pzlh0lglzc0" + "commit": "e0d08ee6d29289a475796e22b2298b028c02b408", + "sha256": "1dp3av91rwq87vfgwpgi622imbv0z79znnfx0r6f5i06xn1ag5bv" }, "stable": { "version": [ @@ -1899,8 +1899,8 @@ "deps": [ "consult" ], - "commit": "e8cb221892ae4d82fc52fffb72b45b5b89ada334", - "sha256": "0gwg60c3f2ypjwpai3j4dhzdjn29lxskf3s0nw75pnipngf0sh9r" + "commit": "0162da0aab3b30412eee5ebf68427361fc8fc26d", + "sha256": "0sr11l9mxz3679q3rhj6gw1w9g202i9iigjszjilxx7y2vyccx7s" }, "stable": { "version": [ @@ -2047,11 +2047,11 @@ "repo": "takaxp/ah", "unstable": { "version": [ - 20201213, - 218 + 20220730, + 1058 ], - "commit": "869219e7853510aeb00af3580aede0e5d49b324a", - "sha256": "02i6nrkbqf1bj2m4h81p5z1mi9lm92g9vm1mi6qny83zs64m2607" + "commit": "8e12223f0f423e7fa882cc049a25af6db755902d", + "sha256": "06cxg7x34qfw8m5zj4dpapcbwka4i11qn065753zwzbqfikwwl11" } }, { @@ -2371,16 +2371,16 @@ "repo": "jwiegley/alert", "unstable": { "version": [ - 20200303, - 2118 + 20220808, + 510 ], "deps": [ "cl-lib", "gntp", "log4e" ], - "commit": "7046393272686c7a1a9b3e7f7b1d825d2e5250a6", - "sha256": "1s93ijkax0s78qn79c364ainmq7jq4gc95akl9wra642ql6hz3iq" + "commit": "fb92919739b35ec6e9e6db56ca7c10cf7ef1329d", + "sha256": "1yik54ksk1al4kb2m0nc1xmcz8333h45c5w9qfg1w23mfg52g11y" }, "stable": { "version": [ @@ -2489,11 +2489,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220628, - 2233 + 20220801, + 1541 ], - "commit": "9c90dbaa31a2fdc163e4394514bf9ee359e46ee5", - "sha256": "0sx1xj9fspv560h23h7hmg3kwcc5vjk337i6ic3c3vl94zhd92r2" + "commit": "6f876fa11ef64af20d9b2a44fdabac6446de51ba", + "sha256": "1n975ziy5wyfnmmpak1vsj7nqzm5ciw811pcg7rdmc2ljlc90n5p" }, "stable": { "version": [ @@ -2908,8 +2908,8 @@ "repo": "pythonic-emacs/anaconda-mode", "unstable": { "version": [ - 20211122, - 817 + 20220717, + 1956 ], "deps": [ "dash", @@ -2917,8 +2917,8 @@ "pythonic", "s" ], - "commit": "cbea0fb3182321d34ff93981c5a59f8dd72d82a5", - "sha256": "0ajmqa60avwmlx9c63rirfb5mjqhbcxf2x15mnxr6a1rlzcylxg6" + "commit": "160e4e7185881233d96da6722332bd6d038187a9", + "sha256": "0rk540wrpgkibrjzjr0dbaw6l0gaiq5szqld2xj9y8q020ixrgr4" }, "stable": { "version": [ @@ -3229,11 +3229,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20220707, - 1207 + 20220809, + 846 ], - "commit": "4c697e70e882657aaf9072d9703c6142e931b265", - "sha256": "1brm6qp3zcprr9s7v1q4jd2wzbnv2dvx2krv754jzdiw3lm92arf" + "commit": "0f4ffd5c1c9f92fea6961699287f3dd124b88aad", + "sha256": "00w5lrq6mg95q2kds2b7lipzs4h0w9pg2nwk76lw5gajk6qlnzpi" }, "stable": { "version": [ @@ -3271,8 +3271,8 @@ 20200914, 644 ], - "commit": "5d30d8e7a25dfced02edefd82699f1f7b6f79316", - "sha256": "022jzidrgx66k40i25wd49p8q9gh8x7s2m7qnxpqcfjbmgdy624p" + "commit": "5d2d77abbc0c97f5b23d7089797c3ef8796508dc", + "sha256": "1ayprcd7alryqz89p5gi3wawbc72210r7j8jw7naind7wwkjz386" }, "stable": { "version": [ @@ -3633,11 +3633,11 @@ "repo": "wanderlust/apel", "unstable": { "version": [ - 20220427, - 1121 + 20220720, + 1308 ], - "commit": "6947dc4605ebbb87762edf7051a78a3f7b5f17c5", - "sha256": "0qfmnrr9v7r78amvi6qd3a3qyiy1hk0jqhj4bmsabifxwlsmbzlb" + "commit": "82eb2325bd149dc57b43a9ce9402c6c6183e4052", + "sha256": "0qiw19pn1cs8y571irw7bjdygkvwan9ch2i1dg139dri4b6q1il6" } }, { @@ -3919,8 +3919,8 @@ 20220527, 632 ], - "commit": "cb48fee04cb0cbb26f760a3b95649f7dac78c6ec", - "sha256": "088rcqlwhdcaal99cbwsfg93nvzil2kix28zib2lxv6lfapjpzwp" + "commit": "4116be5ddab61d7f2366d5efcd23baa7519e6e84", + "sha256": "1c7n4072l2aw9ilfln4vv90z19lw9i9gkrr8bwj87b8nh15q239s" }, "stable": { "version": [ @@ -4164,26 +4164,26 @@ "repo": "zkry/asm-blox", "unstable": { "version": [ - 20220124, - 1430 + 20220808, + 128 ], "deps": [ "yaml" ], - "commit": "47aa63d320c39f8566a8d95c61f27383f561b001", - "sha256": "0rc0m0w8z5mz0mkyh05kjcnz9wzjvs92ygyh934zwl8a3lk566sk" + "commit": "d511ec0e24a081f1aa691c19cd38c8e0a90cb87e", + "sha256": "1yydjlc4x86fl1n9g9z4a4w9kqqgpvzfd2n7n4qqk07kwcf7nxmc" }, "stable": { "version": [ 0, - 2, - 3 + 3, + 0 ], "deps": [ "yaml" ], - "commit": "8bc20ab442765dffc6c710c1922757c2df3675a4", - "sha256": "1b9iqbwc7g2z9k413mb01s1qzzshfmxs25pn2m0l1z26fc81dch0" + "commit": "d73e111a0b96d335e9bca69a234bd0004dfe36f9", + "sha256": "1f19822ygyn07lpzfvvxhk49cjk2lc5zam1wd59whfqmpl93s0y3" } }, { @@ -4212,14 +4212,14 @@ "repo": "phillord/assess", "unstable": { "version": [ - 20200211, - 1817 + 20220719, + 1904 ], "deps": [ "m-buffer" ], - "commit": "5bac045b273623772b6a2d820997d50f7ab4e466", - "sha256": "0mq59wz9anvywazl7d01fis1z7z7fsp9c7pymrc8rgmz77xpwnqx" + "commit": "44083d94feb45d3636f7ee6c55e0ef6bbb32b938", + "sha256": "1mgx6sism6l1mwmz81fq6wcxkxlbyn4k6p8nl0v8xc1zsh2mn8m0" }, "stable": { "version": [ @@ -4274,11 +4274,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20220630, - 57 + 20220807, + 1541 ], - "commit": "7f4ed1e8b44e0b88eadb2efeeaf97f32c38f14c4", - "sha256": "08d1sv97xhk20r7xgb9mxlvdzlj5x7pi542fdm5nrz2s47y4w0xg" + "commit": "6d164db151c4ab68242662342f71741b8594762f", + "sha256": "08njlpivli93jc8z5sklwas6m1mjizsn8m46dfsswwnxpsl3zsd7" }, "stable": { "version": [ @@ -4463,15 +4463,15 @@ "repo": "alpha22jp/atomic-chrome", "unstable": { "version": [ - 20210221, - 59 + 20220723, + 113 ], "deps": [ "let-alist", "websocket" ], - "commit": "c73367d8aa660f2b3c3f70ef5c39f5b502d60404", - "sha256": "07bw5fjmszxsvvcb0415zfawfmzqwj0qdvaigxrbb5rinazwb0pn" + "commit": "061958ab96c31085b5daf449b1d826b052777b59", + "sha256": "0jfmw11d18v8qjcqcfkcmq66ccaa97jq7y5v7m67kf2hcawxk2a4" }, "stable": { "version": [ @@ -4530,14 +4530,14 @@ "repo": "tsuu32/auctex-cluttex", "unstable": { "version": [ - 20210226, - 302 + 20220730, + 1100 ], "deps": [ "auctex" ], - "commit": "9a15742a6de1285831329eac93f9e35752472685", - "sha256": "1ra2qkr9wadnx5aqg6paxk8w4h9m6c4jrl4b7zb5l6s1csw1llj1" + "commit": "f4012ac86e612eac7662c62afd946e59b3b405bd", + "sha256": "163p1x5zrw39cq2l7vf4zf8283a0bsg9wfs25yvs77dlgsvzvb5c" }, "stable": { "version": [ @@ -4753,11 +4753,11 @@ "repo": "ccrusius/auth-source-xoauth2", "unstable": { "version": [ - 20220628, - 2232 + 20220804, + 2219 ], - "commit": "8bbfd9395a2dc397639ec265299ccaadb71aeebc", - "sha256": "1csqsp960w1i0pw5z3hagb7kv0hx9nf8h1b5ifljwjgnbpirhs46" + "commit": "5d1adfa649bb5a9df20a2fa89f235a55a64b52e4", + "sha256": "06ssvsqac1vlbay9yp1fidbils56dwfgbzwk4nrnr5qxnl2rd370" }, "stable": { "version": [ @@ -5640,28 +5640,28 @@ "repo": "jasonm23/autothemer", "unstable": { "version": [ - 20220106, - 416 + 20220809, + 906 ], "deps": [ "cl-lib", "dash" ], - "commit": "1dbc06ad430c51b5ec1a602a808ee46b9bd4bafa", - "sha256": "09kx27dr7pw6aa2yx7p04z6xc4nn277d2n4g0r6smwacjh803ljs" + "commit": "3223cd8867fb75a109e41ccce98ab0e89d0a4f1b", + "sha256": "1rwz8hdmycmvak1w5sriwf1pwahham77vyab6jngdw8x9ngxabnx" }, "stable": { "version": [ 0, 2, - 2 + 5 ], "deps": [ "cl-lib", "dash" ], - "commit": "8c467f57571c154129d660dfccebd151c998f2d9", - "sha256": "0cd2pqh6k32sjidkcd8682y4l6mx52xw4a05f38kk8nsrk28m74k" + "commit": "3223cd8867fb75a109e41ccce98ab0e89d0a4f1b", + "sha256": "1rwz8hdmycmvak1w5sriwf1pwahham77vyab6jngdw8x9ngxabnx" } }, { @@ -6320,11 +6320,11 @@ "repo": "base16-project/base16-emacs", "unstable": { "version": [ - 20220713, - 402 + 20220725, + 353 ], - "commit": "6f37e4a849a84a41c4404a15d1bac57cbf912324", - "sha256": "0y0yw6wnsfkmv8nrl2a0v6l0aiqc9bjhiwxjz4l8ncbp0gkvad1y" + "commit": "36cd6ed044ee37e399fc5d0db8070ae79fb06800", + "sha256": "1v0i80iydmzrd8z1ri1dmg9bqj13xvr21lwvaqpq9jxh7iq1b9a8" }, "stable": { "version": [ @@ -6761,14 +6761,11 @@ "repo": "Malabarba/beacon", "unstable": { "version": [ - 20190104, - 1931 + 20220730, + 100 ], - "deps": [ - "seq" - ], - "commit": "370c21c76be9d7600d98e9666cda56f47610cbb0", - "sha256": "057xjfqcxm3m6fdgv238lxqg33rn4f34lisw0dl04k4vwq9g091r" + "commit": "85261a928ae0ec3b41e639f05291ffd6bf7c231c", + "sha256": "0gp68ngzdyxz65wnijrj273wxrzdvkf35i0ww5sqszbin2vyxv4l" }, "stable": { "version": [ @@ -6791,14 +6788,14 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220711, - 911 + 20220718, + 1440 ], "deps": [ "dash" ], - "commit": "a3ebdcdd91d32f044b68541a00e162396e4acb38", - "sha256": "1jmlg5rbgam3s9n7blmk2b9r9ggzdvsbry1fdsx5gipymbldx1gg" + "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", + "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" } }, { @@ -6841,11 +6838,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20220409, - 846 + 20220803, + 1431 ], - "commit": "bbcfdc0909c20ddee41e95b7ade7de63af73b220", - "sha256": "06z0c2ryq8j3sd3m5pph5l6qnxy51bdqy6b8ya3z94qa63xm3ksb" + "commit": "eb77d82dc88846c5715353b7fd99c9030a2e2ee7", + "sha256": "0xswh4wfrnwzwsrxmfsvfm1bcdviwfs2hhdark62l37s5xx6dcc9" }, "stable": { "version": [ @@ -7383,15 +7380,15 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20171204, - 2010 + 20220807, + 1556 ], "deps": [ "bind-key", "key-chord" ], - "commit": "0ad5d9d5d8a61517a207ab04bf69e71c081149eb", - "sha256": "112g1944iirjlvfw8fxwd1iy6z8yfawf4qz5jv3aj087cxli55ww" + "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", + "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" }, "stable": { "version": [ @@ -7415,11 +7412,11 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20210210, - 1609 + 20220809, + 42 ], - "commit": "0ad5d9d5d8a61517a207ab04bf69e71c081149eb", - "sha256": "112g1944iirjlvfw8fxwd1iy6z8yfawf4qz5jv3aj087cxli55ww" + "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", + "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" }, "stable": { "version": [ @@ -8109,8 +8106,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20220704, - 1741 + 20220726, + 1637 ], "deps": [ "cl-lib", @@ -8119,8 +8116,8 @@ "flycheck", "yasnippet" ], - "commit": "e162f0d89fbc9d55da7d4a6059449449afc29f3b", - "sha256": "1glcszq0mf63z45dhny02vyxx1shlan0cxg22r2hrm2p36lm8nkm" + "commit": "0a736ab6e9669e755141db5afefbfe8cd5df6961", + "sha256": "0mg5w8zvavw4g9iaivsbg1r42vzjjcbzq0zprwl0x09p8z23drga" } }, { @@ -8226,15 +8223,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20220611, - 1724 + 20220803, + 1958 ], "deps": [ "epkg", "magit" ], - "commit": "c8b5ee24a289848a8c100bf04e29ae56130d0cf4", - "sha256": "1n766s994kymppgn2gmv2qx7gm5wka5wcwhby1kpv7b2zq3xx9hr" + "commit": "47122b6559f4990c03e0b26d6e123e7f9f46525b", + "sha256": "00ihsfsinjy0cvgb64chixffv6afb5qj5sidq6699g79xpvdhp1i" }, "stable": { "version": [ @@ -8419,14 +8416,14 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20220710, - 2116 + 20220807, + 1438 ], "deps": [ "fringe-helper" ], - "commit": "1aaf5b237a2bd550dceff6d76c56e4bf3365ca25", - "sha256": "0pkxp9c9jqrh91jmscsl3b7r892mbb9aid9iqk78cr29zn6q44g5" + "commit": "8f86b980d450e44cd29d24e66c30ff079c6b9982", + "sha256": "13jl2ppc8yn8nkwg0xix7cfmgfy34grw4rlask39mdis0jkwazk6" }, "stable": { "version": [ @@ -8436,8 +8433,8 @@ "deps": [ "fringe-helper" ], - "commit": "1aaf5b237a2bd550dceff6d76c56e4bf3365ca25", - "sha256": "0pkxp9c9jqrh91jmscsl3b7r892mbb9aid9iqk78cr29zn6q44g5" + "commit": "8f86b980d450e44cd29d24e66c30ff079c6b9982", + "sha256": "13jl2ppc8yn8nkwg0xix7cfmgfy34grw4rlask39mdis0jkwazk6" } }, { @@ -8725,11 +8722,14 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20220606, - 1330 + 20220728, + 1835 ], - "commit": "fc98ca9e2a8b6edcec7199bf52eaf1848bd3e35c", - "sha256": "1i629jdlp3lxjk3awarx64s7czbzg15yy101ns9hrjk914bvskbc" + "deps": [ + "compat" + ], + "commit": "7c176d043445ea94fe924a715158c25b91ec4776", + "sha256": "0badxbj4whqcz8pkwzhp2fxppgcfqrrf0cciwnxy1nyamcrf0y7z" } }, { @@ -8740,11 +8740,14 @@ "repo": "killdash9/buffer-flip.el", "unstable": { "version": [ - 20220708, - 1751 + 20220718, + 10 ], - "commit": "5b85c1cfd37b60c7419e1d4bf8931ea04c0db743", - "sha256": "02qxwhrcfmrsbrh90fjxf97rpqqj92p32hjhpyi17y9ky1g5x68x" + "deps": [ + "cl-lib" + ], + "commit": "dda0cbcd202cdadf322942f9637a11ed92525756", + "sha256": "1m67xgka4pwk7dl9b4rlhckghv0mafhghbig2vrdpj44xzgiy05m" }, "stable": { "version": [ @@ -8948,8 +8951,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20220711, - 1909 + 20220726, + 1658 ], "deps": [ "dash", @@ -8958,8 +8961,8 @@ "map", "pretty-hydra" ], - "commit": "23132ffed65d78c0bf5ab2c4c6385d009db496ec", - "sha256": "15zam24zz4pb4zq20wzp3j31cg87fdwxn4bzn9mrm4q466rbldl7" + "commit": "5e8f02c3a454d6d43c18851023d6ac6ae470c31f", + "sha256": "1m7x5zksjfyh254mvsl9va5jqr76niyf54djjiacnrlpqnn3bf2s" }, "stable": { "version": [ @@ -9326,11 +9329,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20220619, - 2214 + 20220629, + 2119 ], - "commit": "42df1faa653f2765941f478167dafac059dc3a57", - "sha256": "1s9ps7a4459hgvpdslzvkhq3gsdj600l2h9jsxrfbam7lxkp7v35" + "commit": "62176a39ee6aa990c96e97c13ee4992355f0a122", + "sha256": "0j9qaa45r14kyqv44jhnygc03xzvw2k7rfaai99v7xl6a6aj4p8k" }, "stable": { "version": [ @@ -10007,11 +10010,11 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220714, - 1350 + 20220804, + 2211 ], - "commit": "c36d7405db24e15d1ad019b549b0fc5a2944f66c", - "sha256": "08bai91v6nr8h7kixxsji6wdf06bk20im51s85r2h076ps25y4wp" + "commit": "ab2f4ec9ec778d256c7e4b3490ecd50269c422f0", + "sha256": "1ivhf9xvhxz8k53fk2m03s4967hcyghacgrbg7sc0mywhdf0ba1f" }, "stable": { "version": [ @@ -10033,8 +10036,8 @@ 20210707, 2310 ], - "commit": "5e029f5af4c2dc912f6add122c29cae8992c4fb5", - "sha256": "03z4img3gafx8az5z3jlj9khb617y206ly8z9d1299zgywk2bryf" + "commit": "a41bf576b2d4f27696e9366e69072359138612c2", + "sha256": "03ag1lzclyx0khz5cai4x1a0zqkllp1xmhgyfj27lla8qr18y8vg" }, "stable": { "version": [ @@ -10076,6 +10079,55 @@ "sha256": "04pld093g14dq139ghbvk67xs1fam729m8az4mkyp3f369gwz3y0" } }, + { + "ename": "cardano-tx", + "commit": "7979d0bfcd5a7492b5943355615b0cfcf767ce08", + "sha256": "1lbxkvcsmffppk5ryxhwjdwm60k45a3yjysragh1n0bpyvkqgj1l", + "fetcher": "github", + "repo": "Titan-C/cardano.el", + "unstable": { + "version": [ + 20220718, + 1440 + ], + "deps": [ + "bech32", + "cbor", + "emacsql", + "emacsql-sqlite3", + "f", + "helm", + "readable-numbers", + "yaml", + "yaml-mode", + "yasnippet" + ], + "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", + "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + } + }, + { + "ename": "cardano-wallet", + "commit": "7a53b6e81d08b4671b0e8ba9e552d33621e5cbc9", + "sha256": "1x74gc7n3dw0ixsgz23v10rwhfxkchx29q6vd5lw4b3f9326l466", + "fetcher": "github", + "repo": "Titan-C/cardano.el", + "unstable": { + "version": [ + 20220718, + 1434 + ], + "deps": [ + "cardano-tx", + "dash", + "readable-numbers", + "yaml", + "yaml-mode" + ], + "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", + "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + } + }, { "ename": "cargo", "commit": "e997b356b009b3d2ab467fe49b79d728a8cfe24b", @@ -10084,14 +10136,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20220707, - 1403 + 20220717, + 1129 ], "deps": [ "markdown-mode" ], - "commit": "0b9821b029f49654565edffdbfd68ca0f6ca9434", - "sha256": "1gq0g75cj92aabh6pviixwka5biz88cwajdgab94bphmpk7zags7" + "commit": "7bd3682456bcd666ae550224487e63c0106a7cf9", + "sha256": "17fplf8cr9lgx59fz9f0zm65sz8a5bdjzbkf7x6wbzpp1clnc4m9" }, "stable": { "version": [ @@ -10129,11 +10181,11 @@ "repo": "peterstuart/cargo-transient", "unstable": { "version": [ - 20220714, - 128 + 20220730, + 154 ], - "commit": "69b56ef92cac91384b21dbeed370646285288517", - "sha256": "0l7hi0cmnd2pf7bz36rwjjzhlbx37lyii7bps5mw90zdcwm55azq" + "commit": "1755da9c1cedde6026a0a9e7fd0fe98ed2d30dbb", + "sha256": "1bidbpak7w16dw78sgwx8kb75kvib6s15cnl8akzxsdx69r9k207" } }, { @@ -10415,14 +10467,14 @@ "repo": "Titan-C/cardano.el", "unstable": { "version": [ - 20220623, - 22 + 20220802, + 1008 ], "deps": [ "dash" ], - "commit": "a3ebdcdd91d32f044b68541a00e162396e4acb38", - "sha256": "1jmlg5rbgam3s9n7blmk2b9r9ggzdvsbry1fdsx5gipymbldx1gg" + "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", + "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" } }, { @@ -10451,8 +10503,8 @@ 20210501, 820 ], - "commit": "c664b26d0861621ac86b5b5f47835dd84f06dc93", - "sha256": "1qis1wmqdllzj46nsnlqskk0lld1bgn858gk8l03gcy92jrlh1bg" + "commit": "3ed86d42717ab2a54ec8de6ab32d552dc0a4c3b0", + "sha256": "12fjhp10zvlymgamgzmhl0g4bs6ix731b6s8xjmzhwjvzavcsclg" } }, { @@ -10500,8 +10552,8 @@ 20200904, 1431 ], - "commit": "c664b26d0861621ac86b5b5f47835dd84f06dc93", - "sha256": "1qis1wmqdllzj46nsnlqskk0lld1bgn858gk8l03gcy92jrlh1bg" + "commit": "3ed86d42717ab2a54ec8de6ab32d552dc0a4c3b0", + "sha256": "12fjhp10zvlymgamgzmhl0g4bs6ix731b6s8xjmzhwjvzavcsclg" } }, { @@ -10512,14 +10564,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20220701, - 1236 + 20220808, + 1414 ], - "deps": [ - "auctex" - ], - "commit": "4c392765e123f9c5481e7d113486a6acf720ab13", - "sha256": "0dg69rj9zbjvw9qm3lpx46vhp3zgcc3njbvp2dhpqkvya6jnzrnk" + "commit": "6fc8a1f2949b1b58b2ef9a56b3417490f1ca3b61", + "sha256": "1364prn41fypbr7j985mpbdr0ra4p8niwmrc5xi2s6sr367a2dki" }, "stable": { "version": [ @@ -10797,8 +10846,8 @@ 20171115, 2108 ], - "commit": "7c4d31c94a982852f61043ce00c61b0f4be0e689", - "sha256": "1afc53bgm7b4i5bwz9w17nl804q34qy5sh53in1f2402042y2qd0" + "commit": "72e8af1887116a7ee609b1d5f24ecd459388349f", + "sha256": "1j9zf96mlk5yw8xcc0inkxcqwn6iyhvp169di05y3i87qdwv3wmr" }, "stable": { "version": [ @@ -10953,17 +11002,17 @@ 20220318, 1007 ], - "commit": "c44b4e950af73dd82805181da5473db2c93e2eaf", - "sha256": "0jbpl17f5jdil9slv92ldvq4b60zpgr60cv0rk4qf3nwm4ijpk21" + "commit": "2b930905c23f1cd2fcf3ecad558fde5b708ea1a8", + "sha256": "0rjaj1y2nax40j41b8wz32lx0znhr1vvx6x9cf477c8rd9sbfxhj" }, "stable": { "version": [ 1, 3, - 6 + 7 ], - "commit": "25afa64a35780b7d870a6c2467a404ea67d6d23f", - "sha256": "0jwyq878bayw4qx25ifc1gabsvg0xilsizg73lkwj06qzag2x0s9" + "commit": "2b930905c23f1cd2fcf3ecad558fde5b708ea1a8", + "sha256": "0rjaj1y2nax40j41b8wz32lx0znhr1vvx6x9cf477c8rd9sbfxhj" } }, { @@ -11119,10 +11168,10 @@ }, { "ename": "cheatsheet", - "commit": "0d2cd657fcadb2dd3fd12864fe94a3465f8c9bd7", - "sha256": "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq", + "commit": "9a291d6a7f4217d8453311fc19d65df14cb098f4", + "sha256": "0iyhkkxdw252k39dkc3559x8bjyyd5wz27hrmfnaqi50v5dd3hvf", "fetcher": "github", - "repo": "darksmile/cheatsheet", + "repo": "mykyta-shyrin/cheatsheet", "unstable": { "version": [ 20170126, @@ -11476,8 +11525,8 @@ "seq", "ts" ], - "commit": "85f1642d27e92cc393806a2b9a42044151b563ac", - "sha256": "022l6p2sxivrsk38ri4ay3492qjmiksfkl6wqqaal96nq3amz8qp" + "commit": "a8f05bcd051e6c1a1b247c3083be3db9c95c4b8c", + "sha256": "1cc9cwrs6k9cqvzk60g9lbs9rc3csqnlam53jyi7hy4wg784paxf" }, "stable": { "version": [ @@ -11527,8 +11576,8 @@ "deps": [ "chronometrist" ], - "commit": "85f1642d27e92cc393806a2b9a42044151b563ac", - "sha256": "022l6p2sxivrsk38ri4ay3492qjmiksfkl6wqqaal96nq3amz8qp" + "commit": "a8f05bcd051e6c1a1b247c3083be3db9c95c4b8c", + "sha256": "1cc9cwrs6k9cqvzk60g9lbs9rc3csqnlam53jyi7hy4wg784paxf" }, "stable": { "version": [ @@ -11558,8 +11607,8 @@ "chronometrist", "spark" ], - "commit": "85f1642d27e92cc393806a2b9a42044151b563ac", - "sha256": "022l6p2sxivrsk38ri4ay3492qjmiksfkl6wqqaal96nq3amz8qp" + "commit": "a8f05bcd051e6c1a1b247c3083be3db9c95c4b8c", + "sha256": "1cc9cwrs6k9cqvzk60g9lbs9rc3csqnlam53jyi7hy4wg784paxf" }, "stable": { "version": [ @@ -11631,8 +11680,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220628, - 551 + 20220808, + 1329 ], "deps": [ "clojure-mode", @@ -11642,8 +11691,8 @@ "sesman", "spinner" ], - "commit": "186b4976565a18fcb00e1685a44a87a8559eadcc", - "sha256": "0r0fgmk36hkbwm30ck2gywc9nzgxzil4riwmpc18wxp6alqf3mwi" + "commit": "9577dbbdae8cffe023442427b97f963b4447983a", + "sha256": "01f1is17zkz2gzgf8bpismxk5050syk7yacfyp9ihln27h1hlb4f" }, "stable": { "version": [ @@ -11789,26 +11838,26 @@ "repo": "ailiop/cilk-mode", "unstable": { "version": [ - 20220411, - 1342 + 20220807, + 1629 ], "deps": [ "flycheck" ], - "commit": "2f33f991c726d5214d6a17bbbd19836302a8e423", - "sha256": "0jpq67q7vhmgvsjh4qqk5lb40w9rkdr2v8bd5gh32k8wkbgykpgg" + "commit": "d5ba732a5a313a97a96085943cd7840b8e2d9c7c", + "sha256": "03bdwdrvhzs7yvs7vbqm55nvf1p41xpc5b19l9ajh3n7vr8rflx3" }, "stable": { "version": [ 0, - 2, - 2 + 3, + 1 ], "deps": [ "flycheck" ], - "commit": "6e46cdb72ae0348c77b70f1679b34a1155e70797", - "sha256": "02rrjjaak0kjm0kifdfb7a427b6q86whs1hkc515fdl1bdr7slaj" + "commit": "d5ba732a5a313a97a96085943cd7840b8e2d9c7c", + "sha256": "03bdwdrvhzs7yvs7vbqm55nvf1p41xpc5b19l9ajh3n7vr8rflx3" } }, { @@ -11941,30 +11990,29 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20220715, - 1909 + 20220809, + 1305 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "c05dce095f340b1ab91434e17eac06b40911fd2a", - "sha256": "010a5azp8ycwar643b5n6d57y7yrhl80scrkml6mjinm95s6snz7" + "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", + "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" }, "stable": { "version": [ - 0, - 9, - 7 + 1, + 0 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "1bc880cafdb20f3c258ffcfd47da899c3c242c95", - "sha256": "1f49l1zmy4fnz75b0m2rav5jm8yp6hry44bv9xasiszyy3bn0hv8" + "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", + "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" } }, { @@ -11975,28 +12023,27 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20220710, - 1109 + 20220724, + 2250 ], "deps": [ "citar", "embark" ], - "commit": "c05dce095f340b1ab91434e17eac06b40911fd2a", - "sha256": "010a5azp8ycwar643b5n6d57y7yrhl80scrkml6mjinm95s6snz7" + "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", + "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" }, "stable": { "version": [ - 0, - 9, - 7 + 1, + 0 ], "deps": [ "citar", "embark" ], - "commit": "1bc880cafdb20f3c258ffcfd47da899c3c242c95", - "sha256": "1f49l1zmy4fnz75b0m2rav5jm8yp6hry44bv9xasiszyy3bn0hv8" + "commit": "9d7088c1fe82e9cfa508ead7ef7738c732556644", + "sha256": "1n69lkp7298gasm9hlbx9nhgp9ggh8w8ffyvi1rmbj96lcnpsyi9" } }, { @@ -12007,8 +12054,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20220710, - 2043 + 20220717, + 729 ], "deps": [ "dash", @@ -12019,13 +12066,14 @@ "s", "string-inflection" ], - "commit": "7cc0152706d59954124f8c1559198050783bbc59", - "sha256": "04v1r545304g00kbfzcfk8cr6ma9xqkglkns0f1828smlhknqbw2" + "commit": "406bd9964f1ce531fc45beddcf9ccc44d3456129", + "sha256": "0rkwqn9pcimfcyq19wlrcij0kcjyhbwisla7vwbhjj8ang0bq9rm" }, "stable": { "version": [ 0, - 9 + 9, + 1 ], "deps": [ "dash", @@ -12036,8 +12084,8 @@ "s", "string-inflection" ], - "commit": "15034f1706cc9eb0ef97dfeeb7884da2a43b88a9", - "sha256": "1m5j1abyk68f3d1v781yrx2xkg42vyfgfckbj2yk2lgk6d7rz0p1" + "commit": "406bd9964f1ce531fc45beddcf9ccc44d3456129", + "sha256": "0rkwqn9pcimfcyq19wlrcij0kcjyhbwisla7vwbhjj8ang0bq9rm" } }, { @@ -12058,8 +12106,8 @@ "org", "org-ref" ], - "commit": "20cd7e817420a3f6e7b82faea901a3c67c6d4d9f", - "sha256": "1qwcfjiqgr3kspqcv0j5irmqyawbi3wqzcpi3phw9rjy6pp928ji" + "commit": "840e352855704921e2e68065e9abfdba769ccbd1", + "sha256": "1026q4sqv45cm6arncwry2p5im01w878xaz7pkyzs26qi7bmvh5z" }, "stable": { "version": [ @@ -12482,8 +12530,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20220711, - 1920 + 20220729, + 543 ], "deps": [ "cider", @@ -12496,14 +12544,14 @@ "seq", "yasnippet" ], - "commit": "5b289c47c8b008812419a2f9e1e2616c7ab0bb31", - "sha256": "0a7sz592lz6ji6wfnaadbi5acm5f7h45f4pnblqyx6dzw934r517" + "commit": "1bd7b09976c05ebd1ff1ee3d5c882af303780b67", + "sha256": "0ygq2s9g63lk8v5m4mbkf2411li656wlq9nisadmhlahxk1vs26x" }, "stable": { "version": [ 3, 5, - 4 + 5 ], "deps": [ "cider", @@ -12516,8 +12564,8 @@ "seq", "yasnippet" ], - "commit": "7bf500ce67ceacf5e726f5adcf1b46a41be369ab", - "sha256": "1cl1fn3wvfw19mi0h62lhfd25pqknmszj54li3dnimia4nlgg4q3" + "commit": "1bd7b09976c05ebd1ff1ee3d5c882af303780b67", + "sha256": "0ygq2s9g63lk8v5m4mbkf2411li656wlq9nisadmhlahxk1vs26x" } }, { @@ -12528,16 +12576,16 @@ "repo": "philjackson/cljr-helm", "unstable": { "version": [ - 20160913, - 828 + 20220721, + 824 ], "deps": [ "cl-lib", "clj-refactor", "helm-core" ], - "commit": "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4", - "sha256": "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj" + "commit": "2c1f9cbd892ec03335f671ea3f974ee2ff6078dc", + "sha256": "0cd2ik9kjnl47c3ys4zbi8pp6kv8vvrcv8ylqpnlikqy1fmnj7wv" }, "stable": { "version": [ @@ -12688,8 +12736,8 @@ "request", "ts" ], - "commit": "5f5c2bae76344f4d84f1659590c2eddad25b1139", - "sha256": "0485zn7is5ng2hcc04xz9qjjl93li800jh5vf6dglyzxdiq59gya" + "commit": "03ccd05c2b6b48babb6ee5838a402112225904ca", + "sha256": "0ypnwyqwp74xghp5kvzs1s3gdhdnaa0b4r07nhx0da4ixqxz19sw" }, "stable": { "version": [ @@ -12796,20 +12844,20 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220715, - 1509 + 20220729, + 2246 ], - "commit": "fee38d780f7d0b2a42a441e4d8bcfaa4fa672983", - "sha256": "1ck9d8jzs6m5qvg5bnx9i7d94icsfl4698p66vxsn3yqclhc8yzz" + "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", + "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" }, "stable": { "version": [ 5, - 14, - 0 + 15, + 1 ], - "commit": "b7d08b87f6a116ff47b33ee857926b60c66c3ab7", - "sha256": "0n7v6hx21f8x37gj388wnff38aqpzxxv5g8vxavp74vr3cbagsnn" + "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", + "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" } }, { @@ -12826,20 +12874,20 @@ "deps": [ "clojure-mode" ], - "commit": "fee38d780f7d0b2a42a441e4d8bcfaa4fa672983", - "sha256": "1ck9d8jzs6m5qvg5bnx9i7d94icsfl4698p66vxsn3yqclhc8yzz" + "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", + "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" }, "stable": { "version": [ 5, - 14, - 0 + 15, + 1 ], "deps": [ "clojure-mode" ], - "commit": "b7d08b87f6a116ff47b33ee857926b60c66c3ab7", - "sha256": "0n7v6hx21f8x37gj388wnff38aqpzxxv5g8vxavp74vr3cbagsnn" + "commit": "ad322e989e56c10c05bb286e5b55a82b1e031d62", + "sha256": "12m3yjhy4q0x3ri4xxb9raqg9lmw4hk4jgn436d9zvsk4fr3h1nd" } }, { @@ -13131,19 +13179,17 @@ 20220617, 1532 ], - "commit": "831757ead326d2133ef3c6b23d4be47495a5b119", - "sha256": "0c2cz5g8x0bpp8scr7bf0zgwj8xi9mkjiz244cvj0s6vhanyv3dl" + "commit": "f7a13beaa4e7ef262004e37997ffc5d856fc26f2", + "sha256": "0ni5y55h6d6mfa23hkicvkrrk8axh9577w1ipm1zmbrc70ln2rd0" }, "stable": { "version": [ 3, 24, - 0, - -1, - 3 + 0 ], - "commit": "95cce32470b9fbddf3b6f4bd0d186ec5efe50371", - "sha256": "0q2yg9k07c76mfx43cyclv8w5l2lprr5wvk302a3q7jvni248461" + "commit": "4be24f031a4829db75b85062cc67125035d8831e", + "sha256": "1ylp6i2q9lkhcl5kng3sl48dqb4ci1fvl2sj89jm1q4sq0xyl8vf" } }, { @@ -13211,11 +13257,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20220715, - 409 + 20220719, + 818 ], - "commit": "3732ada115cae269e0fa5e3434f92f3e6e6823d9", - "sha256": "1z510dn4ih5av59nridhr99jpd1bsnjwbh15kqnw0nd8zpawixkf" + "commit": "b263edf140e3ecdb0640a001c120b5e0b7edeb5f", + "sha256": "0h4x4z28z41zkw52z0f6k9x0ai8klyb36bwa3qsdx00w7jlpaax4" }, "stable": { "version": [ @@ -14131,11 +14177,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20220714, - 1331 + 20220731, + 2333 ], - "commit": "890797d3d7ca9c6703aac11753dd1513de67d46d", - "sha256": "0m3xygppb5dm84mjmsw1z014wvch1n3m8lgjdnhpswrb3ff0hhax" + "commit": "f1877a370ca76d5cd6614c527635b2d6983188af", + "sha256": "1nis7561w9lbis3bz84is40fychg1gz3i9q3m2h0ml1x0m4ss6lh" }, "stable": { "version": [ @@ -14581,16 +14627,16 @@ "repo": "jcs-elpa/company-emojify", "unstable": { "version": [ - 20220704, - 647 + 20220727, + 1740 ], "deps": [ "company", "emojify", "ht" ], - "commit": "1b3f944973eb0393e3bb63a88659385ade0ea6cc", - "sha256": "157azpvakk3xhj6gq8wv2bpbh657csw6jls6hkryk8y9qhz9siv0" + "commit": "cc3ae96fbafa51d71fde802fa3c1e5fad9402158", + "sha256": "0hw2pzg1prcjysrxrki0qsfzfqr0gp0mh606lakr33hzkib447xx" }, "stable": { "version": [ @@ -14685,16 +14731,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20220704, - 727 + 20220721, + 1609 ], "deps": [ "company", "ht", "s" ], - "commit": "4b5fa0b4e298447d139f7700eb5c70a2b8d2e386", - "sha256": "05p1zz53449mnc75jy4ic30gfzbgfd6s5cw5qq2454sq4q7ydqnj" + "commit": "91b76fc475f7eb17a0ae8b94a42625dfb546cc01", + "sha256": "1yabv0g07xpj1kfm95ygxa21zgq8r0lq0iyavdv9s56q1aiwpkpq" }, "stable": { "version": [ @@ -15052,16 +15098,16 @@ "stable": { "version": [ 0, - 7, - 6 + 8, + 1 ], "deps": [ "company", "maxima", "seq" ], - "commit": "8d643a1776523ef1a6e0bff0bb0a390772fcc77d", - "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" + "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", + "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" } }, { @@ -15196,15 +15242,15 @@ "repo": "xenodium/company-org-block", "unstable": { "version": [ - 20210825, - 2107 + 20220809, + 2027 ], "deps": [ "company", "org" ], - "commit": "115af0a3625f4669358eca568466d468cacc78bd", - "sha256": "13kdwi4d1pvba6wv9yn1s0dl4cnq61zwf3j647d1s5ybqlrw5f4r" + "commit": "29a2edb35e18c2627dcfa0641852a55d9639263c", + "sha256": "14qvxypgc1cj6ijvkkybl7x5p00435v4rdaw7pvvlf58lc422492" } }, { @@ -16022,14 +16068,14 @@ "repo": "mkcms/compiler-explorer.el", "unstable": { "version": [ - 20210916, - 1316 + 20220807, + 1136 ], "deps": [ "request" ], - "commit": "9ea0cc78ac40f667dfaf9277758a22b9058ca434", - "sha256": "1b6cj5scc5n78kmdz9ch574ln91v9hj4svk6455crs8rpqgs7k47" + "commit": "04da0fd822d7e9eca82c993c99f6318df824b652", + "sha256": "0f9lmwjh644cnifk8wmsv36rwi3zvc8x1g9sm0rqh0mq4fxbgcka" }, "stable": { "version": [ @@ -16175,8 +16221,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20220710, - 1740 + 20220724, + 1857 ], "deps": [ "dash", @@ -16184,8 +16230,8 @@ "pythonic", "s" ], - "commit": "06a1ac946ed245e0b0fae2755f9641c4c180de9f", - "sha256": "0ngj4prn9lk1ymffpkj5h7wcy1zmqsfm9ljyqqxrcmmjylciglav" + "commit": "a65ed0084876366fd1b238bb2b8b36ee75ac98d8", + "sha256": "0w4fb615019w8bav5v67a5y6rb4bs2fbh3kggs3pya96ncr475cr" }, "stable": { "version": [ @@ -16339,14 +16385,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220716, - 522 + 20220807, + 1302 ], "deps": [ "compat" ], - "commit": "0fa264c2efc17e564af406d60dbe77ae2fb6f010", - "sha256": "13ilnd2599m3sfkbcm9y858qg9l0v1835g89sxbakm9k2mnm7ysl" + "commit": "e4546edb6f1268c4a13ac3dd1dec8c9b28d7df51", + "sha256": "0i5s6hndk7d45fl2idmbqrrddaf1vjcg2qvycm9gs6f568ld1s0m" }, "stable": { "version": [ @@ -16436,15 +16482,15 @@ "repo": "karthink/consult-dir", "unstable": { "version": [ - 20220505, - 1037 + 20220808, + 141 ], "deps": [ "consult", "project" ], - "commit": "d397ca6ea67af4d3c59a330a778affd825f0efd9", - "sha256": "07gq5ja8qzzar0qyl1ii6g3sy78mmzh3wnq868s2dhh18vxl5335" + "commit": "8abf62df088de87175e98adf8f6f5fb93515004c", + "sha256": "17ha6s84i01199p1bcr89d5fxklz7lg1j9wip1485x43f7gfhddj" }, "stable": { "version": [ @@ -16732,25 +16778,26 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20220227, - 2050 + 20220808, + 9 ], "deps": [ "consult" ], - "commit": "d550a76ffb00846a1b91be595e5adf5b9b2b1f93", - "sha256": "1h7i8azk9rvqnknhspfpfgh684p98hlpmcd7na382cdxqji9sgp9" + "commit": "2bd1ed98b23c2b72617fcef11aba7eb969b94ffa", + "sha256": "185crk09jyv2hxkkc3xl9fny9w4aa3nnnma1rrwp5lkm6ypr0j03" }, "stable": { "version": [ 0, - 4 + 6, + 2 ], "deps": [ "consult" ], - "commit": "228306eeda8c57db45609ca068f60ee433367c17", - "sha256": "0rxfxws0d65sdjph91g77a2sy1k90y9hgyps4da0a6kvbm3zprgg" + "commit": "8299efb610178a73ea809de74f87d724ee6183d6", + "sha256": "0k0796sqqbl66s8i8i6icdqj21xghjphsibkakp2nwy65cn5snx7" } }, { @@ -16780,15 +16827,15 @@ "repo": "mohkale/consult-yasnippet", "unstable": { "version": [ - 20220409, - 1209 + 20220724, + 1338 ], "deps": [ "consult", "yasnippet" ], - "commit": "cdb256d2c50e4f8473c6052e1009441b65b8f8ab", - "sha256": "0sr0v6kd91sbz8zfg35b5y2s3mr047a75kwh9himn2jgrm75kl50" + "commit": "ae0450889484f23dc4ec37518852a2c61b89f184", + "sha256": "13hmmsnmh32vafws61sckzzy354rq0nslqpyzhw97iwvn0fpsa35" } }, { @@ -16921,8 +16968,8 @@ 20220612, 1904 ], - "commit": "961e66956412a1dd63f79473a8273da8853f7179", - "sha256": "07dbw0yvk3ijibhghzgaik3cfrv56dr8ax7dyy0kryvjairmhwjc" + "commit": "8b2f5d0f7d821599ef4ab99c5ba42d55cd04168d", + "sha256": "16yvw0ywcn946w6g6sml8zhh3ymwhr9h8zklmpzanbxnk7hbfnxc" } }, { @@ -17218,14 +17265,14 @@ "url": "https://codeberg.org/ideasman42/emacs-counsel-at-point.git", "unstable": { "version": [ - 20220710, - 711 + 20220731, + 2354 ], "deps": [ "counsel" ], - "commit": "de081520f5fd5927eba032294b5a8dfb2585edd7", - "sha256": "1qf984qbnssqdj1kxlkr3k5asgpbj22ppxb1zvs34m2365frlhcz" + "commit": "65a7244ad6342ac79c612fbc6e5ca54759ebaf03", + "sha256": "1vwn977gjjvk1jhcyzncv2ycr6dbyh64if0f2f87bwl1yf7hsf41" } }, { @@ -17405,14 +17452,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20220526, - 1436 + 20220728, + 1351 ], "deps": [ "counsel" ], - "commit": "05d364b556aadcfe49df727c0729abc3f0c14372", - "sha256": "1v77lpp0nij1rjg2k9wj42kqk7xqg1dzs9vmadha6f2j8j6375m8" + "commit": "b109dff190db6706e32ad08deb64b77fc8ad75c7", + "sha256": "0qgdhqwhw4pf2aclb602p0hirym28fh38ykmdnhzang2027l16p5" }, "stable": { "version": [ @@ -17799,16 +17846,16 @@ "repo": "AdamNiederer/cov", "unstable": { "version": [ - 20220410, - 2247 + 20220727, + 31 ], "deps": [ "elquery", "f", "s" ], - "commit": "8396fa82a84965cd88fa23f5b361ab80ff28e231", - "sha256": "14qgws2zi9qvw7jvp155xh8437g409g02bv7042xkjxz13bwa5ss" + "commit": "cd3e1995c596cc227124db9537792d8329ffb696", + "sha256": "1gyc0si60czhgrkm7kink1p1zj1h5j5nzif4ivm5bg78l28skmpm" } }, { @@ -17883,8 +17930,8 @@ 20210510, 1540 ], - "commit": "683c23afa2a37272be54de822ad19f4e11dd86ba", - "sha256": "08sffa51f4p2la199hf6zb2r2hyvrpdcd2q6q4sig3gmyk75qlbm" + "commit": "6c706d90902a186a2260d380d69460da4cdc61cb", + "sha256": "0yqz4hg6shcdgbi917qz4p0v5q59wb41fskcjzzm4ixnhxvlgqyg" } }, { @@ -18042,26 +18089,26 @@ "repo": "emacsfodder/emacs-theme-creamsody", "unstable": { "version": [ - 20220616, - 119 + 20220808, + 518 ], "deps": [ "autothemer" ], - "commit": "21add9e946e2d00c15b609e75d65aa4c292bc7a2", - "sha256": "02cv63iyxslsxrfim20562cnffa0wkv9y9rmg22pj9i060c5fiw4" + "commit": "f7155dd7a9f53050fcfcaadbec5e0d3511d8c33c", + "sha256": "1kk3iis4h26xmrsw579yzz4ici53ci5khysxkp4afi5rc8frz6x9" }, "stable": { "version": [ 0, 3, - 15 + 16 ], "deps": [ "autothemer" ], - "commit": "21add9e946e2d00c15b609e75d65aa4c292bc7a2", - "sha256": "02cv63iyxslsxrfim20562cnffa0wkv9y9rmg22pj9i060c5fiw4" + "commit": "f7155dd7a9f53050fcfcaadbec5e0d3511d8c33c", + "sha256": "1kk3iis4h26xmrsw579yzz4ici53ci5khysxkp4afi5rc8frz6x9" } }, { @@ -18819,20 +18866,20 @@ "repo": "russell/cue-mode", "unstable": { "version": [ - 20220512, - 2104 + 20220809, + 1942 ], - "commit": "f98b9f9088fcb66c97f9200f6c8a0cd16c11caae", - "sha256": "08nxlgf02v8gz92dif3fy72qz3yisybxlx1i0any3sxn5swi7g7y" + "commit": "ebc50a881c6fbce429b0ec6bef8ea91a8310cf46", + "sha256": "1n8fx8xkyw9aq8hy02wdm7qdfmv5qj4cq5xdp9vniak3x5r3gwwp" }, "stable": { "version": [ 1, 0, - 9 + 10 ], - "commit": "f98b9f9088fcb66c97f9200f6c8a0cd16c11caae", - "sha256": "08nxlgf02v8gz92dif3fy72qz3yisybxlx1i0any3sxn5swi7g7y" + "commit": "ebc50a881c6fbce429b0ec6bef8ea91a8310cf46", + "sha256": "1n8fx8xkyw9aq8hy02wdm7qdfmv5qj4cq5xdp9vniak3x5r3gwwp" } }, { @@ -19025,14 +19072,14 @@ "url": "https://codeberg.org/ideasman42/emacs-cycle-at-point.git", "unstable": { "version": [ - 20220708, - 500 + 20220723, + 646 ], "deps": [ "recomplete" ], - "commit": "14dbe688fb611d4118229f6197039c69b67d4e35", - "sha256": "0gik0nz85zwkg21fc12rrnsdp35h91405iqvs7wprcmvnilc7irs" + "commit": "d12be2e91337096f4fbf36029de57d4119a00e1d", + "sha256": "085r3klapmzj6y9v75xndzrzb3ww4sigk9n2mcfck1frzghc62wk" } }, { @@ -19118,17 +19165,17 @@ 20211111, 1407 ], - "commit": "6414a07ec88b60d604daf0e51fd850ee974afdcb", - "sha256": "0rcshhb9cc1fzj932yp25i90kv2ryv19k73imrrmn1kk8y53apbp" + "commit": "b721a96d13b43f7018ed6f697715e829d0e5a9af", + "sha256": "0k19shxpnx4gn34qns83jpdcp1amgrchbcjydx87zrabb1zhbapg" }, "stable": { "version": [ 0, 29, - 30 + 32 ], - "commit": "a6f04ef2430fb4e7383a068cd1ae9a115d7a78df", - "sha256": "141qywx4ym817lrpqis4x2i2bll0hcjljn1qfnn1dwmhmydhhkwx" + "commit": "c48361d0a0969206e227ec016f654c9d941c2b69", + "sha256": "168nanar3dlc9czrj7cklk78pmnqaah89zzp96rbnlxw2n20m62x" } }, { @@ -19326,8 +19373,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20220712, - 919 + 20220802, + 617 ], "deps": [ "bui", @@ -19340,8 +19387,8 @@ "posframe", "s" ], - "commit": "ad0b8f9d25a7bd82f8fc9694c5406429e8e34d8c", - "sha256": "1d8k517darmlwx29v8k1q6ycqq3ji92hdl68ab440hbjkm0mz4cw" + "commit": "e2a37cc0a4ec2da858022badd33ccc086b283075", + "sha256": "0a9wb4wasdc8k9bpqx4hs8s9yhhr3lk1wrnbrq160b2iiayk4qss" }, "stable": { "version": [ @@ -19498,26 +19545,26 @@ "repo": "emacsfodder/emacs-theme-darktooth", "unstable": { "version": [ - 20201215, - 822 + 20220808, + 620 ], "deps": [ "autothemer" ], - "commit": "ec03b30ee7f43f89ca4c382bb3fe4ee560c028a8", - "sha256": "00ijwqchvrwln2wl3nfcq5v3i2p232z4qsy67x1v51q20876mc9j" + "commit": "7ea1435cc2867fcc4f8a133739cdd506f6ac9a2d", + "sha256": "19ivnwpmjzg6bgjrpc47symw13c1ipdjx2fif3p4m7r4sbig0412" }, "stable": { "version": [ 0, - 3, - 10 + 4, + 1 ], "deps": [ "autothemer" ], - "commit": "ae14a9be19b6fbd287e0f5ad156e7942cd6a5bc6", - "sha256": "1jisiz0blksjl6d8q7bnvnlfrwalqfpd93fs66i8pgllhf5z7j19" + "commit": "7ea1435cc2867fcc4f8a133739cdd506f6ac9a2d", + "sha256": "19ivnwpmjzg6bgjrpc47symw13c1ipdjx2fif3p4m7r4sbig0412" } }, { @@ -19691,11 +19738,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220615, - 540 + 20220809, + 1358 ], - "commit": "f4e8ed9f0dd2147d4f076948ff7f6c7333042c91", - "sha256": "020x45vyc1skj423l8xj26h8b9m8ikvbcavxai44m6jgaac4ldx0" + "commit": "49e5603cac7d028bfc4c679161a20ca40327956c", + "sha256": "0hs4hq9rj3xrjcm98gd9b6vyvakhq97gqym4z19h1wkrnhf3rpv0" }, "stable": { "version": [ @@ -19877,8 +19924,8 @@ "deps": [ "extmap" ], - "commit": "3505de8bd176056083a1da73226f9e77cc50c4b7", - "sha256": "1lzmij8hk7s2rj51yx88swvpj2dlgh9wnrcbpgzfh7l9sv22r3lq" + "commit": "2951fc53ebf9a2037c5479519585a1afd3286269", + "sha256": "0yrczqryyr8hgp7ppy4lmf2gxica7zis2nw7jpw26i2fid7vs9pp" }, "stable": { "version": [ @@ -20024,15 +20071,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20220501, - 2005 + 20220803, + 1302 ], "deps": [ "ccc", "cdb" ], - "commit": "c664b26d0861621ac86b5b5f47835dd84f06dc93", - "sha256": "1qis1wmqdllzj46nsnlqskk0lld1bgn858gk8l03gcy92jrlh1bg" + "commit": "3ed86d42717ab2a54ec8de6ab32d552dc0a4c3b0", + "sha256": "12fjhp10zvlymgamgzmhl0g4bs6ix731b6s8xjmzhwjvzavcsclg" } }, { @@ -20175,19 +20222,20 @@ "repo": "lifelike/decide-mode", "unstable": { "version": [ - 20220319, - 1927 + 20220718, + 1352 ], - "commit": "b4feee9d5ad32c7b73ab3e1da5cfcdab532754c2", - "sha256": "0xwflq1k4x2br5dw8fhqbz6zq4hbwvknrnzd2c2b1l68l4y7rs3j" + "commit": "cc67cd24791accd17a2656512d863e24ca3fd578", + "sha256": "0i28pgqw3rv4ak1rrf8zv5cbqil7gmdaycyir85lmry4axhcbmsc" }, "stable": { "version": [ 0, - 8 + 9, + 1 ], - "commit": "668fa559b95b50f140e73f26a21fad559c1ffa77", - "sha256": "1wbiy8lda6p888qf4ak8j02cp42h25y17xnz5bq5p032xgq731n0" + "commit": "cc67cd24791accd17a2656512d863e24ca3fd578", + "sha256": "0i28pgqw3rv4ak1rrf8zv5cbqil7gmdaycyir85lmry4axhcbmsc" } }, { @@ -20280,11 +20328,11 @@ "url": "https://codeberg.org/ideasman42/emacs-default-font-presets.git", "unstable": { "version": [ - 20220708, - 211 + 20220731, + 2219 ], - "commit": "e16c19107c1cc4466efa099daee192c5cb18e27b", - "sha256": "19dm11brf2an0vhzc56zf9qscbvdyhmc1wynp779hip8b6ic1qmy" + "commit": "80380aa053c78b7126275e269e80d8988ba3f1e3", + "sha256": "07bvlb7n8gryjc205bfpx7k0liibx4cakv9aisc5nfifxqygmv1n" } }, { @@ -20727,11 +20775,11 @@ "url": "https://git.sr.ht/~niklaseklund/detached.el", "unstable": { "version": [ - 20220704, - 941 + 20220718, + 1501 ], - "commit": "b778480d176f0fe16243f2eb4128a48ce0d0f6d5", - "sha256": "140i69c11pkr1kfshscpz23y3sgdsz914yjaqm43px6kr3yr3nvi" + "commit": "d8e657cc569da2ad0f1916aa0b5dbc444f0675ff", + "sha256": "092j3d7f4fvdb2dz35133wi284q6b02m8d95nnczlwcsrh1ssryp" }, "stable": { "version": [ @@ -20765,11 +20813,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20220606, - 1342 + 20220729, + 923 ], - "commit": "d5d0cfbfbcd037ef8f84f41b2adc3f5a23baa11f", - "sha256": "1q81ddnvdsfmfas2sfkxzpcr51f8zmmwmig0p3i3hcc9jf1wviid" + "commit": "60099be5fc5c90d5adc2795b3bfacb492a0adb88", + "sha256": "0hxyanl0vy3ajyzrjqgcybp388jxdk139wgwbb0kzw05blr0jzxv" } }, { @@ -20982,11 +21030,11 @@ "url": "https://codeberg.org/ideasman42/emacs-diff-ansi.git", "unstable": { "version": [ - 20220710, - 557 + 20220731, + 2329 ], - "commit": "f4c61c3cb5b4a543bd8eb8c7b796f710deb2269b", - "sha256": "069c279f2i6lx780gprn8spwziam0wh636rl0hx8hal76v1kh4ik" + "commit": "c4f350da4302cd7d33343d83d5faaeae6795768f", + "sha256": "06k3ppgwng3b0234qpvpq7cvfcdc3fkwm813qpmddcwbg9b8m7fn" } }, { @@ -21547,6 +21595,21 @@ "sha256": "0qqj16r7p6pidlyj7fi0s3xhi13065642j20hlnply8nrq782vpj" } }, + { + "ename": "dired-duplicates", + "commit": "84d6c3430c6638fc3c3305540f3ff557caa69205", + "sha256": "0312vwing7fdp1d2xi07763r66ck3zg4mfavr4b13ga0zcdjfs7f", + "fetcher": "git", + "url": "https://codeberg.org/hjudt/dired-duplicates.git", + "unstable": { + "version": [ + 20220718, + 1341 + ], + "commit": "94319f44f716e9b4b0e0d4f6067c0e028dc0072b", + "sha256": "1k4s2xcy283s8fayaqbk97an81652dpqq03zwn49w8ikgzh1gd5w" + } + }, { "ename": "dired-dups", "commit": "6d01ad74959e17b5708ba9fa6a4958d4cda4e232", @@ -21815,11 +21878,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20220317, - 1839 + 20220805, + 1655 ], - "commit": "72ebbe2b3d2e04dbfda636fa114d4f47835ce044", - "sha256": "0z53ymlbyan542mzsjkgab29czx2zk05qgady99kg40rik78599q" + "commit": "e7877700144cf4abb5f5482eea7fde9b749cfc57", + "sha256": "0i59cn7fk8db3mr6zljgnyvqvhqbdynsdbcj0l0fnlydw9rh9hyd" } }, { @@ -21992,8 +22055,8 @@ 20211004, 1924 ], - "commit": "a376f53e42fdca80c3286e8111578c65c64b0711", - "sha256": "1dk9q5qwr6y6crmq95qsz86jc8wvvjmqxvh9xp3xdf6c87yblgkb" + "commit": "a0869778e252b97c568140bca366955f9391d885", + "sha256": "0xrdzplr9hqrf5zpnplsjhv9byyqhs26ipbk3v9m8awvzlvjg9pg" } }, { @@ -22042,15 +22105,15 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20220313, - 1533 + 20220729, + 1031 ], "deps": [ "dash", "s" ], - "commit": "b327971d197e95e9b78e7ef92539bd4196a12797", - "sha256": "15bkjvrdyn1bpvj0lpxm370cl7phyypmpswc80qngx2axdqbr0a2" + "commit": "4057a36440988769bff0a859c347a19973b3ae62", + "sha256": "047jh06n60d7090rc3yfwvpms309xrb25i79i2km83dck4gx5dbv" }, "stable": { "version": [ @@ -22103,11 +22166,11 @@ "repo": "crocket/dired-single", "unstable": { "version": [ - 20211101, - 2319 + 20220726, + 137 ], - "commit": "b254f9b7bfc96a5eab5760a56811f2872d2c590a", - "sha256": "1w243yq5m6zd6yvcsnvxf8162fd6i0l5izqj11mji7jzyqxl1ih3" + "commit": "48532d747f0098280050721b5d016ec59c97c77c", + "sha256": "10l6bx2hai3k73bb406zfaf0nfp42d3mr19fm6r60v2g352wz6c4" }, "stable": { "version": [ @@ -22418,26 +22481,26 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220716, - 153 + 20220809, + 1208 ], "deps": [ "transient" ], - "commit": "b8b114d0bcb2ddac7a14a37575f9ce89b5c44f8c", - "sha256": "0fmwq77s45ccyvfpz9h4ha62b18vmkf1z61fq5074caijb7maibw" + "commit": "2715ecfaa0147078318d3bcc74e95e0086786045", + "sha256": "10vpk2hcbij4rpa4z33w2xwg24w1n82n4vd0nk2fyqqm575h7wmi" }, "stable": { "version": [ 1, - 8, - 14 + 9, + 23 ], "deps": [ "transient" ], - "commit": "21a6805aa989285698d2f2c09feaeb4a03171890", - "sha256": "14d3h27qvfbk9s7mxng0dpl2bx1ikwv5swizia9zfn8w4aplpn93" + "commit": "4e0663265b27c2fa0302a581cf7f465fcfb449a0", + "sha256": "0s0rkpfpkx3nafahy0b96gjfsl5h1hccrx4iwqzsafm5v8q4yphr" } }, { @@ -22471,11 +22534,19 @@ "repo": "jart/disaster", "unstable": { "version": [ - 20171016, - 2152 + 20220807, + 2215 ], - "commit": "10a785facc60d89d78e0d5177985ab1af1741bb4", - "sha256": "0iz43jdkh5qdllqdchliys84gn9bpj6688rpc4jnycp64141m6cx" + "commit": "e261bb4cfdc9da95a3e6b9614d79e75437c85c8b", + "sha256": "1lpxaxhkimhww8296mvgwiq8l8yrzw55jlhhcs7iyv5lpfiwsfsm" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "1e94e5f96aba8577b8b138855a771881f383ea3f", + "sha256": "17kyaf90nsz87d7f2lmch9917k31gy1zyyg2l5a6jbnbb90z7d9i" } }, { @@ -23088,11 +23159,11 @@ "url": "https://codeberg.org/ideasman42/emacs-doc-show-inline.git", "unstable": { "version": [ - 20220708, - 211 + 20220731, + 2330 ], - "commit": "1be290742980331736828207208caf2473f3ba60", - "sha256": "14xjn7yzskac5azq8h3dbxijiqmss2xdl1sah4ndwhw2i7ziq1x2" + "commit": "02f2187d815b480e316238e2b8568bccc5e38fdd", + "sha256": "1i4lzq60d5i3yiibgf8nx97xfr477gkp4pyd5r2q1sykv9hjlr51" } }, { @@ -23287,19 +23358,19 @@ "repo": "spotify/dockerfile-mode", "unstable": { "version": [ - 20220220, - 1439 + 20220806, + 1709 ], - "commit": "b63a3d12b7dea0cb9efc7f78d7ad5672ceab2a3f", - "sha256": "0cnsm9xc5lqfx0vgv0fcqadwr8mnj3s9bqldrh1s6f26q9bapncd" + "commit": "c7e4e2541deb66d266f58c364e33a4a10cefbc2b", + "sha256": "0hmzwh8m72rj6cwaxfypnv3fmjrs11iqr15vsdw1rw7m55xi675f" }, "stable": { "version": [ 1, - 6 + 7 ], - "commit": "11c43de04b128b7638cd98a1e80be2b661c18fbb", - "sha256": "0nmybfc9qch0jng06qgs2xb41dl9v52ckc9nc20d7hv3x36w555x" + "commit": "c7e4e2541deb66d266f58c364e33a4a10cefbc2b", + "sha256": "0hmzwh8m72rj6cwaxfypnv3fmjrs11iqr15vsdw1rw7m55xi675f" } }, { @@ -23471,11 +23542,11 @@ "repo": "manuel-uberti/doneburn-theme", "unstable": { "version": [ - 20181110, - 1857 + 20220720, + 1218 ], - "commit": "da4fa915a2a659001eea04498d790cdd8cac1fce", - "sha256": "1xlh20vc43ywljjw13cp0aj4h9qackhqqzm0yi5g881lcyng2ca1" + "commit": "824eae7ecf1cce08fa41f6762a27670815b7f786", + "sha256": "0jvq6k9qlyk5g9gvs8yhmq27hgdygplvqn94rcjw77gwsgr568p6" } }, { @@ -23515,15 +23586,15 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220716, - 514 + 20220805, + 1037 ], "deps": [ "compat", "shrink-path" ], - "commit": "7003009213fd1433e47240e5387b84e6cbb7d350", - "sha256": "0gaqfqk8k8k93r4wcv624507ggmlch596kcxr8mq2mb0dzjmmxmw" + "commit": "1b7463832f21369377bf0a3d8f402241ad8102cb", + "sha256": "08cj22njp8xc9mk02wzjvgsxs9w2gvcrr393xqw452x95n59fnr5" }, "stable": { "version": [ @@ -23566,14 +23637,14 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220622, - 2317 + 20220727, + 853 ], "deps": [ "cl-lib" ], - "commit": "d79a41f593c69697af1ddaac971c0c47ecc446a8", - "sha256": "120pcas0l1m6w551qxfcl2fx0aysjqp91nn47zdxrr8rs01654wr" + "commit": "aa13e7fc713d458f46f4ab7cce367fd30d801765", + "sha256": "0pls01fkcm0d952cimaa7zk3h26zn434h891vs9ln08axlkf2d5b" }, "stable": { "version": [ @@ -23816,11 +23887,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20220209, - 724 + 20220804, + 618 ], - "commit": "60f4e0c67aeeaeb1632cd82b96f4ff5ee83bd1f4", - "sha256": "0ixmdjbi9zvgim6s5j0slc744zwz5l069bvbsinxmi8fzpiln68m" + "commit": "37b3979b91b06a0520a0d326bc323b4dda280123", + "sha256": "1z4zk38agf2j36gbrj3wmngmk617mc6id8y4c11kvva2fd7l60am" }, "stable": { "version": [ @@ -24058,8 +24129,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20220602, - 2129 + 20220808, + 1529 ], "deps": [ "cl-lib", @@ -24067,8 +24138,8 @@ "s", "seq" ], - "commit": "a657a8c034746069a5b340ef7356cb7d38290ec9", - "sha256": "1cycdzk24g3ay1riz840bvd94vhcy7l0hx6ipb7s18pz5aw7icbb" + "commit": "2a76bd06d95ef0b07cad235b01107051616a5387", + "sha256": "1g29af3ds8c0jqk16bnay93z95brnimynp20p7w4n29n7kqfjmhx" } }, { @@ -24094,19 +24165,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20220518, - 807 + 20220725, + 849 ], - "commit": "57f4072fa8acd5f7af40b11f5f33607bca324fe1", - "sha256": "1pimn792p93i2rs08al32xr3p9csp645ai5830mgjza6nkkqhxml" + "commit": "d4fd1b4977eb0d534844fddf01c3c51c70c57205", + "sha256": "16g4bv2py423l19n0kaz18a41wk5fsrpnqzifdss6amqh0dqyvmf" }, "stable": { "version": [ 1, - 7 + 8 ], - "commit": "66fc30af02901db023e464a24d2b5fb3ff472794", - "sha256": "0ihwmkxgbd0mgfvzisjiwvyypa9z21ckyxdnkf9y5lxywjyr39zh" + "commit": "d4fd1b4977eb0d534844fddf01c3c51c70c57205", + "sha256": "16g4bv2py423l19n0kaz18a41wk5fsrpnqzifdss6amqh0dqyvmf" } }, { @@ -24184,8 +24255,8 @@ "popup", "s" ], - "commit": "ba4127336d897f5656032694bbe22c490ecbb000", - "sha256": "07r4c4wrffbk6qvgyjg4k7jz0viym2qfpkqql6xg1rpan1sp9rk7" + "commit": "0a783d1db610ff1dc4e1b7869589cff16ff92f7a", + "sha256": "0m67a9zdgdwgl4w24qcla10xgjgk88mg7a9jsfsj1cyqngrm0kjs" }, "stable": { "version": [ @@ -24225,20 +24296,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20210909, - 1010 + 20220805, + 1652 ], - "commit": "02a51a1318f3bdb9f7b6c016c258d3c9df1c9b9b", - "sha256": "0f74jpf3p9b0x6a28vafix6jmh8xmphl323cz9zbl1ki8jna8n3w" + "commit": "dcde9174164aa82708d3108eef40287b363cc8ea", + "sha256": "18ghh62273ybmzklzccy7qg6xasdfk75906qn06yw4xhkwbxlldg" }, "stable": { "version": [ 3, - 3, + 4, 1 ], - "commit": "b3232b22e13ff2fe4db994ba7ae3db727d1493cd", - "sha256": "0wdja70l7y1cj1d0sijm0q0cbics8xd9wqka7zyb29y1cc57pasa" + "commit": "ac188544b55357c1fff277f54d1481d28a634e19", + "sha256": "02zn79l7y7rvy7b6bimlf5qymrvzc43w8q7l4jx3k8wzn2g5326z" } }, { @@ -24324,6 +24395,21 @@ "sha256": "14nd544ispfj165ys6lv9bpy41p9j8kf4lwy73qigr4c7qlf43by" } }, + { + "ename": "dwim-shell-command", + "commit": "61d5717cacebf03cb9ace2f16a877cc07890c013", + "sha256": "0skfqspgcykgpmf4akb52z606xk12ycg2h37w43nrg8lhvyaxalb", + "fetcher": "github", + "repo": "xenodium/dwim-shell-command", + "unstable": { + "version": [ + 20220809, + 738 + ], + "commit": "f89b831f6f66326f63905b800d95bda233bf9765", + "sha256": "1msnbqwj9czclndgmgi8mf05lbl4qwi5knq9zsw3ydr262gjaiqq" + } + }, { "ename": "dyalog-mode", "commit": "1a8f86df54f1243fea71e1e73ed0b9fb049032bd", @@ -24749,8 +24835,8 @@ 20220526, 1434 ], - "commit": "4fe2cafbfeb73d806ebea8801c3522ff2886f30b", - "sha256": "05m121lw90rjs1a6wq8gvqxzydm4940x30xp3kh1v5x4zwwcf03b" + "commit": "5e2b881d321c588fed05875819e2b749d33abe0e", + "sha256": "0a0i2a5mqj9s5shb3wj3mhc2j7n0dmkqhid81cxflll9m0mkaryp" }, "stable": { "version": [ @@ -25028,8 +25114,8 @@ 20220606, 1846 ], - "commit": "89a868226e7ddb303548e82a81f76fbb0e5b21c5", - "sha256": "0hqlvjhbx6zz11dhnacqgi62mwwbiji95jgv2zwdl9y1zmizd23c" + "commit": "89df6ca4215b3a325dc94a8f246f403cacc99745", + "sha256": "0323d3ldj1f2z8k5hl7n31ywz6rh2ll62wvs0v7d6nps09zhm318" } }, { @@ -25040,11 +25126,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20220626, - 1336 + 20220725, + 832 ], - "commit": "b046d9417edda5cb078041ea0e920d0688255060", - "sha256": "14c336pvyxfys3rb9vmqzv9zlbcl0r2k150xrfvyl0qs0syvbc28" + "commit": "5b8bf34b8ea5d05f0b8dfc12bfea825f9cffbeda", + "sha256": "04733lqa6z3kmdjcgdi58q3wrqan2qib43rvjw51qc739fwmwb5y" } }, { @@ -25139,8 +25225,8 @@ "repo": "ecukes/ecukes", "unstable": { "version": [ - 20210202, - 1241 + 20220802, + 1502 ], "deps": [ "ansi", @@ -25150,8 +25236,8 @@ "f", "s" ], - "commit": "d173cdf487bc2c62305e2232db96290bc021950f", - "sha256": "182qgddfv8nd89y1l55rs5vm5i61ayc8cxbplb8zx0alnid9xrw1" + "commit": "3fff6edbf4acfab5b9e042c307bc5bbfac1c550f", + "sha256": "0y953fxhxgbkjvh87wq3vkmkhs5pbafwhyflcq2d6krbb1w6jcwh" }, "stable": { "version": [ @@ -25903,8 +25989,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20220715, - 1158 + 20220726, + 1405 ], "deps": [ "eldoc", @@ -25914,8 +26000,8 @@ "seq", "xref" ], - "commit": "33c464f658de70f36c27237d57b9c9858c68bc81", - "sha256": "1qplg6ilrr5p28mn3jflqkidz04s475q2nl53qdfh2mvhviwwklz" + "commit": "000b7fdce93ed29c505a7fa75baaf87094fd690a", + "sha256": "0x4b592vx1x63avmybdi6n6v7ik1v15idhbf1dpda2m54fhrf7bn" }, "stable": { "version": [ @@ -26211,8 +26297,8 @@ 20220622, 2008 ], - "commit": "15f6af6035ad1f159ac931268ec3431ce4cdf2ec", - "sha256": "0zdjlcfpq8xb871r2m2i8ah08mqpwnm375s42z3qgbccz63v8hy8" + "commit": "cf6350c637a3151c16324768cf9c472d060f70df", + "sha256": "0d8w9m8rm6b2m86m6mq2sz5nfh9m3dizxcryn5qwwlv8hrlpir14" }, "stable": { "version": [ @@ -26646,11 +26732,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20220708, - 55 + 20220723, + 33 ], - "commit": "c3c9d318171c2627a64e6f34eed5942e4f5ad369", - "sha256": "1p78rdpin836giqmz479awbjzp6mass3mjrsbxbrp5yak4swhjwg" + "commit": "7aacd702335b4ab3344d3815c0fffed319effdf9", + "sha256": "15rjghwgvnd00ql62x03smsban15g7asskqkvhn2znqfsngbxs3b" } }, { @@ -26695,11 +26781,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20220715, - 2010 + 20220807, + 1244 ], - "commit": "0d2f46eb41180ada741725f9ea2e1272491591c4", - "sha256": "0c87rb8r2ghhj49xdjpiqq4b8222mi3bmmc97m63844zii1fjsc5" + "commit": "a9d5607372b0935fb1b84a81bfcbdf60a7bf7ca8", + "sha256": "1159kz63fsw116bl42vhfgnzck1g5x6vj41pwz7jl2cx4fgcc7pc" }, "stable": { "version": [ @@ -26719,11 +26805,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20220612, - 243 + 20220729, + 844 ], - "commit": "39b44c99a02299fc7270f1c1832fb37149f8b924", - "sha256": "077y6dhxs032r9y7b1if9d2113bvhn3j1vinyh8l16fnnd02cxsi" + "commit": "4a57d48115501c68665535877e58694281a50563", + "sha256": "0iw3z8hjcsy7lw5zy3b8pyl3m5pahy5zfa0s4hn012g563f9yx8m" }, "stable": { "version": [ @@ -27090,10 +27176,10 @@ }, { "ename": "elfeed-goodies", - "commit": "e6ebb8d23961fd9bfe101f7917caa3b405493f31", - "sha256": "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi", + "commit": "8d39d68623d62a0565f371f0d125e2d18276e1b7", + "sha256": "1hwjydi6kzkr44xafr28yf5bj879808nf6l6zvmia2pjgridwaad", "fetcher": "github", - "repo": "algernon/elfeed-goodies", + "repo": "jeetelongname/elfeed-goodies", "unstable": { "version": [ 20220614, @@ -27128,8 +27214,8 @@ "org", "s" ], - "commit": "d28c858303e60dcb3a6eb18ea85ee3cb9e3dd623", - "sha256": "189hr2pqpm9vpz06frkl6r3k6q6ispx97zj24lczcli44l7d8gsz" + "commit": "f8715f20fc5e51d1b284667951ca23638475fcba", + "sha256": "00wdhxj60v9mcjysp5hsdm5pmch1vqkmry040v6mwa44gabrnk75" } }, { @@ -27154,14 +27240,14 @@ "version": [ 0, 8, - 0 + 1 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "4a59e26216ceb6eb466781f15b6ac770b90437f6", - "sha256": "07r1qlldgd0kfikd0y737y5n42ab3nkw2s5jx7frimj41yandbdp" + "commit": "b813574faefc1ac4825da19b40f620339b6badff", + "sha256": "0k9rkghp9rg7aidmx7q0n4wpb9z5cwr7j8z167yzaqgf9s3y4jj2" } }, { @@ -27234,15 +27320,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20220703, - 2128 + 20220716, + 1217 ], "deps": [ "aio", "elfeed" ], - "commit": "5817c91f5b3b7159965aa73839d2a0a08fd952bd", - "sha256": "1w22n54gm8my4r4kvi2id6s2wghsqdazzk168v79kw8kfw32vyy9" + "commit": "a048950b9dc6d33741ed3224d6d8440fe4408742", + "sha256": "0a8fj2wy9y2k0qrszd4vbizlgpwywjrkjz1vs7x4smbf9cj5mxaw" } }, { @@ -27260,8 +27346,8 @@ "elfeed-tube", "mpv" ], - "commit": "5817c91f5b3b7159965aa73839d2a0a08fd952bd", - "sha256": "1w22n54gm8my4r4kvi2id6s2wghsqdazzk168v79kw8kfw32vyy9" + "commit": "a048950b9dc6d33741ed3224d6d8440fe4408742", + "sha256": "0a8fj2wy9y2k0qrszd4vbizlgpwywjrkjz1vs7x4smbf9cj5mxaw" } }, { @@ -27364,16 +27450,16 @@ "repo": "Wilfred/elisp-def", "unstable": { "version": [ - 20220704, - 2144 + 20220803, + 1647 ], "deps": [ "dash", "f", "s" ], - "commit": "7e9c950288d5f90b6f5ab0a9846e29db384f4fd4", - "sha256": "01ipd1if6l320m8hg6xqhmxbd0k6qn7ysfrc0cng02l0y3k8d44c" + "commit": "1d2e88a232ec16bce036b49577c4d4d96035f9f7", + "sha256": "0slywahznd20369ghyl51mw58svq31042sfljfq53pc7p4f5n15y" }, "stable": { "version": [ @@ -27963,8 +28049,8 @@ 20220526, 1512 ], - "commit": "b200d979bcbfe2df0f7c0074aeb5497251ed47a8", - "sha256": "1gmwf3wv984vxnr42936kyb4npkwc3mwpm81akprxm5ggzz0zigd" + "commit": "2e2048bc335d170b5680e97c6a4cccd71eb85129", + "sha256": "0692a38g39jxzby3q88674ghldda7n0zaby0l06ra3a70cdhvj12" }, "stable": { "version": [ @@ -27984,11 +28070,11 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220715, - 612 + 20220809, + 253 ], - "commit": "b42463a49eca1f319bc1830f70295e8f127fb40b", - "sha256": "04mkk3v3vy49cac18dv641cxz120v0wlzkjvwmzlvfx6zr1gnq5j" + "commit": "b5269970249871a8889950a3e47bdff51eb0420c", + "sha256": "0j69l2wbzhw33wwnfvmscpn1isry9aycghhs36h6vsa3wc7zml1a" }, "stable": { "version": [ @@ -28372,11 +28458,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20220628, - 1501 + 20220806, + 1536 ], - "commit": "cbe56e216df38756de11370535601b5324fdc63b", - "sha256": "1xdahfnrvfda427grv69agx4ry3mq30nyz1ay01a23ijjlrf4q58" + "commit": "a1b16b53c5211607fa0f76c80aebb3a72f645ae1", + "sha256": "1jgr1f2nrnw5rsvnsxmvnlrr48fxrb895q4mpawnaw17xx13llpg" } }, { @@ -28759,17 +28845,16 @@ "repo": "elken/embark-vc", "unstable": { "version": [ - 20220703, - 1008 + 20220720, + 613 ], "deps": [ - "code-review", "embark", "forge", "s" ], - "commit": "6124909d8b07c70a0eb3bcaf47f1c3a28698528a", - "sha256": "0rcnmqvsvwwqa8f9j4jflk9b15l4577ay3q2c3mdhx46g3q1c9cx" + "commit": "4a6fcf96d07c79ab8c5f4fe3f84b4335a2a4033f", + "sha256": "1xx66szz5y9w7cdj1gp3arn49z49sqf3f7plchcqzzn6aiz88ddr" } }, { @@ -29368,6 +29453,29 @@ "sha256": "0k5ns40s5nskn0zialwq96qll1v5k50lfa5xh8hxbpcamsfym6h8" } }, + { + "ename": "encrypt-region", + "commit": "1ed03e2c07f97fe5f631cd8c2212570ebc807ba8", + "sha256": "1x8c92q233icgq69rgcfkag5h27sw9zp2ihkxvilyspsdcv516ai", + "fetcher": "github", + "repo": "cgshep/encrypt-region", + "unstable": { + "version": [ + 20220802, + 918 + ], + "commit": "8ff5704bc6f4c57f935a8b7680129e599bbe474f", + "sha256": "08dd1grxlbb8mlwp46z35pbvh80y68mcq351id0mz8wwxi7ivan2" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "76d4e621c188467bfb9608ab9662215e7352cd77", + "sha256": "0zkadhk4cdmmhdshl9r6zsxjvlprk1d9nzswvp4qzri6y31clvbq" + } + }, { "ename": "engine-mode", "commit": "ea1b5dfb6628cf17e77369f25341835aad425f54", @@ -29406,11 +29514,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20220707, - 1949 + 20220717, + 652 ], - "commit": "23ee0e8690a157d9c81d7aec179c82f0bba309b8", - "sha256": "0rsx48lkv9j9gc9mx6ky65z8ab88fxf06ffyqvxxibnb9idjsmy6" + "commit": "8dcb8888cd8007420594212945fee88f82b663f6", + "sha256": "1p98jxfjvc4y42sk5hja1v9vrqycgpj2zqx1fgjaqac0a4f0032j" }, "stable": { "version": [ @@ -29510,15 +29618,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20220604, - 1519 + 20220809, + 1320 ], "deps": [ "inheritenv", "seq" ], - "commit": "7f36664fc6d97a7ca77c6c3e0c6577b72fa0b70d", - "sha256": "0858d36xgc6r4s116hc4pb8jf1j1l9ixws9xpk39a8h1diw3gplm" + "commit": "2a6257b5fdf51e77e41038c934fe81015c85fbde", + "sha256": "1s71pzj1lqvdxv00j3k6yvmk9hf7qb72p4y63fj8nnw2d4kpb6j1" }, "stable": { "version": [ @@ -30309,8 +30417,8 @@ 20200914, 644 ], - "commit": "5d30d8e7a25dfced02edefd82699f1f7b6f79316", - "sha256": "022jzidrgx66k40i25wd49p8q9gh8x7s2m7qnxpqcfjbmgdy624p" + "commit": "5d2d77abbc0c97f5b23d7089797c3ef8796508dc", + "sha256": "1ayprcd7alryqz89p5gi3wawbc72210r7j8jw7naind7wwkjz386" }, "stable": { "version": [ @@ -30334,8 +30442,8 @@ 20220215, 1844 ], - "commit": "34d362faf2a6272280b52585a5570a04d7fd63e4", - "sha256": "1n3x4906iwgw34pvkjc8sv0pzznnj4hp0j2fjlnk2kifi977ay97" + "commit": "c58471e58117409c9470a04f9dc1de6c765aa86d", + "sha256": "1xhbxcpcvc9vy66qp4ap26cg44dx2j7zarljmmw801ckcmv3ff84" }, "stable": { "version": [ @@ -30869,14 +30977,14 @@ "repo": "Phundrak/eshell-info-banner.el", "unstable": { "version": [ - 20220531, - 940 + 20220728, + 1006 ], "deps": [ "s" ], - "commit": "b7f2bfc0137be9cdc3dfe26a71e1984d3c3bcdc4", - "sha256": "0xj9cmcm8cfmmnvjs2wwhqc9j7jwydywscbwq16clwb3v4v5gj1i" + "commit": "2f4e59ea7ac2129b175af2b6acf353b29687fb9f", + "sha256": "1362fag0hxsiah0y6rwwkrbxn01h07l59a73xr2piwl1m6imsihr" }, "stable": { "version": [ @@ -30969,14 +31077,14 @@ "repo": "4DA/eshell-toggle", "unstable": { "version": [ - 20210407, - 2039 + 20220718, + 729 ], "deps": [ "dash" ], - "commit": "7160518ca56444fead841b8acff59aeffc7cebb3", - "sha256": "0g0cg71n0cp1576i2qkgvg729gw1927vq0js3s64v5b8p9hmb1kq" + "commit": "d4e884624f02e68b267b0044322ad17baa6780f8", + "sha256": "13bb0dyhncph6rxihlf4fy7p92nyxz0ylld8vx1sj4551sv5ifn9" } }, { @@ -31289,11 +31397,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220629, - 1607 + 20220727, + 1131 ], - "commit": "1069abd4e241ebc223e15c2060d1818ac772c845", - "sha256": "1x4fbjfkynnqfg9l8660m5zh47a0irsxlir0fvh1cq6yp0hwkw1r" + "commit": "b8167727d3c51f7adee6ebcad698ab566b68a55e", + "sha256": "1g3bih73fr8vinasw19kag28f1d2z9isxa5n9jk52vi0rcspmsb1" }, "stable": { "version": [ @@ -31907,15 +32015,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220705, - 1432 + 20220809, + 2107 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "0e501d17c5dc2944f23fe5046b030d0c641665c5", - "sha256": "1iqj8ja7nhp0mh9nih6fmf68xf6qnx24bnyi6gjsdj3df1j7xps3" + "commit": "87a1fc7fdf75feaac1b0fd163ca60694eda1834e", + "sha256": "0lp9h23ymzz8xqxr5rxaan8jzj4lynmvcvrc459xvh7dv2j2wl83" }, "stable": { "version": [ @@ -32108,15 +32216,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220712, - 758 + 20220809, + 650 ], "deps": [ "annalist", "evil" ], - "commit": "9cea83273c1af812e2e3feab1ec13ab54aba25a0", - "sha256": "10lnf016qf8wb3wxhky2j2hfni58b2d2m1p97v21b0jwiga7bzcj" + "commit": "c1ede88de9b09f280e4a37c671b6dd540bf1028a", + "sha256": "1zx14vm9a7gf38vm4fzby0rg9dgwryp299k735v8f6xghgvpx0k4" }, "stable": { "version": [ @@ -32677,8 +32785,8 @@ 20220608, 1134 ], - "commit": "271551560c3c8c066b29d335f781ff9b5aefe746", - "sha256": "1vzpmr33smi1kgcrxj7jl8wvk1ffvy2bf6p6pki0r53lk03mf8fr" + "commit": "296cc6580b990dec41893bdb08d8294ded4cb91b", + "sha256": "0ir05gr0a60l7l02pimq6f2wd227cr1138l6rwz1lgd5b2x9ymsz" }, "stable": { "version": [ @@ -32803,11 +32911,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20220524, - 1231 + 20220718, + 1414 ], - "commit": "386cd758a477d1b1ba742ef698ecc19916b43fbe", - "sha256": "1gg6g14nyizfagn5dgqr8qrfcyvlbcm0jvlb2wqp5z2wp1dyzqkg" + "commit": "b1a92221c9735c2681806a3d5a86c7258e73089f", + "sha256": "1bbkscmnfy7xkkhjkpxp5qc7izv5azqb4z9a4az6s9744s50maf6" }, "stable": { "version": [ @@ -32842,14 +32950,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20220711, - 930 + 20220731, + 2346 ], "deps": [ "evil" ], - "commit": "61dde4e3715fd1255df8f87a37d9c8022e909bf4", - "sha256": "006s8azhypp5n7jnvqkb4rmzqmnsdwj87c3r97zhjzgi2jq953gx" + "commit": "7bd9bb0bce2ed61fa256952fbf37fc5259928925", + "sha256": "0z8rma0h615lybvbx67apcddy7jfm4lbrg6hr5k4hmll3q7b594r" }, "stable": { "version": [ @@ -33425,8 +33533,8 @@ "deps": [ "evil" ], - "commit": "0e501d17c5dc2944f23fe5046b030d0c641665c5", - "sha256": "1iqj8ja7nhp0mh9nih6fmf68xf6qnx24bnyi6gjsdj3df1j7xps3" + "commit": "87a1fc7fdf75feaac1b0fd163ca60694eda1834e", + "sha256": "0lp9h23ymzz8xqxr5rxaan8jzj4lynmvcvrc459xvh7dv2j2wl83" }, "stable": { "version": [ @@ -33628,15 +33736,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220715, - 1530 + 20220805, + 1520 ], "deps": [ "evil", "tree-sitter" ], - "commit": "9dce8dab68c954ae32095328cf898eb856fc341a", - "sha256": "08s2za167a76p6z40cdpi1b10968sf4mvwgm0sinvqh26pqqz9n4" + "commit": "7ec5835662941ce64201281bc0ed0f31ee34e48a", + "sha256": "10kh8idwlcxa9f7f5jmwg1sykm3v1lv50lf3zqn13k1blj0k0ya0" } }, { @@ -34197,11 +34305,11 @@ "repo": "magnars/expand-region.el", "unstable": { "version": [ - 20210708, - 1952 + 20220729, + 659 ], - "commit": "7e5bbe2763c12bae3e77fe0c49bcad05ff91dbfe", - "sha256": "167mxvhpr1laad3iznpxbfczvzjyi5c1w6h58amn60gq8v78j9rl" + "commit": "c5c4362741deebb0985a8a29f9b8b0e25160764a", + "sha256": "17h58v5mnggbrwrp61cwkqx8hzazkdqyz9p6s1hl9g2hys7zkb00" }, "stable": { "version": [ @@ -34343,6 +34451,21 @@ "sha256": "1k2j8szavyq2wy5c0skvs03a88cr9njy7y63b7knh2m92nw4830d" } }, + { + "ename": "external-dict", + "commit": "3ab82a8b7a785cb4b25af78d2cf6e1537fb0f78c", + "sha256": "146g9378cgzrgk3q590ch47sv2bn2i3r815idbr3xv3dm21913wb", + "fetcher": "git", + "url": "https://repo.or.cz/external-dict.el.git", + "unstable": { + "version": [ + 20220801, + 2349 + ], + "commit": "aa051548ca850d15f939acfa82b358f756a761f6", + "sha256": "1nnkyy7wi5zkb511bsp8j95p88rd451nfncyvss27ldrscnizjf0" + } + }, { "ename": "extmap", "commit": "91ef4352603cc69930ab3d63f0a90eee63f5f328", @@ -34462,10 +34585,10 @@ }, { "ename": "exwm-mff", - "commit": "78f94ec4d5f83020003cbdb7b954213dfb0f242b", - "sha256": "10qjdhdkvyavjl43cyq9czvfbx8s0riiby0fss6v0snxdhg4qysd", - "fetcher": "github", - "repo": "ieure/exwm-mff", + "commit": "3760d6c7908a03034979fbebdc2b52727ecef40a", + "sha256": "0zwkqqhas67bcdlkxvabqfjblh0b2yfl7bnp3f7ixa6n8yqgjn1i", + "fetcher": "git", + "url": "https://codeberg.org/emacs-weirdware/exwm-mff", "unstable": { "version": [ 20210603, @@ -34893,6 +35016,21 @@ "sha256": "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g" } }, + { + "ename": "fancy-compilation", + "commit": "01f74f003f04d7bd650d833b719b7cf68f2d4a2d", + "sha256": "0g3wmhbw2xmgpnnpc39aj0s7cxkwwqbgladicxx4hvpcfr94s1pf", + "fetcher": "git", + "url": "https://codeberg.org/ideasman42/emacs-fancy-compilation.git", + "unstable": { + "version": [ + 20220725, + 2313 + ], + "commit": "6d98cf908b0bbd6286a55e6bf11905010468a006", + "sha256": "0b4c8wr8r1ch0g8s7whpxxfj3gsysaay4n1xznas36157v9d4135" + } + }, { "ename": "fancy-dabbrev", "commit": "1ac5a3797d9882235de984739d5a2bf122b64540", @@ -34966,14 +35104,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20220702, - 812 + 20220805, + 216 ], "deps": [ "s" ], - "commit": "07815b29decc08994e7b6ae24be188047531b1b9", - "sha256": "01qnlfcjf7gr0bax94b6s79qf6r3pkvv2h30kmkz630x8a6wsgzf" + "commit": "031c7ab7a16113bdca2b351781dc95aff9658c9a", + "sha256": "0d9v93ll884srr8f6di1iyp396wr0bklip6cv0xydw3mimv2rv3x" } }, { @@ -35270,8 +35408,8 @@ 20220418, 848 ], - "commit": "e204d9e204b767cf95d6a051ff283f05dc51e9d3", - "sha256": "0zg4nkwfwmil2a3n2gnrwsj14dkwb1hm1mbcgcrg2dgvh45idns6" + "commit": "177d065db5984cbfaa66c375d13d5f1ccbb5f4a7", + "sha256": "0qwkpv146bi5ias5wl2c4mffs6bnp8kphcg24bil4kn0v35s51d5" }, "stable": { "version": [ @@ -35705,8 +35843,8 @@ 20220702, 1332 ], - "commit": "677352621db8bf4a28be4e7a1c73dd3ce111f02a", - "sha256": "0pw373r9ffgkby8k0mwwxrwcb6zq2bk4kij62lqcjkf9bwkd4ghi" + "commit": "af7bc59a3b9ab626bea88ff81b9227cc22c09362", + "sha256": "1gjvsj5giznd4a74hh5dh30ckrkx206s7i2ssxx4954f720qxs7k" }, "stable": { "version": [ @@ -35824,8 +35962,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20220704, - 1022 + 20220722, + 1932 ], "deps": [ "async", @@ -35836,8 +35974,8 @@ "s", "transient" ], - "commit": "508f6699795528c579b235f4f7726b5aa5ad9595", - "sha256": "1raq1l4ixap83n98wf7a7dzd2mx2i1mgfsksim00x1qy9fpr5qar" + "commit": "cb4ed363d2ada2bff621c6b6586fe0c3342331b6", + "sha256": "0600b0f5m6s38r1m5z21gzl1pp29sircm89y5rf6imqgwasnx9gd" }, "stable": { "version": [ @@ -36351,15 +36489,15 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20220205, - 205 + 20220729, + 145 ], "deps": [ "buffer-manage", "dash" ], - "commit": "2da0e5e791896810747c710276ff3a1d0465d843", - "sha256": "0xix6j99hb1l0ml8ry2zcz74n86572bnq5czr0xni8hvrgxa9b61" + "commit": "cf28cf68f025b0090f9a8ae82326b647dced2d66", + "sha256": "03la8jd4n15gx92xl7z5b29xjly2if0pva2bfzqvsm88njp4wgaw" }, "stable": { "version": [ @@ -36397,15 +36535,15 @@ "repo": "wanderlust/flim", "unstable": { "version": [ - 20220503, - 1442 + 20220720, + 1311 ], "deps": [ "apel", "oauth2" ], - "commit": "f8dcbb8b4e6fa0d72212d478fb4a1e74804a2aa8", - "sha256": "1ld9srm0vzjqld2rcm5dyyk1prw0xhj5ladkdmrk9zq4jqflxchr" + "commit": "b27f4ae0bff18791bf41efa346cdc2eb35ad53e7", + "sha256": "1yd1f3fg64lk9isf0dvd2afkgq6fw6h5f7k0afz0nbs0vid482s1" } }, { @@ -36698,8 +36836,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20220612, - 1800 + 20220729, + 1039 ], "deps": [ "dash", @@ -36707,8 +36845,8 @@ "pkg-info", "seq" ], - "commit": "c955fd6fb970eed5fdecf675369d3d61a41f6c68", - "sha256": "1dcacgzh7hxvsyw7hjc5l2qdy8p3nrgfx5rlzkv57j06h075nq5l" + "commit": "8541a61053bba1f2f31d0791e597cd3c78a21456", + "sha256": "1rh76xwiikcq2pbq5i2nf5dx1dsgaqlgmjpcm011w99m0nzg7bvi" }, "stable": { "version": [ @@ -38123,14 +38261,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20220704, - 637 + 20220731, + 2301 ], "deps": [ "flycheck" ], - "commit": "8dca25f9fa79d6871fef9fdeeb1858474a8e9f0c", - "sha256": "1w1w049zcid8l2f0qyqv1g8sfbnwsbp28vkriwcnxywn9vmi4pzc" + "commit": "53b3e46d47a0e70fd2e5c49fea9134ee9aa41793", + "sha256": "1di51jp20ymqkp777rsvwkqzr9vpnpi90b8bd4db5v2ji46xrkjf" }, "stable": { "version": [ @@ -38366,29 +38504,30 @@ "repo": "flycheck/flycheck-ocaml", "unstable": { "version": [ - 20170730, - 2153 + 20220730, + 542 ], "deps": [ "flycheck", "let-alist", "merlin" ], - "commit": "8707a7bf545a8639a6a5c600a98d9a2ea1487dc9", - "sha256": "13vzxkjq6v1f1i9zgxgjbwpiba04k9frkcl2wx6a9h3vgd7jyay0" + "commit": "77f8ddbd9bfc3a11957ac7ec7e45d5fa9179b192", + "sha256": "0ndqd5s43la6nyrzff7w4d7kb7ya77i0givi8p8cik4r8nfxwjnd" }, "stable": { "version": [ 0, - 3 + 4, + 2 ], "deps": [ "flycheck", "let-alist", "merlin" ], - "commit": "9b4cd83ad2a87cc94b5d4e1ac26ac235475f1e6c", - "sha256": "1phfarws2aajkgcl96hqa4ydmb1yncg10q2ldzf8ff6yd6mvk51l" + "commit": "7f7530043d0a52f4900ced5d202534dd5e855363", + "sha256": "1kwg0aylv4bb3hfgrid8wnd3fgcb6iqzhnb4a7js1cs4gh2c3ga1" } }, { @@ -38499,15 +38638,15 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20210714, - 1805 + 20220723, + 1451 ], "deps": [ "flycheck", "phpstan" ], - "commit": "4f990bf51cc65b3bdc63f4991e007d03b76932a2", - "sha256": "07iqv6jd7a49vmfp4fz9dwvxhhl50wkpyisazr2rxwfs9i72n00m" + "commit": "e229e990e36a2bfb88503bfe2bb6f2836eaa2874", + "sha256": "1235m8q85rijgx9a5jn3p812hdffjlnalh7nvdl3qgxjsf2c4bd0" }, "stable": { "version": [ @@ -39609,11 +39748,11 @@ "repo": "s-kostyaev/flymake-go-staticcheck", "unstable": { "version": [ - 20190708, - 1325 + 20220804, + 1907 ], - "commit": "130079fcd29c3e2a72f8325f3041042bcc6286f1", - "sha256": "1wxsk6vy9hm8gi5cvhmxmqv9415q8k2yp8636s4fb1xcp1zalysk" + "commit": "9098f7e07ea6513667dc6af6d9ad2fa854464d20", + "sha256": "15gwg431lk7n8n21dsaic3k0rjw6lbsc2g394hr3xzirywk3g40i" } }, { @@ -40132,8 +40271,8 @@ "deps": [ "flymake-easy" ], - "commit": "1c57813235fb4b1561cadc94b44635b2b612b874", - "sha256": "0c96x0l487a96xkgdasgpp81vjiai31cd5chwgsfyaz9bnw8zdh5" + "commit": "433fd05b608f06a40bb209fbea76117d896449ed", + "sha256": "149yk0l55p2fcvcgy0pqv3iw8mgbskycmb84bqvjg8227a38bks8" }, "stable": { "version": [ @@ -40161,8 +40300,8 @@ "deps": [ "phpstan" ], - "commit": "4f990bf51cc65b3bdc63f4991e007d03b76932a2", - "sha256": "07iqv6jd7a49vmfp4fz9dwvxhhl50wkpyisazr2rxwfs9i72n00m" + "commit": "e229e990e36a2bfb88503bfe2bb6f2836eaa2874", + "sha256": "1235m8q85rijgx9a5jn3p812hdffjlnalh7nvdl3qgxjsf2c4bd0" }, "stable": { "version": [ @@ -41261,15 +41400,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20220701, - 823 + 20220806, + 702 ], "deps": [ "inheritenv", "language-id" ], - "commit": "aa22b06283382baf73d78064fcfd6c2f075ead5c", - "sha256": "0fl68l5qcf78z7m7hwb4089vqa0py46fbv9rzars450kpkc82hhg" + "commit": "7e375c01eeaacdf33a27b59f6cf1849bb6a0caa5", + "sha256": "1xh6bbwcgx6bs78vfmfv5cy16ng7i9k37kr1cpdxfchjl3ylyhw1" }, "stable": { "version": [ @@ -41852,11 +41991,11 @@ "repo": "pdo/frimacs", "unstable": { "version": [ - 20220702, - 1004 + 20220723, + 1902 ], - "commit": "978665a47314f385850097442a3838ad7f3b688d", - "sha256": "1bvjk3g0rcjxn4anwvkd72r4phd534md350h1ryxr0frvgrpkcd1" + "commit": "b35fdefb60ead4d7559131601c43761973762a9a", + "sha256": "034x3b471xfn1ih95az59h34ad2qvb9qpav29ng5z0ry2hqcq0za" } }, { @@ -41998,8 +42137,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20220106, - 2256 + 20220725, + 2139 ], "deps": [ "company", @@ -42009,8 +42148,8 @@ "quick-peek", "yasnippet" ], - "commit": "c95c2a61a6c42a1fa8bab9a8eb812a41be3e6f69", - "sha256": "1vj0lgj2q9bjspaqd0qlfifzwilzwnhkn21csnra78bvbhk2pd3p" + "commit": "60489e75c6f26417068bf861b6db2935e72c38fe", + "sha256": "17j66xilzv0dv91jzk7v224hwpm0mlyxcsz7qf0ip8379ax1jb8g" }, "stable": { "version": [ @@ -42040,8 +42179,8 @@ "deps": [ "cl-lib" ], - "commit": "5716fde9dd0aa8531894938a9930b07ce96dfa66", - "sha256": "1rgs8ivbh8686kva0l8wi7gx5yp3v6rk50id11axzx9qzj5p1gnw" + "commit": "b0badd157101d4b6b184f06726b456a00171b801", + "sha256": "11vpvjyh860j0k7rcysa0ssgggrai8fq6q33hqw2wz66pf2xn6bv" }, "stable": { "version": [ @@ -42194,14 +42333,14 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20220713, - 23 + 20220723, + 1500 ], "deps": [ "flx" ], - "commit": "314280ae62a907004ce82f8bbbddf8feca497e95", - "sha256": "062lg7a6bb57zr1rcisk8hxagm2jd5ywphm881q87c8vkfhki2ar" + "commit": "d789dd9eb292ef2ff8a0959dc015f2edc67af6f7", + "sha256": "1h08kbd7i1g84rxmwn50rq9h67xmi615wg0yzjzdi0x4f2y56xgi" }, "stable": { "version": [ @@ -42407,11 +42546,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20211228, - 2005 + 20220726, + 2216 ], - "commit": "d61cecbdb60b0f10cecd50ff2ae115aeb77f9fdc", - "sha256": "1p392jq76jaqjk12rrnwkk4bmxmgav8bigqvp5a39c6jaw5ybrcd" + "commit": "21912ebc7e1084aa88c9d8b7715e782a3978ed23", + "sha256": "0gdqjh8996hb06bnnyhi94k69mjfrzyfgq00a9s4wwagv28sqmkj" }, "stable": { "version": [ @@ -42571,11 +42710,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20220510, - 944 + 20220721, + 547 ], - "commit": "d9e1f7f766c73115de8ce2815bc249069636c3db", - "sha256": "165xf8sg0sfnw8cvgfpym0jcfkn1dm7skpnvhrl647wmhba175is" + "commit": "d392e8aa7e7c6dd79ce52fb55d78f7acfa443194", + "sha256": "1zwhcqh3zvblmqz7ipm8r4n4qs4rv1myv3xbg5fm4axba46hpa5y" }, "stable": { "version": [ @@ -42672,15 +42811,15 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220614, - 2009 + 20220802, + 1327 ], "deps": [ "project", "transient" ], - "commit": "115e1e39278e2ca32fa032b4d985eb6171935a83", - "sha256": "1akc6xpr3xyb9gn002nrjdwlfgq5spfacyf9m76m6y2f6rn0pwdk" + "commit": "bd3d4ab6d7dffd9f8565af32471dc58aaf5a2214", + "sha256": "1kz8sl1iyrxx5lrfj4rkzm4xcmgvxwkvxdpw37id2jh0d986x0ql" }, "stable": { "version": [ @@ -42762,14 +42901,14 @@ "repo": "emacs-geiser/chicken", "unstable": { "version": [ - 20211204, - 2049 + 20220717, + 1130 ], "deps": [ "geiser" ], - "commit": "79a9ac78f4df7c9ec1f918313c543c116dbb8b70", - "sha256": "19j4ar7900yp2q4i4kdwqj1g0fjywflk6jr2x5n2y3zn7pj7z9nz" + "commit": "a480598b5908c95bc8d3178a48f13e9072a9235b", + "sha256": "0jb0zlg82axp44iy51w7fh96z3pmn2k1idipznhw90hkr3wkiiqw" }, "stable": { "version": [ @@ -42847,14 +42986,14 @@ "repo": "emacs-geiser/guile", "unstable": { "version": [ - 20220323, - 2352 + 20220719, + 143 ], "deps": [ "geiser" ], - "commit": "c641fcc50b6b86ca95743122b5206cdcd475f96e", - "sha256": "18m5ldj4r4c2hxgvv5b4azl90r8az1kn5f3s913h971asyv4wx06" + "commit": "7a4945fbc199ec823da1be7283f6e81f83b2609b", + "sha256": "140kd55qld95fbacvcgk2823l2rh7syj6rplppxcp7yvrji5nkn0" }, "stable": { "version": [ @@ -43152,11 +43291,11 @@ "repo": "matsuyoshi30/germanium-el", "unstable": { "version": [ - 20220116, - 1634 + 20220716, + 1500 ], - "commit": "54c9a56da1e86941f2580d4838fbb6097f22f349", - "sha256": "193ck3641skspdbggx1a5lqy6rq84k0bj3xkznrzgrcfa9iw1mmx" + "commit": "7292aa6870cf8b0acb34a8750da32b44d83cd65c", + "sha256": "029hfzzdpx89ggbcs53l05yk9v6jwschy7vn4w48zifg4svqdva2" } }, { @@ -43167,16 +43306,16 @@ "repo": "thisch/gerrit.el", "unstable": { "version": [ - 20220508, - 704 + 20220809, + 928 ], "deps": [ "dash", "magit", "s" ], - "commit": "2ca9cf999534a94c9aa93b393f30ed373eb2ed86", - "sha256": "1pmjyd9b4b97fvm644gvhlg7jzxsys4kqswrp9rxdlp8w64zxn31" + "commit": "eaedb6a200bf76d5add77e4cb00b8b9fd57fd087", + "sha256": "0ygdfycpipk3g51kmw419b2r5i4240v1i3hk5xjps0ni4x87i26i" } }, { @@ -43295,8 +43434,8 @@ "marshal", "pcache" ], - "commit": "27ccc892e94f7e747e5b879eec71119965d9ed6e", - "sha256": "0biljpqw14kjv0njyrahfdgglaphghva0kpfjhiprfwbd0rmmi1k" + "commit": "9c47468a400a97732a116c598c2cd34fd3a23fa7", + "sha256": "1h4b52dx9914fhavk9z34fc7d92cmzyqxm8g2qyzjgic8hq4a0qb" }, "stable": { "version": [ @@ -43531,11 +43670,11 @@ "repo": "Ambrevar/emacs-gif-screencast", "unstable": { "version": [ - 20210401, - 656 + 20220714, + 1300 ], - "commit": "5517a557a17d8016c9e26b0acb74197550f829b9", - "sha256": "0n0gd4k1c1s8xj7p1yg7irnkaxw9f91jmjp5www5hrwhi3mbmpb8" + "commit": "adec408e6adab2e8e057fe0ad828749f473bfb83", + "sha256": "0vgslz094hr0xavkjn6lx7hw65i032jiwmxl29bdgi9xrshbv87y" }, "stable": { "version": [ @@ -43651,11 +43790,11 @@ "repo": "jwiegley/git-annex-el", "unstable": { "version": [ - 20190625, - 2118 + 20220807, + 1542 ], - "commit": "1324d3f23c534fe79391a2c256bb8803054e383b", - "sha256": "1lfky2nsrlndlbvk6vwbswnvbvkz1sxgg0n3r5q6xykdkjym0lrh" + "commit": "92f2d97c89980d2cea85850353836c68903514a1", + "sha256": "124qa11qzh5174jaidwkllbfzhi1rw9cxfc9px8bkarzqlizsnys" }, "stable": { "version": [ @@ -43834,16 +43973,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220615, - 1159 + 20220803, + 2341 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "acd26dd9f3708602d4c721395d790a4af7937eed", - "sha256": "05xfkk4dssqcf1kgxjlr74nya7nbkjmvqhqj6rmxbq89yb46nim5" + "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", + "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" }, "stable": { "version": [ @@ -43940,8 +44079,8 @@ 20220423, 1704 ], - "commit": "a50672b62a678922b8c0cab95225d520f493439b", - "sha256": "0xywglck2z06vgwf7m7a87plcrxca06pgd4y0iq8asbl046akj0g" + "commit": "315e7924a2683f75bcdd5e1ed032fbf01ac218e5", + "sha256": "1y3fxa951qhwl56vrfqb41dhixqlv6r9l9d5rra8sswcw3hj6g40" }, "stable": { "version": [ @@ -44054,16 +44193,16 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20220402, - 708 + 20220721, + 912 ], "deps": [ "dash", "f", "hydra" ], - "commit": "e7da2b3e3a5a790311431e3263b00df41d335136", - "sha256": "0mm5fbp9x1far97bk7n2y5hmcjbmd3iss9wx7iqh1852b4k4087x" + "commit": "f920916a92fad0c551cd0739e48fc09d8709bd8d", + "sha256": "1ig7xf9f3hs3xh8428fsjrczfhnxzzjjjij2xhgns6m0kwh5j0r3" }, "stable": { "version": [ @@ -44256,10 +44395,10 @@ }, { "ename": "git-timemachine", - "commit": "549ce6acba5c3135b3d8b6fff85845c41642c53b", - "sha256": "1laxdv9iw1z1wnf092231iyzq4mybg3z6q02qvwi38sinscskvgn", + "commit": "8c097ed61b11fe7362b512fe130afe8e0e9939d3", + "sha256": "1np8sqfi1q1vf9pm0vrh1wgwi2rh0c0kc68k22gb1bwczcs21y6k", "fetcher": "git", - "url": "https://codeberg.org/pidu/git-timemachine.git", + "url": "https://codeberg.org/pidu/git-timemachine", "unstable": { "version": [ 20220324, @@ -45312,11 +45451,11 @@ "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ - 20220102, - 1637 + 20220717, + 1224 ], - "commit": "57be3c7addec31e226a5a27aa553e996f9c684e3", - "sha256": "04w11gsg91mvr2bpa70rip8rn6ir9wmgpj6078hlx4dhx0fj7c00" + "commit": "803033e59ba4d9357088716cf9fcd144d3799d2d", + "sha256": "0j334cafq41g3s2s6nfdrfwbhkv5l5dbhv84in0vykpk6cyjycdm" }, "stable": { "version": [ @@ -45823,21 +45962,21 @@ "cl-lib", "go-mode" ], - "commit": "fa2693278637f56759480d2bf203bb8aad107230", - "sha256": "1dy96rgss19pwj3pp39wrm5kk933xbqmk79y6a599mnkiixdyaaz" + "commit": "08aa90d52f0e7d2ad02f961b554e13329672d7cb", + "sha256": "1zdyhjg3crvcw093zw2nv3kzs583i26ba6pbs8jyhqnnysl7llfc" }, "stable": { "version": [ 1, - 5, + 6, 0 ], "deps": [ "cl-lib", "go-mode" ], - "commit": "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2", - "sha256": "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf" + "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", + "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" } }, { @@ -45916,20 +46055,20 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20220114, - 2239 + 20220727, + 115 ], - "commit": "fa2693278637f56759480d2bf203bb8aad107230", - "sha256": "1dy96rgss19pwj3pp39wrm5kk933xbqmk79y6a599mnkiixdyaaz" + "commit": "08aa90d52f0e7d2ad02f961b554e13329672d7cb", + "sha256": "1zdyhjg3crvcw093zw2nv3kzs583i26ba6pbs8jyhqnnysl7llfc" }, "stable": { "version": [ 1, - 5, + 6, 0 ], - "commit": "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2", - "sha256": "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf" + "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", + "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" } }, { @@ -46040,20 +46179,20 @@ "deps": [ "go-mode" ], - "commit": "fa2693278637f56759480d2bf203bb8aad107230", - "sha256": "1dy96rgss19pwj3pp39wrm5kk933xbqmk79y6a599mnkiixdyaaz" + "commit": "08aa90d52f0e7d2ad02f961b554e13329672d7cb", + "sha256": "1zdyhjg3crvcw093zw2nv3kzs583i26ba6pbs8jyhqnnysl7llfc" }, "stable": { "version": [ 1, - 5, + 6, 0 ], "deps": [ "go-mode" ], - "commit": "35f6826e435c3004dabf134d0f2ae2f31ea7b6a2", - "sha256": "1nd2h50yb0493wvf1h7fzplq45rmqn2w7kxpgnlxzhkvq99v8vzf" + "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", + "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" } }, { @@ -46314,24 +46453,6 @@ "sha256": "0kniznqdbaim9llf76zi0cbwpa21xcf07w970hrspffjpzkcadnv" } }, - { - "ename": "goldendict", - "commit": "e86bb7d511a5228c1e87d900993a2747b418bf03", - "sha256": "1hmycq4sv2pkjgqpryv7wd9zy5v4igbfz7d8ap4ah6g2v1r7jdxr", - "fetcher": "git", - "url": "https://repo.or.cz/goldendict.el.git", - "unstable": { - "version": [ - 20220210, - 1401 - ], - "deps": [ - "cl-lib" - ], - "commit": "f3fbe658a8d31dc1bd0ca69e4d2ebaab59e92791", - "sha256": "0x38j3wpyaxggihkw3g1qcf0phfrcic555xyqy3vskhvvf5xgc5v" - } - }, { "ename": "golint", "commit": "34f22d829257456abbc020c006b92da9c7a7860e", @@ -46430,8 +46551,8 @@ 20220210, 1659 ], - "commit": "e8808406eab41dab5dbfbaec0aee620d6c618365", - "sha256": "1136gsyzr59rxfp6qkq8agjbxb612bcda07fl7iv1kigbz1c0ggh" + "commit": "099770e27c0727d3e9489f4c4c5226f5e41affab", + "sha256": "089j2qg88f8ms3mv1mvbz3fc53vdlvavdjh99vvpp8afgn5vrlrz" } }, { @@ -46594,16 +46715,16 @@ "repo": "nlamirault/gotest.el", "unstable": { "version": [ - 20220209, - 1739 + 20220728, + 750 ], "deps": [ "f", "go-mode", "s" ], - "commit": "78be56c0f210224b1e3a7d58239e2a32f8f84bf4", - "sha256": "0xkvw0wy4p8viib2s7anh322lvwm8p30g4hsjr9x0j8sqiq838ds" + "commit": "2ec82dcc70d5f6aa22f66b44f8b537be33bd7903", + "sha256": "0jm4i5axw19451z8m79iv1zqlhqpr8mn4r9mcli5j9hrvb7wczrd" }, "stable": { "version": [ @@ -46727,8 +46848,8 @@ 20190525, 1855 ], - "commit": "7ea191df18ff4774cf1dc568e1726143dd54ea02", - "sha256": "1x8sr1xrarb7s7hxp4wg96ng7hb3li3ahixybkzcisz4ga9iwj8x" + "commit": "6218441a0e644c23e247594aece004e80775d307", + "sha256": "1rhf5llw9k6r05wrr870c2m1d6jalz7xz1rsgl1fp01pb4jwq82i" } }, { @@ -46772,8 +46893,8 @@ "magit-popup", "s" ], - "commit": "87e10dea77313b470dd8cef2a7249db3c9794fbf", - "sha256": "0an2bp3vm6xna884dv8b873yjs8jzxgaxn99cz9gppwhmyvhrvai" + "commit": "f036314826293cb5df72f124a20b175d17e6daa4", + "sha256": "0g1s1rhndb35d9g3p2kbgj6pw022xqijhl61x8k4csgy0fyj1g9b" }, "stable": { "version": [ @@ -47394,6 +47515,21 @@ "sha256": "06rrbwb5ms2m3mhsg1l4hqnn7x379019kkdfm8gys5kxv4mfp22l" } }, + { + "ename": "grey-paper-theme", + "commit": "e8849f6bab76eaeca1aa794b189db622f343fd4f", + "sha256": "0vzqwmprmkw80s88ri2gpzvbfjysv7dviyf81rwd4sq4vs03sk98", + "fetcher": "github", + "repo": "gugod/grey-paper-theme", + "unstable": { + "version": [ + 20220711, + 2241 + ], + "commit": "10e243316000e85a10b49729745ccd4262d21cda", + "sha256": "14hyq5hh4z6lmrh94hc07pdxarw4wy510p55vb7czfmh98z6nl5f" + } + }, { "ename": "greymatters-theme", "commit": "d13621f3033b180d06852d90bd3ebe03276031f5", @@ -47610,26 +47746,26 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20220625, - 1642 + 20220808, + 302 ], "deps": [ "autothemer" ], - "commit": "e88ee445b791b77078ab0be8aa972bfab3078ed0", - "sha256": "0amj785fd2j3xnqb26p363w2hhhn50kw44kfga7wyyljifv3lnjr" + "commit": "9c31dda03e386dbbf7ad206f401528261942fbb3", + "sha256": "108xr16kzfqsvwp07xwas93j6pmpwgsshdlj26l8qkfvqz1fvwj5" }, "stable": { "version": [ 1, - 28, + 29, 0 ], "deps": [ "autothemer" ], - "commit": "69a6ddf6c7e8c84174b94900ba71ddd08ec0237f", - "sha256": "00qq92gp1g55pzm97rh7k0dgxy44pxziridl8kqm4rbpi31r7k9p" + "commit": "5cc7e7354a778d5e9df5ee6850e2fdd8e02851d1", + "sha256": "0ydwr2l3jhqbs3gk5qajirl54vfb8i65qrlzrs04jnsj1pkzq5xa" } }, { @@ -48263,6 +48399,24 @@ "sha256": "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6" } }, + { + "ename": "hammy", + "commit": "a7bc17821460099de343145539629e97150978f7", + "sha256": "17yxydb4fa4fz9lyyj2zmr4r0wdp1slpbwr6h3ddskwhyqy65i5h", + "fetcher": "github", + "repo": "alphapapa/hammy.el", + "unstable": { + "version": [ + 20220808, + 1841 + ], + "deps": [ + "ts" + ], + "commit": "0151ac98064f1b7d2dc542598cc0f6711c065800", + "sha256": "1mimgkfywpr9mqahj4r52sj3dp7p8xnb8wir514c3xc2frbgwkff" + } + }, { "ename": "handle", "commit": "b95fa8694bd49595da9fb56454e6539e76feff97", @@ -48836,28 +48990,28 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220715, - 1758 + 20220807, + 734 ], "deps": [ "helm-core", "popup" ], - "commit": "c451a06123fc90f949b7f734944b80c44033db4f", - "sha256": "1cr78z6m99zyfps5zjfhcrkzk7mggrxwc78wdf7kmpb8yj4hg16k" + "commit": "1d066466feb786f3477f1e6b3278d6af54666177", + "sha256": "0rgwvav867k7y7nx850nzxq14y10bjf1344m8lk8qs9f4kzy2mnh" }, "stable": { "version": [ 3, 8, - 6 + 7 ], "deps": [ "helm-core", "popup" ], - "commit": "99c0362c2bb879df44f224d0add69a7434447d48", - "sha256": "02z5jxjkqspj6f6j2a87l9bzl2b4mh1560bzl8ia72w2vxg15m8z" + "commit": "4ede199d5d1b7050486a0fdeecbbbf49fef31118", + "sha256": "1a8zkp00ahb84ww5072naxwllzbjhi7ccarkk2d7xsykn5lig54c" } }, { @@ -49203,26 +49357,26 @@ "repo": "dragonwasrobot/helm-bitbucket", "unstable": { "version": [ - 20190422, - 1102 + 20220722, + 1538 ], "deps": [ "helm-core" ], - "commit": "c722016622ad019202419cca60c3be3c53e56130", - "sha256": "08i8d6b41n4sq3jb4gvxkiml73am82jzqkqvvdm9mdhibb8x08mx" + "commit": "9d07a274584ad364a2620c6389f86d90502f2640", + "sha256": "1xlzxdslbmhgiv1hd65jihnhfhq00442jh9a43f9cdb7hz42fm92" }, "stable": { "version": [ 0, 1, - 3 + 4 ], "deps": [ "helm-core" ], - "commit": "632495036c4a6ac30e408fc74ee9f209fd5ac429", - "sha256": "0rbgk982jlbqh1rhns3zmndfr3lpw7m2j9z7qylghkll4k8fcjpl" + "commit": "9d07a274584ad364a2620c6389f86d90502f2640", + "sha256": "1xlzxdslbmhgiv1hd65jihnhfhq00442jh9a43f9cdb7hz42fm92" } }, { @@ -49305,8 +49459,8 @@ "bufler", "helm" ], - "commit": "23132ffed65d78c0bf5ab2c4c6385d009db496ec", - "sha256": "15zam24zz4pb4zq20wzp3j31cg87fdwxn4bzn9mrm4q466rbldl7" + "commit": "5e8f02c3a454d6d43c18851023d6ac6ae470c31f", + "sha256": "1m7x5zksjfyh254mvsl9va5jqr76niyf54djjiacnrlpqnn3bf2s" }, "stable": { "version": [ @@ -49742,26 +49896,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220708, - 343 + 20220809, + 1446 ], "deps": [ "async" ], - "commit": "c451a06123fc90f949b7f734944b80c44033db4f", - "sha256": "1cr78z6m99zyfps5zjfhcrkzk7mggrxwc78wdf7kmpb8yj4hg16k" + "commit": "1d066466feb786f3477f1e6b3278d6af54666177", + "sha256": "0rgwvav867k7y7nx850nzxq14y10bjf1344m8lk8qs9f4kzy2mnh" }, "stable": { "version": [ 3, 8, - 6 + 7 ], "deps": [ "async" ], - "commit": "99c0362c2bb879df44f224d0add69a7434447d48", - "sha256": "02z5jxjkqspj6f6j2a87l9bzl2b4mh1560bzl8ia72w2vxg15m8z" + "commit": "4ede199d5d1b7050486a0fdeecbbbf49fef31118", + "sha256": "1a8zkp00ahb84ww5072naxwllzbjhi7ccarkk2d7xsykn5lig54c" } }, { @@ -49824,16 +49978,16 @@ "repo": "danlamanna/helm-ctest", "unstable": { "version": [ - 20191031, - 1435 + 20220721, + 400 ], "deps": [ "dash", "helm-core", "s" ], - "commit": "2a29cfb4ec583da247fa2ae7bac88790b1223e40", - "sha256": "11am95crkf409w3ph17x55v0xx2gy4spb4qc6z5f7vbxgwyaa4a6" + "commit": "48edc9fa862219da34feb423c06c33d8f6d43722", + "sha256": "14n8inbpg4abxnda8x06m5myy2l5ddcmicyl44ycmfaqbk379mih" } }, { @@ -50300,14 +50454,14 @@ "repo": "jcs-elpa/helm-file-preview", "unstable": { "version": [ - 20220716, - 850 + 20220720, + 531 ], "deps": [ "helm" ], - "commit": "b6108fa3f2508087bb2e38085806b7a9d4802884", - "sha256": "07vqdzg9j94rw4vlyr5g0pmqv8knx9nlpa578x1inxlldlyv19a3" + "commit": "c7584ce5e75c7f1b7b31c820fcd30bde4614c663", + "sha256": "0spzwm0g2fq3f8fnr23l2vndlbbwa77s1554fmx7ck14qj7l9jfa" }, "stable": { "version": [ @@ -50499,11 +50653,11 @@ "repo": "chee/helm-frame", "unstable": { "version": [ - 20180604, - 1005 + 20220803, + 1528 ], - "commit": "485e2a534b0de5e8dbeb144a9a60ceca00215a4a", - "sha256": "1hxqyyh8jzk83ppi1p5r9b9gy7k2hanh3xzp129iw9yqpmvwmsnq" + "commit": "1b5e895e9199deeea049010e5fe4de7a338f41f3", + "sha256": "0c7qb16yad5qfv40d419mgf4307mif46733ws1cnwxnhvz4dfxqd" } }, { @@ -50571,8 +50725,8 @@ "flx", "helm" ], - "commit": "8b80a2d371f754c597bdbd30373a38490a2f1499", - "sha256": "0q5lbjhddarm16zhwbxc924k11694rk80vxh80np3j2fyzj4xba9" + "commit": "6098cee7fb274a814e539db85b7a4924d56493e8", + "sha256": "05mr4rxa84bpgkbq6yxjg51rffbcfph7q9377mcy1n1fmfxxm1hk" }, "stable": { "version": [ @@ -51372,14 +51526,14 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20220707, - 1048 + 20220727, + 505 ], "deps": [ "helm" ], - "commit": "bbe111adc204b7dcfa0657e5f56d5b90d2286afd", - "sha256": "1xq2j6ynxjr24gbhqa7224a195skajlkfklg50pvz7bfawml0db0" + "commit": "9d91c25c7d1776d137fd126f241d0272b6e5f90e", + "sha256": "0bxmhi1dr553v1grspig5b16ldwl74dzflf6xqi8kk7wdpk1ir3k" }, "stable": { "version": [ @@ -51850,7 +52004,7 @@ "org-ql", "s" ], - "commit": "98b6049eccc4f3b19700d27a86f22d4428013501", + "commit": "06f1e1be6ff5ef7e2c8c05dc1954bcedcbb6eb0b", "sha256": "0qn3ww9hp08xbmjicd451zcqm3za84wvizjwlzmxi6hqsaxmzpfm" }, "stable": { @@ -51935,14 +52089,14 @@ "repo": "emacs-jp/helm-orgcard", "unstable": { "version": [ - 20151001, - 1524 + 20220721, + 756 ], "deps": [ "helm-core" ], - "commit": "9655ac340d1ccc5f3d1c0f7c49be8dd3556d4d0d", - "sha256": "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3" + "commit": "d58d35627bb1714bb2cb095f696706b6881233ed", + "sha256": "05ah4ha9zg1fzs60hs2zdfnxwy7cbrn35c8r6rrryy59dn40jzxc" }, "stable": { "version": [ @@ -52211,16 +52365,16 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20201217, - 908 + 20220807, + 350 ], "deps": [ "cl-lib", "helm", "projectile" ], - "commit": "58123f14c392021714fc5d23b9f95c7f95ce07f1", - "sha256": "0w8267l136l9ci9b0rz0mshh8wcj7za9izvm64ks17lr8avm2his" + "commit": "6dcc543815984f7f40e99050b1ee3b68a088e160", + "sha256": "0xhf56p3svl9bs2gc2sj1i3k6y3wrcbrrh3jfr09pxziffj0300z" }, "stable": { "version": [ @@ -53171,14 +53325,14 @@ "repo": "akirak/helm-tail", "unstable": { "version": [ - 20181124, - 439 + 20220726, + 947 ], "deps": [ "helm" ], - "commit": "1f5a6355aa3bdb00b9b0bc93db29c17f0d6701e3", - "sha256": "1ad0khw26m22xpdv0iyg5gac92i8m455sznsfh16vxaa98gq0c4q" + "commit": "8dc44a87fa1a52199e43b73b55c8ef8fe8069e79", + "sha256": "1gn3z14md9b20pkjk8gzjajjqdgb3nmnf10ylanlfh7gx5xjig77" } }, { @@ -53219,14 +53373,14 @@ "repo": "emacsorphanage/helm-themes", "unstable": { "version": [ - 20200323, - 712 + 20220721, + 330 ], "deps": [ "helm-core" ], - "commit": "7b39adc0e80e791390f34aab866a963df317c235", - "sha256": "0jllvylilc81gxkdhy4cl0bma8jrkjhj8c1m7vzjdxr3mplnl1sj" + "commit": "12e856c0346fa69d13d941f27bd3cddb3a3deed2", + "sha256": "19wqdf4v8cacfyg709xcmczwbaal32290cbv933wc6ridc5576i7" }, "stable": { "version": [ @@ -53775,11 +53929,11 @@ "repo": "omajid/hgignore-mode", "unstable": { "version": [ - 20210314, - 431 + 20220804, + 1326 ], - "commit": "2c5aa4c238848f5b4f2955afcfb5f21ea513653b", - "sha256": "0jn9rzhrmmv4lf7rdapdjclk6623d1mir2lq3c46428skhzjlph7" + "commit": "c65810347f39904b985187c5e2aaf27b184f3cae", + "sha256": "1nwrkyb2przdw9fam7b6y8jwgd36ma5pggiqf54xy9m6fdn2s8ac" } }, { @@ -53831,8 +53985,8 @@ 20210208, 652 ], - "commit": "b56ae0d5cd5ce3ef24ed13be5103e231c91ef4e2", - "sha256": "0cl84mlgrjwjxgk2kx4930rarxyc6n07lvy54gmb907i4l6flw61" + "commit": "c554f94e6aed2c755ed9e4391f5a090d6289b1ee", + "sha256": "1r3hxs37ak617sig8hl55s9bn71krb84aly3hh6cp1pzrsm39wjb" }, "stable": { "version": [ @@ -54275,11 +54429,11 @@ "repo": "fgeller/highlight-thing.el", "unstable": { "version": [ - 20220626, - 831 + 20220726, + 2237 ], - "commit": "f122a40ef717602937a8e083813395d423963202", - "sha256": "0p01g89b3hxl2mx96mh3masii3zsbh2yih0bkp6a8i8zks3m04is" + "commit": "cdf429c41c13c22d25fe43493cc5d85cc480dba6", + "sha256": "1p3q0s96f2pgmf327zzwx11sdy24im3dy9qv53bk2nb5zysvklzm" } }, { @@ -54538,11 +54692,11 @@ "url": "https://codeberg.org/ideasman42/emacs-hl-block-mode.git", "unstable": { "version": [ - 20220710, - 933 + 20220731, + 2352 ], - "commit": "d3ff25a72269fef466c240388850f076eaf30039", - "sha256": "1kkaiwiknakc1h6fprlvx1hqf1pgjqj3q84p6w1qfw85d6ygl7na" + "commit": "a9e8e8cfd83972a448bdbb0a9967989d0aa1d05a", + "sha256": "0bdn9d28g2nmbxq0jhjrcpxadl18q0z231ciyqw2cvcc60i4n4rq" } }, { @@ -54589,11 +54743,11 @@ "url": "https://codeberg.org/ideasman42/emacs-hl-prog-extra.git", "unstable": { "version": [ - 20220710, - 1157 + 20220731, + 2353 ], - "commit": "286a4916ad4dd764ead07fb17000ad64cbcf11bd", - "sha256": "077yjk1vh47jgfdd2x680maz5mfgmb35rpq98dv6ivdsr7m1p1p9" + "commit": "6d419cc36936f3bb3c9c63a6f77cc88a80b0db9c", + "sha256": "19k1g8g0z9sllqjq2arp2fdcpn9xs8d73d7nx7bn12s1kpa7viv6" } }, { @@ -54940,11 +55094,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20220626, - 1704 + 20220731, + 934 ], - "commit": "a19395aca9eff0e31c51efbbe4c6e16229f3b380", - "sha256": "1hm7nd4736lq118b7626clk4371pd94dg9gvwxyjrpgbrf9qc5mv" + "commit": "5ccab77f7bfb1d4246aa01639e151ec9509c64bb", + "sha256": "0s353mpajdzr76bjj8b1qvfyzmy0kv9lmhwlvbcf8xmd05gi6ifn" } }, { @@ -55541,11 +55695,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20210806, - 1955 + 20220807, + 2029 ], - "commit": "cb784a69e60938efe14b48130558f1bb1af92d3c", - "sha256": "06wibm3xc5mbpq2ha3ssiwczq7c2660dqwkmpbnsqarx2s4v2km5" + "commit": "4b5da51c78b319e16ada6b431bddbacb61d5f2c5", + "sha256": "0l85ng40sqyhgj2qh4cf66gjavl3cwwmd5gcl26p6cqzfsiiyr4w" } }, { @@ -55674,10 +55828,10 @@ }, { "ename": "hyperspace", - "commit": "0696a12acba676015640de63fc6e011128bca71c", - "sha256": "0ya41c9bxvspj81n5209p9b4c9p1i6jcp710n9i9jawpahwpqlkw", - "fetcher": "github", - "repo": "ieure/hyperspace-el", + "commit": "35549e5b484e68235520211081bd3352c219bb05", + "sha256": "034jnslh02cz0laql9nd0jycvalrdy1k2xg0bf1c8sp978qcsdf0", + "fetcher": "git", + "url": "https://codeberg.org/emacs-weirdware/hyperspace", "unstable": { "version": [ 20210603, @@ -55735,6 +55889,21 @@ "sha256": "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm" } }, + { + "ename": "i3bar", + "commit": "85a075fdb9d80d01a04361c5c337623acc2dd83c", + "sha256": "0idgci46hx0m7lj2s7lhg9wj9dlkj18mgpcf5dffk9ql70kzj00d", + "fetcher": "github", + "repo": "Stebalien/i3bar.el", + "unstable": { + "version": [ + 20220808, + 1551 + ], + "commit": "7c182fef33578ae32f945758123601396de227d0", + "sha256": "184jqz9kgfszq00f0p48xm2plzhv3kww22mya0rgmrcfai13dyfm" + } + }, { "ename": "i3wm", "commit": "2e12638554a13ef49ab24da08fe20ed2a53dbd11", @@ -56127,11 +56296,11 @@ "url": "https://codeberg.org/ideasman42/emacs-idle-highlight-mode.git", "unstable": { "version": [ - 20220710, - 709 + 20220731, + 2354 ], - "commit": "dd07a8f465adb76c05d4712d03e093e9fdb79485", - "sha256": "08h274za9wn4rcjz0w2r5a8v4mxx1g3lagajcgjlkg266g4nr6ph" + "commit": "b3eed5553fe8d7b28bd95b5093e4174d859695ca", + "sha256": "1wp6mcj7j7hdwhdg29d6csma2v02g1w5z5kv5aa9lwmb3w7pfdq6" } }, { @@ -57087,14 +57256,14 @@ "repo": "jcs-elpa/impatient-showdown", "unstable": { "version": [ - 20220704, - 652 + 20220730, + 1259 ], "deps": [ "impatient-mode" ], - "commit": "8f3e7ef41ea8fc43a747716a2c84c2708d5d4a2a", - "sha256": "0lhd8msnz6pfvvx29j80db0q0y0gbb80hlmhkvlb7ry5dvbkch3j" + "commit": "501d8eb255022d832bb30178db154d0004eac18c", + "sha256": "0qqg84yyfxc7kb1fxn0kpnsjgi7kphh7cvq9avabl1yiy1s51gq8" }, "stable": { "version": [ @@ -57440,26 +57609,26 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20220715, - 905 + 20220807, + 2113 ], "deps": [ "clojure-mode" ], - "commit": "67b0403aa183d521e36545266100f1f62a34e783", - "sha256": "0446ip809xzyb4n1dz3sm5d90y0lwgvd661h3cjybakpphykzcb4" + "commit": "59a9f0695f3d97a593f8d5ea04b51ea5dcb2718a", + "sha256": "18kj3ds5sl4dmfqrsbvkd9hpwfyn5qh5nyx1bf7sljbcfjgildw2" }, "stable": { "version": [ 3, 2, - 0 + 1 ], "deps": [ "clojure-mode" ], - "commit": "67b0403aa183d521e36545266100f1f62a34e783", - "sha256": "0446ip809xzyb4n1dz3sm5d90y0lwgvd661h3cjybakpphykzcb4" + "commit": "151b20ba9d3ae39b88f91aecbab98bd5a5215f1a", + "sha256": "179k3w67v1sx8dg5fjg6pf2pg9qdg48slbihcax033bm494kydq5" } }, { @@ -57500,20 +57669,20 @@ "repo": "J3RN/inf-elixir", "unstable": { "version": [ - 20211202, - 210 + 20220721, + 1939 ], - "commit": "acb948ca41a862c8c9b3f61ad576dec2c30d0052", - "sha256": "1rlc2sf8r1vzs13fa2kab93m2xr883ckywx1h1an2b4si73y5ddc" + "commit": "5b45f5bd346446d87c629794b3c3e586c3eefd9c", + "sha256": "19h3wxwv4yws2hw03pqw4574dvmywy36zr3rby6bd71sx8ljdbkl" }, "stable": { "version": [ 2, - 1, - 2 + 2, + 0 ], - "commit": "acb948ca41a862c8c9b3f61ad576dec2c30d0052", - "sha256": "1rlc2sf8r1vzs13fa2kab93m2xr883ckywx1h1an2b4si73y5ddc" + "commit": "5b45f5bd346446d87c629794b3c3e586c3eefd9c", + "sha256": "19h3wxwv4yws2hw03pqw4574dvmywy36zr3rby6bd71sx8ljdbkl" } }, { @@ -57539,11 +57708,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20220710, - 959 + 20220804, + 18 ], - "commit": "24bf59caf03db3f24e02ba738df5dab88e57836f", - "sha256": "05sqznzmj4fyvlg5l24fi7bangxn7yh513afhgyhybfhni6nwx60" + "commit": "7dfc779dc6038125c516c7c7746994a54b96e409", + "sha256": "0jfc3slm0yxd7l533x5x575h8f6hzmzkf0iya6g1sdhw6kibs66h" }, "stable": { "version": [ @@ -57891,11 +58060,11 @@ "url": "https://codeberg.org/ideasman42/emacs-theme-inkpot.git", "unstable": { "version": [ - 20220710, - 1022 + 20220731, + 435 ], - "commit": "f4ff574b8a7446205db0eb6b33090ec84c3024da", - "sha256": "1rm21gchjwc39mxf8d3d1pdlbs2wh6lchwmjc3d61s462anl3lp8" + "commit": "a8a09d1c4f9044f89b480fcfec9cc9cd868190e5", + "sha256": "0dd6w7ffhhj2z3p1y2gy14byyvhcd7cfg4bvjzbjfd3xq1zb8g0g" } }, { @@ -60251,8 +60420,8 @@ "repo": "Emiller88/emacs-jest", "unstable": { "version": [ - 20220703, - 1950 + 20220807, + 2243 ], "deps": [ "cl-lib", @@ -60262,8 +60431,8 @@ "projectile", "s" ], - "commit": "398fcd7920dc3e9865574f5228baeaba03d1d297", - "sha256": "0xxv6ghhm6w4r1dr5pcnz8qm7bkk022v11lg71k56v168v55b2p1" + "commit": "c8145635c54bd7df9711000e889753d267afcdc4", + "sha256": "1b6mrr2vjbgmicxfbibysqllgbp09clxszppk9j0284ja6w2avmj" } }, { @@ -60274,11 +60443,11 @@ "repo": "rymndhng/jest-test-mode", "unstable": { "version": [ - 20220131, - 304 + 20220722, + 1947 ], - "commit": "e08326a467ccb1ec9ddf99c1f5d53f55c50e52b4", - "sha256": "1rgi5qwrd9pfz6yqmfgmx2inlxqykq615aay5vi7wajdiss36i3f" + "commit": "3126c5c5c5632da639ea34867a7342d4410d78aa", + "sha256": "16cfikwzysng8wm1ihs5dhv59dx5rz85fx9d57dba87gcs0bsvdf" } }, { @@ -61050,26 +61219,26 @@ "repo": "taku0/json-par", "unstable": { "version": [ - 20220122, - 352 + 20220723, + 829 ], "deps": [ "json-mode" ], - "commit": "962e5a2221136aa07f512834925c381cfeed2d92", - "sha256": "0pxcya18gbgzx772sh68803dbhxpss4smh6ar9vlc87mqwg5cqnk" + "commit": "2c13ad1bc3c2a62141d3312501d2c2012555972b", + "sha256": "1f0aj6dl5f0gjsgkh12rk79akbrrf6whn79jpgmjc0pa22k1v66p" }, "stable": { "version": [ - 2, - 1, + 3, + 0, 0 ], "deps": [ "json-mode" ], - "commit": "2bc383c4f88a111202b4d00303f3345b32e4b8e9", - "sha256": "1k1jv0m6mj772dkjzsy86k528lqljqmffcpz9l2lzrm6q1bqnw43" + "commit": "2c13ad1bc3c2a62141d3312501d2c2012555972b", + "sha256": "1f0aj6dl5f0gjsgkh12rk79akbrrf6whn79jpgmjc0pa22k1v66p" } }, { @@ -61407,8 +61576,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20220523, - 435 + 20220722, + 547 ], "deps": [ "dash", @@ -61418,8 +61587,8 @@ "spinner", "vterm" ], - "commit": "326da9a7d0463ed2727f66dcbd4cb58b517ffe25", - "sha256": "0irspd2j644g1fwai51wwawmq5ni0fpwzby3j4yka2w0pwvqvg6w" + "commit": "d275f8a070431d2ce669a2844a28e5a65ee0c430", + "sha256": "0bzqgwhc2ks3gblbs78hgbyvxqc5qwvq426l3appx1srh52chizz" }, "stable": { "version": [ @@ -61446,14 +61615,14 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20220713, - 216 + 20220720, + 1410 ], "deps": [ "vterm" ], - "commit": "fef0df66e1de1733c4df706d76a4fc29788fe251", - "sha256": "1fk67c3cwv0iz0vkn9jaclvhzdsk3j5w13n51sigxgflhdpbr77h" + "commit": "698ca35da04d99f25c8f075e8342015434f6a662", + "sha256": "0n6nif6vci5dxq1s9vv2awf953pa2g5snpzg61jxbqsv533rn01y" }, "stable": { "version": [ @@ -61887,10 +62056,10 @@ }, { "ename": "kaleidoscope", - "commit": "148d47626879be1608f35827ef82a28274ff4de3", - "sha256": "0nfz207rzpnni7jyzvdvz5lr0zcpzy278a86821cmw8d5l81a3yp", - "fetcher": "github", - "repo": "algernon/kaleidoscope.el", + "commit": "9412301a470716c84fd1f6886ae226f57ba905a3", + "sha256": "00sc2yldir0q2r3jv095dlm757b1vw9ys3aw722sv400x5bvq430", + "fetcher": "git", + "url": "https://git.madhouse-project.org/algernon/kaleidoscope.el", "unstable": { "version": [ 20170808, @@ -62045,14 +62214,14 @@ "repo": "kuanyui/kaomoji.el", "unstable": { "version": [ - 20171227, - 440 + 20220721, + 441 ], "deps": [ "helm-core" ], - "commit": "90a1490743b2a30762f5454c9d9309018eff83dd", - "sha256": "1jc796nyrck3k50x6jb1wsaawk396y4gk87gkwb8yd5qks7ci35q" + "commit": "fba0018a13eba70c2bffc6153dcfee99937fa3d6", + "sha256": "1zmi7q0vsyx5m50f34vr2fhij1id03dkj2l93hlqyz5037wij1ka" } }, { @@ -62846,8 +63015,8 @@ 20210318, 2106 ], - "commit": "a921b58baa9bb4b57025a68557a3630f9c018918", - "sha256": "1a6plr8w6c21lbmlg3jk0ig4xq9bbabf0ys54w4qyxyrqdxf9lhz" + "commit": "714f4935085d4ac0c220fdf7183fb35175f8bcad", + "sha256": "0kmsqg6z490sywvkqmiz13r6cikbzg20rnxhis7xv6swfncq7w6d" }, "stable": { "version": [ @@ -63161,8 +63330,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20220509, - 104 + 20220723, + 1655 ], "deps": [ "dash", @@ -63170,8 +63339,8 @@ "transient", "yaml-mode" ], - "commit": "c45e19a215e8e7df80a61c10ca1fa26dcfd1de35", - "sha256": "03i6iyhiqhi2vxb8qvw99n6h6xg8jnxkazikw6sqnp0flnrgcf7q" + "commit": "161f8f60cfe7f59cacd38127f7fd21b08c516bc3", + "sha256": "18a2fwx3ylq5virxxyrizb00niyvd8hbk4h0hk87wp29blg9qvcs" }, "stable": { "version": [ @@ -63203,8 +63372,8 @@ "evil", "kubel" ], - "commit": "c45e19a215e8e7df80a61c10ca1fa26dcfd1de35", - "sha256": "03i6iyhiqhi2vxb8qvw99n6h6xg8jnxkazikw6sqnp0flnrgcf7q" + "commit": "161f8f60cfe7f59cacd38127f7fd21b08c516bc3", + "sha256": "18a2fwx3ylq5virxxyrizb00niyvd8hbk4h0hk87wp29blg9qvcs" }, "stable": { "version": [ @@ -63337,26 +63506,26 @@ "repo": "emacsfodder/kurecolor", "unstable": { "version": [ - 20220527, - 829 + 20220808, + 1456 ], "deps": [ "s" ], - "commit": "d17a77d9210b3e7b8141d03c04d1898bcab2b876", - "sha256": "0gnh0yzip0238ycprx03147xaclcbmiy4lkp6wqil2waavwrkwbf" + "commit": "e4f4ee32f54c0c71551dbe5e4419d2c2727130bf", + "sha256": "04rck57mri2r0w9i69fyhwql0ka9g8vcicqjz1k9pl7a5lb5f6vc" }, "stable": { "version": [ 1, - 2, - 9 + 3, + 2 ], "deps": [ "s" ], - "commit": "076de3e420210fc479675389acb3fed6ada9c8e0", - "sha256": "0a36bnnyg0ay60kpjwv6s5cl5m3cvygjgq7kfpj8wkjv1gf19q05" + "commit": "2016973e92651f25518e130405155bb8728339e3", + "sha256": "0n6lgh3y6qx8rym74ll1z26cc7hihdxb3qny4ymrcyycywh2kmnq" } }, { @@ -63517,25 +63686,25 @@ }, { "ename": "lacquer", - "commit": "c06360c9aeee408d144f756943a65cf465e41139", - "sha256": "1bi59x2l6xxayr4dqy2bpkfx4gd5sc9ban9dc2hykphvz560qmqn", + "commit": "48f62babdf14d79b3a5530d3df60d4395cfd7c4c", + "sha256": "1xk7qvwc3w7gsbhhhw6k4sr93xdmf9wmd2sz2kgcpp3sqyvm7azw", "fetcher": "github", - "repo": "dingansichKum0/lacquer", + "repo": "zakudriver/lacquer", "unstable": { "version": [ - 20220321, - 720 + 20220809, + 635 ], - "commit": "0d7d09f7fe22fb0241e91228ce44568ed3e3e798", - "sha256": "1xfh4yi5r96vfy0zmr09lkvgzf7v82cs03y3jvflpz75acmbiryh" + "commit": "676919f5fc301451fcfb8553c3f8262a65c36192", + "sha256": "09irbdnw4crpp572hpv29hdcjp31l1a3rvhdz01v1i5hzbq59p9n" }, "stable": { "version": [ 1, 1 ], - "commit": "6609581a58ae9c0124de785b056f4f5bbcec3b61", - "sha256": "12bav2dd0q6b47sxnqfv6ibrhzd6i74wwqz7zvm7lp9s4mpqscsa" + "commit": "71bf9e8464ae240db17204dd2b968260a9c4c305", + "sha256": "1y2vdypmr0bbmfm4xh6ss8r6rq41mpxgkrlrcfmxdlal1qzx93vy" } }, { @@ -63546,11 +63715,11 @@ "repo": "HenryNewcomer/laguna-theme", "unstable": { "version": [ - 20220419, - 1459 + 20220804, + 227 ], - "commit": "48d14ffad6f0ffb4bd60c341e618c47ddbb7a2d8", - "sha256": "0s2pm1ykkg4r39sigbpr5rjqv25dxpiz47jg3j38m2qpihgi03nw" + "commit": "680ab8c936cb1c249b5a6a07976bcc83ef217e25", + "sha256": "02ma47pmjavhfdswz3kp6s5icw93f1v9rkyirn0viz6pcxjn6ksd" } }, { @@ -63584,22 +63753,22 @@ "highlight", "math-symbol-lists" ], - "commit": "2933ac40c75a53b773b421a7069741c5aa07c0a8", - "sha256": "07lcfi4c9jgk285g586zvmlkxhsyn9gwbk6si543qlnm760mlbfk" + "commit": "16644a4d9d0bcdd43c009c597dddb89f6a64a482", + "sha256": "0ji0gq9iww5bic9ggm6jwp59h485p1dwq27jamf25biqdqll0icl" }, "stable": { "version": [ 2, 2, - 0 + 1 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "0476fbec66e99750abe9d60c3aa9cb9a52189bea", - "sha256": "0bpyzm71b1fh48yp73m4vh99c7q4sd69lynkww6c8yrjdqlwbb27" + "commit": "33348d8325916da440a4e96490fd20b0f6d313c5", + "sha256": "0aqqrmg5hj0323412l3qb566j1bcgff39ll7bzy4ghlrz14n6rm7" } }, { @@ -65012,8 +65181,8 @@ 20220209, 755 ], - "commit": "ff6f66193048893cafcde6985c0ac0c78f76a875", - "sha256": "04cl27697wp38h92p2qv3fq4aagai3vr5lq71xzsh363fmy7ls3p" + "commit": "5c772aac623b4216d06de5c73683402fd43f34ed", + "sha256": "1ly7p0503ydx364r2pnvwjwn4r86crmr8xmvlmifnwks79pb45hh" }, "stable": { "version": [ @@ -65033,8 +65202,8 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220704, - 630 + 20220721, + 451 ], "deps": [ "fringe-helper", @@ -65042,8 +65211,8 @@ "indicators", "ov" ], - "commit": "e0fa3c93ff7e422507812b6ac414766fe4d9b1e7", - "sha256": "09jv8zgskljn7bwmr6crm55g6kinfjlndjpzqqhz40z07n4kkpgh" + "commit": "1b2dfa899409f4af2896fce6b9acbe98072abd59", + "sha256": "1xxmvdgqfj3lv33vn4pw3rdrxjmqypf09hh5w1jr69xbyl2ahzzp" }, "stable": { "version": [ @@ -65419,8 +65588,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20220209, - 1138 + 20220804, + 1946 ], "deps": [ "ace-window", @@ -65429,8 +65598,8 @@ "swiper", "zoutline" ], - "commit": "df1b7e614fb0f73646755343e8892ddda310f427", - "sha256": "02pmnn9cqslahnvllqzawp2j5icmb3wgkrk4qrfxjds68jg7pjj4" + "commit": "cdb7d32f2195ca2ed8df237aa6826bbd177b2813", + "sha256": "000f87v26fdy3ydqiisa53xhrnpf8phkjqxr60wyr8s7r6ng69y9" }, "stable": { "version": [ @@ -65576,11 +65745,11 @@ "repo": "publicimageltd/lister", "unstable": { "version": [ - 20220118, - 1322 + 20220802, + 2128 ], - "commit": "51581b53ecf8e68d67a2d85dde539533aa7199ee", - "sha256": "051wd9gnbr702qf3qz7ni8cmc6sxbxmxvlzipf03gga0n2dhrlas" + "commit": "f3e9748b3417184c36e301a381ec20ef4a88e511", + "sha256": "04y51ifjdnkczsvmv70py15p41gc8mhg6f568k3xwdg1791qhwr5" }, "stable": { "version": [ @@ -65897,8 +66066,8 @@ 20220518, 204 ], - "commit": "0f8ff5d19ccfcc4326a4b7aebea2f8981e058c69", - "sha256": "1vd7sxcaksvl08apq9frbwl1gqgnay6jl47rw4axnmdhwmhi1jh1" + "commit": "a700f04e9865cbb6da498681a09d7ea607b3883c", + "sha256": "0wmaxghjq6vmky0spfdgynmpkz748j5q9lx9nlqqylp60gw334nc" }, "stable": { "version": [ @@ -66528,15 +66697,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20220510, - 323 + 20220731, + 202 ], "deps": [ "map", "seq" ], - "commit": "a2dbc79bd33a1d194c4804c1157caf27e67b5066", - "sha256": "0ccwf2sh52689ajpx7zf0kz8win7nclhm70sc08wk44ygazywjfx" + "commit": "10a9be5f0b143dee454bb64d2b5146e4509553d6", + "sha256": "0khsnpr1x834zm453ff8ri2i7kyhgxrn782nkzhc4blk6bjljr5p" }, "stable": { "version": [ @@ -66567,8 +66736,8 @@ "dash", "loopy" ], - "commit": "a2dbc79bd33a1d194c4804c1157caf27e67b5066", - "sha256": "0ccwf2sh52689ajpx7zf0kz8win7nclhm70sc08wk44ygazywjfx" + "commit": "10a9be5f0b143dee454bb64d2b5146e4509553d6", + "sha256": "0khsnpr1x834zm453ff8ri2i7kyhgxrn782nkzhc4blk6bjljr5p" }, "stable": { "version": [ @@ -66667,8 +66836,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220620, - 1516 + 20220717, + 1834 ], "deps": [ "dap-mode", @@ -66678,8 +66847,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "7868b87ab27cf96878ded35c390e15bb5bb588e6", - "sha256": "1p93bg44lz1wh5xap592kjfjvg0m599418qn7ybmbx7j1l68m15v" + "commit": "a312fe8cd941b641216d4654da2e8be82b16d611", + "sha256": "1mmfi32000917vw098ymkbc54f8kr3sap74i6ii51paqg5nmlpbn" }, "stable": { "version": [ @@ -66799,14 +66968,14 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20220307, - 2312 + 20220809, + 2129 ], "deps": [ "lsp-mode" ], - "commit": "daa51072e1718ca075987901fccbbc2357bca1fc", - "sha256": "0d2myk2906j0ngivca1yf4vdi8bfk5pz706nx279bf0pil7irdy0" + "commit": "485c1148ce4d27030bb95b21c7289809294e7d31", + "sha256": "0ygyvam8h59bhx785rwf4hs30d95xk5kb48inr1gs4313qc2lil2" } }, { @@ -67023,14 +67192,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20220704, - 636 + 20220806, + 1456 ], "deps": [ "lsp-mode" ], - "commit": "1e99307a49f88e92afc4245f3ddaa130b355ab3e", - "sha256": "188c3acqk8n54lrpbxq7h9djxwmri75z3r9szd5knfbc8x8crhns" + "commit": "18b0e8608408f9e913d89075e78c2b4e3f69cf1c", + "sha256": "1a0vlcnw7dzaz3ypav7ws5nfs8p8rg7rfjm302fbf8sz167rb2xq" }, "stable": { "version": [ @@ -67055,8 +67224,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20220712, - 1400 + 20220715, + 2128 ], "deps": [ "dap-mode", @@ -67068,8 +67237,8 @@ "scala-mode", "treemacs" ], - "commit": "39cda6e693e5caad27453d10759897822678d573", - "sha256": "1j2vsvzsnqv8kc1x7ni3jimibn032yxxcf2wxx3ii3z0w97qpb3s" + "commit": "097d6021a4ff0eae704cc3074e064c9509c5cafc", + "sha256": "0ari87b4fxb38rldvvasw4bqxmwndqq1yj18jr1rhb42w367qqdx" }, "stable": { "version": [ @@ -67099,8 +67268,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220716, - 814 + 20220808, + 1239 ], "deps": [ "dash", @@ -67110,8 +67279,8 @@ "markdown-mode", "spinner" ], - "commit": "e4cc46d754bd0cd55e67eed56381bd525ee67fa9", - "sha256": "06dvaw4bdw1815nfzhk2vdcfqhgnpha1jb0l100h908qbbjr232m" + "commit": "ece9bcdc01953c794533b734b24931485c0070fb", + "sha256": "11xn75rxlgm9xfwbfb9mdk8snh9rnlvyyncvlb54mc3y7xdqhy9q" }, "stable": { "version": [ @@ -67341,15 +67510,15 @@ "url": "https://codeberg.org/rgherdt/emacs-lsp-scheme", "unstable": { "version": [ - 20220716, - 808 + 20220809, + 2014 ], "deps": [ "f", "lsp-mode" ], - "commit": "16fd04af47fb2168707ed0c455acfcd9c52839f8", - "sha256": "1zd7injh2h02k0z76d7rq4cjaq3krj6jbnnwdna1ngx2vfri16mm" + "commit": "02e56f4c4981bc5497cdd516969206418858a357", + "sha256": "00r2fcyvz94nydhzw41k0y6np7sx0gbcg36riq5fpq8j5zd3ky95" }, "stable": { "version": [ @@ -67387,16 +67556,16 @@ "stable": { "version": [ 0, - 0, - 2 + 1, + 0 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "d2c0ffe736d6cda4cc524f62ac8b5c5c98490c04", - "sha256": "1x6m5j119qa45rqydq9svsrf16s0lw8zivfppzfiikyi405g75yz" + "commit": "a429be2aea7797369a3c751ef54e3554733117be", + "sha256": "11rgfn9sdwxsncc4xrchiqn9dbqi3zirjvbz91kc5rvjv436077b" } }, { @@ -67492,16 +67661,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220714, - 1453 + 20220723, + 1213 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "9a8983d95d823ae62e5f842a4bd433c860131398", - "sha256": "1pd5lvjlmd6zq64py21yi5zxhcza9g5q48ngfivv7fi7pf3vsv00" + "commit": "8d4fa5a14f5b5c6f57bc69f454eba6861ed2ba9f", + "sha256": "1z3gfv6ca1ssyyaggzpaljybzrilh77lzqrixm9napzfv3aa795w" }, "stable": { "version": [ @@ -67526,11 +67695,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20210809, - 1320 + 20220801, + 503 ], - "commit": "5a9bee8d5fc978dc64fcb677167417010321ba65", - "sha256": "1w67k5wlyz9cyxgxka4ffgzszam45dxy4164xalwr16cgyhpnx05" + "commit": "d17a00ca50aee197cd017d573b83367eb241cc44", + "sha256": "0jib46v4g5f6p5whj45fmhr5q0a9472gzp3ys6az13q9qp6y149d" }, "stable": { "version": [ @@ -67725,16 +67894,16 @@ "repo": "SqrtMinusOne/lyrics-fetcher.el", "unstable": { "version": [ - 20220207, - 1326 + 20220717, + 1716 ], "deps": [ "emms", "f", "request" ], - "commit": "06bd0293dfa759df48faefd73be60d43d1febd17", - "sha256": "10lifif5nbbn172l6dyifm00q3ak91bp143ng3p2j5518vah2cb2" + "commit": "a3be34b0153c2c056dc4b55bbc5fbdc2d9f87549", + "sha256": "1nyajjxidp2acsbpkbv4whcph6bmwjn31nii2y87xsj8cdv0wrx7" }, "stable": { "version": [ @@ -67759,14 +67928,14 @@ "repo": "phillord/m-buffer-el", "unstable": { "version": [ - 20170407, - 2141 + 20220719, + 1850 ], "deps": [ "seq" ], - "commit": "8681342aaffa187e5c54945ab91b812965a96d19", - "sha256": "040g7l0r4bxz4ynp4zxy80jsa6x2f48z8rylc41fqxiblasmh0af" + "commit": "ecdc61282155739acd6b03233d5733e1ad57da1b", + "sha256": "06aiz6k751apgjrr3g2jhpdncqaqnxz96yib6csf6qg06vx8777l" }, "stable": { "version": [ @@ -67836,14 +68005,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20220708, - 1127 + 20220808, + 41 ], "deps": [ "transient" ], - "commit": "b88a924e8e1036e6066a81273c38a8da36b5b4c8", - "sha256": "1vx1s9lpmpaxb3xscrkkjn75rn4dnijj42sdqs289j3hczsb1x29" + "commit": "4e5e80721df474d1a4fa8c8ad4123d6435b8b4ac", + "sha256": "1wb56g1xd0avby1hqxk7q71fbdnaxqhaq1gmc8zcxlr3adip4lna" } }, { @@ -68030,8 +68199,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220706, - 148 + 20220806, + 702 ], "deps": [ "compat", @@ -68041,8 +68210,8 @@ "transient", "with-editor" ], - "commit": "acd26dd9f3708602d4c721395d790a4af7937eed", - "sha256": "05xfkk4dssqcf1kgxjlr74nya7nbkjmvqhqj6rmxbq89yb46nim5" + "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", + "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" }, "stable": { "version": [ @@ -68121,14 +68290,14 @@ "url": "https://codeberg.org/ideasman42/emacs-magit-commit-mark.git", "unstable": { "version": [ - 20220708, - 211 + 20220809, + 625 ], "deps": [ "magit" ], - "commit": "c7008bf9fff5e94060a7483ca68d0627d52f4460", - "sha256": "14fd3xz56liah973cm9mmbwp3ml8zs14dpmfbypxs2mcx5nsjbk7" + "commit": "9367f7e4038792073f090b2c881cdbde1ab47f40", + "sha256": "16cn28730q52fwfhv1x9z7ky9qngf4jr761qdn8pxi6b8x92c6xf" } }, { @@ -68408,8 +68577,8 @@ "libgit", "magit" ], - "commit": "acd26dd9f3708602d4c721395d790a4af7937eed", - "sha256": "05xfkk4dssqcf1kgxjlr74nya7nbkjmvqhqj6rmxbq89yb46nim5" + "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", + "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" }, "stable": { "version": [ @@ -68557,15 +68726,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220615, - 1159 + 20220803, + 2341 ], "deps": [ "compat", "dash" ], - "commit": "acd26dd9f3708602d4c721395d790a4af7937eed", - "sha256": "05xfkk4dssqcf1kgxjlr74nya7nbkjmvqhqj6rmxbq89yb46nim5" + "commit": "8a0cc83eff98489d3685b8585afdcebbb47c1393", + "sha256": "0hf3zyxwhknnkgcms5phwf5qrbzjkj5c8kpmynzb9bwr6ba8yf6p" }, "stable": { "version": [ @@ -69343,11 +69512,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220707, - 914 + 20220721, + 1833 ], - "commit": "4fe73f5724d1e7e61b2e0abf4a530d8a2cdadcb8", - "sha256": "0ini275pkw5dy7y6jhrsddaq2z1lb744b8mdlyfssy0hs53abszg" + "commit": "69442c2d9472b665f698f67426cd255f6c0620a3", + "sha256": "088hl9swh8ns4249cb2vapchbynxmy06njb7y4mvj1da493wp6az" }, "stable": { "version": [ @@ -69537,29 +69706,30 @@ "repo": "jasonm23/markdown-soma", "unstable": { "version": [ - 20220716, - 347 + 20220802, + 956 ], "deps": [ "dash", + "f", "s" ], - "commit": "f78ffe4ef3e2f4ce8af818c719148b17acf51097", - "sha256": "1l0dahrd9dlimja1m0l9qxjynpmy27aic0xmn29jgca949c0qj8z" + "commit": "e604b9e4a65bbd2057befbfaebfa73d00bd9826a", + "sha256": "1rz96x42g5cigzhmpvimxh8c9hb576kyzgnnbkd0jbn8ag0aw4zw" }, "stable": { "version": [ 0, - 2, - 0, - 2 + 3, + 1 ], "deps": [ "dash", + "f", "s" ], - "commit": "507ca274e901aca86cdf84b03218dac3df920812", - "sha256": "1skb7dkpn5s2kv114qysj7h7cwff7diqhfzc322wmj5lbwdicxv5" + "commit": "e604b9e4a65bbd2057befbfaebfa73d00bd9826a", + "sha256": "1rz96x42g5cigzhmpvimxh8c9hb576kyzgnnbkd0jbn8ag0aw4zw" } }, { @@ -69738,8 +69908,8 @@ "deps": [ "ht" ], - "commit": "490496d974d03906f784707ecc2e0ac36ed84b96", - "sha256": "13yf61sw5rmqb8dshk1v9j348jkdfqql55dqvs9srb3ypj8b02v9" + "commit": "bc00044d9073482f589aad959e34d563598f682a", + "sha256": "0v5ncg88bghn4rpqw6fnvxpd0276mwn2bh6fpch7s1ibpaj2bsp0" }, "stable": { "version": [ @@ -69792,15 +69962,15 @@ "url": "https://codeberg.org/martianh/mastodon.el", "unstable": { "version": [ - 20220627, - 1644 + 20220808, + 1410 ], "deps": [ "request", "seq" ], - "commit": "04d35c7e28b8f50b47f2b86d5c4765f4f091d2a4", - "sha256": "17d8srxaqwxar9gd768a82q56xlvkkjkx05pzbhj87zdh788vsic" + "commit": "3ff8f250c3a0e0ab0670cf7af72a2607950e4b5e", + "sha256": "1w3mk7y37jw8m69c1vsjx7z0d4qvzsys1022x070dfjxvis1s8r7" }, "stable": { "version": [ @@ -70015,15 +70185,15 @@ "stable": { "version": [ 0, - 7, - 6 + 8, + 1 ], "deps": [ "s", "test-simple" ], - "commit": "8d643a1776523ef1a6e0bff0bb0a390772fcc77d", - "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" + "commit": "1334f44725bd80a265de858d652f3fde4ae401fa", + "sha256": "1h1lqrl3p9qgkicds8v44vdry19g53rya56hdj3cz5q8xj1nisn1" } }, { @@ -70391,16 +70561,16 @@ "repo": "skangas/mentor", "unstable": { "version": [ - 20220113, - 2136 + 20220729, + 1756 ], "deps": [ "async", "seq", "xml-rpc" ], - "commit": "afab3a14a4bfb5117f8e25417fdf151611b3df0b", - "sha256": "0wcmgynshjk9xdiv4y86d5qb7ncxkswim2gp34hkhslhvfmhfh8f" + "commit": "a820c8492392d2e3480845af4f6573c942996de8", + "sha256": "1b3mskakbgb65pf576fxryc92h4ycc85ck371kzm2my9vj6pdh21" }, "stable": { "version": [ @@ -70426,11 +70596,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220715, - 47 + 20220727, + 2104 ], - "commit": "6083e746f7c009b16d2178b7a4eddb309f50d738", - "sha256": "0yapr0aj6yvkfkijnl79nnhqxm5ibhb1z5dqh4kj1h31ng90gry1" + "commit": "7471762ec043fa85a91398b2b5b05859da544200", + "sha256": "1i7smdmryn8irhn2s7gkym3xkmimkvfkqm2cjal0jgb7z6rg3mkj" }, "stable": { "version": [ @@ -70603,14 +70773,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20220715, - 2021 + 20220716, + 1705 ], "deps": [ "f" ], - "commit": "938f8ed7e6deea7c255414ab62d1478afa1ac07b", - "sha256": "1vydm5vfqnqr4m7fvd18pcqwy9jajcxs1d6rrhvg8ba1r06ka91r" + "commit": "a98a9e733b1da1e6a19e68c1db4367bf46283479", + "sha256": "1xhvjng4av3k9n96p3gi0v9i47ya23rz02pwzgp7xxvhflbas4ph" } }, { @@ -70906,8 +71076,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20220521, - 17 + 20220723, + 1800 ], "deps": [ "cider", @@ -70917,8 +71087,8 @@ "projectile", "s" ], - "commit": "ae02f9e3b93730672f2f0a476a4e32bf1a024937", - "sha256": "0j0p3s4n0z873191w8z27p2fl77ybpb958v0wzjdi1alq0rl1bdf" + "commit": "20878c2c059d1302b169f6c0252641a176a3f327", + "sha256": "1lhds8k74rcqqd71j02y4n2ci3sh4xyc6d0475qj8sam3j6f329w" }, "stable": { "version": [ @@ -70937,11 +71107,11 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20210131, - 2152 + 20220806, + 306 ], - "commit": "00f6045b1292d23a0579208521a470d685bdc59f", - "sha256": "05w41l2n7y2xrckx95hxa3m96py42m2wnzw2h1278zzbwpn5w1fm" + "commit": "3cea4223657cdbb32fcb0afc54bb736388dfbd5e", + "sha256": "018spmlvb30x8qxvsr8avbngvcn0qcvzyh5520jwrm0q0yhnvb4x" }, "stable": { "version": [ @@ -71111,11 +71281,11 @@ "repo": "erikbackman/mindre-theme", "unstable": { "version": [ - 20220711, - 2253 + 20220725, + 1404 ], - "commit": "06e7e2401a79425b9c02bb44cb995a8e79077d68", - "sha256": "0rw8m675n7fvk6gplcs72yf63h8ik4x1kpywlq4rwzw5izf58d16" + "commit": "b8a2942524c75aa94505ee05c82ecfb803f04f7f", + "sha256": "0svnmxmr1wip6f6aq6j8mg4w155znmkm8mmk70k4kl92dc9l2f6i" } }, { @@ -71777,11 +71947,11 @@ "repo": "sigma/mocker.el", "unstable": { "version": [ - 20210115, - 157 + 20220727, + 1452 ], - "commit": "5b01b3cc51388faf1ba823683c3600790099c84c", - "sha256": "0nmi6bsbbgcxihjb865bmm2zrirnzi1lq02d6cl1df57k47md4ny" + "commit": "e455599f48bad7d73fd445e70a3acf4b44c2f5c1", + "sha256": "1mdw08rgdfdxwai38ff3c5r884vhw15shrc67x5yh02jfqzbkkfq" }, "stable": { "version": [ @@ -71801,11 +71971,11 @@ "repo": "mrkkrp/modalka", "unstable": { "version": [ - 20210318, - 1748 + 20220802, + 1450 ], - "commit": "3d7f652d06c8e39cfe252ece804868a20730df07", - "sha256": "1ysfr02mc11sfcxngcki74zbyj4sa9mlk4v0liqk2bv1wx2cpdb5" + "commit": "414b3e89937495b36fd8897adc6443eca98df78c", + "sha256": "0x859mslpfqxg38728jf603mgpl4nw9bvx5fdgbjcp9isla7bim0" }, "stable": { "version": [ @@ -71905,11 +72075,11 @@ "url": "https://codeberg.org/ideasman42/emacs-mode-line-idle.git", "unstable": { "version": [ - 20220710, - 702 + 20220731, + 2355 ], - "commit": "4c309f0890bc888f95c8be31bae6fe5a5d4164a9", - "sha256": "1y94dm0nphdsfrsg236zbkxz2gmy788a0926m2imip7b06a09hwk" + "commit": "11877416ef391dffa38eb1433ce2f337405c7ddc", + "sha256": "13vaxj7hy7zp7zy2g5vfgd4mrkhw6r3bi4hfn1h1h2ijf9hln3am" } }, { @@ -72025,20 +72195,20 @@ "url": "https://git.sr.ht/~protesilaos/modus-themes", "unstable": { "version": [ - 20220714, - 1115 + 20220809, + 1644 ], - "commit": "abe2047067fe4be527a1dc0ddca27035e19980ca", - "sha256": "1lyvjrc49s0fnkkavysj0dxgw2178hi95n6776s3a3mxianiygzl" + "commit": "2b0c31b94ddb82307181dcf0078cee2f3c187aec", + "sha256": "14lm9vn2w3nm5iszi2ghsdzw6krf3lp28l91hn2xhijv8364v3pd" }, "stable": { "version": [ 2, - 4, - 1 + 5, + 0 ], - "commit": "467aab71377a6e1476dcab7ab5f2c55d1ffc28fe", - "sha256": "0b4y8dzyc9qwwaf2ngqiwyfcnhwlr49kxhc96laqk20lvjlfsrnx" + "commit": "64f9378a5114399f3a47c9d23136af677c25e513", + "sha256": "0ng85240zabw87ac53xnrlrafp10ns5wn6dgv9d1jxvnq40p7zqz" } }, { @@ -72399,11 +72569,11 @@ "repo": "takaxp/moom", "unstable": { "version": [ - 20210324, - 825 + 20220724, + 808 ], - "commit": "f94cf84138a81212ffe856599834f7824a1b6e95", - "sha256": "0rdvcv8hwrxxbb9s8sfx5331a08kdk28x8chnnq3pj58pxqvagy3" + "commit": "808952a934d0459829422b3417ca23926c1ceabf", + "sha256": "0llkf7f7cq4ydql8ynqvslmnmbkxx7bdpawxm10cv44n1qyv8s7h" }, "stable": { "version": [ @@ -72681,8 +72851,8 @@ 20210306, 1053 ], - "commit": "9da52ff96e9ecc33b38612f17a6e9abb60c81bf0", - "sha256": "04i0wg8y4qchq2mskbcrmqf80svssxbbnkximjsm8ihxkq4w0s13" + "commit": "d1f5657f9b43fdf06852424cfb4f1a6fe2bc5171", + "sha256": "0hwdas1njbf8iy5shhr4ijblq2ksznby83mz8q793qrbfxi1d2dy" }, "stable": { "version": [ @@ -72900,16 +73070,11 @@ "repo": "kljohann/mpv.el", "unstable": { "version": [ - 20211228, - 2043 + 20220801, + 1917 ], - "deps": [ - "cl-lib", - "json", - "org" - ], - "commit": "4fd8baa508dbc1a6b42b4e40292c0dbb0f19c9b9", - "sha256": "03zziy1lcvpf1wq15bsxwy0dhdb2z7rrdcj6srgrmgykz2wf33q7" + "commit": "2e0234bc21a3dcdf12d94d3285475e7f6769d3e8", + "sha256": "0mvzg2wqpycny2dmiyp8jm0fflvll7ay6scvsb9rxgfwimr2vbw5" }, "stable": { "version": [ @@ -73810,17 +73975,25 @@ }, { "ename": "my-repo-pins", - "commit": "597e8b0041643c9945f387e5ad76183434c8e647", - "sha256": "0kq03s7aidhi27nv57wqwiv39v8ywamc89ldxdyqj11i1i179vbn", + "commit": "71668cffda630ca39d6f606ee61fc1dc47d70978", + "sha256": "10kapw38sq850599axqpmkvr4cn6pmqy2r1cw07ks6f423bxrlh9", "fetcher": "github", - "repo": "ninjatrappeur/my-repo-pins", + "repo": "NinjaTrappeur/my-repo-pins", "unstable": { "version": [ - 20220711, - 1300 + 20220726, + 813 ], - "commit": "6ba60541656d6f0088fddab6753ddbde7a5f911c", - "sha256": "1hfsm4hs200mlp1mfxwcwv0xrs99h7yh62yh0g3471b2wvp1g7ax" + "commit": "f460f17c524db2c815966a0b1ffe86ac450d4908", + "sha256": "1ma1fgnka7v03jf0vn0fxn137k0gj4i9c58a34d7gqf6i2j7wajn" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "3a85c415b2fd6c9146de9de6cc99fe5de629cd07", + "sha256": "1ndn17jqlcgp7k7qwli67i23hvbcvgp0jyj967hfisbd553x9964" } }, { @@ -73849,8 +74022,8 @@ 20220715, 615 ], - "commit": "6c35dd44369930b039a37f6174617bb6ab93be27", - "sha256": "04kljxzzja1hb2lr45vik8x7v3l32xmbyl5vq85s0p74qmm5pcxi" + "commit": "de4c0e694ed3e8fcebb1854b5d3fc3f0d98b0767", + "sha256": "043liypx7s8jpk8jgxfprvpgs2wcia4n84dnr2rp25aagr09h58q" }, "stable": { "version": [ @@ -74019,11 +74192,11 @@ "repo": "kenranunderscore/emacs-naga-theme", "unstable": { "version": [ - 20220715, - 1017 + 20220724, + 2023 ], - "commit": "44204a9d0dabe1553c28310f6d2d78f144c08990", - "sha256": "0ba20v82m5sy4ya7aiwldvnsnlkfw71grgfrw4cn5xwz6qihl809" + "commit": "c5ef0baf1d2e95bc613e99700c38a1227cabe187", + "sha256": "133d871a1rrapnkjv5nhll1gc14ih3n045v5brmmr642w97ri9dh" } }, { @@ -74403,11 +74576,11 @@ "repo": "rolandwalker/nav-flash", "unstable": { "version": [ - 20210906, - 1942 + 20220726, + 1117 ], - "commit": "2e31f32085757e1dfdd8ec78e9940fd1c88750de", - "sha256": "0wzk6nqky5zjpds9mmi1dcwn00d3044l7a0giawqycsa4zcybdlk" + "commit": "5d4b48567862f6be0ca973d6b1dca90e4815cb9b", + "sha256": "0l6zamrh3n3416pgr2jhqabldl180zg0n4651g42jn8xcbwg4w6c" }, "stable": { "version": [ @@ -74605,17 +74778,17 @@ 20220514, 2039 ], - "commit": "b290da108cbaa9b9ef4e92d742f14d74c08e6baf", - "sha256": "0i4nm0y49bs20jggqb7gp622jyn652j2llnr1j2jbcbq5ghvavrc" + "commit": "77f33fc765decce01d5ad7905e908ccbf2233307", + "sha256": "1cz04p6lh4wrr8b8f09qfp98mghvzw9bbabd73xqhiyzx969948c" }, "stable": { "version": [ 0, - 0, - 33 + 1, + 43 ], - "commit": "b290da108cbaa9b9ef4e92d742f14d74c08e6baf", - "sha256": "0i4nm0y49bs20jggqb7gp622jyn652j2llnr1j2jbcbq5ghvavrc" + "commit": "fb9b9a0a432089b5c93868b45e898646ce74504e", + "sha256": "0j5y07aswcjix4ijbh4qnvm4djsh97c54k11qzb3ldkw0kn053x0" } }, { @@ -74823,8 +74996,8 @@ "repo": "felko/neuron-mode", "unstable": { "version": [ - 20210227, - 1737 + 20220718, + 827 ], "deps": [ "company", @@ -74832,8 +75005,8 @@ "markdown-mode", "s" ], - "commit": "a968a923aad07ab15fb35deb79ac95581a427b4c", - "sha256": "1mb55bbsb32gxms488pjw9fsqiic2qfmwkhm3pwcgy194723vcaa" + "commit": "33bc73f9a2ef1c6855bb12fec08e15a8cf4a6c6e", + "sha256": "0pkwnrqyf1h6cdrkh1351qmds9pzr3rka3d8gyf5h3k9prg67rfl" }, "stable": { "version": [ @@ -75243,15 +75416,15 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20220505, - 1706 + 20220719, + 505 ], "deps": [ "magit-section", "transient" ], - "commit": "8fe2ccf0b01f694a77d2528e06c10f06057784f6", - "sha256": "08kz9qp4gp55z1i87ig0ysq6pgqgwlgr765g1vp8gsh6lp3myh36" + "commit": "b3f71c75f7d43a32e7cbc632e9be80f2a03788d4", + "sha256": "14vcjjyvjdxpzrcd6arq6lrjqgmbbsibx73h0v34fdzfpi4wfx08" }, "stable": { "version": [ @@ -75305,11 +75478,11 @@ "repo": "jwiegley/nix-update-el", "unstable": { "version": [ - 20190124, - 1935 + 20220809, + 412 ], - "commit": "fc6c39c2da3fcfa62f4796816c084a6389c8b6e7", - "sha256": "01cpl4w49m5dfkx7l8g1q183s341iz6vkjv2q4fbx93avd7msjgi" + "commit": "1dd1434a2fcc054ad0046cca0563a292e890d59b", + "sha256": "10h6q8j6p9pvhja6ldpbh1s57lq0wpzy11wcbqknsyv0wpbrcpwk" } }, { @@ -75585,15 +75758,16 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20220711, - 445 + 20220803, + 1427 ], "deps": [ + "kv", "request", "s" ], - "commit": "c7e42920c2db19428c1b30402aaf99bd65bcac7e", - "sha256": "1fabx74caj6q5a5hhw5yyg68j415qhadarliwfp2n071pf4dickw" + "commit": "beacb05f7298228dce4d494fb41c73d26991e15c", + "sha256": "1ak7c2qy80idk1izs3xjw7nlsd9hjvig5qxqf1bwmiqrrdbcqsgs" } }, { @@ -75882,11 +76056,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220714, - 1551 + 20220807, + 1005 ], - "commit": "349987668ae1da3ee30cdbe3a4acc11bb2219e0d", - "sha256": "0hgzzq0wc9l2kd4cxdmn3ssin635m2ag8dg37fqps996cfsddw0a" + "commit": "6d6d2a5fe7a04cc8de43d6b27844c50f02d749ed", + "sha256": "0rv19isfggcxzwd7d071i1rh4mix4hf7bnj21w20c6kvryfpfr2b" }, "stable": { "version": [ @@ -76057,14 +76231,14 @@ "url": "https://depp.brause.cc/nov.el.git", "unstable": { "version": [ - 20220428, - 1417 + 20220805, + 2031 ], "deps": [ "esxml" ], - "commit": "8f5b42e9d9f304b422c1a7918b43ee323a7d3532", - "sha256": "0xnzwmv44pfqrh7rhqw8v6rd39kshxfah6d9fxrrbv33vlqy8kpl" + "commit": "cb5f45cbcfbcf263cdeb2d263eb15edefc8b07cb", + "sha256": "1fm65d39505kcgqaxnr5nkdilan45gpb1148m15d7gc5806n0sdz" }, "stable": { "version": [ @@ -77069,8 +77243,8 @@ "deps": [ "frimacs" ], - "commit": "978665a47314f385850097442a3838ad7f3b688d", - "sha256": "1bvjk3g0rcjxn4anwvkd72r4phd534md350h1ryxr0frvgrpkcd1" + "commit": "b35fdefb60ead4d7559131601c43761973762a9a", + "sha256": "034x3b471xfn1ih95az59h34ad2qvb9qpav29ng5z0ry2hqcq0za" } }, { @@ -77978,6 +78152,46 @@ "sha256": "00w5by87igi5l72xqkg6dn5zh7rk1lxc9p6m0c885ylp9giwalqj" } }, + { + "ename": "obsidian", + "commit": "2c2a69a670206a4f06f69654278026564de6d5cd", + "sha256": "0v3fc7pcgpdbpmcp6fp3lwc581jrr19agw2lnx8v72ca260vrvi2", + "fetcher": "github", + "repo": "licht1stein/obsidian.el", + "unstable": { + "version": [ + 20220808, + 2351 + ], + "deps": [ + "company", + "dash", + "elgrep", + "markdown-mode", + "org", + "s" + ], + "commit": "49b4712b407a3542bbba50d3f74e1bb45025e255", + "sha256": "1x9y6mq72f3p53fcp6p2jv48xjph1i704d7q46gn1hvxbpryvhzz" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "company", + "dash", + "elgrep", + "markdown-mode", + "org", + "s" + ], + "commit": "ef5f4174acdc8c6ef38707103f2a05223ad4481b", + "sha256": "1l88ixp3nyi7j4302pdkgi02vmyqm7amk46cz5pkwh8lf74pk9jc" + } + }, { "ename": "obsidian-theme", "commit": "e90227252eb69d3eac81f5a6bd5e3a582d33f335", @@ -78004,17 +78218,17 @@ 20220707, 751 ], - "commit": "fd908d7b21a88c0f1cd6e9acdd50e83076b3fd17", - "sha256": "0mdwmxv48v67nn4zjljvps18w8snhiddvlzh2jx1g9gs6fdamc4v" + "commit": "9cbd8150c28f70ba6315c347a833a4ac8c85c481", + "sha256": "071fsdl67c0wis521i2w7mw85ijavxc7c458minanwqamabjvsck" }, "stable": { "version": [ 0, 24, - 0 + 1 ], - "commit": "fd908d7b21a88c0f1cd6e9acdd50e83076b3fd17", - "sha256": "0mdwmxv48v67nn4zjljvps18w8snhiddvlzh2jx1g9gs6fdamc4v" + "commit": "86938aa4435b251af1a3b081f7fbed90f982cf62", + "sha256": "0y1j5mwwrliy6a78cmpi6j8gw425shghqg9ylyl3qw5fx4b088pp" } }, { @@ -78198,26 +78412,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20220706, - 1759 + 20220804, + 1019 ], "deps": [ "org-re-reveal" ], - "commit": "f25b51fc4370fedaebb52d82ff72a597bf44ccc4", - "sha256": "1d5v2wmvfgffi6jmkz8mkfy547d5amis64i756cah0kv2km6zdw6" + "commit": "099a6b85097bcd7830cd8919030d7f2d8b8b06ff", + "sha256": "09pk03njc4mk7r0brccch6ajnz182gxxh5d78yiqx4d5kgjj39pm" }, "stable": { "version": [ 4, - 5, + 7, 0 ], "deps": [ "org-re-reveal" ], - "commit": "48884ade629af4c366092e68f08dd5cb626cfaa4", - "sha256": "1d5v2wmvfgffi6jmkz8mkfy547d5amis64i756cah0kv2km6zdw6" + "commit": "099a6b85097bcd7830cd8919030d7f2d8b8b06ff", + "sha256": "09pk03njc4mk7r0brccch6ajnz182gxxh5d78yiqx4d5kgjj39pm" } }, { @@ -79051,15 +79265,15 @@ "repo": "spegoraro/org-alert", "unstable": { "version": [ - 20210922, - 125 + 20220721, + 1721 ], "deps": [ "alert", "org" ], - "commit": "c039d0121d21e4558c0f5433135c839679b556d7", - "sha256": "0xalf5bbawnxm61askvldg2g93gvf6i1bpxqk55bglnl2cdq6g2i" + "commit": "f1801e061722843329b95409957c7dbd5cc223e9", + "sha256": "0k8rc820s57rxb74xzk6w838887x3swbvaya3k7xfkwm6yshfg6z" }, "stable": { "version": [ @@ -79225,14 +79439,14 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20220715, - 329 + 20220809, + 1711 ], "deps": [ "async" ], - "commit": "bce665c79fc29f1e80f1eae7db7e91c56b0788fc", - "sha256": "0gj3sqzg5zzqb84vbf08wyqkynyz0zzs4hy5q83zgz02mwwjbv01" + "commit": "69c4aa39f33c157f124db81050928838aee54704", + "sha256": "04i7clcsalq56raw356cn5fis5ghc3dlcrmvs375pd6gwv85rlks" }, "stable": { "version": [ @@ -79357,23 +79571,22 @@ "repo": "alphapapa/org-bookmark-heading", "unstable": { "version": [ - 20200103, - 514 + 20220805, + 2357 ], - "deps": [ - "f" - ], - "commit": "38a2813f72ff65f3ae91e2ebb23e0bbb42a8d1df", - "sha256": "09rfp0zf68gnhiwh61wc10kgqk75ypkbk0hawrw1rhida1bi2wb1" + "commit": "fac3edac3b70a00f5412e3e7e2830a5cfee84432", + "sha256": "1wr442hqiih6ygcwcww1k56fkw5afn5rlcd49hs4qwqg4cchvgc0" }, "stable": { "version": [ 1, - 0, - 0 + 1 ], - "commit": "70b014e09977371a8c9bad03085c116693062b19", - "sha256": "0j765rb2yfwnc0ri53jb8d6lxj6knpmy495bk3sd63492kdrxf93" + "deps": [ + "f" + ], + "commit": "d71c6c96b878fb5d57fea0200a8c19e8d897b857", + "sha256": "0d5w8a3j1mkds9513v659flmq0ci178qd8wynz56wvcz3sqqw4h3" } }, { @@ -80195,8 +80408,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20220708, - 611 + 20220809, + 1955 ], "deps": [ "alert", @@ -80205,8 +80418,8 @@ "request", "request-deferred" ], - "commit": "396a30cf256c8b32a69fd73a081364937b43a1c7", - "sha256": "19d6v06bks41anyisv4sjlsbw4yndi51ccn6hr767y9wyhn1337l" + "commit": "40291bec0cd0bf8a2f5db656e4d3077b256092ae", + "sha256": "00ais9k2qc9ib7ihh38hwz3gmkn9zcb2x5n7x8cllhdq8zmy00a6" }, "stable": { "version": [ @@ -80439,16 +80652,16 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20220228, - 1651 + 20220801, + 928 ], "deps": [ "dash", "org", "s" ], - "commit": "9671cf059b681fac39ce910dd8847b5c7bfad170", - "sha256": "1zygrmihzdsciqnm5kl3j4wgmm796q8ppv7nvgn3d8rv6xky5mx3" + "commit": "9ca02c4e7a38c788b70a1f5364ab505695335bd3", + "sha256": "0j7c775vx9a25qh3485xlnd3j070cq4d9yyrlq1d6j5r6i5iwhjj" }, "stable": { "version": [ @@ -80551,30 +80764,30 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20220702, - 709 + 20220725, + 1808 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "97e9535e0f9410dc92eab4330dff061bfde00155", - "sha256": "0awfz4c70pxfj401p4h4j1lxic4pqpgigkldy9wvdkcyhqbphswj" + "commit": "93629335727d855e8795470e78282c9dc532c839", + "sha256": "050sf6i8y28hl0d90y0hr4p5gzmsf3v728ghrj7y0hfvq0r3bhwj" }, "stable": { "version": [ 4, - 3, - 2 + 4, + 0 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "df45be17fb66490f625b60c99d9954e614885101", - "sha256": "1hsfkkm3ykdf7n8a6k0mpzilhjpy7vllwrl2s4rfb9mhnaq5yb8y" + "commit": "9510f2010750c5c74b6c1be7e06939afd64aa39b", + "sha256": "1s91l4ibjvvc7rfvd8gldxqrcgjq00q83fdww217ck2ps5yrzyjl" } }, { @@ -80630,21 +80843,21 @@ "repo": "SqrtMinusOne/org-journal-tags", "unstable": { "version": [ - 20220416, - 1507 + 20220805, + 1001 ], "deps": [ "magit-section", "org-journal", "transient" ], - "commit": "ca6327161f4994ea0e98d7c6c3f662222e2650bf", - "sha256": "1pg7wxjlhbh3fls17zgh9wdzk0mjc3sfi873207kc5rcd4araq89" + "commit": "66b4dcd6084242008a430aedb27e5834671b5f99", + "sha256": "1l352pqpmhld74qgkzq9i6inkppgiy145cmr0zyjk0803gry0g67" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ @@ -80652,8 +80865,8 @@ "org-journal", "transient" ], - "commit": "ca6327161f4994ea0e98d7c6c3f662222e2650bf", - "sha256": "1pg7wxjlhbh3fls17zgh9wdzk0mjc3sfi873207kc5rcd4araq89" + "commit": "d2375f42c80799ad7fb2324247315169bedc4c19", + "sha256": "0i0gvah8pvlksi2ph9hl09plk6ddvqsvklzx5z0yfpamh870077k" } }, { @@ -80664,30 +80877,30 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20220510, - 2150 + 20220723, + 1216 ], "deps": [ "dash", "org", "s" ], - "commit": "1d3234359fa52fce5ac1006e2c51f14c760d275e", - "sha256": "1kvmr1sz3jcd4wc4gybazpigb9yv5wl246axbr7z4m6wjiq0k5nv" + "commit": "e78deb03880ae89d6bceae6563ef1383526233a1", + "sha256": "006y8glnd3h5nmcb0fdq650xnknhi5n74v7adk1maf26r8rpc6vy" }, "stable": { "version": [ 0, 6, - 4 + 5 ], "deps": [ "dash", "org", "s" ], - "commit": "1d3234359fa52fce5ac1006e2c51f14c760d275e", - "sha256": "1kvmr1sz3jcd4wc4gybazpigb9yv5wl246axbr7z4m6wjiq0k5nv" + "commit": "e78deb03880ae89d6bceae6563ef1383526233a1", + "sha256": "006y8glnd3h5nmcb0fdq650xnknhi5n74v7adk1maf26r8rpc6vy" } }, { @@ -80890,11 +81103,11 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20220521, - 1422 + 20220722, + 242 ], - "commit": "cf96f585c68ad14751a3f73d937cbfcb890171b9", - "sha256": "17380kpf08j5ai30nn5iks0k3x8sm3kmz8lkyr1v0qvpr5a8s70b" + "commit": "5c19b458f8dbd61f8a40c8b94ba843833ba90a77", + "sha256": "0j8h9wqk0ca551ynfx9wliy92ddhgiq4gw8idhq4l1lkdykpnb11" }, "stable": { "version": [ @@ -80985,11 +81198,11 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20220625, - 1302 + 20220730, + 827 ], - "commit": "239c02aa99dc52755edf38d5e9c9e986683c4249", - "sha256": "0d6871y4n4mz4h13lx9a2q2jyx8gpii0fal9s6rjflx3wnld8fsn" + "commit": "c82b50a61d04571e11c242fb91944753d8bf945c", + "sha256": "0x6i69balwp5gzalgfcnb0m6gz78ca6vdj7qlx354awnxsd70nhz" }, "stable": { "version": [ @@ -81063,14 +81276,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20220331, - 1707 + 20220809, + 1736 ], "deps": [ "htmlize" ], - "commit": "60e22e446325a9b3387396459d98be7c1c52579d", - "sha256": "077g7gvn1k6i2x4m2kd3dkrznc89f5a5pd916wsmpy703pv0aca5" + "commit": "e0174324ac37a63ed36869c7632dd7139f1b2419", + "sha256": "1ks5hcadgzaa81ii71flnna8kbchk8x3kf7dz3h31yk95hx3jjf8" } }, { @@ -81457,23 +81670,23 @@ "repo": "rlister/org-present", "unstable": { "version": [ - 20220108, - 1802 + 20220806, + 1847 ], "deps": [ "org" ], - "commit": "c0f1f36b2384b58b00a2000f2e30895a6230bb6b", - "sha256": "0rjaxg6ha5r8bj7ry63g1mnz0bk57738k9hbq7y30l3l77ab1mkg" + "commit": "4ec04e1b77dea76d7c30066ccf3200d2e0b7bee9", + "sha256": "0bcrgwc80968zx52lwg71cs7v2yrygynzbnrakxdja1l5a6h3xy6" } }, { "ename": "org-present-remote", - "commit": "66b092084565634cac8dd07b7b1694d0ddb236ba", - "sha256": "06xxxa8hxfxx47bs6wxi8nbgqc8nm82c3h0yv1ddlm35qfscggks", + "commit": "f95c49abe614778010041269c05db8de0ad81966", + "sha256": "0nlcj1bxp4a22hjq408201gdlny629cb3ifcvx9rfd4j79xixjrj", "error": "Not in archive", - "fetcher": "gitlab", - "repo": "duncan-bayne/org-present-remote" + "fetcher": "git", + "url": "https://git.sr.ht/~duncan-bayne/org-present-remote" }, { "ename": "org-pretty-tags", @@ -81507,14 +81720,14 @@ "repo": "jakebox/org-preview-html", "unstable": { "version": [ - 20220713, - 151 + 20220809, + 1033 ], "deps": [ "org" ], - "commit": "220d7ea93945581a9ab9fa7b43c67070bb5680a4", - "sha256": "15z6hijfg28p5siz9iqyknpfs77j5c9hvmxmmdhazisb99v0iq0k" + "commit": "785e1f5c99c0f2d76a9a6611a06b4552a343e221", + "sha256": "113nzbwpirbzbff6193rmn2ardzs9bi9if6b9l4qz7aa42ff4zr7" } }, { @@ -81619,8 +81832,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20220715, - 1850 + 20220718, + 1844 ], "deps": [ "dash", @@ -81634,7 +81847,7 @@ "transient", "ts" ], - "commit": "98b6049eccc4f3b19700d27a86f22d4428013501", + "commit": "06f1e1be6ff5ef7e2c8c05dc1954bcedcbb6eb0b", "sha256": "0qn3ww9hp08xbmjicd451zcqm3za84wvizjwlzmxi6hqsaxmzpfm" }, "stable": { @@ -81735,28 +81948,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20220622, - 642 + 20220808, + 734 ], "deps": [ "htmlize", "org" ], - "commit": "f184e66e398e1cfdfd55894c67392805ae531a39", - "sha256": "180dn5iywarljbmx8lm61y30n2d800kg96psrvc8ghfglnvp6964" + "commit": "6f78a0a2287e7eecd4d22aebdb597ebadcc3eab3", + "sha256": "0mn7qn80289gizvnxyjjs00b7qmlf0692kai7qgzgfj6i87pjc38" }, "stable": { "version": [ 3, - 14, - 1 + 15, + 0 ], "deps": [ "htmlize", "org" ], - "commit": "f184e66e398e1cfdfd55894c67392805ae531a39", - "sha256": "180dn5iywarljbmx8lm61y30n2d800kg96psrvc8ghfglnvp6964" + "commit": "6f78a0a2287e7eecd4d22aebdb597ebadcc3eab3", + "sha256": "0mn7qn80289gizvnxyjjs00b7qmlf0692kai7qgzgfj6i87pjc38" } }, { @@ -81911,8 +82124,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220715, - 1202 + 20220808, + 1445 ], "deps": [ "avy", @@ -81927,8 +82140,8 @@ "parsebib", "s" ], - "commit": "ebe3bb6f58350ac10da73e583d3ad1078f0690e2", - "sha256": "03z215lmca2xcsfcdb1vfhnhdh178rm0hfbhp89qpxa3hrmx92i5" + "commit": "4c9128f8cff3f5393efecf9c7547c630331a0299", + "sha256": "10kmkwyrfklzllgq5a5j5531whsjlq2mba2mh1cd14fvha5dwvd9" }, "stable": { "version": [ @@ -82004,28 +82217,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220702, - 511 + 20220731, + 1246 ], "deps": [ "dash", "org" ], - "commit": "bd8bc9b4c15783debcec132c79835e37b03626c8", - "sha256": "004nhqkcv6a9gcnxpkmpr15bzzrx7nn376cbcsxryzyz3z13lx31" + "commit": "e53d0fde875d137eeb03eddd6b50d3c827f9947f", + "sha256": "1syksy6c914d1z57zjiyqfmfpi6lpw2nfyw321mc4fr3m2l8wzzv" }, "stable": { "version": [ 0, 3, - 12 + 13 ], "deps": [ "dash", "org" ], - "commit": "bd8bc9b4c15783debcec132c79835e37b03626c8", - "sha256": "004nhqkcv6a9gcnxpkmpr15bzzrx7nn376cbcsxryzyz3z13lx31" + "commit": "e53d0fde875d137eeb03eddd6b50d3c827f9947f", + "sha256": "1syksy6c914d1z57zjiyqfmfpi6lpw2nfyw321mc4fr3m2l8wzzv" } }, { @@ -82075,8 +82288,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220621, - 527 + 20220804, + 437 ], "deps": [ "dash", @@ -82085,8 +82298,8 @@ "magit-section", "org" ], - "commit": "c3867619147175faf89ed8f3e90a1e67a4fd9655", - "sha256": "18a1sx3z9gvg32kqhg760351nf9w4d81jnzl6y9izsb5p539iqpp" + "commit": "7f453f3fffb924ca4ae3f8d34cabc03fbcae0127", + "sha256": "10a7f10wfvpcyvjha6rwgpxz20qf045fsmbw8649f75hf1vjg0ny" }, "stable": { "version": [ @@ -82139,10 +82352,10 @@ }, { "ename": "org-roam-timestamps", - "commit": "5141a8f5505427e8d5cb898015587972c2eb2f34", - "sha256": "060sjq9icpabdvi5dz0im7acdc8k21iprhpa6mga6zynpqhshsjs", + "commit": "817320c7a52e78f89746694b62fead6260175c3f", + "sha256": "17yi95pdfk9z1zhiz8338mjpvbh7n0pfbdw7i50i5b3gifl2sfnh", "fetcher": "github", - "repo": "ThomasFKJorna/org-roam-timestamps", + "repo": "tefkah/org-roam-timestamps", "unstable": { "version": [ 20220111, @@ -82163,16 +82376,16 @@ "repo": "org-roam/org-roam-ui", "unstable": { "version": [ - 20220713, - 1144 + 20220803, + 1024 ], "deps": [ "org-roam", "simple-httpd", "websocket" ], - "commit": "2cd93bfa517d51b4c97d42817713ca5ce61cb0df", - "sha256": "10p9fyk4y5qsg06y2mw0lacjpf1kkjgwrvc8cjcj4xcyka2lz9jf" + "commit": "c75fc7506ee7f03840a9a93ed9336d7ed24551aa", + "sha256": "0mkcd2622np8s5qz2zvx7lch6dc586xqmn6914gi4ym7nvklf3zy" } }, { @@ -82730,15 +82943,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220712, - 123 + 20220723, + 758 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "7a6aec1b28416fb4bdda5611f1ca30c77d18a854", - "sha256": "0c40c2g80jy9yw93ahjkm43hfjrv29hkpspx72yfzmnynkv49bg6" + "commit": "b9c6ffcc206ffaeafbe6e3ef9561ce6a8e0f30ad", + "sha256": "1apxxhjmz04myl99fm88la941n69a5sw6pkcxaz7svga1cnpdj9l" } }, { @@ -83330,14 +83543,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20220503, - 1357 + 20220727, + 859 ], "deps": [ "org" ], - "commit": "9eb18ecd93895a9894970fa85b68257da647812d", - "sha256": "0nmbbrw36bkxygh5pllfa9i1z20b0wzrax7bcz049syjkfl3l621" + "commit": "edba7bcfdc054ad0ff1952bb525f5709a687db25", + "sha256": "06rb7frgw1vja7azsd9cxzkbvlr7xpzapgqypsc777szncz06xhi" }, "stable": { "version": [ @@ -83754,8 +83967,8 @@ 20220715, 16 ], - "commit": "f4df67e94926f9d389f4a456a9cbf721c9b22b89", - "sha256": "1jcqkk3rpw128a0x5cwwwkpfj9q2ypzjg1ck49lhadlf09y4bqm8" + "commit": "9fba876c51d070832e15c888bf81609c4145f233", + "sha256": "0pck6pgyr55xf8g0kwrshal7jm64nxclhdm9ys8wx6vi7mvdqnb7" }, "stable": { "version": [ @@ -83774,11 +83987,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20220127, - 1502 + 20220726, + 1241 ], - "commit": "36d7aec5549655174467db45d1dba6647b9e19b1", - "sha256": "0cg8rxl8wrcgm910jm0m61wbxk5i9f8cxcb289p7ip5bjbijmic9" + "commit": "cfdddd6700c7c0e8850aecfaae6f0bb4345ea5d0", + "sha256": "047ys7qlg7s35drp5izz13gknri2hbsms2f57kf76w2qlp6i5ijv" } }, { @@ -83804,14 +84017,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20220127, - 1516 + 20220726, + 1235 ], "deps": [ "cl-lib" ], - "commit": "f5254db6ae78e30c2786c53991e98e86ed344ac6", - "sha256": "1l63bcvlnqnj5z10cyanybc5jz9yimf53vffycf9wbsph5lpfs12" + "commit": "4b09436de15545ce73dd40e938176a98254109f8", + "sha256": "0k7z3d24k4nqz13xj0a7l79idar3kdl022r4jm3f9hjkxlddsbfk" } }, { @@ -83973,8 +84186,8 @@ 20220702, 2218 ], - "commit": "1c5e825fbec4c22ae3a649dec84d51803768b44a", - "sha256": "0p19vcv32pm27vxm33gdggzggac5hb0ji75fhs4g5va69kv1nxyw" + "commit": "808baabecd9882736b240e6ea9344047aeb669e2", + "sha256": "13kd3zf6vbhsrnrcxwjpk5nk69869ph57wfj7y58asdkdk7ks0lx" }, "stable": { "version": [ @@ -84048,14 +84261,14 @@ "repo": "xuchunyang/osx-dictionary.el", "unstable": { "version": [ - 20210703, - 1152 + 20220801, + 1542 ], "deps": [ "cl-lib" ], - "commit": "1a4479d9f44ef1e6e5f7643c172c32f6fe6cce21", - "sha256": "1714bh7gx1limy8zs1sbxyr9an7gj7viq8sf4cr6wnxz44v237fb" + "commit": "0715e5a3ac659df32a0f0fabfbbeef0228fbd9a9", + "sha256": "0q4swp25bp0q2aqr8d8wszhcwy738m1brbv52r6hj787pg4wjhvl" }, "stable": { "version": [ @@ -84249,14 +84462,14 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20220613, - 1341 + 20220720, + 1144 ], "deps": [ "compat" ], - "commit": "f83db95e07c55b9a7e69df23a6291171d4697e15", - "sha256": "09ji0z1mmn2ihf759i2h21bqr52bfy4axhi6zgkj4dkhjpzrdwi8" + "commit": "9cc3fed195e0a1f960a971880287856c148b4861", + "sha256": "1k3nislsc47k7sf24vyv4krj2nldcibxwq0j33bzq5sxg8q2rz8i" }, "stable": { "version": [ @@ -86490,19 +86703,19 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20220620, - 2207 + 20220730, + 2341 ], - "commit": "1ec276bb26371b686d6c57ffd38ca222cf42e8db", - "sha256": "0vb1lqi3m3c4p8lw4lznr4cllkd46bq09lyky2ib37wbb7qddnn7" + "commit": "175a1bdac1eabc7415116c8722795a1155e2d2c9", + "sha256": "1di24gklkg4ri1glyimwnc8i06aj7y38mjia9iifm19qn7gqv9dl" }, "stable": { "version": [ 4, - 1 + 2 ], - "commit": "185239020f878cfbe1036270e6c3d1026ba8f255", - "sha256": "1bsxhizwhri8ayryfq59ghkybrql611q2bnjd45hpj7armwq3s8m" + "commit": "ca7f5fcbbdfb38e84fd1740e14dad32a7081c69e", + "sha256": "0da4b6d65bq9xhyhq7h9g315zg6g5q9435vz870la966rgav5szd" } }, { @@ -87024,11 +87237,11 @@ "repo": "sigma/pcache", "unstable": { "version": [ - 20201226, - 634 + 20220724, + 1841 ], - "commit": "893d2a637423bae2cc5e72c559e3a9d1518797c9", - "sha256": "1xxbi4lp4ygvciqmy8lp6zn47k954ziz5d95qz1l7a2jix3rxf1p" + "commit": "507230d094cc4a5025fe09b62569ad60c71c4226", + "sha256": "1fjdn4g9ww70f3x6vbzi3gqs9dsmqg16isajlqlflzw2716zf2nh" }, "stable": { "version": [ @@ -87222,8 +87435,8 @@ 20200419, 1237 ], - "commit": "2f4099aa1330f87df4e9cd526de057ee9b71de6c", - "sha256": "0fdzhsz3784lf50mdabz9h2b6992cab2nnn4xv7rx2a8hsyyq1mq" + "commit": "31602ccab53aa7dcf26a1af222c7da2bcc1390ed", + "sha256": "0x2pg03csf25vj8y2zb5sv493dk3n0s4xbkihii2mzhkx82vgpxg" } }, { @@ -87249,16 +87462,16 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220714, - 2356 + 20220723, + 2329 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "386dca5b2d078ba691eefe230478a440ee1f7b16", - "sha256": "0gav9fg6x7gbbvpnjs5l5hdmvb7ynhdr4jkdhxr4s4mz1ba6mp2w" + "commit": "bb0b71f5bafd81d0b5647c4ec48fafa0bb6f6c21", + "sha256": "1j6aj6sxw82n8pvwylwcnrgi95d6n5fpa0g75lphfgkaqk9nbgmw" }, "stable": { "version": [ @@ -88306,14 +88519,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20220710, - 942 + 20220723, + 1451 ], "deps": [ "php-mode" ], - "commit": "4f990bf51cc65b3bdc63f4991e007d03b76932a2", - "sha256": "07iqv6jd7a49vmfp4fz9dwvxhhl50wkpyisazr2rxwfs9i72n00m" + "commit": "e229e990e36a2bfb88503bfe2bb6f2836eaa2874", + "sha256": "1235m8q85rijgx9a5jn3p812hdffjlnalh7nvdl3qgxjsf2c4bd0" }, "stable": { "version": [ @@ -88724,11 +88937,11 @@ "url": "https://git.zamazal.org/pdm/pip-frame", "unstable": { "version": [ - 20220706, - 810 + 20220802, + 1914 ], - "commit": "7a75e73f884f294c979d19a520268f2a4371861b", - "sha256": "0wssm2rrm53hg2gvg7y926zgca2r8hvjib0dbgg6lz6bflshv8bp" + "commit": "8c396a11f532a1beb594b65e99e594f1e9f1c2c8", + "sha256": "0qx7529i6hscy230rpx6gxk03gapa017pm65cjxvm2cj2lg0f68v" } }, { @@ -88780,6 +88993,21 @@ "sha256": "1ak9dvjqhdm12i7yamgbqjmc4zmvy2f0gd1nia1q9dy3n6576ryq" } }, + { + "ename": "pipewire", + "commit": "9e5fc9c71e12ed4b1f4e0b1d2e021bd894b2d5a8", + "sha256": "17wj4vjgn6fan48kqgsghba2ip13j3fyp587ijwy97l7m18nwhad", + "fetcher": "git", + "url": "https://git.zamazal.org/pdm/pipewire-0", + "unstable": { + "version": [ + 20220725, + 1858 + ], + "commit": "ae7a95230f102e7430a80acb02850bc24430c3b2", + "sha256": "1f4hbjh5jb1skk104s52brq9mgsl275g1l631x07yffdps310axr" + } + }, { "ename": "pippel", "commit": "45459106a88b5bb8ce5afdef9a7cb95a0fb447bf", @@ -88894,11 +89122,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20220428, - 556 + 20220802, + 1951 ], - "commit": "8faee70e4640bd6ec1857651ec64e139e4dc2833", - "sha256": "1a18kc2rjkgdm8s816pf3nrdjxkwi9yrvkvwwqbxg915rzyv9858" + "commit": "9525be8ecbd3a0d0bc7cc27e6d0f403e111aa067", + "sha256": "03rhhmwwigvych4qfn0hly0z2hihs57yjapvfinbkrmw8ajgnl01" }, "stable": { "version": [ @@ -90635,11 +90863,11 @@ "repo": "jschaf/powershell.el", "unstable": { "version": [ - 20220402, - 643 + 20220805, + 1712 ], - "commit": "77b27faf8a292f1dc9f54c872241dc53b6791bf1", - "sha256": "0i66gq5pzgnh4x2y05vsd54cnb8v3adp7gxljwzzljm2jpwmb8hn" + "commit": "f2da15857e430206e215a3c65289b4058ae3c976", + "sha256": "00q0qdrdj1rsi6lc1mdmn0nnxklpp2wjp73q12dwav37ymv9cj4w" } }, { @@ -91478,11 +91706,11 @@ "repo": "fritzgrabo/project-mode-line-tag", "unstable": { "version": [ - 20211013, - 1954 + 20220720, + 2110 ], - "commit": "69d44e5495185587ee8577f8b9d616063d6bd7f8", - "sha256": "1rv5zgbg003zhhjvikyv92pwjgl191ja14sba7hncs0pk580v075" + "commit": "509ac9a01cd344ee9bfa1bfebed6565dd4cfedd7", + "sha256": "0a256hcjyl7qlx08bfqcsacl3kpwgzdf458p4r1sxrwd0b1lz1g9" } }, { @@ -91580,11 +91808,11 @@ "repo": "fritzgrabo/project-tab-groups", "unstable": { "version": [ - 20220331, - 918 + 20220720, + 2109 ], - "commit": "837267a23fa57199599b96af94c2db2e80a859d3", - "sha256": "1yrypgykgvvfq0qpkv4arc766r5kq1cidpmkk6ymlj376rviivvf" + "commit": "2d348279876f3073176048d903f9672f3c933ca5", + "sha256": "05in97rym6nc91nyshbdk4i1g013gsgzgs5r5nhsshpa9glwpv55" } }, { @@ -91595,11 +91823,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220710, - 959 + 20220804, + 1530 ], - "commit": "00fce5a62cab56873c37629bef653bb2a1e4a4c1", - "sha256": "1qa5xir20x6qrs3cj79pykp5cpb74y4s23n8664p6kjyhmg7l5cs" + "commit": "94273611c95b6718c41018be2657f6982a325f60", + "sha256": "17819s97qrmq96rvnnwa29hblrnbajqyd8q16dvj28m7366gq90q" }, "stable": { "version": [ @@ -92001,11 +92229,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20220714, - 1137 + 20220803, + 1702 ], - "commit": "e06a7704a53ee43c4695681c0e40edfdf9b1124d", - "sha256": "1yyprdnfhp5rpax8qsag3szmkgn5f0m4g83pbbp2f33dxxvvx767" + "commit": "c304d73e09daec54dd8f8cef90df10c0b3d2c2ef", + "sha256": "1vik42pn9gd1kvz2mvnslsg3xy0zsgy8cck1m412ffl8f6rlsgqx" }, "stable": { "version": [ @@ -92108,16 +92336,16 @@ 20220303, 1716 ], - "commit": "eb6cc788493dd22582df752641307348ae40d173", - "sha256": "1gx99pyvf2248kz07sx4kx0pzinj65bbxkn2679wjqbvg19lcd9w" + "commit": "e83492d94a8ce8ef529b829da0df4e458ee05908", + "sha256": "1b42aaj76vdhangx9awwi8lv1vr5kh4m956mzzcbn0ydgml7zxp5" }, "stable": { "version": [ 21, - 2 + 5 ], - "commit": "839b18b1ba42639fedecfd751102afcc5736b5d4", - "sha256": "0arri4vlj6qrkxr251kz9iil6grv8clxi0746pimwrd2jppg8jqd" + "commit": "ab840345966d0fa8e7100d771c92a73bfbadd25c", + "sha256": "0q4xcpnixbalyry444b9ykzq477hmfhpy2rgcyyaix1rm42zcr3d" } }, { @@ -92516,11 +92744,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20220702, - 1336 + 20220730, + 1556 ], - "commit": "e1c4cac260ac0aae5328e9378bec70baa5102e4c", - "sha256": "06b66xz0yfx0jp50i94hand8rhzizbg4h9af7vc3644g0sjvwsl8" + "commit": "28836e98d5566172b1a94d7b38290d07b49201b2", + "sha256": "1z35nzsqcp8q9nnka0d5gpiidl07qfqmd2giwnd3b3v7h3v1kwpz" } }, { @@ -92700,11 +92928,11 @@ "url": "https://codeberg.org/ideasman42/emacs-py-autopep8.git", "unstable": { "version": [ - 20220522, - 1152 + 20220802, + 1154 ], - "commit": "cf2daa75aee75d4dec772103c577c614c85409ad", - "sha256": "1sr64n1cg1pdxfa3n8ckq3hy92asnwi2b5nl88qy3jy1mybah4d2" + "commit": "4e5a8d5ddd77b45841f0e55d7c5326854f565830", + "sha256": "1k1yvf5n5ygzf170bfb6wjhw3jrk3wsycb9bf39k53p8gzanh435" }, "stable": { "version": [ @@ -92926,26 +93154,6 @@ "sha256": "1y3q1k195wp2kgp00a1y34i20zm80wdv2kxigh6gbn2r6qzkqrar" } }, - { - "ename": "pyenv-mode-auto", - "commit": "f3fcb707356bd16fd0b573c176023534cd69d0d7", - "sha256": "1l7h4fas1vshkh4skxzpw7v2a11s1hwnb20n6a81yh701pbikqnd", - "fetcher": "github", - "repo": "ssbb/pyenv-mode-auto", - "unstable": { - "version": [ - 20180620, - 1252 - ], - "deps": [ - "f", - "pyenv-mode", - "s" - ], - "commit": "347b94cd5ad22e33cc41be661c102d4548767858", - "sha256": "1gz7145jnjcky1751pqrlhh3pq02ybsmz49ngx4ip2589nry7iyv" - } - }, { "ename": "pygen", "commit": "e761724e52de6fa4d92950751953645dd439d340", @@ -93010,15 +93218,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20220709, - 519 + 20220724, + 1211 ], "deps": [ "async", "xr" ], - "commit": "3d9d16b578a1136ef344b61db5f0d55cefcf4164", - "sha256": "032an8d6mr67q4xip9x6imw7ljslnck8s1mx44gxdrz94zi2rk4h" + "commit": "4d6323389665c0c30e737143832d17feb71e9199", + "sha256": "0krsa8ch14f84i4ckizrg3q3i2lciq05l1fxjk4y7jfdmdys5svg" }, "stable": { "version": [ @@ -93178,11 +93386,11 @@ "repo": "it-is-wednesday/pyinspect.el", "unstable": { "version": [ - 20211102, - 1415 + 20220805, + 918 ], - "commit": "36cf624236c8b4cce852dd52b64d058d4d4a32fd", - "sha256": "0g2k9fgjvcq2jc3j2k2x2v1vghaf0hyarzvdby5vzycsp7jlzcjm" + "commit": "df5959e699157d757c16ce11efdf3045a5b58d23", + "sha256": "15xbs4g5agp700ajqrfcz6fgmridj55v8hhg1jmhqn1aacvh6zas" } }, { @@ -93196,17 +93404,17 @@ 20210411, 1931 ], - "commit": "40c9e66e4756e76318469f1484602ca92d505d3f", - "sha256": "1pg5xr14kskkfl9qmvzdwgd4lr2njzv9ai9f22faw4xs2kkqfr7l" + "commit": "50f369047078810311f11c7d8cc2ad98fad7ea67", + "sha256": "1mpdn680jrg783857xdrcrvjc6hcw502b92jqf8hfywa12qcylm8" }, "stable": { "version": [ 2, 14, - 4 + 5 ], - "commit": "bf29a5520e8d0e432ca715e0614a62052b3809e2", - "sha256": "05vfjxb5gbc1wwarqmbm55kbqp5623xwk47ny5xh5ng8qchw9drn" + "commit": "566ffca72a1a08c9e7ec14383c4710d64165c592", + "sha256": "0ljfvyzr2i07pi7m19kbshlc3cfnwr53mjhcpydaa0w8bak4cc95" } }, { @@ -93496,8 +93704,8 @@ "deps": [ "reformatter" ], - "commit": "339814df22b87eebca02137e581f65d6283fce97", - "sha256": "094nqaf60cw3kch2hka5jbbrc5b6v3z6np98w3y6690yxwx7wmz4" + "commit": "8b4948b7fcad90fc9b72f69f4653260bd21f62c3", + "sha256": "1s9f1yvgnls3pscq9yzjzq7awx4cia7d200280cznq57bfrx2zdf" }, "stable": { "version": [ @@ -93544,11 +93752,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20220709, - 1619 + 20220726, + 1741 ], - "commit": "cf4c7be22343032e00c7bcf24071aba63ad14f01", - "sha256": "0w33wl6chl02kgr427c8rxcgdyfa6agm7fh8926grc29hzcjjhzd" + "commit": "23f8f55d3e5ce34b19f74c78928a43914df38696", + "sha256": "1ar1x8k3pl05zffbz6aj239j22523vgxiiikdxj5515w0rddk06k" }, "stable": { "version": [ @@ -93568,8 +93776,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20220714, - 1951 + 20220720, + 1918 ], "deps": [ "dash", @@ -93577,8 +93785,8 @@ "s", "transient" ], - "commit": "d031fa91e21bb2112635ef048955ef44e23695a8", - "sha256": "1i08xfbwfig3lshkww6k7c5vf2qcapipcmpb2x66jkwdq0n97g0n" + "commit": "9bf8db38bf18feb0484931877210cecfaa96bfc6", + "sha256": "09mk486fp5brw67aa4w9jyrq6g6i7ssd3y2mprhy5953q3w5s8fk" }, "stable": { "version": [ @@ -93666,15 +93874,15 @@ "repo": "pythonic-emacs/pythonic", "unstable": { "version": [ - 20210122, - 1247 + 20220723, + 1741 ], "deps": [ "f", "s" ], - "commit": "fe75bc17baae314bf8f5e0b12aad3fccfc6c5397", - "sha256": "1g5mfn37d01259s2xii2d41027xpif4czxipq4sa7d6sfyq50h7h" + "commit": "c18a5bd8cb2ba59014b6b29b5bf1903bd2476a07", + "sha256": "11fps8ah3xmacfd9bglq8yaafzh37i1qpiyhfdphhsy0jqy990wz" }, "stable": { "version": [ @@ -93854,8 +94062,8 @@ "repo": "quarto-dev/quarto-emacs", "unstable": { "version": [ - 20220602, - 1714 + 20220802, + 2041 ], "deps": [ "markdown-mode", @@ -93863,8 +94071,8 @@ "polymode", "request" ], - "commit": "3cf4546a01766775d56b92e1c974c850ec35d5a9", - "sha256": "0r2f4m5vqxhb6jpkciywj86mxvw9zw5wxpmh56d1znids4jyypxz" + "commit": "769a4ec178f8ad3e0c87b1ee23e64616ee161b02", + "sha256": "1xi47d32mlpi80ylg9wj50amxiysbmigzpvf4xwivl181yn7cikl" } }, { @@ -93898,11 +94106,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20211228, - 248 + 20220730, + 230 ], - "commit": "54fc5b951f103fadba25dde38274964737815883", - "sha256": "0ckbl69d4xk64gzvy2mmgqa9v3z76nm673k3an937gnnh0l4xssx" + "commit": "59bd9bf760f2fdf70c81c220f2875dbee0c29d5c", + "sha256": "1lv8q6rs61qijrfj40fwy89gyhf9dgbp44z3p6clbhlq9kqf55jw" }, "stable": { "version": [ @@ -94226,11 +94434,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220705, - 1452 + 20220809, + 1724 ], - "commit": "9dae07533f0fde32c12af5260055a2c3cc199312", - "sha256": "1wbrxfmagp1v7wyhhwiv6yplw8bnpyjzs4bd7nqgsvvjgf3lk2h4" + "commit": "194fe14888fb653219ed6e605377884673fb6308", + "sha256": "1simri1lrg32qpxhzpxgj7g6zms6j5l442pdk9yf95x6fxxwc24i" } }, { @@ -94913,6 +95121,21 @@ "sha256": "1mbnyp2xknymfs2nrcw572plrwxgjacrysxaf5szr75vn2vh11nl" } }, + { + "ename": "readable-numbers", + "commit": "2e26cb5c394b0114985fb2ae5cc807733428b894", + "sha256": "1hhqly2f5jr4xk1x6pd26w9m2qznwklkjygval5kdrjwbhbx2ylp", + "fetcher": "github", + "repo": "Titan-C/cardano.el", + "unstable": { + "version": [ + 20220711, + 911 + ], + "commit": "40d04a0baf5c3d1087b18cc03595c573a1b5891d", + "sha256": "1z2kvv5im24h7hqmz2yhpar6d6cp4hzhzk6kxgrdrwgywpaf0bdx" + } + }, { "ename": "readline-complete", "commit": "0cf3b56dae7669b34df9d2abe2d78164cbf064c9", @@ -95420,11 +95643,11 @@ "url": "https://codeberg.org/ideasman42/emacs-recomplete.git", "unstable": { "version": [ - 20220708, - 211 + 20220731, + 2328 ], - "commit": "541e98dad23c019b62af37cf4971ed17226c8713", - "sha256": "02mc088551sj5iyd41ra3vfp6a5m9j22yg44w5axa9539klv0i98" + "commit": "3ed522a234bced2d2ba1d069fd00e715359ac29a", + "sha256": "18195hq4m5mk95k72q6m4hrircvh29v47w2qv47pw0gplpx0fa47" } }, { @@ -96038,11 +96261,11 @@ "repo": "karthink/repeat-help", "unstable": { "version": [ - 20220706, - 1225 + 20220718, + 1742 ], - "commit": "47fd9041bfb33af6a24a49db37e174c96b7f8fe4", - "sha256": "168g6av6llbyns2x4i8djv8x4h6k0391l8cmnxm4b4c2mw53qfn5" + "commit": "bdc21d9a8846b4adf63dd9317860666da5ade478", + "sha256": "1bvgq9amnawyv3k1vbalvlfw2r2z1yqilwllcsanlrdcz95awcv2" } }, { @@ -96624,17 +96847,20 @@ "deps": [ "seq" ], - "commit": "50b8376f152916bc200635a112db9439bc3cc9b5", - "sha256": "12lk6k0jwz3y9bjyxyl14g8qys4zcacb80mkc0hgz0bb7797hp3z" + "commit": "41f47d5ccab77d42cc2e1a89a09d0dc2410e9eb4", + "sha256": "1h4gpyqir0kqf6a7ni8dbqwd4mr33imay0fmprrpfpfqxj0lj7c1" }, "stable": { "version": [ 0, 0, - 7 + 8 ], - "commit": "90add9a1f8c4a3c78029d38087ff4d22fe5372d3", - "sha256": "05k2zp2hldzq5h6nl8gx79dd8lvfn507ad4x3naichdqgn2013nn" + "deps": [ + "seq" + ], + "commit": "41f47d5ccab77d42cc2e1a89a09d0dc2410e9eb4", + "sha256": "1h4gpyqir0kqf6a7ni8dbqwd4mr33imay0fmprrpfpfqxj0lj7c1" } }, { @@ -96668,11 +96894,11 @@ "url": "https://codeberg.org/ideasman42/emacs-revert-buffer-all.git", "unstable": { "version": [ - 20220710, - 706 + 20220731, + 2351 ], - "commit": "7fe7fd335542e76c5099e51b17ea29614482faa1", - "sha256": "1a0xvk3cwfy0j09nbrhmpijjnpimaz1dpld9ny7ldypy6hlwjlhy" + "commit": "c07996fcf3e8f7ee156055327522586f32582ce1", + "sha256": "16288519g1q07rkg8j3kmxv6lssjl04kw7ni4mj44jfgzimm6vn6" } }, { @@ -96683,11 +96909,11 @@ "repo": "kmuto/review-el", "unstable": { "version": [ - 20220215, - 842 + 20220809, + 1250 ], - "commit": "f08ef20d9ff4f03a00a8c24dae9ce416da0d9d1c", - "sha256": "0wyjh9ymj62rlvvhahcqy48xjw768x6pkvhrwp8sp8pyb64ghkj3" + "commit": "d0ec3357ae80e745e3a2b00012dd577e276b88d0", + "sha256": "13lcwhy47p4d6fk6x0xh726q8ka5l41hzqri00rbdafz0dzflbj4" } }, { @@ -96764,6 +96990,30 @@ "sha256": "1nxzplpk5cf6hhr2v85bmg68i6am96shi2zq7m83fs96bilhwsp5" } }, + { + "ename": "rgb", + "commit": "a6207f5129ffd2bedbc83aa8a41d83fe4f6e41be", + "sha256": "0ff7wmcmcqbr7n7z5xm15a1x67c6ifacx8fcbhx97hvlgsxgi9qx", + "fetcher": "gitlab", + "repo": "cwpitts/rgb.el", + "unstable": { + "version": [ + 20220717, + 1940 + ], + "commit": "c83388c134e5ed207170b97cf55eb69cec1d2857", + "sha256": "1zq4nnp3yqv46129kazm76bvdqvjjhlrfg95bkdxvkd7qrdjc9a3" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "4aab5a5be16b69b47ef5e67d02782df5e41dbd7b", + "sha256": "1zq4nnp3yqv46129kazm76bvdqvjjhlrfg95bkdxvkd7qrdjc9a3" + } + }, { "ename": "rhq", "commit": "7538e3b243c20552f73d9a3c7524f0a106a62cb7", @@ -97144,11 +97394,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20220526, - 1719 + 20220729, + 1809 ], - "commit": "9c56c62993b9644a3c8bf6fc0a3a6599c0956707", - "sha256": "035cbj2ppxrjx8fdyjq3w7zjznzljxkcnr5pg61xw2vigd9mcjva" + "commit": "f3c56ba6949934758e79a371eb5a29d8e832a828", + "sha256": "0xv7f0hsnjm3zcqqsvmrihh5ik59n16pjd0a1vcbabamcd59yq37" } }, { @@ -97159,14 +97409,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20211208, - 205 + 20220731, + 2016 ], "deps": [ "inf-ruby" ], - "commit": "11207bd549a5a78e3a4d70265c3715990dcdab71", - "sha256": "0hcyvvv4y78fmwprlxgmpzb81lzip9y1hjskmv8x7l0q1a6a3dsz" + "commit": "993ae13791ba882076b644b0c8054b6e89e22dad", + "sha256": "1a4sdhrmaswi5h5wwqabiyqfz6lfgn0iq68j6qrbn1lwdmcf71d2" }, "stable": { "version": [ @@ -97181,6 +97431,30 @@ "sha256": "1xbj7wi389n6pxfvxrakvhylkdlqg8ll9ad2zmxggcchygwah6nl" } }, + { + "ename": "robot-log", + "commit": "8d2581ed84fec78ad68cfaa91f34f7a56427e9e7", + "sha256": "0v01fxhkmwxr4j6q6qd15acfzdhpb4c0x49s7dbcqiy2xc9nawin", + "fetcher": "git", + "url": "https://git.sr.ht/~apteryx/emacs-robot-log", + "unstable": { + "version": [ + 20220719, + 1301 + ], + "commit": "26da47597aa97be9649cb60f4da6d94d47d0c0ac", + "sha256": "1l9yxryrhvylh2x17cczd8v8978w1nv8173d4l9hv0cr26kp5b68" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "commit": "26da47597aa97be9649cb60f4da6d94d47d0c0ac", + "sha256": "1l9yxryrhvylh2x17cczd8v8978w1nv8173d4l9hv0cr26kp5b68" + } + }, { "ename": "robot-mode", "commit": "51cc7ea77a8f782ff5f1fb2415c337abb805e410", @@ -97384,15 +97658,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20220622, - 909 + 20220809, + 150 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "778c76a6a4bd93faf137d5ca47e7823e1665051c", - "sha256": "0gpw0yf1rc65qv2n51fwjms0ihbhsbdy5akwh69hcq7wmrlr75fj" + "commit": "484f0bab468674852aaf3e0ad0c3b3d4335d4316", + "sha256": "15skhq2skmwmp0z7zq1z2lb0s67bgxaigf068c7s6giz4k4zgxal" }, "stable": { "version": [ @@ -97890,8 +98164,8 @@ "repo": "semenInRussia/emacs-run-command-recipes", "unstable": { "version": [ - 20220604, - 1330 + 20220801, + 1851 ], "deps": [ "dash", @@ -97900,8 +98174,8 @@ "run-command", "s" ], - "commit": "6cff6fff2c3ac23384d044a9c64d0e4b80721d4c", - "sha256": "1bg1ha4mlbxr13w3v7xkbdi9mqp3amljikbnkfcc5wijx572c396" + "commit": "4e7846ea4174fa6f56f5c1173e72fc9743812245", + "sha256": "11pq39zmr1ihwg5rkdkgvb2j304fsi1md450s4dirhzjqd4lbn1b" } }, { @@ -98644,16 +98918,16 @@ "repo": "teeann/scholar-import", "unstable": { "version": [ - 20220504, - 1101 + 20220730, + 431 ], "deps": [ "org", "request", "s" ], - "commit": "cd0b42e5026426af2bfad57b692760bcb5d05dbb", - "sha256": "1kda2yrpm2c8c8p9lg183hf8limc4b2ay5gdssfhc7r29nvvagpv" + "commit": "7cb04af45f1ed1db30d6e7788803e578c641b3b6", + "sha256": "00v9zl25vs71qsjxq54rcyj10b6m8nxvzfy8x6anxmis0r5g4f8k" } }, { @@ -98768,10 +99042,10 @@ }, { "ename": "scratch", - "commit": "b46813f928eadfa08a1d4bf94ceeb96dbc2a7c72", - "sha256": "1an30pr64fz13s6lghlcb36b7hn3961vv0yipfp9s140ccygdvh7", - "fetcher": "github", - "repo": "ieure/scratch-el", + "commit": "5948edd0bbc5635dfa309dee6585142ebea4b191", + "sha256": "0hlsbm0xn1dr9hs7dcq0ingx66crx5blyz0cfx8hwwhp42aqwbnv", + "fetcher": "git", + "url": "https://codeberg.org/emacs-weirdware/scratch", "unstable": { "version": [ 20220319, @@ -99466,15 +99740,15 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20220503, - 1449 + 20220720, + 1346 ], "deps": [ "apel", "flim" ], - "commit": "b1c245b81715b0430f7593cee2339e6264104f3d", - "sha256": "1s1qvhxklzhmq9h62cn95iaxacvmp7c2hn6jh9bhymx4x9afqagh" + "commit": "ac3e726ca94ed245c25881ec8d7177d0d834ea6a", + "sha256": "1bg07y6svvg1mmlr455x3j1anjp3wbv27s6b2inp294rbwprm41n" } }, { @@ -99618,15 +99892,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20220501, - 1539 + 20220715, + 2343 ], "deps": [ "dash", "edit-indirect" ], - "commit": "454c9a3561acca3d57cce6ddb356f686b3d8cbee", - "sha256": "0i7d4cig64lz27vq8rf6kqnpm5k7shzj34d6pg56pphf0xs26zyk" + "commit": "9af0c1f417c460352f77de88b5b4432d6b955858", + "sha256": "1hy5z965hs06pbwsg9blvrqmkdcp4iv1y9l9zy5wxd9ii65cfr8w" }, "stable": { "version": [ @@ -99695,15 +99969,15 @@ "repo": "MaximeWack/seriestracker", "unstable": { "version": [ - 20220704, - 1713 + 20220731, + 2330 ], "deps": [ "dash", "transient" ], - "commit": "ce8b86a9eee175de513d00ce3e1aa754adbf5c8a", - "sha256": "1324lz9xibxfiridfkkfdb01dp51sm3rva5hq63wd72z0ai51ilr" + "commit": "1b4fe12d2fff15e3646a2d7cbe528ad1f95c4f19", + "sha256": "1ib5vxsm292b0ivp3bwm638qshcf6gr8gs24pywm7mimy8y1nplc" } }, { @@ -100059,8 +100333,8 @@ 20210512, 1625 ], - "commit": "dbcef650b906fec62608d5e4e3075bf251e675e1", - "sha256": "0qnqp06vb2ikkwy0p10x3s7mil6c948w42mx4c72cdz36m116zc0" + "commit": "bcdce40b906c848727dbb55176262a9f03f8abb4", + "sha256": "1v9gvl2d5sy7crhmpryrpb8zyf4ib7386rf60b1n8lbvvrbna4v0" } }, { @@ -100176,10 +100450,10 @@ }, { "ename": "shell-here", - "commit": "88df6e04614547a59aefbeae88c301f3b8394039", - "sha256": "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh", - "fetcher": "github", - "repo": "ieure/shell-here", + "commit": "13942be7200938f70a38044da64dfd78499de27f", + "sha256": "0dymv34gqlnamxpq9y8mhszqkbh3rq2x9wrhbslkx7828lawsnmh", + "fetcher": "git", + "url": "https://codeberg.org/emacs-weirdware/shell-here", "unstable": { "version": [ 20220102, @@ -100315,8 +100589,8 @@ 20220629, 817 ], - "commit": "3f051e42288ddfe4cd7cd0ee62efad90227de24b", - "sha256": "1v0p8f5m1i3sm15q4mi687wk9gx5bv8yx38n15ap36vwkrybxzad" + "commit": "173e4d632c94af6670869729c09bfb8ba484d257", + "sha256": "1934mh3kngpnxg12akpr10fb9x7j27f7v5jlxifa2w3iyxqckry6" }, "stable": { "version": [ @@ -100429,20 +100703,20 @@ "repo": "redguardtoo/shenshou", "unstable": { "version": [ - 20220709, - 654 + 20220808, + 604 ], - "commit": "f3f991f9773283f3834e8518eb6910aa29e88f9e", - "sha256": "0gmih585vb1qlcz152gkx8q9xdfjg456w43d4bd0q363ysqjfd70" + "commit": "25903d642e81f33abea84573979af2a373f5b5b0", + "sha256": "197gs31nb8aa47q1jv6zfrrbbi09n4kbjsdlvi7zviy6xi2723c7" }, "stable": { "version": [ 0, 0, - 5 + 9 ], - "commit": "f3f991f9773283f3834e8518eb6910aa29e88f9e", - "sha256": "0gmih585vb1qlcz152gkx8q9xdfjg456w43d4bd0q363ysqjfd70" + "commit": "25903d642e81f33abea84573979af2a373f5b5b0", + "sha256": "197gs31nb8aa47q1jv6zfrrbbi09n4kbjsdlvi7zviy6xi2723c7" } }, { @@ -100524,11 +100798,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220707, - 40 + 20220809, + 115 ], - "commit": "e3ca74f62602e69af5ff3271bd98977bd490e9de", - "sha256": "0jznj2zh2bb32sy7cgwkb8sy4x9w63y8f929nq6271s6ljg8akc2" + "commit": "a8e2e5c7b7576afd7b097b40c6ca39e5717f97a5", + "sha256": "0vqq69jkx11d8m9g9v2m4zvpq3khkdhvgzvpcszvic4fvaa65jpc" } }, { @@ -100992,11 +101266,11 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20220706, - 720 + 20220806, + 401 ], - "commit": "32c2c9f8d752073c2b637ea8f0b4473804339f64", - "sha256": "1n1diyz95d0g1gq0yzf86a94fcgsqvh834ww7pblgq1yk7ld9hzd" + "commit": "3e1889daa10ea6950b130e29991296d150fd9679", + "sha256": "0579qmb3sspk438v2qrp3gkfn0cwydp3x7s3lvya7lfs4ywmqcpv" }, "stable": { "version": [ @@ -101008,6 +101282,38 @@ "sha256": "1rnzyhkqbihp8j0g8nfg1wdzvyldks162wapr48lis74xjzzavdk" } }, + { + "ename": "sideline-blame", + "commit": "d77ea6e08a13021e42ee7013f01dedbb6fa7945d", + "sha256": "1kq5x6l2x09hjgk0mgi7zfgqg2gkgcpak37g2j3y9324468ca8a9", + "fetcher": "github", + "repo": "emacs-sideline/sideline-blame", + "unstable": { + "version": [ + 20220629, + 801 + ], + "deps": [ + "sideline", + "vc-msg" + ], + "commit": "574592a8ecc171112d4ac2575f9cac51ff5eb184", + "sha256": "08msa23fgwhfwnyl8dmakv32qa8fkzqfspcgc0bliqrxh6dpcjr5" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "sideline", + "vc-msg" + ], + "commit": "c3721eeb01cea8acc520c60b9c0a802c39114c6e", + "sha256": "1rbb7sazdrp3ixvr5plby8i033j34ww52f6igljvzyclpv8w9rqi" + } + }, { "ename": "sideline-flycheck", "commit": "3aad0e0d246dca4166dd273219f8223153561e9f", @@ -101041,6 +101347,74 @@ "sha256": "1lrjrp47h2crj7df4npvwpmd53amz37z37byp13nczxcq1yzw806" } }, + { + "ename": "sideline-flymake", + "commit": "929f2a0947487db761cee10f420d23a482bc0cb1", + "sha256": "1p1yzxkznrr19hl0bky1l4zx13nvxcrvm4dchrgzc11w19kpimrk", + "fetcher": "github", + "repo": "emacs-sideline/sideline-flymake", + "unstable": { + "version": [ + 20220629, + 802 + ], + "deps": [ + "sideline" + ], + "commit": "a6c6e9e4e64a12040adadaf351f3e83a0e2954e6", + "sha256": "1gf0jfs4gnvp2n4d1nix84sqr3a8np0hf05f1prhk0z2sr4ils8k" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "sideline" + ], + "commit": "97d6922b3101eb97fdca4c5516d3dc4c4ccd75a5", + "sha256": "11cy2yxdsjxa5np6hh6vk9rc8mfghsly1j7q28l8zz4990w2g27a" + } + }, + { + "ename": "sideline-lsp", + "commit": "944b211053299e32737051e69e9e5685d1648379", + "sha256": "0zzwnnm7hhw4rvans71s3bhbyqp21sbmpdf1c42mk2kmvb2ik5z1", + "fetcher": "github", + "repo": "emacs-sideline/sideline-lsp", + "unstable": { + "version": [ + 20220629, + 757 + ], + "deps": [ + "dash", + "ht", + "lsp-mode", + "s", + "sideline" + ], + "commit": "b340c1e9a6d26ad4b3afe6aa660d62e8cebd66c8", + "sha256": "00y2jsvk0a1jjp0jw6r49pqmcbmrgrsrrhjkxvh13765i89x3fck" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "dash", + "ht", + "lsp-mode", + "s", + "sideline" + ], + "commit": "afe8995e27a71b0e7355c40cbd3137ca26939dfc", + "sha256": "0623g071fv4zg31g90vrmkmgvz16788qavizgdp8y1wavi0gy8qx" + } + }, { "ename": "sift", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -101447,14 +101821,14 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20220628, - 1545 + 20220721, + 1600 ], "deps": [ "terminal-focus-reporting" ], - "commit": "be84587cfc443aacfde728f290a2cd6ea690da29", - "sha256": "18jwg0amk6lsj7xj7kh173wc2kqqj6ax9xr6rf6iai2z9yyn9im5" + "commit": "d7a415b00bb1ddcf940d82afdd01e8b793d5466b", + "sha256": "1vj1yr6likmsapr6nrkbr3sf2bk9w16jxa8hra0328b3q8afh21f" } }, { @@ -101942,8 +102316,8 @@ 20180831, 459 ], - "commit": "b93ad77f9fc1d14e080d7d64864fc9cb222248b6", - "sha256": "1s4yk6w9fqf6hmimjcq8r7b54v7f2hz3isihiaidj3sv5zclhflw" + "commit": "b89b4fbddb4b6b95fcc7301ec543ea535b2cc4d7", + "sha256": "06gr15dlz910azxzlwwbqimy2pvpncw2p3iixm6r4kbb41ycpn87" } }, { @@ -103945,11 +104319,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220715, - 157 + 20220803, + 148 ], - "commit": "052b0c908ccb387f50ab8a80befa6a1443ba5b70", - "sha256": "0ddxsggg5i4ncr40wxlqlsn1x0390l7lqj61hy55pk64c0pzrz2q" + "commit": "cefebe6215b4065827553f2e0cb87c31c5893e5e", + "sha256": "060nbh6bq55d1vv0ln67kdp6am7fad6i6zpjvfdf5252gsz63lds" } }, { @@ -103996,20 +104370,17 @@ }, { "ename": "speed-type", - "commit": "d6c33b5bd15875baea0fd2f24ee8ec9414a6f7aa", - "sha256": "0lsbi3b6v7fiwpvydgwcqx3y5i7bysfjammly22qpz3kcjmlvi06", + "commit": "859938e040ad9ec57aa851e06435fc1a492608f7", + "sha256": "0rqq13604v7qxnwwybdfh1jv43biydyabpqsmb5vblb8vlfdrwfd", "fetcher": "github", - "repo": "parkouss/speed-type", + "repo": "dakra/speed-type", "unstable": { "version": [ - 20191204, - 1107 + 20220809, + 1119 ], - "deps": [ - "cl-lib" - ], - "commit": "5ef695f7159aa1f20c7c9e55f0c39bcdacce8d21", - "sha256": "17xh7f1ps6bfs55a08d0jjma2hs117fv4j90w4xif0n2h49m4pjp" + "commit": "e2fda90683945d9fff9f5b48ee080eebe3994fb9", + "sha256": "0cngw8v8n7byskiyyjq2lxz95kz34xr5gb5z8m42rwk780mn6hz2" }, "stable": { "version": [ @@ -104076,11 +104447,11 @@ "url": "https://codeberg.org/ideasman42/emacs-spell-fu.git", "unstable": { "version": [ - 20220710, - 1038 + 20220802, + 1151 ], - "commit": "dd35cffc34d2d3714865a5b1194edd242d8d50bf", - "sha256": "19j24y5i6xllfbca3z7223xxk9fy9avgfway5wi2x9ncxj1vgjbf" + "commit": "bfd017fd1985418a1b101c1e497510ce24bb0348", + "sha256": "1gv2596kq06x90cscc5bhwsisrm3pipiwh5gmq11j28dj0mih3pf" } }, { @@ -104400,6 +104771,30 @@ "sha256": "1j77h761vf74y9sfjpidgaznail95hsg9akjs55sz1xiyy7hkgyw" } }, + { + "ename": "sq", + "commit": "fabbef64cedf120781b7ab4866956512bb439f30", + "sha256": "12n4di8rb24h6cks4ncplks8a8xyla2spbwqc75gn3ivvh1kkyx7", + "fetcher": "gitlab", + "repo": "sequoia-pgp/sqel", + "unstable": { + "version": [ + 20220717, + 2039 + ], + "commit": "bb0d1756bb9c62bb999fa21e15949e28650c663e", + "sha256": "1ih91f58spn1225x6a8mlpikxqg2ga4xbln6aalrcjk6pk84s69d" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "commit": "bb0d1756bb9c62bb999fa21e15949e28650c663e", + "sha256": "1ih91f58spn1225x6a8mlpikxqg2ga4xbln6aalrcjk6pk84s69d" + } + }, { "ename": "sql-clickhouse", "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", @@ -104660,11 +105055,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20220526, - 2233 + 20220724, + 11 ], - "commit": "3e5fbaef46126634c58d0f39be4bc522c05de1f9", - "sha256": "1wahhk2fssjasiz691pkh61qd6x8dbabv4vrwzvc32r9vy8xpyg5" + "commit": "10c36b101cadfdded4d7b78d920fc2919a7d674e", + "sha256": "0y2rc30k1dn4w3s2s75789f33vn6r9v1g2i7agkihjyp4sc4zmsa" }, "stable": { "version": [ @@ -104726,10 +105121,10 @@ }, { "ename": "ssh", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "1wlzagcg2fxqcbpd3z02wsil2n224kzmhcd54df80jypgq5fa6k3", - "fetcher": "github", - "repo": "ieure/ssh-el", + "commit": "c02f4a8dc51ffa240cef1e9b5395c2e80214fab2", + "sha256": "09p8cn7594ap99i1sqg57xlz6981nml7gk4ch9n49zms1pb3njp0", + "fetcher": "git", + "url": "https://codeberg.org/emacs-weirdware-abandoned/ssh", "unstable": { "version": [ 20120904, @@ -104815,34 +105210,14 @@ "repo": "death/ssh-tunnels", "unstable": { "version": [ - 20220606, - 1229 + 20220721, + 1242 ], "deps": [ "cl-lib" ], - "commit": "191013b83f3ec3214394a1ed698c4cf38e4d9047", - "sha256": "0l50d8vkfc5hv1j5j807a398ghv4ap19mpiv75c8l5k1mbrysald" - } - }, - { - "ename": "stack-mode", - "commit": "1328a676140e4b8d01af126c4043bcfa8d1b2a8c", - "sha256": "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf", - "fetcher": "github", - "repo": "commercialhaskell/stack-ide", - "unstable": { - "version": [ - 20150923, - 1523 - ], - "deps": [ - "cl-lib", - "flycheck", - "haskell-mode" - ], - "commit": "f3481e239dde9817152ec00e32bfc3ebf5aaf2cb", - "sha256": "1f2dxlc3dsf9ay417h1l43fxjkrb0a4gg96zd3asx9v2alpzgcim" + "commit": "5010d779edef33f869065231b99d74723c9c7eaf", + "sha256": "15pwgc9s7f5fjmx2savjrpwr6qcpp0s9iy0y10abpy63np4krc62" } }, { @@ -105118,8 +105493,8 @@ 20200606, 1308 ], - "commit": "9ce680a52bd90ce9bac568a6a182b1b3c00577e5", - "sha256": "0ab9ri7bdhq0w0hn7ady3xf5rvsvni3j1l9lr6y3nqf6kfrbhzhf" + "commit": "1d829904702be42f057e89686cfc07e7051d7b05", + "sha256": "1vcbjg0hrndrcs6mmdnynv2ly9cl4gwp3zqbp2av9w95lx8ynqif" }, "stable": { "version": [ @@ -105168,11 +105543,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20220705, - 1627 + 20220808, + 1150 ], - "commit": "d09863f13a1a32906d962e55abd5b13ca7e844a5", - "sha256": "15im06zbg87mqgxiqpj70hkki2iqhpdy10nwjcs8kxnrp1vz6vxw" + "commit": "9c8391cbc69bb44576b333af5caec84221d7b596", + "sha256": "1fwmns83vlbin272zy4nnwbbjlr3zjlh0shb661jlxvbqbi25p9p" } }, { @@ -105673,14 +106048,14 @@ "repo": "nflath/sudo-edit", "unstable": { "version": [ - 20210706, - 534 + 20220801, + 1317 ], "deps": [ "cl-lib" ], - "commit": "23b78a39053088839f281bc0c3134203d7e04e50", - "sha256": "1c8rrrxq8i287a7r1qwrqhfyrl84jfcpnjxiqczwjmc95r510yyz" + "commit": "74eb1e6986461baed9a9269566ff838530b4379b", + "sha256": "11wbmprz4c1rp66v19qk9yavzbcbvhvv684b31zpgfcpy7hx45w5" }, "stable": { "version": [ @@ -105860,18 +106235,19 @@ "repo": "tlikonen/suomalainen-kalenteri", "unstable": { "version": [ - 20220101, - 718 + 20220804, + 657 ], - "commit": "30103e6c6fa5dcbae70a636b007afdaad2fbcac0", - "sha256": "1b4isqymawq3srcgz4qf5ghdq5074iajwqxsb25jky4niki0kgfz" + "commit": "8a41d16371ffaface70739ec861709f674b4a94a", + "sha256": "0rpkwns05aa4d5ix0ffkh2gzag75dvqb78gqhihq560jb83qhc5z" }, "stable": { "version": [ - 2022 + 2022, + 8 ], - "commit": "30103e6c6fa5dcbae70a636b007afdaad2fbcac0", - "sha256": "1b4isqymawq3srcgz4qf5ghdq5074iajwqxsb25jky4niki0kgfz" + "commit": "8a41d16371ffaface70739ec861709f674b4a94a", + "sha256": "0rpkwns05aa4d5ix0ffkh2gzag75dvqb78gqhihq560jb83qhc5z" } }, { @@ -106496,8 +106872,8 @@ "repo": "vermiculus/sx.el", "unstable": { "version": [ - 20191229, - 1746 + 20220804, + 1419 ], "deps": [ "cl-lib", @@ -106505,8 +106881,8 @@ "let-alist", "markdown-mode" ], - "commit": "e9d1093c97507a6d7b4f4710ef65200dae725e5f", - "sha256": "0m90ddwm8j0y6d1ppqhd2gil1107k202blw6mzm5bdambn4nfqkf" + "commit": "c58405f9ff27b9740997ea837a1f6fd173d1edc5", + "sha256": "1rybhwzvbd6y8p4gshiaw8i5v8ankav4wc4v1viag2j7ay0ygjxz" }, "stable": { "version": [ @@ -107059,11 +107435,11 @@ "repo": "ajrosen/tab-bar-buffers", "unstable": { "version": [ - 20220628, - 45 + 20220722, + 1937 ], - "commit": "7da11a70ca0aa6287b4f0cd629db0f1b70420938", - "sha256": "09j8xdhgdl1vwargf2dn1sdscc6jim26f7fvi46fm7f6xrs3a0zs" + "commit": "243a55685a2000a2cbe9d49d04bf9efa8cda210b", + "sha256": "1mjz3cz26bfi06iild3rnc35kay9kp0c2b17a2dzsy0hklnm935y" } }, { @@ -107362,6 +107738,21 @@ "sha256": "01q6c2k9lkz1zpi816b9s99lwrnlf4ni9r0z45jx4fljsy59c0i3" } }, + { + "ename": "tangonov-theme", + "commit": "a9595a5239a1f1003a269e7c7b52804ccb692d30", + "sha256": "13dlllb7j03sigydwm3j6p4fh5dp7pi9bywvrarhnxrhh6wmdizv", + "fetcher": "github", + "repo": "trev-dev/tangonov-theme", + "unstable": { + "version": [ + 20220808, + 1727 + ], + "commit": "fdef90a7795549181276d51d679eacb6e8e74e74", + "sha256": "09izx2k8kpcck63qpwjpsbb5952zzynsa9cdbh3irmkkck9i3bnp" + } + }, { "ename": "tangotango-theme", "commit": "ebfcfa3ba4ca77443667a9478d59214810cd8cc2", @@ -107721,11 +108112,11 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220709, - 816 + 20220804, + 1453 ], - "commit": "ff9756b0646b1d06443eb4bdc64db443f1aa6c40", - "sha256": "0iyh6wxchqg83gpwvg6lz4qy4c2qh25iqjpjm56kif52346a99d2" + "commit": "dac7e7bcbda97560532c854888a3d51ac01829ae", + "sha256": "06sxz9p86q4hzdwdi0jdnq6gc4chh3kh4c2dbi0wm3fyndbviqwh" }, "stable": { "version": [ @@ -108282,10 +108673,10 @@ }, { "ename": "test-case-mode", - "commit": "d2e0bf342713cbdf30cf98d0bbc7476b0abeb7f5", - "sha256": "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi", - "fetcher": "github", - "repo": "ieure/test-case-mode", + "commit": "09745b15620c661a418cf7e997f2a53ef2d7ed53", + "sha256": "15i13h4j6w4255aidns668rncjj8abq5jiqqz5wr97kardwwrmb2", + "fetcher": "git", + "url": "https://codeberg.org/emacs-weirdware-abandoned/test-case-mode", "unstable": { "version": [ 20130525, @@ -108764,18 +109155,18 @@ 20200212, 1903 ], - "commit": "74238342142e0ad93141c9654fea285110223753", - "sha256": "0dwinv4jg87vhnlgfy5z1hsgsjlkgsb993221jqah031rsnpkh30" + "commit": "8d346673d83b8019c1637e8396ed4635d5c2ddb0", + "sha256": "06zhd2v80j6flxiqdavpyq87v8yvnixjv98agpsabh1lrvl4cday" }, "stable": { "version": [ 2022, - 7, - 11, + 8, + 8, 0 ], - "commit": "a7f17c88d6977bb26e574d0df0dd911002b22975", - "sha256": "08fgd03z3kkbl50rqlczs53yzvp3s3z18d39015szgc6riw80z6j" + "commit": "68ac4169a6e95bb94540f222cd6b3f9f2ed3f868", + "sha256": "1nb9waad0ijgd1ah2d9jipwjplx9mdn61bsxcpvqcpswy326ymad" } }, { @@ -108825,14 +109216,14 @@ "repo": "tidalcycles/Tidal", "unstable": { "version": [ - 20210211, - 1531 + 20220808, + 1553 ], "deps": [ "haskell-mode" ], - "commit": "c9df210748d3a3d00c16c880e901cc03bd9f2362", - "sha256": "1j3inr3v1jrl7sp845pxdi9qcsjmz0ifmh18m9wkq8j0nsb27i0y" + "commit": "4356f6309a3686cbb5e4d298f265baadb855b945", + "sha256": "07syq66z3b4nnxf67zljsvnmmd0im76vd24kw660qcls5fj4k3ps" }, "stable": { "version": [ @@ -108865,8 +109256,8 @@ "s", "typescript-mode" ], - "commit": "96bfc5da11a9b83b32368c38e933a405270652de", - "sha256": "1py0z8nrkgh3lzsmgxq62bi2nbdx3c97194frjyb5wl81kh4pbbp" + "commit": "4cf6a0d89da7f946565a425a632ee2410a40c7da", + "sha256": "1gjchqdrwjpnlkn0zzppx81mgvbnlzyh81dxcad41h6n1xadpbg8" }, "stable": { "version": [ @@ -109080,11 +109471,11 @@ "repo": "aimebertrand/timu-rouge-theme", "unstable": { "version": [ - 20220525, - 1239 + 20220717, + 2158 ], - "commit": "5c6f406bf5815e6b72b09093b651b09c7c6769fc", - "sha256": "04wjz4xzbb5ps16bfvwd39ifh7y880g4n1di76kn9mylc445a0kq" + "commit": "bbfc8bbba01e5caa9d11628f0bc2276605c75901", + "sha256": "0r2647yll9yx9i5i1j2gqr8ammxll5pc367prs9jz8il6nd4irpa" }, "stable": { "version": [ @@ -109103,11 +109494,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20220604, - 1042 + 20220808, + 2051 ], - "commit": "1051753f371535c0af2008a372a456b3769c7f69", - "sha256": "1nfl9r99w5gfdf7z00f4kha4b9z3zw4x9nv0qnbph4xb6milc4dj" + "commit": "65fd97f36cfcf64be721297ee596fc9c5adf5c9b", + "sha256": "1pfn1pzm6cn7z3nmzbfk8pzxliqp07b5snvxiv2j09r81wsfl4jm" }, "stable": { "version": [ @@ -109159,11 +109550,11 @@ "repo": "aaronbieber/tiny-menu.el", "unstable": { "version": [ - 20161213, - 1235 + 20220725, + 1748 ], - "commit": "05563b94537b6eb22aeddedef2a6e59e3f88d073", - "sha256": "0k0djq60mwhjiwy9dpy9m9bs507b9p19pdl3g2s8sd9i2fk53rfy" + "commit": "17eacfd1d44cd4d5482d32eac63229230c3cd3fc", + "sha256": "1yds5881r6yqpy3smhj57wlm5aadlk70ai8s2x2pf4gma5mvnh2j" } }, { @@ -109207,11 +109598,11 @@ "url": "https://codeberg.org/acdw/titlecase.el", "unstable": { "version": [ - 20220516, - 1909 + 20220728, + 2253 ], - "commit": "ca79d9b25e8bab5eef92b13dc69ac0c38ac39172", - "sha256": "179h6pzz2nw6b7zbp6w67xckhh12fibk02wh1jyv1i8nic32sfr1" + "commit": "1fc48a505a0bf7d0e8b1bb25425993212576a3ef", + "sha256": "1hvkcf2crpf23p241mcaack6mr43p1p18772gckg56iw8bw8n14f" }, "stable": { "version": [ @@ -109295,11 +109686,11 @@ "repo": "dalanicolai/toc-mode", "unstable": { "version": [ - 20211229, - 1334 + 20220723, + 1725 ], - "commit": "4c9ce0f54d1e3e0c7c75c7f3c2d9a4d50287ca18", - "sha256": "06r0p0lc851g2dmvc2mxhq2kqwqyvhdc8436x3blgdb59cyh9ash" + "commit": "0671d11654db7f7f33d023006d0d2f3d60e85147", + "sha256": "19n3xmln6wk0v4i5inc574qw3d68kn0rjv6qqxs753my2ahd2vq4" } }, { @@ -109465,11 +109856,11 @@ "url": "https://git.sr.ht/~tok/tok-theme", "unstable": { "version": [ - 20220713, - 748 + 20220718, + 1215 ], - "commit": "3c88eca01a7978c8e425b714346631227e68f3e1", - "sha256": "0bnmx2iaa9sgkaxlv5dd2kmfrwli5zdnq1f8fi45yqqnfy9nxxnz" + "commit": "f6d036b3213f277b0da86eb0e0f333f469eca643", + "sha256": "1nwkw002ah3p9ss7dpkq35q49k8bf4z06qb5yf4hr37w4dc75dg1" } }, { @@ -109486,8 +109877,8 @@ "deps": [ "magit-section" ], - "commit": "08db7ef62b3bcab5e1e1abf0a427d478db04420b", - "sha256": "01zyk465w5j74jal1nqcn00ppn093mg227zj5glgx21qvym0lms2" + "commit": "181021cd881eecd604a546d4a717866a81c7a511", + "sha256": "0gcjlcfxd4bg123gjf7d0vfvfd6zpd0da8svynglca1qhp77jkx1" }, "stable": { "version": [ @@ -109599,11 +109990,11 @@ "repo": "trevorpogue/topspace", "unstable": { "version": [ - 20220702, - 609 + 20220803, + 2258 ], - "commit": "0399f73f9b976737f51ad8079ad620673eb0106c", - "sha256": "0rprfg1gjd7bxhlhjan715035bxakjf9m44i76d614g6vc158zs1" + "commit": "fa67b67e1ae41adb44de0e5180a6cab922da6bb0", + "sha256": "1v78pmv6554qb9b4s2i19vvxncsp914qblyyv95zbq8id3k3v606" }, "stable": { "version": [ @@ -109946,11 +110337,11 @@ "repo": "cuspymd/tramp-term.el", "unstable": { "version": [ - 20220412, - 1546 + 20220725, + 1441 ], - "commit": "e2e5375a444d4eb5d144bef12e066c02befd1352", - "sha256": "1jdjf2m4kdq13ipx1mn57bj28n2wfnjd89xvxbw3cn4im61j7iyw" + "commit": "ed75189122737d301f716a30a8013205aa3736f1", + "sha256": "1629qsl2xsz5qwmvwl2wdfnlj6wlhvrb34wc33dd11n8szrvbk6h" } }, { @@ -109979,14 +110370,14 @@ "repo": "magit/transient", "unstable": { "version": [ - 20220527, - 2213 + 20220806, + 2224 ], "deps": [ "compat" ], - "commit": "a583d2b2f5f8963f08cb5a15a4d4dd55faa13585", - "sha256": "1dgwyqkl86nqqyjv8fqipyb61if6gkd2awm572smybh3k3z3w0rn" + "commit": "3b267425c0fe93a518a703d814cff3cf6a304a97", + "sha256": "04xdaap7hqx42mpwwxdvlmmsffbdv107jqkvy6pifwjl2mmz2p5v" }, "stable": { "version": [ @@ -110319,16 +110710,16 @@ "repo": "ShuguangSun/tree-sitter-ess-r", "unstable": { "version": [ - 20220710, - 515 + 20220801, + 1453 ], "deps": [ "ess", "tree-sitter", "tree-sitter-langs" ], - "commit": "2781d18303110549b4e61cb6b465b1dcbe3635f8", - "sha256": "0zxy9263v5sp0sv9l10ps7i7czsjr3vj27kl09wf92mhykxqcjx9" + "commit": "52fcf9a83dc3ec1cbd0b662794a59cfc23eaa204", + "sha256": "08mr4scy3pw45hghbss71akdy08qqdsphwfw59pmdjs36m65ik1r" } }, { @@ -110454,8 +110845,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220622, - 2016 + 20220801, + 1910 ], "deps": [ "ace-window", @@ -110467,8 +110858,8 @@ "pfuture", "s" ], - "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", - "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" + "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", + "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" }, "stable": { "version": [ @@ -110504,8 +110895,8 @@ "all-the-icons", "treemacs" ], - "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", - "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" + "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", + "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" }, "stable": { "version": [ @@ -110535,8 +110926,8 @@ "evil", "treemacs" ], - "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", - "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" + "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", + "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" }, "stable": { "version": [ @@ -110565,8 +110956,8 @@ "deps": [ "treemacs" ], - "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", - "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" + "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", + "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" }, "stable": { "version": [ @@ -110596,8 +110987,8 @@ "pfuture", "treemacs" ], - "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", - "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" + "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", + "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" }, "stable": { "version": [ @@ -110629,8 +111020,8 @@ "persp-mode", "treemacs" ], - "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", - "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" + "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", + "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" }, "stable": { "version": [ @@ -110662,8 +111053,8 @@ "perspective", "treemacs" ], - "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", - "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" + "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", + "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" }, "stable": { "version": [ @@ -110694,8 +111085,8 @@ "projectile", "treemacs" ], - "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", - "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" + "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", + "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" }, "stable": { "version": [ @@ -110725,8 +111116,8 @@ "dash", "treemacs" ], - "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", - "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" + "commit": "aa3f4547c3cb32b0b6b25bfab215228d9d848162", + "sha256": "0srm2gnhakng4sfi5yz8iikbijxpfxgqjhdxwgc5sybdnn2dkqha" }, "stable": { "version": [ @@ -111071,14 +111462,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20220713, - 1857 + 20220719, + 148 ], "deps": [ "caml" ], - "commit": "978acff45e99f011896b7f4718b289dd5ea12998", - "sha256": "0zf4snd235sfifa2k6qdifmp3ai5j2yqagxjh1shlzw1i17f9q2k" + "commit": "ad8a688b7e2aeeafc320a845f86cdd9aa7c971ce", + "sha256": "0vma9ylyaxrl21a3g4vlzd9iqpwallchaar3p7v0dyp5cf8xxvfw" }, "stable": { "version": [ @@ -111353,11 +111744,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20220705, - 2151 + 20220805, + 2008 ], - "commit": "83bf47e406761d951bd9eab2f0674e4fa3874a1b", - "sha256": "1f9wnmw6dz22nd5liyadjic2na8zlqflzvqdmrhlaj575k2fr56g" + "commit": "d1123e0e96da3535a22380e9345249730e756966", + "sha256": "0lp2mbfzpvcr08kgk2mgrlmpzxkq4kbaj53qsv6jbkfdcbv48x3i" }, "stable": { "version": [ @@ -111828,11 +112219,11 @@ "url": "https://codeberg.org/ideasman42/emacs-undo-fu.git", "unstable": { "version": [ - 20220710, - 351 + 20220731, + 2326 ], - "commit": "2c00eff32487e90d40588dcc69dc0e8d40a99f61", - "sha256": "1p4bg3c9ph5hcdwwx9h0qpm415vfi0frisi49zac3q60q90bqx9m" + "commit": "b0d6eba024ac87a0aaf7fa66ae76d76f6c764d46", + "sha256": "1h68p5dy11mmmn680smhh748gxk3ch11lsjfp10wskrhahvfix7y" } }, { @@ -111843,11 +112234,11 @@ "url": "https://codeberg.org/ideasman42/emacs-undo-fu-session.git", "unstable": { "version": [ - 20220710, - 1043 + 20220731, + 2356 ], - "commit": "c95d1fbb28cb38fc68f3ba7cb5ef0e0136055118", - "sha256": "0ylbapnrn2n7piblsf0vafj99na2jbhzgw721mdvy25qmaiz59vd" + "commit": "48544cb102fd3d761acf92598076b20bbb4075f9", + "sha256": "1qyb9ssglg0wnrrpkaqdkrc01f88i976c9fg7hyd7pknfjg7glrf" } }, { @@ -112539,14 +112930,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20210207, - 1926 + 20220809, + 42 ], "deps": [ "bind-key" ], - "commit": "0ad5d9d5d8a61517a207ab04bf69e71c081149eb", - "sha256": "112g1944iirjlvfw8fxwd1iy6z8yfawf4qz5jv3aj087cxli55ww" + "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", + "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" }, "stable": { "version": [ @@ -112569,8 +112960,8 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20181024, - 2322 + 20220807, + 1556 ], "deps": [ "bind-chord", @@ -112578,8 +112969,8 @@ "key-chord", "use-package" ], - "commit": "0ad5d9d5d8a61517a207ab04bf69e71c081149eb", - "sha256": "112g1944iirjlvfw8fxwd1iy6z8yfawf4qz5jv3aj087cxli55ww" + "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", + "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" }, "stable": { "version": [ @@ -112634,15 +113025,15 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20180913, - 1501 + 20220807, + 1558 ], "deps": [ "system-packages", "use-package" ], - "commit": "0ad5d9d5d8a61517a207ab04bf69e71c081149eb", - "sha256": "112g1944iirjlvfw8fxwd1iy6z8yfawf4qz5jv3aj087cxli55ww" + "commit": "e5f64cc6d9d0df3721b319eeecca1f4f49ea86a3", + "sha256": "1108x07jf9cfgi5wyy18v0dr6vjpssl19032q9g0vci5mpi5k123" }, "stable": { "version": [ @@ -112764,14 +113155,14 @@ "repo": "diml/utop", "unstable": { "version": [ - 20210607, - 1941 + 20220719, + 2111 ], "deps": [ "tuareg" ], - "commit": "a779b0515c98819cadec8e2e5ffc580f12df9bf1", - "sha256": "04gqc4c71k6vy7n9haghni9yh5ky621ynrvpsml9iph6akrabga8" + "commit": "bbd9a6ed45c8de8d50adcd5d4d845bdba212db63", + "sha256": "1r82434cdzls98f06xlwamnwf8xp9yv933jsq8j8cvir4qiq84hw" }, "stable": { "version": [ @@ -112922,11 +113313,11 @@ "repo": "ottbot/vagrant.el", "unstable": { "version": [ - 20211206, - 1634 + 20220730, + 302 ], - "commit": "a232b7385178d5b029ccc5274dfa9b56e5ba43a1", - "sha256": "1i345jyhh1g10hlcvs3c34glk5r09k1i4dxmmrwfhpy1f759h10m" + "commit": "eb4ec2053955eda1ac9e5ff92ded88f1919e13f2", + "sha256": "1gdscbsbaiz84hk1izn2yr29glvyy4ld6msbck38pn41zkbdz9b2" }, "stable": { "version": [ @@ -113181,8 +113572,8 @@ "deps": [ "popup" ], - "commit": "720c6f0e699f25463cd37642ee23adb4e23bc60b", - "sha256": "0pn4gpxzgxlz12h4yymqdfmvic51jc5s3b973wl3qjizv1j1062l" + "commit": "153f493a50e64263bcfd5210c47bbeeac8a68a01", + "sha256": "0q8zgrh7c8zginq44vqckbv24as7h8r4hcmw2pyqy1hdgxfrxjv7" }, "stable": { "version": [ @@ -113515,11 +113906,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20220214, - 943 + 20220727, + 1923 ], - "commit": "f6fd85d913c39603695e52d258d02e6030e3d42d", - "sha256": "032s7i4gg7cc35cqa816sji8bhww2wzlihizvvbbzplsz435mdbs" + "commit": "e3b3c146d7bf8fb12295338aded6a96ff4fb1752", + "sha256": "1pb01z7fyh4s4crn5ndzjkyic5n1kbr7nphsmy7lw4i2had3ac2d" }, "stable": { "version": [ @@ -114589,11 +114980,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220606, - 2300 + 20220805, + 157 ], - "commit": "e3ca74f62602e69af5ff3271bd98977bd490e9de", - "sha256": "0jznj2zh2bb32sy7cgwkb8sy4x9w63y8f929nq6271s6ljg8akc2" + "commit": "a8e2e5c7b7576afd7b097b40c6ca39e5717f97a5", + "sha256": "0vqq69jkx11d8m9g9v2m4zvpq3khkdhvgzvpcszvic4fvaa65jpc" } }, { @@ -114711,15 +115102,16 @@ "repo": "corgi-emacs/walkclj", "unstable": { "version": [ - 20220422, - 854 + 20220719, + 1610 ], "deps": [ + "a", "parseclj", "treepy" ], - "commit": "ce4e7713d801b03f94f5da9898fce09718380ed4", - "sha256": "1r66fxbm39i1p75aizicravy2n8yjnj3m5nckzdqd86nw2v5d5c6" + "commit": "875ee7a350f5141f425c4b5350a630e1ee1795e8", + "sha256": "1390qxghf1q11n1gpk6brqzdlvj4jn6dzl6a6d08nbv95wm3ppq3" }, "stable": { "version": [ @@ -114853,16 +115245,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20220710, - 221 + 20220720, + 1344 ], "deps": [ "apel", "flim", "semi" ], - "commit": "d0296bb70abe97fdc3d855ee76eff0414a5fae62", - "sha256": "0n4h4486bzqk6wlqlc7p05ahiwqr7pbhgfc0j5hgz188lf9kjqra" + "commit": "a3847bf379ac92e39ac7188071707551d1628ccb", + "sha256": "0g44bzwxbnql9mqg6n1v5xqwkzyd6srgq007phc9za6x8vclr8yx" } }, { @@ -115332,6 +115724,30 @@ "sha256": "07hj9nr7x6c9w2dnvc58cfbprgp9cqzdxflp5qlpglzdw0bi9s3c" } }, + { + "ename": "websearch", + "commit": "21936b2b821a564c02415d31982cbf0af8b05049", + "sha256": "1y7nh200ckjd2h2zfki4sc3464jv0g4x3g2g9vc90hyg1yvq1vcy", + "fetcher": "gitlab", + "repo": "xgqt/emacs-websearch", + "unstable": { + "version": [ + 20220809, + 1338 + ], + "commit": "362bf974532e01c31d4abb340ed3f749da385175", + "sha256": "104ajdhxm9hsc7zrs1lxzqscnlnd01vs7s7y72fb0n03f5jyg853" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "c20c42177ee9268ac29dc00ab6533719ad5c59bc", + "sha256": "104ajdhxm9hsc7zrs1lxzqscnlnd01vs7s7y72fb0n03f5jyg853" + } + }, { "ename": "websocket", "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", @@ -115873,11 +116289,11 @@ "url": "https://codeberg.org/akib/emacs-why-this.git", "unstable": { "version": [ - 20220601, - 1132 + 20220722, + 1608 ], - "commit": "0975f5b57ffc77bf4aa871aa313085b80c5e43cd", - "sha256": "1lilp6adi8k1f6ww02mzr729h22paz7daqvlych07qm7aznl37aq" + "commit": "4552587fd48263509cbaf2edfbfaf4536049cb20", + "sha256": "0nmvwpc2s7w9mkzkjgjnbb32527xn9pb62392yyb5c46w35shm06" } }, { @@ -116723,14 +117139,14 @@ "url": "https://codeberg.org/martianh/wordreference.el", "unstable": { "version": [ - 20220601, - 650 + 20220806, + 1022 ], "deps": [ "s" ], - "commit": "1c5ea8bd88b32571d3f4be64c1ad73784af83136", - "sha256": "006ib6b0zznm014y83sqhahqdm5i3vv69f6p30w65d46yc2fhjdp" + "commit": "fd46c30ddc3abd6124b9057110fb0cbdc242937a", + "sha256": "18gfhgqchlpbpbd6lyfx1sb548f07lw970ff8896rra8jz5jy565" } }, { @@ -117070,11 +117486,11 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20220526, - 1431 + 20220728, + 1358 ], - "commit": "fe5dfb4e4db38f9fc944509a687812b8f419b958", - "sha256": "05h5wxzwzl5almgsk2mjas8in7h5kfmb06r3lfrwgydwxl3wmqnl" + "commit": "a7fe5428c88522a121c22b5811cb499a16fd8fa8", + "sha256": "0h86qv4s3kv03cq89h2nbbda47p2pi2vbdpc1anaxhzd3gclxfb8" }, "stable": { "version": [ @@ -117611,11 +118027,11 @@ "url": "https://codeberg.org/ideasman42/emacs-xref-rst.git", "unstable": { "version": [ - 20220708, - 211 + 20220710, + 1033 ], - "commit": "c497c0d9b97692a39c984d0e6bb06dcdc4ad0082", - "sha256": "17whfpdwliafpfnf7qbkapmk92gqm4hwycb91mpa8gbz133xa9nf" + "commit": "e1dd4439e535185a0cd195bb392f70982cf5aadc", + "sha256": "0snl51bnm69zwb8wm8yr0xr263m2sr6f2b1d30p1yp0p0jv40i33" } }, { @@ -117925,11 +118341,11 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20220713, - 358 + 20220720, + 2359 ], - "commit": "0ac7f365bb6b4507259b31679bb37ac291e1f1c7", - "sha256": "0n0cf5y862ajyf2q0pnvbkhg57ggsri33x8y4q99s0a17ksk4qrm" + "commit": "73fde9d8fbbaf2596449285df9eb412ae9dd74d9", + "sha256": "05jxnmaypp4vcbx7c1i6v8bikzj3cqdgb7ll23dnzq10slxy1rm5" }, "stable": { "version": [ @@ -117995,6 +118411,36 @@ "sha256": "0gsa153yp8lmwrvcc3nzpw5lj037y7q2nm23k5k404r5as4k355l" } }, + { + "ename": "yaml-pro", + "commit": "7d95324723efbb063eccdda9ee33b2b1b6a0db8f", + "sha256": "1jip206lc09v91wnlv2pvk41lhi2sfsns631cvqkxi1q1g7abcka", + "fetcher": "github", + "repo": "zkry/yaml-pro", + "unstable": { + "version": [ + 20220722, + 334 + ], + "deps": [ + "yaml" + ], + "commit": "3e698c625c716a1f85e64b9b839241cb56f0db92", + "sha256": "0c0p07g6zjpfnmac368iigw63zl7fylxawx8rbmcwzkb5yrbq4xq" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "deps": [ + "yaml" + ], + "commit": "3e698c625c716a1f85e64b9b839241cb56f0db92", + "sha256": "0c0p07g6zjpfnmac368iigw63zl7fylxawx8rbmcwzkb5yrbq4xq" + } + }, { "ename": "yaml-tomato", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -119097,14 +119543,14 @@ "repo": "ymherklotz/emacs-zettelkasten", "unstable": { "version": [ - 20210830, - 1025 + 20220727, + 1137 ], "deps": [ "s" ], - "commit": "9eb18ecd93895a9894970fa85b68257da647812d", - "sha256": "0nmbbrw36bkxygh5pllfa9i1z20b0wzrax7bcz049syjkfl3l621" + "commit": "edba7bcfdc054ad0ff1952bb525f5709a687db25", + "sha256": "06rb7frgw1vja7azsd9cxzkbvlr7xpzapgqypsc777szncz06xhi" }, "stable": { "version": [ @@ -119214,11 +119660,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220707, - 1957 + 20220722, + 1626 ], - "commit": "f72397e1244fc9a2eb0be7f07b5a60c584545f24", - "sha256": "1jszbgimsd2zv7mh0h0cyjigm1sxjr9hvkyah0j07rz8all0svk9" + "commit": "d997b13e7a03f7c3c7411183641bd0dc89526ec9", + "sha256": "04nqd7mhv8s2sp68vk14x4p9gmw4z9gayvyl5zl5ilv1zlchkiwv" }, "stable": { "version": [ @@ -119237,14 +119683,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220713, - 2002 + 20220723, + 1824 ], "deps": [ "zk" ], - "commit": "f72397e1244fc9a2eb0be7f07b5a60c584545f24", - "sha256": "1jszbgimsd2zv7mh0h0cyjigm1sxjr9hvkyah0j07rz8all0svk9" + "commit": "d997b13e7a03f7c3c7411183641bd0dc89526ec9", + "sha256": "04nqd7mhv8s2sp68vk14x4p9gmw4z9gayvyl5zl5ilv1zlchkiwv" }, "stable": { "version": [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix index 867f7214d3..8d210f822b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/macport.nix @@ -5,20 +5,20 @@ stdenv.mkDerivation rec { pname = "emacs"; - version = "27.2"; + version = "28.1"; emacsName = "emacs-${version}"; - macportVersion = "8.3"; + macportVersion = "9.0"; name = "emacs-mac-${version}-${macportVersion}"; src = fetchurl { url = "mirror://gnu/emacs/${emacsName}.tar.xz"; - sha256 = "1ff182gjw9wqsbx1kj5gl2r5pbqhp4ar54g04j33fgz6g17cr9xl"; + sha256 = "1qbmmmhnjhn4lvzsnyk7l5ganbi6wzbm38jc1a7hhyh3k78b7c98"; }; macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${emacsName}-mac-${macportVersion}.tar.gz"; - sha256 = "0q4lbk3nb8rz1ibmf23plgsh8sx2wvhry5bf5mivgz4m4b6s2yij"; + sha256 = "10gyynz8wblz6r6dkk12m98kjbsmdwcbrhxpmsjylmdqmjxhlj4m"; name = "${emacsName}-mac-${macportVersion}.tar.xz"; # It's actually compressed with xz, not gz }; @@ -57,7 +57,6 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace '/bin/pwd' 'pwd' substituteInPlace lib-src/Makefile.in --replace '/bin/pwd' 'pwd' - # Reduce closure size by cleaning the environment of the emacs dumper substituteInPlace src/Makefile.in \ --replace 'RUN_TEMACS = ./temacs' 'RUN_TEMACS = env -i ./temacs' @@ -114,7 +113,7 @@ stdenv.mkDerivation rec { extensions are distributed with GNU Emacs; others are available separately. - This is the "Mac port" addition to GNU Emacs 26. This provides a native + This is the "Mac port" addition to GNU Emacs. This provides a native GUI support for Mac OS X 10.6 - 10.12. Note that Emacs 23 and later already contain the official GUI support via the NS (Cocoa) port for Mac OS X 10.4 and later. So if it is good enough for you, then you diff --git a/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix b/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix index 6bf26b525b..f7dc988de1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/greenfoot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "greenfoot"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { # We use the deb here. First instinct might be to go for the "generic" JAR # download, but that is actually a graphical installer that is much harder # to unpack than the deb. url = "https://www.greenfoot.org/download/files/Greenfoot-linux-${builtins.replaceStrings ["."] [""] version}.deb"; - sha256 = "sha256-K9faU3ZarcR4g8riHpoZYVH0sXtueqfm3Fo+sZAHJA8="; + sha256 = "sha256-wGgKDsA/2luw+Nzs9dWb/HRHMx/0S0CFfoI53OCzxug="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix index 1cffa831ef..fe92848735 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jedit/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation { sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.vbgl ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json index 7e48ace516..c38506432f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/versions.json @@ -3,294 +3,330 @@ "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", - "version": "2022.1", - "sha256": "a8ad8db6362d60a5ce60a7552110887dbd12e8420c839c368b55808b68dea38b", - "url": "https://download.jetbrains.com/cpp/CLion-2022.1.tar.gz", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "6f0234d41c4ca1cf8eaa4ea5585ba4cfc17d86c16c78edc59501e0ca05a80d56", + "url": "https://download.jetbrains.com/cpp/CLion-2022.1.3.tar.gz", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", - "version": "2022.1.1", - "sha256": "d4ffcb4371ee6e9f03704fa6282630349fd4ff4759846c02d43bb37e3caeae67", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.tar.gz", - "version-major-minor": "2022.1.1" + "version": "2022.1.5", + "sha256": "688fcb5996d9bdffd0735e14d10171cfefc72bc482dd773102dcc9e28e245ab8", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5.tar.gz", + "version-major-minor": "2022.1.1", + "build_number": "221.5787.39" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2022.1", - "sha256": "7803f432b62b7b9a9f340fd48375f50d60b0e5412b052b70e175de8edf82a947", - "url": "https://download.jetbrains.com/go/goland-2022.1.tar.gz", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "b96a1cb1b6be1d1e55c85de551fbd94b9a8c0566193d784f3bc408da60e6904e", + "url": "https://download.jetbrains.com/go/goland-2022.1.3.tar.gz", + "version-major-minor": "2022.1", + "build_number": "221.5921.26" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", - "version": "2022.1", - "sha256": "0400e6152fa0173e4e9a514c6398eef8f19150893298658c0b3eb1427e5bcbe5", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.tar.gz", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "f8a14e3ab100cf745dc7e329e13bd31961cd728c6b7676493b9ffb4e290a9543", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3.tar.gz", + "version-major-minor": "2022.1", + "build_number": "221.5921.22" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-no-jbr.tar.gz", - "version": "2022.1", - "sha256": "f786bbd4a7c82273f6871996584fb7b37aa2b32fb07c7f554076f203284c77b6", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.1-no-jbr.tar.gz", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "97748cd2dacf74701eb4ec30227d96a9b5ab5c09afc7e59443669ab839d20d02", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3-no-jbr.tar.gz", + "version-major-minor": "2022.1", + "build_number": "221.5921.22" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2021.3", - "sha256": "e9aeb62f0d667dd285f808e3ba308f572797dbf11d51e9aa06cf49481bee857f", - "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3.tar.gz", - "version-major-minor": "2021.3" + "version": "2021.3.1", + "sha256": "b7d41c4362e71f30adeaed9f0ec30afd5ac0e6eea9650ee4a19d70a5783db3e6", + "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3.1.tar.gz", + "version-major-minor": "2021.3", + "build_number": "213.7172.958" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2022.1", - "sha256": "e30d6991c98addcc02ab05c623d0c42797d605db73c01b7c153bf2246c877395", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.tar.gz", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "ea5d005f3aee2588dd725bd3aa87d5e3beb51ac87b1505f34263f9da3babd360", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3.tar.gz", + "version-major-minor": "2022.1", + "build_number": "221.5921.28" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2022.1", - "sha256": "35d857df0ac4bd76caba60ac329c9183594be142094d0592f2afa40534be85eb", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.tar.gz", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "888595caa9510d31fd1b56009b6346fd705e8e7cd36d07205f8bf510b92f26a5", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3.tar.gz", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2022.1", - "sha256": "9b160ed74f384be31ff376af73f91924a212e6440ce142a581b22f261e6cf605", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.tar.gz", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "f8b9a761529358e97d1b77510a8ef81314bccdfb0fa450f2adcd466ba1fd0bf5", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3.tar.gz", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", - "version": "2022.1", - "sha256": "e5d2018bf352f4ff17299d2ee4f286d654946fe4dac2ff47d3dc853820364673", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.tar.gz", - "version-major-minor": "2022.1" + "version": "2022.1.2", + "sha256": "4513e55d3db013986bdfda52854f89fb127a153f2588ae456d6e7a182987b741", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2.tar.gz", + "version-major-minor": "2022.1", + "build_number": "221.5787.36" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", - "version": "2022.1", - "sha256": "495c0d86eb7f3bed0ed692a7ae37e8b3b333c58ae891ca3891a311db6b951401", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.tar.gz", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "9d9c729bd1908a865c72c215b25525e3b82ffee46986b58b747cb502dc6ec2f4", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3.tar.gz", + "version-major-minor": "2022.1", + "build_number": "221.5921.22" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", - "version": "2022.1", - "sha256": "d9dd5815cc456d74f7dc47533ade3990d0f2f9ce0c4dab3d5ae9b04e01d1746c", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.tar.gz", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "cc32c57753f1846f2679cef27a365aebcdacfbbffaea9f33bef1d0da6032ed6c", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3.tar.gz", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" } }, "x86_64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", - "version": "2022.1", - "sha256": "4972403e5ed7587ad76dcfb08b975879a2a955e9be9f88344e369cd4006b2d52", - "url": "https://download.jetbrains.com/cpp/CLion-2022.1.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "6358b42546906c43e46499ea176f901df83ed8c922af65aad068ed048248138d", + "url": "https://download.jetbrains.com/cpp/CLion-2022.1.3.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", - "version": "2022.1.1", - "sha256": "6ea0c0c972bad06fd0378a2c1e9a1cb1b3ec50d52cc98d0f9c98327cc7af2a1e", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1.dmg", - "version-major-minor": "2022.1.1" + "version": "2022.1.5", + "sha256": "ac96ab12d7b4593df21cd466b3cea26bcce0db2c2eb92b5d31456887f500032b", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5.dmg", + "version-major-minor": "2022.1.1", + "build_number": "221.5787.39" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2022.1", - "sha256": "ec44455e83b8c8d85614b63815245a0dff984796a432e05801787c7f8474900b", - "url": "https://download.jetbrains.com/go/goland-2022.1.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "5a6821d54cd8777c937fe4dc1ef1d6cab528a24419ac0c751df6bd877a264610", + "url": "https://download.jetbrains.com/go/goland-2022.1.3.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.26" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", - "version": "2022.1", - "sha256": "6f9dddab5c280bb2ad6bb8d46bcc85c1b167974ce4b412a68faf31f7f7d1c194", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "63637f764018d50717a54c7088be6038f14fbdc8240b3e84fddecf9747471f01", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.22" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", - "version": "2022.1", - "sha256": "2f1e51db514b39b54cb4029815b7f92764b378f2cf2eb16e69e2ee3c0b35f416", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "7297867bb7c5041015ff2e68415e35537c37bf500c53a5e003c82fc6af9515ab", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.22" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2021.3", + "version": "2021.3.1", "sha256": "2c5517518fec31ac960e4309fa848ad831f9048ef15df1b362e12aa8f41d9dbd", - "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos.dmg", - "version-major-minor": "2021.3" + "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1-macos.dmg", + "version-major-minor": "2021.3", + "build_number": "213.7172.958" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2022.1", - "sha256": "daa3c749b3a41e106384ac8e003957a46f38dfc844cebfce8c802c4a223535b8", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "306e3bb8224bfb538d02fa33c777d744d369814f460fe254150d722507827abf", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.28" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2022.1", - "sha256": "99ba20a8b0752ca58e1fc814fb19766fd19c376b42e3cbfa4102c67bc21942ec", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "d653aaf52be86d7327d566f03a61a5ce4dfd8059948d1d612833215410dde09b", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2022.1", - "sha256": "ab5496370a6145073dbd423e47d6112d9c726a4a286d2528e66711f865d92d56", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "af7594948effdbe5c9a704185d8abd65a23aab5098059f3fbfef4f29c777fd98", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", - "version": "2022.1", - "sha256": "38867fb7ca4b5af013f33b4db3b15994b6e732b121176f98480b5ff1b49ef17e", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.2", + "sha256": "ddcf6544e7302632a117ec00cf2e20688b53a47319114418fa55f7304bf49b82", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5787.36" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", - "version": "2022.1", - "sha256": "b33f34b889fde6ebe6348499e2ad15bb85937aba1e2a8a9543c411b2476ec4ff", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "1088ef00fef9e63cc3b24c90b4b86e20a473b1d3c72c18b0926e76a41218956f", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.22" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", - "version": "2022.1", - "sha256": "0bd2be5ea0ccabfb7a806ca4c46d33f1e9106c2256243c48091ff61d5ac29a08", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "85c73a9c5415eecb18d11e22e8b6aced4c16908aaec129c5a1a7241e5f354c2a", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" } }, "aarch64-darwin": { "clion": { "update-channel": "CLion RELEASE", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", - "version": "2022.1", - "sha256": "333d4ac5757f537ad67863dd6fb03644722ab8fce1596976fa99e5ae9de7991c", - "url": "https://download.jetbrains.com/cpp/CLion-2022.1-aarch64.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "60f3f83cc1e526f126c89c444928c2ab5dfaf26aab109de5f05baca2fdf20a24", + "url": "https://download.jetbrains.com/cpp/CLion-2022.1.3-aarch64.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" }, "datagrip": { "update-channel": "DataGrip RELEASE", "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg", - "version": "2022.1.1", - "sha256": "2ba92ed34366b111a39ba0632d91dbaf232633f5f5557a208dd8ab7696179b6f", - "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.1-aarch64.dmg", - "version-major-minor": "2022.1.1" + "version": "2022.1.5", + "sha256": "31df43a4f1adab562730adade212916091fc7f7090121001840c1453d2037694", + "url": "https://download.jetbrains.com/datagrip/datagrip-2022.1.5-aarch64.dmg", + "version-major-minor": "2022.1.1", + "build_number": "221.5787.39" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2022.1", - "sha256": "0506a817e35a80d3d776484a88bf4136628b589a8f5754833387a8dec99798d3", - "url": "https://download.jetbrains.com/go/goland-2022.1-aarch64.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "5e29fbd0b2ed2ea06445ee378fd12f8172cfffb122652d26579b7dfea6c774e5", + "url": "https://download.jetbrains.com/go/goland-2022.1.3-aarch64.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.26" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", - "version": "2022.1", - "sha256": "f61bdf70e373a948a71331e68a7303bf90cf47ea4e2f97338aaf96d19e8862c4", - "url": "https://download.jetbrains.com/idea/ideaIC-2022.1-aarch64.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "b436120ee2bb380f30e29582c3958e110d9c85186bde6af6fe5c571c75e99df8", + "url": "https://download.jetbrains.com/idea/ideaIC-2022.1.3-aarch64.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.22" }, "idea-ultimate": { "update-channel": "IntelliJ IDEA RELEASE", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", - "version": "2022.1", - "sha256": "af9c0e8d47fcded5f567293b7991fd0ac8df838b83884149109fd91ec2dec769", - "url": "https://download.jetbrains.com/idea/ideaIU-2022.1-aarch64.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "0f0ec167c0394b7d4969cb0b95e08e2b469e811a1aa515971bc84d5ef4d54def", + "url": "https://download.jetbrains.com/idea/ideaIU-2022.1.3-aarch64.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.22" }, "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2021.3", - "url": "https://download.jetbrains.com/mps/2021.3/MPS-2021.3-macos-aarch64.dmg", + "version": "2021.3.1", + "url": "https://download.jetbrains.com/mps/2021.3.1/MPS-2021.3.1-macos-aarch64.dmg", "sha256": "3ace6d45db718dffd80bf126a76735fb65099de292112a01cc078aa61c475a70", - "version-major-minor": "2021.3" + "version-major-minor": "2021.3", + "build_number": "213.7172.958" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2022.1", - "sha256": "d13744e7a70a9716f1b99cb9b77c77e17cb4710466a29db490ef6e707a54ae21", - "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1-aarch64.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "68c6093701f86b6a31601e159569629ceea87c7db20b8b98089bf8efadb0310e", + "url": "https://download.jetbrains.com/webide/PhpStorm-2022.1.3-aarch64.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.28" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2022.1", - "sha256": "1873565756716cb0eee23c60068dd5d394413b2b2e54b4b75cbe8b882540a0b7", - "url": "https://download.jetbrains.com/python/pycharm-community-2022.1-aarch64.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "0d578b5ab3140ac20e6a0250c2733cc2fa6888b8ab478a046181c273ac6a66cb", + "url": "https://download.jetbrains.com/python/pycharm-community-2022.1.3-aarch64.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2022.1", - "sha256": "ba0ea4ff52703a53a9c7e14d42c9ae12688b94364ced77a28d4ed0c417c9642f", - "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1-aarch64.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "88bcc8acc6bb7bc189466da427cc049df62062e8590108f17b080208a8008a07", + "url": "https://download.jetbrains.com/python/pycharm-professional-2022.1.3-aarch64.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" }, "rider": { "update-channel": "Rider RELEASE", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", - "version": "2022.1", - "sha256": "273f40eda119a034ada821db2257e3b5c2bfb835c287365398237f5d9a9daad3", - "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1-aarch64.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.2", + "sha256": "81ce9020cc2b20f50ce73efe80969b054fce2a62a1736aed877a1141eaf07d4b", + "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2022.1.2-aarch64.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5787.36" }, "ruby-mine": { "update-channel": "RubyMine RELEASE", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", - "version": "2022.1", - "sha256": "06d932a587adcd25b4e70d0b27c2c229381144deaef90cbcdc345edd822e04ed", - "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1-aarch64.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "ed4b77ad69207872190b3200143c8bca50234c19539fcaaf55bfa4643e7be3b0", + "url": "https://download.jetbrains.com/ruby/RubyMine-2022.1.3-aarch64.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.22" }, "webstorm": { "update-channel": "WebStorm RELEASE", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", - "version": "2022.1", - "sha256": "96ec148af1b20ea9d2cb6f8b1f268f96607269e8dd3caf521b48464fe21a7177", - "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1-aarch64.dmg", - "version-major-minor": "2022.1" + "version": "2022.1.3", + "sha256": "60de3524c32fbc6dde2989b7ffcfce861c069ce79bded6206dbc587c94f411a2", + "url": "https://download.jetbrains.com/webstorm/WebStorm-2022.1.3-aarch64.dmg", + "version-major-minor": "2022.1", + "build_number": "221.5921.27" } } } diff --git a/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix index 2280c6d9e6..2fd2871448 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jove/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "jove"; - version = "4.17.3.7"; + version = "4.17.4.6"; src = fetchFromGitHub { owner = "jonmacs"; repo = "jove"; rev = version; - sha256 = "sha256-fD87FIWZlfJE2tVX+0QaiGGqu+tJFHheXe1guJR/Hxg="; + sha256 = "sha256-UCjqF0i43TSvtG5uxb2SA/F9oGBeo/WdEVJlrSSHV8g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix index d9805cbb36..bace622004 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix @@ -2,22 +2,27 @@ buildGoModule rec { pname = "micro"; - version = "2.0.10"; + version = "2.0.11"; src = fetchFromGitHub { owner = "zyedidia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hVFmViwGXuYVAKaCkzK/LHjCi8AtLu0tsPpT61glxys="; + sha256 = "sha256-3Rppi8UcAc4zdXOd81Y+sb5Psezx2TQsNw73WdPVMgE="; }; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/micro" ]; - vendorSha256 = "sha256-YcAKl4keizkbgQLAZGiCG3CGpNTNad8EvOJEXLX2s0s="; + vendorSha256 = "sha256-/bWIn5joZOTOtuAbljOc0NgBfjrFkbFZih+cPNHnS9w="; - ldflags = [ "-s" "-w" "-X github.com/zyedidia/micro/v2/internal/util.Version=${version}" "-X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; + ldflags = let t = "github.com/zyedidia/micro/v2/internal"; in [ + "-s" + "-w" + "-X ${t}/util.Version=${version}" + "-X ${t}/util.CommitHash=${src.rev}" + ]; postInstall = '' installManPage assets/packaging/micro.1 diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-override.vim b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-override.vim index 34a1a8f1f4..04ee667601 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-override.vim +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-override.vim @@ -1,7 +1 @@ -" configuration generated by NIX -set nocompatible - -set packpath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir -set runtimepath^=/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-vim-pack-dir - :help ale diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/tests.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/tests.nix index 3163041dab..3f38abee50 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/tests.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/tests.nix @@ -86,9 +86,11 @@ rec { nvim_with_plug = neovim.override { extraName = "-with-plug"; - configure.plug.plugins = with pkgs.vimPlugins; [ - (base16-vim.overrideAttrs(old: { pname = old.pname + "-unique-for-tests-please-dont-use"; })) - ]; + configure.packages.plugins = with pkgs.vimPlugins; { + start = [ + (base16-vim.overrideAttrs(old: { pname = old.pname + "-unique-for-tests-please-dont-use"; })) + ]; + }; configure.customRC = '' color base16-tomorrow-night set background=dark @@ -123,7 +125,7 @@ rec { }); force-nowrap = runTest nvimDontWrap '' - ! grep "-u" ${nvimDontWrap}/bin/nvim + ! grep -F -- ' -u' ${nvimDontWrap}/bin/nvim ''; nvim_via_override-test = runTest nvim_via_override '' @@ -154,12 +156,6 @@ rec { configure.packages.foo.start = with vimPlugins; [ deoplete-nvim ]; }; - # only neovim makes use of `requiredPlugins`, test this here - test_nvim_with_vim_nix_using_pathogen = neovim.override { - extraName = "-pathogen"; - configure.pathogen.pluginNames = [ "vim-nix" ]; - }; - nvimWithLuaPackages = wrapNeovim2 "-with-lua-packages" (makeNeovimConfig { extraLuaPackages = ps: [ps.mpack]; customRC = '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix index 16b19f63d2..c3e4196653 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix @@ -11,21 +11,18 @@ , wrapNeovimUnstable }: let - # returns everything needed for the caller to wrap its own neovim: - # - the generated content of the future init.vim - # - the arguments to wrap neovim with - # The caller is responsible for writing the init.vim and adding it to the wrapped - # arguments (["-u" writeText "init.vim" GENERATEDRC)]). - # This makes it possible to write the config anywhere: on a per-project basis - # .nvimrc or in $XDG_CONFIG_HOME/nvim/init.vim to avoid sideeffects. - # Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc wont be loaded - # anymore, $MYVIMRC wont be set etc + /* returns everything needed for the caller to wrap its own neovim: + - the generated content of the future init.vim + - the arguments to wrap neovim with + The caller is responsible for writing the init.vim and adding it to the wrapped + arguments (["-u" writeText "init.vim" GENERATEDRC)]). + This makes it possible to write the config anywhere: on a per-project basis + .nvimrc or in $XDG_CONFIG_HOME/nvim/init.vim to avoid sideeffects. + Indeed, note that wrapping with `-u init.vim` has sideeffects like .nvimrc wont be loaded + anymore, $MYVIMRC wont be set etc + */ makeNeovimConfig = - { - withPython2 ? false - /* the function you would have passed to python.withPackages */ - , extraPython2Packages ? (_: [ ]) - , withPython3 ? true + { withPython3 ? true /* the function you would have passed to python3.withPackages */ , extraPython3Packages ? (_: [ ]) , withNodeJs ? false @@ -36,10 +33,8 @@ let # expects a list of plugin configuration # expects { plugin=far-vim; config = "let g:far#source='rg'"; optional = false; } , plugins ? [] - # forwarded to configure.customRC + # custom viml config appended after plugin-specific config , customRC ? "" - # same values as in vimUtils.vimrcContent - , configure ? { } # for forward compability, when adding new environments, haskell etc. , ... @@ -54,25 +49,20 @@ let }; # transform all plugins into an attrset - pluginsNormalized = map (x: if x ? plugin then { optional = false; } // x else { plugin = x; optional = false;}) plugins; + # { optional = bool; plugin = package; dest = filename; } + pluginsNormalized = map (x: if x ? plugin then { dest = "init.vim"; optional = false; } // x else { plugin = x; optional = false;}) plugins; - configurePatched = configure // { - customRC = pluginRc + customRC + (configure.customRC or ""); - }; - # A function to get the configuration string (if any) from an element of 'plugins' - pluginConfig = p: - if (p.config or "") != "" then '' - " ${p.plugin.pname or p.plugin.name} {{{ - ${p.config} - " }}} - '' else ""; + pluginRC = lib.concatMapStrings (p: p.config or "") pluginsNormalized; - pluginRc = lib.concatMapStrings pluginConfig pluginsNormalized; - - requiredPlugins = vimUtils.requiredPlugins configurePatched; + pluginsPartitioned = lib.partition (x: x.optional == true) pluginsNormalized; + requiredPlugins = vimUtils.requiredPluginsForPackage myVimPackage; getDeps = attrname: map (plugin: plugin.${attrname} or (_: [ ])); + myVimPackage = { + start = map (x: x.plugin) pluginsPartitioned.wrong; + opt = map (x: x.plugin) pluginsPartitioned.right; + }; pluginPython3Packages = getDeps "python3Dependencies" requiredPlugins; python3Env = python3Packages.python.withPackages (ps: @@ -102,12 +92,16 @@ let let binPath = lib.makeBinPath (lib.optionals withRuby [ rubyEnv ] ++ lib.optionals withNodeJs [ nodejs ]); - flags = lib.concatLists (lib.mapAttrsToList ( - prog: withProg: [ - "--cmd" (genProviderSettings prog withProg) - ] - ) - hostprog_check_table); + hostProviderViml = lib.mapAttrsToList genProviderSettings hostprog_check_table; + + # as expected by packdir + packDirArgs.myNeovimPackages = myVimPackage; + + # vim accepts a limited number of commands so we join them all + flags = [ + "--cmd" (lib.intersperse "|" hostProviderViml) + "--cmd" "set packpath^=${vimUtils.packDir packDirArgs}" + ]; in [ "--inherit-argv0" "--add-flags" (lib.escapeShellArgs flags) @@ -120,11 +114,10 @@ let "--prefix" "LUA_CPATH" ";" (neovim-unwrapped.lua.pkgs.lib.genLuaCPathAbsStr luaEnv) ]; - - manifestRc = vimUtils.vimrcContent (configurePatched // { customRC = ""; }) ; - neovimRcContent = vimUtils.vimrcContent configurePatched; + manifestRc = vimUtils.vimrcContent ({ customRC = ""; }) ; + # we call vimrcContent without 'packages' to avoid the init.vim generation + neovimRcContent = vimUtils.vimrcContent ({ beforePlugins = ""; customRC = pluginRC + customRC; packages = null; }); in - assert withPython2 -> throw "Python2 support has been removed from neovim, please remove withPython2 and extraPython2Packages."; builtins.removeAttrs args ["plugins"] // { wrapperArgs = makeWrapperArgs; @@ -144,10 +137,9 @@ let "let g:loaded_${prog}_provider=0" ; - # to keep backwards compatibility + # to keep backwards compatibility for people using neovim.override legacyWrapper = neovim: { extraMakeWrapperArgs ? "" - , withPython ? false /* the function you would have passed to python.withPackages */ , extraPythonPackages ? (_: []) /* the function you would have passed to python.withPackages */ @@ -162,22 +154,25 @@ let , extraName ? "" }: let - /* for compatibility with passing extraPythonPackages as a list; added 2018-07-11 */ - compatFun = funOrList: (if builtins.isList funOrList then - (_: lib.warn "passing a list as extraPythonPackages to the neovim wrapper is deprecated, pass a function as to python.withPackages instead" funOrList) - else funOrList); + + # we convert from the old configure.format to + plugins = if builtins.hasAttr "plug" configure then + throw "The neovim legacy wrapper doesn't support configure.plug anymore, please setup your plugins via 'configure.packages' instead" + else + lib.flatten (lib.mapAttrsToList genPlugin (configure.packages or {})); + genPlugin = packageName: {start ? [], opt?[]}: + start ++ opt; res = makeNeovimConfig { inherit withPython3; - extraPython3Packages = compatFun extraPython3Packages; + inherit extraPython3Packages; inherit extraLuaPackages; inherit withNodeJs withRuby viAlias vimAlias; - inherit configure; + customRC = configure.customRC or ""; + inherit plugins; inherit extraName; }; in - assert withPython -> throw "Python2 support has been removed from neovim, please remove withPython and extraPythonPackages."; - wrapNeovimUnstable neovim (res // { wrapperArgs = lib.escapeShellArgs res.wrapperArgs + " " + extraMakeWrapperArgs; wrapRc = (configure != {}); diff --git a/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix b/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix index 06d5997af1..2c57eeb390 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-9VbtSpWiSVNRydqpTJ0Zd2/9mXy18Drl6q61BHZ0zrs="; + sha256 = "sha256-kEqoL4S/eHsbFoYxNlrv+Wq6acrHQm/qMfrARzl+BYA="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/nvpy/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nvpy/default.nix index 99e4992576..cc5f60984c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nvpy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nvpy/default.nix @@ -3,14 +3,14 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "2.1.0"; + version = "2.2.0"; pname = "nvpy"; src = fetchFromGitHub { owner = "cpbotha"; repo = pname; - rev = "v${version}"; - sha256 = "02njvybd8yaqdnc5ghwrm8225z57gg4w7rhmx3w5jqzh16ld4mhh"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-eWvD1k0wbzo0G46/LEOlHl1wLvc4JHLL1fg6wuCHiQY="; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix b/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix index aee98d9a61..e27c80052f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.7"; + version = "0.26.9"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-8SO1VpDWz19UfppdtziiZymoLnvQLMAAIjjOTZ/VMOM="; + sha256 = "sha256-FoVMTU6Ug4IZrjEVpCujhf2lyH3GyYZayQ03dPjQX/s="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix index a3454180b0..eca556fa86 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/pinegrow/default.nix @@ -14,7 +14,9 @@ stdenv.mkDerivation rec { pname = "pinegrow"; - version = "6.6"; + # deactivate auto update, because an old 6.21 version is getting mixed up + # see e.g. https://github.com/NixOS/nixpkgs/pull/184460 + version = "6.6"; # nixpkgs-update: no auto update src = fetchurl { url = "https://download.pinegrow.com/PinegrowLinux64.${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix index 77466cfdbe..bcc959bc20 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/poke/default.nix @@ -1,14 +1,14 @@ { lib , stdenv , fetchurl +, autoreconfHook , gettext , help2man , pkg-config , texinfo -, makeWrapper , boehmgc , readline -, guiSupport ? false, tcl, tcllib, tk +, guiSupport ? false, makeWrapper, tcl, tcllib, tk , miSupport ? true, json_c , nbdSupport ? !stdenv.isDarwin, libnbd , textStylingSupport ? true @@ -22,14 +22,17 @@ let isCross = stdenv.hostPlatform != stdenv.buildPlatform; in stdenv.mkDerivation rec { pname = "poke"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-NpDPERbafLOp7GtPcAPiU+JotRAhKiiP04qv7Q68x2Y="; + sha256 = "sha256-hB4oWRfGc4zpgqaTDjDr6t7PsGVaedkYTxb4dqn+bkc="; }; - outputs = [ "out" "dev" "info" "lib" "man" ]; + outputs = [ "out" "dev" "info" "lib" ] + # help2man can't cross compile because it runs `poke --help` to + # generate the man page + ++ lib.optional (!isCross) "man"; postPatch = '' patchShebangs . @@ -38,22 +41,30 @@ in stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ + autoreconfHook gettext - help2man pkg-config texinfo - ] ++ lib.optional guiSupport makeWrapper; + ] ++ lib.optionals (!isCross) [ + help2man + ] ++ lib.optionals guiSupport [ + makeWrapper + tcl.tclPackageHook + ]; buildInputs = [ boehmgc readline ] - ++ lib.optionals guiSupport [ tk tcl.tclPackageHook tcllib ] + ++ lib.optionals guiSupport [ tcl tcllib tk ] ++ lib.optional miSupport json_c ++ lib.optional nbdSupport libnbd ++ lib.optional textStylingSupport gettext ++ lib.optional (!isCross) dejagnu; configureFlags = [ + # libpoke depends on $datadir/poke, so we specify the datadir in + # $lib, and later move anything else it doesn't depend on to $out "--datadir=${placeholder "lib"}/share" ] ++ lib.optionals guiSupport [ + "--enable-gui" "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--with-tkinclude=${tk.dev}/include" @@ -66,6 +77,16 @@ in stdenv.mkDerivation rec { postInstall = '' moveToOutput share/emacs "$out" + moveToOutput share/vim "$out" + ''; + + 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 = { @@ -85,10 +106,10 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Interactive, extensible editor for binary data"; homepage = "http://www.jemarch.net/poke"; + changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres kira-bruneau ]; platforms = platforms.unix; - changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${version}"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix index d7746ac178..38ac593db2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rednotebook/default.nix @@ -5,13 +5,13 @@ buildPythonApplication rec { pname = "rednotebook"; - version = "2.24"; + version = "2.25"; src = fetchFromGitHub { owner = "jendrikseipp"; repo = "rednotebook"; - rev = "v${version}"; - sha256 = "sha256-nTFyRNJAhTrVlKdLd2F0jv7VcNn2pGTAegvfMjfHY84="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-3FcnyiQc7XGiZVtqxVxqaWYxXejgy/eNQQ4QNTUsCUI="; }; # We have not packaged tests. diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix index 74298e059f..a1ff1b8817 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fetchurl, gtk2, glib, pkg-config, unzip, ncurses, zip }: stdenv.mkDerivation rec { - version = "11.3"; + version = "11.4"; pname = "textadept"; nativeBuildInputs = [ pkg-config unzip zip ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "orbitalquark"; repo = "textadept"; rev = "textadept_${version}"; - sha256 = "sha256-C7J/Qr/58hLbyw39R+GU4wot1gbAXf51Cv6KGk3kg30="; + sha256 = "sha256-1we2NC4N8oY4QmmqIIWGSpTBuLx3MEFkZK+BjmNEfD0="; }; preConfigure = @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { "PREFIX=$(out)" "WGET=true" "PIXMAPS_DIR=$(out)/share/pixmaps" + "GTK2=1" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix index c0744875e7..1baac73df8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix @@ -1,25 +1,25 @@ { - "scintilla514.tgz" = { - url = "https://www.scintilla.org/scintilla514.tgz"; - sha256 = "sha256-3IJcVUmJBWsmMURsfKKLFHyUw2XZI90Kkoq3oR3To2U="; + "scintilla524.tgz" = { + url = "https://www.scintilla.org/scintilla524.tgz"; + sha256 = "sha256-Su8UiMmkOxcuBat2JWYEnhNdG5HKnV1fn1ClnJhazGY="; }; "lexilla510.tgz" = { url = "https://www.scintilla.org/lexilla510.tgz"; sha256 = "sha256-azWVJ0AFSYZxuFTPV73uwiVJZvNxcS/POnFtl6p/P9g="; }; + "9088723504b19f8611b66c119933a4dc7939d7b8.zip" = { + url = + "https://github.com/orbitalquark/scintillua/archive/9088723504b19f8611b66c119933a4dc7939d7b8.zip"; + sha256 = "sha256-V2t1kt6+SpZQvQSzLhh8n+WiAnA32SRVFnrbTaJrHRo="; + }; "475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip" = { url = "https://github.com/orbitalquark/scinterm/archive/475d8d43f3418590c28bd2fb07ee9229d1fa2d07.zip"; sha256 = "sha256-lNMK0RFcOLg9RRE5a6VelhSzUYVl5TiAiXcje2JOedE="; }; - "4cb1464ef738a098f008d6530b776fe780b19c34.zip" = { - url = - "https://github.com/orbitalquark/scintillua/archive/4cb1464ef738a098f008d6530b776fe780b19c34.zip"; - sha256 = "sha256-OgmZ5iWnjG1cI6wprHOyeLY86DcLpU/4omGJ6stEe0c="; - }; - "lua-5.4.2.tar.gz" = { - url = "http://www.lua.org/ftp/lua-5.4.2.tar.gz"; - sha256 = "sha256-EVcNl+nXMDwKWVZ+0ax8ZINAzQ2xDV/VlMCSI+8vUk8="; + "lua-5.4.4.tar.gz" = { + url = "http://www.lua.org/ftp/lua-5.4.4.tar.gz"; + sha256 = "sha256-Fkx4SWU7gK5nvsS3RzuIS/XMjS3KBWU0dewu0nuev2E="; }; "lpeg-1.0.2.tar.gz" = { url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; @@ -29,16 +29,17 @@ url = "https://github.com/keplerproject/luafilesystem/archive/v1_8_0.zip"; sha256 = "sha256-46a+ynqKkFIu7THbbM3F7WWkM4JlAMaGJ4TidnG54Yo="; }; - "gtdialog_1.5.zip" = { - url = "https://github.com/orbitalquark/gtdialog/archive/gtdialog_1.5.zip"; - sha256 = "sha256-kk85ajgMG0okUwPAyL0TYq6BfS5cuyFmsk6i8pn7pbw="; + "444af9ca8a73151dbf759e6676d1035af469f01a.zip" = { + url = + "https://github.com/orbitalquark/gtdialog/archive/444af9ca8a73151dbf759e6676d1035af469f01a.zip"; + sha256 = "sha256-7AkX7OWXJtzKq3h4uJeLzHpf6mrsz67SXtPvmyA5xxg="; }; "cdk-5.0-20200923.tgz" = { url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz"; sha256 = "sha256-AH9d6IDLLuvYVW335M2Gc9XmTJlwFH7uaSOoFMKfqu0="; }; - "libtermkey-0.20.tar.gz" = { - url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; - sha256 = "sha256-bA2HyUq5kV527NMTuuwI3t871W3oN0PZqpI6CBk10vU="; + "libtermkey-0.22.tar.gz" = { + url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.22.tar.gz"; + sha256 = "sha256-aUW9PEqqg9qD2AoEXFVj2k7dfQN0xiwNNa7AnrMBRgA="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/uivonim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/uivonim/default.nix index 0a04ddb7be..23d09cdc4b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/uivonim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/uivonim/default.nix @@ -35,8 +35,6 @@ mkYarnPackage rec { name = "uivonim-build-${version}"; inherit version src packageJSON yarnLock yarnNix yarnPreBuild distPhase; - yarnFlags = [ "--offline" ]; - buildPhase = '' yarn build:prod ''; @@ -47,7 +45,7 @@ mkYarnPackage rec { }; # The --production flag disables the devDependencies. - yarnFlags = [ "--offline" "--production" ]; + yarnFlags = [ "--production" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix index ffcfcc373a..70993d2ccb 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "9.0.0001"; + version = "9.0.0115"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "sha256-WnMm3q5Stn3s33rxQt76goURSa1Rq+jMVWYiS+uJTX0="; + sha256 = "sha256-McotjgjN+ze1jdaAxkdJGTqIIIuOlHENriHdMrYSf5w="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/default.nix index 42a1b730fe..49af99fad1 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation { "--with-tlib=ncurses" "vim_cv_terminfo=yes" "vim_cv_tgetent=zero" # it does on native anyway + "vim_cv_timer_create=yes" "vim_cv_tty_group=tty" "vim_cv_tty_mode=0660" "vim_cv_getcwd_broken=no" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json index b185aa7483..bdfc403d06 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json @@ -1,4 +1,8 @@ { + "TrueZen-nvim": { + "date": "2022-07-27", + "new": "true-zen-nvim" + }, "compe-tmux": { "date": "2021-12-21", "new": "cmp-tmux" diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix index 73eea5bd34..38f9e8c105 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix @@ -53,12 +53,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2022-05-19"; + version = "2022-07-12"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "2fc990977e3ec0fb626b2004645c4180954584e0"; - sha256 = "1w5i0dsbwprkaykbvm1qlr05aj9226h248b9mhjmi9v0zxax8pld"; + rev = "adb5905c617c06d56a72be4dc012c400aba591ec"; + sha256 = "0j48r4048f3rxgjmjghiv91f0xy729m7d790vafdg72ml5zabwa9"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -77,24 +77,24 @@ final: prev: FTerm-nvim = buildVimPluginFrom2Nix { pname = "FTerm.nvim"; - version = "2022-07-07"; + version = "2022-07-21"; src = fetchFromGitHub { owner = "numToStr"; repo = "FTerm.nvim"; - rev = "db3bf919c068101195813692dbe95b3d9bb766b2"; - sha256 = "18zm5xb1jsq19s52d9a83zfqyzkc0pdj98c5ia9svwg8qm2bqg1y"; + rev = "efd10656724a269e21ba68d65e2b058a4e606424"; + sha256 = "1wfdw5gm4hnar9w7z4v1s14zm7g7pd6a3b54r4gsdwgr107ql7md"; }; meta.homepage = "https://github.com/numToStr/FTerm.nvim/"; }; FixCursorHold-nvim = buildVimPluginFrom2Nix { pname = "FixCursorHold.nvim"; - version = "2022-02-17"; + version = "2022-07-09"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "FixCursorHold.nvim"; - rev = "1bfb32e7ba1344925ad815cb0d7f901dbc0ff7c1"; - sha256 = "0b1iffk6pa2zwd9fvlgqli72r8qj74b7hqkhlw6awhc7r1qj8m1q"; + rev = "5aa5ff18da3cdc306bb724cf1a138533768c9f5e"; + sha256 = "1zaqbwbs01iyqlsxh9r06qiasgrkgqkznrl5xv3fizvpk88y7lz8"; }; meta.homepage = "https://github.com/antoinemadec/FixCursorHold.nvim/"; }; @@ -161,12 +161,12 @@ final: prev: LeaderF = buildVimPluginFrom2Nix { pname = "LeaderF"; - version = "2022-07-07"; + version = "2022-07-20"; src = fetchFromGitHub { owner = "Yggdroot"; repo = "LeaderF"; - rev = "c81ffb908e8011620f371295fdde557aac95e555"; - sha256 = "0pl1krhs9b51xv9s7s92v7935hywi8fd5wx7vm0r5i0wh9i0g2vp"; + rev = "aef58eaa7f328d6f5713a04198c80590bbc4ecba"; + sha256 = "08xacx5n5di51929yiqz51z57ph8scvk4z9pa02r69iq4wa9grzr"; }; meta.homepage = "https://github.com/Yggdroot/LeaderF/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-07-08"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "8f9c4b4be02189181923675fb166a974324188c0"; - sha256 = "0xrag02ia12ls10dc7yfdm800wz300bpdi8i64vd3xim8zvkn7aj"; + rev = "ff0d80ed00726a9b20596d165511bd902867457f"; + sha256 = "0v246d21fw5r6wl10674w6p980l7z16427yq0v2rq1lnlk48y49w"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -329,24 +329,24 @@ final: prev: SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2021-04-07"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "376af5c2204de61726ea86b596acb2dab9795e1f"; - sha256 = "0h3wxkswd5z9y46d6272sr210i73j5pwf5faw7qhr1plilfgx4gb"; + rev = "2678fca10e731f367253f937db5f8b42de674f4f"; + sha256 = "1rhgjxrsjy9kg1740myyfh9n6pllm2nzxm3vgm4yxr6n6q74cy6n"; }; meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-07-08"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "069c620851bdfe1a0b0f978e86034c1b75bcc7ba"; - sha256 = "0zkfw3hzjw4zirxf263k7kwy16m108nhajwxswlm0hxn6m4xcxyp"; + rev = "ba187ae41fc33fbd57efb29e1eae69e6dc761e70"; + sha256 = "15xfdxv2zs0ap1y1fgxz3pmbvjwzhjpxn5s0sgkp328kbihl5832"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -380,11 +380,11 @@ final: prev: version = "2022-07-01"; src = fetchFromGitHub { owner = "Pocco81"; - repo = "TrueZen.nvim"; + repo = "true-zen.nvim"; rev = "fd0af396aa06c4aaa7c021cffca3a64a66a4b11f"; sha256 = "1q88knxcasjn17yx93lmhlynvrmybg2gxy7933ii49r36nqk0hqi"; }; - meta.homepage = "https://github.com/Pocco81/TrueZen.nvim/"; + meta.homepage = "https://github.com/Pocco81/true-zen.nvim/"; }; VimCompletesMe = buildVimPluginFrom2Nix { @@ -498,12 +498,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-07-06"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "95a66fabb9cc732c410d54d4c803f3d52dae298f"; - sha256 = "0kkckspjwbaqrwp005naaarrb5spmjfypiy3mi4baxgd5zsw7848"; + rev = "86b8341bb8c58ece7e7f3f9b2d0310f4a328ab21"; + sha256 = "1bigmmdr16ypd6khvs3m0lv5agjw06bw3wc5s3zp4rvj91vdz56k"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -546,12 +546,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2022-07-07"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "ad2f75e4b207debb3b7cf2a007dd2d205fe603bd"; - sha256 = "05icz5fyic52xbbnw2vvjkgahp9rsdv44gm8gd35gcg622z3mjaw"; + rev = "e10fcf22dcc0441da3c984e26ae2e467b0ae554f"; + sha256 = "1lzkx2ayyk1ja17i0dli7632rrg687fqvg2dqin0j9hnz93fx9ql"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -570,12 +570,12 @@ final: prev: alpha-nvim = buildVimPluginFrom2Nix { pname = "alpha-nvim"; - version = "2022-07-05"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "goolord"; repo = "alpha-nvim"; - rev = "411ce27d871f963256c0787bc4133cf945dd89d3"; - sha256 = "0pggkihpvv9xmwsr8fif0dsab7gg5r7ab7frhbayahzj2jnmaivs"; + rev = "d688f46090a582be8f9d7b70b4cf999b780e993d"; + sha256 = "10cajjc18n9hvbb3y1c6al4xpzdnv6rd2kx5mi9q3bnk90kmyq7d"; }; meta.homepage = "https://github.com/goolord/alpha-nvim/"; }; @@ -714,12 +714,12 @@ final: prev: aurora = buildVimPluginFrom2Nix { pname = "aurora"; - version = "2022-07-03"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "ray-x"; repo = "aurora"; - rev = "835ceb4d8da3bda25b8ec6702c20031cae621e6e"; - sha256 = "0szpcma5dd9i3l87l9kj7wkx3r8nn9bqhqhi31cqqx4rcc9q67cx"; + rev = "bc13049ee772cc19f94c69e7f9c198861336a692"; + sha256 = "05qz9jnhwcswwayvkpghqsffvpkpczj8dknh7gx9dpjh8zvjh8vv"; }; meta.homepage = "https://github.com/ray-x/aurora/"; }; @@ -750,12 +750,12 @@ final: prev: auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2022-07-08"; + version = "2022-07-14"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "375ca80f16f22c9b83ae7f1842ea3f2bcde74258"; - sha256 = "0qp2rdzppjy30259mw0n4gh23fhcf0qwgyk8b7w8af85jlk3j05x"; + rev = "50f5f2eaa7ff825c7036dc3c9981ebae7584b48e"; + sha256 = "1h89cw34dnk3xgvpd12ic9bpll62sa3qpif4sfhb8rjcdxi9b1sl"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -798,12 +798,12 @@ final: prev: barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar.nvim"; - version = "2022-07-03"; + version = "2022-07-24"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "75ed1b95235d1ef91e7c633f742ce9b8b7beac74"; - sha256 = "0rjhrbnvzx1k6yyzw836aqfcyf45skm339pzpyfw841q1lnnfq60"; + rev = "4a19df133df71b51e82302db06b31570d7dedd58"; + sha256 = "1jjp3rpqvn4ngv91pp3d2v2dlg894412p97z4i88g1ifixdadhiv"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -930,12 +930,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2022-07-05"; + version = "2022-07-24"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "b5a2b1f66b61df620f92cd3ad13f6d8aa7cda08c"; - sha256 = "07szcbpn0jq58abhbc2725zd75r7msp5dr5dx09ynhv4kwslwdrl"; + rev = "c4dd9b4de03b891f648b098c25e4dc1bc48a13e5"; + sha256 = "0i9xpsg49m4m16m22iixhsfajnbcyw383iql1r9s5r8cwmzax0kq"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -954,12 +954,12 @@ final: prev: calendar-vim = buildVimPluginFrom2Nix { pname = "calendar.vim"; - version = "2022-06-25"; + version = "2022-07-24"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "3fbe34e21e5847fb40314eb0848faabfa609301a"; - sha256 = "0qgs27ms71zsmp0sx7prvsq3j4qfiw2nigvykdd90931ssb089s6"; + rev = "2cd2e55ca86e891a359b82a40ffc6f6ba799cbc4"; + sha256 = "16d4wcx3zb536jpf617xi9a4yhhk9c3ljrrqi9a7nk34j211b13d"; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; @@ -1050,12 +1050,12 @@ final: prev: clangd_extensions-nvim = buildVimPluginFrom2Nix { pname = "clangd_extensions.nvim"; - version = "2022-05-31"; + version = "2022-07-19"; src = fetchFromGitHub { owner = "p00f"; repo = "clangd_extensions.nvim"; - rev = "81b56d41d8ab791509a8464b0afc54144be9f23d"; - sha256 = "13mainbpndl3mlvalghkvykbqjpvdp5pbhk5ma93vgj38sk6ph0d"; + rev = "2390bf75e25daf738d2cc04aac8f83f62b7f037d"; + sha256 = "0hj0cazy5mzwswjrdhi8sn2p9v72k35z7cap67crqn321fp4hp0z"; }; meta.homepage = "https://github.com/p00f/clangd_extensions.nvim/"; }; @@ -1194,12 +1194,12 @@ final: prev: cmp-dap = buildVimPluginFrom2Nix { pname = "cmp-dap"; - version = "2022-06-05"; + version = "2022-07-20"; src = fetchFromGitHub { owner = "rcarriga"; repo = "cmp-dap"; - rev = "2c4cecbb9c4d255acc87ccaca727d1ad2f2b8c90"; - sha256 = "11wg62nf37ka40l9acwxcklzghapwiw3x549vnp397sl70r3w6b2"; + rev = "e21f0e5d188ee428f8acab1af21839af391607a4"; + sha256 = "19lv7671imcdcxwz6yzn8lq2gm7jgh52mmr2xk1knq744d7dfld0"; }; meta.homepage = "https://github.com/rcarriga/cmp-dap/"; }; @@ -1266,12 +1266,12 @@ final: prev: cmp-fuzzy-path = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-path"; - version = "2022-06-30"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-fuzzy-path"; - rev = "b5f137ccee80b6c1f9b9243bb56c943d278b7166"; - sha256 = "1szhcbj31xndf1pi9ra8ikdp7r8qnj3llg96xjak60biw266sbbd"; + rev = "b4a8c1bebfe5a5d45b36e0b09e72f9f082e9a40c"; + sha256 = "0zfx0mh4bq2mvppdl6vr5045hdjjqq6wd1xjn7mjwj3mbvnfpk2f"; }; meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; }; @@ -1374,12 +1374,12 @@ final: prev: cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp-signature-help"; - version = "2022-06-20"; + version = "2022-07-20"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp-signature-help"; - rev = "007dd2740d9b70f2688db01a39d6d25b7169cd57"; - sha256 = "194i2b6qbl3z4j2p2s6sig2fac8i9kglkdwdc5h3x2q7avw70yrg"; + rev = "57c4db7d3a663bd31ef60c4b5ed32683301247e9"; + sha256 = "0lygd43zfhss9kirlhfc3rq95m0hdkk3cxc85nlfr2xx36plrarc"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; }; @@ -1458,24 +1458,24 @@ final: prev: cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; - version = "2022-06-29"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-path"; - rev = "981baf9525257ac3269e1b6701e376d6fbff6921"; - sha256 = "14i80iajwnjnnb6c5cmrhcvjdy1p8zvy0hn4gr7qm5pivfh88n74"; + rev = "447c87cdd6e6d6a1d2488b1d43108bfa217f56e1"; + sha256 = "0nmxwfn0gp70z26w9x03dk2myx9bbjxqw7zywzvdm28lgr43dwhv"; }; meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; cmp-rg = buildVimPluginFrom2Nix { pname = "cmp-rg"; - version = "2022-01-13"; + version = "2022-07-27"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "cmp-rg"; - rev = "fd92d70ff36b30924401b0cf7d4ce7344c8235f7"; - sha256 = "0z8knl4l5a7miw081h290s0g4icqqvn6qibr6jx4x71qwqb21w2y"; + rev = "7cf6ddc0046591b8a95c737826edf683489c3a66"; + sha256 = "1xi3vygr5czjx904314ny2pgyxz9s8s7m27cl74ii05np7i27nnz"; }; meta.homepage = "https://github.com/lukas-reineke/cmp-rg/"; }; @@ -1506,12 +1506,12 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2022-06-25"; + version = "2022-07-17"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "a5081776185e3c7f406e7fc3dd5f0a0ae0288e59"; - sha256 = "0sccxvdsgy8n57cs6h8mh5inhgl4x6r7pqpp29ms88f4wz5z15p2"; + rev = "bfc45c962a4e8da957e9972d4f4ddeda92580db0"; + sha256 = "08lzssdalgr322wkah0gsspkf57spwlv1nz4yxnnlfpg1f51amik"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; @@ -1650,12 +1650,12 @@ final: prev: coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2022-07-07"; + version = "2022-07-27"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "dbfb10b05ac0c705740e5cff5106b7639a2d8c86"; - sha256 = "11zs4cw1vylmzr52n9y3w9875ng7fkkcl90xy207j329i0dnn3l8"; + rev = "e6fe722e82282e5f12e44f2dbe33b3b937603f68"; + sha256 = "1bmvzkmgl6wlqwd2h23y4gjxychm9zz1dig5p4w7hgx24ivm5izx"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -1795,12 +1795,12 @@ final: prev: comment-nvim = buildVimPluginFrom2Nix { pname = "comment.nvim"; - version = "2022-06-29"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "numtostr"; repo = "comment.nvim"; - rev = "4086630ce2aaf76b2652516ee3169f0b558f6be1"; - sha256 = "0pzjvwfbd9zlzvwf5k4nrfl64vlrwhahks0nkqjmwqijqyrrbl1q"; + rev = "78ab4e9785b6da9b7a539df3bd6f70300dc9482b"; + sha256 = "1dgbhf8l3212rvhs424cdb2qh07k95biazyc0qy5xa7asrdwj1m7"; }; meta.homepage = "https://github.com/numtostr/comment.nvim/"; }; @@ -1939,12 +1939,12 @@ final: prev: conjure = buildVimPluginFrom2Nix { pname = "conjure"; - version = "2022-07-02"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "Olical"; repo = "conjure"; - rev = "2e7f449d06753f2996e186954e96afc60edd5862"; - sha256 = "0p2c1dcircd30gmln6rx83x8xs1fxfx9fdnc4bvry8wri0yjypb5"; + rev = "572c9717d82de38f5bc60c2942843ce9b941aed6"; + sha256 = "0yh1i2jhifdvdpb2zih0fg6v0xp5imy5byx3laijbqvycl2aa8za"; }; meta.homepage = "https://github.com/Olical/conjure/"; }; @@ -1975,24 +1975,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-07-08"; + version = "2022-07-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "f8917e6ee6b73ee938f16422ce9c8550ada6f4f9"; - sha256 = "1sz483q70nwv5zdv0gnawna27wkgsw4rcjgk9q8pnbdj6a023r91"; + rev = "e39572495d27ebbcd6ccaf580da193a900c5fad9"; + sha256 = "0ss009wd68973s7p2905bs2nczcp6k6vj7nsi9kdmh0zg7nw92pm"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-07-08"; + version = "2022-07-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "f66a551948c40dc179757cd1325cfe29eee2dbba"; - sha256 = "1kxl11fds1vh0qjzlamk6gq8z5s7jknsz9ya22h322v83r48z9vq"; + rev = "3c43d8b07b3ebd1db825ff2cd7f83ee67c78a674"; + sha256 = "0aqwb98mn7x9zhi7n2xi8pkk00bg5mi1ijam8i2var2bv5wpgm28"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2011,12 +2011,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-07-08"; + version = "2022-07-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "efa6824c951d0638ec6134a8686f47b7efeda951"; - sha256 = "0c28fdh9nr2n5ajpc9dhff69lq9fbz8xba919va6jws5r7nh04zg"; + rev = "d913a16b930c6fb83ea62c47d9367ed725debaf3"; + sha256 = "03cwv1mbvvww6p4137z8blap4pbm823yi2qrcg0j4kv39vv432wy"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2047,12 +2047,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2022-07-05"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "131df937c3857cf7c17843fe9a92cc59e9104261"; - sha256 = "08sifqc8a14pa902s4rk1rrxg7vy6z7w107dmg6gr64cr6xmck9s"; + rev = "868f6e2439e0de3bfaed1e2ec13a5bf32a9b4a5b"; + sha256 = "0c8a9jsfmp1pfcnxyw1qldv57fcsyrp6svv5q75y2hcnp08yk1ad"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -2071,12 +2071,12 @@ final: prev: csharpls-extended-lsp-nvim = buildVimPluginFrom2Nix { pname = "csharpls-extended-lsp.nvim"; - version = "2022-03-08"; + version = "2022-07-15"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "csharpls-extended-lsp.nvim"; - rev = "a1985fd1cd3c67d5e1b1be7c9283222fd46e7615"; - sha256 = "159mlvz9bb91v8nld2g52r0v4gbdp182l489jdm5pvxc5yf5zl3w"; + rev = "865ace7f8f4069b4965e86005392dc78eec0858f"; + sha256 = "154psrw6j92la05g3gv42i8jdaix9va17wkmw4p0ip72wrd2wn0q"; }; meta.homepage = "https://github.com/Decodetalkers/csharpls-extended-lsp.nvim/"; }; @@ -2155,12 +2155,12 @@ final: prev: dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2022-06-28"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "88a6077812b1f54819a941d824896f3a75fe5ce4"; - sha256 = "1v4x5rhjs766j33wz20ws94fc4qii299jw377mpbswkbzjxvf6j6"; + rev = "6e48e4fd8b03b47d09c686b38e968d5dcd261c8d"; + sha256 = "098iwm2x2xc63pyyvi4v5xkz1n2kvr76alz7r9wj4lp15mmm5w5p"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -2251,12 +2251,12 @@ final: prev: deol-nvim = buildVimPluginFrom2Nix { pname = "deol.nvim"; - version = "2022-05-04"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "cb48ec3f1c119d68cf633757a236228e3d887bf1"; - sha256 = "0ckhcx6z1dqlvsaldy3961p3h4qvxgdqdp4i8xkqy4scjvaanvz0"; + rev = "6a5adf9a8860888076766c8a0d921236ff5deb0e"; + sha256 = "1b83s7nq4ymg3wjldfqq7in46hjylpschm1lqnfy91prg0r1djmp"; }; meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; @@ -2529,12 +2529,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview.nvim"; - version = "2022-07-04"; + version = "2022-07-20"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "16c3985581ee65bccdfbebbe014b24a01adc7d1f"; - sha256 = "0spkh7sq1gwxpkvxb7ghrvjmw4433k7wswxd1j9vxdnmzmzw89wb"; + rev = "a45163cb9ee65742cf26b940c2b24cc652f295c9"; + sha256 = "0vp6id3lqhvn9db5hd2bml5xfsmcy65hn19wbl82pscl6vqx80n4"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -2553,24 +2553,24 @@ final: prev: doki-theme-vim = buildVimPluginFrom2Nix { pname = "doki-theme-vim"; - version = "2022-06-27"; + version = "2022-07-21"; src = fetchFromGitHub { owner = "doki-theme"; repo = "doki-theme-vim"; - rev = "da277b3a52c7c2de42c30ed09ce1987ba2105499"; - sha256 = "11z064q6bc9rcpf66dwshz1ak0y98d5jq609cm4jdwg3c6gdahm6"; + rev = "6101e530676eddb7cedf75c731b29f98d6e41c4e"; + sha256 = "0973x7fqjz0xccqkwf7wyvh8dd5kbqxbbrch2ldl4dmsrfkafjdb"; }; meta.homepage = "https://github.com/doki-theme/doki-theme-vim/"; }; dressing-nvim = buildVimPluginFrom2Nix { pname = "dressing.nvim"; - version = "2022-06-08"; + version = "2022-07-21"; src = fetchFromGitHub { owner = "stevearc"; repo = "dressing.nvim"; - rev = "af179837e1cdddfb164f0296883951b2255c46d2"; - sha256 = "1i38j2zq6g7rypkwfc0hglp9va6l55jcwpy63fa27jq81bp37nnw"; + rev = "e9d0de44707fe5ce06be6f6959d33a3fab985a3c"; + sha256 = "0a10cr3ay429k6pj2i124qigr6pyp5qnkq0lx6q34m8cqjf5gdkr"; }; meta.homepage = "https://github.com/stevearc/dressing.nvim/"; }; @@ -2589,12 +2589,12 @@ final: prev: edge = buildVimPluginFrom2Nix { pname = "edge"; - version = "2022-07-03"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "sainnhe"; repo = "edge"; - rev = "ebb933214dfdf13b738b9b129ee7ad447e63d172"; - sha256 = "0qhm7kz68zl4zc4y52gx53d2zj83p3xc6aa9q2bxfvp0ycxzms8w"; + rev = "33dbe6b7ac23f8666d36ad27db7f82ff58cb2408"; + sha256 = "15glvybxj1i8abbhkqc3x7q0jbs9f08k7s5b34p1zwk96vwashk7"; }; meta.homepage = "https://github.com/sainnhe/edge/"; }; @@ -2614,12 +2614,12 @@ final: prev: editorconfig-nvim = buildVimPluginFrom2Nix { pname = "editorconfig.nvim"; - version = "2022-06-30"; + version = "2022-07-18"; src = fetchFromGitHub { owner = "gpanders"; repo = "editorconfig.nvim"; - rev = "b96a75a470e5c26caf4e57c594e85ee5d0dc7bf1"; - sha256 = "0xbb0d4m1m8a406kpia71bnnjkk5w5yfp8ra1s8jj66c3j1hp3d7"; + rev = "764577498694a1035c7d592149458c5799db69d4"; + sha256 = "0rsqpyyj0hwpsr036wml9ks0mk80r8jmr57bdb62b4zqacim4iry"; }; meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; }; @@ -2675,12 +2675,12 @@ final: prev: everforest = buildVimPluginFrom2Nix { pname = "everforest"; - version = "2022-07-08"; + version = "2022-07-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "everforest"; - rev = "2f48c65da2292ba376079346a65984abea8114f0"; - sha256 = "18j3kk5q8ibaxc3i2i8jbjjliyllap3a2cngdc6n1chgwzg4qm15"; + rev = "9a8b4f85a7f1bb0e3019911f2c425b994cedb18f"; + sha256 = "103ncn51p1b0g6xynlh5ss36dxhxg9d0amzdc47l83i41q562cxc"; }; meta.homepage = "https://github.com/sainnhe/everforest/"; }; @@ -2735,12 +2735,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2022-05-31"; + version = "2022-07-11"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "1ea42671c523a080a01c62c40c2c8e7fc0139a8f"; - sha256 = "0yrkdzikpcq9phybbzfggdfj4y983y9qw1fvnzpvff7mp11jskqw"; + rev = "2962c8c4a67f41ef35c58aa367ff2afb7a9691d3"; + sha256 = "1ypm1yjcsxiy99329wswcfq68rrqh6nvc0w4w70cv7bbswx2ib1m"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2759,12 +2759,12 @@ final: prev: fern-vim = buildVimPluginFrom2Nix { pname = "fern.vim"; - version = "2022-06-13"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "fern.vim"; - rev = "951a05d3f6ebc785db728ccfdf1759a2cf7c15ff"; - sha256 = "1d0g3cylci2ph7crmw888jjjpindbmab5h4z9y7qsvl5633aclk4"; + rev = "23dc0773849919cbfcc12f310dd2187e0267c5ed"; + sha256 = "1k00ns58z8nfsvw1dxn8ah4rqvnr7jy1b8wvs26j30r705x9qf2r"; }; meta.homepage = "https://github.com/lambdalisue/fern.vim/"; }; @@ -2783,12 +2783,12 @@ final: prev: fidget-nvim = buildVimPluginFrom2Nix { pname = "fidget.nvim"; - version = "2022-06-12"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "j-hui"; repo = "fidget.nvim"; - rev = "46d1110435f1f023c22fa95bb10b3906aecd7bde"; - sha256 = "0v0jnzj288swbp0w8xa7287sbql1rfgziqdk1gbcgvzs7zlvczbr"; + rev = "492492e7d50452a9ace8346d31f6d6da40439f0e"; + sha256 = "1s3qv09gbsjjmqkb85hc4832j18hd21j37rg4iqks0a4n2z5yi4b"; }; meta.homepage = "https://github.com/j-hui/fidget.nvim/"; }; @@ -2856,12 +2856,12 @@ final: prev: flutter-tools-nvim = buildVimPluginFrom2Nix { pname = "flutter-tools.nvim"; - version = "2022-07-03"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "akinsho"; repo = "flutter-tools.nvim"; - rev = "54a73fd238454c3de0ad5ba56e67492600eb3dc0"; - sha256 = "1mzz1fpfvqbi9zkqjysrrni7hd98x2iv0gknd63b6s1bfknsgrnk"; + rev = "789c41dddd602ae3d4d9e91f7c2f2461dc505e93"; + sha256 = "03g34brqyrcmq59984c9i0kx0fi6ivf9rhp3g047ylkcrazvf5kr"; }; meta.homepage = "https://github.com/akinsho/flutter-tools.nvim/"; }; @@ -2892,12 +2892,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2022-07-06"; + version = "2022-07-24"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "24afb4c178d8ea28bfa73f37814ada43be478b1d"; - sha256 = "09fx4nrj9z0w8idv9pm80dlm57ffy5cxj9yy2agxwiwr0c1lkxsr"; + rev = "5632135df892a742e5c3bbf97f0f634e273254d4"; + sha256 = "1j1q6zmbq9xgsmnyg9x8wg6dkasmbd629aw4p6cg0lij1fngc65s"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2988,24 +2988,24 @@ final: prev: fzf-lsp-nvim = buildVimPluginFrom2Nix { pname = "fzf-lsp.nvim"; - version = "2022-06-17"; + version = "2022-07-16"; src = fetchFromGitHub { owner = "gfanto"; repo = "fzf-lsp.nvim"; - rev = "f19d6902dfdecb3150a9dbe153599524ae080dd8"; - sha256 = "0rii15z51gz97vc688w5si0jb9vdnzq8vvz3yx52rghm535yv46y"; + rev = "f8988d7d738a0e9e7aba2f0a9512df6356bbda07"; + sha256 = "1bl8a3mnz9p9a03pqq3gdxpfxk8j3pjj8g4828nca3df72nk9vrn"; }; meta.homepage = "https://github.com/gfanto/fzf-lsp.nvim/"; }; fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2022-07-08"; + version = "2022-07-19"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "4707adc1ec9c5019590f6070ce578f68ed3a085c"; - sha256 = "10lhx67y1ik0rd7bcr9r9d2hrdjxzfyj2fx06gp4i8fs9mqc7x3g"; + rev = "8dade5e9989eb4b99f3551384e090afa9da8b633"; + sha256 = "13bg8b68k44wc5f8g9ixva4jpql801mfldjgs12k8ljzkbpy89gs"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3048,12 +3048,12 @@ final: prev: gentoo-syntax = buildVimPluginFrom2Nix { pname = "gentoo-syntax"; - version = "2022-05-02"; + version = "2022-07-13"; src = fetchFromGitHub { owner = "gentoo"; repo = "gentoo-syntax"; - rev = "2b77af2d85b1bdc8d78f65f41d6673c240bbc7a1"; - sha256 = "1spdpyxlh53mwdazzaskwk3y2lb4im2by0l9qq1cz78nwmwm2m4h"; + rev = "3bc67579b990d53cdcf2ba9b016995b41d2b26a3"; + sha256 = "1przyjqp6pjgbmiwx378k5dx5p1j18c5f89zqjihr52q0p7x90f0"; }; meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; @@ -3156,12 +3156,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-07-08"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "bb6c3bf6f584e73945a0913bb3adf77b60d6f6a2"; - sha256 = "19pznbvc75mf3m704h9pidkiv5n04qriyn176yas377hgpwk4h4r"; + rev = "8b817e76b6399634f3f49e682d6e409844241858"; + sha256 = "1dpxnk6b7rlj13y15sfsc05k3mzcp1b3dmvpj03af0imp9lq70c3"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3192,12 +3192,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow.nvim"; - version = "2022-06-10"; + version = "2022-07-15"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "900042f7dda528cb980b7f1056ed7c21d4402826"; - sha256 = "05dhbxclnn5fz9wapa6gvf7p9qk88ir6ix72sahv0vpjcccr6gk6"; + rev = "764527caeb36cd68cbf3f6d905584750cb02229d"; + sha256 = "0yj49bfjsljpza08dc96wdnbiqvgp6dx1zq7ksvhyvc1nsaymm4b"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -3216,24 +3216,24 @@ final: prev: gotests-vim = buildVimPluginFrom2Nix { pname = "gotests-vim"; - version = "2021-11-25"; + version = "2022-07-12"; src = fetchFromGitHub { owner = "buoto"; repo = "gotests-vim"; - rev = "9adb78b15d0cbb72a3ffb9fbed28faa909b0817b"; - sha256 = "0lf05rfgw1dmidslbvw5qal45crnb8jfxsfbhbhffqa9da1fkspn"; + rev = "42abccb59e9889cd1ce427b11b2ffbb36f2a46a6"; + sha256 = "0fpr23nxcm5ip6qhwqfymkwqy32h2jb7spkhhkmvjj9mzx8w52jm"; }; meta.homepage = "https://github.com/buoto/gotests-vim/"; }; goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2022-06-30"; + version = "2022-07-19"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "99407d8e63305a5c68627cee156ca3991a75fd19"; - sha256 = "12izx7nl094ydi0bdxb4bh4w83gg36jrl024givqqh74i659p2am"; + rev = "a5af27cff485b325f0ef2dcdf55ae51faed05cba"; + sha256 = "11dzbl8jh6pwfys87bj9awysmfhhlmyzbhh8vfqdisbmmmqz3c3y"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -3300,24 +3300,24 @@ final: prev: gruvbox-material = buildVimPluginFrom2Nix { pname = "gruvbox-material"; - version = "2022-07-03"; + version = "2022-07-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "gruvbox-material"; - rev = "9c4af27e4335c367b0bc4d86dadaf34e742682b9"; - sha256 = "0k20840nldp4y7y8izp1g2aghq3ad6mb1qpldprpkprpsgpbm49x"; + rev = "d60d97144193502e1ba19aa6a5f90284ed418f95"; + sha256 = "14nv148cl68papwq5sp5f5hjfi6hcq8k4jvijyd9z5l15r56f9ga"; }; meta.homepage = "https://github.com/sainnhe/gruvbox-material/"; }; gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox.nvim"; - version = "2022-07-06"; + version = "2022-07-15"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "gruvbox.nvim"; - rev = "aee207e1ae55c44bd6a23c1a85e5e17939e3835b"; - sha256 = "0ck0wxk373bjp4sbx3sgrzr88w88klwikn99hxfhqmb762vwrp7p"; + rev = "29c50f1327d9d84436e484aac362d2fa6bca590b"; + sha256 = "114az2y9xgsds7qn2jgz5amsvafbvbmf376rjppjb1n6789k4gbz"; }; meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/"; }; @@ -3346,6 +3346,17 @@ final: prev: meta.homepage = "https://github.com/junegunn/gv.vim/"; }; + hare-vim = buildVimPluginFrom2Nix { + pname = "hare.vim"; + version = "2022-07-02"; + src = fetchgit { + url = "https://git.sr.ht/~sircmpwn/hare.vim"; + rev = "5c758cdbbabd6e4ba92bced9428cd1fa4212f003"; + sha256 = "0l1q9x1n30h32zfnd2krg3frywydfmb8ic05619pylamnyh4w918"; + }; + meta.homepage = "https://git.sr.ht/~sircmpwn/hare.vim"; + }; + harpoon = buildVimPluginFrom2Nix { pname = "harpoon"; version = "2022-05-08"; @@ -3408,12 +3419,12 @@ final: prev: hologram-nvim = buildVimPluginFrom2Nix { pname = "hologram.nvim"; - version = "2022-06-16"; + version = "2022-07-11"; src = fetchFromGitHub { owner = "edluffy"; repo = "hologram.nvim"; - rev = "d6d3ebe931529681c99aff18bc4d4c2487867e06"; - sha256 = "0hld4cr09bd0y4k9yz1lls5dqdak605zf5rnv75zi5scbgwly19c"; + rev = "53906ca0d742c2d3ef00e79a0956e5d60710c959"; + sha256 = "1hkj6xdhmwmkx9gvh9p3sqvf9zwdjqzzmnn35ida5bj9s5v48s4q"; }; meta.homepage = "https://github.com/edluffy/hologram.nvim/"; }; @@ -3432,24 +3443,24 @@ final: prev: hop-nvim = buildVimPluginFrom2Nix { pname = "hop.nvim"; - version = "2022-07-07"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "6bcaeb7c0ea30afe137db11fcf681c373a7171bf"; - sha256 = "0p5apgszs0hw9jz2jnlbi8zfb79pj6409bx3z253sjprijjf78vq"; + rev = "ced6c94204c6cd55c583e6bce6397fd1c91eb214"; + sha256 = "0zf61ny76cnrs21w3iwra2gqq5fdn0hfw3dvw5d37pxc4pp95dyv"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; hotpot-nvim = buildVimPluginFrom2Nix { pname = "hotpot.nvim"; - version = "2022-06-19"; + version = "2022-07-20"; src = fetchFromGitHub { owner = "rktjmp"; repo = "hotpot.nvim"; - rev = "104aa65f9155d34629c9623d5dac39b5b2ad555c"; - sha256 = "0m0w69mmy471c2axr8n15c8spd7w8zdb0ri2cnf571kpmb68szxr"; + rev = "b942e8760ea26f6ff3782f675a8d6c1323f3e7d4"; + sha256 = "1xcrv6ih5jphzlim362k23nc6l306inya0272bjzql4asvgzzmhy"; }; meta.homepage = "https://github.com/rktjmp/hotpot.nvim/"; }; @@ -3552,12 +3563,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline.nvim"; - version = "2022-06-29"; + version = "2022-07-27"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "4a58fe6e9854ccfe6c6b0f59abb7cb8301e23025"; - sha256 = "1wppsqpi5h0qb1vhxryjw0sn0g8yhkpald47cwnr5r3ix5w99wfa"; + rev = "c15bbe9f23d88b5c0b4ca45a446e01a0a3913707"; + sha256 = "03l28ja345vz4hrbj9ha864vfyagid116mqi4z8ka2g2nk7s1brd"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -3733,12 +3744,12 @@ final: prev: kanagawa-nvim = buildVimPluginFrom2Nix { pname = "kanagawa.nvim"; - version = "2022-07-01"; + version = "2022-07-15"; src = fetchFromGitHub { owner = "rebelot"; repo = "kanagawa.nvim"; - rev = "dd13260478149f787753b72689076b34c6a4ded9"; - sha256 = "15f816yq0igh6lgf3zrp7sk1drxsa88lhpg0pk41f5369yjvf09r"; + rev = "a423ff33e9f9182cf6ee346ae19df2583ab37f55"; + sha256 = "1h42x991dgxk7y4vp2gbqqfq6sgvasx9nfjrcsbly2d76mhz8f0f"; }; meta.homepage = "https://github.com/rebelot/kanagawa.nvim/"; }; @@ -3817,12 +3828,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-07-07"; + version = "2022-07-21"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "ffa77427c7f39d4263478f747d77a639d5f980d7"; - sha256 = "1sblifa4h56yf10skg92qjzwjrxw249qx3bvjkqmckfmq352fngw"; + rev = "60ac136bf74ddf39fb19a1b0cfd261dfced11b1d"; + sha256 = "03cpyqgzalbvx10w1d23fq8sddd7sagbnipnhbab4fh9223wnfgm"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3865,12 +3876,12 @@ final: prev: lexima-vim = buildVimPluginFrom2Nix { pname = "lexima.vim"; - version = "2022-06-13"; + version = "2022-07-20"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "f06d2fa627c66689ec0ef68fe95765f0af0ded88"; - sha256 = "00d27f9h4s83c1bsqskv48fhcyd2yf1fn7bpzqgqipbdsj7n04hn"; + rev = "6723e86c4168b6c1ca6ec463900fd9b370798e99"; + sha256 = "0mlv9k5nkrbk0dij7ng1xn0rqzhqkh7gg9bvknfxkkf01jlmafgn"; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; }; @@ -4033,48 +4044,48 @@ final: prev: litee-calltree-nvim = buildVimPluginFrom2Nix { pname = "litee-calltree.nvim"; - version = "2022-05-19"; + version = "2022-07-11"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-calltree.nvim"; - rev = "71f7eee870d8dcf8f8719238eb7ef8435de567a7"; - sha256 = "1php9n68bw3l1344zz4q0n2pg6cx6ihpva8rzmm8xipxwwvxk8my"; + rev = "77799885c1929cc4a9d982670afcc6d6bc0506b1"; + sha256 = "1030rb93dfx3683vdkzjx26hnh5yvfam1cjdc9m5aksj4h81lvrc"; }; meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/"; }; litee-filetree-nvim = buildVimPluginFrom2Nix { pname = "litee-filetree.nvim"; - version = "2022-06-14"; + version = "2022-07-13"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-filetree.nvim"; - rev = "3d3447816beea47ba93753afa7b717f5deb8a26c"; - sha256 = "0p4wp53lpm9awkbf6cwzxzxjbvqf5r272hlygbiwhv048lbz26xk"; + rev = "fe0f41da067c7ea5816a3c96d83efa3ba95106df"; + sha256 = "15h1pnhhddgffmrym7nmacf50nk00hlh4d08kcic6aphnnifll2q"; }; meta.homepage = "https://github.com/ldelossa/litee-filetree.nvim/"; }; litee-symboltree-nvim = buildVimPluginFrom2Nix { pname = "litee-symboltree.nvim"; - version = "2022-05-20"; + version = "2022-07-11"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee-symboltree.nvim"; - rev = "8f13d50dfda93ce188f39a526773ef9fd6c73add"; - sha256 = "0n99r4lhd29yx4n2axnyhx9a5v6y8kk6i075x5088hpdd6yi84jq"; + rev = "426d4db8a66ef4741b16d7fff006402bd5de43a6"; + sha256 = "1i9zzag0izzm9gmnp6qrvg9j1q7cz0vp8jp9d6sy11hbigrfgjjl"; }; meta.homepage = "https://github.com/ldelossa/litee-symboltree.nvim/"; }; litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-06-03"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "de1a3d65c0917bcb933ad023768f6b6e74f6ca92"; - sha256 = "1qmvqh9xw8y7vgnc532glcgv94mbwr0ilaiw100ri2qlr9lri2np"; + rev = "4d366989f73ac080a782629ea5b5ae609b59940a"; + sha256 = "1kp9fr2ab2nlrw4nkg79qixd9ir19kgrsgpxdi3kl5k29d0vx6py"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -4129,23 +4140,23 @@ final: prev: lsp_lines-nvim = buildVimPluginFrom2Nix { pname = "lsp_lines.nvim"; - version = "2022-06-29"; + version = "2022-07-26"; src = fetchgit { url = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; - rev = "ec98ce50102a843f34d4895d5af0e60f8cc1d83f"; - sha256 = "12i9v3vnbl0djx43y46xli3f5nbf2yly4c7d0mcq8682yxfq149b"; + rev = "db67e94c813aae166c3d2f119ea7d2e85164922a"; + sha256 = "0xz30jwccpl0xrigfl503garpjhdfikasnmcd98r1n4jmg5rl1w8"; }; meta.homepage = "https://git.sr.ht/~whynothugo/lsp_lines.nvim"; }; lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature.nvim"; - version = "2022-07-08"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "86f0310c095ed72607359fd9a4aef1f375d8fbec"; - sha256 = "1ha8n1kcxi9x873f1y14zh7sswb7p0cqixs5ijm8j4csi5plvbc1"; + rev = "aea1e060d465fcb565bc1178e4189fc79524ba61"; + sha256 = "19dg7k59i088xhyc2kizjgiy87r6v1i2hlj0wyflnzmpaxy4lll1"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -4212,24 +4223,24 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2022-07-06"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "c15e3b4c9eb7015dd58688b3d9bb1d659a49d3d1"; - sha256 = "0s3734i7j28z5l17x8r6lj15rzpkmrpfywq96nhq3vrmnxiaaww1"; + rev = "5f68f070e4f7158517afc55f125a6f5ed1f7db47"; + sha256 = "0p900s02gsy03fbfmy7zs3c3qrq4214jkfbswq0ss3gi5biyzij0"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-07-02"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "295cc9e422060b3200234b42cbee6dde1dfee765"; - sha256 = "1cpqq5miskc87az6ckcgbcpi8acb6hvj57mp7kfddq6s4414svz5"; + rev = "281a89e374eb04663e18e786db5f215092a56595"; + sha256 = "1xkysyqqwdhympljg44hgi5fbfgz042qx91vpf85j99wqhaiz4i4"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -4248,12 +4259,12 @@ final: prev: lush-nvim = buildVimPluginFrom2Nix { pname = "lush.nvim"; - version = "2022-07-05"; + version = "2022-07-13"; src = fetchFromGitHub { owner = "rktjmp"; repo = "lush.nvim"; - rev = "5fa6b33f99211ee7b8741bc8731c4156b707b344"; - sha256 = "12djvkqksh4nbaj6xw7rxqnn5s8jdc03nnfq440vdwzz0i1yidpp"; + rev = "3df0790319b0985d04e2f09fe879b6c2b15692f2"; + sha256 = "0a042blv5zrimfvrsmsn6lls5qss2imgkg73h2vi14z2z4jyk266"; }; meta.homepage = "https://github.com/rktjmp/lush.nvim/"; }; @@ -4284,14 +4295,14 @@ final: prev: marks-nvim = buildVimPluginFrom2Nix { pname = "marks.nvim"; - version = "2022-05-13"; + version = "2022-06-18"; src = fetchFromGitHub { - owner = "chentau"; + owner = "chentoast"; repo = "marks.nvim"; - rev = "56cfa45f9c20373ed90bc4271eae17ee0d452bae"; - sha256 = "0qc452ikyrrx28by0awm9jggv05zcph95kygjya1085g9win87l4"; + rev = "bb257578fef656812d87375f950f4e4018a39ae4"; + sha256 = "069frp4j53211rkw3yjhx8dr2sqlpmb9frwnb8dijd981c7difk8"; }; - meta.homepage = "https://github.com/chentau/marks.nvim/"; + meta.homepage = "https://github.com/chentoast/marks.nvim/"; }; matchit-zip = buildVimPluginFrom2Nix { @@ -4308,12 +4319,12 @@ final: prev: material-nvim = buildVimPluginFrom2Nix { pname = "material.nvim"; - version = "2022-07-03"; + version = "2022-07-11"; src = fetchFromGitHub { owner = "marko-cerovac"; repo = "material.nvim"; - rev = "09844df73a07e5cfad23270318c78ee27e93e5be"; - sha256 = "0g0c6ka8yymw1y40l4j9a0gqva64kngs0vnpa9mdnb2fswryr0ny"; + rev = "94414171611bed8603a35f78f75cd543e591c178"; + sha256 = "1khpg29sn6i2fldabw62wgk1kirp47g4qvr7qh3wmgwfk757zgj8"; }; meta.homepage = "https://github.com/marko-cerovac/material.nvim/"; }; @@ -4332,24 +4343,24 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2022-07-07"; + version = "2022-07-24"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "fc5b438f4cdad5c02621e4dbe4f02357faa19d50"; - sha256 = "00csi3jgw773a84ipa3phc5dw8zny7v3hmn8gjy6h541gr5k55g2"; + rev = "004a53297d1360b604d725acd86e21865fccbcec"; + sha256 = "0cypyf6w96hpm4lhhgbfdxhf5il1ggqrns6f646lfr399r5vgvyb"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; minimap-vim = buildVimPluginFrom2Nix { pname = "minimap.vim"; - version = "2022-06-20"; + version = "2022-07-15"; src = fetchFromGitHub { owner = "wfxr"; repo = "minimap.vim"; - rev = "a9f47afe1032d119a1ceff2714d47e4055564d07"; - sha256 = "1ihx2vhrwyj3zmhnzwdcq54kygm5zic14ccyld995s7vjc4d15ig"; + rev = "3801d9dfaa5431e7b83ae6f98423ac077d9f5c3f"; + sha256 = "1qgrfmbdk420qa7v6r6c6galbr8cg0jkib4i0jvx0m3pdg4sw4rp"; }; meta.homepage = "https://github.com/wfxr/minimap.vim/"; }; @@ -4368,12 +4379,12 @@ final: prev: mkdir-nvim = buildVimPluginFrom2Nix { pname = "mkdir.nvim"; - version = "2022-03-12"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "jghauser"; repo = "mkdir.nvim"; - rev = "01261650382bef195dab8ac39344234b57914f09"; - sha256 = "1irpi2aqi2pr0ydxsw2d4m2lkhzkqcs6gvz15snvnsckvk03j3v7"; + rev = "c55d1dee4f099528a1853b28bb28caa802eba217"; + sha256 = "0zpyvkbw7wfqdxfgidr7zfxqb5ldci4pflx50rsm1hbwai0ybv23"; }; meta.homepage = "https://github.com/jghauser/mkdir.nvim/"; }; @@ -4680,24 +4691,24 @@ final: prev: neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2022-07-05"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "d93f3d8d7efc3f3dd7c5a8079a1186a89905aa2f"; - sha256 = "1q23i0i1q280iafqdizp4chi43rsb01gmgydrnjsvrz0pvb0i5li"; + rev = "892be036fa82871f602f20a5245dfd4bc88d2f08"; + sha256 = "17mgv9qr9bn4ajy825yk5zr3cqhdqz113261vckx43sfia4ligbg"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2022-07-01"; + version = "2022-07-21"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "585251902917f33b3574f2bc7670f68543bd3481"; - sha256 = "14fpqhh98kq4fh2sf4rvns8ffrk9zx44k8p5d6z9l39jygwl8xy1"; + rev = "06e986fab0d0c31ba981b9f21c712dc72b3d237f"; + sha256 = "0pc90hvjkxjg9q4qcn3h2j2z4s40h3ly9pi4jfp61cnqcqm67nsw"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -4752,24 +4763,24 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-07-08"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "01ca7404cca5bb45b06a7cb2a9a0f14fb4451165"; - sha256 = "1phy3l4far26a8rxyb7ic349iik8zrldyi5qywz0p4h7z5ang40w"; + rev = "2c4305eb32b10710a043380069c5538632160260"; + sha256 = "0cbvf0qj31s6pbv0g5nm966v86l1yfan0c7dlyy2lipxhr01x420"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; neoscroll-nvim = buildVimPluginFrom2Nix { pname = "neoscroll.nvim"; - version = "2022-06-15"; + version = "2022-07-11"; src = fetchFromGitHub { owner = "karb94"; repo = "neoscroll.nvim"; - rev = "71c8fadd60362383e5e817e95f64776f5e2737d8"; - sha256 = "1xcj3dmrcnqrk2dzzr137n0g0crfyg3zk3220202v6b4vylairnh"; + rev = "54c5c419f6ee2b35557b3a6a7d631724234ba97a"; + sha256 = "09xlpdkbi0rpyh18f80w77454krx65kw463rs12241f5m0bax7xb"; }; meta.homepage = "https://github.com/karb94/neoscroll.nvim/"; }; @@ -4932,12 +4943,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-07-08"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "8666cba1552e14f72b6ac9e8c46da56f89deb7ee"; - sha256 = "1x8y7vnpkbj8y4rw4lyz56ar5mzj411vxbclynrgf24bj4s5hwmn"; + rev = "4899a1680e5b41436dc92a1f6e5f2a5bbc0b9454"; + sha256 = "10fxqnrl21my3qfg26gl1wsyxksgniynp9ji23hvm72a38mn2g9v"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -4992,24 +5003,24 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord.nvim"; - version = "2022-07-08"; + version = "2022-07-18"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "bc1b3682e4f10add31907ba93233e684fb8ac714"; - sha256 = "1g1n3ic3s3c6b48fy6ynf9isvv2c5iprjv1lhv9babyf26dw3la2"; + rev = "baf9ab55a8b8a75325ed8a9673e60e4d8fef6092"; + sha256 = "0jyn9r7fq2iknmwj1ca1wl9zbyff80n5haa37jcj4sn5cqkfywg5"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; nordic-nvim = buildVimPluginFrom2Nix { pname = "nordic.nvim"; - version = "2022-04-10"; + version = "2022-07-10"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nordic.nvim"; - rev = "fd9bfa20eb7513ac95fc49952949ae1ee3e0956a"; - sha256 = "0isxr0a8v7rfcv7cgyz1g9q9m7z9a2ng3bsw4cfq8x3xzhhgka7l"; + rev = "eb096c03853b8cc24457263c9ceed90256566118"; + sha256 = "1fmxxlndm8ab5i71242d8vai6fbcddslgvcnkg19c09028khmsmy"; }; meta.homepage = "https://github.com/andersevenrud/nordic.nvim/"; }; @@ -5028,24 +5039,24 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-07-08"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "284e2d1b423953ee22694d50e0564e42a65acce1"; - sha256 = "0qjfqdwyzcpfi4v0b350hjvh84k98xsbmnk2js7v2xmjnr9vwvgy"; + rev = "26622d147762f2212bf30e0792df1d0164a73cd9"; + sha256 = "1is2pbmiv92h4m22la4phpjxrv9zj6lmwmylsm4067yyqsr21jf9"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2022-07-06"; + version = "2022-07-20"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "fbb1929b29beff82e0fc495670f00ef4b3bcbcd3"; - sha256 = "1fh1gf8vwim2lf4iq2higqr6cqjmmxyk7q6sfc6ksldz3d6xcav4"; + rev = "9c396ab880bec1097dc4d124c0961cdfa2aa3848"; + sha256 = "0b4cqsiw57bmpnkak8rc6263sgv8vp1r51rr5b1ljrrhdnwx0adr"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -5124,12 +5135,12 @@ final: prev: nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2022-07-08"; + version = "2022-07-20"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "f5e7f60e91821ca4e63d60fdc3a1428118ed1557"; - sha256 = "05m1607rycqfwd23gr92ds5bkvcr68cjdpqxzma5wrac0cssdx6x"; + rev = "8b62211ad7529c314e80b22968eef6ba275c781c"; + sha256 = "1h7k6yca9axv8qvi11cajwwcjd6xpncpkq0211mg7dhqqb4f9xlj"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -5160,12 +5171,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-06-29"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "9897465a7663997b7b42372164ffc3635321a2fe"; - sha256 = "1ic1h8h1h4v5f9f76vahl7yz7smq55x59r7j5h9gdmj97n0p0fp4"; + rev = "706371f1300e7c0acb98b346f80dad2dd9b5f679"; + sha256 = "1cwzzdwhsy3fqxwdx0big2qfvqha4m97nml83i1mp31agjk016pk"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5256,36 +5267,36 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2022-06-29"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "f4a3be57f61893cffa1e22aa5e1e7bded495fcf2"; - sha256 = "0s86y4x1rxkimaz76mbbxavwakmp317fzimn5gypqi36liwv81zq"; + rev = "b3998a9a1848330ca467c3c88ee96f6b3fc48812"; + sha256 = "10x8ykxxigj2dzkjs1c5dc9za913lfj4rfg4rxjvx3l7xyzq101a"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2022-07-02"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "d33b905770f9c674468b0b83bed3aeab41cf9bb0"; - sha256 = "1a1dpfjkr0pssc3vymzcfwyjnh90qhh7cg3s5qgk2vjvgadixvrg"; + rev = "b7b71444128f5aa90e4aee8dbfa36b14afddfb7a"; + sha256 = "1v0jpx6gq3p8n9l3afhrfs9xwszz5mdwfmax5y36dg23ll55lbsv"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; nvim-dap-virtual-text = buildVimPluginFrom2Nix { pname = "nvim-dap-virtual-text"; - version = "2022-06-26"; + version = "2022-07-24"; src = fetchFromGitHub { owner = "theHamsta"; repo = "nvim-dap-virtual-text"; - rev = "a36982259216afd710f55bcdc220477c74b5bc35"; - sha256 = "1liw94g5hi7nvki3kjxyp90y9lrp24wa4df8p54nmpkdxwd38kz4"; + rev = "41bd4b5a698444d30d5827b2d19bcbae4e084ab4"; + sha256 = "057hjk2y335lg73kjx0ljf84y7nbl2ahsfcd0dnw74mw3fby92fw"; }; meta.homepage = "https://github.com/theHamsta/nvim-dap-virtual-text/"; }; @@ -5304,12 +5315,12 @@ final: prev: nvim-fzf = buildVimPluginFrom2Nix { pname = "nvim-fzf"; - version = "2022-06-30"; + version = "2022-07-12"; src = fetchFromGitHub { owner = "vijaymarupudi"; repo = "nvim-fzf"; - rev = "ea1df3a64b26c3213365d83850cfa40b55f4b24e"; - sha256 = "0vs7a7rcvr3xv9b4sdv7g8ngfm92qyjdjc31q08g86yf7hiksxzi"; + rev = "a8dc4bae4c1e1552e0233df796e512ab9ca65e44"; + sha256 = "0cyq5rq029hnk9p3qw6gfhxvqiz5m788i4w6n4xxb6wif642bd4l"; }; meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf/"; }; @@ -5328,12 +5339,12 @@ final: prev: nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2022-07-07"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "64f3b7b4dfddb0d5cd1aedaf1b5d26d407beaf06"; - sha256 = "0z6jwmdhwb5a1mr5y4y9llbmzq9dj320k9bcl9m9lmqb1dg5bmvs"; + rev = "4408d2c10618636101945e9cd9ef9d68fc335e19"; + sha256 = "1i57n41z8qpn5a626spkvn08jnbnhygia7hw2d0bvlcy56xx5wv4"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; @@ -5352,12 +5363,12 @@ final: prev: nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2022-07-07"; + version = "2022-07-19"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "28f766201cc4b8e268305e1d3c7571cdd19aff78"; - sha256 = "1gb67qglls3ga82vm0d46ki2mh5xkq9h02z9am1wslikjhsfj5pw"; + rev = "80e52a18be416790c20e035fa2816aa5e7e34cc9"; + sha256 = "07g7k1dyycyamk5cx36hnwwza6npqi793pivaqs3w80qmqqqba1s"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -5388,12 +5399,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-06-30"; + version = "2022-07-20"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "703268d5b8479de4e0c27af93b203d56c1b53d2b"; - sha256 = "1r55jkvrkx7drfs170801nw4ldh96654fg4nr8zay71i1nyb81w8"; + rev = "f35efb60a0ba208ff2de063085d8b5603e536f9e"; + sha256 = "0xx1yrnxad5975cvrrpq08yj3cyapp48f7xjj3gj7z4xxg0lwkzx"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5448,36 +5459,36 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2022-06-23"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "5249977a585c3c17d94afdc8f0255a689d3a0057"; - sha256 = "0d5gh1n2r0knhmlqpgqx2f67fg5828p6pwhpf7zi89jap53skrwn"; + rev = "4d0abb94776f860ed0eef7c2d7aae96a804cbee5"; + sha256 = "0b47zj8j1ag8y5avyb9zklfjivj18ns4h6n3n6a0shgyfmihn4r7"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; - version = "2022-05-09"; + version = "2022-07-17"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "nvim-lsp-ts-utils"; - rev = "441385952278a1df5c91ba0d33e72c148d4654d3"; - sha256 = "199nf01hjxdalc76xhr306xyisvydjwqhhw40nx1krq9k3xy4z39"; + rev = "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7"; + sha256 = "1j45q63fzxlj179f1fl717ap37p7yiji53967j0yv4pdn200xinz"; }; meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-07-07"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "d17179dbddcdf05f69b67ac13e2127c58a6295a7"; - sha256 = "0r5jqdk1d4azslrpzg275marzxhygl3py95yl3xrizczaikdwz1q"; + rev = "ba25b747a3cff70c1532c2f28fcc912cf7b938ea"; + sha256 = "0fnldljq3n7nnmjmwvn8mbfq5m34ca5kq1bgjdjpfsy2w2mhlabc"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5496,36 +5507,36 @@ final: prev: nvim-luapad = buildVimPluginFrom2Nix { pname = "nvim-luapad"; - version = "2022-06-14"; + version = "2022-07-09"; src = fetchFromGitHub { owner = "rafcamlet"; repo = "nvim-luapad"; - rev = "171e204ed65dc9308833ff80026fc6b7cec22825"; - sha256 = "1k7zly9xpdrxf6221w2x898fdapagzwjcf8sf6agis7flqhp3j8f"; + rev = "9815e2659ce8e2ef4b55e401531cf09b6423e0ea"; + sha256 = "0fkrjrhgkygbm819xgx0fkqndy7n5p0hir47a0kfipv2h7jr5il0"; }; meta.homepage = "https://github.com/rafcamlet/nvim-luapad/"; }; nvim-metals = buildVimPluginFrom2Nix { pname = "nvim-metals"; - version = "2022-07-02"; + version = "2022-07-18"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "9e68fd2cae91ec8361b4e60ec89adb9a745b91c7"; - sha256 = "0ggl7pi0ak2xjmxg8d98dcf1sqqbgxh59ii33v37gpkwskpfgh5h"; + rev = "e6cd8ff487b0140863e683b2ea4cf7f0c14bc504"; + sha256 = "1mymsa75w9k55qbv38fgm256k5md9bhj400rynvbxvq8lp8907a6"; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; }; nvim-neoclip-lua = buildVimPluginFrom2Nix { pname = "nvim-neoclip.lua"; - version = "2022-07-03"; + version = "2022-07-24"; src = fetchFromGitHub { owner = "AckslD"; repo = "nvim-neoclip.lua"; - rev = "1d167d6a3ba44810a2669b3c5463dd322ac1a6ba"; - sha256 = "0llg5pf3k5kpyfbwvf7m2pp3v44pzb2q3cviq6acgsqcsk1s7lw0"; + rev = "74af02e289b3ea465bc8a4d7b9b83adc4e4b8c06"; + sha256 = "1mh93h1bp4r4w7bm1m3g7758bmsdznna5smid64mry2x4ni002dg"; }; meta.homepage = "https://github.com/AckslD/nvim-neoclip.lua/"; }; @@ -5544,12 +5555,12 @@ final: prev: nvim-notify = buildVimPluginFrom2Nix { pname = "nvim-notify"; - version = "2022-07-02"; + version = "2022-07-21"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-notify"; - rev = "74ba257b6cf7fe2b7bb0f6813088ed488baa4a2a"; - sha256 = "0k27isyrsdqf9is943m51wvvkkh7kw5qxm4c5rbbxd2gzb3ykyn4"; + rev = "cd2a59f16d3dc8c54dabc58c31c9c539fcef3c2b"; + sha256 = "14mfvlp44qn3jb4fnicay3cxy0vya5jix41hnvfz1j3bi2c0zng1"; }; meta.homepage = "https://github.com/rcarriga/nvim-notify/"; }; @@ -5580,12 +5591,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-06-25"; + version = "2022-07-19"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "0eff6e2826d92e4b37be6711a1e5bbc945ec3b9f"; - sha256 = "0i5702amdvrcs7xw0alny8nvm8s1fxq4f9syf9ck3j997x1kfayy"; + rev = "dc5474332379c31ac8c74e1e5d1c7a27f0b8177e"; + sha256 = "0w7jyvzj9ybvlhc7jwcinyvpia3cp1d22an89yw9mzlckl2sfwk5"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -5604,12 +5615,12 @@ final: prev: nvim-spectre = buildVimPluginFrom2Nix { pname = "nvim-spectre"; - version = "2022-07-02"; + version = "2022-07-15"; src = fetchFromGitHub { owner = "nvim-pack"; repo = "nvim-spectre"; - rev = "a52139da068ee4d0860810af7c6b6d48d3cde603"; - sha256 = "1h78va3w6x9xppdn63vq4jfrn86807cnw0dgpxsgc73aqi3m3i24"; + rev = "b1a084c05bf6cf32a3b55196e5cde44bb94422fb"; + sha256 = "1k24y4610kmwdnvmk59qvcck22mavc2kd6bh0vzbczf8q1frzd6w"; }; meta.homepage = "https://github.com/nvim-pack/nvim-spectre/"; }; @@ -5628,36 +5639,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-07-06"; + version = "2022-07-27"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "4bd919a75f37c7127ccfc746fc59a71068db3ceb"; - sha256 = "0arzwzmrigsiqpdq9avlb0xmfcrxfvwg3ah0abg5cbv10zagzz8b"; + rev = "e632ac7c8116ed0ed2e865b4b3e0a17a78de8081"; + sha256 = "18w1z94k2armcks0xjgb6yxngshc7qkv949vx652gd1i4xy4xzw7"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-07-08"; + version = "2022-07-27"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "4286c8c74a70202b2673be6fad170aec2f774e96"; - sha256 = "0qxxv1n0xqgam73bh5yxi18msmr6f34baz33rhf3pir6ihaspjc8"; + rev = "36ee4890c47a9de5789d6561b19ce36da8b766be"; + sha256 = "05n3xpk98anp3zlhcr66j536cdlpndqrdayzr7jrh32y57q8smrk"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-07-03"; + version = "2022-07-09"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "dbffef7e76f5c8f3595dea4a5fca854d1185ca92"; - sha256 = "1cbmm1fpvdhlg2m5pi7jcc1nyp0frzss5wapxrs9s5zsjr07hdix"; + rev = "0d086d23c0742404e9bd52977712619a621c3da9"; + sha256 = "109pdbf0098nnrsg72agqsi13z3kghn4fhvcddk2j15yxdp7zwnw"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -5688,12 +5699,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2022-07-08"; + version = "2022-07-11"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "ab6bd79a908e1fb7d5ebc03f4e09f47fb493afb3"; - sha256 = "0knxpg1zgzxzl16p7kcp0czl0xw0913rpimx1hhj4njzp7f4lsl6"; + rev = "40f20e6788e6ce850802cbd2ca029fbb66b5d043"; + sha256 = "0a7p0lvkb8x5cngr7h5vbljckx44lvmbmflwi045p1fcb2b9r250"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -5724,12 +5735,12 @@ final: prev: nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2022-07-08"; + version = "2022-07-14"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "6c0b3b670f67c8eb4dca72e13fcba156f708cb86"; - sha256 = "1psqjdsl5lrjhcx1cf5l2km0p70sbnpcp4lzm4qg65j6w8bjmv5q"; + rev = "9dd019e84dc3b470dfdb5b05e3bb26158fef8a0c"; + sha256 = "0gmh1h28vvrzgmaiz3mv41d7dmvs83r4d2ha8409zvs5bv5d19ad"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -5856,36 +5867,36 @@ final: prev: onedark-nvim = buildVimPluginFrom2Nix { pname = "onedark.nvim"; - version = "2022-06-24"; + version = "2022-07-09"; src = fetchFromGitHub { owner = "navarasu"; repo = "onedark.nvim"; - rev = "4f4bf74bf731cbd779c93a10a6e287ebf16425a2"; - sha256 = "13bjbalj3wdzywspk60bpb2djyhbl075xwi5f9kagm62fw9c2ji2"; + rev = "a5d57015fe164e1a65f317116089956e395132d3"; + sha256 = "0ca5phndl4q5galg0wdirsgp7f8f9ijq7xdvkzdc1icamxgb6sl9"; }; meta.homepage = "https://github.com/navarasu/onedark.nvim/"; }; onedark-vim = buildVimPluginFrom2Nix { pname = "onedark.vim"; - version = "2022-06-27"; + version = "2022-07-18"; src = fetchFromGitHub { owner = "joshdick"; repo = "onedark.vim"; - rev = "ff0e0a488ca9d0d146f6e67b6fc3038f760238ea"; - sha256 = "063390s96464m7nw20sgb3zinwvzawa3ck1ali20gfkywb8qjmll"; + rev = "1fe54f212f09a03c2b5e277f0fe5b7b9d0b0a4ed"; + sha256 = "19jhpfwidwigrcwz20qgm4gf5znz61xslfsf90fkr7k45vgwsk4q"; }; meta.homepage = "https://github.com/joshdick/onedark.vim/"; }; onedarkpro-nvim = buildVimPluginFrom2Nix { pname = "onedarkpro.nvim"; - version = "2022-06-27"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "olimorris"; repo = "onedarkpro.nvim"; - rev = "6b66ef86fc473a20d6072fbdb016036c2e3dee37"; - sha256 = "016fxzl1fig6x041j2alzisy3qzkqls7hxl4770dxv84kl8p8xvp"; + rev = "2c439754e1a60d42197e79461bf04e358213a654"; + sha256 = "1bmifx5dzpypjbpq5pdvzzh68w87q5j06biaqvqrsjygaxm0828c"; }; meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/"; }; @@ -5928,12 +5939,12 @@ final: prev: orgmode = buildVimPluginFrom2Nix { pname = "orgmode"; - version = "2022-07-01"; + version = "2022-07-09"; src = fetchFromGitHub { owner = "nvim-orgmode"; repo = "orgmode"; - rev = "72a7a62530e110bd999e9b55d23308d7dbeb39a4"; - sha256 = "1h2qiga742v6d66181929rw9fdcmp09hmbjfixyhlin6cx6aj2k6"; + rev = "8cc6fa4599aeae171d3051570a10c94269acf05f"; + sha256 = "1vnhma09fyll353f85744fa98pzkcdzgy0s51h0wpwa254s75175"; }; meta.homepage = "https://github.com/nvim-orgmode/orgmode/"; }; @@ -5952,12 +5963,12 @@ final: prev: packer-nvim = buildVimPluginFrom2Nix { pname = "packer.nvim"; - version = "2022-07-07"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "e4c2afb37d31e99b399425e102c58b091fbc16be"; - sha256 = "1826499hcjlz0c777a12qfspfv8jrmmp7sf9bm5m0d3vny1fyiz1"; + rev = "de109156cfa634ce0256ea4b6a7c32f9186e2f10"; + sha256 = "0f3gddf3lfqf97r44gjaf63nbymdsxgsgrbqrpqd02ff1fc4ikb1"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -6072,12 +6083,12 @@ final: prev: plenary-nvim = buildNeovimPluginFrom2Nix { pname = "plenary.nvim"; - version = "2022-07-04"; + version = "2022-07-10"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "46e8bb9d3a852e0a2678be2d48179db545a9a39a"; - sha256 = "0jdaayzyk4w39k72yh5asg3rc5ljc1j4w5g22g0bjg3difznkqgy"; + rev = "986ad71ae930c7d96e812734540511b4ca838aa2"; + sha256 = "1gxz2ivf2p6p3h3d1xm0lb6s7jixf1l6l759a60n0vxv90a565kq"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -6711,12 +6722,12 @@ final: prev: sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2022-07-03"; + version = "2022-07-16"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "93d6f268f65b8208a46e725da7e0cd759cc7b297"; - sha256 = "0cwc084219b36z5ln0z6rvsyx9srz6facr1lbnl9iabqb30j9xqd"; + rev = "888b68bed34a18be8f3341713ccd69b549951d95"; + sha256 = "1b9m09x1wqndwk3aci6033p3bh4nr0lqjh7pgpz0dllrs1jxzs9a"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -6783,12 +6794,12 @@ final: prev: spellsitter-nvim = buildVimPluginFrom2Nix { pname = "spellsitter.nvim"; - version = "2022-07-03"; + version = "2022-07-09"; src = fetchFromGitHub { owner = "lewis6991"; repo = "spellsitter.nvim"; - rev = "9a79ce2e670a3bbf85a6669ab5a6e5f6f01f2a13"; - sha256 = "0m49sqxalr69h5f7b7bplgdnxazmsn82gw4h9gxvjfi9v4xgblil"; + rev = "eb74c4b1f4240cf1a7860877423195cec6311bd5"; + sha256 = "0qajg4kjwlwbxjjms580v5aisg1vjid4vbmvzwk6nsfms8nrzn18"; }; meta.homepage = "https://github.com/lewis6991/spellsitter.nvim/"; }; @@ -6831,12 +6842,12 @@ final: prev: splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin.vim"; - version = "2022-06-30"; + version = "2022-07-24"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "5553f71bbac9f87a3a3f78d01de24a615744a4b3"; - sha256 = "1j3z84n6zjdzdjis54nv8zmh8qxaxazxz43bmzpxjqv7g8jgwqs0"; + rev = "1f7d5841b84b4dd07b7774df5d0601dfdd1efe4e"; + sha256 = "1flr37ikb78ns5az4g3iqm2l6829m9sm508j55liqwrr6l5746xy"; fetchSubmodules = true; }; meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; @@ -6844,12 +6855,12 @@ final: prev: sqlite-lua = buildVimPluginFrom2Nix { pname = "sqlite.lua"; - version = "2022-07-05"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "kkharji"; repo = "sqlite.lua"; - rev = "d53bdff134a81e12834c3f7bd431376482132b7c"; - sha256 = "1y5l3qz3azkbj9xf1dmgd1j6ylgzncn633c4i2s45x88k8bjp2gp"; + rev = "56c5aacd5e31496d9b3cd3d1b0e570bb9a65d35b"; + sha256 = "1yx3bar8gsapaka0x9bkm5d7frzz3k1kpwbc7n110f5x3cirf1yx"; }; meta.homepage = "https://github.com/kkharji/sqlite.lua/"; }; @@ -6880,12 +6891,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2022-05-09"; + version = "2022-07-09"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "174dfcd0197ebc7397c854ae8607f9c9e691eef5"; - sha256 = "1vi1gjkflrkm5fr432r23rbq474h26j9jyagdrkw6mkq3wgh4fcr"; + rev = "f7c4d93d6822df1770a90b7fdb46f6df5c94052e"; + sha256 = "01ngpjnpppazq4dqfwrdc2jkgz5ikpxkscsy0gc89lyi4q2srpai"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -6988,12 +6999,12 @@ final: prev: swayconfig-vim = buildVimPluginFrom2Nix { pname = "swayconfig.vim"; - version = "2022-07-08"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "jamespeapen"; repo = "swayconfig.vim"; - rev = "ce7757f2486cda9ea62d2c3c83d7b943a7623a05"; - sha256 = "007y8b0rzk5wflivkq7fgqcsbncpyyn5zm0slqx2fnz8qnvns817"; + rev = "00705ec60c4c04fac24294ed7a260a09fc32ef9f"; + sha256 = "03wmikc2l3l788ykmx5pb934zbvxx2z3gmk2z401rii48mzyn6wi"; }; meta.homepage = "https://github.com/jamespeapen/swayconfig.vim/"; }; @@ -7037,12 +7048,12 @@ final: prev: syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2022-07-06"; + version = "2022-07-10"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "6f638ed5bb214213a788c6c1aaa565937efd5e8c"; - sha256 = "0vgkfdgpkincr89anjhhw0nyk41rp97sgjphr0xs1sf4hq627n5m"; + rev = "8d5e37c29cf5952fbf300b9230bffe424c61a488"; + sha256 = "0z2dazzy7af4wrk48wlwl5zlii0qzvrxlf0cqrzk1qxx3z8m2n50"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -7182,12 +7193,12 @@ final: prev: tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2022-04-24"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "7fb091aad8d824bef1d7bc9365921c65e26d82ad"; - sha256 = "1lcaa5184gaifscdqzqv7fs35lmcwhlv0s5n8606xbm4qy1sr7mn"; + rev = "e77e1bf61b4f1ddc7b13c6160b7389df42aba24d"; + sha256 = "00cvap0qp016x09h4wkk6d0b9px7q8dplj8fj5c7j95r15k6z2r7"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -7218,12 +7229,12 @@ final: prev: telescope-coc-nvim = buildVimPluginFrom2Nix { pname = "telescope-coc.nvim"; - version = "2022-07-07"; + version = "2022-07-15"; src = fetchFromGitHub { owner = "fannheyward"; repo = "telescope-coc.nvim"; - rev = "8f531dae83882d93cb2a1a7948da2944d292f3b4"; - sha256 = "00q9xaqg50q1am92321zrdlwknkkmz13al1cpp7y09bsbhair766"; + rev = "65d73788915a1706bc8c47fa283f3e9515f7ed1b"; + sha256 = "02fzllnr87s8sfm2b7ax6nvl3hjzniiz93yqf2m7l1gaadpf9axk"; }; meta.homepage = "https://github.com/fannheyward/telescope-coc.nvim/"; }; @@ -7242,12 +7253,12 @@ final: prev: telescope-file-browser-nvim = buildVimPluginFrom2Nix { pname = "telescope-file-browser.nvim"; - version = "2022-07-04"; + version = "2022-07-18"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-file-browser.nvim"; - rev = "b5502c660fc135f2d7fdc390693ba900282433b8"; - sha256 = "0xf3hpk1k4p86lxyjnain8yc5ncb5p6nazn5vllkr8jxpn6f2pag"; + rev = "c30fcb6214acf8538616e403e0f82a6430bf6801"; + sha256 = "17pilvq69q66s8bfsyllmphhzganzcd3vgbb3q9w64d5gbpr7jgg"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/"; }; @@ -7325,6 +7336,18 @@ final: prev: meta.homepage = "https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/"; }; + telescope-media-files-nvim = buildVimPluginFrom2Nix { + pname = "telescope-media-files.nvim"; + version = "2021-10-21"; + src = fetchFromGitHub { + owner = "nvim-telescope"; + repo = "telescope-media-files.nvim"; + rev = "513e4ee385edd72bf0b35a217b7e39f84b6fe93c"; + sha256 = "1ap3ijh64ynyxzbc62ijfkbwasv506i17pc65bh3w4dfpzn6rlpy"; + }; + meta.homepage = "https://github.com/nvim-telescope/telescope-media-files.nvim/"; + }; + telescope-project-nvim = buildVimPluginFrom2Nix { pname = "telescope-project.nvim"; version = "2022-06-12"; @@ -7375,24 +7398,24 @@ final: prev: telescope-vim-bookmarks-nvim = buildVimPluginFrom2Nix { pname = "telescope-vim-bookmarks.nvim"; - version = "2021-08-12"; + version = "2022-07-17"; src = fetchFromGitHub { owner = "tom-anders"; repo = "telescope-vim-bookmarks.nvim"; - rev = "b7a436eba6102c2bc73f49766a12e79d24ab8fb5"; - sha256 = "0lak83b8y963hv61z2yfi1nyaapvq2hnhpcx7bc6h8v4jzyjis0n"; + rev = "92498cbf7c127dea37c3d27117b60dd7ab9baef4"; + sha256 = "1nflwz7jji4lr621cifg4mq7a6ld4dvaq3dxg7rr4bahh02w5hb5"; }; meta.homepage = "https://github.com/tom-anders/telescope-vim-bookmarks.nvim/"; }; telescope-z-nvim = buildVimPluginFrom2Nix { pname = "telescope-z.nvim"; - version = "2022-01-19"; + version = "2022-07-15"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-z.nvim"; - rev = "962766a35b8e8c77f3c92612101d4b2347687c00"; - sha256 = "1ladvpxri5lbjdh6zvbqa306f9nanx80bxy216glq2sgz7br4f1n"; + rev = "64e5adc84acd1cd73fd401c026fda54dccd78f72"; + sha256 = "16018l76an0p7xrvzaxsb2vg5bq7di79snv1fz1k5naajxlpa3b0"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-z.nvim/"; }; @@ -7411,12 +7434,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope.nvim"; - version = "2022-07-07"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "524c4eb7fb1a9941460ab7c7c09a3bca9cebb7be"; - sha256 = "07f8j6d0hpg70qdnnfl17l7s396lb7jnda7vz9zh57dhgk0zr5n6"; + rev = "b5833a682c511885887373aad76272ad70f7b3c2"; + sha256 = "1czip023gay22dh4zz18pkxaazljm2miqhhifvwf39vrbx8sywdx"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -7519,12 +7542,12 @@ final: prev: tlib_vim = buildVimPluginFrom2Nix { pname = "tlib_vim"; - version = "2022-06-14"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "tomtom"; repo = "tlib_vim"; - rev = "223c696eab4a3a59a33352531e42c74c721510e7"; - sha256 = "1x9s9ypk934lkqpcyvycij5803y1vz5i3q8p8di6d6jv04ylvgvl"; + rev = "d3bdad7b5e4253dc7ce6793342d7b8755c67ff0c"; + sha256 = "14r3nn1lq1cx2jr02czrrl55k2s0da6375js24c426iqar9dzf17"; }; meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; @@ -7592,12 +7615,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm.nvim"; - version = "2022-07-05"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "8cba5c20c9d8517af21ac9e2afd06ad7b2dbdece"; - sha256 = "1radhrw4byzif24nrfsbmjyqbxahh6m9w3lhwh3hnzck08kwxvbm"; + rev = "cd12ed737d3de2757a540ddf4962a6de05881127"; + sha256 = "032x7kmy8aqrc3lq6ns3jcicvjgwjhsfmfch3s20af48y6lp1xm7"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -7832,12 +7855,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2022-07-05"; + version = "2022-07-20"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "617dee975135f0981410b8369dc94dbe58a80d7c"; - sha256 = "1dgfbgx5475zfpxv0shliyajv7568ggiwcg61azfqi52mqgyy1dp"; + rev = "18113770f05b2a6a8b70328277099189185471e0"; + sha256 = "13r17a8zl9gxd4d0m3gwvhsxlkaczl8mynfaba9h4akyfqrvcwj6"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -8168,12 +8191,12 @@ final: prev: vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2022-06-28"; + version = "2022-07-13"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "91b67e3ca2d7bc66544724f9c702265c564a1f2e"; - sha256 = "0b007gl1j8k91h3fwxjkviikaijdhfvsq96k8pqvszaqjsszrksj"; + rev = "ebb89a0846ff8b8bc64579155d661b825f97d3f2"; + sha256 = "0c75m9hcyjng66j0fw60q77bqcyzqwccgfyc683gfik0qhd3k3qs"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -8192,12 +8215,12 @@ final: prev: vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2021-07-13"; + version = "2022-07-12"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "97cf3e6e638f936187d5f6e9b5eb1bdf0a4df256"; - sha256 = "0cbxjb1q7xlxykzq4ab4n3ny768ysf97f7h7d9spfmw286j3c2wi"; + rev = "55bad92d246a31e3425dfaf16b7eec657eab1fad"; + sha256 = "1xr8h8n1vxdbl7cm6jxqb2y3ywdq53vm9vq4qbz2xpg8w5fvm3z7"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -8264,12 +8287,12 @@ final: prev: vim-argwrap = buildVimPluginFrom2Nix { pname = "vim-argwrap"; - version = "2022-02-08"; + version = "2022-07-14"; src = fetchFromGitHub { owner = "FooSoft"; repo = "vim-argwrap"; - rev = "0faba07179f96cae2ab49cf2cc22ebeb922c1532"; - sha256 = "1lb1rjp1q25gqpzbjix9anjxvx7cqw1qlacvc693f59gl8s8nbf4"; + rev = "feaba6b8b6ca099d267c81ee2c4ba43ce6de8499"; + sha256 = "08hjsxwm0fxgc54awzr7fmq1mrddq3rah40wnj44l4lsd73f5lba"; }; meta.homepage = "https://github.com/FooSoft/vim-argwrap/"; }; @@ -8300,12 +8323,12 @@ final: prev: vim-auto-save = buildVimPluginFrom2Nix { pname = "vim-auto-save"; - version = "2021-10-15"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "907th"; repo = "vim-auto-save"; - rev = "d8ff037621e2351278cf0892ca19ee7ce479e802"; - sha256 = "1z075hb5wi7sv9yha4fxfxakcayymicg6av2gc9skaw8y2sx6jzn"; + rev = "038c104f67a63d4a39bef1ce5d60716fbebf1b24"; + sha256 = "1sm08m86l7vd9v34ba0rfmybnl5930djnmfjhcr380bpwq946vky"; }; meta.homepage = "https://github.com/907th/vim-auto-save/"; }; @@ -8540,12 +8563,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2022-07-08"; + version = "2022-07-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "01405e75aaedaddee9f26f3491dc22683c43f0ff"; - sha256 = "1gi3f9zbqzd88fydgzhd9cl47x263cnqhkhdwr18v7rh32056ik3"; + rev = "141fb556f43ea4a50a406d855b6339f037075c75"; + sha256 = "0c2q61i4pcfbsizk54npdnzdrg6g3v5cfhcvj4rh87scj6sapp27"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -8600,12 +8623,12 @@ final: prev: vim-code-dark = buildVimPluginFrom2Nix { pname = "vim-code-dark"; - version = "2022-06-15"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "tomasiser"; repo = "vim-code-dark"; - rev = "caf254ffa59b91c41851024a58d1eaa806a81bc9"; - sha256 = "0ympd38yf9wlm37sgamyxi8nal0k7imd173xxfp617sj7lrnnx5q"; + rev = "08eea24ec8c9a713e53ec47b7dd2c1d5a2dd7027"; + sha256 = "1y9y37l55qx1yqpksj38di41rbxr498rcxf9dnczk2mp7hcssi0b"; }; meta.homepage = "https://github.com/tomasiser/vim-code-dark/"; }; @@ -8900,12 +8923,12 @@ final: prev: vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2022-04-26"; + version = "2022-07-14"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "7e41cd7628d9844b4e66b45104f3abc326aa1a00"; - sha256 = "16q979l3zjh4ly0rr74y3g3q0csabs8v5k6dxkyymvg3bycrpg4y"; + rev = "81b40878f286f370df2a2b3a52c4d860643d2142"; + sha256 = "19wmp9bx3sgf4vjvq504ah12hh6zm7hvqjyq07sccy2z7ld87bd5"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -9068,12 +9091,12 @@ final: prev: vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2022-07-01"; + version = "2022-07-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "79a3397f7799cb211a7fb803388b96a5f28fd778"; - sha256 = "1fhs01k6nmnik54inx7jq4yxsfpxiawvw7abwxwwd6fshss57k66"; + rev = "210bec5b5306023ba7b04a4e5b0824755ea51d5d"; + sha256 = "1f51nv2ffqp0sg6fv5x8hm94mc1l4pmmnc05ghbahzn8z6042b52"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -9128,12 +9151,12 @@ final: prev: vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2022-05-06"; + version = "2022-07-14"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "39e0232f490322c5a2d9e24275872f28da496a93"; - sha256 = "1wp5x5vximysab4c97d7x7y0hnnmycfm9h8mxxzz291ra5yrbbr2"; + rev = "74e0e1662cc9ed3d58ba3e3de20eb30ac4039956"; + sha256 = "0c9in0y32glddwzv6d9720qhm5fhh4l0kxfv6griaxp8707pbnm3"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -9320,12 +9343,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2022-07-08"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "ff04324bffd86f9c146cc5fc2c0a2f95a1509643"; - sha256 = "0g0sj9j8nsln2q8msp1qy2139pvi949gyyh64qy3jafa5bxg6gcn"; + rev = "9a13fc87c4ab83ea81e71ccad9b846a5eb31a998"; + sha256 = "0k8zyj0pjnzknbw758gamg0hqn5bl3c3qasaxqk9fmsb10hky4hr"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -9464,12 +9487,12 @@ final: prev: vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2022-06-09"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "b7506c6da8ea3a88e268a91aa6630be3e26a20a9"; - sha256 = "1n0b5057q41d32gdlvcxv01xgj7m30428fyqrr6la2maixvv77zw"; + rev = "7ec0a19a78a453686cb5c9776e506375562f9a1f"; + sha256 = "17aq08q5ymc7460lf02wfw7wl3dsnazm504m45w6f6i3zhzbwqnq"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -9765,12 +9788,12 @@ final: prev: vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2022-04-10"; + version = "2022-07-09"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "c82e6d04f27a41d7fdcad9be0bce5bb59fcb78e5"; - sha256 = "192a6il56r4cfkqq67vh5kbdfa7vzwmh33sb8zy6zlri0a0h7dw8"; + rev = "6bfa5dc069bd4aa8513a3640d0b73392094749be"; + sha256 = "0jwqmp8zx9iv80rlz24xvp62jnrhq7m8jamnk7s2x1cw2ik83gjl"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -10006,12 +10029,12 @@ final: prev: vim-kitty-navigator = buildVimPluginFrom2Nix { pname = "vim-kitty-navigator"; - version = "2022-03-27"; + version = "2022-07-25"; src = fetchFromGitHub { owner = "knubie"; repo = "vim-kitty-navigator"; - rev = "7bf84bc1253bebb86cbf63efa274a656e1faadc6"; - sha256 = "126z01zqrpnkhi7kprl8kqwkr5ahxyrnx3pvzzmfqb9320v98d18"; + rev = "e48aae3c7e3136682b3f4c6cfd85867b392f7f1a"; + sha256 = "06caj10yw71rbksf0cjdxak3c1qm7qcby7jrc26llk5qhfpwgh2a"; }; meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; @@ -10186,12 +10209,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-07-01"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "68c018eb1a79e0bbeb496f7040f7205b57cf3750"; - sha256 = "0ykacf1zkiqh66ikfkv9md1qhylyz7n7fb2ql1g2ikc428lh22vc"; + rev = "eb542a379fbb8147ac8ae346f50217df655acc1d"; + sha256 = "0ka3dqdmj9h3ld7xnh3vfgpjs9l0d651gz0zr76spf7xdgrn59y7"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -10234,24 +10257,24 @@ final: prev: vim-manpager = buildVimPluginFrom2Nix { pname = "vim-manpager"; - version = "2022-01-28"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "vim-manpager"; - rev = "194607a8d1bd122ad811ef601eb04a3df7786d59"; - sha256 = "0qnm4k0frki3p9fpb6h4xnv1dxijk9aqcd7glq28c216gh395a5d"; + rev = "ba60d59a79c096775f5c7f7d76fdffa396efdfca"; + sha256 = "115sm2hxbc0jyf0wx6nh6249pmvv9rm3wa3wixggakv2lj9hddjl"; }; meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; vim-markbar = buildVimPluginFrom2Nix { pname = "vim-markbar"; - version = "2022-07-02"; + version = "2022-07-10"; src = fetchFromGitHub { owner = "Yilin-Yang"; repo = "vim-markbar"; - rev = "20d5555ff854d89493b8f434ba619cae0b0268d9"; - sha256 = "027ridkx2akvq7n17ad6xrwdc9bm2avhgdsfhh31p3iyxhs7g8da"; + rev = "8da283528c36a3e1c25d7c40c259f3a8082d1467"; + sha256 = "1dfvi3afqxi5142n2j9zz78mjxcnsh77v83247ax15y679ww9h64"; }; meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; }; @@ -10295,12 +10318,12 @@ final: prev: vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; - version = "2022-05-29"; + version = "2022-07-16"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "976ebfe61b407d0a75d87b4a507bf9ae4ffffbaa"; - sha256 = "182lzlbjfplvhzw36rsizjhjcnhkddswm0yydbqg3gjdxs7y5wdf"; + rev = "3cebd218a7b85a75df3f4f7867adc79b8624a217"; + sha256 = "0n7hhiws3i0dckk8jmb9bb6qqm43h1l39v6f1m3z918lgjmlx5rw"; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; }; @@ -10319,12 +10342,12 @@ final: prev: vim-merginal = buildVimPluginFrom2Nix { pname = "vim-merginal"; - version = "2022-06-25"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "idanarye"; repo = "vim-merginal"; - rev = "0fab5c23255902f975c52e65fbb6dff9be8ed64d"; - sha256 = "0ia7nmhipghw4d7azbgsrdmdd8dc36cqdj9grg5g2xlvfmfj15pv"; + rev = "436076b9f2daa805948fa054a24e3b519f6fc089"; + sha256 = "1gcc35pp44sm632nqa14hg9d8ymfrfs9sd62gzjkygjbyz9c8nc1"; }; meta.homepage = "https://github.com/idanarye/vim-merginal/"; }; @@ -10415,12 +10438,12 @@ final: prev: vim-mundo = buildVimPluginFrom2Nix { pname = "vim-mundo"; - version = "2022-06-20"; + version = "2022-07-17"; src = fetchFromGitHub { owner = "simnalamburt"; repo = "vim-mundo"; - rev = "b9a6adbcfacc1ffe42ef3aa888f7c828a0b63746"; - sha256 = "0x0xjijadzk3z3f4bs0k3rbhb760qcdczvn0c8m9gx678wfjshyd"; + rev = "3c7e008a9922702be979dbfe3c5280313f53618b"; + sha256 = "0gjsv7abpdiv4x199057404xhimlgy6r2f5y22q4p574mq66mg2k"; }; meta.homepage = "https://github.com/simnalamburt/vim-mundo/"; }; @@ -10571,12 +10594,12 @@ final: prev: vim-ocaml = buildVimPluginFrom2Nix { pname = "vim-ocaml"; - version = "2022-06-24"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "ocaml"; repo = "vim-ocaml"; - rev = "47fb78a015d3ea185dd26cfc162d81dc564aec76"; - sha256 = "08ip8g4b6q5ivfgvrgjs4p0f4x6qj1gsyjrr1vshqg3b1z06877z"; + rev = "95e1947766a1496f31ee501828375ed30d06edf3"; + sha256 = "1p4s7gbxwj81ywycm51b23a9pkfb117bjvkg8m6yknap26sx0wml"; }; meta.homepage = "https://github.com/ocaml/vim-ocaml/"; }; @@ -10751,12 +10774,12 @@ final: prev: vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2022-06-01"; + version = "2022-07-23"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "ff52ed9296715988fc3269b64a903415c3bdf322"; - sha256 = "08p51a7alj173j0n8qlg4lpyyr4m2i6jfm7wqxl0k4qnfw3lpyx9"; + rev = "2baeabb9584bb948618806f22bc4cef5685535fc"; + sha256 = "095hsn5vm0s8ky84l85cshn9hsa3cmyy27r9n9cdq28x373nabdr"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -11075,12 +11098,12 @@ final: prev: vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2022-07-06"; + version = "2022-07-10"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "e76078886f944a2ec83ead3aa749895d31dd45e1"; - sha256 = "10azmn46bi9rc8jdbxd3gbakp9p3cn5mcs9dkf4dbfkq6929mlf0"; + rev = "50f9ced186cf2651f4356aa3548c2306e181ec3b"; + sha256 = "1wv498ikprc8cmvlmyspw3mll9na5aa8w3yni8vzrdlca6zy3l0q"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -11183,12 +11206,12 @@ final: prev: vim-rsi = buildVimPluginFrom2Nix { pname = "vim-rsi"; - version = "2021-01-16"; + version = "2022-07-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rsi"; - rev = "e181883a0932d9315cceb96b5fffb5e2ec67068e"; - sha256 = "1pfg3y1hf840pr7f6vcwldbraj2w4c2pnf7ampbgyric0q3f4708"; + rev = "4c673fb6c70652a09682c50a0e308184731ca70b"; + sha256 = "1vfgb6ip8rnwxvjayv4lxar274bx3wykax3ms07wyna9p9pp5qfj"; }; meta.homepage = "https://github.com/tpope/vim-rsi/"; }; @@ -11219,12 +11242,12 @@ final: prev: vim-sandwich = buildVimPluginFrom2Nix { pname = "vim-sandwich"; - version = "2022-07-03"; + version = "2022-07-22"; src = fetchFromGitHub { owner = "machakann"; repo = "vim-sandwich"; - rev = "59f95e614f1363be7d00523189d70011ecf477ec"; - sha256 = "0jwmsnd0wck7w0y52vy0ky20dr15v1x0hs5g5nv4p35csafm0w0r"; + rev = "74898e6f5c5ea37e17163f00bf4981049f785eed"; + sha256 = "09zx0081bmprvf1zv3wxjnl0j4viks9w3yysbwgg1qqi38fls5rg"; }; meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; @@ -11399,12 +11422,12 @@ final: prev: vim-slime = buildVimPluginFrom2Nix { pname = "vim-slime"; - version = "2022-07-08"; + version = "2022-07-16"; src = fetchFromGitHub { owner = "jpalardy"; repo = "vim-slime"; - rev = "f5828b076771551dee9ea09cd735bea019d9596c"; - sha256 = "047b7zbhrp1k2b2h2s0bawiwgyny2czk4vy36kmlzizrp3jl0bd8"; + rev = "36153404daeb4c9b0f8db0be1ee6aae7ef73fee3"; + sha256 = "1chq7ppyv7djjsamj7a05dx3zs5ic3nr0wvvc8qfswx1i9lrjhys"; }; meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; @@ -11483,12 +11506,12 @@ final: prev: vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2022-06-10"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "222cf7b44bb569c9a046a9891000c898bd4c43c9"; - sha256 = "0xksa854c8rjp9y2xvhk78z5ha9p8c3pvpzvddii2aay22cfkn8h"; + rev = "c5d977c49211883b9241086874fe89c72ae378ca"; + sha256 = "0sqy26xicaxsx7ii74j9z5inc6nnlxp05dssy1c5ilf6pk2npb44"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -11567,12 +11590,12 @@ final: prev: vim-startuptime = buildVimPluginFrom2Nix { pname = "vim-startuptime"; - version = "2022-06-17"; + version = "2022-07-27"; src = fetchFromGitHub { owner = "dstein64"; repo = "vim-startuptime"; - rev = "82c8a5491e13fa307fb2cb47182a30560f930377"; - sha256 = "05bj0cs5m829bdcm9zgmla2ha2nwg5cn1qs9r75haway42dza3s6"; + rev = "dcdba2cd6713b48d86cf828f4752273a8b6eaaef"; + sha256 = "0zr6pvw3jimjzlxjg2mjbr6kpdkihxai388b8492zp48ixv01hh0"; }; meta.homepage = "https://github.com/dstein64/vim-startuptime/"; }; @@ -11736,12 +11759,12 @@ final: prev: vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2022-06-27"; + version = "2022-07-21"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "dfbf93d71b63699d54accd37f12ba328b8ac311a"; - sha256 = "1s5m1d37r10l24x5n0dr6pa7hfb5n0s1kw77vfd04k8jf1w2sphb"; + rev = "a5b122e8c5eb47db5a034908172ccbee44f4e520"; + sha256 = "0mwlmmf7fikrfjq0m2bn9dwmgky0mp0w7lll7fw4lqdmphvk8kd5"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -11820,12 +11843,12 @@ final: prev: vim-textobj-variable-segment = buildVimPluginFrom2Nix { pname = "vim-textobj-variable-segment"; - version = "2021-08-29"; + version = "2022-07-16"; src = fetchFromGitHub { owner = "Julian"; repo = "vim-textobj-variable-segment"; - rev = "30f7bc94bc8a87d923631f5e440200b662becb1a"; - sha256 = "1168qylhs0f0xzvy68kh07p8w01ypc78h2cb4pklv8079c869k30"; + rev = "51c323dca5c44f7a8e5a689b9156ef818d02188e"; + sha256 = "1fvy3il883b7czwsai1pq80hslra23c7ff23ydhvzxgfip9qrkxc"; }; meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/"; }; @@ -11916,12 +11939,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2022-06-25"; + version = "2022-07-19"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "af7fe78523c7c860d00b79383908322fcb5e6133"; - sha256 = "1wazgrvywmr6hc32l4vbqdd8cjq73fy2pnaiifwcjbpxzxj6qasw"; + rev = "45969a8510894b0f8ff4468361c18897dd524b98"; + sha256 = "0wdvdxrphix46kbaaqqsarvg161xrb8r0s3c0q29k1kzajnygxpm"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -12216,12 +12239,12 @@ final: prev: vim-xkbswitch = buildVimPluginFrom2Nix { pname = "vim-xkbswitch"; - version = "2022-04-11"; + version = "2022-07-09"; src = fetchFromGitHub { owner = "lyokha"; repo = "vim-xkbswitch"; - rev = "a0a7dd335189c5ba0c6afee875c6713d70e6e3fc"; - sha256 = "09lpivh5a6n61ypw0n31ncy5bj4cpzvvn4s6666yjnpsmi2phsix"; + rev = "3dc0c735bd031a9302177762ec6b608e450a1564"; + sha256 = "19zbf82sflkvh9qw9prha1lxc8ryqmr1n3fflxfmd7xfvv3n336m"; }; meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; @@ -12408,12 +12431,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2022-06-28"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "bdfa7471ec63e49b7712a8f16ee7d1f96f3783d8"; - sha256 = "0phxs1gkw61g29fcn6ry9v282a6i8dlgkjgnp0nb7r69zrqcigrr"; + rev = "794c11f2dc3d943183fc04b6b9f82d3a0207ce02"; + sha256 = "152rj4vf0hi0am2qg31mgsrvma1k7nx3gnai35jycv0wyqrxvnlb"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -12421,12 +12444,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2022-07-08"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "2ebf0aea386c2fa82161b2cb533a49273933e025"; - sha256 = "16qn4g2sy0q7m1q8axg4n6ax1g4ympq0iss95mjz4g672zylkbb9"; + rev = "b9ad861cd7ab1a55eb5f64b3e2e0043d2b835946"; + sha256 = "03lybgm2wbncdy578zqd05nsihg3y7b3mj9cd5jr2q46iih6rzkq"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -12710,12 +12733,12 @@ final: prev: zk-nvim = buildVimPluginFrom2Nix { pname = "zk-nvim"; - version = "2022-06-30"; + version = "2022-07-14"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk-nvim"; - rev = "fab4bb7fd95edd9eaab7cd7bb517a291351e0574"; - sha256 = "009mnwbn2g58apcvi3s11w1q0pcxfnw25rb023n6vy107qfszncz"; + rev = "73affbc95fba3655704e4993a8929675bc9942a1"; + sha256 = "0rw72y6h19dq67ncrfyc4y2743czh8j735ihrqykfj2mr3rwa2h5"; }; meta.homepage = "https://github.com/mickael-menu/zk-nvim/"; }; @@ -12746,36 +12769,36 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2022-06-24"; + version = "2022-07-26"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "ffd6f3e10445cb2c92401b75d4eccb75faf8b6b1"; - sha256 = "0970426myaybar4aqf3lz468057q2b88bmr4skmmfy2a2xq3cddc"; + rev = "484c7d741176f471ae4425af40e3c0cd97da188e"; + sha256 = "15r7r8pb2gdbhlm8zvm92fa6fapns2gpzfj1h4py0h62cdgy4qq5"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; catppuccin-vim = buildVimPluginFrom2Nix { pname = "catppuccin-vim"; - version = "2022-07-02"; + version = "2022-07-18"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "4f4d11c9c6bd9dec003cad2162ba25fbb20180e4"; - sha256 = "0f9vf7p22n4sl4qa7km5pg62dcnn30d63ghhbcipm21777xws8a9"; + rev = "ee1c14bd00fd6edcf158fab340c42622690fd859"; + sha256 = "057gafifcp5gx2bw3gcij1yq3w2ikll1ka7gs4y0sm5dq7czpff0"; }; meta.homepage = "https://github.com/catppuccin/vim/"; }; chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-07-08"; + version = "2022-07-27"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "2560bdee3ca186fc6fe3426b29741f9657125fff"; - sha256 = "0vwqb3xy5krzz0gvl1a18kgls8kyhlf8hw5i29lj5lj3g6nzs6j2"; + rev = "e15a5faf6d321df8f93c61d3ed346315233668cc"; + sha256 = "092vmylxd916li71vscx0d52r8qfwnrkmq4a9r4jpx1pa982gjw2"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -12794,24 +12817,24 @@ final: prev: embark-vim = buildVimPluginFrom2Nix { pname = "embark-vim"; - version = "2022-04-08"; + version = "2022-07-12"; src = fetchFromGitHub { owner = "embark-theme"; repo = "vim"; - rev = "d231d6f6ddb9c405ccf9ec2331deaf1d0b2c8d2a"; - sha256 = "0pbzjmywkxsfr3dw1gvaisnq87ryzk9565s4gj77yr8qrbjh1k1j"; + rev = "1dcf15351622964ab7e35f3e780e7a1c581ebd2d"; + sha256 = "1hc5grwn5xxrswm7yz7dn2fjddvngvy09bhjdgldpxw45m9kpdd9"; }; meta.homepage = "https://github.com/embark-theme/vim/"; }; gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2022-04-29"; + version = "2022-07-14"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "34ad436b234c5095d46bb065c5b32780618df83f"; - sha256 = "11zp3w4n2iq97rx7fp7rlvykmx4k7swbbqpjphrx0il0fmghv6q8"; + rev = "7e1b1bcab96149224738664a9ddd7cb1b3acf90a"; + sha256 = "1hrr0lcj93iwlzzawvg183d0zz3phlnnx70gfhsv83csnj04r1vz"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -12842,12 +12865,12 @@ final: prev: rose-pine = buildVimPluginFrom2Nix { pname = "rose-pine"; - version = "2022-06-16"; + version = "2022-07-17"; src = fetchFromGitHub { owner = "rose-pine"; repo = "neovim"; - rev = "3f0a6c06da29c7b0f3fa49a313ae4d56f0dc58b8"; - sha256 = "01r34bkfs8kvaw72852sfk5jr1ngg2qf6a3dlpsppkb8l4lwi1k3"; + rev = "9aff7f7602614f4f0046db639f07cf2bed4c321a"; + sha256 = "0wrqhb2j5hfg4vvs7xacy8vszyn40ygjsfi9f2i5p7h682vbz5ad"; }; meta.homepage = "https://github.com/rose-pine/neovim/"; }; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix index f7e1645d70..b2477665ec 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix @@ -824,6 +824,10 @@ self: super: { meta.platforms = lib.platforms.all; }); + telescope-media-files-nvim = super.telescope-media-files-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim popup-nvim plenary-nvim ]; + }); + telescope-nvim = super.telescope-nvim.overrideAttrs (old: { dependencies = with self; [ plenary-nvim ]; }); @@ -974,7 +978,7 @@ self: super: { libiconv ]; - cargoSha256 = "sha256-9Vr1gpggfAQlMgM/s8j6FTTYFppHql2PQ7cPtg1wNmo="; + cargoSha256 = "sha256-prqS4cx5T+EiilXf3v7ResNBtgst0Kpgvayknf0QDXA="; }; in '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names index 26666c8359..cb7a8c114d 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -280,6 +280,7 @@ https://github.com/sainnhe/gruvbox-material/,, https://github.com/ellisonleao/gruvbox.nvim/,, https://github.com/sjl/gundo.vim/,, https://github.com/junegunn/gv.vim/,, +https://git.sr.ht/~sircmpwn/hare.vim,HEAD, https://github.com/ThePrimeagen/harpoon/,, https://github.com/neovimhaskell/haskell-vim/,, https://github.com/travitch/hasksyn/,, @@ -358,7 +359,7 @@ https://github.com/alvarosevilla95/luatab.nvim/,, https://github.com/rktjmp/lush.nvim/,, https://github.com/mkasa/lushtags/,, https://github.com/iamcco/markdown-preview.nvim/,, -https://github.com/chentau/marks.nvim/,, +https://github.com/chentoast/marks.nvim/,, https://github.com/vim-scripts/matchit.zip/,, https://github.com/marko-cerovac/material.nvim/,, https://github.com/vim-scripts/mayansmoke/,, @@ -614,6 +615,7 @@ https://github.com/nvim-telescope/telescope-fzf-writer.nvim/,, https://github.com/nvim-telescope/telescope-fzy-native.nvim/,, https://github.com/nvim-telescope/telescope-github.nvim/,, https://github.com/gbrlsnchs/telescope-lsp-handlers.nvim/,, +https://github.com/nvim-telescope/telescope-media-files.nvim/,HEAD, 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/,, diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix index 60d4856cae..d11d638f4a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -3,7 +3,6 @@ , runCommand, makeWrapper , nix-prefetch-hg, nix-prefetch-git , fetchFromGitHub, runtimeShell -, hasLuaModule , python3 , callPackage, makeSetupHook }: @@ -52,8 +51,6 @@ this to your .vimrc should make most plugins work: set rtp+=~/.nix-profile/share/vim-plugins/youcompleteme " or for p in ["youcompleteme"] | exec 'set rtp+=~/.nix-profile/share/vim-plugins/'.p | endfor -which is what the [VAM]/pathogen solutions above basically do. - Learn about about plugin Vim plugin mm managers at http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html. @@ -168,16 +165,13 @@ let rtpPath = "."; - # Generates a packpath folder as expected by vim + /* Generates a packpath folder as expected by vim + Example: + packDir (myVimPackage.{ start = [ vimPlugins.vim-fugitive ]; opt = [] }) + => "/nix/store/xxxxx-pack-dir" + */ packDir = packages: let - # dir is "start" or "opt" - linkLuaPlugin = plugin: packageName: dir: '' - mkdir -p $out/pack/${packageName}/${dir}/${plugin.pname}/lua - ln -sf ${plugin}/share/lua/5.1/* $out/pack/${packageName}/${dir}/${plugin.pname}/lua - ln -sf ${plugin}/${plugin.pname}-${plugin.version}-rocks/${plugin.pname}/${plugin.version}/* $out/pack/${packageName}/${dir}/${plugin.pname}/ - ''; - linkVimlPlugin = plugin: packageName: dir: '' mkdir -p $out/pack/${packageName}/${dir} if test -e "$out/pack/${packageName}/${dir}/${lib.getName plugin}"; then @@ -242,8 +236,8 @@ let */ vimrcContent = { packages ? null, - vam ? null, - pathogen ? null, + vam ? null, # deprecated + pathogen ? null, # deprecated plug ? null, beforePlugins ? '' " configuration generated by NIX @@ -253,19 +247,6 @@ let }: let - /* pathogen mostly can set &rtp at startup time. Deprecated. - */ - pathogenImpl = let - knownPlugins = pathogen.knownPlugins or vimPlugins; - - plugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); - - pathogenPackages.pathogen = { - start = plugins; - }; - in - nativeImpl pathogenPackages; - /* vim-plug is an extremely popular vim plugin manager. */ plugImpl = @@ -278,23 +259,7 @@ let call plug#end() ''; - /* - vim-addon-manager = VAM - - * maps names to plugin location - - * manipulates &rtp at startup time - or when Vim has been running for a while - - * can activate plugins laziy (eg when loading a specific filetype) - - * knows about vim plugin dependencies (addon-info.json files) - - * still is minimalistic (only loads one file), the "check out" code it also - has only gets loaded when a plugin is requested which is not found on disk - yet - - */ + # vim-addon-manager = VAM (deprecated) vamImpl = let knownPlugins = vam.knownPlugins or vimPlugins; @@ -314,7 +279,7 @@ let ] ++ lib.optional (vam != null) (lib.warn "'vam' attribute is deprecated. Use 'packages' instead in your vim configuration" vamImpl) ++ lib.optional (packages != null && packages != []) (nativeImpl packages) - ++ lib.optional (pathogen != null) (lib.warn "'pathogen' attribute is deprecated. Use 'packages' instead in your vim configuration" pathogenImpl) + ++ lib.optional (pathogen != null) (throw "pathogen is now unsupported, replace `pathogen = {}` with `packages.home = { start = []; }`") ++ lib.optional (plug != null) plugImpl ++ [ customRC ]; @@ -444,27 +409,20 @@ rec { # used to figure out which python dependencies etc. neovim needs requiredPlugins = { packages ? {}, - givenKnownPlugins ? null, - vam ? null, - pathogen ? null, plug ? null, ... }: let - # This is probably overcomplicated, but I don't understand this well enough to know what's necessary. - knownPlugins = if givenKnownPlugins != null then givenKnownPlugins else - if vam != null && vam ? knownPlugins then vam.knownPlugins else - if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else - vimPlugins; - pathogenPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); - vamPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) (lib.concatMap vamDictToNames vam.pluginDictionaries)); - nonNativePlugins = (lib.optionals (pathogen != null) pathogenPlugins) - ++ (lib.optionals (vam != null) vamPlugins) - ++ (lib.optionals (plug != null) plug.plugins); nativePluginsConfigs = lib.attrsets.attrValues packages; - nativePlugins = lib.concatMap ({start?[], opt?[], knownPlugins?vimPlugins}: start++opt) nativePluginsConfigs; + nonNativePlugins = (lib.optionals (plug != null) plug.plugins); + nativePlugins = lib.concatMap (requiredPluginsForPackage) nativePluginsConfigs; in nativePlugins ++ nonNativePlugins; + + # figures out which python dependencies etc. is needed for one vim package + requiredPluginsForPackage = { start ? [], opt ? []}: + start ++ opt; + toVimPlugin = drv: drv.overrideAttrs(oldAttrs: { # dont move the "doc" folder since vim expects it diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix index fd8e0092ea..5ecb1b7b32 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix @@ -13,7 +13,7 @@ , jq , shellcheck , moreutils -, racket-minimal +, racket , clojure-lsp , alejandra }: @@ -34,11 +34,16 @@ let mktplcRef = { publisher = "1Password"; name = "op-vscode"; - version = "1.0.0"; - sha256 = "sha256-ZeKTP3WKjyuR/ryBdJRHXJT+l2gbY4QnWNTsN9+4nOA="; + version = "1.0.1"; + sha256 = "sha256-0SsHf1zZgmrb7oIsRU6Xpa3AvR8bSfANz5ZlRogjiS0="; }; - meta = { - license = lib.licenses.mit; + meta = with lib; { + changelog = "https://github.com/1Password/op-vscode/releases"; + description = "A VSCode extension that integrates your development workflow with 1Password service"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=1Password.op-vscode"; + homepage = "https://github.com/1Password/op-vscode"; + license = licenses.mit; + maintainers = with maintainers; [ _2gn ]; }; }; @@ -281,8 +286,8 @@ let mktplcRef = { name = "vscode-neovim"; publisher = "asvetliakov"; - version = "0.0.86"; - sha256 = "sha256-XZd2xTcTqT6LytVwN+CybaFT71nwdobgZQQddMFdjU4="; + version = "0.0.89"; + sha256 = "sha256-4cCaMw7joaXeq+dk5cPZz6/zXDlxWeP/3IjkgSmmRvs="; }; meta = { license = lib.licenses.mit; @@ -783,8 +788,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "12.1.1"; - sha256 = "0i1wxgc61rrf11zff0481dg9s2lmv1ngpwx8nb2ygf6lh0axr7cj"; + version = "12.1.2"; + sha256 = "0wpmfrfpi6wl9v3dknx2qr2m74azpcw8bvhac21v67w6jxnl3jd9"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; @@ -901,17 +906,18 @@ let mktplcRef = { name = "magic-racket"; publisher = "evzen-wybitul"; - version = "0.5.7"; - sha256 = "sha256-34/H0WgM73yzuOGU2w6Ipq7KuEBuN1bykcLGuvzY3mU="; + version = "0.6.4"; + sha256 = "sha256-Hxa4VPm3QvJICzpDyfk94fGHu1hr+YN9szVBwDB8X4U="; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' cd "$out/$installPrefix" - jq '.contributes.configuration.properties."magic-racket.general.racketPath".default = "${racket-minimal}/bin/racket"' package.json | sponge package.json + jq '.contributes.configuration.properties."magicRacket.general.racketPath".default = "${racket}/bin/racket"' package.json | sponge package.json + jq '.contributes.configuration.properties."magicRacket.general.racoPath".default = "${racket}/bin/raco"' package.json | sponge package.json ''; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/evzen-wybitul.magic-racket/changelog"; - description = "The best coding experience for Racket in VS Code "; + description = "The best coding experience for Racket in VS Code"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=evzen-wybitul.magic-racket"; homepage = "https://github.com/Eugleo/magic-racket"; license = licenses.agpl3Only; @@ -1201,8 +1207,8 @@ let mktplcRef = { name = "haskell"; publisher = "haskell"; - version = "1.8.0"; - sha256 = "sha256-+k8XT2COe9Z8HvZvcrzfVuocRcxXBrVoNHDT/uKK7Hs="; + version = "2.2.0"; + sha256 = "sha256-YGPytmI4PgH6GQuWaRF5quiKGoOabkv7On+WVupI92E="; }; meta = with lib; { license = licenses.mit; @@ -1330,8 +1336,8 @@ let mktplcRef = { name = "latex-workshop"; publisher = "James-Yu"; - version = "8.27.2"; - sha256 = "sha256-scvT6cjlMrfG4yrhWlUwGM7ozu1E0xAryPRpV7FGCas="; + version = "8.28.0"; + sha256 = "sha256-ZH2n/r4iKNxf6QETmNnGc5KIAIE0hcAReX3p2MDkve8="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/James-Yu.latex-workshop/changelog"; @@ -1379,8 +1385,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.17"; - sha256 = "sha256-CDxh/YRyDGocxG4qOcyLXA0zHCg0YJ7XUu3OjFFjleI="; + version = "1.4.19"; + sha256 = "1yl5pxsayplkdqv5jipii7pyj85j2lc4zmibyr69470b6li264rq"; }; meta = with lib; { license = licenses.mit; @@ -1415,8 +1421,8 @@ let mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "3.4.0"; - sha256 = "0ab7m5jzxakjxaiwmg0jcck53vnn183589bbxh3iiylkpicrv67y"; + version = "3.6.0"; + sha256 = "sha256-rZXRzPmu7IYmyRWANtpJp3wp0r/RwB7eGHEJa7hBvoQ="; }; meta = { license = lib.licenses.bsd3; @@ -1648,8 +1654,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.22.0"; - sha256 = "sha256-+cY9uLQ4oIk7V/4uCNc6BdIAQCXvPPGeqd0apbDjDos="; + version = "1.22.1"; + sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52"; }; meta = { license = lib.licenses.mit; @@ -1674,6 +1680,22 @@ let ms-vscode.cpptools = callPackage ./cpptools { }; + ms-vscode.PowerShell = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "PowerShell"; + publisher = "ms-vscode"; + version = "2022.7.2"; + sha256 = "sha256-YL90dRmOvfbizT+hfkNu267JtG122LTMS9MHCfaMzkk="; + }; + meta = with lib; { + description = "A Visual Studio Code extension for PowerShell language support"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ms-vscode.PowerShell"; + homepage = "https://github.com/PowerShell/vscode-powershell"; + license = licenses.mit; + maintainers = with maintainers; [ rhoriguchi ]; + }; + }; + ms-vscode-remote.remote-ssh = callPackage ./remote-ssh { }; ms-vscode.theme-tomorrowkit = buildVscodeMarketplaceExtension { @@ -1709,9 +1731,7 @@ let }; }; - ms-python.python = callPackage ./python { - extractNuGet = callPackage ./python/extract-nuget.nix { }; - }; + ms-python.python = callPackage ./python { }; msjsdiag.debugger-for-chrome = buildVscodeMarketplaceExtension { mktplcRef = { @@ -1859,8 +1879,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.7.0"; - sha256 = "1bbjpaypp0mq5akww5f0pkpq01j0xhhvkfr44f4lb2rdhr5nmnvc"; + version = "1.9.1"; + sha256 = "10m70sahl7vf8y82gqz9yk6bk4k4b923xn5rk7fax1nqw0pkln2w"; }; meta = { license = lib.licenses.mit; @@ -1915,8 +1935,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.16.0"; - sha256 = "sha256-AOHvWoVB26caNgEEnKBhw5Z/tRtaTSeVLkO6Rlc/kqo="; + version = "4.19.0"; + sha256 = "1azkkp4bnd7n8v0m4325hfrr6p6ikid88xbxaanypji25pnyq5a4"; }; meta = { license = lib.licenses.mit; @@ -1939,8 +1959,8 @@ let mktplcRef = { name = "adwaita-theme"; publisher = "piousdeer"; - version = "1.0.7"; - sha256 = "zfG9ktxOCUOJaNrWtblq+ktSMppwp1SaB/39F1qfQew="; + version = "1.0.8"; + sha256 = "XyzxiwKQGDUIXp6rnt1BmPzfpd1WrG8HnEqYEOJV6P8="; }; meta = with lib; { description = "Theme for the GNOME desktop"; @@ -1955,8 +1975,8 @@ let mktplcRef = { name = "prisma"; publisher = "Prisma"; - version = "3.14.0"; - sha256 = "09dlm2awd2h0xmx1vcx95kdvz3xf4f5pd7zcdg3mb0g2az4nfld7"; + version = "4.1.0"; + sha256 = "sha256-YpdxRoeIesx4R2RIpJ8YmmHEmR3lezdN1efhhg14MzI="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog"; @@ -2028,6 +2048,26 @@ let }; }; + sanaajani.taskrunnercode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "taskrunnercode"; + publisher = "sanaajani"; + version = "0.3.0"; + sha256 = "NVGMM9ugmYZNCWhNmclcGuVJPhJ9h4q2G6nNzVUEpes="; + }; + meta = { + description = "Extension to view and run tasks from Explorer pane"; + longDescription = '' + This extension adds an additional "Task Runner" view in your Explorer Pane + to visualize and individually run the auto-detected or configured tasks + in your project. + ''; + homepage = "https://github.com/sana-ajani/taskrunner-code"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pbsds ]; + }; + }; + scala-lang.scala = buildVscodeMarketplaceExtension { mktplcRef = { name = "scala"; @@ -2077,6 +2117,26 @@ let }; }; + shd101wyy.markdown-preview-enhanced = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "shd101wyy"; + name = "markdown-preview-enhanced"; + version = "0.6.3"; + sha256 = "dCWERQ5rHnmYLtYl12gJ+dXLnpMu55WnmF1VfdP0x34="; + }; + meta = { + description = "Provides a live preview of markdown using either markdown-it or pandoc"; + longDescription = '' + Markdown Preview Enhanced provides you with many useful functionalities + such as automatic scroll sync, math typesetting, mermaid, PlantUML, + pandoc, PDF export, code chunk, presentation writer, etc. + ''; + homepage = "https://github.com/shd101wyy/vscode-markdown-preview-enhanced"; + license = lib.licenses.ncsa; + maintainers = with lib.maintainers; [ pbsds ]; + }; + }; + shyykoserhiy.vscode-spotify = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-spotify"; @@ -2208,8 +2268,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.2.5"; - sha256 = "0ayhlzh3b2mcdx6mdj00y4qxvv6mirfpnp8q5zvidm6sv3vwlcj0"; + version = "2.3.1"; + sha256 = "0pm9i3zw4aa4qrcqnzb9bz166rl7p6nwb81m9rqzisdc85mx4s3x"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; @@ -2352,6 +2412,8 @@ let sha256 = "1bcj546bp0w4yndd0qxwr8grhiwjd1jvf33jgmpm0j96y34vcszz"; }; meta = { + description = "Show PDF preview in VSCode"; + homepage = "https://github.com/tomoki1207/vscode-pdfviewer"; license = lib.licenses.mit; }; }; @@ -2462,8 +2524,8 @@ let mktplcRef = { name = "vim"; publisher = "vscodevim"; - version = "1.23.1"; - sha256 = "sha256-k3z3n+29vqvC/FqjrHUBnYIVcKuJpiT+nITbqVm0Low="; + version = "1.23.2"; + sha256 = "sha256-QC+5FJYjWsEaao1ifgMTJyg7vZ5JUbNNJiV+OuiIaM0="; }; meta = { license = lib.licenses.mit; @@ -2498,8 +2560,8 @@ let mktplcRef = { name = "vscode-import-cost"; publisher = "wix"; - version = "2.15.0"; - sha256 = "0d3b6654cdck1syn74vmmd1jmgkrw5v4c4cyrhdxbhggkip732bc"; + version = "3.3.0"; + sha256 = "0wl8vl8n0avd6nbfmis0lnlqlyh4yp3cca6kvjzgw5xxdc5bl38r"; }; meta = with lib; { license = licenses.mit; @@ -2510,8 +2572,8 @@ let mktplcRef = { name = "viml"; publisher = "xadillax"; - version = "1.0.1"; - sha256 = "sha256-mzf2PBSbvmgPjchyKmTaf3nASUi5/S9Djpoeh0y8gH0="; + version = "2.1.2"; + sha256 = "sha256-n91Rj1Rpp7j7gndkt0bV+jT1nRMv7+coVoSL5c7Ii3A="; }; meta = with lib; { license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix index b1a3917417..909dc69c02 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/default.nix @@ -1,65 +1,76 @@ { lib , fetchurl , vscode-utils -, unzip , patchelf -, makeWrapper , icu , stdenv , openssl -, mono }: - let - # Get as close as possible as the `package.json` required version. - # This is what drives omnisharp. - rtDepsSrcsFromJson = lib.importJSON ./rt-deps-bin-srcs.json; + inherit (stdenv.hostPlatform) system; - rtDepsBinSrcs = builtins.mapAttrs (k: v: - let - # E.g: "OmniSharp-x86_64-linux" - kSplit = builtins.split "(__)" k; - name = builtins.elemAt kSplit 0; - system = builtins.elemAt kSplit 2; - in + version = "1.25.0"; + + + vsixInfo = + let + linuxDebuggerBins = [ + ".debugger/vsdbg-ui" + ".debugger/vsdbg" + ]; + darwinX86DebuggerBins = [ + ".debugger/x86_64/vsdbg-ui" + ".debugger/x86_64/vsdbg" + ]; + darwinAarch64DebuggerBins = [ + ".debugger/arm64/vsdbg-ui" + ".debugger/arm64/vsdbg" + ]; + omniSharpBins = [ + ".omnisharp/1.39.0-net6.0/OmniSharp" + ]; + razorBins = [ + ".razor/createdump" + ".razor/rzls" + ]; + in { - inherit name system; - installPath = v.installPath; - binaries = v.binaries; - bin-src = fetchurl { - urls = v.urls; - inherit (v) sha256; + x86_64-linux = { + url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-x64.vsix"; + sha256 = "1cqqjg8q6v56b19aabs9w1kxly457mpm0akbn5mis9nd1mrdmydl"; + binaries = linuxDebuggerBins ++ omniSharpBins ++ razorBins; }; - } - ) - rtDepsSrcsFromJson; - - rtDepBinSrcByName = bSrcName: - rtDepsBinSrcs."${bSrcName}__${stdenv.targetPlatform.system}"; - - omnisharp = rtDepBinSrcByName "OmniSharp"; - vsdbgs = [ - (rtDepBinSrcByName "Debugger") - ] ++ lib.optionals (stdenv.isDarwin) [ - # Include the aarch64-darwin debugger binaries on x86_64-darwin. Even though OmniSharp will be - # running under Rosetta 2, debugging will fail to start if both sets of binaries are not present. - (rtDepsBinSrcs."Debugger__aarch64-darwin") - ]; - razor = rtDepBinSrcByName "Razor"; + aarch64-linux = { + url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-linux-arm64.vsix"; + sha256 = "0nsjgrb7y4w71w1gnrf50ifwbmjidi4vrw2fyfmch7lgjl8ilnhd"; + binaries = linuxDebuggerBins ++ omniSharpBins; # Linux aarch64 version has no Razor Language Server + }; + x86_64-darwin = { + url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-x64.vsix"; + sha256 = "01qn398vmjfi9imzlmzm0qi7y2h214wx6a8la088lfkhyj3gfjh8"; + binaries = darwinX86DebuggerBins ++ omniSharpBins ++ razorBins; + }; + aarch64-darwin = { + url = "https://github.com/OmniSharp/omnisharp-vscode/releases/download/v${version}/csharp-${version}-darwin-arm64.vsix"; + sha256 = "020j451innh7jzarbv1ij57rfmqnlngdxaw6wdgp8sjkgbylr634"; + binaries = darwinAarch64DebuggerBins ++ darwinX86DebuggerBins ++ omniSharpBins ++ razorBins; + }; + }.${system} or (throw "Unsupported system: ${system}"); in - -vscode-utils.buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "1.23.16"; - sha256 = "sha256-fM4vcSMi2tEjIox9Twh2sRiFhXgAeRwAM9to3vtcSqI="; + inherit version; + }; + + vsix = fetchurl { + name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; + inherit (vsixInfo) url sha256; }; nativeBuildInputs = [ - unzip patchelf - makeWrapper ]; postPatch = '' @@ -78,23 +89,11 @@ vscode-utils.buildVscodeMarketplaceExtension { -E -e 's/(this\._pipePath=[a-zA-Z0-9_]+\.join\()([a-zA-Z0-9_]+\.getExtensionPath\(\)[^,]*,)/\1require("os").tmpdir(), "'"$ext_unique_id"'"\+/g' \ "$PWD/dist/extension.js" - unzip_to() { - declare src_zip="''${1?}" - declare target_dir="''${2?}" - mkdir -p "$target_dir" - if unzip "$src_zip" -d "$target_dir"; then - true - elif [[ "1" -eq "$?" ]]; then - 1>&2 echo "WARNING: unzip('$?' -> skipped files)." - else - 1>&2 echo "ERROR: unzip('$?')." - fi - } - patchelf_add_icu_as_needed() { declare elf="''${1?}" declare icu_major_v="${ - with builtins; head (splitVersion (parseDrvName icu.name).version)}" + lib.head (lib.splitVersion (lib.getVersion icu.name)) + }" for icu_lib in icui18n icuuc icudata; do patchelf --add-needed "lib''${icu_lib}.so.$icu_major_v" "$elf" @@ -111,42 +110,22 @@ vscode-utils.buildVscodeMarketplaceExtension { "$elf" } - declare omnisharp_dir="$PWD/${omnisharp.installPath}" - unzip_to "${omnisharp.bin-src}" "$omnisharp_dir" - rm "$omnisharp_dir/bin/mono" - ln -s -T "${mono}/bin/mono" "$omnisharp_dir/bin/mono" - chmod a+x "$omnisharp_dir/run" - touch "$omnisharp_dir/install.Lock" - - '' + builtins.concatStringsSep "\n" (map (vsdbg: '' - declare vsdbg_dir="$PWD/${vsdbg.installPath}" - unzip_to "${vsdbg.bin-src}" "$vsdbg_dir" - chmod a+x "$vsdbg_dir/vsdbg-ui" - chmod a+x "$vsdbg_dir/vsdbg" - touch "$vsdbg_dir/install.complete" - touch "$vsdbg_dir/install.Lock" - - '') vsdbgs) + '' - declare razor_dir="$PWD/${razor.installPath}" - unzip_to "${razor.bin-src}" "$razor_dir" - chmod a+x "$razor_dir/rzls" - touch "$razor_dir/install.Lock" - - '' + lib.optionalString stdenv.isLinux '' - patchelf_common "$vsdbg_dir/vsdbg" - patchelf_common "$vsdbg_dir/vsdbg-ui" - patchelf_common "$razor_dir/rzls" - - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace $omnisharp_dir/etc/config \ - --replace "libmono-native-compat.dylib" "libmono-native.dylib" - ''; + '' + (lib.concatStringsSep "\n" (map + (bin: '' + chmod +x "${bin}" + '') + vsixInfo.binaries)) + + lib.optionalString stdenv.isLinux (lib.concatStringsSep "\n" (map + (bin: '' + patchelf_common "${bin}" + '') + vsixInfo.binaries)); meta = with lib; { description = "C# for Visual Studio Code (powered by OmniSharp)"; homepage = "https://github.com/OmniSharp/omnisharp-vscode"; license = licenses.mit; maintainers = [ maintainers.jraygauthier ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json deleted file mode 100644 index 13678d1097..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/rt-deps-bin-srcs.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "OmniSharp__x86_64-darwin": { - "installPath": ".omnisharp/1.37.16", - "binaries": [ - "./mono.osx", - "./run" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/0ea1ea1eae48552a1992ed6df782353a/omnisharp-osx-1.37.16.zip", - "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-osx-1.37.16.zip" - ], - "sha256": "0hhgfx7zs1rljhn3n9c7lci7j15yp2448z3f1d3c47a95l1hmlip" - }, - "OmniSharp__x86_64-linux": { - "installPath": ".omnisharp/1.37.16", - "binaries": [ - "./mono.linux-x86_64", - "./run" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/03c32aa6-7c7a-4936-82a0-fd8f816d112f/9ae3ed99fc0c41c7139751dde6f2bc78/omnisharp-linux-x64-1.37.16.zip", - "https://roslynomnisharp.blob.core.windows.net/releases/1.37.16/omnisharp-linux-x64-1.37.16.zip" - ], - "sha256": "0a2basc6dw42fnjv9zz93ff0bsw2i3446gvcjx5mn5d8dasi483i" - }, - "Debugger__x86_64-darwin": { - "installPath": ".debugger/x86_64", - "binaries": [ - "./vsdbg-ui", - "./vsdbg" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/c1122f7141735472d9583c1124024c55/coreclr-debug-osx-x64.zip", - "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-x64.zip" - ], - "sha256": "08z3k0h25gdsbmlxwayd94672hp2z7zmwdmd0nyr9j82izj3ci2m" - }, - "Debugger__aarch64-darwin": { - "installPath": ".debugger/arm64", - "binaries": [ - "./vsdbg-ui", - "./vsdbg" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/96a88189c7904a517f3bb59b2dba8bd1/coreclr-debug-osx-arm64.zip", - "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-osx-arm64.zip" - ], - "sha256": "113kz02ihvb4y5fj01wamqz2jsql2q7n7f55s9kzs9dsrmq5ffa0" - }, - "Debugger__aarch64-linux": { - "installPath": ".debugger", - "binaries": [ - "./vsdbg-ui", - "./vsdbg" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/7a723bfbda6d196c52084226b6835b36/coreclr-debug-linux-arm64.zip", - "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-arm64.zip" - ], - "sha256": "1d4a5q3f7qfk3jq2i4f6g50i9i4z8z7g8ss083y9n5c1yj3629kw" - }, - "Debugger__x86_64-linux": { - "installPath": ".debugger", - "binaries": [ - "./vsdbg-ui", - "./vsdbg" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/49f44239-bd47-4fb5-91be-4c91d7638fff/dd019b4c839f458596e26bfcfe6a3e7f/coreclr-debug-linux-x64.zip", - "https://vsdebugger.blob.core.windows.net/coreclr-debug-1-23-14/coreclr-debug-linux-x64.zip" - ], - "sha256": "0c5y0035sa07bl3m3iiqccqd92xjwpcfjrqhmi5xligk40q2i2gk" - }, - "Razor__x86_64-linux": { - "installPath": ".razor", - "binaries": [ - "./rzls" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/b846e9c7d7afdba54a72fae1dcb6c42c/razorlanguageserver-linux-x64-6.0.0-preview.5.21358.6.zip" - ], - "sha256": "0gb36nlb7fgcv03a0awna1qyrsky6ys5gkpsmvxc5j35f1yq337b" - }, - "Razor__x86_64-darwin": { - "installPath": ".razor", - "binaries": [ - "./rzls" - ], - "urls": [ - "https://download.visualstudio.microsoft.com/download/pr/b8678010-2cd7-4201-a5e7-ba57920607d5/ad846449769eb2ae810d0236823a6aaa/razorlanguageserver-osx-x64-6.0.0-preview.5.21358.6.zip" - ], - "sha256": "0iqinpwwlqwajdq4i1qbb9hfpfmgy17av95bpw02ad2f9fnyh572" - } -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs deleted file mode 100755 index 8c43231b1a..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools-csharp/update-bin-srcs +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../.. -i bash -p curl jq unzip -set -euf -o pipefail - -declare scriptDir -scriptDir=$(cd "$(dirname "$0")"; pwd) -1>&2 echo "scriptDir='$scriptDir'" - -. "$scriptDir/../_maintainers/update-bin-srcs-lib.sh" - -declare extPublisher="ms-dotnettools" -declare extName="csharp" -declare defaultExtVersion="1.23.16" -declare extVersion="${1:-$defaultExtVersion}" - -formatExtRuntimeDeps \ - "$extPublisher" "$extName" "$extVersion" \ - | computeAndAttachExtRtDepsChecksums \ - | jqStreamToJson \ - | tee "$scriptDir/rt-deps-bin-srcs.json" \ - | jq '.' diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix index 6b12320161..8ca353c847 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/default.nix @@ -1,134 +1,44 @@ -{ lib, stdenv, fetchurl, fetchpatch, vscode-utils, extractNuGet -, icu, curl, openssl, liburcu, lttng-ust, autoPatchelfHook -, python3, musl -, pythonUseFixed ? false # When `true`, the python default setting will be fixed to specified. - # Use version from `PATH` for default setting otherwise. - # Defaults to `false` as we expect it to be project specific most of the time. -, ctagsUseFixed ? true, ctags # When `true`, the ctags default setting will be fixed to specified. - # Use version from `PATH` for default setting otherwise. - # Defaults to `true` as usually not defined on a per projet basis. +{ lib +, vscode-utils +, icu +, python3 + # When `true`, the python default setting will be fixed to specified. + # Use version from `PATH` for default setting otherwise. + # Defaults to `false` as we expect it to be project specific most of the time. +, pythonUseFixed ? false }: -assert ctagsUseFixed -> null != ctags; - -let - liburcu-0-12 = liburcu.overrideAttrs (oldAttrs: rec { - version = "0.12.2"; - src = fetchurl { - url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "0yx69kbx9zd6ayjzvwvglilhdnirq4f1x1sdv33jy8bc9wgc3vsf"; - }; - }); - - lttng-ust-2-10 = (lttng-ust.override { - liburcu = liburcu-0-12; - }).overrideAttrs (oldAttrs: rec { - version = "2.10.5"; - src = fetchurl { - url = "https://lttng.org/files/lttng-ust/lttng-ust-${version}.tar.bz2"; - sha256 = "0ddwk0nl28bkv2xb78gz16a2bvlpfbjmzwfbgwf5p1cq46dyvy86"; - }; - patches = (oldAttrs.patches or []) ++ [ - # Pull upstream fix for -fno-common toolchain. Without it build fails on - # upstream gcc-10 as: - # ld: libustsnprintf.a(libustsnprintf_la-core.o):snprintf/core.c:23: multiple definition of - # `ust_loglevel'; ustctl.o:liblttng-ust-ctl/ustctl.c:80: first defined here - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/lttng/lttng-ust/commit/21a934df4c683e73e0a66a9afca33573fcf9d789.patch"; - sha256 = "122lw9rdmr80gmz7814235ibqs47c6pzvg0ryh01805x0cymx74z"; - }) - ]; - }); - - pythonDefaultsTo = if pythonUseFixed then "${python3}/bin/python" else "python"; - ctagsDefaultsTo = if ctagsUseFixed then "${ctags}/bin/ctags" else "ctags"; - - # The arch tag comes from 'PlatformName' defined here: - # https://github.com/Microsoft/vscode-python/blob/master/src/client/activation/types.ts - arch = - if stdenv.isLinux && stdenv.isx86_64 then "linux-x64" - else if stdenv.isDarwin then "osx-x64" - else throw "Only x86_64 Linux and Darwin are supported."; - - languageServerSha256 = { - linux-x64 = "1pmj5pb4xylx4gdx4zgmisn0si59qx51n2m1bh7clv29q6biw05n"; - osx-x64 = "0ishiy1z9dghj4ryh95vy8rw0v7q4birdga2zdb4a8am31wmp94b"; - }.${arch}; - - # version is languageServerVersion in the package.json - languageServer = extractNuGet rec { - name = "Python-Language-Server"; - version = "0.5.30"; - - src = fetchurl { - url = "https://pvsc.azureedge.net/python-language-server-stable/${name}-${arch}.${version}.nupkg"; - sha256 = languageServerSha256; - }; - }; -in vscode-utils.buildVscodeMarketplaceExtension rec { +vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2022.0.1814523869"; + version = "2022.11.11881005"; + sha256 = "sha256-8NH/aWIAwSpVRi3cvBCpvO8MVzIoRaXxADmWp6DuUb8="; }; - vsix = fetchurl { - name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; - url = "https://github.com/microsoft/vscode-python/releases/download/${mktplcRef.version}/ms-python-release.vsix"; - sha256 = "sha256-JDaimcOUDo9GuFA3mhbbGLwqZE9ejk8pWYc+9PrRhVk="; - }; + buildInputs = [ icu ]; - buildInputs = [ - icu - curl - openssl - ] ++ lib.optionals stdenv.isLinux [ - lttng-ust-2-10 - musl - ]; + nativeBuildInputs = [ python3.pkgs.wrapPython ]; - nativeBuildInputs = [ - python3.pkgs.wrapPython - ] ++ lib.optionals stdenv.isLinux [ - autoPatchelfHook - ]; - - pythonPath = with python3.pkgs; [ - setuptools + propagatedBuildInputs = with python3.pkgs; [ + debugpy + isort + jedi-language-server ]; postPatch = '' + # remove bundled python deps and use libs from nixpkgs + rm -r pythonFiles/lib + mkdir -p pythonFiles/lib/python/ + ln -s ${python3.pkgs.debugpy}/lib/*/site-packages/debugpy pythonFiles/lib/python/ + buildPythonPath "$propagatedBuildInputs" + for i in pythonFiles/*.py; do + patchPythonScript "$i" + done + '' + lib.optionalString pythonUseFixed '' # Patch `packages.json` so that nix's *python* is used as default value for `python.pythonPath`. substituteInPlace "./package.json" \ - --replace "\"default\": \"python\"" "\"default\": \"${pythonDefaultsTo}\"" - - # Patch `packages.json` so that nix's *ctags* is used as default value for `python.workspaceSymbols.ctagsPath`. - substituteInPlace "./package.json" \ - --replace "\"default\": \"ctags\"" "\"default\": \"${ctagsDefaultsTo}\"" - - # Similar cleanup to what's done in the `debugpy` python package. - # This prevent our autopatchelf logic to bark on unsupported binaries (`attach_x86.so` - # was problematic) but also should make our derivation less heavy. - ( - cd pythonFiles/lib/python/debugpy/_vendored/pydevd/pydevd_attach_to_process - declare kept_aside="${{ - "x86_64-linux" = "attach_linux_amd64.so"; - "aarch64-darwin" = "attach_x86_64.dylib"; - "x86_64-darwin" = "attach_x86_64.dylib"; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")}" - mv "$kept_aside" "$kept_aside.hidden" - rm *.so *.dylib *.dll *.exe *.pdb - mv "$kept_aside.hidden" "$kept_aside" - ) - ''; - - postInstall = '' - mkdir -p "$out/$installPrefix/languageServer.${languageServer.version}" - cp -R --no-preserve=ownership ${languageServer}/* "$out/$installPrefix/languageServer.${languageServer.version}" - chmod -R +wx "$out/$installPrefix/languageServer.${languageServer.version}" - - patchPythonScript "$out/$installPrefix/pythonFiles/lib/python/isort/main.py" + --replace "\"default\": \"python\"" "\"default\": \"${python3.interpreter}\"" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix deleted file mode 100644 index 1e70cabe03..0000000000 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/python/extract-nuget.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ stdenv, unzip }: -{ name, version, src, ... }: - -stdenv.mkDerivation { - inherit name version src; - - nativeBuildInputs = [ unzip ]; - dontBuild = true; - unpackPhase = "unzip $src"; - installPhase = '' - mkdir -p "$out" - chmod -R +w . - find . -mindepth 1 -maxdepth 1 | xargs cp -a -t "$out" - ''; -} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 49b730361a..8f0112e5f6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -43,7 +43,7 @@ let }); fetchVsixFromVscodeMarketplace = mktplcExtRef: - fetchurl((import ./mktplcExtRefToFetchArgs.nix mktplcExtRef)); + fetchurl (import ./mktplcExtRefToFetchArgs.nix mktplcExtRef); buildVscodeMarketplaceExtension = a@{ name ? "", @@ -65,11 +65,12 @@ let "publisher" "version" "sha256" + "arch" ]; mktplcExtRefToExtDrv = ext: - buildVscodeMarketplaceExtension ((removeAttrs ext mktplcRefAttrList) // { - mktplcRef = ext; + buildVscodeMarketplaceExtension (removeAttrs ext mktplcRefAttrList // { + mktplcRef = builtins.intersectAttrs (lib.genAttrs mktplcRefAttrList (_: null)) ext; }); extensionFromVscodeMarketplace = mktplcExtRefToExtDrv; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 9f85c9f9a1..210761a5c4 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -2,6 +2,7 @@ let inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; plat = { x86_64-linux = "linux-x64"; @@ -9,22 +10,22 @@ let aarch64-linux = "linux-arm64"; aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; - }.${system}; + }.${system} or throwSystem; archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0rq0bc99hsji4ni5mqw1rhzn2rng9rldm4xbdxlkrjyprc6qvffz"; - x86_64-darwin = "1yjcb65w0anxyjc1nd9kbwr4hwnrlk9c6kp1a2ncy1g181klzarl"; - aarch64-linux = "1fk7887clz9sd7fmz7lkxql7bnsvnbjd9fjixym2746x9if5ds42"; - aarch64-darwin = "1bfgsjnm5r1wpss69ncx310j23mbwhixdxmg07m3kpcfqrmznvgc"; - armv7l-linux = "0131i5cx2737wmngybvlw7d9c4gnilmla33nlrhf74ihic98jwlc"; - }.${system}; + x86_64-linux = "1ldn2m7mi3sfkcv417a2ci68p8r178kfr9bf1wx6j0r09sn5r4i0"; + x86_64-darwin = "1pkxcj6dz5lcvf0ivzafvwvcyw2098ylxrqqzj9dfgfad29kyszd"; + aarch64-linux = "1q1l7vrf4ifv6y46b4zz9km83wrsq80wx6rb4rnqkgijpbx02f7z"; + aarch64-darwin = "1zhvbn6kmp99a5p0299256fm08y67rfzz03zygif7y20zrmr27ka"; + armv7l-linux = "0jn2li0j1cmk5m61ha6m4lskc80q1j7mfmgidc3x9x9yiv6yacr7"; + }.${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.68.1"; + version = "1.70.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 721cfbabf8..9155a9fe27 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -2,6 +2,7 @@ let inherit (stdenv.hostPlatform) system; + throwSystem = throw "Unsupported system: ${system}"; plat = { x86_64-linux = "linux-x64"; @@ -9,17 +10,17 @@ let aarch64-linux = "linux-arm64"; aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; - }.${system}; + }.${system} or throwSystem; archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1gx64ff9sgjqn8vw2hjpn3qlfpfyyhc5ivzc52vqyczaj1fcny65"; - x86_64-darwin = "0sv0iyqfw24k14r28qzvlpdb81b7fqhbgb1lqzb75adhdfpjwz31"; - aarch64-linux = "13mg7nn43k4bs1gl8cx1kly90yxz7iial6a1fpy4grxsk8mna1rj"; - aarch64-darwin = "0mnj3lckpqwb3kmg7x7r34idaxyhy55gpiiyj0gmpqp8hp0ai5sc"; - armv7l-linux = "0cvvigzmqp21jxwdfpkspdj7sva9bj977f9689qgb012kqvy41b2"; - }.${system}; + x86_64-linux = "0vwnx7fs46fkas75pnhjc81wy3hr24k2gs82i30ailaxw5r63j81"; + x86_64-darwin = "0bxc74vfkw9zhxfahzhcghlnybvj8k15jbni489lf636a45xrlcc"; + aarch64-linux = "10z6nv67yjd15ilxgfpjf07qbdp0cbd5761a5gcymiam4r22l6hq"; + aarch64-darwin = "133nccm0hcgcd2503psxwaaq4v4l16q7w7kbcz1y5lynlvwazjrx"; + armv7l-linux = "1sx3l42ls62v3apjap25ccg4mcbi71spfj5xh7y6rffzi65xwdrv"; + }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; in @@ -28,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.68.1"; + version = "1.70.0"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix b/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix index 7e36aeccde..0cbca2ea2b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/xed-editor/default.nix @@ -1,39 +1,40 @@ { stdenv , lib , fetchFromGitHub -, cmake , libxml2 , libpeas , glib , gtk3 , gtksourceview4 , gspell -, xapps +, xapp , pkg-config +, python3 , meson , ninja , wrapGAppsHook , intltool -, itstool }: +, itstool +}: stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.2.2"; + version = "3.2.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-PW7y3+Sa9FH5r5xvziysvxM08RJCPvnLs3wsm5IqToQ="; + sha256 = "sha256-aO5ilmlkSAxlkWYdSLmrcm7pC8GbITpCitd4TXp5tfY="; }; nativeBuildInputs = [ meson - cmake pkg-config intltool itstool ninja + python3 wrapGAppsHook ]; @@ -44,13 +45,9 @@ stdenv.mkDerivation rec { gtksourceview4 libpeas gspell - xapps + xapp ]; - postInstall = '' - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - doInstallCheck = true; installCheckPhase = '' if [[ "$($out/bin/xed --version)" == "xed - Version ${version}" ]] ; then diff --git a/third_party/nixpkgs/pkgs/applications/editors/zee/default.nix b/third_party/nixpkgs/pkgs/applications/editors/zee/default.nix new file mode 100644 index 0000000000..9442044a16 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/zee/default.nix @@ -0,0 +1,31 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "zee"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "zee-editor"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/9SogKOaXdFDB+e0//lrenTTbfmXqNFGr23L+6Pnm8w="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; + + # disable downloading and building the tree-sitter grammars at build time + # grammars can be configured in a config file and installed with `zee --build` + # see https://github.com/zee-editor/zee#syntax-highlighting + ZEE_DISABLE_GRAMMAR_BUILD=1; + + cargoSha256 = "sha256-mbqI1csnU95VWgax4GjIxB+nhMtmpaeJ8QQ3qb0hY4c="; + + meta = with lib; { + description = "A modern text editor for the terminal written in Rust"; + homepage = "https://github.com/zee-editor/zee"; + license = licenses.mit; + maintainers = with maintainers; [ booklearner ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix index 4cc449ee49..9935e51740 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/bsnes/ares/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ares"; - version = "128"; + version = "129"; src = fetchFromGitHub { owner = "ares-emulator"; repo = "ares"; rev = "v${version}"; - sha256 = "sha256-Ojf1kyColBK0S3DwXjGaAZSl0ljhgiXkfKC11BL2fEc="; + hash = "sha256-prfvoGtbnsl/1ahx98jBOgT64W566GoUtE8rIOF7lYc="; }; patches = [ @@ -56,18 +56,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ - "-C desktop-ui" + "hiro=gtk3" "local=false" "openmp=true" - "hiro=gtk3" "prefix=$(out)" + "-C desktop-ui" ]; meta = with lib; { homepage = "https://ares.dev"; description = "Open-source multi-system emulator with a focus on accuracy and preservation"; license = licenses.isc; - maintainers = with maintainers; [ Madouura ]; + maintainers = with maintainers; [ Madouura AndersonTorres ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix index d070c86eef..3acf4a0760 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/emulator.nix @@ -4,15 +4,15 @@ , SDL2 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "x16-emulator"; - version = "40"; + version = "41"; src = fetchFromGitHub { owner = "commanderx16"; - repo = pname; - rev = "r${version}"; - hash = "sha256-7ZzVd2NJCFNAFrS2cj6bxcq/AzO5VakoFX9o1Ac9egg="; + repo = "x16-emulator"; + rev = "r${finalAttrs.version}"; + hash = "sha256-pnWqtSXQzUfQ8ADIXL9r2YjuBwHDQ2NAffAEFCN5Qzw="; }; dontConfigure = true; @@ -23,23 +23,24 @@ stdenv.mkDerivation rec { runHook preInstall install -Dm 755 -t $out/bin/ x16emu - install -Dm 444 -t $out/share/doc/${pname} README.md + install -Dm 444 -t $out/share/doc/x16-emulator/ README.md runHook postInstall ''; meta = with lib; { - description = "The official emulator of CommanderX16 8-bit computer"; homepage = "https://www.commanderx16.com/forum/index.php?/home/"; + description = "The official emulator of CommanderX16 8-bit computer"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; mainProgram = "x16emu"; inherit (SDL2.meta) platforms; + broken = with stdenv; isDarwin && isAarch64; }; passthru = { - # upstream project recommends emulator and rom synchronized; + # upstream project recommends emulator and rom to be synchronized; # passing through the version is useful to ensure this - inherit version; + inherit (finalAttrs) version; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix index 617c0a16b8..202a212064 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/commanderx16/rom.nix @@ -5,15 +5,15 @@ , python3 }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "x16-rom"; - version = "40"; + version = "41"; src = fetchFromGitHub { owner = "commanderx16"; - repo = pname; - rev = "r${version}"; - hash = "sha256-5oqttuTJiJOUENncOJipAar22OsI1uG3G69m+eYoSh0="; + repo = "x16-rom"; + rev = "r${finalAttrs.version}"; + hash = "sha256-kowdyUVi3hliqkL8VQo5dS3Dpxd4LQi5+5brkdnv0lE="; }; nativeBuildInputs = [ @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -Dm 444 -t $out/share/${pname} build/x16/rom.bin - install -Dm 444 -t $out/share/doc/${pname} README.md + install -Dm 444 -t $out/share/x16-rom/ build/x16/rom.bin + install -Dm 444 -t $out/share/doc/x16-rom/ README.md runHook postInstall ''; @@ -42,11 +42,12 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; inherit (cc65.meta) platforms; + broken = with stdenv; isDarwin && isAarch64; }; passthru = { - # upstream project recommends emulator and rom synchronized; + # upstream project recommends emulator and rom to be synchronized; # passing through the version is useful to ensure this - inherit version; + inherit (finalAttrs) version; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/openmsx/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/openmsx/default.nix index f054b954b5..4dfa3b8644 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/openmsx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/openmsx/default.nix @@ -13,26 +13,26 @@ , libpng , libtheora , libvorbis -, python +, python3 , tcl , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "openmsx"; - version = "17.0"; + version = "18.0"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; - rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] version}"; - sha256 = "sha256-9PdUNahJZ2O6ASkzLW/uudP3hiIzTDpxzFy6Pjb8JiU="; + rev = "RELEASE_${builtins.replaceStrings ["."] ["_"] finalAttrs.version}"; + sha256 = "sha256-4V2B+OQbPVRmkRuqfeqyd+7pz9Z1YISjI79WqZS0Qhc="; fetchSubmodules = true; }; nativeBuildInputs = [ pkg-config - python + python3 ]; buildInputs = [ @@ -72,4 +72,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix index a5ff1106fd..77e69a0321 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/pcsx2/default.nix @@ -32,14 +32,14 @@ stdenv.mkDerivation rec { pname = "pcsx2"; - version = "1.7.2731"; + version = "1.7.3128"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; fetchSubmodules = true; rev = "v${version}"; - hash = "sha256-b3cK3ly9J44YMy/cNprlDCSsu8+DrlhRSLXv5xMouWo="; + hash = "sha256-OVKxVyUkTpyVvQ1oA8G6W77ssC1NmUAu/VanBM8Z168="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix index b84d18a4e7..14121a49bd 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/ppsspp/default.nix @@ -16,14 +16,14 @@ mkDerivation rec { pname = "ppsspp"; - version = "1.12.3"; + version = "1.13.1"; src = fetchFromGitHub { owner = "hrydgard"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-S16rTB0svksW5MwrPV/+qpTK4uKZ7mFcmbOyEmMmzhY="; + sha256 = "sha256-WsFy2aSOmkII2Lte5et4W6qj0AXUKWWkYe88T0OQP08="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/emulators/resim/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/resim/default.nix index 49d7721174..d69aafcec2 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/resim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/resim/default.nix @@ -17,5 +17,10 @@ stdenv.mkDerivation { cp -v vc4emul/vc4emul $out/bin/vc4emul ''; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta.license = lib.licenses.mit; } diff --git a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix index 0a078f68c7..4a8c762b6a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/retroarch/default.nix @@ -5,6 +5,7 @@ , withVulkan ? stdenv.isLinux , alsa-lib , AppKit +, dbus , fetchFromGitHub , ffmpeg_4 , Foundation @@ -80,6 +81,7 @@ stdenv.mkDerivation rec { lib.optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ lib.optionals stdenv.isLinux [ alsa-lib + dbus libX11 libXdmcp libXext @@ -95,7 +97,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" ]; + configureFlags = lib.optionals stdenv.isLinux [ "--enable-kms" "--enable-egl" "--enable-dbus" ]; postInstall = '' mkdir -p $out/share/libretro/info diff --git a/third_party/nixpkgs/pkgs/applications/emulators/stella/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/stella/default.nix index 212c066904..593845cca6 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/stella/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/stella/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "stella"; - version = "6.6"; + version = "6.7"; src = fetchFromGitHub { owner = "stella-emu"; repo = pname; rev = version; - hash = "sha256-+ZvSCnnoKGyToSFqUQOArolFdgUcBBFNjFw8aoVDkYI="; + hash = "sha256-E8vbBbsVMOSY3iSSE+UCwBwmfHU7Efmre1cYlexVZ+E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix index e3875e130a..a280b9d3e3 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/base.nix @@ -6,7 +6,7 @@ patches, vkd3dArches, moltenvk, - buildScript ? null, configureFlags ? [] + buildScript ? null, configureFlags ? [], mainProgram ? "wine" }: with import ./util.nix { inherit lib; }; @@ -198,6 +198,6 @@ stdenv.mkDerivation ((lib.optionalAttrs (buildScript != null) { description = if supportFlags.waylandSupport then "An Open Source implementation of the Windows API on top of OpenGL and Unix (with experimental Wayland support)" else "An Open Source implementation of the Windows API on top of X, OpenGL, and Unix"; platforms = if supportFlags.waylandSupport then (lib.remove "x86_64-darwin" prevPlatforms) else prevPlatforms; maintainers = with lib.maintainers; [ avnik raskin bendlas jmc-figueira ]; - mainProgram = "wine"; + inherit mainProgram; }; }) diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/packages.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/packages.nix index c119feb783..3b5aa19658 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/packages.nix @@ -28,6 +28,7 @@ in with src; { monos = [ mono ]; configureFlags = [ "--enable-win64" ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; + mainProgram = "wine64"; }; wineWow = callPackage ./base.nix { pname = "wine-wow"; @@ -40,5 +41,6 @@ in with src; { monos = [ mono ]; buildScript = ./builder-wow.sh; platforms = [ "x86_64-linux" ]; + mainProgram = "wine64"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix index 024334aca5..bcc521556b 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/joshuto/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "joshuto"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "kamiyaa"; repo = pname; - rev = version; - sha256 = "sha256-RbA7MM/3u2LJG6QD5f15E/XoLwHMkPasx0ht4PqV/jc="; + rev = "v${version}"; + sha256 = "sha256-sSrXBPZe9R8s+MzWA7cRlaRCyf/4z2qb6DrUCgvKQh8="; }; - cargoSha256 = "sha256-vhTfAoAwDJ9BjhgUEkV2H+KAetJR1YqwaZ7suF6yMXA="; + cargoSha256 = "sha256-e4asmP/wTnX6/xrK6lAgCkRlGRFniveEiL5GRXVzcZg="; buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration Foundation ]; @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { description = "Ranger-like terminal file manager written in Rust"; homepage = "https://github.com/kamiyaa/joshuto"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ figsoda ]; + maintainers = with maintainers; [ figsoda totoroot ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix index 87c43628c4..eed48c4a7d 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/nnn/default.nix @@ -20,13 +20,13 @@ assert withNerdIcons -> withIcons == false; stdenv.mkDerivation rec { pname = "nnn"; - version = "4.5"; + version = "4.6"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uToAgWpGaTPTMYJh1D0xgvE23GSIshv1OBlWxXI07Mk="; + sha256 = "sha256-+EAKOXZp1kxA2X3e16ItjPT7Sa3WZuP2oxOdXkceTIY="; }; configFile = lib.optionalString (conf != null) (builtins.toFile "nnn.h" conf); diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix index 3aa01d9372..774e885401 100644 --- a/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/file-managers/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.10.0"; + version = "4.10.1"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-BK6Soh2hJYMunw/bXZFh+05c+iYig2L7lLFEqs6lyxk="; + sha256 = "sha256-8dJjh+h8lsdydSqLJ72sfi2IFJ4X8dfRot5/aAEQ5Vk="; }; buildInputs = [ libX11 ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix index 23cee79b5e..8ec293e489 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "grass"; - version = "8.0.1"; + version = "8.2.0"; src = with lib; fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = version; - sha256 = "sha256-rcOT21HRJDR+DEYsZn6BjOOhy28DWapz9PN7cRAdWGc="; + sha256 = "sha256-VK9FCqIwHGmeJe5lk12lpAGcsC1aPRBiI+XjACXjDd4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch b/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch new file mode 100644 index 0000000000..5553f80fbc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/set-pyqt-package-dirs.patch @@ -0,0 +1,59 @@ +diff --git a/cmake/FindPyQt5.cmake b/cmake/FindPyQt5.cmake +index b51fd0075e..87ee317e05 100644 +--- a/cmake/FindPyQt5.cmake ++++ b/cmake/FindPyQt5.cmake +@@ -25,7 +25,7 @@ ELSE(EXISTS PYQT5_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _pyqt5_metadata "${Python_SITEARCH}/PyQt5-*.dist-info/METADATA") ++ FILE(GLOB _pyqt5_metadata "@pyQt5PackageDir@/PyQt5-*.dist-info/METADATA") + IF(_pyqt5_metadata) + FILE(READ ${_pyqt5_metadata} _pyqt5_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" PYQT5_VERSION_STR ${_pyqt5_metadata_contents}) +@@ -34,8 +34,8 @@ ELSE(EXISTS PYQT5_VERSION_STR) + ENDIF(_pyqt5_metadata) + + IF(PYQT5_VERSION_STR) +- SET(PYQT5_MOD_DIR "${Python_SITEARCH}/PyQt5") +- SET(PYQT5_SIP_DIR "${Python_SITEARCH}/PyQt5/bindings") ++ SET(PYQT5_MOD_DIR "@pyQt5PackageDir@/PyQt5") ++ SET(PYQT5_SIP_DIR "@pyQt5PackageDir@/PyQt5/bindings") + FIND_PROGRAM(__pyuic5 "pyuic5") + GET_FILENAME_COMPONENT(PYQT5_BIN_DIR ${__pyuic5} DIRECTORY) + +diff --git a/cmake/FindQsci.cmake b/cmake/FindQsci.cmake +index 69e41c1fe9..5456c3d59b 100644 +--- a/cmake/FindQsci.cmake ++++ b/cmake/FindQsci.cmake +@@ -24,7 +24,7 @@ ELSE(QSCI_MOD_VERSION_STR) + IF(SIP_BUILD_EXECUTABLE) + # SIP >= 5.0 path + +- FILE(GLOB _qsci_metadata "${Python_SITEARCH}/QScintilla*.dist-info/METADATA") ++ FILE(GLOB _qsci_metadata "@qsciPackageDir@/QScintilla*.dist-info/METADATA") + IF(_qsci_metadata) + FILE(READ ${_qsci_metadata} _qsci_metadata_contents) + STRING(REGEX REPLACE ".*\nVersion: ([^\n]+).*$" "\\1" QSCI_MOD_VERSION_STR ${_qsci_metadata_contents}) +@@ -33,7 +33,7 @@ ELSE(QSCI_MOD_VERSION_STR) + ENDIF(_qsci_metadata) + + IF(QSCI_MOD_VERSION_STR) +- SET(QSCI_SIP_DIR "${PYQT5_SIP_DIR}") ++ SET(QSCI_SIP_DIR "@qsciPackageDir@/PyQt5/bindings") + SET(QSCI_FOUND TRUE) + ENDIF(QSCI_MOD_VERSION_STR) + +diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt +index 4cd19c3af4..668cc6a5e6 100644 +--- a/python/CMakeLists.txt ++++ b/python/CMakeLists.txt +@@ -206,7 +206,7 @@ if (WITH_GUI) + install(FILES ${QGIS_PYTHON_OUTPUT_DIRECTORY}/_gui.pyi DESTINATION ${QGIS_PYTHON_DIR}) + endif() + if(QSCI_SIP_DIR) +- set(SIP_EXTRA_OPTIONS ${SIP_EXTRA_OPTIONS} -I ${QSCI_SIP_DIR}) ++ set(SIP_BUILD_EXTRA_OPTIONS ${SIP_BUILD_EXTRA_OPTIONS} --include-dir=${QSCI_SIP_DIR}) + else() + message(STATUS "Qsci sip file not found - disabling bindings for derived classes") + set(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} HAVE_QSCI_SIP) diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix index 8acc917b04..b5a407ef53 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -38,6 +38,8 @@ , pdal , zstd , makeWrapper +, wrapGAppsHook +, substituteAll }: let @@ -64,7 +66,9 @@ let urllib3 pygments pyqt5 - sip_4 + pyqt-builder + sip + setuptools owslib six ]; @@ -116,30 +120,31 @@ in mkDerivation rec { ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ makeWrapper cmake flex bison ninja ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; - # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5 - # - # TODO: Correct PyQt5 to provide the expected directory and fix - # build to use PYQT5_SIP_DIR consistently. - postPatch = '' - substituteInPlace cmake/FindPyQt5.py \ - --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"' - ''; + patches = [ + (substituteAll { + src = ./set-pyqt-package-dirs.patch; + pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; + qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; + }) + ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DWITH_3D=True" "-DWITH_PDAL=TRUE" - "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" - "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + dontWrapGApps = true; # wrapper params passed below + postFixup = lib.optionalString withGrass '' # grass has to be availble on the command line even though we baked in - # the path at build time using GRASS_PREFIX + # the path at build time using GRASS_PREFIX. + # using wrapGAppsHook also prevents file dialogs from crashing the program + # on non-NixOS wrapProgram $out/bin/qgis \ + "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} ''; diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index f0cfbda170..ae35fb2ec2 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -38,6 +38,8 @@ , pdal , zstd , makeWrapper +, wrapGAppsHook +, substituteAll }: let @@ -64,7 +66,9 @@ let urllib3 pygments pyqt5 - sip_4 + pyqt-builder + sip + setuptools owslib six ]; @@ -116,30 +120,31 @@ in mkDerivation rec { ++ lib.optional withWebKit qtwebkit ++ pythonBuildInputs; - nativeBuildInputs = [ makeWrapper cmake flex bison ninja ]; + nativeBuildInputs = [ makeWrapper wrapGAppsHook cmake flex bison ninja ]; - # Force this pyqt_sip_dir variable to point to the sip dir in PyQt5 - # - # TODO: Correct PyQt5 to provide the expected directory and fix - # build to use PYQT5_SIP_DIR consistently. - postPatch = '' - substituteInPlace cmake/FindPyQt5.py \ - --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings"' - ''; + patches = [ + (substituteAll { + src = ./set-pyqt-package-dirs.patch; + pyQt5PackageDir = "${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}"; + qsciPackageDir = "${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}"; + }) + ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DWITH_3D=True" "-DWITH_PDAL=TRUE" - "-DPYQT5_SIP_DIR=${py.pkgs.pyqt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" - "-DQSCI_SIP_DIR=${py.pkgs.qscintilla-qt5}/${py.pkgs.python.sitePackages}/PyQt5/bindings" ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/grass78"; + dontWrapGApps = true; # wrapper params passed below + postFixup = lib.optionalString withGrass '' # grass has to be availble on the command line even though we baked in - # the path at build time using GRASS_PREFIX + # the path at build time using GRASS_PREFIX. + # using wrapGAppsHook also prevents file dialogs from crashing the program + # on non-NixOS wrapProgram $out/bin/qgis \ + "''${gappsWrapperArgs[@]}" \ --prefix PATH : ${lib.makeBinPath [ grass ]} ''; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index 3b58aba1e5..92b8164f8b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-43"; + version = "7.1.0-45"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; - rev = builtins.replaceStrings [ "-" ] [ "." ] version; - hash = "sha256-SOy7Ci1rzLB12ofSQBWmX86dfbr/ywsRPunHRswlAt4="; + rev = version; + hash = "sha256-fiygwb15dbMyTZ62iWbhWaHpdmoK4rKeb46v0sojgpc="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 85d201f32d..1080f56ebe 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "19.0.3"; + version = "20.2.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "be456d396a19dcb8881ad4bff315197306ae05cca5e47332a1e5ad572948614e"; + sha256 = "sha256-O/gzXAzvaYJXpexjBSc6jNW1wX0ukwQcpFU8fq4qM4k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/emulsion-palette/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/emulsion-palette/default.nix new file mode 100644 index 0000000000..3c21738266 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/emulsion-palette/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, lib +, fetchFromGitHub +, meson +, ninja +, vala +, wrapGAppsHook4 +, libadwaita +, json-glib +, libgee +, pkg-config +, gtk3 +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "emulsion-palette"; + version = "3.3.9"; + + src = fetchFromGitHub { + owner = "lainsce"; + repo = "emulsion"; + rev = version; + sha256 = "sha256-xG7yZKbbNao/pzFhdTMof/lw9K12NKZi47YRaEd65ok="; + }; + + nativeBuildInputs = [ meson ninja pkg-config vala wrapGAppsHook4 ]; + + buildInputs = [ + desktop-file-utils + gtk3 # We're only using it for the gtk-update-icon-cache utility. + json-glib + libadwaita + libgee + ]; + + postFixup = '' + ln -s $out/bin/io.github.lainsce.Emulsion $out/bin/emulsion-palette + ''; + + meta = with lib; { + description = "Store your color palettes in an easy way"; + homepage = "https://github.com/lainsce/emulsion"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ foo-dogsquared ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix index 563853f8f5..6e98f0fe25 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "epick"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "vv9k"; repo = pname; rev = version; - sha256 = "sha256-x1C8kY9VpMg7aXgC/jRsLCeUV8uRLobgjSAQdK2/sHk="; + sha256 = "sha256-JSKenJEM+FUk/2BtAstIhJ26kFBRDvvFAlBsb0ltUsY="; }; - cargoSha256 = "sha256-KgQOlvKRt47lg7NteqBa2DLKkDf93JTzp9EIHn3clxY="; + cargoSha256 = "sha256-hFay+XL2oqA7SC+I3wlrzhUmUitO2vbeqfoArU9Jsp4="; nativeBuildInputs = lib.optional stdenv.isLinux python3; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix index 3865848ff2..70f83e9a2f 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, makeWrapper -, xorg, imlib2, libjpeg, libpng, fetchpatch +, xorg, imlib2, libjpeg, libpng , curl, libexif, jpegexiforient, perl , enableAutoreload ? !stdenv.hostPlatform.isDarwin }: @@ -14,13 +14,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-rgNC4M1TJ5EPeWmVHVzgaxTGLY7CYQf7uOsOn5bkwKE="; }; - patches = [ - # fix test failure when magic=0 is set - (fetchpatch { - url = "https://github.com/derf/feh/commit/3c1076b31e2e4e3429a5c3d334d555e549fb72d2.patch"; - sha256 = "sha256-F9N+N/BAeclyPHQYlO9ZV1U8S1VWfHl/8dMKUqA7DF8="; - }) - ]; + postPatch = '' + substituteInPlace test/feh.t \ + --replace "WARNING:" "WARNING: While loading" \ + --replace "Does not look like an image \(magic bytes missing\)" "Unknown error \(15\)" + ''; outputs = [ "out" "man" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix index 6c3f6fac30..17537083aa 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -49,13 +49,13 @@ mkDerivation rec { pname = "freecad"; - version = "0.20"; + version = "0.20.1"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; rev = version; - hash = "sha256-Em4XVxDfvVG1Kf7q+6uHNA/VcMGLKMTv5TCh2XF/BtQ="; + hash = "sha256-r2lhFv4ReASteoVxwwiW9TdSckpaju6QE8UegxeY4rE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index d44ef1f9cf..954f97bf9b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "491"; + version = "493"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ceKawn2jyfZPP4HzhkB1jIQoStCPRO/Ni/+Ys1R2FJQ="; + sha256 = "sha256-sROmWFH3sDBDh1VSVLTM71Y9qD8CndvwW7PKzkavIuc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/image-roll/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/image-roll/default.nix index 2bba3c80cd..20444f5807 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/image-roll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/image-roll/default.nix @@ -4,25 +4,30 @@ , glib , pkg-config , wrapGAppsHook -, gtk3 +, gtk4 }: rustPlatform.buildRustPackage rec { pname = "image-roll"; - version = "1.4.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "weclaw1"; repo = pname; rev = version; - sha256 = "sha256-SyG/syIDnyQaXUgGkXZkY98dmFs7O+OFnGL50250nJI="; + sha256 = "sha256-CC40TU38bJFnbJl2EHqeB9RBvbVUrBmRdZVS2GxqGu4="; }; - cargoSha256 = "sha256-pyeJ7WmtkbQjbek/rRh2UKFQ5o006Rf7phZ1yl2s4wA="; + cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk="; nativeBuildInputs = [ glib pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 ]; + buildInputs = [ gtk4 ]; + + checkFlags = [ + # fails in the sandbox + "--skip=file_list::tests" + ]; postInstall = '' install -Dm444 src/resources/com.github.weclaw1.ImageRoll.desktop -t $out/share/applications/ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/imgcat/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/imgcat/default.nix index cb2301d633..b904dec085 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/imgcat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/imgcat/default.nix @@ -1,14 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, ncurses }: +{ lib, stdenv, fetchFromGitHub, cimg, ncurses }: stdenv.mkDerivation rec { pname = "imgcat"; - version = "2.3.1"; + version = "2.5.1"; - nativeBuildInputs = [ autoconf automake libtool ]; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses cimg ]; preConfigure = '' - ${autoconf}/bin/autoconf sed -i -e "s|-ltermcap|-L ${ncurses}/lib -lncurses|" Makefile ''; @@ -18,7 +16,7 @@ stdenv.mkDerivation rec { owner = "eddieantonio"; repo = pname; rev = "v${version}"; - sha256 = "0frz40rjwi73nx2dlqvmnn56zwr29bmnngfb11hhwr7v58yfajdi"; + sha256 = "sha256-EkVE6BgoA1lo4oqlNETTxLILIVvGXspFyXykxpmYk8M="; }; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 88f6279348..83fd78c631 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -48,6 +48,7 @@ let cachecontrol numpy lxml + packaging pillow scour pyserial diff --git a/third_party/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix index 6095d81c52..95ea902b5e 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, libjpeg }: +{ lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.6"; + version = "1.4.7"; pname = "jpegoptim"; - src = fetchurl { - url = "https://www.kokkonen.net/tjko/src/${pname}-${version}.tar.gz"; - sha256 = "1dss7907fclfl8zsw0bl4qcw0hhz6fqgi3867w0jyfm3q9jfpcc8"; + src = fetchFromGitHub { + owner = "tjko"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-qae3OEG4CC/OGkmNdHrXFUv9CkoaB1ZJnFHX3RFoxhk="; }; # There are no checks, it seems. @@ -17,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Optimize JPEG files"; homepage = "https://www.kokkonen.net/tjko/projects.html"; - license = licenses.gpl2; + license = licenses.gpl3Plus; maintainers = [ maintainers.aristid ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/kodelife/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/kodelife/default.nix index 6286e64e3e..291d63d11a 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/kodelife/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/kodelife/default.nix @@ -1,15 +1,51 @@ -{ lib, stdenv -, fetchzip +{ lib +, stdenv +, fetchurl +, makeWrapper +, autoPatchelfHook +, dpkg , alsa-lib -, glib -, gst_all_1 -, libGLU, libGL -, xorg +, curl +, avahi +, gstreamer +, gst-plugins-base +, libxcb +, libX11 +, libXcursor +, libXext +, libXi +, libXinerama +, libXrandr +, libXrender +, libXxf86vm +, libglvnd +, gnome }: +let + runLibDeps = [ + curl + avahi + libxcb + libX11 + libXcursor + libXext + libXi + libXinerama + libXrandr + libXrender + libXxf86vm + libglvnd + ]; + + runBinDeps = [ + gnome.zenity + ]; +in + stdenv.mkDerivation rec { pname = "kodelife"; - version = "0.9.8.143"; + version = "1.0.5.161"; suffix = { aarch64-linux = "linux-arm64"; @@ -17,51 +53,55 @@ stdenv.mkDerivation rec { x86_64-linux = "linux-x86_64"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - src = fetchzip { - url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.zip"; - sha256 = { - aarch64-linux = "0ryjmpzpfqdqrvqpq851vvrjd8ld5g91gcigpv9rxp3z1b7qdand"; - armv7l-linux = "08nlwn8ixndqil4m7j6c8gjxmwx8zi3in86arnwf13shk6cds5nb"; - x86_64-linux = "0kbz7pvh4i4a3pj1vzbzzslha825i888isvsigcqsqvipjr4798q"; + src = fetchurl { + url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; + hash = { + aarch64-linux = "sha256-6QZ5jCxINCH46GQx+V68FpkIAOIOFw4Kd0tUQTKBRzU="; + armv7l-linux = "sha256-eToNjPttY62EzNuRSVvJsHttO6Ux6LXRPRuuIKnvaxM="; + x86_64-linux = "sha256-5M2tgpF74RmrCLI44RBNXK5t0hMAOHtmcjWu7fypc0U="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; - dontConfigure = true; - dontBuild = true; - dontStrip = true; - dontPatchELF = true; - preferLocalBuild = true; + unpackCmd = "mkdir root; dpkg-deb -x $curSrc root"; + + strictDeps = true; + + nativeBuildInputs = [ + makeWrapper + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + stdenv.cc.cc.lib + alsa-lib + gstreamer + gst-plugins-base + ]; installPhase = '' runHook preInstall + + mkdir -p $out + cp -r usr/share $out/share + mkdir -p $out/bin - mv KodeLife $out/bin + cp opt/kodelife/KodeLife $out/bin/KodeLife + + wrapProgram $out/bin/KodeLife \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath runLibDeps} \ + --prefix PATH : ${lib.makeBinPath runBinDeps} + runHook postInstall ''; - preFixup = let - libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib - alsa-lib - glib - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - libGLU libGL - xorg.libX11 - ]; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}" \ - $out/bin/KodeLife - ''; - meta = with lib; { - homepage = "https://hexler.net/products/kodelife"; + homepage = "https://hexler.net/kodelife"; description = "Real-time GPU shader editor"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ prusnak ]; + maintainers = with maintainers; [ prusnak lilyinstarlight ]; platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; + mainProgram = "KodeLife"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index 50b1cb37ff..fb47a304f2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.1.03"; + version = "1.2.01"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-X7hAkzVqIABpyFokiYaMGZqSda69cKhKghFDWDEVOow="; + sha256 = "sha256-V4hswyj6Ly6inaIlHlxpvER8ar09wZ55Ad+xH4GbHfs="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix index 8dc057a17c..fd552df11b 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.27"; + version = "2.28"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-CNIt+DC3ZYyT8EY1t641y7jW7vn7Rr1PLOsy9bjKaDk="; + sha256 = "sha256-NrXfEUoTJSz8C6rNU+tSO4PUUo5YWP0bknzXQieOqDc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix index 13f6c3f5ab..e8ce0dbd0c 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "megapixels"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitLab { owner = "postmarketOS"; repo = "megapixels"; rev = version; - hash = "sha256-zOtHxnXDzsLfaQPS0BhbuoUXglCbRULVJfk1txoS72Y="; + hash = "sha256-UH3NQdMlZTi4hc8HNSbCcQSm0rxI78RMCRYll1NCBO8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix index 296c9d2065..5615044b90 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix @@ -4,6 +4,8 @@ , pkg-config , rustPlatform , stdenv +, withSixel ? false +, libsixel , libX11 , libXrandr , AppKit @@ -12,24 +14,31 @@ rustPlatform.buildRustPackage rec { pname = "menyoki"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7dqV18+Q0M1PrSXfMro5bUqSeA72Stj5JfP4MsTlrjM="; + sha256 = "sha256-z0OpRnjVfU6vcyZsxkdD2x3l+a9GkDHZcFveGunDYww="; }; - cargoSha256 = "sha256-c3VpHr/X2tKh7mY4dOQac0lS7oem0GGqjzv7feNwc24="; + cargoSha256 = "sha256-uSoyfgPlsHeUwnTHE49ErrlB65wcfl5dxn/YrW5EKZw="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional stdenv.isLinux pkg-config; - buildInputs = lib.optionals stdenv.isLinux [ libX11 libXrandr ] + buildInputs = lib.optional withSixel libsixel + ++ lib.optionals stdenv.isLinux [ libX11 libXrandr ] ++ lib.optional stdenv.isDarwin AppKit; buildNoDefaultFeatures = !withSki; + buildFeatures = lib.optional withSixel "sixel"; + + checkFlags = [ + # sometimes fails on lower end machines + "--skip=record::fps::tests::test_fps" + ]; postInstall = '' installManPage man/* diff --git a/third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix index c1ebbd57c0..019aaf86dc 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/nsxiv/default.nix @@ -1,43 +1,58 @@ { lib , stdenv -, fetchFromGitHub +, fetchFromGitea +, fetchpatch , giflib , imlib2 , libXft , libexif , libwebp +, libinotify-kqueue , conf ? null }: stdenv.mkDerivation rec { pname = "nsxiv"; - version = "29"; + version = "30"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "nsxiv"; - repo = pname; + repo = "nsxiv"; rev = "v${version}"; - hash = "sha256-JUF2cF6QeAXk6G76uMu3reaMgxp2RcqHDbamkNufwqE="; + hash = "sha256-swzTdQ6ow1At4bKRORqz6fb0Ej92yU9rlI/OgcinPu4="; }; + patches = [ + # Fix build failure when _SC_PHYS_PAGES is not defined + (fetchpatch { + url = "https://codeberg.org/nsxiv/nsxiv/commit/1a50bff9f300f84e93a6e7035657e6029e7e8183.patch"; + hash = "sha256-PpUqGVWaJ06EVu3tBKVzOh8HYvT6wAG3bvY6wUD+dTM="; + }) + ]; + buildInputs = [ giflib imlib2 libXft libexif libwebp - ]; + ] ++ lib.optional stdenv.isDarwin libinotify-kqueue; preBuild = lib.optionalString (conf!=null) '' cp ${(builtins.toFile "config.def.h" conf)} config.def.h ''; - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-linotify"; + + makeFlags = [ "CC:=$(CC)" ]; + + installFlags = [ "PREFIX=$(out)" ]; + + installTargets = [ "install-all" ]; meta = with lib; { - homepage = "https://nsxiv.github.io/nsxiv/"; + homepage = "https://nsxiv.codeberg.page/"; description = "New Suckless X Image Viewer"; longDescription = '' nsxiv is a fork of now unmaintained sxiv with the purpose of being a @@ -54,8 +69,7 @@ stdenv.mkDerivation rec { - Display image name/path in X title ''; license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; + maintainers = with maintainers; [ AndersonTorres sikmir ]; platforms = platforms.unix; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix index cd16fe1de0..1087bba970 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/paraview/default.nix @@ -44,13 +44,6 @@ in mkDerivation rec { export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix} ''; - # During build, binaries are called that rely on freshly built - # libraries. These reside in build/lib, and are not found by - # default. - preBuild = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib:$PWD/VTK/ThirdParty/vtkm/vtk-m/lib - ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DPARAVIEW_ENABLE_FFMPEG=ON" diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix index 46e5ce420a..43d47cb077 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/default.nix @@ -3,6 +3,7 @@ , exiv2 , expat , fetchFromGitHub +, fetchpatch , fftw , fftwFloat , gettext @@ -22,9 +23,11 @@ , pcre , pkg-config , pugixml -, lib, stdenv +, lib +, stdenv , swig , vips +, gtk-mac-integration-gtk2 }: stdenv.mkDerivation rec { @@ -38,7 +41,15 @@ stdenv.mkDerivation rec { sha256 = "1bq4733hbh15nwpixpyhqfn3bwkg38amdj2xc0my0pii8l9ln793"; }; - patches = [ ./CMakeLists.patch ]; + patches = [ + (fetchpatch { + name = "fix-compiler-flags.patch"; + url = "https://sources.debian.org/data/main/p/photoflow/0.2.8%2Bgit20200114-3/debian/patches/ftbfs"; + sha256 = "sha256-DG5yG6M4FsKOykE9Eh5TGd7Z5QURGTTVbO1pIxMAlhc="; + }) + ./CMakeLists.patch + ./fix-build.patch + ]; nativeBuildInputs = [ automake @@ -57,8 +68,8 @@ stdenv.mkDerivation rec { expat fftw fftwFloat - gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3 - # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803 + gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3 + # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803 lcms2 lensfun libexif @@ -70,6 +81,8 @@ stdenv.mkDerivation rec { pcre pugixml vips + ] ++ lib.optionals stdenv.isDarwin [ + gtk-mac-integration-gtk2 ]; cmakeFlags = [ @@ -82,13 +95,7 @@ stdenv.mkDerivation rec { description = "A fully non-destructive photo retouching program providing a complete RAW image editing workflow"; homepage = "https://aferrero2707.github.io/PhotoFlow/"; license = licenses.gpl3Plus; - maintainers = [ maintainers.MtP ]; - platforms = platforms.linux; - # sse3 is not supported on aarch64 - badPlatforms = [ "aarch64-linux" ]; - # added 2021-09-30 - # upstream seems pretty dead - #/build/source/src/operations/denoise.cc:30:10: fatal error: vips/cimg_funcs.h: No such file or directory - broken = true; + maintainers = with maintainers; [ MtP wegank ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflow/fix-build.patch b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/fix-build.patch new file mode 100644 index 0000000000..ac0516b203 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/photoflow/fix-build.patch @@ -0,0 +1,76 @@ +diff --git a/src/external/librtprocess/src/include/librtprocess.h b/src/external/librtprocess/src/include/librtprocess.h +index 47691a09..b1c63dbd 100644 +--- a/src/external/librtprocess/src/include/librtprocess.h ++++ b/src/external/librtprocess/src/include/librtprocess.h +@@ -21,6 +21,7 @@ + #define _LIBRTPROCESS_ + + #include ++#include + + + enum rpError {RP_NO_ERROR, RP_MEMORY_ERROR, RP_WRONG_CFA, RP_CACORRECT_ERROR}; +diff --git a/src/operations/denoise.cc b/src/operations/denoise.cc +index 10050f70..16b340c1 100644 +--- a/src/operations/denoise.cc ++++ b/src/operations/denoise.cc +@@ -27,7 +27,7 @@ + + */ + +-#include ++//#include + + #include "../base/new_operation.hh" + #include "convert_colorspace.hh" +diff --git a/src/operations/gmic/gmic.cc b/src/operations/gmic/gmic.cc +index 876e7c20..fc6a8505 100644 +--- a/src/operations/gmic/gmic.cc ++++ b/src/operations/gmic/gmic.cc +@@ -28,13 +28,31 @@ + */ + + //#include ++#include + + #include "../../base/processor_imp.hh" + #include "../convertformat.hh" + #include "gmic.hh" + +-int vips_gmic(VipsImage **in, VipsImage** out, int n, int padding, double x_scale, double y_scale, const char* command, ...); +- ++int vips_gmic(VipsImage **in, VipsImage** out, int n, int padding, double x_scale, double y_scale, const char* command, ...) ++{ ++ VipsArrayImage *array; ++ va_list ap; ++ int result; ++ ++#ifndef NDEBUG ++ printf("vips_gmic(): padding=%d\n", padding); ++#endif ++ ++ array = vips_array_image_new( in, n ); ++ va_start( ap, command ); ++ result = vips_call_split( "gmic", ap, array, out, ++ padding, x_scale, y_scale, command ); ++ va_end( ap ); ++ vips_area_unref( VIPS_AREA( array ) ); ++ ++ return( result ); ++} + + PF::GMicPar::GMicPar(): + OpParBase(), +diff --git a/src/vips/gmic/gmic/src/CImg.h b/src/vips/gmic/gmic/src/CImg.h +index 268b9e62..5a79640c 100644 +--- a/src/vips/gmic/gmic/src/CImg.h ++++ b/src/vips/gmic/gmic/src/CImg.h +@@ -32843,7 +32843,7 @@ namespace cimg_library_suffixed { + \see deriche(), vanvliet(). + **/ + CImg& blur_box(const float boxsize, const bool boundary_conditions=true) { +- const float nboxsize = boxsize>=0?boxsize:-boxsize*std::max(_width,_height,_depth)/100; ++ const float nboxsize = boxsize>=0?boxsize:-boxsize*std::max({_width,_height,_depth})/100; + return blur_box(nboxsize,nboxsize,nboxsize,boundary_conditions); + } + diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pika/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pika/default.nix new file mode 100644 index 0000000000..b9cbf142a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/pika/default.nix @@ -0,0 +1,32 @@ +{ lib +, fetchurl +, stdenv +, undmg +}: + +stdenv.mkDerivation rec { + pname = "pika"; + version = "0.0.12"; + + src = fetchurl { + url = "https://github.com/superhighfives/${pname}/releases/download/${version}/Pika-${version}.dmg"; + sha256 = "sha256-hcP2bETEx9RQW43I9nvdRPi9lbWwKW6mhRx5H6RxhjM="; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "Pika.app"; + + installPhase = '' + mkdir -p "$out/Applications/Pika.app" + cp -R . "$out/Applications/Pika.app" + ''; + + meta = with lib; { + homepage = "https://superhighfives.com/pika"; + description = "An open-source colour picker app for macOS"; + platforms = platforms.darwin; + license = licenses.mit; + maintainers = with maintainers; [ arkivm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix index 7a730cbda9..04677a3982 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "pineapple-pictures"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = version; - sha256 = "sha256-KTYwe6fS/rUHBbC2B9OdK95mFm3zvgDdGODkg7VQ27M="; + sha256 = "sha256-1fsEHyepmoZfNOFEnW6RQJyccOlQr5LTp8TjRqyXkcw"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix index 494180fdb5..c1f78b1807 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, cmake, pixman, libpthreadstubs, gtkmm3, libXau , libXdmcp, lcms2, libiptcdata, libcanberra-gtk3, fftw, expat, pcre, libsigcxx, wrapGAppsHook -, lensfun, librsvg +, lensfun, librsvg, gtk-mac-integration }: stdenv.mkDerivation rec { @@ -17,11 +17,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; # This patch is upstream; remove it in 5.9. - patches = [ ./fix-6324.patch ]; + patches = [ ./fix-6324.patch ] + # Disable upstream-enforced bundling on macOS. + ++ lib.optionals stdenv.isDarwin [ ./do-not-bundle.patch ]; buildInputs = [ pixman libpthreadstubs gtkmm3 libXau libXdmcp - lcms2 libiptcdata libcanberra-gtk3 fftw expat pcre libsigcxx lensfun librsvg + lcms2 libiptcdata fftw expat pcre libsigcxx lensfun librsvg + ] ++ lib.optionals stdenv.isLinux [ + libcanberra-gtk3 + ] ++ lib.optionals stdenv.isDarwin [ + gtk-mac-integration ]; cmakeFlags = [ @@ -40,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "http://www.rawtherapee.com/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ jcumming mahe ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch new file mode 100644 index 0000000000..8c3257e888 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/rawtherapee/do-not-bundle.patch @@ -0,0 +1,13 @@ +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/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix index e44c49ac6b..aa452f8de2 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix @@ -32,13 +32,13 @@ let in mkDerivation rec { pname = "renderdoc"; - version = "1.18"; + version = "1.21"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "sha256-nwERwdNQYY1Fd7llwZHrJBzWDJNdsySRQ3ZvXZjB7YY="; + sha256 = "sha256-T6OAr6Pl4VmXVSlNHF6kh8jIKs3FSTZsZ+Y4IH3SPTE="; }; buildInputs = [ @@ -95,7 +95,7 @@ mkDerivation rec { of any application using Vulkan, D3D11, OpenGL or D3D12 across Windows 7 - 10, Linux or Android. ''; - maintainers = [ maintainers.jansol ]; + maintainers = [ ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix index 98726de060..b5964adbbc 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix @@ -22,20 +22,20 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-v4cca4tSv//VFUvOfemkueELxlez2TdtynqbzjCTlB4="; + hash = "sha256-CZLZblC10k5ynzDDXi/bOe6Rc6M94eywXjyu0ABOVq4="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-sK8GOLxNG4mu45oQSaFi467DHYt00Pxu3vMM6Po/YqI="; + hash = "sha256-Udat35KqrMWR0Ckx34BWoF0HiJHZ5CP2CGFD6FNCWRA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/kde/default.nix b/third_party/nixpkgs/pkgs/applications/kde/default.nix index 146ee9b145..29bfaecd0a 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/default.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/default.nix @@ -145,6 +145,7 @@ let kio-extras = callPackage ./kio-extras.nix {}; kio-gdrive = callPackage ./kio-gdrive.nix {}; kipi-plugins = callPackage ./kipi-plugins.nix {}; + kirigami-gallery = callPackage ./kirigami-gallery.nix {}; kitinerary = callPackage ./kitinerary.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; @@ -229,6 +230,7 @@ let skanlite = callPackage ./skanlite.nix {}; skanpage = callPackage ./skanpage.nix {}; spectacle = callPackage ./spectacle.nix {}; + umbrello = callPackage ./umbrello.nix {}; yakuake = callPackage ./yakuake.nix {}; zanshin = callPackage ./zanshin.nix {}; }; diff --git a/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix b/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix index 92d256f477..b70f4977f5 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/dolphin.nix @@ -27,8 +27,4 @@ mkDerivation { wayland qtwayland ]; outputs = [ "out" "dev" ]; - # We need the RPATH for linking, because the `libkdeinit5_dolphin.so` links - # private against its dependencies and without the correct RPATH, these - # dependencies are not found. - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; } diff --git a/third_party/nixpkgs/pkgs/applications/kde/kirigami-gallery.nix b/third_party/nixpkgs/pkgs/applications/kde/kirigami-gallery.nix new file mode 100644 index 0000000000..f012188ed9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/kirigami-gallery.nix @@ -0,0 +1,31 @@ +{ mkDerivation +, lib +, kirigami2 +, extra-cmake-modules +, kitemmodels +, qtgraphicaleffects +, qtquickcontrols2 +, qttools +, qtbase +}: + +mkDerivation rec { + pname = "kirigami-gallery"; + + nativeBuildInputs = [ extra-cmake-modules qttools ]; + + buildInputs = [ + qtgraphicaleffects + qtquickcontrols2 + kirigami2 + kitemmodels + ]; + + meta = with lib; { + homepage = "https://apps.kde.org/kirigami2.gallery/"; + description = "View examples of Kirigami components"; + license = licenses.lgpl2; + maintainers = with maintainers; [ shadowrz ]; + broken = versionOlder qtbase.version "5.15"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/kde/umbrello.nix b/third_party/nixpkgs/pkgs/applications/kde/umbrello.nix new file mode 100644 index 0000000000..4746e1976b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/kde/umbrello.nix @@ -0,0 +1,25 @@ +{ mkDerivation +, lib +, extra-cmake-modules +, cmake +, karchive +, ki18n +, kiconthemes +, kdelibs4support +, ktexteditor +}: + +mkDerivation { + pname = "umbrello"; + meta = { + homepage = "https://umbrello.kde.org/"; + description = "A Unified Modelling Language (UML) diagram program"; + license = [ lib.licenses.gpl2 ]; + }; + nativeBuildInputs = [ + cmake extra-cmake-modules + ]; + propagatedBuildInputs = [ + karchive ki18n kiconthemes kdelibs4support ktexteditor + ]; +} diff --git a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix b/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix index 8f0fe76108..72786ce205 100644 --- a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix @@ -1,9 +1,9 @@ { buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.28.11"; - sha256 = "sha256-CdGeGpOEWYn7yIWJxWpRrSPHcuult+jtqpjYaSjfBLQ="; - vendorSha256 = "sha256-fgRQ2n5tzj5s4rT65VIqh61wDwu+x/fWhpaKwyr8XWA="; + humioCtlVersion = "0.29.1"; + sha256 = "sha256-89rVUzxUf9lM1KE55m1EQidwc26q/QadY0kgu/afj9I="; + vendorSha256 = "sha256-n9gfY6oNxOjU6sGm8Bd8asFlHxm+dzHdVWj4CmfvFpA="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; pname = "humioctl"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/beta.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/beta.nix index 871f07440e..fa68f6e833 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/beta.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/beta.nix @@ -44,12 +44,19 @@ let in stdenv.mkDerivation rec { pname = "1password"; - version = "8.8.0-165.BETA"; + version = "8.8.0-215.BETA"; - src = fetchurl { - url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; - sha256 = "sha256-ZpKAkuIMeHEFdz/od/sKDh8VXoWOZYO8GjvMiho3D4A="; - }; + src = + if stdenv.hostPlatform.isAarch64 then + fetchurl { + url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz"; + sha256 = "sha256-GjLwLeJ6GE39NFIZ+v83xaUVsgrkKRH3xt60aG/XrDg="; + } + else + fetchurl { + url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz"; + sha256 = "sha256-TR0evvu5NNR6Kvqj8JlpYuTcK9Rmf1oDFGrfzrGZzo8="; + }; nativeBuildInputs = [ makeWrapper ]; @@ -132,6 +139,6 @@ in stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ timstott savannidgerinel maxeaubrey sebtm ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix index 0d18b3dd37..72f4120cfc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password/default.nix +++ b/third_party/nixpkgs/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.5.1"; + version = "2.6.0"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-HZ6AVheJrw9ZR9HGWbB6/kCzbrfYcwApa2z18tDBo1k=" "zip"; - i686-linux = fetch "linux_386" "sha256-aG6oW0epF+P9pSWMlTStSbBynBDkGX1B+0NHUnwLRhs=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-7GkBVcvXM/WZiXEiIbYh9lS0f4BS4Hc4RCVjr8FoW8A=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-XebD33fX15RsFUdbV+DvMRIi1MSyMfIRC3JOwcmi8kk=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-2V3/F7/HEOvk2T1dv4rnS0xu6Z5EqGSV/9erED7ZS1w=" "zip"; + i686-linux = fetch "linux_386" "sha256-z4pKZY5DQ2oDHHuet1S/p7GM+rXS8/8xmTrN+rqCUBo=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-1/DgwHMkUenj+2ZyADeBK1HJ3M/b2PoAey36eAqAUSQ=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-YPidRXNzNNuDoM2Gd5dEsCDxwosBJFKSzjoP0SPkQZs=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix index e54f6c8cbc..3a88536224 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "5.2.7.7"; + version = "5.2.8.3"; src = fetchFromGitHub { owner = "justarchinet"; repo = pname; rev = version; - sha256 = "sha256-2yx6YjMsJixtaiWse65p5VeZoiSumdIjaPIlfq9Mdmw="; + sha256 = "sha256-WoEbcZbTUH34xkJ+KtAbJXFqWSpFXlXtsQgXOVknxTg="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_6_0; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix index 983e03c8f3..4f276da75c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-aarch64-linux.nix @@ -1,6 +1,6 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) - (fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; }) + (fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; }) + (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.1"; sha256 = "0sdxqjwvyf0l1cp4n4i84g7rly8z7ramq0y7vsgqvf6hzx7dnk5i"; }) (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) @@ -68,7 +68,7 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) @@ -90,7 +90,6 @@ (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) @@ -110,9 +109,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; }) + (fetchNuGet { pname = "NLog"; version = "5.0.1"; sha256 = "1ln6qxm2kgq8vr4kja41y9b6mhcf2812fi7vbkmbc5q1bivawf1b"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.1"; sha256 = "1z7cp2zdnaiijm6m0449h5q4mpij3985nbpayscwbifsnv8xl9ci"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.0"; sha256 = "18jaxjbyaw5q166px5n5hanlwh0swlpw0fbcwh2qhvla7ik11gyk"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) @@ -165,14 +164,15 @@ (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.3.1"; sha256 = "1jyrqdj8bvxf1a8pcnkkj7v727c0sh1yzgnm6si7xzrhkz4zzc0z"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.3.1"; sha256 = "16mi3f130bn7arybfawc8wrwjb5zq31zyrsm7wjazj70gdpra9pb"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.3.1"; sha256 = "1siabkmip1ccnpbaf1jn6dga996kqbf9y0am2qwa9abrpn1l30p7"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.3.1"; sha256 = "1lgy5wfrdc6ihamz50qbv5sjkx4g90m6lza9al5cf36hrs6cybnw"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.3.1"; sha256 = "1ikrgxxalkf0lj591444rc2x8y0kma8ch1vpnlslvaxgq58g9jpz"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.3.1"; sha256 = "13bhyldm2gfckzvmfyx577p1fs7afsxpipjnczfapqj4fawcd72v"; }) + (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 = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) @@ -242,7 +242,7 @@ (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (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"; }) @@ -269,7 +269,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 = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; }) + (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"; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix index fc69de3a10..8f8a04977d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps-x86_64-linux.nix @@ -1,6 +1,6 @@ { fetchNuGet }: [ - (fetchNuGet { pname = "AngleSharp"; version = "0.14.0"; sha256 = "1zgwhh1fp2mmaplvpgm86rpmslix3wqfxf0d3hxx1gxwfgr6wxm6"; }) - (fetchNuGet { pname = "AngleSharp.XPath"; version = "1.1.7"; sha256 = "0lrk002nizq973zdmcm0wmcq17j5gizwp03xdv84hiqqd8cyy538"; }) + (fetchNuGet { pname = "AngleSharp"; version = "0.17.1"; sha256 = "038idg33ydy72362qplsd7y8ldifi9zg02dhjli6wy4p47hyqcph"; }) + (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.1"; sha256 = "0sdxqjwvyf0l1cp4n4i84g7rly8z7ramq0y7vsgqvf6hzx7dnk5i"; }) (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; }) (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) @@ -68,7 +68,7 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "3.0.0"; sha256 = "13a47xcqyi5gz85swxd4mgp7ndgl4kknrvv3xwmbn71hsh953hsh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "5.0.0"; sha256 = "0fqxkc9pjxkqylsdf26s9q21ciyk56h1w33pz3v1v4wcv8yv1v6k"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "5.0.0"; sha256 = "15sdwcyzz0qlybwbdq854bn3jk6kx7awx28gs864c4shhbqkppj4"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "5.0.0"; sha256 = "17cz6s80va0ch0a6nqa1wbbbp3p8sqxb96lj4qcw67ivkp2yxiyj"; }) @@ -90,7 +90,6 @@ (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.6"; sha256 = "1a6hvkiy2z6z7v7rw1q61qqlw7w0hzc4my3rm94kwgjcv5qkpr5k"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) @@ -110,9 +109,9 @@ (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; }) (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; }) (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; }) - (fetchNuGet { pname = "NLog"; version = "5.0.0"; sha256 = "10da1qfvqkfs7msb0f9yba3ias6dh9m0xjr2hbp95symbz8nrfwz"; }) - (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.0"; sha256 = "0r06b64f7j1pi7qlsaqvbvnp0irpng3vkngszis7mj0g6415rz8c"; }) - (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.0.0"; sha256 = "1fj4m1kdszcxva918pz2abpn31vp69vj0349gfzixz87gml8vbg4"; }) + (fetchNuGet { pname = "NLog"; version = "5.0.1"; sha256 = "1ln6qxm2kgq8vr4kja41y9b6mhcf2812fi7vbkmbc5q1bivawf1b"; }) + (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.0.1"; sha256 = "1z7cp2zdnaiijm6m0449h5q4mpij3985nbpayscwbifsnv8xl9ci"; }) + (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.1.0"; sha256 = "18jaxjbyaw5q166px5n5hanlwh0swlpw0fbcwh2qhvla7ik11gyk"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "protobuf-net"; version = "3.0.101"; sha256 = "0594qckbc0lh61sw74ihaq4qmvf1lf133vfa88n443mh7lxm2fwf"; }) (fetchNuGet { pname = "protobuf-net.Core"; version = "3.0.101"; sha256 = "1kvn9rnm6f0jxs0s9scyyx2f2p8rk03qzc1f6ijv1g6xgkpxkq1m"; }) @@ -165,14 +164,15 @@ (fetchNuGet { pname = "runtime.win.System.Net.Sockets"; version = "4.3.0"; sha256 = "0lr3zki831vs6qhk5wckv2b9qbfk9rcj0ds2926qvj1b9y9m6sck"; }) (fetchNuGet { pname = "runtime.win.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1700famsxndccfbcdz9q14qb20p49lax67mqwpgy4gx3vja1yczr"; }) (fetchNuGet { pname = "SteamKit2"; version = "2.4.1"; sha256 = "13f7jra2d0kjlvnk4dghzhx8nhkd001i4xrkf6m19gisjvpjhpdr"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.3.1"; sha256 = "1jyrqdj8bvxf1a8pcnkkj7v727c0sh1yzgnm6si7xzrhkz4zzc0z"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.3.1"; sha256 = "16mi3f130bn7arybfawc8wrwjb5zq31zyrsm7wjazj70gdpra9pb"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Newtonsoft"; version = "6.3.1"; sha256 = "1siabkmip1ccnpbaf1jn6dga996kqbf9y0am2qwa9abrpn1l30p7"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.3.1"; sha256 = "1lgy5wfrdc6ihamz50qbv5sjkx4g90m6lza9al5cf36hrs6cybnw"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.3.1"; sha256 = "1ikrgxxalkf0lj591444rc2x8y0kma8ch1vpnlslvaxgq58g9jpz"; }) - (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.3.1"; sha256 = "13bhyldm2gfckzvmfyx577p1fs7afsxpipjnczfapqj4fawcd72v"; }) + (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 = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) @@ -242,7 +242,7 @@ (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) - (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (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"; }) @@ -269,7 +269,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 = "4.5.0"; sha256 = "19x38911pawq4mrxrm04l2bnxwxxlzq8v8rj4cbxnfjj8pnd3vj3"; }) + (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"; }) diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix index 260035bf11..e3aad12a58 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix @@ -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 = "99278781c3716064dc25e3608a344900ebb05165"; - sha256 = "0nly16g39cv4lhnm40w5ci6bdwypk0gp8n70l914907hy0nvz4vg"; + rev = "60a692f2e0d6b7c2bcd2cf363042d4647f246b4b"; + sha256 = "1g49zwghdfgzd5canrrw1c2r4780xyvcaz72p14w036h93fw01z2"; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix index 5de9d220ab..534ba7e8d5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/node-packages.nix @@ -13,436 +13,436 @@ let sha512 = "Aolwjd7HSC2PyY0fDj/wA/EimQT4HfEnFYNp5s9CQlrdhyvWTtvZ5YzrUPu6R6/1jKiUlxu8bUhkdSnKHNAHMA=="; }; }; - "@babel/code-frame-7.16.7" = { + "@babel/code-frame-7.18.6" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; - sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.17.10" = { + "@babel/compat-data-7.18.8" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.17.10"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz"; - sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"; + sha512 = "HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="; }; }; - "@babel/core-7.18.5" = { + "@babel/core-7.18.9" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.18.5"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz"; - sha512 = "MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz"; + sha512 = "1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g=="; }; }; - "@babel/eslint-parser-7.18.2" = { + "@babel/eslint-parser-7.18.9" = { name = "_at_babel_slash_eslint-parser"; packageName = "@babel/eslint-parser"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.2.tgz"; - sha512 = "oFQYkE8SuH14+uR51JVAmdqwKYXGRjEXx7s+WiagVjqQ+HPE+nnwyF2qlVG8evUsUHmPcA+6YXMEDbIhEyQc5A=="; + url = "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz"; + sha512 = "KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ=="; }; }; - "@babel/generator-7.18.2" = { + "@babel/generator-7.18.9" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz"; - sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz"; + sha512 = "wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug=="; }; }; - "@babel/helper-annotate-as-pure-7.16.7" = { + "@babel/helper-annotate-as-pure-7.18.6" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; - sha512 = "s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; + sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz"; - sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz"; + sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="; }; }; - "@babel/helper-compilation-targets-7.18.2" = { + "@babel/helper-compilation-targets-7.18.9" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz"; - sha512 = "s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz"; + sha512 = "tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg=="; }; }; - "@babel/helper-create-class-features-plugin-7.18.0" = { + "@babel/helper-create-class-features-plugin-7.18.6" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz"; - sha512 = "Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz"; + sha512 = "YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.17.12" = { + "@babel/helper-create-regexp-features-plugin-7.18.6" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz"; - sha512 = "b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"; + sha512 = "7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="; }; }; - "@babel/helper-define-polyfill-provider-0.3.0" = { + "@babel/helper-define-polyfill-provider-0.3.1" = { name = "_at_babel_slash_helper-define-polyfill-provider"; packageName = "@babel/helper-define-polyfill-provider"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz"; - sha512 = "7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg=="; + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"; + sha512 = "J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA=="; }; }; - "@babel/helper-environment-visitor-7.18.2" = { + "@babel/helper-environment-visitor-7.18.9" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz"; - sha512 = "14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; + sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; }; }; - "@babel/helper-explode-assignable-expression-7.16.7" = { + "@babel/helper-explode-assignable-expression-7.18.6" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"; - sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"; + sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; }; }; - "@babel/helper-function-name-7.17.9" = { + "@babel/helper-function-name-7.18.9" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.17.9"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"; - sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz"; + sha512 = "fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A=="; }; }; - "@babel/helper-hoist-variables-7.16.7" = { + "@babel/helper-hoist-variables-7.18.6" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; - sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; + sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.17.7" = { + "@babel/helper-member-expression-to-functions-7.18.9" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.17.7"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz"; - sha512 = "thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; + sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; }; }; - "@babel/helper-module-imports-7.16.7" = { + "@babel/helper-module-imports-7.18.6" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; - sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; + sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.18.0" = { + "@babel/helper-module-transforms-7.18.9" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz"; - sha512 = "kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz"; + sha512 = "KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g=="; }; }; - "@babel/helper-optimise-call-expression-7.16.7" = { + "@babel/helper-optimise-call-expression-7.18.6" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; - sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; + sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; }; - "@babel/helper-plugin-utils-7.17.12" = { + "@babel/helper-plugin-utils-7.18.9" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz"; - sha512 = "JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz"; + sha512 = "aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="; }; }; - "@babel/helper-remap-async-to-generator-7.16.8" = { + "@babel/helper-remap-async-to-generator-7.18.6" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.8"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"; - sha512 = "fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.6.tgz"; + sha512 = "z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ=="; }; }; - "@babel/helper-replace-supers-7.16.7" = { + "@babel/helper-replace-supers-7.18.9" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.16.7"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz"; - sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; + sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; }; }; - "@babel/helper-simple-access-7.18.2" = { + "@babel/helper-simple-access-7.18.6" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz"; - sha512 = "7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; + sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { + "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.16.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"; - sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz"; + sha512 = "imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw=="; }; }; - "@babel/helper-split-export-declaration-7.16.7" = { + "@babel/helper-split-export-declaration-7.18.6" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; - sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; + sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-validator-identifier-7.16.7" = { + "@babel/helper-validator-identifier-7.18.6" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; - sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; + sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; }; }; - "@babel/helper-validator-option-7.16.7" = { + "@babel/helper-validator-option-7.18.6" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; - sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; + sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; }; - "@babel/helper-wrap-function-7.16.8" = { + "@babel/helper-wrap-function-7.18.6" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.16.8"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"; - sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz"; + sha512 = "I5/LZfozwMNbwr/b1vhhuYD+J/mU+gfGAj5td7l5Rv9WYmH6i3Om69WGKNmlIpsVW/mF6O5bvTKbvDQZVgjqOw=="; }; }; - "@babel/helpers-7.18.2" = { + "@babel/helpers-7.18.9" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz"; - sha512 = "j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz"; + sha512 = "Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ=="; }; }; - "@babel/highlight-7.16.7" = { + "@babel/highlight-7.18.6" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz"; - sha512 = "aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.18.5" = { + "@babel/parser-7.18.9" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.5"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz"; - sha512 = "YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz"; + sha512 = "9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz"; - sha512 = "xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"; + sha512 = "Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz"; - sha512 = "/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz"; + sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.17.12" = { + "@babel/plugin-proposal-async-generator-functions-7.18.6" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz"; - sha512 = "RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz"; + sha512 = "WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w=="; }; }; - "@babel/plugin-proposal-class-properties-7.17.12" = { + "@babel/plugin-proposal-class-properties-7.18.6" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz"; - sha512 = "U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"; + sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-class-static-block-7.18.0" = { + "@babel/plugin-proposal-class-static-block-7.18.6" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz"; - sha512 = "t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"; + sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.16.7" = { + "@babel/plugin-proposal-dynamic-import-7.18.6" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"; - sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"; + sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.17.12" = { + "@babel/plugin-proposal-export-namespace-from-7.18.9" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz"; - sha512 = "j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"; + sha512 = "k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA=="; }; }; - "@babel/plugin-proposal-json-strings-7.17.12" = { + "@babel/plugin-proposal-json-strings-7.18.6" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz"; - sha512 = "rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"; + sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.17.12" = { + "@babel/plugin-proposal-logical-assignment-operators-7.18.9" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz"; - sha512 = "EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz"; + sha512 = "128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz"; - sha512 = "ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"; + sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.16.7" = { + "@babel/plugin-proposal-numeric-separator-7.18.6" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz"; - sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; + sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.18.0" = { + "@babel/plugin-proposal-object-rest-spread-7.18.9" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz"; - sha512 = "nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; + sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { + "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"; - sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"; + sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.17.12" = { + "@babel/plugin-proposal-optional-chaining-7.18.9" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz"; - sha512 = "7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz"; + sha512 = "v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w=="; }; }; - "@babel/plugin-proposal-private-methods-7.17.12" = { + "@babel/plugin-proposal-private-methods-7.18.6" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz"; - sha512 = "SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"; + sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.17.12" = { + "@babel/plugin-proposal-private-property-in-object-7.18.6" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz"; - sha512 = "/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"; + sha512 = "9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.17.12" = { + "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz"; - sha512 = "Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"; + sha512 = "2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -490,13 +490,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-import-assertions-7.17.12" = { + "@babel/plugin-syntax-import-assertions-7.18.6" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz"; - sha512 = "n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"; + sha512 = "/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ=="; }; }; "@babel/plugin-syntax-json-strings-7.8.3" = { @@ -580,301 +580,301 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.17.12" = { + "@babel/plugin-transform-arrow-functions-7.18.6" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz"; - sha512 = "PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"; + sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.17.12" = { + "@babel/plugin-transform-async-to-generator-7.18.6" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz"; - sha512 = "J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"; + sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.16.7" = { + "@babel/plugin-transform-block-scoped-functions-7.18.6" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"; - sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; + sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.17.12" = { + "@babel/plugin-transform-block-scoping-7.18.9" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.17.12.tgz"; - sha512 = "jw8XW/B1i7Lqwqj2CbrViPcZijSxfguBWZP2aN59NHgxUyO/OcO1mfdCxH13QhN5LbWhPkX+f+brKGhZTiqtZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; + sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; }; }; - "@babel/plugin-transform-classes-7.17.12" = { + "@babel/plugin-transform-classes-7.18.9" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.17.12.tgz"; - sha512 = "cvO7lc7pZat6BsvH6l/EGaI8zpl8paICaoGk+7x7guvtfak/TbIf66nYmJOH13EuG0H+Xx3M+9LQDtSvZFKXKw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz"; + sha512 = "EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g=="; }; }; - "@babel/plugin-transform-computed-properties-7.17.12" = { + "@babel/plugin-transform-computed-properties-7.18.9" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz"; - sha512 = "a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz"; + sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.18.0" = { + "@babel/plugin-transform-destructuring-7.18.9" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz"; - sha512 = "Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz"; + sha512 = "p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA=="; }; }; - "@babel/plugin-transform-dotall-regex-7.16.7" = { + "@babel/plugin-transform-dotall-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"; - sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; + sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.17.12" = { + "@babel/plugin-transform-duplicate-keys-7.18.9" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz"; - sha512 = "EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"; + sha512 = "d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.16.7" = { + "@babel/plugin-transform-exponentiation-operator-7.18.6" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"; - sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; + sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; }; }; - "@babel/plugin-transform-for-of-7.18.1" = { + "@babel/plugin-transform-for-of-7.18.8" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.18.1"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz"; - sha512 = "+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; + sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; }; }; - "@babel/plugin-transform-function-name-7.16.7" = { + "@babel/plugin-transform-function-name-7.18.9" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.16.7"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"; - sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"; + sha512 = "WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ=="; }; }; - "@babel/plugin-transform-literals-7.17.12" = { + "@babel/plugin-transform-literals-7.18.9" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz"; - sha512 = "8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"; + sha512 = "IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.16.7" = { + "@babel/plugin-transform-member-expression-literals-7.18.6" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"; - sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; + sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; }; }; - "@babel/plugin-transform-modules-amd-7.18.0" = { + "@babel/plugin-transform-modules-amd-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz"; - sha512 = "h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; + sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.18.2" = { + "@babel/plugin-transform-modules-commonjs-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz"; - sha512 = "f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; + sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.18.0" = { + "@babel/plugin-transform-modules-systemjs-7.18.9" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.0.tgz"; - sha512 = "vwKpxdHnlM5tIrRt/eA0bzfbi7gUBLN08vLu38np1nZevlPySRe6yvuATJB5F/WPJ+ur4OXwpVYq9+BsxqAQuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz"; + sha512 = "zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A=="; }; }; - "@babel/plugin-transform-modules-umd-7.18.0" = { + "@babel/plugin-transform-modules-umd-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz"; - sha512 = "d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; + sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.17.12" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz"; - sha512 = "vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz"; + sha512 = "UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg=="; }; }; - "@babel/plugin-transform-new-target-7.17.12" = { + "@babel/plugin-transform-new-target-7.18.6" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz"; - sha512 = "CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; + sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; }; }; - "@babel/plugin-transform-object-super-7.16.7" = { + "@babel/plugin-transform-object-super-7.18.6" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"; - sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; + sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.17.12" = { + "@babel/plugin-transform-parameters-7.18.8" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.17.12"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz"; - sha512 = "6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; + sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; }; }; - "@babel/plugin-transform-property-literals-7.16.7" = { + "@babel/plugin-transform-property-literals-7.18.6" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"; - sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; + sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; }; }; - "@babel/plugin-transform-regenerator-7.18.0" = { + "@babel/plugin-transform-regenerator-7.18.6" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz"; - sha512 = "C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"; + sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="; }; }; - "@babel/plugin-transform-reserved-words-7.17.12" = { + "@babel/plugin-transform-reserved-words-7.18.6" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz"; - sha512 = "1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; + sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.7" = { + "@babel/plugin-transform-shorthand-properties-7.18.6" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; - sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; + sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; }; }; - "@babel/plugin-transform-spread-7.17.12" = { + "@babel/plugin-transform-spread-7.18.9" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz"; - sha512 = "9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz"; + sha512 = "39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA=="; }; }; - "@babel/plugin-transform-sticky-regex-7.16.7" = { + "@babel/plugin-transform-sticky-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"; - sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; + sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; }; }; - "@babel/plugin-transform-template-literals-7.18.2" = { + "@babel/plugin-transform-template-literals-7.18.9" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz"; - sha512 = "/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"; + sha512 = "S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.17.12" = { + "@babel/plugin-transform-typeof-symbol-7.18.9" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz"; - sha512 = "Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"; + sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.16.7" = { + "@babel/plugin-transform-unicode-escapes-7.18.6" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz"; - sha512 = "TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz"; + sha512 = "XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.16.7" = { + "@babel/plugin-transform-unicode-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"; - sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; + sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; }; }; - "@babel/preset-env-7.18.2" = { + "@babel/preset-env-7.18.9" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz"; - sha512 = "PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.9.tgz"; + sha512 = "75pt/q95cMIHWssYtyfjVlvI+QEZQThQbKvR9xH+F/Agtw/s4Wfc2V9Bwd/P39VtixB7oWxGdH4GteTTwYJWMg=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -895,31 +895,31 @@ let sha512 = "/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg=="; }; }; - "@babel/template-7.16.7" = { + "@babel/template-7.18.6" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"; - sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz"; + sha512 = "JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw=="; }; }; - "@babel/traverse-7.18.5" = { + "@babel/traverse-7.18.9" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.18.5"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz"; - sha512 = "aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.9.tgz"; + sha512 = "LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg=="; }; }; - "@babel/types-7.18.4" = { + "@babel/types-7.18.9" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.18.4"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz"; - sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz"; + sha512 = "WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg=="; }; }; "@discoveryjs/json-ext-0.5.5" = { @@ -940,15 +940,6 @@ let sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; }; }; - "@fortawesome/fontawesome-common-types-0.3.0" = { - name = "_at_fortawesome_slash_fontawesome-common-types"; - packageName = "@fortawesome/fontawesome-common-types"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz"; - sha512 = "CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w=="; - }; - }; "@fortawesome/fontawesome-common-types-6.1.1" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; @@ -958,13 +949,13 @@ let sha512 = "wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA=="; }; }; - "@fortawesome/fontawesome-svg-core-1.3.0" = { + "@fortawesome/fontawesome-svg-core-6.1.1" = { name = "_at_fortawesome_slash_fontawesome-svg-core"; packageName = "@fortawesome/fontawesome-svg-core"; - version = "1.3.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.3.0.tgz"; - sha512 = "UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.1.tgz"; + sha512 = "NCg0w2YIp81f4V6cMGD9iomfsIj7GWrqmsa0ZsPh59G7PKiGN1KymZNxmF00ssuAlo/VZmpK6xazsGOwzKYUMg=="; }; }; "@fortawesome/free-brands-svg-icons-6.1.1" = { @@ -985,13 +976,13 @@ let sha512 = "0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg=="; }; }; - "@fortawesome/vue-fontawesome-2.0.7" = { + "@fortawesome/vue-fontawesome-2.0.8" = { name = "_at_fortawesome_slash_vue-fontawesome"; packageName = "@fortawesome/vue-fontawesome"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.7.tgz"; - sha512 = "D1a5FJQeiCFG5a29Re5uNAUAI8SdkCPZlvf0EyfEy9XBVB7tEsL/tfXO6ToXoEOE8CAzJCwuM/PXSCHusXT5/Q=="; + url = "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz"; + sha512 = "SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw=="; }; }; "@humanwhocodes/config-array-0.9.2" = { @@ -1012,13 +1003,13 @@ let sha512 = "ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA=="; }; }; - "@jridgewell/gen-mapping-0.3.1" = { + "@jridgewell/gen-mapping-0.3.2" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; - sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; }; }; "@jridgewell/resolve-uri-3.0.5" = { @@ -1030,13 +1021,13 @@ let sha512 = "VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="; }; }; - "@jridgewell/set-array-1.1.1" = { + "@jridgewell/set-array-1.1.2" = { name = "_at_jridgewell_slash_set-array"; packageName = "@jridgewell/set-array"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz"; - sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; + sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; }; }; "@jridgewell/sourcemap-codec-1.4.11" = { @@ -1318,6 +1309,15 @@ let sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; }; }; + "@vue/compiler-sfc-2.7.7" = { + name = "_at_vue_slash_compiler-sfc"; + packageName = "@vue/compiler-sfc"; + version = "2.7.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.7.tgz"; + sha512 = "Ah8dIuo6ZVPHTq9+s4rBU/YpJu3vGSNyeOTCrPrVPQnkUfnT5Ig+IKBhePuQWFXguYb2TuEWrEfiiX9DZ3aJlA=="; + }; + }; "@vue/component-compiler-utils-3.2.2" = { name = "_at_vue_slash_component-compiler-utils"; packageName = "@vue/component-compiler-utils"; @@ -1768,31 +1768,31 @@ let sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; }; - "babel-plugin-polyfill-corejs2-0.3.0" = { + "babel-plugin-polyfill-corejs2-0.3.1" = { name = "babel-plugin-polyfill-corejs2"; packageName = "babel-plugin-polyfill-corejs2"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz"; - sha512 = "wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz"; + sha512 = "v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="; }; }; - "babel-plugin-polyfill-corejs3-0.5.0" = { + "babel-plugin-polyfill-corejs3-0.5.2" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.5.0"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.0.tgz"; - sha512 = "Hcrgnmkf+4JTj73GbK3bBhlVPiLL47owUAnoJIf69Hakl3q+KfodbDXiZWGMM7iqCZTxCG3Z2VRfPNYES4rXqQ=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz"; + sha512 = "G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ=="; }; }; - "babel-plugin-polyfill-regenerator-0.3.0" = { + "babel-plugin-polyfill-regenerator-0.3.1" = { name = "babel-plugin-polyfill-regenerator"; packageName = "babel-plugin-polyfill-regenerator"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz"; - sha512 = "dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz"; + sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; }; }; "balanced-match-1.0.0" = { @@ -2062,7 +2062,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; }; "color-name-1.1.4" = { @@ -2164,13 +2164,13 @@ let sha512 = "gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA=="; }; }; - "connect-history-api-fallback-1.6.0" = { + "connect-history-api-fallback-2.0.0" = { name = "connect-history-api-fallback"; packageName = "connect-history-api-fallback"; - version = "1.6.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"; - sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; + url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz"; + sha512 = "U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="; }; }; "consolidate-0.15.1" = { @@ -2308,6 +2308,15 @@ let sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; }; + "csstype-3.1.0" = { + name = "csstype"; + packageName = "csstype"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz"; + sha512 = "uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA=="; + }; + }; "de-indent-1.0.2" = { name = "de-indent"; packageName = "de-indent"; @@ -2665,7 +2674,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; }; "escape-string-regexp-4.0.0" = { @@ -2677,13 +2686,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.17.0" = { + "eslint-8.20.0" = { name = "eslint"; packageName = "eslint"; - version = "8.17.0"; + version = "8.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.17.0.tgz"; - sha512 = "gq0m0BTJfci60Fz4nczYxNAlED+sMcihltndR8t9t1evnU/azx53x3t2UHXC/uRjcbvRw/XctpaNygSTcQD+Iw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz"; + sha512 = "d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA=="; }; }; "eslint-config-airbnb-base-15.0.0" = { @@ -2722,13 +2731,13 @@ let sha512 = "hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA=="; }; }; - "eslint-plugin-vue-9.1.1" = { + "eslint-plugin-vue-9.2.0" = { name = "eslint-plugin-vue"; packageName = "eslint-plugin-vue"; - version = "9.1.1"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.1.1.tgz"; - sha512 = "W9n5PB1X2jzC7CK6riG0oAcxjmKrjTF6+keL1rni8n57DZeilx/Fulz+IRJK3lYseLNAygN0I62L7DvioW40Tw=="; + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.2.0.tgz"; + sha512 = "W2hc+NUXoce8sZtWgZ45miQTy6jNyuSdub5aZ1IBune4JDeAyzucYX0TzkrQ1jMO52sNUDYlCIHDoaNePe0p5g=="; }; }; "eslint-scope-5.1.1" = { @@ -3217,6 +3226,15 @@ let sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; }; }; + "globals-13.16.0" = { + name = "globals"; + packageName = "globals"; + version = "13.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz"; + sha512 = "A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q=="; + }; + }; "globby-13.1.1" = { name = "globby"; packageName = "globby"; @@ -3286,7 +3304,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; }; "has-flag-4.0.0" = { @@ -3898,7 +3916,7 @@ let version = "0.5.0"; src = fetchurl { url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; }; }; "jsesc-2.5.2" = { @@ -4087,7 +4105,7 @@ let version = "4.0.8"; src = fetchurl { url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; }; }; "lodash.merge-4.6.2" = { @@ -4315,13 +4333,13 @@ let sha512 = "XkCYOU+rr2Ft3LI6w4ye51M3VK31qJXFIxu0XLw169PtKG0Zx47OrXeVW/GCYOfpC9s1yyyf1S+L8/4LY0J9Zw=="; }; }; - "nanoid-3.3.1" = { + "nanoid-3.3.4" = { name = "nanoid"; packageName = "nanoid"; - version = "3.3.1"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"; - sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"; + sha512 = "MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="; }; }; "natural-compare-1.4.0" = { @@ -4828,13 +4846,13 @@ let sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA=="; }; }; - "postcss-8.4.12" = { + "postcss-8.4.14" = { name = "postcss"; packageName = "postcss"; - version = "8.4.12"; + version = "8.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz"; - sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"; + sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; }; }; "postcss-modules-extract-imports-3.0.0" = { @@ -5080,13 +5098,13 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-5.0.1" = { + "regexpu-core-5.1.0" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz"; - sha512 = "CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz"; + sha512 = "bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA=="; }; }; "regjsgen-0.6.0" = { @@ -5251,22 +5269,22 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sass-1.52.3" = { + "sass-1.53.0" = { name = "sass"; packageName = "sass"; - version = "1.52.3"; + version = "1.53.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz"; - sha512 = "LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.53.0.tgz"; + sha512 = "zb/oMirbKhUgRQ0/GFz8TSAwRq2IlR29vOUJZOx0l8sV+CkHUfHa4u5nqrG+1VceZp7Jfj59SVW9ogdhTvJDcQ=="; }; }; - "sass-loader-13.0.0" = { + "sass-loader-13.0.2" = { name = "sass-loader"; packageName = "sass-loader"; - version = "13.0.0"; + version = "13.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.0.tgz"; - sha512 = "IHCFecI+rbPvXE2zO/mqdVFe8MU7ElGrwga9hh2H65Ru4iaBJAMRteum1c4Gsxi9Cq1FOtTEDd6+/AEYuQDM4Q=="; + url = "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz"; + sha512 = "BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q=="; }; }; "schema-utils-2.7.1" = { @@ -5926,13 +5944,13 @@ let sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; }; }; - "vue-2.6.14" = { + "vue-2.7.7" = { name = "vue"; packageName = "vue"; - version = "2.6.14"; + version = "2.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz"; - sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.7.tgz"; + sha512 = "osfkncsGCWqtch+YWYxbqTNQ9hl/UQ6TFRkdmK/VqAjuMpxzr5QotFsYpmJ1AB1ez2LJeIKXDmtMkXUotMOTsA=="; }; }; "vue-eslint-parser-8.3.0" = { @@ -5944,13 +5962,13 @@ let sha512 = "dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g=="; }; }; - "vue-eslint-parser-9.0.2" = { + "vue-eslint-parser-9.0.3" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "9.0.2"; + version = "9.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.0.2.tgz"; - sha512 = "uCPQwTGjOtAYrwnU+76pYxalhjsh7iFBsHwBqDHiOPTxtICDaraO4Szw54WFTNZTAEsgHHzqFOu1mmnBOBRzDA=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.0.3.tgz"; + sha512 = "yL+ZDb+9T0ELG4VIFo/2anAOz8SvBdlqEnQnvJ3M7Scq56DvtjY0VY88bByRZB0D4J0u8olBcfrXTVONXsh4og=="; }; }; "vue-hot-reload-api-2.3.4" = { @@ -5962,13 +5980,13 @@ let sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; }; }; - "vue-loader-15.9.8" = { + "vue-loader-15.10.0" = { name = "vue-loader"; packageName = "vue-loader"; - version = "15.9.8"; + version = "15.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz"; - sha512 = "GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog=="; + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz"; + sha512 = "VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg=="; }; }; "vue-meta-2.4.0" = { @@ -6025,13 +6043,13 @@ let sha512 = "sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg=="; }; }; - "vue-template-compiler-2.6.14" = { + "vue-template-compiler-2.7.7" = { name = "vue-template-compiler"; packageName = "vue-template-compiler"; - version = "2.6.14"; + version = "2.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz"; - sha512 = "ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g=="; + url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.7.tgz"; + sha512 = "vxOsjWhvDPyMW7QwXPecNmTNwKyXiF+j4KjBFjDxYPuY0xvqCT5o9WrapVItR/Nrh0XThfBaL19kXFSNYtbKmw=="; }; }; "vue-template-es2015-compiler-1.9.1" = { @@ -6106,13 +6124,13 @@ let sha512 = "81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg=="; }; }; - "webpack-dev-server-4.9.2" = { + "webpack-dev-server-4.9.3" = { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.9.2"; + version = "4.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz"; - sha512 = "H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.3.tgz"; + sha512 = "3qp/eoboZG5/6QgiZ3llN8TUzkSpYg1Ko9khWX1h40MIEUNS2mDoIa8aXsPfskER+GbTvs/IJZ1QTBBhhuetSw=="; }; }; "webpack-merge-5.8.0" = { @@ -6258,9 +6276,9 @@ let src = ./.; dependencies = [ sources."@ampproject/remapping-2.1.1" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.17.10" - (sources."@babel/core-7.18.5" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + (sources."@babel/core-7.18.9" // { dependencies = [ sources."debug-4.3.4" sources."json5-2.2.1" @@ -6268,72 +6286,72 @@ let sources."semver-6.3.0" ]; }) - (sources."@babel/eslint-parser-7.18.2" // { + (sources."@babel/eslint-parser-7.18.9" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.18.2" - sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.18.2" // { + sources."@babel/generator-7.18.9" + sources."@babel/helper-annotate-as-pure-7.18.6" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" + (sources."@babel/helper-compilation-targets-7.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.0" - sources."@babel/helper-create-regexp-features-plugin-7.17.12" - (sources."@babel/helper-define-polyfill-provider-0.3.0" // { + sources."@babel/helper-create-class-features-plugin-7.18.6" + sources."@babel/helper-create-regexp-features-plugin-7.18.6" + (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-explode-assignable-expression-7.16.7" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.17.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-remap-async-to-generator-7.16.8" - sources."@babel/helper-replace-supers-7.16.7" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.16.7" - sources."@babel/parser-7.18.5" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-async-generator-functions-7.17.12" - sources."@babel/plugin-proposal-class-properties-7.17.12" - sources."@babel/plugin-proposal-class-static-block-7.18.0" - sources."@babel/plugin-proposal-dynamic-import-7.16.7" - sources."@babel/plugin-proposal-export-namespace-from-7.17.12" - sources."@babel/plugin-proposal-json-strings-7.17.12" - sources."@babel/plugin-proposal-logical-assignment-operators-7.17.12" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" - sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.18.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" - sources."@babel/plugin-proposal-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-private-methods-7.17.12" - sources."@babel/plugin-proposal-private-property-in-object-7.17.12" - sources."@babel/plugin-proposal-unicode-property-regex-7.17.12" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-explode-assignable-expression-7.18.6" + sources."@babel/helper-function-name-7.18.9" + 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.18.9" + sources."@babel/helper-optimise-call-expression-7.18.6" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-remap-async-to-generator-7.18.6" + sources."@babel/helper-replace-supers-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helper-wrap-function-7.18.6" + sources."@babel/helpers-7.18.9" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.9" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-async-generator-functions-7.18.6" + sources."@babel/plugin-proposal-class-properties-7.18.6" + sources."@babel/plugin-proposal-class-static-block-7.18.6" + sources."@babel/plugin-proposal-dynamic-import-7.18.6" + sources."@babel/plugin-proposal-export-namespace-from-7.18.9" + sources."@babel/plugin-proposal-json-strings-7.18.6" + sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" + sources."@babel/plugin-proposal-numeric-separator-7.18.6" + sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-private-methods-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.17.12" + sources."@babel/plugin-syntax-import-assertions-7.18.6" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -6343,53 +6361,53 @@ let sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.17.12" - sources."@babel/plugin-transform-async-to-generator-7.17.12" - sources."@babel/plugin-transform-block-scoped-functions-7.16.7" - sources."@babel/plugin-transform-block-scoping-7.17.12" - sources."@babel/plugin-transform-classes-7.17.12" - sources."@babel/plugin-transform-computed-properties-7.17.12" - sources."@babel/plugin-transform-destructuring-7.18.0" - sources."@babel/plugin-transform-dotall-regex-7.16.7" - sources."@babel/plugin-transform-duplicate-keys-7.17.12" - sources."@babel/plugin-transform-exponentiation-operator-7.16.7" - sources."@babel/plugin-transform-for-of-7.18.1" - sources."@babel/plugin-transform-function-name-7.16.7" - sources."@babel/plugin-transform-literals-7.17.12" - sources."@babel/plugin-transform-member-expression-literals-7.16.7" - sources."@babel/plugin-transform-modules-amd-7.18.0" - sources."@babel/plugin-transform-modules-commonjs-7.18.2" - sources."@babel/plugin-transform-modules-systemjs-7.18.0" - sources."@babel/plugin-transform-modules-umd-7.18.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.12" - sources."@babel/plugin-transform-new-target-7.17.12" - sources."@babel/plugin-transform-object-super-7.16.7" - sources."@babel/plugin-transform-parameters-7.17.12" - sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-regenerator-7.18.0" - sources."@babel/plugin-transform-reserved-words-7.17.12" - sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/plugin-transform-spread-7.17.12" - sources."@babel/plugin-transform-sticky-regex-7.16.7" - sources."@babel/plugin-transform-template-literals-7.18.2" - sources."@babel/plugin-transform-typeof-symbol-7.17.12" - sources."@babel/plugin-transform-unicode-escapes-7.16.7" - sources."@babel/plugin-transform-unicode-regex-7.16.7" - (sources."@babel/preset-env-7.18.2" // { + sources."@babel/plugin-transform-arrow-functions-7.18.6" + sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-block-scoped-functions-7.18.6" + sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-classes-7.18.9" + sources."@babel/plugin-transform-computed-properties-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-dotall-regex-7.18.6" + sources."@babel/plugin-transform-duplicate-keys-7.18.9" + sources."@babel/plugin-transform-exponentiation-operator-7.18.6" + sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-function-name-7.18.9" + sources."@babel/plugin-transform-literals-7.18.9" + sources."@babel/plugin-transform-member-expression-literals-7.18.6" + sources."@babel/plugin-transform-modules-amd-7.18.6" + sources."@babel/plugin-transform-modules-commonjs-7.18.6" + sources."@babel/plugin-transform-modules-systemjs-7.18.9" + sources."@babel/plugin-transform-modules-umd-7.18.6" + sources."@babel/plugin-transform-named-capturing-groups-regex-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.18.8" + sources."@babel/plugin-transform-property-literals-7.18.6" + sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-reserved-words-7.18.6" + sources."@babel/plugin-transform-shorthand-properties-7.18.6" + sources."@babel/plugin-transform-spread-7.18.9" + sources."@babel/plugin-transform-sticky-regex-7.18.6" + sources."@babel/plugin-transform-template-literals-7.18.9" + sources."@babel/plugin-transform-typeof-symbol-7.18.9" + sources."@babel/plugin-transform-unicode-escapes-7.18.6" + sources."@babel/plugin-transform-unicode-regex-7.18.6" + (sources."@babel/preset-env-7.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.14.6" - sources."@babel/template-7.16.7" - (sources."@babel/traverse-7.18.5" // { + sources."@babel/template-7.18.6" + (sources."@babel/traverse-7.18.9" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.18.4" + sources."@babel/types-7.18.9" sources."@discoveryjs/json-ext-0.5.5" (sources."@eslint/eslintrc-1.3.0" // { dependencies = [ @@ -6398,19 +6416,11 @@ let sources."ms-2.1.2" ]; }) - sources."@fortawesome/fontawesome-common-types-0.3.0" - sources."@fortawesome/fontawesome-svg-core-1.3.0" - (sources."@fortawesome/free-brands-svg-icons-6.1.1" // { - dependencies = [ - sources."@fortawesome/fontawesome-common-types-6.1.1" - ]; - }) - (sources."@fortawesome/free-solid-svg-icons-6.1.1" // { - dependencies = [ - sources."@fortawesome/fontawesome-common-types-6.1.1" - ]; - }) - sources."@fortawesome/vue-fontawesome-2.0.7" + sources."@fortawesome/fontawesome-common-types-6.1.1" + sources."@fortawesome/fontawesome-svg-core-6.1.1" + sources."@fortawesome/free-brands-svg-icons-6.1.1" + sources."@fortawesome/free-solid-svg-icons-6.1.1" + sources."@fortawesome/vue-fontawesome-2.0.8" (sources."@humanwhocodes/config-array-0.9.2" // { dependencies = [ sources."debug-4.3.3" @@ -6418,9 +6428,9 @@ let ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" sources."@jridgewell/resolve-uri-3.0.5" - sources."@jridgewell/set-array-1.1.1" + sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/sourcemap-codec-1.4.11" sources."@jridgewell/trace-mapping-0.3.13" sources."@leichtgewicht/ip-codec-2.0.3" @@ -6452,11 +6462,11 @@ let sources."@types/serve-static-1.13.10" sources."@types/sockjs-0.3.33" sources."@types/ws-8.5.3" + sources."@vue/compiler-sfc-2.7.7" (sources."@vue/component-compiler-utils-3.2.2" // { dependencies = [ sources."picocolors-0.2.1" sources."postcss-7.0.39" - sources."source-map-0.6.1" ]; }) sources."@webassemblyjs/ast-1.11.1" @@ -6524,13 +6534,13 @@ let ]; }) sources."babel-plugin-dynamic-import-node-2.3.3" - (sources."babel-plugin-polyfill-corejs2-0.3.0" // { + (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.0" - sources."babel-plugin-polyfill-regenerator-0.3.0" + sources."babel-plugin-polyfill-corejs3-0.5.2" + sources."babel-plugin-polyfill-regenerator-0.3.1" sources."balanced-match-1.0.0" sources."batch-0.6.1" sources."before-build-webpack-0.2.12" @@ -6561,11 +6571,7 @@ let sources."chalk-2.4.2" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" - (sources."clean-css-5.2.2" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."clean-css-5.2.2" sources."clean-webpack-plugin-4.0.0" sources."clone-deep-4.0.1" sources."color-convert-1.9.3" @@ -6578,7 +6584,7 @@ let sources."compression-1.7.4" sources."concat-map-0.0.1" sources."confusing-browser-globals-1.0.10" - sources."connect-history-api-fallback-1.6.0" + sources."connect-history-api-fallback-2.0.0" sources."consolidate-0.15.1" (sources."content-disposition-0.5.4" // { dependencies = [ @@ -6611,6 +6617,7 @@ let sources."css-select-4.1.3" sources."css-what-5.1.0" sources."cssesc-3.0.0" + sources."csstype-3.1.0" sources."de-indent-1.0.2" sources."debug-2.6.9" sources."deep-is-0.1.4" @@ -6666,7 +6673,7 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.17.0" // { + (sources."eslint-8.20.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6677,7 +6684,7 @@ let sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" sources."glob-parent-6.0.2" - sources."globals-13.15.0" + sources."globals-13.16.0" sources."has-flag-4.0.0" sources."ms-2.1.2" sources."supports-color-7.2.0" @@ -6705,13 +6712,13 @@ let sources."doctrine-2.1.0" ]; }) - (sources."eslint-plugin-vue-9.1.1" // { + (sources."eslint-plugin-vue-9.2.0" // { dependencies = [ sources."debug-4.3.4" sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" sources."ms-2.1.2" - sources."vue-eslint-parser-9.0.2" + sources."vue-eslint-parser-9.0.3" ]; }) sources."eslint-scope-5.1.1" @@ -6960,11 +6967,7 @@ let sources."media-typer-0.3.0" sources."memfs-3.4.1" sources."merge-descriptors-1.0.1" - (sources."merge-source-map-1.1.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."merge-source-map-1.1.0" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" @@ -6981,7 +6984,7 @@ let sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."ms-2.0.0" - sources."nanoid-3.3.1" + sources."nanoid-3.3.4" sources."natural-compare-1.4.0" sources."negotiator-0.6.3" sources."neo-async-2.6.2" @@ -7043,7 +7046,7 @@ let sources."pinkie-promise-2.0.1" sources."plurals-cldr-2.0.1" sources."popper.js-1.16.1" - sources."postcss-8.4.12" + sources."postcss-8.4.14" sources."postcss-modules-extract-imports-3.0.0" sources."postcss-modules-local-by-default-4.0.0" sources."postcss-modules-scope-3.0.0" @@ -7078,7 +7081,7 @@ let sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.15.0" sources."regexpp-3.2.0" - sources."regexpu-core-5.0.1" + sources."regexpu-core-5.1.0" sources."regjsgen-0.6.0" (sources."regjsparser-0.8.4" // { dependencies = [ @@ -7098,8 +7101,8 @@ let sources."run-parallel-1.2.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."sass-1.52.3" - sources."sass-loader-13.0.0" + sources."sass-1.53.0" + sources."sass-loader-13.0.2" sources."schema-utils-3.1.1" sources."select-hose-2.0.0" sources."selfsigned-2.0.1" @@ -7137,6 +7140,7 @@ let sources."sirv-1.0.17" sources."slash-4.0.0" sources."sockjs-0.3.24" + sources."source-map-0.6.1" sources."source-map-js-1.0.2" (sources."spdy-4.0.2" // { dependencies = [ @@ -7170,11 +7174,7 @@ let }) ]; }) - (sources."terser-webpack-plugin-5.3.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."terser-webpack-plugin-5.3.0" sources."text-table-0.2.0" sources."thunky-1.1.0" sources."to-fast-properties-2.0.0" @@ -7216,7 +7216,7 @@ let sources."v-tooltip-2.1.3" sources."v8-compile-cache-2.3.0" sources."vary-1.1.2" - sources."vue-2.6.14" + sources."vue-2.7.7" (sources."vue-eslint-parser-8.3.0" // { dependencies = [ sources."debug-4.3.3" @@ -7226,14 +7226,14 @@ let ]; }) sources."vue-hot-reload-api-2.3.4" - sources."vue-loader-15.9.8" + sources."vue-loader-15.10.0" sources."vue-meta-2.4.0" sources."vue-multiselect-2.1.6" sources."vue-resize-1.0.1" sources."vue-router-3.5.4" sources."vue-snotify-3.2.1" sources."vue-style-loader-4.1.3" - sources."vue-template-compiler-2.6.14" + sources."vue-template-compiler-2.7.7" sources."vue-template-es2015-compiler-1.9.1" sources."vuex-3.6.2" sources."watchpack-2.3.1" @@ -7264,7 +7264,7 @@ let sources."schema-utils-4.0.0" ]; }) - (sources."webpack-dev-server-4.9.2" // { + (sources."webpack-dev-server-4.9.3" // { dependencies = [ sources."ajv-8.11.0" sources."ajv-keywords-5.1.0" diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh index 90f8baf8e1..e683814886 100755 --- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh +++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/update.sh @@ -1,8 +1,8 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix gnused jq curl +#! nix-shell -I nixpkgs=../../../../.. -i bash -p nodePackages.node2nix gnused jq curl set -eoux pipefail -pushd ../../../.. +pushd ../../../../.. version=$(nix-instantiate --strict --eval -A ArchiSteamFarm.version | jq -r) popd pushd "$(dirname "$0")" diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix index f7c01ce464..e90ac480eb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix @@ -16,13 +16,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; # headers are just two and very small - preConfigure = - if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}"`pwd`/build/src - '' else '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}"`pwd`/build/src - ''; - nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix index ca243f4437..2b6cd7049a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/authy/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { pname = "authy"; # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/authy?channel=stable' | jq '.download_url,.version' - version = "2.2.0"; - rev = "10"; + version = "2.2.1"; + rev = "11"; src = fetchurl { url = "https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_${rev}.snap"; - sha256 = "sha256-sB9/fVV/qp+DfjxpvzIUHsLkeEu35i2rEv1/JYMytG8="; + sha256 = "sha256-/a0pMXVd7mEp7oaN2mBIJv5uOv1zQ3gvfgiz1XL9ZmM="; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper squashfsTools ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/avalonia-ilspy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/avalonia-ilspy/default.nix new file mode 100644 index 0000000000..7defa48a8f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/avalonia-ilspy/default.nix @@ -0,0 +1,99 @@ +{ lib +, stdenv +, fetchzip +, unzip +, autoPatchelfHook +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, lttng-ust +, libkrb5 +, zlib +, fontconfig +, openssl_1_1 +, libX11 +, libICE +, libSM +, icu +}: + +stdenv.mkDerivation rec { + pname = "avalonia-ilspy"; + version = "7.2-rc"; + + src = fetchzip { + url = "https://github.com/icsharpcode/AvaloniaILSpy/releases/download/v${version}/Linux.x64.Release.zip"; + sha256 = "1crf0ng4l6x70wjlz3r6qw8l166gd52ys11j7ilb4nyy3mkjxk11"; + }; + + nativeBuildInputs = [ + unzip + autoPatchelfHook + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + stdenv.cc.cc.lib + lttng-ust + libkrb5 + zlib + fontconfig + ]; + + libraryPath = lib.makeLibraryPath [ + openssl_1_1 + libX11 + libICE + libSM + icu + ]; + + unpackPhase = '' + unzip -qq $src/ILSpy-linux-x64-Release.zip + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/lib $out/share/icons/hicolor/scalable/apps + cp -r artifacts/linux-x64/* $out/lib + ln -s $out/lib/Images/ILSpy.png $out/share/icons/hicolor/scalable/apps/ILSpy.png + + chmod +x $out/lib/ILSpy + wrapProgram $out/lib/ILSpy --prefix LD_LIBRARY_PATH : ${libraryPath} + mv $out/lib/ILSpy $out/bin + + runHook postInstall + ''; + + # dotnet runtime requirements + preFixup = '' + patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so + ''; + dontStrip = true; + + desktopItem = makeDesktopItem { + name = "ILSpy"; + desktopName = "ILSpy"; + exec = "ILSpy"; + icon = "ILSpy"; + comment = ".NET assembly browser and decompiler"; + categories = [ + "Development" + ]; + keywords = [ + ".net" + "il" + "assembly" + ]; + }; + + meta = with lib; { + description = ".NET assembly browser and decompiler"; + homepage = "https://github.com/icsharpcode/AvaloniaILSpy"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ AngryAnt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix index f7e0597e07..bacb622e2c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-gZMGbw7Ij1IVQSWOqG/91YrbWTG3I3l6Yp11QbVCfyY="; + sha256 = "sha256-lXxHvcUlIl5yb4QBJ/poLdTbwBMBlDYmTz4tSdNtCyY="; }; buildInputs = [ libnotify glib ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix index e92bd4b82a..f0e0b877d9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.6.7"; + version = "0.6.10"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "sha256-cUkSXEB92I0UYTobQzUb2so1MUXJkryAqrmASx9RMF0="; + sha256 = "sha256-pv/GxTGmpGc8RHjKO8F03jybS0uO+SS3z4KCZfHYV0Q="; }; nativeBuildInputs = [ pkg-config pcre ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix b/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix index ccb748fe3a..6a99979063 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/binocle/default.nix @@ -3,6 +3,13 @@ , rustPlatform , fetchFromGitHub , makeWrapper +, AppKit +, CoreFoundation +, CoreGraphics +, CoreVideo +, Foundation +, Metal +, QuartzCore , xorg , vulkan-loader }: @@ -24,7 +31,11 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; - postInstall = '' + buildInputs = lib.optionals stdenv.isDarwin [ + AppKit CoreFoundation CoreGraphics CoreVideo Foundation Metal QuartzCore + ]; + + postInstall = lib.optionalString (!stdenv.isDarwin) '' wrapProgram $out/bin/binocle \ --suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with xorg; [ libX11 libXcursor libXi libXrandr ] ++ [ vulkan-loader ])} ''; @@ -34,6 +45,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/sharkdp/binocle"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ SuperSandro2000 ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix index 9b24e55cfb..343fbb7bc9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix @@ -3,8 +3,9 @@ , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy, webkitgtk , python3Packages, gettext , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3, gtksourceview4, gnome -, steam, xdg-utils, pciutils, cabextract, wineWowPackages +, steam, xdg-utils, pciutils, cabextract , freetype, p7zip, gamemode, mangohud +, wine , bottlesExtraLibraries ? pkgs: [ ] # extra packages to add to steam.run multiPkgs , bottlesExtraPkgs ? pkgs: [ ] # extra packages to add to steam.run targetPkgs }: @@ -80,7 +81,7 @@ python3Packages.buildPythonApplication rec { xdg-utils pciutils cabextract - wineWowPackages.minimal + wine freetype p7zip gamemode # programs.gamemode.enable diff --git a/third_party/nixpkgs/pkgs/applications/misc/break-time/default.nix b/third_party/nixpkgs/pkgs/applications/misc/break-time/default.nix index 8d9a872a10..23856ee541 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/break-time/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/break-time/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "break-time"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "cdepillabout"; repo = "break-time"; rev = "v${version}"; - sha256 = "18p9gfp0inbnjsc7af38fghyklr7qnl2kkr25isfy9d5m8cpxqc6"; + sha256 = "sha256-q79JXaBwd/oKtJPvK2+72pY2YvaR3of2CMC8cF6wwQ8="; }; - cargoSha256 = "01y1p40vz30h2jkh37zipqvmfybgpq6wdcdglkab85jivmd1lslx"; + cargoSha256 = "sha256-DpX5tcIWt/pPGujufivmAGonVIiHERfa8Yb1JZpu3WA="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix index cd332b3910..6ae97e680e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/buku/default.nix @@ -37,14 +37,14 @@ let ]; in with python3'.pkgs; buildPythonApplication rec { - version = "4.6"; + version = "4.7"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "sha256-hr9qiP7SbloigDcs+6KVWu0SOlggMaBr7CCfY8zoJG0="; + sha256 = "sha256-7piJK1hz9h6EWiU/q5MAS1PSvHFxnW7rZBKxq+wda1c="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix index bda779dd54..dea179f3c3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.2.3"; + version = "4.3.1"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "sha256-F0p309rY0PeeOU1K9Had6qI6DCHgzauuuTjMfWoZYBQ="; + sha256 = "sha256-Umbe3XoCQV+q37ROeIWQUZtTe1Nu59Z5Hxt2nc7/l64="; }; subPackages = [ "cmd/cheat" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix index b976ea8907..899939b6cf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/corectrl/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec{ pname = "corectrl"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitLab { owner = "corectrl"; repo = "corectrl"; rev = "v${version}"; - sha256 = "sha256-vMSIo4tfvEO6SVxB5aNBnHEn+PXN6wUfRAgUCwZEHKQ="; + sha256 = "sha256-3WOuPOJEY941JVoF5aQp5LvPeh3shalb6H9FMmmctN4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 3298625601..64787f34a1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-VAakbuAkH7kuAx16m2vo4exikI03inXBW3OEIs5WwSY="; + sha256 = "sha256-edmg3LU3nQ1fWSb2jDE2kaOZ98pchm3exO/PuethTMU="; }; vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index c36d98a1b6..1eaa6177a9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -23,16 +23,16 @@ inherit maven; # use overridden maven version (see dbeaver's entry in all-packages.nix) }) rec { pname = "dbeaver"; - version = "22.1.1"; # When updating also update mvnSha256 + version = "22.1.3"; # When updating also update mvnSha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "sha256-+MFULieuwfvuAP0HjJ+C0hb/uqhHtnP/nOoIfWwjtoI="; + sha256 = "sha256-QrocrH/orgXvg0vNelm1hK4dHeDsxe3ZaVb3Q2FgYSo="; }; - mvnSha256 = "pSZL+GDSXSm+sLymlSlq2ZIRdYJY1B3PCmCpjtosdGY="; + mvnSha256 = "U+RqrXtwFrku4b5d47WrFLmrlfqBs8YVif/qGf5CXqQ="; mvnParameters = "-P desktop,all-platforms"; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix new file mode 100644 index 0000000000..506f260966 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix @@ -0,0 +1,79 @@ +{ buildPythonPackage +, fetchFromGitHub +, databricks-cli +, scipy +, path +, pathspec +, pydantic +, protobuf +, tqdm +, mlflow +, azure-identity +, ruamel-yaml +, emoji +, cookiecutter +, retry +, azure-mgmt-datafactory +, azure-mgmt-subscription +, pytestCheckHook +, pytest-asyncio +, pytest-timeout +, pytest-mock +, lib +, git +}: + +buildPythonPackage rec { + pname = "dbx"; + version = "0.6.8"; + + src = fetchFromGitHub { + owner = "databrickslabs"; + repo = "dbx"; + rev = "v${version}"; + sha256 = "sha256-Ou+VdHFVQzmsxJiyaeDd/+FqHvJZeNGB+OXyoagJwtk="; + }; + + propagatedBuildInputs = [ + databricks-cli + scipy + path + pathspec + pydantic + protobuf + tqdm + mlflow + azure-identity + ruamel-yaml + emoji + cookiecutter + retry + azure-mgmt-datafactory + azure-mgmt-subscription + ]; + + checkInputs = [ + pytestCheckHook + pytest-asyncio + pytest-timeout + pytest-mock + git + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + disabledTests = [ + # fails because of dbfs CLI wrong call + "test_dbfs_unknown_user" + "test_dbfs_no_root" + ]; + + meta = with lib; { + homepage = "https://github.com/databrickslabs/dbx"; + description = "CLI tool for advanced Databricks jobs management"; + license = licenses.databricks-dbx; + maintainers = with maintainers; [ GuillaumeDesforges ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/deckmaster/default.nix b/third_party/nixpkgs/pkgs/applications/misc/deckmaster/default.nix new file mode 100644 index 0000000000..34da4fe939 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/deckmaster/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, makeWrapper +, roboto +}: + +buildGoModule rec { + pname = "deckmaster"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "muesli"; + repo = "deckmaster"; + rev = "v${version}"; + sha256 = "sha256-q2rUHfAvTGXBAGrZUtHMuZr6fYWmpha+al2FG8sCC0Y="; + }; + + vendorSha256 = "sha256-kj4lRHuQ9e0TOC4p4Ak3AB3Lx0JN1jqXaVKlee9EtCg="; + + proxyVendor = true; + + nativeBuildInputs = [ + makeWrapper + ]; + + ldflags = [ + "-s" + "-w" + ]; + + # Let the app find Roboto-*.ttf files (hard-coded file names). + postFixup = '' + wrapProgram $out/bin/deckmaster \ + --prefix XDG_DATA_DIRS : "${roboto.out}/share/" \ + ''; + + meta = with lib; { + description = "An application to control your Elgato Stream Deck on Linux"; + homepage = "https://github.com/muesli/deckmaster"; + license = licenses.mit; + maintainers = with maintainers; [ ianmjones ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix index a4f9d94d9e..6e504ab717 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "dialect"; - version = "2.0.1"; + version = "2.0.2"; format = "other"; @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-Ke23QnvKpmyuaqkiBQL1cUa0T7lSfYPLFi6wa9G8LYk="; + hash = "sha256-55vqxS0ySV8lItxLl1J+wLvPtmR87HzGfAiOKuhigFA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/dwdiff/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dwdiff/default.nix new file mode 100644 index 0000000000..320f8e25bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/dwdiff/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchurl +, gettext +, pkg-config +, icu +}: + +stdenv.mkDerivation rec { + pname = "dwdiff"; + version = "2.1.4"; + + src = fetchurl { + url = "https://os.ghalkes.nl/dist/dwdiff-${version}.tar.bz2"; + sha256 = "sha256-3xb+xE3LRn1lpCRqQ2KPk3QZlsF3PpMLkMbd4i3Vjgo="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + gettext + icu + ]; + + meta = with lib; { + description = "Front-end for the diff program that operates at the word level instead of the line level"; + homepage = "https://os.ghalkes.nl/dwdiff.html"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ onny ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix index 4dfb5b6422..d71c01d4ac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/edgetx/default.nix @@ -29,6 +29,8 @@ mkDerivation rec { "-DGTEST_ROOT=${gtest.src}/googletest" "-DQT_TRANSLATIONS_DIR=${qttranslations}/translations" "-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 025d89e413..4a506aed9e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -21,7 +21,7 @@ }: let - version = "4.2.2"; + version = "4.3.0"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -30,6 +30,7 @@ let libzbar_name = if stdenv.isLinux then "libzbar.so.0" + else if stdenv.isDarwin then "libzbar.0.dylib" else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; # Not provided in official source releases, which are what upstream signs. @@ -37,7 +38,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-bFceOu+3SLtD2eY+aSBEn13xJw7a3aVwX39QfAuqVSo="; + sha256 = "sha256-/bYz2KB9Fggo6cnKM3hvwL/Jy4Xsw2phx1sInuqZpFg="; postFetch = '' mv $out ./all @@ -53,7 +54,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-ucLLfqmTKO5Qpg+PnmcdQwht7cWMWJoFjQWnDecEtVs="; + sha256 = "sha256-E941wseIQEn1+d06NWKQLQM0C+A8a0+Xxl+LzBTwEcw="; }; postUnpack = '' @@ -90,7 +91,6 @@ python3.pkgs.buildPythonApplication { ]; preBuild = '' - sed -i 's,usr_share = .*,usr_share = "'$out'/share",g' setup.py substituteInPlace ./electrum/ecc_fast.py \ --replace ${libsecp256k1_name} ${secp256k1}/lib/libsecp256k1${stdenv.hostPlatform.extensions.sharedLibrary} '' + (if enableQt then '' @@ -101,17 +101,11 @@ python3.pkgs.buildPythonApplication { ''); postInstall = lib.optionalString stdenv.isLinux '' - # Despite setting usr_share above, these files are installed under - # $out/nix ... - mv $out/${python3.sitePackages}/nix/store"/"*/share $out - rm -rf $out/${python3.sitePackages}/nix - substituteInPlace $out/share/applications/electrum.desktop \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum %u"' \ "Exec=$out/bin/electrum %u" \ --replace 'Exec=sh -c "PATH=\"\\$HOME/.local/bin:\\$PATH\"; electrum --testnet %u"' \ "Exec=$out/bin/electrum --testnet %u" - ''; postFixup = lib.optionalString enableQt '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix index 5f65fd4a36..c9332be230 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/ltc.nix @@ -20,7 +20,7 @@ }: let - version = "4.0.9.3"; + version = "4.2.2.1"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -36,7 +36,7 @@ let owner = "pooler"; repo = "electrum-ltc"; rev = version; - sha256 = "sha256-oZjQnrnj8nCaQjrIz8bWNt6Ib8Wu2ZMXHEPfCCy2fjk="; + sha256 = "sha256-qu72LIV07pgHqvKv+Kcw9ZmNk6IBz+4/vdJELlT5tE4="; postFetch = '' mv $out ./all @@ -44,19 +44,6 @@ let ''; }; - py = python3.override { - packageOverrides = self: super: { - - aiorpcx = super.aiorpcx.overridePythonAttrs (oldAttrs: rec { - version = "0.18.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1rswrspv27x33xa5bnhrkjqzhv0sknv5kd7pl1vidw9d2z4rx2l0"; - }; - }); - }; - }; - in python3.pkgs.buildPythonApplication { @@ -65,7 +52,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz"; - sha256 = "sha256-+oox0BGqkvj0OGOKJF8tUoKdsZFeffNb6rTF8E8mo08="; + sha256 = "sha256-7F28cve+HD5JDK5igfkGD/NvTCfA33g+DmQJ5mwPM9Q="; }; postUnpack = '' @@ -73,19 +60,9 @@ python3.pkgs.buildPythonApplication { cp -ar ${tests} $sourceRoot/electrum_ltc/tests ''; - prePatch = '' - substituteInPlace contrib/requirements/requirements.txt \ - --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" - - # according to upstream, this is fine - # https://github.com/spesmilo/electrum/issues/7361 - substituteInPlace contrib/requirements/requirements.txt \ - --replace "qdarkstyle<2.9" "qdarkstyle>=2.7" - ''; - nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiohttp aiohttp-socks aiorpcx diff --git a/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix b/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix index 5f5db97b33..d9016bc341 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix @@ -9,21 +9,26 @@ rustPlatform.buildRustPackage rec { pname = "eureka-ideas"; - version = "1.8.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "simeg"; repo = "eureka"; rev = "v${version}"; - sha256 = "1qjf8nr7m9igy6h228gm9gnav6pi2rfarbd9bc5fchx4rqy59sp7"; + sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc="; }; - cargoSha256 = "sha256-QujrFgliH8Mx1ES9KVl+O9UJP+7GDanQ7+z4QJuSOd0="; + cargoSha256 = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + checkFlags = lib.optionals stdenv.isLinux [ + # failing on linux for unknown reasons + "--skip=config_manager::tests" + ]; + meta = with lib; { description = "CLI tool to input and store your ideas without leaving the terminal"; homepage = "https://github.com/simeg/eureka"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix b/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix index ef82703ac4..2113d53595 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/faircamp/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage { pname = "faircamp"; - version = "unstable-2022-03-20"; + version = "unstable-2022-07-22"; # TODO when switching to a stable release, use fetchFromGitea and add a # version test. Meanwhile, fetchgit is used to make unstableGitUpdater work. src = fetchgit { url = "https://codeberg.org/simonrepp/faircamp.git"; - rev = "863cecb468a58a774bd2d1d93f99f3c8ecd8205c"; - sha256 = "sha256-JodIo601BYesbiHarnBk4/GuFR/bpCswxQbaysRP+CI="; + rev = "4803b6e0b59c1fc9922d1e498743a0171d7f324d"; + sha256 = "sha256-VliBGYZPoX65JURlBaVMCMB5DuE/gqr27KcEzAVRFxc="; }; - cargoHash = "sha256-XqsUUc+s01t4KHtktbNhm52r0NeLbcBg5DVw3Xn0oZk="; + cargoHash = "sha256-fs7CXw6CS+TtMxLtDaQiYY6fiBFl4RCttymQJDAm6dg="; nativeBuildInputs = [ makeWrapper diff --git a/third_party/nixpkgs/pkgs/applications/misc/fbreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fbreader/default.nix deleted file mode 100644 index c684d273bc..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/fbreader/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, pkg-config -, bzip2 -, curl -, expat -, fribidi -, libunibreak -, sqlite -, zlib -, uiTarget ? if !stdenv.isDarwin then "desktop" else "macosx" -, uiType ? if !stdenv.isDarwin then "qt4" else "cocoa" -, qt4 -, gtk2 -, AppKit -, Cocoa -}: - -with lib; - -assert elem uiTarget [ "desktop" "macosx" ]; -assert elem uiType [ "qt4" "gtk" "cocoa" ]; -assert uiTarget == "macosx" -> uiType == "cocoa"; - -# Note: "qt" uiType option mentioned in ${src}/README.build is qt3, -# which is way to old and no longer in nixpkgs. - -stdenv.mkDerivation { - pname = "fbreader-${uiType}"; - version = "0.99.6"; - - src = fetchFromGitHub { - owner = "geometer"; - repo = "FBReader"; - rev = "9e608db14372ae580beae4976eec7241fa069e75"; - sha256 = "0lzafk02mv0cf2l2a61q5y4743zi913byik4bw1ix0gr1drnsa7y"; - }; - - patches = [ - ./typecheck.patch - (fetchpatch { - name = "curl-7_62.diff"; # see https://github.com/geometer/FBReader/pull/311 - url = "https://github.com/geometer/FBReader/commit/b7c78e965d06f780.diff"; - sha256 = "1dgnx9wps7hcf8fkidc7037vcf92fr3ccnjx7bgxm9x02j0hngjg"; - }) - ]; - - postPatch = '' - cat << EOF > makefiles/target.mk - TARGET_ARCH = ${uiTarget} - TARGET_STATUS = release - UI_TYPE = ${uiType} - EOF - - substituteInPlace makefiles/arch/desktop.mk \ - --replace ccache "" \ - --replace moc-qt4 moc - - # libunibreak supersedes liblinebreak - substituteInPlace zlibrary/text/Makefile \ - --replace -llinebreak -lunibreak - ''; - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ - bzip2 - curl - expat - fribidi - libunibreak - sqlite - zlib - ] - ++ optional (uiType == "qt4") qt4 - ++ optional (uiType == "gtk") gtk2 - ++ optionals (uiType == "cocoa") [ AppKit Cocoa ]; - - makeFlags = [ "INSTALLDIR=$(out)" ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=narrowing"; - - meta = with lib; { - description = "An e-book reader for Linux"; - homepage = "http://www.fbreader.org/"; - license = licenses.gpl3; - broken = stdenv.isDarwin # untested, might work - || uiType == "gtk"; # builds, but the result is unusable, hangs a lot - platforms = platforms.unix; - maintainers = [ maintainers.coroa ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/fbreader/typecheck.patch b/third_party/nixpkgs/pkgs/applications/misc/fbreader/typecheck.patch deleted file mode 100644 index cbac290e69..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/fbreader/typecheck.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/fbreader/src/database/booksdb/BooksDB.cpp b/fbreader/src/database/booksdb/BooksDB.cpp -index e33a22e76..1b6092800 100644 ---- a/fbreader/src/database/booksdb/BooksDB.cpp -+++ b/fbreader/src/database/booksdb/BooksDB.cpp -@@ -146,5 +146,5 @@ shared_ptr BooksDB::loadBook(const std::string &fileName) { - myFindFileId->setFileName(fileName); - if (!myFindFileId->run()) { -- return false; -+ return 0; - } - ((DBIntValue&)*myLoadBook->parameter("@file_id").value()) = myFindFileId->fileId(); diff --git a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix index 5d70923574..37e0cef452 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fluidd/default.nix @@ -2,12 +2,12 @@ stdenvNoCC.mkDerivation rec { pname = "fluidd"; - version = "1.17.2"; + version = "1.19.0"; src = fetchurl { name = "fluidd-v${version}.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; - sha256 = "sha256-kb7t3H2gpiN6/N/LxyG/Vu5Cp/zytAePsXmacxVyWCk="; + sha256 = "sha256-KFWjpJ7nYAvEwaI1yeBV+Zvj+uaS2Myw1Szkb/2VZe4="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix index e793618f9d..08af45be5d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/free42/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "free42"; - version = "3.0.9"; + version = "3.0.13"; src = fetchFromGitHub { owner = "thomasokken"; repo = pname; rev = "v${version}"; - hash = "sha256-ZSwqgHsfe9apyYZ1fkvDMnQxdNb9E8U1l9jvC9t693w="; + hash = "sha256-0CFDkGUV9dihshYbjc0JL0axBcW499mt13xxdfO31vg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix new file mode 100644 index 0000000000..0d8a658f3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/default.nix @@ -0,0 +1,89 @@ +{ stdenv +, lib +, fetchFromGitHub +, python3Packages +, wrapGAppsHook4 +, gtk4 +, meson +, ninja +, pkg-config +, appstream-glib +, desktop-file-utils +, glib +, gobject-introspection +, libnotify +, libadwaita +, libportal +, gettext +, librsvg +, tesseract5 +, zbar +}: + +python3Packages.buildPythonApplication rec { + pname = "gnome-frog"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "TenderOwl"; + repo = "Frog"; + rev = version; + sha256 = "sha256-yOjfiGJUU25zb/4WprPU59yDAMpttS3jREp1kB5mXUE="; + }; + + format = "other"; + + patches = [ ./update-compatible-with-non-flatpak-env.patch ]; + postPatch = '' + chmod +x ./build-aux/meson/postinstall.py + patchShebangs ./build-aux/meson/postinstall.py + substituteInPlace ./build-aux/meson/postinstall.py \ + --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" + substituteInPlace ./frog/language_manager.py --subst-var out + ''; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + meson + ninja + pkg-config + glib + wrapGAppsHook4 + ]; + + buildInputs = [ + librsvg + gobject-introspection + libnotify + libadwaita + libportal + zbar + tesseract5 + ]; + + propagatedBuildInputs = with python3Packages; [ + pygobject3 + pillow + pytesseract + pyzbar + ]; + + # This is to prevent double-wrapping the package. We'll let + # Python do it by adding certain arguments inside of the + # wrapper instead. + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + homepage = "https://getfrog.app/"; + description = + "Intuitive text extraction tool (OCR) for GNOME desktop"; + license = licenses.mit; + maintainers = with maintainers; [ foo-dogsquared ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch b/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch new file mode 100644 index 0000000000..aac9b4f76f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/gnome-frog/update-compatible-with-non-flatpak-env.patch @@ -0,0 +1,33 @@ +diff --git a/frog/config.py b/frog/config.py +index 9837755..b73e4e3 100644 +--- a/frog/config.py ++++ b/frog/config.py +@@ -30,10 +30,14 @@ import os + APP_ID = "com.github.tenderowl.frog" + RESOURCE_PREFIX = "/com/github/tenderowl/frog" + ++# This is based from the XDG Base Directory specification. ++if not os.getenv('XDG_DATA_HOME'): ++ os.environ['XDG_DATA_HOME'] = os.path.expanduser("~/.local/share") ++ + if not os.path.exists(os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata')): + os.mkdir(os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata')) + + tessdata_url = "https://github.com/tesseract-ocr/tessdata/raw/main/" + tessdata_best_url = "https://github.com/tesseract-ocr/tessdata_best/raw/main/" + tessdata_dir = os.path.join(os.environ['XDG_DATA_HOME'], 'tessdata') +-tessdata_config = f'--tessdata-dir {tessdata_dir} –psm 6' ++tessdata_config = f'–-psm 6 --tessdata-dir {tessdata_dir}' +diff --git a/frog/language_manager.py b/frog/language_manager.py +index 5752be6..4f6a908 100644 +--- a/frog/language_manager.py ++++ b/frog/language_manager.py +@@ -156,7 +156,7 @@ class LanguageManager(GObject.GObject): + os.mkdir(tessdata_dir) + + dest_path = os.path.join(tessdata_dir, 'eng.traineddata') +- source_path = pathlib.Path('/app/share/appdata/eng.traineddata') ++ source_path = pathlib.Path('@out@/share/appdata/eng.traineddata') + if os.path.exists(dest_path): + return + diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix index da5c8574ad..4c917ce905 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gpsprune"; - version = "21.2"; + version = "21.3"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "sha256-QgbLbpqlC2sITbPK4ZcaovmycwhWtnu06x8F0grpECc="; + sha256 = "sha256-0uPCMMWixw1dZeG12kvFO4FTp8qrOsLyLTKtGSVJxuw="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix index 1c8fe38ea8..051fee4f6f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gremlin-console/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gremlin-console"; - version = "3.6.0"; + version = "3.6.1"; src = fetchzip { url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip"; - sha256 = "sha256-gYlHZuRKpBpC0will4EoJGyHW41vSjAT8Yg8yK6PCms="; + sha256 = "sha256-lr3ffyAL8LBj7mt4EmN2Kq2pxvW4P7zd66gU9X4qzJw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix index 5014031d6c..a225c15a4d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gsctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gsctl"; - version = "1.1.5"; + version = "1.1.6"; src = fetchFromGitHub { owner = "giantswarm"; repo = pname; rev = version; - sha256 = "sha256-P1hJoZ1YSZTCo5ha/Um/nYVVhbYC3dcrQGJYTSnqNu4="; + sha256 = "sha256-eemPsrSFwgUR1Jz7283jjwMkoJR38QiaiilI9G0IQuo="; }; - vendorSha256 = "sha256-NeRABlKUpD2ZHRid/vu34Dh9uHZ+7IXWFPX8jkexUog="; + vendorSha256 = "sha256-6b4H8YAY8d/qIGnnGPYZoXne1LXHLsc0OEq0lCeqivo="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix index c751f4c280..f475df8f7b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gsimplecal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gsimplecal"; - version = "2.2"; + version = "2.4.1"; src = fetchFromGitHub { owner = "dmedvinsky"; repo = "gsimplecal"; rev = "v${version}"; - sha256 = "sha256-r7OitN7WSY7vxpQCraLyokgUNgvaVFjE17ghBGgxzuM="; + sha256 = "sha256-8faYw8tg8pOkpImcv8TM4UUpQEEtDKjAk4iKbXDC9no="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix new file mode 100644 index 0000000000..988b4d0c6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/gum/default.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, installShellFiles, fetchFromGitHub }: + +buildGoModule rec { + pname = "gum"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "charmbracelet"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-zFw2Lf+N8jxrw6JYqzsDMXIMchFc2bxAofELrgIMquk="; + }; + + vendorSha256 = "sha256-8MqBGMcYR/kbExfXBeQrO8p7a/uawUk2hLmnQtarWEw="; + + nativeBuildInputs = [ + installShellFiles + ]; + + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; + + postInstall = '' + $out/bin/gum man > gum.1 + installManPage gum.1 + installShellCompletion --cmd gum \ + --bash <($out/bin/gum completion bash) \ + --fish <($out/bin/gum completion fish) \ + --zsh <($out/bin/gum completion zsh) + ''; + + meta = with lib; { + description = "Tasty Bubble Gum for your shell"; + homepage = "https://github.com/charmbracelet/gum"; + changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ maaslalani ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix index 8943fc17de..10dd5bd545 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "0.8.2"; + version = "0.8.3"; pname = "gummi"; src = pkgs.fetchFromGitHub { owner = "alexandervdm"; repo = "gummi"; rev = version; - sha256 = "sha256-7txAyzJrEoGPjchXstMWIF1Vy+aoba6aa6+JNUYnKQs="; + sha256 = "sha256-71n71KjLmICp4gznd27NlbyA3kayje3hYk/cwkOXEO0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix index c82de2ae02..e9b9e4f4b9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hello/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "hello"; - version = "2.12"; + version = "2.12.1"; src = fetchurl { url = "mirror://gnu/hello/hello-${finalAttrs.version}.tar.gz"; - sha256 = "1ayhp9v4m4rdhjmnl2bq3cibrbqqkgjbl3s7yk2nhlh8vj3ay16g"; + sha256 = "sha256-jZkUKv2SV28wsM18tCqNxoCZmLxdYH2Idh9RLibH2yA="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/inkcut/default.nix b/third_party/nixpkgs/pkgs/applications/misc/inkcut/default.nix index 300423cb7f..b8833a8e4b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/inkcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/inkcut/default.nix @@ -1,4 +1,5 @@ { lib +, fetchpatch , python3Packages , fetchFromGitHub , wrapQtAppsHook @@ -9,15 +10,37 @@ with python3Packages; buildPythonApplication rec { pname = "inkcut"; - version = "2.1.3"; + version = "2.1.5"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "0px0xdv6kyzkkpmvryrdfavv1qy2xrqdxkpmhvx1gj649xcabv32"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-S5IrNWVoUp1w+P7DrKlOUOyY3Q16CHSct9ndZOB3UpU="; }; + patches = [ + # fix opening the extension on inkscape 1.2 + # https://github.com/inkcut/inkcut/pull/340 + (fetchpatch { + url = "https://github.com/inkcut/inkcut/commit/d5d5d0ab3c588c576b668f4c7b07a10609ba2fd0.patch"; + hash = "sha256-szfiOujuV7OOwYK/OU51m9FK6dzkbWds+h0cr5dGIg4="; + }) + # fix loading a document from stdin (as used from the extension) + # https://github.com/inkcut/inkcut/issues/341 + (fetchpatch { + url = "https://github.com/inkcut/inkcut/commit/748ab4157f87afec37dadd715094e87d02c9c739.patch"; + hash = "sha256-ZGiwZru2bUYu749YSz5vxmGwLTAoYIAsafcX6PmdbYo="; + revert = true; + }) + # fix distutils deprecation error + # https://github.com/inkcut/inkcut/pull/343 + (fetchpatch { + url = "https://github.com/inkcut/inkcut/commit/9fb95204981bcc51401a1bc10caa02d1fae0d6cb.patch"; + hash = "sha256-nriys7IWPGykZjVz+DIDsE9Tm40DewkHQlIUaxFwtzM="; + }) + ]; + postPatch = '' substituteInPlace inkcut/device/transports/printer/plugin.py \ --replace ", 'lpr', " ", '${cups}/bin/lpr', " @@ -53,7 +76,7 @@ buildPythonApplication rec { ]; dontWrapQtApps = true; - makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + makeWrapperArgs = [ "--unset" "PYTHONPATH" "\${qtWrapperArgs[@]}" ]; postInstall = '' mkdir -p $out/share/inkscape/extensions diff --git a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix index fa3b360b1c..5a680cc76b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/josm/default.nix @@ -3,20 +3,20 @@ }: let pname = "josm"; - version = "18513"; + version = "18531"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "sha256-rKBDKPq6hn4VGlzW4ad/gBU4eCVRF9JgRLrDaTKjCbI="; + sha256 = "sha256-/esGbLbidQ60+auMC1W2GwH7V5qdTVzblDNsskuhcjs="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - sha256 = "sha256-M8ZV3FXZJHqaegPKQnjQkMYMWt2BUiKzM8Tit4NqtU4="; + sha256 = "sha256-ldcTuacUUxsssJqJ8cRjbP+TWlxQdcNtVbj8clDNEGw="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; rev = version; - sha256 = "sha256-cguvKl9yvthNWcLD6YDLKiialJmutJTa9egMdfKHRpU="; + sha256 = "sha256-Cga17ymUROJb5scpyOlo6JIgQ77yHavI0ciUpZN+jLk="; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix index 6404469320..34ee81a2dd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jotta-cli/default.nix @@ -5,10 +5,10 @@ let in stdenv.mkDerivation rec { pname = "jotta-cli"; - version = "0.14.58899"; + version = "0.14.60923"; src = fetchzip { url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz"; - sha256 = "sha256-V4aShSMifXQl+qnCspm+P4q99Fn3N+us/sLzzTVV7mg="; + sha256 = "sha256-9R2eml0MpOZQn8SIs8gN1d1ddQdKmTsPBEWqHCvW8yo="; stripRoot = false; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jquake/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jquake/default.nix index f68a584fe8..192f8f06a0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jquake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jquake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jquake"; - version = "1.6.2"; + version = "1.7.1"; src = fetchurl { url = "https://fleneindre.github.io/downloads/JQuake_${version}_linux.zip"; - sha256 = "1k12yw9fwq1z3gg0d38dxs4mmyn912zfcm6zsbjkv27q6lvhvwng"; + sha256 = "sha256-sdTt1+1eAU/DJAszPQnmoaBZThJ9yC9GL1k+OpD+tp4="; }; nativeBuildInputs = [ unzip copyDesktopItems ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix index 4aecdec4de..141db33e8b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/jrnl/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "jrnl"; - version = "2.8.4"; + version = "3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "jrnl-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Edu+GW/D+R5r0R750Z1f8YUVPMYbm9PK4D73sTDzDEc="; + sha256 = "sha256-wyN7dlAbQwqvES8qEJ4Zo+fDMM/Lh9tNjf215Ywop10="; }; nativeBuildInputs = with python3.pkgs; [ @@ -31,14 +31,24 @@ python3.pkgs.buildPythonApplication rec { pyxdg pyyaml tzlocal + ruamel-yaml + rich ]; checkInputs = with python3.pkgs; [ pytest-bdd + pytest-xdist pytestCheckHook toml ]; + # Upstream expects a old pytest-bdd version + # Once it changes we should update here too + # https://github.com/jrnl-org/jrnl/blob/develop/poetry.lock#L732 + disabledTests = [ + "bdd" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace 'tzlocal = ">2.0, <3.0"' 'tzlocal = ">2.0, !=3.0"' diff --git a/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix index b50a175151..429d798210 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/k40-whisperer/default.nix @@ -23,12 +23,12 @@ let in stdenv.mkDerivation rec { pname = "k40-whisperer"; - version = "0.59"; + version = "0.60"; src = fetchzip { url = "https://www.scorchworks.com/K40whisperer/K40_Whisperer-${version}_src.zip"; stripRoot = true; - sha256 = "0r8rhaksk87l44pwwpvrfnck2lyic3lgcbh3pi7ib6mrwbsyhlni"; + sha256 = "sha256-Nr7WYVu78msn5HuDNtSSvkdU6iCWtbiYZmh0rnMiyEg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix b/third_party/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix index 552a63240d..daa95500d9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/k4dirstat/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "k4dirstat"; - version = "3.3.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - hash = "sha256-KLvWSDv4x0tMhAPqp8yNQed2i7R0MPbvadHddSJ1Nx4="; + hash = "sha256-+JhMSatgCunzxIVSYIzt1L7O36LYbcFw7vmokgNffPY="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix index c67a64df50..49e8688cb5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kanboard/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "sha256-pLxCm+T9jdn0FFqbTFe1tsIPTaVTT+QDeLHDxrbpGBg="; + sha256 = "sha256-WG2lTPpRG9KQpRdb+cS7CqF4ZDV7JZ8XtNqAI6eVzm0="; }; dontBuild = true; @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "Kanban project management software"; homepage = "https://kanboard.net"; license = licenses.mit; - maintainers = with maintainers; [ fpletz lheckemann ]; + maintainers = with maintainers; [ lheckemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix index 2b8002d4eb..b6bb65a0bf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/khal/default.nix @@ -27,11 +27,6 @@ with python3.pkgs; buildPythonApplication rec { freezegun ]; nativeBuildInputs = [ setuptools-scm sphinx sphinxcontrib_newsfeed installShellFiles ]; - checkInputs = [ - glibcLocales - pytestCheckHook - ]; - LC_ALL = "en_US.UTF-8"; postInstall = '' # shell completions @@ -51,6 +46,18 @@ with python3.pkgs; buildPythonApplication rec { doCheck = !stdenv.isAarch64; + checkInputs = [ + glibcLocales + pytestCheckHook + ]; + + LC_ALL = "en_US.UTF-8"; + + disabledTests = [ + # timing based + "test_etag" + ]; + meta = with lib; { broken = stdenv.isDarwin; homepage = "http://lostpackets.de/khal/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix index b428690b7a..b424ad4cb7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/koreader/default.nix @@ -13,12 +13,12 @@ let font-droid = nerdfonts.override { fonts = [ "DroidSansMono" ]; }; in stdenv.mkDerivation rec { pname = "koreader"; - version = "2022.05.1"; + version = "2022.07"; src = fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-Uz8fzF/SdKNRywoIb8B/iHRuXDwRyw7wH7bL9vRzPfY="; + sha256 = "sha256-8WQFfmKgu6XPqWQsma656RWpNwNkSXmHOHs2cyVVqJU="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix index 03f2558868..f2659218ab 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/leetcode-cli/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "leetcode-cli"; - version = "0.3.10"; + version = "0.3.11"; src = fetchCrate { inherit pname version; - sha256 = "SkJLA49AXNTpiWZByII2saYLyN3bAAJTlCvhamlOEXA="; + sha256 = "sha256-DHtIhiRPRGuO6Rf1d9f8r0bMOHqAaJleUvYNyPiX6mc="; }; - cargoSha256 = "xhKF4qYOTdt8iCSPY5yT8tH3l54HdkOAIS2SBGzqsdo="; + cargoSha256 = "sha256-Suk/nQ+JcoD9HO9x1lYp+p4qx0DZ9dt0p5jPz0ZQB+k="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/applications/misc/libosmocore/default.nix b/third_party/nixpkgs/pkgs/applications/misc/libosmocore/default.nix index 2b825705b0..a3de388a52 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/libosmocore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/libosmocore/default.nix @@ -13,15 +13,19 @@ stdenv.mkDerivation rec { pname = "libosmocore"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "osmocom"; repo = "libosmocore"; rev = version; - hash = "sha256-AjOyZiLlXhsetbyMBuUssoNxk22LzGOkZpeLt4vKli4="; + hash = "sha256-Dkud3ZA9m/UVbPugbQztUJXFpkQYTWjK2mamxfto9JA="; }; + postPatch = '' + echo "${version}" > .tarball-version + ''; + propagatedBuildInputs = [ talloc ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix index e4e51d78fc..d314bfed07 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/logseq/default.nix @@ -1,26 +1,24 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, autoPatchelfHook, electron, git, curl, expat, gcc, openssl, zlib }: +{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron, git }: stdenv.mkDerivation rec { pname = "logseq"; - version = "0.7.6"; + version = "0.8.0"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-3YCO0pQT5vUkscQEE4+XrfEkQJro8DpQ5xDLglfqJjI="; + sha256 = "sha256-eHSZqWQWPX5gavzUwsI3VMsD2Ov0h/fVPqnA92dzKH4="; name = "${pname}-${version}.AppImage"; }; appimageContents = appimageTools.extract { - name = "${pname}-${version}"; - inherit src; + inherit pname src version; }; dontUnpack = true; dontConfigure = true; dontBuild = true; - nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; - buildInputs = [ stdenv.cc.cc curl expat openssl zlib ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' runHook preInstall @@ -29,6 +27,12 @@ stdenv.mkDerivation rec { cp -a ${appimageContents}/{locales,resources} $out/share/${pname} 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 + substituteInPlace $out/share/applications/${pname}.desktop \ --replace Exec=Logseq Exec=${pname} \ --replace Icon=Logseq Icon=$out/share/${pname}/resources/app/icons/logseq.png @@ -37,8 +41,9 @@ stdenv.mkDerivation rec { ''; 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} \ - --prefix PATH : ${lib.makeBinPath [ git ]} \ + --set "LOCAL_GIT_DIRECTORY" ${git} \ --add-flags $out/share/${pname}/resources/app ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix index cdbc1c23d2..e39ef723df 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/lscolors/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "lscolors"; - version = "0.9.0"; + version = "0.12.0"; src = fetchCrate { inherit version pname; - sha256 = "sha256-8r1MTc6sSgHXuioagj7K4f6Kf4WYnnpie17tvzhz7+M="; + sha256 = "sha256-1tLI+M2hpXWsiO/x27ncs8zn8dBDx18AgsSbN/YE2Ic="; }; - cargoSha256 = "sha256-GsrQKv34EWepq0ihRmINMkShl8nyGQ1Q2De+1Y53TUo="; + cargoSha256 = "sha256-4bFzFztaD9jV3GXpZwCowAhvszedM5ion5/h3D26EY8="; # setid is not allowed in the sandbox checkFlags = [ "--skip=tests::style_for_setid" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix index de131b7ce6..1ea5db2515 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.8.46"; + version = "5.8.70"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "sha256-xms4aqIxYXR6v226RMf+abrFU1xz2aDIL6iQ+Yfff1k="; + sha256 = "sha256-mheHvHU7Z1jUxFWEEfXv2kVO51t/edTK3xV82iteUXM="; }; nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://code-industry.net/free-pdf-editor/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; - platforms = with platforms; [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ cmcdragonkai ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor4/default.nix b/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor4/default.nix index befb11a0a4..355c23d3d1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor4/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/masterpdfeditor4/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://code-industry.net/free-pdf-editor/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfreeRedistributable; - platforms = with platforms; [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix index fc2c2ad618..a15733dd52 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "22.03"; + version = "22.06"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q="; + sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix index a6dfa557b2..bde522fb08 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "22.03"; + version = "22.06"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q="; + sha256 = "sha256-mGowC8wnNJij5dpOlwHX3m7uGZ7TbUInPdP+nsesi30="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/moz-phab/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moz-phab/default.nix deleted file mode 100644 index cef60f72e3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/moz-phab/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, buildPythonApplication -, fetchPypi -, mercurial -# build inputs -, distro -, glean-sdk -, pip -, python-hglib -, sentry-sdk -, setuptools -}: - -buildPythonApplication rec { - pname = "moz-phab"; - version = "0.1.99"; - - src = fetchPypi { - pname = "MozPhab"; - inherit version; - sha256 = "sha256-uKoMMSp5AIvB1qTRYAh7n1+2dDLneFbssfkfTTshfcs="; - }; - - # Relax python-hglib requirement - # https://phabricator.services.mozilla.com/D131618 - postPatch = '' - substituteInPlace setup.py \ - --replace "==" ">=" - ''; - - propagatedBuildInputs = [ - distro - glean-sdk - pip - python-hglib - sentry-sdk - setuptools - ]; - checkInputs = [ - mercurial - ]; - - preCheck = '' - export HOME=$(mktemp -d) - ''; - - meta = with lib; { - description = "Phabricator CLI from Mozilla to support submission of a series of commits"; - longDescription = '' - moz-phab is a custom command-line tool, which communicates to - Phabricator’s API, providing several conveniences, including support for - submitting series of commits. - ''; - homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html"; - license = licenses.mpl20; - maintainers = []; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix new file mode 100644 index 0000000000..d78d880c2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix @@ -0,0 +1,78 @@ +{ lib +, fetchFromGitHub +, python3 + +# tests +, git +, mercurial +, patch +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mozphab"; + version = "1.1.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "mozilla-conduit"; + repo = "review"; + rev = "refs/tags/${version}"; + hash = "sha256-vLHikGjTYOeXd6jDRsoCkq3i0eh6Ttd4KdvlixjzdZ4="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "glean-sdk>=50.0.1,==50.*" "glean-sdk" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + distro + glean-sdk + packaging + python-hglib + sentry-sdk + setuptools + ]; + + checkInputs = [ + git + mercurial + patch + ] + ++ (with python3.pkgs; [ + callee + immutabledict + hg-evolve + mock + pytestCheckHook + ]); + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ + # codestyle doesn't matter to us + "tests/test_style.py" + # integration tests try to submit changes, which requires network access + "tests/test_integration_git.py" + "tests/test_integration_hg.py" + "tests/test_integration_hg_dag.py" + "tests/test_integration_patch.py" + "tests/test_integration_reorganise.py" + "tests/test_sentry.py" + ]; + + meta = with lib; { + description = "Phabricator CLI from Mozilla to support submission of a series of commits"; + longDescription = '' + moz-phab is a custom command-line tool, which communicates to + Phabricator’s API, providing several conveniences, including support for + submitting series of commits. + ''; + homepage = "https://moz-conduit.readthedocs.io/en/latest/phabricator-user.html"; + license = licenses.mpl20; + maintainers = with maintainers; []; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/mwic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mwic/default.nix index 970c89b2ac..e1f9baa608 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mwic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.8"; + version = "0.7.9"; pname = "mwic"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0nnhziz9v523hpciylnxfajmxabh2ig5iawzwrfpf7aww70v330x"; + sha256 = "sha256-i7DSvUBUMOvn2aYpwYOCDHKq0nkleknD7k2xopo+C5s="; }; makeFlags=["PREFIX=\${out}"]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix index 30adf58a49..90350c03f4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.19.0"; + version = "2.20.1"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "sha256-tbnhbjtrVlxx21L15UocUSwvUesl5D/QoM/2r55rwOo="; + sha256 = "sha256-uu82KG2RHEP0PstoYB4eWZWFjlousT40A1XAaBfkjFE="; }; - cargoSha256 = "sha256-X5t5mJoda8xTIVw3+u6yOvp78lS4rW3Ud6d/4ttsNbc="; + cargoSha256 = "sha256-gpHeyxLcDqwi96BWF6Hwlb27JG2LSUgfsE4FTB1vIoQ="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix index 488f5cd997..c9765b1e1b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-panel/default.nix @@ -9,17 +9,18 @@ , light # light , pamixer # pamixer , pulseaudio # pactl +, libdbusmenu-gtk3 # tray }: python3Packages.buildPythonApplication rec { pname = "nwg-panel"; - version = "0.5.7"; + version = "0.7.2"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-panel"; rev = "v${version}"; - sha256 = "1d3qh42cwayb5d9ymhfs2vrbg5x5x6x73hw77m3xb9y4vyhji85x"; + sha256 = "sha256-kQow8jBHxMTgtTaOvq8uT5YjWxml+GoYaoUH3hMQN8g="; }; # No tests @@ -31,7 +32,10 @@ python3Packages.buildPythonApplication rec { buildInputs = [ atk gdk-pixbuf gtk-layer-shell pango ]; nativeBuildInputs = [ wrapGAppsHook gobject-introspection ]; - propagatedBuildInputs = with python3Packages; [ i3ipc netifaces psutil pybluez pygobject3 ]; + propagatedBuildInputs = (with python3Packages; + [ i3ipc netifaces psutil pybluez pygobject3 requests dasbus setuptools ]) + # Run-time GTK dependency required by the Tray module + ++ [ libdbusmenu-gtk3 ]; postInstall = '' mkdir -p $out/share/{applications,pixmaps} diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 8e7acbe822..daa1441ffc 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -12,7 +12,7 @@ let inherit (stdenv.hostPlatform) system; pname = "obsidian"; - version = "0.14.15"; + version = "0.15.9"; appname = "Obsidian"; meta = with lib; { description = "A powerful knowledge base that works on top of a local folder of plain text Markdown files"; @@ -25,7 +25,7 @@ let filename = if stdenv.isDarwin then "Obsidian-${version}-universal.dmg" else "obsidian-${version}.tar.gz"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - sha256 = if stdenv.isDarwin then "10c5255nbgqiigcwq6kmhzcgafq91k25wnxj3jxabzc0hs7pn4m5" else "sha256-bSLt4EnlCtxZeKIahr618qMuK9ogUhxn+NKO2GPkjOQ="; + sha256 = if stdenv.isDarwin then "1q9almr8k1i2wzksd09libgnvypj5k9j15y6cxg4rgnw32fa152n" else "sha256-Qz1Ic5FtxXIk8J/2spNZaqpPIgx3yNyXiAQllbVrGjw="; }; icon = fetchurl { diff --git a/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix index 17553c6121..5ac167a100 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/opencpn/default.nix @@ -21,7 +21,7 @@ , libsndfile , libthai , libunarr -, libusb +, libusb1 , libvorbis , libxkbcommon , lsb-release @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { libsndfile libthai libunarr - libusb + libusb1 libvorbis libxkbcommon lz4 diff --git a/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix index e0a7b89424..e9a526a1f6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/opentx/default.nix @@ -31,6 +31,9 @@ mkDerivation rec { # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" + + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix index c44fc41a5c..775e4299ce 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/organicmaps/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "organicmaps"; - version = "2022.06.18-2"; + version = "2022.07.27-3"; src = fetchFromGitHub { owner = "organicmaps"; repo = "organicmaps"; rev = "${version}-android"; - sha256 = "sha256-FlytRGiqGr9L5ZwL1slbPjagJKsleOXM8+loPmtfccI="; + sha256 = "sha256-nn24SWyTm8hhj3KrIJWIeOVotV3wn3l7CQopnSCVrX4="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix b/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix index 80a423a3c8..c06713c98a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/overmind/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "overmind"; - version = "2.2.2"; + version = "2.3.0"; nativeBuildInputs = [ makeWrapper ]; @@ -14,10 +14,10 @@ buildGoModule rec { owner = "DarthSim"; repo = pname; rev = "v${version}"; - sha256 = "zDjIwnhDoUj+zTAhtBa94dx7QhYMCTxv2DNUpeP8CP0="; + sha256 = "sha256-vmmSsg0JneMseFCcx/no2x/Ghppmyiod8ZAIb4JWW9I="; }; - vendorSha256 = "KDMzR6qAruscgS6/bHTN6RnHOlLKCm9lxkr9k3oLY+Y="; + vendorSha256 = "sha256-QIKyLknPvmt8yiUCSCIqha8h9ozDGeQnKSM9Vwus0uY="; meta = with lib; { homepage = "https://github.com/DarthSim/overmind"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix index 6a57c15b74..d7ac4fa21e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix @@ -12,21 +12,15 @@ python3.pkgs.buildPythonApplication rec { # PyPI has old alpha version. Since then the project has switched from using a # seemingly abandoned D-Bus package pydbus and started using maintained # dbus-next. So let's use latest from GitHub. - version = "unstable-2022-03-21"; + version = "unstable-2022-07-18"; src = fetchFromGitHub { owner = "mdellweg"; repo = "pass_secret_service"; - rev = "149f8557e07098eee2f46561eea61e83255ac59b"; - sha256 = "sha256-+/pFi6+K8rl0Ihm6cp/emUQVtau6+Apl8/VEr9AI0Xs="; + rev = "fadc09be718ae1e507eeb8719f3a2ea23edb6d7a"; + hash = "sha256-lrNU5bkG4/fMu5rDywfiI8vNHyBsMf/fiWIeEHug03c="; }; - patches = [ - # Only needed until https://github.com/mdellweg/pass_secret_service/pull/30 - # is merged. - ./int_from_bytes-deprecation-fix.patch - ]; - # Need to specify session.conf file for tests because it won't be found under # /etc/ in check phase. postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/int_from_bytes-deprecation-fix.patch b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/int_from_bytes-deprecation-fix.patch deleted file mode 100644 index b7e78e7b79..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/int_from_bytes-deprecation-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/pass_secret_service/interfaces/session.py -+++ b/pass_secret_service/interfaces/session.py -@@ -4,7 +4,6 @@ - import os - import hmac - from hashlib import sha256 --from cryptography.utils import int_from_bytes - from cryptography.hazmat.backends import default_backend - from cryptography.hazmat.primitives.ciphers import Cipher - from cryptography.hazmat.primitives.ciphers.modes import CBC -@@ -27,9 +26,9 @@ class Session(ServiceInterface, SerialMixin): - @classmethod - @run_in_executor - def _create_dh(cls, input): -- priv_key = int_from_bytes(os.urandom(0x80), "big") -+ priv_key = int.from_bytes(os.urandom(0x80), "big") - pub_key = pow(2, priv_key, dh_prime) -- shared_secret = pow(int_from_bytes(input, "big"), priv_key, dh_prime) -+ shared_secret = pow(int.from_bytes(input, "big"), priv_key, dh_prime) - salt = b"\x00" * 0x20 - shared_key = hmac.new(salt, shared_secret.to_bytes(0x80, "big"), sha256).digest() - aes_key = hmac.new(shared_key, b"\x01", sha256).digest()[:0x10] diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index e4626ef3c9..9b0efb7f25 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.2.12"; + version = "4.3.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "sha256-B9V3dw5A52yPoNfROI3+wAql+Y0hY4T3sTm9uN70TQQ="; + sha256 = "sha256-SUvj9YP7hIgF003caPsx5AWnMYr38y/XRf6TRm0tMAo="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix index 0a7b4bc793..27f4afb435 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pueue/default.nix @@ -1,23 +1,37 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, installShellFiles, SystemConfiguration, libiconv }: +{ lib +, stdenv +, fetchFromGitHub +, SystemConfiguration +, installShellFiles +, libiconv +, rustPlatform +}: rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Nukesor"; - repo = pname; + repo = "pueue"; rev = "v${version}"; - sha256 = "sha256-eFO9v+CZ3sFJJ0Ksa2sV5snjBz9lUkElGSj4DfEUebs="; + hash = "sha256-xUTkjj/PdlgDEp2VMwBuRtF/9iGGiN4FZizdOdcbTag="; }; - cargoSha256 = "sha256-cyuDXMmVrVx3kluumR6WleMzuoV+261f47rpkVYHzZA="; + cargoSha256 = "sha256-7VdPu+9RYoj4Xfb3J6GLOji7Fqxkk+Fswi4C4q33+jk="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ SystemConfiguration libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ + SystemConfiguration + libiconv + ]; - checkFlags = [ "--skip=test_single_huge_payload" "--skip=test_create_unix_socket" ]; + checkFlags = [ + "--test client_tests" + "--skip=test_single_huge_payload" + "--skip=test_create_unix_socket" + ]; postInstall = '' for shell in bash fish zsh; do @@ -27,10 +41,21 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A daemon for managing long running shell commands"; homepage = "https://github.com/Nukesor/pueue"; + description = "A daemon for managing long running shell commands"; + longDescription = '' + Pueue is a command-line task management tool for sequential and parallel + execution of long-running tasks. + + Simply put, it's a tool that processes a queue of shell commands. On top + of that, there are a lot of convenient features and abstractions. + + Since Pueue is not bound to any terminal, you can control your tasks from + any terminal on the same machine. The queue will be continuously + processed, even if you no longer have any active ssh sessions. + ''; changelog = "https://github.com/Nukesor/pueue/raw/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ marsam ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix index 86ed90cbd4..66c159471d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.27.1.6"; + version = "3.27.6.7"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-NnaCwbk8w0ZPnBz7xxs5LMFMUSnEERCSRBXpJL0u+s0="; + sha256 = "sha256-PGGm7XhjGngj2oD8NNh8aQOKRgcdx9qiQu/4ZYBceG8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/rlaunch/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rlaunch/default.nix new file mode 100644 index 0000000000..206c32987c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rlaunch/default.nix @@ -0,0 +1,33 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, libX11 +, libXft +, libXinerama +}: + +rustPlatform.buildRustPackage rec { + pname = "rlaunch"; + version = "1.3.13"; + + src = fetchFromGitHub { + owner = "PonasKovas"; + repo = pname; + rev = version; + sha256 = "1w8qvny72l5358wnk4dmqnrv4mrpzxrzf49svav9grzxzzf8mqy2"; + }; + + cargoSha256 = "00lnw48kn97gp45lylv5c6v6pil74flzpsq9k69xgvvjq9yqjzrx"; + + # The x11_dl crate dlopen()s these libraries, so we have to inject them into rpath. + postFixup = '' + patchelf --set-rpath ${lib.makeLibraryPath [ libX11 libXft libXinerama ]} $out/bin/rlaunch + ''; + + meta = with lib; { + description = "A lightweight application launcher for X11"; + homepage = "https://github.com/PonasKovas/rlaunch"; + license = licenses.mit; + maintainers = with maintainers; [ danc86 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix index 58adba4499..6f858c8c6a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-emoji/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "rofi-emoji"; - version = "2.3.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "Mange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-y+WJYSiDXYvg+N3wok44hJ8Tuqrd3E63pZyiYx0NWXg="; + sha256 = "sha256-pYNeAz8MKBM3VSkQfP4hgTbEy9haGmBmPf/nu9tvKts="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch b/third_party/nixpkgs/pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch new file mode 100644 index 0000000000..f749d6f220 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-top/0001-Patch-plugindir-to-output.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index 4d2df69..3260910 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -54,7 +54,7 @@ dnl --------------------------------------------------------------------- + PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 libgtop-2.0]) + PKG_CHECK_MODULES([rofi], [rofi]) + +-[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`" ++[rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`" + AC_SUBST([rofi_PLUGIN_INSTALL_DIR]) + + LT_INIT([disable-static]) diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch b/third_party/nixpkgs/pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch new file mode 100644 index 0000000000..dd7d7c223a --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-top/0002-Patch-add-cairo.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile.am b/Makefile.am +index 24c1a85..cfabbbf 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,6 +6,6 @@ plugin_LTLIBRARIES = top.la + top_la_SOURCES=\ + src/top.c + +-top_la_CFLAGS= @glib_CFLAGS@ @rofi_CFLAGS@ +-top_la_LIBADD= @glib_LIBS@ @rofi_LIBS@ ++top_la_CFLAGS= @glib_CFLAGS@ @rofi_CFLAGS@ @cairo_CFLAGS@ ++top_la_LIBADD= @glib_LIBS@ @rofi_LIBS@ @cairo_LIBS@ + top_la_LDFLAGS= -module -avoid-version +diff --git a/configure.ac b/configure.ac +index 4d2df69..f340a7a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -53,6 +53,7 @@ dnl PKG_CONFIG based dependencies + dnl --------------------------------------------------------------------- + PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 libgtop-2.0]) + PKG_CHECK_MODULES([rofi], [rofi]) ++PKG_CHECK_MODULES([cairo], [cairo cairo-xcb]) + + [rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`" + AC_SUBST([rofi_PLUGIN_INSTALL_DIR]) diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofi-top/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-top/default.nix new file mode 100644 index 0000000000..328eca9da8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rofi-top/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, cairo +, glib +, gobject-introspection +, libgtop +, pkg-config +, rofi-unwrapped +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "rofi-top"; + version = "unstable-2017-10-16"; + + src = fetchFromGitHub { + owner = "davatorium"; + repo = pname; + rev = "9416addf91dd1bd25dfd5a8c5f1c7297c444408e"; + sha256 = "sha256-lNsmx1xirepITpUD30vpcs5slAQYQcvDW8FkA2K9JtU="; + }; + + patches = [ + ./0001-Patch-plugindir-to-output.patch + ./0002-Patch-add-cairo.patch + ]; + + nativeBuildInputs = [ + autoreconfHook + gobject-introspection + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + cairo + glib + libgtop + rofi-unwrapped + ]; + + meta = with lib; { + description = "A plugin for rofi that emulates top behaviour"; + homepage = "https://github.com/davatorium/rofi-top"; + license = licenses.mit; + maintainers = with maintainers; [ aacebedo ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix index 1cc78282f6..44ce37c456 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/rofimoji/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "rofimoji"; - version = "5.4.0"; + version = "5.5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; - rev = version; - sha256 = "sha256-D45XGnKWHUsE0DQThITBcgpghelsfGkSEIdg9jvOJlw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-rYqEeAoHCx0j83R1vmtj+CVuR0QFEd3e1c5O454mANM="; }; # `rofi` and the `waylandSupport` and `x11Support` dependencies diff --git a/third_party/nixpkgs/pkgs/applications/misc/rusty-psn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rusty-psn/default.nix new file mode 100644 index 0000000000..bc0fd96730 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/rusty-psn/default.nix @@ -0,0 +1,80 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, makeDesktopItem +, copyDesktopItems +, pkg-config +, openssl +, xorg +, libGL +, withGui ? false # build GUI version +}: + +rustPlatform.buildRustPackage rec { + pname = "rusty-psn"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "RainbowCookie32"; + repo = "rusty-psn"; + rev = "v${version}"; + sha256 = "14li5fsaj4l5al6lcxy07g3gzmi0l3cyiczq44q7clq4myhykhhb"; + }; + + cargoSha256 = "0kjaq3ik3lwaz7rjb5jaxavpahzp33j7vln3zyifql7j7sbr300f"; + + nativeBuildInputs = [ + pkg-config + copyDesktopItems + ]; + + buildInputs = if withGui then [ + openssl + xorg.libxcb + xorg.libX11 + xorg.libXcursor + xorg.libXrandr + xorg.libXi + xorg.libxcb + libGL + libGL.dev + ] else [ + openssl + ]; + + buildNoDefaultFeatures = true; + buildFeatures = [ (if withGui then "egui" else "cli") ]; + + postFixup = '' + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/rusty-psn + '' + lib.optionalString withGui '' + mv $out/bin/rusty-psn $out/bin/rusty-psn-gui + ''; + + desktopItem = lib.optionalString withGui (makeDesktopItem { + name = "rusty-psn"; + desktopName = "rusty-psn"; + exec = "rusty-psn-gui"; + comment = "A simple tool to grab updates for PS3 games, directly from Sony's servers using their updates API."; + categories = [ + "Network" + ]; + keywords = [ + "psn" + "ps3" + "sony" + "playstation" + "update" + ]; + }); + desktopItems = lib.optionals withGui [ desktopItem ]; + + meta = with lib; { + description = "Simple tool to grab updates for PS3 games, directly from Sony's servers using their updates API"; + homepage = "https://github.com/RainbowCookie32/rusty-psn/"; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ AngryAnt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/sdcv/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sdcv/default.nix index 391ef82daf..22356ac1a8 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sdcv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sdcv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sdcv"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitHub { owner = "Dushistov"; repo = "sdcv"; rev = "v${version}"; - sha256 = "144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600"; + sha256 = "sha256-i6odmnkoSqDIQAor7Dn26Gu+td9aeMIkwsngF7beBtE="; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/selectdefaultapplication/default.nix b/third_party/nixpkgs/pkgs/applications/misc/selectdefaultapplication/default.nix new file mode 100644 index 0000000000..39470d2b0e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/selectdefaultapplication/default.nix @@ -0,0 +1,36 @@ +{ stdenv, lib, fetchFromGitHub, qmake, qtbase, wrapQtAppsHook }: + +stdenv.mkDerivation { + pname = "selectdefaultapplication"; + version = "unstable-2021-08-12"; + + src = fetchFromGitHub { + owner = "sandsmark"; + repo = "selectdefaultapplication"; + rev = "c752df6ba8caceeef54bcf6527f1bccc2ca8202a"; + sha256 = "C/70xpt6RoQNIlAjSJhOCyheolK4Xp6RiSZmeqMP4fw="; + }; + + nativeBuildInputs = [ qmake wrapQtAppsHook ]; + buildInputs = [ qtbase ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp selectdefaultapplication $out/bin + + install -Dm644 -t "$out/share/applications" selectdefaultapplication.desktop + install -Dm644 -t "$out/share/icons/hicolor/48x48/apps" selectdefaultapplication.png + + runHook postInstall + ''; + + meta = with lib; { + description = "A very simple application that lets you define default applications on Linux in a sane way"; + homepage = "https://github.com/sandsmark/selectdefaultapplication"; + maintainers = with maintainers; [ nsnelson ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix new file mode 100644 index 0000000000..ad849bf699 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix @@ -0,0 +1,70 @@ +{ stdenv +, lib +, fetchFromGitHub +, glib +, meson +, ninja +, wrapGAppsHook +, desktop-file-utils +, gobject-introspection +, gtk3 +, python3 +}: + +stdenv.mkDerivation rec { + pname = "siglo"; + version = "0.9.9"; + + src = fetchFromGitHub { + owner = "theironrobin"; + repo = "siglo"; + rev = "v${version}"; + hash = "sha256-4jKsRpzuyHH31LXndC3Ua4TYcI0G0v9qqe0cbvLuCDA="; + }; + + patches = [ + ./siglo-no-user-install.patch + ]; + + postPatch = '' + chmod +x build-aux/meson/postinstall.py # patchShebangs requires an executable file + patchShebangs build-aux/meson/postinstall.py + ''; + + nativeBuildInputs = [ + glib + meson + ninja + wrapGAppsHook + python3.pkgs.wrapPython + python3 + desktop-file-utils + gtk3 + ]; + + buildInputs = [ + gtk3 + python3.pkgs.gatt + gobject-introspection + ]; + + pythonPath = with python3.pkgs; [ + gatt + pybluez + requests + ]; + + preFixup = '' + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") + ''; + + meta = with lib; { + description = "GTK app to sync InfiniTime watch with PinePhone"; + homepage = "https://github.com/theironrobin/siglo"; + changelog = "https://github.com/theironrobin/siglo/tags/v${version}"; + license = licenses.mpl20; + maintainers = with maintainers; [ tomfitzhenry ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/siglo/siglo-no-user-install.patch b/third_party/nixpkgs/pkgs/applications/misc/siglo/siglo-no-user-install.patch new file mode 100644 index 0000000000..11cd472d7e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/siglo/siglo-no-user-install.patch @@ -0,0 +1,13 @@ +diff --git a/data/meson.build b/data/meson.build +index 62a00fe..5319974 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -18,8 +18,6 @@ install_data(join_paths('icons', 'com.github.alexr4535.siglo.svg'), + install_dir: join_paths(get_option('datadir'), 'icons') + ) + +-install_data('siglo.service', install_dir: '/etc/systemd/user/') +- + appstream_file = i18n.merge_file( + input: 'com.github.alexr4535.siglo.appdata.xml.in', + output: 'com.github.alexr4535.siglo.appdata.xml', diff --git a/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix index 7ffb24cb41..da66fd585f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sioyek/default.nix @@ -5,6 +5,7 @@ , gumbo , harfbuzz , jbig2dec +, mujs , mupdf , openjpeg , qt3d @@ -15,29 +16,25 @@ stdenv.mkDerivation rec { pname = "sioyek"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "ahrm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G4iZi6xTJjWZN0T3lO0jPquxJ3p8Mc0ewmjJEKcGJ34="; + sha256 = "sha256-F71JXgYaWAye+nlSrZvGjJ4ucvHTx3tPZHRC5QI4QiU="; }; - buildInputs = [ gumbo harfbuzz jbig2dec mupdf openjpeg qt3d qtbase ]; + buildInputs = [ gumbo harfbuzz jbig2dec mupdf mujs openjpeg qt3d qtbase ]; nativeBuildInputs = [ installShellFiles wrapQtAppsHook qmake ]; postPatch = '' - substituteInPlace pdf_viewer_build_config.pro \ - --replace "-lmupdf-threads" "-lfreetype -lgumbo -ljbig2dec -lopenjp2 -ljpeg" substituteInPlace pdf_viewer/main.cpp \ --replace "/usr/share/sioyek" "$out/share" \ --replace "/etc/sioyek" "$out/etc" ''; - qmakeFlags = "DEFINES+=\"LINUX_STANDARD_PATHS\" pdf_viewer_build_config.pro"; - postInstall = '' install -Dm644 tutorial.pdf $out/share/tutorial.pdf cp -r pdf_viewer/shaders $out/share/ diff --git a/third_party/nixpkgs/pkgs/applications/misc/snixembed/default.nix b/third_party/nixpkgs/pkgs/applications/misc/snixembed/default.nix index 1a5391b132..71a5837cc1 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/snixembed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/snixembed/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "snixembed"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromSourcehut { owner = "~steef"; repo = pname; rev = version; - sha256 = "0yy1i4463q43aq98qk4nvvzpw4i6bid2bywwgf6iq545pr3glfj5"; + sha256 = "sha256-co32Xlklg6KVyi+xEoDJ6TeN28V+wCSx73phwnl/05E="; }; nativeBuildInputs = [ pkg-config vala ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix index 7f2e4207d0..3d750d8b0f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -25,12 +25,19 @@ python3Packages.buildPythonApplication rec { outputs = [ "out" "udev" ]; - nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; - buildInputs = [ libappindicator librsvg ]; + nativeBuildInputs = [ + gdk-pixbuf + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + libappindicator + librsvg + ]; propagatedBuildInputs = with python3Packages; [ evdev - gobject-introspection gtk3 psutil pygobject3 @@ -47,6 +54,17 @@ python3Packages.buildPythonApplication rec { install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules ''; + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "solaar" ]; + meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix new file mode 100644 index 0000000000..fbee57a13e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/somebar/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromSourcehut +, meson +, ninja +, pkg-config +, wayland +, pango +, wayland-protocols +, conf ? null +}: + +let + # There is a configuration in src/config.def.hpp, which we use by default + configFile = if lib.isDerivation conf || builtins.isPath conf then conf else "src/config.def.hpp"; +in + +stdenv.mkDerivation rec { + pname = "somebar"; + version = "1.0.0"; + + src = fetchFromSourcehut { + owner = "~raphi"; + repo = "somebar"; + rev = "${version}"; + sha256 = "sha256-snCW7dC8JI/pg1+HLjX0JXsTzwa3akA6rLcSNgKLF0c="; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ pango wayland wayland-protocols ]; + + prePatch = '' + cp ${configFile} src/config.hpp + ''; + + meta = with lib; { + homepage = "https://git.sr.ht/~raphi/somebar"; + description = "dwm-like bar for dwl"; + license = licenses.mit; + maintainers = with maintainers; [ magnouvean ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix index 4e540accce..ab6d61f7dd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.10.2"; + version = "2.11.1"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-chaCz4+RXPUP/MZymxA0h1ATuWYRgru3JMELiWPEBcE="; + sha256 = "sha256-NX3qbnnbV2mLxBQCjfl7xNicyir6usi2uYGw6Yij/ho="; }; vendorSha256 = "sha256-zYIbtcDM9iYSRHagvI9D284Y7w0ZxG4Ba1p4jqmQyng="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix index 9039854f74..a66fecd83b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sticky/default.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sticky"; - version = "1.8"; + version = "1.11"; format = "other"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-VSD/QsG7G9hji5m6NSEkCoVM+XK3t4KmCqbocTbZwE4="; + hash = "sha256-PXJpNKzF9goQvfh3lUUfOaZFessFNrWtg8nMDxPxRMo="; }; postPatch = '' @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib gobject-introspection - cinnamon.xapps + cinnamon.xapp gspell ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix index b65dad4735..196e350422 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "stork"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "jameslittle230"; repo = "stork"; rev = "v${version}"; - sha256 = "sha256-itjRJLbRTwovK+HcNEzwViEDTJ1MoRRTvZD412XYVKk="; + sha256 = "sha256-4aNY66y4dY+/MsZZGb5GBIlpZI+bAySff9+BEQUlx9M="; }; - cargoSha256 = "sha256-GaYdgC3Bf759ZPcZxoFG0nmCSz7aNHuqtyid6RS8Ui8="; + cargoSha256 = "sha256-XyFZSQylBetf9tJLaV97oHbpe0aBadEZ60NyyxK8lfo="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix index e81edefdfa..6febcab394 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/syncthingtray/default.nix @@ -21,14 +21,14 @@ }: mkDerivation rec { - version = "1.1.20"; + version = "1.2.2"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-T0ddAROwVSh+IKGZZNDMC7YB2IfQZal2pAQ5ArirtjI="; + sha256 = "sha256-BdcMW9ePOLXOZnFxFb1h/mn5a6c8fHYFr9ckK9hXJAM="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix index 2708fb04a6..250d4087e7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/system76-keyboard-configurator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook, libusb1, hidapi, udev, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, gtk3, glib, wrapGAppsHook, libusb1, hidapi, udev, pkg-config }: # system76-keyboard-configurator tries to spawn a daemon as root via pkexec, so # your system needs a PolicyKit authentication agent running for the @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { }; nativeBuildInputs = [ - pkgconfig + pkg-config glib # for glib-compile-resources wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix index 1346cba9ac..fa81e32ac3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/taskwarrior-tui/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "taskwarrior-tui"; - version = "0.22.0"; + version = "0.23.5"; src = fetchFromGitHub { owner = "kdheepak"; repo = "taskwarrior-tui"; rev = "v${version}"; - sha256 = "sha256-121TfmaWrWppsOiuF+8gxy+3J5YzbliYj88nw4aLt9w="; + sha256 = "sha256-/f68TlNuaEyPDSBpMmOjZkLF6Is2+oYfbWQqQOnsR4M="; }; # Because there's a test that requires terminal access doCheck = false; - cargoSha256 = "sha256-oTb1pSA9g9cExCXKaQjNm+h5WB4bWuqODkU7MvvspGQ="; + cargoSha256 = "sha256-sgwT0CLFdmzh7dezVE5tcmGCXqxnGLT00IDIQJl6pHw="; meta = with lib; { description = "A terminal user interface for taskwarrior "; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix index 2b4db0a7a3..2ffa499f74 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ticker"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LY9js3ckkSTsE5td3VV4DPXeoxhw9MjOa35SdxMlUqk="; + sha256 = "sha256-9Gy7G/uRFUBfXlUa6nIle1WIS5Yf9DJMM57hE0oEyLI="; }; vendorSha256 = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix index 321cdb8e0b..5762eab7a6 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ttyper"; - version = "0.4.1"; + version = "0.4.3"; src = fetchFromGitHub { owner = "max-niederman"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e001uftwIwnCpjf4OH89QWaYyT99aMZhCPqDxyAsHyU="; + sha256 = "sha256-rdQaUaNBnYCU11OMLqnidPYiJB2Ywly6NVw2W40kxng="; }; - cargoSha256 = "sha256-RvqktyPZtdKC8RVtLWpT1YYsdgyfHaL7W3+vO8RgG/8="; + cargoSha256 = "sha256-jJAluIyyU9XfN4BEZw2VbJHZvJ+6MJ781lvbAueUhKM="; meta = with lib; { description = "Terminal-based typing test"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix index bf939cfa17..4cc925d3bf 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tuhi/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { pname = "tuhi"; - version = "0.5"; + version = "0.6"; format = "other"; @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { owner = "tuhiproject"; repo = "tuhi"; rev = version; - sha256 = "17kggm9c423vj7irxx248fjc8sxvkp9w1mgawlx1snrii817p3db"; + sha256 = "sha256-NwyG2KhOrAKRewgmU23OMO0+A9SjkQZsDL4SGnLVCvo="; }; dontWrapGApps = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix index 8fa43da809..603547f2ad 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "1.0.13"; + version = "1.0.16"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-EORvIqA2bsmNUY1euUBmEYNMU02nW0doRDmTQjt15Os="; + sha256 = "sha256-sJX9qpWkNe/v9PSAJ5iY8RKEJXs84Gf0Imce4VIFp2Q="; }; - vendorSha256 = "sha256-ilq1sfFY6WuNACryDGjkpF5eUTan8Y6Yt26vot9XR54="; + vendorSha256 = "sha256-LAVvaZqZzMYCGtVWmeYXI7L4f2tStkaWG4QlLSrSjfk="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix index 690f2148e5..726c749d60 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/urlscan/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "sha256-ZJdmsb+2ElgLFWsicc0S8EQAZhF+gnn+ARgdAyaFDgc="; + hash = "sha256-lCOOVAdsr5LajBGY7XUi4J5pJqm5rOH5IMKhA6fju5w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix index eec7bee309..edd1bd588d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "usql"; - version = "0.9.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - sha256 = "sha256-NHeJSWrcX4hYBJpZu/UjQ1ZWfcUnWFCV0Meo+XveDOw="; + sha256 = "sha256-OOu3zWK/ccmaEVriXKl7SZUJLLYaJB3tgF+eR9p+TmM="; }; - vendorSha256 = "sha256-EsLLBhyOcupx5LrJyWWMu4RAGWDKo3keflyZOASKldE="; + vendorSha256 = "sha256-9XyG0Fu3idxGG01MoBr5BMoQSz+dyZFEXRNvvb+XWjA="; buildInputs = [ unixODBC icu ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index e73c6e7b5d..336a0821df 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -22,16 +22,17 @@ , setuptools , git , withPcap ? true, dpkt, dnslib +, withXclip ? stdenv.isLinux, xclip }: buildPythonApplication rec { pname = "visidata"; - version = "2.8"; + version = "2.9.1"; src = fetchFromGitHub { owner = "saulpw"; repo = "visidata"; rev = "v${version}"; - sha256 = "1lcx444yrzmcvix977cgaf18lfrf9yrn2r14ln7knx8ghc15vkqb"; + hash = "sha256-PKj+imTSAGMpF1tkN0WmE3l/4FmWkm/ktIDzF2ku48s="; }; propagatedBuildInputs = [ @@ -63,7 +64,8 @@ buildPythonApplication rec { zstandard odfpy setuptools - ] ++ lib.optionals withPcap [ dpkt dnslib ]; + ] ++ lib.optionals withPcap [ dpkt dnslib ] + ++ lib.optional withXclip xclip; checkInputs = [ git diff --git a/third_party/nixpkgs/pkgs/applications/misc/warpd/default.nix b/third_party/nixpkgs/pkgs/applications/misc/warpd/default.nix new file mode 100644 index 0000000000..e296eec1b3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/warpd/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, git +, libXi +, libXinerama +, libXft +, libXfixes +, libXtst +, libX11 +, libXext +, waylandSupport ? false, cairo, libxkbcommon, wayland +}: + +stdenv.mkDerivation rec { + pname = "warpd"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "rvaiya"; + repo = "warpd"; + rev = "v${version}"; + sha256 = "AR/uLgNX1VLPEcfUd8cnplMiaoEJlUxQ55Fst62RnbI="; + leaveDotGit = true; + }; + + nativeBuildInputs = [ git ]; + + buildInputs = [ + libXi + libXinerama + libXft + libXfixes + libXtst + libX11 + libXext + ] ++ lib.optionals waylandSupport [ + cairo + libxkbcommon + wayland + ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-m644' '-Dm644' \ + --replace '-m755' '-Dm755' \ + --replace 'warpd.1.gz $(DESTDIR)' 'warpd.1.gz -t $(DESTDIR)' \ + --replace 'bin/warpd $(DESTDIR)' 'bin/warpd -t $(DESTDIR)' + ''; + + meta = with lib; { + description = "A modal keyboard driven interface for mouse manipulation."; + homepage = "https://github.com/rvaiya/warpd"; + changelog = "https://github.com/rvaiya/warpd/blob/${src.rev}/CHANGELOG.md"; + maintainers = with maintainers; [ hhydraa ]; + license = licenses.mit; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix index 3dbf4467a3..73d111979f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmr-stak/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fireice-uk/xmr-stak"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ fpletz bfortz ]; + maintainers = with maintainers; [ bfortz ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix index 578449192f..cf16c8e17f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.17.0"; + version = "6.18.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-K8mN3Wzlay2Qgoo70mu3Bh4lXUXNDpXYt17aNnwWkIc="; + sha256 = "sha256-vYXDQSEhPi/jxCO6pxOJ1q0AoBVVRU9vErtJLq90ltk="; }; nativeBuildInputs = [ cmake ]; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/xmrig/xmrig"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "x86_64-darwin" ]; - maintainers = with maintainers; [ fpletz kim0 ]; + maintainers = with maintainers; [ kim0 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix index 1d80a8837e..c9af439b44 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.16.5-mo1"; + version = "6.18.0-mo1"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-TNiHvRLS+eAPHa+qbnVSAyWTPGJxdp9eheQamd4i24E="; + sha256 = "sha256-Ma5wXaQBAVWJsL2wVOHxQ2aSAG9wOywk/abtUi03JvY="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/zine/Cargo.lock.patch b/third_party/nixpkgs/pkgs/applications/misc/zine/Cargo.lock.patch new file mode 100644 index 0000000000..5f210a8185 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/zine/Cargo.lock.patch @@ -0,0 +1,2722 @@ ++++ a/Cargo.lock 2022-08-05 16:01:20.004065609 +0530 ++++ b/Cargo.lock 2022-08-05 16:01:20.004065609 +0530 +@@ -0,0 +1,2719 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "addr2line" ++version = "0.17.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++ ++[[package]] ++name = "ahash" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" ++dependencies = [ ++ "getrandom 0.2.7", ++ "once_cell", ++ "version_check", ++] ++ ++[[package]] ++name = "aho-corasick" ++version = "0.7.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "anyhow" ++version = "1.0.59" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9" ++dependencies = [ ++ "backtrace", ++] ++ ++[[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 = "base64" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++ ++[[package]] ++name = "bincode" ++version = "1.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" ++dependencies = [ ++ "serde", ++] ++ ++[[package]] ++name = "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.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" ++dependencies = [ ++ "generic-array", ++] ++ ++[[package]] ++name = "bstr" ++version = "0.2.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++ ++[[package]] ++name = "bytes" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" ++ ++[[package]] ++name = "cc" ++version = "1.0.73" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "chrono" ++version = "0.4.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6127248204b9aba09a362f6c930ef6a78f2c1b2215f8a7b398c06e1083f17af0" ++dependencies = [ ++ "js-sys", ++ "num-integer", ++ "num-traits", ++ "wasm-bindgen", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "chrono-tz" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "29c39203181991a7dd4343b8005bd804e7a9a37afb8ac070e43771e8c820bbde" ++dependencies = [ ++ "chrono", ++ "chrono-tz-build", ++ "phf 0.11.0", ++] ++ ++[[package]] ++name = "chrono-tz-build" ++version = "0.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f509c3a87b33437b05e2458750a0700e5bdd6956176773e6c7d6dd15a283a0c" ++dependencies = [ ++ "parse-zoneinfo", ++ "phf 0.11.0", ++ "phf_codegen 0.11.0", ++] ++ ++[[package]] ++name = "clap" ++version = "3.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9" ++dependencies = [ ++ "bitflags", ++ "clap_derive", ++ "clap_lex", ++ "indexmap", ++ "once_cell", ++ "textwrap", ++] ++ ++[[package]] ++name = "clap_derive" ++version = "3.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4" ++dependencies = [ ++ "heck", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "clap_lex" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" ++dependencies = [ ++ "os_str_bytes", ++] ++ ++[[package]] ++name = "convert_case" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" ++ ++[[package]] ++name = "core-foundation" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" ++ ++[[package]] ++name = "cpufeatures" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" ++dependencies = [ ++ "libc", ++] ++ ++[[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 = "crossbeam-channel" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.9.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" ++dependencies = [ ++ "autocfg", ++ "cfg-if 1.0.0", ++ "crossbeam-utils", ++ "memoffset", ++ "once_cell", ++ "scopeguard", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "once_cell", ++] ++ ++[[package]] ++name = "crypto-common" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" ++dependencies = [ ++ "generic-array", ++ "typenum", ++] ++ ++[[package]] ++name = "cssparser" ++version = "0.27.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "754b69d351cdc2d8ee09ae203db831e005560fc6030da058f86ad60c92a9cb0a" ++dependencies = [ ++ "cssparser-macros", ++ "dtoa-short", ++ "itoa 0.4.8", ++ "matches", ++ "phf 0.8.0", ++ "proc-macro2", ++ "quote", ++ "smallvec", ++ "syn", ++] ++ ++[[package]] ++name = "cssparser-macros" ++version = "0.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" ++dependencies = [ ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "derive_more" ++version = "0.99.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" ++dependencies = [ ++ "convert_case", ++ "proc-macro2", ++ "quote", ++ "rustc_version", ++ "syn", ++] ++ ++[[package]] ++name = "deunicode" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "850878694b7933ca4c9569d30a34b55031b9b139ee1fc7b94a527c4ef960d690" ++ ++[[package]] ++name = "digest" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" ++dependencies = [ ++ "block-buffer", ++ "crypto-common", ++] ++ ++[[package]] ++name = "dtoa" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" ++ ++[[package]] ++name = "dtoa-short" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" ++dependencies = [ ++ "dtoa", ++] ++ ++[[package]] ++name = "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" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "fancy-regex" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf" ++dependencies = [ ++ "bit-set", ++ "regex", ++] ++ ++[[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.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "redox_syscall", ++ "windows-sys", ++] ++ ++[[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 = "fluent" ++version = "0.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" ++dependencies = [ ++ "fluent-bundle", ++ "unic-langid", ++] ++ ++[[package]] ++name = "fluent-bundle" ++version = "0.15.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" ++dependencies = [ ++ "fluent-langneg", ++ "fluent-syntax", ++ "intl-memoizer", ++ "intl_pluralrules", ++ "rustc-hash", ++ "self_cell", ++ "smallvec", ++ "unic-langid", ++] ++ ++[[package]] ++name = "fluent-langneg" ++version = "0.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" ++dependencies = [ ++ "unic-langid", ++] ++ ++[[package]] ++name = "fluent-syntax" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" ++dependencies = [ ++ "thiserror", ++] ++ ++[[package]] ++name = "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 = "fsevent" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6" ++dependencies = [ ++ "bitflags", ++ "fsevent-sys", ++] ++ ++[[package]] ++name = "fsevent-sys" ++version = "2.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "fuchsia-zircon" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" ++dependencies = [ ++ "bitflags", ++ "fuchsia-zircon-sys", ++] ++ ++[[package]] ++name = "fuchsia-zircon-sys" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" ++ ++[[package]] ++name = "futf" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" ++dependencies = [ ++ "mac", ++ "new_debug_unreachable", ++] ++ ++[[package]] ++name = "futures-channel" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" ++dependencies = [ ++ "futures-core", ++] ++ ++[[package]] ++name = "futures-core" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" ++ ++[[package]] ++name = "futures-sink" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" ++ ++[[package]] ++name = "futures-task" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" ++ ++[[package]] ++name = "futures-util" ++version = "0.3.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" ++dependencies = [ ++ "futures-core", ++ "futures-task", ++ "pin-project-lite", ++ "pin-utils", ++] ++ ++[[package]] ++name = "fxhash" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" ++dependencies = [ ++ "byteorder", ++] ++ ++[[package]] ++name = "generic-array" ++version = "0.14.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" ++dependencies = [ ++ "typenum", ++ "version_check", ++] ++ ++[[package]] ++name = "getopts" ++version = "0.2.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" ++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 = "globset" ++version = "0.4.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a1e17342619edbc21a964c2afbeb6c820c6a2560032872f397bb97ea127bd0a" ++dependencies = [ ++ "aho-corasick", ++ "bstr", ++ "fnv", ++ "log", ++ "regex", ++] ++ ++[[package]] ++name = "globwalk" ++version = "0.8.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" ++dependencies = [ ++ "bitflags", ++ "ignore", ++ "walkdir", ++] ++ ++[[package]] ++name = "hashbrown" ++version = "0.12.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" ++dependencies = [ ++ "ahash", ++] ++ ++[[package]] ++name = "heck" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "html5ever" ++version = "0.25.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5c13fb08e5d4dfc151ee5e88bae63f7773d61852f3bdc73c9f4b9e1bde03148" ++dependencies = [ ++ "log", ++ "mac", ++ "markup5ever", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[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.3", ++] ++ ++[[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.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" ++ ++[[package]] ++name = "httpdate" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" ++ ++[[package]] ++name = "humansize" ++version = "1.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026" ++ ++[[package]] ++name = "hyper" ++version = "0.14.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac" ++dependencies = [ ++ "bytes", ++ "futures-channel", ++ "futures-core", ++ "futures-util", ++ "http", ++ "http-body", ++ "httparse", ++ "httpdate", ++ "itoa 1.0.3", ++ "pin-project-lite", ++ "socket2", ++ "tokio", ++ "tower-service", ++ "tracing", ++ "want", ++] ++ ++[[package]] ++name = "hyper-tls" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" ++dependencies = [ ++ "bytes", ++ "hyper", ++ "native-tls", ++ "tokio", ++ "tokio-native-tls", ++] ++ ++[[package]] ++name = "ignore" ++version = "0.4.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "713f1b139373f96a2e0ce3ac931cd01ee973c3c5dd7c40c0c2efe96ad2b6751d" ++dependencies = [ ++ "crossbeam-utils", ++ "globset", ++ "lazy_static", ++ "log", ++ "memchr", ++ "regex", ++ "same-file", ++ "thread_local", ++ "walkdir", ++ "winapi-util", ++] ++ ++[[package]] ++name = "include_dir" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "482a2e29200b7eed25d7fdbd14423326760b7f6658d21a4cf12d55a50713c69f" ++dependencies = [ ++ "include_dir_macros", ++] ++ ++[[package]] ++name = "include_dir_macros" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5e074c19deab2501407c91ba1860fa3d6820bfde307db6d8cb851b55a10be89b" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++] ++ ++[[package]] ++name = "indexmap" ++version = "1.9.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" ++dependencies = [ ++ "autocfg", ++ "hashbrown", ++] ++ ++[[package]] ++name = "inotify" ++version = "0.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f" ++dependencies = [ ++ "bitflags", ++ "inotify-sys", ++ "libc", ++] ++ ++[[package]] ++name = "inotify-sys" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "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 = "intl-memoizer" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" ++dependencies = [ ++ "type-map", ++ "unic-langid", ++] ++ ++[[package]] ++name = "intl_pluralrules" ++version = "7.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b18f988384267d7066cc2be425e6faf352900652c046b6971d2e228d3b1c5ecf" ++dependencies = [ ++ "tinystr", ++ "unic-langid", ++] ++ ++[[package]] ++name = "iovec" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" ++ ++[[package]] ++name = "itoa" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.59" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" ++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 = "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.127" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "505e71a4706fa491e9b1b55f51b95d4037d0821ee40131190475f692b35b009b" ++ ++[[package]] ++name = "line-wrap" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" ++dependencies = [ ++ "safemem", ++] ++ ++[[package]] ++name = "linked-hash-map" ++version = "0.5.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" ++ ++[[package]] ++name = "lock_api" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" ++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 = "lol_html" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09ff2adf9c54f4de7d66a9177ea7d27d5b8108503bb03d5b719869b8f4bc2ab2" ++dependencies = [ ++ "bitflags", ++ "cfg-if 1.0.0", ++ "cssparser", ++ "encoding_rs", ++ "hashbrown", ++ "lazy_static", ++ "lazycell", ++ "memchr", ++ "safemem", ++ "selectors", ++ "thiserror", ++] ++ ++[[package]] ++name = "mac" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" ++ ++[[package]] ++name = "markup5ever" ++version = "0.10.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" ++dependencies = [ ++ "log", ++ "phf 0.8.0", ++ "phf_codegen 0.8.0", ++ "string_cache", ++ "string_cache_codegen", ++ "tendril", ++] ++ ++[[package]] ++name = "markup5ever_rcdom" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f015da43bcd8d4f144559a3423f4591d69b8ce0652c905374da7205df336ae2b" ++dependencies = [ ++ "html5ever", ++ "markup5ever", ++ "tendril", ++ "xml5ever", ++] ++ ++[[package]] ++name = "matches" ++version = "0.1.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 = "miniz_oxide" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" ++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 = "mio" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf" ++dependencies = [ ++ "libc", ++ "log", ++ "wasi 0.11.0+wasi-snapshot-preview1", ++ "windows-sys", ++] ++ ++[[package]] ++name = "mio-extras" ++version = "2.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" ++dependencies = [ ++ "lazycell", ++ "log", ++ "mio 0.6.23", ++ "slab", ++] ++ ++[[package]] ++name = "miow" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" ++dependencies = [ ++ "kernel32-sys", ++ "net2", ++ "winapi 0.2.8", ++ "ws2_32-sys", ++] ++ ++[[package]] ++name = "native-tls" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" ++dependencies = [ ++ "lazy_static", ++ "libc", ++ "log", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", ++] ++ ++[[package]] ++name = "net2" ++version = "0.2.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" ++dependencies = [ ++ "cfg-if 0.1.10", ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "new_debug_unreachable" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" ++ ++[[package]] ++name = "nodrop" ++version = "0.1.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" ++ ++[[package]] ++name = "notify" ++version = "4.0.17" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257" ++dependencies = [ ++ "bitflags", ++ "filetime", ++ "fsevent", ++ "fsevent-sys", ++ "inotify", ++ "libc", ++ "mio 0.6.23", ++ "mio-extras", ++ "walkdir", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "num-integer" ++version = "0.1.45" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" ++dependencies = [ ++ "autocfg", ++ "num-traits", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "num_threads" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "object" ++version = "0.29.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" ++ ++[[package]] ++name = "openssl" ++version = "0.10.41" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" ++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-src" ++version = "111.22.0+1.1.1q" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853" ++dependencies = [ ++ "cc", ++] ++ ++[[package]] ++name = "openssl-sys" ++version = "0.9.75" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" ++dependencies = [ ++ "autocfg", ++ "cc", ++ "libc", ++ "openssl-src", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "os_str_bytes" ++version = "6.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" ++ ++[[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.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "redox_syscall", ++ "smallvec", ++ "windows-sys", ++] ++ ++[[package]] ++name = "parse-zoneinfo" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" ++dependencies = [ ++ "regex", ++] ++ ++[[package]] ++name = "percent-encoding" ++version = "2.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" ++ ++[[package]] ++name = "pest" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "69486e2b8c2d2aeb9762db7b4e00b0331156393555cff467f4163ff06821eef8" ++dependencies = [ ++ "thiserror", ++ "ucd-trie", ++] ++ ++[[package]] ++name = "pest_derive" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b13570633aff33c6d22ce47dd566b10a3b9122c2fe9d8e7501895905be532b91" ++dependencies = [ ++ "pest", ++ "pest_generator", ++] ++ ++[[package]] ++name = "pest_generator" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3c567e5702efdc79fb18859ea74c3eb36e14c43da7b8c1f098a4ed6514ec7a0" ++dependencies = [ ++ "pest", ++ "pest_meta", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "pest_meta" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5eb32be5ee3bbdafa8c7a18b0a8a8d962b66cfa2ceee4037f49267a50ee821fe" ++dependencies = [ ++ "once_cell", ++ "pest", ++ "sha-1", ++] ++ ++[[package]] ++name = "phf" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" ++dependencies = [ ++ "phf_macros", ++ "phf_shared 0.8.0", ++ "proc-macro-hack", ++] ++ ++[[package]] ++name = "phf" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4724fa946c8d1e7cd881bd3dbee63ce32fc1e9e191e35786b3dc1320a3f68131" ++dependencies = [ ++ "phf_shared 0.11.0", ++] ++ ++[[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_codegen" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32ba0c43d7a1b6492b2924a62290cfd83987828af037b0743b38e6ab092aee58" ++dependencies = [ ++ "phf_generator 0.11.0", ++ "phf_shared 0.11.0", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" ++dependencies = [ ++ "phf_shared 0.8.0", ++ "rand 0.7.3", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" ++dependencies = [ ++ "phf_shared 0.10.0", ++ "rand 0.8.5", ++] ++ ++[[package]] ++name = "phf_generator" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5b450720b6f75cfbfabc195814bd3765f337a4f9a83186f8537297cac12f6705" ++dependencies = [ ++ "phf_shared 0.11.0", ++ "rand 0.8.5", ++] ++ ++[[package]] ++name = "phf_macros" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" ++dependencies = [ ++ "phf_generator 0.8.0", ++ "phf_shared 0.8.0", ++ "proc-macro-hack", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" ++dependencies = [ ++ "siphasher", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" ++dependencies = [ ++ "siphasher", ++] ++ ++[[package]] ++name = "phf_shared" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9dd5609d4b2df87167f908a32e1b146ce309c16cf35df76bc11f440b756048e4" ++dependencies = [ ++ "siphasher", ++ "uncased", ++] ++ ++[[package]] ++name = "pin-project" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78203e83c48cffbe01e4a2d35d566ca4de445d79a85372fc64e378bfc812a260" ++dependencies = [ ++ "pin-project-internal", ++] ++ ++[[package]] ++name = "pin-project-internal" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "710faf75e1b33345361201d36d04e98ac1ed8909151a017ed384700836104c74" ++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 = "pkg-config" ++version = "0.3.25" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" ++ ++[[package]] ++name = "plist" ++version = "1.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bd39bc6cdc9355ad1dc5eeedefee696bb35c34caf21768741e81826c0bbd7225" ++dependencies = [ ++ "base64", ++ "indexmap", ++ "line-wrap", ++ "serde", ++ "time 0.3.12", ++ "xml-rs", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" ++ ++[[package]] ++name = "precomputed-hash" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" ++ ++[[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.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" ++ ++[[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 = "pulldown-cmark" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" ++dependencies = [ ++ "bitflags", ++ "getopts", ++ "memchr", ++ "unicase", ++] ++ ++[[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 0.2.2", ++ "rand_core 0.5.1", ++ "rand_hc", ++ "rand_pcg", ++] ++ ++[[package]] ++name = "rand" ++version = "0.8.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" ++dependencies = [ ++ "libc", ++ "rand_chacha 0.3.1", ++ "rand_core 0.6.3", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.6.3", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom 0.1.16", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" ++dependencies = [ ++ "getrandom 0.2.7", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rand_pcg" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" ++dependencies = [ ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rayon" ++version = "1.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" ++dependencies = [ ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" ++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 = "regex" ++version = "1.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi 0.3.9", ++] ++ ++[[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.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" ++ ++[[package]] ++name = "safemem" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "schannel" ++version = "0.1.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" ++dependencies = [ ++ "lazy_static", ++ "windows-sys", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "security-framework" ++version = "2.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" ++dependencies = [ ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", ++] ++ ++[[package]] ++name = "security-framework-sys" ++version = "2.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "selectors" ++version = "0.22.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "df320f1889ac4ba6bc0cdc9c9af7af4bd64bb927bccdf32d81140dc1f9be12fe" ++dependencies = [ ++ "bitflags", ++ "cssparser", ++ "derive_more", ++ "fxhash", ++ "log", ++ "matches", ++ "phf 0.8.0", ++ "phf_codegen 0.8.0", ++ "precomputed-hash", ++ "servo_arc", ++ "smallvec", ++ "thin-slice", ++] ++ ++[[package]] ++name = "self_cell" ++version = "0.10.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" ++ ++[[package]] ++name = "semver" ++version = "1.0.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93f6841e709003d68bb2deee8c343572bf446003ec20a583e76f7b15cebf3711" ++ ++[[package]] ++name = "serde" ++version = "1.0.142" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e590c437916fb6b221e1d00df6e3294f3fccd70ca7e92541c475d6ed6ef5fee2" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.142" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34b5b8d809babe02f538c2cfec6f2c1ed10804c0e5a6a041a049a4f5588ccc2e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7" ++dependencies = [ ++ "itoa 1.0.3", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "servo_arc" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d98238b800e0d1576d8b6e3de32827c2d74bee68bb97748dcf5071fb53965432" ++dependencies = [ ++ "nodrop", ++ "stable_deref_trait", ++] ++ ++[[package]] ++name = "sha-1" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "cpufeatures", ++ "digest", ++] ++ ++[[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 = "siphasher" ++version = "0.3.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" ++ ++[[package]] ++name = "slab" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "slug" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3bc762e6a4b6c6fcaade73e77f9ebc6991b676f88bb2358bddb56560f073373" ++dependencies = [ ++ "deunicode", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" ++ ++[[package]] ++name = "socket2" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" ++dependencies = [ ++ "libc", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "stable_deref_trait" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" ++ ++[[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 0.10.0", ++ "precomputed-hash", ++ "serde", ++] ++ ++[[package]] ++name = "string_cache_codegen" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" ++dependencies = [ ++ "phf_generator 0.10.0", ++ "phf_shared 0.10.0", ++ "proc-macro2", ++ "quote", ++] ++ ++[[package]] ++name = "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 = "syntect" ++version = "4.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b20815bbe80ee0be06e6957450a841185fcf690fe0178f14d77a05ce2caa031" ++dependencies = [ ++ "bincode", ++ "bitflags", ++ "fancy-regex", ++ "flate2", ++ "fnv", ++ "lazy_static", ++ "lazycell", ++ "plist", ++ "regex-syntax", ++ "serde", ++ "serde_derive", ++ "serde_json", ++ "walkdir", ++ "yaml-rust", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "fastrand", ++ "libc", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "tendril" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" ++dependencies = [ ++ "futf", ++ "mac", ++ "utf-8", ++] ++ ++[[package]] ++name = "tera" ++version = "1.16.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7c9783d6ff395ae80cf17ed9a25360e7ba37742a79fa8fddabb073c5c7c8856d" ++dependencies = [ ++ "chrono", ++ "chrono-tz", ++ "globwalk", ++ "humansize", ++ "lazy_static", ++ "percent-encoding", ++ "pest", ++ "pest_derive", ++ "rand 0.8.5", ++ "regex", ++ "serde", ++ "serde_json", ++ "slug", ++ "unic-segment", ++] ++ ++[[package]] ++name = "test-case" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "07aea929e9488998b64adc414c29fe5620398f01c2e3f58164122b17e567a6d5" ++dependencies = [ ++ "test-case-macros", ++] ++ ++[[package]] ++name = "test-case-macros" ++version = "2.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c95968eedc6fc4f5c21920e0f4264f78ec5e4c56bb394f319becc1a5830b3e54" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "proc-macro-error", ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" ++ ++[[package]] ++name = "thin-slice" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" ++ ++[[package]] ++name = "thiserror" ++version = "1.0.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5f6586b7f764adc0231f4c79be7b920e766bb2f3e51b3661cdb263828f19994" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.32" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "12bafc5b54507e0149cdf1b145a5d80ab80a90bcd9275df43d4fff68460f6c21" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" ++dependencies = [ ++ "once_cell", ++] ++ ++[[package]] ++name = "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.3.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74b7cc93fc23ba97fde84f7eea56c55d1ba183f495c6715defdfc7b9cb8c870f" ++dependencies = [ ++ "itoa 1.0.3", ++ "js-sys", ++ "libc", ++ "num_threads", ++ "serde", ++] ++ ++[[package]] ++name = "tinystr" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "29738eedb4388d9ea620eeab9384884fc3f06f586a2eddb56bedc5885126c7c1" ++ ++[[package]] ++name = "tokio" ++version = "1.20.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581" ++dependencies = [ ++ "autocfg", ++ "bytes", ++ "libc", ++ "memchr", ++ "mio 0.8.4", ++ "num_cpus", ++ "once_cell", ++ "pin-project-lite", ++ "signal-hook-registry", ++ "socket2", ++ "tokio-macros", ++ "winapi 0.3.9", ++] ++ ++[[package]] ++name = "tokio-macros" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "tokio-native-tls" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" ++dependencies = [ ++ "native-tls", ++ "tokio", ++] ++ ++[[package]] ++name = "tokio-util" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" ++dependencies = [ ++ "bytes", ++ "futures-core", ++ "futures-sink", ++ "pin-project-lite", ++ "tokio", ++] ++ ++[[package]] ++name = "toml" ++version = "0.5.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" ++dependencies = [ ++ "serde", ++] ++ ++[[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.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aba3f3efabf7fb41fae8534fc20a817013dd1c12cb45441efb6c82e6556b4cd8" ++dependencies = [ ++ "bitflags", ++ "bytes", ++ "futures-core", ++ "futures-util", ++ "http", ++ "http-body", ++ "http-range-header", ++ "httpdate", ++ "mime", ++ "mime_guess", ++ "percent-encoding", ++ "pin-project-lite", ++ "tokio", ++ "tokio-util", ++ "tower-layer", ++ "tower-service", ++] ++ ++[[package]] ++name = "tower-layer" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" ++ ++[[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.36" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "log", ++ "pin-project-lite", ++ "tracing-core", ++] ++ ++[[package]] ++name = "tracing-core" ++version = "0.1.29" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7" ++dependencies = [ ++ "once_cell", ++] ++ ++[[package]] ++name = "try-lock" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" ++ ++[[package]] ++name = "type-map" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" ++dependencies = [ ++ "rustc-hash", ++] ++ ++[[package]] ++name = "typenum" ++version = "1.15.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" ++ ++[[package]] ++name = "ucd-trie" ++version = "0.1.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89570599c4fe5585de2b388aab47e99f7fa4e9238a1399f707a02e356058141c" ++ ++[[package]] ++name = "uncased" ++version = "0.9.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09b01702b0fd0b3fadcf98e098780badda8742d4f4a7676615cad90e8ac73622" ++dependencies = [ ++ "version_check", ++] ++ ++[[package]] ++name = "unic-char-property" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" ++dependencies = [ ++ "unic-char-range", ++] ++ ++[[package]] ++name = "unic-char-range" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" ++ ++[[package]] ++name = "unic-common" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" ++ ++[[package]] ++name = "unic-langid" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "73328fcd730a030bdb19ddf23e192187a6b01cd98be6d3140622a89129459ce5" ++dependencies = [ ++ "unic-langid-impl", ++] ++ ++[[package]] ++name = "unic-langid-impl" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a4a8eeaf0494862c1404c95ec2f4c33a2acff5076f64314b465e3ddae1b934d" ++dependencies = [ ++ "tinystr", ++] ++ ++[[package]] ++name = "unic-segment" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e4ed5d26be57f84f176157270c112ef57b86debac9cd21daaabbe56db0f88f23" ++dependencies = [ ++ "unic-ucd-segment", ++] ++ ++[[package]] ++name = "unic-ucd-segment" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2079c122a62205b421f499da10f3ee0f7697f012f55b675e002483c73ea34700" ++dependencies = [ ++ "unic-char-property", ++ "unic-char-range", ++ "unic-ucd-version", ++] ++ ++[[package]] ++name = "unic-ucd-version" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" ++dependencies = [ ++ "unic-common", ++] ++ ++[[package]] ++name = "unicase" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" ++dependencies = [ ++ "version_check", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" ++ ++[[package]] ++name = "utf-8" ++version = "0.7.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" ++ ++[[package]] ++name = "version_check" ++version = "0.9.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" ++dependencies = [ ++ "same-file", ++ "winapi 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.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" ++dependencies = [ ++ "bumpalo", ++ "log", ++ "once_cell", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.82" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" ++ ++[[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 = "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 = "xml-rs" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" ++ ++[[package]] ++name = "xml5ever" ++version = "0.16.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9234163818fd8e2418fcde330655e757900d4236acd8cc70fef345ef91f6d865" ++dependencies = [ ++ "log", ++ "mac", ++ "markup5ever", ++ "time 0.1.44", ++] ++ ++[[package]] ++name = "yaml-rust" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" ++dependencies = [ ++ "linked-hash-map", ++] ++ ++[[package]] ++name = "zine" ++version = "0.6.0" ++dependencies = [ ++ "anyhow", ++ "clap", ++ "fluent", ++ "html5ever", ++ "http-body", ++ "hyper", ++ "hyper-tls", ++ "include_dir", ++ "intl-memoizer", ++ "lol_html", ++ "markup5ever_rcdom", ++ "notify", ++ "once_cell", ++ "parking_lot", ++ "pulldown-cmark", ++ "rayon", ++ "regex", ++ "serde", ++ "serde_json", ++ "syntect", ++ "tera", ++ "test-case", ++ "time 0.3.12", ++ "tokio", ++ "toml", ++ "tower", ++ "tower-http", ++ "walkdir", ++] diff --git a/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix new file mode 100644 index 0000000000..28fdaebe35 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/zine/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +}: +rustPlatform.buildRustPackage rec { + pname = "zine"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "zineland"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Pd/UAg6O9bOvrdvbY46Vf8cxFzjonEwcwPaaW59vH6E="; + }; + + cargoPatches = [ ./Cargo.lock.patch ]; # Repo does not provide Cargo.lock + + cargoSha256 = "sha256-qpzBDyNSZblmdimnnL4T/wS+6EXpduJ1U2+bfxM7piM="; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + openssl + ]; + + meta = with lib; { + description = "A simple and opinionated tool to build your own magazine"; + homepage = "https://github.com/zineland/zine"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix index 24511096f1..833b2e4c15 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/zola/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zola"; - version = "0.15.3"; + version = "0.16.0"; src = fetchFromGitHub { owner = "getzola"; repo = "zola"; rev = "v${version}"; - sha256 = "sha256-LK8twqWaS+SQ3oqvMGE7oP/IJNLvQ45Pu92pkbSKzDs="; + sha256 = "sha256-FrCpHavlHf4/g96G7cY0Rymxqi73XUCIAYp4cm//2Ic="; }; - cargoSha256 = "sha256-7W0vjbAWZl/eKBZvUWWWolEOh8aQeKegt823EebcKMQ="; + cargoSha256 = "sha256-c6SbQasgpOyqVninAo104oYo1CXpiECZvsB1gxrD7wM="; nativeBuildInputs = [ cmake diff --git a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix index cac64ba7f6..7dd69aeebc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/appgate-sdp/default.nix @@ -87,11 +87,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "5.5.5"; + version = "6.0.1"; src = fetchurl { url = "https://bin.appgate-sdp.com/${versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-eXcGHd3TGNFqjFQ+wSg4+1hF/6DJTPOs0ldjegFktGo="; + sha256 = "sha256-dVVOUdGJDmStS1ZXqPOFpeWhLgimv4lHBS/OOEDrtM0="; }; # just patch interpreter diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index f17bdcd8f9..2f291266a5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.40.113"; + version = "1.41.100"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-+lJjLfxEOf82uvcVaRbWYQ93KEzWGVrzXvI9Rt1U9Bc="; + sha256 = "sha256-r5mMI7iLJ+q4dvt/IDcFlHz56sygYXsG8bb29UVxmTI="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix index e106eb7ff6..60e8631249 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/default.nix @@ -1,60 +1,45 @@ -{ lib, buildGoPackage, fetchurl, fetchFromGitHub, go-bindata }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub }: let - version = "1.6.4"; + version = "1.8.0"; # TODO: must build the extension instead of downloading it. But since it's # literally an asset that is indifferent regardless of the platform, this # might be just enough. webext = fetchurl { - url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}-an.fx.xpi"; - sha256 = "1shf1s9s525wns5vrsc4ns21zjxm1si43lx6v0q8ma6vd5x5445l"; + url = "https://github.com/browsh-org/browsh/releases/download/v${version}/browsh-${version}.xpi"; + sha256 = "sha256-12xWbf4ngYHWLKV9yyxyi0Ny/zHSj2o7Icats+Ef+pA="; }; -in buildGoPackage rec { +in + +buildGoModule rec { inherit version; pname = "browsh"; - goPackagePath = "browsh"; + sourceRoot = "source/interfacer"; - # further go package dependencies are defined in deps.nix, see line below. src = fetchFromGitHub { owner = "browsh-org"; repo = "browsh"; rev = "v${version}"; - sha256 = "0gvf5k1gm81xxg7ha309kgfkgl5357dli0fbc4z01rmfgbl0rfa0"; + sha256 = "sha256-/tH1w6qi+rimsqtk8Y8AYljU3X4vbmoDtV07piWSBdw="; }; - nativeBuildInputs = [ go-bindata ]; + vendorSha256 = "sha256-eCvV3UuM/JtCgMqvwvqWF3bpOmPSos5Pfhu6ETaS58c="; - # embed the web extension in a go file and place it where it's supposed to - # be. See - # https://github.com/browsh-org/browsh/blob/v1.5.0/interfacer/contrib/xpi2bin.sh preBuild = '' - xpiprefix="$(mktemp -d)" - cp "${webext}" "$xpiprefix/browsh.xpi" - go-bindata \ - -prefix "$xpiprefix" \ - -pkg browsh \ - -o "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/webextension.go" \ - "$xpiprefix/browsh.xpi" - - sed \ - -e 's:Asset("/browsh.xpi"):Asset("browsh.xpi"):g' \ - -i "$NIX_BUILD_TOP/go/src/${goPackagePath}/interfacer/src/browsh/firefox.go" + cp "${webext}" src/browsh/browsh.xpi ''; - postBuild = '' - mv "$NIX_BUILD_TOP/go/bin/src" "$NIX_BUILD_TOP/go/bin/browsh" - ''; - - goDeps = ./deps.nix; + # Tests require network access + doCheck = false; meta = with lib; { description = "A fully-modern text-based browser, rendering to TTY and browsers"; homepage = "https://www.brow.sh/"; - maintainers = [ maintainers.kalbasit ]; + maintainers = with maintainers; [ kalbasit siraben ]; license = lib.licenses.lgpl21; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/deps.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/deps.nix deleted file mode 100644 index 12154af752..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/browsh/deps.nix +++ /dev/null @@ -1,264 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/NYTimes/gziphandler"; - fetch = { - type = "git"; - url = "https://github.com/NYTimes/gziphandler"; - rev = "dd0439581c7657cb652dfe5c71d7d48baf39541d"; - sha256 = "0rhrjlw220hnymzfccm0yir3pc9dpj7h3gwzhzq2cbsb3hhsqvyy"; - }; - } - { - goPackagePath = "github.com/fsnotify/fsnotify"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "github.com/gdamore/encoding"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/encoding"; - rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d"; - sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; - }; - } - { - goPackagePath = "github.com/gdamore/tcell"; - fetch = { - type = "git"; - url = "https://github.com/gdamore/tcell"; - rev = "b5d0c1ac570211e469f43ff88c0c6aa4b56cc99a"; - sha256 = "0g2zfbgyk3djlk0qpmrgcyy0ba9ad932yswpaacswi21qyf9gwag"; - }; - } - { - goPackagePath = "github.com/go-errors/errors"; - fetch = { - type = "git"; - url = "https://github.com/go-errors/errors"; - rev = "a6af135bd4e28680facf08a3d206b454abc877a4"; - sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"; - sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "8cb6e5b959231cc1119e43259c4a608f9c51a241"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/hpcloud/tail"; - fetch = { - type = "git"; - url = "https://github.com/hpcloud/tail"; - rev = "a30252cb686a21eb2d0b98132633053ec2f7f1e5"; - sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; - }; - } - { - goPackagePath = "github.com/lucasb-eyer/go-colorful"; - fetch = { - type = "git"; - url = "https://github.com/lucasb-eyer/go-colorful"; - rev = "30298f24079860c4dee452fdef6519b362a4a026"; - sha256 = "0fig06880bvk1l92j4127v4x9sar4ds7ga8959gxxghb2w70b7l2"; - }; - } - { - goPackagePath = "github.com/magiconair/properties"; - fetch = { - type = "git"; - url = "https://github.com/magiconair/properties"; - rev = "de8848e004dd33dc07a2947b3d76f618a7fc7ef1"; - sha256 = "19zqw1x0w0crh8zc84yy82nkcc5yjz72gviaf2xjgfm5a8np7nyb"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "3ee7d812e62a0804a7d0a324e0249ca2db3476d3"; - sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "eea6ad008b96acdaa524f5b409513bf062b500ad"; - sha256 = "1326s5fxgasdpz1qqwrw4n5p3k0vz44msnyz14knrhlw5l97lx33"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "90e289841c1ed79b7a598a7cd9959750cb5e89e2"; - sha256 = "1n7i4hksdgv410m43v2sw14bl5vy59dkp6nlw5l76nibbh37syr9"; - }; - } - { - goPackagePath = "github.com/pelletier/go-toml"; - fetch = { - type = "git"; - url = "https://github.com/pelletier/go-toml"; - rev = "728039f679cbcd4f6a54e080d2219a4c4928c546"; - sha256 = "1v76s3vds0i9dxaha4ikd6xjm7vqqfk6sy9l6jc2lsvmj99d5sy6"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; - sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; - }; - } - { - goPackagePath = "github.com/shibukawa/configdir"; - fetch = { - type = "git"; - url = "https://github.com/shibukawa/configdir"; - rev = "e180dbdc8da04c4fa04272e875ce64949f38bd3e"; - sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z"; - }; - } - { - goPackagePath = "github.com/spf13/afero"; - fetch = { - type = "git"; - url = "https://github.com/spf13/afero"; - rev = "588a75ec4f32903aa5e39a2619ba6a4631e28424"; - sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9"; - }; - } - { - goPackagePath = "github.com/spf13/cast"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cast"; - rev = "8c9545af88b134710ab1cd196795e7f2388358d7"; - sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; - }; - } - { - goPackagePath = "github.com/spf13/jwalterweatherman"; - fetch = { - type = "git"; - url = "https://github.com/spf13/jwalterweatherman"; - rev = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1"; - sha256 = "1ywmkwci5zyd88ijym6f30fj5c0k2yayxarkmnazf5ybljv50q7b"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "298182f68c66c05229eb03ac171abe6e309ee79a"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/spf13/viper"; - fetch = { - type = "git"; - url = "https://github.com/spf13/viper"; - rev = "b5bf975e5823809fb22c7644d008757f78a4259e"; - sha256 = "1zpzxvn13wpvbblbbn73svaq39zgxfjqhci9d68g3qf309pcfy19"; - }; - } - { - goPackagePath = "github.com/ulule/limiter"; - fetch = { - type = "git"; - url = "https://github.com/ulule/limiter"; - rev = "38b2a440be905c8be884fd5e114dc893a64e5d81"; - sha256 = "0sbbfz9k3m2hf45cx7y7xshsr3rac495lks9ciwmnrzsnxfdh3l5"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "461777fb6f67e8cb9d70cda16573678d085a74cf"; - sha256 = "0sc0llch05q6h7nqgayi3sgismsznpnlsz4gh89y4klpymdcpbh2"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "93c9922d18aeb82498a065f07aec7ad7fa60dfb7"; - sha256 = "0hv96nwbv0li3nrv43ldfzmf12yrrbji2cf8n44iibv8ps5kfssx"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-tomb/tomb"; - rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml index f2bf29cda2..10cd77df21 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml @@ -7,7 +7,6 @@ enable_js_type_check=false enable_mdns=false enable_mse_mpeg2ts_stream_parser=true enable_nacl=false -enable_one_click_signin=false enable_reading_list=false enable_remoting=false enable_reporting=false diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 3ed40359ed..4e3caaf5a4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,27 +1,8 @@ { "stable": { - "version": "103.0.5060.114", - "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", - "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", - "deps": { - "gn": { - "version": "2022-05-11", - "url": "https://gn.googlesource.com/gn", - "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", - "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" - } - }, - "chromedriver": { - "version": "103.0.5060.53", - "sha256_linux": "1gpxfrqf2wm2c76701rnw0h5ppmaqzf5ygcrasj1mmwjsfk49v5d", - "sha256_darwin": "03ibi0ybr3mmk02mmn6dp7ygjn7c9wwvahbhm2syh0fhxyyxmf0p", - "sha256_darwin_aarch64": "13bb2ai32b1q4lvyhcgp5315zzxwbi6609xxb67h7h3i3rb2yhcd" - } - }, - "beta": { - "version": "104.0.5112.48", - "sha256": "1zk4ywphcy6nrv0yf38yhl2bcq6fk34makglx31aalf2nhhw945i", - "sha256bin64": "14cx0m6jak4cma62axli0l4gqzqqh4gs7gam2dfahmwxsgcdwwn7", + "version": "104.0.5112.79", + "sha256": "1wxb3nl080wgg1g61g3pgzz3gaawg442iv8pxqhnayacm3qn5ilw", + "sha256bin64": "1m09bbh6a4sm5i0n8z2wy0hb8s7w0c2d335mpyrmndzs45py5ggx", "deps": { "gn": { "version": "2022-06-08", @@ -29,12 +10,31 @@ "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" } + }, + "chromedriver": { + "version": "104.0.5112.79", + "sha256_linux": "1naxi6pa5l9ciwzlqimcwqfjsqzyqndg1i0hp6zwh20wfvcfms3w", + "sha256_darwin": "0lgls8vsv31apgxjvksqaaiqj78q5v3bs0mnrxhfbw7cbhf6wxk5", + "sha256_darwin_aarch64": "11rjqdd65zibhb1gvdwy0slcdpvwh77mkhcj5hdg4hdlysd1a3a2" + } + }, + "beta": { + "version": "105.0.5195.19", + "sha256": "08wap1v2qjx8nzd8sbiv24vx0vdc2dhlzrlv3g4zpm2qj7l4mki7", + "sha256bin64": "15rhslgq77wiwiycf6m89vi3f5vry286b7kqfk0v5ibmcsf6clgf", + "deps": { + "gn": { + "version": "2022-07-11", + "url": "https://gn.googlesource.com/gn", + "rev": "9ef321772ecc161937db69acb346397e0ccc484d", + "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" + } } }, "dev": { - "version": "105.0.5176.3", - "sha256": "11zdihvy1n7d3vfl88477ppbfjd3mmkdsj4pfmfqm4mpw7zgi7fy", - "sha256bin64": "08rhg2am01dbb15djh7200wsg0wb48na09i706035wnnf0d8z313", + "version": "106.0.5216.6", + "sha256": "1mgdzm5iw0ml9w68wszcscw0d3l2rlsanhznyz2ll2qv412wxgci", + "sha256bin64": "02kj2swqfvcvn27x22i98g7r0fj4p20bqcabagigxs1bhxw56akc", "deps": { "gn": { "version": "2022-07-11", @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "103.0.5060.114", - "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", - "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", + "version": "104.0.5112.81", + "sha256": "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y", + "sha256bin64": null, "deps": { "gn": { - "version": "2022-05-11", + "version": "2022-06-08", "url": "https://gn.googlesource.com/gn", - "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", - "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" + "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", + "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" }, "ungoogled-patches": { - "rev": "103.0.5060.114-1", - "sha256": "11i7d480q21vcd9p14rc7rb408xwlg2nkj88dq0sfj2rz60lzy0a" + "rev": "104.0.5112.81-1", + "sha256": "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 76dcafa844..9d3ff6a0da 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,985 +1,985 @@ { - version = "102.0b9"; + version = "104.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ach/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ach/firefox-104.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "f6a62b8149ed7bd0d5f544857caa895421515aba3c18fa2cd706ce79932a1b45"; + sha256 = "9c343be5e470c8580af9c55d00e3c894c63f6a2fd1bddad2ff8c4e0782aea58a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/af/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/af/firefox-104.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "8f6004b6dca8bbe0bc3fdd58b2e8196213911618287cefd0489edecfd7979930"; + sha256 = "ccd2e3b4126cdd3517a72d9749cc8cee062280edc2fa2e4b3a08bf1bd515319b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/an/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/an/firefox-104.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "fce57419cd95a2e3c395070bf37b224983cf20a04c90721374ed1a76e5c0770e"; + sha256 = "e293bfc57aba4cb96de21a3d4047749ab54ebc431afb8f4352989f2194296f1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ar/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ar/firefox-104.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "412496ab20fb82702db69299759a955726d45dfd430e13705b60335c095be1ed"; + sha256 = "03dc14568cbbaf34b1037b2b7209a79ddee5bc42c74e73b27da2664c4c07d742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ast/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ast/firefox-104.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "757d92e5220400919fc0f658ea9cd319498b752a10a6a8e1b1ceeff8db3057ec"; + sha256 = "d9d72b228f3776bda85fa8bd8c11c8292bda366b5957b25ba1de1087cd98d997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/az/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/az/firefox-104.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "9e05bb2ee38e11e50af90975a6d0ee191ed040d5bf4e27c447a9bb80385915ab"; + sha256 = "efa196f5353ffd787d21a575960222827ba1348ff9026d70b6d6b29970985313"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/be/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/be/firefox-104.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "86e6df9cdaab54b8dc9bb0def3a3dbb724168798fa5df44a34fac5cda4cc294c"; + sha256 = "7a7a4ffa2a65535612a9109f3a15ffb314f7cda362347760c19cccc6d112251d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/bg/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/bg/firefox-104.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "07de1169bfb798b74032fe40da2239e165066f0f9ddd15ce5ef818103498cb76"; + sha256 = "c96ec818e5811d446fb55c43cb6ba987c84d496a4abea0c627f5ae592c1e7967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/bn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/bn/firefox-104.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "c5913cbb695e2b1c51ee298117fc1a26ad044ea84389b12cf32345ae8e2d6a7f"; + sha256 = "c0c4c51e0d15c33e61d5fa0b98c9b065f27b4c4218ea6cf5c2884b05243a8e49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/br/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/br/firefox-104.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "072b458f42f7c0d42a0672a0d77d7db9e9c6423ce8efb3ad3ed008637acd849c"; + sha256 = "4e92a5a3c24fbe7bf2d1f4db86d2e4f2a4248b8dd413886f2df8d12e9bf7d979"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/bs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/bs/firefox-104.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "862274ebaa9d718c1132d168e29105c804ee457d1fc860d3eb57157c70a54c13"; + sha256 = "07b4e7801d4fc3075d0fedade3fdcd1de04d19670a33a4bc358c5229aa49e5a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ca-valencia/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ca-valencia/firefox-104.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "2ebd10e91fd537794e5139c0a70a2117f6b6288dd452ed34e28260cd708d68cb"; + sha256 = "e69b015b3ba339506818672cc56a16d08f6a649731bba34275a08778718ea456"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ca/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ca/firefox-104.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1abc9f7856aa1112cedbd34852620315be7b00d5a4057a930cb9e82d7b8caec2"; + sha256 = "3f396efb1aeee865d62c1b5db6039606f3b75f079d12be1cb5ff0d8c9cf6ea0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/cak/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/cak/firefox-104.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e7ff230c42648b2df77613e51ca0bc9d9bc02ce3b0256c0b7c6f7eb4fbaac031"; + sha256 = "66379c54716abcf3922c9b03b60b413ffee83ac574b6a8bd269a09ff842ee252"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/cs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/cs/firefox-104.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "92f1876d0214796bf074f453b16c728b1e96abbc91e25bc8fc1269204e9f8068"; + sha256 = "3d4638cf25c6b5c06e7de0c4314bb58ebf3cc49d6db99c2c7471f0c1920486a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/cy/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/cy/firefox-104.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "5a0bbad296543c64d7f5d44a7b65447f8f502855769cb35ba39afa501cadb438"; + sha256 = "5ddd17e2182dcac68c312d32cfec3b3bccebb337fc8bec1bae429ba6969c4de1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/da/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/da/firefox-104.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "466ade4b3d5efabadb562320e1eb9a4b74add0a9b2b9388413abb0aa9e1c8fd4"; + sha256 = "9abfcda70d3ee6bab74b76c7e918ca051cdd1367b451f197e51cf4e51f25458b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/de/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/de/firefox-104.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "294b403166693f2612d3a6a30d540f88acec826a4c1c8ef0c05231bc6dcdf079"; + sha256 = "51150253b64cf14fb46cbce888cdfc4bffffe20d383012e97dae2eb28b571ed6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/dsb/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/dsb/firefox-104.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "457bf545b320ea85643db20754fbda4a01c4bb06078af3849561b724cbb30aa6"; + sha256 = "fb456a3fea9eba3ef2fafb95b4d4f8e33029a26247f2d3d9af78366bdf606c57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/el/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/el/firefox-104.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "91c0ae42071fa97a8cfa69d898b7da202e62e28dfdb224d190645409688d59d5"; + sha256 = "8459a53e040ae2b1b9c18140012075432d8fcbbd875bd96ad800db356424819e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/en-CA/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/en-CA/firefox-104.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "24b113b1f90dd271c389909287230034edeab7109aae3b33dd1bcb3f31a8de92"; + sha256 = "ff5c49878f97ee37d0703a326aeb3faeebb3ac6a6dab6d0688b0961a6e68c839"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/en-GB/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/en-GB/firefox-104.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6a74d7384f80eac4fd9e8502b6de230ff2a9147b8df5594fd8cbdfbad0527869"; + sha256 = "fef8b5d014e9e136ed491b01282052e5bfa28a772fdd1fd7cdb9df53493aa03d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/en-US/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/en-US/firefox-104.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "05c2ba22559d7d35b93196ad93bd3268cb85946c10a57824eaf2abe298e3e650"; + sha256 = "5624f8686296d2aee7920a9587e825b4d5c1f60a8a657dc651230db9fff4da8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/eo/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/eo/firefox-104.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "e0b2dca237a4a5512f919927c9b62cab48a62a4aed8a3485124ba81f007f048b"; + sha256 = "f81b129fbcc6739906109214f7bbc2ad60978a0f2dd4905afd56d09a5e0f1154"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/es-AR/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/es-AR/firefox-104.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "994709b21742292cd6f3d8f34881578b43b7f57661134fbee88f8a12ba68adbf"; + sha256 = "c1e47a426cad118df541d1461181e27006a0101e90729c5a7e106ccc3f816ed6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/es-CL/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/es-CL/firefox-104.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "f074e4ca16f37e5f9654fb91107b3396c4cfe52a707a691e4bc17a1e31e994d7"; + sha256 = "e80a62a9f34f94b65554e95af5b21c0c859829fe23777e943263e7f68f8e0871"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/es-ES/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/es-ES/firefox-104.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7619f6e2a6966b23a5da0d202fa01ba299db426b9254d42a22f9a40f6565ff6f"; + sha256 = "a04a43c034fed78fb1180ad7016e5fd0810b0e437f679ffbe1521866387e2698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/es-MX/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/es-MX/firefox-104.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "913d768d2d7c983da0aaaef3cc774fb17acf726878de65a97c10cfbb71648e94"; + sha256 = "986739b20e919aba1b38c6999db7bc5995dfe751881dbc3ff8029f828c6bfb73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/et/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/et/firefox-104.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "e4c654a9bb423e2aee965ae4c78ebd4527282ce5f6732f461975b46323e43d2a"; + sha256 = "021bde5f3fb0b44afed6282ab85c3d960ac5ff799b1237cac58245cc337fb417"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/eu/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/eu/firefox-104.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "335be9e6ddd3a026282b3efd4e9d94f96009794b818506dd1ae934c0a71b13a3"; + sha256 = "d7131c1552831e9d06c37f9554a415fd50a4d2945bd061980b70fd4e340553e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/fa/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/fa/firefox-104.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "1f9ee2e5d6662023fe1e5e36b4663289e040b0cb736bafe4d0993574b0105628"; + sha256 = "7454a924dcf84b1889e1c051313d4f39f044453b8934832000d260e8167d2115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ff/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ff/firefox-104.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "0dfa9858f637af48365d49979af1d61f2b83c29e93af1ab09f7b0bbee47f6d28"; + sha256 = "c22c7f8ba198e9e4f1d9979da32353bfe1d7df19c64d404a22d3923bbd8a5a12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/fi/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/fi/firefox-104.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "3bd60c1d82ccdcee32c5a8281039628b0da80b55520a26661e3e663b0ee6ae5b"; + sha256 = "b3637524eeb5b04dac3e6ea87b8fe02304c9320075fe6ed1b3e8f1c44b4093eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/fr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/fr/firefox-104.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "91a40ffb51816c74859e99458ad7673e7432f586039effd1087cb6ea549b8833"; + sha256 = "68bf86feb2ea985ce28932b728d5fb9041b78d3b362ef0f6226ed303b9274d81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/fy-NL/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/fy-NL/firefox-104.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "b0e4db755b8d145318cf017498d91ce7c7b6c10a9ddaff8b89b9214d93099a20"; + sha256 = "c733e64f3a159943a34b96af605dd0c2dd7361449d4ec107f54c2206cee04694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ga-IE/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ga-IE/firefox-104.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "1b827951034f7a9b3a8abf6fd8d8cf0bc6cc05747f0bf34d334b06f823d5a2fa"; + sha256 = "b713178cff8492d310cb6020addfb596a1f3f2040830e6b77f723c3d6fb6cce3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/gd/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/gd/firefox-104.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "4f3c924610b71a449a9a06412bec34f5cc24e301ffa67d4ed2b8ca793bdec98f"; + sha256 = "535d83dc01ca52c6b4b20bdd14fc20213494e34bfbae9573df3dbb86da386db9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/gl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/gl/firefox-104.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "1f3c5eb9235bf52762d36f65a22a3db1eba899e9cb33855c8dab7c62dca12298"; + sha256 = "4522adc99ff95fea93adf462791bcfb05bb4fea55bd7f4d93abf879fbeb4260c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/gn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/gn/firefox-104.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "1c19bf45cdb749b6c642e92ad9cfc50025043183804cc144fb2b41110e0d8c1d"; + sha256 = "4303e8a97d810629095a3fa1e2acdb9bfe25e294abe2195a3e997342bcfab467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/gu-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/gu-IN/firefox-104.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "3180bf019cc52bcf07774969180576cd3df61864dc37bab67ec6ca2927e2f33b"; + sha256 = "86d6b66a21a97c6d8c45b5a15ac0fea6089fbab18a259b8f07f4262438ec82ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/he/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/he/firefox-104.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "18afc8e49fbb495a88939aa3e39a1405d7cf5924555b5e87c05bd591b0687910"; + sha256 = "a93c88fff79ca1b37cd8bb5ab475b21ec427c0fb2c80154bf8fd46b081aa5e19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/hi-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/hi-IN/firefox-104.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e0625561c65fa65fdc9dec3679cad9ca0d9339a5c566ff1b33d0dcc2724eb1f8"; + sha256 = "d6e88f00a6560484e160f5b31ef140e30d30f1126843de4e3fe4237ad7297722"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/hr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/hr/firefox-104.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "d733426ddc6e8adad2ac6b0e49c328cba3116164c33ee3bde9d2058164365097"; + sha256 = "301f0475fe19b63d1df09d1495752e78cf5e22039f946b89425e950416b11e43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/hsb/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/hsb/firefox-104.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "95fe6f146eb82b214e0ae9eb000508dd56ed829854cd6960d7a06782bd3c9f27"; + sha256 = "a69480838d3f553c11426e062a25cdb0a4d2f1e0555a5086bb840bfd21820289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/hu/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/hu/firefox-104.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "dc9b58f809395ce0c9140cd67179bfe844b4ad16c8700ca20cfc9cda4bc82a87"; + sha256 = "a91e947690fb656fe440db5ffc9ce132270b7fc59af7007ae45ecaf72cb96b48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/hy-AM/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/hy-AM/firefox-104.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "091a28c4179c5ff321d91249b8fc9ebd9cd791b78577805aba592a6bc34ababd"; + sha256 = "ecd9ee091040bfbcbc02d01e4bab2f3cf58acddf3299c646f9fce23b4518dd84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ia/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ia/firefox-104.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "af6d2e552f581d33b2a9ac847235fa05bc8d31e5b0adfc5b9b2f388c18a943cd"; + sha256 = "0d5dcfdad66812fa592a99db05f4660b1a2d1cf7e058875984db001911c7908b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/id/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/id/firefox-104.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7e8bc203cc0de401ca57da1697ff19f1385f1493f05bd0b09bcd1575364b0525"; + sha256 = "61367949e4077cd27907faa4819554baf11c2d8a85d51bfa62ab980cc4facce5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/is/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/is/firefox-104.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "327c418e89dc0f7a465252186622df20eb32f1f626a643195f5d18c80d985c04"; + sha256 = "f1a81783da1876129a7b8f821bb3f6f56e1553abc4a05c424b22be553747ae19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/it/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/it/firefox-104.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "ccb3930cb1daea27adfdcd5060badd6224fade2b336865a66104e95ec7362428"; + sha256 = "1ece01f5770e6c529f544ad34b7b1fe842a7cb4eeadda48a3a6481bed4e295e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ja/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ja/firefox-104.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "e48d5977a1c1e2c251c4a93c749187e5061800f5c2c2834834ab401d68b8daca"; + sha256 = "c4583686959afd416c945cb17e816e02e503354a62a0e942f0bb68300b8ebeab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ka/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ka/firefox-104.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "dddaf01eee264975209a3f25e4b2d72b7f9a10c41db9ef331043b37c91cf7d71"; + sha256 = "750fd298de9530d92f50df82af2f4717a801872abbc77869f6f19a8355c40f48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/kab/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/kab/firefox-104.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "0cb3a0723a0ebe3c90682a2356b994c8c7986a44fa159df7b2a61163fe84f598"; + sha256 = "ff1cc19234f54b55ab9d1d37b668fbf5dc0c3c668430bd4959e78ef84e21476f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/kk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/kk/firefox-104.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "8ffb34d138f675cb1d4521accd7cb74f7d3aec5f18977fa101e97e9412b0bf06"; + sha256 = "c5586063b96f19b31a7561b8b9810f027060ca943aa9f982328c48e930cef32b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/km/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/km/firefox-104.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "3b1d3d06d8712a8e308b5cebcc92574bed651f284d6e55b52ec96ecc1c1bb4d6"; + sha256 = "332d27fa7bef1af230f07781b3b8e87cadc8c06bb461f7f89f02303436580481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/kn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/kn/firefox-104.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "6b6eb8d59ba445fb76b310241f05a927cb6e0cf03e018532b61ed5d3a295f1d6"; + sha256 = "058a8bafc3602bebf79ab9b3781bfa45d9faa7c9de628f7d68842aaf1b6a5cb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ko/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ko/firefox-104.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "cd486e51854aaa070ef2e98c0f97cc83f9336b33cb082cebb5634c9809429dd0"; + sha256 = "bda632e9fe46393d48a38cb603a8b59cae19033523dbafb1f517f2461313c167"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/lij/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/lij/firefox-104.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "42f09292edd9df0337142ce49e3c52352dbeb4fc3c44b7e9dafb38cad5d40bfb"; + sha256 = "8dc76d55145fa52a52d23e4492b9dc3fc54591f2112f40aa8ca61391d8cd0e61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/lt/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/lt/firefox-104.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f559821d7c372ecff40cf79b36ddd74629a9ad5404f1e39f07fd586618914419"; + sha256 = "b03913e4962267c1dc8cd16416dcb2821c197dc3978a6823756880ee78826ca1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/lv/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/lv/firefox-104.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "86fbfb43010472f8cca75b64f24493682dbd3a1837131c90ac784ec4400a185c"; + sha256 = "9c8e870f25884160167f513bae92ce073ef09c0a8fcb544f135c57a83f68fe85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/mk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/mk/firefox-104.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "021576bb2b687e76dc4df1b3b739dc6fb47be1d80fbc28e4cf98e0bd8df537fb"; + sha256 = "1afc931626c1a732bbbaa6a83afa927fc918f44055bf0250a993786422cc0bfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/mr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/mr/firefox-104.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "7d75029e32f227aabc5580c036a29190b1b7ff1accc945d6c6269225dcf55812"; + sha256 = "d8c323b23d3dffde46e6ea71bc6f8b90f3d9c794063fb7ee0db94394cb8f8f97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ms/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ms/firefox-104.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "3d7eb53c775315e84025e5163b8b1386b9353f2f3371b13d253aa73c7fbe6acd"; + sha256 = "63f07d68543d38f97979b7044abe0ed3664f22df1804beab77f27f71ca228447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/my/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/my/firefox-104.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "7bfa3b314c618fcf299ce4907bb54758cc696d50ed2675cb88b0bdeb908627db"; + sha256 = "c293f413290a9c9d43fc46f08e2848608c2bf5cebda98c031347b335a96330c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/nb-NO/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/nb-NO/firefox-104.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "781e3c9be1f4c3c23f6084d6e8c88d6e6ad569d3eb40433499a4aba7661a425a"; + sha256 = "cac3bb2bdf6f46e2a2f0afd85d4a8782b6072204f5cb4456964f004d3a7c17cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ne-NP/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ne-NP/firefox-104.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "3504c5dea5f6a6ad82fd5075efd63d4ff195839a733917200c782eb113d3a695"; + sha256 = "fee892f2aed6af5c5429831c14096010a47d2abe2db243662965385deb1bedc5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/nl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/nl/firefox-104.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "5967441d70b936e00a7bf2e89cbbf40d967a28d2eb6affc4c101888b4801e7ba"; + sha256 = "752052b608b994b83c3bf2fce4499c3438650690d26c90693fa44cea94b70f0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/nn-NO/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/nn-NO/firefox-104.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "03f3b86f89d560f71db7429ad9506e10eab9284c16877f0076295e1d01d17ac3"; + sha256 = "25345269a7053cd9886c3a70420c5572f45df7caa24eb7d963ac11369c55896e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/oc/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/oc/firefox-104.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "0512991bbf04f9b23b6d7ebf1dcd6eb121550d616e7fe36d2f20cbdfb9703130"; + sha256 = "58a605b62089384363054028b23d1828c3fcb18f16c5da08807a9b8442732dcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/pa-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/pa-IN/firefox-104.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "1eccf86a9c5cc2d2471c0d92a09ed982e5507a918d36b26eda3862fa7c44b1f9"; + sha256 = "5c8055524dac1bd0d78cb77fc8db2af6e137b3c725c4252232feb0ab6a1dbd1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/pl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/pl/firefox-104.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "fe1f71e8281b0b9f27b378926c97b03105167035f727e82512bc8ae22ce00ae4"; + sha256 = "c25fd4e8f824e9e6ea6ec9f8654e046fb5bb17d5820672302c53e35e73b297f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/pt-BR/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/pt-BR/firefox-104.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "058b62559effbc6267a027d298fd876d16fab1483bfd13ab846748c7d835dcc0"; + sha256 = "71d31b454b46394944725733b84b49c545f99ac310c058250e14b6787b226e18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/pt-PT/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/pt-PT/firefox-104.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f0e6ea6817b630e7217b5cb01818e2e1c8f90f21cb4d44e53c2df47e9005d255"; + sha256 = "a3823bdc1769e107dfad12529b705e3c1645b6c073df80e7d73aa0ee9c6a06f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/rm/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/rm/firefox-104.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "7fcfc37ec448bd4bedd57c2c80c0ccf93eba18c98d148c2a064735c37f596b83"; + sha256 = "c7e5f547d0a50bbf9bc29050922b41990302919656e54b448fbae92b6dbfc08c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ro/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ro/firefox-104.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "16ada7990282d86567e959afcecc4af834e87b0529908c9438cde9c5423f0ab2"; + sha256 = "3cfb212546e44bb4c9c64b169edd1239007362f146cd96ade0356b0891bcdf23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ru/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ru/firefox-104.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "f8fba469012ca813959d1e18ada6ce5f08ac2149860dff94a6ea3955b43b187e"; + sha256 = "1b72982e2bfdd66776366e3f7e32e5ec65e2e57125f0f17c3d53087720d8f13b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sco/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/sco/firefox-104.0b7.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "f1b44b4ad4bdc9c7477e1217f82f38519c69d03197f3c2b4a7745bfd6e21166e"; + sha256 = "408e66653cc8f550c31a2760ee36299613d5dcf95027acb9f2f7df75503ec8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/si/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/si/firefox-104.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "b2674ca44f703c0c87cca9338448010c12e5ee6815fa13bdc7d75b86c78ef50c"; + sha256 = "b7806c3e71c9dd27cd90a4ba5bc7b12fecc77c0808af2826153989cb1bd40b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/sk/firefox-104.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1b3c1ed920596bdd9c4563e590a002304ce03b16f83795dcc0e64943029af7a4"; + sha256 = "21cdaed6c15a3d00a8ac774d86cb1ae088f8812b6a0cd864df4ab89bc7d0d98d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/sl/firefox-104.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a5d90ae445633614a85be7154b5633b030fced435886efb24abae7d7da273ab2"; + sha256 = "41d128459cda4ffa252014d34977eed5f1f1a3a4f445177dc7ccd486a94ffd89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/son/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/son/firefox-104.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "94ab6ebd8a40883050043d0976ef67e27432b4797c699a7b8305169e545276e0"; + sha256 = "b879ddf33a8c7be027a923fe9a3d3221fe4bd88e1d4bf9dd3e11844612b48883"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sq/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/sq/firefox-104.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2616ea691b488f9c7eef6397beb074ad90bc15c32f4789a60d6a2a776cd3a6de"; + sha256 = "ba4b77291f499b79bafc0250b17edffb93942e6393526007b5a67364091893f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/sr/firefox-104.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "b09e7265ff516d462da24e059e4420e4b40c96b9d705449fd5474bdacd8f3da6"; + sha256 = "1da4f9e84bcbae7b73e66a9520d179221280d7aca4792895f7e14be568425d48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/sv-SE/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/sv-SE/firefox-104.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "bb47fc71084f21fb59bfbd5f35c86a5b31cdb961345b8cc9885014cd1168686d"; + sha256 = "5ad9dcec171689f6a586b65269a4094879e2fba8494b8f68c41de3958324f8d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/szl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/szl/firefox-104.0b7.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "264a6f0d1a9e1c5f8862f1632a1ef6aaca9ac7c4e1c58e3704e1fc8f2b920caa"; + sha256 = "bc74b0038e6481610594878ec7b8bdb6fc10fcb044c21fa104230e386743631c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ta/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ta/firefox-104.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "d53616088845bcb779301c265452d75d37081785286c2b923ab149ce7ffc36eb"; + sha256 = "4386d2cb98d05dd94ae7d22cc033e9a53cc9beddf795dfb66981a3f5085f1107"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/te/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/te/firefox-104.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "b9fe7b1f0f7fce1823b71a06043292c160b44bd9d1ea45e7a5a4aee680a02d14"; + sha256 = "314eddb25baf468b3eeb8e290f30293d30079924fcf42436f19966a94a8a1438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/th/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/th/firefox-104.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "778c01294759cee55da38a0e94e6bcdc29d61b20064d6c58d4202686ce92ed14"; + sha256 = "20782a4079ffe6d3b26017542b6bb988b65335555e9672653b32081245e8b595"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/tl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/tl/firefox-104.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "da70af424c392a72a15f6084cf3f9fc467f70cadd51b8e2b23a67c840490a163"; + sha256 = "9fbf729d12f5b0e5dee67cdd808ed40b28c0e5e8dc6c9c68cc6c5f7aca34176f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/tr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/tr/firefox-104.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "32c99fd1ea5648cae849e16792875ee6610f80c3a3e16cf8c9fc872ad4ca2568"; + sha256 = "ee3ddac16b5966e37b02eb8a330f03fd59c034d07a8fdce5f8539bdffcee34ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/trs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/trs/firefox-104.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "dd33de848adbb8d19cd1135ec172b4ebd8e14919f1ad710164b10815f254d3db"; + sha256 = "56f75b8fbfcc32222f969d9eae2ce9e8979a31f923d7e26c92ffd2487151297d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/uk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/uk/firefox-104.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "20d3f58d75ca72c7bab2537a49777b5054444673320c5fc226665129077d68d3"; + sha256 = "16789e8d01284c2fd8660205b8abfa797319f5c23fe48de423ee42588285e45a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/ur/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/ur/firefox-104.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "97441900226e7496f8be02f6845a795d7a219971ba91b0bd2e01ac740a41b143"; + sha256 = "8feaf5fa1a1c3a7eae3db731b7262abaf78576b1c37d97564bf3e45c3e7e8ba4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/uz/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/uz/firefox-104.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "79b3704259a848b01e2d09e3ec6691162ddb9c938e950c5fd88cba3b0ebbe165"; + sha256 = "2f1a7b634bf9ddc6db396c799e98fc408ad3b5d8e1dda0f4a149d48af08325e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/vi/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/vi/firefox-104.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "df0767cb2a81e66e8e74db143d7f2b783dc87b7cca5245a5dbd8bfb3da168913"; + sha256 = "ccef1f172cc2170a2d96a34380a14b146533414e9421b1c04cded141b199b3a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/xh/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/xh/firefox-104.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "c9b1525d1c74c8f22066ce92ed3020a311acb13daf481bc1b063ccb24d5d04f4"; + sha256 = "7841221ce073dd3557454c0b1ec107dccac9af9efb920d9f63b878eaeeab9170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/zh-CN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/zh-CN/firefox-104.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "d0fe983910d03407eb1b66ce22b98a916c3f8f37a66903ea9852a45219444ed4"; + sha256 = "39074fc90590686902434146bb0d2e8b6b79862961e368faf1f669d0fdf63614"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-x86_64/zh-TW/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-x86_64/zh-TW/firefox-104.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "251a6746ed303b4aedc70c06609ebd5677abcbb7bc78f6124b86cb7d601827f6"; + sha256 = "8d576d5b997bb7a38fbe2b4b636bf6b62b8699f17f2843093167b41eba4bb25a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ach/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ach/firefox-104.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "1db3027a0ff4f97a9f3b89e74c0cd064a6e286650107e3c679637e5a3d8bcf9f"; + sha256 = "c5fb0c68f29144d17094766cdfbbf08fcc0db7968be2df66cd5f7610b73d26e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/af/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/af/firefox-104.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "9b30388af217863bfdfe515fbdc4e8f75fd10d42df0f1e792718e2866277d3b9"; + sha256 = "49241e83e0cc1f204eb9417e0005b29402931c209df1d95a90dc847a0a1e9eed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/an/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/an/firefox-104.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "6039792ade1504227eeaab031419a21f059fb8e86c29a92210c92afbae228b0f"; + sha256 = "ce14d78d18b8a66bc30453e7f7cb82d2bb373c7f7f132c4c0ac90fb52d37f64c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ar/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ar/firefox-104.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "96fd651782739e9d6b0801637546d0c081bc3180f1c893594364992d88e8d351"; + sha256 = "ecb90394a735f2e7a0b376326647f19d0ff269de79d4b1f20c4fe9299566dea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ast/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ast/firefox-104.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a781ac01567448a3f333d71ccc925db988f894d8324e186ed9b45a51a846ba8e"; + sha256 = "f0f5c82b14cddb90969ca0105b13797248fd6593c80e8e7fa67b3b484f415830"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/az/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/az/firefox-104.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "64b5ff9a72fca91631a0de0197945fc29b6a0816b24ec803b896ace5908439a6"; + sha256 = "63c4dd31b05c96d18478e481c08dd4d7068e510a6e10407f50ecb2163638b99e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/be/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/be/firefox-104.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "0d6fbb02a1b3c08c4856e1768fc3244903822b641164f2e56f19cd8fd062c258"; + sha256 = "725fac145a220b9257f76b0cd4b75305aaba9a0560b6f5daad5c577bdc494222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/bg/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/bg/firefox-104.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "4da9b4d4333a68d166ee93e26aedddf2f07e7cd8bcfd6456515b453693264ae9"; + sha256 = "67b5bf06c9c8403255b5eb6e8635eb681bf9c2cb139acc5bd498a364e3c51b63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/bn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/bn/firefox-104.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3bd664b4778e2ec305ea20e4d5c35b5251dfc874ae3387c00af1f7746835c406"; + sha256 = "7f328d6af6e91b2b8d51cfa1bff85534cf8e4f3953ee357c61e56b89c14c7dea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/br/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/br/firefox-104.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "5b344af3df5c8826f89c7ce0b1884bab6110d39c4436ed1b309cc61266d4a6c9"; + sha256 = "1083b2629ce457c9530876e94df4a637c604e216f91d7a23368f6576bbfc0600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/bs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/bs/firefox-104.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "ab071cc62f7e27b1a0c10ba2871dd0cc7049ab17e03a1cd3344ab49c9f523bfd"; + sha256 = "c491ca391ec734e42eae303f864eebd9132d25a9495626f30c7835056f4d31db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ca-valencia/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ca-valencia/firefox-104.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "b716bfee87a44a33724391da559c923398dfd27c6198f9ee8b5ce1ce02722802"; + sha256 = "b19acbfba61ef43fa28a473f0af9a14f07870d1cff04b70b21ecf5a9a19bef26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ca/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ca/firefox-104.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "41ebb594e850fd0001367a35e17b8d3cfa9a6fa4946d092f218b577d2632a1eb"; + sha256 = "5f34772e9869787cfffd17c99d91bf556c18e2b2341a25b865863451cd63a5ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/cak/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/cak/firefox-104.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "84b169887334029d52599b3cd3295b342d156ee300f7b2a6c9f25db23ac54d6b"; + sha256 = "8be118d3dbaeb301b9322962dcd099b0052e27668d5b066c360d9d586fa97602"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/cs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/cs/firefox-104.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "07feeb58f2ffe2fc85996e9c161dd93b98897688a0b0418d5a3f28440d572c85"; + sha256 = "130b7554c268ed5774ab277dcc17c782a192a65d97a143844d9fb5a42719aa28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/cy/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/cy/firefox-104.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "15ec7072d94f5f1a37e97ff8db6cde0354157ddb7ebd9a717f7445904dd69e2c"; + sha256 = "c8a8104689052d2ab08e7f012e1cacb81ce6b162a1289a6b51863b175248fbda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/da/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/da/firefox-104.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "c3c7f7003650f89de1a1c0dd52c0b69a926591073bd1d308611a2bcfce204101"; + sha256 = "802fe1fbc426b2c3ceb4ceffae265fd554684e9316d879bc832f331ec6090e59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/de/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/de/firefox-104.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "041f366f76d58e7175e64716fe7b458bd93a9e9bcad8645d241e081871146dcc"; + sha256 = "1749ceff5a2cf10e6e8faced87dcec698f39a4120fdfa83102de6dd780e5ab39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/dsb/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/dsb/firefox-104.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "99ce4792744e32660c379b4ddaed8b8df28b62525a735144707fbafe5bf019ae"; + sha256 = "1de6223ffa7f9471bfa22947e3c96d8e0ec4e5ca3828365d888f873871fcb751"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/el/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/el/firefox-104.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "c7a866979dfcb5a67cb7ed1bf991e37f3269fea6e61f46f9fbabf6e6528d1b94"; + sha256 = "5ed6c997de32ce3346cb86f177030e9ea980a7b0e23b36fdc7d4b7f02dacf75d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/en-CA/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/en-CA/firefox-104.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "06a69fe2d4ceb9137c1fb998b9d227493dbc28503d5122bce87b30d75799b5e7"; + sha256 = "173ca01e99979539cf8077ea45e9701794ca574e14a075db245a4c8531fdd31f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/en-GB/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/en-GB/firefox-104.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "cb532e0e1378002018062dd843986de1dc053ee25d06d1d403565143a940c75a"; + sha256 = "7090ad7f5bb89d68fe2f1658c141863960cf4ef142d794492133afdf7b3343de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/en-US/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/en-US/firefox-104.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "e0d50401fb8d7c77fcfb68d331b821960aca8d7f07f459a51f563e942242da59"; + sha256 = "287eef842bfea628cbef70d83d36c0f8c66bb3cb87203a4395ce2b9f91918210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/eo/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/eo/firefox-104.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "04109864aab5ea2232bc10cee64662d3dd0b2ea2ea92fbafc883862dcee76e59"; + sha256 = "e3caf972377b5f43dd2be7b234cb6f63a445bf4e53764fa154b1b6e1527592af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/es-AR/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/es-AR/firefox-104.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "0da754812b2d4c92634b2c384b6c78f5380de7257f7627c8c76866cfaca0c7d1"; + sha256 = "d62095676ce1644aa5a9c7fb235c35790ed6e69a678e8ee4eee40d619cc51ff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/es-CL/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/es-CL/firefox-104.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "c7479a639501d6a81bfb1e40f1484abb1409c51e38476d2831152216ff9227fa"; + sha256 = "0c3a1ad277380d484b99fe8702313721811dd52829e185ef766c09955f3c5ff3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/es-ES/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/es-ES/firefox-104.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "73443686ac2d94b13dc1b2fdd05cd96859e96fb6b38a7cfdda492c1907515538"; + sha256 = "9d18c93c65d430cf2e2d97236ae5f3c4256696eefbf6b9de27b59b32e6875ecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/es-MX/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/es-MX/firefox-104.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "3020e0bd33e2abf4f0fce26da38f242963bee96d86c36501b2364dbd84ef4d79"; + sha256 = "1f7a2d1f8b5e2650ca0941d850882ac1ef6d4e6c3938c0bfb964f392ba2d5665"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/et/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/et/firefox-104.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "e1f217785f1a9405d58d508eec2c7a612453b53813a98876d6196fdedc1ce3d6"; + sha256 = "560d4b5def2e3866d6d593e368b8bd1ab524459242c0e693402fd70dcc7225a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/eu/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/eu/firefox-104.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "c7de81417b64e86af18fd299b94b6867595b6c3f46408157174ed5322714598e"; + sha256 = "d819fb28cea8c3eae4d6fde2fcdd8de0fb157608cf7e44f4e0051c6ceb615dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/fa/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/fa/firefox-104.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1ea5df0a4b1fd236f4f0c0172675e592382de040097a04eaaf0ea453766567f7"; + sha256 = "cebf182f0587c8c5c754a7b2a41935632f6e34abf9eba52eb5db4f3301844364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ff/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ff/firefox-104.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "2128882e8be4a953e126665d253e4b0274b1e03652fd7cd77985633f0f7cbc5d"; + sha256 = "accc4d20b5b3c1a83d18a39be292ceb3d448687f791157e12bc23d788f793fe0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/fi/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/fi/firefox-104.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "24b768c57724729e6b4ecb10c7726c36ef639164127cf376292be1783753d484"; + sha256 = "db2f6b81b70d758c03126eefe099ea1c7037484be884401c23b667de1f472867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/fr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/fr/firefox-104.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "c8a6252244b64f69942877cf7e5b3526ba5ce4c103a6c322b55e9d40037466a1"; + sha256 = "7f47837be324f0c868b7e19263a5ad220fb2292cc791a8a8246153e8fdf83d25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/fy-NL/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/fy-NL/firefox-104.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6f84d63e032821cfaf578a212e030089bf67e90be80b16796e0f1031ac3fc566"; + sha256 = "dd86ac43630a66572d70a5d1462e56a28e1706504dad06346acebe1e8bc55a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ga-IE/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ga-IE/firefox-104.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "fec3e01ca2e76dd9b12c2c22829a8b93bcfc7735c86ba190c674f5865b626d65"; + sha256 = "5b05a9fee5a6bc3dc2c3bda47dbccaae4040efe1bc2c1f2f79bcd47deba295b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/gd/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/gd/firefox-104.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c2bd3adcc77b91f0cbf5abd38a55c45a5aab5a26aacbef0f09e1996a98628c2a"; + sha256 = "5ed592c473c762b564ee1bbb7bd43316c11d574fa296ed73905ad22ce0e815f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/gl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/gl/firefox-104.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "e715815b246ce479417d70913fc2da97f4926bd9156666ad854fc1fbb8c95eb4"; + sha256 = "9f05d18352cf9814c5c6d4e9e6cc6f9045476cc1b42841491dd0d09ea024c244"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/gn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/gn/firefox-104.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "1ff47e0900f8cad068f7fc5fcea60a6434b8a2d7cadf0185f918ac9abfc8fcfb"; + sha256 = "27ffbfb0c84498154e325421b779ab1b0f98ea635dbe6c108497d66542dd8ea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/gu-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/gu-IN/firefox-104.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "25257bb9b09c5d027afe6e93882df02c6f599a2f1acdbc030b1fe1879f01c64b"; + sha256 = "aa12857a5387bbb1a15dc83dd091adaf9a2ded1e5e0c56f84d8207457455d785"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/he/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/he/firefox-104.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "94a7beb1a8a8869e4b14f1384cc04b46bb430ab74ca37f40097c80b150523a9b"; + sha256 = "e84a7050a3f71f3999634425f71876f7450347816183ef5cc626259bd228b43e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/hi-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/hi-IN/firefox-104.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "d35191506fd802eef87d3869805735845c28c4f8ba733f52ce7cd4d140f5fd25"; + sha256 = "f6a85877ebb6f1772b2b11bc8f3bb3a885a34a04194aea6f3a71342ce9c1304d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/hr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/hr/firefox-104.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "06f180b0d86561c6bb7a7f9d678b93899b9ae804d09ebeb26c9359831411762f"; + sha256 = "2cdf17bbecd55f50de8957b91aa6a04014b92afcfe05ebacf5c207b6853c5842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/hsb/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/hsb/firefox-104.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "fa3ed226e5d4e27362610db29b4413a489e0bb7b8f7a89d9cbe964208102c6b6"; + sha256 = "e067de18bc6eec6268efbe4e5eac9ad90d46a122eab8bd7559c86f115e01785a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/hu/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/hu/firefox-104.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "447790e0d2690fc7ad3d53bd766c39d9a3c8278bccb84260f9c1ddbe7ae927ec"; + sha256 = "35d6bb0c34ab0b91e6d659bd6f41bacc3b55ac7634f0155f247355ef3db0b2d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/hy-AM/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/hy-AM/firefox-104.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "2d0f5ed9ad68a64aab70ad01977dd1df0cb2e24e30df04e1bcd4f182f473acc9"; + sha256 = "3bb3bd913e994bdbf8c335aa7ca95f608bf73441a7bfcf45f3d8a189cf681dd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ia/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ia/firefox-104.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "f4bf4b85cea6aa58a91fc5d9037f9ec5d2a751bd8dd933de4a392c0ef35f2800"; + sha256 = "392f477fddaede5225a84dc320f752b58f887c289cdd14feba8334fd1aa4620d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/id/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/id/firefox-104.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "4090c7d35be06e5293e8c35610e4cb691f4f86c61f92975524f88ee4ec801156"; + sha256 = "c537cf21f9dd446ce0d46b2aa58a5934b6300ad4ccfc24f1b42b385348eae31b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/is/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/is/firefox-104.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "cb2fbc27dd4f09ab81a2835bb4acc7da4b40fc5eb60e5125c6b03cf871c096ea"; + sha256 = "2d0b7192df82b4ef9d6afc038e392ef5778a1d72a4c98da956d14170954fcd17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/it/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/it/firefox-104.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "53de3aeff13e8d55d5924d9393b1051f03889c1974849a82b445c9fe9596336e"; + sha256 = "a251e0e96dd2d3c0ad86b80502724ae8820585402feaf8dafcbde8fd0a9a72c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ja/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ja/firefox-104.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "b5201b5993681717e33e2fcf4354b546616e84a3fb6db6fba04cebbfcfa7bf89"; + sha256 = "71ebd086b0d2f5309688f9134b4241dfae95f4de1845d4e847c44dc6f235d59f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ka/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ka/firefox-104.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "12da40b40ba63f7b0747e52b336df59f4a9d408b1a492280e98c667f69240efd"; + sha256 = "ea6eef7ee3d83d31f61aa51a1b3df6f6ad70c92f59a1bbb3611c232c18061818"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/kab/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/kab/firefox-104.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "b3f48792ed72a61b84e27003e8d662914feb6e2270e0c1b3c5d2ad9ea4127f44"; + sha256 = "4db31c6c9399ca7003d9869f66c9752f9680d8ad50d5af3278400405d2943483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/kk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/kk/firefox-104.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "bdd6d181f6f758e5b9bb0e121ea952538954346e9628c579fd520de574eb863f"; + sha256 = "846e0d71815f9b57f850ce5e6b16e0e798fdca69566d5023126ff31faf50e897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/km/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/km/firefox-104.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "d50f19153543fa39a50aebda529e900a0c4cf21ce7eae4493080ed82b50b879b"; + sha256 = "0a9ff6cb848b8ebea1a85c49287517ad5e638081d6a98fb5b127d44fb3a74a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/kn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/kn/firefox-104.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "f8ec8484acbb3160bb45c9690e411d48a84c7d02a61f20a3c8a37aadb71e5b93"; + sha256 = "736b480e20437b45f3f6b3d5a9383d00b661fd46f0d1f13c957e09a0adc01df8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ko/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ko/firefox-104.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "6bbd43408079b08a26217a198ee0493607573da97a056aad7f6a45d38242b59e"; + sha256 = "f6d8278a705fc9eb2a92ced96ca43df615c41f92cbf8091af49daaf929130e5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/lij/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/lij/firefox-104.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "23dbff1ae5de2282280ba3e789b51c235302e131d4f8dce8bd189363b58f76c7"; + sha256 = "95c26a33938d1b3cb7bd2da7e3397b366ca3059a3b8648e2a466855cd71db321"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/lt/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/lt/firefox-104.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "12def4de968be402f5b510472924e47129a35b48c0a18ff8ff6b93ba26533201"; + sha256 = "466193fd3373f60edf2f5a24a3a9273286560824aa2a350dd407a3f836465f56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/lv/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/lv/firefox-104.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "9b334e85fe418403370dbe157ca5a701dc8609a5e44dbfd7fb56d0758a45825e"; + sha256 = "2ffc9bfb18b627031be14bc9b4465fc91112035c379592face1bc8c2fa7e3679"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/mk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/mk/firefox-104.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "9e120cbbd6a3011b84925656abb779383a24f0166c4e388b29b6ca48ac59eb06"; + sha256 = "dacb3d6568ea81d7702fd1845f2db1c05f64f130c7a39ced62429fd31cfbb377"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/mr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/mr/firefox-104.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "dd07b03bb19d23ce8f6511a119975413c6301cf472e481f756dfd3a70a37ca44"; + sha256 = "19a2415576e3eb77d992d112db55f6f9e8ac5d0ddb3e9e2f4497a1d8f7089cb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ms/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ms/firefox-104.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "b45e50a06ca6f848765a3d11de32fb1271a4dc04f1973d638289e9bfd8234d68"; + sha256 = "52e8c5669d72a0d4701170e3430080d5c34badd83dd5a9171478e9d89e1bb6d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/my/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/my/firefox-104.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "1fd25682cb4357b494e53dcdf4778ceb61efda4fa164e32f6a35d3d4195a028d"; + sha256 = "1f4746453e75d606e58357be7dcf1a051252e97d78acfd89c695c6d231b1815c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/nb-NO/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/nb-NO/firefox-104.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "7b51ee57818c032a4b0e40a6138f51c249639d6f33ee7ac5ec02653b7b9b1b50"; + sha256 = "113afc1141d8b9e4f965ffa8723431c852f3813cf70911b6aa79414b3bc15f22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ne-NP/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ne-NP/firefox-104.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "4a27e82e5b9e6058cdf135d13712f9d72a521e6360fee3dc59bbd5d929c79ec0"; + sha256 = "733491e33bf399735e3e4d828a2e059390466105414a5cd5e546ab600ba88e7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/nl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/nl/firefox-104.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "cb25d590024b8ed1eeeba4a3f5272d4f7446fcf948adb307b3650f4abdfc5832"; + sha256 = "55fed7c91a3730aa076ac7bfa613e2a204ba680d28a3eb9e28c82589171f5144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/nn-NO/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/nn-NO/firefox-104.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "5282a779407c72df80600f77de7e2da94d5fc38f233feae27dd23d7688ee5509"; + sha256 = "a6c1fab17f5c09ad1e2c65c85e1616596524952c826980dff035612b97caddc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/oc/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/oc/firefox-104.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "9dafe1b6c3e2525e8f2280de325fecbcc82d691b94d3173819dcd7c32cd91174"; + sha256 = "1a0755981baa9fe75c1f02dd1e0b1e7cb39dff2c7e754d6f5dbb54f8d58319e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/pa-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/pa-IN/firefox-104.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "93964e2a205cc6483ce789747351d1c4f5bee7901c49094bf53ea80d554fdc0b"; + sha256 = "e5af52012f9169482f8b8176b18e5ecdf929dda7884a47a7d56781f031a367c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/pl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/pl/firefox-104.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "646f5e7dab305ce63a40a35ffcfe7b96d115d3d5a575279c4979db4d88c42e55"; + sha256 = "d7db5920749a62976be96cf0a1b81a3af1822754e672c1316ec9599e8bed7c7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/pt-BR/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/pt-BR/firefox-104.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "1c3fa6f027aee4f68ea2945aee20769717b7008184e06b577bafe82dddcf4daf"; + sha256 = "798e8065f1cae64a92505a3df4e427e2676d6a1fbba5fe02708b06ec54c00c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/pt-PT/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/pt-PT/firefox-104.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "9df2f65cd2865558da6d6b55fe99302b6e9cc6ecce4972770b573f1bc48fe118"; + sha256 = "cd3949f043c7b1816d092e3e1a8c18abe080b1bec2a41d7bb4d3b0247038fe90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/rm/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/rm/firefox-104.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "da5524b9f08b675f28ff5eeaff2e2b5428795d3e793ee4f5f12e08482b59ff52"; + sha256 = "7102fb9198ec09408b3935412ec478ea68577d1dea3cd7b45dee9db8e4e7dd52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ro/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ro/firefox-104.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "cc0033b02c4fa831076fffe2c04fff40affaaaecbd626be2f40421fcd0281ab7"; + sha256 = "a3c0fe0b751c9125c42bae466d0668dfb4ede83e3b9f09c2542c4dbce2e75c35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ru/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ru/firefox-104.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "646d11a5b02182ffb6986003503682c623491393eb4aafb8eee5ffed8e4ed552"; + sha256 = "a87b1eaf6b16d7b6e7e75a2f404aa4bb8536b975c5bbb3f0037fb546388efde5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sco/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/sco/firefox-104.0b7.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "69035477633b94fc85b7dac6206cc3f03e505b9d04fd508aca0b89e628a30588"; + sha256 = "88cbdd5a21044a646acbcf58d048bd48ac64b1bb4731a57b4569ac3680d276d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/si/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/si/firefox-104.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "bce7537aea70a67adcc47fd5b5e459b6ea64d91e23ac80f331d653792b723fa6"; + sha256 = "9a123240ff0499906cde5e9cf3458130c965ccdeb7ca9a45d147b33a568d40c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/sk/firefox-104.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a29f75cd874ea82f958261995c97bcba1f4e141f90c660060a51a279d43429ae"; + sha256 = "b099016ed424ffe5c423f331a4ed4f729d79b4c8a962a25d2710f102b6df4213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/sl/firefox-104.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "dabe09a1c7e72c06aa3aed1dcc1ef1d1861fd957d8a9bda7251725186afac730"; + sha256 = "c25de52d1c7f7e11ded668e98df40daefd8c3590bc31a1618d04f39c73c1023e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/son/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/son/firefox-104.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "8250f9a3563f8ec1d020530361f5dbd936210cdd3b90842d54d76a022ee2666a"; + sha256 = "b72c5a5ee7f2136903069fe94b3ffd8508650e52b96ca25093bd8b46fc7d9418"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sq/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/sq/firefox-104.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "36c1782d325e9dcfb5361c1353b225f4524dbd32b11809468338d30c2f4a349a"; + sha256 = "67a7e7d22f8db247f8278d0949b305a8842336b78fad05e9d9cf07a82a435591"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/sr/firefox-104.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "d74ae16920ce78661c89b7c34470585dc417ad59e6554f8f1cecf519a9268f20"; + sha256 = "48b0a7ca56f6616335a63b7f2b4726e76dc6d0fec587772a2ec8867e530d6331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/sv-SE/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/sv-SE/firefox-104.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "fbb041c3d4200620fffea26a1aeb48bb1b50cf06135b99359828ef56d1e37ad3"; + sha256 = "eaf3f88dc9e8b541c43b09bce01097842eb7e6302e589751ffe41f63586a9bfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/szl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/szl/firefox-104.0b7.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "3ddf5abafd04a01e2d33d991738e238d95248d855bac108c5b2a9878e5e2e85d"; + sha256 = "e996a6419f4274b67bc1a1f9917c5ca8e15ac9ad5428bad82e495fbb1f3c794c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ta/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ta/firefox-104.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "59c2139dee10b8b2f21d27758dac079b4284a6ae8f45f697258bcb9f8592a3c8"; + sha256 = "58c9724d8c547b4ed4949c0ddfa966e3d036e7621f6ff19e3222699a14b9905b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/te/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/te/firefox-104.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "e0ea6b586cdc2d9d033433e67c2c93ccbdf9306dc66f053839f41b513df8b73b"; + sha256 = "f70f1337c005a6e262c76ebbc2f92e467765ff777ced3a0d2ee7d3318e0124f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/th/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/th/firefox-104.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f8f878a7a3b9267e03072108830abfda957b477a942149374bc4a83d8f62180b"; + sha256 = "524916cf9f44f6d834c8212683a07b51f30c48033567e202f6cfeae788a243dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/tl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/tl/firefox-104.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "e569c469ac3c2b8e021fd5d0d9858007c41254c78cc66c82e3b9f3aaeb6de8a3"; + sha256 = "63cf78d2ab388095b7d981926d85b476c45335279df046d461ea8540a27e4fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/tr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/tr/firefox-104.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "595750b491505178c43eb54e0855f0a0a7b9505d12b4b4021f36718463a8f978"; + sha256 = "0fce446d615d0274128cbad4876932bc0180d482f55927883acca05f9fc9c6d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/trs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/trs/firefox-104.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "0b44f31f42b4951169c90263204e80ac74156575af838d1082356733f6a1dd31"; + sha256 = "0afdd96668b1243cffa233d570c7163870f04a7fb8e83b0e2025b5084415c886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/uk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/uk/firefox-104.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "c0309af70b5a663d1791fe66523b50e888c69e5503ef0e994efbac4a8176bfe8"; + sha256 = "dc1bb67430142b4fdeba493bd4b8a20b24d20b39a29c28b023e38102051b7b3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/ur/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/ur/firefox-104.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "1484e464b336d7f00b200fb434f01743ac97453ebe1465fc46bb9a244c6fdfe8"; + sha256 = "74bf8d4609afa8f5cc114bd18af5d4170112089baa8fe3850094e33484f7fa7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/uz/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/uz/firefox-104.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "70ed74140744b996aeb28028fb249d8930821319887a391d22393a53edf61793"; + sha256 = "2508ff1a9923d0a357b8d15e62dc846a5596d8075f45acbfd1bb94ba27c8cdcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/vi/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/vi/firefox-104.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "b3cb678b053c6d922f8e0ccd3f84c6ccd06186fef707e35c949cdef5904eca38"; + sha256 = "77cbc261a0dc08fc5381caa4b0045aba114f1aaa023719e25e5398fcc07b002d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/xh/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/xh/firefox-104.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "2a98c11a8cf701fa768ab950fc1d8b7df60ed7a7e973596342339745a5fc8ea9"; + sha256 = "3ccfc2f13036a73cb36cd2eefb119082eb81816c4b33f3062e1364e66ef52e70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/zh-CN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/zh-CN/firefox-104.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "6e7daad9047854f5b7a454d11e52641e35b25c3284fa5e4d89187b9c1714992b"; + sha256 = "060c34d5922b4a84147a6218364b2299494a0a7c81d2f204678c756a79a9c35e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0b9/linux-i686/zh-TW/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/104.0b7/linux-i686/zh-TW/firefox-104.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "00846889533b8c072df2b34a04689de826ac3cdf9e78e5d401ae46095dc10417"; + sha256 = "b355b25a35939f8602bac8e5d47b7b415c04e6c820e0622b00038f63e50c203d"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 30db6ce576..1108c7c8ee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,985 +1,985 @@ { - version = "102.0b9"; + version = "104.0b7"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ach/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ach/firefox-104.0b7.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "1a5e41a1a972a03fb693d9ab93822697292255c9b1bdfe48691ee2e8f3ac69d7"; + sha256 = "3a29171e70a70f1a12c427068431d9af5380141dc2b0b46c0a1384a344239478"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/af/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/af/firefox-104.0b7.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "d6a0a64bae306060a45f498d41157f79a6d89c36ca0e6ec67e9aed364fafb073"; + sha256 = "a02348bd6262df9b178304a40f65b2c94fd7934b23fcaf2159e197948c4c395c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/an/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/an/firefox-104.0b7.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "b86a4a25517d1035be526313449545e5f3388a4c7a6018c067ff485fbc2872c1"; + sha256 = "fcd4c3f8e7dd17c04184328f1ee9954eb43192d6c743f139efc3951a63e61e11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ar/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ar/firefox-104.0b7.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "79859079210cbf3764a2fa6589e322931cdc654e41658e4d6160524b785bbdfb"; + sha256 = "c4df6ba1eb15f4db92f5d7082fe6abd5d39a3fce7ab0cad3bedfbb75356b20a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ast/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ast/firefox-104.0b7.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "ab6a10d2aaae6668f8b30a1987afc41aba9c01948c478357b0da3290a7d56243"; + sha256 = "a6f6d9370ae5340d941d5702a8aba84646b7db1548ea5395bbccd09c7e4ea575"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/az/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/az/firefox-104.0b7.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "8dd7274d51d8625734d1ae9803124d86bcdfb0bdbf82b33819d1079d4b9f3508"; + sha256 = "a8cec8ff8cea8424dfdb42671639a808cdd14d1b38f9b728278df4c43633dd40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/be/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/be/firefox-104.0b7.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "6998f76cac59ca479e34131fbe9dc47ebce99823831896df98a721cc724be8a4"; + sha256 = "8d42f4283fc180100129ee56d29d263e672705e4edc86043c1f2cb6d6ed97feb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/bg/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/bg/firefox-104.0b7.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "3087a15600bf4d88a10741d3ecba4fa8e5ced23e858ee797a7a0243bd9c012b3"; + sha256 = "87a01e4a9c399165f35e4506bb748c182c8deeb4684f01a118d9eb7c7f6b8d52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/bn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/bn/firefox-104.0b7.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "b7a7a7f7ed2d9faf3714504b1146f87ce55a6370d56378de018d16d0ec73d29f"; + sha256 = "af280cad4185cc02b9c2ad6462cbd90e2a0e5087f8506f60db38485027ab2d20"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/br/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/br/firefox-104.0b7.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7cfa14ee570dff3beb8691683079f2dc7e193117153036a93e6f8998004f996a"; + sha256 = "b34d9c8b22f33e30c5542583f26f3c4d27552e553cf07e815b380e176e4bbdb1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/bs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/bs/firefox-104.0b7.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "0d2a837dec23c4f232c16137e82bcfc0b1c194c0bda4727930f4d06d936e861f"; + sha256 = "78533ee9c1a9d3faabe25b3e913ec84e5e80dbe0f1ceefe085293192483ddff7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ca-valencia/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ca-valencia/firefox-104.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "0fc5a60806a91760ec8e2c4708001260d6da89d7c47a6c8737c03338879cba48"; + sha256 = "08df1041cabc316fbdec50c8d14a8eaf2d4cba46e539bdc5d8059849923e95cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ca/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ca/firefox-104.0b7.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b84e85ec868289f3733fd522e9ffeb14d2a829e14925a5b2951ade216b04123f"; + sha256 = "6eccaf9ec8861e418ffc8d42a0dd478f639eb5191c96dc81979f1b82c98b466f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/cak/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/cak/firefox-104.0b7.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f3c9f9a3bc4d9b2257c4b57a9705b4d42f40001a7dfbd55e72648f478c6fd48d"; + sha256 = "c2368464639d26844eee07e47a4932a12b9056bfaa0440b639d41e6e00fdc93d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/cs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/cs/firefox-104.0b7.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "789fe9999e6449ce02a925ed4a1b99c5ab11fbfe1e6cfa540edd01a68cea6a4f"; + sha256 = "022e1a2193dd58c3ff4b9d7a4bcb44fcde00d141c05d7df52512174ab58403c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/cy/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/cy/firefox-104.0b7.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8b7e6c0880c01ba5bbef05d6a569a1a5eea4489807ea2ce777206f311436a7af"; + sha256 = "f01222faa41004895b1224df1f2addb5b1437ebf695f4958a222245048ec8a0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/da/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/da/firefox-104.0b7.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "ca83b1561a9fdc50a9608ab00d3ab653b4619be38a205ee4038fa3ebc4a9f5e9"; + sha256 = "89d31342a8c2a1b4420e3870b86248dd33a640b0d29107bb0110c2a779c5f029"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/de/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/de/firefox-104.0b7.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "eb17a15586dec4ad7e8a22ab09e64f70e455a4f99a10730244d2617f30aa1985"; + sha256 = "aede8b82918d04fd6850d4f376e3c623fd4063c2a3ec4bbe53708305263fe707"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/dsb/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/dsb/firefox-104.0b7.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "77cf1e4b4ddf15a379360bfe51d35cee72fe63da3e9083631e3d1be8fb9dbe6e"; + sha256 = "d311bd27222a2e23a48b6d2e20b9e8fa0bccf2b90082b9f58cc386744638ea89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/el/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/el/firefox-104.0b7.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "0ae67c082eb32aa868b5c499fc2310a13342c0484899ccf0163a3ac678c46d50"; + sha256 = "8e5234f267d505d2d60c694dac7c6377a368bb8b1459783c03cbce171e220526"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/en-CA/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/en-CA/firefox-104.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "c7a1d3ebbd41f900cc03252fea79e2c455b03a1dd97b5ca9ee6ebc2ef2fec028"; + sha256 = "654f6a7134460414a971fb1b4d0ee45d793d39af8d24bbdd0f49b34c4f9c4bbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/en-GB/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/en-GB/firefox-104.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "308e6fb5df7a3d0ae5926fccf656f5d3e43e3cf87c3dc4080f48e945922b92c6"; + sha256 = "40277694f96a35b7fd0fecab0acb0dce416612e7347d38326ecb2638eb9bfc22"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/en-US/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/en-US/firefox-104.0b7.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "ffb6f51c96b3cac58f57b62d03820d77a25eabb886dfdd43af9fda4e2f4d7812"; + sha256 = "80317c68a8ce5a5a06d3dd9fd44445529172ab9ebf4711a29bd990a5f5c44838"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/eo/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/eo/firefox-104.0b7.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "42a744c58486da5d1bf2962dc39e01d671eea7a78fb84de4a87d6a91fa1c5c50"; + sha256 = "0435673da58e5f090de0d8a4a92abfbeb4f5d30f5daa7bd1a457fba05a4e95a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/es-AR/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/es-AR/firefox-104.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "4b1964daa9cedaaf070804ac22c2b62e68564a5b7ffc7c68a959eab165fac33d"; + sha256 = "911dae749d3cfd83a960290bab71548d6119941acbeecf2739acc78f04a090ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/es-CL/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/es-CL/firefox-104.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "43ff5d8079a2878c67ddc24d266f1541ae4a2b050a6631cbd7a10ebb736a095f"; + sha256 = "e846a837bae039889dbbc739f0231c211d2947023adac42a5b9b6aaadfd5754a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/es-ES/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/es-ES/firefox-104.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "68a32bbec42be6f6c4dac5745da961074b30b22aa6cf4e7f0fc1886d834fcd16"; + sha256 = "2d23acc854d247185c13d31fabc937015b5d850af4d698d39543b8f7d0e0b4e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/es-MX/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/es-MX/firefox-104.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "4f1e09f82fa4c2e1adc5c671543c2f0a2c59fa589bff6f50395c14681be9213b"; + sha256 = "0707763b95490992a6dfbe6d9ffca5d425772a66bf99a93dc109b7635efeedf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/et/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/et/firefox-104.0b7.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "22a79259b5d520c6a02e7b2d8c4fdffa8b44a57ba89fe6c805bc77e5c388f6e7"; + sha256 = "7d439633385e0ac8023efd89eb6a404d0b772776f39d4d2fad5550837899c3c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/eu/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/eu/firefox-104.0b7.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "bed20f26a0e06e68889a299f4c964cb27e80453d4fa2a693fafb5e22c2cc1fc3"; + sha256 = "bf72da2439739d638d5d3682ae08651cb9bf75eea51f98eeadec44721ee275b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/fa/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/fa/firefox-104.0b7.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "6e987af60eb49dad2975cb80e7e50944dfb74e4d57e1c3db4bd84d809e7413ef"; + sha256 = "8c4fbdd82fcc27a5f3a4a97dafe322a83d4590b26b6234787f4049ac5b25a4ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ff/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ff/firefox-104.0b7.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "da10b9d805a6e8a1d784a6f6c63215b185099b195b3f2a645fc0fab00f8ea4df"; + sha256 = "1b946484c23f2d9f8db5c950addc83662e530e7c3ff5fa46dbef88cfa36a1173"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/fi/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/fi/firefox-104.0b7.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "0e0129c4b4bdf2a3601ba05bdab71576e61510a176221210ea7a2e0e1de5c0dd"; + sha256 = "2f66e87d3e77d4d09efca3b6b0717fab0cc93a1d8dc3d59faf53a1fbdf63cc92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/fr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/fr/firefox-104.0b7.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "78f3f76bc8864a5e01b4f969005a98fecf8494f9314b44de5bebefe81ddf75b2"; + sha256 = "9bcaa9e6f051adf34f021009404caa4fbeb86f3730f82ea4d9ebb9c799a95879"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/fy-NL/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/fy-NL/firefox-104.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "09d76c19b14cabae4fea4eb78a25e02c39833018e311b5e2d491851bd06c1ba5"; + sha256 = "5c2fff71d3f21d5aa4b08a0833904b4141fd692dc174bce4bf3b2865f01de859"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ga-IE/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ga-IE/firefox-104.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "d42e1e05d47fbf4817af085f00b9240dd430b41ede83fbc7085b7447ad6b179c"; + sha256 = "acbd119564330d114a4b897fb8f0a50713dfd047015ce65e2cdd24e7f41069df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/gd/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/gd/firefox-104.0b7.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "5bdb489aebdb7959caed9e5f9e6594da7be7ede8d1950b6a376d21caacde530e"; + sha256 = "34e279d036269fce44d356e52d6c7e0b80a9331121513be9c02539f904a47db6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/gl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/gl/firefox-104.0b7.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "a1af14c81acf5e29e322d70e009da5019f28c1487cac98e24c10a2215a6a8729"; + sha256 = "75b7ec3c7e88204f64f3b062360bebaacecacb1de97ebc06f6a7b5ac40f842ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/gn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/gn/firefox-104.0b7.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "fb3a85d4f98c296bc9e63910523288b771cd37b3c121b6cfccb9f71773646de1"; + sha256 = "9594237a4d117cd31ab2b73aa3ebb0b4ed66db2d45eb69f0025fb9f86b0b8dd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/gu-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/gu-IN/firefox-104.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "1df3bb7c597dc80c2f499e99a7376d6e1447036d683df395934099c083d62e7b"; + sha256 = "6ab1008b9d67eedf72080625fdf2ca757768b6771de12493f0786f87a917b7eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/he/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/he/firefox-104.0b7.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "859d115acacfc08a532da15d5d0ac6707f9d594a40355f73a1b5964b2c8ee965"; + sha256 = "a1c81e20eaba17a93deac71dc0818f9f60374d7a2cfa981e5a6ce8b111842aca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/hi-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/hi-IN/firefox-104.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "7ce20086aa50f8e04c81921830e9a878e340c512af980d5438d83cf4ef238d6f"; + sha256 = "7b03ae1261f58922b59cfa3f3d09f7a2bd573cf0909f558ed871b290edd03fe8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/hr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/hr/firefox-104.0b7.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "5d2cfd725aa903e8e9882fffdd965ad44fc4955aa52bc7306c227067369df7c1"; + sha256 = "8ddbc310ebdd01e710f51fd5dde8c6ac6b5b78c9647bb970a3884588d9bd5127"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/hsb/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/hsb/firefox-104.0b7.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a445f73d7c64a27ac029225a7a5004d80cbf4f9a7f5b7bc22950d9c7a2af9698"; + sha256 = "b6fca6037be048535c6270b5bfb001273b26dd04335fb324ff738f3c3e775edc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/hu/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/hu/firefox-104.0b7.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "e59e8cd84fa9eafe840ec9df9a188bc7423fbf2726600d9ecfcedac03e860d7d"; + sha256 = "8b5faf3cdea4c4b8100565f9bcd041019cee0c787367e50ef474ec49931a44a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/hy-AM/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/hy-AM/firefox-104.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8592842744d4b6aeade8ce488f1bbbebe03b47dab78b1ae068f2aa8ca3933dc4"; + sha256 = "ebbfd1d1d75f5b98276ec8c2a3087235dd8bd30baa3218c977cc70196ea73282"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ia/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ia/firefox-104.0b7.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "8641ac4759c4534aaaa9d8837006860221b3f37d9b9befc894eb0a150a4d596f"; + sha256 = "4f60e1a5675c05c9f08be0c42f5b2032651140ad2a455a7a8e79ac0b66b34552"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/id/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/id/firefox-104.0b7.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "7dd98fbed1f0e63d3215492f70b3835aa36917655a619548b2eff4fb2cc456ca"; + sha256 = "bda0416592d0d7916753a26cc1b85832695399c3e74f1fc5056d50d0999f5f9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/is/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/is/firefox-104.0b7.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8c27c86757ab0f705cc022b83baddf0cf5c79525bf57c9ad2b22d6b05008ebbb"; + sha256 = "7f1321212f6273601bee9103587e344142cbbdcbaf8cbb3c42f6645ef06ab632"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/it/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/it/firefox-104.0b7.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "b5cbdd6141c9940efa12d326224955e9294215ca91d41d8167fd5d873d7c2e1d"; + sha256 = "41ec8fc8a4090104167e2c7a95ca35c637f718b2170d865d4dfb14886bd8ee98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ja/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ja/firefox-104.0b7.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "416d2e4f5eb11ab304f65eeda1a8dcb48c88b0235113ff2830075b26079be2d5"; + sha256 = "204aa16622c86c320b6267bce196decf941d7a001d625c4ee855514898969d2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ka/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ka/firefox-104.0b7.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "3cb646b36ce61027f60b853b45b1fb3d31a69b0b0a8f68a500f12b6e4b283faf"; + sha256 = "0b154c64224cf18613638deabfd5d4b15886170d93710c6a92318be032d79561"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/kab/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/kab/firefox-104.0b7.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "b2827101227cdfb8a543dd3af4fe1e94d3a987787cbf8d7fe27258a74f664b37"; + sha256 = "6d5291c490e26f2d1a359f98f4a4511645a0500236e15896eafbd6e01dadf4ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/kk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/kk/firefox-104.0b7.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ddedb793a91c37f0bfc78447353a172687f2676b116c2a87c6255af8e0f3349e"; + sha256 = "3678444168843c0f1b83065801f3ae04bf0848401ec3ce7db4dc234d0ac71269"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/km/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/km/firefox-104.0b7.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2d1f44e4789f0692e7ce2284792c2b316c74adec7b06518de1b63f9bbaba719c"; + sha256 = "4d76d72f3be5c9bbba5dd0d80394d1b6b4552db15300c511a8d94e213d17f66a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/kn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/kn/firefox-104.0b7.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "79ae890ef2c37bb51315881913d32c0c24405c41d8d953b7d77509dcde128cb8"; + sha256 = "897034e7f58370a0c1d0c1d13aed7a438989ce12cadd21c16e0e09578fe5cb70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ko/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ko/firefox-104.0b7.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "d1494533ef6ba57e3984c66d4b6ea9db2e6566cd8f9b02d6e66d5e3a40703177"; + sha256 = "55bcbac866a6849cdf16c71e5e8d57c2a6bee7234b2887b03472ca9c94c0b07a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/lij/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/lij/firefox-104.0b7.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "bf5f594a0c8eb88a5c927660ead52509e59fa80dda8332c6ea8cff898b421a8e"; + sha256 = "781293c732a5f6256793c7cfc9e3248fd1a042ba686eda5642f523780a320478"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/lt/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/lt/firefox-104.0b7.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "32faa406db1968ea6f780dfe40d36a43b06c1637529da37f441217a583557c2f"; + sha256 = "768d61b034cc4a05ab44e672b191d7ac886ff90ad6cd2eb645e2ad348da5b0c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/lv/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/lv/firefox-104.0b7.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "782bd3d5d32e4f7ae602c9f312a76c1ca47e7708e5d8514aad12482ccd4998bf"; + sha256 = "8d8761d67f7d16690910690fd111db8228665ba53732fc132a06322fee55a15d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/mk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/mk/firefox-104.0b7.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "0a4f1495c7da3929392d21a87d96a688bd6110b40e8f7907bfff8d7c35646126"; + sha256 = "b3482c4148739f98930411259daaf85789e1c92071b7d82bca8e6860aa884ee7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/mr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/mr/firefox-104.0b7.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "0768fdfaa4ff531c69db1d3f68fafff6286b7d9ad1b813b2243cab9ea9780421"; + sha256 = "014d8e44d94613dd2a0af0c3681433acb2098860db1b7dfab294b972ac329954"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ms/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ms/firefox-104.0b7.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d94e43d757fd456381b95c95d83235b7ddda5a6a4d54dcbad7f4823dcfb463a6"; + sha256 = "12d66ec569135d64453bee3f5d85b2b494e021b410fa41090353c063c7facef4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/my/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/my/firefox-104.0b7.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "3e44a4c3fc4d383da591c412c3a60e1795dfbf9e96060b884677561b77b38846"; + sha256 = "8ef435aad04be325ebaf906de3cce73af46a98b007bf812df42a40c54f0a00a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/nb-NO/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/nb-NO/firefox-104.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c2b63c0036171be80f27e81ef06be28a64c092e57176b7a7742cec3fe2cffc70"; + sha256 = "96b26b86275b2adb32e9ad40d61f01fa152a2af3b802289bab16d15fbaced5ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ne-NP/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ne-NP/firefox-104.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "dc7bdd61aa30795e6d83e5b02d4b168458e83c418088ff32b569253df010ba1c"; + sha256 = "e3c12895c1d027c3347db7e5483764bb1cf4ffb40391a9f4016285dd14e15287"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/nl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/nl/firefox-104.0b7.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "59505fd41ba4ce9f057ba3d80c6b653b878da7f82f1ebfe3ea84d1eb68740351"; + sha256 = "1f3f4a14bb9dd6968504034bbaa262928480fa1a2fca57c362b7afa32abb8632"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/nn-NO/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/nn-NO/firefox-104.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1b18eeabecda5ee31a40fdbeb8c53ed433f73cde066568df03ee17da3a1f6fd6"; + sha256 = "e7f322bd636bc2c149a851ab914ce43826e5dd1b54c0b89b6495d974413e8d3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/oc/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/oc/firefox-104.0b7.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "3fc80bcdae0ff7a0e1a72849c6ff5d76c9d06f86f96e758587f8bb07901f68d5"; + sha256 = "5c6c035344c6915bd349d44bd89b6e62968579ea0c1aa4837f5e1ef8f83a9913"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/pa-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/pa-IN/firefox-104.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "421abeaf294ba035dac388f634abdec00378d58857b0968c1cd544d764505f48"; + sha256 = "4de6b90e6f4435c3f65fd58d260f480e52261c948815883bdae25f6179e8b69e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/pl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/pl/firefox-104.0b7.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "f224d45978ac5d77fa5e10707f0530344ab3bafe56b81ef412effd8d838d0d24"; + sha256 = "40223141dfc4292c72a811c739708ce0f89f5ec11928ea46b8e71c547722a869"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/pt-BR/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/pt-BR/firefox-104.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "3bca4a224fe5bdb2fa309af3ad431dcab8bf1c393cfc87bb0ece866fd0046730"; + sha256 = "8bc8c6c42d06336d20066732b118d7fb7d200ea7fe217a10f65b54559c846dfb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/pt-PT/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/pt-PT/firefox-104.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "8e85dd8c3215b7f070b01b9df8105176d2d40c542246a116932aa6b67548e948"; + sha256 = "ffa850eda85da2d578c91864cfd95b12071d6f81286f41cb3472e5313f55a05d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/rm/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/rm/firefox-104.0b7.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "0c27e0102f3c51c0b0c7a862a44e17b4eaef349eed4de8af7329b656d0d9cb83"; + sha256 = "bc7c3fa03190f3ec768edd7bc5f168cfec79f0597bd8bb36e088d63be621aebf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ro/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ro/firefox-104.0b7.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9fdc9b1d1a421260b2b0258d5edb3eb26a6ec934248b5e481aa7a2f9a5f6e9b4"; + sha256 = "605668cb215631ee327ed2d2edf25dbcc613b7f58b29ea1ba6135dfd1d40a636"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ru/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ru/firefox-104.0b7.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "693dd65d47b4fcf2653a71a65af22efbe7fec2811124e1760b726c7a92a015f9"; + sha256 = "0b4be518ead63c5159f5eb9ba9222a2c4df40fd00ddf19e854a10854ee4b419b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sco/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/sco/firefox-104.0b7.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "15473a22b5548976a4b651be112f589a7ac2534ed4961031cced654d34dd140f"; + sha256 = "05630e4901f186fa4aa604cda276c2713d4c34b24a32e32aa63c7f4d05a7d8ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/si/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/si/firefox-104.0b7.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "7923f0e3e0485cada413520b5a15b418a737d047120a8c1b076c22432de05bbd"; + sha256 = "36b9865a670673e9adda0748279dbfbec211b9c93b8a3372f90f49e1cddd6f07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/sk/firefox-104.0b7.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d5c9ae52af4d8ad812b56b093dab4fd9b9cc180f12fe88a560d9cbaf9ae9174b"; + sha256 = "5244ee9afed1abf530b3e014ad107ab0c0ce7019bc0a9ea3f72878bf91a66cd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/sl/firefox-104.0b7.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "9119bf5c163d8700d888c0aa957eec0c6108044af667f81e48d868ab3423d2b4"; + sha256 = "99aad30ba4cd29f2882c62d511c53764e15bdccae4e338cd0871cc772b6d986a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/son/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/son/firefox-104.0b7.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "0a5711cedc0040fb676a8873efb9c725fb0fcd444dae077291b32a5947b44111"; + sha256 = "bfd4e7bcdaba60ca63ce41adb130d3ee58aba6a6a7915b1402d1f65cbf516e57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sq/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/sq/firefox-104.0b7.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "c657853f1692789436031e7bc5bcf605dda1c238d61939a0004dc0ea5e17b4fa"; + sha256 = "440932765ab253823d03840cb0a576f9dd8d922eb170ef1275c6fe55dfe17806"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/sr/firefox-104.0b7.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "806c5bdf82e6cdab072a6de659d92a3ee4cb85daf152e67e33590e7b2a106198"; + sha256 = "cd5d9025837eb639b0ef2ea52b5dff9313fa0ca1a8ac4a99df8e9cf7f2344f90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/sv-SE/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/sv-SE/firefox-104.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "2def75eb1ae4f095843a4bf8aa763f69a496217d06beded65a06167e2dd195ae"; + sha256 = "51b301c174540c0dbe53c1ee4b2e777d6eb1296330fad8ca3e27749e92fa929b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/szl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/szl/firefox-104.0b7.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "c6210f98b15c0667e638672c1c34382395170e980e1f9d981d12f171007498ae"; + sha256 = "09a6d47e799be6b42db9080d0e761284342a7eaf4da898e84572045fb5b4e060"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ta/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ta/firefox-104.0b7.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "53b92f4613ea7847fa96f5b328b4f7dde0a0969a8b6697469b4e04216aca951d"; + sha256 = "8ded4d10a5fd39ba9f463b817a136239fd08ed5148ee36fec39de5f992362907"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/te/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/te/firefox-104.0b7.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "316761dd16ea27b0a72417722ecba7215fb6b9f885b37fd95a49cde166305839"; + sha256 = "0fe1b8936c3e003bc4ea30211eab645ac7abc900b36aa5f856ca2cbfb851780a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/th/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/th/firefox-104.0b7.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "eb205e189270bd50765cf23a5e14c0b5e9078ee5cc923860d6a661f4e2be2c9e"; + sha256 = "035d190c9a052de310d4f1144e69a93ee58a09457d403b8695d7dae1c5afd125"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/tl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/tl/firefox-104.0b7.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f333dc4695ba4e3e9a20b521c8d1d3d078ae9074541eb16178718827ec7819fb"; + sha256 = "cc2b8bf7013e4a04bca9dcca0203b6e5c42c41f02d8f097bbc330a9a553260fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/tr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/tr/firefox-104.0b7.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "151a205e266aa76efe06a96a5b064438c3abd38605e945b4864696f226aa557c"; + sha256 = "9a2d0b0894086ec62f69c372a8ffd9a146c554806fb826e0287fdea6a64e3c00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/trs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/trs/firefox-104.0b7.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "d40ba44f885081356d9b933005f59fd6da0cc25af7936c8ed3b609873fe50714"; + sha256 = "5102f9fc9fdb82cf2e8be971dda2d186dd9b6fd984cb0266f10b3b0b933565d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/uk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/uk/firefox-104.0b7.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "9700faf2856fecf9be38b488d497dd641a38db0808bd13d2df335f67088f4622"; + sha256 = "a6383ab8c32fceff66a82815102b9377b0ec8e5667611531c5132960b8ecd44c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/ur/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/ur/firefox-104.0b7.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "c23d1c1966fd0b5e85a5bce8026ef80989f4bcdfb398c11c7977988f63290d25"; + sha256 = "469404f5fe42fdae66cd70dca7dd50f6bfb9548bc13c23ba1e3b6b00036b0938"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/uz/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/uz/firefox-104.0b7.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "992a3032a97c64b08d4a57e474a3ba1f9644af3d221b4a0084ed3e5f85e18cce"; + sha256 = "577287d546454a738fce62a9a0cdc6f5786c0e20816398da5c318ed7dcd5f6ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/vi/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/vi/firefox-104.0b7.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "3226d0eb7662cf35224d431be8a735e2c1300fce3bb1c6628e2d041ac5266d6f"; + sha256 = "f5fec58631a6db366fe71e731f1c69e62470ac79226a8c06ba8df4a82ac5e37a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/xh/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/xh/firefox-104.0b7.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "5cff24dec61b3038ade2cd37191eadbb8232fcbe270c3fe55632f2c7b740f401"; + sha256 = "8cfb84ae984237841a576650bd7627dae92168f5de28182e8c8562d5b2685189"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/zh-CN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/zh-CN/firefox-104.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "ff4a234906bc47315b26e8f5efed0e5442c9df8ec13e02c9bd16d2e6435667a0"; + sha256 = "76832755b698016e7434e2aa4447e218328ed7a3ce87e529f1080844bea162fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-x86_64/zh-TW/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-x86_64/zh-TW/firefox-104.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "f2a6326ad37e65f026b2129f90be7300827867cc5fa6701570b83c81f83c804a"; + sha256 = "e0691372b4f06cdf54871700121efc82511b8461d8732edf3f7d9c7e22baa373"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ach/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ach/firefox-104.0b7.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "433952be7ad3f8416230ed6049b3df93b426de9433f450764049645c5703d18f"; + sha256 = "0ad9e439e7220d5b4f3cd35d8a85d0c3a432866399d85ff4a7284500e7485083"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/af/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/af/firefox-104.0b7.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b6dcb02b8e862ee2b1071547a111238907f307834953d9256df153210e5da1ed"; + sha256 = "f03a0513f9bf2a4d9d91e53110bcc5c4cde959c7d004704d646dc02afae228e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/an/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/an/firefox-104.0b7.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "a11771763fea6860f8b94e4441144e5c0413d5db2f12feb804f09decc587bfd2"; + sha256 = "849c9ce898b93abce8b4dd87edaef8a4afdce2b2cc38fd01cd80819bada29bd3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ar/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ar/firefox-104.0b7.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "a4ad2aeeeb7c88d51382c0b0fcdd23ca58e8ca81c2cf44b2d9f6fe9d89e09ef7"; + sha256 = "b3087c2e7cec708b589b8bd852af2575c95c880919dc65da7a2b14395d7492eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ast/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ast/firefox-104.0b7.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "7f22f4d8e405bdef7815c96e54456d25f7f1a0f5c9eb443346d052b575510c0f"; + sha256 = "d84db6c4d02a2bda3c47a6708c05237a1b00ad9a80ef5e99af20b985127c3148"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/az/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/az/firefox-104.0b7.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "371bbf1ba3bf1505b931d9efad07fcbce090eebd9ea7aa349c927506b5e32961"; + sha256 = "877089b24cd58604e9fddbe6b1af23355aff3879d58a85840269a6c6581f6f56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/be/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/be/firefox-104.0b7.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "fd537cff6c5be96c2ebf303808e352dcae7425c779a7a7603b37393d6b3883c7"; + sha256 = "51f73747cb6833ce5e50ba547b1b427f56a03ede283487556b41567e1d7c2ae7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/bg/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/bg/firefox-104.0b7.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "ef5703d8eb4150721e3ffb6df7b031c6115401683f8df965e9c62de4c3e8586c"; + sha256 = "8c81445299e0aa3542f962ec9d2465eb6efd1415c3c18b2880ea764a9d170aa3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/bn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/bn/firefox-104.0b7.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "3acd10e98e85339da5e3efc4b3879d6371d796fc0ef559daec79559d94ec74f3"; + sha256 = "f3e9eb95e0f27c475e4dbf54d235540cae0c4e4ebf36149ed8d5a539729ea110"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/br/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/br/firefox-104.0b7.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "4e07f618a70a3ba83dde4320608f03f55d583692f0cb4a316da3e46375e54de6"; + sha256 = "8f75ae8815f659bbdcc819de98dbe23377ebe373970cf644c13d1feaac90c1ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/bs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/bs/firefox-104.0b7.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "be1e8a8690d5a0042f9d7c63bd70e5abe0f87a85e6783f72af8109176499abcf"; + sha256 = "77b9182185277d6d027e11a1bfeecd3158c41e44c76481bb560cfee3821bbcd9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ca-valencia/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ca-valencia/firefox-104.0b7.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "8dd5706395fddc49825431bcfaa66102fa4e623bea0bf796b5e620fc70030198"; + sha256 = "cefb44740526364f2397813d12fb7d5f9185c259ea008ba49bc9d178dbe9c52f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ca/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ca/firefox-104.0b7.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "f2371094234cfc28ea7c873ff62ab20782d76dc23e5596200762b4afd66b7e5e"; + sha256 = "54d482fff8638e73c5a2b8da283741a1adc8e316407449bdd478616b2e6edb02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/cak/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/cak/firefox-104.0b7.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "1dc95886244ca2e77e82923cff11d222973a8f293e010ff1a2fd77b8c94d4194"; + sha256 = "2f7ef06b52ccc87bd6dd823e1abbe3c0b1df44ef068b8d42fcc6a5923bbcf5a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/cs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/cs/firefox-104.0b7.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "dfc0666f67ade708f90ca2ee311a462c4bced25f782e31972e0b589e5e740f2b"; + sha256 = "5f8b9d41c59174bbbdc02757cc2ce10b44706b52dca7e72871ad23fd2686fce9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/cy/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/cy/firefox-104.0b7.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "ab49163b0ad5eaf22874381399ed82f15f9af67b3ebb79ead3714ca705866676"; + sha256 = "6d4c09fbc2f4a84d50d03c083d20e8c02281c63622df007002482426f51ea1e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/da/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/da/firefox-104.0b7.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "3b5e773f2b8419a9067c2ba577280e4defd436081d706c2bbf1bbc80a872a81a"; + sha256 = "7708faaaf67f5fe23c66022dfb726ae051d77ae44e228e0ec2540d8ce4ee156a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/de/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/de/firefox-104.0b7.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "63313e7f568feb506fd1a69014406c2715eea6c77402f125d7f5c4a83b9c2199"; + sha256 = "7bd5ce8ab0070a9a4cfee9526459a6739fc5acf0e3d69d001f5dccb872ab248e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/dsb/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/dsb/firefox-104.0b7.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "69f66f057febea4484166cc324ff60d55a1021c98f8dc4d9bd7c7e83219ca6ed"; + sha256 = "e30085fed0906fa122267b2c38cc89a9adcfa7b88466a08b0669027db286f27a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/el/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/el/firefox-104.0b7.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ee73de5881d6185b309ee4332935364bad6efed583cc823a1090425d263cc0f3"; + sha256 = "7870eb45aceeb7121bd2f1e6254132881f423f77d08b63703d7b491b11967321"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/en-CA/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/en-CA/firefox-104.0b7.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "76deafb0629214764e7d5c06cb65a01836d39067096c4ad3ef6d6f33560abe61"; + sha256 = "dff7863179a15a2e7ec9f58d5a81266222ccd3baa341b64dece482c294a2f81a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/en-GB/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/en-GB/firefox-104.0b7.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "29c894d423003e083be48432a1494d6af6cb8c8106f2c4432a18f6d30150946f"; + sha256 = "001115773ad37cd5e33fa57451ce73c454bb2bd0e4459479eeb66c3589825475"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/en-US/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/en-US/firefox-104.0b7.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "a65f5c26f259b49a70df68ed6f0f36db65a1f12e077b8bf48b1aadae1f53a32d"; + sha256 = "04eb37e533294d43d5e434bdf2f61de0b0c9dc8f3b7cc34bed34f68875e76ab9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/eo/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/eo/firefox-104.0b7.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "f001b00098e259db413b0f958694993be4a7a6913f8a432f91ce6cd9c4df4288"; + sha256 = "05095b1ed33d48daf60cbe47ebc92811ce5170c61f0b53c6b4adad49d1438094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/es-AR/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/es-AR/firefox-104.0b7.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "8fef275c843bad0b5395aad9d80aa4c2ad0ffbf188b24ecd6ac1cefb285feab2"; + sha256 = "59961c23196d89044b4a63f8f7b61915ab1d9d341c608474e29d5aa1c294ad9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/es-CL/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/es-CL/firefox-104.0b7.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "25e82c26d33aebcf9f440c78ad77dc2478cfa260253a14008e06b518f50ae982"; + sha256 = "8ad93e88f6bc1538e755b5bb1074f55eac3ea6a2b08d41af1cbbb2081343950b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/es-ES/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/es-ES/firefox-104.0b7.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "15b930d22c4e04e7e0c867ba7d946d5c5ece3e256b4a5af8a148d94a1f2f0846"; + sha256 = "264f210852fb3b09a0d9cbecfc7b5baf8d1794035d3699f78cbc62a87fa3b115"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/es-MX/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/es-MX/firefox-104.0b7.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "57bc7958e5975aaed879d494d5cf73f20e145a08f02e309cdb7b229692bebd61"; + sha256 = "6f6b35ee4643fec207e833e877960fdc74a51e4f5e6db58f611048dd4693f595"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/et/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/et/firefox-104.0b7.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "7cc8c38cb33f0a38f594281c82507e22b929d794c14993e94946aa86bb79af28"; + sha256 = "6d9172c67994326c8739e5e95b7e352b4fd837c1f2e160ca20fe809339b60933"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/eu/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/eu/firefox-104.0b7.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "6a178ef79b141625e301f6b9ad07ebf0aa1e2a9d43746491d4d800565590402d"; + sha256 = "e4a5d3e400cfd6a0493818bb15b0cc871230b9f72d5246a7450b2f89298817a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/fa/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/fa/firefox-104.0b7.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "a8926507c074cb58a0951c1d2e66db039faa6a540a212121169081254bc22629"; + sha256 = "7da1b2a3fb06697c4ffe22814b55ff2257b9cce010a94c37a5f7fc596525af4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ff/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ff/firefox-104.0b7.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "47b0615b81eeeaae2d6fdfdb8a94fc47519553204c54c96d4423c05ca4243014"; + sha256 = "3029496cbd290ca01bca962f93f6d48d65ce85b89a1cb5e87297be8b1483835f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/fi/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/fi/firefox-104.0b7.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "88b2b1001d93fb8cfc94bd43d1cf1dddde506abd8dd5ada955417bc3c2441050"; + sha256 = "c5d8c6c4d99f9bdafe7531c4766f31f097f8ae49bd3a9b8db837a9bff07364fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/fr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/fr/firefox-104.0b7.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bcbe7950ebc56473a86e64defc21f43fb619d36ed8b408a38debf7b17339afc4"; + sha256 = "cb6265aa367b145ab95453b9ac8498386744162752710d300a94f920f205d264"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/fy-NL/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/fy-NL/firefox-104.0b7.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "f089fe7d3a46106fc4591d3736a4272a0a8942fd97e173c7c3e02bbba0ebbc1a"; + sha256 = "157371b0a8c726c48a7eaf2d2df92a3101e54c5eb95eae42f96475f4c0954b4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ga-IE/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ga-IE/firefox-104.0b7.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "75c7a68124e657f9cb0908ac23dede6761dec3bb0a386b8cf37dd28ba73ebcf8"; + sha256 = "7019704b1676fcb260d489de3214d975e2de3d5e9eab0d11aaeb53b119082b6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/gd/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/gd/firefox-104.0b7.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "70742e0fee63fd8da839fe8bf3e1b86a7d0b4afaf1cd69848f8cde2778a50d38"; + sha256 = "119bf7dea48caa9c136e2d320efd336962d8049a71c51b987d7f13eb08db80b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/gl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/gl/firefox-104.0b7.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "631e4d5c796fab822631b2f59e4016b9f15ab54393480376e1cd983b9b9ec74b"; + sha256 = "2d32aaf405f7b4887b68d2b88f1cd180d95f1b5dbe86e72e1584c04ff3b14815"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/gn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/gn/firefox-104.0b7.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "822f44a187d962e070e75feaa3395a6545ac189694a61cf256da4cb98f8a7b92"; + sha256 = "71d03e82d49beea061b8b32e39de1e5a9612aa1b96c2c0202662ff2d8f6feb15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/gu-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/gu-IN/firefox-104.0b7.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "e51f78ab4e7d360b90d57a6b19225d8d74be1676d8c4e53999f00a07b991e6ee"; + sha256 = "da6abccb36d43813b5d875d789c8654ead6d26e3d5a91e2eef6866092d8d9888"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/he/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/he/firefox-104.0b7.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3e9d4e15e3357f25826264829fef141fdd6425bccff9ce6b171e683bb113b0c5"; + sha256 = "a713cb9a2a5e378eccff7e120526e600a7503fdfc13e3de6ff3628f2839ada05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/hi-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/hi-IN/firefox-104.0b7.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "f67c5291a3f163b23fa024ad2f213237535e7a743bd008daed9ce951abd25e48"; + sha256 = "377e42f61f7d302095b7e750bb2de248ec0b8ce3ccf4cac348c4e07797af736b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/hr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/hr/firefox-104.0b7.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e45776b7c582fb3ed32dd77a2d9809f2b0c5bf1374e8c102e9ddcb119ef7696a"; + sha256 = "10372c6c08809999d781b711b0712ee20ded977c8f179ff7b73b7227f3fb161f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/hsb/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/hsb/firefox-104.0b7.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "ffe92e7183d538a00fdfedb811bb4cdd504b380bce6e5857c509021aa0789b0f"; + sha256 = "83cb1ceb12936a9739821d26807bbc122164c0c03672dbf83dadc9bfa55d1d70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/hu/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/hu/firefox-104.0b7.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "51f8b6f968d55a443aa73c2d815c31ea7968f5feedd843cdb100d1ac6a4ccf3c"; + sha256 = "cf88e8cf9beb37a788405bb6a5d2babaa23be12dada87c638543b1336ad7fc24"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/hy-AM/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/hy-AM/firefox-104.0b7.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "4f40cdab8bccba72f8d1ff4d0214d4573169373dd46ef8f23db915696f1dacd9"; + sha256 = "25e1bfb6c12d93c8fab2a6a3dac47c024774c25c413626c2333185c3091215d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ia/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ia/firefox-104.0b7.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "23a0c5f1ffc3b92a79fc6633f68619c28fd306b38bd7e1307cc8bf230aa0dd7d"; + sha256 = "77aef0ffb396f03fa219931e0daab463238184adb24e42f3e27b8ecee8b8f0b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/id/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/id/firefox-104.0b7.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "616663dd0dd966acfade5dc2e9b25056e9e7922d73264cb054df8b7a334c244e"; + sha256 = "e60b11010b23ff0fcc2f1258f2d63bfa8b3f55c17ad2f30aa23502462d377e12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/is/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/is/firefox-104.0b7.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c2eae8cade38437aefc8499884a5a5faa0ce0b47aa01563cf66cab4a4f1f412c"; + sha256 = "cb9996cbc358d0034b8c0e647b9f06bd5bf0c8f91362c874abf9008521c18626"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/it/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/it/firefox-104.0b7.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "7d02e30abb489197f1b928e7afe7e09eb63d94d390a3d0293e0b4228779b7a32"; + sha256 = "37874e8a79e609aca34690fc1f4f3002d0eaa73f152f937387e04347ff7b5555"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ja/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ja/firefox-104.0b7.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "7a601336e5affd854cf70d515e882797f6fb868ece894a6a097b60466511aa3d"; + sha256 = "6123d0348d6976ca06106f5c65f6718b6241bc66db3cf39afe9c08fa497d6965"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ka/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ka/firefox-104.0b7.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "5f277ad954baaa715e99a7591f3bd6252914ad731db7e9c6d292c10d633896ab"; + sha256 = "f67a5e2b020e3cb866a5527a7247641c471d087c4703c6cc07a36908c3a4f28f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/kab/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/kab/firefox-104.0b7.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bfd044fca456f10dc8d4ab6cd23673109d8115c4cd9119568517dcd0d699630d"; + sha256 = "cf8c22f87e480f0b90eb334990560ff9f942bc8eb703eab2d02e944ae9efccd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/kk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/kk/firefox-104.0b7.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "7adbc87dabbe73fa48c27eb709e6a4e93b9ba2596ed1bfb6dad950c72c3d102b"; + sha256 = "0e294a735a497328f1912ce183eedcd457ad4134978e2aebc7e31ec0c997d96a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/km/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/km/firefox-104.0b7.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "0aed3077a571fad35b214ff8995da0e23fdd3c1e94565f03e7e14f76bac50804"; + sha256 = "f8efdf3b7e7ddf265d0b952d1edeb64682cacd720aaccca4a75fbf1a72a5c946"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/kn/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/kn/firefox-104.0b7.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "40ea65410906b2dbce37e856f6becc664ea2901b65cfa8e80e0853a597577fe4"; + sha256 = "2384f870ee1fdbbdf750034fd219c7016e83160d318e10e8f6a267843fdba7c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ko/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ko/firefox-104.0b7.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "4c51e32ed8a62ab4e88bff143778a791426af38b560fdeaf70ae46d0d0d6e82d"; + sha256 = "ac8c619b8692e05789eb65e5e73bf770aa1580785fd294d0901b6f1b4b83823c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/lij/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/lij/firefox-104.0b7.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "f965b833fd0f6e58ca4a22347466d271aa7616603fd986f663dc293219e87228"; + sha256 = "ed23ef5b1a46a49655e80609d76be2d22b96c2c4037c21fc4dd5805d75c46eb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/lt/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/lt/firefox-104.0b7.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "316f2afc49d01147397b5e8a20186551f1354a6e601c2bf3c13612ab0d803410"; + sha256 = "b3543a68aad0561870e67d3a2f9641209bcf70bf7cedf9a9bee14904aed9f73c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/lv/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/lv/firefox-104.0b7.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "00288295569d6aae0deb79923a8abdfd2a4340b2af8e9e607b372ed1b1bc6c3e"; + sha256 = "6871c945393da0be0c5d3e265be941f05317dda58cef403cd7bb5b796b1cc2c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/mk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/mk/firefox-104.0b7.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "78083c6829d30b4f340cecae6a126da43cddea95003e7c74029527a7d1400086"; + sha256 = "4b8a503ef260cf3faa8e207e9188e78d67636e177c73aff14a339683f5d4cffd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/mr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/mr/firefox-104.0b7.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1ba82a6b7bd4c875710dc5c6cc36a54b5c14d10b67fa8e9946c9b1f24a621778"; + sha256 = "f80056079751e2483b01ce2b71eddeb4d02bb16add9d63d5fafcf316bd29834a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ms/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ms/firefox-104.0b7.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f1bf54ae0c85c23cb79ba17ed5bb532665a26170460dba04480bf1e5f93ee76a"; + sha256 = "a34110fd25a140c3e83f7d42f3eb003aeb82404a06ec4d7a7466340717d54396"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/my/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/my/firefox-104.0b7.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "e87264cda611f39e4d94953f48d3dfb3d603408789ce96fcb9e4c9495e20a54a"; + sha256 = "0258123db6a4ebdee3aeadacbdfbabad6b653aa2a9635439d7e12eb3a256196d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/nb-NO/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/nb-NO/firefox-104.0b7.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e7254987ed65efb8afd2936343a5b9a7bf7a6ccebcf979e03986e8a348febfe6"; + sha256 = "9be62e8d06ee4e6b7c6a4efbd2ae5432562ddafd8a306579ce9f3775865e2415"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ne-NP/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ne-NP/firefox-104.0b7.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "1184293695999b241591cd4ed095a4854b1b86491d3fae4859f295558f744eb3"; + sha256 = "9c459c871d7d876102db3d5b4c187c6c30dbcd8ff9eadbc9035fe74fc9ca5530"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/nl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/nl/firefox-104.0b7.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "23dc62d58c2a29c44346cf640f99725bc502efe4b0e3d2a9d11e06ece8676ea1"; + sha256 = "2d267e7ba9833e2bccf033c807c7568f901a21627aae9a7c4afa4c6d91a0b7d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/nn-NO/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/nn-NO/firefox-104.0b7.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "8d76b7d04e02e05986edfcf649c7f795e0be804f688d02d7c5639bcc7fabf977"; + sha256 = "16fd2d0a077367229c2548c3af6811850413f2bc9979b1a8b86e14113797cc89"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/oc/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/oc/firefox-104.0b7.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "3e24172252e35adbf43f50f3556328539f76802ed217925149aca0abe5b153b3"; + sha256 = "37a70a51af75a3bd027e6bc79c7b8b449d52e397d5e746f81f71e4dc8f45f806"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/pa-IN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/pa-IN/firefox-104.0b7.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "c6f40a2f4e221b246fae8a90453c42cad9b79934b6f9b9acf5728ec158229b9b"; + sha256 = "a4caebedf9959f25cb0f6d0d2853b31a748ba231eb4a487d160088854e94a791"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/pl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/pl/firefox-104.0b7.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "505a7449393c7c4480404c51a53dc6b78f31d57f1c8088a66b035a1f9f45d9d7"; + sha256 = "44970a0afa4dc9cc33b00db2860848757143b946b9f695308fb0084846a639b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/pt-BR/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/pt-BR/firefox-104.0b7.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "07375e45b3700cf3fe3d5f1176e23c9be20e763a2a0cd1258af2451182ac87aa"; + sha256 = "b51cfef131ef258efddd4063af24e0916fe137b4e894691fda4e66e340918ed4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/pt-PT/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/pt-PT/firefox-104.0b7.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "adf7b806fd1d6488cd33c4c997fe6996f9b600636afc39c2c647c6349fedccef"; + sha256 = "4dde85eae03cf13f3e21e89277d64242f7a04a5d8294e07f1e5aaa0a946c5872"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/rm/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/rm/firefox-104.0b7.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d9e248830083d19716249ed2a624c06a2c0c4555f784d86211e07f2a47bcc9fd"; + sha256 = "6a6952bbceb5272f8d895ef0c0c5f006c70ea9b509c43cdc30d033297b24bd9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ro/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ro/firefox-104.0b7.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "e719694ae5b070ff42badbc08f1a335664a9af4d54923709fa4980ae48b6a333"; + sha256 = "2bfa2109e10919f8e228915e6aa6170509ad7d71e7a45b89cc812eda20e76ec2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ru/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ru/firefox-104.0b7.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "67084117828276fed9261611fa3d39a6de631d45179d241211807416e07c1d44"; + sha256 = "d6becf94aba7bf1580f02f7d1781f2f89f56eab9c47ca05599fe64ddb32bdae1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sco/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/sco/firefox-104.0b7.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "a731a2a6150939c9294b4a9bc6fca582c266bac4429f781abdb8d96883a1ab70"; + sha256 = "f0f675ac4b9191962dc798d6f73638eb8accb64ae1f6f407ded52ae01b0e5862"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/si/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/si/firefox-104.0b7.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "47837be1db501d2fecd0d31747eafedad762a5017c99cd1a7eaa6431f069d8fd"; + sha256 = "7219d44407cf0c6513b434daa6ba6ef1043adfed42aa3b9b54c7b7521caf4654"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/sk/firefox-104.0b7.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b6b7ce10155b9c5c5d168f73570ac23a0288ce580bef229f726fd2e1579cc51d"; + sha256 = "f5c4265f810274c69effae81b7982c38e2f16b1e0ca6a505a29607a878eedbe2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/sl/firefox-104.0b7.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "ea7eaffc8aad34eef722fdf6c2a664895d184b099a25f10234f0fce940233864"; + sha256 = "491d8b0dc680c5ab03ddc3a8033058909dbbbebbbf848b109e477d6bf049bd3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/son/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/son/firefox-104.0b7.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "53c5a451ed323ff7b41712af6781b3792a86f14622ba490392c1b7a0855384af"; + sha256 = "602e1cf09819083a89b327bb1c70acfaf62ef8a51ebf523f2f9d32ee4228ede8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sq/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/sq/firefox-104.0b7.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "0296523f33b6632f2c15ede741bc5a7cd41ecdc32dd1e9395ef42008ba93b41d"; + sha256 = "8b72b7e1b69e3c64a5bae8b02ac813c15a504de62f788d1599689a3cf852682a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/sr/firefox-104.0b7.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "dd3857681b7b7c64c6d0d0293395647dff678736e9384530d1f6094c9750a19e"; + sha256 = "860aa21c5debbf5cb7f8eacae7d011b3c1fad0e7c24193849a26173bb37c942a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/sv-SE/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/sv-SE/firefox-104.0b7.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "8b9cfd1f112a617c0d069868c371e802ff25ab99e8eafc39f32cb19acc7dff4a"; + sha256 = "b5f6c6f047acea4754a4c7074378753a98cab544df7ae7b4e3c7c641c4bdb8c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/szl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/szl/firefox-104.0b7.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "a0ea0af3af63298220cb57aa42475a9b7b45cffe35ac385e506e48ddb75bf156"; + sha256 = "5b500a38f05c8744682406a991ff2bacb6e76c0953902c03e592ffb0a6fac64c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ta/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ta/firefox-104.0b7.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "b6c91a94ee7513fc3167e8018d16947090a0836c54b4ccab563baf422932fc59"; + sha256 = "3d83b668de3b9ac278413db1ff3c6000201397d12f0a7fe5043efbacd8ce239f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/te/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/te/firefox-104.0b7.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "a1ed0d315e09600a89c63f173a4550968290f0c449c76ae776be53324616fb38"; + sha256 = "d907e3bc5734c42f17128df76c51b4ae7df0df251513d83f0d4edfc2c0bc3c91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/th/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/th/firefox-104.0b7.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "fc6dfd8e5a985ff0dccf3d2ea744be16c5a870a295aedf253d7a6374cc944660"; + sha256 = "08d76d2c4b5f6d35b1269c3ac6da5a921e29ff7bf0ec459350dfbb2f362f49d6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/tl/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/tl/firefox-104.0b7.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "93aa331e1229262de5f45dc50e5a8ffeabdc8bcde08eab2c021f9bd41e3ff812"; + sha256 = "e7ae2e956056edfba68da60e6cf5f4b122b3d000feaf5115e393feac039e6ceb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/tr/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/tr/firefox-104.0b7.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "f4066a7ef491e6699b4f4004d8d2b9d2ca4cf3cbf2202c370c462c8bb4438fe1"; + sha256 = "dd3e1c77def3bd24ed4c1c11927677ac83ec66c9ff7607acd516f24c9652faa6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/trs/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/trs/firefox-104.0b7.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "e6c28cb21e808f9fcffe6e88f3e03b81cfa30aee3a7ce8bc9e3c7900142216a4"; + sha256 = "b1ff3c642770709fdb0edbc30d052a6cf3b98909b45a4677ddcfe0228cfaf661"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/uk/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/uk/firefox-104.0b7.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "6f1db006276427267b9eaeb64d116c252eae46f0512c818ca1f654a955047121"; + sha256 = "e3ca173bdf486b9415fd10636fbc9731266d33053d3a5a11cc6704caefad8442"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/ur/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/ur/firefox-104.0b7.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "f6fc22d3811fe242aec4cde4242e1caadb672c0a1d8ac0a38ec04a35f890fadb"; + sha256 = "68afedeab0dd4cd6dae3f11883eed99382bbfc923ee811709a6f5fea7b8e5c92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/uz/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/uz/firefox-104.0b7.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "dca5936956d46103e7a9daaadbadf598bf034553fd5191d3bcfcbe7c45493584"; + sha256 = "03c2c06ee2e88b9a7407a8d753c06115a5b5b38ce8c098add250b97b048eb661"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/vi/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/vi/firefox-104.0b7.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "9f3ed580b5bb30c45b0de1835577fed411c9d313a36aeb886d8e5f2572c00df6"; + sha256 = "84a2778dd61c2545da62c6f01ff25889f61c46c7c230ec9946a1e0ffe94bc42b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/xh/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/xh/firefox-104.0b7.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "1084d9e7b7247a9e75b916be41e0ac1471d5a5c9871011870aca7f63e22aaf2b"; + sha256 = "e1f394a0cbf75ca2e420c40286f1516aa2fe9be19aed51db40f4ca7658238f8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/zh-CN/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/zh-CN/firefox-104.0b7.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "8e8f7adac1d6e6bbcca4693e72e2b1b3146267f9c0de0634c02eb580017d4205"; + sha256 = "fdf74de848724dcf9b1da8390b57cf37992500d79800546dc4462de7cdf40911"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/102.0b9/linux-i686/zh-TW/firefox-102.0b9.tar.bz2"; + { url = "https://archive.mozilla.org/pub/devedition/releases/104.0b7/linux-i686/zh-TW/firefox-104.0b7.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "db770a52b74dcd8ad0ebb551c9b96a2558d8ff21cc4d106c68461970ea4dfc86"; + sha256 = "f5fad66ed736bc9f366eb546ecd18bdd97663eacfc9dfead88f82e65757a4b14"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index a78a0c1314..cefa5ebcb8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "102.0.1"; + version = "103.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ach/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ach/firefox-103.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "46bb0d10257cf4ca8bcb80ddd7e223a8bdaf4e28fb658f41af46c8ec0b321bb3"; + sha256 = "667b9eb59c4ecdfaf13f7d6a653ee87628364a01294507159f54d9c03d3eb5f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/af/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/af/firefox-103.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "59995d60269d943d9bf0a0bde29e6e507e91494508bba827b9d49af5341530bd"; + sha256 = "ff5bee28f145cd00c06ace53414f20b5bed8948aaf9a651003edce4e3f5ea553"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/an/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/an/firefox-103.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "f9131bc2881f830687c0dff1f431948774ac770b1542c56f42c93ad775d27492"; + sha256 = "53ed4ee66c6d232cfdf9da3198bb8e591862e50d387f69cfb4cfe51028c3d274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ar/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ar/firefox-103.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "5c769f460e97549546a877ad27818244f2289a4818bf145237d9809551ddbe13"; + sha256 = "406bacbfd8620bd0a249d03f96dbeb62fbe3128b435b50edff027b7b3b9c12a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ast/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ast/firefox-103.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "91e2ea408bf6deb74f174d13718158e09a3fcd9aafaf39b0dee632a02698ad49"; + sha256 = "99d7135bcc0d64083ea0a0946fa7f030f9b025da633e3aec751284a5a82a0dc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/az/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/az/firefox-103.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "d9582e3bb3f057c9e906a821a30b0f01e2a3349f6ca9b4533c6671b15081b087"; + sha256 = "00542247744f223b1511ea1432f376f692a1f224a5a50161be7ee2327c2d9005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/be/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/be/firefox-103.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "234982c40f48f19df333a92323ca4448e9439dca37a759957df6f1b66068d4b4"; + sha256 = "e75810c3c00287ca086fb990f13edceb295c7e03b79a093599d8b0413842088a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/bg/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/bg/firefox-103.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "fa861f846d558c0f7120f80b2f56f4400bcae56b21fbcdc32325fce4d67992c7"; + sha256 = "ac25d48f3e28065ffc2f011e607e10c97986d4d08011ee14a9d3a50f4c727e2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/bn/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/bn/firefox-103.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "22ec4bbc08bf793db33ca285e54a52cc6fbb9e85712f1a96d7a36e2beeea427c"; + sha256 = "b709046f7178bc0580f01f4c6c26ea3729608b595d594768e38bb8005fb01a72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/br/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/br/firefox-103.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c4a11e9d01eee94b9a36a47bc5a9714046c510132a12e0d596ad8144c515dc74"; + sha256 = "941cd816887f9bbf76c6cd192e8b1f87d76705666d63716d610e6eee97695a94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/bs/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/bs/firefox-103.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "960a0cb14cffa767cb398e7e59f9e68eb884093eaae55b9f88feae8ae55f2df1"; + sha256 = "e827efa73b263e60e708f8200227bede64242f9eb3e7085522dedad6507ad06c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ca-valencia/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ca-valencia/firefox-103.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "510d3746629976424f07f39094574b67c1b83d5a348b5be2a9f670f24027de07"; + sha256 = "acf8260a6f6f06a3ba0f05bd31214463e5404103daf5de9c6e726525ed126e85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ca/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ca/firefox-103.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "91bc95b46b4208b252ec3bbc941fe66d1cb3a8ed2ebafbe7dd4d7de10461c14a"; + sha256 = "fda60c9f0a55795157e70fd78542fec63944b3b443d82b17cf6a03f074d8f6a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/cak/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/cak/firefox-103.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ea2c15ef82e772141df11de2fcc86adb4ae3ed6a87ff9f48e5d4feaf2a6a2398"; + sha256 = "08fde34822645ae6d3c34bcde7202c8dd905d5f36a5e7790c9887b4e13b743b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/cs/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/cs/firefox-103.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "0594c8fbacdeb6a5255c67522713eee28427d08e3a3fabd855febaddae089275"; + sha256 = "5dcfd7687f523a56952a26e1fa4e900579e50d61ff342f5adc75ad33cc037cf2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/cy/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/cy/firefox-103.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "0c02f758b7ee899068953d2ec3fb00586fed52b35af25a7e2743a7bb8a79ad0d"; + sha256 = "7543927c81ffbf9c213f29f30d88426de340c1abb22e9285d63fcbd245136929"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/da/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/da/firefox-103.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "50bf4e3bf21760d3e2cfc20ab46c7973bc2b7b6f1373a784b74b7caefd9f7df6"; + sha256 = "d893cae22f582733662ad5676ab0152eda4f666900c379d7ca4179d0b0602ab2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/de/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/de/firefox-103.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ec93b1d7eb44a85ee19ea0ce00eea9df2395412986ff2bc5d5afe5562cda6995"; + sha256 = "ae48c75326e5b444429b09d324a13b26ce40df4b6ce05894870ac104000649ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/dsb/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/dsb/firefox-103.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "12d83d8ef2af3330da0796b151f096336db9b32afccd8b78fbae20af901472a9"; + sha256 = "bd11ad0969b616d364d174067df665d40a9b788195e4489cdb739f774cb7cec9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/el/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/el/firefox-103.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "c72a0c9b18c06759389c89c1ecbccd62b5613f9e7a07ae9a4b12e404ff1f8b22"; + sha256 = "a9ed65c8456545039d6127fd486d53aecf007235f05a0b74dc474fa682b4d5a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/en-CA/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/en-CA/firefox-103.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "2b5b3628ce47624b0710dd72ca93c5eab58a18a9dd493f6cd8bc3cc973168a6b"; + sha256 = "a57634e452ac8818ffe360686f003c0c98a846b66990125145d99f16b29626eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/en-GB/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/en-GB/firefox-103.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "489cd4c9cf1d95eb1ddfe7a00d73bca62145c3bb03ff9c48db76ddff374654cd"; + sha256 = "a5c6a543ff3582cbcc958a007c228d46eba77d8e12560f73028271d61b7296ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/en-US/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/en-US/firefox-103.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "1b9b7f04dad1954cdcb16d6d52938e3c6d8f2679c78807a06e04489d2affd6b5"; + sha256 = "7869a2d95e02d34b105b37baa669cf29e0fd075fd883eaf4b2bd4e0ced77f6ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/eo/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/eo/firefox-103.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "c9a99397f6fc63411fe9c420584d1f0bc3a6198d9e82f9d2ac542675405c023e"; + sha256 = "9b587327f283a51d24a65459e7ca02e11230937da40890c3750edeb36c57edaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/es-AR/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/es-AR/firefox-103.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "94b42f9e14bb8402c6b51ce448d3e9e83db3ab4c7ab0749b62363b6f6b6714b3"; + sha256 = "8ea2c2433631faf1b808da7123b7ed8b9a2e113b86617d9218d79834af4e679d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/es-CL/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/es-CL/firefox-103.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "44fcd6fa6dcd135a52510bff5f16570c79398cc5599eb4ce4680ca5c5bb7fc6c"; + sha256 = "4fe43133d965c6cbe7972f55101af80421af341da4305f5a929e690a9ca9521c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/es-ES/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/es-ES/firefox-103.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "8f7d2c1d5ee82c344149e7ec68e538ceb116c4781ea0478087aa8051de0360f2"; + sha256 = "44133f39d1b962860536f619993d931156867c01d1e26f58d070f1124505c960"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/es-MX/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/es-MX/firefox-103.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e7e3c46bb5371675e08254f63281fd333deacf91426c563d3eea4ea59f804bde"; + sha256 = "b7be94d4f18b5e8d1375c4520a5329b208a4bdf911d691f6086c876b1b98f825"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/et/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/et/firefox-103.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "43a5c07768df98fdba670436db37070cd26bfe5fd9fac9ed8ee09ab192c41441"; + sha256 = "a895e29bd9e27be40c3e5dc929931642a479e1ef3b76c631bed0fa423eafb707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/eu/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/eu/firefox-103.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "bed9fac2f760ca237267976be131125ef1d20379237f6e35ef1e037ffdb46c6c"; + sha256 = "63a7602c5bddbccb797aa4e5f5603dc6d86101085b2c29355e270324293bcba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/fa/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/fa/firefox-103.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "cf087b5bbbff300fc921727a8f6f19d8522cfe394957f9bfab1c24b25b797c30"; + sha256 = "ba35501e17f2cf5517ff28ad90f7e9798d0fca26de0c5cf8f8535389a285509d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ff/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ff/firefox-103.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "89edad833ebe7d9014c6418cdd45b7da0b5c02a26ac73461094c0e4d6f747c0f"; + sha256 = "c0eb30b289e912c1cdf1bad80ccfecafcb2d4a5f893bce45fbfb39b43ea5ffb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/fi/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/fi/firefox-103.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "08bce8ee22e05d1923ceb2cce574627e434be03269606ccfcb989376021b9253"; + sha256 = "405efc6891ba7e65b42359229f98c4483cfe35b623ea2a6ac2be868b556ae2b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/fr/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/fr/firefox-103.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "a09f140dc6c4cb1c5feb36d86376b28a8ec110ee7b464bc474dc432d69cca590"; + sha256 = "cdac96bd9de829c0c50c7dd54e0a9973cbca2aadd38f0149bc4290cf817b0b5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/fy-NL/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/fy-NL/firefox-103.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "c74790d0b6ee2dac789c7ac900d1331398a8b584e570fe535ee98ebf2121f699"; + sha256 = "9fca46eb9c189626430750a7ee4a8e230e0cd605fcbaa2c100efbbf954fb0fff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ga-IE/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ga-IE/firefox-103.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "f3f4d9ac1cdce936d2dd21500e96a8fbca71c598c9884821d847caf3a1af96ee"; + sha256 = "1b85d7ba7fea1a81859b7e453351806eae58271bd0ee5ebd3111219846e7ff5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/gd/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/gd/firefox-103.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "6f1985aacede5eefaeb238214b3e9710a6b9ad09658af0b88175bcfb84de3e42"; + sha256 = "d9d79846b310803de926206b842ca5dda33bcf9a896b5703c8244d7f9d2e5417"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/gl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/gl/firefox-103.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "0e54f941198dc2613ee086893d77d1cc0acb5f5c63920f3e90e5790b07526b5c"; + sha256 = "77292d69aa5fc995c16feffd5bc21137f4b623f247093c3ce319847671f84481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/gn/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/gn/firefox-103.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "c90295ddd2b8d4a81974337f6ac5927a00c73f6594f74363529539c6cc2f1e25"; + sha256 = "e6a02c18a386c2a68194267d561a364f3832ebd8d2ecd6a9c5111c0509481ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/gu-IN/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/gu-IN/firefox-103.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "4f360d3f3e19691796e09acfb4e3a113e8e0abaa65a73202d532877940d7ed40"; + sha256 = "c3b9bd403d549a1bc9cef24e36f8dde3f9cab01b24b917d9b09ed9da48d061db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/he/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/he/firefox-103.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "68e2e8feb093d43b7c6fd9437888b8ad38ad59f175d0b288b92b4408551754d5"; + sha256 = "9a78a88d90fb0d89318b5fbd74465bf03346e6ff7f0b1610903853b2bef4e05e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/hi-IN/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/hi-IN/firefox-103.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "29f8b443bf6452c1f72163e153a816858b5e6f3aa25a426f123c29d2c0848180"; + sha256 = "7f696fb0fce2d5a036c7624b1cc0145634a4f731acc1165a2446f91b55c3054f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/hr/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/hr/firefox-103.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "95b87f107a2ee9049c64fafe475338365530d6748650602d9394a7d788590264"; + sha256 = "6a2b65671537d04527f963b37645629b0446f3acccf2baf345bde00a1d80d7e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/hsb/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/hsb/firefox-103.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "7dd555015b95436ef4fca0fd44135286db04a82f21f8ac28ed34a1bcdea7ab84"; + sha256 = "586c85a6d0741fa62a9bf220de289f9646a618dec6680bb0b7f54ae4041f383c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/hu/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/hu/firefox-103.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "68336899032caf24f732c851089eed028829362b6170372482a12c9ec2a5ad1b"; + sha256 = "73d6cea610cc49b6fd47edf73fa96741190f06e830117924e71a38fd0ba056e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/hy-AM/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/hy-AM/firefox-103.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "6dabf9f63acbb98bf2e8e58113ab1633e99224bed43de5945c298ab920a88c28"; + sha256 = "bcbe9ffb5641fde9aa91ce397d0b9dccb087e42cc5789f5900098c6c013d7719"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ia/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ia/firefox-103.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "28b5bac350c250111def748b3488310167ced514efda3d66652cf302b51f27d0"; + sha256 = "0ac6925e54a5ca30647997cdb292c4f6b35222c60ed1cc1c382e6c78c5785cee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/id/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/id/firefox-103.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "3a6619999d4f6d7ac6e3e950a10815be5f39bd07c4e331a729a237bf757f6a6c"; + sha256 = "a393a32ca88a373f65a9a1fd97982c5f58972f264ccf5ba5be860d3aee799984"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/is/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/is/firefox-103.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "81a85f231acd5c5d13d72529fcf3b46714ac6ff18f7da5fed2792fa9f6b837c4"; + sha256 = "05cf0e983a2dc48688ab1d3110ec8b0f52d6762c8d95a96472c977ff6a863130"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/it/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/it/firefox-103.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "084028f8ae4de1fa5197908e6123454cee9005836df6e27d09908bda454bd862"; + sha256 = "4d4acc045eb0a9ba1e18a2d1e511f4b0d4b1145a400013f7faf11c5e650e6ba3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ja/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ja/firefox-103.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "fc57d26f133d9b6689fb72bf923327f9343fe1117f2a6b4d70555d8e4b10f138"; + sha256 = "cca13dd89e889dc0e27822e85c22f2efc089392792434ccb08ac0c805808ac71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ka/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ka/firefox-103.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "13b7b1f15eb0dfe45608e105b2754ffc3f9f4f0f42c3e382e69824eb50ecba76"; + sha256 = "0f102834c3df16ec7c7dd0f2fe70b8f6201b802ca252b43481ef32510837d047"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/kab/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/kab/firefox-103.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "c8941464d28d59e9761a58e1649e105cb37da3ef6f4804baca41edd8d177c24c"; + sha256 = "f0b52b45ecb42f4ff3a9420fa353c7df0146512fa6aa45d872e388165742642c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/kk/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/kk/firefox-103.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "37e1e5ba8e629d46338669d5e5c26e2e9a5fb3c7d33b52aa28cae757d883cd19"; + sha256 = "8e696ee71dea9a09892f57e20c3be7f492449b084f4ca32b687f9ed17a827089"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/km/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/km/firefox-103.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "9d557b921da0456b39be36e2991807ce70c1df8e047d1609f08a78ce31f5706f"; + sha256 = "bf5774d2fa798e79a77cea50667799ca81efe63b04633cee68f62f5ad168f88a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/kn/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/kn/firefox-103.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "75101de577da0e10a111d76674948cb1e659bc0a6a36b9b35900b88f782af18a"; + sha256 = "12e5f87263194d3e4d9185768aa7d4a306952c21c63075cf434f9d856e064a46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ko/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ko/firefox-103.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "779c0f54ef3d552ede4d5ff40d97f6be25d64e2773b94402355278648182e0ee"; + sha256 = "7dc889a785027d74676c701a739f115ed9f3060740fa8f2ab7773ffc52e6f5a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/lij/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/lij/firefox-103.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "c64c00ef5985018c535fb70913e39c7d2f6ea68b82724d0c6a649f90def4fb05"; + sha256 = "cf86b689cdb42beefefa8b4361d239e6a1b8b43b62899893b7ce0a4b8e8f6c4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/lt/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/lt/firefox-103.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "46b734a29f772d4cf3cb9d576e855e5cca4af343df4d18937d9d6b69677af549"; + sha256 = "cb81de8ca6059f5343a2f8cc4b2110d6784e3bf4077260563f391c977f8756c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/lv/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/lv/firefox-103.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "3c282564c0185d848365ac5b7f7b08da0ea2a603209cbc6faeb5acfce7470630"; + sha256 = "b44009c2f089f01ed49e12200b4dc3baff086ce09630e1b8c9419a1b9542da10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/mk/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/mk/firefox-103.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "940ec4b5e536141c133d91ce91f82c1fba6ad54ab80f5cccb48ae6791517e32e"; + sha256 = "73143c3587caca250b3027271c860a4b09c1f6efc898f27d3cf78a5781835f8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/mr/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/mr/firefox-103.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "2879456b59139bba481b010600aba352eead272d9551f817bed91bc56730d922"; + sha256 = "c12cea9024851a2896a9f6b5b6127229cab6f4c1bc5c3793f4dc7f2bf0f8c897"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ms/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ms/firefox-103.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "a58e62395a63973e35bfad2adcae08ab6fd03397f0e2c6d0beabb54628943406"; + sha256 = "e7cacc43fee6d4e6d720b0994f39e2cfe49e59cd2ba0e47017e7e997ead642b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/my/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/my/firefox-103.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "4b823ef88950d285c623cd9d566cd236e58beca9330341cde9a2cb326240647b"; + sha256 = "fd98964924a57d5208e14d19fd2fd86aa522cfe1af40ccb1b955195a0899156b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/nb-NO/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/nb-NO/firefox-103.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "838a9a3de0037f76f7f1a4b2a36dad1519de075fb07b601cb7b12fa7a5ec1444"; + sha256 = "31363aba0ac96d4fee665744f6328e2b447b0baa0957b1286169e7849ef74dde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ne-NP/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ne-NP/firefox-103.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "f38894580d0e30144934949e53b6d8592874419900b115288d1d1236aab6bdb0"; + sha256 = "f974a0b22b6df9f7f2d41c1f1b1a9d608fc5d40833454edd7b4f01d4a34c98a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/nl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/nl/firefox-103.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "364ebf214ee76a134022b5a9ea5fe93733a0e1f84b8fd1c656de86faab58ebb6"; + sha256 = "47dfcacb3753d1501393bbf6343aa756f9fbaa4292aaeb3cc4c5fd0293a7bd46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/nn-NO/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/nn-NO/firefox-103.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "6848b59e176f32c8a303fb6fc3725bb93a09846bb794210216a309be41bc5348"; + sha256 = "93ea62e1b69e0af218e66d4f627a6690eae8fce07698ce7b532a72877c482f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/oc/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/oc/firefox-103.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "e0854f481b5f409560fe3c55022dc9372bcf31b714b6340db75451790a542429"; + sha256 = "7be129a7c0dabb608eb38a76a940fac9f09fc2da978880f25b07ce695acc5068"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/pa-IN/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/pa-IN/firefox-103.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "536b87ed410bccecd1116f809465e6b1c103298ed1e0c9ae2480c3d9ff9e9929"; + sha256 = "e86418ac11d823f694404749c2d79efa3b6f94b78a0500e0f161dbb39888e01c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/pl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/pl/firefox-103.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "2a844f057be8af4006e258d41906639a882f6b3220b41a0434de239a1910a8a2"; + sha256 = "c7c8021f6f354142d59004f33b9846829dd883141031b5cc918a3768b5b06a5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/pt-BR/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/pt-BR/firefox-103.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "ba789f481e5a35b86defdb020ead396932184ff782c8dc7a64951175473c8255"; + sha256 = "fc927cfd3d653f2249d0e0b0b8b680e8912801bda21ca28be80a02ea1f58c6b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/pt-PT/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/pt-PT/firefox-103.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "0ad35706daac73d0013b02b77195f22bf75b3ef71652f3521221bfdb67401feb"; + sha256 = "73cdc8ec0098d5f2be5ebacb6258948896331f073acbc446a61ff352ae89e259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/rm/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/rm/firefox-103.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "87d0e1dc7bf312b8ecd58dcd1507eeb24ae7dcf240b2e054818a9fc5bc1427d3"; + sha256 = "3f77d327875c2fa51a5e8c0f610bbf4b762c593dc9c027453eada786ea0960d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ro/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ro/firefox-103.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "7a7e9b5d051c94ce968b41f278a179b9610b4205d69934862f600d7b028bc194"; + sha256 = "2ba0a665af0c2b3021e9dae7c8dfc169684873e77840af836add8def26292b09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ru/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ru/firefox-103.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "7de6e2ed3e23fb4ddec0555af5143ebb5797ec7d9e2c6622e8eaadfd40531d8c"; + sha256 = "34349423496c8fda3ef2304fc63ae2a04880d1eed7a953f1b446f5225bdbcd8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sco/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/sco/firefox-103.0.2.tar.bz2"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "67e9ce90897a429ae2f13e27af66375564f05af02b01d7e292c7b061ea86e3a0"; + sha256 = "7b16c352f96824395ac992545a44c8543f7ca8458503dd80fa431cb95a0778c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/si/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/si/firefox-103.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "0a34f41d508d00f1a104991403b7a7be68c2d6e41ec9bd89915d86b1eeef4d28"; + sha256 = "e622e22029c73feaa1f3b8e8907012c97f8403032966b7d347e26d57ee90fee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sk/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/sk/firefox-103.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "6ddcac0827bb9c052d36b19e81ea0dcd43f6e825448bd39af4975f15c56601f6"; + sha256 = "1c683ac68e6b1b7ff4bf74365770f627d9f4b1614eff054a8f4d488cefda9d3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/sl/firefox-103.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "89626505a507621b729a4f1337b18da3203331933ec87419960e8185c1646fbb"; + sha256 = "33f625fd5482bf741bb1695e7bda2ffaffd69e83f4518989c3d562f1db173f3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/son/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/son/firefox-103.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "59f4e313ae965c62999a6d657f4269c4552abb1dc00fb7d664f1f1380c372dec"; + sha256 = "173db42247414b8fbc42b6cbbb0364e45bbe03a6d4b2ceae22582604f86d09fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sq/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/sq/firefox-103.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "b17195c8d38e95354392a1856989c6409cd1ff3dadede5cf2c34fdafd3007c2f"; + sha256 = "ac4b3bed8a1a983431bdf31c0f4436da0bed5907c7ea3277d9583e3eb356fa66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sr/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/sr/firefox-103.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "3087ff60f3f6ee9eb02d758259d43d9eda0b9f065701a5de52d524847778f7e0"; + sha256 = "864fa316ea5179e0eedce9951028dbc0063dbc4dfaf9bc3343d0e5b25fc73f77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/sv-SE/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/sv-SE/firefox-103.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "3085bc8ecb12293487bc6eddc0667f50821375332f08eb306bf9d1f10a1f95b1"; + sha256 = "df701656df9f438f3faa31feda4c326a43a262cd15ddfbcd5a50b6fd471fddf8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/szl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/szl/firefox-103.0.2.tar.bz2"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "1524a056299caa58953e2cb86ccc0a1cbdfcd12cda552235099c5f94fe468cc6"; + sha256 = "33c14cefb63d3bd05874e970b178d741e163f1ee2e14dce1efb5af96e63342d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ta/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ta/firefox-103.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "bdaedc46817ddbe489e943d9476c3b6e9fb0a4d9e3d3e06889a06cb713ccd497"; + sha256 = "56cf70503dc04da80518424df9931252bf9ceca59123469b051c32f9a97fdb86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/te/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/te/firefox-103.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "fe2b9b572683bcc0a4d5f49cff84575b7c2df6aff856c9c6d2764240550cedcd"; + sha256 = "3e97fda3b8995a5f9efaeb211452baa197396f8a5080e87f2a3280342e506526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/th/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/th/firefox-103.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "6e236f5cb5cbf2680fdfa5478bbcb713068a80127abd8b7211d4310af3f912f1"; + sha256 = "76dfdcb6e37050f5b99cf077cde9d8d3b9d19dabc1e86e03591d702d9af7ac30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/tl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/tl/firefox-103.0.2.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "7979d7cd412453a0d8271566d53a2e9aea6276a2699f8f19512d10c899d61727"; + sha256 = "e2d601596453e03b429bdc617c70216943e070d1c1bfdab8dc8d75e74327db29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/tr/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/tr/firefox-103.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "f7fab006ae3012b6e5a69e7053698fdfad5354dbe19f4e7cf96062b96134fcca"; + sha256 = "08344227b430e93b0c0c4106948bc84d4b435b61f727a14c4aaf03dfe2195dd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/trs/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/trs/firefox-103.0.2.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "e6daae370f97e48a034c601123dbe3de9de5a24b7a56929bbc47d3c7eb48f008"; + sha256 = "d832f899f7860a27f4ff919ad2497f7a262b04ccb3a68a47a673fa8e781c8640"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/uk/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/uk/firefox-103.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a2155e80740ea11fca29aedceda897d199af30c66b545998787361af7e540b30"; + sha256 = "9dc9a94c51d6ade30757add21801f994617bc279fcb4991b5dbd253e8b7a2802"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/ur/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/ur/firefox-103.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "d8d63bf451f3bee189471de2cc89f56e9a617b2436e5e5cd6dbb5e7dcba602f1"; + sha256 = "4154dc35d9e46d6e2c374b8a62a80af325dabe1ae9e94f1def23a585901f9599"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/uz/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/uz/firefox-103.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "901d130bae7926d04d2b2dcd5bdf2aba6db864cfed7766961794b3183816ebc3"; + sha256 = "cf0e53b045242ecc70a56c099aaa46282291bbffc3d6af635771c8dcbca09806"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/vi/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/vi/firefox-103.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "113b29309cfef424a7eeb7693c596fc4eb68d5f969c2f74cb16b0dc373613583"; + sha256 = "f326a13d4fb7f90186dd103d46b66b39a47482b807c78073e330bc7f17fb27ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/xh/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/xh/firefox-103.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "31f55399b30544f6c1d2191132f145aa2c9c608aa91abfb1f5c298c751f3819c"; + sha256 = "089ccfdb05134a1e6a9ad4646dc443a24ca240d083c18ab1cd78564ee7e4f787"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/zh-CN/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/zh-CN/firefox-103.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5f9530eb7e67ebcd1188e481520600f646a85650f4038588fb9f6a7152473731"; + sha256 = "686ab7d49994ee25ffb8a8a3f242f0982897c821690f10f2c30c1ec469df6600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-x86_64/zh-TW/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-x86_64/zh-TW/firefox-103.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8bd5db690b53e47ec261d595b7c60b7aec6d70bd9ed42bea0ae4254ebb44fe87"; + sha256 = "4275ba2d56438ab14a1008849f373c41b292d85bfc07902f41974d1b198fd205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ach/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ach/firefox-103.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "fbdfb32bdb1b1d336c8c7882f3942fa45cc6a1dd8388290f4c63b68f1aa46331"; + sha256 = "b962109dfd45555b46f692ba3e53fd925afe45ffc0ff1105fe13027cd8d8a68b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/af/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/af/firefox-103.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "409af0720c69fcea10d7b34fc730121a03d10a16eb38a4bb7be2b3477f06e19e"; + sha256 = "654b7507c023333564791f76875f0722b4e9fc935bb80e0b2932de16ebe6b528"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/an/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/an/firefox-103.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "cd86aa9c20e803b7308cd7ef01f2e00a31ad7cb8a895a50f721e97e4d438c729"; + sha256 = "a93ae626b44676c3a517e35600f7abdac16f2cac873b4d24229a50e8c72a82c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ar/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ar/firefox-103.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4ebd6e2f0d84136174587e51dfce1a269c40aae4361bad15f78f91da8e073fc8"; + sha256 = "720ae5c60754b63ff0a6e52e691b621362773e1ea9e1cc4d2e1fdf538fb5ca0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ast/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ast/firefox-103.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "408a63cb9127e9efac43204385723c3bb51810db721a0573830e8f4f0e44c310"; + sha256 = "0a16fe33c0ed46a3e740ff0b2b7980a480434e9bdb9a66f691983e5e8c8e6552"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/az/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/az/firefox-103.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "0f69ced32b17199c49a1043e41dce80e35515c9e16667364446e2d3f45441b3f"; + sha256 = "bb13e66537f1308e665d74209e5f95ad23fe615a4594afa60dccfd7db1cd91b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/be/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/be/firefox-103.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "a809e9068bc372ff072e1b34d0ec62ee077d3ee9b928c9a73648605e81b90f41"; + sha256 = "0bbf4aa7f228f4286e59d34aea49ea36e4bd675bddd385d53e2d995c3c2b29ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/bg/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/bg/firefox-103.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "000c520bd71c2590638bed40b90cc3075e09d397d0db4b8c351776635ecb1107"; + sha256 = "5fff11cdf9900bab4a6c86707f990476fcd01cdec57fd63125ea88a2eccbc2ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/bn/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/bn/firefox-103.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "5a2974627a5aec428e80c6518faa28554fff2c86700309ca33f7c78a1d02cf8e"; + sha256 = "af80343e344326cf661ff66649cc9a5670bccb3726a7b6923c3a4547ed7c0396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/br/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/br/firefox-103.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "895d42bc70a97c8518c97c25909cd01866a92d6f5b88dbfd8d07df0d4a1166b2"; + sha256 = "38a485bc21ed61090bf121f4a081dce5b194a44db9cc5f7024d65b5b86fd3a38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/bs/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/bs/firefox-103.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "94b1c4a00045b99f58eaabc0b12b912a83e6c1d79d318ecad4f92313a67ff6e7"; + sha256 = "5a251f7ab017f99af3f7becf09f99209c15efd99d9786d1fd8af36e2e2a66b7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ca-valencia/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ca-valencia/firefox-103.0.2.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "778de777b2fe32798d24b7a4638c07b2fc0fffbda00d703cae128d609e3a0654"; + sha256 = "705e61f94a1fc99333b248f11af11fef36e4e7e028e87cd2cceee4c4f5ac7ecb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ca/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ca/firefox-103.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7d4dd5441522ce7191fdc4a07c15031a9b2c1ddef02d4dfa326267ba8304756d"; + sha256 = "c524f63fce99d26a61e3b65d7c13cf04e4e8e18eefff32dfab71906c420c5558"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/cak/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/cak/firefox-103.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "2a0869ce3590affd116c10d5b234642d6066bebf6c7d5f2daff6448a2199661c"; + sha256 = "7c72d38c1b93c547066fbff9f6760277c567d7af7b9a6ddd6f0d8a3f90f3659c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/cs/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/cs/firefox-103.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "fe10703ec63227e228ec3b5c128855016f6a5151d73a5e20a316741b12c75800"; + sha256 = "06a8d6f3839b5a8e32f20bc5a71812ff2624fd8b19fc443474471280ce45d49b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/cy/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/cy/firefox-103.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4fcdb9a767e02fe7f16278f37e66a086c49b05ffe96ea42e5144d6bbdb61dd98"; + sha256 = "1bf70f593238cbfff6994f1370a69d1138686712f8da800a360f01a5a5260a8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/da/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/da/firefox-103.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "f31b5be4fe48fe39490e1de239e66aaeffb4612dbbe9018cfa872682ecb15c34"; + sha256 = "9503186aa27c860094c8c72d424961f292ed3c4d0ad5e592b4bb5d8c7fc7aee4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/de/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/de/firefox-103.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "389bdc21a35170212a1e2314c2b4281450a466a1858cd11c3a4fafbb03b6ab8f"; + sha256 = "1395d528ffd1c29ef33be7609849e60312f6964b49b796ceaa8f2d0e9641147a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/dsb/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/dsb/firefox-103.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c60a73d2f3aeb511afb2544667032bb547a63f90413fbe7cbd64feef51666207"; + sha256 = "96d2cb208b7d41504c2059f80c83be8f01f81668e47d6188edca701cdd1e1418"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/el/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/el/firefox-103.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ddfcc601f810ead91aeee633470774b9d3a659b20c1d58e6d07d2d78f8adb47d"; + sha256 = "180bbb5fc06ab926ede08a40d9f3444989dfcbfdd18b7cc083072a528ae4b5e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/en-CA/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/en-CA/firefox-103.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a0d8f5c7db5a9213827eddd2c3fc58e347bb2163448b6f0b2592f0968467c074"; + sha256 = "a3e0a8fff4e2a58f518ff57e6bdec8b14513df1b0ac310c1f9da9d45961dc77b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/en-GB/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/en-GB/firefox-103.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8cd6d10bcc63a1a55c88e7f691c38f1b8e62a9a8cb951461706ff0b1213d870c"; + sha256 = "8c4e8a2d17e6730711cb3bf533269d91858ef7f903473146b934f367f423c4b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/en-US/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/en-US/firefox-103.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "643f899b1a3b2bb2a34c9ccab3375881ca7a9bda193c118927ba1f9dfbe56b73"; + sha256 = "99852e7b204be9821a40c42283d819a367f12adbafed906d22f12fd53b3fa8ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/eo/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/eo/firefox-103.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "fdf74607b94e39c97f38b4a39195c90c9070e2177a929f861b7380b91996f465"; + sha256 = "90bf871975ca2ff7ec781d8fed17528fc38fc41ba88e5d26e67a083f42ee2576"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/es-AR/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/es-AR/firefox-103.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "077d138678f2fcec2b23c99f5beb049f370885a099d2a717b86e6a33facaaf6b"; + sha256 = "712e7d63a064417a986a6bb760bffd46f3e927af4bc14d2f281343dc72d7b3db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/es-CL/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/es-CL/firefox-103.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "82e97dd939939445c7d1e982f2b53d71099fc28503f7cde167d81ef596638f1b"; + sha256 = "3ea9baa59fd7207b8cb8286f222e8f7bc40a1217d9b3ec73f8f3c766a50bc889"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/es-ES/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/es-ES/firefox-103.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "72ca69b410be2b94dd652678b6a12b9d72b2f40b7029a0073dc14026e5a9c17e"; + sha256 = "ded9fe10619ab84f51dd66ba1ea60406607aedf32329e33a24e56619aaf3f211"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/es-MX/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/es-MX/firefox-103.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "88ef1651217bedb95982ec13787a97b382bdf1300341b830bb349fdc8869f239"; + sha256 = "794513a4b2f55149af96f4a111a02c7dcd2d0d98ccaa89d0922f5daff9aa32f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/et/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/et/firefox-103.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a804fd794a309d16d681e75279cdfbf1eb34594d002e543f3bb452e8cfd9a371"; + sha256 = "b6ded248ad65c1d603ae39a3eb123e6476334ec4d151c9f48d496c72b5f8c3ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/eu/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/eu/firefox-103.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "0a45d439ef31f40e795cdc4b1bac9ccf7047feeb9330a62c2e0eba108e8c4b85"; + sha256 = "778c30d9467d7e3a12c79813cee3e39a5bc0a3faea8e5224c4c9014fd564b708"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/fa/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/fa/firefox-103.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "c80eca05272939e9fb8204d7e81d4c7e5cc94f674c622f0d2d02c34071540bae"; + sha256 = "de54be63983e7265247a0f9345be06361b2c9475631b7f28717192d4ac015c30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ff/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ff/firefox-103.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "7cd45d4bd0de9493c70a327722cc55fa61ae4ac088b3738683e018f33dbcb089"; + sha256 = "50bf5f2e029c715cb261acfdd2435cdbdc15ca9c6aa5e0a8a60090f137265bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/fi/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/fi/firefox-103.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "e3b42cf290b78cd42e7354942dd9976a327302074d032f868c377912631ec565"; + sha256 = "fcbbebe15f79a5634d5618b62c6b34157a48060c9ad7aded8b919a6f306f6998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/fr/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/fr/firefox-103.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "589665a8515564aa9fe907fc9f2eadfb1ef85afd199c0d4add59339ebf2aac60"; + sha256 = "8dc93cf01ccc9bdaabdd74357e90aca4a3533da7c799a650dd862c93b9f36192"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/fy-NL/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/fy-NL/firefox-103.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "83855c24442b8d8989077192d29201d3ad6dea8e2bc6d80d978ce5564be8293b"; + sha256 = "5d314e155903ff8f62671111c49ba5044cc55e5f2b7f2dca8fa2cf68d3b3c2f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ga-IE/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ga-IE/firefox-103.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "f240285131c060417ba9091341f1bb399936a25068f680e021389e2a498f9b6d"; + sha256 = "b5ffa83c822f9cc24cca6b385b72280cf1bc3e971c5bc285d0e987669d696cdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/gd/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/gd/firefox-103.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "c8e2a0350c5b6e9b62028bbad184291c15c10fc5814c948f54d4d2fb29f52534"; + sha256 = "2b89166220eb02826d8839556e264a8f08fb0340704380d9919c8ed5adc79474"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/gl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/gl/firefox-103.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0635e6015c14abb8680794800e0f8400a7cc123639b782b9757bc0b6095a5ee3"; + sha256 = "78a673257731f1d88fc4f13361cc9eaec5213b7af456922fea287683f5721659"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/gn/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/gn/firefox-103.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "9418e2b79581a9c2b17c4cecf7175a1456db572e8af437480758c3201fd3f40a"; + sha256 = "6dccf2e372d95c23d1adbf951e2f08ab9c273ed0e322b5c89d21a5590886eada"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/gu-IN/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/gu-IN/firefox-103.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "d0662e73146b3c35998f4da55297b6785e291c2dd25fd71f9276e592f347468c"; + sha256 = "e3c264da5eccaed2c86d3bd9e116bbacf717dd2573612ebe03d4e9a9ccb44f62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/he/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/he/firefox-103.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "4a9481f68c4386a331b00613f572ca39645de17b2c639b0cc61a8d94eaf54b37"; + sha256 = "e6cbdbfc446cbb5abcf3a1c34de47ad44449a98c0d420866fb1084197c47c2bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/hi-IN/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/hi-IN/firefox-103.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "0bf61ee762d7fa4826ea1aa3004acf6d01dc86112d32a3232e623198407bdffc"; + sha256 = "9e14ce602d332f44f65afcfbdd02c1c906df5da689e54cce3fb954146c905b95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/hr/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/hr/firefox-103.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "d1c05d24c85255f2347eac4e816d0474e630db3b621931889efdece93096dcce"; + sha256 = "885572cd49ac83b5b741c9d457d7d24f18607ceb469c015f526a458b217b03f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/hsb/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/hsb/firefox-103.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "d0792a4eb606bac718c73d303287769fd86f2ea21c8974987b04374be091060f"; + sha256 = "d4dc7974cc259b7c89f3bf5644f4ce9ed550fce3d4ec3d541058f2411328f87a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/hu/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/hu/firefox-103.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "3f90a3a53b6487fa0df6f34a5c2934b033b5c054eb5c261c2b165627bb3689ac"; + sha256 = "96305bc7cb3f344d97075bb72ac01295611074ee6086e5f0d9f6fe821b5ef277"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/hy-AM/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/hy-AM/firefox-103.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "d4a6a5640f6228dafe21a14dcb5db7fa8c779587e0ab956df36c7be8b11c87ee"; + sha256 = "8bafc462f78afa7ab315fbe6d3f7aa27c6bb766444ad2deb621ca1253101c3b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ia/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ia/firefox-103.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "4430bf86d60254a2aada4cba2ab341d1e50e55954b425fae91470bc290fe42fc"; + sha256 = "9e62963fd48110753ba62227d47e25364e100bf8bb18d71bbf15984df2d869d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/id/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/id/firefox-103.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "c155a606ffbc0353aeaa96f4a55c97fc866e0e544d726da85201869308860d4e"; + sha256 = "2f0cecbc174cd7ac532e188f95d4896134ec151b6cb03879ad9eaf9278beae63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/is/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/is/firefox-103.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d54ef1d69c63dcf52bde7ee2edcc7198296a5262d53e4a7f9d3afce033ef325f"; + sha256 = "4132b0046fbd0eea3a7d279e0ad62ce4852915966a38c91473ab35af483288f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/it/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/it/firefox-103.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "126d84de003c8580b690682b9e0ba2f6f99704f4b9373e5965ab718d62166d3b"; + sha256 = "5728d3ec62f7ec68ef6027215bc6535e212a03ee6f824453a2c723009f439be9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ja/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ja/firefox-103.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "8d126a58462dae9f382074e65fc36f803402e0ade5863a8193eff150881ece92"; + sha256 = "71410d762f9322eafcbc9084bdaa989af1a9c9e43507fb6078a1e80512aaa478"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ka/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ka/firefox-103.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "191bed12e433b9abfc6ea6529f3b3ac3b61bdde481bc5a9a72041d70ba6340d1"; + sha256 = "0518f6fd8ff08b9d47fb1c9cb3ac869ba1c5c7da8eeaaee6b70dc5f0ff1eb9f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/kab/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/kab/firefox-103.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "f60ec7bc77fe04abb54ed8a6707fe9ecdf599e863e97b0b0f38978550e003b03"; + sha256 = "c3da39d573acfe6c8389be20c218e8bb3d00e21726e552f8624a23278ddb3850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/kk/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/kk/firefox-103.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "923e5e44e9372861edcd676fb7fda2dbd7bb86746ba493d7b1931e736d197095"; + sha256 = "8d192c6e780bff63724b012d09d8a6561cbc85fab2dab10b52df83cd2d42bbfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/km/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/km/firefox-103.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "f95a2ce04a221d25fce530aea15ca8775c27946ede27dce968d954139b7ef8db"; + sha256 = "a3469234f1b42bf11e62e9a352810ea9aa8d3775df18f6f40a0cd8f9f5209d64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/kn/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/kn/firefox-103.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "5ac2b0ccdaa80df9407fec4bc28bebd197b15e46b909010e4846fa0ee5fac7ad"; + sha256 = "a8cb7107d56f9aa094f673c265e0547a1b0907b678dee02b632748bf4a5a48ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ko/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ko/firefox-103.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "26f7118844251d21809334a95718e59e6aa7343f20c997048aac398f3abbaa44"; + sha256 = "27fcc60b73aaa0298bd66347bb57b5ce8b13b4d25a6ee5180b5ca4f7de6d1a1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/lij/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/lij/firefox-103.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "7ea29446320a4360a3c2931707f06bc28497dc1e126a79287a44c53abb4f0fac"; + sha256 = "8d9cd8eac3a0428fc7369e7ca02a0ff222431828c45a4eab58584acb80158be7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/lt/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/lt/firefox-103.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "4d568ea735e757e21e96abbf5ccbca6f507c1d539a4ad19ce2d69a7091271f56"; + sha256 = "d80dd81c0aa9470b740745383ddf42553ec41e5d9c4c504bc9bca6478e7a57c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/lv/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/lv/firefox-103.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "493ef18c7f5e5604ab3e6744255c316a279b52b6a669ba9753241947a3798219"; + sha256 = "1bafd38a30b1b8bf6fa0e9ec4a6a9fd6c4a4872e809e1d66dd1c6787d1bbf46d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/mk/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/mk/firefox-103.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0213a3d4ecf5e3e270d8881d893441740849059e5db89d134f07ffedef152452"; + sha256 = "642abade64640db651ce477deba87994a118aa279f6ffdd302ddc620a3d0c9ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/mr/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/mr/firefox-103.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "feaba709b7699e83bed8cfb64ea8bf5acf38ecf112860353303231acb5579a73"; + sha256 = "b00eec77bdafd2046aa81260ded7cb56c459b4d1ee7ee80652983791fa16affc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ms/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ms/firefox-103.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "592bc3716c07eb6f097d546538f8828e84ab6006e6459dfe5deebc06969f08a5"; + sha256 = "f39f3771158dc7c46e3f5c30b433d35586da0a5d3418d5b0f62042521e99052c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/my/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/my/firefox-103.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "aaf34b393f58dafedf934ec76ff01bdcbf2dbe09b984846616860c5a505db8ec"; + sha256 = "9dcbdf49871e63f988c6b3a4115bf84f5d3843fb982b81e87495a1db1cb80675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/nb-NO/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/nb-NO/firefox-103.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0a31ea0a6f8af9205ba043e3a213407f20d33477557bee9f50bc12e67c2aa4da"; + sha256 = "59a4c7145b3a76d51bdfc8f6e4bec7c8624d90e8131ef97b272e2e073f1fe708"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ne-NP/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ne-NP/firefox-103.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "a2db06b7b440fa82788dd98587d16ad66d9e8515fb36695d65ceb00f36b3d9b5"; + sha256 = "577f7e0830ed6713b6b00a0b5ba614e205b68202c7243fa1fb452001fd5ae1bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/nl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/nl/firefox-103.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "ea3e758916e49e34156ee401d18c1d476286f81941fb12ecd9e38708173e9e72"; + sha256 = "fa9f40f2868eb78501486c8513d978faa1d513060eca68fdba13fa34578a076e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/nn-NO/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/nn-NO/firefox-103.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b30bddce41b5620c9e354281835130776d6499bc3612a0d773e2e55712499a21"; + sha256 = "14732b26dc092275a78223243733a29ba195c719170d852119d689ba4e31f915"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/oc/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/oc/firefox-103.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "d1d644e54224043e243ead3cc901b5b8e0345cb9e4f8c229d32e66bcc910a667"; + sha256 = "484bfe1df41935476f76dedb9cc3b8cf9e7b299a1e2e99f78a68ec797f8b3d6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/pa-IN/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/pa-IN/firefox-103.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "19085cdca4fc685a2a7a7cbd9654ff1d597c8be39fcbf83786641ec01823878f"; + sha256 = "100fb719a2f09c393771a766d1b165cbbee256b69cd07918fe4afe7b8bf78140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/pl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/pl/firefox-103.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "d69e2b0ccaa0980ded04452d9fa1b79e85cf39f60f03b7566c3b2f428b678ab3"; + sha256 = "2419cab7b2b71d2e39440d8867b2bba66cb2c6330240d7a9d22c63668cbbc875"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/pt-BR/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/pt-BR/firefox-103.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "90aea975b47dc134ca37a927ef8a6aca4b0e8a54bbcb62aac48be5c5284a14f1"; + sha256 = "134331e12301a11048a75a891c135fe48bfe573a1d86a3ac454b7ffc4612b0b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/pt-PT/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/pt-PT/firefox-103.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "3ed70ae4017110efff1b6484415931b209944f1c0175ff65904753f8d635ef19"; + sha256 = "8c7fb54060bf0708c3e9d4afe4ca3433078d0c815acb120530fdd1a2cb22f9a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/rm/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/rm/firefox-103.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "eedd78a7eb96cf59edce029d83185708e5e870401359cd5871b7fd21bb535ef0"; + sha256 = "d30713da6519a177e88df0a65d44990c6714248cc69146aefe20006d99056301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ro/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ro/firefox-103.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "22aa2cac8285f5a8bb6d1e9773d2ea0ba77284715657a8d678bdc9dc26fd05d7"; + sha256 = "3780683ff2b1f9916770a3d93348a4c6243d4aa7d45759a5d13ae1483b14b95b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ru/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ru/firefox-103.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "c7e19d09aaaf8a1ba83cb8554e6ea5acc7ab2967249cc605dceab8348dbe3d0a"; + sha256 = "287874ea57f9088eb965d5cdf1d574816f884790e92ed4d857129afbc737d1c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sco/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/sco/firefox-103.0.2.tar.bz2"; locale = "sco"; arch = "linux-i686"; - sha256 = "72a99f4fb3138cdaa4aa2b21898aab53b99826283619d4873e845ed0e39886be"; + sha256 = "7f0e4540b12439b4c148fab74b162b440bce4900b1c854f65b5c69dd40b157a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/si/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/si/firefox-103.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "d7b50cac4d681c6f80ce712fbea95683a329b4240df99eee6eef2eb37943670f"; + sha256 = "bd67285f89656b95fb3b7ddc485298e11cb585912e558118bf819afe83a5f7fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sk/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/sk/firefox-103.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "577ae57c5b945670505c0c41a91b85ec07213482073bd38e7ad30abbe8fa58b3"; + sha256 = "42c7d180af9f7971341044513fe347c6b0f97082370a3fa42f77edb1bf7e18d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/sl/firefox-103.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "01982ebf9f2fd307d002c8d887861ddd63f7a939dd086fad00a9ce10f7b38662"; + sha256 = "edb90893f92d6c6ef6d3fc118439cf51d2bb60b863e5c7be4560dd66da4be774"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/son/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/son/firefox-103.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "19d1cbc9647b7cff655a84ad383911ec29928dc14fa2782cf7ea8da833fbe89f"; + sha256 = "cc894f3899204fd5d5da28ab1047fd36520b0503756a4b1a473524e7046943ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sq/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/sq/firefox-103.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "d272017b07c3b840331a7cb752af406eb7e5b5349df3bcf764774e1482830184"; + sha256 = "575b38e35c41d561f49270a7a9c93d353f9a2aefb17744f9eddfa6eccb69ee0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sr/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/sr/firefox-103.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "b212c14f52e01c967e6e17ef14415f2d46fa285f2b7f9487d0822e5a39c8673f"; + sha256 = "03da3ceebe3a4f57599240092f3d7ee0bb3212a5c943fee81bb92d8bc8d4e842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/sv-SE/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/sv-SE/firefox-103.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "13a289c4a25512dc8c9c9d08ed8ea2ffd24956756b74f02375dedb4e8696ac4a"; + sha256 = "cedf5b9083da650e10fa980c666d001494fc012ebea55d63d10706470fe174ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/szl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/szl/firefox-103.0.2.tar.bz2"; locale = "szl"; arch = "linux-i686"; - sha256 = "dd9b42a7fa3a06c0956e9aa4ef95767a81a9ea2b410708bc394c0b066bbb0711"; + sha256 = "9a5b695aaf23325d094d4ff33b89c014e0356721c9f05f97394f8424c470f796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ta/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ta/firefox-103.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "8e869f787bffb0c76a913999baf087f4cbb30598950e2c7c5d48c1d99eed7042"; + sha256 = "0596f0f82eec30cd8d81a0fdeb48b031eb2b5b5f3624851a9e2974e5a515f4ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/te/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/te/firefox-103.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "06cd50bd7f577f915efa0c904bdb27906df9bcd24a94f35aa904299471a01cff"; + sha256 = "548bd9a8dcfd4b0fee2fec6819d659a41c51946e8098d1675e784ac81886ccdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/th/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/th/firefox-103.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "21bf4b45ddcec7f901d8dfb98bb6d176c5f05384b4764745f2634c29c9a91248"; + sha256 = "afaffdb62f14531d658f3af231bfb3f753dd4957df3b7b76c912b835ad940ecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/tl/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/tl/firefox-103.0.2.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "0d19a59ca94d2e561d2084bd0b25806077da7bb14d0d94e062d28804b7dc3b8b"; + sha256 = "d50d0262d8ba991c74d9fcf2bf70015507da9c3e752d146ee4b69f3426efb291"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/tr/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/tr/firefox-103.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "26fb0058417e1799025b3d2d045f7e4f33e82f69312d138afb5fb3713eda5a71"; + sha256 = "a6d8e3c1d9544b7e8d4598cb59204180c49169c6faa471a821ddd67c5b4055fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/trs/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/trs/firefox-103.0.2.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "846d4a907f4af9a85d72ce00e3ae1793e35d1f1df96b57711cfa8dc4cfe5c0d2"; + sha256 = "586a6761366673b7b3fabd966c4a8e65aa850c60230bb5c078da83de1ab6aa38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/uk/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/uk/firefox-103.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "0506e021bf1c34c6b1b4fb3c3fd095431bd4852224bbfe807a99404c9fed0d1d"; + sha256 = "654ad92cc77bff8ed4385e9c0511c0f107327b8ed128874cb7913df2824b572e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/ur/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/ur/firefox-103.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a0fe16bebc32cb512df1b1251b87f59bf14da25d18b2bab85fad96f5be796466"; + sha256 = "5fbd71c269feedaf637eb2611ccd956a426bede0958008a71a07862d24b03b36"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/uz/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/uz/firefox-103.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4ef1a2b0708e3263799d353d1a363e02870da08a608e8282b982bdf93e200cfa"; + sha256 = "9344c246a6a91431df5a1aa21b5ec3a24123bdd2919893f9e71d977427038d29"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/vi/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/vi/firefox-103.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "7325a392d359c72807f30992469d72c36b8351b1c5b08d96cf77d8ed5def7437"; + sha256 = "7dab6c27775bf05558adae3d015a5fec31ca0b191ecd6342bb945000456d8b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/xh/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/xh/firefox-103.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "83d21390a892cd3bf381f990a9bc51703432c2daea99aee9d07a5225a3199b76"; + sha256 = "cd74b821097542e39f73e9666580bfb763643091881264725875472b08c2be68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/zh-CN/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/zh-CN/firefox-103.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b4e2e92dd46553a94eba49af88229f5d60f2c6d00539276799cb8be65bbab21c"; + sha256 = "5d1c16904b8feeeaa868762075a2b55328fa9b589bbcf31d5cefa852b1cd3ff8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/102.0.1/linux-i686/zh-TW/firefox-102.0.1.tar.bz2"; + { url = "https://archive.mozilla.org/pub/firefox/releases/103.0.2/linux-i686/zh-TW/firefox-103.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "0f9cc66cdc5478cb8c270db76dd5396ac9c8aa0a8c81b5d8236b0b4f3c5a8a3e"; + sha256 = "aaa4da6b12b6c70542b60cd97520a79b6799366ec840ce8eede2a89389aafcbe"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 9e3a08cb66..fb4c326be5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -202,7 +202,7 @@ let in buildStdenv.mkDerivation ({ - name = "${pname}-unwrapped-${version}"; + pname = "${pname}-unwrapped"; inherit version; inherit src unpackPhase meta; @@ -219,7 +219,7 @@ buildStdenv.mkDerivation ({ "profilingPhase" ]; - patches = [ + patches = lib.optionals (lib.versionOlder version "103") [ (fetchpatch { # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 name = "rust-cbindgen-0.24.2-compat.patch"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 31a65f235a..8e1c98bf9c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = buildMozillaMach rec { pname = "firefox"; - version = "102.0.1"; + version = "103.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417"; + sha512 = "f13984bb551039c80ef731931f08a284f070142ecb479b31a4caad026a6b535e3fc7ae506b629e933ba5f5a1676f14b6b36d031d22584170492676f8727c822a"; }; meta = { @@ -27,12 +27,12 @@ rec { }; firefox-esr-102 = buildMozillaMach rec { - pname = "firefox-esr"; - version = "102.0.1esr"; + pname = "firefox-esr-102"; + version = "102.1.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "ce804fa4e5dda3b8c4c7937f18994a184b0eb7d8fb9484dc924d04d3213ee3daf018141f91703daed6d060a99bfc5d915186db10a4ddcf220c2ea43e369e58df"; + sha512 = "2505b87ce4115445568eb6b7d8af41678bd787fd07f3f79e9f0a22d90cdf752ae5d4371856cf9c56e2d9da7d5b7c3939dc2aab5753fcc017398e7d65260f6f03"; }; meta = { @@ -54,12 +54,12 @@ rec { }; firefox-esr-91 = buildMozillaMach rec { - pname = "firefox-esr"; - version = "91.11.0esr"; + pname = "firefox-esr-91"; + version = "91.12.0esr"; applicationName = "Mozilla Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96"; + sha512 = "323fb752488b45872b40f0b0ee1d8c1dffa16874dbff2afde19a54286c824ef48177233e029faeafa5946184e71c31c6bc5ba7ec17a571e21af64fc5f7334042"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json index e5dc54729e..44f09e3d2c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "102.0.1-1", + "packageVersion": "103.0-3", "source": { - "rev": "102.0.1-1", - "sha256": "10f9gngn04nwrhcqkdznx7209c4javscqz8arswyrn4c8rc5x6w5" + "rev": "103.0-3", + "sha256": "1d8qh0s5zjh10cyyawpvr7ywygg1ibh1r0rx0vnqv1qakj3y4jcq" }, "firefox": { - "version": "102.0.1", - "sha512": "a930d359fb81e473b963a93f6db5110871e9fd57f6d0f352513047d363d930dd4811e8dd786c2f6f3541c3871eb1c0169b718652d9ee076fd13a20f52af30417" + "version": "103.0", + "sha512": "016c2f276fb94e5174626f7d8b1a821b2de0f5a07f8a10f00a7ea4d4285591b0c23dd3ef45306579de79b3dfa99ccc527224c33f3319f61cf088b1f4bd097f9e" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix index 02b3f88d1e..e01131e193 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.25"; + version = "2.27"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "sha256-LdeFCGmOgnnvTwmjoqIelZUEARNALabFU5dEFPtJ3Sw="; + sha256 = "sha256-2N3L/O3nzd6Aq+sKI2NY9X+mvrK8+S4QliTpuJb567Q="; }; buildInputs = with lib; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix index c3e73e18de..c3a44a6dbb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/offpunk/default.nix @@ -5,8 +5,8 @@ makeWrapper, offpunk, python3, - ripgrep, stdenv, + testVersion, timg, xdg-utils, xsel, @@ -24,7 +24,6 @@ let ]; otherDependencies = [ less - ripgrep timg xdg-utils xsel @@ -32,14 +31,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "offpunk"; - version = "1.4"; + version = "1.5"; src = fetchFromGitea { domain = "notabug.org"; owner = "ploum"; repo = "offpunk"; rev = "v${finalAttrs.version}"; - sha256 = "04dzkzsan1cnrslsvfgn1whpwald8xy34wqzvq81hd2mvw9a2n69"; + sha256 = "1zg13wajsfrl3hli6sihn47db08w037jjq9vgr6m5sjh8r1jb9iy"; }; buildInputs = [ makeWrapper ] ++ otherDependencies ++ pythonDependencies; @@ -56,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru.tests.version = testVersion { package = offpunk; }; + meta = with lib; { description = "An Offline-First browser for the smolnet "; homepage = "https://notabug.org/ploum/offpunk"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix index c4c00d5637..47ea426565 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/default.nix @@ -45,15 +45,15 @@ assert with lib.strings; ( stdenv.mkDerivation rec { pname = "palemoon"; - version = "31.1.0"; + version = "31.2.0.1"; src = fetchFromGitea { domain = "repo.palemoon.org"; owner = "MoonchildProductions"; repo = "Pale-Moon"; - rev = "${version}_Release_build2"; # Remove _build2 when bumping past 31.1.0 + rev = "${version}_Release"; fetchSubmodules = true; - sha256 = "sha256-x3n4OeZbnJCPCVjsZJW1nBYlsEYn6fXt80voYWQSNq4="; + sha256 = "sha256-ytJC3QW9grbI6DusYITACc40+xUJ94+ATVGaOzWAwHU="; }; nativeBuildInputs = [ @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { # Too many cores can lead to build flakiness # https://forum.palemoon.org/viewtopic.php?f=5&t=28480 - export jobs=$(($NIX_BUILD_CORES<=32 ? $NIX_BUILD_CORES : 32)) + export jobs=$(($NIX_BUILD_CORES<=20 ? $NIX_BUILD_CORES : 20)) if [ -z "$enableParallelBuilding" ]; then jobs=1 fi diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/mozconfig b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/mozconfig index 65143fdac1..d680dc1ab4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/mozconfig +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/palemoon/mozconfig @@ -19,7 +19,10 @@ ac_add_options --enable-jemalloc ac_add_options --enable-strip ac_add_options --enable-devtools ac_add_options --enable-av1 +ac_add_options --enable-phoenix-extensions +ac_add_options --disable-eme +ac_add_options --disable-webrtc ac_add_options --disable-gamepad ac_add_options --disable-tests ac_add_options --disable-debug @@ -34,8 +37,10 @@ export MOZILLA_OFFICIAL=1 ac_add_options --x-libraries=@xlibs@ +# MOZ_PKG_SPECIAL is only relevant for upstream's packaging + # -# NixOS-specific adjustments +# NixOS-specific additions # ac_add_options --prefix=@prefix@ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 766e6bfe5f..f3a443c6ff 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.5"; + version = "11.5.1"; lang = "en-US"; @@ -98,7 +98,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-Itag51LOYmxDrpDxafHXv0L+zMB6bs3dEdIIddd82cI="; + sha256 = "sha256-LgzvptQoTHGngW4xDZNfm5teSjpAjcUzMKDbBHRInoo="; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "sha256-U0cTWusoRKM9VWZiOfoIU3dhKvR21OatoVvhHMDE9oo="; + sha256 = "sha256-J/ka/Qvu2UC5KTfatkWq0jc6bHTazA20vL9tz1sK/Rg="; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix index 40ae8502c7..29f3cbd0b1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vieb/default.nix @@ -14,7 +14,7 @@ mkYarnPackage rec { packageJSON = ./package.json; yarnLock = ./yarn.lock; yarnNix = ./yarn.nix; - yarnFlags = [ "--production" "--offline" ]; + yarnFlags = [ "--production" ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix index 9d29fc6c0b..0d59b67c21 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.3.2679.68-1"; + version = "5.3.2679.70-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0dfpxjr1sknkppazmw6dwrczv6gvh14nyc3la3q1y7cdzp95jpx3"; + sha256 = "0mcq3nbbjw5x2gjah6hbbiv233bxwi68y7nziyqpp9d6nd2pixjn"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix index 2215de9291..b5961c4adb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -32,14 +32,15 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "41.1"; + version = "42.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; rev = version; - sha256 = "1vbw9x5s3ww11f3lnqivc74rjlmi9fk1hzaq1idrdcck3gvif0h8"; + fetchSubmodules = true; + hash = "sha256-ASKK9PB5FAD10CR5O+L2WgMjCzmIalithHL8jV0USiM="; }; outputs = [ "out" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index 4990d008c2..1e5e8ab749 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cloudflared"; - version = "2022.5.2"; + version = "2022.7.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - hash = "sha256-xE/Bc+6Ob2u4tQQoykoaa8MhFH2czwz5rMABUqfXNMM="; + hash = "sha256-kc6+jn4eTCw37u+kPJdx/kxiaj8MnIddDbUFpPfWdlw="; }; vendorSha256 = null; - ldflags = [ "-X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; preCheck = '' # Workaround for: sshgen_test.go:74: mkdir /homeless-shelter/.cloudflared: no such file or directory diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix index 371d0b3a55..e3e15162d7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo-rollouts/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argo-rollouts"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${version}"; - sha256 = "sha256-1oF93+pN9wyCq5R5bTeMN/uzg9DHpc/AkX/d1lB5r1g="; + sha256 = "sha256-l23RVpwT/XYkpVTWkSYdPyvn7Xirs0Sf85U6Wrx5H1k="; }; vendorSha256 = "sha256-URuIeF1ejKdMGxziJbujLctYheiIr/Jfo+gTzppZG9E="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 7023e94f0a..e4380b7873 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.3.9"; + version = "0.4.4"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-LX/26fOvQYnzCbVuMxsuD/3bdZx/mVD47v8l4DppUPA="; + sha256 = "sha256-d7Jm4Ff7cXytbECt+/TzncCwDGDYxsV1xOC8GSPAgJY="; }; - vendorSha256 = "sha256-UYTEQ3RvSJB+9zduw0xCDU71Zp54ilZzNucuzTMKEHA="; + vendorSha256 = "sha256-EpLU6rYzmtk/FCZiS8AJVGR4LUEkzNQE26CU9LzBwFM="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index c97d28de8d..44f244cacb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "argocd"; - version = "2.4.4"; + version = "2.4.9"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-rmgXsA9rOCUy1HDm09Aq5s8EfkM71We76gffPElnUAU="; + sha256 = "sha256-/g+icvpo62iV9GmpYxwHP7bsJF770bfnsVknVHEnEzM="; }; - vendorSha256 = "sha256-32cuYIySHtV+PfN2wrqf+p01+F6uBZJN3w2MeDQ8hbI="; + vendorSha256 = "sha256-M1ZYooS22bntHXAMK4QpMAwuMvN4/tHtVu3WZW9V8TA="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 @@ -26,9 +26,9 @@ buildGoModule rec { "-X ${package_url}.gitCommit=${src.rev}" "-X ${package_url}.gitTag=${src.rev}" "-X ${package_url}.gitTreeState=clean" - "-X ${package_url}.kubectlVersion=v0.23.3" + "-X ${package_url}.kubectlVersion=v0.23.1" # NOTE: Update kubectlVersion when upgrading this package with - # https://github.com/argoproj/argo-cd/blob/master/go.mod#L95 + # https://github.com/argoproj/argo-cd/blob/v${version}/go.mod#L95 # Per https://github.com/argoproj/argo-cd/blob/master/Makefile#L18 # Will need a way to automate it :P ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix index 420d093755..92070fe2a3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/arkade/default.nix @@ -2,22 +2,25 @@ , stdenv , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { pname = "arkade"; - version = "0.8.29"; + version = "0.8.30"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-VCscevLGRpBgqxhRNcvIkCdroE0MawG1fROVOLjZLW0="; + sha256 = "sha256-KTZ8UJ0aQmjreio7ancJnZ0KGANAQIPYNSQGXHHSqX4="; }; CGO_ENABLED = 0; - vendorSha256 = "sha256-CoIlqDMmhZY+B5SEabmnbP2QUu1jkFluCzLp3Y8Z7n0="; + nativeBuildInputs = [ installShellFiles ]; + + vendorSha256 = "sha256-6EnhO4zYYdsTKvNQApZxXo8x6oFKsmuMvOI3zPHAQLs="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ @@ -38,6 +41,13 @@ buildGoModule rec { "-X github.com/alexellis/arkade/cmd.Version=${version}" ]; + postInstall = '' + installShellCompletion --cmd arkade \ + --bash <($out/bin/arkade completion bash) \ + --zsh <($out/bin/arkade completion zsh) \ + --fish <($out/bin/arkade completion fish) + ''; + meta = with lib; { homepage = "https://github.com/alexellis/arkade"; description = "Open Source Kubernetes Marketplace"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix index f9b66041d4..65f3313bcc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.11.11"; + version = "0.12.1"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IZMtkTKslFvbk/qwfZpFZAV6VUj66JKGFewXH1Ujxbw="; + sha256 = "sha256-WCOZuHJBssRM75+EO9s11t7ASkLxHbsVe+qmb/glFWU="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix index 9066cbe7b9..2018b94d4b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "civo"; - version = "1.0.28"; + version = "1.0.32"; src = fetchFromGitHub { owner = "civo"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-PuLmjX7ps0pdfaDpshWrc67OW83/jpB4HkNCi1fzpAU="; + sha256 = "sha256-Q/eSYm+SupHdRf7O7dU+UU+1GOwtjcsT0iFxWiKAEuw="; }; - vendorSha256 = "sha256-VMBMiwBFXKe+E4Xzcmhu2Ge5JzS+jIbUtxTfp+B0EWE="; + vendorSha256 = "sha256-ZZwecjcJqKOj2ywy4el1SVMs+0a/F6tFP37MYDC6tyg="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix index c2b313d442..f09afe7b65 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clusterctl"; - version = "1.1.5"; + version = "1.2.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${version}"; - sha256 = "sha256-Nnfy8KOMJqg2sXrNDZlrcrpWfc70sXL1tNlXSgg5ZZg="; + sha256 = "sha256-udlIylkaNZIkJS6TgJemmQr/o73i87Nt8pL2Pbe+AqA="; }; - vendorSha256 = "sha256-zRdtd/mE9AQtqw9Z/Tatd9vEx9l/XSFge8sOLbS/Wrs="; + vendorSha256 = "sha256-jM5qU/KaBf+CzKKOuVXjawn/QqwrCjXKaQFFomEPndg="; subPackages = [ "cmd/clusterctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix index 28a0df2fcd..3cef6be03c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cmctl/default.nix @@ -2,20 +2,24 @@ buildGoModule rec { pname = "cmctl"; - version = "1.8.2"; + version = "1.9.1"; src = fetchFromGitHub { owner = "cert-manager"; repo = "cert-manager"; rev = "v${version}"; - sha256 = "sha256-sfC1acnCrcQ4A1tXXcjh47Af6xeJqjdGXy0gK21ZSFg="; + hash = "sha256-Z1aJ18X4mfJPlCPBC7QgfdX5Tk4+PK8mYoJZhGwz9ec="; }; - vendorSha256 = "sha256-UYw9WdQ6VwzuuiOsa1yovkLZG7NmLYSW51p8UhmQMeI="; + vendorSha256 = "sha256-45+tZZAEHaLdTN1NQCueJVTx5x2IanwDl+Y9MELqdBE="; subPackages = [ "cmd/ctl" ]; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-s" "-w" + "-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build.name=cmctl" + "-X github.com/cert-manager/cert-manager/cmd/ctl/pkg/build/commands.registerCompletion=true" + ]; nativeBuildInputs = [ installShellFiles ]; @@ -28,11 +32,21 @@ buildGoModule rec { ''; meta = with lib; { - description = "A CLI tool for managing Cert-Manager service on Kubernetes clusters"; + description = "A CLI tool for managing cert-manager service on Kubernetes clusters"; + longDescription = '' + cert-manager adds certificates and certificate issuers as resource types + in Kubernetes clusters, and simplifies the process of obtaining, renewing + and using those certificates. + + It can issue certificates from a variety of supported sources, including + Let's Encrypt, HashiCorp Vault, and Venafi as well as private PKI, and it + ensures certificates remain valid and up to date, attempting to renew + certificates at an appropriate time before expiry. + ''; downloadPage = "https://github.com/cert-manager/cert-manager"; license = licenses.asl20; homepage = "https://cert-manager.io/"; - maintainers = with maintainers; [ superherointj ]; + maintainers = with maintainers; [ joshvanl superherointj ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix new file mode 100644 index 0000000000..e2aa0cd47c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, stdenv +, testers +, crc +, runtimeShell +, coreutils +}: + +let + openShiftVersion = "4.10.22"; + podmanVersion = "4.1.0"; + writeKey = "cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; +in +buildGoModule rec { + version = "2.4.1"; + pname = "crc"; + gitCommit = "6b954d40ec3280ca63e825805503d4414a3ff55b"; + + src = fetchFromGitHub { + owner = "code-ready"; + repo = "crc"; + rev = "v${version}"; + sha256 = "sha256-wjwTf+d19F1NLYmUORMU0PGJeQZd+IrlScm5DiFvAk0="; + }; + + vendorSha256 = null; + + nativeBuildInputs = [ git ]; + + postPatch = '' + substituteInPlace pkg/crc/oc/oc_linux_test.go \ + --replace "/bin/echo" "${coreutils}/bin/echo" + + substituteInPlace Makefile \ + --replace "/bin/bash" "${runtimeShell}" + ''; + + tags = [ "containers_image_openpgp" ]; + + ldflags = [ + "-X github.com/code-ready/crc/pkg/crc/version.crcVersion=${version}" + "-X github.com/code-ready/crc/pkg/crc/version.bundleVersion=${openShiftVersion}" + "-X github.com/code-ready/crc/pkg/crc/version.podmanVersion=${podmanVersion}" + "-X github.com/code-ready/crc/pkg/crc/version.commitSha=${gitCommit}" + "-X github.com/code-ready/crc/pkg/crc/segment.WriteKey=${writeKey}" + ]; + + preBuild = '' + export HOME=$(mktemp -d) + ''; + + # tests are currently broken on aarch64-darwin + # https://github.com/code-ready/crc/issues/3237 + doCheck = !(stdenv.isDarwin && stdenv.isAarch64); + checkFlags = [ "-args --crc-binary=$out/bin/crc" ]; + + passthru.tests.version = testers.testVersion { + package = crc; + command = '' + export HOME=$(mktemp -d) + crc version + ''; + }; + + meta = with lib; { + 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 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/update.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/update.sh new file mode 100755 index 0000000000..9d3fcba7d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/crc/update.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnugrep gnused jq + +set -x -eu -o pipefail + +WORKDIR=$(mktemp -d) +trap "rm -rf ${WORKDIR}" EXIT + +NIXPKGS_CRC_FOLDER=$( + cd $(dirname ${BASH_SOURCE[0]}) + pwd -P +) +cd ${NIXPKGS_CRC_FOLDER} + +LATEST_TAG_RAWFILE=${WORKDIR}/latest_tag.json +curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + https://api.github.com/repos/code-ready/crc/releases >${LATEST_TAG_RAWFILE} + +LATEST_TAG_NAME=$(jq 'map(.tag_name)' ${LATEST_TAG_RAWFILE} | + grep -v -e rc -e engine | tail -n +2 | head -n -1 | sed 's|[", ]||g' | sort -rV | head -n1) + +CRC_VERSION=$(echo ${LATEST_TAG_NAME} | sed 's/^v//') + +CRC_COMMIT=$(curl --silent ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ + https://api.github.com/repos/code-ready/crc/tags | + jq -r "map(select(.name == \"${LATEST_TAG_NAME}\")) | .[0] | .commit.sha") + +FILE_MAKEFILE=${WORKDIR}/Makefile +curl --silent https://raw.githubusercontent.com/code-ready/crc/${CRC_COMMIT}/Makefile >$FILE_MAKEFILE + +OPENSHIFT_VERSION=$(grep 'OPENSHIFT_VERSION' ${FILE_MAKEFILE} | + head -n1 | awk '{print $3}') + +PODMAN_VERSION=$(grep 'PODMAN_VERSION' ${FILE_MAKEFILE} | + head -n1 | awk '{print $3}') + +WRITE_KEY=$(grep '$(REPOPATH)/pkg/crc/segment.WriteKey' ${FILE_MAKEFILE} | + head -n1 | awk '{print $4}' | sed -e 's/$(REPOPATH)\/pkg\/crc\/segment.WriteKey=//g') + +sed -i "s|version = \".*\"|version = \"${CRC_VERSION:-}\"|" \ + ${NIXPKGS_CRC_FOLDER}/default.nix + +sed -i "s|gitCommit = \".*\"|gitCommit = \"${CRC_COMMIT:-}\"|" \ + ${NIXPKGS_CRC_FOLDER}/default.nix + +sed -i "s|openShiftVersion = \".*\"|openShiftVersion = \"${OPENSHIFT_VERSION:-}\"|" \ + ${NIXPKGS_CRC_FOLDER}/default.nix + +sed -i "s|podmanVersion = \".*\"|podmanVersion = \"${PODMAN_VERSION:-}\"|" \ + ${NIXPKGS_CRC_FOLDER}/default.nix + +sed -i "s|writeKey = \".*\"|writeKey = \"${WRITE_KEY:-}\"|" \ + ${NIXPKGS_CRC_FOLDER}/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index 7d060c546d..d458e7ce40 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -1,9 +1,9 @@ { lib, buildGoModule, fetchFromGitHub, fetchzip, installShellFiles }: let - version = "0.31.3"; - sha256 = "16c6rr0hzlzlfc5xsphp23s3rxavkgfcsblzm15wzd85c2ahm81l"; - manifestsSha256 = "1nr44h5sy97ki2vn2426i2idnnc4pv1n3j6n4p11mf73dy9qzgzp"; + version = "0.31.5"; + sha256 = "0dv34y79229n63i5as0qxf3lmlsfyk8p277i09hrq1vn86wnjdm7"; + manifestsSha256 = "1p5f05lgbv2hhl5dbank2mmhmhlkxn1rfnh09x02j22ldrvk3zzl"; manifests = fetchzip { url = @@ -23,7 +23,7 @@ in buildGoModule rec { inherit sha256; }; - vendorSha256 = "sha256-vHRk6oADEvDmYCeBK/puGSMd4L9K1x/CVPtuYZY9klk="; + vendorSha256 = "sha256-bTvVf6fsrWLayOwwxBo2iOz5Di4dHEiV45uGkAyWrMU="; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index dd98759292..cda692cacf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.25.2"; + version = "1.25.3"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-OZLTT54InDPF+m5e4xtuAL311wCD16Ne/T0PbgiSaN4="; + sha256 = "sha256-tV6rPpZW3HWxUBUdDkYOP6gIc/ZD+CMmT7FVYXiLp5A="; }; - vendorSha256 = "sha256-Q9THG76/B/gdfhf5wLxVXoAAzXeOjaaAyYaGKy9LeF0="; + vendorSha256 = "sha256-wApm7IXblhQiV7VpBXZndJgFpQmq2WEFjCEG1qd+Nlo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix index 714d1e1e4d..8dbe5f4659 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.8.1"; + version = "3.9.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - sha256 = "sha256-zEUH88sjgR738BXK2oSSM6jf5oHZt0VJv61BcxclG1Q="; + sha256 = "sha256-hZ8PBJ+6G0A5tVrJfxy2rODxOxQarQg6mxG3sQCqjfY="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix index a9b4441e00..07ddd07e7a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.10.10"; + version = "1.12.0"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-Be0ejIQ3euKXX6wc1abXz8BphhrDnBMP0GzmnrF7C/4="; + hash = "sha256-LRCdKz7vaxxQTFveHbF2WrSinPtjWP96GhqtSMLIiDs="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "1s3s4n2wgi4azwkmg9zw2a3gz378nb1i41p3s8aixfbf6fsqc6ga"; + vendorSha256 = "sha256-1FbcNgTD5+YI29LOmkJMjhE+MnxrKmomTKK4DgyXCws="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix index 1b8cba11c7..1d9b10bfc3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hadoop/default.nix @@ -26,13 +26,13 @@ with lib; assert elem stdenv.system [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; let - common = { pname, versions, untarDir ? "${pname}-${version}", hash, jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: + common = { pname, platformAttrs, untarDir ? "${pname}-${version}", jdk, openssl ? null, nativeLibs ? [ ], libPatches ? "", tests }: stdenv.mkDerivation rec { inherit pname jdk libPatches untarDir openssl; - version = versions.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + version = platformAttrs.${stdenv.system}.version or (throw "Unsupported system: ${stdenv.system}"); src = fetchurl { url = "mirror://apache/hadoop/common/hadoop-${version}/hadoop-${version}" + optionalString stdenv.isAarch64 "-aarch64" + ".tar.gz"; - hash = hash.${stdenv.system}; + inherit (platformAttrs.${stdenv.system}) hash; }; doCheck = true; @@ -51,7 +51,8 @@ let makeWrapper "$n" "$out/bin/$(basename $n)"\ --set-default JAVA_HOME ${jdk.home}\ --set-default HADOOP_HOME $out/lib/${untarDir}\ - --set-default HADOOP_CONF_DIR /etc/hadoop-conf/\ + --run "test -d /etc/hadoop-conf && export HADOOP_CONF_DIR=\''${HADOOP_CONF_DIR-'/etc/hadoop-conf/'}"\ + --set-default HADOOP_CONF_DIR $out/lib/${untarDir}/etc/hadoop/\ --prefix PATH : "${makeBinPath [ bash coreutils which]}"\ --prefix JAVA_LIBRARY_PATH : "${makeLibraryPath buildInputs}" done @@ -62,7 +63,7 @@ let passthru = { inherit tests; }; - meta = { + meta = recursiveUpdate { homepage = "https://hadoop.apache.org/"; description = "Framework for distributed processing of large data sets across clusters of computers"; license = licenses.asl20; @@ -80,8 +81,8 @@ let computers, each of which may be prone to failures. ''; maintainers = with maintainers; [ illustris ]; - platforms = attrNames hash; - }; + platforms = attrNames platformAttrs; + } (attrByPath [ stdenv.system "meta" ] {} platformAttrs); }; in { @@ -89,19 +90,20 @@ in # https://cwiki.apache.org/confluence/display/HADOOP/Hadoop+Java+Versions hadoop_3_3 = common rec { pname = "hadoop"; - versions = rec { - x86_64-linux = "3.3.3"; - x86_64-darwin = x86_64-linux; - aarch64-linux = "3.3.1"; - aarch64-darwin = aarch64-linux; - }; - untarDir = "${pname}-${version}"; - hash = rec { - x86_64-linux = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q="; - x86_64-darwin = x86_64-linux; - aarch64-linux = "sha256-v1Om2pk0wsgKBghRD2wgTSHJoKd3jkm1wPKAeDcKlgI="; - aarch64-darwin = aarch64-linux; + platformAttrs = rec { + x86_64-linux = { + version = "3.3.3"; + hash = "sha256-+nHGG7qkJxKa7wn+wCizTdVCxlrZD9zOxefvk9g7h2Q="; + }; + x86_64-darwin = x86_64-linux; + aarch64-linux = { + version = "3.3.1"; + hash = "sha256-v1Om2pk0wsgKBghRD2wgTSHJoKd3jkm1wPKAeDcKlgI="; + meta.knownVulnerabilities = [ "CVE-2021-37404" "CVE-2021-33036" ]; + }; + aarch64-darwin = aarch64-linux; }; + untarDir = "${pname}-${platformAttrs.${stdenv.system}.version}"; jdk = jdk11_headless; inherit openssl; # TODO: Package and add Intel Storage Acceleration Library @@ -122,8 +124,10 @@ in }; hadoop_3_2 = common rec { pname = "hadoop"; - versions.x86_64-linux = "3.2.3"; - hash.x86_64-linux = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU="; + platformAttrs.x86_64-linux = { + version = "3.2.3"; + hash = "sha256-Q2/a1LcKutpJoGySB0qlCcYE2bvC/HoG/dp9nBikuNU="; + }; jdk = jdk8_headless; # not using native libs because of broken openssl_1_0_2 dependency # can be manually overriden @@ -131,8 +135,10 @@ in }; hadoop2 = common rec { pname = "hadoop"; - versions.x86_64-linux = "2.10.2"; - hash.x86_64-linux = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo="; + platformAttrs.x86_64-linux = { + version = "2.10.2"; + hash = "sha256-xhA4zxqIRGNhIeBnJO9dLKf/gx/Bq+uIyyZwsIafEyo="; + }; jdk = jdk8_headless; tests = nixosTests.hadoop2; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix index cdd6c68a76..5a8d5189b8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - sha256 = "sha256-V7Qw20PPoAEXl/XAMj/WSM73fLdp/gH4G3ipx49p06o="; + sha256 = "sha256-476ZhjRwHlNJFkHzY8qQ7WbAUUpFNSoxXLGX9esDA/E="; }; - vendorSha256 = "sha256-FpmeOQ8nV+sEVu2+nY9o9aFbCpwSShQUFOmyzwEQ9Pw="; + vendorSha256 = "sha256-xXwunk9rmzZEtqmSo8biuXnAjPp7fqWdQ+Kt9+Di9N8="; subPackages = [ "cmd/helm-docs" ]; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix index 85971b8dfb..38c00f66b2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/chart-testing/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chart-testing"; - version = "3.6.0"; + version = "3.7.0"; src = fetchFromGitHub { owner = "helm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WGoLj6IuhxARSB3vAnprW1UO2g142uKZVHI3ubJepRs="; + sha256 = "sha256-wwXHSjb5FeWOx008jpGNzplzRtHyvcxkcHWLOSoaIE0="; }; - vendorSha256 = "sha256-gXW1NarCo42d/awg22wr6bIQQFRVTVnRUUAtQU8zY4M="; + vendorSha256 = "sha256-VYa97JaVGadltrUH/2S9QU5ndgAjozKUXtmaN0q478Q="; postPatch = '' substituteInPlace pkg/config/config.go \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix index 342fd9e686..16fceff4ee 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/default.nix @@ -6,6 +6,8 @@ helm-git = callPackage ./helm-git.nix { }; + helm-cm-push = callPackage ./helm-cm-push.nix { }; + helm-s3 = callPackage ./helm-s3.nix { }; helm-secrets = callPackage ./helm-secrets.nix { }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix new file mode 100644 index 0000000000..f54d2b332f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-cm-push.nix @@ -0,0 +1,44 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "helm-cm-push"; + version = "0.10.3"; + + src = fetchFromGitHub { + owner = "chartmuseum"; + repo = "helm-push"; + rev = "v${version}"; + hash = "sha256-GyVhjCosVaUS1DtztztFxKuuRlUdxlsOP4/QMQ7+TaU="; + }; + + vendorSha256 = "sha256-9LhokpQrREmcyBqwb33BSMyG8z7IAsl9NtE3B631PnM="; + + subPackage = [ "cmd/helm-cm-push" ]; + + # Remove hooks. + postPatch = '' + sed -e '/^hooks:/,+2 d' -i plugin.yaml + ''; + + CGO_ENABLED = 0; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + install -Dm644 plugin.yaml $out/helm-cm-push/plugin.yaml + mv $out/bin $out/helm-cm-push + ''; + + # Tests require the ChartMuseum service. + doCheck = false; + + meta = with lib; { + description = "Helm plugin to push chart package to ChartMuseum"; + homepage = "https://github.com/chartmuseum/helm-push"; + license = licenses.asl20; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index 09de0219c7..64fa0f35e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.1.3"; + version = "3.5.0"; src = fetchFromGitHub { owner = "databus23"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h26EOjKNrlcrs2DAYj0NmDRgNRKozjfw5DtxUgHNTa4="; + sha256 = "sha256-evFdMM2AilKQPdSCUzKo6RuC4OC4zfjj+JzFvtkSrdk="; }; - vendorSha256 = "sha256-+n/QBuZqtdgUkaBG7iqSuBfljn+AdEzDoIo5SI8ErQA="; + vendorSha256 = "sha256-9i4ryBpaK7mMbsOpIaaZWBRjewD1MtTpf4zJ0yU0KMg="; # NOTE: Remove the install and upgrade hooks. postPatch = '' @@ -27,7 +27,7 @@ buildGoModule rec { meta = with lib; { description = "A Helm plugin that shows a diff"; - inherit (src.meta) homepage; + homepage = "https://github.com/databus23/helm-diff"; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index 05ded10444..d72b152cc5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Helm downloader plugin that provides GIT protocol support"; - inherit (src.meta) homepage; + homepage = "https://github.com/aslafy-z/helm-git"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index b6a47ec9dd..bbfff3fd5f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -30,7 +30,7 @@ buildGoModule rec { meta = with lib; { description = "A Helm plugin that shows a diff"; - inherit (src.meta) homepage; + homepage = "https://github.com/hypnoglow/helm-s3"; license = licenses.mit; maintainers = with maintainers; [ yurrriq ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index a16472413f..7d9135045f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Helm plugin that helps manage secrets"; - inherit (src.meta) homepage; + homepage = "https://github.com/jkroepke/helm-secrets"; license = licenses.asl20; maintainers = with maintainers; [ yurrriq ]; - platforms = platforms.all; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix index e01f9c14a1..730201ee21 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.8.1"; + version = "3.13.0"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-njo5LlowlgWFK5G2lpgi7hdxtnSs8f5cT0oHI7bJxNc="; + sha256 = "sha256-QyxluxAwhEZrgfMWlxB7sUZi6XGCFNGhhWRw3RmnhKM="; }; - vendorSha256 = "sha256-F+b4EXAxa4+O6yepx+9eRrdq294ZcQ+sODFUCKYpSuo="; + vendorSha256 = "sha256-gkzDecVvHZPFWDSi8nLw2mkR4HK0+pClpaHcdFFOnF8="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index 051a3f9ae4..8c5c352999 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.14.1"; + version = "1.14.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-Y8Bo2niIyvBE3BPpnSanFrR8ZHIUdG7iKSOyD6YadIM="; + sha256 = "sha256-1E4YtGSiHXG7G60Rng1t4OvgLvn9tjYahCkrFnlfLyw="; }; - vendorSha256 = "sha256-MnSOWJwTOQmHnABRYNJwU9kOr7g51rkUaERksupBTb4="; + vendorSha256 = "sha256-S0297wgoqhPD9+nyzPEytpfppA91PWo1q4B7L8CHKLs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix index 2d6f7ea2ac..9f289c27b9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A50PbZTgv0EfL5aqTiTEOdfRXUgKGzTsRIiMgXItkxI="; + sha256 = "sha256-1SlVGQLU/7UmcvyKD/BaJSBCdOWACteQtR2Os4THPaU="; }; - vendorSha256 = "sha256-2i6SoixE5RitRuJpOU4LdzN9JY/76c3mjsbsXlQp854="; + vendorSha256 = "sha256-vTcFJ7L8FW0IZBNarje/Oc3+jSRMga8+/nPLvqus2vY="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index b1c00f223b..614ddc58da 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -46,10 +46,10 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.24.2+k3s2"; # k3s git tag - k3sCommit = "a237260237b549b90dd3aae449de09231caf1351"; # k3s git commit at the above version - k3sRepoSha256 = "1dmlsq7f0z0wq8ypbmdqwk1hl59pcnywvqhz7qblzm3wnbdb62cl"; - k3sVendorSha256 = "sha256-w5dYkewoNnI9GvqCAkmecg7JsKgO+gu1WcyPRItLvWY="; + k3sVersion = "1.24.3+k3s1"; # k3s git tag + k3sCommit = "990ba0e88c90f8ed8b50e0ccd375937b841b176e"; # k3s git commit at the above version + k3sRepoSha256 = "0slw2j7d7ccj7k9z06l5ch3nxi07jbm6xijs774hisyv25jx94rd"; + k3sVendorSha256 = "sha256-8jWpTUE/tJf2qpFjdsV+0i8hRf6JqATwr/YbXrZa/iA="; # 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. @@ -323,7 +323,7 @@ buildGoModule rec { passthru.updateScript = ./update.sh; - passthru.tests = { inherit (nixosTests) k3s-single-node; }; + passthru.tests = nixosTests.k3s; meta = baseMeta; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix index befec62fbc..cab22babbc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3sup/default.nix @@ -2,24 +2,25 @@ , buildGoModule , fetchFromGitHub , makeWrapper +, installShellFiles , bash , openssh }: buildGoModule rec { pname = "k3sup"; - version = "0.11.3"; + version = "0.12.0"; src = fetchFromGitHub { owner = "alexellis"; repo = "k3sup"; rev = version; - sha256 = "sha256-6WYUmC2uVHFGLsfkA2EUOWmmo1dSKJzI4MEdRnlLgYY="; + sha256 = "sha256-sb0cVLPIRD49AQ2XUsXkABFEZPrcuytr8Ht7Zt40H3o="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; - vendorSha256 = "sha256-Pd+BgPWoxf1AhP0o5SgFSvy4LyUQB7peKWJk0BMy7ds="; + vendorSha256 = "sha256-I2bODrGF4D7B13qBZtCAOWgAmrxdleqfDQz+vCGmdjQ="; postConfigure = '' substituteInPlace vendor/github.com/alexellis/go-execute/pkg/v1/exec.go \ @@ -37,6 +38,11 @@ buildGoModule rec { postInstall = '' wrapProgram "$out/bin/k3sup" \ --prefix PATH : ${lib.makeBinPath [ openssh ]} + + installShellCompletion --cmd k3sup \ + --bash <($out/bin/k3sup completion bash) \ + --zsh <($out/bin/k3sup completion zsh) \ + --fish <($out/bin/k3sup completion fish) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index e31c9dc4b9..75210a0f98 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.25.21"; + version = "0.26.3"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "sha256-ziIMTMK6G8vXje6GWPvcIWmlubq75XVrJUzZlA+R0Rc="; + sha256 = "sha256-Czjx6YTyFKAP8ZuwBpTpRfjDdRdd8GQ0ggbe5LMb8uA="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { tags = [ "netgo" ]; - vendorSha256 = "sha256-wL8Unht/ZRAGDuC/U4SFV5PdExy78F4DMyM8+7CMtOY="; + vendorSha256 = "sha256-rnROcJA4f0YjDGKEncrMmf/43VKrbgpmM3TvV1MMiWU="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix index e549c8f09f..44dc9f4900 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kconf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kconf"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "particledecay"; repo = "kconf"; rev = "v${version}"; - sha256 = "sha256-V+B1vqI/MLASqEy6DZiB71h7EkUfrxVKIMxriRK6pyY="; + sha256 = "sha256-aEZTwXccKZDXRNWr4XS2ZpqtEnNGbsIVau8zPvaHTkk="; }; - vendorSha256 = "sha256-Fq3V3vYaofB0TWt3t7uW1Dd7MlwMvh8RaRVpdq9XZh4="; + vendorSha256 = "sha256-7mzk2OP1p8FfRsbs4B6XP/szBeckm7Q7hf8AkbZUG2Q="; ldflags = [ "-s" "-w" "-X github.com/particledecay/kconf/build.Version=${version}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix index 25363e7789..b8e34871dd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kn"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "knative"; repo = "client"; rev = "knative-v${version}"; - sha256 = "sha256-etENW/zP9xy0pyUT2UoFXrzgkSXrfp8dxl35bD2t/Yc="; + sha256 = "sha256-3qH7L0tOsAnAAPIzTd5MIVMPM/M2SJAkxXfyMijHuRs="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index 8382f6f519..8b54719d5c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -62,8 +62,8 @@ rec { }; kops_1_24 = mkKops rec { - version = "1.24.0"; - sha256 = "sha256-4vvmwqsRSu8hZZE7fZUTv9v19wRtJvA5IX5w9jr5pEI="; + version = "1.24.1"; + sha256 = "sha256-rePNCk76/j6ssvi+gSvxn4GqoW/QovTFCJ0rj2Dd+0A="; rev = "v${version}"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock index fa2cdb980d..b1eb6d8972 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.3) + activesupport (7.0.3.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -13,40 +13,21 @@ GEM domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) ejson (1.3.1) - faraday (1.10.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) + faraday (2.4.0) + faraday-net_http (~> 2.0) ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday-net_http (2.1.0) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) rake - googleauth (0.17.1) - faraday (>= 0.17.3, < 2.0) + googleauth (1.2.0) + faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) - signet (~> 0.15) + signet (>= 0.16, < 2.a) http (4.4.1) addressable (~> 2.3) http-cookie (~> 1.0) @@ -58,17 +39,17 @@ GEM http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) - i18n (1.11.0) + i18n (1.12.0) concurrent-ruby (~> 1.0) jsonpath (1.1.2) multi_json jwt (2.4.1) - krane (2.4.7) + krane (2.4.9) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) ejson (~> 1.0) - googleauth (~> 0.8) + googleauth (~> 1.2) jsonpath (~> 1.0) kubeclient (~> 4.9) oj (~> 3.0) @@ -85,9 +66,8 @@ GEM mime-types-data (3.2022.0105) minitest (5.16.2) multi_json (1.15.0) - multipart-post (2.2.3) netrc (0.11.0) - oj (3.13.16) + oj (3.13.19) os (1.1.4) public_suffix (4.0.7) rake (13.0.6) @@ -103,9 +83,9 @@ GEM faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - statsd-instrument (3.2.1) + statsd-instrument (3.3.0) thor (1.2.1) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix index d29904200c..a42ccf61ab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z05zyc57f8ywvdvls6nx93vrhyyzzpgz729mwampz1qb8vvcspj"; + sha256 = "15lbq28v48i6q118p02m5zs9c63y1kv2h5krb3ss6q2vyaxhnfz7"; type = "gem"; }; - version = "7.0.3"; + version = "7.0.3.1"; }; addressable = { dependencies = ["public_suffix"]; @@ -63,116 +63,25 @@ version = "1.3.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"]; + dependencies = ["faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; + sha256 = "0i45f90mg367izgpxf6rrq9zbwwqba1pymwyja6q128vrj1pjajj"; type = "gem"; }; - version = "1.10.0"; - }; - faraday-em_http = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-em_synchrony = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-excon = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; - type = "gem"; - }; - version = "1.1.0"; - }; - faraday-httpclient = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; - type = "gem"; - }; - version = "1.0.1"; - }; - faraday-multipart = { - dependencies = ["multipart-post"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; - type = "gem"; - }; - version = "1.0.4"; + version = "2.4.0"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + sha256 = "1rfiwhggrqgwp00c82sk8v2h93l81nxgl0mf07pijxz1zjmbgswj"; type = "gem"; }; - version = "1.0.1"; - }; - faraday-net_http_persistent = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; - type = "gem"; - }; - version = "1.2.0"; - }; - faraday-patron = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-rack = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; - type = "gem"; - }; - version = "1.0.0"; - }; - faraday-retry = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; - type = "gem"; - }; - version = "1.0.3"; + version = "2.1.0"; }; ffi = { groups = ["default"]; @@ -201,10 +110,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08l9qb2an7a60r3xjlkrfna8b8sfnj5c2hlfdygbnpvb1p7cpafl"; + sha256 = "030bcdnffwndk8h270cmbndixb5h3ss860yifv6bkfys95s5fjpp"; type = "gem"; }; - version = "0.17.1"; + version = "1.2.0"; }; http = { dependencies = ["addressable" "http-cookie" "http-form_data" "http-parser"]; @@ -265,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g0g9qaarwn9ga8889r7lnaybygvd2a2dp4ilc73g4rsxxcrgy0x"; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; jsonpath = { dependencies = ["multi_json"]; @@ -297,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hmsz359zkpw1spyxx22wijzjls22qsak6rbrlv1ybk3hhk13vjg"; + sha256 = "03sfcn5zfbagkyn30zih73i7pycdfzk0c5wr99d6qxl90c9cddc2"; type = "gem"; }; - version = "2.4.7"; + version = "2.4.9"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -364,16 +273,6 @@ }; version = "1.15.0"; }; - multipart-post = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; - type = "gem"; - }; - version = "2.2.3"; - }; netrc = { groups = ["default"]; platforms = []; @@ -389,10 +288,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i8yrwnf5mzixl8a4h3cfx93gkzcs7q6grpyv0zng1vga9cmk28n"; + sha256 = "1b10apyzm1qyph42438z9nx2ln5v9sg0686ws9gdrv5wh482fnmf"; type = "gem"; }; - version = "3.13.16"; + version = "3.13.19"; }; os = { groups = ["default"]; @@ -471,10 +370,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0653pjqln9r52nfkcjna0wf4q9ws114pz29wav2nlf18v8jazqbf"; + sha256 = "1555jgxr0az43l6nc8ngz5vmhqgjaznz4mkg5w5x0q6sa78i2pf3"; type = "gem"; }; - version = "3.2.1"; + version = "3.3.0"; }; thor = { groups = ["default"]; @@ -492,10 +391,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; unf = { dependencies = ["unf_ext"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krelay/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/krelay/default.nix index 16e9203bf9..51c99b36e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krelay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krelay/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "krelay"; - version = "0.0.2"; + version = "0.0.4"; src = fetchFromGitHub { owner = "knight42"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7P+pGiML/1aZEpYAWtAPEhrBAo8e8ATcemrH8tD73w8="; + sha256 = "sha256-NAIRzHWXD4z6lpwi+nVVoCIzfWdaMdrWwht24KgQh3c="; }; - vendorSha256 = "sha256-PrL3GYP5K6ZaSAShwuDQA7WfOVJeQraxZ8jrtnajR9g="; + vendorSha256 = "sha256-1/zy5gz1wvinwzRjjhvrIHdjO/Jy/ragqM5QQaAajXI="; subPackages = [ "cmd/client" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index 355ef15455..395010dd4c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -15,13 +15,13 @@ let in buildGoModule rec { pname = "kube3d"; - version = "5.4.1"; + version = "5.4.4"; src = fetchFromGitHub { owner = "k3d-io"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-DVQrD4JMei9yRFzuiVb6AcydEupNSlpgYLfGWWRiaao="; + sha256 = "sha256-3J25Aj/otKDCWJ+YqAsoJogU2vckZMy7fsS8XR2EMgE="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix index 1b1089f655..0aeb54948a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubebuilder/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "kubebuilder"; - version = "3.3.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; rev = "v${version}"; - sha256 = "sha256-xLeS0vfYuLEdzuou67ViduaBf62+Yqk+scaCCK+Xetk="; + sha256 = "sha256-WbFY1tBwq0DjJqM5ld7W9GkhPQDsGUQCwEe42XkJlfQ="; }; - vendorSha256 = "sha256-zE/y9FAoUZBmWiUMWbc66CwkK0h7SEXzfZY3KkjtQ0A="; + vendorSha256 = "sha256-tz0SHAl9SwppjA8s0m4gJOh6rf8F+kRc2HnNMjO+blQ="; subPackages = ["cmd"]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-tree/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-tree/default.nix index 5a69eb186a..0ee6c44ba0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-tree/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-tree/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-tree"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5+INUr7ewSJrFwdhDgdrRu+xDB3FkWRjWbbVJO8cgkc="; + sha256 = "sha256-tE3ujknd7GDjTPIzZaL1Ynm6F9tJI/R1u2l0nCttjrI="; }; - vendorSha256 = "sha256-/GLzIoFHXpTmY2601zA83tB2V2XS0rWy1bEDQ6P6D8k="; + vendorSha256 = "sha256-EQEsOJ/IZoR+9CjfFtQmBGeUXgmtACDvvpKCgnep+go="; meta = with lib; { description = "kubectl plugin to browse Kubernetes object hierarchies as a tree"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix index 8bfa519dee..fd2402fe1d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubedb-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.25.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-hRLju3nVLy0eDgqGeReHaF8p7oOlpo1T0IbLq4h/uwg="; + sha256 = "sha256-fSJ9IIuyOuKmpklw7uh1NKM3Pr5epJefYBJ3udeC5sE="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix index e08a3b46d1..513e77dfc2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeone/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubeone"; - version = "1.4.0"; + version = "1.4.6"; src = fetchFromGitHub { owner = "kubermatic"; repo = "kubeone"; rev = "v${version}"; - sha256 = "sha256-uij5daVHKIfxx+8UTmU/HKSbf/RTRFuO8mCQdsC80qI="; + sha256 = "sha256-2abuKLAqOaRceokmNb7YG0qg/iYbPhSTG75Rs5mwHDU="; }; vendorSha256 = "sha256-kI5i1us3Ooh603HOz9Y+HlfPUy/1J8z89/jvKEenpLw="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix index 32130ee96d..d99a8592d1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubergrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubergrunt"; - version = "0.8.0"; + version = "0.9.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "kubergrunt"; rev = "v${version}"; - sha256 = "sha256-K94cGU+cFHOrAGXjHQFFFJYhZi9zNfdlGy5eb2DkcV8="; + sha256 = "sha256-2uMPj4/jluBW0N2+AyDb7QmuVwlCavfQZ3i2fg32m8o="; }; - vendorSha256 = "sha256-95rteSEMOBQnAw0QKuj5Yyi8n3xXGl0Tm97WiyTGxVw="; + vendorSha256 = "sha256-9hWX6INN5HWXyeFQRjkqr+BsGv56lInVYacvT6Imahw="; # Disable tests since it requires network access and relies on the # presence of certain AWS infrastructure diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index 56b195f4e5..137ae8287a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.17.5"; + version = "0.18.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "0wrsfbsjf74qss4mfhjpc1h4lhfmwib83bd2i28g4yd00qq958vj"; + sha256 = "sha256-mqkkPqun0m4y/qFUWVTRCtqZd3j6jDw6Ua8hRQ41G38="; }; - vendorSha256 = "sha256-/rZRDH5Id8ft2oe0U/uhEgBgb0nhaQ8O5wjrSftvBzA="; + vendorSha256 = "sha256-geelFhThdcqQ0iBzmYb5SlxPatFYDmN042O8YY5AhS0="; subPackages = [ "cmd/kubeseal" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix index 4b5679f697..81abb6f502 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kyverno/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kyverno"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${version}"; - sha256 = "sha256-MHEVGJNuZozug0l+V1bRIykOe5PGA3aU3wfBV2TH/Lo="; + sha256 = "sha256-Lx+ae0Eb8iVKurXpsb3NPTFrh59vxxf4fA18o1JTIv0="; }; ldflags = [ @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorSha256 = "sha256-DUe1cy6PgI5qiB9BpDJxnTlBFuy/BmyqCoxRo7Ums1I="; + vendorSha256 = "sha256-bpuEEoWobFPVsNZKKuOKTQGvV+/NAgaM4M63bv5y0Rk="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix index 7e9ca9a84a..afee16bf8f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/levant/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "levant"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "levant"; rev = "v${version}"; - sha256 = "9M7a4i+DPKb1H9jOEVAvhvYxGwtj3dK/40n4GSy4Rqo="; + sha256 = "sha256-ujybD4nSHC/w2Pfu43eSO6rNJjXFAvc81T05icWFvbs="; }; - vendorSha256 = "sha256-m3WSk5RvCmeIgX6SwHpWHvokgs71cY6XCKtHJ4jnonc="; + vendorSha256 = "sha256-pKxj0qz7adSuPpiXu4+2KBO3JZu8zZ8ycPF5LosF4T8="; # The tests try to connect to a Nomad cluster. doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 11a06f5775..605160e3d5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.26.0"; + version = "1.26.1"; - vendorSha256 = "sha256-3ME8bs4TAQRAECko7+ZXBCFf4IyTn1P/+hParpc5QTU="; + vendorSha256 = "sha256-aw2B5wdhEQiTDp/BpJdXzY3XBm3eXlSQt83j4RHhMg0="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-vGlW65jf3XGFNK9aSvsK7V0OmUOCtgJcWeNFOZVuH00="; + sha256 = "sha256-08q/IdQEq1/KaIBN6ss8r1KbjSjZnhOW/BeaJ8BuYZM="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix index 488d0c4327..bee4d47852 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix @@ -59,7 +59,7 @@ in buildGoPackage rec { or develop with it, day-to-day, on your local host. ''; homepage = "https://github.com/minishift/minishift"; - maintainers = with maintainers; [ fpletz vdemeester ]; + maintainers = with maintainers; [ vdemeester ]; platforms = platforms.linux; license = licenses.asl20; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index 5de2f03be7..2bba4816d8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.20.0"; + version = "0.22.2"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5bigfsig2LkZoLUlA6764ttG85CNi6rmOgQck+/zc5c="; + sha256 = "sha256-D5NnCJrQQ2Iam9A5rxuiT6XOf00x/LOiwEC8SjSZdt0="; }; - vendorSha256 = "sha256-Ei4L35/RN2en7gOUzvGflBivTlBy2YnUvTHqcCe5HN4="; + vendorSha256 = "sha256-5QcltDNvhfyzUsFNbSjVnh0OMTxj+JU0VnDADSWTD48="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix index a584fee3b4..60411f4d91 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-phuXsioSLO/jl1l5dwV/emoirJfgGXQSmeQHSImxm2U="; + sha256 = "sha256-dkOkHsQ1ZfB5rSFuFRlrKf605EIo/7IkyyYz3ZhMggQ="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix index 5c5cb7c4a6..65b012a10a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-pack/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "nomad-pack"; - version = "2022-05-12"; - rev = "bee6e8e078ff31fee916b864fbf3648294dbcdf5"; + version = "0.0.1-techpreview.3"; + rev = "3b4163b3b826c8408ae824238daaa45307d03380"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-28Dx9z7T+4WXl4voAzlSR2h3HcZMSzOuX7FHLJ4q9Sc="; + sha256 = "sha256-Br+BJRAo9qSJQjg2awQTnsYz76WReVWsTUw6XoUb1YY="; }; - vendorSha256 = "sha256-hPsO842gmk77qc27slV2TiYNI7Ofw1RqGgcLP1gdgJ0="; + vendorSha256 = "sha256-dUPDwKdkBXBfyfbFxrpgHwZ0Q5jB7aamClNmv+tLCGA="; # skip running go tests as they require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix index fb1888d623..a91ac4ce33 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/odo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "odo"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "odo"; rev = "v${version}"; - sha256 = "KYJkCoF80UPsebWwxpc5gIfmT3Aj4OU8r6dDkaWXqbY="; + sha256 = "sha256-+UvG+aDji/GtkXdt+xZB06j6NxjeK2nhBjle5K+lx/A="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix index 89bbd0cb7d..9933e80566 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/openshift/default.nix @@ -10,14 +10,14 @@ buildGoModule rec { pname = "openshift"; - version = "4.10.0"; - gitCommit = "346b183"; + version = "4.11.0"; + gitCommit = "20dd77d5"; src = fetchFromGitHub { owner = "openshift"; repo = "oc"; - rev = "release-4.10"; - sha256 = "Pdq3OwT5P7vvB70X+GVglT9CdJbhkm35nvEGurO1HPc="; + rev = "20dd77d5c889f86b05e2bdd182853ae702852c63"; + sha256 = "wqLo/CKGzeMDJUoI9PUEjJER5hSPu+FmUCJLPZ9PJuw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix index 08e55ec669..75f14c69bc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-iCsEYbEENDOg69wdWu9QQ8tTGxvaY2i/Hboc6XSYyEM="; + sha256 = "sha256-GETCwj9T1D6paG56LT/N2YkISE7UBpt/femwvHyHHJE="; }; ldflags = [ @@ -17,9 +17,7 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorSha256 = "sha256-aLTzhBMwQHa6twzBC3FyMsZa1vQsBDdg4MpzJWZz3n4="; - - doCheck = true; + vendorSha256 = "sha256-ZRDcZbaoGJ8jgSwMXTTcWSv/4dlOoTNcuj/bN4QYHNE="; doInstallCheck = true; installCheckPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix index 7350a8bd46..244c581b6f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/ssm-session-manager-plugin/default.nix @@ -1,14 +1,20 @@ { stdenv, lib, fetchurl, autoPatchelfHook, dpkg, awscli, unzip }: let ver = "1.2.331.0"; - source = - if stdenv.isDarwin then { - url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; - sha256 = "0gr6frdn9jvxnkymkcpvgkqw4z2sac9jdf5qj4hzakq1zkfviazf"; - } else { - url = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; - sha256 = "sha256-xWnY89dslkGhRTh9llRFkuUqYIjHQNt+TLnkPQr3u1Q="; - }; + source = { + url = rec { + "x86_64-linux" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_64bit/session-manager-plugin.deb"; + "aarch64-linux" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/ubuntu_arm64/session-manager-plugin.deb"; + "x86_64-darwin" = "https://s3.amazonaws.com/session-manager-downloads/plugin/${ver}/mac/sessionmanager-bundle.zip"; + "aarch64-darwin" = x86_64-darwin; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + sha256 = rec { + "x86_64-linux" = "sha256-xWnY89dslkGhRTh9llRFkuUqYIjHQNt+TLnkPQr3u1Q="; + "aarch64-linux" = "sha256-QE6+EjLoydTPuLitG6fALXAtvIkfyoFuWij8Z2HT6+Q="; + "x86_64-darwin" = "0gr6frdn9jvxnkymkcpvgkqw4z2sac9jdf5qj4hzakq1zkfviazf"; + "aarch64-darwin" = x86_64-darwin; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; archivePath = if stdenv.isDarwin then "sessionmanager-bundle" else "usr/local/sessionmanagerplugin"; in stdenv.mkDerivation rec { @@ -35,10 +41,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = - "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; + homepage = "https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager-working-with-install-plugin.html"; description = "Amazon SSM Session Manager Plugin"; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ mbaillie ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix index 5f6c61417a..7ab484033a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-pCdcgQC6oihHKyrq9MkJr0c3EErPrMImNsk+TX9Z5GA="; + sha256 = "sha256-20dbBRJ0OwRiYoLVmXyV8XApOzGsyppaTW079TGK5fI="; }; - vendorSha256 = "sha256-BhLksvv5j3fSqHj7gY+aWPN9Uni7/B5/ltIAMJ/ljEE="; + vendorSha256 = "sha256-Xb4gkYBDTSFPwxCSxVqXLxDLn75xyy/k6Vwy+ot59KU="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix index b4844015eb..4c165cc7e1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "temporal"; - version = "1.16.2"; + version = "1.17.2"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - sha256 = "sha256-MPfyjRpjfnuVbj+Pd7yIlaEJCiX1IEy/Lwwkv23kugw="; + sha256 = "sha256-V80v8nRHAshPnyWdBb4ahCn5FfzT906oZlhalZ547Nk="; }; - vendorSha256 = "sha256-82W1nHhHvvU6poh5szuH9lDkq6YHgyfsJSubxotV270="; + vendorSha256 = "sha256-MT/BmGTdyEzmXjuwlA6WhLIWlrQz3Wc4Tl5dMI1587Q="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index 364a7d6605..fcc70509e7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , buildGoModule -, buildGo117Module , fetchFromGitHub , callPackage , config @@ -61,16 +60,6 @@ let { # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); - # fails to build on x86_64-darwin with 1.18 - lxd = automated-providers.lxd.override { mkProviderGoModule = buildGo117Module; }; - # fails to build on x86_64-darwin with 1.18 - netlify = automated-providers.netlify.override { mkProviderGoModule = buildGo117Module; }; - # fails to build on x86_64-darwin with 1.18 - pass = automated-providers.pass.override { mkProviderGoModule = buildGo117Module; }; - # fails to build on x86_64-darwin with 1.18 - skytap = automated-providers.skytap.override { mkProviderGoModule = buildGo117Module; }; - # fails to build on x86_64-{darwin,linux} with 1.18 - tencentcloud = automated-providers.tencentcloud.override { mkProviderGoModule = buildGo117Module; }; }; # Put all the providers we not longer support in this list. diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index cd8cf81c90..bcf25a84ba 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,12 +1,14 @@ { "aci": { + "deleteVendor": true, "owner": "CiscoDevNet", "provider-source-address": "registry.terraform.io/CiscoDevNet/aci", + "proxyVendor": true, "repo": "terraform-provider-aci", - "rev": "v2.3.0", - "sha256": "sha256-V4LvMVWuKsGMVo/P8r79ICy3SrsVmCOMl75yRIixqAQ=", - "vendorSha256": null, - "version": "2.3.0" + "rev": "v2.5.2", + "sha256": "sha256-Y2cNp2BuPEH5wAEwaMVSBgKoHrcy6d4eOlsGPqAxmoU=", + "vendorSha256": "sha256-AB+uj4hQIYMVQHhw1cISB2TotNO8rw1iU0/gP096CoE=", + "version": "2.5.2" }, "acme": { "owner": "vancluever", @@ -30,10 +32,10 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v3.3.1", - "sha256": "sha256-bp3qwz6HJGiJ/R5LKkT6Rr86lsAiKbcGcuKLZvklwEs=", - "vendorSha256": "sha256-EMBcnCXtGJk9eSe3TkDZobn2fSJS8KxHCinybLUBGYU=", - "version": "3.3.1" + "rev": "v3.4.0", + "sha256": "sha256-AIQf2ArawnyvD9FyIoIbY6DV9XptxIk9MqY+vDKY51g=", + "vendorSha256": "sha256-SjgY7ZiFHOGAvwT5ysHnbsAOIuRZSh9JvSUiZhFbCvo=", + "version": "3.4.0" }, "akamai": { "owner": "akamai", @@ -49,10 +51,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.176.0", - "sha256": "sha256-YMcB1CdnXdYHBUdghFP/4BHCtWfOSzPXMD+VZp49VY0=", - "vendorSha256": "sha256-6FiVXy/q3WImYDbwvj9e3ns9gilaL6GBW5qCpaUNCW0=", - "version": "1.176.0" + "rev": "v1.179.0", + "sha256": "sha256-J6DYXGVCQalXuxpOd4Bw9N9UCcunpvX4EMmiM9XzxQ8=", + "vendorSha256": "sha256-g8ZwzgcrHoPcw+cPi2cIW7ZDHy5TLxKUblDqLVlFlSw=", + "version": "1.179.0" }, "ansible": { "owner": "nbering", @@ -76,55 +78,55 @@ "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.33.0", - "sha256": "sha256-yAt2uBrkHS6TalHArSikRxTo8s0g/PoNoPBS/d/iWzY=", - "vendorSha256": "sha256-HJtG2sCQpY9rTSwHj2PjSiF8236VLufF9B9TyubGD/Q=", - "version": "0.33.0" + "rev": "v0.34.0", + "sha256": "sha256-wjqJf3MgLL5NAXp0Nf9VWg8D8jEKvyXoLCMq9yyyFGM=", + "vendorSha256": "sha256-5OIMhuzM/jTXNeZpMG3BOOUTmJyoLrbOjR2O7ixDDlM=", + "version": "0.34.0" }, "avi": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/avi", "repo": "terraform-provider-avi", - "rev": "v21.1.4", - "sha256": "sha256-6H56TRA3I0CQ9/d8JdP5JNL0u3lpS8YhCvdSM5bxYp8=", - "vendorSha256": "sha256-b0MwGmgugZdmVk7ZVBSCivDQ4n+tLABymH/igo/S1Wc=", - "version": "21.1.4" + "rev": "v22.1.1", + "sha256": "sha256-BQ4M1e7wWDCq2HEJIoAAqSUmq9hV66auvH47p3j2M8I=", + "vendorSha256": "sha256-otOArethLfanpp3KjQCutrlOxkcpr+6YHn5xWl31feE=", + "version": "22.1.1" }, "aviatrix": { "owner": "AviatrixSystems", "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix", "repo": "terraform-provider-aviatrix", - "rev": "v2.22.1", - "sha256": "sha256-jvk6j/JZvRSq1ywlkJdCXGFrJccjViCVAIe+z4SjiUk=", + "rev": "v2.22.3", + "sha256": "sha256-yMzeeS8hpCeoejMYa1YQl6wvhki/BzFtNWgZ951bpLU=", "vendorSha256": null, - "version": "2.22.1" + "version": "2.22.3" }, "aws": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.22.0", - "sha256": "sha256-F+YzXIKkF/eGUY3l8MjeP+8GqS37e1N9b+fmNCkdeMM=", - "vendorSha256": "sha256-kz0bPsfLCekRj/ZGCBT+eFRMRkV+Dc69RkyBbFaztd0=", - "version": "4.22.0" + "rev": "v4.25.0", + "sha256": "sha256-0dRCgNK828aUFBDRBkRFY/1Rnesd3ZQrHtimbNquHO8=", + "vendorSha256": "sha256-b6RrsJnWm5dvmNN/zv04Ct6I28McpXWzw0fySHMRias=", + "version": "4.25.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.26.1", - "sha256": "sha256-9S+J0z9ilRqfpZv3aZe6Fv1Jyo2ShRQzeoMuRsDBiUo=", + "rev": "v2.27.0", + "sha256": "sha256-E8O0+OblKl1aSOXB5fnc34m+pUsfIZ6eHWoAq6HkKHs=", "vendorSha256": null, - "version": "2.26.1" + "version": "2.27.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.14.0", - "sha256": "sha256-/lE+PuljWG57d3tSiNo0ED4Cj2fJbyDsWNqdYcl1vS4=", + "rev": "v3.17.0", + "sha256": "sha256-XeZwQxK0WhLv2Y7PFADsv4f6vO4E3/j/9HM1wJ8LXKE=", "vendorSha256": null, - "version": "3.14.0" + "version": "3.17.0" }, "azurestack": { "owner": "hashicorp", @@ -184,12 +186,11 @@ "checkly": { "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", - "proxyVendor": true, "repo": "terraform-provider-checkly", - "rev": "v1.6.1", - "sha256": "sha256-vzYOieW4KdYcaPSSa6j57GsPAAIdwmWu5hIBCCmnstM=", - "vendorSha256": "sha256-XErR45BMWgAzeLU20CDd2j5tsokkoOMQhUar2ZsU5+0=", - "version": "1.6.1" + "rev": "v1.6.2", + "sha256": "sha256-hi6GTToJcKVSpbBBWQN6IREhm8iHFCj+pg71fgZ5rOI=", + "vendorSha256": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=", + "version": "1.6.2" }, "checkpoint": { "deleteVendor": true, @@ -214,28 +215,28 @@ "owner": "cloudamqp", "provider-source-address": "registry.terraform.io/cloudamqp/cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.19.0", - "sha256": "sha256-RwgqJl+W5L/2Qz5Wd0dBPUNhX5Q+7J/y7RfLprOBa3k=", + "rev": "v1.19.1", + "sha256": "sha256-oq7wsraZTKSo2tEaUrQ+uzCEuC3LLP6AVLzmCDWBK3A=", "vendorSha256": "sha256-OnkSfHEbbcnSs+pI5wphObRyIXGtNlpeTe/RqxF/pr4=", - "version": "1.19.0" + "version": "1.19.1" }, "cloudflare": { "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.19.0", - "sha256": "sha256-OgB4FhuEJJFbciOyUX2NAJnZP1aCFhTPRvYC0uylm5M=", - "vendorSha256": "sha256-EsFLZlgZGZBLgcl5mqeRycOB1jqFkBENeO+lFgSgXeA=", - "version": "3.19.0" + "rev": "v3.20.0", + "sha256": "sha256-NbnYFPtE/s7mbfKAAX2PS1ApdrLAlxaIWWr2jD8JUqs=", + "vendorSha256": "sha256-6PWeR9gau0Se19GuSR7ZZQK+IULoDlKDZOuALhOQOMM=", + "version": "3.20.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", "provider-source-address": "registry.terraform.io/cloudfoundry-community/cloudfoundry", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.15.3", - "sha256": "sha256-fZ3LwquvypCw3i/gugUI3AuDrvdw2/sHU+xlk1kgkVU=", - "vendorSha256": "sha256-Wa2oTq1fsmfCQgSXY9YhqzzaRS2e662k23lIdoSxzU0=", - "version": "0.15.3" + "rev": "v0.15.5", + "sha256": "sha256-VfGB0NkT36oYT5F1fh1N/2rlZdfhk+K76AXNh0NkO50=", + "vendorSha256": "sha256-dj0XBy3dvpn9aEt+Xab6ZelvXZmt2+BX6qytdsMbIXo=", + "version": "0.15.5" }, "cloudinit": { "owner": "hashicorp", @@ -278,19 +279,19 @@ "owner": "poseidon", "provider-source-address": "registry.terraform.io/poseidon/ct", "repo": "terraform-provider-ct", - "rev": "v0.10.0", - "sha256": "sha256-P2CwICft0OPcmYC3FT4P4pwS4Svb2kpQe6tzUEnDBfI=", - "vendorSha256": "sha256-E4OmSPV4gTo8I2cSRz+iaFugzGbgJtgKkptPbu8daGI=", - "version": "0.10.0" + "rev": "v0.11.0", + "sha256": "sha256-poEyXP6VfKYKuTCxQxkiWBuc7/1S2J7RolrrPb6nvUI=", + "vendorSha256": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=", + "version": "0.11.0" }, "datadog": { "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.13.1", - "sha256": "sha256-Xwkf8qjobnTD/dANWbi7cPHJmaPkvn80CMO39Jog6Lk=", - "vendorSha256": "sha256-X+zfXao9k9coOvebybYK/zJ4sTm6fu831PpFST+DuQY=", - "version": "3.13.1" + "rev": "v3.14.0", + "sha256": "sha256-ErTbQEC01Vn8hqk2wglam/b+80ybzMELPfExwUE9TUo=", + "vendorSha256": "sha256-jWqkF0pyp2+pZJyC1+UNYMCDP40Tu9DBrX0WLOqpmnE=", + "version": "3.14.0" }, "dhall": { "owner": "awakesecurity", @@ -341,19 +342,19 @@ "owner": "kreuzwerker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.19.0", - "sha256": "sha256-hzIGA8RCDoISJwq6RyQZDqj7CfWsgPkYMv8Yhf/KEKQ=", - "vendorSha256": "sha256-Wzd0TsOtiEyVIneQd6JfhdNzDP6Z3T96C5wtr/GCW/M=", - "version": "2.19.0" + "rev": "v2.20.0", + "sha256": "sha256-qMHssqCPQXWZYXATYpo1W43kq/9LSfh7q1bLgyhWXMQ=", + "vendorSha256": "sha256-uyUlhhne6EvM5vQk31uDPXcpJONVsw4ooGKmH4wYISQ=", + "version": "2.20.0" }, "dome9": { "owner": "dome9", "provider-source-address": "registry.terraform.io/dome9/dome9", "repo": "terraform-provider-dome9", - "rev": "v1.27.1", - "sha256": "sha256-VmobLWMjHH+GzxUk0bnIr4dWkuH8D00U7VrN9eApF5c=", + "rev": "v1.27.4", + "sha256": "sha256-+3jIq7f21CkuF3UZYV3o+ZIdoQi0hFgO/qXwdhkcaPI=", "vendorSha256": null, - "version": "1.27.1" + "version": "1.27.4" }, "elasticsearch": { "owner": "phillbaker", @@ -368,19 +369,19 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/equinix", "repo": "terraform-provider-equinix", - "rev": "v1.7.0", - "sha256": "sha256-H2cvJMtZnJFk3snohEcxS++xzsc45TWBZquWRe3vseM=", - "vendorSha256": "sha256-oANCzm5HSxs5vTiu1kIGJQcwAvNg84G9qXnoBge9fAs=", - "version": "1.7.0" + "rev": "v1.8.0", + "sha256": "sha256-U/6d7cfiYjVZ8VIvIBXoM3rsfySlpWOSxwVTcaR7uKQ=", + "vendorSha256": "sha256-dB0asOYl4JUtsdmcuWhcX2WioqB4DI3MTJf5ynJOMVA=", + "version": "1.8.0" }, "exoscale": { "owner": "exoscale", "provider-source-address": "registry.terraform.io/exoscale/exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.38.0", - "sha256": "sha256-TVJlfce5bF5Z64FOPKqb0ac+NtjzeHsid+Q7vWIINuk=", + "rev": "v0.40.0", + "sha256": "sha256-CQd/wYY4XRmWPV77uwTQgqZOGqWVdtAgsG8sUNB7y4A=", "vendorSha256": null, - "version": "0.38.0" + "version": "0.40.0" }, "external": { "owner": "hashicorp", @@ -395,28 +396,30 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v2.2.0", - "sha256": "sha256-x5Rl4JW59kuAoX0pSpCpto3dcvyEhvZlocg8fv2R6Jw=", + "rev": "v2.2.1", + "sha256": "sha256-Ls5yTkwnvBjvGyJZ9Hr+BE6jFuwoTfl/iFVf3WsduF8=", "vendorSha256": null, - "version": "2.2.0" + "version": "2.2.1" }, "flexibleengine": { "owner": "FlexibleEngineCloud", "provider-source-address": "registry.terraform.io/FlexibleEngineCloud/flexibleengine", "repo": "terraform-provider-flexibleengine", - "rev": "v1.31.0", - "sha256": "sha256-Vu6XRRtN+04Hg1OhZ42QaqFiVbov0Zg5v6Rbyeyz410=", + "rev": "v1.31.1", + "sha256": "sha256-QB3O9Ez+hFgBE1yYi1kqtC3WW//Ueg/Ij4p2WbQz/AE=", "vendorSha256": "sha256-P2/yK6aLNdmC8g5dMKK0hpAdj76KtewzVVHQsVgr3J4=", - "version": "1.31.0" + "version": "1.31.1" }, "fortios": { + "deleteVendor": true, "owner": "fortinetdev", "provider-source-address": "registry.terraform.io/fortinetdev/fortios", + "proxyVendor": true, "repo": "terraform-provider-fortios", - "rev": "v1.14.1", - "sha256": "sha256-9e1PEg8RtJa7DR5g3cCdAhubFxt7vN5dPjaBA+F7Y4E=", - "vendorSha256": null, - "version": "1.14.1" + "rev": "v1.15.0", + "sha256": "sha256-jXaEGWt/O0Cv15ksFax571f6aoDhVpNZSbvbOFj6TZ4=", + "vendorSha256": "sha256-WkF2mVDrDlCefM4pjADoXsVwpa7E02c6kUyOgHxNFpo=", + "version": "1.15.0" }, "gandi": { "owner": "go-gandi", @@ -431,10 +434,10 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.27.0", - "sha256": "sha256-cQMkBhXvD5sO9obHGH64GcDg6v5X5qs9QHwjyBNkRww=", + "rev": "v4.28.0", + "sha256": "sha256-Pu8I+tAcrEN8ZtBv/gH1VguO1GVk3tnqeJ50cLh7/HQ=", "vendorSha256": null, - "version": "4.27.0" + "version": "4.28.0" }, "gitlab": { "owner": "gitlabhq", @@ -450,20 +453,20 @@ "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.28.0", - "sha256": "sha256-Dy0T5/G8vzaE688o/lb4H3ccE0mGnTRDQHIxcvs1C9k=", - "vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=", - "version": "4.28.0" + "rev": "v4.31.0", + "sha256": "sha256-Y9iyWjC+XLkselVIhaM0N7iNelbdlF9jV7AjTYiD8RM=", + "vendorSha256": "sha256-hu1uK1yW07NlV3/DnKQxdGhbrzpq6MADmgkRr4+VQ1w=", + "version": "4.31.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.28.0", - "sha256": "sha256-faYPwFcusDVM1TM5I9sgpUBER8TB2ltaTryyDvLQz9g=", - "vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=", - "version": "4.28.0" + "rev": "v4.31.0", + "sha256": "sha256-5Ieq8LvhrlFevMgr7JKeGCkWWejjOvKhKfXpPvsNzRU=", + "vendorSha256": "sha256-hu1uK1yW07NlV3/DnKQxdGhbrzpq6MADmgkRr4+VQ1w=", + "version": "4.31.0" }, "googleworkspace": { "owner": "hashicorp", @@ -478,28 +481,28 @@ "owner": "grafana", "provider-source-address": "registry.terraform.io/grafana/grafana", "repo": "terraform-provider-grafana", - "rev": "v1.24.0", - "sha256": "sha256-0E3yWEtt1o+K9/BoawL0Wyt+8yIDADZy6r9Kg7oNYPI=", - "vendorSha256": "sha256-YDWTHiRyY2bzX+ZgYbUTKO3IjsvbIEVWxqGhDNpVnhM=", - "version": "1.24.0" + "rev": "v1.25.0", + "sha256": "sha256-KB2GTz8Sq9H1MVPaU5qaDhP4NytdQocO4AYO7zoihJc=", + "vendorSha256": "sha256-uRsuw2JgKjbCQSodNdufR+vZSD+NI0HgxvWg6p4hUgQ=", + "version": "1.25.0" }, "gridscale": { "owner": "gridscale", "provider-source-address": "registry.terraform.io/gridscale/gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.14.3", - "sha256": "sha256-OGVIZ6q8qq4XkkWxjX5BQCJE9qubJ5Xnt2DrD23JGB8=", + "rev": "v1.15.0", + "sha256": "sha256-vbFrwAZBazZok4LwXTTa4QIZpHxIPKv3x6vUyVt2S2I=", "vendorSha256": null, - "version": "1.14.3" + "version": "1.15.0" }, "hcloud": { "owner": "hetznercloud", "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.34.3", - "sha256": "sha256-3p7pdpBxrbKZx6di39GQb2DOS2ZtN4uVmIb2OU0Zs+c=", - "vendorSha256": "sha256-3JFdsuJlDW6xTgSgn7hkIWfH9Iqr35t8op4yVXYIFpg=", - "version": "1.34.3" + "rev": "v1.35.1", + "sha256": "sha256-7zEvBB4FwI5jx+q4tBwPcwxb5CMVpJAnr5NNYZe2BkA=", + "vendorSha256": "sha256-5JfUt5+qZqT1NFLLl0sI26bafbAuqrj99Jiuh+kkH8Y=", + "version": "1.35.1" }, "helm": { "owner": "hashicorp", @@ -514,10 +517,10 @@ "owner": "heroku", "provider-source-address": "registry.terraform.io/heroku/heroku", "repo": "terraform-provider-heroku", - "rev": "v5.1.0", - "sha256": "sha256-MMX8zaM3J2GxMXUX0YNX03V8uQzb67cIUF432tjm3Mw=", + "rev": "v5.1.1", + "sha256": "sha256-lXMxIxXgjW2hD4wJQBnc19WFym4zJSKq3dUeUbIqiOQ=", "vendorSha256": null, - "version": "5.1.0" + "version": "5.1.1" }, "hetznerdns": { "owner": "timohirt", @@ -541,19 +544,19 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/http", "repo": "terraform-provider-http", - "rev": "v2.2.0", - "sha256": "sha256-Ym9z/b2geSLdXYlQGggjyNTBZLo+GeMW5XLM+Gvk/gA=", - "vendorSha256": "sha256-Qk3ztfAtKt6Gq9QBtaeodwVkH/71TrCNMMAdrXO6Tjs=", - "version": "2.2.0" + "rev": "v3.0.1", + "sha256": "sha256-oeHWuXiLQF4cnC2QKWmqfNS5abItAxpYCV9BAId1Ld0=", + "vendorSha256": "sha256-fROMSbnav8BiUWD6qdwKi/fGEn4a2lmOuAXsnFTT3fQ=", + "version": "3.0.1" }, "huaweicloud": { "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.38.1", - "sha256": "sha256-8NvrHfHFHmEDt5coyVxHNG+WZDCcGc7cKscTU1bwKHM=", + "rev": "v1.38.2", + "sha256": "sha256-ZbfSpno3yEJ7u6g1dBWMza2uLS1FXEzvSKi+mMLbVGQ=", "vendorSha256": null, - "version": "1.38.1" + "version": "1.38.2" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -577,10 +580,10 @@ "owner": "IBM-Cloud", "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm", "repo": "terraform-provider-ibm", - "rev": "v1.43.0", - "sha256": "sha256-5oQqWr8s4wMiR58JITDH4e5iMPktmlItPjWwScbYSqo=", - "vendorSha256": "sha256-b1aKgB3iB9+7vCgEYuaaEcxgF8ptZOPOrZcpj+SscvA=", - "version": "1.43.0" + "rev": "v1.44.1", + "sha256": "sha256-DpWxhDHQHGVQ0NliJXfn7o3nR9VVHE8QZs/h/tnclUg=", + "vendorSha256": "sha256-ugdkBCgSDWcC8oC3WYco2rAIhFc2ILBZjq8NmB+3mTM=", + "version": "1.44.1" }, "icinga2": { "owner": "Icinga", @@ -622,10 +625,10 @@ "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.9.1", - "sha256": "sha256-+VRVYJDCTcqlB+rfNLVZyBaA6GBNOibWMZAcePRF7Ro=", + "rev": "v3.10.0", + "sha256": "sha256-JDMPr2uFi+9CcHdyigmP1DM3uRx2+eFnzSaHp+es2Tg=", "vendorSha256": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=", - "version": "3.9.1" + "version": "3.10.0" }, "ksyun": { "owner": "kingsoftcloud", @@ -658,10 +661,10 @@ "owner": "launchdarkly", "provider-source-address": "registry.terraform.io/launchdarkly/launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.7.0", - "sha256": "sha256-V7osiBlNDzJbmVUUhpRUi9tnoY1HccdZ5ub83ciSvbY=", - "vendorSha256": "sha256-HKea86ck97uc/Gv6geJm9TTRfG6bnpB+q8cuU/jubI8=", - "version": "2.7.0" + "rev": "v2.8.0", + "sha256": "sha256-H/oKgylo8LLmx2v0BTj6Vb7JQbf9JCooFmsziog6r4E=", + "vendorSha256": "sha256-Ef07RvkqXR/7qf8gHayxczBJ/ChHDmxR6+/wzaokkzk=", + "version": "2.8.0" }, "libvirt": { "owner": "dmacvicar", @@ -676,10 +679,10 @@ "owner": "linode", "provider-source-address": "registry.terraform.io/linode/linode", "repo": "terraform-provider-linode", - "rev": "v1.28.0", - "sha256": "sha256-FkfyyG+DcfsTQY319zmg5iiCgAW8Eu2PxWF35vd51Ng=", - "vendorSha256": "sha256-fWD1Qf6vFe/MH2K2yFufCFBcVuos7FD31ShOA9GvsWw=", - "version": "1.28.0" + "rev": "v1.29.1", + "sha256": "sha256-eZ13kVQplnIQNT4KecUeLAfrCime1WNEdG0yuv3dBWk=", + "vendorSha256": "sha256-PBnMIEuMGcb+qeFO4e17e9sg58DmL6BEAZJeTTVjS1g=", + "version": "1.29.1" }, "linuxbox": { "owner": "numtide", @@ -730,10 +733,10 @@ "owner": "poseidon", "provider-source-address": "registry.terraform.io/poseidon/matchbox", "repo": "terraform-provider-matchbox", - "rev": "v0.5.0", - "sha256": "sha256-vxoKP6oJ4c95BggJLxcTP9FLjzTvQahofcv0Pw/Q+VM=", - "vendorSha256": "sha256-LqRY67rvHmVM+rIez8/ORVXdGigTAMvBlkrHN05aTCk=", - "version": "0.5.0" + "rev": "v0.5.2", + "sha256": "sha256-vWhdStfwReeD1PHTihBoj4GoKnP85nzNzIV/Tjfcz1M=", + "vendorSha256": "sha256-coARdDQVs38dVdUH/fsoGVlwh3wYr3aTxKp/FpUzhis=", + "version": "0.5.2" }, "metal": { "owner": "equinix", @@ -748,10 +751,10 @@ "owner": "aminueza", "provider-source-address": "registry.terraform.io/aminueza/minio", "repo": "terraform-provider-minio", - "rev": "v1.5.2", - "sha256": "sha256-QERV6Q/vYm1DWV91aYFCgZtFfnK9V2ATNsIAbuGzgdY=", - "vendorSha256": "sha256-SB7R466O3CbVwk6JSWXiFK4AD0rf6zijVfQW0rlEsVA=", - "version": "1.5.2" + "rev": "v1.5.3", + "sha256": "sha256-AWVBRrQ90XoJodRsBvqJYjkXSqbQBxWk748na9pTnEk=", + "vendorSha256": "sha256-0c8Pj4Ga6yNX1UcZXIhmDXhdZOTY3h/WdGdYo4Hmltc=", + "version": "1.5.3" }, "mongodbatlas": { "owner": "mongodb", @@ -794,10 +797,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.48.2", - "sha256": "sha256-iLgc9nkeQIElVvu7+Pw5yZyzsx3VovCKOoJMIPigBGo=", - "vendorSha256": "sha256-ch+xeSTIu1zkbPN/zq3BKywNLt6ip1HxYCvSmU+0+mI=", - "version": "2.48.2" + "rev": "v2.49.1", + "sha256": "sha256-+jjMdBj8yEJBA9etiRo3qu+/KfpOe3Gb2DqCR8YPzPI=", + "vendorSha256": "sha256-iIArzW/r57OCtq/lNaFCvQrrGJ8WPHo4md+JrHdMyGs=", + "version": "2.49.1" }, "nomad": { "owner": "hashicorp", @@ -849,19 +852,19 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.84.0", - "sha256": "sha256-fLWA7SPoCzO2TZkxnUw5K07OCAQYd+X5BMnHeIdAEdA=", + "rev": "v4.87.0", + "sha256": "sha256-Db1CCKEeolVcNwtvRlPi2Tsq5JqHfRhFZlELTRrn0OA=", "vendorSha256": null, - "version": "4.84.0" + "version": "4.87.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.31.0", - "sha256": "sha256-IUCiImmT4LG58r342mvWVMxBjVO9zGX8BVHe5G1GiMg=", - "vendorSha256": "sha256-BnxtHEd1C0DOUPVggPCXSBtQ36gcNwL7Hl0Pl1B5e4U=", - "version": "3.31.0" + "rev": "v3.33.0", + "sha256": "sha256-44rbvPfl/DU1wkV/2hPwnpA4R7VSI4TrFpetc52+1gk=", + "vendorSha256": "sha256-hOkhJn1Hc3hv8/+L1N3xZWS2bM4FcaFMXVq+F/1+cN8=", + "version": "3.33.0" }, "oktaasa": { "owner": "oktadeveloper", @@ -885,37 +888,37 @@ "owner": "terraform-provider-openstack", "provider-source-address": "registry.terraform.io/terraform-provider-openstack/openstack", "repo": "terraform-provider-openstack", - "rev": "v1.47.0", - "sha256": "sha256-Hz5cW9hu/hrL7kO/4Q48rRUe5f1urD6x182lNSYsd0E=", - "vendorSha256": "sha256-xlsTLlf1uCfrP77OgjuZWkYAKe1+Tbrf8XDrct+s+AA=", - "version": "1.47.0" + "rev": "v1.48.0", + "sha256": "sha256-I2Rl/Z6KHEkhaoslqMD+ZQ8vOnIwLDDJIP3P/3sTWcw=", + "vendorSha256": "sha256-XB8odOjqSVg/TJApHCZnlReJYTyD89u7axSilMlIALk=", + "version": "1.48.0" }, "opentelekomcloud": { "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.30.0", - "sha256": "sha256-goXQlsOw/nE4d+9VXfqr1yhf/DEOtlVdIS2QJ2s4+8M=", - "vendorSha256": "sha256-0QKYpjA9iv8dSOZ5mIqJ/hpQxlgd+5Y/txBDa0Gsqqc=", - "version": "1.30.0" + "rev": "v1.31.0", + "sha256": "sha256-I3Oku5sNlPlRlYcagz2C4LCZI4N3mwlLK6xAWNn7iVo=", + "vendorSha256": "sha256-mLroGI3X9nLufz4LT4KCbVoPUZimtMaQ3rI108SKURE=", + "version": "1.31.0" }, "opsgenie": { "owner": "opsgenie", "provider-source-address": "registry.terraform.io/opsgenie/opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.10", - "sha256": "sha256-nA3AXwvVFBnyVK8qeUN0AUzISpAYzVdLtyBQNbUxuM8=", + "rev": "v0.6.11", + "sha256": "sha256-R+IKAI86DhQ2E74VpswqG75p7PRzSV77at2+dAyI5RI=", "vendorSha256": null, - "version": "0.6.10" + "version": "0.6.11" }, "ovh": { "owner": "ovh", "provider-source-address": "registry.terraform.io/ovh/ovh", "repo": "terraform-provider-ovh", - "rev": "v0.18.1", - "sha256": "sha256-DoFjm2o6U/e16jhVNtezQ82dbSh1ZfTK/YPo38tHokA=", + "rev": "v0.19.1", + "sha256": "sha256-lQFiJLKxHfXKGNmwi+5wKO2AezmC/yI7igXHZHRnfak=", "vendorSha256": null, - "version": "0.18.1" + "version": "0.19.1" }, "pagerduty": { "owner": "PagerDuty", @@ -1011,10 +1014,10 @@ "owner": "scaleway", "provider-source-address": "registry.terraform.io/scaleway/scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.2.2", - "sha256": "sha256-uSJga2M+9unC8eJkUjhuCQbTTGXEYGky4MJyVL0ZfiQ=", - "vendorSha256": "sha256-DOL38q5463aOMijP6AbBuE7jI7hvLYLm8yCBxrr6DoA=", - "version": "2.2.2" + "rev": "v2.2.7", + "sha256": "sha256-W100EYLKaFH9KGmSkgk0Ig2Z0R+RvYijrm3ikhEvBe8=", + "vendorSha256": "sha256-zswPGl4a/V8tOMMUWCjxY8ubSy5GT9pP6eBpqSrAg/k=", + "version": "2.2.7" }, "secret": { "owner": "numtide", @@ -1038,10 +1041,10 @@ "owner": "jianyuan", "provider-source-address": "registry.terraform.io/jianyuan/sentry", "repo": "terraform-provider-sentry", - "rev": "v0.9.2", - "sha256": "sha256-/Am4v+s7l3hDCbvIV34aG9C+dMEtPS6qB97FywcZcho=", - "vendorSha256": "sha256-A8VxxoMYd8Z4DRFmBLh/uSzjWxIyLQGtV4kGbuDfv8I=", - "version": "0.9.2" + "rev": "v0.9.3", + "sha256": "sha256-FTwJ0H5k5zeglgjur3O6b4GybWAmVF4K7QmNMlvHnlY=", + "vendorSha256": "sha256-lmnZLgCTpKGhk+rUWwL2GQoBAXlU006Sk1GZrcEvhD4=", + "version": "0.9.3" }, "shell": { "owner": "scottwinkler", @@ -1056,10 +1059,10 @@ "owner": "splunk-terraform", "provider-source-address": "registry.terraform.io/splunk-terraform/signalfx", "repo": "terraform-provider-signalfx", - "rev": "v6.13.1", - "sha256": "sha256-OtWJgLObTaWCGOjxN8nlkmfW+D6EMS0esht/OkJaioM=", - "vendorSha256": "sha256-yWqUsObvABwmA6V9ecz8SFtk1Bhdq2/dUpnNLKQtuNM=", - "version": "6.13.1" + "rev": "v6.14.0", + "sha256": "sha256-29yN8n/m/1kSl9xRlf5dae9KOL16FvfZJuM1fLqWPd4=", + "vendorSha256": "sha256-I9fWw6wJiytEuiT8gQVSTKuQggXCMENn4RBxPsenZOY=", + "version": "6.14.0" }, "skytap": { "owner": "skytap", @@ -1074,10 +1077,10 @@ "owner": "Snowflake-Labs", "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.39.0", - "sha256": "sha256-I15vLcZtVPs/37vRuJk5qiiWxNXY561gpWkOLw4ZN6w=", + "rev": "v0.40.0", + "sha256": "sha256-xouzlgI7MkFfela0ZgaX318YhgBLN5/qN+yqZ7rxVGQ=", "vendorSha256": "sha256-I0d7Nm8h7vBHxvcyTousg7Uc+QuYu8FCPabPNMw8rGM=", - "version": "0.39.0" + "version": "0.40.0" }, "sops": { "owner": "carlpett", @@ -1092,10 +1095,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.79.0", - "sha256": "sha256-UOqXUUqbZ7qVlqFI1YABahfW4+ghyMS7n2Yc9Lfd6cc=", - "vendorSha256": "sha256-AJfQhIsh7a1WVQ//oT6P12H/sqmGtKD7jwW3JthvVNQ=", - "version": "1.79.0" + "rev": "v1.81.0", + "sha256": "sha256-UQgN9FTQCtEUvb0OqeQzYrCF/YOZwbvcNkmuyjfkxco=", + "vendorSha256": "sha256-hs6wvdUv4SUa1qYWSoJBaJntEJTCdTY1UeVOAoBUOg0=", + "version": "1.81.0" }, "stackpath": { "owner": "stackpath", @@ -1119,28 +1122,28 @@ "owner": "SumoLogic", "provider-source-address": "registry.terraform.io/SumoLogic/sumologic", "repo": "terraform-provider-sumologic", - "rev": "v2.16.2", - "sha256": "sha256-/JQXnGpUbAIsz2zErrHe97ggGdjnWkvhYm8SHTh/xCs=", - "vendorSha256": "sha256-7DGY+L41bJJrtLwdWgu2aMCefgcmtR6tmH12foi68Kc=", - "version": "2.16.2" + "rev": "v2.17.0", + "sha256": "sha256-vrkH9QccurlQMLkyf4mosDit9tEhL2nhgW1VZSPqjhM=", + "vendorSha256": "sha256-XhAKWlEz7Y8rIGRRJhfS1Dtke6B0eU79Ef3WE3bTo4U=", + "version": "2.17.0" }, "tencentcloud": { "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.76.0", - "sha256": "sha256-Qfe2j6y2qn1GVtsv9+Sy7r9tmPMuAkkNNsOqno2nCx8=", + "rev": "v1.76.4", + "sha256": "sha256-N1DkLDaZW/wZ6Vf0OG2sQ+YVGuCNqz37gi/LjEai1uk=", "vendorSha256": null, - "version": "1.76.0" + "version": "1.76.4" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.33.0", - "sha256": "sha256-OmQQau3nr84sSIiCGeoi2vDvvoK2L7Zve2tzuul0Wyg=", - "vendorSha256": "sha256-IeteO1xIpEwdfHGkz9SKy5EZJCHsHho2L02O6yWzoTk=", - "version": "0.33.0" + "rev": "v0.35.0", + "sha256": "sha256-YSQrDiaADEi8eTnFaXfsX3wz4bst/h/gVts4YjWbVzI=", + "vendorSha256": "sha256-Qa0EKVaMFpSpTc5z4KhAeK8bhDNPeac1QzeTSNkUwA0=", + "version": "0.35.0" }, "thunder": { "owner": "a10networks", @@ -1164,10 +1167,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", - "rev": "v3.4.0", - "sha256": "sha256-14sKHnmUfDbXceH+bfSPuA1TKo6Q6kkazYwHC15D4vY=", - "vendorSha256": "sha256-o7QvF6Z/HCyb/EBr0m90B63AVKqxteQEBXe+OuovnYg=", - "version": "3.4.0" + "rev": "v4.0.1", + "sha256": "sha256-/yfSai1huhk+1OYN6DKspWBdfSDql53lxHWjALD5AV4=", + "vendorSha256": "sha256-Uk20wDu2qIs9Ez/H6NyHMS7i34Il0ReuDzC3MnKdHSk=", + "version": "4.0.1" }, "triton": { "deleteVendor": true, @@ -1201,28 +1204,28 @@ "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "0.17.27", - "sha256": "sha256-FE2G0EOjI4D9HzH05eiwTHc4ZN+5NfcJXYoMUZN+OWM=", - "vendorSha256": "sha256-/ZxmvsKTteAvl9NoCyxSQk4llDsGZmZTZxEIPlqXvY0=", - "version": "0.17.27" + "rev": "0.17.28", + "sha256": "sha256-8Ep4eYpFSJtIA7twOpUI5ns4/lqSnM07MflQJLnC8eU=", + "vendorSha256": "sha256-6ELd3Cxc460TY+XY1AcDQamYg76hWad6bO9BzTEWleU=", + "version": "0.17.28" }, "vault": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/vault", "repo": "terraform-provider-vault", - "rev": "v3.7.0", - "sha256": "sha256-n2sUc71Ymk2kI9bpQxp2TRG4hte5/xIP+NbUxBwyNaM=", - "vendorSha256": "sha256-TqhnjsK36EGpDlN4yy1jd/1KpdOT+hu4koMM3VCJEV0=", - "version": "3.7.0" + "rev": "v3.8.1", + "sha256": "sha256-7d3oOsDEbKZ6qOoRLslFDMgw8q6sBup3A+cA3ijkfXw=", + "vendorSha256": "sha256-D6O8N1WEdDM6sogJym+8dheBKE3eQmGTvbVJeiGreRc=", + "version": "3.8.1" }, "vcd": { "owner": "vmware", "provider-source-address": "registry.terraform.io/vmware/vcd", "repo": "terraform-provider-vcd", - "rev": "v3.6.0", - "sha256": "sha256-vtqlT3cfrEsbTmsKY6SVYUgyo+zIiX0cK080H03C1d0=", - "vendorSha256": "sha256-g5qcT4xaXQMih4WN3ysk+xGwd3ux8XjMceXgmw8gYB0=", - "version": "3.6.0" + "rev": "v3.7.0", + "sha256": "sha256-qEElcMl6tCBfOTTTpTFjVYg6E6K9iTXfgmDDozrgNVg=", + "vendorSha256": "sha256-u5W7zeOv53VAr4M5T2AAVFRDF/6PNhSm1A2WFo6pnJU=", + "version": "3.7.0" }, "venafi": { "owner": "Venafi", @@ -1273,10 +1276,10 @@ "owner": "vultr", "provider-source-address": "registry.terraform.io/vultr/vultr", "repo": "terraform-provider-vultr", - "rev": "v2.11.3", - "sha256": "sha256-Dq4keHT2AWh1zfBYFj6ig2BfU3u4amsp7IB/5Szo/38=", + "rev": "v2.11.4", + "sha256": "sha256-6NiVW6kqUCeit6Dc9GbP4mV03UJkqo+UwHsDE4xMwzQ=", "vendorSha256": null, - "version": "2.11.3" + "version": "2.11.4" }, "wavefront": { "owner": "vmware", @@ -1291,9 +1294,9 @@ "owner": "yandex-cloud", "provider-source-address": "registry.terraform.io/yandex-cloud/yandex", "repo": "terraform-provider-yandex", - "rev": "v0.76.0", - "sha256": "sha256-QMeZjJ9Lm1ncB6xPd6NYJXVTOYvAUQfu7y/y30BvVB4=", - "vendorSha256": "sha256-E6keFmYkxAMSNWqPF9ghFKX1GjwalVx3RyYpUqdk/xE=", - "version": "0.76.0" + "rev": "v0.77.0", + "sha256": "sha256-jkFWEUHqsR//IqgFIyFyJBm5EoclD5ri23QrZ3tRG/w=", + "vendorSha256": "sha256-08/Av6lrFdhTI0cH5cFbcHKOcDPrchC5wSWW83xHrfU=", + "version": "0.77.0" } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 18732782cf..495fd38b63 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -169,8 +169,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.2.5"; - sha256 = "sha256-dj6q+FwsXphR1e/LQApqBr7ytVM5FXexSbNklnU1jao="; + version = "1.2.7"; + sha256 = "sha256-0AGONBurlm0cSM4HyAmUxLt8GdnqNPh146A8ibyfe+k="; vendorSha256 = "sha256-Whe1prBGsE0q0QdNkzAKwvAP7EVlnD/985gjngh+VI4="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfswitch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tfswitch/default.nix index a57128907e..9449c5931b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tfswitch/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tfswitch/default.nix @@ -1,16 +1,16 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "tfswitch"; - version = "0.13.1275"; + version = "0.13.1288"; src = fetchFromGitHub { owner = "warrensbox"; repo = "terraform-switcher"; rev = version; - sha256 = "sha256-yuoJkVztLtlr4xOa4muWKquwAb8lo2IQpD7PLxEQfpg="; + sha256 = "sha256-nGFIzYThcuWpcwUahwMPIURubXpOj+ygoDbSnNYkACI="; }; - vendorSha256 = "sha256-jM9xYwBshBpaT4duBTvVwYUOapQfUbq9kL7EaRIGfQY="; + vendorSha256 = "sha256-NX+vzI/Fa/n9ZQjpESes4fNVAmKlA1rqPwSKsL2GEUY="; # Disable tests since it requires network access and relies on the # presence of release.hashicorp.com diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index 1dd8361f20..b97b20d6be 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/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.4"; + version = "0.30.5"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AdT3qL0frsTi4R4AbmZlPDx0Q2RixC3e4AyEMgGgnlc="; + sha256 = "sha256-K7vQ2Pz35/ye5AhUez/fN7PhW3KRv5/4duG4JpvO5vY="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix index 18ca0709af..aed84153d2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/vcluster/default.nix @@ -40,6 +40,6 @@ buildGoModule rec { downloadPage = "https://github.com/loft-sh/vcluster"; homepage = "https://www.vcluster.com/"; license = licenses.asl20; - maintainers = with maintainers; [ peterromfeldhk ]; + maintainers = with maintainers; [ peterromfeldhk berryp ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix index 038ab2c2bf..8c056cdce0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Pq1gGXROPHHMaOoQwx6cObvMF+SoilOROR4bwI0Y/GM="; + sha256 = "sha256-wvbtiu4WeuiHtyLkhwAB20XvpvHvy24xPSH5Lxtpea8="; }; - vendorSha256 = "sha256-Q8ookgQwecRuSrnQiIREBMDxK9NAWfHu+sIQeMO/T4w="; + vendorSha256 = "sha256-bDsmou4zmRz8DyENdteJ3MzhTpCgri4ISIgxi7fhQdc="; nativeBuildInputs = [ go-bindata installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix index 6fb80f9504..1404878682 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -5,21 +5,22 @@ , installShellFiles , btrfs-progs , glibc -, gitUpdater +, testers +, werf }: buildGoModule rec { pname = "werf"; - version = "1.2.124"; + version = "1.2.151"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-fdCFdsRMdH9xu2YIYt6r7BxqbdzrzUxLxB1k4WEnGIo="; + sha256 = "sha256-YgyR3BVkfQcluTamXlsCHHfqxbM1wqdmGsHPYDyMk8I="; }; - vendorSha256 = "sha256-AbTlchqVD3TySrcHcF3/QfMhbkNg4A4oef9Qkn2v6xY="; + vendorSha256 = "sha256-XpSAFiweD2oUKleD6ztDp1+3PpfUWXfGaaE/9mzRrUQ="; proxyVendor = true; @@ -58,10 +59,10 @@ buildGoModule rec { --zsh <($out/bin/werf completion --shell=zsh) ''; - passthru.updateScript = gitUpdater { - inherit pname version; - ignoredVersions = "1\.[3-9].*"; - rev-prefix = "v"; + passthru.tests.version = testers.testVersion { + package = werf; + command = "werf version"; + version = "v${version}"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix index de96a3ddaa..f13d3d321a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/compactor/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "compactor"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "dns-stats"; repo = pname; rev = version; fetchSubmodules = true; - hash = "sha256-AUNPUk70VwJ0nZgMPLMU258nqkL4QP6km0USrZi2ea0="; + hash = "sha256-SgmtlbYOrSMzVfzsrbg4qs+yGkXQialiJTI99EBsUjQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix index d9f02941b4..032238d399 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix @@ -63,7 +63,7 @@ in python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Chatbot designed to be simple to extend with plugins written in Python"; homepage = "http://errbot.io/"; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ globin ]; license = licenses.gpl3Plus; platforms = platforms.linux; # flaky on darwin, "RuntimeError: can't start new thread" diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index 3f27dd59b7..cc62a7f707 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.21"; + version = "3.3.22"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-0XpToyy5Q3d2IpEMaeyhTri4xCBrI3Kmy5lMTqnAqC0="; + hash = "sha256-VDMcOiuEOTzyogkdpVogikrme2Q6drpb40PqDgDtr7Q="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix index 40e49ff329..7ac58abd53 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ftp/filezilla/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.60.1"; + version = "3.60.2"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - hash = "sha256-gflsY2OMrxg44MY+WHT2AZISCWXYJSlKiUoit9QgZq8="; + hash = "sha256-5AfbrRaZU/+VFFK8vxONlTo6MCNfirsD0nHHEsx+V5I="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/ftp/gftp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ftp/gftp/default.nix index 37338d31e0..3007fdd671 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ftp/gftp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ftp/gftp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gftp"; - version = "2.8.0b"; + version = "2.9.1b"; src = fetchFromGitHub { owner = "masneyb"; repo = pname; rev = version; - hash = "sha256-syeRFpqbd1VhKhhs/fIByDSVpcY+SAlmikDo3J1ZHlo="; + hash = "sha256-0zdv2oYl24BXh61IGCWby/2CCkzNjLpDrAFc0J89Pw4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix b/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix index f919ff757f..7e9e2c3933 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/go-graft/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.6"; + version = "0.2.8"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-nuRkQEqytMPxd2Wh5XeUwk4YzIxnnNEiVTxFY4GlD1E="; + sha256 = "sha256-bihQo75HwottWXIGGaTG4mN+wg0iWKun61dvCYlAmeQ="; }; CGO_ENABLED = 0; ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ]; - vendorSha256 = "sha256-/ckudHo/ttNct+yrQYQEaC6hX+p+Q6M1I/cjJCgjYLk="; + vendorSha256 = "sha256-26tk6pv3yCVwczuymD7r54C7BKcaVlOseI8TXj8IyOM="; subPackages = [ "." ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/gopher/geomyidae/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gopher/geomyidae/default.nix index c9aa26ad98..197cdaca00 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gopher/geomyidae/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gopher/geomyidae/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "geomyidae"; - version = "0.50.1"; + version = "0.51"; src = fetchurl { url = "gopher://bitreich.org/9/scm/geomyidae/tag/geomyidae-v${version}.tar.gz"; - sha512 = "2a71b12f51c2ef8d6e791089f9eea49eb90a36be45b874d4234eba1e673186be945711be1f92508190f5c0a6f502f132c4b7cb82caf805a39a3f31903032ac47"; + sha512 = "3lGAa7BCrspGBcQqjduBkIACpf3u/CkeSCBnaJ3rrz3OIidn4o4dNwZNe7u8swaJxN2dhDSKKeVT3RnFQUaXdg=="; }; buildInputs = [ libressl ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix new file mode 100644 index 0000000000..c6d135a028 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny-desktop/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, dpkg +, fetchurl +, autoPatchelfHook +, glib-networking +, openssl +, webkitgtk +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + name = "cinny-desktop"; + version = "2.1.1"; + + src = fetchurl { + url = "https://github.com/cinnyapp/cinny-desktop/releases/download/v${version}/Cinny_desktop-x86_64.deb"; + sha256 = "sha256-4jd+N3a+u+c+XLwgr8BvvdkVLzo+xTBKFdjiQeu7NJU="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + dpkg + ]; + + buildInputs = [ + glib-networking + openssl + webkitgtk + wrapGAppsHook + ]; + + unpackCmd = "dpkg-deb -x $curSrc source"; + + installPhase = "mv usr $out"; + + meta = with lib; { + description = "Yet another matrix client for desktop"; + homepage = "https://github.com/cinnyapp/cinny-desktop"; + maintainers = [ maintainers.aveltras ]; + license = licenses.mit; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + platforms = platforms.linux; + mainProgram = "cinny"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix index 3f3d71a337..6d212b406f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -4,11 +4,11 @@ let configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); in stdenv.mkDerivation rec { pname = "cinny"; - version = "2.0.4"; + version = "2.1.2"; src = fetchurl { url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz"; - sha256 = "0p5s25nkjs9514a16c7kl0m78vn5f14mv6nbi79yz0sxb7hc12qg"; + sha256 = "sha256-UbL9HP90zfsoj/ClUoBF27n5zkvvN4UU4pxQu8QsoUA="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix index 980ff7e9b5..8354426423 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix @@ -1,6 +1,7 @@ { lib , copyDesktopItems , electron_18 +, buildGoModule , esbuild , fetchFromGitHub , libdeltachat @@ -31,19 +32,18 @@ let hash = "sha256-4rpoDQ3o0WdWg/TmazTI+J0hL/MxwHcNMXWMq7GE7Tk="; }; }); - electronExec = if stdenv.isDarwin then - "${electron_18}/Applications/Electron.app/Contents/MacOS/Electron" - else - "${electron_18}/bin/electron"; - esbuild' = esbuild.overrideAttrs (old: rec { - version = "0.12.29"; - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg="; - }; - }); + esbuild' = esbuild.override { + buildGoModule = args: buildGoModule (args // rec { + version = "0.12.29"; + src = fetchFromGitHub { + owner = "evanw"; + repo = "esbuild"; + rev = "v${version}"; + hash = "sha256-oU++9E3StUoyrMVRMZz8/1ntgPI62M1NoNz9sH/N5Bg="; + }; + vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; + }); + }; in nodePackages.deltachat-desktop.override rec { pname = "deltachat-desktop"; version = "1.30.1"; @@ -98,7 +98,7 @@ in nodePackages.deltachat-desktop.override rec { $out/lib/node_modules/deltachat-desktop/html-dist/fonts done - makeWrapper ${electronExec} $out/bin/deltachat \ + makeWrapper ${electron_18}/bin/electron $out/bin/deltachat \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher${stdenv.hostPlatform.extensions.sharedLibrary} \ --add-flags $out/lib/node_modules/deltachat-desktop ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix index 3e992899e4..fff08699fa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -14,7 +14,7 @@ , qrencode , icu , gspell -, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good +, srtp, libnice, gnutls, gstreamer, gst-plugins-base, gst-plugins-good, webrtc-audio-processing }: stdenv.mkDerivation rec { @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-good + webrtc-audio-processing ] ++ lib.optionals (!stdenv.isDarwin) [ xorg.libxcb xorg.libpthreadstubs diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix index f3af6d9e8b..c4b11068a1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,7 +1,7 @@ { branch ? "stable", callPackage, fetchurl, lib, stdenv }: let versions = if stdenv.isLinux then { - stable = "0.0.18"; + stable = "0.0.19"; ptb = "0.0.29"; canary = "0.0.136"; } else { @@ -14,7 +14,7 @@ let x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "1hl01rf3l6kblx5v7rwnwms30iz8zw6dwlkjsx2f1iipljgkh5q4"; + sha256 = "GfSyddbGF8WA6JmHo4tUM27cyHV5kRAyrEiZe1jbA5A="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; @@ -53,7 +53,7 @@ let downloadPage = "https://discordapp.com/download"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ ldesgoui MP2E devins2518 ]; + maintainers = with maintainers; [ MP2E devins2518 ]; platforms = [ "x86_64-linux" "x86_64-darwin" ] ++ lib.optionals (branch != "stable") [ "aarch64-darwin" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix index ba4b5f0ffd..c6a64212b5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -1,30 +1,20 @@ { lib, stdenv, fetchFromGitHub, nodejs, bash, nodePackages, unzip }: -let - # OpenAsar fails with default unzip, throwing "lchmod (file attributes) error: Operation not supported" - unzipFix = - if stdenv.isLinux then - unzip.overrideAttrs (oldAttrs: { - buildFlags = oldAttrs.buildFlags ++ [ "LOCAL_UNZIP=-DNO_LCHMOD" ]; - }) - else - unzip; -in stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2022-06-27"; + version = "unstable-2022-08-07"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "6f7505fb91a07035d3661a3a7bf68b3018ddfd82"; - sha256 = "2tb6OgYOnpryiyk7UH39sgzwtGJf9hNOpy74YqLI+Uk="; + rev = "e0870784008a584229d3094e0988f5da155c7fd7"; + hash = "sha256-t0b2SFlDDBSQEkOCQME0jsLJ8NvoXROTxoQgnoXM9eQ="; }; postPatch = '' # Hardcode unzip path substituteInPlace ./src/updater/moduleUpdater.js \ - --replace \'unzip\' \'${unzipFix}/bin/unzip\' + --replace \'unzip\' \'${unzip}/bin/unzip\' # Remove auto-update feature echo "module.exports = async () => log('AsarUpdate', 'Removed');" > ./src/asarUpdate.js ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index c8c1860453..5b7c23f7c7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -19,7 +19,6 @@ let pinData = lib.importJSON ./pin.json; executableName = "element-desktop"; - electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; keytar = callPackage ./keytar { inherit Security AppKit; }; seshat = callPackage ./seshat { inherit CoreServices; }; in @@ -83,7 +82,7 @@ mkYarnPackage rec { # executable wrapper # LD_PRELOAD workaround for sqlcipher not found: https://github.com/matrix-org/seshat/issues/102 - makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ + makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ --set LD_PRELOAD ${sqlcipher}/lib/libsqlcipher.so \ --add-flags "$out/share/element/electron" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix index 4dfd048b1b..9a6cf2d035 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -1,4 +1,5 @@ -{ alsa-lib +{ addOpenGLRunpath +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -54,6 +55,9 @@ , wayland , wrapGAppsHook , xdg-utils + +# for custom command line arguments, e.g. "--use-gl=desktop" +, commandLineArgs ? "" }: stdenv.mkDerivation rec { @@ -146,14 +150,19 @@ stdenv.mkDerivation rec { mkdir -p $out mv usr/share $out/ mv opt/ $out/ - chmod -R g-w $out substituteInPlace $out/share/applications/bytedance-feishu.desktop \ --replace /usr/bin/bytedance-feishu-stable $out/opt/bytedance/feishu/bytedance-feishu - wrapProgram $out/opt/bytedance/feishu/feishu \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ - --prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu + # Wrap feishu and vulcan + # Feishu is the main executable, vulcan is the builtin browser + for executable in $out/opt/bytedance/feishu/{feishu,vulcan/vulcan}; do + wrapProgram $executable \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ + --prefix LD_LIBRARY_PATH : ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" \ + ${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"} + done mkdir -p $out/share/icons/hicolor base="$out/opt/bytedance/feishu" @@ -161,6 +170,9 @@ stdenv.mkDerivation rec { mkdir -p $out/share/icons/hicolor/''${size}x''${size}/apps ln -s $base/product_logo_$size.png $out/share/icons/hicolor/''${size}x''${size}/apps/bytedance-feishu.png done + + mkdir -p $out/bin + ln -s $out/opt/bytedance/feishu/bytedance-feishu $out/bin/bytedance-feishu ''; meta = with lib; { @@ -169,5 +181,6 @@ stdenv.mkDerivation rec { downloadPage = "https://www.feishu.cn/en/#en_home_download_block"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ billhuang ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix index edd05a83ad..82f808be3b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -31,5 +31,8 @@ mkFranzDerivation' rec { maintainers = with maintainers; [ davidtwco ma27 ]; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; + knownVulnerabilities = [ + "CVE-2022-32320" + ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix index cbc87fc5ac..2f02e28df4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/ferdium/default.nix @@ -3,10 +3,10 @@ mkFranzDerivation rec { pname = "ferdium"; name = "Ferdium"; - version = "6.0.0-nightly.65"; + version = "6.0.0"; src = fetchurl { - url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/ferdium_${version}_amd64.deb"; - sha256 = "sha256-vmu74aLAKGbmRf9hkMUL5VOfi/Cbvdix9MzsZK1qW80="; + url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-amd64.deb"; + sha256 = "sha256-395rleN2T8iUejLRjl51N+lgqtWwHXad36WpIT1BFGQ="; }; extraBuildInputs = [ xorg.libxshmfence ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/default.nix new file mode 100644 index 0000000000..140b72f20f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/fractal-next/default.nix @@ -0,0 +1,76 @@ +{ stdenv +, lib +, fetchFromGitLab +, meson +, ninja +, rustPlatform +, pkg-config +, glib +, gtk4 +, gtksourceview5 +, libadwaita +, gstreamer +, gst-plugins-base +, gst-plugins-bad +, libsecret +, desktop-file-utils +, appstream-glib +, openssl +, pipewire +, libshumate +, wrapGAppsHook4 +}: + +stdenv.mkDerivation rec { + pname = "fractal-next"; + version = "unstable-2022-07-10"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "fractal"; + rev = "837b56978474fe512469805844b8ee234587499a"; + hash = "sha256-6op/+eiDra5EFRludpkQOucBXdPl5a/oQWPwwhJEx+M="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-2mE26ES+fYSWdfMr8uTsX2VVGTNMDQ9MXEk5E/L95UI="; + }; + + nativeBuildInputs = [ + glib + gtk4 + meson + ninja + pkg-config + rustPlatform.bindgenHook + rustPlatform.cargoSetupHook + rustPlatform.rust.cargo + rustPlatform.rust.rustc + desktop-file-utils + appstream-glib + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gstreamer + gst-plugins-base + gst-plugins-bad + gtk4 + gtksourceview5 + libadwaita + libsecret + openssl + pipewire + libshumate + ]; + + meta = with lib; { + description = "Matrix group messaging app (development version)"; + homepage = "https://gitlab.gnome.org/GNOME/fractal"; + license = licenses.gpl3Plus; + maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]); + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 9725676da0..2cd6b897d7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.4.6"; + version = "1.4.7"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256-iiZ2Nv6voq67+OJ26hk+3JQSKevx9ti8s6DreSAsQk8="; + sha256 = "sha256-GkgHvzo0sxBIgk5P/3Yr0eFiL0ZOc6QmwJaE3Ck2hPM="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix index bd0da749e0..d0f9f3d9e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gotktrix/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "gotktrix"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/UDXqN7FnFvbiXp3pID1WbNfCuKDsMrFQvL1101xxOo="; + sha256 = "sha256-ZaE7L43fA9L5WbTAsBiIxlwYgjl1hMrtfrraAROz+7k="; }; - vendorSha256 = "sha256-xA2DW4v6aT4fEW2WSa96oRr5Yrb2HoR054V1+BiWSvk="; + vendorSha256 = "sha256-k6T44aH1NogyrbUnflfEHkp0zpOOH1YFly/X2kwbMzs="; buildInputs = [ gtk4 diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/client-qt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/client-qt.nix index 74bfbc6006..840606bf19 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/client-qt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/client-qt.nix @@ -9,6 +9,8 @@ , python3 , qttools # for translations , wrapQtAppsHook +, ffmpeg-jami +, jami-daemon , libnotify , qt5compat , qtbase @@ -19,7 +21,7 @@ , qtsvg , qtwebengine , qtwebchannel -, jami-libclient +, withWebengine ? false }: stdenv.mkDerivation { @@ -42,9 +44,10 @@ stdenv.mkDerivation { ]; buildInputs = [ - jami-libclient - networkmanager + ffmpeg-jami + jami-daemon libnotify + networkmanager qtbase qt5compat qrencode @@ -53,9 +56,17 @@ stdenv.mkDerivation { qtmultimedia qtsvg qtwebchannel + ] ++ lib.optionals withWebengine [ qtwebengine ]; + cmakeFlags = [ + "-DRING_BUILD_DIR=${jami-daemon}/include" + "-DRING_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" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common index 9376a38b18..0aac24e24b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_args_common @@ -19,6 +19,9 @@ --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 @@ -43,6 +46,9 @@ --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 @@ -59,6 +65,13 @@ --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 diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches index 2422192c09..28f884e667 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/config/ffmpeg_patches @@ -2,5 +2,6 @@ remove-mjpeg-log.patch change-RTCP-ratio.patch rtp_ext_abs_send_time.patch libopusdec-enable-FEC.patch -libopusenc-enable-FEC.patch +libopusenc-reload-packet-loss-at-encode.patch +ios-disable-b-frames.patch screen-sharing-x11-fix.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix index 635cc569e8..131ca7b913 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/daemon.nix @@ -2,86 +2,38 @@ , version , jami-meta , stdenv -, lib -, fetchFromGitHub , autoreconfHook , pkg-config , perl # for pod2man -, ffmpeg_4 -, pjsip , alsa-lib , asio , dbus , dbus_cplusplus +, ffmpeg-jami , fmt , gmp +, gnutls +, http-parser +, jack +, jsoncpp , libarchive , libgit2 , libnatpmp -, secp256k1 -, openssl -, opendht -, speex -, webrtc-audio-processing -, jsoncpp -, gnutls -, zlib -, libyamlcpp , libpulseaudio -, jack -, udev , libupnp +, libyamlcpp , msgpack +, opendht-jami +, openssl +, pjsip-jami , restinio -, http-parser +, secp256k1 +, speex +, udev +, webrtc-audio-processing +, zlib }: -let - readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); - - ffmpeg-jami = ffmpeg_4.overrideAttrs (old: - let - patch-src = src + "/daemon/contrib/src/ffmpeg/"; - in - { - patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/ffmpeg_patches)); - 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" ]; - meta = old.meta // { - # undefined reference to `ff_nlmeans_init_aarch64' - broken = stdenv.isAarch64; - }; - }); - - pjsip-jami = pjsip.overrideAttrs (old: - let - patch-src = src + "/daemon/contrib/src/pjproject/"; - in - rec { - version = "e1f389d0b905011e0cb62cbdf7a8b37fc1bcde1a"; - - src = fetchFromGitHub { - owner = "savoirfairelinux"; - repo = "pjproject"; - rev = version; - sha256 = "sha256-6t+3b7pvvwi+VD05vxtujabEJmWmJTAeyD/Dapav10Y="; - }; - - patches = old.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); - }); - - opendht-jami = opendht.override { - enableProxyServerAndClient = true; - enablePushNotifications = true; - }; - -in stdenv.mkDerivation { pname = "jami-daemon"; inherit src version; @@ -102,26 +54,25 @@ stdenv.mkDerivation { ffmpeg-jami gmp gnutls + http-parser + jack + jsoncpp libarchive libgit2 libnatpmp + libpulseaudio + libupnp + libyamlcpp + msgpack opendht-jami - pjsip-jami - secp256k1 openssl + pjsip-jami + restinio + secp256k1 speex + udev webrtc-audio-processing zlib - libyamlcpp - jsoncpp - libpulseaudio - jack - opendht - libupnp - udev - msgpack - restinio - http-parser ]; doCheck = false; # The tests fail to compile due to missing headers. @@ -130,9 +81,6 @@ stdenv.mkDerivation { passthru = { updateScript = ./update.sh; - ffmpeg = ffmpeg-jami; - pjsip = pjsip-jami; - opendht = opendht-jami; }; meta = jami-meta // { diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix index 32b5a26638..690f6534e9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/default.nix @@ -1,24 +1,30 @@ { stdenv , lib , callPackage +, fetchFromGitHub , fetchzip +, ffmpeg_4 +, pjsip +, opendht , jack , udev , qt6Packages }: let - version = "20220503.1550.0f35faa"; + version = "20220726.1515.da8d1da"; src = fetchzip { url = "https://dl.jami.net/release/tarballs/jami_${version}.tar.gz"; - hash = "sha256-iCmsgjgGogNjj1k0sYRqx59ZEwFZcJOeVGBNyBlcy1M="; + hash = "sha256-yK+xo+YpNYmmWyNAE31hiL6HLvDdEFkm8FO6LQmPCL0="; stripRoot = false; postFetch = '' cd $out - mv jami-project/* ./ - rm -r jami-project.rst jami-project client-android client-ios client-macosx client-uwp + mv jami-project/daemon ./ + mv jami-project/client-qt ./ + mv jami-project/COPYING ./ + rm -r jami-project.rst jami-project rm daemon/contrib/tarballs/* ''; }; @@ -30,11 +36,57 @@ let platforms = platforms.linux; maintainers = [ maintainers.linsui ]; }; + + readLinesToList = with builtins; file: filter (s: isString s && stringLength s > 0) (split "\n" (readFile file)); in rec { - jami-daemon = callPackage ./daemon.nix { inherit version src udev jack jami-meta; }; + ffmpeg-jami = ffmpeg_4.overrideAttrs (old: + let + patch-src = src + "/daemon/contrib/src/ffmpeg/"; + in + { + patches = old.patches ++ (map (x: patch-src + x) (readLinesToList ./config/ffmpeg_patches)); + 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" ]; + meta = old.meta // { + # undefined reference to `ff_nlmeans_init_aarch64' + broken = stdenv.isAarch64; + }; + }); - jami-libclient = qt6Packages.callPackage ./libclient.nix { inherit version src jami-meta; }; + pjsip-jami = pjsip.overrideAttrs (old: + let + patch-src = src + "/daemon/contrib/src/pjproject/"; + in + rec { + version = "4af5d666d18837abaac94c8ec6bfc84984dcf1e2"; - jami-client-qt = qt6Packages.callPackage ./client-qt.nix { inherit version src jami-meta; }; + src = fetchFromGitHub { + owner = "savoirfairelinux"; + repo = "pjproject"; + rev = version; + sha256 = "sha256-ENRfQh/HCXqInTV0tu8tGQO7+vTbST6XXpptERXMACE="; + }; + + patches = old.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); + }); + + opendht-jami = opendht.override { + enableProxyServerAndClient = true; + enablePushNotifications = true; + }; + + jami-daemon = callPackage ./daemon.nix { + inherit version src udev jack jami-meta ffmpeg-jami pjsip-jami opendht-jami; + }; + + jami-client-qt = qt6Packages.callPackage ./client-qt.nix { + inherit version src jami-meta ffmpeg-jami; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/libclient-include-path.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/libclient-include-path.patch deleted file mode 100644 index 3ae017eb45..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/libclient-include-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/CMakeLists.txt w/CMakeLists.txt -index 0ee77dba..767e19df 100644 ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -635,7 +635,7 @@ if(ENABLE_SHARED) - ) - endif() - --SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include) -+SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_FULL_INCLUDEDIR}) - - INSTALL( FILES ${libringclient_LIB_HDRS} ${libringclient_extra_LIB_HDRS} - DESTINATION ${INCLUDE_INSTALL_DIR}/libringclient diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/libclient.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/libclient.nix deleted file mode 100644 index d998fe7a06..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/libclient.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ version -, src -, jami-meta -, stdenv -, lib -, pkg-config -, cmake -, qtbase -, jami-daemon -}: - -stdenv.mkDerivation { - pname = "jami-libclient"; - inherit version src; - - sourceRoot = "source/lrc"; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - jami-daemon - jami-daemon.ffmpeg - ]; - - patches = [ - # Fix path to include dir when using split outputs - ./libclient-include-path.patch - ]; - - propagatedBuildInputs = [ - qtbase - ]; - outputs = [ "out" "dev" ]; - - cmakeFlags = [ - "-DRING_BUILD_DIR=${jami-daemon}/include" - "-DRING_XML_INTERFACES_DIR=${jami-daemon}/share/dbus-1/interfaces" - ]; - - dontWrapQtApps = true; - - meta = jami-meta // { - description = "The client library" + jami-meta.description; - license = lib.licenses.lgpl21Plus; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/update.sh index ecf14e25dd..abc7728e07 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/update.sh +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/jami/update.sh @@ -9,8 +9,9 @@ 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-libclient "$version" --file=$jami_dir/default.nix +update-source-version jami-daemon "$version" --file=$jami_dir/default.nix src=$(nix-build --no-out-link -A jami-libclient.src) @@ -20,7 +21,7 @@ mkdir -p $config_dir ffmpeg_rules="${src}/daemon/contrib/src/ffmpeg/rules.mak" # Update FFmpeg patches -ffmpeg_patches=$(sed -n '/.sum-ffmpeg:/,/HAVE_IOS/p' ${ffmpeg_rules} | sed -n -E 's/.*ffmpeg\/(.*patch).*/\1/p') +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" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix index 306a53f0a3..71299566dd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -83,6 +83,9 @@ mkDerivation rec { cmakeFlags = [ "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include" "-DMINIZIP_LIBRARIES=minizip" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; # The default install phase fails because the paths are somehow messed up in diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix index 750511ebf1..d3a7abae82 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -33,13 +33,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "sha256-h1Yahz7Rt7+r55RFTSVj6E14nWnjCs0CecljceaWgaQ="; + sha256 = "sha256-JNAI1+GmRgee7bqeJi8JadV3W7vXMpEvvKqqinb97Ng="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix new file mode 100644 index 0000000000..fd8342fbde --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-signald/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchFromGitHub, pidgin, json-glib, signald }: + +stdenv.mkDerivation rec { + pname = "purple-signald"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "hoehermann"; + repo = "libpurple-signald"; + rev = "v${version}"; + sha256 = "sha256-2LiHjVRBwdPbfravIVM+gvsh3Gq4bhjtRD6eWAbkWmc="; + fetchSubmodules = true; + }; + + buildInputs = [ + pidgin + json-glib + signald + ]; + + PKG_CONFIG_PURPLE_PLUGINDIR = "${placeholder "out"}/lib/purple-2"; + PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; + + installFlags = [ "DESTDIR=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/hoehermann/libpurple-signald"; + description = "Signal support for Pidgin / libpurple"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ hufman ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index fe3f90346f..c5e5b063c4 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -43,13 +43,13 @@ assert enablePsiMedia -> enablePlugins; mkDerivation rec { pname = "psi-plus"; - version = "1.5.1618"; + version = "1.5.1633"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "sha256-ueZYFOZFCPQrg9etZCrY5ZTn7PZMkcuwbXVPPbW9S/A="; + sha256 = "sha256-kXdDxpIOcwcFy+OmsqlE8a19sGPfMNI08fMy5OFuP9w="; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index d854414a36..e04c0b8547 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.8.5"; + version = "3.8.7"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - sha256 = "sha256-nKEfdbHfLjM4w79hzQdKiC4+IT3WXdDdlXkzelCKqOw"; + sha256 = "sha256-kSEOjhsSa+5+oNxWY+cQR7RIRzd+BGR4WDL1drybxzU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index e2b4cafe99..d1a1c8d646 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -19,7 +19,6 @@ let pinData = lib.importJSON ./pin.json; executableName = "schildichat-desktop"; - electron_exec = if stdenv.isDarwin then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" else "${electron}/bin/electron"; in stdenv.mkDerivation rec { pname = "schildichat-desktop"; @@ -88,7 +87,7 @@ stdenv.mkDerivation rec { done # executable wrapper - makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ + makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ --add-flags "$out/share/element/electron" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index e0eff91f98..633abdfa3e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.10.8"; + version = "0.10.10"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - sha256 = "sha256-vZBFYPim/qBC8hJHvp5gK6P2JxIs9rzR/hIMjW3kNM8="; + sha256 = "sha256-VXL4eeBK8hY5gw8tAdqKQGOc+z1AOAPDyHfBe/fDONc="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index de4ecadc44..2862ff6612 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.50.0"; # Please backport all updates to the stable channel. + version = "5.54.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "sha256-3/a0+FTRSI7MdI/4mAhKl/KEBoEM1rqTUUWTpNFJTSA="; + sha256 = "sha256-dGxbsSNvBT0KFukSNXyii69hMN246IYFbb0CzrDh7IU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch deleted file mode 100644 index 61474d0ab4..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/apple-sdk-missing-utimensat.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/signalbackup/setfiletimestamp.cc b/signalbackup/setfiletimestamp.cc -index f53a168..d2d1c5e 100644 ---- a/signalbackup/setfiletimestamp.cc -+++ b/signalbackup/setfiletimestamp.cc -@@ -21,24 +21,23 @@ - - #if !defined(_WIN32) && !defined(__MINGW64__) - --#include --#include -+#include - - bool SignalBackup::setFileTimeStamp(std::string const &file, long long int time_usec) const - { -- struct timespec ntimes[] = -+ struct timeval ntimes[] = - { - { // ntimes[0] = - time_usec / 1000, // tv_sec, seconds -- (time_usec % 1000) * 1000 // tv_usec, nanoseconds -+ static_cast(time_usec) // tv_usec, nanoseconds - }, - { // ntimes[1] = - time_usec / 1000, // tv_sec, seconds -- (time_usec % 1000) * 1000 // tv_usec, nanoseconds -+ static_cast(time_usec) // tv_usec, nanoseconds - } - }; - -- return (utimensat(AT_FDCWD, file.c_str(), ntimes, 0) == 0); -+ return (utimes(file.c_str(), ntimes) == 0); - } - - #else // this is poorly tested, I don't have windows diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index adbe34207c..439143a10a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,18 +2,15 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20220526"; + version = "20220711"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - sha256 = "sha256-vFq9NvQboqGVzwiH2KPhT6jsdY5i2oKIgEaZKfBsb/o="; + sha256 = "sha256-dKU8oTQ6ECwycDN3k7NY/pKpNWH16ceJIFDnRNEA90c="; }; - # Remove when Apple SDK is >= 10.13 - patches = lib.optional (stdenv.system == "x86_64-darwin") ./apple-sdk-missing-utimensat.patch; - buildInputs = [ openssl sqlite ]; buildFlags = [ "-Wall" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix index ac7040a9aa..0b85524364 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -4,18 +4,18 @@ let pname = "signald"; - version = "0.18.5"; + version = "0.19.1"; src = fetchFromGitLab { owner = pname; repo = pname; rev = version; - sha256 = "sha256-2cb1pyBOoOlFqJsNKXA0Q9x4wCE4yzzcfrDDtTp7HMk="; + sha256 = "sha256-Ma6kIKRVM8UUU/TvfVp2RVl/FLxFgBQU3mEypnujJ+c="; }; jre' = jre_minimal.override { jdk = jdk17_headless; - # from https://gitlab.com/signald/signald/-/blob/0.18.5/build.gradle#L173 + # from https://gitlab.com/signald/signald/-/blob/0.19.1/build.gradle#L173 modules = [ "java.base" "java.management" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 515290ab91..263d3a17fa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.82.0.403"; + version = "8.86.0.407"; rpath = lib.makeLibraryPath [ alsa-lib @@ -68,7 +68,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "sha256-45aHb6BI0kUnJOlRsglyGdZ6+8sLmHZK3FN8nYpuHXM="; + sha256 = "sha256-46M0JYP5QBCTCRqLtNyrQsEc6PsK6WRssb55IkG6pu0="; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 9146da9453..e171622616 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config cmake ninja yasm ]; - buildInputs = [ + propagatedBuildInputs = [ libjpeg openssl libopus @@ -120,13 +120,5 @@ stdenv.mkDerivation { enableParallelBuilding = true; - propagatedBuildInputs = [ - # Required for linking downstream binaries. - abseil-cpp - openh264 - usrsctp - libvpx - ]; - meta.license = lib.licenses.bsd3; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 212092d8a1..5b7416555f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -23,6 +23,7 @@ , libopus , alsa-lib , libpulseaudio +, pipewire , range-v3 , tl-expected , hunspell @@ -35,6 +36,7 @@ , util-linuxMinimal , pcre , libpthreadstubs +, libXdamage , libXdmcp , libselinux , libsepol @@ -127,6 +129,7 @@ env.mkDerivation rec { libopus alsa-lib libpulseaudio + pipewire range-v3 tl-expected hunspell @@ -139,6 +142,7 @@ env.mkDerivation rec { util-linuxMinimal # Required for libmount thus not nativeBuildInputs. pcre libpthreadstubs + libXdamage libXdmcp libselinux libsepol diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix new file mode 100644 index 0000000000..ec9df5ec10 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchFromGitHub, rustPlatform, pkg-config, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "twitch-tui"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "Xithrius"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-144yn/QQPIZJOgqKFUWjB7KCmEKfNpj6XjMGhTpQdEQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + cargoHash = "sha256-zUeI01EyXsuoKzHbpVu3jyA3H2aBk6wMY+GW3h3v8vc="; + + meta = with lib; { + description = "Twitch chat in the terminal"; + homepage = "https://github.com/Xithrius/twitch-tui"; + license = licenses.mit; + maintainers = [ maintainers.taha ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix index 293f6747d3..f324dd0db0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -2,7 +2,7 @@ , writeScript , stdenv , fetchurl -, alsaLib +, alsa-lib , at-spi2-atk , at-spi2-core , atk @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib + alsa-lib at-spi2-atk at-spi2-core atk diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix index c50424c7a5..778aaf85f5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-sha.nix @@ -1 +1 @@ -"1ir5akl4vrzb0b5s37s2viqisvf4sylw8rfnfj434h1q0gqz79sc" +"09x0l50frck8v2zhgp84m57q3kj74chk37sc69mpbhwy0s6vg980" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix index e776017ccb..e3f51ac695 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zoom-us/x86_64-linux-version.nix @@ -1 +1 @@ -"5.11.1.3595" +"5.11.3.3882" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix index ad16c84c69..cf48ba4420 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/default.nix @@ -17,6 +17,10 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw="; }; + patches = [ + ./pytest-executable-name.patch + ]; + propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 lxml @@ -43,12 +47,6 @@ python3.pkgs.buildPythonApplication rec { "--prefix" "PATH" ":" (lib.makeBinPath [ libnotify ]) ]; - disabledTests = [ - # IndexError: list index out of range - "test_main_multiple_notify_options" - "test_main_multiple_autohide_options" - ]; - meta = with lib; { description = "Zulip's official terminal client"; homepage = "https://github.com/zulip/zulip-terminal"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch new file mode 100644 index 0000000000..a816993b8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/zulip-term/pytest-executable-name.patch @@ -0,0 +1,22 @@ +diff --git a/tests/cli/test_run.py b/tests/cli/test_run.py +index 1452cfd..0a21c09 100644 +--- a/tests/cli/test_run.py ++++ b/tests/cli/test_run.py +@@ -240,7 +240,7 @@ def test_main_multiple_autohide_options( + + captured = capsys.readouterr() + lines = captured.err.strip("\n") +- lines = lines.split("pytest: ", 1)[1] ++ lines = lines.split("__main__.py: ", 1)[1] + expected = f"error: argument {options[1]}: not allowed with argument {options[0]}" + assert lines == expected + +@@ -277,7 +277,7 @@ def test_main_multiple_notify_options( + + captured = capsys.readouterr() + lines = captured.err.strip("\n") +- lines = lines.split("pytest: ", 1)[1] ++ lines = lines.split("__main__.py: ", 1)[1] + expected = f"error: argument {options[1]}: not allowed with argument {options[0]}" + assert lines == expected + diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix index 459610feea..49483ff7eb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-cluster/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "ipfs-cluster"; - version = "1.0.1"; + version = "1.0.2"; - vendorSha256 = "sha256-V+fqyrol+hXjjaCBlAs6f7FeqBqa2jTmMO2bvb6HfgY="; + vendorSha256 = "sha256-4pCJnQ/X5bvlgyHcRVZ8LyOexaKmz+1xAntMpZCpvd0="; src = fetchFromGitHub { - owner = "ipfs"; + owner = "ipfs-cluster"; repo = "ipfs-cluster"; rev = "v${version}"; - sha256 = "sha256-dwV5fx52QS2QiBUV8gkJ47tBqT54tEOfSpdXF6hmeLQ="; + sha256 = "sha256-Mbq4NzMNIGGFOWuHlToGmel/Oa/K6xzpZTVuXnKHq1M="; }; meta = with lib; { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; - homepage = "https://cluster.ipfs.io/"; + homepage = "https://ipfscluster.io"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ Luflosi jglukasik ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix index 2540c777f1..71df2c1a07 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ipfs"; - version = "0.13.1"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.14.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "12"; # Also update ipfs-migrator when changing the repo version # go-ipfs makes changes to it's source tarball that don't match the git source. src = fetchurl { - url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; - sha256 = "sha256-kGtqFb4Fxx9mxDqX8YSqnY875sU70pzL2BwWBQg5sTU="; + url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; + hash = "sha256-93jd0r5nWkGrMnaPXoJMf6dHxMrtiWPgkHYaWH109lg="; }; # tarball contains multiple files/directories diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix index 275cf4c726..7b2a8c3f24 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "6.42"; + version = "7.02"; src = fetchFromGitHub { owner = "convos-chat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-W7ZVZUCNllpFIQpNz2m/8VFOXDZfuppB+g3qibY6wt8="; + sha256 = "sha256-i8lDK5/Whi5uo2/Qqh5jgJGLuuHn7kdrfvr+9Ktzp/8="; }; nativeBuildInputs = [ makeWrapper ] @@ -20,7 +20,7 @@ perlPackages.buildPerlPackage rec { buildInputs = with perlPackages; [ CryptPassphrase CryptPassphraseArgon2 CryptPassphraseBcrypt - FileHomeDir FileReadBackwards HTTPAcceptLanguage + FileHomeDir FileReadBackwards HTTPAcceptLanguage SyntaxKeywordTry FutureAsyncAwait IOSocketSSL IRCUtils JSONValidator LinkEmbedder ModuleInstall Mojolicious MojoliciousPluginOpenAPI MojoliciousPluginSyslog MojoliciousPluginWebpack ParseIRC TextMarkdownHoedown TimePiece UnicodeUTF8 @@ -36,6 +36,10 @@ perlPackages.buildPerlPackage rec { ''; preCheck = '' + # Remove unstable test (PR #176640) + # + rm t/plugin-auth-header.t + # Remove online test # rm t/web-pwa.t diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix index 9ea6c32c7d..b04cd2e07a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "irssi"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "irssi"; repo = "irssi"; rev = version; - hash = "sha256-HLcIhAZoJfCHoSNQCpoytBR0zmiZd919FcKWCl35G0A="; + hash = "sha256-dQZ/CeBfcfWGjKPF3fR62JDqyEXGv5hd9VT4OEbgJhQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix index c275f90466..b26b2cb1da 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -1,34 +1,28 @@ -{ lib, stdenv, fetchFromGitHub, irssi, gmp, automake, autoconf, libtool, openssl, glib, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, glib, openssl, irssi }: stdenv.mkDerivation rec { pname = "fish-irssi"; - version = "unstable-2013-04-13"; + version = "unstable-2021-04-16"; src = fetchFromGitHub { owner = "falsovsky"; repo = "FiSH-irssi"; - rev = "e98156bebd8c150bf100b3a0356e7103bb5c20e6"; - sha256 = "0mqq7q3rnkzx4j352g1l8sv3g687d76ikjl9c7g6xw96y91kqvdp"; + rev = "fcc484f09ce6941ba2e499605270593ddd13b81a"; + hash = "sha256-KIPnz17a0CFfoPO2dZz90j+wG/dR4pv5d0iZMRf7Vkc="; }; - preConfigure = '' - cp -a "${irssi.src}" "./${irssi.name}" - configureFlags="$configureFlags --with-irssi-source=`pwd`/${irssi.name}" + patches = [ ./irssi-include-dir.patch ]; - ./regen.sh - ''; + nativeBuildInputs = [ cmake pkg-config ]; - installPhase = '' - mkdir -p $out/lib/irssi/modules - cp src/.libs/libfish.so $out/lib/irssi/modules - ''; + buildInputs = [ glib openssl ]; - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [ gmp libtool openssl glib ]; + cmakeFlags = [ "-DIRSSI_INCLUDE_PATH:PATH=${irssi}/include" ]; - meta = { + meta = with lib; { homepage = "https://github.com/falsovsky/FiSH-irssi"; - license = lib.licenses.unfree; # I can't find any mention of license - maintainers = with lib.maintainers; [viric]; + license = licenses.mit; + maintainers = with maintainers; [ viric ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch new file mode 100644 index 0000000000..0a51ec327b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/irssi-include-dir.patch @@ -0,0 +1,33 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 601b92b..b440f83 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -36,27 +36,10 @@ if(OPENSSL_FOUND) + MESSAGE(STATUS "Using OpenSSL ${OPENSSL_VERSION}") + ENDIF() + +-# Sets a variable that the user can set with +-# cmake -DIRSSI_INCLUDE_DIR:PATH=/path/to/irssi/includes . +-SET(IRSSI_INCLUDE_DIR "" CACHE PATH "Path to irssi include files") +- +-# Tries to find the irssi include files in the most common places, +-# and in the user defined directory +-FIND_PATH(IRSSI_INCLUDE_PATH +- NAMES irssi-config.h src/common.h +- PATHS /usr/include/irssi /usr/local/include/irssi ${IRSSI_INCLUDE_DIR} +-) +- +-# Bail out if the required irssi files werent found +-IF(NOT IRSSI_INCLUDE_PATH) +- MESSAGE(SEND_ERROR "Could not detect the irssi include files. Please run:\n# cmake -DIRSSI_INCLUDE_DIR:PATH=/path/to/irssi/includes .") +- RETURN() +-ENDIF() +- + MESSAGE(STATUS "irssi includes were found on ${IRSSI_INCLUDE_PATH}") + + # Add the weirdo irssi includes directories +-INCLUDE_DIRECTORIES(${IRSSI_INCLUDE_PATH} ${IRSSI_INCLUDE_PATH}/src ${IRSSI_INCLUDE_PATH}/src/fe-common/core ${IRSSI_INCLUDE_PATH}/src/core) ++INCLUDE_DIRECTORIES(${IRSSI_INCLUDE_PATH} ${IRSSI_INCLUDE_PATH}/irssi ${IRSSI_INCLUDE_PATH}/irssi/src ${IRSSI_INCLUDE_PATH}/irssi/src/fe-common/core ${IRSSI_INCLUDE_PATH}/irssi/src/core) + + MESSAGE(STATUS "The module will be installed by default to ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/irssi/modules") + MESSAGE(STATUS "You can change it with 'cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr .'") diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix index d12ee05d4e..a76a27607b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/senpai/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "senpai"; - version = "unstable-2022-05-10"; + version = "unstable-2022-07-25"; src = fetchFromSourcehut { owner = "~taiite"; repo = "senpai"; - rev = "7a9fe74fdfb3f334b97434df0aa74b2b32e3582e"; - sha256 = "sha256-uagdJG+YVryzsaZfkg5W2F8mQSc1bpflL77tqMHp1Ck="; + rev = "f13aa044de9d7b8922a12e895f3ff3f86b60e939"; + sha256 = "sha256-siQoRgbJIVtBXqrxJzdVABnDgdHqW5FLSJpBrL0iVuU="; }; vendorSha256 = "sha256-hgojB1D0/SZWLEzJ48EBoT/InYYmqD/1qoTknfk/aTo="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/srain/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/srain/default.nix index 302fe96f1e..1d30656854 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/srain/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/srain/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "srain"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "SrainApp"; repo = "srain"; rev = version; - sha256 = "sha256-oeC0zyDyh0lW1IMIJ9bjqryqz3Km4JJzRUxkO6LadoQ="; + sha256 = "sha256-zkSePzmbi/QnUYJO/henkxfhuN+BXTXtKGPW7M2QyBY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 1835e59e86..4631cef04f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -85,7 +85,7 @@ let on https://nixos.org/nixpkgs/manual/#sec-weechat . ''; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ lovek323 lheckemann ]; + maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix index a3cf55d6a0..f84e2307ac 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -11,6 +11,8 @@ url_hint = callPackage ./url_hint { }; + weechat-grep = callPackage ./weechat-grep { }; + weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { inherit (luaPackages) cjson luaffi; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix index 49e74e0203..c20d8f0a80 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "weechat-autosort"; - version = "3.8"; + version = "3.9"; src = fetchFromGitHub { owner = "de-vri-es"; repo = pname; - rev = version; - sha256 = "0a2gc8nhklvlivradhqy2pkymsqyy01pvzrmwg60cln8snmcqpd5"; + rev = "d62fa8633015ebc2676060fcdae88c402977be46"; + sha256 = "sha256-doYDRIWiuHam2i3r3J3BZuWEhopoN4jms/xPXGyypok="; }; passthru.scripts = [ "autosort.py" ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Autosort is a weechat script to automatically or manually keep your buffers sorted"; homepage = "https://github.com/de-vri-es/weechat-autosort"; - license = licenses.gpl3; - maintainers = with maintainers; [ emily ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ emily flokli ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-grep/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-grep/default.nix new file mode 100644 index 0000000000..efc575bd3e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-grep/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "weechat-grep"; + version = "0.8.5"; + + src = fetchurl { + url = "https://github.com/weechat/scripts/raw/5ee93d56f371c829d2798a5446a14292c180f70b/python/grep.py"; + sha256 = "sha256-EVcoxjTTjXOYD8DppD+IULxpKerEdolmlgphrulFGC0="; + }; + + dontUnpack = true; + + installPhase = '' + mkdir -p $out/share + cp $src $out/share/grep.py + ''; + + passthru = { + scripts = [ "grep.py" ]; + }; + + meta = with lib; { + description = "Search in Weechat buffers and logs (for Weechat 0.3.*)"; + homepage = "https://github.com/weechat/scripts/blob/master/python/grep.py"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix index 9b87073f3f..059a4585c7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/maestral-qt/default.nix @@ -5,21 +5,41 @@ , nixosTests }: -python3.pkgs.buildPythonApplication rec { +let + inherit (pypkgs) makePythonPath; + + pypkgs = (python3.override { + packageOverrides = self: super: { + # Use last available version of maestral that still supports PyQt5 + # Remove this override when PyQt6 is available + maestral = super.maestral.overridePythonAttrs (old: rec { + version = "1.5.3"; + src = fetchFromGitHub { + owner = "SamSchott"; + repo = "maestral"; + rev = "refs/tags/v${version}"; + hash = "sha256-Uo3vcYez2qSq162SSKjoCkwygwR5awzDceIq8/h3dao="; + }; + }); + }; + }).pkgs; + +in +pypkgs.buildPythonApplication rec { pname = "maestral-qt"; version = "1.5.3"; - disabled = python3.pkgs.pythonOlder "3.6"; + disabled = pypkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "sha256-zaG9Zwz9S/SVb7xDa7eXkjLNt1BhA1cQ3I18rVt+8uQ="; }; format = "pyproject"; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with pypkgs; [ click markdown2 maestral @@ -36,8 +56,8 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" # Add the installed directories to the python path so the daemon can find them - "--prefix" "PYTHONPATH" ":" "${lib.concatStringsSep ":" (map (p: p + "/lib/${python3.libPrefix}/site-packages") (python3.pkgs.requiredPythonModules python3.pkgs.maestral.propagatedBuildInputs))}" - "--prefix" "PYTHONPATH" ":" "${python3.pkgs.maestral}/lib/${python3.libPrefix}/site-packages" + "--prefix PYTHONPATH : ${makePythonPath (pypkgs.requiredPythonModules pypkgs.maestral.propagatedBuildInputs)}" + "--prefix PYTHONPATH : ${makePythonPath [ pypkgs.maestral ]}" ]; # no tests @@ -50,7 +70,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "GUI front-end for maestral (an open-source Dropbox client) for Linux"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg sfrijters ]; platforms = platforms.linux; homepage = "https://maestral.app"; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix index 47e295de29..739f45fd4e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 @@ -20,6 +20,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-6xQniOLNUk8tDkooDN3Tp6sb43GqoynO6+fN9yhNqZ4="; }; + patches = [ + (fetchpatch { + name = "symbolic-icons.patch"; + url = + "https://github.com/astroidmail/astroid/commit/7c2022f06a4146ad62e858bcaacdb4ee817851b9.patch"; + hash = "sha256-hZHOg1wUR8Kpd6017fWzhMmG+/WQxSOCnsiyIvUcpbU="; + }) + ]; + nativeBuildInputs = [ cmake ronn pkg-config wrapGAppsHook gobject-introspection python3 python3.pkgs.wrapPython diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/electron-mail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/electron-mail/default.nix index 43f4f5e2f2..f454a8b43d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/electron-mail/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/electron-mail/default.nix @@ -2,12 +2,12 @@ let pname = "electron-mail"; - version = "4.14.0"; + version = "5.0.1"; name = "ElectronMail-${version}"; src = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-sahMEj9m10gsceTBnYk8wkWcQoM5s6s1ek1U6u3PTgw="; + sha256 = "sha256-w6ZZPIJnAlA8WhNHtM9gsjr7U6wMYT21fGFmkDDAVJU="; }; appimageContents = appimageTools.extract { inherit name src; }; @@ -30,7 +30,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "ElectronMail is an Electron-based unofficial desktop client for ProtonMail"; homepage = "https://github.com/vladimiry/ElectronMail"; - license = licenses.mit; + license = licenses.gpl3; maintainers = [ maintainers.princemachiavelli ]; platforms = [ "x86_64-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix index bed71202c4..870477545b 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imapfilter"; - version = "2.7.5"; + version = "2.7.6"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "nbVwbPkNbJz4GHhvOp+QVgiBqKA/HR34p4x3NXJB7ig="; + sha256 = "sha256-7B3ebY2QAk+64NycptoMmAo7GxUFOo3a7CH7txV/KTY="; }; makeFlags = [ "SSLCAFILE=/etc/ssl/certs/ca-bundle.crt" diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix index 539e69069f..a5a9b3ac89 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "mailspring"; - version = "1.10.3"; + version = "1.10.5"; src = fetchurl { url = "https://github.com/Foundry376/Mailspring/releases/download/${version}/mailspring-${version}-amd64.deb"; - sha256 = "sha256-+H2KeaRBApveUG6Vz+Z8LWpmNpZ4lwyeX1LK0AKx/bw="; + sha256 = "sha256-eVwb7E04DzGdqfH4T+gkvmBtvN7ja4o8u7LvHk/581I="; }; nativeBuildInputs = [ @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ''; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; - maintainers = with maintainers; [ toschmidt doronbehar ]; + maintainers = with maintainers; [ toschmidt ]; homepage = "https://getmailspring.com"; downloadPage = "https://github.com/Foundry376/Mailspring"; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index d60f472a5c..c0bc4f5dbb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.0.2"; + version = "102.0.3"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/af/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/af/thunderbird-102.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "bf31f2fd59685a3cdefabc8512fe57603392183ec653f369adf750d37332da0d"; + sha256 = "acbb0b0467c0f83179c301e6435d6fb09d784d793bf56eb9d10a2240f40972cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ar/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ar/thunderbird-102.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f1b456ee95540ab8965647d9bd795a1411701a95f3a5d09fb8694eb27b66b58e"; + sha256 = "c15a7753c36d20da261a4819a49429196d839a7288b756478330bcf69cd93611"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ast/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ast/thunderbird-102.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "79ad9345d0a2d0545a1ba18f0c0d97372065a53da58c258c8cb58a5881308349"; + sha256 = "2e0747bfa96640d8c4998d08b3e1096797d870773bc805a2d9726da110799e35"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/be/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/be/thunderbird-102.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "77e43b688c0888959f07f57e9bf46d74b84387483aef3d0b6153249850b33a6f"; + sha256 = "1316efa7b999c1ecd6470520ae90beec9575e549bd1735ea523bb61b1edc3230"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/bg/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/bg/thunderbird-102.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e02fe0e198cc340b9dd63af7a064fc3f6ff0301eac8b11546f30e44abe482959"; + sha256 = "502f8aef0eab71e3b07404e888962930d3fd751d4402c178ed4ab2b38b1f9fb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/br/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/br/thunderbird-102.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "f4fb54301e34c77be5503808a183303ec702dcc004a9e2781acc786ba53a6f46"; + sha256 = "1d3ec6f206083eca2b72f65bf50134163f58e800607e768892765f040feea94b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ca/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ca/thunderbird-102.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "e0da55902658afa56cd28ba704a0d266f65fc92fc4c8029d52f43b5414b1a2e9"; + sha256 = "aaae5de848334d5ebc3f761ec6780aa9826e43424308c256d40469c63699b6cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/cak/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/cak/thunderbird-102.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f82182d598a8de79a634713bf4390a6134f225ed693f3edf88a69caa939e2f8b"; + sha256 = "f391f7d47c1fd9cb5ad7f5e1d79e20400521449404842cedaa7e5ac613e71e10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/cs/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/cs/thunderbird-102.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "262c93857029d9a8376fb2846e0d93ff9b42de13d18a15d6c2cd3a07cecea6af"; + sha256 = "9ba13380b2ac7c54f15e294fdd1534eb6687056865dad5f72aa4c7120fb2740b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/cy/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/cy/thunderbird-102.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "084ac1957a02e8a91773fa327861ca23191429fbdb237f9ee727e518edacea48"; + sha256 = "3f93b8fbe6cb9928a546768fbf0976b69361fd1ca34acc207b74a267cab32b7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/da/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/da/thunderbird-102.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "d9e8f431470511c45932d0d498a26492b1829a4f8004f573dc0b7b8397adfa24"; + sha256 = "45a5500cad37d4a50ae16801362a1b32f4233f9febd2400deb239e082fd59421"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/de/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/de/thunderbird-102.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "2cc8cb967f90284fd2c1fc7bed97eda6aa045316732582ab9c8a1ec9839e212d"; + sha256 = "4b36a09e6945c0a4674982e726ceaccf7b7724d9f394640f190ab0b2597cff4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/dsb/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/dsb/thunderbird-102.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "734fbccd006fa3158bb982897fd99b57143ed3b3fa55786b71b6e8a53e56ee3f"; + sha256 = "3ab10a155916f89c803738fcac21a66b670321795b2aed813d3007e34f00b996"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/el/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/el/thunderbird-102.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "62e36b4f5152691489d8992b7a51773e90b73da553dbb125adb65f271f5f6d0f"; + sha256 = "2bcdedd483a0724714e20416fe4ff57d5f8d7e07da32e54430ab1af20a6f6089"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/en-CA/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/en-CA/thunderbird-102.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "523a1f718c29ab241d94e3f780ca3c5825d9db5c9a8d5a7e4920f004566cf4d9"; + sha256 = "0b5bc27fd53c7b19a81d0dd502866237e0861770cc8e7caba5b5771b5321cdf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/en-GB/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/en-GB/thunderbird-102.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "8503130f0f43250cc365e99a672ce02e15b78c40aa20d4585d0b048bc43695ae"; + sha256 = "4bd0315b1b1f8d9d83e91b845df10807274c3ee921551fdece8a25cf51db08f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/en-US/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/en-US/thunderbird-102.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "a98f9cb5d33e3225e9e152b3f47c7046c8a16e43aa43a7e2534ecef12e8f902d"; + sha256 = "16c2db5a24db5f9a7b449a73ebe0b881fd6965c4060f9b005df2ec819dded4e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/es-AR/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/es-AR/thunderbird-102.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "9ea04912f380917a8f721f29a2a3a8ecc4eca436f838bc70f8fd138189450a1c"; + sha256 = "a9cb0bbc9ea7cfe759cf19e9e27cf23ca88967d26e7a951a5b58908fdd535cdc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/es-ES/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/es-ES/thunderbird-102.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "bf902ecef24010f1ac7c88a5906ec78ef1b7697e06ad08c327bd17a08e6fa7e4"; + sha256 = "462ebc50ec7fb4a4f6fe81fcec48d2e50ae6ae0c90768499104692fdd5e78396"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/es-MX/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/es-MX/thunderbird-102.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b25bcc0f5a030e3f1a0f999b9d7680cff0ca2ff250eb4e193415d732b6ea548b"; + sha256 = "bb025a6d3bda7916ecba63b400386fa046d0a075ad1f82213d7b6577d6605edc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/et/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/et/thunderbird-102.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "602f002ffe740b2ba7b7e2474628cbaaa053fa3305a20ea5469d126fa81156a0"; + sha256 = "7914cf39516159f769f29ca73985ae45d587c8db953fea10aa9814d65bbc341d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/eu/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/eu/thunderbird-102.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "ecb63e896bc9c07b3f0367fda6045ace405616221fc6072261a981fb65276194"; + sha256 = "b34813f880a4a48152695a65d5ff24e206e34bdbdaeb8edef59c0075d3b130de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/fi/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/fi/thunderbird-102.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "753752f6da47d9f486cb61a60a8eeb8bbd8ecf18d7bc37035dab4869e3d5255a"; + sha256 = "33aff0a00102765d0e102eea520f615a3d4d0f1d93a00e8768e6fc93492fd16e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/fr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/fr/thunderbird-102.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "982175567ff4dfb950e198d810b1bdf2d557b053c0cf2a0ac7637bc932e34c39"; + sha256 = "0cce5a940d8c3a2b9d15d3102108d21c3165d69c30a62618da0a93b95a52cf99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/fy-NL/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/fy-NL/thunderbird-102.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "fc37a298eac00ee1b137520b130397688af0870f390fd373e2cb2afc24626b22"; + sha256 = "bba6ccedface111987459a370352972853fd0af65a61a1a0032faf24113730df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ga-IE/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ga-IE/thunderbird-102.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "7c86dd97d76481025ae72333c50b89cf3abeec18bfcadc916d33498e28bbdf48"; + sha256 = "18960a121ffc43f27e9fa733ec2a80881f4ca9316bf6114ccc693de772416c89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/gd/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/gd/thunderbird-102.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0bff5a9c420df5fe9d14b74d3013ab53b18d61cb7de4d8f054d8bb05d8e1110f"; + sha256 = "6e4430667839fbab52acc968036d9a08d99eec0eed5ceb5284ac747c4026c5ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/gl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/gl/thunderbird-102.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "4749c8f5eeed740fe2c01afedb2e528ecfb9820c8856cae652803555a30845c9"; + sha256 = "0c871f1f195fc35b78c9f6b1f93220635231f117da3c5b470b852724408390e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/he/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/he/thunderbird-102.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "52fab3f4ee2f74be4792bd233020ad514ecda12286bed194eb985a3ce479621e"; + sha256 = "e0f6dc98cebe0a00361b05292547d338d767837b5a29740786049f0af9bdbf38"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/hr/thunderbird-102.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "7b1881e7ed5e6f55fc744589a766480908f867c5fcef3c2aa2e723c5c3b2ab44"; + sha256 = "af6a7cd558d9ce3f30c98fc1f6d4d5ffab8342dbab27b381943f8d21aab05f37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hsb/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/hsb/thunderbird-102.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "3e76a53cdf1854e08115c7bbf488f94a14f5965088a73df6b1d4aff6423aecd4"; + sha256 = "fc121b9b7ff2a74562dd239345d8754b3f21d5ea99eea47eee2436c71aad39fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hu/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/hu/thunderbird-102.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "8935b6a67f6f1d849eb007c6145909db1d6f5c1ec44ccf0e03c943ea5fff8d23"; + sha256 = "e8df28798a07a4a43265f5a8c29ae0844f083f51bffe54afc9b173881407021b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hy-AM/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/hy-AM/thunderbird-102.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "8142f0068ec9636a2269df7f732e99e080d42b9e65922968fe4e631f0eae3062"; + sha256 = "8a7c705633a98937550b8c22199dfba8f9908fd6ea2c41cccf504bcb8c1b0c05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/id/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/id/thunderbird-102.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c798aaf2548942168671fcb64487fce251d1daf54b7fe4ebd1a868028acb9018"; + sha256 = "ed2d44255fc8d227a602743619b6bab606bbc17de96f90503c644347fa99cc58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/is/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/is/thunderbird-102.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9740e7ea80d038821a00da541813e8fef924a40c7a90e2cdedf42ca075b953ff"; + sha256 = "309d47fece404ef7717d95cf0b4920be48ecee0b69c73a1431e7044fab5c46d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/it/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/it/thunderbird-102.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3d5e4c0bd729894db0e3b8ce0eb01c07b68cd1e3480c8b906345ca8a28a24fd7"; + sha256 = "e92bd95955e9e6964394d95dd6564956e14c618e73f9853a72473cc89f6e68b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ja/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ja/thunderbird-102.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "fde66a7b89e8581545fb80f549c262c3248562e29bd9a639344469ecca8a0720"; + sha256 = "81299c0ccaf3dd52d92a081a828d01573bcfe7f821c7cb6d0697acb505591189"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ka/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ka/thunderbird-102.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "2ebc499ba3084fb9d544fed31037a9d0e92587e40680855fd6051842c2968e6d"; + sha256 = "8445a72ae12af5c11d56e0dc1d8bc3beb5c368386950b3815bc63c6b3ff48837"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/kab/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/kab/thunderbird-102.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "101a29d4a11e06eb07c2e9e2912eb92940787692714d52512438488fd47b33d3"; + sha256 = "c403ad18c89ba13550484a4cf83afd0e28c6a11dead70f4a40ad81e136b5c4a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/kk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/kk/thunderbird-102.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9988f45d389abbd5f5d60fadb4aa629a761d87177688a2012ac530150f830c7d"; + sha256 = "924ddb7c862291732f58dd3e57b9a3b30e39eea24efc1a02a6226f580c6878ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ko/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ko/thunderbird-102.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "f2af42b4ca5a75dd96bcaad3365ace3888d58b0051a1e6f7fe5d028ad9906635"; + sha256 = "7663f31cc759cf0115a75bba540f57f6c64905c63d204825a5fc63ad6e274edd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/lt/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/lt/thunderbird-102.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "978f9f7890d4dc8551589fab115107e2f33d8ec7825806a986436cfbfc75da6e"; + sha256 = "039d08152f607f6a8190cdb306e37ec2434447c655e9a86a5703170a36116a4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/lv/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/lv/thunderbird-102.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "81b1ba931b5ab3973779a157d3ed7cbe647e4a2d1c1e3a68a11594e7b4d3b4da"; + sha256 = "0f40dbd570823d52abf7739024f1dda2a52303b02edf63939b6a544f15231252"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ms/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ms/thunderbird-102.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f0e5dc7e5427674b471df56619380efe6ea72fb50f826d0baff04a66f64f44ab"; + sha256 = "6f8abab920d8755f94bbbaa151fa6400be664b7e6dedc57e7c94c0bb2dfc4752"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/nb-NO/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/nb-NO/thunderbird-102.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "449f60fc5c127413acd74a4d2575763745440b973249e5ae624379d259e41baf"; + sha256 = "4938fe75b54544ff7888c6db0a52b94ab4d71af15cfe429d6420ace100f47f0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/nl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/nl/thunderbird-102.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "fafe5a13869c3076be69c8d0fb94d3044c4774663e12fb75bab2f68f63c47455"; + sha256 = "769484d34082d656720e92f737bc7b80c39685e74aefa3148e8988d54c3fb96e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/nn-NO/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/nn-NO/thunderbird-102.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "275b2e1bee94a1ef3adb97b4d1ca520c4f27696cb71b81bc80d9be354293bcad"; + sha256 = "2f6628897a9dda07bbf8f0d5df020b073b081ebb5d77942f23a38900b56f0cc5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pa-IN/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/pa-IN/thunderbird-102.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "37a7d35f52c1b805334a1320cfaa04182b6c1428f77e8722478aba4d5303d4ce"; + sha256 = "d5381e984b7f180c743f1572ee156c9b23350eacf3cea6b005aa159022bcb5c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/pl/thunderbird-102.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b0331dab8d0d2a09d95d5e87c948b10a47af47f47fb59dd11356693b85e3b2fd"; + sha256 = "2322ce9c3979e01d3bad6af964b1917293a654fa24e1ae70413194e93ebc4016"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pt-BR/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/pt-BR/thunderbird-102.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "8309588bba6f3858987e5c0d6ec083f3cd5195d49d5f9cc216b61ab972abc652"; + sha256 = "c427e30ce35ae73c9f214aaccbd61880dc896f18619d85e81f166d068d01a107"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pt-PT/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/pt-PT/thunderbird-102.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "ebbc0276bf25a2ce9561ad9e40d286448ba57cb9441bd57cd1114cd1226075e7"; + sha256 = "8593bd34d6c87882d38cb521bd7e64e698565376bc50198a840f48516d2d1473"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/rm/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/rm/thunderbird-102.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a97e6c804bef1a28e80920d528865dc41851d75cb4415fde9a4610d6fcacdfaa"; + sha256 = "8afd7611f7a3604fd1b720ca4fd8f91b46e43a905874d87ef1befaefcfb73c16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ro/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ro/thunderbird-102.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "9dee91ec00405b58f730b7a9a23a59f1dc0e4506cfbaf4135134f13b5029ff29"; + sha256 = "322faa61dc5524d84fadbd57df1cf6a12631c12b02af79807f6c0042c2d7906a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ru/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/ru/thunderbird-102.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "4558b9eef1db93aa4e8602530809be81bc62317872b344bc6679c7da5ec0def3"; + sha256 = "696b98e0a1309bb66355051a0dd507a323e16fd98425fe8fff9688625edd6669"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/sk/thunderbird-102.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "e2ef80bb2c1b98b78380c7ade61f1272dde33b9b57a155841a37fc5cd360a9a4"; + sha256 = "4370208682ced071070f798a5f3f024a6a154e12150435550ddb96334dd773de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/sl/thunderbird-102.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "20cfe9c9999eefcb77b20c5227ab9001e3682770bef73ba8f994b714d99b83e8"; + sha256 = "c7b15cbd62fcc90503f16ca6cfccded4205cd2af058886f23435317b0f085425"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sq/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/sq/thunderbird-102.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "17d92fc90a0832711b7d39e2ae959cf0ed6b4dcb53998ce1de529d6088711963"; + sha256 = "e5827847a7d987fdc0484bdc70110213b1d3a1ee4ba8e0b10bcebfc39c9f3e5a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/sr/thunderbird-102.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "0a9613c7265cebc62198dbb369b790748c5b8c47c0d0112ac03abc4e599ee2f5"; + sha256 = "a17962cbf4cc6b302a7b06432fa9a5ba11e33505089619bb677293d6f3529832"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sv-SE/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/sv-SE/thunderbird-102.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "64347005f48bf84851a7834175f82071a98a3a850ed832f3d42c298a7ca1a366"; + sha256 = "bb11f3928321898f0c746dc988995bf853e102f753b91c602073c8357cfb1d00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/th/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/th/thunderbird-102.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "5ae8c2c1c6a82110b60402d3868e74a8606ea44acf3d1fc370673bb0e280da04"; + sha256 = "38696729272f4ca48d918767135e03a24226f86529d243482c729196d645f94b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/tr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/tr/thunderbird-102.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "05023d2d511261c0237f65ab1e28981d5ae8c4e493a225f74c121186d3b43848"; + sha256 = "3857970887245300da2d764a2da99a64fcdd725ae9456dbe423a79483666cd93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/uk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/uk/thunderbird-102.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "f5a6805d7a2f2b33e6c9357598a55032e288c70c838bfb7b3cd66020475bdbfb"; + sha256 = "743b5f2b7e04af087acbf75ca47ea5ec9588530908a33c8e2025d1ee6d91b70e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/uz/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/uz/thunderbird-102.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e5f656f5a367879bb699f2676ba51b3e8bed10d3ec756ab95c2406b745490fa8"; + sha256 = "ab498aa09a784ca8f42ecae1cfb7ed6b54afbf7381fc3f32391cf160983fdbc6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/vi/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/vi/thunderbird-102.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "e7aff2fc6dc436f99f32a5762562ac66961ea51f4e7d012f44ffa8cb8e820c8b"; + sha256 = "57d18f28b4ebe93093657aab133c58da1859ad8261fe5eb14f156a813c9feb53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/zh-CN/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/zh-CN/thunderbird-102.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "658a6ce621e30cfe63071320c3eb376731a58a138a4372bf0908f83457511752"; + sha256 = "7922f00281084e18f3a27f661c14730de81b7df0ed3052374ad6ee1f93d15ed3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/zh-TW/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-x86_64/zh-TW/thunderbird-102.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "4e3989b239a7f574e73f407282d1b62d6d3fa828c489dc454d80db1a58dc4575"; + sha256 = "c8119e17541bd649728d3fa4f725231ded11f37809048c5b20e8847b8c222ec5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/af/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/af/thunderbird-102.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "5252c4a31ca1676208a4ee0b8172945a2a55285da5d397168e39afd8b744cfd3"; + sha256 = "dd728dbb96d781c4ad0b2a01d67807d2b8235c7b77f652b4d226248f84f2bb92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ar/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ar/thunderbird-102.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "4b1dff9eaf981a6a52c9dbb7c6eff636b2a675e937e04564edbfea99fab4b636"; + sha256 = "68314d9ce2afc0a91578b7761df736b16d3016629ac191474a014e662bf4e419"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ast/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ast/thunderbird-102.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "722f72b3f018d60161f82b6709bcb866c483b5c77501ae20ff617ed088c957c8"; + sha256 = "e9e82165023f075e6380794487474856ef0420530f94f8c1c233d3112fcc2ca5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/be/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/be/thunderbird-102.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "dd85fdcdc39c68e01f2daf08db11f309e139f3c0298ce1956a0ee70e9a205ffa"; + sha256 = "3722fc4b2a9f42104f4bb2267923320c392f817486c1dcfbe4a92c01764a900c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/bg/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/bg/thunderbird-102.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "bf937297e3144adfd5a6b995965057be524eb85363a0402972139845ecf82f44"; + sha256 = "719f8571d79cdef43abba3bd2e453d875652b9bde7b24ed987cbb83b313e8cf0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/br/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/br/thunderbird-102.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "206b8c6a0aa5f1f3ccefc5bc7de65fd7ef457d5e9093f1613e7d1021a5845e05"; + sha256 = "8195d158a2770707073ae0ed18bcf578ff061c052d593b4feb02e9f10facb6be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ca/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ca/thunderbird-102.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "72247980162026fc55057ad1e235dcfcea859386ce04cbc7afd0f2e7276fa533"; + sha256 = "f97b5247b38c00f2e6db3a2edd878de0059dec8a59b92663ea2d9f7175a4eb7e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/cak/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/cak/thunderbird-102.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f19bd02105be26da636c7e2518f39b2c566594ea07dcc6c742e10ede9834e82f"; + sha256 = "247f1be0ebac1033b519dadefb35c645c02c6352658a24e9b2864d449bc91ab3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/cs/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/cs/thunderbird-102.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "8edc31d5b132274a12077939cc45dc805498b3a3ef798bb8038ab3921597adda"; + sha256 = "39bec8757b777aeadf5e3803a1b8ca52bf8c62f906d792b1d47a68b67593162f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/cy/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/cy/thunderbird-102.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "6497e711b5e4a9cf97307bdccd462f778527a45f1d1ced675f2452d549da0b7c"; + sha256 = "d9899c8f3b6c538828b559af3990d44bb93fa085539815f4c800bcd3f7f2029c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/da/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/da/thunderbird-102.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "8795c5eebfd9fbe26b46556cbe7f606b2a73dc1071f4987b71ceb97e6c30fe9d"; + sha256 = "359ffd538a7f5f2870d8bd379f1538800defe296766a0cae57432e545f0ee49e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/de/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/de/thunderbird-102.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "b805d8339a9e8082c6497adf2afc2a649bb036562f732e8e15f472ff7f84d6a5"; + sha256 = "1f372cd57db1e564d960c12dd34317747017d4255e2c5dc8f960d5075bf2a835"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/dsb/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/dsb/thunderbird-102.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c1d7038e6b6dd30fcb71d5bbcc46332915e959c79e3772f66b920747f903c497"; + sha256 = "fca6872c8bc3fd832ceb96b4cabe189fb4b679592fbf4fd4e27df514da917d4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/el/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/el/thunderbird-102.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "e22bfbc3624474bc187551d16f390186b131c7552ff492a39c044ec4aa1d3ff8"; + sha256 = "81ba36edd7ce98f44a86511fc7b03e030e2fc2ec1821640114a6546babc1b042"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/en-CA/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/en-CA/thunderbird-102.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "955d58c13452c7937d40f643c4ae27595e32fdde947e326036519695bf529e19"; + sha256 = "bf3ec87dd0842e92d0a759e8bad1eb5fbce8917277fabfd70b8366bfab9f011f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/en-GB/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/en-GB/thunderbird-102.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "1667598685761e043dfe6966b7e26e76a0de391e64c807610898f5d12c3426e9"; + sha256 = "9b1ac42adceab6ddc19bc432ae4568fe4008f0063c59b86871041a299890d9fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/en-US/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/en-US/thunderbird-102.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "156f92a9e0e45fa42f2c3b938d921c66b25ccb123505e2ca469d1107138a1c99"; + sha256 = "acd7b35b5d7d2e863a0a37a850b60d6ce91d156476ce1c7974256339000d86bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/es-AR/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/es-AR/thunderbird-102.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "b5ba861b6e6aea74b9fffdcfef921f4c66e0680a57e1c13a2fd2d4cb068c62c7"; + sha256 = "4b2715d15add631a1158e843108cbcc0eefce833ec42d7d35b4d856b473cb48f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/es-ES/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/es-ES/thunderbird-102.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "614a0738702412054c9c42e0b78796230030558b9819f164e80cb66a210f41d6"; + sha256 = "6b3dcd54b1e948ee36a3e674c22e56356b66503bd40e149b9a24ea3116cf98e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/es-MX/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/es-MX/thunderbird-102.0.3.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "239387c3450a99bda49eb044d15e2adbb2765794ae5219d4318d88afaef66410"; + sha256 = "49fedc894cd933770536eea6359c31a01e47ad9e797274284bfaf3ea8de8ff15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/et/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/et/thunderbird-102.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "fdc1f424c43c9f7efc9e760d7f2dfdb7a5ead58bf26a0d5669b539ba04e6db0c"; + sha256 = "78d961730172ae310bc08139d0eff9471745900d85fd8a568c97d649bca1b354"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/eu/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/eu/thunderbird-102.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "e229f46845b2f192623b88a8103d704d3fe271070e187c5796b0cf309afcea04"; + sha256 = "d8dbc084f38f86598cb1efe16a6c48634c57830318d9a9d1f5ac9ef7c63ef7ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/fi/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/fi/thunderbird-102.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "cc31a8a0235674ab72c00de931659167805741e71f1d2e3553bd30de457c8d33"; + sha256 = "71d303185d5ec95d607507bb9836a01940908e27c15117575280b13dcb5788c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/fr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/fr/thunderbird-102.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "0bade93a0a2b8bbd342baaddbda0ed9418a0ec9ff3dd5db54f688279d0a778b9"; + sha256 = "55e158f1204517652d03e2b7d1600cee41f8c024db794f4676826f960440a6a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/fy-NL/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/fy-NL/thunderbird-102.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "476a21ca877b15a6bc619686ca3884f02017b295e25675f09a0cfc2f0ad21900"; + sha256 = "329d42fef604eba4f3b5d036ba5b9acf055673205dd30f8651c94f5c7684bbf6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ga-IE/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ga-IE/thunderbird-102.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "da21aaf27c50ccc17558006e5e955578e5d9319ad2aef6eb70dc64fff63594db"; + sha256 = "4c4d3de0d9db04caf2b46238c47c6b897f2d7fe52fe21cfa14d71568671dbf02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/gd/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/gd/thunderbird-102.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6ad7f63a5d0f9509caa82249c310fe1d4e178460ecc1fba1c465626a1711ea4f"; + sha256 = "f14761057f6d1d6934e5e1cc55335a46f26a2382dc4708632665265331b4f08b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/gl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/gl/thunderbird-102.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "516d2579a2801d20e956b2c80d576ebeae9251896256875e52a722d42014c55d"; + sha256 = "2078e7499593799d76b2242f44c0097d5a1ec357da62802d5d1cce47732a75a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/he/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/he/thunderbird-102.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "f30ca9bffe64f7f72980031a424e33db5ab0b7665e53e2db96862316b5d04f15"; + sha256 = "2fa1c357cfb849d61562bca9146939eda36f0af909022dbd21029b3c47f683ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/hr/thunderbird-102.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "62bf938f8f185de8d5d485c229142c71a1fd533ebcb4fc1cbf49d541ab70f7c7"; + sha256 = "c1b8fd464affaa87903856b9c959a09b120814d6887ce946db14e1f429a85304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hsb/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/hsb/thunderbird-102.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "07bb48f656bfb77142c3a509b4470d4c022dff3f6378ef6c01f858c8aa9c0d0b"; + sha256 = "db8ac9b2463293d8360cb04df2a5a7c92f4b8eee7f1e705ca3b2f19031ff2d4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hu/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/hu/thunderbird-102.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8ab53272bb1f9992ffc5dddf67099b0b966991549a07d8275e6f6999c1b881a3"; + sha256 = "3749911e71ef81a89a3009bf691c8a06abbc1ca537dedb68c785dca9f0257d4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hy-AM/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/hy-AM/thunderbird-102.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "53459949bda746c5a2e02a9919efa730c6dae96ed818f3cca2c4f4bfcbee4c09"; + sha256 = "07988301e82d78494e478fd5f99a0639642364bf53f8cd9711ff643112cf25c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/id/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/id/thunderbird-102.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "705d28efb1bd9ab1516d00d44c7e60f3c3345ba4249cca5913c647d87075385b"; + sha256 = "8af0ece3ba77f12ed9053ff9bcf311cebcf8159b34bded5df09748c2fbfb208a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/is/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/is/thunderbird-102.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "27d56900ab0eee73aafb9d4a2a5650e2535872d4d202bcad6ef7003b4ea6c7fb"; + sha256 = "663b1af1fb3977edcb5524769effd6a94da93860c9c7206c4b31aadb85e5c8bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/it/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/it/thunderbird-102.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "84649aaebabf5bf67121b1a36f9bc6fe3609ca4995e53512fb109848f8007721"; + sha256 = "83739d727628ef7b60c5732d41bb6c708d3adfa5fb2ccfbb0f1a62f4ac0317c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ja/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ja/thunderbird-102.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a8879ac875b3ce85962099245dbe8b73fa12b50b56132f5891b0be2abb61c06f"; + sha256 = "79d20840657d20afbe7d1dcf5e86d26ded6e72a52d41b4433dbd7c08e77a239b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ka/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ka/thunderbird-102.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9d9c229c15a370d2efb3819587424c89573a66fe2be49622791ccfab40ef3c6c"; + sha256 = "86b332459621f593e9f311b1b606e38923ad8862b4d0b6a35e113cda67ad4255"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/kab/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/kab/thunderbird-102.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "5c972699c55e5290784a902c58655edfed6e30d6423a7f52b1fcb0e26e416507"; + sha256 = "9e4def077f06509440bc78d7ac2b7573c0e2140944bb0761d55472cb1a5465c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/kk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/kk/thunderbird-102.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "be446aaebe589f3d5274635102f06b9dd2aaf4ff34b7dc0a332700b520b623c0"; + sha256 = "39bc019264f03f7f8a25bb42242629af3c7971965b7a448f02f862e76087b7c4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ko/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ko/thunderbird-102.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "452731102d29b927e442b2b0ec5c4a82a7a354933d255ef43619f11f9e03e334"; + sha256 = "183bb61c5e4ab7ee00b5da58bee26557e82c9a9ced39e276c8a5b3f5f7974c42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/lt/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/lt/thunderbird-102.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "eb12af786067c1a8bc43aee746a1d1b300fc0bab998af7352abae2d0bd4b61fc"; + sha256 = "da9177b28632516fecdfdb0561a9af8c502872f1f79ed552d3c7f948597ff55f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/lv/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/lv/thunderbird-102.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "7277d68a04e10ca043d8563d1949f26da622a2952004664562c85a7943f4fed6"; + sha256 = "5a808bff2a272396c43ecb2353dde36a1ef7f2b6c871f00e94f20f787e0ff84b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ms/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ms/thunderbird-102.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "d923e39e46b3678427554e265d62b085683d074960b5e25bea720cfa8e9bde95"; + sha256 = "e6b6ab180f723936c8a8a870359ffec20347d9fc58eb1b6406b76c7fa292ca1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/nb-NO/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/nb-NO/thunderbird-102.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "0ece7236c20992b5dc7f525fc6390f6fff38d2798255dd8aa692cef9a9bcb3ba"; + sha256 = "bf21182e27be5dd930b2cb2dcd31ed0c1c4c14b0c09a34e1be7f62b6aef85800"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/nl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/nl/thunderbird-102.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "48a7a11e49f22424e79f3eab5c6961f2f3ec81e2b5ecf4578740214306974841"; + sha256 = "431ac204db5cce7c76e5221df0754dbbca2c4eaaf131b7a144b2e325f2df8e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/nn-NO/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/nn-NO/thunderbird-102.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "099097ab9d94fc49a91a14f7f15a886770de282db4db4334f6c7b8931384e6ba"; + sha256 = "52b6f7f08ee856f631376e78ecb0ab52ac3b88faee03f4604459b5ac8a98e18b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pa-IN/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/pa-IN/thunderbird-102.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "83d409241a8dafa600759f0ef0f66bef38fcf4ef0ac0a7d7bdf9f0a85f5873c6"; + sha256 = "b1e5cbd3ac22af04a17920831d79c953311a9e1163cc4ca6e8aecaca89411152"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/pl/thunderbird-102.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "cbd7e676ad0848a69f387b496346b1c3664d62cec195dc897b5e5b7a940329e6"; + sha256 = "0a15a79b2be773aab7e9b719ce0212168479e78ceb4771096f3fbad13ee202af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pt-BR/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/pt-BR/thunderbird-102.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6ef30480b304a1b6f05fbdcabfedfe11e2e77519acc4aa3cfe7124c54df8ce95"; + sha256 = "ec994c42a39304861c0d5994826aa7baa2e5e07359fc192059a5f4a7e75232a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pt-PT/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/pt-PT/thunderbird-102.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f870cb3a29830cb9c83007e466307a2c7f1f3606caa16679fa7b71a71eaa815f"; + sha256 = "efc3b02b4f1ad379568aab7bcda964ace0ca6b041197522ab5beaed2f349f16d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/rm/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/rm/thunderbird-102.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "10b52b1e6fdc2dc6d905f04d396e99fbc02804a0b927aefc8332349b67340ebf"; + sha256 = "68e891c973d3f1c0d3e375bda27c4b3f1d778996dcad1377601cff5a93aef613"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ro/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ro/thunderbird-102.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "26a1ef950fec4b46f81f963faae8082a79c836b76105283561be81c59fe290a9"; + sha256 = "7d60e055c73d0b121e5e772447f6eb7ec7b2858ef99f2a60d5b30a6ee593d04c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ru/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/ru/thunderbird-102.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "e22db3e3aa6519dd990e16d6e10c8cf003999aa83b9f50f4ba80d3c86c73dba7"; + sha256 = "8df485fdf589942e5e0110401fde31dc33af56fb0b1e0f972990cd25460651dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/sk/thunderbird-102.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "d7d1fe7d44c07ef15ebf3504ee66f2f5c9f9a9710d4e1f4f9e42816b26b44a4e"; + sha256 = "b699730217177e392d0e51024dd86c93bd5655702e0e7ac628c1af729480fd8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sl/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/sl/thunderbird-102.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "b91300228f4449ac4cf9f8013ef0872946504e1ba8aae18053d371359f7e17da"; + sha256 = "5cd62795e8c2195bff851e077ddd4ba0b6b725a562d1e4f95100f1e7cfb00d49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sq/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/sq/thunderbird-102.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "6198d701388f2b3eea954bd5189c1d6b8d1633fa8f66e2dc3a123ec40bffc382"; + sha256 = "2cbe949408ec382b91fc056935014f800d13b7cc4fcd19e5d5699a6252698545"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/sr/thunderbird-102.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "07b0d41ee93edea4d3fca98b5d2f3c6a046b6516eeb32d4f75a16a159723077a"; + sha256 = "264ee1a41398ff754b6b3b349b2728812bb0bf651aa39e3d1661b15e7f15ed02"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sv-SE/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/sv-SE/thunderbird-102.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "0a7f891e29298536a8f221492955bc1c0ca1f617a16e073f862380d059c753aa"; + sha256 = "05393be6b938ecb9327078305910204554ef34c413f95bf8bfc0fa846fd5e8da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/th/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/th/thunderbird-102.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "f6faf753d9d46d3bf1c6ac2c63ed8ffa3ae82f32d5e7d38362eed05708630d5d"; + sha256 = "9282291d0668dd7ac340dec6ec15cc2f53a08fa280823072c5aa285cab741f2d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/tr/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/tr/thunderbird-102.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "9b7aef5d3d2c97a5aa96060c8cce9b80ef862f1fa6a948e8f079cf3401e38f14"; + sha256 = "415759235885f38a83269100df2492b48be42095e855841d31cd1b4b0875c280"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/uk/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/uk/thunderbird-102.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "490703856b02172c146c2703b630b9d06586a093f88ebeddfff9a666dd713335"; + sha256 = "480923d1f68028250ca5b7170c5391fe39152c4597ed307f1e232a2f6efaf1dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/uz/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/uz/thunderbird-102.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "f4629622b8e5d6aff9f1dac72eea73ccbac27491913e6f03464efe5c19187129"; + sha256 = "fdb1d65960820ebe14e6a8698abd11583652cd74f3f9412e2ff5c38df0a5b212"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/vi/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/vi/thunderbird-102.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "a6ebcf38e4f860376fbcc6811e7fe9d688960a98a581d7eba7097b6b54db1898"; + sha256 = "eb2bab16ff71881bbc6590ddd731ecbf9a1a19d5f499c9d023626da42e4ff3c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/zh-CN/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/zh-CN/thunderbird-102.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "75787fd56d89d2841f58381efc28435acc70399bdbc8589b7b0e50f8c63fa892"; + sha256 = "0047b3f174dcd19556bf1f6f1f4bfa5fc87a6cab53d7e4d111ad7f321ffec09c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/zh-TW/thunderbird-102.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.3/linux-i686/zh-TW/thunderbird-102.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "854c1e0c700a023e3361b48d34a3048ca783ba0b3c8b4fd9e3ec1d30bbaf4e30"; + sha256 = "cdee1981e868cb8df03681051c02ecf07936d1f5dcdee1c0f30d6c4742042b64"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index be24852735..de83279403 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -4,13 +4,13 @@ rec { thunderbird = thunderbird-102; thunderbird-91 = (buildMozillaMach rec { pname = "thunderbird"; - version = "91.11.0"; + version = "91.12.0"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "26b9242259b71eb14ddadffb34a59d07d515bbbc0cb806eed965a73b001ee81b3b1128d06cfdf3e50d5da4ef97be21d11193be34a582d3c9f27f27d2f97d90d2"; + sha512 = "1c0200a84ccc4124127d472713d72c4ff7ece8d61ad120d5c45c732a3ab4f86a2edfea23a8bf26e4739d24956654aec30e7bc59a28af17fbbf10f3d67466649a"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. @@ -39,13 +39,13 @@ rec { }; thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.0.2"; + version = "102.0.3"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "c757543aff8b0acc48f1e2d5fb94024fa894a34f27275eb9c9193d8d2c6aee7643d8b762e7b511c2217130a93ffb0d5e7a405b2bfb15ea129b2a6f9ae9c7e9f2"; + sha512 = "ac9f22935ef558890c95cf7fbbbe32a5bb1b7140acb10088ed0d037d1ca5c6e11695c131eb40844807003b77e83b1dd2d9008df420ec394fed5008d5c4c6c3cb"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix index 92a8563633..b4b46f36b3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/tutanota-desktop/default.nix @@ -3,12 +3,12 @@ electron, libsecret }: stdenv.mkDerivation rec { pname = "tutanota-desktop"; - version = "3.95.4"; + version = "3.98.17"; 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 = "0kkkp0nw4fby4663w7g0k2y1sg89pm336slzii1s3n70h8cak3dx"; + sha256 = "sha256-rVAiutjFI3/KJZeiTy6H2IdMh+SFz9+NvEoriPTnW2w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix index e2bf0b134d..21d9d19e03 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mpop/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.16"; + version = "1.4.17"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-hw61cerm0j+5KtDITXnenDjF9iTjYUk31XS/5Jumh/k="; + sha256 = "sha256-Qq5JS60pQdn2R8SMPtmMOLqapc8/5I+w/gblttrfi9U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix index 418a74a62a..47ba4b1e69 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/msmtp/default.nix @@ -1,54 +1,38 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkg-config, texinfo -, netcat-gnu, gnutls, gsasl, libidn2, Security -, withKeyring ? true, libsecret ? null -, systemd ? null }: +{ resholve +, stdenv +, symlinkJoin +, lib +, fetchFromGitHub +, autoreconfHook +, pkg-config +, bash +, coreutils +, gnugrep +, gnutls +, gsasl +, libidn2 +, netcat-gnu +, texinfo +, which +, Security +, withKeyring ? true +, libsecret ? null +, withSystemd ? stdenv.isLinux +, systemd ? null +}: let - tester = "n"; # {x| |p|P|n|s} - journal = if stdenv.isLinux then "y" else "n"; + inherit (lib) getBin getExe optionals; -in stdenv.mkDerivation rec { - pname = "msmtp"; version = "1.8.20"; - src = fetchurl { - url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-2TriqvwPSK99ydCzlN8buABYi4tOjQltizzyJTROsRE="; + src = fetchFromGitHub { + owner = "marlam"; + repo = "msmtp-mirror"; + rev = "msmtp-${version}"; + hash = "sha256-RcQZ7Vm8UjJJoogkmUmZ+/2fz7C4AcVYY/kTOlfz7+I="; }; - patches = [ - ./paths.patch - ]; - - buildInputs = [ gnutls gsasl libidn2 ] - ++ lib.optional stdenv.isDarwin Security - ++ lib.optional withKeyring libsecret; - - nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; - - configureFlags = [ "--sysconfdir=/etc" "--with-libgsasl" ] - ++ lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; - - postInstall = '' - install -d $out/share/doc/${pname}/scripts - cp -r scripts/{find_alias,msmtpqueue,msmtpq,set_sendmail} $out/share/doc/${pname}/scripts - install -Dm644 doc/*.example $out/share/doc/${pname} - - substitute scripts/msmtpq/msmtpq $out/bin/msmtpq \ - --replace @msmtp@ $out/bin/msmtp \ - --replace @nc@ ${netcat-gnu}/bin/nc \ - --replace @journal@ ${journal} \ - ${lib.optionalString (journal == "y") "--replace @systemdcat@ ${systemd}/bin/systemd-cat" } \ - --replace @test@ ${tester} - - substitute scripts/msmtpq/msmtp-queue $out/bin/msmtp-queue \ - --replace @msmtpq@ $out/bin/msmtpq - - ln -s msmtp $out/bin/sendmail - - chmod +x $out/bin/* - ''; - meta = with lib; { description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; homepage = "https://marlam.de/msmtp/"; @@ -56,4 +40,92 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; + + binaries = stdenv.mkDerivation rec { + pname = "msmtp-binaries"; + inherit version src meta; + + configureFlags = [ "--sysconfdir=/etc" "--with-libgsasl" ] + ++ optionals stdenv.isDarwin [ "--with-macosx-keyring" ]; + + buildInputs = [ gnutls gsasl libidn2 ] + ++ optionals stdenv.isDarwin [ Security ] + ++ optionals withKeyring [ libsecret ]; + + nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; + + enableParallelBuilding = true; + + postInstall = '' + install -Dm444 -t $out/share/doc/msmtp doc/*.example + ln -s msmtp $out/bin/sendmail + ''; + }; + + scripts = resholve.mkDerivation rec { + pname = "msmtp-scripts"; + inherit version src meta; + + patches = [ ./paths.patch ]; + + postPatch = '' + substituteInPlace scripts/msmtpq/msmtpq \ + --replace @journal@ ${if withSystemd then "Y" else "N"} + ''; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm555 -t $out/bin scripts/msmtpq/msmtp* + install -Dm444 -t $out/share/doc/msmtp/scripts scripts/msmtpq/README* + install -Dm444 -t $out/share/doc/msmtp/scripts scripts/{find_alias,msmtpqueue,set_sendmail}/* + + if grep --quiet -E '@.+@' $out/bin/*; then + echo "Unsubstituted variables found. Aborting!" + grep -E '@.+@' $out/bin/* + exit 1 + fi + + runHook postInstall + ''; + + solutions = { + msmtpq = { + scripts = [ "bin/msmtpq" ]; + interpreter = getExe bash; + inputs = [ + binaries + coreutils + gnugrep + netcat-gnu + which + ] ++ optionals withSystemd [ systemd ]; + execer = [ + "cannot:${getBin binaries}/bin/msmtp" + "cannot:${getBin netcat-gnu}/bin/nc" + ] ++ optionals withSystemd [ + "cannot:${getBin systemd}/bin/systemd-cat" + ]; + fix."$MSMTP" = [ "msmtp" ]; + fake.external = [ "ping" ] + ++ optionals (!withSystemd) [ "systemd-cat" ]; + }; + + msmtp-queue = { + scripts = [ "bin/msmtp-queue" ]; + interpreter = getExe bash; + inputs = [ "${placeholder "out"}/bin" ]; + execer = [ "cannot:${placeholder "out"}/bin/msmtpq" ]; + }; + }; + }; + +in +symlinkJoin { + name = "msmtp-${version}"; + inherit version meta; + paths = [ binaries scripts ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/msmtp/paths.patch b/third_party/nixpkgs/pkgs/applications/networking/msmtp/paths.patch index 26ee6976d5..1a62aa4cae 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/msmtp/paths.patch +++ b/third_party/nixpkgs/pkgs/applications/networking/msmtp/paths.patch @@ -1,61 +1,31 @@ -diff --git a/scripts/msmtpq/msmtp-queue b/scripts/msmtpq/msmtp-queue -index 1dc220d..d834241 100755 ---- a/scripts/msmtpq/msmtp-queue -+++ b/scripts/msmtpq/msmtp-queue -@@ -27,4 +27,4 @@ - ## change the below line to be - ## exec /path/to/msmtpq --q-mgmt - --exec msmtpq --q-mgmt "$1" -+exec @msmtpq@ --q-mgmt "$1" diff --git a/scripts/msmtpq/msmtpq b/scripts/msmtpq/msmtpq -index bdb4fb8..1363a67 100755 +index 1b39fc6..4baa19b 100755 --- a/scripts/msmtpq/msmtpq +++ b/scripts/msmtpq/msmtpq -@@ -59,7 +59,7 @@ err() { dsp '' "$@" '' ; exit 1 ; } - ## enter the location of the msmtp executable (no quotes !!) - ## e.g. ( MSMTP=/path/to/msmtp ) - ## and uncomment the test for its existence --MSMTP=msmtp -+MSMTP=@msmtp@ - #[ -x "$MSMTP" ] || \ - # log -e 1 "msmtpq : can't find the msmtp executable [ $MSMTP ]" # if not found - complain ; quit - ## -@@ -70,9 +70,9 @@ MSMTP=msmtp +@@ -70,8 +70,8 @@ MSMTP=msmtp ## ( chmod 0700 msmtp.queue ) ## ## the queue dir - modify this to reflect where you'd like it to be (no quotes !!) -Q=~/.msmtp.queue -[ -d "$Q" ] || mkdir -m 0700 "$Q" || \ -- err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit +Q=${MSMTP_QUEUE:-~/.msmtp.queue} +[ -d "$Q" ] || mkdir -m 0700 -p "$Q" || \ -+ err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit + err '' "msmtpq : can't find or create msmtp queue directory [ $Q ]" '' # if not present - complain ; quit ## ## set the queue log file var to the location of the msmtp queue log file - ## where it is or where you'd like it to be -@@ -84,7 +83,10 @@ Q=~/.msmtp.queue +@@ -84,7 +84,10 @@ Q=~/.msmtp.queue ## (doing so would be inadvisable under most conditions, however) ## ## the queue log file - modify (or comment out) to taste (but no quotes !!) -LOG=~/log/msmtp.queue.log +LOG=${MSMTP_LOG:-~/log/msmtp.queue.log} -+test -d "$(dirname $LOG)" || mkdir -p "$(dirname $LOG)" ++[ -d "$(dirname "$LOG")" ] || mkdir -p "$(dirname "$LOG")" + +JOURNAL=@journal@ ## ====================================================================================== ## msmtpq can use the following environment variables : -@@ -108,7 +110,7 @@ LOG=~/log/msmtp.queue.log - ## - #EMAIL_CONN_NOTEST=y # deprecated ; use below var - #EMAIL_CONN_TEST={x| |p|P|n|s} # see settings above for EMAIL_CONN_TEST --EMAIL_CONN_TEST=n -+EMAIL_CONN_TEST=@test@ - #EMAIL_QUEUE_QUIET=t - ## ====================================================================================== - -@@ -138,6 +140,7 @@ on_exit() { # unlock the queue on exit if the lock was +@@ -138,6 +141,7 @@ on_exit() { # unlock the queue on exit if the lock was ## display msg to user, as well ## log() { @@ -63,15 +33,14 @@ index bdb4fb8..1363a67 100755 local ARG RC PFX PFX="$('date' +'%Y %d %b %H:%M:%S')" # time stamp prefix - "2008 13 Mar 03:59:45 " - if [ "$1" = '-e' ] ; then # there's an error exit code -@@ -154,10 +157,19 @@ log() { +@@ -155,10 +159,19 @@ log() { done fi -+ if [ "$JOURNAL" == "y" ] ; then ++ if [ "$JOURNAL" == "Y" ]; then + for ARG ; do + [ -n "$ARG" ] && \ -+ echo "$PFX : $ARG" | @systemdcat@ -t $NAME -p info ++ echo "$ARG" | systemd-cat -t $NAME -p info + done + fi + @@ -79,20 +48,8 @@ index bdb4fb8..1363a67 100755 [ -n "$LKD" ] && lock_queue -u # unlock here (if locked) [ -n "$LOG" ] && \ echo " exit code = $RC" >> "$LOG" # logging ok ; send exit code to log -+ [ "$JOURNAL" == "y" ] && \ -+ echo "exit code= $RC" | @systemdcat@ -t $NAME -p emerg - exit $RC # exit w/return code ++ [ "$JOURNAL" == "Y" ] && \ ++ echo "exit code= $RC" | systemd-cat -t $NAME -p emerg + exit "$RC" # exit w/return code fi } -@@ -207,10 +219,7 @@ connect_test() { - ping -qnc1 -w4 8.8.8.8 >/dev/null 2>&1 || return 1 - - elif [ "$EMAIL_CONN_TEST" = 'n' ] ; then # use netcat (nc) test -- # must, of course, have netcat (nc) installed -- which nc >/dev/null 2>&1 || \ -- log -e 1 "msmtpq : can't find netcat executable [ nc ]" # if not found - complain ; quit -- 'nc' -vz www.debian.org 80 >/dev/null 2>&1 || return 1 -+ @nc@ -vz www.debian.org 80 >/dev/null 2>&1 || return 1 - - elif [ "$EMAIL_CONN_TEST" = 's' ] ; then # use sh sockets test - # note that this does not work on debian systems diff --git a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix index d1091068c6..48189e7bfa 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mullvad-vpn/default.nix @@ -43,11 +43,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2022.2"; + version = "2022.3"; src = fetchurl { url = "https://github.com/mullvad/mullvadvpn-app/releases/download/${version}/MullvadVPN-${version}_amd64.deb"; - sha256 = "sha256-h/c4aPH6E2TzbXGROpLJgF9uHYcjvKiW5upIobpJM9o="; + sha256 = "sha256-AxBVH5dHp1IBgeAMEUm+6xgHNuDChNs1+kOinbsUJu0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix index 21c95de397..1bffef8d46 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/n8n/node-packages.nix @@ -67,40 +67,40 @@ let sha512 = "TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw=="; }; }; - "@azure/core-auth-1.3.2" = { + "@azure/core-auth-1.4.0" = { name = "_at_azure_slash_core-auth"; packageName = "@azure/core-auth"; - version = "1.3.2"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.3.2.tgz"; - sha512 = "7CU6DmCHIZp5ZPiZ9r3J17lTKMmYsm/zGvNkjArQwPkrLlZ1TZ+EUYfGgh2X31OLMVAQCTJZW4cXHJi02EbJnA=="; + url = "https://registry.npmjs.org/@azure/core-auth/-/core-auth-1.4.0.tgz"; + sha512 = "HFrcTgmuSuukRf/EdPmqBrc5l6Q5Uu+2TbuhaKbgaCpP2TfAeiNaQPAadxO+CYBRHGUzIDteMAjFspFLDLnKVQ=="; }; }; - "@azure/core-client-1.6.0" = { + "@azure/core-client-1.6.1" = { name = "_at_azure_slash_core-client"; packageName = "@azure/core-client"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.0.tgz"; - sha512 = "YhSf4cb61ApSjItscp9XoaLq8KRnacPDAhmjAZSMnn/gs6FhFbZNfOBOErG2dDj7JRknVtCmJ5mLmfR2sLa11A=="; + url = "https://registry.npmjs.org/@azure/core-client/-/core-client-1.6.1.tgz"; + sha512 = "mZ1MSKhZBYoV8GAWceA+PEJFWV2VpdNSpxxcj1wjIAOi00ykRuIQChT99xlQGZWLY3/NApWhSImlFwsmCEs4vA=="; }; }; - "@azure/core-http-2.2.5" = { + "@azure/core-http-2.2.6" = { name = "_at_azure_slash_core-http"; packageName = "@azure/core-http"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.5.tgz"; - sha512 = "kctMqSQ6zfnlFpuYzfUKadeTyOQYbIQ+3Rj7dzVC3Dk1dOnHroTwR9hLYKX8/n85iJpkyaksaXpuh5L7GJRYuQ=="; + url = "https://registry.npmjs.org/@azure/core-http/-/core-http-2.2.6.tgz"; + sha512 = "Lx7A3k2JIXpIbixfUaOOG79WNSo/Y7dhZ0LaLhaayyZ6PwQdVsEQXAR+oIPqPSfgPzv7RtwPSVviJ2APrsQKvQ=="; }; }; - "@azure/core-lro-2.2.4" = { + "@azure/core-lro-2.2.5" = { name = "_at_azure_slash_core-lro"; packageName = "@azure/core-lro"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.4.tgz"; - sha512 = "e1I2v2CZM0mQo8+RSix0x091Av493e4bnT22ds2fcQGslTHzM2oTbswkB65nP4iEpCxBrFxOSDPKExmTmjCVtQ=="; + url = "https://registry.npmjs.org/@azure/core-lro/-/core-lro-2.2.5.tgz"; + sha512 = "/7LKDHNd2Q6gGCrg7zV4va/N90w250pE4vaQUfFt+hTd/dyycgJWCqQ6EljQr8hrIFiH93C8Apk97tsnl7Czkg=="; }; }; "@azure/core-paging-1.3.0" = { @@ -112,13 +112,13 @@ let sha512 = "H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg=="; }; }; - "@azure/core-rest-pipeline-1.9.0" = { + "@azure/core-rest-pipeline-1.9.1" = { name = "_at_azure_slash_core-rest-pipeline"; packageName = "@azure/core-rest-pipeline"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.0.tgz"; - sha512 = "uvM3mY+Vegk0F2r4Eh0yPdsXTUyafTQkeX0USnz1Eyangxm2Bib0w0wkJVZW8fpks7Lcv0ztIdCFTrN7H8uptg=="; + url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.9.1.tgz"; + sha512 = "OVtt0LP0K5ktsKTmh6/695P0mPFmngjdCJPr4V0uvrkhHTkARSQ3VYRnxRc0LC9g3mHcH90C+8a6iF7ApMAZKg=="; }; }; "@azure/core-tracing-1.0.0-preview.13" = { @@ -175,31 +175,31 @@ let sha512 = "aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g=="; }; }; - "@azure/msal-browser-2.27.0" = { + "@azure/msal-browser-2.28.1" = { name = "_at_azure_slash_msal-browser"; packageName = "@azure/msal-browser"; - version = "2.27.0"; + version = "2.28.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.27.0.tgz"; - sha512 = "PyATq2WvK+x32waRqqikym8wvn939iO9UhpFqhLwitNrfLa3PHUgJuuI9oLSQOS3/UzjYb8aqN+XzchU3n/ZuQ=="; + url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-2.28.1.tgz"; + sha512 = "5uAfwpNGBSRzBGTSS+5l4Zw6msPV7bEmq99n0U3n/N++iTcha+nIp1QujxTPuOLHmTNCeySdMx9qzGqWuy22zQ=="; }; }; - "@azure/msal-common-7.1.0" = { + "@azure/msal-common-7.3.0" = { name = "_at_azure_slash_msal-common"; packageName = "@azure/msal-common"; - version = "7.1.0"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.1.0.tgz"; - sha512 = "WyfqE5mY/rggjqvq0Q5DxLnA33KSb0vfsUjxa95rycFknI03L5GPYI4HTU9D+g0PL5TtsQGnV3xzAGq9BFCVJQ=="; + url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-7.3.0.tgz"; + sha512 = "revxB3z+QLjwAtU1d04nC1voFr+i3LfqTpUfgrWZVqKh/sSgg0mZZUvw4vKVWB57qtL95sul06G+TfdFZny1Xw=="; }; }; - "@azure/msal-node-1.11.0" = { + "@azure/msal-node-1.12.1" = { name = "_at_azure_slash_msal-node"; packageName = "@azure/msal-node"; - version = "1.11.0"; + version = "1.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.11.0.tgz"; - sha512 = "KW/XEexfCrPzdYbjY7NVmhq9okZT3Jvck55CGXpz9W5asxeq3EtrP45p+ZXtQVEfko0YJdolpCNqWUyXvanWZg=="; + url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-1.12.1.tgz"; + sha512 = "m909lX9C8Ty01DBxbjr4KfAKWibohgRvY7hrdDo13U1ztlH+0Nbt7cPF1vrWonW/CRT4H4xtUa4LCNmivghggw=="; }; }; "@azure/storage-blob-12.11.0" = { @@ -211,22 +211,22 @@ let sha512 = "na+FisoARuaOWaHWpmdtk3FeuTWf2VWamdJ9/TJJzj5ZdXPLC3juoDgFs6XVuJIoK30yuBpyFBEDXVRK4pB7Tg=="; }; }; - "@babel/parser-7.18.8" = { + "@babel/parser-7.18.11" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.8"; + version = "7.18.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.8.tgz"; - sha512 = "RSKRfYX20dyH+elbJK2uqAkVyucL+xXzhqlMD5/ZXx+dAAwpyB7HsvnHe/ZUGOF+xLr5Wx9/JoXVTj6BQE2/oA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz"; + sha512 = "9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ=="; }; }; - "@babel/runtime-7.18.6" = { + "@babel/runtime-7.18.9" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.18.6"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.6.tgz"; - sha512 = "t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz"; + sha512 = "lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw=="; }; }; "@colors/colors-1.5.0" = { @@ -247,31 +247,31 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@fontsource/open-sans-4.5.10" = { + "@fontsource/open-sans-4.5.11" = { name = "_at_fontsource_slash_open-sans"; packageName = "@fontsource/open-sans"; - version = "4.5.10"; + version = "4.5.11"; src = fetchurl { - url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.10.tgz"; - sha512 = "MrtTDfWb1Tu9YxVh2KaKmsKBn6O3KL/lHZS0KRKK58jgqvdwuiDt4QW4udmW4FQf0XOWgnZ+4vKUF80F3SqBAA=="; + url = "https://registry.npmjs.org/@fontsource/open-sans/-/open-sans-4.5.11.tgz"; + sha512 = "nG0gmbx4pSr8wltdG/ZdlS6OrsMK40Wt6iyuLTKHEf0TQfzKRMlWaskZHdeuWCwS6WUgqHKMf9KSwGdxPfapOg=="; }; }; - "@fortawesome/fontawesome-common-types-6.1.1" = { + "@fortawesome/fontawesome-common-types-6.1.2" = { name = "_at_fortawesome_slash_fontawesome-common-types"; packageName = "@fortawesome/fontawesome-common-types"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz"; - sha512 = "wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA=="; + url = "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.2.tgz"; + sha512 = "wBaAPGz1Awxg05e0PBRkDRuTsy4B3dpBm+zreTTyd9TH4uUM27cAL4xWyWR0rLJCrRwzVsQ4hF3FvM6rqydKPA=="; }; }; - "@fortawesome/free-regular-svg-icons-6.1.1" = { + "@fortawesome/free-regular-svg-icons-6.1.2" = { name = "_at_fortawesome_slash_free-regular-svg-icons"; packageName = "@fortawesome/free-regular-svg-icons"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.1.tgz"; - sha512 = "xXiW7hcpgwmWtndKPOzG+43fPH7ZjxOaoeyooptSztGmJxCAflHZxXNK0GcT0uEsR4jTGQAfGklDZE5NHoBhKg=="; + url = "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.2.tgz"; + sha512 = "xR4hA+tAwsaTHGfb+25H1gVU/aJ0Rzu+xIUfnyrhaL13yNQ7TWiI2RvzniAaB+VGHDU2a+Pk96Ve+pkN3/+TTQ=="; }; }; "@icetee/ftp-0.3.15" = { @@ -400,13 +400,13 @@ let sha512 = "sBpko86IrTscc39EvHUhL+c++81BVTsIZ3ETu/vG+cCdi0N6vb2DoahR67A9FI2CGnxRRHjnTfa3m6LulwNATA=="; }; }; - "@oclif/core-1.9.5" = { + "@oclif/core-1.13.10" = { name = "_at_oclif_slash_core"; packageName = "@oclif/core"; - version = "1.9.5"; + version = "1.13.10"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/core/-/core-1.9.5.tgz"; - sha512 = "C605Cr4RhHTMXYApLxdVt/PL6IA5cguN6MPvsMjxkvBppk2Fvcsj05dtRdDqShskRpZzHtu65emG1tHy8TWPWQ=="; + url = "https://registry.npmjs.org/@oclif/core/-/core-1.13.10.tgz"; + sha512 = "nwpjXwWscETdvO+/z94V1zd95vnzmCB6VRaobR4BdBllwWU6jHF/eCi1Ud2Tk9RSedChoLneZuDCkKnRCmxyng=="; }; }; "@oclif/errors-1.3.5" = { @@ -553,6 +553,15 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; + "@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/bluebird-3.5.36" = { name = "_at_types_slash_bluebird"; packageName = "@types/bluebird"; @@ -607,13 +616,13 @@ let sha512 = "WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag=="; }; }; - "@types/express-serve-static-core-4.17.29" = { + "@types/express-serve-static-core-4.17.30" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.29"; + version = "4.17.30"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz"; - sha512 = "uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz"; + sha512 = "gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ=="; }; }; "@types/express-unless-0.5.3" = { @@ -688,6 +697,15 @@ let sha512 = "/THyiqyQAP9AfARo4pF+aCGcyiQ94tX/Is2I7HofNRqoYLgN1PBoOWu2/zTA5zMxzP5EFutMtWtGAFRKUe961Q=="; }; }; + "@types/lodash.intersection-4.4.7" = { + name = "_at_types_slash_lodash.intersection"; + packageName = "@types/lodash.intersection"; + version = "4.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/lodash.intersection/-/lodash.intersection-4.4.7.tgz"; + sha512 = "7ukD2s54bmRNNpiH9ApEErO4H6mB8+WmXFr/6RpP3e/n7h3UFhEJC7QwLcoWAqOrYCIRFMAAwDf3ambSsW8c5Q=="; + }; + }; "@types/lossless-json-1.0.1" = { name = "_at_types_slash_lossless-json"; packageName = "@types/lossless-json"; @@ -697,13 +715,13 @@ let sha512 = "zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw=="; }; }; - "@types/mime-1.3.2" = { + "@types/mime-3.0.1" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "1.3.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; - sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"; + sha512 = "Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="; }; }; "@types/minimatch-3.0.5" = { @@ -724,13 +742,13 @@ let sha512 = "/SNsDidUFCvqqcWDwxv2feww/yqhNeTRL5CVoL3jU4Goc4kKEL10T7Eye65ZqPNi4HRx8sAEX59pV1aEH7drNA=="; }; }; - "@types/node-18.0.3" = { + "@types/node-18.6.5" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.0.3"; + version = "18.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz"; - sha512 = "HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz"; + sha512 = "Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw=="; }; }; "@types/node-fetch-2.6.2" = { @@ -778,13 +796,13 @@ let sha512 = "EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="; }; }; - "@types/serve-static-1.13.10" = { + "@types/serve-static-1.15.0" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.10"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz"; - sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"; + sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; }; }; "@types/shelljs-0.8.11" = { @@ -841,13 +859,13 @@ let sha512 = "QcJ5ZczaXAqbVD3o8mw/mEBhRvO5UAdTtbvgwL/OgoWubvNBh6/MxLBAigtcgIFaq3shon9m3POIxQaLQt4fxQ=="; }; }; - "@vue/compiler-sfc-2.7.5" = { + "@vue/compiler-sfc-2.7.8" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "2.7.5"; + version = "2.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.5.tgz"; - sha512 = "f2xlkMzBLbTAUy13N4aJBnmb7+86WJqoGqHDibkGHd1/CabpNVvzhpBFlfWJjBrGWIcWywNGgGSuoWzpCUuD4w=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.8.tgz"; + sha512 = "2DK4YWKfgLnW9VDR9gnju1gcYRk3flKj8UNsms7fsRmFcg35slVTZEkqwBtX+wJBXaamFfn6NxSsZh3h12Ix/Q=="; }; }; "abbrev-1.1.1" = { @@ -877,13 +895,13 @@ let sha512 = "H5aqjkogmFxfaOrfn/e42vyspHVXuJ8er63KuljJXpOyJ1ZO/U5CrHfO8BLKIy2w7mBM02L5quL0vbfQqrGQbA=="; }; }; - "acorn-8.7.1" = { + "acorn-8.8.0" = { name = "acorn"; packageName = "acorn"; - version = "8.7.1"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.1.tgz"; - sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"; + sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; }; }; "acorn-walk-8.2.0" = { @@ -895,6 +913,15 @@ let sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA=="; }; }; + "address-1.2.0" = { + name = "address"; + packageName = "address"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/address/-/address-1.2.0.tgz"; + sha512 = "tNEZYz5G/zYunxFm7sfhAxkXEuLj3K6BKwv6ZURlsF6yiUQ65z0Q2wZW9L5cPUl9ocofGvXOdFYbFHp0+6MOig=="; + }; + }; "adler-32-1.2.0" = { name = "adler-32"; packageName = "adler-32"; @@ -1156,6 +1183,15 @@ let sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; }; }; + "ast-types-0.13.4" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.13.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz"; + sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; + }; + }; "async-3.2.4" = { name = "async"; packageName = "async"; @@ -1201,6 +1237,15 @@ let sha512 = "h7diyELoq692AA4oqO50ULoYKIomUdzuQ+NW+eFPwIX0xzVbXEu9cIcgzZ3TYNVbpkGtcNKh51aRfAQNef7HVA=="; }; }; + "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=="; + }; + }; "avsc-5.7.4" = { name = "avsc"; packageName = "avsc"; @@ -1210,13 +1255,13 @@ let sha512 = "z4oo33lmnvvNRqfUe3YjDGGpqu/L2+wXBIhMtwq6oqZ+exOUAkQYM6zd2VWKF7AIlajOF8ZZuPFfryTG9iLC/w=="; }; }; - "aws-sdk-2.1173.0" = { + "aws-sdk-2.1191.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1173.0"; + version = "2.1191.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1173.0.tgz"; - sha512 = "RR5OENCE5N7J9sp6Are+8WacIa4sGgeVi3K0wezV97nDTHXJD82hSiaRCCN/xGfnB/GcWtPIBCetRD2tpiCN2w=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1191.0.tgz"; + sha512 = "G8hWvuc+3rxTfHqsnUwGx/fy8zlnVPtlNesXMHlwU/l4oBx3+Weg0Nhng6HvLGzUJifzlnSKDXrOsWVkHtuZ1w=="; }; }; "aws-sign2-0.7.0" = { @@ -2011,13 +2056,13 @@ let sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; - "commander-9.3.0" = { + "commander-9.4.0" = { name = "commander"; packageName = "commander"; - version = "9.3.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz"; - sha512 = "hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw=="; + url = "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz"; + sha512 = "sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="; }; }; "commist-1.1.0" = { @@ -2173,6 +2218,15 @@ let sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; + "copy-to-2.0.1" = { + name = "copy-to"; + packageName = "copy-to"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-to/-/copy-to-2.0.1.tgz"; + sha512 = "3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="; + }; + }; "core-js-2.6.12" = { name = "core-js"; packageName = "core-js"; @@ -2182,13 +2236,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.23.4" = { + "core-js-3.24.1" = { name = "core-js"; packageName = "core-js"; - version = "3.23.4"; + version = "3.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.23.4.tgz"; - sha512 = "vjsKqRc1RyAJC3Ye2kYqgfdThb3zYnx9CrqoCcjMOENMtQPC7ZViBvlDxwYU/2z2NI/IPuiXw5mT4hWhddqjzQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz"; + sha512 = "0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="; }; }; "core-util-is-1.0.2" = { @@ -2326,6 +2380,15 @@ let sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; + "data-uri-to-buffer-3.0.1" = { + name = "data-uri-to-buffer"; + packageName = "data-uri-to-buffer"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz"; + sha512 = "WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og=="; + }; + }; "debug-2.6.9" = { name = "debug"; packageName = "debug"; @@ -2380,6 +2443,15 @@ let sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; }; + "deep-is-0.1.4" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; + }; + }; "deepmerge-1.5.2" = { name = "deepmerge"; packageName = "deepmerge"; @@ -2398,6 +2470,15 @@ let sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; }; }; + "default-user-agent-1.0.0" = { + name = "default-user-agent"; + packageName = "default-user-agent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/default-user-agent/-/default-user-agent-1.0.0.tgz"; + sha512 = "bDF7bg6OSNcSwFWPu4zYKpVkJZQYVrAANMYB8bc9Szem1D0yKdm4sa/rOCs2aC9+2GMqQ7KnwtZRvDhmLF0dXw=="; + }; + }; "define-lazy-prop-2.0.0" = { name = "define-lazy-prop"; packageName = "define-lazy-prop"; @@ -2416,6 +2497,15 @@ let sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; }; + "degenerator-3.0.2" = { + name = "degenerator"; + packageName = "degenerator"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/degenerator/-/degenerator-3.0.2.tgz"; + sha512 = "c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ=="; + }; + }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -2443,13 +2533,13 @@ let sha512 = "XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw=="; }; }; - "denque-2.0.1" = { + "denque-2.1.0" = { name = "denque"; packageName = "denque"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/denque/-/denque-2.0.1.tgz"; - sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ=="; + url = "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz"; + sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw=="; }; }; "depd-2.0.0" = { @@ -2497,6 +2587,15 @@ let sha512 = "9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w=="; }; }; + "digest-header-0.0.1" = { + name = "digest-header"; + packageName = "digest-header"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/digest-header/-/digest-header-0.0.1.tgz"; + sha512 = "Qi0KOZgRnkQJuvMWbs1ZRRajEnbsMU8xlJI4rHIbPC+skHQ30heO5cIHpUFT4jAvAe+zPtdavLSAxASqoyZ3cg=="; + }; + }; "dir-glob-3.0.1" = { name = "dir-glob"; packageName = "dir-glob"; @@ -2794,6 +2893,15 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; + "escodegen-1.14.3" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.14.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz"; + sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; + }; + }; "eslint-config-riot-1.0.0" = { name = "eslint-config-riot"; packageName = "eslint-config-riot"; @@ -2812,6 +2920,24 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; + "estraverse-4.3.0" = { + name = "estraverse"; + packageName = "estraverse"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; + sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; + }; + }; + "esutils-2.0.3" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; + sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; + }; + }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -2893,6 +3019,15 @@ let sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; + "extend-shallow-2.0.1" = { + name = "extend-shallow"; + packageName = "extend-shallow"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; + sha512 = "zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug=="; + }; + }; "external-editor-3.1.0" = { name = "external-editor"; packageName = "external-editor"; @@ -2938,6 +3073,15 @@ let sha512 = "lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="; }; }; + "fast-levenshtein-2.0.6" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; + }; + }; "fastq-1.13.0" = { name = "fastq"; packageName = "fastq"; @@ -2983,6 +3127,15 @@ let sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; + "file-uri-to-path-2.0.0" = { + name = "file-uri-to-path"; + packageName = "file-uri-to-path"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-2.0.0.tgz"; + sha512 = "hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg=="; + }; + }; "filelist-1.0.4" = { name = "filelist"; packageName = "filelist"; @@ -3100,6 +3253,15 @@ let sha512 = "KcpbcpuLNOwrEjnbpMC0gS+X8ciDoZE1kkqzat4a8vrprf+s9pKNQ/QIwWfbfs4ltgmFl3MD177SNTkve3BwGQ=="; }; }; + "formstream-1.1.1" = { + name = "formstream"; + packageName = "formstream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/formstream/-/formstream-1.1.1.tgz"; + sha512 = "yHRxt3qLFnhsKAfhReM4w17jP+U1OlhUjnKPPtonwKbIJO7oBP0MvoxkRUwb8AU9n0MIkYy5X5dK6pQnbj+R2Q=="; + }; + }; "forwarded-0.2.0" = { name = "forwarded"; packageName = "forwarded"; @@ -3163,6 +3325,15 @@ let sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; + "ftp-0.3.10" = { + name = "ftp"; + packageName = "ftp"; + version = "0.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz"; + sha512 = "faFVML1aBx2UoDStmLwv2Wptt4vw5x03xxX172nhA5Y5HBshW5JweqQ2W4xL4dezQTG8inJsuYcpPHHU3X5OTQ=="; + }; + }; "function-bind-1.1.1" = { name = "function-bind"; packageName = "function-bind"; @@ -3280,6 +3451,15 @@ let sha512 = "zzlgaYnHMIEgHRrfC7x0Qp0Ylhw/sHpM6MHXeVBTYIsvGf5GpbnClB+Q6rAPdn+0gd2oZZIo6Tj3EaWrt4VhDQ=="; }; }; + "get-uri-3.0.2" = { + name = "get-uri"; + packageName = "get-uri"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/get-uri/-/get-uri-3.0.2.tgz"; + sha512 = "+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg=="; + }; + }; "getpass-0.1.7" = { name = "getpass"; packageName = "getpass"; @@ -3550,6 +3730,15 @@ let sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; }; }; + "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"; @@ -3568,6 +3757,15 @@ let sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; + "humanize-ms-1.2.1" = { + name = "humanize-ms"; + packageName = "humanize-ms"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"; + sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; + }; + }; "hyperlinker-1.0.0" = { name = "hyperlinker"; packageName = "hyperlinker"; @@ -3712,6 +3910,24 @@ let sha512 = "3GYo0GJtLqgNXj4YhrisLaNNvWSNwSS2wS4OELGfGxH8I69+XfNdnmV1AyN+ZqMh0i7eX+SWjrwFKDBDgfBC1A=="; }; }; + "ip-1.1.8" = { + name = "ip"; + packageName = "ip"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-1.1.8.tgz"; + sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; + }; + }; + "ip-2.0.0" = { + name = "ip"; + packageName = "ip"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz"; + sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; + }; + }; "ip-regex-2.1.0" = { name = "ip-regex"; packageName = "ip-regex"; @@ -3739,6 +3955,15 @@ let sha512 = "dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA=="; }; }; + "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-arrayish-0.3.2" = { name = "is-arrayish"; packageName = "is-arrayish"; @@ -3793,13 +4018,13 @@ let sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; }; - "is-core-module-2.9.0" = { + "is-core-module-2.10.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; - sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz"; + sha512 = "Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg=="; }; }; "is-date-object-1.0.5" = { @@ -3820,6 +4045,15 @@ let sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; }; }; + "is-extendable-0.1.1" = { + name = "is-extendable"; + packageName = "is-extendable"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; + sha512 = "5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="; + }; + }; "is-extglob-2.1.1" = { name = "is-extglob"; packageName = "is-extglob"; @@ -3838,6 +4072,15 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; + "is-generator-function-1.0.10" = { + name = "is-generator-function"; + packageName = "is-generator-function"; + version = "1.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz"; + sha512 = "jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A=="; + }; + }; "is-glob-3.1.0" = { name = "is-glob"; packageName = "is-glob"; @@ -3991,6 +4234,15 @@ let sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; + "is-typed-array-1.1.9" = { + name = "is-typed-array"; + packageName = "is-typed-array"; + version = "1.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz"; + sha512 = "kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A=="; + }; + }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -4342,6 +4594,15 @@ let sha512 = "nvVPLpIHUxCUoRLrFqTgSxXJ614d8AgQoWl7zPe/2VadE8+1dpU3LBhowRuBAcuwruWtOdD8oYC9jDNJjXDPyA=="; }; }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; + }; + }; "libbase64-1.2.1" = { name = "libbase64"; packageName = "libbase64"; @@ -4360,13 +4621,13 @@ let sha512 = "xOqorG21Va+3CjpFOfFTU7SWohHH2uIX9ZY4Byz6J+lvpfvc486tOAT/G9GfbrKtJ9O7NCX9o0aC2lxqbnZ9EA=="; }; }; - "libphonenumber-js-1.10.8" = { + "libphonenumber-js-1.10.11" = { name = "libphonenumber-js"; packageName = "libphonenumber-js"; - version = "1.10.8"; + version = "1.10.11"; src = fetchurl { - url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.8.tgz"; - sha512 = "MGgHrKRGE7sg7y0DikHybRDgTXcYv4HL+WwhDm5UAiChCNb5tcy5OEaU8XTTt5bDBwhZGCJNxoGMVBpZ4RfhIg=="; + url = "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.10.11.tgz"; + sha512 = "ehoihx4HpRXO6FH/uJ0EnaEV4dVU+FDny+jv0S6k9JPyPsAIr0eXDAFvGRMBKE1daCtyHAaFSKCiuCxrOjVAzQ=="; }; }; "libqp-1.1.0" = { @@ -4477,6 +4738,15 @@ let sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w=="; }; }; + "lodash.intersection-4.4.0" = { + name = "lodash.intersection"; + packageName = "lodash.intersection"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.intersection/-/lodash.intersection-4.4.0.tgz"; + sha512 = "N+L0cCfnqMv6mxXtSPeKt+IavbOBBSiAEkKyLasZ8BVcP9YXQgxLO12oPR8OyURwKV8l5vJKiE1M8aS70heuMg=="; + }; + }; "lodash.isarguments-3.1.0" = { name = "lodash.isarguments"; packageName = "lodash.isarguments"; @@ -4549,6 +4819,15 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; + "lodash.omit-4.5.0" = { + name = "lodash.omit"; + packageName = "lodash.omit"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz"; + sha512 = "XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg=="; + }; + }; "lodash.once-4.1.1" = { name = "lodash.once"; packageName = "lodash.once"; @@ -4567,6 +4846,15 @@ let sha512 = "4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="; }; }; + "lodash.split-4.4.2" = { + name = "lodash.split"; + packageName = "lodash.split"; + version = "4.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.split/-/lodash.split-4.4.2.tgz"; + sha512 = "kn1IDX0aHfg0FsnPIyxCHTamZXt3YK3aExRH1LW8YhzP6+sCldTm8+E4aIg+nSmM6R4eqdWGrXWtfYI961bwIw=="; + }; + }; "lodash.throttle-4.1.1" = { name = "lodash.throttle"; packageName = "lodash.throttle"; @@ -4666,6 +4954,15 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; + "lru-cache-5.1.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; + sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + }; + }; "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; @@ -4837,6 +5134,15 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; + "mime-2.6.0" = { + name = "mime"; + packageName = "mime"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz"; + sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; + }; + }; "mime-db-1.52.0" = { name = "mime-db"; packageName = "mime-db"; @@ -4900,13 +5206,13 @@ let sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; - "minipass-3.3.4" = { + "minipass-3.3.5" = { name = "minipass"; packageName = "minipass"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz"; - sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.5.tgz"; + sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; }; }; "minizlib-2.1.2" = { @@ -5035,13 +5341,13 @@ let sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="; }; }; - "mssql-8.1.2" = { + "mssql-8.1.3" = { name = "mssql"; packageName = "mssql"; - version = "8.1.2"; + version = "8.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/mssql/-/mssql-8.1.2.tgz"; - sha512 = "xkTw3Sp1Jpq2f7CG3rFQn6YK4XZbnL8HfZhaB/KRC/hjDZlJB3pSWYN2Cp/WwxIeA1iUJkdFa6GTfdMY8+DAjg=="; + url = "https://registry.npmjs.org/mssql/-/mssql-8.1.3.tgz"; + sha512 = "XGxNNNeKZMMTM71na2M4eLMkPWKckcfZtMiCKR1mLzN887x31NisekNhoBAoRpqizErUZxSW8gSDZc8PVig7Kw=="; }; }; "multer-1.4.5-lts.1" = { @@ -5080,49 +5386,49 @@ let sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; }; }; - "n8n-core-0.126.0" = { + "n8n-core-0.130.0" = { name = "n8n-core"; packageName = "n8n-core"; - version = "0.126.0"; + version = "0.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.126.0.tgz"; - sha512 = "+vXSQenGtjBBT+i5N3GZRYtbTxqXcWDOSPIZdO4HLVkt7YzfjF0ZFAILgs1baGaSEsXZuM6OE8uk5TKsjnUYKg=="; + url = "https://registry.npmjs.org/n8n-core/-/n8n-core-0.130.0.tgz"; + sha512 = "fWqLRMOZ2aXuMrVns6kVX5eWTJVbrrslgQA9aZESMysR/P6eVVnBAcB948YMDHAZB9EeFGBzxCJCdCGdF3VVUQ=="; }; }; - "n8n-design-system-0.26.0" = { + "n8n-design-system-0.30.0" = { name = "n8n-design-system"; packageName = "n8n-design-system"; - version = "0.26.0"; + version = "0.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.26.0.tgz"; - sha512 = "wiD3V2Fkqs1jgNJBl+nvrbTDmDFVGyxJ0N6PY8/2tO1TxwWbWO03uj1dbGjzuepYGChyMnCM8h2pZplYRJbemw=="; + url = "https://registry.npmjs.org/n8n-design-system/-/n8n-design-system-0.30.0.tgz"; + sha512 = "ZZRGms10PjTGzw7W8UPe5MXKuJ9eMZr+z9+mO7jywQg1ADzG+JCIgAcdad2II/V46nM4hkilGk0EI+IaBg0R/g=="; }; }; - "n8n-editor-ui-0.152.0" = { + "n8n-editor-ui-0.156.0" = { name = "n8n-editor-ui"; packageName = "n8n-editor-ui"; - version = "0.152.0"; + version = "0.156.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.152.0.tgz"; - sha512 = "Gz65kORkN4aNtwcHxc9rOugX+hPoG5g6v4+Fv5sEW40ac6jxw9ZT3ApkJ8+UpE/7jvoLFmzhks8gar1I85Yh3w=="; + url = "https://registry.npmjs.org/n8n-editor-ui/-/n8n-editor-ui-0.156.0.tgz"; + sha512 = "otgW18usDm9pD4Zz6JADNFhb3iMRjcHHcgv897uvk7oZC9nHr9VAQry0bOCMvO4bm3oJug37KkM6eNm02EY+tg=="; }; }; - "n8n-nodes-base-0.184.0" = { + "n8n-nodes-base-0.188.0" = { name = "n8n-nodes-base"; packageName = "n8n-nodes-base"; - version = "0.184.0"; + version = "0.188.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.184.0.tgz"; - sha512 = "9jrZejz8INnkU8avs+BohvrlQ+YZcJnh1CIy0m7Q5+mkYQE8t/aoazU/k79TL93QXRfxYrNNa/34DtqbMgkcWw=="; + url = "https://registry.npmjs.org/n8n-nodes-base/-/n8n-nodes-base-0.188.0.tgz"; + sha512 = "+R15NaRM9H767h7D/kwsQCpXhxmNQDMr3LMwhwPrUAXKGTZbk9YLZWhMlQaewhjGgQV69qo94OS9/Wb2FkvzMg=="; }; }; - "n8n-workflow-0.108.0" = { + "n8n-workflow-0.112.0" = { name = "n8n-workflow"; packageName = "n8n-workflow"; - version = "0.108.0"; + version = "0.112.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.108.0.tgz"; - sha512 = "l9fXbNcXsMZkRZU9Ourn3MxCNTujub2ScZBXNefvvwPlto1Mr8602JpNP0v0dKYFd3+gJefgWXXCUKkfkuqTGQ=="; + url = "https://registry.npmjs.org/n8n-workflow/-/n8n-workflow-0.112.0.tgz"; + sha512 = "6HE3WP4kMdifNJ0plmcye1VU4PKbxlUXr5wIF/74M5M+yLusoMJn2kSLEQ4KO50WYwByl8qttXBbBIjrkM8lNw=="; }; }; "named-placeholders-1.1.2" = { @@ -5197,6 +5503,15 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; + "netmask-2.0.2" = { + name = "netmask"; + packageName = "netmask"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz"; + sha512 = "dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg=="; + }; + }; "nice-try-1.0.5" = { name = "nice-try"; packageName = "nice-try"; @@ -5260,22 +5575,22 @@ let sha512 = "mGA53bSqo7j62PjmMuFPdO0efNT9pqiGYhQTNVCWkY7PdduRIECJF7n7NOrr5cb+d/js1GdYRLpoTYDwawRk6A=="; }; }; - "node-html-parser-5.3.3" = { + "node-html-parser-5.4.1" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "5.3.3"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.3.3.tgz"; - sha512 = "ncg1033CaX9UexbyA7e1N0aAoAYRDiV8jkTvzEnfd1GDvzFdrsXLzR4p4ik8mwLgnaKP/jyUFWDy9q3jvRT2Jw=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.1.tgz"; + sha512 = "xy/O2wOEBJsIRLs4avwa1lVY7tIpXXOoHHUJLa0GvnoPPqMG1hgBVl1tNI3GHOwRktTVZy+Y6rjghk4B9/NLyg=="; }; }; - "node-ssh-12.0.4" = { + "node-ssh-12.0.5" = { name = "node-ssh"; packageName = "node-ssh"; - version = "12.0.4"; + version = "12.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/node-ssh/-/node-ssh-12.0.4.tgz"; - sha512 = "5M3FBeAWjEpAQvVakQde6CeviEoEiYb6IjJL9mrMen9at63GAv0Q5vOFHFP+SM1Y7pTN3EBvJ/I+oxn2Lpydbw=="; + url = "https://registry.npmjs.org/node-ssh/-/node-ssh-12.0.5.tgz"; + sha512 = "uN2GTGdBRUUKkZmcNBr9OM+xKL6zq74emnkSyb1TshBdVWegj3boue6QallQeqZzo7YGVheP5gAovUL+8hZSig=="; }; }; "nodeify-1.0.1" = { @@ -5413,13 +5728,13 @@ let sha512 = "EFVjAYfzWqWsBMRHPMAXLCDIJnpMhdWAqR7xG6M6a2cs6PMFpl/+Z20w9zDW4vkxOFfddegBKq9Rehd0bxWE7A=="; }; }; - "object.assign-4.1.2" = { + "object.assign-4.1.3" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.2"; + version = "4.1.3"; 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.3.tgz"; + sha512 = "ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA=="; }; }; "object.getownpropertydescriptors-2.1.4" = { @@ -5539,6 +5854,15 @@ let sha512 = "jq83qaUb0wNg9Krv1c5OQ+58EK+vHde6aBPzLvPPqJm89UQWsvSuFy9X/OSNJnFeSOKo7btE0n8Nl2+nE+z5nA=="; }; }; + "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=="; + }; + }; "ordered-read-streams-1.0.1" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -5548,6 +5872,15 @@ let sha512 = "Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw=="; }; }; + "os-name-1.0.3" = { + name = "os-name"; + packageName = "os-name"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz"; + sha512 = "f5estLO2KN8vgtTRaILIgEGBoBrMnZ3JQ7W9TMZCnOIGwHe8TRGSpcagnWDo+Dfhd/z08k9Xe75hvciJJ8Qaew=="; + }; + }; "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; @@ -5557,6 +5890,15 @@ let sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; }; }; + "osx-release-1.1.0" = { + name = "osx-release"; + packageName = "osx-release"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz"; + sha512 = "ixCMMwnVxyHFQLQnINhmIpWqXIfS2YOXchwQrk+OFzmo6nDjQ0E4KXAyyUh0T0MZgV4bUhkRrAbVqlE4yLVq4A=="; + }; + }; "p-cancelable-2.1.1" = { name = "p-cancelable"; packageName = "p-cancelable"; @@ -5620,6 +5962,24 @@ let sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; + "pac-proxy-agent-5.0.0" = { + name = "pac-proxy-agent"; + packageName = "pac-proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-5.0.0.tgz"; + sha512 = "CcFG3ZtnxO8McDigozwE3AqAw15zDvGH+OjXO4kzf7IkEKkQ4gxQ+3sdF50WmhQ4P/bVusXcqNE2S3XrNURwzQ=="; + }; + }; + "pac-resolver-5.0.1" = { + name = "pac-resolver"; + packageName = "pac-resolver"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-5.0.1.tgz"; + sha512 = "cy7u00ko2KVgBAjuhevqpPeHIkCIqPe1v24cydhWjmeuzaBfmUWFCZJ1iAh5TuVzVZoUzXIW7K8sMYOZ84uZ9Q=="; + }; + }; "packet-reader-1.0.0" = { name = "packet-reader"; packageName = "packet-reader"; @@ -5854,6 +6214,15 @@ let sha512 = "KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg=="; }; }; + "pause-stream-0.0.11" = { + name = "pause-stream"; + packageName = "pause-stream"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + sha512 = "e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A=="; + }; + }; "pdf-parse-1.1.1" = { name = "pdf-parse"; packageName = "pdf-parse"; @@ -6052,13 +6421,13 @@ let sha512 = "epKaq3TTfTzXcxBxjpoKYMcTTcAX8Rykus6QZu77XNhJuRHSRxMd+JJrbX/3PFI0opFGSN0BabbAYCbGxbu0mA=="; }; }; - "postcss-8.4.14" = { + "postcss-8.4.16" = { name = "postcss"; packageName = "postcss"; - version = "8.4.14"; + version = "8.4.16"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"; - sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"; + sha512 = "ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ=="; }; }; "postgres-array-2.0.0" = { @@ -6097,6 +6466,15 @@ let sha512 = "9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="; }; }; + "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=="; + }; + }; "printj-1.1.2" = { name = "printj"; packageName = "printj"; @@ -6196,6 +6574,15 @@ let sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; }; }; + "proxy-agent-5.0.0" = { + name = "proxy-agent"; + packageName = "proxy-agent"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-5.0.0.tgz"; + sha512 = "gkH7BkvLVkSfX9Dk27W6TyNOWWZWRilRfk1XxGNWOYJ2TuedAv1yFpCaU9QSBmBe716XOTNpYNOzhysyw8xn7g=="; + }; + }; "proxy-from-env-1.1.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -6574,15 +6961,6 @@ let sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; }; }; - "requestretry-7.1.0" = { - name = "requestretry"; - packageName = "requestretry"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/requestretry/-/requestretry-7.1.0.tgz"; - sha512 = "TqVDgp251BW4b8ddQ2ptaj/57Z3LZHLscAUT7v6qs70buqF2/IoOVjYbpjJ6HiW7j5+waqegGI8xKJ/+uzgDmw=="; - }; - }; "require-at-1.0.6" = { name = "require-at"; packageName = "require-at"; @@ -7024,13 +7402,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.10.0" = { + "simple-git-3.12.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.10.0.tgz"; - sha512 = "2w35xrS5rVtAW0g67LqtxCZN5cdddz/woQRfS0OJXaljXEoTychZ4jnE+CQgra/wX4ZvHeiChTUMenCwfIYEYw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.12.0.tgz"; + sha512 = "cy1RSRFHGZSrlYa3MnUuNVOXLUdifEZD2X8+AZjg8mKCdRvtCFSga6acq5N2g0ggb8lH3jBi369MrFZ+Y6sfsA=="; }; }; "simple-lru-cache-0.0.2" = { @@ -7060,6 +7438,15 @@ let sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; + "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=="; + }; + }; "snake-case-3.0.4" = { name = "snake-case"; packageName = "snake-case"; @@ -7069,13 +7456,31 @@ let sha512 = "LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg=="; }; }; - "snowflake-sdk-1.6.11" = { + "snowflake-sdk-1.6.12" = { name = "snowflake-sdk"; packageName = "snowflake-sdk"; - version = "1.6.11"; + version = "1.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.11.tgz"; - sha512 = "w4oCXjNQ1peAJjhnrwihr+epYw1pSxbe5/+PdxexYb2rzowyOn0RA5PFbir90q/dx0jzM2gvPiHDjnSBEZ1/zA=="; + url = "https://registry.npmjs.org/snowflake-sdk/-/snowflake-sdk-1.6.12.tgz"; + sha512 = "nkwtsWsZr4KrloLgpMpLgCnJIxfcuWlD4sqR53kn8BQRmhOi6cSBgnvZmoYcFvW2arVvfHh/Dc3vOQ/4OuRSLg=="; + }; + }; + "socks-2.7.0" = { + name = "socks"; + packageName = "socks"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz"; + sha512 = "scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA=="; + }; + }; + "socks-proxy-agent-5.0.1" = { + name = "socks-proxy-agent"; + packageName = "socks-proxy-agent"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz"; + sha512 = "vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ=="; }; }; "source-map-0.6.1" = { @@ -7141,13 +7546,13 @@ let sha512 = "VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="; }; }; - "sqlite3-5.0.8" = { + "sqlite3-5.0.11" = { name = "sqlite3"; packageName = "sqlite3"; - version = "5.0.8"; + version = "5.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.8.tgz"; - sha512 = "f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.11.tgz"; + sha512 = "4akFOr7u9lJEeAWLJxmwiV43DJcGV7w3ab7SjQFAFaTVyknY3rZjvXTKIVtWqUoY4xwhjwoHKYs2HDW2SoHVsA=="; }; }; "sqlstring-2.3.3" = { @@ -7222,6 +7627,15 @@ let sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A=="; }; }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; + }; + }; "statuses-2.0.1" = { name = "statuses"; packageName = "statuses"; @@ -7375,22 +7789,22 @@ let sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; - "swagger-ui-dist-4.12.0" = { + "swagger-ui-dist-4.13.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.12.0"; + version = "4.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.12.0.tgz"; - sha512 = "B0Iy2ueXtbByE6OOyHTi3lFQkpPi/L7kFOKFeKTr44za7dJIELa9kzaca6GkndCgpK1QTjArnoXG+aUy0XQp1w=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.13.2.tgz"; + sha512 = "jHL6UyIYpvEI7NsuWd0R3hJaPQTg6Oo4qSBo+oVfOEkv6rrQm/475RGSMmZgV6ajp+Sgrp9CqrDjQYAgQqiv1A=="; }; }; - "swagger-ui-express-4.4.0" = { + "swagger-ui-express-4.5.0" = { name = "swagger-ui-express"; packageName = "swagger-ui-express"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.4.0.tgz"; - sha512 = "1CzRkHG386VQMVZK406jcpgnW2a9A5A/NiAjKhsFTQqUBWRF+uGbXTU/mA7WSV3mTzyOQDvjBdWP/c2qd5lqKw=="; + url = "https://registry.npmjs.org/swagger-ui-express/-/swagger-ui-express-4.5.0.tgz"; + sha512 = "DHk3zFvsxrkcnurGvQlAcLuTDacAVN1JHKDgcba/gr2NFRE4HGwP1YeHIXMiGznkWR4AeS7X5vEblNn4QljuNA=="; }; }; "tar-6.1.11" = { @@ -7717,6 +8131,15 @@ let sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; + }; + }; "type-fest-0.21.3" = { name = "type-fest"; packageName = "type-fest"; @@ -7798,6 +8221,15 @@ let sha512 = "eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="; }; }; + "unescape-1.0.1" = { + name = "unescape"; + packageName = "unescape"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unescape/-/unescape-1.0.1.tgz"; + sha512 = "O0+af1Gs50lyH1nUu3ZyYS1cRh01Q/kUKatTOkSs7jukXE6/NebucDVxyiDsA9AQ4JC1V1jUH9EO8JX2nMDgGQ=="; + }; + }; "unique-stream-2.3.1" = { name = "unique-stream"; packageName = "unique-stream"; @@ -7879,6 +8311,15 @@ let sha512 = "WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ=="; }; }; + "urllib-2.38.1" = { + name = "urllib"; + packageName = "urllib"; + version = "2.38.1"; + src = fetchurl { + url = "https://registry.npmjs.org/urllib/-/urllib-2.38.1.tgz"; + sha512 = "1tvjdL74oT9aV4X+SIjE1BXyes5PbfhHKhK4IlhoKhKqk4nD5/lXE90v10WZ02kELWIPI4w7ADneEQ4i7dPjiQ=="; + }; + }; "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; @@ -7897,6 +8338,15 @@ let sha512 = "QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg=="; }; }; + "util-0.12.4" = { + name = "util"; + packageName = "util"; + version = "0.12.4"; + src = fetchurl { + url = "https://registry.npmjs.org/util/-/util-0.12.4.tgz"; + sha512 = "bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw=="; + }; + }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -7915,6 +8365,24 @@ let sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw=="; }; }; + "utility-0.1.11" = { + name = "utility"; + packageName = "utility"; + version = "0.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/utility/-/utility-0.1.11.tgz"; + sha512 = "epFsJ71+/yC7MKMX7CM9azP31QBIQhywkiBUj74i/T3Y2TXtEor26QBkat7lGamrrNTr5CBI1imd/8F0Bmqw4g=="; + }; + }; + "utility-1.17.0" = { + name = "utility"; + packageName = "utility"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utility/-/utility-1.17.0.tgz"; + sha512 = "KdVkF9An/0239BJ4+dqOa7NPrPIOeQE9AGfx0XS16O9DBiHNHRJMoeU5nL6pRGAkgJOqdOu8R4gBRcXnAocJKw=="; + }; + }; "utils-merge-1.0.1" = { name = "utils-merge"; packageName = "utils-merge"; @@ -8005,13 +8473,13 @@ let sha512 = "AuECTSvwu2OHLAZYhG716YzwodKCIJxB6u1zG7PgSQwIgAlEaoXH52bxdcvT8GkGjnYK7r7yWDW0m0sOsPuBjQ=="; }; }; - "vue-2.7.5" = { + "vue-2.7.8" = { name = "vue"; packageName = "vue"; - version = "2.7.5"; + version = "2.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.7.5.tgz"; - sha512 = "mUDXXgBIFr9dk0k/3dpB6wtnCxRhe9mbGxWLtha9mTUrEWkdkZW1d58vl98VKWH067NA8f1Wj4Qwq7y7DDYfyw=="; + url = "https://registry.npmjs.org/vue/-/vue-2.7.8.tgz"; + sha512 = "ncwlZx5qOcn754bCu5/tS/IWPhXHopfit79cx+uIlLMyt3vCMGcXai5yCG5y+I6cDmEj4ukRYyZail9FTQh7lQ=="; }; }; "vue-color-2.8.1" = { @@ -8050,6 +8518,15 @@ let sha512 = "N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg=="; }; }; + "vue2-teleport-1.0.1" = { + name = "vue2-teleport"; + packageName = "vue2-teleport"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vue2-teleport/-/vue2-teleport-1.0.1.tgz"; + sha512 = "hbY/Q0x8qXGFxo6h4KU4YYesUcN+uUjliqqC0PoNSgpcbS2QRb3qXi+7XMTgLYs0a8i7o1H6Mu43UV4Vbgkhgw=="; + }; + }; "webidl-conversions-3.0.1" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -8095,6 +8572,15 @@ let sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="; }; }; + "which-typed-array-1.1.8" = { + name = "which-typed-array"; + packageName = "which-typed-array"; + version = "1.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz"; + sha512 = "Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw=="; + }; + }; "wide-align-1.1.5" = { name = "wide-align"; packageName = "wide-align"; @@ -8113,6 +8599,15 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; + "win-release-1.1.1" = { + name = "win-release"; + packageName = "win-release"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz"; + sha512 = "iCRnKVvGxOQdsKhcQId2PXV1vV3J/sDPXKA4Oe9+Eti2nb2ESEsYHRYls/UjoUW3bIc5ZDO8dTH50A/5iVN+bw=="; + }; + }; "winston-3.8.1" = { name = "winston"; packageName = "winston"; @@ -8149,6 +8644,15 @@ let sha512 = "OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA=="; }; }; + "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-1.0.0" = { name = "wordwrap"; packageName = "wordwrap"; @@ -8185,13 +8689,13 @@ let sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; - "ws-7.5.8" = { + "ws-7.5.9" = { name = "ws"; packageName = "ws"; - version = "7.5.8"; + version = "7.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz"; - sha512 = "ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; + sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; "xlsx-0.17.5" = { @@ -8293,6 +8797,15 @@ let sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; }; + "yallist-3.1.1" = { + name = "yallist"; + packageName = "yallist"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; + sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + }; + }; "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; @@ -8365,13 +8878,13 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "yargs-parser-21.0.1" = { + "yargs-parser-21.1.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "21.0.1"; + version = "21.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz"; - sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"; + sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw=="; }; }; "yup-0.32.11" = { @@ -8416,20 +8929,15 @@ in n8n = nodeEnv.buildNodePackage { name = "n8n"; packageName = "n8n"; - version = "0.186.0"; + version = "0.190.0"; src = fetchurl { - url = "https://registry.npmjs.org/n8n/-/n8n-0.186.0.tgz"; - sha512 = "2AGjWTEw0vvySVoBjuZogDXEtn0QTFhaOXF/l99jA+xI3P/QwAHGycdv/uBG9f5gMsvHtypSNX5lkx0NLUKWhg=="; + url = "https://registry.npmjs.org/n8n/-/n8n-0.190.0.tgz"; + sha512 = "FsvOBZL1FsFuZp9ut6+s97t/Oz5MAIpqNsS/Pdh4ZmJz5XoiTYn1UchlGF4NziUYzvWmdEV96uxo1IU/i8VtSw=="; }; dependencies = [ sources."@apidevtools/json-schema-ref-parser-8.0.0" sources."@apidevtools/openapi-schemas-2.1.0" - (sources."@apidevtools/swagger-cli-4.0.0" // { - dependencies = [ - sources."chalk-3.0.0" - sources."supports-color-7.2.0" - ]; - }) + sources."@apidevtools/swagger-cli-4.0.0" sources."@apidevtools/swagger-methods-3.0.2" (sources."@apidevtools/swagger-parser-9.0.1" // { dependencies = [ @@ -8441,17 +8949,17 @@ in sources."tslib-2.4.0" ]; }) - (sources."@azure/core-auth-1.3.2" // { + (sources."@azure/core-auth-1.4.0" // { dependencies = [ sources."tslib-2.4.0" ]; }) - (sources."@azure/core-client-1.6.0" // { + (sources."@azure/core-client-1.6.1" // { dependencies = [ sources."tslib-2.4.0" ]; }) - (sources."@azure/core-http-2.2.5" // { + (sources."@azure/core-http-2.2.6" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tough-cookie-4.0.0" @@ -8459,9 +8967,8 @@ in sources."universalify-0.1.2" ]; }) - (sources."@azure/core-lro-2.2.4" // { + (sources."@azure/core-lro-2.2.5" // { dependencies = [ - sources."@azure/core-tracing-1.0.0-preview.13" sources."tslib-2.4.0" ]; }) @@ -8470,8 +8977,10 @@ in sources."tslib-2.4.0" ]; }) - (sources."@azure/core-rest-pipeline-1.9.0" // { + (sources."@azure/core-rest-pipeline-1.9.1" // { dependencies = [ + sources."@tootallnate/once-2.0.0" + sources."http-proxy-agent-5.0.0" sources."tslib-2.4.0" ]; }) @@ -8504,17 +9013,17 @@ in sources."tslib-2.4.0" ]; }) - sources."@azure/msal-browser-2.27.0" - sources."@azure/msal-common-7.1.0" - sources."@azure/msal-node-1.11.0" + sources."@azure/msal-browser-2.28.1" + sources."@azure/msal-common-7.3.0" + sources."@azure/msal-node-1.12.1" (sources."@azure/storage-blob-12.11.0" // { dependencies = [ sources."@azure/core-tracing-1.0.0-preview.13" sources."tslib-2.4.0" ]; }) - sources."@babel/parser-7.18.8" - sources."@babel/runtime-7.18.6" + sources."@babel/parser-7.18.11" + sources."@babel/runtime-7.18.9" sources."@colors/colors-1.5.0" (sources."@dabh/diagnostics-2.0.3" // { dependencies = [ @@ -8522,9 +9031,9 @@ in sources."kuler-2.0.0" ]; }) - sources."@fontsource/open-sans-4.5.10" - sources."@fortawesome/fontawesome-common-types-6.1.1" - sources."@fortawesome/free-regular-svg-icons-6.1.1" + sources."@fontsource/open-sans-4.5.11" + sources."@fortawesome/fontawesome-common-types-6.1.2" + sources."@fortawesome/free-regular-svg-icons-6.1.2" (sources."@icetee/ftp-0.3.15" // { dependencies = [ sources."isarray-0.0.1" @@ -8548,9 +9057,16 @@ in sources."tslib-2.4.0" ]; }) - (sources."@oclif/core-1.9.5" // { + (sources."@oclif/core-1.13.10" // { dependencies = [ + (sources."chalk-4.1.2" // { + dependencies = [ + sources."supports-color-7.2.0" + ]; + }) + sources."supports-color-8.1.1" sources."tslib-2.4.0" + sources."wrap-ansi-7.0.0" ]; }) (sources."@oclif/errors-1.3.5" // { @@ -8558,18 +9074,20 @@ in sources."fs-extra-8.1.0" sources."jsonfile-4.0.0" sources."universalify-0.1.2" + sources."wrap-ansi-7.0.0" ]; }) (sources."@oclif/help-1.0.1" // { dependencies = [ sources."@oclif/config-1.18.2" + sources."chalk-4.1.2" sources."tslib-2.4.0" - sources."wrap-ansi-6.2.0" ]; }) sources."@oclif/linewrap-1.0.0" (sources."@oclif/parser-3.8.7" // { dependencies = [ + sources."chalk-4.1.2" sources."tslib-2.4.0" ]; }) @@ -8590,7 +9108,7 @@ in sources."@types/es-aggregate-error-1.0.2" sources."@types/express-4.17.13" sources."@types/express-jwt-0.0.42" - sources."@types/express-serve-static-core-4.17.29" + sources."@types/express-serve-static-core-4.17.30" sources."@types/express-unless-0.5.3" sources."@types/ftp-0.3.33" sources."@types/generic-pool-3.1.11" @@ -8599,11 +9117,12 @@ in sources."@types/json-schema-7.0.11" sources."@types/jsonwebtoken-8.5.8" sources."@types/lodash-4.14.182" + sources."@types/lodash.intersection-4.4.7" sources."@types/lossless-json-1.0.1" - sources."@types/mime-1.3.2" + sources."@types/mime-3.0.1" sources."@types/minimatch-3.0.5" sources."@types/multer-1.4.7" - sources."@types/node-18.0.3" + sources."@types/node-18.6.5" (sources."@types/node-fetch-2.6.2" // { dependencies = [ sources."form-data-3.0.1" @@ -8613,19 +9132,20 @@ in sources."@types/promise-ftp-common-1.1.0" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/serve-static-1.13.10" + sources."@types/serve-static-1.15.0" sources."@types/shelljs-0.8.11" sources."@types/snowflake-sdk-1.6.7" sources."@types/swagger-ui-express-4.1.3" sources."@types/tough-cookie-2.3.8" sources."@types/tunnel-0.0.3" sources."@types/yamljs-0.2.31" - sources."@vue/compiler-sfc-2.7.5" + sources."@vue/compiler-sfc-2.7.8" sources."abbrev-1.1.1" sources."accepts-1.3.8" sources."access-control-1.0.1" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-walk-8.2.0" + sources."address-1.2.0" sources."adler-32-1.2.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -8662,6 +9182,11 @@ in sources."asn1.js-rfc5280-3.0.0" sources."assert-options-0.7.0" sources."assert-plus-1.0.0" + (sources."ast-types-0.13.4" // { + dependencies = [ + sources."tslib-2.4.0" + ]; + }) sources."async-3.2.4" sources."async-validator-1.8.5" sources."asynckit-0.4.0" @@ -8671,8 +9196,9 @@ in sources."semver-6.3.0" ]; }) + sources."available-typed-arrays-1.0.5" sources."avsc-5.7.4" - (sources."aws-sdk-2.1173.0" // { + (sources."aws-sdk-2.1191.0" // { dependencies = [ sources."buffer-4.9.2" sources."events-1.1.1" @@ -8761,11 +9287,7 @@ in sources."adler-32-1.3.1" ]; }) - (sources."chalk-4.1.2" // { - dependencies = [ - sources."supports-color-7.2.0" - ]; - }) + sources."chalk-3.0.0" (sources."change-case-4.1.2" // { dependencies = [ sources."tslib-2.4.0" @@ -8784,8 +9306,10 @@ in sources."cli-cursor-3.1.0" (sources."cli-highlight-2.1.11" // { dependencies = [ + sources."chalk-4.1.2" sources."cliui-7.0.4" sources."parse5-5.1.1" + sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" @@ -8794,11 +9318,7 @@ in sources."cli-progress-3.11.2" sources."cli-width-3.0.0" sources."client-oauth2-4.3.3" - (sources."cliui-6.0.0" // { - dependencies = [ - sources."wrap-ansi-6.2.0" - ]; - }) + sources."cliui-6.0.0" sources."cluster-key-slot-1.1.0" sources."codepage-1.15.0" (sources."color-3.2.1" // { @@ -8845,7 +9365,8 @@ in sources."cookie-0.4.1" sources."cookie-parser-1.4.6" sources."cookie-signature-1.0.6" - sources."core-js-3.23.4" + sources."copy-to-2.0.1" + sources."core-js-3.24.1" sources."core-util-is-1.0.3" sources."crc-32-1.2.2" sources."cron-1.7.2" @@ -8863,12 +9384,16 @@ in sources."cssfilter-0.0.10" sources."csstype-3.1.0" sources."dashdash-1.14.1" + sources."data-uri-to-buffer-3.0.1" sources."debug-4.3.4" sources."debuglog-1.0.1" sources."decamelize-1.2.0" + sources."deep-is-0.1.4" 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."degenerator-3.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-1.5.1" @@ -8877,6 +9402,11 @@ in sources."detect-libc-2.0.1" sources."diagnostics-1.1.1" sources."difflib-0.2.4" + (sources."digest-header-0.0.1" // { + dependencies = [ + sources."utility-0.1.11" + ]; + }) sources."dir-glob-3.0.1" sources."discontinuous-range-1.0.0" sources."dom-serializer-1.4.1" @@ -8912,8 +9442,11 @@ in sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-4.0.0" + sources."escodegen-1.14.3" sources."eslint-config-riot-1.0.0" sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" sources."etag-1.8.1" sources."events-3.3.0" sources."eventsource-2.0.2" @@ -8933,11 +9466,13 @@ in ]; }) sources."extend-3.0.2" + sources."extend-shallow-2.0.1" sources."external-editor-3.1.0" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" sources."fecha-4.2.3" sources."fflate-0.7.3" @@ -8947,6 +9482,7 @@ in ]; }) sources."file-type-14.7.1" + sources."file-uri-to-path-2.0.0" (sources."filelist-1.0.4" // { dependencies = [ sources."minimatch-5.1.0" @@ -8967,12 +9503,24 @@ in sources."forever-agent-0.6.1" sources."form-data-4.0.0" sources."formidable-1.2.6" + (sources."formstream-1.1.1" // { + dependencies = [ + sources."mime-2.6.0" + ]; + }) sources."forwarded-0.2.0" sources."frac-1.1.2" sources."fresh-0.5.2" sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" + (sources."ftp-0.3.10" // { + dependencies = [ + sources."isarray-0.0.1" + sources."readable-stream-1.1.14" + sources."string_decoder-0.10.31" + ]; + }) sources."function-bind-1.1.1" sources."function.prototype.name-1.1.5" sources."functions-have-names-1.2.3" @@ -8985,6 +9533,13 @@ in sources."get-port-5.1.1" sources."get-symbol-description-1.0.0" sources."get-system-fonts-2.0.2" + (sources."get-uri-3.0.2" // { + dependencies = [ + sources."fs-extra-8.1.0" + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" + ]; + }) sources."getpass-0.1.7" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -9036,6 +9591,7 @@ in sources."http-proxy-agent-4.0.1" sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.1" + sources."humanize-ms-1.2.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."ics-2.37.0" @@ -9052,24 +9608,32 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-7.3.3" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) sources."internal-slot-1.0.3" sources."interpret-1.4.0" sources."ioredis-4.28.5" + sources."ip-1.1.8" sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" + sources."is-arguments-1.1.1" sources."is-arrayish-0.3.2" sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" sources."is-callable-1.2.4" - sources."is-core-module-2.9.0" + sources."is-core-module-2.10.0" sources."is-date-object-1.0.5" sources."is-docker-2.2.1" + sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" + sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" sources."is-nan-1.3.2" sources."is-negated-glob-1.0.0" @@ -9086,6 +9650,7 @@ in sources."is-stream-2.0.1" sources."is-string-1.0.7" sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.9" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-weakref-1.0.2" @@ -9096,7 +9661,11 @@ in sources."isexe-2.0.0" sources."iso-639-1-2.1.15" sources."isstream-0.1.2" - sources."jake-10.8.5" + (sources."jake-10.8.5" // { + dependencies = [ + sources."chalk-4.1.2" + ]; + }) sources."jmespath-0.16.0" sources."join-component-1.1.0" sources."js-md4-0.3.2" @@ -9129,13 +9698,14 @@ in sources."kafkajs-1.16.0" sources."kuler-1.0.1" sources."leven-2.1.0" + sources."levn-0.3.0" sources."libbase64-1.2.1" (sources."libmime-5.1.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."libphonenumber-js-1.10.8" + sources."libphonenumber-js-1.10.11" sources."libqp-1.1.0" sources."limiter-1.1.5" sources."linkify-it-4.0.0" @@ -9143,6 +9713,7 @@ in dependencies = [ sources."cliui-7.0.4" sources."debug-4.3.2" + sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yargs-17.1.1" sources."yargs-parser-20.2.9" @@ -9156,6 +9727,7 @@ in sources."lodash.flatten-4.4.0" sources."lodash.get-4.4.2" sources."lodash.includes-4.3.0" + sources."lodash.intersection-4.4.0" sources."lodash.isarguments-3.1.0" sources."lodash.isboolean-3.0.3" sources."lodash.isequal-4.5.0" @@ -9164,8 +9736,10 @@ in sources."lodash.isplainobject-4.0.6" sources."lodash.isstring-4.0.1" sources."lodash.merge-4.6.2" + sources."lodash.omit-4.5.0" sources."lodash.once-4.1.1" sources."lodash.set-4.3.2" + sources."lodash.split-4.4.2" sources."lodash.throttle-4.1.1" sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" @@ -9221,7 +9795,7 @@ in ]; }) sources."minimist-1.2.6" - sources."minipass-3.3.4" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-0.5.6" (sources."mock-require-3.0.3" // { @@ -9248,29 +9822,29 @@ in ]; }) sources."ms-2.1.2" - (sources."mssql-8.1.2" // { + (sources."mssql-8.1.3" // { dependencies = [ - sources."commander-9.3.0" + sources."commander-9.4.0" ]; }) sources."multer-1.4.5-lts.1" sources."mute-stream-0.0.8" (sources."mysql2-2.3.3" // { dependencies = [ - sources."denque-2.0.1" + sources."denque-2.1.0" sources."iconv-lite-0.6.3" ]; }) sources."mz-2.7.0" - sources."n8n-core-0.126.0" - sources."n8n-design-system-0.26.0" - sources."n8n-editor-ui-0.152.0" - (sources."n8n-nodes-base-0.184.0" // { + sources."n8n-core-0.130.0" + sources."n8n-design-system-0.30.0" + sources."n8n-editor-ui-0.156.0" + (sources."n8n-nodes-base-0.188.0" // { dependencies = [ sources."iconv-lite-0.6.3" ]; }) - sources."n8n-workflow-0.108.0" + sources."n8n-workflow-0.112.0" (sources."named-placeholders-1.1.2" // { dependencies = [ sources."lru-cache-4.1.5" @@ -9288,6 +9862,7 @@ in }) sources."negotiator-0.6.3" sources."neo-async-2.6.2" + sources."netmask-2.0.2" sources."nice-try-1.0.5" (sources."no-case-3.0.4" // { dependencies = [ @@ -9299,8 +9874,8 @@ in sources."node-ensure-0.0.0" sources."node-fetch-2.6.7" sources."node-html-markdown-1.2.0" - sources."node-html-parser-5.3.3" - sources."node-ssh-12.0.4" + sources."node-html-parser-5.4.1" + sources."node-ssh-12.0.5" sources."nodeify-1.0.1" sources."nodemailer-6.7.7" sources."nopt-5.0.0" @@ -9314,7 +9889,7 @@ in sources."object-inspect-1.12.2" sources."object-keys-1.1.1" sources."object-treeify-1.1.33" - sources."object.assign-4.1.2" + sources."object.assign-4.1.3" sources."object.getownpropertydescriptors-2.1.4" sources."on-finished-2.4.1" sources."on-headers-1.0.2" @@ -9326,8 +9901,11 @@ in sources."openapi-types-10.0.0" sources."openurl-1.1.1" sources."optional-require-1.1.8" + sources."optionator-0.8.3" sources."ordered-read-streams-1.0.1" + sources."os-name-1.0.3" sources."os-tmpdir-1.0.2" + sources."osx-release-1.1.0" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -9335,6 +9913,8 @@ in sources."p-map-2.1.0" sources."p-timeout-3.2.0" sources."p-try-2.2.0" + sources."pac-proxy-agent-5.0.0" + sources."pac-resolver-5.0.1" sources."packet-reader-1.0.0" (sources."param-case-3.0.4" // { dependencies = [ @@ -9375,6 +9955,7 @@ in sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."pause-0.0.1" + sources."pause-stream-0.0.11" (sources."pdf-parse-1.1.1" // { dependencies = [ sources."debug-3.2.7" @@ -9408,11 +9989,12 @@ in sources."popsicle-transport-http-1.2.1" sources."popsicle-transport-xhr-2.0.0" sources."popsicle-user-agent-1.0.0" - sources."postcss-8.4.14" + sources."postcss-8.4.16" 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."prelude-ls-1.1.2" sources."printj-1.1.2" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -9428,6 +10010,12 @@ in sources."promise.prototype.finally-3.1.3" sources."property-expr-2.0.5" 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."pseudomap-1.0.2" sources."psl-1.9.0" @@ -9483,7 +10071,6 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."requestretry-7.1.0" sources."require-at-1.0.6" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -9548,21 +10135,22 @@ in sources."shelljs-0.8.5" (sources."showdown-2.1.0" // { dependencies = [ - sources."commander-9.3.0" + sources."commander-9.4.0" ]; }) sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.10.0" + sources."simple-git-3.12.0" sources."simple-lru-cache-0.0.2" sources."simple-swizzle-0.2.2" sources."slash-3.0.0" + sources."smart-buffer-4.2.0" (sources."snake-case-3.0.4" // { dependencies = [ sources."tslib-2.4.0" ]; }) - (sources."snowflake-sdk-1.6.11" // { + (sources."snowflake-sdk-1.6.12" // { dependencies = [ sources."axios-0.27.2" sources."debug-3.2.7" @@ -9571,6 +10159,12 @@ in sources."uuid-3.4.0" ]; }) + (sources."socks-2.7.0" // { + dependencies = [ + sources."ip-2.0.0" + ]; + }) + sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."spex-3.2.0" @@ -9580,7 +10174,7 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."sqlite3-5.0.8" + sources."sqlite3-5.0.11" sources."sqlstring-2.3.3" sources."sse-channel-3.1.1" sources."ssf-0.11.2" @@ -9610,15 +10204,11 @@ in }) sources."strip-ansi-6.0.1" sources."strtok3-6.3.0" - sources."supports-color-8.1.1" - (sources."supports-hyperlinks-2.2.0" // { - dependencies = [ - sources."supports-color-7.2.0" - ]; - }) + sources."supports-color-7.2.0" + sources."supports-hyperlinks-2.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."swagger-ui-dist-4.12.0" - sources."swagger-ui-express-4.4.0" + sources."swagger-ui-dist-4.13.2" + sources."swagger-ui-express-4.5.0" (sources."tar-6.1.11" // { dependencies = [ sources."mkdirp-1.0.4" @@ -9671,6 +10261,7 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-0.0.6" @@ -9679,19 +10270,22 @@ in dependencies = [ sources."argparse-2.0.1" sources."buffer-6.0.3" + sources."chalk-4.1.2" sources."cliui-7.0.4" sources."js-yaml-4.1.0" sources."mkdirp-1.0.4" sources."tslib-2.4.0" + sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.1" ]; }) sources."uc.micro-1.0.6" sources."uid-safe-2.1.5" sources."unbox-primitive-1.0.2" sources."unc-path-regex-0.1.2" + sources."unescape-1.0.1" sources."unique-stream-2.3.1" sources."universalify-2.0.0" sources."unpipe-1.0.0" @@ -9712,14 +10306,23 @@ in ]; }) sources."url-parse-1.5.10" + (sources."urllib-2.38.1" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + sources."statuses-1.5.0" + ]; + }) (sources."utf7-1.0.2" // { dependencies = [ sources."semver-5.3.0" ]; }) sources."utf8-2.1.2" + sources."util-0.12.4" sources."util-deprecate-1.0.2" sources."util.promisify-1.1.1" + sources."utility-1.17.0" sources."utils-merge-1.0.1" sources."uuencode-0.0.4" sources."uuid-8.3.2" @@ -9732,18 +10335,25 @@ in ]; }) sources."vm2-3.9.10" - sources."vue-2.7.5" + sources."vue-2.7.8" sources."vue-color-2.8.1" sources."vue-fragment-1.5.1" sources."vue-i18n-8.27.2" sources."vue2-boring-avatars-0.3.4" + sources."vue2-teleport-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" + sources."which-typed-array-1.1.8" sources."wide-align-1.1.5" sources."widest-line-3.1.0" + (sources."win-release-1.1.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) (sources."winston-3.8.1" // { dependencies = [ sources."readable-stream-3.6.0" @@ -9756,10 +10366,11 @@ in }) sources."wmf-1.0.2" sources."word-0.3.0" + sources."word-wrap-1.2.3" sources."wordwrap-1.0.0" - sources."wrap-ansi-7.0.0" + sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xlsx-0.17.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" diff --git a/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix index f90ec3644c..94a7910029 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nali/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nali"; - version = "0.4.2"; + version = "0.5.0"; src = fetchFromGitHub { owner = "zu1k"; repo = "nali"; rev = "v${version}"; - sha256 = "sha256-7NUUX4hDwvMBBQvxiB7P/lNHKgxwOFObdD6DUd0vX5c="; + sha256 = "sha256-rK+UKECwG+2WcltV4zhODSFZ1EGkmLTBggLgKGMCAGI="; }; - vendorSha256 = "sha256-Ld5HehK5MnPwl6KtIl0b4nQRiXO4DjKVPL1iti/WBIQ="; + vendorSha256 = "sha256-pIJsCBevCVMg6NXc96f6hAbFK5VKwjFwCe34A+54NW8="; subPackages = [ "." ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix index 50ad2d312f..af9812e8fc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "ncgopher"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "jansc"; repo = "ncgopher"; rev = "v${version}"; - sha256 = "sha256-1tiijW3q/8zS9437G9gJDzBtxqVE3QUxgw74P7rcv98="; + sha256 = "sha256-GLt+ByZzQ9v+PPyebTa8LFqySixXw85RjGZ2e3yLRss="; }; - cargoSha256 = "sha256-LA8LjY8oZslGFQhKR8fJ2heYxSBqUnmeejXKRvZXjIs="; + cargoSha256 = "sha256-VI+BTxgocv434wTr7nBeJRdt12wE53fEeqczE3o3768="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix index 4d62cc4c82..868729514d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -19,15 +19,16 @@ , libsecret , gobject-introspection , glib-networking +, gitUpdater }: stdenv.mkDerivation rec { pname = "liferea"; - version = "1.13.8"; + version = "1.13.9"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "0x2857nhn98hlzqxmxb2h2wcasr5jkhciih71wcnp0cja60aw20h"; + sha256 = "IP3TSmnRekFebxeBh5JRegeSedx+y24e4X9muMAyhFk="; }; nativeBuildInputs = [ @@ -69,6 +70,12 @@ stdenv.mkDerivation rec { gappsWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH") ''; + passthru.updateScript = gitUpdater { + inherit pname version; + url = "https://github.com/lwindolf/${pname}"; + rev-prefix = "v"; + }; + meta = with lib; { description = "A GTK-based news feed aggregator"; homepage = "http://lzone.de/liferea/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/raven-reader/default.nix index f458efd92e..360a93b5ed 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/newsreaders/raven-reader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -2,10 +2,10 @@ let pname = "raven-reader"; - version = "1.0.73"; + version = "1.0.74"; src = fetchurl { url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; - sha256 = "sha256-wU99+nDXHGMad94qszw5uThKckk1ToUvjNrIf/yTeTM="; + sha256 = "sha256-BwJK0V19aLpTRa/7wzlWdALiJrOhfejCkKCGrZyA5EQ="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index 0a5f465946..ec2d717e35 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.5.2"; + version = "3.5.4"; outputs = [ "out" "dev" ]; @@ -34,7 +34,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-lNsAdYErd3m1bNhvSDVJ5Rfqt8lutNJ1+2DCmntL6pM="; + sha256 = "sha256-ennKNUuoyhpVfG1XPzJKrop0i77BAB3C2MNqZPOXNkc="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix index 9b5b27e7ca..3ba4f6ac57 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/opsdroid/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonPackage rec { meta = with lib; { description = "An open source chat-ops bot framework"; homepage = "https://opsdroid.dev"; - maintainers = with maintainers; [ fpletz globin willibutz lheckemann ]; + maintainers = with maintainers; [ globin willibutz ]; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix index 49d21bbf33..c5966ae13f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/deluge/default.nix @@ -43,7 +43,7 @@ pythonPackages.buildPythonPackage rec { librsvg ]; - nativeBuildInputs = [ intltool wrapGAppsHook glib ]; + nativeBuildInputs = [ gobject-introspection intltool wrapGAppsHook glib ]; checkInputs = with pythonPackages; [ pytestCheckHook diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix index 3b88ffb11d..6b49416173 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/gnunet/default.nix @@ -3,15 +3,15 @@ , makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib , libpulseaudio, libopus, libogg, jansson, libsodium -, postgresqlSupport ? false, postgresql }: +, postgresqlSupport ? true, postgresql }: stdenv.mkDerivation rec { pname = "gnunet"; - version = "0.17.1"; + version = "0.17.2"; src = fetchurl { url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz"; - sha256 = "sha256-dd4KcV4+lpKGSD7GrkslqHNlZk1CzftgbfjnRqFfEmU="; + sha256 = "sha256-OLE7V44kkKmSInV8ZHJ965eTn995cQf5hih8KUTudUE="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix index 3fb48dd6a5..47fe3e97c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -12,13 +12,13 @@ assert trackerSearch -> (python3 != null); with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.4.3"; + version = "4.4.3.1"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qBittorrent"; rev = "release-${version}"; - sha256 = "sha256-Gcjs7Yueuw76/4is4ZyvlVr6xZ8D+So1+PjZGg6Curk="; + sha256 = "sha256-byA6bzGdigmVptUFdgBjyg6Oimn5L6l1DDOuuBjwO0s="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix index 4cb3a43640..49905cdbd2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/pcloud/default.nix @@ -26,13 +26,12 @@ let pname = "pcloud"; - version = "1.9.7"; - code = "XZ0FAtXZNxFJbda6KhLejU9tKAg4N0TEqx3V"; - - # Archive link's code thanks to: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pcloud-drive + version = "1.9.9"; + code = "XZWTVkVZQM0GNXA4hrFGPkefzUUWVLKOpPIX"; + # 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-6eMRFuZOLcoZd2hGw7QV+kAmzE5lK8uK6ZpGs4n7/zw="; + hash = "sha256-8566vKrE3/QCm4qW9KxEAO+r+YfMRYOhV2Da7qic48M="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix index 81195c4e21..51a51b3fb1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/powerdns-admin/default.nix @@ -29,7 +29,7 @@ let }; pythonDeps = with python.pkgs; [ - flask flask_assets flask_login flask_sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify + flask flask_assets flask_login flask-sqlalchemy flask_migrate flask-seasurf flask_mail flask-session flask-sslify mysqlclient psycopg2 sqlalchemy cffi configobj cryptography bcrypt requests ldap pyotp qrcode dnspython gunicorn python3-saml pytz cssmin rjsmin authlib bravado-core diff --git a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix index d56197c313..a7954bcc57 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protonmail-bridge"; - version = "2.1.1"; + version = "2.1.3"; src = fetchFromGitHub { owner = "ProtonMail"; repo = "proton-bridge"; rev = "br-${version}"; - sha256 = "sha256-8oDA1QU5ZjtQZoCPVDa1U3P2KLzXtegtOxm6rNh+Ahk="; + sha256 = "sha256-+XeNhjwtH1T5p8iydMQk22nXztyamSn6yY56/qqvkmk="; }; - vendorSha256 = "sha256-n+WwkNHT+/CrC4vWIVHqYs2a8Qe/LNc0L3uoPZWDTts="; + vendorSha256 = "sha256-YTGjiteYfuRkDC4M9c/JKqURq4WiC5n9pFRqRVYhyxU="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix index e34d6495d9..321d1268ca 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/r53-ddns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "r53-ddns"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "fleaz"; repo = "r53-ddns"; rev = "v${version}"; - sha256 = "sha256:1pvd1karq1p81rkq2n7mh040n29f7wb8701ax6g2sqm1yz7gxd08"; + sha256 = "sha256-KJAPhSGaC3upWLfo2eeSD3Vit9Blmbol7s8y3f849N4="; }; - vendorSha256 = "sha256:1jhwds57gi548ahnh5m342csrs5rv9ysy7fqmfvg5w2s9slswq77"; + vendorSha256 = "sha256-KkyMd94cejWkgg/RJudy1lm/M3lsEJXFGqVTzGIX3qM="; meta = with lib; { license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix index 5e1b831f73..9f4fa9ce75 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/citrix-workspace/sources.nix @@ -87,6 +87,17 @@ let 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 = "a17e4478ad3eac4b0cbc9fb7be0dba2758393ba2d3b6a82b3074ff053586c5f5"; + x86hash = "f08d9c83a1af7873cbb864b26ec24d731fdc2e5045adee982eeef4083982c5bc"; + x64suffix = "20"; + x86suffix = "20"; homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix index 99a81fd1a8..c769b7de6c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/freerdp/default.nix @@ -52,13 +52,13 @@ let in stdenv.mkDerivation rec { pname = "freerdp"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; rev = version; - sha256 = "sha256-XBYRhbwknVa8eXxk31b7n9gMWBcTjCecDN+j2FGcpw0="; + sha256 = "sha256-bVq/99jMkxTjckMjWoK4pBa0jD/AYezgKUPJziNSqI0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index 9721c6b9ba..20496f38e8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, cmake, ninja, pkg-config, wrapGAppsHook -, glib, gtk3, gettext, libxkbfile, libX11 +, glib, gtk3, gettext, libxkbfile, libX11, python3 , freerdp, libssh, libgcrypt, gnutls, vte , pcre2, libdbusmenu-gtk3, libappindicator-gtk3 , libvncserver, libpthreadstubs, libXdmcp, libxkbcommon @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.25"; + version = "1.4.27"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-1val/KCClEtw1prVWuXJe8DmmQ7e7oqwAfAnT9G9iHI="; + sha256 = "sha256-WIppHK4ucvKqgXB8VPy9ldbw22ZuDaEn1gNaLpyb4jA="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libvncserver libpthreadstubs libXdmcp libxkbcommon libsoup spice-protocol spice-gtk libepoxy at-spi2-core openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk - harfbuzz + harfbuzz python3 ] ++ optionals withLibsecret [ libsecret ] ++ optionals withVte [ vte ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix index 1338f3e56f..bf236e179c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seahub/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , python3 , makeWrapper +, nixosTests }: let # Seahub 8.x.x does not support django-webpack-loader >=1.x.x @@ -19,13 +20,13 @@ let in python.pkgs.buildPythonApplication rec { pname = "seahub"; - version = "8.0.8"; + version = "9.0.6"; src = fetchFromGitHub { owner = "haiwen"; repo = "seahub"; - rev = "c51346155b2f31e038c3a2a12e69dcc6665502e2"; # using a fixed revision because upstream may re-tag releases :/ - sha256 = "0dagiifxllfk73xdzfw2g378jccpzplhdrmkwbaakbhgbvvkg92k"; + rev = "876b7ba9b680fc668e89706aff535593772ae921"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "sha256-GHvJlm5DVt3IVJnqJu8YobNNqbjdPd08s4DCdQQRQds="; }; dontBuild = true; @@ -39,6 +40,7 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ django future + django-compressor django-statici18n django-webpack-loader django-simple-captcha @@ -47,11 +49,11 @@ python.pkgs.buildPythonApplication rec { mysqlclient pillow python-dateutil - django_compressor djangorestframework openpyxl requests requests-oauthlib + chardet pyjwt pycryptodome qrcode @@ -68,7 +70,10 @@ python.pkgs.buildPythonApplication rec { passthru = { inherit python; - pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs; + pythonPath = python.pkgs.makePythonPath propagatedBuildInputs; + tests = { + inherit (nixosTests) seafile; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index e9dc1eb492..1dab78a8fc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { meta = with lib; { description = "Simple and highly scalable distributed file system"; homepage = "https://github.com/chrislusf/seaweedfs"; - maintainers = with maintainers; [ cmacrae raboof ]; + maintainers = with maintainers; [ cmacrae ]; mainProgram = "weed"; license = licenses.asl20; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index 531c0f9658..da0e03a272 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "WSK2b1DYSYEFqmVIOlhjFGyqC9ok/9rWAz2ZgUZejzo="; + sha256 = "WcxRVup7wjA9YNyL6UpFoMfkCmXixfbYatcrmA4OHh4="; }; modRoot = "./agent"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index b749055861..2f41d0ec55 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -59,10 +59,6 @@ in stdenv.mkDerivation { sed -i -e '1i cmake_policy(SET CMP0025 NEW)' CMakeLists.txt ''; - preBuild = '' - export LD_LIBRARY_PATH="$PWD/run" - ''; - postInstall = '' # to remove "cycle detected in the references" mkdir -p $dev/lib/wireshark diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix index 7b6316631e..d2c6620b8d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/onedrive/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.4.19"; + version = "2.4.20"; src = fetchFromGitHub { owner = "abraunegg"; repo = pname; rev = "v${version}"; - hash = "sha256-7kX7gC/1jSZGgV3ZhfebMIn/Y5gXkz22GDP2zpiwUZ4="; + hash = "sha256-2sDs4AhiyccVpnfCGPBL+QifQGStbrzSUIL547kh2ko="; }; nativeBuildInputs = [ autoreconfHook ldc installShellFiles pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index c93f35bff9..cdef1fdab5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.59.0"; + version = "1.59.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-SHUAEjdcqzNiIxSsmYb71JiOhWPoi8Z2nJAReRw2M5k="; + sha256 = "sha256-eblCMe9ywJztjsWmngUkB/IE2ePI9Yin2jkxBW0tTbQ="; }; - vendorSha256 = "sha256-ajOUvZ/0D8QL4MY6xO+hZziyUtIB0WQERU6Ov06K9I8="; + vendorSha256 = "sha256-MZ5RtB4UGHPlMxyQ0VbX5iPpZw98oUuEhuMBDZcYiw8="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix index 497b91ad36..97ee3ed586 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/unison/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "unison"; - version = "2.52.0"; + version = "2.52.1"; src = fetchFromGitHub { owner = "bcpierce00"; repo = "unison"; rev = "v${version}"; - sha256 = "sha256-YCuXkHqY+JHsguvst2UkI/6YlFt3iTvchO8PQuS15nI="; + sha256 = "sha256-taA8eZ/wOe9uMccXVYfe34/XzWgqYKA3tLZnIOahOrQ="; }; nativeBuildInputs = [ makeWrapper ] diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix index 53a112790b..f24e1255d5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/wdt/default.nix @@ -1,14 +1,26 @@ -{ stdenv, lib, fetchFromGitHub, cmake, folly, boost, gflags, glog, openssl, double-conversion, fmt }: +{ stdenv +, lib +, fetchFromGitHub +, cmake +, folly +, boost +, gflags +, glog +, openssl +, double-conversion +, fmt +, unstableGitUpdater +}: stdenv.mkDerivation { pname = "wdt"; - version = "unstable-2022-03-24"; + version = "unstable-2022-07-08"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "43319e59d0c77092468367cdadab37d12d7a2383"; - sha256 = "sha256-MajYK2eTUbWhEql0iTlgW5yLg9xAGZQk+Dx4fNxFFqw="; + rev = "8f01b7558a80e5f08b06244d2821c3eb5c1d6e9b"; + sha256 = "sha256-ozii7EA3j3F/o+lE2mPsUY5lrm3OOtK75gjGkrvoaQ0="; }; nativeBuildInputs = [ cmake ]; @@ -24,6 +36,10 @@ stdenv.mkDerivation { "-DWDT_USE_SYSTEM_FOLLY=ON" ]; + passthru = { + updateScript = unstableGitUpdater { }; + }; + meta = with lib; { description = "Warp speed Data Transfer"; homepage = "https://github.com/facebook/wdt"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index f09f9fb45a..6fdc0e0d00 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -4,13 +4,13 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.20.3"; + version = "1.20.4"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - hash = "sha256-8sxCTPFdf5VDysANUYqic6zq5gipTL6wmPXstJc+6bA="; + hash = "sha256-umnlYvCtT+76Yer17T7ZvWJ5sUdXu+7kiRikrmWrIM8="; }; vendorSha256 = "sha256-CJFKY69Iz8GrVpvUdDveMQQFj6RXApfgYjP7B1wfgfo="; @@ -34,9 +34,8 @@ let inherit postInstall; - passthru.tests = with nixosTests; { - init = syncthing-init; - relay = syncthing-relay; + passthru.tests = { + inherit (nixosTests) syncthing syncthing-init syncthing-relay; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix index 69468c0a4d..f86be07dfe 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/synology-drive-client/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, qt5, fetchurl, autoPatchelfHook, dpkg, glibc, cpio, xar, undmg, gtk3, pango }: +{ stdenv, lib, writeScript, qt5, fetchurl, autoPatchelfHook, dpkg, glibc, cpio, xar, undmg, gtk3, pango, libxcb }: let pname = "synology-drive-client"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; - buildNumber = "12920"; - version = "3.1.0"; + version = "3.1.0-12923"; + 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."; homepage = "https://www.synology.com/en-global/dsm/feature/drive"; @@ -12,18 +12,29 @@ let maintainers = with maintainers; [ jcouyang MoritzBoehme ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; + passthru.updateScript = writeScript "update-synology-drive-client" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl common-updater-scripts + + set -eu -o pipefail + + version="$(curl -s https://www.synology.com/en-uk/releaseNote/SynologyDriveClient \ + | grep -oP '(?<=data-version=")(\d.){2}\d-\d{5}' \ + | head -1)" + update-source-version synology-drive-client "$version" + ''; linux = qt5.mkDerivation { - inherit pname version meta; + inherit pname version meta passthru; src = fetchurl { - url = "${baseUrl}/${version}-${buildNumber}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-UAO/LwqPchIMhjdQP4METjVorMJsbvIDRkp4JxtZgOs="; + url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; + sha256 = "sha256-gL08uJbA2S+SuP1afMBmcJMIcu7QRzdiXgIMxSZQl/I="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; - buildInputs = [ glibc gtk3 pango ]; + buildInputs = [ glibc gtk3 pango libxcb ]; unpackPhase = '' mkdir -p $out @@ -44,11 +55,11 @@ let }; darwin = stdenv.mkDerivation { - inherit pname version meta; + inherit pname version meta passthru; src = fetchurl { - url = "${baseUrl}/${version}-${buildNumber}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "15wici8ycil1mfh5cf89rfan4kb93wfkdsd4kmpvzjj4bnddwlxa"; + url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; + sha256 = "0pwm2xi1b9p9zmhy4dhix3aas49i183wxslyidfwvlaphic9qkxm"; }; nativeBuildInputs = [ cpio xar undmg ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix index c7ae7e4094..7119b0de4c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/taler/default.nix @@ -1,58 +1,122 @@ -{ lib, stdenv, fetchurl, curl, gnunet, jansson, libgcrypt, libmicrohttpd -, qrencode, libsodium, libtool, pkg-config, postgresql, sqlite }: +{ lib, stdenv, fetchgit, curl, gnunet, jansson, libgcrypt, libmicrohttpd_0_9_72 +, qrencode, libsodium, libtool, libunistring, pkg-config, postgresql +, autoreconfHook, python39, recutils, wget, jq, gettext, texinfo +}: let - gnunet' = gnunet.override { postgresqlSupport = true; }; - - mkTaler = { pname, version, sha256 }: - extraAttrs: - stdenv.mkDerivation (extraAttrs // { - inherit pname version; - src = fetchurl { - url = "mirror://gnu/taler/${pname}-${version}.tar.gz"; - inherit sha256; - }; - enableParallelBuilding = true; - meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); - description = "Anonymous, taxable payment system."; - homepage = "https://taler.net/"; - license = licenses.agpl3Plus; - maintainers = with maintainers; [ ehmry ]; - platforms = platforms.gnu ++ platforms.linux; - }; - }); + taler-merchant-backoffice = fetchgit { + url = "https://git.taler.net/merchant-backoffice.git"; + # branch "prebuilt" as of 2022-07-01 + rev = "1ef7150f32960cb65ebea67839cd5023f29a3d1d"; + sha256 = "sha256-ZtLYWHi6l5DxFvDm8RFGUD0BiAfJXCZr/ggrP3Uw7/0="; + }; in rec { - - taler-exchange = mkTaler { + taler-exchange = stdenv.mkDerivation rec { pname = "taler-exchange"; - version = "0.8.1"; - sha256 = "sha256-MPt3n1JXd0Y89b1qCuF6YxptSr7henfYp97JTq1Z+x4="; - } { - buildInputs = [ - curl - jansson - libgcrypt - libmicrohttpd - libsodium - libtool - postgresql - # sqlite + version = "unstable-2022-07-17"; + + src = fetchgit { + url = "https://git.taler.net/exchange.git"; + rev = "93b45e62eef254eae68bc119b9770e97bae2c9fa"; + fetchSubmodules = true; + sha256 = "sha256-BQxbwEf0wIkBOBVsPgMkMvUj4kFReXMUFTiSG0jXOJ0="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config ]; - propagatedBuildInputs = [ gnunet' ]; - patches = [ ./exchange-fix-6665.patch ]; + buildInputs = [ + libgcrypt + libmicrohttpd_0_9_72 + jansson + libsodium + postgresql + curl + recutils + gettext + texinfo # Fix 'makeinfo' is missing on your system. + libunistring + python39.pkgs.jinja2 + ]; + propagatedBuildInputs = [ gnunet ]; + + configureFlags = [ "--with-gnunet=${gnunet}" ]; + preConfigure = '' + ./contrib/gana-update.sh + ''; + + enableParallelBuilding = true; + + checkInputs = [ wget curl ]; + doInstallCheck = true; + checkTarget = "check"; + + meta = with lib; { + description = '' + Taler is an electronic payment system providing the ability to pay + anonymously using digital cash. Taler consists of a network protocol + definition (using a RESTful API over HTTP), a Exchange (which creates + digital coins), a Wallet (which allows customers to manage, store and + spend digital coins), and a Merchant website which allows customers to + spend their digital coins. Naturally, each Merchant is different, but + Taler includes code examples to help Merchants integrate Taler as a + payment system. + ''; + homepage = "https://taler.net/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ astro ]; + platforms = platforms.linux; + }; }; - taler-merchant = mkTaler { + taler-merchant = stdenv.mkDerivation rec { pname = "taler-merchant"; - version = "0.8.0"; - sha256 = "sha256-scrFLXeoQirGqhc+bSQKRl84PfUvjrp1uxF7pfOIB9Q="; - } { - nativeBuildInputs = [ pkg-config ]; - buildInputs = taler-exchange.buildInputs ++ [ qrencode taler-exchange ]; - propagatedBuildInputs = [ gnunet' ]; - PKG_CONFIG = "${pkg-config}/bin/pkg-config"; - }; + version = "unstable-2022-07-11"; + src = fetchgit { + url = "https://git.taler.net/merchant.git"; + rev = "60dcacf25e51cc2bff359ea1fc86cdd3d9e6083"; + sha256 = "sha256-Wn11z6YjnylZl3z2JjBlrtZ1KHfQUHLIYWo5F+mAmNo="; + }; + postUnpack = '' + ln -s ${taler-merchant-backoffice}/spa.html $sourceRoot/contrib/ + ''; + + nativeBuildInputs = [ pkg-config autoreconfHook ]; + buildInputs = taler-exchange.buildInputs ++ [ + qrencode + taler-exchange + # for ltdl.h + libtool + ]; + propagatedBuildInputs = [ gnunet ]; + + configureFlags = [ + "--with-gnunet=${gnunet}" + "--with-exchange=${taler-exchange}" + ]; + + enableParallelBuilding = true; + + checkInputs = [ jq ]; + doInstallCheck = true; + checkTarget = "check"; + + meta = with lib; { + description = '' + This is the GNU Taler merchant backend. It provides the logic that should run + at every GNU Taler merchant. The GNU Taler merchant is a RESTful backend that + can be used to setup orders and process payments. This component allows + merchants to receive payments without invading the customers' privacy. Of + course, this applies mostly for digital goods, as the merchant does not need + to know the customer's physical address. + ''; + homepage = "https://taler.net/"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ astro ]; + platforms = platforms.linux; + }; + }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/taler/exchange-fix-6665.patch b/third_party/nixpkgs/pkgs/applications/networking/taler/exchange-fix-6665.patch deleted file mode 100644 index e648123d26..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/taler/exchange-fix-6665.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit 9911b327ac299ec7eeae81b98cb520f4153071f2 -Author: Christian Grothoff -Date: Wed Dec 9 07:25:26 2020 +0100 - - fix #6665 - -diff --git a/src/testing/testing_api_cmd_rewind.c b/src/testing/testing_api_cmd_rewind.c -index e1b17fa9..979607cd 100644 ---- a/src/testing/testing_api_cmd_rewind.c -+++ b/src/testing/testing_api_cmd_rewind.c -@@ -24,7 +24,6 @@ - */ - #include "platform.h" - #include "taler_exchange_service.h" --#include "taler/taler_testing_lib.h" - #include "taler_testing_lib.h" - - -diff --git a/src/testing/testing_api_cmd_twister_exec_client.c b/src/testing/testing_api_cmd_twister_exec_client.c -index 2cb92a8f..b3903f29 100644 ---- a/src/testing/testing_api_cmd_twister_exec_client.c -+++ b/src/testing/testing_api_cmd_twister_exec_client.c -@@ -26,7 +26,7 @@ - */ - - #include "platform.h" --#include -+#include "taler_testing_lib.h" - #include "taler_twister_testing_lib.h" - - -diff --git a/src/testing/testing_api_trait_uuid.c b/src/testing/testing_api_trait_uuid.c -index c9b73a5b..4d5003ec 100644 ---- a/src/testing/testing_api_trait_uuid.c -+++ b/src/testing/testing_api_trait_uuid.c -@@ -22,9 +22,9 @@ - * @author Jonathan Buchanan - */ - #include "platform.h" --#include --#include --#include -+#include "taler_signatures.h" -+#include "taler_exchange_service.h" -+#include "taler_testing_lib.h" - - - #define TALER_TESTING_TRAIT_UUID "uuid" diff --git a/third_party/nixpkgs/pkgs/applications/networking/tcping-go/default.nix b/third_party/nixpkgs/pkgs/applications/networking/tcping-go/default.nix new file mode 100644 index 0000000000..b7f8ceb6d6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/tcping-go/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule { + pname = "tcping-go"; + version = "unstable-2022-05-28"; + + src = fetchFromGitHub { + owner = "cloverstd"; + repo = "tcping"; + rev = "83f644c761819f7c4386f0645cd0a337eccfc62e"; + sha256 = "sha256-GSkNfaGMJbBqDg8DKhDtLAuUg1yF3FbBdxcf4oG50rI="; + }; + + vendorSha256 = "sha256-Q+aFgi7GCAn3AxDuGtRG4DdPhI7gQKEo7A9iu1YcTsQ="; + + meta = with lib; { + description = "Ping over TCP instead of ICMP, written in Go"; + homepage = "https://github.com/cloverstd/tcping"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix b/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix index e003c3a0e5..02a69a0fe1 100644 --- a/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/PageEdit/default.nix @@ -13,7 +13,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake qttranslations ]; propagatedBuildInputs = [ qtsvg qtwebengine ]; - cmakeFlags = "-DINSTALL_BUNDLED_DICTS=0"; + cmakeFlags = [ "-DINSTALL_BUNDLED_DICTS=0" ]; meta = with lib; { description = "ePub XHTML Visual Editor"; diff --git a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix index 5f8d3adf8c..c716323d4f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/beamerpresenter/default.nix @@ -1,39 +1,28 @@ -{ lib, - stdenv, - fetchFromGitHub, - installShellFiles, - pkg-config, - cmake, - qtbase, - qtmultimedia, - qttools, - wrapQtAppsHook, - bash, - zlib, - gcc, - gnumake, - coreutils, - # only required when using poppler - poppler, - # only required when using mupdf - mupdf, - freetype, - jbig2dec, - openjpeg, - gumbo, - # choose renderer: mupdf or poppler or both (not recommended) - renderer ? "mupdf", - # choose major Qt version: "5" or "6" (only 5 is tested) - qt_version ? "5"}: - -let - renderers = { - mupdf.buildInputs = [ mupdf freetype jbig2dec openjpeg gumbo ]; - poppler.buildInputs = [ poppler ]; - }; - use_poppler = if "${renderer}" == "poppler" || "${renderer}" == "both" then "ON" else "OFF"; - use_mupdf = if "${renderer}" == "mupdf" || "${renderer}" == "both" then "ON" else "OFF"; -in +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, wrapGAppsHook +, wrapQtAppsHook +, gst_all_1 +, qtbase +, qtmultimedia +, qttools +, qtwayland +, zlib +# only required when using poppler +, poppler +# only required when using mupdf +, freetype +, gumbo +, jbig2dec +, mupdf +, openjpeg +# choose renderer: mupdf or poppler or both (not recommended) +, usePoppler ? false +, useMupdf ? true +}: stdenv.mkDerivation rec { pname = "beamerpresenter"; @@ -46,25 +35,53 @@ stdenv.mkDerivation rec { sha256 = "16v263nnnipih3lxg95rmwz0ihnvpl4n1wlj9r6zavnspzlp9dvb"; }; - nativeBuildInputs = [ pkg-config installShellFiles wrapQtAppsHook ]; - buildInputs = [ gcc cmake coreutils gnumake bash zlib qtbase qtmultimedia qttools ] ++ renderers.${renderer}.buildInputs; + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook + wrapQtAppsHook + ]; + + dontWrapGApps = true; + + buildInputs = [ + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + zlib + qtbase + qtmultimedia + qttools + qtwayland + ] ++ lib.optionals useMupdf [ + freetype + gumbo + jbig2dec + mupdf + openjpeg + ] ++ lib.optionals usePoppler [ + poppler + ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE='Release'" "-DGIT_VERSION=OFF" - "-DUSE_POPPLER=${use_poppler}" - "-DUSE_MUPDF=${use_mupdf}" + "-DUSE_POPPLER=${if usePoppler then "ON" else "OFF"}" + "-DUSE_MUPDF=${if useMupdf then "ON" else "OFF"}" "-DUSE_MUJS=OFF" "-DUSE_GUMBO=ON" "-DUSE_TRANSLATIONS=ON" - "-DQT_VERSION_MAJOR=${qt_version}" + "-DQT_VERSION_MAJOR=${lib.versions.major qtbase.version}" ]; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + meta = with lib; { description = "Modular multi screen pdf presentation viewer"; homepage = "https://github.com/stiglers-eponym/BeamerPresenter"; license = with licenses; [ agpl3 gpl3Plus ]; platforms = platforms.all; - maintainers = with maintainers; [ pacien ]; + maintainers = with maintainers; [ pacien dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix index c702c02c14..27281b5d52 100644 --- a/third_party/nixpkgs/pkgs/applications/office/fava/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix @@ -1,26 +1,15 @@ -{ lib, python3, fetchpatch }: +{ lib, python3 }: python3.pkgs.buildPythonApplication rec { pname = "fava"; - version = "1.21"; + version = "1.22.2"; format = "pyproject"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-0aFCKEjmXn6yddgNMi9t4rzqHcN7VBLoz3LEg9apmNY="; + sha256 = "sha256-Oarh0a0q+PYFojsYmdX763vFRSQhtm09z4ruSxXDpSA="; }; - patches = [ - (fetchpatch { - # Update werkzeug compatibility - url = "https://github.com/beancount/fava/commit/5a99417a42e1d739b1e57fae2d01ff1d146dcbc2.patch"; - hash = "sha256-Y6IcxZAcFJEYgT8/xBIABdkP+pUdQX1EgSS5uNdSJUE="; - excludes = [ - ".pre-commit-config.yaml" - ]; - }) - ]; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix index 1c6fe68480..e33ef51708 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -154,8 +154,6 @@ stdenv.mkDerivation rec { test-xml-pricedb \ test-xml-transaction \ test-xml2-is-file - - export LD_LIBRARY_PATH="$PWD/lib:$PWD/lib/gnucash:$PWD/lib/gnucash/test:$PWD/lib/gnucash/test/future" ''; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix index c7f1f605f2..2a00811a44 100644 --- a/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/homebank/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "homebank"; - version = "5.5.5"; + version = "5.5.6"; src = fetchurl { url = "http://homebank.free.fr/public/homebank-${version}.tar.gz"; - sha256 = "sha256-vs4F7LUjkhR0JKoeWheTiXd7gr9Gir69c+twsq+cnmc="; + sha256 = "sha256-Rg6OjHLkwVIDnXqzqPXA8DxqSdrh2T6V/gLBND8vx9o="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix index 55e24d80f2..d4a3028b89 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jameica/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: +{ lib, stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, wrapGAppsHook, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let _version = "2.10.2"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "jameica"; inherit version; - nativeBuildInputs = [ ant jdk makeWrapper ]; + nativeBuildInputs = [ ant jdk wrapGAppsHook makeWrapper ]; buildInputs = lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] ++ lib.optional stdenv.isDarwin Cocoa; @@ -35,6 +35,8 @@ stdenv.mkDerivation rec { sha256 = "1x9sybknzsfxp9z0pvw9dx80732ynyap57y03p7xwwjbcrnjla57"; }; + dontWrapGApps = true; + # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries # and is not able to build the application itself buildPhase = '' @@ -53,13 +55,16 @@ stdenv.mkDerivation rec { install -Dm644 plugin.xml $out/share/java/ install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png cp ${desktopItem}/share/applications/* $out/share/applications/ + ''; + postFixup = '' makeWrapper ${jre}/bin/java $out/bin/jameica \ --add-flags "-cp $out/share/java/jameica.jar:$out/share/jameica-${version}/* ${ lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' } de.willuhn.jameica.Main" \ --prefix LD_LIBRARY_PATH : ${lib.escapeShellArg (lib.makeLibraryPath buildInputs)} \ - --chdir "$out/share/java/" + --chdir "$out/share/java/" \ + "''${gappsWrapperArgs[@]}" ''; meta = with lib; { @@ -71,7 +76,7 @@ stdenv.mkDerivation rec { ''; sourceProvenance = with sourceTypes; [ fromSource - binaryBytecode # source bundles dependencies as jars + binaryBytecode # source bundles dependencies as jars ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix b/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix index 95da79cca4..3f17e46023 100644 --- a/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/kmymoney/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, doxygen, extra-cmake-modules, graphviz, kdoctools , wrapQtAppsHook +, autoPatchelfHook , akonadi, alkimia, aqbanking, gmp, gwenhywfar, kactivities, karchive , kcmutils, kcontacts, kdewebkit, kdiagram, kholidays, kidentitymanagement @@ -10,24 +11,24 @@ # Needed for running tests: , qtbase, xvfb-run -, python2, python3Packages +, python3 }: stdenv.mkDerivation rec { pname = "kmymoney"; - version = "5.1.1"; + version = "5.1.3"; src = fetchurl { url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-33ufeOhZb5nSgpXKc4cI8GVe4Fd4nf2SHHsbq5ZXgpg="; + sha256 = "sha256-OTi4B4tzkboy4Su0I5di+uE0aDoMLsGnUQXDAso+Xj8="; }; # Hidden dependency that wasn't included in CMakeLists.txt: NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5"; nativeBuildInputs = [ - doxygen extra-cmake-modules graphviz kdoctools python2 - python3Packages.wrapPython wrapQtAppsHook + doxygen extra-cmake-modules graphviz kdoctools + python3.pkgs.wrapPython wrapQtAppsHook autoPatchelfHook ]; buildInputs = [ @@ -38,20 +39,18 @@ stdenv.mkDerivation rec { # Put it into buildInputs so that CMake can find it, even though we patch # it into the interface later. - python3Packages.weboob + python3.pkgs.woob ]; - weboobPythonPath = [ python3Packages.weboob ]; - - postInstall = '' - buildPythonPath "$weboobPythonPath" - patchPythonScript "$out/share/kmymoney/weboob/kmymoneyweboob.py" + postPatch = '' + buildPythonPath "${python3.pkgs.woob}" + patchPythonScript "kmymoney/plugins/woob/interface/kmymoneywoob.py" # Within the embedded Python interpreter, sys.argv is unavailable, so let's # assign it to a dummy value so that the assignment of sys.argv[0] injected # by patchPythonScript doesn't fail: sed -i -e '1i import sys; sys.argv = [""]' \ - "$out/share/kmymoney/weboob/kmymoneyweboob.py" + "kmymoney/plugins/woob/interface/kmymoneywoob.py" ''; doInstallCheck = stdenv.hostPlatform == stdenv.buildPlatform; @@ -62,10 +61,18 @@ stdenv.mkDerivation rec { ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now. ''; + # libpython is required by the python interpreter embedded in kmymoney, so we + # need to explicitly tell autoPatchelf about it. + postFixup = '' + patchelf --debug --add-needed libpython${python3.pythonVersion}.so \ + "$out/bin/.kmymoney-wrapped" + ''; + meta = { description = "Personal finance manager for KDE"; homepage = "https://kmymoney.org/"; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ aidalgol das-g ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix b/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix index c6f0ae106e..c92cfdb97a 100644 --- a/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/micropad/default.nix @@ -11,10 +11,6 @@ }: let executableName = "micropad"; - electron_exec = - if stdenv.isDarwin - then "${electron}/Applications/Electron.app/Contents/MacOS/Electron" - else "${electron}/bin/electron"; in mkYarnPackage rec { pname = "micropad"; @@ -64,7 +60,7 @@ in done # executable wrapper - makeWrapper '${electron_exec}' "$out/bin/${executableName}" \ + makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ --add-flags "$out/share/micropad" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" diff --git a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix index 75bc494d3a..679a732c2d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/paperless-ngx/default.nix @@ -11,6 +11,7 @@ , tesseract4 , unpaper , liberation_ttf +, fetchFromGitHub }: let @@ -19,6 +20,20 @@ let packageOverrides = self: super: { django = super.django_4; + # use paperless-ngx version of django-q + # see https://github.com/paperless-ngx/paperless-ngx/pull/1014 + django-q = super.django-q.overridePythonAttrs (oldAttrs: rec { + src = fetchFromGitHub { + owner = "paperless-ngx"; + repo = "django-q"; + sha256 = "sha256-aoDuPig8Nf8fLzn7GjBn69aF2zH2l8gxascAu9lIG3U="; + rev = "71abc78fdaec029cf71e9849a3b0fa084a1678f7"; + }; + # due to paperless-ngx modification of the pyproject.toml file + # the patch is not needed any more + patches = []; + }); + # django-extensions 3.1.5 is required, but its tests are incompatible with Django 4 django-extensions = super.django-extensions.overridePythonAttrs (_: { doCheck = false; @@ -38,12 +53,12 @@ let in py.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ngx"; - version = "1.7.1"; + version = "1.8.0"; # Fetch the release tarball instead of a git ref because it contains the prebuilt fontend src = fetchurl { url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-8vx4hvbIqaChjPyS8Q0ar2bz/pLzEdxoF7P2gBEeFzc="; + hash = "sha256-BLfhh04RvBJFRQiPXkMl8XlWqZOWKmjjl+6lZ326stU="; }; format = "other"; @@ -144,6 +159,13 @@ py.pkgs.pythonPackages.buildPythonApplication rec { zope_interface ]; + # paperless-ngx includes the bundled django-q version. This will + # conflict with the tests and is not needed since we overrode the + # django-q version with the paperless-ngx version + postPatch = '' + rm -rf src/django-q + ''; + # Compile manually because `pythonRecompileBytecodeHook` only works for # files in `python.sitePackages` postBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index 30da3b3520..ed374f7181 100644 --- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.58.5"; + version = "0.59.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-7olUx0JmztNb6uFsxKwOkBqkbMEiy2vb+iHqBe5I1PM="; + sha256 = "sha256-dPmrj4DM3c9dLldi1ZfoLgchZellart9PfADormj2Gk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix index 7c6159bf74..d102a79ea3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/qownnotes/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "qownnotes"; - version = "22.7.1"; + version = "22.8.0"; src = fetchurl { url = "https://download.tuxfamily.org/${pname}/src/${pname}-${version}.tar.xz"; # Fetch the checksum of current version with curl: # curl https://download.tuxfamily.org/qownnotes/src/qownnotes-.tar.xz.sha256 - sha256 = "9431a3315a533799525217e5ba03757b3c39e8259bf307c81330304f043b8b77"; + sha256 = "37ae0952119341b7a07a80bb79e732d91edab3a684b6b9a626e5a9d13a97fad1"; }; nativeBuildInputs = [ qmake qttools ]; @@ -24,7 +24,7 @@ mkDerivation rec { longDescription = "QOwnNotes is a plain-text file notepad and todo-list manager with markdown support and Nextcloud/ownCloud integration."; homepage = "https://www.qownnotes.org/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ dtzWill totoroot ]; + maintainers = with maintainers; [ totoroot ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index 1410ab3205..0f7b4e95ff 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -1,18 +1,8 @@ -{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, gtk3, libxshmfence, wrapGAppsHook }: +{ lib, stdenv, nixosTests, fetchurl, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem, copyDesktopItems, libxshmfence, wrapGAppsHook }: let - description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases"; - desktopItem = makeDesktopItem { - name = "Trilium"; - exec = "trilium"; - icon = "trilium"; - comment = description; - desktopName = "Trilium Notes"; - categories = [ "Office" ]; - }; - - meta = with lib; { - inherit description; + metaCommon = with lib; { + description = "Hierarchical note taking application with focus on building large personal knowledge bases"; homepage = "https://github.com/zadam/trilium"; license = licenses.agpl3Plus; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; @@ -20,24 +10,22 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.51.2"; + version = "0.53.2"; - desktopSource = { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "17bqcnpvflpi5dlz9m294diwd6as5wha5jcv9a3qvhh4pq0nyr4z"; - }; + desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + desktopSource.sha256 = "0sjljyn7x0kv1692wccdjsll8h49r9lyqbrfnz4cn147xinclyw4"; - serverSource = { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "0jjvg75a4va5d81x8dvpzmzax7p0bqd7psv0alkkl13m91gai6ig"; - }; + serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; + serverSource.sha256 = "0y5xjf4r0c2hw2ch4ml55fq1nlmgnakq4zh3ch8sdgzm86nchavb"; in { trilium-desktop = stdenv.mkDerivation rec { pname = "trilium-desktop"; inherit version; - inherit meta; + meta = metaCommon // { + mainProgram = "trilium"; + }; src = fetchurl desktopSource; @@ -45,21 +33,32 @@ in { autoPatchelfHook makeWrapper wrapGAppsHook + copyDesktopItems ]; - buildInputs = atomEnv.packages ++ [ gtk3 libxshmfence ]; + buildInputs = atomEnv.packages ++ [ libxshmfence ]; + + desktopItems = [ + (makeDesktopItem { + name = "Trilium"; + exec = "trilium"; + icon = "trilium"; + comment = meta.description; + desktopName = "Trilium Notes"; + categories = [ "Office" ]; + }) + ]; installPhase = '' runHook preInstall mkdir -p $out/bin mkdir -p $out/share/trilium - mkdir -p $out/share/{applications,icons/hicolor/128x128/apps} + 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 - cp ${desktopItem}/share/applications/* $out/share/applications runHook postInstall ''; @@ -69,13 +68,15 @@ in { ''; dontStrip = true; + + passthru.updateScript = ./update.sh; }; trilium-server = stdenv.mkDerivation rec { pname = "trilium-server"; inherit version; - inherit meta; + meta = metaCommon; src = fetchurl serverSource; diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/update.sh b/third_party/nixpkgs/pkgs/applications/office/trilium/update.sh new file mode 100755 index 0000000000..02af29dace --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/update.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils curl jq +set -euo pipefail + +cd $(dirname "${BASH_SOURCE[0]}") + +version=$(curl -s --show-error "https://api.github.com/repos/zadam/trilium/releases/latest" | jq -r '.tag_name' | tail -c +2) + +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) + +setKV () { + sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" ./default.nix +} + +setKV version $version +setKV desktopSource.sha256 $sha256_linux64 +setKV serverSource.sha256 $sha256_linux64_server diff --git a/third_party/nixpkgs/pkgs/applications/office/zk/default.nix b/third_party/nixpkgs/pkgs/applications/office/zk/default.nix index f6b9f1393e..23b1977308 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zk/default.nix @@ -2,26 +2,24 @@ buildGoModule rec { pname = "zk"; - version = "0.9.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "mickael-menu"; repo = "zk"; rev = "v${version}"; - sha256 = "sha256-AXKIi70evf581lMwfbfxm8hFCzsnhKRQgnIEZQFS75A="; + sha256 = "sha256-30Vw6RGREg/ULS+eNExulHNOsOssMjXE+/tuRBQ17kI="; }; - vendorSha256 = "sha256-m7QGv8Vx776TsN7QHXtO+yl3U1D573UMZVyg1B4UeIk="; + vendorSha256 = "sha256-11GzI3aEhKKTiULoWq9uIc66E3YCrW/HJQUYXRhCaek="; doCheck = false; - buildInputs = [ icu ]; - CGO_ENABLED = 1; ldflags = [ "-s" "-w" "-X=main.Build=${version}" ]; - tags = [ "fts5" "icu" ]; + tags = [ "fts5" ]; meta = with lib; { maintainers = with maintainers; [ pinpox ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index f8d94f8690..32f59a718f 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -41,12 +41,12 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "6.0.9"; + version = "6.0.10"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-yzMppbvdw7ShYtWdmE5HkqutgivwuJKPkAOGq6WkyuQ="; + sha256 = "sha256-+RFTFOZVf0w9HBlk05pEsssiFlEaPJ9XTq29QpuIil8="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix index acd3a7a8c8..35f7b60a45 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/angelfish.nix @@ -20,8 +20,8 @@ , srcs # These must be updated in tandem with package updates. -, cargoShaForVersion ? "22.04" -, cargoSha256 ? "RtdZMBKixC3mdHeFXY9u0pHyDv93Z8p4EVY+lz1aISM=" +, cargoShaForVersion ? "22.06" +, cargoSha256 ? "ckxShWgqGaApYoGQdrRQKCKOsbwUH5QP82x3BNM4Jx8=" }: # Guard against incomplete updates. diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh b/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh index 3a3d5b18a5..41ff6d0f7d 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.04/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.06/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kasts.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/kasts.nix index 793fd5c9bd..1903bf259b 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/kasts.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/kasts.nix @@ -16,6 +16,7 @@ , qtquickcontrols2 , syndication , taglib +, threadweaver }: let @@ -46,6 +47,7 @@ mkDerivation rec { qtquickcontrols2 syndication taglib + threadweaver ]; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix index 24e2f6f471..0e30c86df9 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix @@ -6,6 +6,7 @@ , kcontacts , ki18n +, kio , kirigami2 , knotifications , kpeople @@ -28,6 +29,7 @@ mkDerivation rec { buildInputs = [ kcontacts ki18n + kio kirigami2 knotifications kpeople diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix index e7da4d7b0f..849118e5ce 100644 --- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix +++ b/third_party/nixpkgs/pkgs/applications/plasma-mobile/srcs.nix @@ -4,187 +4,195 @@ { alligator = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/alligator-22.04.tar.xz"; - sha256 = "1f2s0ay4qr7ylqnx8d1fawwi4h15gza2d4dsvrww1gm8ar1miqwc"; - name = "alligator-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/alligator-22.06.tar.xz"; + sha256 = "1h4jawzmiikn81iajc62pkgdv0xlc2w9g80l04awfiz2546rcxmf"; + name = "alligator-22.06.tar.xz"; }; }; angelfish = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/angelfish-22.04.tar.xz"; - sha256 = "169bhkymfxcs93injzp86cvcdhv78pl4dfsscjahlh9c1g5lsbqa"; - name = "angelfish-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/angelfish-22.06.tar.xz"; + sha256 = "0s9kzkw0ikb4r4x04nyd568kika7wvi5gj0k6735nwjn5qyp933f"; + name = "angelfish-22.06.tar.xz"; }; }; audiotube = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/audiotube-22.04.tar.xz"; - sha256 = "0x9xmlfz39ac15c4rbg33sl1bbjmglxgz39flmrvrrw9h2m62s2x"; - name = "audiotube-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/audiotube-22.06.tar.xz"; + sha256 = "0680cr90nsa5qc9qm9vpl7993zmz0r1ms0m4f63cds7k8zrwwal0"; + name = "audiotube-22.06.tar.xz"; }; }; calindori = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/calindori-22.04.tar.xz"; - sha256 = "1zinhlflrx230yymlfxvm98dvvq1yig3r49bq61fmyrzq6fdfv60"; - name = "calindori-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/calindori-22.06.tar.xz"; + sha256 = "0fcbkk1yisdd6z1qvac9x6i55wfppqpdma87a0n5smm191lkjg07"; + name = "calindori-22.06.tar.xz"; }; }; kalk = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/kalk-22.04.tar.xz"; - sha256 = "0aaqcb7jkkqypawfkzjnqglzyni17064d0mhch8g7q0qm5izvap8"; - name = "kalk-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/kalk-22.06.tar.xz"; + sha256 = "09c3rfnljjacw55vdrgcpp18vkbbjzq6brcfs6gb0nhfgbjj6ava"; + name = "kalk-22.06.tar.xz"; }; }; kasts = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/kasts-22.04.tar.xz"; - sha256 = "0c60wp0i6l7ji13ap69lh21vpdq09h2nmqpzjlrwlbjqbhhx7lsh"; - name = "kasts-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/kasts-22.06.tar.xz"; + sha256 = "0hznam4gxrhz1sbykl7wr0mqa6r23mskx5qhp0lq3sxaxiy9jlrk"; + name = "kasts-22.06.tar.xz"; }; }; kclock = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/kclock-22.04.tar.xz"; - sha256 = "1ycln85ydd3qmzfadgg80zf7jlwx5yijxs1mbfmx7f1rr427qdk6"; - name = "kclock-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/kclock-22.06.tar.xz"; + sha256 = "1rd2gxbc3p5h1xjwn59vqr5v2xdk8b0m0dx6qsmihx1qnr2k5vrj"; + name = "kclock-22.06.tar.xz"; }; }; keysmith = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/keysmith-22.04.tar.xz"; - sha256 = "0cx14r820mnlh75l3blc0ywxwmlinn2wakdnwl75w6i8l46k48li"; - name = "keysmith-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/keysmith-22.06.tar.xz"; + sha256 = "0qwfvznjp85y93y3dry5pkcqz6y63wpk2h2p5m3qiymk3qckm9yj"; + name = "keysmith-22.06.tar.xz"; }; }; khealthcertificate = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/khealthcertificate-22.04.tar.xz"; - sha256 = "0sr90ki42m3cbjy63rl2ay02wm089wyka0lc4ik7jaic6wb47y5d"; - name = "khealthcertificate-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/khealthcertificate-22.06.tar.xz"; + sha256 = "079j9df21hcfs62ikh2q8sjxq59qiqvinicjvghk708xf0dkl8nh"; + name = "khealthcertificate-22.06.tar.xz"; }; }; koko = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/koko-22.04.tar.xz"; - sha256 = "0i4h2brc5dqwdmj2bs7nywrz7cgqcf7nmm6yl03047vj9aah01cw"; - name = "koko-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/koko-22.06.tar.xz"; + sha256 = "0fcwls7xq0dmb2ghn8x6xq26a4qa9ashnlm8ypcyfmfr4pvxwlml"; + name = "koko-22.06.tar.xz"; }; }; kongress = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/kongress-22.04.tar.xz"; - sha256 = "07yb8hddxl7m1wl0z7rcwdls3k9q89zl1d271n15j1rwrsbwiyxd"; - name = "kongress-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/kongress-22.06.tar.xz"; + sha256 = "1mlyqdv0y112z4c56a9746hc8x0xrcvw0qqafm7vvd7hy5idqsrb"; + name = "kongress-22.06.tar.xz"; }; }; krecorder = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/krecorder-22.04.tar.xz"; - sha256 = "0d7nvq87avw4gj6whjrlmxs361r9cvzfmfsrca5f536jlazp95pg"; - name = "krecorder-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/krecorder-22.06.tar.xz"; + sha256 = "148gqz5xya1pxw0mhs82dns0wmpvl8h48hrb5hly9jwdymb7143g"; + name = "krecorder-22.06.tar.xz"; }; }; ktrip = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/ktrip-22.04.tar.xz"; - sha256 = "1ijy19axc492l4naayr3d8qdjznc286105qnki8vmcaw93p48n9x"; - name = "ktrip-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/ktrip-22.06.tar.xz"; + sha256 = "123770qa8d4xhpgga6gbs7dnnfmka9jshsbkpckvbzl3ndcnlpql"; + name = "ktrip-22.06.tar.xz"; }; }; kweather = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/kweather-22.04.tar.xz"; - sha256 = "0080l00dya34d35sf6z2j3ra6lls0nafr045a9jmxv09763ydb5d"; - name = "kweather-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/kweather-22.06.tar.xz"; + sha256 = "0a47swzvp6z1fdn3vhgfnqz06583x6xsgvf01wsspkz4g2lxj5zk"; + name = "kweather-22.06.tar.xz"; }; }; neochat = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/neochat-22.04.tar.xz"; - sha256 = "04i1kn52w9jjaaw8x53mksw2vzrpsq1xrq13h158c1s3q1g9jdm8"; - name = "neochat-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/neochat-22.06.tar.xz"; + sha256 = "16wxkc3h0bqlnb7jhkk6qh1v5hj06rwaj7khzqxbm9cj8zh29wdn"; + name = "neochat-22.06.tar.xz"; }; }; plasma-dialer = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/plasma-dialer-22.04.tar.xz"; - sha256 = "0hnxasj6psplwykahhisipyvy67hfr820azixw5p820fzy11x2g4"; - name = "plasma-dialer-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/plasma-dialer-22.06.tar.xz"; + sha256 = "07sbjmk9hzf1nhk7jhvavikwkb4nmy0bwccs7qa4nf9g2yzbli87"; + name = "plasma-dialer-22.06.tar.xz"; }; }; plasma-phonebook = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/plasma-phonebook-22.04.tar.xz"; - sha256 = "14nd2yx9cf6gabb10kcaqkdn7kb96n2209qrib7daq2ldva8c9i9"; - name = "plasma-phonebook-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/plasma-phonebook-22.06.tar.xz"; + sha256 = "00h9plfjgr4bmcay56la074pza2hp4l28a566nbqqivagpn1qz8w"; + name = "plasma-phonebook-22.06.tar.xz"; }; }; plasma-settings = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/plasma-settings-22.04.tar.xz"; - sha256 = "1k40mviikpij1srar1hkg732qg14ld0176g1mpza0ysr3yr21vny"; - name = "plasma-settings-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/plasma-settings-22.06.tar.xz"; + sha256 = "096zyzxff0b948wnnmdykp9fm87r8xyn8kkndnjkrmacz2p3822m"; + name = "plasma-settings-22.06.tar.xz"; }; }; plasmatube = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/plasmatube-22.04.tar.xz"; - sha256 = "01bmxdh0aclm184j5s0kddjc7a14225bdnbkr8jlk21g9wlw8cyx"; - name = "plasmatube-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/plasmatube-22.06.tar.xz"; + sha256 = "009kcba9blhyx8xhbsxawjxayq1vrpi2byig1n1ra848kij0hi3q"; + name = "plasmatube-22.06.tar.xz"; }; }; qmlkonsole = { - version = "22.04.1"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/qmlkonsole-22.04.1.tar.xz"; - sha256 = "06zfrqaag9sgihs5k93nssgm4smrs2ymh7q0fx35z7fcphngjpaw"; - name = "qmlkonsole-22.04.1.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/qmlkonsole-22.06.tar.xz"; + sha256 = "1h244bb566sgfgswgdqkljfdd70z4v52gxm0h5bmvmdqjhb6zg7n"; + name = "qmlkonsole-22.06.tar.xz"; }; }; spacebar = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/spacebar-22.04.tar.xz"; - sha256 = "0ga3symavdrq5aim924bd889b9cmv09dyplz9gcspk46w49vx3s5"; - name = "spacebar-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/spacebar-22.06.tar.xz"; + sha256 = "0jl9gvhf8dfg9y8wwxp0c86rlsmj8inrl7syb25pz57z1mvv4kkr"; + name = "spacebar-22.06.tar.xz"; + }; + }; + telly-skout = { + version = "22.06"; + src = fetchurl { + url = "${mirror}/stable/plasma-mobile/22.06/telly-skout-22.06.tar.xz"; + sha256 = "09ibm424x5k1kjbay1cn48car6xacz82dk6qwi8ww3jph32jm4pf"; + name = "telly-skout-22.06.tar.xz"; }; }; tokodon = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/tokodon-22.04.tar.xz"; - sha256 = "0c9q2ax0h047xm3g5r5cn6sxfyv2lb93dahd5z3nw67bfrzwvnw2"; - name = "tokodon-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/tokodon-22.06.tar.xz"; + sha256 = "0cgg42ys7liab754n9nwbanwl3i7iz587933vvhf5k9zmvx4jqhb"; + name = "tokodon-22.06.tar.xz"; }; }; vakzination = { - version = "22.04"; + version = "22.06"; src = fetchurl { - url = "${mirror}/stable/plasma-mobile/22.04/vakzination-22.04.tar.xz"; - sha256 = "0zadygzw4xzpwbdnb6dwjjjls1h915gp9xaf59kbfbmzwb6m4mf8"; - name = "vakzination-22.04.tar.xz"; + url = "${mirror}/stable/plasma-mobile/22.06/vakzination-22.06.tar.xz"; + sha256 = "0wa58a9fps9i0brbppcdkda1przxckg7sir8f2p8k842k2qnsvbp"; + name = "vakzination-22.06.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix index e885270370..c989747406 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix @@ -22,10 +22,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals portaudioSupport [ portaudio ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD - ''; meta = with lib; { description = "Digital Speech Decoder"; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix index 5adf07053a..80ea41e4f9 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -1,23 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, rtl-sdr, soapysdr -} : +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, rtl-sdr +, soapysdr +, libobjc +, IOKit +, Security +}: -let - version = "0.3.0"; - -in stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "soapyrtlsdr"; - inherit version; + version = "0.3.3"; src = fetchFromGitHub { owner = "pothosware"; repo = "SoapyRTLSDR"; - rev = "soapy-rtlsdr-${version}"; - sha256 = "15j0s7apbg9cjr6rcbr058kl0r3szwzf00ixcbykxb77fh7c6r9w"; + rev = "soapy-rtl-sdr-${finalAttrs.version}"; + sha256 = "sha256-IapdrBE8HhibY52Anm76/mVAoA0GghwnRCxxfGkyLTw="; }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ rtl-sdr soapysdr ]; + buildInputs = [ rtl-sdr soapysdr ] + ++ lib.optionals stdenv.isDarwin [ libobjc IOKit Security ]; cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; @@ -25,7 +31,7 @@ in stdenv.mkDerivation { homepage = "https://github.com/pothosware/SoapyRTLSDR"; description = "SoapySDR plugin for RTL-SDR devices"; license = licenses.mit; - maintainers = with maintainers; [ ragge ]; + maintainers = with maintainers; [ ragge luizribeiro ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix index 1e5052d4f9..422e665b93 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/default.nix @@ -25,6 +25,11 @@ in stdenv.mkDerivation { sha256 = "19f2x0pkxvf9figa0pl6xqlcz8fblvqb19mcnj632p0l8vk6qdv2"; }; + patches = [ + # see https://github.com/pothosware/SoapySDR/issues/352 for upstream issue + ./fix-pkgconfig.patch + ]; + nativeBuildInputs = [ cmake makeWrapper pkg-config ]; buildInputs = [ libusb-compat-0_1 ncurses ] ++ lib.optionals usePython [ python swig2 ]; diff --git a/third_party/nixpkgs/pkgs/applications/radio/soapysdr/fix-pkgconfig.patch b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/fix-pkgconfig.patch new file mode 100644 index 0000000000..d4b15e3f99 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/radio/soapysdr/fix-pkgconfig.patch @@ -0,0 +1,14 @@ +diff --git a/lib/SoapySDR.in.pc b/lib/SoapySDR.in.pc +index a1ca698..fd2f4c0 100644 +--- a/lib/SoapySDR.in.pc ++++ b/lib/SoapySDR.in.pc +@@ -1,7 +1,5 @@ +-prefix=@CMAKE_INSTALL_PREFIX@ +-exec_prefix=${prefix} +-libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: Soapy SDR + Description: Vendor and platform neutral SDR interface library. diff --git a/third_party/nixpkgs/pkgs/applications/radio/srsran/default.nix b/third_party/nixpkgs/pkgs/applications/radio/srsran/default.nix index dc7ae777df..f9a1c5fbbe 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/srsran/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/srsran/default.nix @@ -12,6 +12,7 @@ , uhd , soapysdr , libbladeRF +, zeromq }: stdenv.mkDerivation rec { @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { uhd soapysdr libbladeRF + zeromq ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix b/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix index fbc7eae910..fcb35bd66a 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/welle-io/default.nix @@ -41,6 +41,6 @@ mkDerivation rec { homepage = "https://www.welle.io/"; maintainers = with maintainers; [ ck3d markuskowa ]; license = licenses.gpl2Only; - platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; + platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gnuastro/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gnuastro/default.nix index aed029f9d3..d0d3ab6562 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gnuastro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gnuastro/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnuastro"; - version = "0.17"; + version = "0.18"; src = fetchurl { url = "mirror://gnu/gnuastro/gnuastro-${version}.tar.gz"; - sha256 = "sha256-xBvtM8wkDOqXg/Q2dNfPR0R0ZgRm4QiPJZoLDKivaPU="; + sha256 = "sha256-bKfiLhQFERdMbwL9+UitCL8/dB/k6YKNjBzfKnCtWec="; }; nativeBuildInputs = [ libtool ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/gprojector/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/gprojector/default.nix index 37d20b585a..f5fa5f1d1e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/gprojector/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/gprojector/default.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "gprojector"; - version = "3.0.3"; + version = "3.0.4"; src = fetchzip { url = "https://www.giss.nasa.gov/tools/gprojector/download/G.ProjectorJ-${version}.tgz"; - sha256 = "sha256-60UT6z5aQ3Tk4EujEUp4ntB5GakFVhJzk5eytoIwf78="; + sha256 = "sha256-6EixVNRgYnuY9INb7gAyBzo125DhPEUPD+pGxjzmhy8="; }; desktopItems = [ (makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix index 0474e7de2c..8212e6a2a9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.9"; + version = "3.6.0"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-SO8W1juP+MkXvXyNCP45AauYTbDrurAUtw4Gp4AA6X4="; + sha256 = "sha256-wdv2TOOPIB3VRG3XMs58i/HvMDZ9wvERAhBQNslJ25E="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix index c2377d6bed..b157be0fcb 100644 --- a/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,18 +1,18 @@ -{ stdenv, lib, mkDerivation, fetchFromGitHub +{ stdenv, lib, fetchFromGitHub , cmake, freetype, libpng, libGLU, libGL, openssl, perl, libiconv , qtscript, qtserialport, qttools, qtcharts , qtmultimedia, qtlocation, qtbase, wrapQtAppsHook }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "stellarium"; - version = "0.22.1"; + version = "0.22.2"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "sha256-zDYZBV/76BDWWfiug0fFvMe3pdE4xfKgSmVJJd3Qu9Y="; + sha256 = "sha256-FBH5IB1keMzRP06DQK2e7HX8rwm5/sdTX+cB80uG0vw="; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; @@ -25,14 +25,13 @@ mkDerivation rec { preConfigure = lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ - 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Stellarium.app/Contents")' + 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")' ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Free open-source planetarium"; - homepage = "http://stellarium.org/"; - license = licenses.gpl2; + homepage = "https://stellarium.org/"; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ ma27 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix index e7379ee382..bde774c622 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bedops/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bedops"; - version = "2.4.40"; + version = "2.4.41"; src = fetchFromGitHub { owner = "bedops"; repo = "bedops"; rev = "v${version}"; - sha256 = "sha256-rJVl3KbzGblyQZ7FtJXeEv/wjQJmzYGNjzhvkoMoBWY="; + sha256 = "sha256-VJBoi1+tHA4oOVOsClUfimB+mOV5ZSQsDcDq3vAZwBA="; }; buildInputs = [ zlib bzip2 jansson ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix new file mode 100644 index 0000000000..762b0515e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/dssp/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, boost, cmake, libcifpp, zlib, }: + +stdenv.mkDerivation rec { + pname = "dssp"; + version = "4.0.5"; + + src = fetchFromGitHub { + owner = "PDB-REDO"; + repo = pname; + rev = "v${version}"; + sha256 = "1x35rdcm4fch66pjbmy73lv0gdb6g9y3v023a66512a6nzsqjsir"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost libcifpp zlib ]; + + meta = with lib; { + description = "Calculate the most likely secondary structure assignment given the 3D structure of a protein"; + homepage = "https://github.com/PDB-REDO/dssp"; + license = licenses.bsd2; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix index ff05ef4b8d..29b61db76f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/igv/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "igv"; - version = "2.8.13"; + version = "2.13.2"; src = fetchzip { - url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip"; - sha256 = "0sab478jq96iw3fv0560hrrj8qbh40r8m4ncypdb7991j9haxl09"; + url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; + sha256 = "sha256-S0EoZAqjElrM/bp1p69jLuclXeUzSIuH8VsgCO6F04U="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix index bbe661b4f0..031e596190 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/last/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "last"; - version = "1268"; + version = "1406"; src = fetchFromGitLab { owner = "mcfrith"; repo = "last"; rev = version; - sha256 = "sha256-9yzeLg3xporl32sZ1Ks8s63jXJNGUiI64XyQmhbQF4M="; + sha256 = "sha256-N1B9W++4SiMRMUjDi8ZexOWF/HQpN8BBPuDKYh4bCS8="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix index 764a0f0da8..7b1a3c6807 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mafft"; - version = "7.490"; + version = "7.505"; src = fetchurl { url = "https://mafft.cbrc.jp/alignment/software/mafft-${version}-with-extensions-src.tgz"; - sha256 = "0hb5jzcqdnjn3micm5z301lrnyvmn9pnnnxjz4h2wa4yicyz7vnn"; + sha256 = "sha256-9Up4Zw/NmWAjO8w7PdNZ85WnHAztRae+HP6uGZUM5v8="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix index ec61e0bd7c..29ba667b05 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/samtools/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { }) ]; + # tests require `bgzip` from the htslib package + checkInputs = [ htslib ]; + nativeBuildInputs = [ perl ]; buildInputs = [ zlib ncurses htslib ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix index 5302b43bb0..9780c8a99a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/spades/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { description = "St. Petersburg genome assembler: assembly toolkit containing various assembly pipelines"; license = licenses.gpl2Only; homepage = "http://cab.spbu.ru/software/spades/"; - platforms = with platforms; [ "x86_64-linux" "x86_64-darwin"]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bzizou ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix index ba93e174e4..052cf68eab 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/jmol/default.nix @@ -25,14 +25,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.32.45"; + version = "14.32.66"; 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-9bcOwORHLZfn95RFur4JdP3Djpq8K8utnWIsniqKAI4="; + sha256 = "sha256-6L5hsJKiLnFKBtLJZnNxmnVcZTdu8Pmj5Md5QIoRxdU="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix index 668a34b511..ca2b2e5175 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,7 +1,8 @@ -{ mkDerivation +{ stdenv , lib , fetchFromGitHub , fetchpatch +, wrapQtAppsHook , qmake , pkg-config , qtbase @@ -9,6 +10,7 @@ , qttools , qtserialport , boost +, libngspice , libgit2 , quazip }: @@ -16,35 +18,34 @@ let # SHA256 of the fritzing-parts HEAD on the master branch, # which contains the latest stable parts definitions - partsSha = "640fa25650211afccd369f960375ade8ec3e8653"; + partsSha = "4713511c894cb2894eae505b9307c6555afcc32c"; parts = fetchFromGitHub { owner = "fritzing"; repo = "fritzing-parts"; rev = partsSha; - sha256 = "sha256-4S65eX4LCnXCFQAOxmdvr8d0nAgTWcJooE2SpLYpcXI="; + sha256 = "sha256-QiOGWc+99MJhOVrXyNOinR8rTVvW/E+wPfoB6QvbhY0="; }; in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "fritzing"; - version = "unstable-2021-09-22"; + version = "unstable-2022-07-01"; src = fetchFromGitHub { owner = pname; repo = "fritzing-app"; - rev = "f0af53a9077f7cdecef31d231b85d8307de415d4"; - sha256 = "sha256-fF38DrBoeZ0aKwVMNyYMPWa5rFPbIVXRARZT+eRat5Q="; + rev = "40d23c29b0463d5c968c3c4b34ed5ffc05c5a258"; + sha256 = "sha256-smvfuxQWF/LMFFXHOKb3zUZsEet/XoiaxXOR5QMaYzw="; }; - buildInputs = [ qtbase qtsvg qtserialport boost libgit2 quazip ]; - nativeBuildInputs = [ qmake pkg-config qttools ]; + buildInputs = [ qtbase qtsvg qtserialport boost libgit2 quazip libngspice ]; + nativeBuildInputs = [ qmake pkg-config qttools wrapQtAppsHook ]; patches = [ - # Add support for QuaZip 1.x (fetchpatch { - url = "https://github.com/fritzing/fritzing-app/commit/ef83ebd9113266bb31b3604e3e9d0332bb48c999.patch"; - sha256 = "sha256-J43E6iBRIVbsuuo82gPk3Q7tyLhNkuuyYwtH8hUfcPU="; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-Quick-Dirty-patch-to-allow-finding-quazip-qt5-on-Arc.patch?h=fritzing&id=1ae0dc88464f375a54b156e6761315bcb04bcc1f"; + sha256 = "sha256-iS18EWw920gyeXDoHBRGwXvwMJurJS21H77Erl+fqog="; }) ]; @@ -60,10 +61,10 @@ mkDerivation rec { cp -a ${parts}/* parts/ ''; + NIX_CFLAGS_COMPILE = "-I${quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}/quazip"; + qmakeFlags = [ "phoenix.pro" - "DEFINES=QUAZIP_INSTALLED" - "DEFINES+=QUAZIP_1X" ]; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index f1d34062d2..6b5f04fe73 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config, python3Packages +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, ninja, pkg-config, python3Packages , boost, rapidjson, qtbase, qtsvg, igraph, spdlog, wrapQtAppsHook , graphviz, llvmPackages, z3 }: @@ -13,6 +13,18 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "sha256-uNpELHhSAVRJL/4iypvnl3nX45SqB419r37lthd2WmQ="; }; + + patches = [ + (fetchpatch { + # Fix build with python 3.10 + # https://github.com/emsec/hal/pull/463 + name = "hal-fix-python-3.10.patch"; + url = "https://github.com/emsec/hal/commit/f695f55cb2209676ef76366185b7c419417fbbc9.patch"; + sha256 = "sha256-HsCdG3tPllUsLw6kQtGaaEGkEHqZPSC2v9k6ycO2I/8="; + includes = [ "plugins/gui/src/python/python_context.cpp" ]; + }) + ]; + # make sure bundled dependencies don't get in the way - install also otherwise # copies them in full to the output, bloating the package postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 0fbd824008..aa5d9a7ade 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -75,7 +75,11 @@ stdenv.mkDerivation rec { makeFlags = optionals (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; - cmakeFlags = optionals (withScripting) [ + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ] + ++ optionals (withScripting) [ "-DKICAD_SCRIPTING_WXPYTHON=ON" ] ++ optionals (!withScripting) [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh index 48270e962f..c51d32d39a 100755 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh @@ -65,7 +65,7 @@ tmp="${here}/,versions.nix.${RANDOM}" libs=( symbols templates footprints packages3d ) get_rev() { - git ls-remote --heads --tags "$@" + git ls-remote --tags "$@" } gitlab="https://gitlab.com/kicad" diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 7bd4d0d2bb..eb8a2fd6da 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "6.0.6"; + version = "6.0.7"; src = { - rev = "3a73a7531170b37afa1eb22d5924ef8af7f9e71e"; - sha256 = "0cb9zba812dlmn2w27s1q38mjpfdwhv0nnbilwsxchpvwg8j4k2j"; + rev = "77480857076960b2e8a70e01aee0b843db37f5f7"; + sha256 = "10bqn99nif9zyi5v0lkic3na2vac5lgacw01ayil359vaw7d0pzy"; }; }; libVersion = { - version = "6.0.6"; + version = "6.0.7"; libSources = { - symbols.rev = "3df4c49795a65a051fafb1cf81d291be4c891f62"; - symbols.sha256 = "02z3vqhz1rlf57zi8vyrlxvvdl1hpsh447p41qdgcpn5dyjycb9d"; - templates.rev = "17aca4385144bf872e69f41bf5012fd2018cec2c"; + symbols.rev = "059abdef06a0b7b44994ae9948a4f98f7224cb1f"; + symbols.sha256 = "006ksx8r6cm6q7v701nalggivp21cmysj8p9zc18y3sch8n1mj4g"; + templates.rev = "16d1898d52f1277ce9bd75640a32f7d2c6d122bf"; templates.sha256 = "08zxh83fbygh1x2jhca8nrp3f9kihf7kmg65qmyp95wvps4p5h8v"; - footprints.rev = "64bae4c4a0d51afbc8129682ef0c2bf28b005c04"; - footprints.sha256 = "1phynxisha2pq2knbx5l1hkdz1bmjm0qxl3lcb4ab82h8d35r37c"; - packages3d.rev = "6cb25bc10f8c94fbf71479fe9782aecfcc9952bd"; - packages3d.sha256 = "0ci9gxbpfnfqwah95ki4qcwlca78s1z6s7hckisnp58a1cm9siya"; + footprints.rev = "26e8be9805444cc25d03d2263277aa06620f5374"; + footprints.sha256 = "0c5fm4hlkka0ms43j02kbv7s9yrlkffn0jz6649ac3gpx6pk8lbf"; + packages3d.rev = "cd9551dfb37ab0c086cac63564e54a7bc7b611d8"; + packages3d.sha256 = "0rdhwyhknrc63sc5ykmq097rzrl36zibnkls7q5hf54lrhn0n3k4"; }; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix index 1b1eb39cff..636caec690 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/openroad/default.nix @@ -8,7 +8,7 @@ , git , python3 , swig4 -, boost172 +, boost17x , cimg , eigen , lcov @@ -27,14 +27,14 @@ mkDerivation rec { pname = "openroad"; - version = "2.0"; + version = "unstable-2022-07-19"; src = fetchFromGitHub { owner = "The-OpenROAD-Project"; repo = "OpenROAD"; - rev = "v${version}"; + rev = "2610b3953ef62651825d89fb96917cf5d20af0f1"; fetchSubmodules = true; - sha256 = "1p677xh16wskfj06jnplhpc3glibhdaqxmk0j09832chqlryzwyx"; + sha256 = "sha256-BP0JSnxl1XyqHzDY4eITaGHevqd+rbjWZy/LAfDfELs="; }; nativeBuildInputs = [ @@ -47,7 +47,7 @@ mkDerivation rec { ]; buildInputs = [ - boost172 + boost17x cimg eigen lcov @@ -70,7 +70,11 @@ mkDerivation rec { ''; # Enable output images from the placer. - cmakeFlags = [ "-DUSE_CIMG_LIB=ON" ]; + cmakeFlags = [ + "-DUSE_SYSTEM_BOOST=ON" + "-DUSE_CIMG_LIB=ON" + "-DOPENROAD_VERSION=${src.rev}" + ]; # Resynthesis needs access to the Yosys binaries. qtWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ yosys ]}" ]; @@ -84,6 +88,12 @@ mkDerivation rec { test/regression ''; + doInstallCheck = true; + installCheckPhase = '' + $out/bin/openroad -version + $out/bin/sta -version + ''; + meta = with lib; { description = "OpenROAD's unified application implementing an RTL-to-GDS flow"; homepage = "https://theopenroadproject.org"; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix index 646f374ba4..456b939c60 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/xschem/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "xschem"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "StefanSchippers"; repo = "xschem"; rev = version; - sha256 = "sha256-C57jo8tAbiqQAgf4Xp2lpFGOr6F1knPpFcYxPiqSM4k="; + sha256 = "sha256-SHpESg5mn9lSDOURQusQUsug8Jqin/W5rqkVgmseSgA="; }; nativeBuildInputs = [ bison flex pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix b/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix index 1e8c250989..20d2513b87 100644 --- a/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/geometry/gama/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }: stdenv.mkDerivation rec { pname = "gama"; - version = "2.19"; + version = "2.21"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-OCyUcKkQzp1nz9lgGSR4MRrP7XBR1kpIfPEA7PdSA1I="; + sha256 = "sha256-h+Mo+j/Kr7jmMY9fy4hHwn0FM1C9hMI7f7XY/xjBzHY="; }; buildInputs = [ expat ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix index 992d8b1de5..0cb9c8037c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/btor2tools/default.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/btorsim contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "A generic parser and tool package for the BTOR2 format"; homepage = "https://github.com/Boolector/btor2tools"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix index 63efe0a2d0..a7c4950167 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cvc3/default.nix @@ -13,6 +13,13 @@ stdenv.mkDerivation rec { patches = [ ./cvc3-2.4.1-gccv6-fix.patch ]; + # fails to configure on darwin due to gmp not found + configureFlags = [ "LIBS=-L${gmp}/lib" "CXXFLAGS=-I${gmp.dev}/include" ]; + + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/127608 + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + postPatch = '' sed -e "s@ /bin/bash@bash@g" -i Makefile.std find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';' diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cvc5/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cvc5/default.nix index c1bf56b45d..47c738f4cd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cvc5/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cvc5/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cvc5"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "cvc5"; repo = "cvc5"; rev = "cvc5-${version}"; - sha256 = "03sxqwmlajffmv7lncqs1bx8gyihkpnikk87q9wjrd4776n13ign"; + sha256 = "sha256-D3rexkDc78w/HObT/WYPBo8mTBx1MAkxPXJvddg97ic="; }; nativeBuildInputs = [ pkg-config cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix index cbd09b2a1a..4cbe6ac144 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.43.0"; + version = "3.46.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "bfce34363b0efe86e93e3fe75de76ab3740c772d"; - sha256 = "100mb003zkgrv1wd2agbk41aipk3j78k8zcjbj7pv9ixh02c7ss8"; + rev = "741670c439f1ca266bc7fe61ef7212cc9afd9dd8"; + sha256 = "sha256-/4R9i9906e5WQnaKNqUqUyDDIbSW9DNKdGg4rlrvC6c="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix index a042bd6c75..d3cb555323 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,13 +1,13 @@ {lib, stdenv, fetchurl, cmake, libGLU, libGL, qt5, boost}: stdenv.mkDerivation rec { - version = "201707"; + version = "202206"; build_nr = "1"; pname = "mcrl2"; src = fetchurl { url = "https://www.mcrl2.org/download/release/mcrl2-${version}.${build_nr}.tar.gz"; - sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; + sha256 = "KoLt8IU/vCdYqzJukNuaZfl8bWiOKB0UxWHEdQj3buU="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix index e30a897e56..fca3c20cd8 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/metis-prover/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "metis-prover"; - version = "2.3.20160713"; + version = "2.4.20200713"; src = fetchFromGitHub { owner = "gilith"; repo = "metis"; - rev = "f0b1a17cd57eb098077e963ab092477aee9fb340"; - sha256 = "1i7paax7b4byk8110f5zk4071mh5603r82bq7hbprqzljvsiipk7"; + rev = "d17c3a8cf6537212c5c4bfdadcf865bd25723132"; + sha256 = "phu1x0yahK/B2bSOCvlze7UJw8smX9zw6dJTpDD9chM="; }; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/monosat/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/monosat/default.nix index e49c80db9d..2709b16c57 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/monosat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/monosat/default.nix @@ -47,6 +47,9 @@ let "-DBUILD_STATIC=OFF" "-DJAVA=${boolToCmake includeJava}" "-DGPL=${boolToCmake includeGplCode}" + + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; postInstall = optionalString includeJava '' diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix index e86a24ffa4..6ab52ff9aa 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "sha256-3F4Q/ZWlgkiiW7QVjnaaDLSNLVdfAOSmwYdQo1v9Lv4="; + sha256 = "sha256-Hy+NCR0gbU06WnfIyKy6XTH94vd0CevwGbZ7KlXVvIQ="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix index 0c20faceb5..5671317e30 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/workcraft/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "workcraft"; - version = "3.3.6"; + version = "3.3.8"; src = fetchurl { url = "https://github.com/workcraft/workcraft/releases/download/v${version}/workcraft-v${version}-linux.tar.gz"; - sha256 = "sha256-5J4HOTz92ALUcZZr15jJ6vplc3KDwbFCXqjEhlOV4kE="; + sha256 = "sha256-T2rUEZsO8g/nk10LZvC+mXEC6IzutbjncERlmqg814g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix index b715c2fc33..c7209d00af 100644 --- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/shogun/default.nix @@ -134,7 +134,6 @@ stdenv.mkDerivation rec { "-DCMAKE_DISABLE_FIND_PACKAGE_Mosek=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_TFLogger=ON" "-DCMAKE_DISABLE_FIND_PACKAGE_ViennaCL=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;TrainedModelSerialization'" # Sporadic segfault "-DENABLE_TESTING=${enableIf doCheck}" "-DDISABLE_META_INTEGRATION_TESTS=ON" diff --git a/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix index 5713f84a86..b5f4263c79 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "getdp"; - version = "3.4.0"; + version = "3.5.0"; src = fetchurl { url = "http://getdp.info/src/getdp-${version}-source.tgz"; - sha256 = "sha256-d5YxJgtMf94PD6EHvIXpPBFPKC+skI/2v1K5Sad51hA="; + sha256 = "sha256-C/dsSe+puIQBpFfBL3qr2XWXrUnvYy0/uTCKqOpDe9w="; }; inherit (petsc) mpiSupport; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/jags/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/jags/default.nix index 3ddcd6206d..1acc6a287c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/jags/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/jags/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JAGS"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "mirror://sourceforge/mcmc-jags/JAGS-${version}.tar.gz"; - sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; + sha256 = "sha256-+SWDVbXp6xO9M8X6cg8MvrrOp9CkpCtxsPsUUB7hQik="; }; nativeBuildInputs = [ gfortran ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix index 993092c465..a5ecd42a8e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/primecount/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "primecount"; - version = "7.3"; + version = "7.4"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primecount"; rev = "v${version}"; - hash = "sha256-hxnn1uiGSB6XRC7yK+SXTwTsJfjhemWXsMNhhL7Ghek="; + hash = "sha256-ZKrTeeDJgVy+6Q0twFW9+bQulUmOL1dxznYK9nWd07Y="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/primesieve/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/primesieve/default.nix index c57e2d71f1..e43538e9ba 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/primesieve/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/primesieve/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "primesieve"; - version = "7.9"; + version = "8.0"; src = fetchFromGitHub { owner = "kimwalisch"; repo = "primesieve"; rev = "v${version}"; - hash = "sha256-lwT+adKFoNI125y5FuJMovtMh8sFi9oqMLYGLabzrCI="; + hash = "sha256-sqHNQXWeo+Iktq3gyiDLblBq/9QNlUQDvi1oHcZ2XYM="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/docutils-0.18.1-deprecation.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/docutils-0.18.1-deprecation.patch deleted file mode 100644 index 0a19e7af10..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/docutils-0.18.1-deprecation.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py -index 08c4225b87..3a9bbe4ed0 100644 ---- a/src/sage/misc/sagedoc.py -+++ b/src/sage/misc/sagedoc.py -@@ -1402,6 +1402,8 @@ class _sage_doc: - sage: identity_matrix.__doc__ in browse_sage_doc(identity_matrix, 'rst') - True - sage: browse_sage_doc(identity_matrix, 'html', False) # optional - sphinx sagemath_doc_html -+ ... -+ FutureWarning: The configuration setting "embed_images" will be removed in Docutils 1.2. Use "image_loading: link". - '...div...File:...Type:...Definition:...identity_matrix...' - - In the 'text' version, double colons have been replaced with diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index a0375a5184..514cbb66ea 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -112,22 +112,27 @@ stdenv.mkDerivation rec { # adapted from https://trac.sagemath.org/ticket/23712#comment:22 ./patches/tachyon-renamed-focallength.patch - # docutils 0.18.1 now triggers Sphinx warnings. tolerate them for - # now, because patching Sphinx is not feasible. remove when Sphinx - # 5.0 hits nixpkgs. - # https://github.com/sphinx-doc/sphinx/pull/10372 - ./patches/docutils-0.18.1-deprecation.patch - (fetchSageDiff { name = "eclib-20220621-update.patch"; base = "9.7.beta4"; rev = "9b65d73399b33043777ba628a4d318638aec6e0e"; sha256 = "sha256-pcb9Q9a0ROCZTyfT7TRMtgEqCom8SgrtAaZ8ATgeqVI="; }) + + # https://trac.sagemath.org/ticket/34149 + (fetchSageDiff { + name = "sphinx-5-update.patch"; + base = "9.7.beta6"; + rev = "6f9ceb7883376a1cacda51d84ec7870121860482"; + sha256 = "sha256-prTCwBfl/wNXIkdjKLiMSe/B64wCXOjOTr4AVNiFruw="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; + # do not create .orig backup files if patch applies with fuzz + patchFlags = [ "--no-backup-if-mismatch" "-p1" ]; + postPatch = '' # Make sure sage can at least be imported without setting any environment # variables. It won't be close to feature complete though. diff --git a/third_party/nixpkgs/pkgs/applications/science/math/scalp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/scalp/default.nix new file mode 100644 index 0000000000..05261701fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/math/scalp/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchgit +, cmake +, withGurobi ? false +, gurobi +, withCplex ? false +, cplex +, withLpsolve ? true +, lp_solve +}: + +stdenv.mkDerivation rec { + pname = "scalp"; + version = "unstable-2022-03-15"; + + src = fetchgit { + url = "https://digidev.digi.e-technik.uni-kassel.de/git/scalp.git"; + # mirrored at https://github.com/wegank/scalp.git + rev = "185b84e4ff967f42cf2de5db4db4e6fa0cc18fb8"; + sha256 = "sha256-NyMZdJwdD3FR6uweYCclJjfcf3Y24Bns1ViwsmJ5izg="; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = lib.optionals withGurobi [ + gurobi + ] ++ lib.optionals withCplex [ + cplex + ] ++ lib.optionals withLpsolve [ + lp_solve + ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" + ''; + + cmakeFlags = [ + "-DBUILD_TESTS=${lib.boolToString doCheck}" + ] ++ lib.optionals withGurobi [ + "-DGUROBI_DIR=${gurobi}" + ] ++ lib.optionals withCplex [ + "-DCPLEX_DIR=${cplex}" + ]; + + doCheck = true; + + meta = with lib; { + description = "Scalable Linear Programming Library"; + homepage = "https://digidev.digi.e-technik.uni-kassel.de/scalp/"; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ wegank ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix index e3a301f662..aa7431504a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/boinc/default.nix @@ -4,7 +4,7 @@ sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let majorVersion = "7.20"; - minorVersion = "1"; + minorVersion = "2"; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "BOINC"; repo = "boinc"; rev = "client_release/${majorVersion}/${version}"; - sha256 = "sha256-FRU5s/nvT3VKU78AXYlbzeru7XQwNSqDNMGrdQ3jd1w="; + sha256 = "sha256-vMb5Vq/6I6lniG396wd7+FfslsByedMRPIpiItp1d1s="; }; nativeBuildInputs = [ libtool automake autoconf m4 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/gephi/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/gephi/default.nix index f945e90930..bb17fcc9c2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/gephi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/gephi/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, jdk, maven, javaPackages }: let - version = "0.9.2"; + version = "0.9.6"; src = fetchFromGitHub { owner = "gephi"; repo = "gephi"; rev = "v${version}"; - sha256 = "0kqp2nvnsb55j1axb6hk0mlw5alyaiyb70z0mdybhpqqxyw2da2r"; + sha256 = "sha256-3+tOwcE7TUeexJCugFsx9SgsKeb7ApNqbMEIi9QaKPE="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -24,7 +24,7 @@ let installPhase = ''find $out/.m2 -type f -regex '.+\(\.lastUpdated\|resolver-status\.properties\|_remote\.repositories\)' -delete''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1p7yf97dn0nvr005cbs6vdk3i341s8fya4kfccj8qqad2qgxflif"; + outputHash = "sha256-kIPsZN0alRAgiMbckQnMWKOKtCZ37D/6MgT17VYcr+s="; }; in stdenv.mkDerivation { diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix index 872438158d..b4e0a35184 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/root/default.nix @@ -40,13 +40,27 @@ , noSplash ? false }: +let + + _llvm_9 = llvm_9.overrideAttrs (prev: { + patches = (prev.patches or []) ++ [ + (fetchpatch { + url = "https://github.com/root-project/root/commit/a9c961cf4613ff1f0ea50f188e4a4b0eb749b17d.diff"; + stripLen = 3; + hash = "sha256-LH2RipJICEDWOr7JzX5s0QiUhEwXNMFEJihYKy9qWpo="; + }) + ]; + }); + +in + stdenv.mkDerivation rec { pname = "root"; - version = "6.24.06"; + version = "6.26.06"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "sha256-kH9p9LrKHk8w7rSXlZjKdZm2qoA8oEboDiW2u6oO9SI="; + hash = "sha256-sfc8l2pYClxWyMigFSWCod/FYLTdgOG3VFI3tl5sics="; }; nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; @@ -59,7 +73,7 @@ stdenv.mkDerivation rec { zstd lapack libxml2 - llvm_9 + _llvm_9 lz4 xz gsl @@ -80,13 +94,6 @@ stdenv.mkDerivation rec { patches = [ ./sw_vers.patch - - # Fix builtin_llvm=OFF support - (fetchpatch { - url = "https://github.com/root-project/root/commit/0cddef5d3562a89fe254e0036bb7d5ca8a5d34d2.diff"; - excludes = [ "interpreter/cling/tools/plugins/clad/CMakeLists.txt" ]; - sha256 = "sha256-VxWUbxRHB3O6tERFQdbGI7ypDAZD3sjSi+PYfu1OAbM="; - }) ]; # Fix build against vanilla LLVM 9 diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix index 4867e6c9ed..8db9245ed3 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/simgrid/default.nix @@ -65,6 +65,9 @@ stdenv.mkDerivation rec { "-Denable_compile_warnings=off" "-Denable_compile_optimizations=${optionOnOff optimize}" "-Denable_lto=${optionOnOff optimize}" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; makeFlags = optional debug "VERBOSE=1"; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix index fc6c9a086a..3777f6e248 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/snakemake/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "7.8.5"; + version = "7.12.0"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-y1rjBp5O0aiVeFlCIw7IK4A3ehOhzy+NKa9/abhFrFo="; + hash = "sha256-URywo88EcQBYorwnKqgGOzunf2JunEWa36adhA1wha0="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix index 14cc2d8b4c..f02e45280a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.50"; + version = "1.8.52"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dTdXmhm6sWZphLhcoKRDQ2Ir0hcu0ev0xCul2O9hAXg="; + sha256 = "sha256-H30QZbUj6SXuwhhQUvHoPDM1D4ynm/vt1Mi4rkCB1oo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix index 92f6ebe6ce..8ed3cd8749 100644 --- a/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -6,7 +6,7 @@ mkDerivation rec { pname = "qgroundcontrol"; - version = "4.2.1"; + version = "4.2.3"; qtInputs = [ qtbase qtcharts qtlocation qtserialport qtsvg qtquickcontrols2 @@ -14,7 +14,12 @@ mkDerivation rec { ]; gstInputs = with gst_all_1; [ - gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad wayland + gstreamer + gst-plugins-base + (gst-plugins-good.override { qt5Support = true; }) + gst-plugins-bad + gst-libav + wayland ]; buildInputs = [ SDL2 ] ++ gstInputs ++ qtInputs; @@ -64,7 +69,7 @@ mkDerivation rec { owner = "mavlink"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7POrc6RUm3GVx3KuPUBNbKRUvUmA2UkEL7ezQVQt/yo="; + sha256 = "sha256-xa4c0ggQKqt4OfwVehjkhXYXY1TYVEoubuRH3Zsv0Ac="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/search/re-isearch/default.nix b/third_party/nixpkgs/pkgs/applications/search/re-isearch/default.nix new file mode 100644 index 0000000000..85f2186efa --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/search/re-isearch/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchFromGitHub, lib, db, file, libnsl }: + +stdenv.mkDerivation rec { + pname = "re-Isearch"; + version = "unstable-2022-03-24"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "e5953ea6c84285283be3689df7065908369cdbaf"; + sha256 = "sha256-D0PDqlWzIOHqdS2MlNzR2T5cyhiLcFlf30v6eFokoRQ="; + }; + + buildinputs = [ + db + file # libmagic + libnsl + ]; + + makeFlags = [ + "CC=g++" "cc=gcc" "LD=g++" + "INSTALL=${placeholder "out"}/bin" + ]; + + preBuild = '' + cd build + makeFlagsArray+=( + EXTRA_INC="-I${db.dev}/include -I${file}/include" + LD_PATH="-L../lib -L${db.out}/lib -L${file}/lib -L${libnsl}/lib" + ) + ''; + + preInstall = '' + mkdir -p $out/{bin,lib} + ''; + postInstall = '' + cp ../lib/*.so $out/lib/ + ''; + + meta = with lib; { + description = "Novel multimodal search and retrieval engine"; + homepage = "https://github.com/re-Isearch/"; + license = licenses.asl20; + maintainers = [ maintainers.astro ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix index 78b1901be4..7ba18bf9ed 100644 --- a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -35,11 +35,11 @@ mkDerivation rec { pname = "recoll"; - version = "1.32.0"; + version = "1.32.5"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-4kt6g5MVZTyYLSH7q2z72nzAsU6fatC0vTebEKhSA6E="; + sha256 = "sha256-UvRpJkapN9nXHy3TY7SVdZ/sy8f3QCHkg3/FM0oP9VY="; }; configureFlags = [ "--enable-recollq" "--disable-webkit" "--without-systemd" ] diff --git a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix index 60339bf2e5..495d236b35 100644 --- a/third_party/nixpkgs/pkgs/applications/system/glances/default.nix +++ b/third_party/nixpkgs/pkgs/applications/system/glances/default.nix @@ -9,29 +9,16 @@ buildPythonApplication rec { pname = "glances"; - version = "3.2.6.4"; + version = "3.2.7"; disabled = isPyPy; src = fetchFromGitHub { owner = "nicolargo"; repo = "glances"; rev = "v${version}"; - sha256 = "sha256-i88bz6AwfDbqC+7yvr7uDofAqBwQmnfoKbt3iJz4Ft8="; + sha256 = "sha256-WZDvC95Y6Xc7dOuPJJlJLI4PCZR76pYPl8NGtmxe91o="; }; - # Some tests fail in the sandbox (they e.g. require access to /sys/class/power_supply): - patches = lib.optional (doCheck && stdenv.isLinux) ./skip-failing-tests.patch - ++ lib.optional (doCheck && stdenv.isDarwin) - [ - # Fix "TypeError: unsupported operand type(s) for +=: 'int' and 'NoneType'" on darwin - # https://github.com/nicolargo/glances/pull/2082 - (fetchpatch { - name = "fix-typeerror-when-testing-on-darwin.patch"; - url = "https://patch-diff.githubusercontent.com/raw/nicolargo/glances/pull/2082.patch"; - sha256 = "sha256-MIePPywZ2dTTqXjf7EJiHlQ7eltiHzgocqrnLeLJwZ4="; - }) - ]; - # On Darwin this package segfaults due to mismatch of pure and impure # CoreFoundation. This issues was solved for binaries but for interpreted # scripts a workaround below is still required. diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix index abcea5f69a..02c035914f 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.12.1"; + version = "1.13.0"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "14jqs4sarxbrgi5pxz0afqa9jxq90cb5ayqd21qj2n65whqa5bpk"; + sha256 = "0cc262jpqp8l25p04pcqh3w671gw0p1d2zrr3d34ch8k9c6s4nzq"; }; depsBuildBuild = [ @@ -144,7 +144,6 @@ stdenv.mkDerivation rec { mesonBuildType = "release"; # See https://codeberg.org/dnkl/foot/src/tag/1.9.2/INSTALL.md#options - # TODO(@sternenseemann): install systemd user units mesonFlags = [ # Use lto "-Db_lto=true" @@ -154,6 +153,8 @@ stdenv.mkDerivation rec { "-Ddefault-terminfo=foot" # Tell foot to set TERMINFO and where to install the terminfo files "-Dcustom-terminfo-install-location=${terminfoDir}" + # Install systemd user units for foot-server + "-Dsystemd-units-dir=${placeholder "out"}/lib/systemd/user" ]; # build and run binary generating PGO profiles, diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix index 691a2d10c6..790aa17259 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , gettext , gnome , libgtop @@ -29,14 +30,23 @@ stdenv.mkDerivation rec { sha256 = "fSbmwYdExXWnhykyY/YM7/YwEHCY6eWKd2WwCsdDcEk="; }; + patches = [ + (fetchpatch { + name = "fix-clang-build-issues.patch"; + url = "https://gitlab.gnome.org/GNOME/console/-/commit/0e29a417d52e27da62f5cac461400be6a764dc65.patch"; + sha256 = "sha256-5ORNZOxjC5dMk9VKaBcJu5OV1SEZo9SNUbN4Ob5hVJs="; + }) + ]; + buildInputs = [ gettext libgtop - gnome.nautilus gtk3 libhandy pcre2 vte + ] ++ lib.optionals stdenv.isLinux [ + gnome.nautilus ]; nativeBuildInputs = [ @@ -51,6 +61,10 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; + mesonFlags = lib.optionals (!stdenv.isLinux) [ + "-Dnautilus=disabled" + ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; @@ -64,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/console"; license = licenses.gpl3Plus; maintainers = teams.gnome.members ++ (with maintainers; [ zhaofengli ]); - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix index 031d49d245..707534d261 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/hyper/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.2.1"; + version = "3.2.3"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "sha256-nwaJ+lnuHv+Qb/QkKF/9jG8cvq1Z+urz8CPwxSsMmuA="; + sha256 = "sha256-CHLkHH9u5YWlmRDa4H3ymqg1YMBYjo+kuxpu0OVv4E8="; }; nativeBuildInputs = [ dpkg ]; diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index e818f4a71f..28dad82fe1 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -125,6 +125,21 @@ buildPythonApplication rec { fish ]; + # skip failing tests due to darwin sandbox + preCheck = if stdenv.isDarwin then '' + substituteInPlace kitty_tests/file_transmission.py \ + --replace test_file_get dont_test_file_get \ + --replace test_path_mapping_receive dont_test_path_mapping_receive + substituteInPlace kitty_tests/shell_integration.py \ + --replace test_fish_integration dont_test_fish_integration + substituteInPlace kitty_tests/open_actions.py \ + --replace test_parsing_of_open_actions dont_test_parsing_of_open_actions + substituteInPlace kitty_tests/ssh.py \ + --replace test_ssh_connection_data dont_test_ssh_connection_data + substituteInPlace kitty_tests/fonts.py \ + --replace 'class Rendering(BaseTest)' 'class Rendering' + '' else ""; + checkPhase = let buildBinPath = if stdenv.isDarwin @@ -132,6 +147,8 @@ buildPythonApplication rec { else "linux-package/bin"; in '' + runHook preCheck + # Fontconfig error: Cannot load default config file: No such file: (null) export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix index 52b35ad38a..18e9136194 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/sakura/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "sakura"; - version = "3.8.4"; + version = "3.8.5"; src = fetchFromGitHub { owner = "dabisu"; repo = pname; rev = "SAKURA_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-Sqo1gyCvCMlEv1rYqw6P3Dmu10osi/KqB7/WlgTTNAc="; + hash = "sha256-eMGhPkfhpPHMg69J+XgK/ssJjwRSFgd/a64lAYi7hd0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix index 4fed03db0d..70f933e7b2 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -22,20 +22,21 @@ , Cocoa , Foundation , libiconv +, UserNotifications , nixosTests , runCommand }: rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20220624-141144-bd1b7c5d"; + version = "20220807-113146-c2fee766"; src = fetchFromGitHub { owner = "wez"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-7VuNOJ4xqTxumLft7wRj4zdN8Y2ZSYtXr/KuqaLNOgw="; + sha256 = "sha256-2krngcANqcwq8wNQZSz01srJ6yEOkk03QnO2sL7SuJA="; }; postPatch = '' @@ -45,7 +46,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-YvQ0APyPiYwISE/pDD2s+UgYFj4CKPdolb14FrNpocU="; + cargoSha256 = "sha256-ZkDGCR86VSCuvVlo4Pf9Ifax2BZuBicZpB/K/7bIMls="; nativeBuildInputs = [ pkg-config @@ -71,6 +72,7 @@ rustPlatform.buildRustPackage rec { CoreGraphics Foundation libiconv + UserNotifications ]; postInstall = '' @@ -119,7 +121,5 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; - # Fails on missing UserNotifications framework while linking - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix index 38aca7350a..f6a52466d6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix @@ -16,6 +16,7 @@ , termcolor , tomlkit , typing-extensions +, chardet , argcomplete, fetchPypi }: @@ -34,13 +35,13 @@ in buildPythonApplication rec { pname = "commitizen"; - version = "2.21.2"; + version = "2.29.2"; src = fetchFromGitHub { owner = "commitizen-tools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7S676bpSrlAqpbgDj9nAo0WjeitbbHoYc693MJm35Js="; + hash = "sha256-4mK+GA1rfctJkMv4ZMfXE/qih/9fF0kwT6bIcLVB/Bk="; deepClone = true; }; @@ -49,6 +50,7 @@ buildPythonApplication rec { nativeBuildInputs = [ poetry ]; propagatedBuildInputs = [ + chardet termcolor questionary colorama @@ -85,6 +87,8 @@ buildPythonApplication rec { "test_bump_on_git_with_hooks_no_verify_disabled" "test_bump_on_git_with_hooks_no_verify_enabled" "test_bump_patch_increment" + "test_bump_pre_commit_changelog" + "test_bump_pre_commit_changelog_fails_always" "test_bump_tag_exists_raises_exception" "test_bump_when_bumpping_is_not_support" "test_bump_when_version_inconsistent_in_version_files" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix index 382f08f7af..b8361d8bd7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/dvc/default.nix @@ -10,19 +10,26 @@ python3.pkgs.buildPythonApplication rec { pname = "dvc"; - version = "2.12.0"; + version = "2.17.0"; format = "setuptools"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = version; - hash = "sha256-d1Tjqomr8Lcf+X+LZgi0wHlxXBUqHq/nAzDBbrxHAl4="; + hash = "sha256-2h+fy4KMxFrVtKJBtA1RmJDZv0OVm1BxO1akZzAw95Y="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "grandalf==0.6" "grandalf" \ + --replace "scmrepo==0.0.25" "scmrepo" + substituteInPlace dvc/daemon.py \ + --subst-var-by dvc "$out/bin/dcv" + ''; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm - setuptools-scm-git-archive ]; propagatedBuildInputs = with python3.pkgs; [ @@ -30,7 +37,6 @@ python3.pkgs.buildPythonApplication rec { appdirs colorama configobj - configobj dictdiffer diskcache distro @@ -38,6 +44,7 @@ python3.pkgs.buildPythonApplication rec { dvclive dvc-data dvc-render + dvc-task flatten-dict flufl_lock funcy @@ -59,7 +66,7 @@ python3.pkgs.buildPythonApplication rec { shortuuid shtab tabulate - toml + tomlkit tqdm typing-extensions voluptuous @@ -82,16 +89,6 @@ python3.pkgs.buildPythonApplication rec { importlib-resources ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "grandalf==0.6" "grandalf" \ - --replace "scmrepo==0.0.25" "scmrepo" \ - --replace "dvc-data==0.0.16" "dvc-data" \ - --replace "dvc-render==0.0.6" "dvc-render" - substituteInPlace dvc/daemon.py \ - --subst-var-by dvc "$out/bin/dcv" - ''; - # Tests require access to real cloud services doCheck = false; @@ -99,6 +96,6 @@ python3.pkgs.buildPythonApplication rec { description = "Version Control System for Machine Learning Projects"; homepage = "https://dvc.org"; license = licenses.asl20; - maintainers = with maintainers; [ cmcdragonkai fab ]; + maintainers = with maintainers; [ cmcdragonkai fab anthonyroussel ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/fornalder/Cargo.lock b/third_party/nixpkgs/pkgs/applications/version-management/fornalder/Cargo.lock new file mode 100644 index 0000000000..5f1cafc909 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/fornalder/Cargo.lock @@ -0,0 +1,597 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "either" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" + +[[package]] +name = "error-chain" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" +dependencies = [ + "backtrace", + "version_check", +] + +[[package]] +name = "fallible-iterator" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "fastrand" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +dependencies = [ + "instant", +] + +[[package]] +name = "fornalder" +version = "0.1.0" +dependencies = [ + "chrono", + "error-chain", + "io", + "itertools", + "regex", + "rusqlite", + "serde", + "serde_json", + "structopt", + "tempfile", +] + +[[package]] +name = "gimli" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" + +[[package]] +name = "hashbrown" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashlink" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d99cf782f0dc4372d26846bec3de7804ceb5df083c2d4462c0b8d2330e894fa8" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "io" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c839d30624bc6b3dced6a4652823d1967fb7939d4848ad002d509b1fc916b2" + +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "libsqlite3-sys" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64d31059f22935e6c31830db5249ba2b7ecd54fd73a9909286f0a67aa55c2fbd" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "miniz_oxide" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +dependencies = [ + "adler", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "memchr", +] + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "redox_syscall" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "534cfe58d6a18cc17120fbf4635d53d14691c1fe4d951064df9bd326178d7d5a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "regex" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "rusqlite" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5f38ee71cbab2c827ec0ac24e76f82eca723cee92c509a65f67dee393c25112" +dependencies = [ + "bitflags", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "memchr", + "smallvec", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "ryu" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" + +[[package]] +name = "serde" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "structopt" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +dependencies = [ + "clap", + "lazy_static", + "structopt-derive", +] + +[[package]] +name = "structopt-derive" +version = "0.4.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +dependencies = [ + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "time" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi", + "winapi", +] + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + +[[package]] +name = "unicode-segmentation" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/fornalder/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fornalder/default.nix new file mode 100644 index 0000000000..9dd25cf12e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/fornalder/default.nix @@ -0,0 +1,29 @@ +{ fetchFromGitHub, rustPlatform, lib }: + +rustPlatform.buildRustPackage rec { + pname = "fornalder"; + version = "unstable-2022-07-23"; + + src = fetchFromGitHub { + owner = "hpjansson"; + repo = pname; + rev = "44129f01910a9f16d97d0a3d8b1b376bf3338ea6"; + sha256 = "sha256-YODgR98SnpL6SM2nKrnzhpsEzYQFqduqigua/SXhazk="; + }; + + cargoLock.lockFile = ./Cargo.lock; + + postPatch = '' + ln -s ${./Cargo.lock} Cargo.lock + ''; + + # tests don't typecheck + doCheck = false; + + meta = with lib; { + description = "Visualize long-term trends in collections of Git repositories"; + homepage = "https://github.com/hpjansson/fornalder"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix index 867efc6ece..ab610624f3 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.18"; + version = "2.19"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${version}/fossil-${version}.tar.gz"; - sha256 = "0iimdzfdl5687xyqxfadbn640x45n3933q1nfx7b32rl4v3vk778"; + sha256 = "sha256-RZ9/7b4lRJqFVyfXwzutO8C/Pa6XPyxtvpp7gmEGoj4="; }; nativeBuildInputs = [ installShellFiles tcl tcllib ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index e8bde32832..9b1284c6e0 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.14.2"; + version = "2.14.4"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-/0cX1GSzrmTFsRA1L5pCNHMO5cb5RFx4DsInBEn3emw="; + sha256 = "sha256-vg91YnwtbD2j6zue5g5j+iyHRDrW83GQKEi/n9nDHBw="; }; - vendorSha256 = "sha256-yhUP6BaR2xloy3/g7pKhn5ljwTEm8XwPaOiZCIfIM7E="; + vendorSha256 = "sha256-xyrz+oN9DLDh4jSVFM5gVZFJW+yJKrhYOtQs38URAjM="; nativeBuildInputs = [ installShellFiles ]; @@ -32,14 +32,14 @@ buildGoModule rec { install -Dm755 bin/gh -t $out/bin installManPage share/man/*/*.[1-9] - for shell in bash fish zsh; do - $out/bin/gh completion -s $shell > gh.$shell - installShellCompletion gh.$shell - done + installShellCompletion --cmd gh \ + --bash <($out/bin/gh completion -s bash) \ + --fish <($out/bin/gh completion -s fish) \ + --zsh <($out/bin/gh completion -s zsh) runHook postInstall ''; - # fails with `unable to find git executable in PATH` + # most tests require network access doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 32ef030962..01f69c9c98 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-0ewiCLBAvK0cLsEFN1W7fQyn66Vu2aLor9+VYuX05Os="; + sha256 = "sha256-rnlSwqZ3Kigfmkt2ws5bmX/ipqxFUPZYDpdnkZZE59Y="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix index 13ba738c46..902211ef3d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-branchless/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "git-branchless"; - version = "0.3.12"; + version = "0.4.0"; src = fetchFromGitHub { owner = "arxanas"; repo = "git-branchless"; rev = "v${version}"; - sha256 = "sha256-1bUHltONLfJumkxPnzGJFMMyS02LVqjpDL+KgiewyoQ="; + sha256 = "sha256-WFrN5TRFr9xHBUawTfvri0qlTiWCfAeC5SL+T6mwlU0="; }; - cargoSha256 = "sha256-3+ULHqtKAhf4AdoLPK/3IqnfOcskoh6ctlQnY1oTHJ8="; + cargoSha256 = "sha256-AGW1jUKPc5iiuDlgIDHG1sOn1flAB3UdxJJNKPH5+f8="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix index ced8244256..2e467b657d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cliff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - sha256 = "sha256-wVHL2+didmiN7UlEeIuSr+8LhkFKCOD3of4rKVg1i1o="; + sha256 = "sha256-lRONRLTByhMalN9BKilCcQn2c9f4cxOnHJLL0l0jaOs="; }; - cargoSha256 = "sha256-5jhloUnaGXXDu2LCO86SMJo8ETIxLAivv3hx9gEqtJ4="; + cargoSha256 = "sha256-1r/k3DQ/vjIjMpOHYCRRosbZ22iAFkuq4EbZUcZoWn0="; # attempts to run the program on .git in src which is not deterministic doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 88224a6425..5defb54a63 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -1,21 +1,21 @@ { lib, fetchFromGitHub, python3Packages, gettext, git, qt5 }: let - inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify; + inherit (python3Packages) buildPythonApplication pyqt5 sip_4 pyinotify qtpy; in buildPythonApplication rec { pname = "git-cola"; - version = "3.12.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "1f8jpfa916nszj431cmp41bxj2m76k2n8qnscqgxrc0k3pnnp3wc"; + hash = "sha256-xCGXPGZa4K9f37kZRerfUY+Y7atRdqld5rxj0VYdziU="; }; buildInputs = [ git gettext ]; - propagatedBuildInputs = [ pyqt5 sip_4 pyinotify ]; + propagatedBuildInputs = [ pyqt5 sip_4 pyinotify qtpy ]; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix index de7f47507f..45b7851133 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-credential-1password/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "git-credential-1password"; - version = "1.0.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "develerik"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WMEUa0mSxmeFXQBejwxtlhWuuLKguugavRaBUVpYA3g="; + sha256 = "sha256-F3XhBVTV8TgVNrOePm3F+uWspkllBlZ/yRyUxrCG0xw="; }; - vendorSha256 = "sha256-eUjaSpmQpSOvSBW+7ajXiEDepkyvHsIiEY0RGpfnao0="; + vendorSha256 = "sha256-2CNGAuvO8IeNUhFnMEj8NjZ2Qm0y+i/0ktNCd3A8Ans="; meta = with lib; { description = "A git credential helper for 1Password"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix index c128536d34..71c8bf1790 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "6.4.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; - rev = version; - sha256 = "sha256-swAc8ObZY78nVQyjTrVG81xBqTYnWHVDFpiUApbowqU="; + rev = "refs/tags/${version}"; + sha256 = "sha256-CPJhd3QXXNm4RGBEDnNOohVOYKVI6I8uc3cDiTrXKvc="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 98da70a274..b6595a7278 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -31,6 +31,6 @@ buildRustPackage rec { description = "Quickly and easily fetch .gitignore templates from gitignore.io"; homepage = "https://github.com/sondr3/git-ignore"; license = licenses.gpl3Plus; - maintainers = [ maintainers.sondr3 ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 1e2af3023c..ffe5aeb7ee 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -12,13 +12,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.11.1"; + version = "3.11.4"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BhR1dE6+K7UKaCbLmWPtLMyq0oIj/xYenXp5s7kRINc="; + sha256 = "sha256-nP7TOxTvf2twfS3rLYjiR6iRTS+lA6iJttqzlj4rGm0="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 6e33c013dc..9e735edea8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -19,6 +19,7 @@ , pkg-config, glib, libsecret , gzip # needed at runtime by gitweb.cgi , withSsh ? false +, doInstallCheck ? !stdenv.isDarwin # extremely slow on darwin }: assert osxkeychainSupport -> stdenv.isDarwin; @@ -26,12 +27,12 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.36.1"; + version = "2.37.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "git" + lib.optionalString svnSupport "-with-svn" + lib.optionalString (!svnSupport && !guiSupport && !sendEmailSupport && !withManual && !pythonSupport && !withpcre2) "-minimal"; @@ -39,7 +40,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0w43a35mhc2qf2gjkxjlnkf2lq8g0snf34iy5gqx2678yq7llpa0"; + sha256 = "sha256-yBYsa4uPHF23BqsBtO4p4xBhGCE13CfEhgIkquwbNQA="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -280,7 +281,7 @@ stdenv.mkDerivation { ## InstallCheck doCheck = false; - doInstallCheck = true; + inherit doInstallCheck; installCheckTarget = "test"; @@ -369,6 +370,9 @@ stdenv.mkDerivation { passthru = { shellPath = "/bin/git-shell"; tests = { + withInstallCheck = finalAttrs.finalPackage.overrideAttrs (_: { + doInstallCheck = true; + }); buildbot-integration = nixosTests.buildbot; }; }; @@ -387,4 +391,4 @@ stdenv.mkDerivation { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ primeos wmertens globin ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index 9d63642dcb..cb75ec8264 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,47 +1,65 @@ -{ lib, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, unixtools, nixosTests }: +{ lib +, buildGoModule +, fetchpatch +, fetchFromGitHub +, git +, groff +, installShellFiles +, makeWrapper +, unixtools +, nixosTests +}: -buildGoPackage rec { +buildGoModule rec { pname = "hub"; - version = "2.14.2"; - - goPackagePath = "github.com/github/hub"; - - # Only needed to build the man-pages - excludedPackages = [ "github.com/github/hub/md2roff-bin" ]; + version = "unstable-2022-04-04"; src = fetchFromGitHub { owner = "github"; repo = pname; - rev = "v${version}"; - sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh"; + rev = "363513a0f822a8bde5b620e5de183702280d4ace"; + sha256 = "sha256-jipZHmGtPTsztTeVZofaMReU4AEU9k6mdw9YC4KKB1Q="; }; - nativeBuildInputs = [ groff installShellFiles unixtools.col ]; - postPatch = '' - patchShebangs . - substituteInPlace git/git.go --replace "cmd.New(\"git\")" "cmd.New(\"${git}/bin/git\")" - substituteInPlace commands/args.go --replace "Executable: \"git\"" "Executable: \"${git}/bin/git\"" + patchShebangs script/ ''; + vendorSha256 = "sha256-wQH8V9jRgh45JGs4IfYS1GtmCIYdo93JG1UjJ0BGxXk="; + + # Only needed to build the man-pages + excludedPackages = [ "github.com/github/hub/md2roff-bin" ]; + + nativeBuildInputs = [ + groff + installShellFiles + makeWrapper + unixtools.col + ]; + postInstall = '' - cd go/src/${goPackagePath} - installShellCompletion --zsh --name _hub etc/hub.zsh_completion - installShellCompletion --bash --name hub etc/hub.bash_completion.sh - installShellCompletion --fish --name hub.fish etc/hub.fish_completion + installShellCompletion --cmd hub \ + --bash etc/hub.bash_completion.sh \ + --fish etc/hub.fish_completion \ + --zsh etc/hub.zsh_completion - LC_ALL=C.UTF8 \ - make man-pages + LC_ALL=C.UTF8 make man-pages installManPage share/man/man[1-9]/*.[1-9] + + wrapProgram $out/bin/hub \ + --suffix PATH : ${lib.makeBinPath [ git ]} ''; + checkInputs = [ + git + ]; + passthru.tests = { inherit (nixosTests) hub; }; meta = with lib; { description = "Command-line wrapper for git that makes you better at GitHub"; - license = licenses.mit; homepage = "https://hub.github.com/"; + license = licenses.mit; maintainers = with maintainers; [ globin ]; - platforms = with platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hut/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hut/default.nix index 49e5fa675a..f2623d326d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/hut/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hut"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = "hut"; rev = "v${version}"; - sha256 = "sha256-2YUrDPulpLQQGw31nEasHoQ/AppECg7acwwqu6JDT5U="; + sha256 = "sha256-g9KbOtZaBAgy/iBBh/Tv5ULJNnNzwzZpA6DOynl+dnk="; }; - vendorSha256 = "sha256-EmokL3JlyM6C5/NOarCAJuqNsDO2tgHwqQdv0rAk+Xk="; + vendorSha256 = "sha256-vuAx8B34Za+GEtekFOUaY07hBk3O2OaJ1JmulbIhwbs="; nativeBuildInputs = [ scdoc diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 75bf008d1e..a697093e1f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,23 +1,35 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "lefthook"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "evilmartians"; repo = "lefthook"; - sha256 = "sha256-uaIZrxfzV2WPvnAPm6Q67yKx1EVmSMcChSxZG/Huw48="; + sha256 = "sha256-/y9UUVwJ/u1F9+hMxWqGENscTuf8GP4VZl7hTk3zyrM="; }; vendorSha256 = "sha256-LCBQyVSkUywceIlioYRNuRc6FrbPKuhgfw5OocR3NvI="; + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ "-s" "-w" ]; + doCheck = false; + postInstall = '' + installShellCompletion --cmd lefthook \ + --bash <($out/bin/lefthook completion bash) \ + --fish <($out/bin/lefthook completion fish) \ + --zsh <($out/bin/lefthook completion zsh) + ''; + meta = with lib; { description = "Fast and powerful Git hooks manager for any type of projects"; - homepage = "https://github.com/Arkweid/lefthook"; + homepage = "https://github.com/evilmartians/lefthook"; + changelog = "https://github.com/evilmartians/lefthook/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ rencire ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix index e1129a7274..a484aa6c32 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lucky-commit/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "lucky-commit"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "not-an-aardvark"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FnH9rDy6opu0WJnCgAFvxJXWKyD2v5eGPNmbC1cvzko="; + sha256 = "sha256-0RSNlzmwat89ewQrjdGxLcXo01d+UaPZlteaxZCBRyE="; }; - cargoSha256 = "sha256-iEYkOPAcWIwK7mthovrGFHfp/NsQ4ycqiTZvkHnYWzA="; + cargoSha256 = "sha256-8r/EGIiN+HTtChgLTdOS+Y7AdmjswqD4BZtYlL5UiEo="; buildInputs = lib.optional withOpenCL (if stdenv.isDarwin then OpenCL else ocl-icd); diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix index 6355b7114f..85cb9127c2 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -8,7 +8,7 @@ mkDerivation rec { owner = "tibirna"; repo = "qgit"; rev = "${pname}-${version}"; - sha256 = "1cwq43ywvii9zh4m31mgkgisfc9qhiixlz0zlv99skk9vb5v6r38"; + sha256 = "sha256-xM0nroWs4WByc2O469zVeAlzKn6LLr+8WDlEdSjtRYI="; }; buildInputs = [ qtbase ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index 6740cb713f..45a5234acc 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -9,7 +9,6 @@ buildGoModule rec { repo = "git-lfs"; rev = "v${version}"; sha256 = "sha256-3gVUPfZs5GViEA3D7Zm5NdxhuEz9DhwPLoQqHFdGCrI="; - leaveDotGit = true; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix index ad41afe5ac..f680fc6b14 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.25"; + version = "2.28"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "sha256-3S4peybytlO432ui+bECVWQTbyNfs2kSMqcqQyVc1os="; + sha256 = "sha256-wuEwyhKclbfkcm8Wc5wyoLT1p/V0zAtaQB1gbuwqalM="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index c9af0c8f1f..c82951768c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -14,21 +14,14 @@ buildGoPackage rec { pname = "gitea"; - version = "1.16.9"; + version = "1.17.0"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-LxPYUSyRSfDlGwCC2IFPEISP4wsRJsUbwi9F7sxbMOE="; + sha256 = "sha256-oBbAg2xQ58dLBCjhcKMoUf32ckoFfnFQHL3z3pAKW1Y="; }; - unpackPhase = '' - mkdir source/ - tar xvf $src -C source/ - ''; - - sourceRoot = "source"; - patches = [ ./static-root-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix index 7c07dc17c2..a834a33570 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/github-desktop/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "github-desktop"; - version = "2.9.12"; + version = "3.0.5"; src = fetchurl { url = "https://github.com/shiftkey/desktop/releases/download/release-${version}-linux1/GitHubDesktop-linux-${version}-linux1.deb"; - sha256 = "sha256-tr1u6q7sHI1Otor53d1F7J0f9eV9tKtLZx8+40I16y8="; + sha256 = "sha256-7Sk2jDNZtOA04hkl/J+Up2yMGT8+FcXGPiUMcHhb7iY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index dce348e9f2..e507401a56 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,22 @@ { - "version": "15.1.2", - "repo_hash": "sha256-gZCKI2OXKQZzRe3T/nbnRC0qFHnOBVOAST+ky0qmJDc=", - "yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4", + "version": "15.2.2", + "repo_hash": "sha256-Rb6u47Ehx1Kee3FFsoFa6ZqpU7c00ToEelvfjyG3aiI=", + "yarn_hash": "154akdngdagwfn8s90aw6sajw058i507shv5wzdn8l0vy3badgkv", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.1.2-ee", + "rev": "v15.2.2-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.1.2", - "GITLAB_PAGES_VERSION": "1.59.0", - "GITLAB_SHELL_VERSION": "14.7.4", - "GITLAB_WORKHORSE_VERSION": "15.1.2" - } + "GITALY_SERVER_VERSION": "15.2.2", + "GITLAB_PAGES_VERSION": "1.61.1", + "GITLAB_SHELL_VERSION": "14.9.0", + "GITLAB_WORKHORSE_VERSION": "15.2.2" + }, + "vendored_gems": [ + "devise-pbkdf2-encryptable", + "omniauth-gitlab", + "omniauth_crowd", + "mail-smtp_pool", + "ipynbdiff", + "error_tracking_open_api" + ] } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix index 73a0267347..1175b42fc5 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/default.nix @@ -46,6 +46,8 @@ let # N.B. omniauth_oauth2_generic and apollo_upload_server both provide a # `console` executable. ignoreCollisions = true; + + extraConfigPaths = lib.forEach data.vendored_gems (gem: "${src}/vendor/gems/${gem}"); }; yarnOfflineCache = fetchYarnDeps { @@ -203,7 +205,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin krav talyz yayayayaka yuka ]; + maintainers = with maintainers; [ globin krav talyz yayayayaka yuka ]; } // (if gitlabEnterprise then { license = licenses.unfreeRedistributable; # https://gitlab.com/gitlab-org/gitlab-ee/raw/master/LICENSE diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 787e705f94..cbb9321fd7 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' gem 'rugged', '~> 1.2' -gem 'github-linguist', '~> 7.12', require: 'linguist' +gem 'github-linguist', '~> 7.20.0', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.1.4.7' gem 'rdoc', '~> 6.0' @@ -13,7 +13,7 @@ gem 'faraday', '~> 1.0' gem 'rbtrace', require: false # Labkit provides observability functionality -gem 'gitlab-labkit', '~> 0.21.1' +gem 'gitlab-labkit', '~> 0.23' # Detects the open source license the repository includes # This version needs to be in sync with GitLab CE/EE diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index 3616864ad7..65faf2b721 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -40,7 +40,7 @@ GEM dotenv (2.7.6) equalizer (0.0.11) erubi (1.10.0) - escape_utils (1.2.1) + escape_utils (1.2.2) factory_bot (5.0.2) activesupport (>= 4.2.0) faraday (1.0.1) @@ -48,11 +48,11 @@ GEM ffi (1.15.3) gemojione (3.3.0) json - github-linguist (7.12.1) + github-linguist (7.20.0) charlock_holmes (~> 0.7.7) escape_utils (~> 1.2.0) mini_mime (~> 1.0) - rugged (>= 0.25.1) + rugged (~> 1.0) github-markup (1.7.0) gitlab-gollum-lib (4.2.7.10.gitlab.2) gemojione (~> 3.2) @@ -65,11 +65,11 @@ GEM gitlab-gollum-rugged_adapter (0.4.4.4.gitlab.1) mime-types (>= 1.15) rugged (~> 1.0) - gitlab-labkit (0.21.2) + gitlab-labkit (0.23.0) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) - grpc (~> 1.30) - jaeger-client (~> 1.1) + grpc (>= 1.37) + jaeger-client (~> 1.1.0) opentracing (~> 0.4) pg_query (~> 2.1) redis (> 3.0.0, < 5.0.0) @@ -110,7 +110,7 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2020.1104) - mini_mime (1.0.2) + mini_mime (1.1.2) mini_portile2 (2.8.0) minitest (5.15.0) msgpack (1.3.3) @@ -228,10 +228,10 @@ DEPENDENCIES activesupport (~> 6.1.4.7) factory_bot faraday (~> 1.0) - github-linguist (~> 7.12) + github-linguist (~> 7.20.0) gitlab-gollum-lib (~> 4.2.7.10.gitlab.2) gitlab-gollum-rugged_adapter (~> 0.4.4.4.gitlab.1) - gitlab-labkit (~> 0.21.1) + gitlab-labkit (~> 0.23) gitlab-license_finder gitlab-markup (~> 1.7.1) google-protobuf (~> 3.19.0) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index 44068644cc..dcb9d3cc1f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,39 +11,55 @@ let gemdir = ./.; }; - version = "15.1.2"; + version = "15.2.2"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; -in -buildGoModule { - pname = "gitaly"; - inherit version; + commonOpts = { + inherit version; - src = fetchFromGitLab { - owner = "gitlab-org"; - repo = "gitaly"; - rev = "v${version}"; - sha256 = "sha256-g/SlrE/NVMYqZaEgKncMLjsfI8jAE0xfyy6rpShsi2Q="; + src = fetchFromGitLab { + owner = "gitlab-org"; + repo = "gitaly"; + rev = "v${version}"; + sha256 = "sha256-ZePtqpe5zwbslgisIQ+BFM9vtnWknB75gtgoOlkbuyo="; + }; + + vendorSha256 = "sha256-aKF7iupg3XNopi0asasSu5ug+2M9p2nwxk/0g5how6U="; + + ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; + + tags = [ "static,system_libgit2" ]; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ rubyEnv.wrappedRuby libgit2_1_3_0 openssl zlib pcre http-parser ]; + + doCheck = false; }; - vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww="; + auxBins = buildGoModule ({ + pname = "gitaly-aux"; + + subPackages = [ "cmd/gitaly-hooks" "cmd/gitaly-ssh" "cmd/gitaly-git2go-v15" "cmd/gitaly-lfs-smudge" ]; + } // commonOpts); +in +buildGoModule ({ + pname = "gitaly"; passthru = { inherit rubyEnv; }; - ldflags = "-X ${gitaly_package}/internal/version.version=${version} -X ${gitaly_package}/internal/version.moduleVersion=${version}"; + subPackages = [ "cmd/gitaly" "cmd/gitaly-backup" ]; - tags = [ "static,system_libgit2" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ rubyEnv.wrappedRuby libgit2_1_3_0 openssl zlib pcre http-parser ]; - doCheck = false; + preConfigure = '' + mkdir -p _build/bin + cp -r ${auxBins}/bin/* _build/bin + ''; postInstall = '' mkdir -p $ruby cp -rv $src/ruby/{bin,lib,proto} $ruby - mv $out/bin/gitaly-git2go-${package_version} $out/bin/gitaly-git2go-${version} ''; outputs = [ "out" "ruby" ]; @@ -52,7 +68,7 @@ buildGoModule { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux ++ [ "x86_64-darwin" ]; - maintainers = with maintainers; [ roblabla globin fpletz talyz yayayayaka ]; + maintainers = with maintainers; [ roblabla globin talyz yayayayaka ]; license = licenses.mit; }; -} +} // commonOpts) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 1697a9f902..692a3614db 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -174,12 +174,14 @@ version = "1.10.0"; }; escape_utils = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qminivnyzwmqjhrh3b92halwbk0zcl9xn828p5rnap1szl2yag5"; + sha256 = "182ha3nmsc6ny4384233pav58a5x2spjn838w9nciwb29lxah1x3"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; factory_bot = { dependencies = ["activesupport"]; @@ -228,10 +230,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08lnb04qmlz4arls3nr3ia0k8r1kcyn010fr5qvc2qddidckqk88"; + sha256 = "10biwhh50fdssqs3ai651qgv079bn6h06g5cv00jc5s73iszfns9"; type = "gem"; }; - version = "7.12.1"; + version = "7.20.0"; }; github-markup = { source = { @@ -269,10 +271,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xkzm6kri1dzjrmicm3wgbnxi9gk0byanr6ibfrflv7spd98fz19"; + sha256 = "0kiz2m3dw6ld2z6dsl8jh2ycw061wv8wiy34flymb5zqjiyyzw8l"; type = "gem"; }; - version = "0.21.2"; + version = "0.23.0"; }; gitlab-license_finder = { dependencies = ["rubyzip" "thor" "tomlrb" "with_env" "xml-simple"]; @@ -442,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; type = "gem"; }; - version = "1.0.2"; + version = "1.1.2"; }; mini_portile2 = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 37d66c3a7f..029c2048f9 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.7.4"; + version = "14.9.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-kLIjlMwoK1AlhvP38OspXnIWbdOcaLl4r05PiUmqnWw="; + sha256 = "sha256-TO0ZO7Hd/9J+801zPrelnAnJa/X0W9yR0Wphjh3TpaE="; }; buildInputs = [ ruby ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorSha256 = "sha256-f2IkdkTZhve/cYKSH+N2Y5bXFSHuQ8t4hjfReyKTPUU="; + vendorSha256 = "sha256-urS0FED636APQe5uNvhDvWsnZtHCW60VtRE1B7IzGZQ="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin @@ -26,7 +26,7 @@ buildGoModule rec { description = "SSH access and repository management app for GitLab"; homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin talyz yayayayaka ]; + maintainers = with maintainers; [ globin talyz yayayayaka ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ec0a2f8e99..7b12ce314c 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "15.1.2"; + version = "15.2.2"; src = fetchFromGitLab { owner = data.owner; @@ -16,7 +16,7 @@ buildGoModule rec { sourceRoot = "source/workhorse"; - vendorSha256 = "sha256-cF2wVii/uBqlUQvrbDyPlv4tnfKA45deb/sE0c9U7Tk="; + vendorSha256 = "sha256-kZs0va/lVAxSYJ8W2bwLij6HjGg5ppE+eQY9lCsljCE="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; @@ -24,7 +24,7 @@ buildGoModule rec { meta = with lib; { homepage = "http://www.gitlab.com/"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin talyz yayayayaka ]; + maintainers = with maintainers; [ globin talyz yayayayaka ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 9f5c0e4cbf..eab90519e6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -30,6 +30,7 @@ gem 'declarative_policy', '~> 1.1.0' # Authentication libraries gem 'devise', '~> 4.7.2' +gem 'devise-pbkdf2-encryptable', '~> 0.0.0', path: 'devise-pbkdf2-encryptable' gem 'bcrypt', '~> 3.1', '>= 3.1.14' gem 'doorkeeper', '~> 5.5.0.rc2' gem 'doorkeeper-openid_connect', '~> 1.7.5' @@ -44,13 +45,13 @@ gem 'omniauth-dingtalk-oauth2', '~> 1.0' gem 'omniauth-alicloud', '~> 1.0.1' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.4' -gem 'omniauth-gitlab', '~> 1.0.2' +gem 'omniauth-gitlab', '~> 4.0.0', path: 'omniauth-gitlab' # See vendor/gems/omniauth-gitlab/README.md gem 'omniauth-google-oauth2', '~> 0.6.0' gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.10' gem 'omniauth-shibboleth', '~> 1.3.0' gem 'omniauth-twitter', '~> 1.4' -gem 'omniauth_crowd', '~> 2.4.0' +gem 'omniauth_crowd', '~> 2.4.0', path: 'omniauth_crowd' # See vendor/gems/omniauth_crowd/README.md gem 'omniauth-authentiq', '~> 0.3.3' gem 'gitlab-omniauth-openid-connect', '~> 0.9.0', require: 'omniauth_openid_connect' gem 'omniauth-salesforce', '~> 1.0.5' @@ -91,7 +92,7 @@ gem 'gpgme', '~> 2.0.19' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes # see https://github.com/intridea/omniauth-ldap/compare/master...gitlabhq:master -gem 'gitlab_omniauth-ldap', '~> 2.1.1', require: 'omniauth-ldap' +gem 'gitlab_omniauth-ldap', '~> 2.2.0', require: 'omniauth-ldap' gem 'net-ldap', '~> 0.16.3' # API @@ -103,7 +104,7 @@ gem 'rack-cors', '~> 1.1.0', require: 'rack/cors' gem 'graphql', '~> 1.13.12' gem 'graphiql-rails', '~> 1.8' gem 'apollo_upload_server', '~> 2.1.0' -gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] +gem 'graphql-docs', '~> 2.1.0', group: [:development, :test] gem 'graphlient', '~> 0.5.0' # Used by BulkImport feature (group::import) gem 'hashie' @@ -145,9 +146,9 @@ gem 'seed-fu', '~> 2.3.7' gem 'elasticsearch-model', '~> 7.2' gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' gem 'elasticsearch-api', '7.13.3' -gem 'aws-sdk-core', '~> 3' +gem 'aws-sdk-core', '~> 3.131.0' gem 'aws-sdk-cloudformation', '~> 1' -gem 'aws-sdk-s3', '~> 1' +gem 'aws-sdk-s3', '~> 1.114.0' gem 'faraday_middleware-aws-sigv4', '~>0.3.0' gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections @@ -181,7 +182,7 @@ gem 'diffy', '~> 3.3' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.2.3.0' +gem 'rack', '~> 2.2.4' # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.6.0', require: 'rack/timeout/base' @@ -255,7 +256,7 @@ gem 'slack-messenger', '~> 2.3.4' gem 'hangouts-chat', '~> 0.0.5', require: 'hangouts_chat' # Asana integration -gem 'asana', '~> 0.10.3' +gem 'asana', '~> 0.10.13' # FogBugz integration gem 'ruby-fogbugz', '~> 0.2.1' @@ -268,7 +269,7 @@ gem 'sanitize', '~> 6.0' gem 'babosa', '~> 1.0.4' # Sanitizes SVG input -gem 'loofah', '~> 2.2' +gem 'loofah', '~> 2.18.0' # Working with license gem 'licensee', '~> 9.14.1' @@ -323,7 +324,7 @@ gem 'thrift', '>= 0.14.0' # I18n gem 'ruby_parser', '~> 3.15', require: false -gem 'rails-i18n', '~> 6.0' +gem 'rails-i18n', '~> 7.0' gem 'gettext_i18n_rails', '~> 1.8.0' gem 'gettext_i18n_rails_js', '~> 1.3' gem 'gettext', '~> 3.3', require: false, group: :development @@ -339,12 +340,12 @@ gem 'snowplow-tracker', '~> 0.6.1' # Metrics gem 'method_source', '~> 1.0', require: false gem 'webrick', '~> 1.6.1', require: false -gem 'prometheus-client-mmap', '~> 0.15.0', require: 'prometheus/client' +gem 'prometheus-client-mmap', '~> 0.16', require: 'prometheus/client' -gem 'warning', '~> 1.2.0' +gem 'warning', '~> 1.3.0' group :development do - gem 'lefthook', '~> 0.8.0', require: false + gem 'lefthook', '~> 1.0.0', require: false gem 'rubocop' gem 'solargraph', '~> 0.44.3', require: false @@ -407,7 +408,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 3.4.0', require: false + gem 'gitlab-dangerfiles', '~> 3.4.3', require: false end group :development, :test, :coverage do @@ -436,7 +437,7 @@ group :test do gem 'capybara-screenshot', '~> 1.0.22' gem 'selenium-webdriver', '~> 3.142' - gem 'shoulda-matchers', '~> 4.0.1', require: false + gem 'shoulda-matchers', '~> 5.1.0', require: false gem 'email_spec', '~> 2.2.0' gem 'webmock', '~> 3.9.1' gem 'rails-controller-testing' @@ -466,7 +467,7 @@ gem 'benchmark-memory', '~> 0.1', require: false gem 'activerecord-explain-analyze', '~> 0.1', require: false # OAuth -gem 'oauth2', '~> 1.4' +gem 'oauth2', '~> 2.0' # Health check gem 'health_check', '~> 3.0' @@ -524,7 +525,7 @@ gem 'erubi', '~> 1.9.0' # Monkey-patched in `config/initializers/mail_encoding_patch.rb` # See https://gitlab.com/gitlab-org/gitlab/issues/197386 gem 'mail', '= 2.7.1' - +gem 'mail-smtp_pool', '~> 0.1.0', path: 'mail-smtp_pool', require: false # File encryption gem 'lockbox', '~> 0.6.2' @@ -535,7 +536,7 @@ gem 'valid_email', '~> 0.1' # JSON gem 'json', '~> 2.5.1' gem 'json_schemer', '~> 0.2.18' -gem 'oj', '~> 3.10.6' +gem 'oj', '~> 3.13.19' gem 'multi_json', '~> 1.14.1' gem 'yajl-ruby', '~> 1.4.1', require: 'yajl' @@ -546,6 +547,10 @@ gem 'ipaddress', '~> 0.8.3' gem 'parslet', '~> 1.8' -gem 'ipynbdiff', '0.4.7' +gem 'ipynbdiff', path: 'ipynbdiff' gem 'ed25519', '~> 1.3.0' + +# Error Tracking OpenAPI client +# See https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/development/rake_tasks.md#update-openapi-client-for-error-tracking-feature +gem 'error_tracking_open_api', path: 'error_tracking_open_api' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 535e470372..7bdffef814 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1,3 +1,44 @@ +PATH + remote: devise-pbkdf2-encryptable + specs: + devise-pbkdf2-encryptable (0.0.0) + devise (~> 4.0) + +PATH + remote: error_tracking_open_api + specs: + error_tracking_open_api (1.0.0) + typhoeus (~> 1.0, >= 1.0.1) + +PATH + remote: ipynbdiff + specs: + ipynbdiff (0.4.7) + diffy (~> 3.3) + oj (~> 3.13.16) + +PATH + remote: mail-smtp_pool + specs: + mail-smtp_pool (0.1.0) + connection_pool (~> 2.0) + mail (~> 2.7) + +PATH + remote: omniauth-gitlab + specs: + omniauth-gitlab (4.0.0) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.7.1) + +PATH + remote: omniauth_crowd + specs: + omniauth_crowd (2.4.0) + activesupport + nokogiri (>= 1.4.4) + omniauth (~> 1.0, < 3) + GEM remote: https://rubygems.org/ specs: @@ -76,11 +117,11 @@ GEM apollo_upload_server (2.1.0) actionpack (>= 4.2) graphql (>= 1.8) - asana (0.10.3) + asana (0.10.13) faraday (~> 1.0) faraday_middleware (~> 1.0) faraday_middleware-multi_json (~> 0.0) - oauth2 (~> 1.4) + oauth2 (>= 1.4, < 3) asciidoctor (2.0.15) asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) @@ -98,24 +139,24 @@ GEM execjs (> 0) awesome_print (1.9.2) awrence (1.1.1) - aws-eventstream (1.1.0) - aws-partitions (1.345.0) + aws-eventstream (1.2.0) + aws-partitions (1.600.0) aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.104.3) + aws-sdk-core (3.131.1) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.36.0) - aws-sdk-core (~> 3, >= 3.99.0) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.57.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.75.0) - aws-sdk-core (~> 3, >= 3.104.1) + aws-sdk-s3 (1.114.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.1) + aws-sigv4 (~> 1.4) + aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) azure-storage-blob (2.0.3) azure-storage-common (~> 2.0) @@ -468,7 +509,7 @@ GEM terminal-table (~> 1.5, >= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (3.4.0) + gitlab-dangerfiles (3.4.3) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake @@ -516,9 +557,9 @@ GEM rubocop-rspec (~> 1.44) gitlab_chronic_duration (0.10.6.2) numerizer (~> 0.2) - gitlab_omniauth-ldap (2.1.1) + gitlab_omniauth-ldap (2.2.0) net-ldap (~> 0.16) - omniauth (~> 1.3) + omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) globalid (1.0.0) @@ -580,13 +621,13 @@ GEM graphql-client (0.17.0) activesupport (>= 3.0) graphql (~> 1.10) - graphql-docs (1.6.0) + graphql-docs (2.1.0) commonmarker (~> 0.16) escape_utils (~> 1.2) extended-markdown-filter (~> 0.4) gemoji (~> 3.0) - graphql (~> 1.6) - html-pipeline (~> 2.8) + graphql (~> 1.12) + html-pipeline (~> 2.9) sass (~> 3.4) grpc (1.42.0) google-protobuf (~> 3.18) @@ -660,9 +701,6 @@ GEM invisible_captcha (1.1.0) rails (>= 4.2) ipaddress (0.8.3) - ipynbdiff (0.4.7) - diffy (~> 3.3) - json (~> 2.5, >= 2.5.1) jaeger-client (1.1.0) opentracing (~> 0.3) thrift @@ -672,7 +710,7 @@ GEM atlassian-jwt multipart-post oauth (~> 0.5, >= 0.5.0) - jmespath (1.4.0) + jmespath (1.6.1) js_regex (3.7.0) character_set (~> 1.4) regexp_parser (~> 2.1) @@ -717,7 +755,7 @@ GEM rest-client (~> 2.0) launchy (2.5.0) addressable (~> 2.7) - lefthook (0.8.0) + lefthook (1.0.2) letter_opener (1.7.0) launchy (~> 2.2) letter_opener_web (2.0.0) @@ -742,7 +780,7 @@ GEM activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.16.0) + loofah (2.18.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lru_redux (1.1.0) @@ -808,12 +846,13 @@ GEM shellany (~> 0.0) numerizer (0.2.0) oauth (0.5.6) - oauth2 (1.4.7) - faraday (>= 0.8, < 2.0) + oauth2 (2.0.3) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) + rash_alt (>= 0.4, < 1) + version_gem (~> 1.0) octokit (4.20.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) @@ -830,7 +869,7 @@ GEM plist (~> 3.1) train-core wmi-lite (~> 1.0) - oj (3.10.6) + oj (3.13.19) omniauth (1.9.1) hashie (>= 3.4.6) rack (>= 1.6.2, < 3) @@ -861,18 +900,15 @@ GEM omniauth-github (1.4.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-gitlab (1.0.3) - omniauth (~> 1.0) - omniauth-oauth2 (~> 1.0) omniauth-google-oauth2 (0.6.0) jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) - omniauth-oauth (1.1.0) + omniauth-oauth (1.2.0) oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.7.2) - oauth2 (~> 1.4) + omniauth (>= 1.0, < 3) + omniauth-oauth2 (1.7.3) + oauth2 (>= 1.4, < 3) omniauth (>= 1.9, < 3) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) @@ -887,10 +923,6 @@ GEM omniauth-twitter (1.4.0) omniauth-oauth (~> 1.1) rack - omniauth_crowd (2.4.0) - activesupport - nokogiri (>= 1.4.4) - omniauth (~> 1.0) open4 (1.3.4) openid_connect (1.3.0) activemodel @@ -959,7 +991,7 @@ GEM coderay parser unparser - prometheus-client-mmap (0.15.0) + prometheus-client-mmap (0.16.2) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) @@ -981,7 +1013,7 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) racc (1.6.0) - rack (2.2.3.1) + rack (2.2.4) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.6.1) @@ -1023,9 +1055,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.4.2) loofah (~> 2.3) - rails-i18n (6.0.0) + rails-i18n (7.0.3) i18n (>= 0.7, < 2) - railties (>= 6.0.0, < 7) + railties (>= 6.0.0, < 8) railties (6.1.4.7) actionpack (= 6.1.4.7) activesupport (= 6.1.4.7) @@ -1035,6 +1067,8 @@ GEM rainbow (3.1.1) rake (13.0.6) randexp (0.1.7) + rash_alt (0.4.12) + hashie (>= 3.4) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) @@ -1167,7 +1201,7 @@ GEM ruby2_keywords (0.0.5) ruby_parser (3.15.0) sexp_processor (~> 4.9) - rubyntlm (0.6.2) + rubyntlm (0.6.3) rubypants (0.2.0) rubyzip (2.3.2) rugged (1.2.0) @@ -1218,8 +1252,8 @@ GEM settingslogic (2.0.9) sexp_processor (4.15.1) shellany (0.0.1) - shoulda-matchers (4.0.1) - activesupport (>= 4.2.0) + shoulda-matchers (5.1.0) + activesupport (>= 5.2.0) sidekiq (6.4.0) connection_pool (>= 2.2.2) rack (~> 2.0) @@ -1393,6 +1427,7 @@ GEM validates_hostname (1.0.11) activerecord (>= 3.0) activesupport (>= 3.0) + version_gem (1.0.0) version_sorter (2.2.4) view_component (2.50.0) activesupport (>= 5.0.0, < 8.0) @@ -1400,7 +1435,7 @@ GEM vmstat (2.3.0) warden (1.2.8) rack (>= 2.0.6) - warning (1.2.0) + warning (1.3.0) webauthn (2.3.0) android_key_attestation (~> 0.3.0) awrence (~> 1.1) @@ -1447,7 +1482,7 @@ DEPENDENCIES addressable (~> 2.8) akismet (~> 3.0) apollo_upload_server (~> 2.1.0) - asana (~> 0.10.3) + asana (~> 0.10.13) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.4.0) asciidoctor-kroki (~> 0.5.0) @@ -1457,8 +1492,8 @@ DEPENDENCIES autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3) - aws-sdk-s3 (~> 1) + aws-sdk-core (~> 3.131.0) + aws-sdk-s3 (~> 1.114.0) babosa (~> 1.0.4) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1489,6 +1524,7 @@ DEPENDENCIES derailed_benchmarks device_detector devise (~> 4.7.2) + devise-pbkdf2-encryptable (~> 0.0.0)! devise-two-factor (~> 4.0.2) diff_match_patch (~> 0.1.0) diffy (~> 3.3) @@ -1501,6 +1537,7 @@ DEPENDENCIES elasticsearch-rails (~> 7.2) email_reply_trimmer (~> 0.1) email_spec (~> 2.2.0) + error_tracking_open_api! erubi (~> 1.9.0) escape_utils (~> 1.1) factory_bot_rails (~> 6.2.0) @@ -1527,7 +1564,7 @@ DEPENDENCIES gitaly (~> 15.1.0.pre.rc1) github-markup (~> 1.7.0) gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 3.4.0) + gitlab-dangerfiles (~> 3.4.3) gitlab-experiment (~> 0.7.1) gitlab-fog-azure-rm (~> 1.3.0) gitlab-labkit (~> 0.23.0) @@ -1540,7 +1577,7 @@ DEPENDENCIES gitlab-sidekiq-fetcher (= 0.8.0) gitlab-styles (~> 7.1.0) gitlab_chronic_duration (~> 0.10.6.2) - gitlab_omniauth-ldap (~> 2.1.1) + gitlab_omniauth-ldap (~> 2.2.0) gon (~> 6.4.0) google-api-client (~> 0.33) google-protobuf (~> 3.19.0) @@ -1552,7 +1589,7 @@ DEPENDENCIES graphiql-rails (~> 1.8) graphlient (~> 0.5.0) graphql (~> 1.13.12) - graphql-docs (~> 1.6.0) + graphql-docs (~> 2.1.0) grpc (~> 1.42.0) gssapi guard-rspec @@ -1568,7 +1605,7 @@ DEPENDENCIES icalendar invisible_captcha (~> 1.1.0) ipaddress (~> 0.8.3) - ipynbdiff (= 0.4.7) + ipynbdiff! jira-ruby (~> 2.1.4) js_regex (~> 3.7) json (~> 2.5.1) @@ -1579,14 +1616,15 @@ DEPENDENCIES knapsack (~> 1.21.1) kramdown (~> 2.3.1) kubeclient (~> 4.9.2) - lefthook (~> 0.8.0) + lefthook (~> 1.0.0) letter_opener_web (~> 2.0.0) licensee (~> 9.14.1) lockbox (~> 0.6.2) lograge (~> 0.5) - loofah (~> 2.2) + loofah (~> 2.18.0) lru_redux mail (= 2.7.1) + mail-smtp_pool (~> 0.1.0)! marginalia (~> 1.10.0) memory_profiler (~> 0.9) method_source (~> 1.0) @@ -1596,10 +1634,10 @@ DEPENDENCIES net-ldap (~> 0.16.3) net-ntp nokogiri (~> 1.13.6) - oauth2 (~> 1.4) + oauth2 (~> 2.0) octokit (~> 4.15) ohai (~> 16.10) - oj (~> 3.10.6) + oj (~> 3.13.19) omniauth (~> 1.8) omniauth-alicloud (~> 1.0.1) omniauth-atlassian-oauth2 (~> 0.2.0) @@ -1611,14 +1649,14 @@ DEPENDENCIES omniauth-dingtalk-oauth2 (~> 1.0) omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.4) - omniauth-gitlab (~> 1.0.2) + omniauth-gitlab (~> 4.0.0)! omniauth-google-oauth2 (~> 0.6.0) omniauth-oauth2-generic (~> 0.2.2) omniauth-salesforce (~> 1.0.5) omniauth-saml (~> 1.10) omniauth-shibboleth (~> 1.3.0) omniauth-twitter (~> 1.4) - omniauth_crowd (~> 2.4.0) + omniauth_crowd (~> 2.4.0)! org-ruby (~> 0.9.12) pact (~> 1.12) parallel (~> 1.19) @@ -1628,13 +1666,13 @@ DEPENDENCIES pg_query (~> 2.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) - prometheus-client-mmap (~> 0.15.0) + prometheus-client-mmap (~> 0.16) pry-byebug pry-rails (~> 0.3.9) pry-shell (~> 0.5.0) puma (~> 5.6.2) puma_worker_killer (~> 0.3.1) - rack (~> 2.2.3.0) + rack (~> 2.2.4) rack-attack (~> 6.6.0) rack-cors (~> 1.1.0) rack-oauth2 (~> 1.19.0) @@ -1642,7 +1680,7 @@ DEPENDENCIES rack-timeout (~> 0.6.0) rails (~> 6.1.4.7) rails-controller-testing - rails-i18n (~> 6.0) + rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) rdoc (~> 6.3.2) @@ -1682,7 +1720,7 @@ DEPENDENCIES sentry-ruby (~> 5.1.1) sentry-sidekiq (~> 5.1.1) settingslogic (~> 2.0.9) - shoulda-matchers (~> 4.0.1) + shoulda-matchers (~> 5.1.0) sidekiq (~> 6.4) sidekiq-cron (~> 1.2) sigdump (~> 0.2.4) @@ -1722,7 +1760,7 @@ DEPENDENCIES version_sorter (~> 2.2.4) view_component (~> 2.50.0) vmstat (~> 2.3.0) - warning (~> 1.2.0) + warning (~> 1.3.0) webauthn (~> 2.3) webmock (~> 3.9.1) webrick (~> 1.6.1) @@ -1730,4 +1768,4 @@ DEPENDENCIES yajl-ruby (~> 1.4.1) BUNDLED WITH - 2.3.9 + 2.3.15 diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 5f11d60987..7adf6fb2b8 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -211,10 +211,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14cs2k802hlvlmn0nwnx4k3g44944x0a8dsj3k14mjnbvcw1fkxh"; + sha256 = "1b6pqazhi9922y79763m0alvdmvm90i806qgb1a8l4fnimzx7l1n"; type = "gem"; }; - version = "0.10.3"; + version = "0.10.13"; }; asciidoctor = { groups = ["default"]; @@ -337,20 +337,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0pn66yqrdkrfdin7qdim0yj2x75miyg4wp6mijckhzhrjb7cv5"; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12q3swh4f44iqlq2md9lphg8csi0hd35jhgmkkkji9n0mgay4ggh"; + sha256 = "0cx73zazv4jsh51b08jgf7pzn62wmfqlwwg2z8w4rcqbvn326n93"; type = "gem"; }; - version = "1.345.0"; + version = "1.600.0"; }; aws-sdk-cloudformation = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -369,10 +369,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xfv8nfz8n700z29di51mcyyrnmbpq7flff4hx9mm92avnly1ysy"; + sha256 = "0yiz3aaik62rxhxipwznb2bv8ywha13vdxg9nk6anq9bd0nn0728"; type = "gem"; }; - version = "3.104.3"; + version = "3.131.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -380,10 +380,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rpwpj4f4q9wdrbgiqngzwfdaaqyz0iif8sv16z6z0mm6y3cb06q"; + sha256 = "1m8vwm4cakfv3i4f723a6id07myx18fpdbq8ypa2j7r5njwxpmzz"; type = "gem"; }; - version = "1.36.0"; + version = "1.57.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -391,10 +391,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "068xx6wp86wkmikdzg4wqxmg570hc3ydp8211j02g13djjr3k28n"; + sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; type = "gem"; }; - version = "1.75.0"; + version = "1.114.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -402,10 +402,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0aknh3q37rq3ixxa84x2p26g8a15zmiig2rm1pmailsb9vqhfh3j"; + sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; type = "gem"; }; - version = "1.2.1"; + version = "1.5.0"; }; azure-storage-blob = { dependencies = ["azure-storage-common" "nokogiri"]; @@ -2040,10 +2040,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13c7k36xq042fbf7d9jwgfc30zq9dfziwvqfi88h2199v9dkylix"; + sha256 = "06jfkak5z7jj1g8vy8ljnxradk111phg41f8p6ays4ckfrimkvm4"; type = "gem"; }; - version = "3.4.0"; + version = "3.4.3"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2179,10 +2179,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f8cjbzlhckarmm59l380jjy33a3hlljg69b3zkh8rhy1xd3xr90"; + sha256 = "1343sax19jidp7nr4s8bxpkyqwy6zb9lfslg99jys8xinfn20kdv"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2364,10 +2364,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12wzsikbn54b2hcv100hz7isq5gdjm5w5b8xya64ra5sw6sabq8d"; + sha256 = "0xmmifirvm4hay8qy6hjsdwms56sk973cq1b9c85b97xz0129f3y"; type = "gem"; }; - version = "1.6.0"; + version = "2.1.0"; }; grpc = { dependencies = ["google-protobuf" "googleapis-common-protos-types"]; @@ -2698,17 +2698,6 @@ }; version = "0.8.3"; }; - ipynbdiff = { - dependencies = ["diffy" "json"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bm7k1lga4jmbi7fx373npbi0smm7jkhhpvnh7jrjawnjmfii1bz"; - type = "gem"; - }; - version = "0.4.7"; - }; jaeger-client = { dependencies = ["opentracing" "thrift"]; groups = ["default"]; @@ -2746,10 +2735,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.1"; }; js_regex = { dependencies = ["character_set" "regexp_parser" "regexp_property_values"]; @@ -2929,10 +2918,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05ykgpj6cka9vprvrk37ixyhj2pdw7a9m6bq645yai6ihghahlf0"; + sha256 = "0zmg1kl5fh38gs4nj6mbj1rg61jg1iwplciq7n0qml5jckm75fpd"; type = "gem"; }; - version = "0.8.0"; + version = "1.0.2"; }; letter_opener = { dependencies = ["launchy"]; @@ -3025,10 +3014,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; + sha256 = "18ymp6l3bv7abz07k6qbbi9c9vsiahq30d2smh4qzsvag8j5m5v1"; type = "gem"; }; - version = "2.16.0"; + version = "2.18.0"; }; lru_redux = { groups = ["default"]; @@ -3468,15 +3457,15 @@ version = "0.5.6"; }; oauth2 = { - dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"]; + dependencies = ["faraday" "jwt" "multi_xml" "rack" "rash_alt" "version_gem"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q6q2kgpxmygk8kmxqn54zkw8cs57a34zzz5cxpsh1bj3ag06rk3"; + sha256 = "06y4wnsc1flbgv8vhh650x7f2k0k8238zcrmncil4swkb9kdhhxk"; type = "gem"; }; - version = "1.4.7"; + version = "2.0.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -3505,10 +3494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zik71a9dj2c0cnbqxjfzgrg6r2l3f7584813z6asl50nfdbf7jw"; + sha256 = "1b10apyzm1qyph42438z9nx2ln5v9sg0686ws9gdrv5wh482fnmf"; type = "gem"; }; - version = "3.10.6"; + version = "3.13.19"; }; omniauth = { dependencies = ["hashie" "rack"]; @@ -3631,17 +3620,6 @@ }; version = "1.4.0"; }; - omniauth-gitlab = { - dependencies = ["omniauth" "omniauth-oauth2"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "19ydk2zd2mz8zi80z3l03pajpm9357sg3lrankrcb3pirkkdb9fp"; - type = "gem"; - }; - version = "1.0.3"; - }; omniauth-google-oauth2 = { dependencies = ["jwt" "omniauth" "omniauth-oauth2"]; groups = ["default"]; @@ -3659,10 +3637,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037"; + sha256 = "0yw2vzx633p9wpdkd4jxsih6mw604mj7f6myyfikmj4d95c8d9z7"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; omniauth-oauth2 = { dependencies = ["oauth2" "omniauth"]; @@ -3670,10 +3648,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ry65f309rnzhgdjvqybkd5i4qp9rpk1gbp4dz02h4l6bkk6ya10"; + sha256 = "0ia73zcbmhf02krlkq2rxmksx93jp777ax5x58fzkq3jzacqyniz"; type = "gem"; }; - version = "1.7.2"; + version = "1.7.3"; }; omniauth-oauth2-generic = { dependencies = ["omniauth-oauth2"]; @@ -3730,17 +3708,6 @@ }; version = "1.4.0"; }; - omniauth_crowd = { - dependencies = ["activesupport" "nokogiri" "omniauth"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1wiq1vnwjddzw2qzkpr3nqzx6glmcz5pfylw10pc7vkzdcmkpy37"; - type = "gem"; - }; - version = "2.4.0"; - }; open4 = { groups = ["default" "development"]; platforms = []; @@ -4009,10 +3976,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vn736898qyyw29kjyjifx2bg18r6gfaw3q8xzjgmr0jk4jz29c3"; + sha256 = "0r8iaviqw0bjp83364k04n5kyzvr0hawf3h5xlgjsg30vmpykrrn"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.2"; }; pry = { dependencies = ["coderay" "method_source"]; @@ -4129,10 +4096,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b1qsg0yfargdhmpapp2d3mlxj82wyygs9nj74w0r03diyi8swlc"; + sha256 = "0axc6w0rs4yj0pksfll1hjgw1k6a5q0xi2lckh91knfb72v348pa"; type = "gem"; }; - version = "2.2.3.1"; + version = "2.2.4"; }; rack-accept = { dependencies = ["rack"]; @@ -4260,10 +4227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05mcgv748vppnm3fnml37wjy3dw61wj8vfw14ldaj1yx1bmkhb07"; + sha256 = "1lrbrx88ic42adcj36wip3dk1svmqld1f7qksngi4b9kqnc8w5g3"; type = "gem"; }; - version = "6.0.0"; + version = "7.0.3"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -4306,6 +4273,17 @@ }; version = "0.1.7"; }; + rash_alt = { + dependencies = ["hashie"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qn9qrbi79mr4nyf1fqv3fjbh9ipx6r42vwfxmwrkpxp3ansjhx"; + type = "gem"; + }; + version = "0.4.12"; + }; rb-fsevent = { groups = ["default" "development" "test"]; platforms = []; @@ -4896,10 +4874,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p6bxsklkbcqni4bcq6jajc2n57g0w5rzn4r49c3lb04wz5xg0dy"; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; rubypants = { groups = ["default"]; @@ -5161,10 +5139,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1s6a2i39lsqq8rrkk2pddqcb10bsihxy3v5gpnc2gk8xakj1brdq"; + sha256 = "01svmyma958sbqfz0v29lbqbr0ibvgcng352nhx6bsc9k5c207d0"; type = "gem"; }; - version = "4.0.1"; + version = "5.1.0"; }; sidekiq = { dependencies = ["connection_pool" "rack" "redis"]; @@ -5986,6 +5964,16 @@ }; version = "1.0.11"; }; + version_gem = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bwgbw56z2mhh2j044lgahrsiddibxx0r62r0cxvp0k4sjj9774j"; + type = "gem"; + }; + version = "1.0.0"; + }; version_sorter = { groups = ["default"]; platforms = []; @@ -6033,10 +6021,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qhniramhgrcqhb905rkc82k29kgd6535jqf0aii5w3v6m2kn8qd"; + sha256 = "17h6x3fh0y46gpkzpknbh94qxcp0pqlvacc90r35rgahirfmls93"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; webauthn = { dependencies = ["android_key_attestation" "awrence" "bindata" "cbor" "cose" "openssl" "safety_net_attestation" "securecompare" "tpm-key_attestation"]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py index bee10e49f4..f862e1aca3 100755 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log prefetch-yarn-deps +#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps import click import click_log @@ -10,11 +10,14 @@ import subprocess import json import pathlib import tempfile -from distutils.version import LooseVersion +from packaging.version import Version from typing import Iterable import requests +# Always keep this in sync with the GitLaab version you're updating to. +# If you see any errors about vendored dependencies during an update, check the Gemfile. +VENDORED_GEMS = ['devise-pbkdf2-encryptable', 'omniauth-gitlab', 'omniauth_crowd', 'mail-smtp_pool', 'ipynbdiff', 'error_tracking_open_api'] logger = logging.getLogger(__name__) @@ -37,7 +40,7 @@ class GitLabRepo: versions = list(filter(self.version_regex.match, tags)) # sort, but ignore v and -ee for sorting comparisons - versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) + versions.sort(key=lambda x: Version(x.replace("v", "").replace("-ee", "")), reverse=True) return versions def get_git_hash(self, rev: str): @@ -85,7 +88,8 @@ class GitLabRepo: owner=self.owner, repo=self.repo, rev=rev, - passthru=passthru) + passthru=passthru, + vendored_gems=VENDORED_GEMS) def _get_data_json(): @@ -139,15 +143,30 @@ def update_rubyenv(): data = _get_data_json() rev = data['rev'] - with open(rubyenv_dir / 'Gemfile.lock', 'w') as f: - f.write(repo.get_file('Gemfile.lock', rev)) + gemfile = repo.get_file('Gemfile', rev) + gemfile_lock = repo.get_file('Gemfile.lock', rev) + with open(rubyenv_dir / 'Gemfile', 'w') as f: - original = repo.get_file('Gemfile', rev) - f.write(re.sub(r".*mail-smtp_pool.*", "", original)) + f.write(re.sub(f'.*({"|".join(VENDORED_GEMS)}).*', "", gemfile)) + + with open(rubyenv_dir / 'Gemfile.lock', 'w') as f: + f.write(gemfile_lock) subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) + with open(rubyenv_dir / 'Gemfile', 'w') as f: + for gem in VENDORED_GEMS: + gemfile = gemfile.replace(f'path: \'vendor/gems/{gem}\'', f'path: \'{gem}\'') + + f.write(gemfile) + + with open(rubyenv_dir / 'Gemfile.lock', 'w') as f: + for gem in VENDORED_GEMS: + gemfile_lock = gemfile_lock.replace(f'remote: vendor/gems/{gem}', f'remote: {gem}') + + f.write(gemfile_lock) + @cli.command('update-gitaly') def update_gitaly(): diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix index 5b1bdeb22b..5146316274 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitoxide/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "gitoxide"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "Byron"; repo = "gitoxide"; rev = "v${version}"; - sha256 = "sha256-hDNlnNGm9of6Yu9WRVTRH5g4fAXlUxAexdufbZ0vMOo="; + sha256 = "sha256-NdZ39F6nSuLZNOdoxRs79OR6I3oFASXHzm/hecDyxNI="; }; - cargoSha256 = "sha256-026DFEWu7PTvhJZP7YW3KOBOkzFRoxrc+THilit87jU="; + cargoSha256 = "sha256-6uRLW1KJF0yskEfWm9ERQIDgVnerAhQFbMaxhnEDIOc="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = if stdenv.isDarwin diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix index 91b33d0b1e..0549169ed1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gogs/default.nix @@ -8,13 +8,13 @@ with lib; buildGoModule rec { pname = "gogs"; - version = "0.12.9"; + version = "0.12.10"; src = fetchFromGitHub { owner = "gogs"; repo = "gogs"; rev = "v${version}"; - sha256 = "sha256-oXIA0JY7+pfXk5RnHWCJEkU9bL+ZIc2oXQrLwa1XHMg="; + sha256 = "sha256-EFGC94aIMW7AYJpgaHBT4W7BjXd+oijMqQPH40rIvlg="; }; vendorSha256 = "sha256-5AnQ7zF2UK1HNoyr6gwFdVv+KMJEGkjKPpDEpUXckUg="; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix index cc00794ba7..75473ddb11 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/got/default.nix @@ -1,17 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, openssl, libbsd, libuuid, libmd, zlib, ncurses }: +{ lib, stdenv, fetchurl, pkg-config, openssl, libbsd, libuuid, libossp_uuid, libmd, zlib, ncurses }: stdenv.mkDerivation rec { pname = "got"; - version = "0.73"; + version = "0.74"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${version}.tar.gz"; - sha256 = "0x583h9f6jnqfwy48b43s1myrgbngn128m4ivmf9gcsvfiz3lxgh"; + sha256 = "sha256-XElSCdFh24rf2gosjS0BG+VNqLZNLYeYkUy4t5RIdv4="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl libbsd libuuid libmd zlib ncurses ]; + buildInputs = [ openssl libbsd libuuid libmd zlib ncurses ] + ++ lib.optionals stdenv.isDarwin [ libossp_uuid ]; doInstallCheck = true; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gameoftrees.org"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ abbe ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix index c99bb409c3..824a54456b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/jujutsu/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - sha256 = "sha256-BOT2pKcOSOha28fba62X+GgILcplhkMWhZo7Q0gGTQ8="; + sha256 = "sha256-G8Y8ooi3aX6v/Ied62eSfo6PvXbZtx455bF0wVkZN30="; }; - cargoSha256 = "sha256-uvR+WXX2iIWFhcPYpOoOS1WBvOXuhTmgVVT2446c6XE="; + cargoSha256 = "sha256-7nWrwpv3xAffKiaUsnoA+h6ledjgG9tQeQ69WNl6e8o="; # Needed to get openssl-sys to use pkg-config. OPENSSL_NO_VENDOR = 1; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 0f6e5c995d..7e69bab2f1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.2"; + version = "6.2.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-04K14/q4kxEmATIBcxQWV0s1roV4dAS7KggZ9Bu4iXI="; + sha256 = "sha256-isXXog0cKtVNTCY9E0FkZG3DSo46a+1pz76rr404gto="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-L4BbU6GTq54DFucqvBZeWtA8zUPvPCwmtIxv/SxgAXk="; + sha256 = "sha256-shmeTQSCpQLrRUbL5bu9nAiPideZUe31YNCrClLM1eI="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix index d7cd89f4de..77540deb90 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix @@ -2,7 +2,7 @@ with python.pkgs; buildPythonApplication rec { - version = "0.5.0"; + version = "0.6.0"; pname = "nbstripout"; # Mercurial should be added as a build input but because it's a Python @@ -14,7 +14,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "86ab50136998d62c9fa92478d2eb9ddc4137e51a28568f78fa8f24a6fbb6a7d8"; + sha256 = "sha256-TWxDAhVqskaMyOcgLvKPNN2RhFFOIeRDQLzShpaMgss="; }; # for some reason, darwin uses /bin/sh echo native instead of echo binary, so diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix index e274f0b033..66cd7facc1 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/rabbitvcs/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { owner = "rabbitvcs"; repo = "rabbitvcs"; rev = "v${version}"; - sha256 = "01cr16zf3gzsci1hhfli79m34fcx5m1pvswl16rkxxn212yc9fhy"; + hash = "sha256-gVrdf8vQWAGORZqlTS/axs4U7aZlS8OAgPM3iKgqAtM="; }; buildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/srcml/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/srcml/default.nix deleted file mode 100644 index 60260ee4de..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/srcml/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python2, antlr2, - curl -}: - -with lib; - -stdenv.mkDerivation rec { - version = "0.9.5_beta"; - pname = "srcml"; - - src = fetchurl { - url = "http://www.sdml.cs.kent.edu/lmcrs/srcML-${version}-src.tar.gz"; - sha256 = "13pswdi75qjsw7z75lz7l3yjsvb58drihla2mwj0f9wfahaj3pam"; - }; - - prePatch = '' - patchShebangs . - substituteInPlace CMake/install.cmake --replace /usr/local $out - ''; - - patches = [ - ./gcc6.patch - ]; - - nativeBuildInputs = [ cmake antlr2 ]; - buildInputs = [ libxml2 libxslt boost libarchive python2 curl ]; - - meta = { - description = "Infrastructure for exploration, analysis, and manipulation of source code"; - homepage = "https://www.srcml.org"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ leenaars ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/version-management/srcml/gcc6.patch b/third_party/nixpkgs/pkgs/applications/version-management/srcml/gcc6.patch deleted file mode 100644 index 7cd596d9ea..0000000000 --- a/third_party/nixpkgs/pkgs/applications/version-management/srcml/gcc6.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git i/CMake/config.cmake w/CMake/config.cmake -index 28f8047..c596cf8 100644 ---- i/CMake/config.cmake -+++ w/CMake/config.cmake -@@ -95,7 +95,7 @@ else() - find_package(LibXml2 REQUIRED) - find_package(CURL REQUIRED) - set(Boost_NO_BOOST_CMAKE ON) -- set(Boost_USE_STATIC_LIBS ON) -+ set(Boost_USE_STATIC_LIBS OFF) - find_package(Boost COMPONENTS program_options filesystem system thread regex date_time REQUIRED) - - # add include directories -diff --git i/src/libsrcml/srcml_reader_handler.hpp w/src/libsrcml/srcml_reader_handler.hpp -index 0b23fed..c02dfef 100644 ---- i/src/libsrcml/srcml_reader_handler.hpp -+++ w/src/libsrcml/srcml_reader_handler.hpp -@@ -456,7 +456,7 @@ public : - - if(uri == SRCML_CPP_NS_URI) { - -- if(archive->language != 0) { -+ if(srcml_check_language(archive->language->c_str()) != 0) { - - if(*archive->language == "C++" || *archive->language == "C" || *archive->language == "Objective-C") - archive->options |= SRCML_OPTION_CPP | SRCML_OPTION_CPP_NOMACRO; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix index 407608cc22..22fe2b2fbb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "verco"; - version = "6.8.0"; + version = "6.12.0"; src = fetchFromGitHub { owner = "vamolessa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E1kqJLnTLPu38zvDGaPHiKSW/yKormbx5N1CBSzQxgc="; + sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM="; }; - cargoSha256 = "sha256-9342LAChCv61kxTJoeOy7EdafMfR10s8dtkc2pTgXT0="; + cargoSha256 = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U="; meta = with lib; { description = "A simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts"; diff --git a/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix b/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix index 82d1adfeec..f83cbf69ed 100644 --- a/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/aegisub/default.nix @@ -65,13 +65,13 @@ let in stdenv.mkDerivation rec { pname = "aegisub"; - version = "3.3.2-20220612"; + version = "3.3.3"; src = fetchFromGitHub { owner = "wangqr"; repo = pname; - rev = "91f8b5f91eb960bad19899c10af08aca34f9b697"; - sha256 = "sha256-lPkPWSsncsBKJHDnma9cUXsQJynruT9JpPkMTHdQ/e8="; + rev = "v${version}"; + sha256 = "sha256-oKhLv81EFudrJaaJ2ga3pVh4W5Hd2YchpjsoYoqRm78="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/ani-cli/default.nix b/third_party/nixpkgs/pkgs/applications/video/ani-cli/default.nix index 85f2e4b8ad..4e8637cf19 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ani-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ani-cli/default.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "2.2"; + version = "3.3"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - sha256 = "sha256-B/bIGrSQmKZFh3PpsbwivR2QKLMHIypWLxWuufiFHw4="; + sha256 = "sha256-khgErF/1DmqnXmTUvTYWuyUAos6aUghImgXp3NjOZEg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix b/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix index d6b0467fb7..35c628f8a5 100644 --- a/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix @@ -66,7 +66,6 @@ stdenv.mkDerivation rec { cd "$sourceRoot" patchPhase - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libXext}/lib" ${stdenv.shell} bootStrap.bash \ --with-core \ ${if withQT then "--with-qt" else "--without-qt"} \ diff --git a/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix b/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix index 905034091a..26954375af 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix @@ -36,7 +36,10 @@ stdenv.mkDerivation rec { ++ lib.optional (!stdenv.isLinux) libiconv ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ]; - cmakeFlags = lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH: + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ] ++ lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ]; postInstall = lib.optionalString enableOcr '' wrapProgram "$out/bin/ccextractor" \ diff --git a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix index 1600b1b4d8..9e8e88ecfb 100644 --- a/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/clapper/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "clapper"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "Rafostar"; repo = pname; rev = version; - sha256 = "sha256-o68IdI20gSwWCPI0g/BhUGF5ro6srXMy0JD1EgmY5ck="; + sha256 = "sha256-s+qdTq3/pHHstwr1W3Hs2Zje++iJFHM6hQTFoZD43bY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix b/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix index 6287f28201..606045d0b8 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.23.1"; + version = "1.24.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-23s5mYwoIUiBs1MXGJVepycGj8e1xCuFAgim5NHKZRc="; + sha256 = "sha256-sQ8Qorf74ypMmpRd9b/wrqg28TZ295t6qkKosxyaG1I="; }; propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix b/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix index c93be6b638..3ceda283d3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/freetube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "freetube"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "https://github.com/FreeTubeApp/FreeTube/releases/download/v${version}-beta/freetube_${version}_amd64.AppImage"; - sha256 = "sha256-G4lZ1lbNN8X9ocWhcuuNZGTZm9AUzuWKVm23YgsJwig="; + sha256 = "sha256-OlWNln62VouUJzzk0CtED+OdSM+aBc4NOu1TSaKVWnk="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix b/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix index 6fd7a2036c..6390558013 100644 --- a/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/gpac/default.nix @@ -41,5 +41,14 @@ 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/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix index 3c73e7f599..d20c6125be 100644 --- a/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/handbrake/default.nix @@ -206,7 +206,7 @@ let self = stdenv.mkDerivation rec { ++ optional (!useGtk) "--disable-gtk" ++ optional useFdk "--enable-fdk-aac" ++ optional stdenv.isDarwin "--disable-xcode" - ++ optional (stdenv.isx86_32 || stdenv.isx86_64) "--harden"; + ++ optional stdenv.hostPlatform.isx86 "--harden"; # NOTE: 2018-12-27: Check NixOS HandBrake test if changing NIX_LDFLAGS = [ "-lx265" ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/hypnotix/default.nix b/third_party/nixpkgs/pkgs/applications/video/hypnotix/default.nix index ad149b947e..a2da839347 100644 --- a/third_party/nixpkgs/pkgs/applications/video/hypnotix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/hypnotix/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "hypnotix"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = "hypnotix"; rev = version; - hash = "sha256-uj5Bn3K9SCKE4p1jylfQ8XnAwNnN4VXHLMLrwhKhzsk="; + hash = "sha256-jjCyO6lyhqH4xeNp5uy/KqNr5Mvv+45pJGHFOXNi0rk="; }; patches = [ @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { dontWrapGApps = true; buildInputs = [ - cinnamon.xapps + cinnamon.xapp ]; pythonPath = with python3.pkgs; [ - imdbpy + cinemagoer pygobject3 requests setproctitle diff --git a/third_party/nixpkgs/pkgs/applications/video/iina/default.nix b/third_party/nixpkgs/pkgs/applications/video/iina/default.nix index 3adb2a926d..bb3fd9cd5e 100644 --- a/third_party/nixpkgs/pkgs/applications/video/iina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/iina/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "iina"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://github.com/iina/iina/releases/download/v${version}/IINA.v${version}.dmg"; - sha256 = "sha256-kbh+gAVfCXoct6jJGXnetTAzFfIGdVLL5zh/SL/EJzY="; + sha256 = "sha256-tQxBaCgAXh7sDcgGbJYe/MOJ5r4aWllVQepi1I0xo5E="; }; nativeBuildInputs = [ undmg ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/manim/default.nix b/third_party/nixpkgs/pkgs/applications/video/manim/default.nix index bdaa216ffa..67a406d134 100644 --- a/third_party/nixpkgs/pkgs/applications/video/manim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/manim/default.nix @@ -45,14 +45,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "manim"; format = "pyproject"; - version = "0.15.2"; + version = "0.16.0"; disabled = python3.pythonOlder "3.8"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = pname; - rev = "v${version}"; - sha256 = "l5JiFWCMQbGnwRRtYzCHBXdVzWBrTNPdcIYaAt/wRNA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-NQI+kJV0Mu2O/DlwwLYQw2jjJk/TmR7avBX9Fe7zmdk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix index 7bd010cff1..9a3e34911d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mkvtoolnix/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "68.0.0"; + version = "69.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0m09r0w98dja9y1yp1vq5hdh46lw0k60aa0xfkdy5zlva568cb7c"; + sha256 = "sha256-sKm/TjlVFj6Vy6lfy3v7UJoEUXALZZSKO3zoIrYtwrc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix index 3dfe83e244..e9be744ed0 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix @@ -64,7 +64,7 @@ let # TODO: don't link all mpv outputs and convert package to mpv-unwrapped? paths = [ mpv.all ]; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; passthru.unwrapped = mpv; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix index 20c49692b8..014a7ef2fb 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-gstreamer.nix @@ -10,22 +10,41 @@ stdenv.mkDerivation rec { pname = "obs-gstreamer"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "fzwoch"; repo = "obs-gstreamer"; rev = "v${version}"; - hash = "sha256-KhSBZcV2yILTf5+aNoYWDfNwPiJoyYPeIOQMDFvOusg="; + hash = "sha256-CDtWe4bx1M06nfqvVmIZaLQoKAsXFnG0Xy/mhiSbMgU="; }; nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = with gst_all_1; [ gstreamer gst-plugins-base obs-studio ]; + # - 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 = + 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-plugins-ugly + gst-vaapi + ]; + 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"; - maintainers = with maintainers; [ ahuzik ]; + maintainers = with maintainers; [ ahuzik pedrohlc ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index bd74feb3bc..c48dde0cf2 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "obs-vkcapture"; - version = "1.1.3"; + version = "1.1.5"; src = fetchFromGitHub { owner = "nowrep"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iIV9ke2yPEt2Lf4bwiEHFip4tLhMS4raWGyCWpao74w="; + hash = "sha256-eZbZBff/M0S9VASiKoGJAqZ6NMADH7uH8J0m6XGY3jY="; }; nativeBuildInputs = [ cmake ninja ]; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/nowrep/obs-vkcapture"; maintainers = with maintainers; [ atila ]; license = licenses.gpl2Only; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix index 3871151bbb..80880d9318 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/wrapper.nix @@ -1,4 +1,4 @@ -{ obs-studio, symlinkJoin, makeWrapper }: +{ lib, obs-studio, symlinkJoin, makeWrapper }: { plugins ? [] }: @@ -8,11 +8,19 @@ symlinkJoin { nativeBuildInputs = [ makeWrapper ]; paths = [ obs-studio ] ++ plugins; - postBuild = '' - wrapProgram $out/bin/obs \ - --set OBS_PLUGINS_PATH "$out/lib/obs-plugins" \ - --set OBS_PLUGINS_DATA_PATH "$out/share/obs/obs-plugins" - ''; + postBuild = with lib; + let + # Some plugins needs extra environment, see obs-gstreamer for an example. + pluginArguments = + lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins; + + wrapCommand = [ + "wrapProgram" + "$out/bin/obs" + ''--set OBS_PLUGINS_PATH "$out/lib/obs-plugins"'' + ''--set OBS_PLUGINS_DATA_PATH "$out/share/obs/obs-plugins"'' + ] ++ pluginArguments; + in concatStringsSep " " wrapCommand; inherit (obs-studio) meta; passthru = obs-studio.passthru // { diff --git a/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix b/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix index c63011eebc..c9e1c8343c 100644 --- a/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/olive-editor/default.nix @@ -1,8 +1,8 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, which, qmake, mkDerivation, - qtmultimedia, wrapQtAppsHook, frei0r, opencolorio_1, ffmpeg-full, - CoreFoundation }: +{ lib, stdenv, fetchFromGitHub +, pkg-config, which, qmake, wrapQtAppsHook +, qtmultimedia, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "olive-editor"; version = "0.1.2"; diff --git a/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix b/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix index 12864d3b40..d51b32bbb1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/qmplay2/default.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation rec { pname = "qmplay2"; - version = "22.03.19"; + version = "22.06.16"; src = fetchFromGitHub { owner = "zaps166"; repo = "QMPlay2"; rev = version; - sha256 = "sha256-+EIv74dMm0zxZcCfa5wR6FJNJl5Xaes+/dCRQEBqFeo="; + sha256 = "sha256-nSlmbBCfN+yZlCcgTujBSkZc1uOO0wYpMPUwgLudJEY="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix index c6429b0934..3dce0123d1 100644 --- a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; # Disable warnings that are irrelevant to us as packagers - cmakeFlags = "-Wno-dev"; + cmakeFlags = [ "-Wno-dev" ]; # We run one of the executables we build while the build is # still running (and patchelf hasn't been invoked) which means diff --git a/third_party/nixpkgs/pkgs/applications/video/showmethekey/default.nix b/third_party/nixpkgs/pkgs/applications/video/showmethekey/default.nix new file mode 100644 index 0000000000..219010eeb3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/showmethekey/default.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, glib +, meson +, ninja +, libevdev +, json-glib +, cairo +, pango +, libinput +, gtk4 +, wrapGAppsHook +, libxkbcommon +, pkg-config +}: +stdenv.mkDerivation rec { + pname = "showmethekey"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = "AlynxZhou"; + repo = "showmethekey"; + rev = "v${version}"; + sha256 = "sha256-hq4X4dG25YauMjsNXC6Flco9pEpVj3EM2JiFWbRrPaA="; + }; + + nativeBuildInputs = [ + glib + meson + ninja + cairo + pango + json-glib + pkg-config + libevdev + libinput + libxkbcommon + wrapGAppsHook + ]; + + buildInputs = [ + gtk4 + ]; + + meta = with lib; { + homepage = "https://showmethekey.alynx.one/"; + description = "Show keys you typed on screen"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ ocfox ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix index eecb3a6b97..9ed563a690 100644 --- a/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/smplayer/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "smplayer"; - version = "22.2.0"; + version = "22.7.0"; src = fetchFromGitHub { owner = "smplayer-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-7DMvIqW3vzjVzJPyjbXuHHcf1T6EFcf/a/mVYqa3XS8="; + hash = "sha256-vU+M5aCCGSA+IwJXTLMYvno/Qei+5Hwck3Q/Ah7N09s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix b/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix index f2753affa5..6be729a374 100644 --- a/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/ustreamer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ustreamer"; - version = "4.11"; + version = "5.17"; src = fetchFromGitHub { owner = "pikvm"; repo = "ustreamer"; rev = "v${version}"; - sha256 = "sha256-MTzlhnnDVZzS3lnYe3P/Hi6pi6f4B0+ejmDwV0f9juI="; + sha256 = "sha256-l0O7iuqXJTGcODPk0BzWXr8GbJJOcAeAHyo147WMnjk="; }; buildInputs = [ libbsd libevent libjpeg ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix index 770fe2cea3..e870b8572d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vlc/default.nix @@ -31,6 +31,7 @@ , libkate , libmad , libmatroska +, libmodplug , libmtp , liboggz , libopus @@ -79,7 +80,6 @@ let inherit (lib) optionalString optional optionals; - hostIsAarch = stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64; in stdenv.mkDerivation rec { pname = "${optionalString onlyLibVLC "lib"}vlc"; @@ -122,6 +122,7 @@ stdenv.mkDerivation rec { libmad libmatroska libmtp + libmodplug liboggz libopus libplacebo @@ -157,7 +158,7 @@ stdenv.mkDerivation rec { xcbutilkeysyms xlibsWrapper ]) - ++ optional (!hostIsAarch && !onlyLibVLC) live555 + ++ optional (!stdenv.hostPlatform.isAarch && !onlyLibVLC) live555 ++ optional jackSupport libjack2 ++ optionals chromecastSupport [ libmicrodns protobuf ] ++ optionals skins2Support (with xorg; [ @@ -182,7 +183,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - LIVE555_PREFIX = if hostIsAarch then null else live555; + LIVE555_PREFIX = if stdenv.hostPlatform.isAarch then null else live555; # vlc depends on a c11-gcc wrapper script which we don't have so we need to # set the path to the compiler diff --git a/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix b/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix index 18b35c0d39..0b16c478ae 100644 --- a/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wf-recorder"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ammen99"; repo = pname; rev = "v${version}"; - sha256 = "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim"; + sha256 = "sha256-othFp97rUrdUoAXkup8VvpcyPHs5iYNFyRE3h3rcmqE="; }; nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ primeos CrazedProgrammer ]; + maintainers = with maintainers; [ yuka ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix index 9d6a5e18ad..c75635b44b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/xplayer/default.nix @@ -22,7 +22,7 @@ , pkg-config , python3 , wrapGAppsHook -, xapps +, xapp , yelp-tools }: let @@ -34,13 +34,13 @@ in stdenv.mkDerivation rec { pname = "xplayer"; - version = "2.4.2"; + version = "2.4.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-qoBJKY0CZyhp9foUehq5hInEENRGZuy1D6jAMjbjYhA="; + sha256 = "sha256-o2vLNIELd1EYWG26t5gOpnamJrBJeg4P6fcLirkcmfM="; }; # configure wants to find gst-inspect-1.0 via pkgconfig but @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { libxml2 libxplayer-plparser pythonenv - xapps + xapp # to satisfy configure script pythonenv.pkgs.pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix index d49ece5048..c973673ac2 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/conmon/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KDAm+Djk1AaA3zXhxywT6HknT0tVCEZLS27nO9j/WgM="; + sha256 = "sha256-/5HYEcJzdGAiaMAh82vlDjzwEc7bf9gAYOAz7fkysR0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index 8c4fbce8e1..79797195e3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "containerd"; - version = "1.6.6"; + version = "1.6.8"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "sha256-cmarbad6VzcGTCHT/NtApkYsK/oo6WZQ//q8Fvh+ez8="; + sha256 = "sha256-0UiPhkTWV61DnAF5kWd1FctX8i0sXaJ1p/xCMznY/A8="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index b234354f9f..0e1081ca11 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.24.1"; + version = "1.24.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-/AoZKeUcYF1fyYtllXpB7GNWR/6SWEOy2ffDLYbTp9E="; + sha256 = "sha256-7nQI6zaWSWML2suPn1A+RJZ0iPJu6JD/4ion5zxlnJ8="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/Cargo.lock b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/Cargo.lock index 7016457499..c7775564c3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/Cargo.lock +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/Cargo.lock @@ -15,6 +15,7 @@ dependencies = [ "kvm", "kvm_sys", "libc", + "memoffset 0.6.5", "minijail", "remain", "resources", @@ -33,22 +34,35 @@ dependencies = [ ] [[package]] -name = "android_log-sys" -version = "0.2.0" +name = "aho-corasick" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" [[package]] name = "arch" version = "0.1.0" dependencies = [ "acpi_tables", + "anyhow", "base", "devices", "gdbstub_arch", @@ -67,9 +81,9 @@ dependencies = [ [[package]] name = "argh" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb41d85d92dfab96cb95ab023c265c5e4261bb956c0fb49ca06d90c570f1958" +checksum = "a7e7e4aa7e40747e023c0761dafcb42333a9517575bbf1241747f68dd3177a62" dependencies = [ "argh_derive", "argh_shared", @@ -77,9 +91,9 @@ dependencies = [ [[package]] name = "argh_derive" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be69f70ef5497dd6ab331a50bd95c6ac6b8f7f17a7967838332743fbd58dc3b5" +checksum = "69f2bd7ff6ed6414f4e5521bd509bae46454bbd513801767ced3f21a751ab4bc" dependencies = [ "argh_shared", "heck", @@ -90,9 +104,9 @@ dependencies = [ [[package]] name = "argh_shared" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6f8c380fa28aa1b36107cd97f0196474bb7241bb95a453c5c01a15ac74b2eac" +checksum = "47253b98986dafc7a3e1cf3259194f1f47ac61abb57a57f46ec09e48d004ecda" [[package]] name = "assertions" @@ -100,29 +114,39 @@ version = "0.1.0" [[package]] name = "async-task" -version = "4.2.0" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" +checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" [[package]] name = "async-trait" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" +checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + [[package]] name = "audio_streams" version = "0.1.0" dependencies = [ "async-trait", - "cros_async", + "futures", "remain", - "sync", "thiserror", ] @@ -153,16 +177,33 @@ name = "base" version = "0.1.0" dependencies = [ "audio_streams", - "cros_async", + "base_poll_token_derive", + "cfg-if", + "chrono", "data_model", + "lazy_static", "libc", + "log", + "rand 0.8.5", + "regex", "remain", "serde", "serde_json", "smallvec", "sync", - "sys_util", + "tempfile", "thiserror", + "win_util", + "winapi", +] + +[[package]] +name = "base_poll_token_derive" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -187,24 +228,65 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "cbindgen" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51e3973b165dc0f435831a9e426de67e894de532754ff7a3f307c03ee5dec7dc" +dependencies = [ + "clap", + "heck", + "indexmap", + "log", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn", + "tempfile", + "toml", +] + [[package]] name = "cc" version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + [[package]] name = "cloudabi" version = "0.0.3" @@ -214,23 +296,35 @@ dependencies = [ "bitflags", ] +[[package]] +name = "const-sha1" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d" + [[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", + "cfg-if", ] [[package]] name = "cros_async" -version = "0.1.0" +version = "0.1.1" dependencies = [ + "anyhow", "async-task", "async-trait", + "audio_streams", + "base", + "cfg-if", "data_model", "futures", + "futures-executor", + "futures-util", "intrusive-collections", "io_uring", "libc", @@ -238,10 +332,14 @@ dependencies = [ "paste", "pin-utils", "remain", + "serde", "slab", + "smallvec", "sync", - "sys_util", + "tempfile", "thiserror", + "win_util", + "winapi", ] [[package]] @@ -251,6 +349,16 @@ dependencies = [ "rand_core 0.4.2", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "crosvm" version = "0.1.0" @@ -263,6 +371,7 @@ dependencies = [ "audio_streams", "base", "bit_field", + "cfg-if", "crosvm_plugin", "data_model", "devices", @@ -275,8 +384,10 @@ dependencies = [ "kernel_loader", "kvm", "kvm_sys", + "lazy_static", "libc", "libcras", + "log", "minijail", "net_util", "p9", @@ -287,9 +398,13 @@ dependencies = [ "rutabaga_gfx", "scudo", "serde_json", + "serde_keyvalue", "sync", "tempfile", + "terminal_size", "thiserror", + "tube_transporter", + "uuid", "vhost", "vm_control", "vm_memory", @@ -309,7 +424,7 @@ dependencies = [ "hypervisor", "kernel_loader", "libc", - "rand", + "rand 0.6.5", "tempfile", "usb_util", "vm_memory", @@ -319,7 +434,9 @@ dependencies = [ name = "crosvm_control" version = "0.1.0" dependencies = [ + "anyhow", "base", + "cbindgen", "libc", "vm_control", ] @@ -341,17 +458,19 @@ name = "data_model" version = "0.1.0" dependencies = [ "assertions", + "cfg-if", "libc", "remain", "serde", "thiserror", + "winapi", ] [[package]] name = "dbus" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0a745c25b32caa56b82a3950f5fec7893a960f4c10ca3b02060b0c38d8c2ce" +checksum = "6f8bcdd56d2e5c4ed26a529c5a9029f5db8290d433497506f958eae3be148eb6" dependencies = [ "libc", "libdbus-sys", @@ -370,6 +489,7 @@ dependencies = [ "balloon_control", "base", "bit_field", + "cfg-if", "cros_async", "data_model", "dbus", @@ -384,6 +504,7 @@ dependencies = [ "libcras", "libvda", "linux_input_sys", + "memoffset 0.6.5", "minijail", "net_sys", "net_util", @@ -397,14 +518,15 @@ dependencies = [ "rutabaga_gfx", "serde", "serde_json", + "serde_keyvalue", "smallvec", "sync", - "sys_util", "system_api", "tempfile", "thiserror", "tpm2", "usb_util", + "uuid", "vfio_sys", "vhost", "virtio_sys", @@ -441,15 +563,15 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "either" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" [[package]] name = "enumn" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4" +checksum = "052bc8773a98bd051ff37db74a8a25f00e6bfa2cbd03373390c72e9f7afbf344" dependencies = [ "proc-macro2", "quote", @@ -477,6 +599,7 @@ version = "0.1.0" dependencies = [ "base", "bitflags", + "crossbeam-utils", "data_model", "enumn", "libc", @@ -492,6 +615,7 @@ checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", + "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -514,6 +638,18 @@ version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +[[package]] +name = "futures-executor" +version = "0.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", + "num_cpus", +] + [[package]] name = "futures-io" version = "0.3.21" @@ -563,11 +699,12 @@ dependencies = [ [[package]] name = "gdbstub" -version = "0.5.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e135587d3f6eee6fa02c4ba174270c2337424e6d852c156942c0840b3c0f5cc" +checksum = "1c1f9371c87c11642ee94dcf92cb48b1484ba250b8e8bff3df71c28651f3f4e7" dependencies = [ - "cfg-if 0.1.10", + "bitflags", + "cfg-if", "log", "managed", "num-traits", @@ -576,9 +713,9 @@ dependencies = [ [[package]] name = "gdbstub_arch" -version = "0.1.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e358b9c0e1468eae66099062e47bb502849308b987b74b5e72f1936397c33c16" +checksum = "c24f469ba9556c5a063d6df35a8a338025fccf96ecae44f330a156b686f7a268" dependencies = [ "gdbstub", "num-traits", @@ -586,13 +723,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", - "wasi", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -609,6 +746,12 @@ dependencies = [ "thiserror", ] +[[package]] +name = "hashbrown" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "607c8a29735385251a339424dd462993c0fed8fa09d378f259377df08c126022" + [[package]] name = "heck" version = "0.3.3" @@ -618,6 +761,15 @@ 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 = "hypervisor" version = "0.1.0" @@ -630,18 +782,29 @@ dependencies = [ "kvm", "kvm_sys", "libc", + "memoffset 0.6.5", "serde", "sync", "vm_memory", ] +[[package]] +name = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +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", + "cfg-if", ] [[package]] @@ -658,30 +821,31 @@ dependencies = [ [[package]] name = "intrusive-collections" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb484b70a4ebad7f571bf84e9cd06b5bfb6a7e4db0c36e13dd1570c6b449c10d" +checksum = "bfe531a7789d7120f3e17d4f3f2cd95f54418ba7354f60b7b622b6644a07888a" dependencies = [ - "memoffset", + "memoffset 0.5.6", ] [[package]] name = "io_uring" -version = "0.1.0" +version = "0.1.1" dependencies = [ + "base", "data_model", "libc", "remain", "sync", - "sys_util", + "tempfile", "thiserror", ] [[package]] name = "itoa" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "kernel_cmdline" @@ -734,9 +898,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libcras" @@ -771,11 +935,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.16" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -786,9 +950,9 @@ checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" [[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 = "memoffset" @@ -799,6 +963,15 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg 1.1.0", +] + [[package]] name = "minijail" version = "0.2.3" @@ -821,6 +994,7 @@ name = "net_sys" version = "0.1.0" dependencies = [ "base", + "libc", ] [[package]] @@ -828,35 +1002,56 @@ name = "net_util" version = "0.1.0" dependencies = [ "base", + "cfg-if", "cros_async", "data_model", "libc", "net_sys", "remain", + "serde", "thiserror", ] [[package]] -name = "num-traits" -version = "0.2.14" +name = "num-integer" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg 1.1.0", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg 1.1.0", ] [[package]] -name = "once_cell" -version = "1.10.0" +name = "num_cpus" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "p9" version = "0.1.0" dependencies = [ "libc", - "sys_util", "wire_format_derive", ] @@ -868,9 +1063,9 @@ checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -884,15 +1079,6 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" -[[package]] -name = "poll_token_derive" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "power_monitor" version = "0.1.0" @@ -906,12 +1092,18 @@ dependencies = [ ] [[package]] -name = "proc-macro2" -version = "1.0.36" +name = "ppv-lite86" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "proc-macro2" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -964,7 +1156,6 @@ dependencies = [ name = "qcow_utils" version = "0.1.0" dependencies = [ - "argh", "base", "disk", "libc", @@ -972,9 +1163,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.17" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -987,7 +1178,7 @@ checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" dependencies = [ "autocfg 0.1.8", "libc", - "rand_chacha", + "rand_chacha 0.1.1", "rand_core 0.4.2", "rand_hc", "rand_isaac", @@ -998,6 +1189,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.3", +] + [[package]] name = "rand_chacha" version = "0.1.1" @@ -1008,6 +1210,16 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.3", +] + [[package]] name = "rand_core" version = "0.3.1" @@ -1023,6 +1235,15 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + [[package]] name = "rand_hc" version = "0.1.0" @@ -1104,10 +1325,27 @@ dependencies = [ ] [[package]] -name = "remain" -version = "0.2.2" +name = "regex" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ba1e78fa68412cb93ef642fd4d20b9a941be49ee9333875ebaf13112673ea7" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + +[[package]] +name = "remain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c35270ea384ac1762895831cc8acb96f171468e52cec82ed9186f9416209fa4" dependencies = [ "proc-macro2", "quote", @@ -1148,21 +1386,11 @@ dependencies = [ "thiserror", ] -[[package]] -name = "rutabaga_gfx_ffi" -version = "0.1.0" -dependencies = [ - "base", - "data_model", - "libc", - "rutabaga_gfx", -] - [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "scudo" @@ -1186,18 +1414,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.136" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" dependencies = [ "proc-macro2", "quote", @@ -1206,15 +1434,36 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "itoa", "ryu", "serde", ] +[[package]] +name = "serde_keyvalue" +version = "0.1.0" +dependencies = [ + "argh", + "remain", + "serde", + "serde_keyvalue_derive", + "thiserror", +] + +[[package]] +name = "serde_keyvalue_derive" +version = "0.1.0" +dependencies = [ + "argh", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "slab" version = "0.4.6" @@ -1223,41 +1472,31 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" + +[[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.90" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "704df27628939572cd88d33f171cd6f896f4eaca85252c6e0a72d8d8287ee86f" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] name = "sync" version = "0.1.0" -[[package]] -name = "sys_util" -version = "0.1.0" -dependencies = [ - "android_log-sys", - "data_model", - "libc", - "poll_token_derive", - "remain", - "serde", - "serde_json", - "sync", - "tempfile", - "thiserror", -] - [[package]] name = "system_api" version = "0.1.0" @@ -1268,7 +1507,7 @@ version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "fastrand", "libc", "redox_syscall", @@ -1277,25 +1516,64 @@ dependencies = [ ] [[package]] -name = "thiserror" -version = "1.0.30" +name = "terminal_size" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +dependencies = [ + "libc", + "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 = "thiserror" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" 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 = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + [[package]] name = "tpm2" version = "0.1.0" @@ -1311,6 +1589,26 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "tube_transporter" +version = "0.1.0" +dependencies = [ + "base", + "data_model", + "rand 0.8.5", + "serde", + "serde_json", + "thiserror", + "win_util", + "winapi", +] + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + [[package]] name = "unicode-segmentation" version = "1.9.0" @@ -1318,10 +1616,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" [[package]] -name = "unicode-xid" -version = "0.2.2" +name = "unicode-width" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" [[package]] name = "usb_sys" @@ -1352,11 +1650,18 @@ dependencies = [ "getrandom", ] +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "vfio_sys" version = "0.1.0" dependencies = [ "base", + "data_model", ] [[package]] @@ -1378,6 +1683,7 @@ name = "virtio_sys" version = "0.1.0" dependencies = [ "base", + "data_model", ] [[package]] @@ -1410,6 +1716,7 @@ dependencies = [ "data_model", "libc", "remain", + "serde", "thiserror", ] @@ -1418,20 +1725,29 @@ name = "vmm_vhost" version = "0.1.0" dependencies = [ "anyhow", + "base", "bitflags", + "cfg-if", "data_model", "libc", "remain", - "sys_util", + "serde", + "serde_json", "tempfile", "thiserror", ] [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "which" @@ -1444,6 +1760,17 @@ dependencies = [ "libc", ] +[[package]] +name = "win_util" +version = "0.1.0" +dependencies = [ + "anyhow", + "lazy_static", + "libc", + "winapi", + "windows", +] + [[package]] name = "winapi" version = "0.3.9" @@ -1466,6 +1793,33 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a43e544233e20425d5a58e9671cf76d6aed9e6f211508c050facb29b188dc10f" +dependencies = [ + "const-sha1", + "windows_gen", + "windows_macros", +] + +[[package]] +name = "windows_gen" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc6283570a39b3594e31c64a498f48058758cc063eb087d972bb6476ad134a16" + +[[package]] +name = "windows_macros" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f757e7665f81f33ace9f89b0f0fc3a7c770e24ff4fa1475c6503bb35b4524893" +dependencies = [ + "syn", + "windows_gen", +] + [[package]] name = "wire_format_derive" version = "0.1.0" @@ -1480,6 +1834,7 @@ name = "x86_64" version = "0.1.0" dependencies = [ "acpi_tables", + "anyhow", "arch", "assertions", "base", diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff index f1aa50ee10..0af27df9a1 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default-seccomp-policy-dir.diff @@ -1,15 +1,15 @@ -diff --git a/src/crosvm.rs b/src/crosvm.rs -index b7055df..5989c87 100644 ---- a/src/crosvm.rs -+++ b/src/crosvm.rs -@@ -141,7 +141,9 @@ impl Default for Config { - x_display: None, - shared_dirs: Vec::new(), - sandbox: !cfg!(feature = "default-no-sandbox"), +diff --git i/src/crosvm.rs w/src/crosvm.rs +index ab7c466b..636dc140 100644 +--- i/src/crosvm.rs ++++ w/src/crosvm.rs +@@ -345,7 +345,9 @@ impl Default for JailConfig { + fn default() -> Self { + JailConfig { + pivot_root: PathBuf::from(option_env!("DEFAULT_PIVOT_ROOT").unwrap_or("/var/empty")), - seccomp_policy_dir: PathBuf::from(SECCOMP_POLICY_DIR), + seccomp_policy_dir: PathBuf::from( + option_env!("DEFAULT_SECCOMP_POLICY_DIR").unwrap_or(SECCOMP_POLICY_DIR), + ), seccomp_log_failures: false, - cras_audio: false, - cras_capture: false, + } + } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix index 68ba3b56e2..2e74fda9e2 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix @@ -1,63 +1,64 @@ { stdenv, lib, rustPlatform, fetchgit -, pkg-config, wayland-scanner, libcap, minijail, wayland, wayland-protocols -, linux +, minijail-tools, pkg-config, wayland-scanner +, libcap, libdrm, libepoxy, minijail, virglrenderer, wayland, wayland-protocols }: -let +rustPlatform.buildRustPackage rec { + pname = "crosvm"; + version = "103.3"; - upstreamInfo = with builtins; fromJSON (readFile ./upstream-info.json); + src = fetchgit { + url = "https://chromium.googlesource.com/crosvm/crosvm"; + rev = "e7db3a5cc78ca90ab06aadd5f08bb151090269b6"; + sha256 = "0hyz0mg5fn6hi97awfpxfykgv68m935r037sdf85v3vcwjy5n5ki"; + fetchSubmodules = true; + }; - arch = with stdenv.hostPlatform; - if isAarch64 then "aarch64" - else if isx86_64 then "x86_64" - else throw "no seccomp policy files available for host platform"; + separateDebugInfo = true; -in + patches = [ + ./default-seccomp-policy-dir.diff + ]; - rustPlatform.buildRustPackage rec { - pname = "crosvm"; - inherit (upstreamInfo) version; + cargoLock.lockFile = ./Cargo.lock; - src = fetchgit (builtins.removeAttrs upstreamInfo.src [ "date" "path" ]); + nativeBuildInputs = [ minijail-tools pkg-config wayland-scanner ]; - separateDebugInfo = true; + buildInputs = [ + libcap libdrm libepoxy minijail virglrenderer wayland wayland-protocols + ]; - patches = [ - ./default-seccomp-policy-dir.diff - ]; + arch = stdenv.hostPlatform.parsed.cpu.name; - cargoLock.lockFile = ./Cargo.lock; + postPatch = '' + cp ${cargoLock.lockFile} Cargo.lock + sed -i "s|/usr/share/policy/crosvm/|$PWD/seccomp/$arch/|g" \ + seccomp/$arch/*.policy + ''; - nativeBuildInputs = [ pkg-config wayland-scanner ]; + preBuild = '' + export DEFAULT_SECCOMP_POLICY_DIR=$out/share/policy - buildInputs = [ libcap minijail wayland wayland-protocols ]; + for policy in seccomp/$arch/*.policy; do + compile_seccomp_policy \ + --default-action trap $policy ''${policy%.policy}.bpf + done + ''; - postPatch = '' - cp ${./Cargo.lock} Cargo.lock - sed -i "s|/usr/share/policy/crosvm/|$out/share/policy/|g" \ - seccomp/*/*.policy - ''; + buildFeatures = [ "default" "virgl_renderer" "virgl_renderer_next" ]; - preBuild = '' - export DEFAULT_SECCOMP_POLICY_DIR=$out/share/policy - ''; + postInstall = '' + mkdir -p $out/share/policy/ + cp -v seccomp/$arch/*.bpf $out/share/policy/ + ''; - postInstall = '' - mkdir -p $out/share/policy/ - cp seccomp/${arch}/* $out/share/policy/ - ''; + passthru.updateScript = ./update.py; - CROSVM_CARGO_TEST_KERNEL_BINARY = - lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) - "${linux}/${stdenv.hostPlatform.linux-kernel.target}"; - - passthru.updateScript = ./update.py; - - meta = with lib; { - description = "A secure virtual machine monitor for KVM"; - homepage = "https://chromium.googlesource.com/chromiumos/platform/crosvm/"; - maintainers = with maintainers; [ qyliss ]; - license = licenses.bsd3; - platforms = [ "aarch64-linux" "x86_64-linux" ]; - }; - } + meta = with lib; { + description = "A secure virtual machine monitor for KVM"; + homepage = "https://chromium.googlesource.com/crosvm/crosvm/"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.bsd3; + platforms = [ "aarch64-linux" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/update.py b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/update.py index f9fc90c6b3..d912c49078 100755 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/update.py +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/update.py @@ -1,23 +1,15 @@ #! /usr/bin/env nix-shell -#! nix-shell -p nix-prefetch-git "python3.withPackages (ps: with ps; [ lxml ])" +#! nix-shell -p common-updater-scripts python3 #! nix-shell -i python -import base64 +import csv import json import re import shlex import subprocess -from codecs import iterdecode from os.path import abspath, dirname, splitext -from lxml import etree -from lxml.etree import HTMLParser from urllib.request import urlopen -git_path = 'chromiumos/platform/crosvm' -git_root = 'https://chromium.googlesource.com/' -manifest_versions = f'{git_root}chromiumos/manifest-versions' -buildspecs_url = f'{manifest_versions}/+/refs/heads/master/full/buildspecs/' - # CrOS version numbers look like this: # [.].. # @@ -26,64 +18,45 @@ buildspecs_url = f'{manifest_versions}/+/refs/heads/master/full/buildspecs/' # branch branches are used for fixes for specific devices. So for # Chromium OS they will always be 0. This is a best guess, and is not # documented. -with urlopen('https://cros-updates-serving.appspot.com/') as resp: - document = etree.parse(resp, HTMLParser()) - # bgcolor="lightgreen" is set on the most up-to-date version for - # each channel, so find a lightgreen cell in the "Stable" column. - (platform_version, chrome_version) = document.xpath(""" - (//table[@id="cros-updates"]/tr/td[1 + count( - //table[@id="cros-updates"]/thead/tr[1]/th[text() = "Stable"] - /preceding-sibling::*) - ][@bgcolor="lightgreen"])[1]/text() - """) +with urlopen('https://chromiumdash.appspot.com/cros/download_serving_builds_csv?deviceCategory=ChromeOS') as resp: + reader = csv.reader(map(bytes.decode, resp)) + header = reader.__next__() + cr_stable_index = header.index('cr_stable') + cros_stable_index = header.index('cros_stable') + chrome_version = [] + platform_version = [] -chrome_major_version = re.match(r'\d+', chrome_version)[0] -chromeos_tip_build = re.match(r'\d+', platform_version)[0] + for line in reader: + this_chrome_version = list(map(int, line[cr_stable_index].split('.'))) + this_platform_version = list(map(int, line[cros_stable_index].split('.'))) + chrome_version = max(chrome_version, this_chrome_version) + platform_version = max(platform_version, this_platform_version) -# Find the most recent buildspec for the stable Chrome version and -# Chromium OS build number. Its branch build and branch branch build -# numbers will (almost?) certainly be 0. It will then end with an rc -# number -- presumably these are release candidates, one of which -# becomes the final release. Presumably the one with the highest rc -# number. -with urlopen(f'{buildspecs_url}{chrome_major_version}/?format=TEXT') as resp: - listing = base64.decodebytes(resp.read()).decode('utf-8') - buildspecs = [(line.split('\t', 1)[1]) for line in listing.splitlines()] - buildspecs = [s for s in buildspecs if s.startswith(chromeos_tip_build)] - buildspecs.sort(reverse=True) - buildspec = splitext(buildspecs[0])[0] +chrome_major_version = chrome_version[0] +chromeos_tip_build = platform_version[0] +release_branch = f'release-R{chrome_major_version}-{chromeos_tip_build}.B-chromeos' -# Read the buildspec, and extract the git revision. -with urlopen(f'{buildspecs_url}{chrome_major_version}/{buildspec}.xml?format=TEXT') as resp: - xml = base64.decodebytes(resp.read()) - root = etree.fromstring(xml) - revision = root.find(f'./project[@name="{git_path}"]').get('revision') +# Determine the git revision. +with urlopen(f'https://chromium.googlesource.com/chromiumos/platform/crosvm/+/refs/heads/{release_branch}?format=JSON') as resp: + resp.readline() # Remove )]}' header + rev = json.load(resp)['commit'] -# Initialize the data that will be output from this script. Leave the -# rc number in buildspec so nobody else is subject to the same level -# of confusion I have been. -data = {'version': f'{chrome_major_version}.{buildspec}'} +# Determine the patch version by counting the commits that have been +# added to the release branch since it forked off the chromeos branch. +with urlopen(f'https://chromium.googlesource.com/chromiumos/platform/crosvm/+log/refs/heads/chromeos..{rev}?format=JSON') as resp: + resp.readline() # Remove )]}' header + branch_commits = json.load(resp)['log'] + version = f'{chrome_major_version}.{len(branch_commits)}' -# Fill in the 'src' key with the output from nix-prefetch-git, which -# can be passed straight to fetchGit when imported by Nix. -argv = ['nix-prefetch-git', - '--fetch-submodules', - '--url', git_root + git_path, - '--rev', revision] -output = subprocess.check_output(argv) -data['src'] = json.loads(output.decode('utf-8')) +# Update the version, git revision, and hash in crosvm's default.nix. +subprocess.run(['update-source-version', 'crosvm', f'--rev={rev}', version]) -# Find the path to crosvm's default.nix, so the src data can be -# written into the same directory. +# Find the path to crosvm's default.nix, so Cargo.lock can be written +# into the same directory. argv = ['nix-instantiate', '--eval', '--json', '-A', 'crosvm.meta.position'] position = json.loads(subprocess.check_output(argv).decode('utf-8')) filename = re.match(r'[^:]*', position)[0] -# Write the output. -with open(dirname(filename) + '/upstream-info.json', 'w') as out: - json.dump(data, out, indent=2) - out.write('\n') - # Generate a Cargo.lock run = ['.', dirname(abspath(__file__)) + '/generate-cargo.sh', diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/upstream-info.json b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/upstream-info.json deleted file mode 100644 index c994ff1a5f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/upstream-info.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "100.14526.0.0-rc1", - "src": { - "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", - "rev": "bdf5e4d4379030cfa2d0510328b8acce73162217", - "date": "2022-02-14T19:13:41+00:00", - "path": "/nix/store/xw31chiwnpzgcp07nf448g2npcwiwkkm-crosvm-bdf5e4d", - "sha256": "0mrnjyyqmz24z1yvdq2mysmhmz0577k8kf9y4v51g7860crqp9ji", - "fetchLFS": false, - "fetchSubmodules": true, - "deepClone": false, - "leaveDotGit": false - } -} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index c0c53b9c6a..f224e03de0 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -39,25 +39,16 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "1.4.5"; + version = "1.5"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-YXbyGUY/E8odjljDok+yYyU8yZSyUFc22zumrUuuXXQ="; + sha256 = "sha256-eirCENgt25VRPub7c9cxYQ1uFxYbzm75cJ1v4r6O/+k="; fetchSubmodules = true; }; - patches = [ - # Should dropped in next release after 1.4.5 - (fetchpatch { - name = "usrbin-paths.patch"; - url = "https://github.com/containers/crun/commit/dd29f7f7f713c49784ac30f7cdca33b2ef94d5b8.patch"; - sha256 = "sha256-kHHix8CUL+c8HbOe5qx4PeF1P19113U4bRZyleMUjqk="; - }) - ]; - nativeBuildInputs = [ autoreconfHook go-md2man pkg-config python3 ]; buildInputs = [ libcap libseccomp systemd yajl ] diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix index e98eb404b9..b9d5a3e927 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix @@ -13,6 +13,12 @@ buildGoModule rec { vendorSha256 = null; + ldflags = [ + "-w" "-s" + "-X github.com/docker/buildx/version.Package=github.com/docker/buildx" + "-X github.com/docker/buildx/version.Version=v${version}" + ]; + installPhase = '' install -D $GOPATH/bin/buildx $out/libexec/docker/cli-plugins/docker-buildx ''; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix index 583a3e50a1..6d40f39d56 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "docker-compose"; - version = "2.6.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; rev = "v${version}"; - sha256 = "sha256-D3+qDWxg3e5/3UIMz8FZDuxmQHmTv0NJVT/otGYedtw="; + sha256 = "sha256-CbYlu7dOpHGceGLFkI3p494SNlFL3JyBv+/yy0PRkPY="; }; - vendorSha256 = "sha256-WxLQfu65Gr+ao/pM8B2uiS88sNT72Klhz7ZIrEadW5g="; + vendorSha256 = "sha256-9ec34jpDA7MUoAhWZMGCmXkOi/iK9mdJpFZ1qu9QgrU="; ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/flintlock/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/flintlock/default.nix index d258604496..39c0918be0 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/flintlock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/flintlock/default.nix @@ -10,16 +10,16 @@ buildGoModule rec{ pname = "flintlock"; - version = "0.1.0-alpha.9"; + version = "0.1.1"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flintlock"; rev = "v${version}"; - sha256 = "sha256-Xw3g2wh0fPUknSuAKoJL3jxVZS50wSPZ9Wz05zkTVXM="; + sha256 = "sha256-uzsLvmp30pxDu0VtzRD1H4onL4sT/RC3CBnzfahm0Fw="; }; - vendorSha256 = "sha256-EjVlM6AD+O/z6+R5TRBmmRWbrP4C+qyvsnEjwOkDkUE="; + vendorSha256 = "sha256-vkSO+mIEPO8urEYqMjQLoHB4mtSxfJC74zHWpQbQL9g="; subPackages = [ "cmd/flintlock-metrics" "cmd/flintlockd" ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix index df9e3e7311..1f917080bc 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "imgcrypt"; - version = "1.1.4"; + version = "1.1.6"; src = fetchFromGitHub { owner = "containerd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a5IQahhonaXA74gY+zR6BbV9MdyEu70j0E6YlNmN3DA="; + sha256 = "sha256-ytoxdwmyg7IlJOhC6FPI9dnoiptEQrlAAPV57/O3M4U="; }; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix index c6b9b4149f..dc9521be29 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/lima/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "lima"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "lima-vm"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tTa/FQiF2qZ36OGORr5fqvKR5i6qo7OTBJFGWJMShQ0="; + sha256 = "sha256-sSmadO7iKkJb/kd9rnH34/DyAHqdNtbvGDt9xkK4t8E="; }; - vendorSha256 = "sha256-wvb592mmxOeRSX8Rxx2m7tZ2S8wQTcQkL3b6z0F6OEQ="; + vendorSha256 = "sha256-pe6AaO3vTbix+b21GqEICxdej8mbXXpzNrF4eKbEnSE="; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix index e6dbb84610..22a8b96373 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "0.1.7"; + version = "0.2.13"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UxdK2e5VYcOEYdZn0oGRFIVGiwnPixiZ3rOnqJDSQO8="; + sha256 = "sha256-ZI29kcGteyJWUfCC/DR92YqzfuVYqDx7FtedehVp+vs="; }; - cargoSha256 = "sha256-dJdPs4BJ1R2ZbGmGmvBerLPVqUHn5b/fz9C0kEnxA6U="; + cargoSha256 = "sha256-Njvf5+i54TLbcWtWiNefEWudtGsSjw+DJh+FP6OuLek="; # skip test due FHS dependency doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix index 6b563dc8b8..78da45fd85 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman-tui/default.nix @@ -2,6 +2,7 @@ , stdenv , pkg-config , fetchFromGitHub +, fetchpatch , buildGoModule , btrfs-progs , gpgme @@ -12,15 +13,23 @@ }: buildGoModule rec { pname = "podman-tui"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman-tui"; rev = "v${version}"; - sha256 = "sha256-2WugN5JdTkz3OOt3ggzT7HwMXy1jxn85RwF7409D8m8="; + sha256 = "sha256-XLC1DqOME9xMF4z+cOPe5H60JnxU9gGaSOQQIofdtj8="; }; + patches = [ + # Fix flaky tests. See https://github.com/containers/podman-tui/pull/129. + (fetchpatch { + url = "https://github.com/containers/podman-tui/commit/7fff27e95a3891163da79d86bbc796f29b523f80.patch"; + sha256 = "sha256-mETDXoMLq7vb8Qhpz/CmNG1LmY2DTaogI10Qav/qN9Q="; + }) + ]; + vendorSha256 = null; nativeBuildInputs = [ pkg-config ]; @@ -30,6 +39,10 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + preCheck = '' + export HOME=/home/$(whoami) + ''; + passthru.tests.version = testers.testVersion { package = podman-tui; command = "podman-tui version"; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index 370c37ffec..1e1263755b 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "podman"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "sha256-+lwq4WTPeELjugTg9l1wvoe0VTqRK2lC1jaFIwXMrL0="; + sha256 = "sha256-crlOF8FoLlDulJJ8t8M1kk6JhSZdJU1VtR+G0O6VngM="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index fb41e303f5..bb20f2a738 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx_rtd_theme ] + nativeBuildInputs = [ makeWrapper removeReferencesTo pkg-config flex bison meson ninja perl python3 python3Packages.sphinx python3Packages.sphinx-rtd-theme ] ++ lib.optionals gtkSupport [ wrapGAppsHook ] ++ lib.optionals stdenv.isDarwin [ sigtool ]; @@ -121,6 +121,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu/qemu/-/commit/f5643914a9e8f79c606a76e6a9d7ea82a3fc3e65.patch"; sha256 = "sha256-8i13wU135h+YxoXFtkXweBN3hMslpWoNoeQ7Ydmn3V4="; }) + (fetchpatch { + name = "CVE-2022-35414.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/418ade7849ce7641c0f7333718caf5091a02fd4c.patch"; + sha256 = "sha256-zQHDXedIXZBnabv4+3TA4z5mY1+KZiPmqUbhaSkGLgA="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; @@ -128,18 +133,6 @@ stdenv.mkDerivation rec { # Otherwise tries to ensure /var/run exists. sed -i "/install_subdir('run', install_dir: get_option('localstatedir'))/d" \ qga/meson.build - - # glibc 2.33 compat fix: if `has_statx = true` is set, `tools/virtiofsd/passthrough_ll.c` will - # rely on `stx_mnt_id`[1] which is not part of glibc's `statx`-struct definition. - # - # `has_statx` will be set to `true` if a simple C program which uses a few `statx` - # consts & struct fields successfully compiles. It seems as this only builds on glibc-2.33 - # since most likely[2] and because of that, the problematic code-path will be used. - # - # [1] https://github.com/torvalds/linux/commit/fa2fcf4f1df1559a0a4ee0f46915b496cc2ebf60#diff-64bab5a0a3fcb55e1a6ad77b1dfab89d2c9c71a770a07ecf44e6b82aae76a03a - # [2] https://sourceware.org/git/?p=glibc.git;a=blobdiff;f=io/bits/statx-generic.h;h=c34697e3c1fd79cddd60db294302e461ed8db6e2;hp=7a09e94be2abb92d2df612090c132e686a24d764;hb=88a2cf6c4bab6e94a65e9c0db8813709372e9180;hpb=c4e4b2e149705559d28b16a9b47ba2f6142d6a6c - substituteInPlace meson.build \ - --replace 'has_statx = cc.links(statx_test)' 'has_statx = false' ''; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix index 272e10318e..65bd4bcecb 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-manager/default.nix @@ -64,6 +64,10 @@ python3.pkgs.buildPythonApplication rec { gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ cpio e2fsprogs file findutils gzip ]}") makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + + # Fixes testCLI0051virt_install_initrd_inject on Darwin: "cpio: root:root: invalid group" + substituteInPlace virtinst/install/installerinject.py \ + --replace "'--owner=root:root'" "'--owner=0:0'" ''; checkInputs = with python3.pkgs; [ @@ -95,8 +99,7 @@ python3.pkgs.buildPythonApplication rec { manages Xen and LXC (linux containers). ''; license = licenses.gpl2; - # exclude Darwin since libvirt-glib currently doesn't build there - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ qknight offline fpletz globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix index ead44c40f9..a9f4a7e58c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virt-what/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "virt-what"; - version = "1.21"; + version = "1.24"; src = fetchurl { url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz"; - sha256 = "0yqz1l4di57d4y1z94yhdmkiykg9a8i7xwkqmd9zsk5a6i9lbjqj"; + sha256 = "sha256-C9fllw/y1SwJKIEa4mgnlYQjF/7L5VN0z84EI88uS9Y="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix index af2c4a0070..83c48536b3 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/default.nix @@ -3,7 +3,6 @@ , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43 , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib -, fetchpatch # If open-watcom-bin is not passed, VirtualBox will fall back to use # the shipped alternative sources (assembly). , open-watcom-bin @@ -24,14 +23,14 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.34"; + version = "6.1.36"; in stdenv.mkDerivation { pname = "virtualbox"; inherit version; src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "9c3ce1829432e5b8374f950698587038f45fb0492147dc200e59edb9bb75eb49"; + sha256 = "e47942e42892c13c621869865e2b7b320340154f0fa74ecbdaf18fdaf70ef047"; }; outputs = [ "out" "modsrc" ]; @@ -98,15 +97,6 @@ in stdenv.mkDerivation { ./qtx11extras.patch # https://github.com/NixOS/nixpkgs/issues/123851 ./fix-audio-driver-loading.patch - # NOTE: both patches below should be removed when updating to 6.1.35 - # https://www.virtualbox.org/ticket/20914#comment:15 - (fetchpatch { - url = "https://www.virtualbox.org/raw-attachment/ticket/20914/vbox-linux-5.19.patch"; - hash = "sha512-NNiMf8kUuM/PimrQCOacYLkrf7UFPh6ZdPsXKyLlsqWfWQXkG92Fv3qZXvg8weE1Z/SBsFTuHICEI4b4l1wZFw=="; - extraPrefix = "/"; - }) - # https://www.virtualbox.org/ticket/20904#comment:22 - ./ffreestanding.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix index 24e66ef7c7..83861e648c 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -1,4 +1,4 @@ -{fetchurl, lib, virtualbox}: +{ fetchurl, lib, virtualbox }: with lib; @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "d7856f0688b6d2ed1e8bff0b367efa952068b03fa5a3a29b46db08cfd5d9a810"; + let value = "3c84f0177a47a1969aff7c98e01ddceedd50348f56cc52d63f4c2dd38ad2ca75"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/ffreestanding.patch b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/ffreestanding.patch deleted file mode 100644 index 0e22aa60cd..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/ffreestanding.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Config.kmk b/Config.kmk -index 3df197404..4c6bd76bb 100644 ---- a/Config.kmk -+++ b/Config.kmk -@@ -4503,11 +4504,14 @@ ifeq ($(VBOX_LDR_FMT),elf) - TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL) - TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \ - $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ -- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) -+ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK) - TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \ - $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \ - $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \ - -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK) -+ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++. -+TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding -+ endif - TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding - TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables - TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 538ebfa78c..75684cb3b9 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "88f86fa0e6970b6a7c80d714b7a91a8c425ff8ef53a3e73fc80781191a87257b"; + sha256 = "c987cdc8c08c579f56d921c85269aeeac3faf636babd01d9461ce579c9362cdd"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; @@ -148,6 +148,6 @@ in stdenv.mkDerivation rec { license = "GPL"; maintainers = [ lib.maintainers.sander ]; platforms = [ "i686-linux" "x86_64-linux" ]; - broken = kernel.kernelAtLeast (if stdenv.hostPlatform.is32bit then "5.10" else "5.17"); + broken = stdenv.hostPlatform.is32bit && (kernel.kernelAtLeast "5.10"); }; } diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix index bfc360e81b..95170b7932 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix @@ -21,13 +21,13 @@ in stdenv.mkDerivation rec { pname = "dwl"; - version = "0.2.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "djpohly"; repo = pname; rev = "v${version}"; - hash = "sha256-T2GqDehBNO8eublqZUmA5WADjnwElzT+bp9Dp1bqSgg="; + hash = "sha256-VHxBjjnzJNmtJxrm3ywJzvt2bNHGk/Cx8TICw6SaoiQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/2.6.nix b/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/2.6.nix new file mode 100644 index 0000000000..44dde60ac0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/2.6.nix @@ -0,0 +1,82 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, cairo +, fontconfig +, freetype +, fribidi +, libXcursor +, libXft +, libXinerama +, libXpm +, libXt +, libpng +, librsvg +, libstroke +, libxslt +, perl +, pkg-config +, python3Packages +, readline +, enableGestures ? false +}: + +stdenv.mkDerivation rec { + pname = "fvwm"; + version = "2.6.9"; + + src = fetchFromGitHub { + owner = "fvwmorg"; + repo = pname; + rev = version; + hash = "sha256-sBVOrrl2WrZ2wWN/r1kDUtR+tPwXgDoSJDaxGeFkXJI="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + python3Packages.wrapPython + ]; + + buildInputs = [ + cairo + fontconfig + freetype + fribidi + libXcursor + libXft + libXinerama + libXpm + libXt + libpng + librsvg + libxslt + perl + python3Packages.python + readline + ] ++ lib.optional enableGestures libstroke; + + pythonPath = [ + python3Packages.pyxdg + ]; + + configureFlags = [ + "--enable-mandoc" + "--disable-htmldoc" + ]; + + postFixup = '' + wrapPythonPrograms + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "http://fvwm.org"; + description = "A multiple large virtual desktop window manager"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ edanaher ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/3.nix b/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/3.nix new file mode 100644 index 0000000000..e68f93bf83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/3.nix @@ -0,0 +1,99 @@ +{ lib +, stdenv +, fetchFromGitHub +, asciidoctor +, autoreconfHook +, cairo +, fontconfig +, freetype +, fribidi +, imlib +, libSM +, libX11 +, libXcursor +, libXft +, libXi +, libXinerama +, libXpm +, libXrandr +, libXt +, libevent +, libintl +, libpng +, librsvg +, libstroke +, libxslt +, perl +, pkg-config +, python3Packages +, readline +, sharutils +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fvwm3"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "fvwmorg"; + repo = "fvwm3"; + rev = finalAttrs.version; + hash = "sha256-ByMSX4nwXkp+ly39C2+cYy3e9B0vnGcJlyIiS7V6zoI="; + }; + + nativeBuildInputs = [ + autoreconfHook + asciidoctor + pkg-config + python3Packages.wrapPython + ]; + + buildInputs = [ + cairo + fontconfig + freetype + fribidi + imlib + libSM + libX11 + libXcursor + libXft + libXi + libXinerama + libXpm + libXrandr + libXt + libevent + libintl + libpng + librsvg + libstroke + libxslt + perl + python3Packages.python + readline + sharutils + ]; + + pythonPath = [ + python3Packages.pyxdg + ]; + + configureFlags = [ + "--enable-mandoc" + ]; + + postFixup = '' + wrapPythonPrograms + ''; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "http://fvwm.org"; + description = "A multiple large virtual desktop window manager - Version 3"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix deleted file mode 100644 index 07c3573fb2..0000000000 --- a/third_party/nixpkgs/pkgs/applications/window-managers/fvwm/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ autoreconfHook, enableGestures ? false, lib, stdenv, fetchFromGitHub -, pkg-config, cairo, fontconfig, freetype, libXft, libXcursor, libXinerama -, libXpm, libXt, librsvg, libpng, fribidi, perl, libstroke, readline, libxslt }: - -stdenv.mkDerivation rec { - pname = "fvwm"; - version = "2.6.9"; - - src = fetchFromGitHub { - owner = "fvwmorg"; - repo = pname; - rev = version; - sha256 = "14jwckhikc9n4h93m00pzjs7xm2j0dcsyzv3q5vbcnknp6p4w5dh"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ - cairo - fontconfig - freetype - libXft - libXcursor - libXinerama - libXpm - libXt - librsvg - libpng - fribidi - perl - readline - libxslt - ] ++ lib.optional enableGestures libstroke; - - configureFlags = [ "--enable-mandoc" "--disable-htmldoc" ]; - - meta = { - homepage = "http://fvwm.org"; - description = "A multiple large virtual desktop window manager"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ edanaher ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix new file mode 100644 index 0000000000..2d271893b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/default.nix @@ -0,0 +1,91 @@ +{ stdenv +, fetchFromGitHub +, meson +, pkg-config +, ninja +, xorg +, libdrm +, vulkan-loader +, wayland +, wayland-protocols +, libxkbcommon +, libcap +, SDL2 +, pipewire +, udev +, pixman +, libinput +, libseat +, xwayland +, glslang +, stb +, wlroots +, libliftoff +, lib +, makeBinaryWrapper +}: +let + pname = "gamescope"; + version = "3.11.33-jupiter-3.3-2"; +in +stdenv.mkDerivation { + inherit pname version; + + src = fetchFromGitHub { + owner = "Plagman"; + repo = "gamescope"; + rev = "refs/tags/${version}"; + hash = "sha256-6/gTsQGZDQPCdmXe5EI9QcT/MkdTf6odsI2/+g/W7Qc="; + }; + + patches = [ ./use-pkgconfig.patch ]; + + nativeBuildInputs = [ + meson + pkg-config + ninja + makeBinaryWrapper + ]; + + buildInputs = [ + xorg.libXdamage + xorg.libXcomposite + xorg.libXrender + xorg.libXext + xorg.libXxf86vm + xorg.libXtst + xorg.libXres + xorg.libXi + libdrm + libliftoff + vulkan-loader + glslang + SDL2 + wayland + wayland-protocols + wlroots + xwayland + libseat + libinput + libxkbcommon + udev + pixman + pipewire + libcap + stb + ]; + + # --debug-layers flag expects these in the path + postInstall = '' + wrapProgram "$out/bin/gamescope" \ + --prefix PATH : ${with xorg; lib.makeBinPath [xprop xwininfo]} + ''; + + meta = with lib; { + description = "SteamOS session compositing window manager"; + homepage = "https://github.com/Plagman/gamescope"; + license = licenses.bsd2; + maintainers = with maintainers; [ nrdxp ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch b/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch new file mode 100644 index 0000000000..2934595243 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/gamescope/use-pkgconfig.patch @@ -0,0 +1,11 @@ +diff --git a/meson.build b/meson.build +index 1311784..77043ac 100644 +--- a/meson.build ++++ b/meson.build +@@ -6,7 +6,6 @@ project( + default_options: [ + 'cpp_std=c++14', + 'warning_level=2', +- 'force_fallback_for=wlroots,libliftoff', + ], + ) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix new file mode 100644 index 0000000000..0f608b83a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/hackedbox/default.nix @@ -0,0 +1,61 @@ +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, freetype +, fribidi +, imlib2 +, libX11 +, libXext +, libXft +, libXinerama +, libXpm +, libXrandr +, libXrender +, pkg-config +, xorgproto +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hackedbox"; + version = "0.8.5.1"; + + src = fetchFromGitHub { + owner = "museoa"; + repo = "hackedbox"; + rev = finalAttrs.version; + hash = "sha256-hxfbEj7UxQ19xhetmdi0iyK6ceLUfUvAAyyTbNivlLQ="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + freetype + fribidi + imlib2 + libX11 + libXext + libXft + libXinerama + libXpm + libXrandr + libXrender + xorgproto + ]; + + configureFlags = [ + "--x-includes=${libX11.dev}/include" + "--x-libraries=${libX11.out}/lib" + ]; + + meta = with lib; { + description = "A bastard hacked offspring of Blackbox"; + homepage = "http://github.com/museoa/hackedbox/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + inherit (libX11.meta) platforms; + }; +}) diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix index e999a458d1..b46179599c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "1k03rdr6irsgnjl4w0vac0kk9nsz46qhy74iflmaycxgfv8fxy7f"; + sha256 = "sha256-stRgCQnlvs5a1jgY37MLsZ/SrJ9ShHsaenStQEBxgQU="; }; outputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock.nix index 03506e889d..2c0a481676 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/lock.nix @@ -1,26 +1,21 @@ -{ fetchurl, lib, stdenv, which, pkg-config, libxcb, xcbutilkeysyms, xcbutilimage, +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, libxcb, xcbutilkeysyms, xcbutilimage, xcbutilxrm, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { pname = "i3lock"; - version = "2.13"; + version = "2.14.1"; - src = fetchurl { - url = "https://i3wm.org/i3lock/${pname}-${version}.tar.bz2"; - sha256 = "02szjsaz7rqrdkd0r2nwgwa85c4hwfrcskxw7ryk695kmjcfhzv3"; + src = fetchFromGitHub { + owner = "i3"; + repo = "i3lock"; + rev = version; + sha256 = "sha256-cC908c47fkU6msLqZSxpEbKxO1/PatH81QeuCzBSZGw="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ which libxcb xcbutilkeysyms xcbutilimage xcbutilxrm + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ libxcb xcbutilkeysyms xcbutilimage xcbutilxrm pam libX11 libev cairo libxkbcommon libxkbfile ]; - makeFlags = [ "all" ]; - installFlags = [ "PREFIX=\${out}" "SYSCONFDIR=\${out}/etc" ]; - postInstall = '' - mkdir -p $out/share/man/man1 - cp *.1 $out/share/man/man1 - ''; - meta = with lib; { description = "A simple screen locker like slock"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index 75cb96f27f..da97958fb3 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "2.9.6"; + version = "2.9.8"; src = fetchFromGitHub { owner = "ice-wm"; repo = pname; rev = version; - hash = "sha256-qC8gEVJ/cmsEbF8jMzv7zyvVcjlbXhgHU3ixe7RLcnA="; + hash = "sha256-SjLXPlwL3tMBD7RCJkL60lqcld/ZXIxgjeNrAn8A6KU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix index f58b71ef03..ba145b8528 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/labwc/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "labwc"; - version = "0.5.0"; + version = "0.5.3"; src = fetchFromGitHub { owner = "labwc"; repo = pname; rev = version; - hash = "sha256-G0EQuXSHftl4JLXKIro+tmhbApwAhlzcjPEL7DP6LHk="; + hash = "sha256-YD2bGxa7uss6KRvOGM0kn8dM+277ubaYeOB7ugRZCcY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix index 6a37809bb5..11a5c9b56c 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/phosh/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkg-config @@ -84,6 +85,19 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dsystemd=true" "-Dcompositor=${phoc}/bin/phoc" ]; + patches = [ + # build: Adjust to polkit version changes + (fetchpatch { + url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/16b46e295b86cbf1beaccf8218cf65ebb4b7a6f1.patch"; + sha256 = "sha256-Db1OEdiI1QBHGEBs1Coi7LTF9bCScdDgxmovpBdIY/g="; + }) + # polkit-auth-agent: Scope cleanup function for PolkitAgentListener + (fetchpatch { + url = "https://gitlab.gnome.org/World/Phosh/phosh/-/commit/b864653df50bfd8f34766fc6b37a3bf32cfbdfa4.patch"; + sha256 = "sha256-YCw3tGk94NAa6PPTmA1lCJVzzi9GC74BmvtTcvuHPh0="; + }) + ]; + postPatch = '' chmod +x build-aux/post_install.py patchShebangs build-aux/post_install.py @@ -113,7 +127,7 @@ stdenv.mkDerivation rec { passthru = { providedSessions = [ - "sm.puri.Phosh" + "sm.puri.Phosh" ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix new file mode 100644 index 0000000000..0528553b18 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchzip, meson, ninja, pkg-config, wayland-scanner +, libxkbcommon, mesa, pixman, xorg, wayland, gtest +}: + +stdenv.mkDerivation { + pname = "sommelier"; + version = "104.0"; + + src = fetchzip rec { + url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz"; + passthru.rev = "af5434fd9903936a534e1316cbd22361e67949ec"; + stripRoot = false; + sha256 = "LungQqHQorHIKpye2SDBLuMHPt45C1cPYcs9o5Hc3cw="; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; + buildInputs = [ libxkbcommon mesa pixman wayland xorg.libxcb ]; + + doCheck = true; + checkInputs = [ gtest ]; + + postInstall = '' + rm $out/bin/sommelier_test # why does it install the test binary? o_O + ''; + + passthru.updateScript = ./update.py; + + meta = with lib; { + homepage = "https://chromium.googlesource.com/chromiumos/platform2/+/refs/heads/main/vm_tools/sommelier/"; + description = "Nested Wayland compositor with support for X11 forwarding"; + maintainers = with maintainers; [ qyliss ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/update.py b/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/update.py new file mode 100755 index 0000000000..03898c9ccd --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/window-managers/sommelier/update.py @@ -0,0 +1,58 @@ +#! /usr/bin/env nix-shell +#! nix-shell -p common-updater-scripts python3 +#! nix-shell -i python + +import csv +import json +import re +import shlex +import subprocess +from os.path import abspath, dirname, splitext +from urllib.request import urlopen + +# CrOS version numbers look like this: +# [.].. +# +# As far as I can tell, branches are where internal Google +# modifications are added to turn Chromium OS into Chrome OS, and +# branch branches are used for fixes for specific devices. So for +# Chromium OS they will always be 0. This is a best guess, and is not +# documented. +with urlopen('https://chromiumdash.appspot.com/cros/download_serving_builds_csv?deviceCategory=ChromeOS') as resp: + reader = csv.reader(map(bytes.decode, resp)) + header = reader.__next__() + cr_stable_index = header.index('cr_stable') + cros_stable_index = header.index('cros_stable') + chrome_version = [] + platform_version = [] + + for line in reader: + this_chrome_version = list(map(int, line[cr_stable_index].split('.'))) + this_platform_version = list(map(int, line[cros_stable_index].split('.'))) + chrome_version = max(chrome_version, this_chrome_version) + platform_version = max(platform_version, this_platform_version) + +chrome_major_version = chrome_version[0] +chromeos_tip_build = platform_version[0] +release_branch = f'release-R{chrome_major_version}-{chromeos_tip_build}.B' + +# Determine the git revision. +with urlopen(f'https://chromium.googlesource.com/chromiumos/platform2/+/refs/heads/{release_branch}?format=JSON') as resp: + resp.readline() # Remove )]}' header + rev = json.load(resp)['commit'] + +# Determine the patch version by counting the commits that have been +# added to the release branch since it forked off the chromeos branch. +with urlopen(f'https://chromium.googlesource.com/chromiumos/platform2/+log/refs/heads/main..{rev}/vm_tools/sommelier?format=JSON') as resp: + resp.readline() # Remove )]}' header + branch_commits = json.load(resp)['log'] + version = f'{chrome_major_version}.{len(branch_commits)}' + +# Update the version, git revision, and hash in sommelier's default.nix. +subprocess.run(['update-source-version', 'sommelier', f'--rev={rev}', version]) + +# Find the path to sommelier's default.nix, so Cargo.lock can be written +# into the same directory. +argv = ['nix-instantiate', '--eval', '--json', '-A', 'sommelier.meta.position'] +position = json.loads(subprocess.check_output(argv).decode('utf-8')) +filename = re.match(r'[^:]*', position)[0] diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix index 10f67558cf..799c58283d 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix @@ -7,7 +7,6 @@ # beware of null defaults, as the parameters *are* supplied by callPackage by default }: -with lib; stdenv.mkDerivation rec { pname = "weston"; version = "10.0.1"; @@ -34,25 +33,25 @@ stdenv.mkDerivation rec { ]; mesonFlags= [ - "-Dbackend-drm-screencast-vaapi=${boolToString (vaapi != null)}" - "-Dbackend-rdp=${boolToString (freerdp != null)}" - "-Dxwayland=${boolToString (xwayland != null)}" # Default is true! + "-Dbackend-drm-screencast-vaapi=${lib.boolToString (vaapi != null)}" + "-Dbackend-rdp=${lib.boolToString (freerdp != null)}" + "-Dxwayland=${lib.boolToString (xwayland != null)}" # Default is true! "-Dremoting=false" # TODO - "-Dpipewire=${boolToString (pipewire != null)}" - "-Dimage-webp=${boolToString (libwebp != null)}" + "-Dpipewire=${lib.boolToString (pipewire != null)}" + "-Dimage-webp=${lib.boolToString (libwebp != null)}" "-Ddemo-clients=false" "-Dsimple-clients=" "-Dtest-junit-xml=false" # TODO: #"--enable-clients" #"--disable-setuid-install" # prevent install target to chown root weston-launch, which fails - ] ++ optionals (xwayland != null) [ + ] ++ lib.optionals (xwayland != null) [ "-Dxwayland-path=${xwayland.out}/bin/Xwayland" ]; passthru.providedSessions = [ "weston" ]; - meta = { + meta = with lib; { description = "A lightweight and functional Wayland compositor"; longDescription = '' Weston is the reference implementation of a Wayland compositor, as well diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/wrapper.nix b/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/wrapper.nix index 409bf73c89..9167b95ddf 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/xmonad/wrapper.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation { buildCommand = '' install -D ${xmonadEnv}/share/man/man1/xmonad.1.gz $out/share/man/man1/xmonad.1.gz makeWrapper ${xmonadEnv}/bin/xmonad $out/bin/xmonad \ - --set NIX_GHC "${xmonadEnv}/bin/ghc" \ + --set XMONAD_GHC "${xmonadEnv}/bin/ghc" \ --set XMONAD_XMESSAGE "${xmessage}/bin/xmessage" ''; diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix index b5adae03df..cdd07d6b2e 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix @@ -70,6 +70,7 @@ let dynamicLinker = /**/ if sharedLibraryLoader == null then null else if targetPlatform.libc == "musl" then "${sharedLibraryLoader}/lib/ld-musl-*" + else if targetPlatform.libc == "uclibc" then "${sharedLibraryLoader}/lib/ld*-uClibc.so.1" else if (targetPlatform.libc == "bionic" && targetPlatform.is32bit) then "/system/bin/linker" else if (targetPlatform.libc == "bionic" && targetPlatform.is64bit) then "/system/bin/linker64" else if targetPlatform.libc == "nblibc" then "${sharedLibraryLoader}/libexec/ld.elf_so" @@ -164,11 +165,13 @@ stdenv.mkDerivation { wrap ld-solaris ${./ld-solaris-wrapper.sh} '') - # Create a symlink to as (the assembler). + # Create symlinks for rest of the binaries. + '' - if [ -e $ldPath/${targetPrefix}as ]; then - ln -s $ldPath/${targetPrefix}as $out/bin/${targetPrefix}as - fi + for binary in objdump objcopy size strings as ar nm gprof dwp c++filt addr2line ranlib readelf elfedit; do + if [ -e $ldPath/${targetPrefix}''${binary} ]; then + ln -s $ldPath/${targetPrefix}''${binary} $out/bin/${targetPrefix}''${binary} + fi + done '' + (if !useMacosReexportHack then '' wrap ${targetPrefix}ld ${./ld-wrapper.sh} ''${ld:-$ldPath/${targetPrefix}ld} diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index f8bddabbc6..86a7416022 100644 --- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -50,6 +50,11 @@ if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "${NIX_STORE:-}" n+=1; skip "$p2" elif [ "$p" = -dynamic-linker ] && badPath "$p2"; then n+=1; skip "$p2" + elif [ "$p" = -syslibroot ] && [ $p2 == // ]; then + # When gcc is built on darwin --with-build-sysroot=/ + # produces '-syslibroot //' linker flag. It's a no-op, + # which does not introduce impurities. + n+=1; skip "$p2" elif [ "${p:0:1}" = / ] && badPath "$p"; then # We cannot skip this; barf. echo "impure path \`$p' used in link" >&2 diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix index e44519a040..f66ad38f7b 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/default.nix @@ -88,6 +88,8 @@ let /lib32 /usr/lib/i386-linux-gnu /usr/lib32 + /run/opengl-driver/lib + /run/opengl-driver-32/lib EOF ldconfig &> /dev/null ''; diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix index 945b9287ed..925dfc8bfb 100644 --- a/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix +++ b/third_party/nixpkgs/pkgs/build-support/build-fhs-userenv-bubblewrap/env.nix @@ -50,7 +50,8 @@ let ]; ldconfig = writeShellScriptBin "ldconfig" '' - exec ${pkgs.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@" + # due to a glibc bug, 64-bit ldconfig complains about patchelf'd 32-bit libraries, so we're using 32-bit ldconfig + exec ${pkgsi686Linux.glibc.bin}/bin/ldconfig -f /etc/ld.so.conf -C /etc/ld.so.cache "$@" ''; etcProfile = writeText "profile" '' export PS1='${name}-chrootenv:\u@\h:\w\$ ' diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix index d74d0490b4..047cdf6a49 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/default.nix @@ -249,12 +249,19 @@ stdenv.mkDerivation { wrap ${targetPrefix}gdc $wrapper $ccPath/${targetPrefix}gdc '' - + optionalString cc.langFortran or false '' + + optionalString cc.langFortran or false ('' wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77 export named_fc=${targetPrefix}gfortran '' + # Darwin aarch64 fortran compilations seem to fail otherwise, see: + # https://github.com/NixOS/nixpkgs/issues/140041 + + (if (stdenvNoCC.isDarwin && stdenvNoCC.isAarch64) then '' + export fortran_hardening="pic strictoverflow relro bindnow" + '' else '' + export fortran_hardening="pic strictoverflow relro bindnow stackprotector" + '')) + optionalString cc.langJava or false '' wrap ${targetPrefix}gcj $wrapper $ccPath/${targetPrefix}gcj @@ -374,7 +381,6 @@ stdenv.mkDerivation { + optionalString (libcxx.isLLVM or false) ('' echo "-isystem ${lib.getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags - '' + lib.optionalString stdenv.targetPlatform.isLinux '' echo "-lc++abi" >> $out/nix-support/libcxx-ldflags '') @@ -474,7 +480,7 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector fortify" '' + optionalString targetPlatform.isAvr '' hardening_unsupported_flags+=" stackprotector pic" - '' + optionalString (targetPlatform.libc == "newlib") '' + '' + optionalString (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") '' hardening_unsupported_flags+=" stackprotector fortify pie pic" '' + optionalString (targetPlatform.libc == "musl" && targetPlatform.isx86_32) '' hardening_unsupported_flags+=" stackprotector" diff --git a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/fortran-hook.sh b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/fortran-hook.sh index d72f314c01..59e493e183 100644 --- a/third_party/nixpkgs/pkgs/build-support/cc-wrapper/fortran-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/cc-wrapper/fortran-hook.sh @@ -5,7 +5,7 @@ export FC${role_post}=@named_fc@ # If unset, assume the default hardening flags. # These are different for fortran. -: ${NIX_HARDENING_ENABLE="stackprotector pic strictoverflow relro bindnow"} +: ${NIX_HARDENING_ENABLE="@fortran_hardening@"} export NIX_HARDENING_ENABLE unset -v role_post diff --git a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix index 16941a7261..ff3934941c 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix @@ -584,8 +584,8 @@ rec { pkgs.pkgsStatic.busybox ]; fakeRootCommands = '' - mkdir -p ./home/jane - chown 1000 ./home/jane + mkdir -p ./home/alice + chown 1000 ./home/alice ln -s ${pkgs.hello.overrideAttrs (o: { # A unique `hello` to make sure that it isn't included via another mechanism by accident. configureFlags = o.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ]; @@ -607,7 +607,7 @@ rec { ]; # tarball consisting of bash and layered image with different owner of the - # /home/jane directory + # /home/alice directory mergedBashFakeRoot = pkgs.dockerTools.mergeImages [ bash layeredImageWithFakeRootCommands diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 15fe5a2c5d..339eac16b0 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -55,6 +55,8 @@ # The type of build to perform. This is passed to `dotnet` with the `--configuration` flag. Possible values are `Release`, `Debug`, etc. , buildType ? "Release" +# If set to true, builds the application as a self-contained - removing the runtime dependency on dotnet +, selfContainedBuild ? false # The dotnet SDK to use. , dotnet-sdk ? dotnetCorePackages.sdk_6_0 # The dotnet runtime to use. diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh index 5a5ece6d99..c7a6d8c17a 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-build-hook.sh @@ -14,6 +14,12 @@ dotnetBuildHook() { parallelBuildFlag="false" fi + if [ "${selfContainedBuild-}" ]; then + dotnetBuildFlags+=("-p:SelfContained=true") + else + dotnetBuildFlags+=("-p:SelfContained=false") + fi + if [ "${version-}" ]; then versionFlag="-p:Version=${version-}" fi diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh index 675006508f..0a881fae9c 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-fixup-hook.sh @@ -4,8 +4,12 @@ makeWrapperArgs=( ${makeWrapperArgs-} ) # First argument is the executable you want to wrap, # the second is the destination for the wrapper. wrapDotnetProgram() { + if [ ! "${selfContainedBuild-}" ]; then + dotnetRootFlag=("--set" "DOTNET_ROOT" "@dotnetRuntime@") + fi + makeWrapper "$1" "$2" \ - --set "DOTNET_ROOT" "@dotnetRuntime@" \ + "${dotnetRootFlag[@]}" \ --suffix "LD_LIBRARY_PATH" : "@runtimeDeps@" \ "${gappsWrapperArgs[@]}" \ "${makeWrapperArgs[@]}" diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh index 7984c5ebd3..fd88ea32ec 100644 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -6,6 +6,12 @@ dotnetInstallHook() { runHook preInstall + if [ "${selfContainedBuild-}" ]; then + dotnetInstallFlags+=("--self-contained") + else + dotnetInstallFlags+=("--no-self-contained") + fi + for project in ${projectFile[@]}; do env \ dotnet publish "$project" \ @@ -15,7 +21,6 @@ dotnetInstallHook() { --output "$out/lib/${pname}" \ --configuration "@buildType@" \ --no-build \ - --no-self-contained \ ${dotnetInstallFlags[@]} \ ${dotnetFlags[@]} done diff --git a/third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index d3796f88e4..c8db14a4d9 100755 --- a/third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/third_party/nixpkgs/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -24,7 +24,7 @@ while read pkg_spec; do pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")" - if [[ $pkg_src != https://api.nuget.org/* ]]; then + if [[ $pkg_src != https://api.nuget.org/* ]] && [[ ! -d $pkg_src ]]; then pkg_source_url="${nuget_sources_cache[$pkg_src]:=$(curl -n --fail "$pkg_src" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')}" pkg_url="$pkg_source_url${pkg_name,,}/${pkg_version,,}/${pkg_name,,}.${pkg_version,,}.nupkg" echo " (fetchNuGet { pname = \"$pkg_name\"; version = \"$pkg_version\"; sha256 = \"$pkg_sha256\"; url = \"$pkg_url\"; })" >> ${tmpfile} diff --git a/third_party/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix index 094228ad3a..1997c80c8a 100644 --- a/third_party/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/fetchnextcloudapp/default.nix @@ -6,7 +6,7 @@ , patches ? [ ] }: stdenv.mkDerivation { - name = "nc-app-${name}"; + pname = "nc-app-${name}"; inherit version patches; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/build-support/go/module.nix similarity index 80% rename from third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix rename to third_party/nixpkgs/pkgs/build-support/go/module.nix index 7e9a76dbde..8b5185979e 100644 --- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/module.nix @@ -19,17 +19,20 @@ # path to go.mod and go.sum directory , modRoot ? "./" -# vendorSha256 is the sha256 of the vendored dependencies +# vendorHash is the SRI hash of the vendored dependencies # -# if vendorSha256 is null, then we won't fetch any dependencies and +# if vendorHash is null, then we won't fetch any dependencies and # rely on the vendor folder within the source. -, vendorSha256 +, vendorHash ? "_unset" +# same as vendorHash, but outputHashAlgo is hardcoded to sha256 +# so regular base32 sha256 hashes work +, vendorSha256 ? "_unset" # Whether to delete the vendor folder supplied with the source. , deleteVendor ? false # Whether to fetch (go mod download) and proxy the vendor directory. # This is useful if your code depends on c code and go mod tidy does not # include the needed sources to build or if any dependency has case-insensitive -# conflicts which will produce platform dependant `vendorSha256` checksums. +# conflicts which will produce platform dependant `vendorHash` checksums. , proxyVendor ? false # We want parallel builds by default @@ -55,11 +58,23 @@ with builtins; assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`"; +assert (vendorSha256 == "_unset" && vendorHash == "_unset") -> throw "either `vendorHash` or `vendorSha256` is required"; +assert (vendorSha256 != "_unset" && vendorHash != "_unset") -> throw "both `vendorHash` and `vendorSha256` set. only one can be set."; let - args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" ]; + hasAnyVendorHash = (vendorSha256 != null && vendorSha256 != "_unset") || (vendorHash != null && vendorHash != "_unset"); + vendorHashType = + if hasAnyVendorHash then + if vendorSha256 != null && vendorSha256 != "_unset" then + "sha256" + else + "sri" + else + null; - go-modules = if vendorSha256 != null then stdenv.mkDerivation (let modArgs = { + args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" "vendorHash" ]; + + go-modules = if hasAnyVendorHash then stdenv.mkDerivation (let modArgs = { name = "${name}-go-modules"; @@ -98,7 +113,7 @@ let fi '' + '' if [ -d vendor ]; then - echo "vendor folder exists, please set 'vendorSha256 = null;' in your expression" + echo "vendor folder exists, please set 'vendorHash = null;' or 'vendorSha256 = null;' in your expression" exit 10 fi @@ -106,7 +121,10 @@ let mkdir -p "''${GOPATH}/pkg/mod/cache/download" go mod download '' else '' - go mod vendor + if (( "''${NIX_DEBUG:-0}" >= 1 )); then + goModVendorFlags+=(-v) + fi + go mod vendor "''${goModVendorFlags[@]}" ''} mkdir -p vendor @@ -131,9 +149,14 @@ let }; in modArgs // ( { outputHashMode = "recursive"; + } // (if (vendorHashType == "sha256") then { outputHashAlgo = "sha256"; outputHash = vendorSha256; - } + } else { + outputHash = vendorHash; + }) // (lib.optionalAttrs (vendorHashType == "sri" && vendorHash == "") { + outputHashAlgo = "sha256"; + }) ) // overrideModAttrs modArgs) else ""; package = stdenv.mkDerivation (args // { @@ -153,7 +176,7 @@ let export GOPROXY=off export GOSUMDB=off cd "$modRoot" - '' + lib.optionalString (vendorSha256 != null) '' + '' + lib.optionalString hasAnyVendorHash '' ${if proxyVendor then '' export GOPROXY=file://${go-modules} '' else '' @@ -249,6 +272,8 @@ let doCheck = args.doCheck or true; checkPhase = args.checkPhase or '' runHook preCheck + # We do not set trimpath for tests, in case they reference test assets + export GOFLAGS=''${GOFLAGS//-trimpath/} for pkg in $(getGoDirs test); do buildGoDir test "$pkg" @@ -271,18 +296,14 @@ let disallowedReferences = lib.optional (!allowGoReference) go; - passthru = passthru // { inherit go go-modules vendorSha256 ; }; + passthru = passthru // { inherit go go-modules vendorSha256 vendorHash; }; enableParallelBuilding = enableParallelBuilding; meta = { # Add default meta information platforms = go.meta.platforms or lib.platforms.all; - } // meta // { - # add an extra maintainer to every package - maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.kalbasit ]; - }; + } // meta; }); in lib.warnIf (buildFlags != "" || buildFlagsArray != "") diff --git a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix b/third_party/nixpkgs/pkgs/build-support/go/package.nix similarity index 98% rename from third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix rename to third_party/nixpkgs/pkgs/build-support/go/package.nix index 643c1955d2..56c8ceeca1 100644 --- a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/go/package.nix @@ -233,6 +233,8 @@ let doCheck = args.doCheck or false; checkPhase = args.checkPhase or '' runHook preCheck + # We do not set trimpath for tests, in case they reference test assets + export GOFLAGS=''${GOFLAGS//-trimpath/} for pkg in $(getGoDirs test); do buildGoDir test "$pkg" diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng-tool.nix b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng-tool.nix index 654b103678..b1fbee92b3 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng-tool.nix +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng-tool.nix @@ -7,10 +7,11 @@ rustPlatform.buildRustPackage { src = ./make-initrd-ng; cargoLock.lockFile = ./make-initrd-ng/Cargo.lock; - nativeBuildInputs = [ makeWrapper ]; + passthru.updateScript = ./make-initrd-ng/update.sh; - postInstall = '' - wrapProgram $out/bin/make-initrd-ng \ - --prefix PATH : ${lib.makeBinPath [ patchelf glibc binutils ]} - ''; + meta = { + description = "Tool for copying binaries and their dependencies"; + maintainers = with lib.maintainers; [ das_j elvishjerricco k900 lheckemann ]; + license = lib.licenses.mit; + }; } diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix index 5f0a70f8a9..e762464fc4 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix @@ -8,10 +8,12 @@ let # compression type and filename extension. compressorName = fullCommand: builtins.elemAt (builtins.match "([^ ]*/)?([^ ]+).*" fullCommand) 1; in -{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, patchelf, runCommand +{ stdenvNoCC, perl, cpio, ubootTools, lib, pkgsBuildHost, makeInitrdNGTool, binutils, runCommand # Name of the derivation (not of the resulting file!) , name ? "initrd" +, strip ? true + # Program used to compress the cpio archive; use "cat" for no compression. # This can also be a function which takes a package set and returns the path to the compressor, # such as `pkgs: "${pkgs.lzop}/bin/lzop"`. @@ -59,7 +61,7 @@ in # If this isn't guessed, you may want to complete the metadata above and send a PR :) , uInitrdCompression ? _compressorMeta.ubootName or (throw "Unrecognised compressor ${_compressorName}, please specify uInitrdCompression") -}: runCommand name { +}: runCommand name ({ compress = "${_compressorExecutable} ${lib.escapeShellArgs _compressorArgsReal}"; passthru = { compressorExecutableFunction = _compressorFunction; @@ -72,8 +74,10 @@ in passAsFile = ["contents"]; contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${if symlink == null then "" else symlink}") contents + "\n"; - nativeBuildInputs = [makeInitrdNGTool patchelf cpio] ++ lib.optional makeUInitrd ubootTools; -} '' + nativeBuildInputs = [makeInitrdNGTool cpio] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils; + + STRIP = if strip then "${(binutils.nativeDrv or binutils).targetPrefix}strip" else null; +}) '' mkdir ./root make-initrd-ng "$contentsPath" ./root mkdir "$out" diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock index 75e732029b..cce94b3f4c 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock @@ -1,5 +1,97 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "goblin" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91766b1121940d622933a13e20665857648681816089c9bc2075c4b75a6e4f6b" +dependencies = [ + "log", + "plain", + "scroll", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + [[package]] name = "make-initrd-ng" version = "0.1.0" +dependencies = [ + "goblin", +] + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[package]] +name = "proc-macro2" +version = "1.0.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "scroll" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04c565b551bafbef4157586fa379538366e4385d42082f255bfd96e4fe8519da" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml index 9076f6b156..c30eccd9fe 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml @@ -7,3 +7,4 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +goblin = "0.5.0" diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs index 294c570a37..89a7c08fda 100644 --- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs @@ -3,11 +3,13 @@ use std::env; use std::ffi::OsStr; use std::fs; use std::hash::Hash; -use std::io::{BufReader, BufRead, Error, ErrorKind}; +use std::io::{BufRead, BufReader, Error}; use std::os::unix; use std::path::{Component, Path, PathBuf}; use std::process::Command; +use goblin::{elf::Elf, Object}; + struct NonRepeatingQueue { queue: VecDeque, seen: HashSet, @@ -38,42 +40,32 @@ impl NonRepeatingQueue { } } -fn patch_elf, P: AsRef>(mode: S, path: P) -> Result { - let output = Command::new("patchelf") - .arg(&mode) - .arg(&path) - .output()?; - if output.status.success() { - Ok(String::from_utf8(output.stdout).expect("Failed to parse output")) - } else { - Err(Error::new(ErrorKind::Other, format!("failed: patchelf {:?} {:?}", OsStr::new(&mode), OsStr::new(&path)))) - } -} - -fn copy_file + AsRef, S: AsRef + AsRef>( +fn add_dependencies + AsRef>( source: P, - target: S, + elf: Elf, queue: &mut NonRepeatingQueue>, -) -> Result<(), Error> { - fs::copy(&source, &target)?; - - if !Command::new("ldd").arg(&source).output()?.status.success() { - // Not dynamically linked - no need to recurse - return Ok(()); +) { + if let Some(interp) = elf.interpreter { + queue.push_back(Box::from(Path::new(interp))); } - let rpath_string = patch_elf("--print-rpath", &source)?; - let needed_string = patch_elf("--print-needed", &source)?; - // Shared libraries don't have an interpreter - if let Ok(interpreter_string) = patch_elf("--print-interpreter", &source) { - queue.push_back(Box::from(Path::new(&interpreter_string.trim()))); - } + let rpaths = if elf.runpaths.len() > 0 { + elf.runpaths + } else if elf.rpaths.len() > 0 { + elf.rpaths + } else { + vec![] + }; - let rpath = rpath_string.trim().split(":").map(|p| Box::::from(Path::new(p))).collect::>(); + let rpaths_as_path = rpaths + .into_iter() + .flat_map(|p| p.split(":")) + .map(|p| Box::::from(Path::new(p))) + .collect::>(); - for line in needed_string.lines() { + for line in elf.libraries { let mut found = false; - for path in &rpath { + for path in &rpaths_as_path { let lib = path.join(line); if lib.exists() { // No need to recurse. The queue will bring it back round. @@ -85,20 +77,45 @@ fn copy_file + AsRef, S: AsRef + AsRef>( if !found { // glibc makes it tricky to make this an error because // none of the files have a useful rpath. - println!("Warning: Couldn't satisfy dependency {} for {:?}", line, OsStr::new(&source)); + println!( + "Warning: Couldn't satisfy dependency {} for {:?}", + line, + OsStr::new(&source) + ); } } +} - // Make file writable to strip it - let mut permissions = fs::metadata(&target)?.permissions(); - permissions.set_readonly(false); - fs::set_permissions(&target, permissions)?; +fn copy_file + AsRef, S: AsRef + AsRef>( + source: P, + target: S, + queue: &mut NonRepeatingQueue>, +) -> Result<(), Error> { + fs::copy(&source, &target)?; - // Strip further than normal - if !Command::new("strip").arg("--strip-all").arg(OsStr::new(&target)).output()?.status.success() { - println!("{:?} was not successfully stripped.", OsStr::new(&target)); - } + let contents = fs::read(&source)?; + if let Ok(Object::Elf(e)) = Object::parse(&contents) { + add_dependencies(source, e, queue); + + // Make file writable to strip it + let mut permissions = fs::metadata(&target)?.permissions(); + permissions.set_readonly(false); + fs::set_permissions(&target, permissions)?; + + // Strip further than normal + if let Ok(strip) = env::var("STRIP") { + if !Command::new(strip) + .arg("--strip-all") + .arg(OsStr::new(&target)) + .output()? + .status + .success() + { + println!("{:?} was not successfully stripped.", OsStr::new(&target)); + } + } + }; Ok(()) } diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/update.sh b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/update.sh new file mode 100755 index 0000000000..ffc5ad3917 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/update.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p cargo -i bash +cd "$(dirname "$0")" +cargo update diff --git a/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix b/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix index 8f7df3386d..b5eb21e5ba 100644 --- a/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix @@ -27,7 +27,7 @@ else stdenv.mkDerivation rec { outputs = ["out" "hook"]; - libName = "libredirect" + stdenv.targetPlatform.extensions.sharedLibrary; + libName = "libredirect" + stdenv.hostPlatform.extensions.sharedLibrary; buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/build-support/make-pkgconfigitem/default.nix b/third_party/nixpkgs/pkgs/build-support/make-pkgconfigitem/default.nix new file mode 100644 index 0000000000..288ca3810e --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/make-pkgconfigitem/default.nix @@ -0,0 +1,69 @@ +{ lib, writeTextFile, buildPackages }: + +# See https://people.freedesktop.org/~dbn/pkg-config-guide.html#concepts +{ name # The name of the pc file + # keywords + # provide a default description for convenience. it's not important but still required by pkg-config. +, description ? "A pkg-config file for ${name}" +, url ? "" +, version ? "" +, requires ? [ ] +, requiresPrivate ? [ ] +, conflicts ? [ ] +, cflags ? [ ] +, libs ? [ ] +, libsPrivate ? [ ] +, variables ? { } +}: + +let + # only 'out' has to be changed, otherwise it would be replaced by the out of the writeTextFile + placeholderToSubstVar = builtins.replaceStrings [ "${placeholder "out"}" ] [ "@out@" ]; + + replacePlaceholderAndListToString = x: + if builtins.isList x + then placeholderToSubstVar (builtins.concatStringsSep " " x) + else placeholderToSubstVar x; + + keywordsSection = + let + mustBeAList = attr: attrName: lib.throwIfNot (lib.isList attr) "'${attrName}' must be a list" attr; + in + { + "Name" = name; + "Description" = description; + "URL" = url; + "Version" = version; + "Requires" = mustBeAList requires "requires"; + "Requires.private" = mustBeAList requiresPrivate "requiresPrivate"; + "Conflicts" = mustBeAList conflicts "conflicts"; + "Cflags" = mustBeAList cflags "cflags"; + "Libs" = mustBeAList libs "libs"; + "Libs.private" = mustBeAList libsPrivate "libsPrivate"; + }; + + renderVariable = name: value: + lib.optionalString (value != "" && value != [ ]) "${name}=${replacePlaceholderAndListToString value}"; + renderKeyword = name: value: + lib.optionalString (value != "" && value != [ ]) "${name}: ${replacePlaceholderAndListToString value}"; + + renderSomething = renderFunc: attrs: + lib.pipe attrs [ + (lib.mapAttrsToList renderFunc) + (builtins.filter (v: v != "")) + (builtins.concatStringsSep "\n") + (section: ''${section} + '') + ]; + + variablesSectionRendered = renderSomething renderVariable variables; + keywordsSectionRendered = renderSomething renderKeyword keywordsSection; + + content = [ variablesSectionRendered keywordsSectionRendered ]; +in +writeTextFile { + name = "${name}.pc"; + destination = "/lib/pkgconfig/${name}.pc"; + text = builtins.concatStringsSep "\n" content; + checkPhase = ''${buildPackages.pkg-config}/bin/pkg-config --validate "$target"''; +} diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix index b5db1ffa7f..b24398665a 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, mkRustcDepArgs, mkRustcFeatureArgs, rust }: +{ lib, stdenv +, mkRustcDepArgs, mkRustcFeatureArgs, needUnstableCLI +, rust +}: + { crateName, dependencies, crateFeatures, crateRenames, libName, release, libPath, @@ -18,6 +22,8 @@ (mkRustcFeatureArgs crateFeatures) ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--target" (rust.toRustTargetSpec stdenv.hostPlatform) + ] ++ lib.optionals (needUnstableCLI dependencies) [ + "-Z" "unstable-options" ] ++ extraRustcOpts # since rustc 1.42 the "proc_macro" crate is part of the default crate prelude # https://github.com/rust-lang/cargo/commit/4d64eb99a4#diff-7f98585dbf9d30aa100c8318e2c77e79R1021-R1022 diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix index e122871f8f..98030225bc 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-crate/default.nix @@ -46,17 +46,28 @@ let ) else extern; + opts = lib.optionalString (dep.stdlib or false) "noprelude:"; + filename = + if lib.any (x: x == "lib" || x == "rlib") dep.crateType + then "${dep.metadata}.rlib" + else "${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}"; in - (if lib.any (x: x == "lib" || x == "rlib") dep.crateType then - " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}.rlib" - else - " --extern ${name}=${dep.lib}/lib/lib${extern}-${dep.metadata}${stdenv.hostPlatform.extensions.sharedLibrary}") + " --extern ${opts}${name}=${dep.lib}/lib/lib${extern}-${filename}" ) dependencies; # Create feature arguments for rustc. mkRustcFeatureArgs = lib.concatMapStringsSep " " (f: ''--cfg feature=\"${f}\"''); + # Whether we need to use unstable command line flags + # + # Currently just needed for standard library dependencies, which have a + # special "noprelude:" modifier. If in later versions of Rust this is + # stabilized we can account for that here, too, so we don't opt into + # instability unnecessarily. + needUnstableCLI = dependencies: + lib.any (dep: dep.stdlib or false) dependencies; + inherit (import ./log.nix { inherit lib; }) noisily echo_colored; configureCrate = import ./configure-crate.nix { @@ -64,7 +75,7 @@ let }; buildCrate = import ./build-crate.nix { - inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs rust; + inherit lib stdenv mkRustcDepArgs mkRustcFeatureArgs needUnstableCLI rust; }; installCrate = import ./install-crate.nix { inherit stdenv; }; diff --git a/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh b/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh index 7e2599d922..41b313280d 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh +++ b/third_party/nixpkgs/pkgs/build-support/rust/hooks/maturin-build-hook.sh @@ -15,7 +15,8 @@ maturinBuildHook() { "CC_@rustTargetPlatform@=@ccForHost@" \ "CXX_@rustTargetPlatform@=@cxxForHost@" \ maturin build \ - --cargo-extra-args="-j $NIX_BUILD_CORES --frozen" \ + --jobs=$NIX_BUILD_CORES \ + --frozen \ --target @rustTargetPlatformSpec@ \ --manylinux off \ --strip \ diff --git a/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix index 24adcf2cb4..34aaa8c516 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/lib/default.nix @@ -3,12 +3,14 @@ rec { # https://doc.rust-lang.org/reference/conditional-compilation.html#target_arch toTargetArch = platform: - if platform.isAarch32 then "arm" + /**/ if platform ? rustc.platform then platform.rustc.platform.arch + else if platform.isAarch32 then "arm" else platform.parsed.cpu.name; # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os toTargetOs = platform: - if platform.isDarwin then "macos" + /**/ if platform ? rustc.platform then platform.rustc.platform.os or "none" + else if platform.isDarwin then "macos" else platform.parsed.kernel.name; # Returns the name of the rust target, even if it is custom. Adjustments are @@ -31,7 +33,7 @@ rec { # Returns the name of the rust target if it is standard, or the json file # containing the custom target spec. toRustTargetSpec = platform: - if (platform.rustc or {}) ? platform + if platform ? rustc.platform then builtins.toFile (toRustTarget platform + ".json") (builtins.toJSON platform.rustc.platform) else toRustTarget platform; } diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/copy-pkgconfig-items.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/copy-pkgconfig-items.sh new file mode 100644 index 0000000000..8c04ec9b5f --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/copy-pkgconfig-items.sh @@ -0,0 +1,46 @@ +# shellcheck shell=bash + +# Setup hook that installs specified pkgconfig items. +# +# Example usage in a derivation: +# +# { …, makePkgconfigItem, copyPkgconfigItems, … }: +# +# let pkgconfigItem = makePkgconfigItem { … }; in +# stdenv.mkDerivation { +# … +# nativeBuildInputs = [ copyPkgconfigItems ]; +# +# pkgconfigItems = [ pkgconfigItem ]; +# … +# } +# +# This hook will copy files which are either given by full path +# or all '*.pc' files placed inside the 'lib/pkgconfig' +# folder of each `pkgconfigItems` argument. + +postInstallHooks+=(copyPkgconfigItems) + +copyPkgconfigItems() { + if [ "${dontCopyPkgconfigItems-}" = 1 ]; then return; fi + + if [ -z "$pkgconfigItems" ]; then + return + fi + + pkgconfigdir="${!outputDev}/lib/pkgconfig" + for pkgconfigItem in $pkgconfigItems; do + if [[ -f "$pkgconfigItem" ]]; then + substituteAllInPlace "$pkgconfigItem" + echo "Copying '$pkgconfigItem' into '${pkgconfigdir}'" + install -D -m 444 -t "${pkgconfigdir}" "$pkgconfigItem" + substituteAllInPlace "${pkgconfigdir}"/* + else + for f in "$pkgconfigItem"/lib/pkgconfig/*.pc; do + echo "Copying '$f' into '${pkgconfigdir}'" + install -D -m 444 -t "${pkgconfigdir}" "$f" + substituteAllInPlace "${pkgconfigdir}"/* + done + fi + done +} diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh index 1a23e6b198..593a5f6486 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh @@ -1,6 +1,7 @@ export NIX_SET_BUILD_ID=1 export NIX_LDFLAGS+=" --compress-debug-sections=zlib" export NIX_CFLAGS_COMPILE+=" -ggdb -Wa,--compress-debug-sections" +export RUSTFLAGS+=" -g" dontStrip=1 fixupOutputHooks+=(_separateDebugInfo) diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh index 2d8e66a89f..80bc064ced 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/strip.sh @@ -7,38 +7,39 @@ _doStrip() { # to $out anyways---if it does, that's a bigger problem that a lack of # stripping will help catch. local -ra flags=(dontStripHost dontStripTarget) - local -ra stripCmds=(STRIP TARGET_STRIP) + local -ra debugDirs=(stripDebugList stripDebugListTarget) + local -ra allDirs=(stripAllList stripAllListTarget) + local -ra stripCmds=(STRIP STRIP_FOR_TARGET) + local -ra ranlibCmds=(RANLIB RANLIB_FOR_TARGET) - # Optimization - if [[ "${STRIP-}" == "${TARGET_STRIP-}" ]]; then - dontStripTarget+=1 - fi + # Strip only host paths by default. Leave targets as is. + stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} + stripDebugListTarget=${stripDebugListTarget:-} + stripAllList=${stripAllList:-} + stripAllListTarget=${stripAllListTarget:-} local i for i in ${!stripCmds[@]}; do local -n flag="${flags[$i]}" + local -n debugDirList="${debugDirs[$i]}" + local -n allDirList="${allDirs[$i]}" local -n stripCmd="${stripCmds[$i]}" + local -n ranlibCmd="${ranlibCmds[$i]}" # `dontStrip` disables them all if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null then continue; fi - stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin} - if [ -n "$stripDebugList" ]; then - stripDirs "$stripCmd" "$stripDebugList" "${stripDebugFlags:--S}" - fi - - stripAllList=${stripAllList:-} - if [ -n "$stripAllList" ]; then - stripDirs "$stripCmd" "$stripAllList" "${stripAllFlags:--s}" - fi + stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags:--S}" + stripDirs "$stripCmd" "$ranlibCmd" "$allDirList" "${stripAllFlags:--s}" done } stripDirs() { local cmd="$1" - local dirs="$2" - local stripFlags="$3" + local ranlibCmd="$2" + local dirs="$3" + local stripFlags="$4" local dirsNew= local d @@ -50,8 +51,13 @@ stripDirs() { dirs=${dirsNew} if [ -n "${dirs}" ]; then - header "stripping (with command $cmd and flags $stripFlags) in$dirs" + echo "stripping (with command $cmd and flags $stripFlags) in$dirs" find $dirs -type f -exec $cmd $stripFlags '{}' \; 2>/dev/null - stopNest + # 'strip' does not normally preserve archive index in .a files. + # This usually causes linking failures against static libs like: + # ld: ...-i686-w64-mingw32-stage-final-gcc-13.0.0-lib/i686-w64-mingw32/lib/libstdc++.dll.a: + # error adding symbols: archive has no index; run ranlib to add one + # Restore the index by running 'ranlib'. + find $dirs -name '*.a' -type f -exec $ranlibCmd '{}' \; 2>/dev/null fi } diff --git a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix index cfc16e932c..f839ce0c6d 100644 --- a/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix +++ b/third_party/nixpkgs/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scheme-manpages"; - version = "unstable-2022-05-14"; + version = "unstable-2022-07-04"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "e4d8e389312a865e350ef88f3e9d69be290705c7"; - sha256 = "sha256-bYg8XSycbQIaZDsE0G5Xy0bd2JNWHwYEnyL6ThN7XS4="; + rev = "0b95de112857b185b83141ac9324fb0e786c56df"; + sha256 = "sha256-HWkZJd4t7gsbbSGiQ92Lav9EMBPMLXmXFT6HVfyFLSI="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/data/fonts/cardo/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cardo/default.nix new file mode 100644 index 0000000000..21763365de --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/cardo/default.nix @@ -0,0 +1,37 @@ +{ fetchzip, lib }: + +let + version = "1.04"; +in +fetchzip { + name = "cardo-${version}"; + + url = "http://scholarsfonts.net/cardo104.zip"; + + hash = "sha256-eBK6+VQpreWA7jIneNXOcKFcT+cJzhoQ9XXyq93SZ8M="; + stripRoot = false; + + postFetch = '' + mkdir -p $out/share/fonts/truetype + mv $out/*.ttf $out/share/fonts/truetype + rm $out/*.pdf + ''; + + meta = with lib; { + description = "Cardo is a large Unicode font specifically designed for the needs of classicists, Biblical scholars, medievalists, and linguists"; + longDescription = '' + Cardo is a large Unicode font specifically designed for the needs of + classicists, Biblical scholars, medievalists, and linguists. It also + works well for general typesetting in situations where a high-quality Old + Style font is appropriate. Its large character set supports many modern + languages as well as those needed by scholars. Cardo also contains + features that are required for high-quality typography such as ligatures, + text figures (also known as old style numerals), true small capitals and + a variety of punctuation and space characters. + ''; + homepage = "http://scholarsfonts.net/cardofnt.html"; + license = licenses.ofl; + maintainers = with lib.maintainers; [ kmein ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix index 4b4772699c..db6ac71582 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/corefonts/default.nix @@ -1,29 +1,26 @@ { lib, stdenv, fetchurl, cabextract }: let - fonts = [ - {name = "andale"; sha256 = "0w7927hlwayqf3vvanf8f3qp2g1i404jzqvhp1z3mp0sjm1gw905";} - {name = "arial"; sha256 = "1xkqyivbyb3z9dcalzidf8m4npzfpls2g0kldyn8g73f2i6plac5";} - {name = "arialb"; sha256 = "1a60zqrg63kjnykh5hz7dbpzvx7lyivn3vbrp7jyv9d1nvzz09d4";} - {name = "comic"; sha256 = "0ki0rljjc1pxkbsxg515fwx15yc95bdyaksa3pjd89nyxzzg6vcw";} - {name = "courie"; sha256 = "111k3waxki9yyxpjwl2qrdkswvsd2dmvhbjmmrwyipam2s31sldv";} - {name = "georgi"; sha256 = "0083jcpd837j2c06kp1q8glfjn9k7z6vg3wi137savk0lv6psb1c";} - {name = "impact"; sha256 = "1yyc5z7zmm3s418hmrkmc8znc55afsrz5dgxblpn9n81fhxyyqb0";} - {name = "times"; sha256 = "1aq7z3l46vwgqljvq9zfgkii6aivy00z1529qbjkspggqrg5jmnv";} - {name = "trebuc"; sha256 = "1jfsgz80pvyqvpfpaiz5pd8zwlcn67rg2jgynjwf22sip2dhssas";} - {name = "webdin"; sha256 = "0nnp2znmnmx87ijq9zma0vl0hd46npx38p0cc6lgp00hpid5nnb4";} - {name = "verdan"; sha256 = "15mdbbfqbyp25a6ynik3rck3m3mg44plwrj79rwncc9nbqjn3jy1";} - {name = "wd97vwr"; sha256 = "1lmkh3zb6xv47k0z2mcwk3vk8jff9m845c9igxm14bbvs6k2c4gn";} + { name = "andale"; sha256 = "0w7927hlwayqf3vvanf8f3qp2g1i404jzqvhp1z3mp0sjm1gw905"; } + { name = "arial"; sha256 = "1xkqyivbyb3z9dcalzidf8m4npzfpls2g0kldyn8g73f2i6plac5"; } + { name = "arialb"; sha256 = "1a60zqrg63kjnykh5hz7dbpzvx7lyivn3vbrp7jyv9d1nvzz09d4"; } + { name = "comic"; sha256 = "0ki0rljjc1pxkbsxg515fwx15yc95bdyaksa3pjd89nyxzzg6vcw"; } + { name = "courie"; sha256 = "111k3waxki9yyxpjwl2qrdkswvsd2dmvhbjmmrwyipam2s31sldv"; } + { name = "georgi"; sha256 = "0083jcpd837j2c06kp1q8glfjn9k7z6vg3wi137savk0lv6psb1c"; } + { name = "impact"; sha256 = "1yyc5z7zmm3s418hmrkmc8znc55afsrz5dgxblpn9n81fhxyyqb0"; } + { name = "times"; sha256 = "1aq7z3l46vwgqljvq9zfgkii6aivy00z1529qbjkspggqrg5jmnv"; } + { name = "trebuc"; sha256 = "1jfsgz80pvyqvpfpaiz5pd8zwlcn67rg2jgynjwf22sip2dhssas"; } + { name = "webdin"; sha256 = "0nnp2znmnmx87ijq9zma0vl0hd46npx38p0cc6lgp00hpid5nnb4"; } + { name = "verdan"; sha256 = "15mdbbfqbyp25a6ynik3rck3m3mg44plwrj79rwncc9nbqjn3jy1"; } + { name = "wd97vwr"; sha256 = "1lmkh3zb6xv47k0z2mcwk3vk8jff9m845c9igxm14bbvs6k2c4gn"; } ]; eula = fetchurl { url = "http://corefonts.sourceforge.net/eula.htm"; sha256 = "1aqbcnl032g2hd7iy56cs022g47scb0jxxp3mm206x1yqc90vs1c"; }; - in - stdenv.mkDerivation { pname = "corefonts"; version = "1"; @@ -33,22 +30,53 @@ stdenv.mkDerivation { inherit sha256; }) fonts; - nativeBuildInputs = [cabextract]; + nativeBuildInputs = [ cabextract ]; buildCommand = '' for i in $exes; do - cabextract --lowercase $i + cabextract --lowercase $i done - cabextract --lowercase viewer1.cab + # rename to more standard names + mv andalemo.ttf Andale_Mono.ttf + mv ariblk.ttf Arial_Black.ttf + mv arial.ttf Arial.ttf + mv arialbd.ttf Arial_Bold.ttf + mv arialbi.ttf Arial_Bold_Italic.ttf + mv ariali.ttf Arial_Italic.ttf + mv comic.ttf Comic_Sans_MS.ttf + mv comicbd.ttf Comic_Sans_MS_Bold.ttf + mv cour.ttf Courier_New.ttf + mv courbd.ttf Courier_New_Bold.ttf + mv couri.ttf Courier_New_Italic.ttf + mv courbi.ttf Courier_New_Bold_Italic.ttf + mv georgia.ttf Georgia.ttf + mv georgiab.ttf Georgia_Bold.ttf + mv georgiai.ttf Georgia_Italic.ttf + mv georgiaz.ttf Georgia_Bold_Italic.ttf + mv impact.ttf Impact.ttf + mv tahoma.ttf Tahoma.ttf + mv times.ttf Times_New_Roman.ttf + mv timesbd.ttf Times_New_Roman_Bold.ttf + mv timesbi.ttf Times_New_Roman_Bold_Italic.ttf + mv timesi.ttf Times_New_Roman_Italic.ttf + mv trebuc.ttf Trebuchet_MS.ttf + mv trebucbd.ttf Trebuchet_MS_Bold.ttf + mv trebucit.ttf Trebuchet_MS_Italic.ttf + mv trebucbi.ttf Trebuchet_MS_Italic.ttf + mv verdana.ttf Verdana.ttf + mv verdanab.ttf Verdana_Bold.ttf + mv verdanai.ttf Verdana_Italic.ttf + mv verdanaz.ttf Verdana_Bold_Italic.ttf + mv webdings.ttf Webdings.ttf + install -m444 -Dt $out/share/fonts/truetype *.ttf # Also put the EULA there to be on the safe side. cp ${eula} $out/share/fonts/truetype/eula.html - # Set up no-op font configs to override any aliases set up by - # other packages. + # Set up no-op font configs to override any aliases set up by other packages. mkdir -p $out/etc/fonts/conf.d for name in Andale-Mono Arial-Black Arial Comic-Sans-MS \ Courier-New Georgia Impact Times-New-Roman \ @@ -58,10 +86,6 @@ stdenv.mkDerivation { done ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "089d2m9bvaacj36qdq77pcazji0sbbr796shic3k52cpxkjnzbwh"; - meta = with lib; { homepage = "http://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix index 8bdbc2d4c4..cb9d5e73ed 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -1,17 +1,12 @@ { lib, fetchurl } : let - major = "3"; - minor = "00"; - version = "${major}.${minor}"; + version = "3.00"; in fetchurl rec { name = "fixedsys-excelsior-${version}"; - urls = [ - "http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf" - "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf" - "http://tarballs.nixos.org/sha256/6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d" - ]; + url = "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf"; + downloadToTemp = true; recursiveHash = true; postFetch = '' @@ -21,8 +16,8 @@ in fetchurl rec { sha256 = "32d6f07f1ff08c764357f8478892b2ba5ade23427af99759f34a0ba24bcd2e37"; meta = { - description = "Pan-unicode version of Fixedsys, a classic DOS font"; homepage = "http://www.fixedsysexcelsior.com/"; + description = "Pan-unicode version of Fixedsys, a classic DOS font"; platforms = lib.platforms.all; license = lib.licenses.publicDomain; maintainers = [ lib.maintainers.ninjatrappeur ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index f180e5b4ff..a52446e499 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "15.6.0"; + version = "15.6.1"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy-private-build-plans.toml b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy-private-build-plans.toml deleted file mode 100644 index 1affc3a8c8..0000000000 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy-private-build-plans.toml +++ /dev/null @@ -1,507 +0,0 @@ -# The file below is copy/pasted from -# https://raw.githubusercontent.com/protesilaos/iosevka-comfy/0.2.1/private-build-plans.toml. It -# seems like ofborg will prevent me from using fetchurl to download -# this file automatically. -[buildPlans.iosevka-comfy] # is your plan name -family = "Iosevka Comfy" # Font menu family name -spacing = "normal" # Optional; Values: `normal`, `quasi-proportional`, `quasi-proportional-extension-only`, `term`, `fontconfig-mono`, or `fixed` -serifs = "sans" # Optional; Values: `sans` or `slab` - -################################################################################################### -# Configure variants - -# # Optional; Whether to inherit a `ss##` variant -# [buildPlans.iosevka-comfy.variants] -# inherits = "ss01" - -# Optional; Configure single character's variant -[buildPlans.iosevka-comfy.variants.design] -cv01 = 1 # A cap straight -cv02 = 1 # B cap straight -cv03 = 1 # C cap serifless -cv04 = 6 # D cap curly with top and bottom serif (without serifs TODO reads like TOOO at small point sizes) -cv05 = 1 # E cap serifless -cv06 = 1 # F cap serifless -cv07 = 4 # G cap toothed -cv08 = 1 # H cap serifless -cv09 = 1 # I cap long serifs -cv10 = 2 # J cap serified -cv11 = 2 # K cap curly -cv12 = 1 # L cap serifless -cv13 = 3 # M cap short middle leg slanted sides -cv14 = 1 # N cap symmetric -cv15 = 1 # P cap straight -cv16 = 4 # Q cap crossing tail -cv17 = 1 # R cap straight -cv18 = 1 # S cap serifless -cv19 = 1 # T cap serifless -cv20 = 3 # U cap serifless -cv21 = 1 # V cap straight -cv22 = 1 # W straight -cv23 = 1 # X cap straight -cv24 = 1 # Y cap straight -cv25 = 1 # Z cap straight -cv26 = 10 # a single storey earless tailed bottom -cv27 = 1 # b toothed -cv28 = 1 # c serifless -cv29 = 1 # d toothed -cv33 = 1 # h straight -cv34 = 10 # i serified flat tailed -cv35 = 6 # j flat hook serified -cv37 = 10 # l serified flat tailed -cv42 = 9 # r compact -cv43 = 1 # s serifless -cv44 = 2 # t flat hook -cv45 = 4 # u tailed -cv49 = 6 # y cursive flat terminal hook -cv53 = 1 # Λ, Δ lambda and delta cap straight -cv54 = 2 # α alpha straight tailed -VXAA = 1 # δ delta rounded top -cv55 = 1 # Γ gamma cap straight -cv56 = 6 # ι iota serified flat tailed -cv57 = 2 # λ lambda top tailed -VXAC = 1 # μ me tailless -VXAB = 2 # ξ xe flat top -cv71 = 13 # 0 oval dashed forward slash -cv74 = 2 # 3 arched -cv76 = 2 # 5 open contour -cv78 = 1 # 7 straight -cv79 = 3 # 8 two asymmetric circles -cv81 = 2 # ~ tilde low -cv82 = 2 # * asterisk five-pointed low -cv83 = 1 # _ underscore right below baseline -cv85 = 1 # ^ uptick high -cv86 = 1 # ( parentheses normal slope -cv87 = 2 # { braces curly -cv88 = 1 # # column straight -cv90 = 4 # @ three-fold, tall height -cv91 = 2 # $ dollar strike through -cv92 = 2 # ¢ cent strike through -cv93 = 1 # % percent dots -cv94 = 1 # | bar natural slope -cv95 = 2 # ≥ equal-or-{higher,lower} slanted -cv96 = 1 # ' single quote straight -cv97 = 1 # ` grave/backtick straight -cv98 = 1 # ? smooth -cv99 = 2 # .:; square punctuation marks -VXDD = 2 # ijäöü square diacretics - -# Optional; Configure single character's variant for Upright and Oblique; Overrides [design] -[buildPlans.iosevka-comfy.variants.upright] -cv30 = 1 # e straight -cv31 = 16 # f serifless bottom flat top crossbar at x height -cv32 = 9 # g single storey flat hook earless cornered top -cv36 = 1 # k straight -cv38 = 6 # m earless double arch short middle leg -cv39 = 3 # n earless straight -cv40 = 2 # p earless -cv41 = 2 # q earless -cv46 = 1 # v straight -cv47 = 1 # w straight -cv48 = 1 # x straight -cv50 = 1 # z straight -cv72 = 3 # 1 serified with base -cv73 = 1 # 2 straight -cv75 = 3 # 4 semi-open contour -cv77 = 3 # 6 straight -cv80 = 3 # 9 straight -cv89 = 2 # & et open top (ampersand) - -# Optional; Configure single character's variant for Italic only; Overrides [design] -[buildPlans.iosevka-comfy.variants.italic] -cv30 = 2 # e curly -cv31 = 14 # f extended flat top bottom hook -cv32 = 7 # g single storey flat hook -cv36 = 2 # k curly -cv38 = 2 # m straight middle shortleg -cv39 = 1 # n straight -cv40 = 1 # p straight -cv41 = 1 # q straight -cv46 = 2 # v curly -cv47 = 2 # w curly short middle top -cv48 = 2 # x curly -cv50 = 4 # z curly -cv72 = 2 # 1 serified no base -cv73 = 2 # 2 curly -cv75 = 1 # 4 closed contour crossing -cv77 = 1 # 6 closed contour -cv80 = 1 # 9 closed contour -cv89 = 4 # & et open top toothed (ampersand) - -# End variant section -################################################################################################### - -################################################################################################### -# Override default building weights -# When buildPlans..weights is absent, all weights would built and mapped to -# default values. -# IMPORTANT : Currently "menu" and "css" property only support numbers between 0 and 1000. -# and "shape" properly only supports number between 100 and 900 (inclusive). -# If you decide to use custom weights you have to define all the weights you -# plan to use otherwise they will not be built. -[buildPlans.iosevka-comfy.weights.light] -shape = 300 -menu = 300 -css = 300 - -[buildPlans.iosevka-comfy.weights.semilight] -shape = 350 -menu = 350 -css = 350 - -[buildPlans.iosevka-comfy.weights.regular] -shape = 400 -menu = 400 -css = 400 - -[buildPlans.iosevka-comfy.weights.bold] -shape = 700 -menu = 700 -css = 700 - -[buildPlans.iosevka-comfy.weights.extrabold] -shape = 800 -menu = 800 -css = 800 - -# End weight section -################################################################################################### - -################################################################################################### -# Override default building slope sets -# When this section is absent, all slopes would be built. - -[buildPlans.iosevka-comfy.slopes.upright] -angle = 0 # Angle in degrees. Valid range [0, 15] -shape = "upright" # Slope grade used for shape selection. `upright` | `oblique` | `italic` -menu = "upright" # Slope grade used for naming. `upright` | `oblique` | `italic` -css = "normal" # Slope grade used for webfont CSS. `normal` | `oblique` | `italic` - -[buildPlans.iosevka-comfy.slopes.italic] -angle = 9.4 -shape = "italic" -menu = "italic" -css = "italic" - -# End slope section -################################################################################################### - -################################################################################################### -# Override default building widths -# When buildPlans..widths is absent, all widths would built and mapped to -# default values. -# IMPORTANT : Currently "shape" property only supports numbers between 434 and 664 (inclusive), -# while "menu" only supports integers between 1 and 9 (inclusive). -# The "shape" parameter specifies the unit width, measured in 1/1000 em. The glyphs' -# width are equal to, or a simple multiple of the unit width. -# If you decide to use custom widths you have to define all the widths you plan to use, -# otherwise they will not be built. - -# [buildPlans.iosevka-comfy.widths.condensed] -# shape = 485 -# menu = 3 -# css = "condensed" - -[buildPlans.iosevka-comfy.widths.normal] -shape = 525 # Unit Width, measured in 1/1000 em. -menu = 5 # Width grade for the font's names. -css = "normal" # "font-stretch' property of webfont CSS. - -# [buildPlans.iosevka-comfy.widths.expanded] -# shape = 600 -# menu = 7 -# css = "expanded" - -# End width section -################################################################################################### - -################################################################################################### -# Metric overrides -# Certain metrics like line height (leading) could be overridden in your build plan file. -# Edit the values to change the metrics. Remove this section when overriding is not needed. - -[buildPlans.iosevka-comfy.metric-override] -leading = 1100 - -# End metric override section -################################################################################################### - - -# Iosevka Comfy variants -# ====================== -# Same glyph overrides and metrics, except for the spacing. - - -# Fixed spacing (no ligatures) -# ---------------------------- -[buildPlans.iosevka-comfy-fixed] -family = "Iosevka Comfy Fixed" -spacing = "fixed" -serifs = "sans" - -# It seems we can inherit variants, but not weights, slopes, widths, -# metric-override... -[buildPlans.iosevka-comfy-fixed.variants] -inherits = "buildPlans.iosevka-comfy" - -[buildPlans.iosevka-comfy-fixed.weights.light] -shape = 300 -menu = 300 -css = 300 - -[buildPlans.iosevka-comfy-fixed.weights.semilight] -shape = 350 -menu = 350 -css = 350 - -[buildPlans.iosevka-comfy-fixed.weights.regular] -shape = 400 -menu = 400 -css = 400 - -[buildPlans.iosevka-comfy-fixed.weights.bold] -shape = 700 -menu = 700 -css = 700 - -[buildPlans.iosevka-comfy-fixed.weights.extrabold] -shape = 800 -menu = 800 -css = 800 - -[buildPlans.iosevka-comfy-fixed.slopes.upright] -angle = 0 -shape = "upright" -menu = "upright" -css = "normal" - -[buildPlans.iosevka-comfy-fixed.slopes.italic] -angle = 9.4 -shape = "italic" -menu = "italic" -css = "italic" - -[buildPlans.iosevka-comfy-fixed.widths.normal] -shape = 525 -menu = 5 -css = "normal" - -[buildPlans.iosevka-comfy-fixed.metric-override] -leading = 1100 - - - -# Duo spacing (quasi-proportional) -# -------------------------------- -[buildPlans.iosevka-comfy-duo] -family = "Iosevka Comfy Duo" -spacing = "quasi-proportional" -serifs = "sans" - -# It seems we can inherit variants, but not weights, slopes, widths, -# metric-override... -[buildPlans.iosevka-comfy-duo.variants] -inherits = "buildPlans.iosevka-comfy" - -# The '0' has a forward slash that cuts diagonally through the middle of -# the circle, connecting the bottom left part to the top right of the -# oval shape. Whereas the narrow variants have a dashed forward slash -# which does not connect the two sides as it is positioned inside the -# oval shape. -[buildPlans.iosevka-comfy-duo.variants.design] -cv71 = 9 # 0 oval forward slash - -# The 'm' character has three legs of equal length, insetad of a shorter -# middle leg. The short middle leg in the narrow variants is necessary -# for legibility, especially at small point sizes (otherwise the -# character's legs visually blend into what appears to be a solid -# block). -[buildPlans.iosevka-comfy-duo.variants.upright] -cv38 = 5 # m earless normal middle leg - -[buildPlans.iosevka-comfy-duo.variants.italic] -cv38 = 1 # m straight normal middle leg - -[buildPlans.iosevka-comfy-duo.weights.light] -shape = 300 -menu = 300 -css = 300 - -[buildPlans.iosevka-comfy-duo.weights.semilight] -shape = 350 -menu = 350 -css = 350 - -[buildPlans.iosevka-comfy-duo.weights.regular] -shape = 400 -menu = 400 -css = 400 - -[buildPlans.iosevka-comfy-duo.weights.bold] -shape = 700 -menu = 700 -css = 700 - -[buildPlans.iosevka-comfy-duo.weights.extrabold] -shape = 800 -menu = 800 -css = 800 - -[buildPlans.iosevka-comfy-duo.slopes.upright] -angle = 0 -shape = "upright" -menu = "upright" -css = "normal" - -[buildPlans.iosevka-comfy-duo.slopes.italic] -angle = 9.4 -shape = "italic" -menu = "italic" -css = "italic" - -[buildPlans.iosevka-comfy-duo.widths.normal] -shape = 525 -menu = 5 -css = "normal" - -[buildPlans.iosevka-comfy-duo.metric-override] -leading = 1100 - - - -# Like iosevka-comfy but expanded -# ------------------------------- -[buildPlans.iosevka-comfy-wide] -family = "Iosevka Comfy Wide" -spacing = "normal" -serifs = "sans" - -# It seems we can inherit variants, but not weights, slopes, widths, -# metric-override... -[buildPlans.iosevka-comfy-wide.variants] -inherits = "buildPlans.iosevka-comfy" - -# The '0' has a forward slash that cuts diagonally through the middle of -# the circle, connecting the bottom left part to the top right of the -# oval shape. Whereas the narrow variants have a dashed forward slash -# which does not connect the two sides as it is positioned inside the -# oval shape. -[buildPlans.iosevka-comfy-wide.variants.design] -cv71 = 9 # 0 oval forward slash - -# The 'm' character has three legs of equal length, insetad of a shorter -# middle leg. The short middle leg in the narrow variants is necessary -# for legibility, especially at small point sizes (otherwise the -# character's legs visually blend into what appears to be a solid -# block). -[buildPlans.iosevka-comfy-wide.variants.upright] -cv38 = 5 # m earless normal middle leg - -[buildPlans.iosevka-comfy-wide.variants.italic] -cv38 = 1 # m straight normal middle leg - -[buildPlans.iosevka-comfy-wide.weights.light] -shape = 300 -menu = 300 -css = 300 - -[buildPlans.iosevka-comfy-wide.weights.semilight] -shape = 350 -menu = 350 -css = 350 - -[buildPlans.iosevka-comfy-wide.weights.regular] -shape = 400 -menu = 400 -css = 400 - -[buildPlans.iosevka-comfy-wide.weights.bold] -shape = 700 -menu = 700 -css = 700 - -[buildPlans.iosevka-comfy-wide.weights.extrabold] -shape = 800 -menu = 800 -css = 800 - -[buildPlans.iosevka-comfy-wide.slopes.upright] -angle = 0 -shape = "upright" -menu = "upright" -css = "normal" - -[buildPlans.iosevka-comfy-wide.slopes.italic] -angle = 9.4 -shape = "italic" -menu = "italic" -css = "italic" - -# For the default width, check buildPlans.iosevka-comfy.widths.normal -[buildPlans.iosevka-comfy-wide.widths.normal] -shape = 625 -menu = 7 -css = "normal" - -[buildPlans.iosevka-comfy-wide.metric-override] -leading = 1100 - - - -# Like iosevka-comfy-wide but fixed monospace (no ligatures) -# ---------------------------------------------------------- -[buildPlans.iosevka-comfy-wide-fixed] -family = "Iosevka Comfy Wide Fixed" -spacing = "fixed" -serifs = "sans" - -# It seems we can inherit variants, but not weights, slopes, widths, -# metric-override... -[buildPlans.iosevka-comfy-wide-fixed.variants] -inherits = "buildPlans.iosevka-comfy-wide" - -[buildPlans.iosevka-comfy-wide-fixed.weights.light] -shape = 300 -menu = 300 -css = 300 - -[buildPlans.iosevka-comfy-wide-fixed.weights.semilight] -shape = 350 -menu = 350 -css = 350 - -[buildPlans.iosevka-comfy-wide-fixed.weights.regular] -shape = 400 -menu = 400 -css = 400 - -[buildPlans.iosevka-comfy-wide-fixed.weights.bold] -shape = 700 -menu = 700 -css = 700 - -[buildPlans.iosevka-comfy-wide-fixed.weights.extrabold] -shape = 800 -menu = 800 -css = 800 - -[buildPlans.iosevka-comfy-wide-fixed.slopes.upright] -angle = 0 -shape = "upright" -menu = "upright" -css = "normal" - -[buildPlans.iosevka-comfy-wide-fixed.slopes.italic] -angle = 9.4 -shape = "italic" -menu = "italic" -css = "italic" - -# For the default width, check buildPlans.iosevka-comfy.widths.normal -[buildPlans.iosevka-comfy-wide-fixed.widths.normal] -shape = 625 -menu = 7 -css = "normal" - -[buildPlans.iosevka-comfy-wide-fixed.metric-override] -leading = 1100 diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix index 3e42151857..4921017cf3 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix @@ -1,14 +1,17 @@ -{stdenv, lib, nodejs, nodePackages, remarshal, ttfautohint-nox, fetchurl}: +{ callPackage, lib, fetchFromGitHub }: let sets = [ "comfy" "comfy-fixed" "comfy-duo" "comfy-wide" "comfy-wide-fixed" ]; - privateBuildPlan = builtins.readFile ./comfy-private-build-plans.toml; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "protesilaos"; + repo = "iosevka-comfy"; + rev = version; + sha256 = "sha256-SMy3Kqve65ZU13lf1vZQR61mH7gcl1DvIZt3yD6tIf4="; + }; + privateBuildPlan = src.outPath + "/private-build-plans.toml"; overrideAttrs = (attrs: { - version = "0.2.1"; - - passthru = { - updateScript = ./update-comfy.sh; - }; + inherit version; meta = with lib; { homepage = "https://github.com/protesilaos/iosevka-comfy"; @@ -22,8 +25,8 @@ let maintainers = [ maintainers.DamienCassou ]; }; }); - makeIosevkaFont = set: (import ./default.nix { - inherit stdenv lib nodejs nodePackages remarshal ttfautohint-nox set privateBuildPlan; + makeIosevkaFont = set: (callPackage ./. { + inherit set privateBuildPlan; }).overrideAttrs overrideAttrs; in builtins.listToAttrs (builtins.map (set: {name=set; value=makeIosevkaFont set;}) sets) diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index c145aad8d7..b4f64c59d8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -80,16 +80,23 @@ stdenv.mkDerivation rec { else privateBuildPlan; inherit extraParameters; - passAsFile = [ "buildPlan" "extraParameters" ]; + passAsFile = [ + "extraParameters" + ] ++ lib.optional (! (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.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 diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-comfy.sh b/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-comfy.sh deleted file mode 100755 index 63e68c768d..0000000000 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-comfy.sh +++ /dev/null @@ -1,33 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p curl jq - -set -euo pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - -repo=protesilaos/iosevka-comfy -oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersion iosevka-comfy.comfy' | tr -d \") -version=$(curl -s https://api.github.com/repos/$repo/tags | jq '.[0].name' | tr -d \") -buildPlansUrl=https://raw.githubusercontent.com/$repo/$(echo $version)/private-build-plans.toml - -if test "$oldVersion" = "$version"; then - echo "New version same as old version, nothing to do." >&2 - exit 0 -fi - -sed --in-place "s/$oldVersion/$version/" comfy.nix - -cat > ./comfy-private-build-plans.toml <> ./comfy-private-build-plans.toml - -sets=$(grep '^\[buildPlans\.iosevka-comfy[^.]*\]' comfy-private-build-plans.toml \ - | sed 's/^.*iosevka-\(comfy[^]]*\)].*$/"\1" /' \ - | tr -d '\n' \ - | sort) - -sed --in-place "s/sets = .*$/sets = [ $sets];/" comfy.nix diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index f666dec7a5..0237d3a3bd 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1frma5fnrfq1z06mvpy3wvp7jkww8qlji308b3pxv0nxwgjd1vyv"; - iosevka-aile = "086ml3r09k3raxrwdmqgn7s7xga1zgrkvzxsldzwjpsw9jsax0m6"; - iosevka-curly = "000n3wsjsk562lpydmck2c36sxd0w2wkjgz8f7dm8iw57ls9pn6g"; - iosevka-curly-slab = "1cybjnmiwqjxj0rw3lil7n5vc6c30dg7ak0dz4g6q5klbnsw354s"; - iosevka-etoile = "0gxhsgsxzkz34lln20aqz0rd8wvm58090f6v8z4fi5qsm0dla06s"; - iosevka-slab = "00nd3h8vyqzlwbp45by6crzjq9rjpmj0nmmbbq17xvjgxxfhjsxr"; - iosevka-ss01 = "1yq8bnrbw3g24xsnrwbq1vl05m4dlcpjl29h8g8irhhpbnnm44nx"; - iosevka-ss02 = "1r40drbjxpwb7aqa24hh90nxayzj3gah110fsf8yjq5l5azg9ds8"; - iosevka-ss03 = "1mlg9qjfdfia0vwd86gi9ygbbnamld56lpf4h6m7gr8y8v00p07i"; - iosevka-ss04 = "0ap45s2si80gbz78q5v8qqga2ipy9dsz9hkq5dyfh8axlx1wiy7p"; - iosevka-ss05 = "1mah12ihqwqlkmr01l5z6kasb6h6xifgd7acfypz5547ip2zy425"; - iosevka-ss06 = "09w0hm5djjhfvy6lhbynvlq6ckd70zisv0z5y7w4jfmanif8jns3"; - iosevka-ss07 = "17imf7021ncpl9f8nbm1c0bjz5grz1iqgvpz48vpqd56632ac6k6"; - iosevka-ss08 = "199bf0qa76z59ad5d7fcgkiq8m4fxcia7q162zzjlxpl5bgv0665"; - iosevka-ss09 = "0w7jcgi4vn5ix58ji5cybpbnzvdl21k1r6rxad76z97ywwqbflag"; - iosevka-ss10 = "18vm9p6jdbyfc8q3cz8wf3sgd0xn7pzyw3qxld9d2qg83siybsmk"; - iosevka-ss11 = "0aj1l0g3zzcr3grkj1l6s39449g60v6hvjfmb4xx4kxg7h1h5b4i"; - iosevka-ss12 = "0zl2ffmgnlrcaj8mzfgp5x5z7iras5svdpf0zl2xcgjn15k17lkx"; - iosevka-ss13 = "0b58jjhd17i9pc5gdcx3xj9y8bgzwxrlh21j6di4cgvgj41gh46k"; - iosevka-ss14 = "0vlqr5s40xcc2645vsaap42cgfswi2p4hbpqbfjfzsmf41w6j6qc"; - iosevka-ss15 = "01qgvdmy8frbasb5d39c12dxjlha6iv1dq621il0dzm0850x48ys"; - iosevka-ss16 = "12vl98p6w73l4rfy2scn57jrvg2jxk99d2vsndri013grx488lq5"; - iosevka-ss17 = "0336m1i7vdd86jgyfdnsw4f6pdzcd4d757gxf8pa3h6jyczcn8n1"; - iosevka-ss18 = "07sqd4zwc85q8mh9l1bc2nbyr966b0bh9fff9rk91jrk106fijcl"; - sgr-iosevka = "0adxnngdwz6lmp4yla8amk0840y9k6d3k1jl90z5qd3dpl0m0w7z"; - sgr-iosevka-aile = "07470h9apwbmnai1rzx5s9jw3195gsxqv6q0z1gnf56mp94wihg1"; - sgr-iosevka-curly = "1jii49qqlrpvzczwqi39001j0qwbrzklc96bwampn9f0la1iqcbf"; - sgr-iosevka-curly-slab = "0bwfsimzkw4pbk6qy4nvbpwcw0h3m16qsjaqwrwfhnzy8hqc6akc"; - sgr-iosevka-etoile = "091ikanzxmkb673wfcfdg9qm56xqv4vwd3c1ph0c5bzc2nz3il50"; - sgr-iosevka-fixed = "1nz7x90zcbmvwldiz5zv5j22qyjgjn4ba42liki747lr930f38lm"; - sgr-iosevka-fixed-curly = "17y7h5jwim59zybpmkv3rqdcc41dxax5145xmhyzvagblsc7qlpk"; - sgr-iosevka-fixed-curly-slab = "1xfaszbpydi6vzif14bymv5cqlwxvvkdadba4jhy0psc7b30k095"; - sgr-iosevka-fixed-slab = "0pbmhr3nbb777ym30qmhlp4swq0q1f5aqc6i7453fc0lhygmcg55"; - sgr-iosevka-fixed-ss01 = "1klxs5npm5i1sxgrnkbkf1rbn1dvrdxp6mr34kjxkjxrd5flrb6m"; - sgr-iosevka-fixed-ss02 = "0aw0yqmvahk0wagyb2k6q6jibpdlyza3q7zn2a7pi36pcnm9b2rn"; - sgr-iosevka-fixed-ss03 = "0ssxx7a7cskd8lcfy3lnjic1qgzy087d6vk7hmhnlg52jhcfbkjm"; - sgr-iosevka-fixed-ss04 = "0fhqzj5ksvcp1rxa8g11a0jwznhwb5xw41wpvjqy1za1qh2h6shw"; - sgr-iosevka-fixed-ss05 = "06z42m7x565wzsf9sfxi4p4846cb3mgz7mr5h3xa528789fk1sx0"; - sgr-iosevka-fixed-ss06 = "0hzy5bj3ac009q515ylxlc73d1qwdfqcxfq8jxla5h6cgcfipnl4"; - sgr-iosevka-fixed-ss07 = "1051ah3q8wgdana4a9v38szd36wdy0h3c15sf1blm0cv3y0q7cv3"; - sgr-iosevka-fixed-ss08 = "05pg3ywxg8m4c1ij8xpd43azz1671v1bsw7r3szbiqmmlq651h9w"; - sgr-iosevka-fixed-ss09 = "0way85q2jwkhz8ixicx73s1x1hsyznr524am95igqkzwaz7c72q9"; - sgr-iosevka-fixed-ss10 = "12b91hk7i00766gmd04dgh3c6m42bvbc25y9h049c6rfimzd9f75"; - sgr-iosevka-fixed-ss11 = "1pn06gz3jrksg6f2glk45gj9i7jmgnh4f509fi7qqa73r3an0pl8"; - sgr-iosevka-fixed-ss12 = "0nb7g0kbi4riczhjl1dqbzg3kwwsw1vlxnsc5p0qfh8h1rnfpg9g"; - sgr-iosevka-fixed-ss13 = "1nj3nbp0b9a4nmskxg4vv98y7qp7gnj6rqkckvsw7bw43mxa2faq"; - sgr-iosevka-fixed-ss14 = "1fhwx95702qyr23iwp400l16lgq12pd3ckbf5dn1hyhfmm691cvg"; - sgr-iosevka-fixed-ss15 = "088xdxr11gdpn5j4fbf4xscq4prc1cydb23xcsmpnci6gsv4ppzg"; - sgr-iosevka-fixed-ss16 = "1p20k188c75jisrg7bqr6fq9pra07b44vyvj10ngm38xwfgqb5lz"; - sgr-iosevka-fixed-ss17 = "03giwk9xlnirgshbkpbkqav3l97n2fm7y3wd21g449vi7r9srimk"; - sgr-iosevka-fixed-ss18 = "1yl501fcik0kcm20b98n9a285zv9m3yc33ngkjdgj12ssgb02lj8"; - sgr-iosevka-slab = "0svls9wajw539bj5xziqbcp3wgc3f3hvwvz0rsicc9wgm7h47i33"; - sgr-iosevka-ss01 = "09i5iylma19jfiqcl0svm7dz4d2agi1ylkvzvsh050ggsk57nzv6"; - sgr-iosevka-ss02 = "1l0c7519wj46m14aq318rlhajq51hkv5sddhl8nvaqpdmrxx0zcj"; - sgr-iosevka-ss03 = "02yz6wqaqnc0in8b6j2n02kf6lws4x16182a5djnh3nnml2jhvi6"; - sgr-iosevka-ss04 = "0llrnx6vh6fl0fn5jjxzkq4rk91siy90pcpwin010sm3bppc0qgf"; - sgr-iosevka-ss05 = "166y9hywcm6d1zw2szqfrlaj9qaankamcs0ff02vd7q399bkl9a2"; - sgr-iosevka-ss06 = "0q41sikcv60nkvxqs5l3zw1dram20192dd5nr17nsd2lrbbdw1qx"; - sgr-iosevka-ss07 = "1nxgsj6ykgh5dj3gjba2ild1y5knilm7pzi5b5qbqpal89ymk5dq"; - sgr-iosevka-ss08 = "19bidxh3zxid6md8y0zp6ij4yxhqbyhqxfmld12pcskvp9xdv5bc"; - sgr-iosevka-ss09 = "15w7dqb73q2v0qkh0wmlhjd3sphcq6qilb8iqz0ifg3kbsix3hd3"; - sgr-iosevka-ss10 = "04gcwjpi313sqmdq1limfzycjyhr6p05vnr8jsabvgbxididikdi"; - sgr-iosevka-ss11 = "1mvhrqgbppx35h2v62ykhihdkh4zw2lwz5i7fd5qdw0ysiv1006d"; - sgr-iosevka-ss12 = "0r7qlba9mx1fibs0jrqgjzbffk1j49912zzim441n9539n6rmpvp"; - sgr-iosevka-ss13 = "1qvn83frjhy2w16i9jnhp3874rjlf0z95n7x1kmcg89hzy3x7288"; - sgr-iosevka-ss14 = "1yjbdgj1b03p2cwvwsh7jl0npj4a840whgn35j61fi9ap74jld8c"; - sgr-iosevka-ss15 = "1jrixb0lw04axv2h6d92mbwgavyzpc189n72b8wf729kwi22bvww"; - sgr-iosevka-ss16 = "1mvgl5dh9frqmqvia17zwpyyy9hwm8iayx2azm7mhjkkff0f0sd9"; - sgr-iosevka-ss17 = "00059jzz2w9xdfcl2lws2i0lwqgn08fakn0di6clqhjig695yglc"; - sgr-iosevka-ss18 = "03sy0az47x9sc0qxjc1wvhkmp71wqrm7q998ijxmj6mkbd3kc24v"; - sgr-iosevka-term = "0r5ah7rxqqi4cha3r6nz6dli6z55s1g91yb1x6b2q04irvm0hzrc"; - sgr-iosevka-term-curly = "1c9vf1kcl0yai5smzh9dldhkbwanbxji2a1j6y1sw59kn9n7aygf"; - sgr-iosevka-term-curly-slab = "02m3fpdj9gxskap4sp43pjr4ylyvr6fpbsbl5csjl5x4rlrh71kr"; - sgr-iosevka-term-slab = "1bnb803vcrkk05igm80v3k8b3p6ji14bsa5rjrplxq7yrjq7ybk4"; - sgr-iosevka-term-ss01 = "1wfz766fi0xi5nb80wdlpp4j4klggz8v2aa1prl6mbvmzq4g1alk"; - sgr-iosevka-term-ss02 = "12vcmbx597h0mfmib9wzqpc7bchbim2jyqnk835fhgrdrddb1w0j"; - sgr-iosevka-term-ss03 = "0a4dfrah8rg5bc7x8r08n2ijr6nfxr5nwbwj7ig0snbw1rrizm4i"; - sgr-iosevka-term-ss04 = "0ix8wn6dbqs072s3bmcjc1k8jfi4zpgjikbbdld3fgsg13gncz2p"; - sgr-iosevka-term-ss05 = "19jjvadmffizdymy21dniz43ac1qkik5i33a4imchk64kcn7nqin"; - sgr-iosevka-term-ss06 = "0lx61ikw9c2glr7smxyqkx68271sww47khkdy68llmw16c1dcapc"; - sgr-iosevka-term-ss07 = "12nx451b67cc6kx6pkb9x2jyk683xvjz3m21wg7zjplskrhlfaqa"; - sgr-iosevka-term-ss08 = "19n39wpz09kp9km9gmb16q6g4xbp288dgnlpdy4jxnway3i23drp"; - sgr-iosevka-term-ss09 = "1j4sh9fjyxi5qa85w72bs7sin5189qis8zdr2fbl39ma7igj5l5f"; - sgr-iosevka-term-ss10 = "02bv19gc1n73qyrdghp5nfzf2vwcvws3qnrcx7k3jpz23xf1n8s8"; - sgr-iosevka-term-ss11 = "1a93vv86sg38ipji4cbpndcr9bfcc2n4bg0s3f19lzyqpw3pa6r9"; - sgr-iosevka-term-ss12 = "1c3d3cxna1m7qq77fc278jja7yz84591pazc1adij28l3xl7xh1z"; - sgr-iosevka-term-ss13 = "0ss0l4373867csgis87miymby4m1vvxs321lqq00m73x35y9xrj2"; - sgr-iosevka-term-ss14 = "0dzg0g5p9p1p8yajdz0xnir8advs69fyj325qwh5616in9y3lv32"; - sgr-iosevka-term-ss15 = "0rx346bjrm33n9ww9bc4czn9dda16bkxjf6h9m4bnvlgxdflgd3y"; - sgr-iosevka-term-ss16 = "14i3f4bwnsb3haai8003pi9hsahcmxm1r1vccbrzny5vx78892py"; - sgr-iosevka-term-ss17 = "0idfiqxj0ixrmvfa0bhl1sg6pvaivcw0csjcfxpp7d406553a70i"; - sgr-iosevka-term-ss18 = "1732sskv5jzpdaaf4dc6xcp45r5fpxxxdq35jlnxbwng0njww3qy"; + iosevka = "1sd45spjccrqydamgi62ipn8yc378y44s7ikv1zrpfwl29vnnwhr"; + iosevka-aile = "05dsr38f1gvxflna8hk3x61jdf2rl3qrh3bjy4vdffi76fvd1m73"; + iosevka-curly = "1056j12bbljzazdwclj6a6l37h9lpj90kvs08rh6aqxb9hgjkdfy"; + iosevka-curly-slab = "1y8kyz4a7yzdqf619vbgkbmrsyz005nihwkjwljhhnr7w577gm3q"; + iosevka-etoile = "1wxdra9j7cdkxx92yvmkcf3i86iy2rp918aixpgnw50hpyz370qh"; + iosevka-slab = "06xaxh77ghf327p9bc40n45c3bhc0vqgdpk3ym60gfbcxs7jrpxh"; + iosevka-ss01 = "0wlwhl4dm2gg0z4vxkqhp076arkyv9bl8xiwhhif06w440b5nikw"; + iosevka-ss02 = "10kk2n5p85haymfaf3viy4la6hz9kvpvr2a4wd5hs410sc0mkp7g"; + iosevka-ss03 = "16skp5l65jkaz2c02g5slma0qd43v54lavi091z8p7sfl01c7mlk"; + iosevka-ss04 = "0s5m76m9gk4a6b72abpdg4abvp85ymjhrfwmy69il4x02ffx3cih"; + iosevka-ss05 = "1j5nm3rinincz50axxsd8rjrbmj8n8y09sxfj56fxxl9j9qq5vrx"; + iosevka-ss06 = "0g96yj19kd5xx8fvnxjxp19bx8inhl9bsy8r03rlgc2c130xng3z"; + iosevka-ss07 = "05h6knsms00akridmrrrbn2gph9i3gkn15z8snjni99apd1iy6hi"; + iosevka-ss08 = "075m6hdmnsjcq0ybp0h7b5my1w4nbgvczba2a2hxpbh06qqbkyng"; + iosevka-ss09 = "0shw8xwbh3v3sc5agrincx4mz3qpjgbr48alyffzfwrzy4divff7"; + iosevka-ss10 = "08b1517kzfhvpbsbsz38wf5ddbnar55m0z43v4nm8zw76wfhbz9i"; + iosevka-ss11 = "10hvldhxgzr9pyabi6kznh77gl1hkr7fkxmlrvrks4a5h406xq0q"; + iosevka-ss12 = "10lbga8xr9dabvwkdq51xhnniyrlywj54a2ncwchikglyzfzz260"; + iosevka-ss13 = "0h19ggacndxnkl5m7v3cc69mzzfqvyzkaa5al1njmipxfmwlw19c"; + iosevka-ss14 = "04razagrzzpfgacv43nsq6ic7wj22lx0kwfcmlii3cpkyxmyfmhy"; + iosevka-ss15 = "1dm673k51hpi1201yyc18wdb9blvh7ad2qcsn10vxsyi6j34nbdr"; + iosevka-ss16 = "1bhljlji97r2b7lmkczv0v9l5kil70q3isvljgz0m40vbrnknsli"; + iosevka-ss17 = "1nqkg0xx0q418981liv8smv8s1p2nnvrkwdmp2vp57q6gjiw2mf7"; + iosevka-ss18 = "0jmff0f5h20md03as2gprbk74wgg2fwvzd45ap6a4w0cyf7wjpmm"; + sgr-iosevka = "1asrysbc1ah8b7fas49md1b100jw09w13n8bvw9vbipk9zvbbzg5"; + sgr-iosevka-aile = "1dpkakcbl1l5lzrl3bmgci1dyszhp1h38yvm0cfc51pwsy9a81c2"; + sgr-iosevka-curly = "037vmrsqxzls4xdjzzddamxgxan0gx7rhflzwsc4izq5agv77605"; + sgr-iosevka-curly-slab = "1faammvd4dj0nibgfh7xg01wp34ilmzls6azri0d3v9844wmm50a"; + sgr-iosevka-etoile = "0kagsz04z9p5pqg6dvqsx4plrsspnk7pd0kffzxyspfc6h6j3lir"; + sgr-iosevka-fixed = "1wxq1416z8kb22mqvqg2pgrvm9pb2rqalm48gjnyaxz1w15hdxf5"; + sgr-iosevka-fixed-curly = "1i8nbm24hb8m7sj2igvsgil9ab5jwnsjgczypzwkmj559r1jlqzv"; + sgr-iosevka-fixed-curly-slab = "1s1n771dq9w668i22107lmxh7hdjf2lvdcqj2d9lb2mipjawqhfd"; + sgr-iosevka-fixed-slab = "1bldr80k7iwzzrniq7gfgdxnzd9lqwsdwyd19r3ryar8r7d93f9n"; + sgr-iosevka-fixed-ss01 = "0daz5kpmkrjx1s0qvk0gcf0hh2q2sddngglr9v3ci8c026xnn04y"; + sgr-iosevka-fixed-ss02 = "0rak6bnz90rnjb1977apkkabl65090c7iliggbg6g65ljqn3gkfc"; + sgr-iosevka-fixed-ss03 = "1ilk06wvs2p6snzdcrvax7s51p0vyyb8vzzpikmrql1w1q1xdh60"; + sgr-iosevka-fixed-ss04 = "1lmdj7wdxgfqjp348hpmgbc96dmigvdzw3hz1axq64wf18dw4hza"; + sgr-iosevka-fixed-ss05 = "0y7z4v7xyvwzlg792jx8rsqdj7agl2s4z2syhkjrw77dd94mxi4x"; + sgr-iosevka-fixed-ss06 = "1m55n2djfkzwz95xavlvkihcfn4liyiymllhibgh3sgza55gljnc"; + sgr-iosevka-fixed-ss07 = "1dj2bab7rq9rr2n9q4siq8hgdf9pwmwf8hlpn1fkks1998yqshsp"; + sgr-iosevka-fixed-ss08 = "0dmckvn1vd7v86q3rxrb1g6rvz0yfzcfzmyn10maddnrnwf8llfm"; + sgr-iosevka-fixed-ss09 = "15gcw3cvbyvnqj66fp5c5475g9gfz38s98slvqwwhlzlg4g8xfnj"; + sgr-iosevka-fixed-ss10 = "0dbd1yrcfwfr4dx01iwk8rhhh0f40lw5qncc6x5ihqrbsskaspn4"; + sgr-iosevka-fixed-ss11 = "188yga2n0cv9xqdilc06ld1pl0v5k50fb5vr46s2l40p1dkd988i"; + sgr-iosevka-fixed-ss12 = "06h82cd10ia4pdhgdkznli3brkkn8q4fxw3kbylp8c9lxbmrvi40"; + sgr-iosevka-fixed-ss13 = "1xbwdxxpc762y9ghgf6g50mhydd1m7fiqjr62lsqs9811d2db0l4"; + sgr-iosevka-fixed-ss14 = "0am6xg4c5x62s1670lgq7y2qyvc4g9lsffb8xbslvijqlp8k6q3z"; + sgr-iosevka-fixed-ss15 = "0cnikxyl8jps6f2dipq8zry95dh1xqm8wvkdqsxpisnm9cfd7y1k"; + sgr-iosevka-fixed-ss16 = "0dcgj4lcfnzcds8qbdi798qsrdpsi1wqiqpy39080h1908zyzyz2"; + sgr-iosevka-fixed-ss17 = "1iidvrn0ij2wqglndl5a82pw81r4nzd921fsdr4rvklw7a6dlppq"; + sgr-iosevka-fixed-ss18 = "0v73i320wrnlj25grhqz4acw7zbivnjhjj8bcly9ghgv1mzbbaga"; + sgr-iosevka-slab = "0s4kwmic87sll394kynj1hc407mgk43kfakgpgv6x60miqmhp7pz"; + sgr-iosevka-ss01 = "02bjnsjcjgj3418qfbkgbm43mfp3q8fh81ckgjxl6pj0r3cwqahd"; + sgr-iosevka-ss02 = "1pzii9rgim4dz3yjv1hpa4qs2x4s180gkk4p3lkyfwn07kkrbwm6"; + sgr-iosevka-ss03 = "18r4slc9p94w2db4n9d0pqln1v1mn8snfbw3bfpjza3470xfrdwd"; + sgr-iosevka-ss04 = "0laypbvzsxfwpak6c3xhhzzbm1akkzpm9f2nyjgr0pfaix0kdhdi"; + sgr-iosevka-ss05 = "0l9dn96mbv8ssgp6352dm5hykwn5z5457fwkxn6i91jiia693j7r"; + sgr-iosevka-ss06 = "057lgnf1pcir8q76ya8819mg0mwdv7sam810qnrya31dc18dzj6z"; + sgr-iosevka-ss07 = "0w04v61qnl8pwfsm2654w39x0a42c27qs5qc8xpah7j6flpmhk07"; + sgr-iosevka-ss08 = "1nr14v36cq846k9km8sznbvacrnhf4nh62mxvnb3nr17csf85al2"; + sgr-iosevka-ss09 = "1b3pkzv3hdzc2hsj3pzf135g109ln0wzic08kdzsqzsh4yb8q6dp"; + sgr-iosevka-ss10 = "1nmb38l1p1ywccdiysw8mvn5gnm8lwfakvnxk4ya7s4k5p72wpi0"; + sgr-iosevka-ss11 = "0449rzm07rfixsfd9ag3a2s4nl1wwf6q5h0zy9iq507af8ys29ji"; + sgr-iosevka-ss12 = "0n198kxjq81ji3i1q2kg3hyg2p14bllzg7r4kqsz8bvf4ivhdbdl"; + sgr-iosevka-ss13 = "0vm2w0ikhrxr5k6w3521vv6r028gg23iazzr0vg71l0yr05z6z83"; + sgr-iosevka-ss14 = "0nnnzfzr4my9lxvahv8sn6dvj8b5jh0nwc0adq4ca2zpfp7py9qp"; + sgr-iosevka-ss15 = "129v06xq7d0minhrmjm1sz6235khgfp7jc746lkk16dr3fsvajbq"; + sgr-iosevka-ss16 = "0rvda1xpb0c35qhdh3lx84gdymb2hxp8s8zxxl6cmwjhpd2n8mwd"; + sgr-iosevka-ss17 = "0a0y5fh97kqf7nvx1hn5727438y5g75dkqwzba2hy8shx14m9cqq"; + sgr-iosevka-ss18 = "1phcfn83wj0dlh6l514s4nj67k0v919nbd79kg0lyn786lingggq"; + sgr-iosevka-term = "178bp8r875ic65wx34y3193iz4pqp5cls1w534zkqkaw21ppl6gv"; + sgr-iosevka-term-curly = "18fh2z87g1zlf7r5r9gk8cxfvdwrc57r7i1llfadh66xs928imps"; + sgr-iosevka-term-curly-slab = "00sv5ibgwjwgm75lkk56n4ldc0hfk98lc04d45q5gi6rfqzy8bjj"; + sgr-iosevka-term-slab = "1izygr56940q8w5gvgfhqyvamfgsz6g26fpm0lf3hm68ypz6vsx8"; + sgr-iosevka-term-ss01 = "0iad3lzj1w84qrnh8yv9hr7kc7xa84m94r1w8j1yyjjqkf41kqzd"; + sgr-iosevka-term-ss02 = "03lj938i8rilrmdki24xyd38hb83wbazqmkw677q8hbj2pw5j1ax"; + sgr-iosevka-term-ss03 = "1svsffkkp3a3gfw8p1cqm6qc0bmadb5nyyg7jip52qil963bv7yx"; + sgr-iosevka-term-ss04 = "1rndp4r7imysdlxrs0fka63v7dx6i5zsyw03hh0ij034qsnpjdxq"; + sgr-iosevka-term-ss05 = "0013pwg24dzziixz16011zdsda37g65nl1ykd505l5527lgr1ypx"; + sgr-iosevka-term-ss06 = "0ccspibjgbb2d7gp784c70cs4pv8hhzrjvr680v82si4siacshd7"; + sgr-iosevka-term-ss07 = "193px84zyc2f6c7xrzzcpr31xn5h9bhbsygzp35rxma4pgs5qr3x"; + sgr-iosevka-term-ss08 = "1v5gs1lphpbc1pwxg2a4vvwlbckpy9p40gwjsvf99q73mvvs7b4b"; + sgr-iosevka-term-ss09 = "16kd1l9nbqcl1w11l9ppp1xhjhm3rihzm5ndpds0clyjacj2s71f"; + sgr-iosevka-term-ss10 = "1l8jksvg3lq1ygrndh7l2nd2v1f7lsl7wr16g7n44acz94xqyj3i"; + sgr-iosevka-term-ss11 = "005jcj0nk4n7gsl88ygxyncj51lxsh3fr1vdcyjp3d0ipmf9dybb"; + sgr-iosevka-term-ss12 = "08850qi22mb6j48ack9091pgqgfagsyad4jzapn9skhfb04kzc13"; + sgr-iosevka-term-ss13 = "0q85sr0dl93xdia9pdh5lfw11vnnvs9mb0xwrc6zikvakriw8zlb"; + sgr-iosevka-term-ss14 = "0akawjz58qnynagnmf82ldnn6yxjxqyfn5fa9261k91lcrbkcils"; + sgr-iosevka-term-ss15 = "18qmj66589nl68sg047d9hzfh485q6wbib5pa5gllgida92k9vw6"; + sgr-iosevka-term-ss16 = "1baipchlrfj3h8aqcmws5s1s08g843na61p9ql17f86f1lib0gw4"; + sgr-iosevka-term-ss17 = "0zfis06pg6b41gx79qrcl8mniirchfads3vrr1hxi37b9prqqi2y"; + sgr-iosevka-term-ss18 = "0hh4ahrj54fpw3p0fiig6m8y69b2mgxv15qfm9j88fik2aps6b3i"; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/lexend/default.nix b/third_party/nixpkgs/pkgs/data/fonts/lexend/default.nix new file mode 100644 index 0000000000..3efb1886b1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/lexend/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "lexend"; + version = "0.pre+date=2022-01-27"; + + src = fetchFromGitHub { + owner = "googlefonts"; + repo = pname; + rev = "57e6c14e2a9b457e8376044a31525c2100297e9c"; + sha256 = "sha256-+tPggQIO50a8kOSnOVN/MR9ZwX5xZqYVNZO79eog9QA="; + }; + + installPhase = '' + runHook preInstall + + cd fonts + for f in *; do + mkdir -p $out/share/fonts/truetype/lexend/$f + install $f/ttf/* $out/share/fonts/truetype/lexend/$f/ + done + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://www.lexend.com"; + description = "A variable font family designed to aid in reading proficiency"; + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ fufexan ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/openmoji/default.nix b/third_party/nixpkgs/pkgs/data/fonts/openmoji/default.nix index baf49c80e1..3a9b91deb2 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/openmoji/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/openmoji/default.nix @@ -47,13 +47,13 @@ let in stdenv.mkDerivation rec { pname = "openmoji"; - version = "13.1.0"; + version = "14.0.0"; src = fetchFromGitHub { owner = "hfg-gmuend"; repo = pname; rev = version; - sha256 = "sha256-7G6a+LFq79njyPhnDhhSJ98Smw5fWlfcsFj6nWBPsSk="; + sha256 = "sha256-XnSRSlWXOMeSaO6dKaOloRg3+sWS4BSaro4bPqOyKmE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix index c9bc0aa792..ef923ba9a8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/sarasa-gothic/default.nix @@ -1,14 +1,14 @@ { lib, fetchurl, libarchive }: let - version = "0.36.2"; + version = "0.36.8"; in fetchurl { name = "sarasa-gothic-${version}"; # Use the 'ttc' files here for a smaller closure size. # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.) url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z"; - sha256 = "sha256-hUQi8mbtQC+peslaz+AVINjELVXseuVi44qbDBtJ+fc="; + sha256 = "sha256-lKrpaTVYmV3wr1Uj5Yqj1p1t0CYF0ApX7j+QFNfpdz0="; recursiveHash = true; downloadToTemp = true; diff --git a/third_party/nixpkgs/pkgs/data/fonts/victor-mono/default.nix b/third_party/nixpkgs/pkgs/data/fonts/victor-mono/default.nix index 11d3f1d25b..e351cea9fd 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/victor-mono/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/victor-mono/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.5.3"; + version = "1.5.4"; in fetchzip { name = "victor-mono-${version}"; @@ -25,7 +25,7 @@ fetchzip { rm -r $out/{EOT,WOFF,WOFF2} ''; - sha256 = "sha256-3TGpUDBJ24NEJb00oaJAHEbjC58bSthohzqM1klVDGA="; + sha256 = "sha256-1si0d2lpuXaDcSc3giVMMMbZc/eKbHKU3wmwfYHZ8o0="; meta = with lib; { description = "Free programming font with cursive italics and ligatures"; diff --git a/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix index 88184b585e..2950f92991 100644 --- a/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "arc-icon-theme"; version = "2016-11-22"; diff --git a/third_party/nixpkgs/pkgs/data/icons/beauty-line-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/beauty-line-icon-theme/default.nix index 2942315f7d..66e5ac57dd 100644 --- a/third_party/nixpkgs/pkgs/data/icons/beauty-line-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/beauty-line-icon-theme/default.nix @@ -1,16 +1,32 @@ -{ lib, stdenv, fetchzip, breeze-icons, gtk3, gnome-icon-theme, hicolor-icon-theme, mint-x-icons, pantheon }: +{ lib +, stdenvNoCC +, fetchFromGitHub +, breeze-icons +, gtk3 +, gnome-icon-theme +, hicolor-icon-theme +, mint-x-icons +, pantheon +, jdupes +}: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "BeautyLine"; - version = "0.0.1"; + version = "0.0.4"; - src = fetchzip { - name = "${pname}-${version}"; - url = "https://github.com/gvolpe/BeautyLine/releases/download/${version}/BeautyLine.tar.gz"; - sha256 = "030bjk333fr9wm1nc740q8i31rfsgf3vg6cvz36xnvavx3q363l7"; + src = fetchFromGitHub { + owner = "gvolpe"; + repo = pname; + rev = version; + sparseCheckout = '' + BeautyLine-V3 + ''; + sha256 = "sha256-IkkypAj250+OXbf19TampCnqYsSbJVIjeYlxJoyhpzk="; }; - nativeBuildInputs = [ gtk3 ]; + sourceRoot = "${src.name}/BeautyLine-V3"; + + nativeBuildInputs = [ jdupes gtk3 ]; # ubuntu-mono is also required but missing in ubuntu-themes (please add it if it is packaged at some point) propagatedBuildInputs = [ @@ -23,10 +39,19 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; + dontPatchELF = true; + dontRewriteSymlinks = true; + installPhase = '' + runHook preInstall + mkdir -p $out/share/icons/${pname} cp -r * $out/share/icons/${pname}/ gtk-update-icon-cache $out/share/icons/${pname} + + jdupes --link-soft --recurse $out/share + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix b/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix index 15905bec3a..b27b96cb5e 100644 --- a/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/default.nix @@ -1,12 +1,12 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , fetchurl , clickgen , unzip }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "bibata-cursors"; version = "1.1.2"; diff --git a/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix b/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix index a6fdaca842..15a746eabf 100644 --- a/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix +++ b/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/extra.nix @@ -1,12 +1,12 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , fetchurl , clickgen , unzip }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "bibata-extra-cursors"; version = "1.0.1"; diff --git a/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/translucent.nix b/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/translucent.nix index 74d7c4d7c3..efaf25c59f 100644 --- a/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/third_party/nixpkgs/pkgs/data/icons/bibata-cursors/translucent.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "bibata-cursors-translucent"; version = "1.1.1"; diff --git a/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix b/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix index 075dbc922b..47fbeda109 100644 --- a/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/capitaine-cursors/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, makeFontsConf +{ lib, stdenvNoCC, fetchFromGitHub, fetchpatch, makeFontsConf , inkscape, xcursorgen, bc }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "capitaine-cursors"; version = "4"; diff --git a/third_party/nixpkgs/pkgs/data/icons/colloid-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/colloid-icon-theme/default.nix new file mode 100644 index 0000000000..c1ae9e416e --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/icons/colloid-icon-theme/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +, gtk3 +, hicolor-icon-theme +, jdupes +, schemeVariants ? [] +, colorVariants ? [] # default is blue +}: + +let + pname = "colloid-icon-theme"; + +in +lib.checkListOfEnum "${pname}: scheme variants" [ "default" "nord" "dracula" ] schemeVariants +lib.checkListOfEnum "${pname}: color variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] colorVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2022-04-22"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + hash = "sha256-0lUdsTjIfZ76Mm327jE1uudxtKVQbt17fsel6c2RdVM="; + }; + + nativeBuildInputs = [ + gtk3 + jdupes + ]; + + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + # These fixup steps are slow and unnecessary for this package. + # Package may install almost 400 000 small files. + dontPatchELF = true; + dontRewriteSymlinks = true; + + postPatch = '' + patchShebangs install.sh + ''; + + installPhase = '' + runHook preInstall + + name= ./install.sh \ + ${lib.optionalString (schemeVariants != []) ("--scheme " + builtins.toString schemeVariants)} \ + ${lib.optionalString (colorVariants != []) ("--theme " + builtins.toString colorVariants)} \ + --dest $out/share/icons + + jdupes --quiet --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + description = "Colloid icon theme"; + homepage = "https://github.com/vinceliuice/colloid-icon-theme"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/icons/comixcursors/default.nix b/third_party/nixpkgs/pkgs/data/icons/comixcursors/default.nix index 2b52b70335..b63877b282 100644 --- a/third_party/nixpkgs/pkgs/data/icons/comixcursors/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/comixcursors/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, bc, librsvg, xcursorgen }: +{ lib, stdenvNoCC, fetchFromGitLab, bc, librsvg, xcursorgen }: let dimensions = { @@ -16,7 +16,7 @@ let # meta.longDescription.) map variantName product; in -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "comixcursors"; version = "0.9.2"; diff --git a/third_party/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix index 1119e24852..921c87774c 100644 --- a/third_party/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "faba-icon-theme"; version = "4.3"; diff --git a/third_party/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix b/third_party/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix index 0627c87bfc..47eeab40ac 100644 --- a/third_party/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "faba-mono-icons"; version = "2016-04-30"; diff --git a/third_party/nixpkgs/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix b/third_party/nixpkgs/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix index 7b779191b6..972b5dfba5 100644 --- a/third_party/nixpkgs/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/gruvbox-dark-icons-gtk/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "gruvbox-dark-icons-gtk"; version = "1.0.0"; diff --git a/third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix index 4a58b8fb89..4fb1ada665 100644 --- a/third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenvNoCC, fetchurl }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "hicolor-icon-theme"; version = "0.17"; diff --git a/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix b/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix index 3a5fe54198..d68e02b838 100644 --- a/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/iconpack-jade/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "iconpack-jade"; version = "1.25"; diff --git a/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index 13b314e1ae..40d4d451f3 100644 --- a/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, mint-x-icons, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "iconpack-obsidian"; version = "4.15"; diff --git a/third_party/nixpkgs/pkgs/data/icons/iso-flags/default.nix b/third_party/nixpkgs/pkgs/data/icons/iso-flags/default.nix index 57cc1752f1..9deff6bcc7 100644 --- a/third_party/nixpkgs/pkgs/data/icons/iso-flags/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/iso-flags/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv +{ lib, stdenvNoCC , fetchFromGitHub , perl , inkscape @@ -6,7 +6,7 @@ , targets ? [ "all" ] }: -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { pname = "iso-flags"; version = "unstable-18012020"; diff --git a/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix index 4de65c8386..4c02e9943c 100644 --- a/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/kora-icon-theme/default.nix @@ -1,14 +1,22 @@ -{ lib, stdenv, fetchFromGitHub , gtk3, adwaita-icon-theme, breeze-icons, hicolor-icon-theme }: +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, adwaita-icon-theme +, breeze-icons +, hicolor-icon-theme +, gitUpdater +}: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "kora-icon-theme"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "bikass"; repo = "kora"; rev = "v${version}"; - sha256 = "sha256-OwuePPn4seHbzv81pnTEP1Q0Tp1ywZIEmw+dx3bDoXw="; + sha256 = "sha256-j4W9w/icGjfkbbb0xYF3NfSFsp5RkNCc805E089JaFQ="; }; nativeBuildInputs = [ @@ -27,7 +35,8 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/share/icons - mv kora* $out/share/icons/ + cp -a kora* $out/share/icons/ + rm $out/share/icons/kora*/create-new-icon-theme.cache.sh for theme in $out/share/icons/*; do gtk-update-icon-cache -f $theme @@ -36,11 +45,16 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater { + inherit pname version; + rev-prefix = "v"; + }; + meta = with lib; { description = "An SVG icon theme in four variants"; homepage = "https://github.com/bikass/kora"; license = with licenses; [ gpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/la-capitaine-icon-theme/default.nix index b7febabacd..01e2a3ea47 100644 --- a/third_party/nixpkgs/pkgs/data/icons/la-capitaine-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/la-capitaine-icon-theme/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , breeze-icons , elementary-icon-theme @@ -7,7 +7,7 @@ , hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "la-capitaine-icon-theme"; version = "0.6.2"; diff --git a/third_party/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix index 04e1bce127..d9fef47da0 100644 --- a/third_party/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }: +{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "moka-icon-theme"; version = "unstable-2019-05-29"; diff --git a/third_party/nixpkgs/pkgs/data/icons/nordzy-cursor-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/nordzy-cursor-theme/default.nix index 7648a57474..ee18fe2877 100644 --- a/third_party/nixpkgs/pkgs/data/icons/nordzy-cursor-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/nordzy-cursor-theme/default.nix @@ -1,9 +1,9 @@ -{ stdenv +{ stdenvNoCC , fetchFromGitHub , lib }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "nordzy-cursor-theme"; version = "0.1.0"; diff --git a/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix index f977a12a78..28da45f4c3 100644 --- a/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/nordzy-icon-theme/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "nordzy-icon-theme"; - version = "1.5"; + version = "1.6"; src = fetchFromGitHub { owner = "alvatip"; repo = "Nordzy-icon"; rev = version; - sha256 = "sha256-2uMbiee7wCyDxs6kYd5sL/keDVIVjIWxoci5/t2HF8s="; + sha256 = "sha256-syiJL5i7JJXiSedUtaaoCnAv/6NgRtB3um7A5Sp+Pek="; }; # In the post patch phase we should first make sure to patch shebangs. diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix index e7f0905ff4..83961f19ca 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, inkscape, xcursorgen }: +{ lib, stdenvNoCC, fetchFromGitHub, inkscape, xcursorgen }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "numix-cursor-theme"; version = "1.2"; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index 235895d8b0..5da3838596 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; version = "22.07.11"; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 1f37dfe1f2..6cb002e7d5 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-square"; version = "22.07.11"; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix index c46cc0a6ec..576fa405e0 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme"; version = "21.10.31"; diff --git a/third_party/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix index 9288b9307f..b676b5956c 100644 --- a/third_party/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/oranchelo-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, plasma5Packages, hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "oranchelo-icon-theme"; - version = "0.8.0.1"; + version = "0.9.0"; src = fetchFromGitHub { owner = "OrancheloTeam"; repo = pname; - rev = "096c8c8d550ac9a85f5f34f3f30243e6f198df2d"; - sha256 = "sha256-TKi42SA33pGKdrPtGTpvxFbOP+5N93Y4BvO4CRTveLM="; + rev = "v${version}"; + sha256 = "sha256-IDsZj/X9rFSdDpa3bL6IPEPCRe5GustPteDxSbfz+SA="; }; nativeBuildInputs = [ @@ -22,9 +22,18 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - installPhase = '' - mkdir -p $out/share/icons - cp -r $Oranchelo* $out/share/icons/ + makeFlags = [ + "DESTDIR=$(out)" + "PREFIX=" + ]; + + postInstall = '' + # space in icon name causes gtk-update-icon-cache to fail + mv "$out/share/icons/Oranchelo/apps/scalable/ grsync.svg" "$out/share/icons/Oranchelo/apps/scalable/grsync.svg" + + for theme in $out/share/icons/*; do + gtk-update-icon-cache "$theme" + done ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix index fc541f6e5b..ae5a43eca0 100644 --- a/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }: +{ lib, stdenvNoCC, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "paper-icon-theme"; version = "unstable-2020-03-12"; diff --git a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index 56ac57e4a5..880fc6f423 100644 --- a/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }: +{ lib, stdenvNoCC, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme, papirus-folders, color ? null }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20220710"; + version = "20220808"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-CInoUlWMmLwc4mMi1krmXr2a2JCWZ7XcPe20wFSNjqk="; + sha256 = "sha256-eOsqBIo7Bs/5mbD8x2Q+RO49Cqxd1KoqNbTsiV9RDWg="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix index 7254e8bc21..ddf3d1afe6 100644 --- a/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/pop-icon-theme/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , meson , ninja @@ -8,7 +8,7 @@ , hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "pop-icon-theme"; version = "2021-11-17"; diff --git a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix index 24ad687834..e2f3e6cb3b 100644 --- a/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,20 +1,30 @@ { lib , stdenvNoCC , fetchFromGitHub +, gitUpdater , gtk3 , hicolor-icon-theme , jdupes +, colorVariants ? [] # default is all +, themeVariants ? [] # default is all }: -stdenvNoCC.mkDerivation rec { +let pname = "qogir-icon-theme"; - version = "2022-01-12"; + +in +lib.checkListOfEnum "${pname}: color variants" [ "default" "dark" "all" ] colorVariants +lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "all" ] themeVariants + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2022-07-20"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1daayxsqh7di3bvfnl39h1arsj1fypd3ba30mas6dl1d0qy17z1p"; + sha256 = "sha256-I+eojCTR3fXcp7v5Bdie9vstmJja9HB71aQSF5jLDD4="; }; nativeBuildInputs = [ gtk3 jdupes ]; @@ -27,15 +37,27 @@ stdenvNoCC.mkDerivation rec { dontPatchELF = true; dontRewriteSymlinks = true; + postPatch = '' + patchShebangs install.sh + ''; + installPhase = '' runHook preInstall - patchShebangs install.sh + mkdir -p $out/share/icons - name= ./install.sh -d $out/share/icons - jdupes -L -r $out/share/icons + + name= ./install.sh \ + ${lib.optionalString (themeVariants != []) ("--theme " + builtins.toString themeVariants)} \ + ${lib.optionalString (colorVariants != []) ("--color " + builtins.toString colorVariants)} \ + --dest $out/share/icons + + jdupes --quiet --link-soft --recurse $out/share + runHook postInstall ''; + passthru.updateScript = gitUpdater { inherit pname version; }; + meta = with lib; { description = "Flat colorful design icon theme"; homepage = "https://github.com/vinceliuice/Qogir-icon-theme"; diff --git a/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix b/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix index 55ba320bc9..0d3f273d5b 100644 --- a/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix @@ -1,11 +1,11 @@ -{ stdenv +{ stdenvNoCC , lib , fetchzip , xorg , hicolor-icon-theme }: -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "vanilla-dmz"; version = "0.4.5"; diff --git a/third_party/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix index 853b1d209a..7ef0abb85c 100644 --- a/third_party/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/vimix-icon-theme/default.nix @@ -1,5 +1,5 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub , gtk3 , hicolor-icon-theme @@ -13,7 +13,7 @@ let in lib.checkListOfEnum "${pname}: color variants" [ "standard" "Amethyst" "Beryl" "Doder" "Ruby" "Black" "White" ] colorVariants -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { inherit pname; version = "2021-11-09"; diff --git a/third_party/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix index c20a3dfe19..8708ee2880 100644 --- a/third_party/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/whitesur-icon-theme/default.nix @@ -1,42 +1,54 @@ -{ lib, stdenvNoCC, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ lib +, stdenvNoCC +, fetchFromGitHub +, gtk3 +, hicolor-icon-theme +, jdupes +, boldPanelIcons ? false +, blackPanelIcons ? false +, themeVariants ? [] +}: + +let + pname = "Whitesur-icon-theme"; +in +lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "grey" "nord" "all" ] themeVariants stdenvNoCC.mkDerivation rec { - pname = "Whitesur-icon-theme"; - version = "2022-03-18"; + inherit pname; + version = "2022-05-11"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "iHLxZqcDLUo62J67MwZ72CSvsHHiI9/Jk31KwkgIPr4="; + sha256 = "sha256-7Bbkjbh6nZdYot0tJMWFuW1Jnl9U4KOLN/n+z92UWh4="; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ gtk3 jdupes ]; buildInputs = [ hicolor-icon-theme ]; + # These fixup steps are slow and unnecessary + dontPatchELF = true; + dontRewriteSymlinks = true; + dontDropIconThemeCache = true; + postPatch = '' + patchShebangs install.sh + ''; + installPhase = '' runHook preInstall - mkdir -p $out/share/icons/WhiteSur{,-dark}/status - echo "$out/share/icons/WhiteSur/status $out/share/icons/WhiteSur-dark/status" | xargs -n 1 cp -r src/status/{16,22,24,32,symbolic} - echo "$out/share/icons/WhiteSur $out/share/icons/WhiteSur-dark" | xargs -n 1 cp -r ./{COPYING,AUTHORS} src/index.theme src/{actions,animations,apps,categories,devices,emblems,mimes,places} links/{actions,apps,categories,devices,emblems,mimes,places,status} + ./install.sh --dest $out/share/icons \ + --name WhiteSur \ + --theme ${builtins.toString themeVariants} \ + ${lib.optionalString boldPanelIcons "--bold"} \ + ${lib.optionalString blackPanelIcons "--black"} - # Change icon color for dark theme - sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,devices,places,status}/{16,22,24}/* - sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/actions/32/* - sed -i "s/#363636/#dedede/g" $out/share/icons/WhiteSur-dark/{actions,apps,categories,emblems,devices,mimes,places,status}/symbolic/* - - for f in actions animations apps categories devices emblems mimes places status; do - ln -sf $out/share/icons/WhiteSur/$f $out/share/icons/WhiteSur/$f@2x - ln -sf $out/share/icons/WhiteSur-dark/$f $out/share/icons/WhiteSur-dark/$f@2x - done - - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done + jdupes --link-soft --recurse $out/share runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix b/third_party/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix index ad9560da9a..91b3a61aec 100644 --- a/third_party/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/geolite-legacy/default.nix @@ -1,25 +1,25 @@ { lib, stdenv, fetchurl, zstd }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "geolite-legacy"; - version = "2022-01-25"; + version = "20220621"; # We use Arch Linux package as a snapshot, because upstream database is updated in-place. geoip = fetchurl { - url = "https://archive.archlinux.org/packages/g/geoip-database/geoip-database-20220125-1-any.pkg.tar.zst"; - sha256 = "sha256-ieuLpllJTHYu28UXBGfDWbnr9Ei8pGnos+RPWDsAGcM="; + url = "https://archive.archlinux.org/packages/g/geoip-database/geoip-database-${version}-1-any.pkg.tar.zst"; + sha256 = "sha256-dmj3EtdAYVBcRnmHGNjBVyDQIKtVoubNs07zYVH9HVM="; }; extra = fetchurl { - url = "https://archive.archlinux.org/packages/g/geoip-database-extra/geoip-database-extra-20220125-1-any.pkg.tar.zst"; - sha256 = "sha256-xrTnuJvuvtvn+uIARtbuJUlHco3Q+9BXLljt35V3ip0="; + url = "https://archive.archlinux.org/packages/g/geoip-database-extra/geoip-database-extra-${version}-1-any.pkg.tar.zst"; + sha256 = "sha256-jViHQ+w9SEqFCbWf4KtNiTdWXT0RuCTjZ9dus0a3F0k="; }; nativeBuildInputs = [ zstd ]; buildCommand = '' - tar -xaf "$geoip" - tar -xaf "$extra" + tar -xaf ${geoip} + tar -xaf ${extra} mkdir -p $out/share mv usr/share/GeoIP $out/share ''; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 4bd6c541ea..0678176b57 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "0b418fc93e5dd9f19c4ca625c57e2cf984267e90", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0b418fc93e5dd9f19c4ca625c57e2cf984267e90.tar.gz", - "sha256": "0rvx383fyl39spw0qr7a1rpqnyzfsjykakia4y2z3658aw4k72cx", - "msg": "Update from Hackage at 2022-07-12T21:40:07Z" + "commit": "7a6596613e0d6549f329cb3c2862b035667e0fc3", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7a6596613e0d6549f329cb3c2862b035667e0fc3.tar.gz", + "sha256": "07sm18dn6lsi8xjhfhm7dyw62lpln9wyhafkigc6f3xaqblz3ap4", + "msg": "Update from Hackage at 2022-08-07T14:05:30Z" } diff --git a/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix index 8f5ce0d020..85f45ec516 100644 --- a/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; - version = "20220511"; + version = "20220725"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-dfk+iGZh8DWYMsPigjyvqG505AgEJbjOCpw7DQqyp3Q="; + sha256 = "sha256-SEWuAcKH8t+wIrxi1ZoUiHP/xKZz9RAgViZXQm1jKs0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix index bde4188154..ba912854f7 100644 --- a/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/osinfo-db/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "osinfo-db"; - version = "20220516"; + version = "20220727"; src = fetchurl { url = "https://releases.pagure.org/libosinfo/${pname}-${version}.tar.xz"; - sha256 = "sha256-1g9p2K/J3MU9dqL7aNVMJtH9w6giuVwYAd5Yw8Zs2m0="; + sha256 = "sha256-IpHlI07Ymagww28rQFb/XnYjX0uge1k0IfSGUpBjTV4="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.com/libosinfo/osinfo-db/"; changelog = "https://gitlab.com/libosinfo/osinfo-db/-/commits/v${version}"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix b/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix index ce55a28aca..92bfe362bc 100644 --- a/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/papirus-folders/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, getent }: stdenv.mkDerivation rec { pname = "papirus-folders"; @@ -11,8 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZZMEZCWO+qW76eqa+TgxWGVz69VkSCPcttLoCrH7ppY="; }; + buildInputs = [ + getent + ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + patchPhase = '' + substituteInPlace ./papirus-folders --replace "getent" "${getent}/bin/getent" + ''; + meta = with lib; { description = "A tool to change papirus icon theme color"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix b/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix index a2d2849bac..197793db6c 100644 --- a/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/shared-mime-info/default.nix @@ -13,17 +13,17 @@ }: stdenv.mkDerivation rec { - pname = "shared-mime-info-unstable"; - version = "2021-12-03"; + pname = "shared-mime-info"; + version = "2.2"; outputs = [ "out" "dev" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "xdg"; - repo = "shared-mime-info"; - rev = "5a406b06792e26a83c7346b3c2443c0bd8d4cdb2"; - sha256 = "1v7dx7mr0m4lcff1aasg9gxn280zn0ffn6fjg9xc44pnllg01n6s"; + repo = pname; + rev = version; + sha256 = "sha256-QrRe/DcjpTMejHXDSOLbjpJywod8qIjP6/leTZ21rhE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/unihan-database/default.nix b/third_party/nixpkgs/pkgs/data/misc/unihan-database/default.nix index 02632b9264..8fb065d6b0 100644 --- a/third_party/nixpkgs/pkgs/data/misc/unihan-database/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/unihan-database/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "unihan-database"; - version = "12.1.0"; + version = "14.0.0"; src = fetchurl { url = "https://www.unicode.org/Public/zipped/${version}/Unihan.zip"; - sha256 = "1kfdhgg2gm52x3s07bijb5cxjy0jxwhd097k5lqhvzpznprm6ibf"; + hash = "sha256-KuRRmyuCzU0VN5wX5Xv7EsM8D1TaSXfeA7KwS88RhS0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix index 5323348c2f..8fc5d74485 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20220708161253"; + version = "20220808014309"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - sha256 = "sha256-RLfb4DmigoQAKp00RHjGKGjQhCHqxSOLNnphiv1ub8s="; + sha256 = "sha256-pqe6AjXDTN71tShD41/tQFljRiH7qJaZ8w5lcTs6dxk="; }; vendorSha256 = "sha256-Igx8yGWWVmVEogvbrosaK13LVs+ZZuYLBNji7iSfzdo="; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix index 790c323e57..0788bff7f3 100644 --- a/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202207070057"; + version = "202208040058"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "cbabee03cf7b7b60b1167a8a14ba1eba9d9dbb77"; - sha256 = "sha256-bWhsV7+aj75nd8NDeb5D5UjvCChhtXq9lpkaZN41wDk="; + rev = "97174fe0eeb28838b0e5e805687d230df773e661"; + sha256 = "sha256-hodJ4HQHbv9voSS847pAHd3YSmfkV7fKyJhEUApVN+w="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/data/themes/arc-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/arc-kde/default.nix index de863524aa..267e1b8b8b 100644 --- a/third_party/nixpkgs/pkgs/data/themes/arc-kde/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/arc-kde/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "arc-kde-theme"; - version = "20220706"; + version = "20220810"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "arc-kde"; rev = version; - sha256 = "sha256-k/+VhqvOg3wkqal7q7nSVpubK/yHnNoTUUWhnxwcIjM="; + sha256 = "sha256-atL0sW3AedQl7PabOQOjeJ5U8a4/J4x0rxFCbxJ4ONA="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix b/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix index ec8c931002..b9bc042dd0 100644 --- a/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/default.nix @@ -6,22 +6,22 @@ , gtk-engine-murrine , sassc , which -, tweaks ? [ ] # can be "nord" "black" "rimless". cannot mix "nord" and "black" -, size ? "standard" # can be "standard" "compact" +, tweaks ? [ ] +, size ? "standard" }: let validSizes = [ "standard" "compact" ]; - validTweaks = [ "nord" "black" "rimless" ]; + validTweaks = [ "nord" "dracula" "black" "rimless" "normal" ]; unknownTweaks = lib.subtractLists validTweaks tweaks; - illegalMix = !(lib.elem "nord" tweaks) && !(lib.elem "black" tweaks); + illegalMix = !(lib.elem "nord" tweaks) && !(lib.elem "dracula" tweaks); assertIllegal = lib.assertMsg illegalMix '' - Tweaks "nord" and "black" cannot be mixed. Tweaks: ${toString tweaks} + Tweaks "nord" and "dracula" cannot be mixed. Tweaks: ${toString tweaks} ''; assertSize = lib.assertMsg (lib.elem size validSizes) '' - You entered wrong size: ${size} + You entered a wrong size: ${size} Valid sizes are: ${toString validSizes} ''; @@ -37,13 +37,13 @@ assert assertUnknown; stdenvNoCC.mkDerivation rec { pname = "catppuccin-gtk"; - version = "unstable-2022-02-24"; + version = "unstable-2022-08-01"; src = fetchFromGitHub { repo = "gtk"; owner = "catppuccin"; - rev = "359c584f607c021fcc657ce77b81c181ebaff6de"; - sha256 = "sha256-AVhFw1XTnkU0hoM+UyjT7ZevLkePybBATJUMLqRytpk="; + rev = "87a79fd2bf07accc694455df30a32a82b1b31f4f"; + sha256 = "sha256-dKHTQva0BYkO6VPNfY/pzRn/V1ghX+tYqbnM9hTAMeE="; }; nativeBuildInputs = [ gtk3 sassc which ]; @@ -52,25 +52,17 @@ stdenvNoCC.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - patches = [ - # Allows installing with `-t all`. Works around missing grey assets. - # https://github.com/catppuccin/gtk/issues/17 - ./grey-fix.patch - ]; - postPatch = '' - patchShebangs --build scripts/* - substituteInPlace Makefile \ - --replace '$(shell git rev-parse --show-toplevel)' "$PWD" - substituteInPlace 'scripts/install.sh' \ - --replace '$(git rev-parse --show-toplevel)' "$PWD" + patchShebangs --build clean-old-theme.sh install.sh ''; installPhase = '' runHook preInstall + export HOME=$(mktemp -d) + mkdir -p $out/share/themes - bash scripts/install.sh -d $out/share/themes -t all \ + bash install.sh -d $out/share/themes -t all \ ${lib.optionalString (size != "") "-s ${size}"} \ ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} @@ -78,7 +70,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = with lib; { - description = "Soothing pastel theme for GTK3"; + description = "Soothing pastel theme for GTK"; homepage = "https://github.com/catppuccin/gtk"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/grey-fix.patch b/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/grey-fix.patch deleted file mode 100644 index 73f7d8fa65..0000000000 --- a/third_party/nixpkgs/pkgs/data/themes/catppuccin-gtk/grey-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/scripts/install.sh b/scripts/install.sh -index d2a2b86..bd05c93 100755 ---- a/scripts/install.sh -+++ b/scripts/install.sh -@@ -20,7 +20,7 @@ fi - SASSC_OPT="-M -t expanded" - - THEME_NAME=Catppuccin --THEME_VARIANTS=('' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal' '-grey') -+THEME_VARIANTS=('' '-purple' '-pink' '-red' '-orange' '-yellow' '-green' '-teal') - COLOR_VARIANTS=('' '-light' '-dark') - SIZE_VARIANTS=('' '-compact') diff --git a/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix new file mode 100644 index 0000000000..dabe19d68d --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/colloid-gtk-theme/default.nix @@ -0,0 +1,76 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +, gnome-themes-extra +, gtk-engine-murrine +, jdupes +, sassc +, themeVariants ? [] # default: blue +, colorVariants ? [] # default: all +, sizeVariants ? [] # default: standard +, tweaks ? [] +}: + +let + pname = "colloid-gtk-theme"; + +in +lib.checkListOfEnum "${pname}: theme variants" [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "grey" "all" ] themeVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants +lib.checkListOfEnum "${pname}: tweaks" [ "nord" "black" "dracula" "rimless" "normal" ] tweaks + +stdenvNoCC.mkDerivation rec { + inherit pname; + version = "2022-07-18"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + hash = "sha256-dWYRTwfQRMBdg+htxpWatF325rToaovF/43LxX6I1GI="; + }; + + nativeBuildInputs = [ + jdupes + sassc + ]; + + buildInputs = [ + gnome-themes-extra + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + postPatch = '' + patchShebangs install.sh clean-old-theme.sh + ''; + + installPhase = '' + runHook preInstall + + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \ + ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ + --dest $out/share/themes + + jdupes --link-soft --recurse $out/share + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + description = "A modern and clean Gtk theme"; + homepage = "https://github.com/vinceliuice/Colloid-gtk-theme"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/colloid-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/colloid-kde/default.nix new file mode 100644 index 0000000000..ebfc339ead --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/colloid-kde/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +}: + +stdenvNoCC.mkDerivation rec { + pname = "colloid-kde"; + version = "unstable-2022-07-13"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = "eaf6844e997aa60c755af7ea560ffba798e72ff5"; + hash = "sha256-FNTG5aVvTWHqNVVR23LFG/ykPtXRD7oH5C6eyWaqc60="; + }; + + postPatch = '' + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.local' $out \ + --replace '$HOME/.config' $out/share + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/latte + + name= HOME="$TMPDIR" \ + ./install.sh --dest $out/share/themes + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + description = "A clean and concise theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/Colloid-kde-theme"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix b/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix index c4e133668b..23e3ce8322 100644 --- a/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/flat-remix-gnome/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20220524"; + version = "20220622"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-m7Er6F0VWcdV3+oUPfhJJq80oaht15hBFtg7JQgZJI8="; + hash = "sha256-fm1YOKI6TLkCnkkPZkp8I0xWkNrZt4sVktYZyD5foKU="; }; nativeBuildInputs = [ glib fake-dconf ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix index 1e9f9041ca..e9819fae1d 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "13.0"; + version = "14.0"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "sha256-aP/zPM7M8Oru/2AA8w6rKU/AVJJ0bAEC01C60yi2SbM="; + sha256 = "sha256-G8oarWGx4DQ8ftmaWYpzV94cabDXbiJcVVgs70AG0Gs="; }; buildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = gitUpdater {inherit pname version; }; + passthru.updateScript = gitUpdater { inherit pname version; }; meta = with lib; { description = "GTK theme supporting Budgie, Pantheon, Mate, Xfce4 and GNOME desktops"; diff --git a/third_party/nixpkgs/pkgs/data/themes/materia-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/materia-kde/default.nix index 67efef725a..1a3f6dc36e 100644 --- a/third_party/nixpkgs/pkgs/data/themes/materia-kde/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/materia-kde/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "materia-kde-theme"; - version = "20220607"; + version = "20220714"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "materia-kde"; rev = version; - sha256 = "sha256-xshkp1Y5V8A3Fj4HCkmFpWcw3xEuNyRJqOLBkIKhwpQ="; + sha256 = "sha256-/LA+H2ekxuO1RpfaPJruRGeWPVopA0rZUxU4Mh7YQ0s="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/omni-gtk-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/omni-gtk-theme/default.nix new file mode 100644 index 0000000000..b216eff619 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/omni-gtk-theme/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation { + pname = "omni-gtk-theme"; + version = "unstable-2021-03-30"; + + src = fetchFromGitHub { + owner = "getomni"; + repo = "gtk"; + rev = "e81b3fbebebf53369cffe1fb662abc400edb04f7"; + sha256 = "sha256-NSZjkG+rY6h8d7FYq5kipPAjMDAgyaYAgOOOJlfqBCI="; + }; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/themes/Omni + cp -a {assets,gnome-shell,gtk-2.0,gtk-3.0,gtk-3.20,index.theme,metacity-1,unity,xfwm4} $out/share/themes/Omni + + runHook postInstall + ''; + + meta = with lib; { + description = "Dark theme created by Rocketseat"; + homepage = "https://github.com/getomni/gtk"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ zoedsoupe ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix index ea8603020c..da647306ed 100644 --- a/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/orchis-theme/default.nix @@ -21,13 +21,13 @@ assert lib.assertMsg (unknownTweaks == [ ]) '' stdenvNoCC.mkDerivation rec { pname = "orchis-theme"; - version = "2022-05-29"; + version = "2022-07-20"; src = fetchFromGitHub { repo = "Orchis-theme"; owner = "vinceliuice"; rev = version; - sha256 = "sha256-F4kqQ1B8JNo2TAdGFondAtQu5C/6os9SQ8NS2gfRCQM="; + sha256 = "sha256-0T9D42XwyvIb5XeXdqXbyahVHNcSeT469lSgWSisNvA="; }; nativeBuildInputs = [ gtk3 sassc ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix new file mode 100644 index 0000000000..30ef4ed82d --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, gitUpdater +}: + +stdenvNoCC.mkDerivation rec { + pname = "qogir-kde"; + version = "unstable-2022-07-08"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = "f240eae10978c7fee518f7a8be1c41a21a9d5c2e"; + hash = "sha256-AV60IQWwgvLwDO3ylILwx1DkKadwo4isn3JX3WpKoxQ="; + }; + + postPatch = '' + patchShebangs install.sh + + substituteInPlace install.sh \ + --replace '$HOME/.local' $out \ + --replace '$HOME/.config' $out/share + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/plasma/plasmoids + + name= HOME="$TMPDIR" ./install.sh --dest $out/share/themes + + mkdir -p $out/share/sddm/themes + cp -a sddm/Qogir $out/share/sddm/themes/ + + runHook postInstall + ''; + + passthru.updateScript = gitUpdater { inherit pname version; }; + + meta = with lib; { + description = "A flat Design theme for KDE Plasma desktop"; + homepage = "https://github.com/vinceliuice/Qogir-kde"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix b/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix index b447ab4230..f6ea2c61aa 100644 --- a/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/qogir/default.nix @@ -1,27 +1,40 @@ { lib , stdenv , fetchFromGitHub +, gitUpdater , gdk-pixbuf , gnome-themes-extra , gtk-engine-murrine +, jdupes , librsvg , sassc , which -, gitUpdater +, themeVariants ? [] # default: blue +, colorVariants ? [] # default: all +, tweaks ? [] }: -stdenv.mkDerivation rec { +let pname = "qogir-theme"; - version = "2022-05-29"; + +in +lib.checkListOfEnum "${pname}: theme variants" [ "default" "manjaro" "ubuntu" "all" ] themeVariants +lib.checkListOfEnum "${pname}: color variants" [ "standard" "light" "dark" ] colorVariants +lib.checkListOfEnum "${pname}: tweaks" [ "image" "square" "round" ] tweaks + +stdenv.mkDerivation rec { + inherit pname; + version = "2022-07-17"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "z8o/1Qc7XmefX9CuVr0Gq2MmKw2NlkUk+5Lz0Z593do="; + sha256 = "NGgTToaSJBwmHnZjWbJ3dSJg9Mmfchj3W0xgK0CMb9M="; }; nativeBuildInputs = [ + jdupes sassc which ]; @@ -36,13 +49,29 @@ stdenv.mkDerivation rec { gtk-engine-murrine # murrine engine for Gtk2 ]; + postPatch = '' + patchShebangs install.sh clean-old-theme.sh + ''; + installPhase = '' - patchShebangs . + runHook preInstall + mkdir -p $out/share/themes - name= HOME="$TMPDIR" ./install.sh -t all -d $out/share/themes + + name= HOME="$TMPDIR" ./install.sh \ + ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \ + ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \ + ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \ + --dest $out/share/themes + mkdir -p $out/share/doc/${pname} cp -a src/firefox $out/share/doc/${pname} + rm $out/share/themes/*/{AUTHORS,COPYING} + + jdupes --link-soft --recurse $out/share + + runHook postInstall ''; passthru.updateScript = gitUpdater { inherit pname version; }; diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix b/third_party/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix index c7c6bebb70..bd39c0843a 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/arcan/clone-sources.nix @@ -3,23 +3,23 @@ letoram-openal-src = fetchFromGitHub { owner = "letoram"; repo = "openal"; - rev = "1c7302c580964fee9ee9e1d89ff56d24f934bdef"; - hash = "sha256-InqU59J0zvwJ20a7KU54xTM7d76VoOlFbtj7KbFlnTU="; + rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a"; + sha256 = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420="; }; freetype-src = fetchgit { url = "git://git.sv.nongnu.org/freetype/freetype2.git"; - rev = "94cb3a2eb96b3f17a1a3bd0e6f7da97c0e1d8f57"; - sha256 = "sha256-LzjqunX/T8khF2UjPlPYiQOwMGem8MqPYneR2LdZ5Fg="; + rev = "275b116b40c9d183d42242099ea9ff276985855b"; + sha256 = "sha256-YVyJttaXt19MSuD0pmazwxNKz65jcqqWvIgmDj4d3MA="; }; libuvc-src = fetchFromGitHub { owner = "libuvc"; repo = "libuvc"; - rev = "b2b01ae6a2875d05c99eb256bb15815018d6e837"; - sha256 = "sha256-2zCTjyodRARkHM/Q0r4bdEH9LO1Z9xPCnY2xE4KZddA="; + rev = "a4de53e7e265f8c6a64df7ccd289f318104e1916"; + hash = "sha256-a+Q0PTV4ujGnX55u49VJfMgQljZunZYRvkR0tIkGnHI="; }; luajit-src = fetchgit { url = "https://luajit.org/git/luajit-2.0.git"; - rev = "d3294fa63b344173db68dd612c6d3801631e28d4"; - sha256 = "sha256-1iHBXcbYhWN4M8g5oH09S1j1WrjYzI6qcRbHsdfpRkk="; + rev = "899093a9e0fa5b16f27016381ef4b15529dadff2"; + sha256 = "sha256-bCi1ms78HCOOgStIY2tSGM9LUEX3qnwadLLeYWWu1KI="; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/default.nix b/third_party/nixpkgs/pkgs/desktops/arcan/arcan/default.nix index a15d5ac6be..0cd7e4e0db 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/arcan/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/arcan/default.nix @@ -8,7 +8,10 @@ , ffmpeg , file , freetype +, glib +, gumbo , harfbuzz +, jbig2dec , leptonica , libGL , libX11 @@ -24,11 +27,14 @@ , libvncserver , libxcb , libxkbcommon -, lua +, lua5_1 , luajit , makeWrapper , mesa +, mupdf , openal +, openjpeg +, pcre , pkg-config , sqlite , tesseract @@ -46,15 +52,15 @@ , useStaticSqlite ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; - version = "0.6.1.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "letoram"; repo = "arcan"; - rev = version; - hash = "sha256-+dJaBSKGbHOwzA26/jDyh2UF9YRwGUcysJIeAM4kvfc="; + rev = finalAttrs.version; + hash = "sha256-Qwyt927eLqaCqJ4Lo4J1lQX2A24ke+AH52rmSCTnpO0="; }; nativeBuildInputs = [ @@ -71,7 +77,10 @@ stdenv.mkDerivation rec { ffmpeg file freetype + glib + gumbo harfbuzz + jbig2dec leptonica libGL libX11 @@ -87,10 +96,13 @@ stdenv.mkDerivation rec { libvncserver libxcb libxkbcommon - lua + lua5_1 luajit mesa + mupdf.dev openal + openjpeg.dev + pcre sqlite tesseract valgrind @@ -144,8 +156,8 @@ stdenv.mkDerivation rec { substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID" ''; - # INFO: According to the source code, the manpages need to be generated before - # the configure phase + # INFO: Arcan build scripts require the manpages to be generated + # before the configure phase preConfigure = lib.optionalString buildManPages '' pushd doc ruby docgen.rb mangen @@ -156,7 +168,7 @@ stdenv.mkDerivation rec { "-DBUILD_PRESET=everything" # The upstream project recommends tagging the distribution "-DDISTR_TAG=Nixpkgs" - "-DENGINE_BUILDTAG=${version}" + "-DENGINE_BUILDTAG=${finalAttrs.version}" "-DHYBRID_SDL=on" "-DBUILTIN_LUA=${if useBuiltinLua then "on" else "off"}" "-DDISABLE_JIT=${if useBuiltinLua then "on" else "off"}" @@ -184,4 +196,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/durden/default.nix b/third_party/nixpkgs/pkgs/desktops/arcan/durden/default.nix index 362e2b7082..d5e9d0693c 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/durden/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/durden/default.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalPackages: { pname = "durden"; - version = "0.6.1+date=2022-05-23"; + version = "unstable-2022-07-16"; src = fetchFromGitHub { owner = "letoram"; - repo = pname; - rev = "9284182bd8b3b976387cd6494c5f605633a559fc"; - hash = "sha256-K1MjgNyX6qlaHya6Grej0cagORihS35BWECWn2HcRCk="; + repo = "durden"; + rev = "4c9eaf1550d34e10565b545e0f96b1f6b8d26dcd"; + hash = "sha256-1d+Kg17nxNQeVT/iVa5oPXu96Ivvas9AO/H+NxhB4Yo="; }; dontConfigure = true; @@ -40,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix b/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix index 86ab425964..6954f157d6 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/pipeworld/default.nix @@ -3,13 +3,13 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalPackages: { pname = "pipeworld"; - version = "0.pre+date=2022-04-03"; + version = "unstable-2022-04-03"; src = fetchFromGitHub { owner = "letoram"; - repo = pname; + repo = "pipeworld"; rev = "f60d0b93fcd5462f47b1c928c109f5b4cbd74eef"; hash = "sha256-PNziP5LaUODZwtAHvg8uYt/EyoD3mB5aWIfp7n5a82E="; }; @@ -47,4 +47,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/prio/default.nix b/third_party/nixpkgs/pkgs/desktops/arcan/prio/default.nix index 406aea740f..cc5bef3c3e 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/prio/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/prio/default.nix @@ -3,13 +3,13 @@ , fetchFromGitHub }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalPackages: { pname = "prio"; - version = "0.pre+date=2018-09-13"; + version = "unstable-2018-09-13"; src = fetchFromGitHub { owner = "letoram"; - repo = pname; + repo = finalPackages.pname; rev = "c3f97491339d15f063d6937d5f89bcfaea774dd1"; hash = "sha256-Idv/duEYmDk/rO+TI8n+FY3VFDtUEh8C292jh12BJuM="; }; @@ -34,4 +34,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/desktops/arcan/xarcan/default.nix b/third_party/nixpkgs/pkgs/desktops/arcan/xarcan/default.nix index 0668754d6a..b979b64a06 100644 --- a/third_party/nixpkgs/pkgs/desktops/arcan/xarcan/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/arcan/xarcan/default.nix @@ -36,15 +36,15 @@ , xtrans }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalPackages: { pname = "xarcan"; - version = "0.6.0+date=2021-08-26"; + version = "unstable-2022-06-14"; src = fetchFromGitHub { owner = "letoram"; - repo = pname; - rev = "e40f0176e495ffdad6e7405c58378df6532eb70d"; - hash = "sha256-T+1oL7P5MTDkeSfW6OXc1OgfZ8E6e/4YRonf1eXcfIA="; + repo = "xarcan"; + rev = "02111f4925453c0c545e9193c6a5e22c0d4e98c3"; + hash = "sha256-rp2sNRbv0OZdfyqZfsv/v3TGQY5uyXWqbvlmUDd7iBk="; }; nativeBuildInputs = [ @@ -116,4 +116,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix index 56cf5a0ff5..bc60bc6bf9 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/bulky/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , wrapGAppsHook , python3 +, gobject-introspection , gsettings-desktop-schemas , gettext , gtk3 @@ -12,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bulky"; - version = "1.9"; + version = "2.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "bulky"; rev = version; - hash = "sha256-OCBFhlnEXZROp47KDiy7Y6l4GDVCCP+i1IFYQa7esyg="; + hash = "sha256-ynPorkhT/LUkFGNRG6JLDYaQjNPm2vMzthvl0wr7J/M="; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ (python3.withPackages (p: with p; [ pygobject3 magic setproctitle ])) + gobject-introspection gsettings-desktop-schemas gtk3 glib @@ -50,6 +52,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + postInstall = '' + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + meta = with lib; { description = "Bulk rename app"; homepage = "https://github.com/linuxmint/bulky"; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 303443cc5f..3581355387 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -1,6 +1,5 @@ { atk , cacert -, fetchpatch , dbus , cinnamon-control-center , cinnamon-desktop @@ -8,11 +7,13 @@ , cinnamon-session , cinnamon-translations , cjs +, clutter , fetchFromGitHub , gdk-pixbuf , libgnomekbd , glib , gobject-introspection +, gsound , gtk3 , intltool , json-glib @@ -34,7 +35,7 @@ , python3 , keybinder3 , cairo -, xapps +, xapp , upower , nemo , libnotify @@ -47,41 +48,51 @@ , meson , ninja , gst_all_1 +, perl }: stdenv.mkDerivation rec { pname = "cinnamon-common"; - version = "5.2.0"; + version = "5.4.9"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon"; rev = version; - hash = "sha256-B2Du2zis0xWeeyh3kSyz1doWImk9Fuk4qQ8HNZZdqdw="; + hash = "sha256-nM87NO/dwOd+hN5/3zX7XUjyKvXh4uDhLcGFcKE9ccA="; }; patches = [ ./use-sane-install-dir.patch ./libdir.patch - - (fetchpatch { - url = "https://github.com/linuxmint/cinnamon/commit/77ed66050f7df889fcb7a10b702c7b8bcdeaa130.patch"; - sha256 = "sha256-OegLxz6Xr/nxVwVOAd2oOY62ohZ3r6uYn1+YED5EBHQ="; - }) ]; buildInputs = [ - # TODO: review if we really need this all - (python3.withPackages (pp: with pp; [ dbus-python setproctitle pygobject3 pycairo xapp pillow pytz tinycss2 python-pam pexpect distro requests ])) + (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 gdk-pixbuf glib + gsound gtk3 json-glib libsoup @@ -101,7 +112,7 @@ stdenv.mkDerivation rec { gnome.caribou keybinder3 upower - xapps + xapp timezonemap nemo libnotify @@ -120,6 +131,7 @@ stdenv.mkDerivation rec { wrapGAppsHook intltool gtk-doc + perl ]; # use locales from cinnamon-translations (not using --localedir because datadir is used) @@ -135,8 +147,8 @@ stdenv.mkDerivation rec { sed "s|/usr/share/sounds|/run/current-system/sw/share/sounds|g" -i ./files/usr/share/cinnamon/cinnamon-settings/bin/SettingsWidgets.py - sed "s|/usr/bin/upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py - sed "s|upload-system-info|${xapps}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|/usr/bin/upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py + sed "s|upload-system-info|${xapp}/bin/upload-system-info|g" -i ./files/usr/share/cinnamon/cinnamon-settings/modules/cs_info.py sed "s|/usr/bin/cinnamon-control-center|${cinnamon-control-center}/bin/cinnamon-control-center|g" -i ./files/usr/bin/cinnamon-settings # this one really IS optional @@ -151,6 +163,8 @@ stdenv.mkDerivation rec { sed "s| cinnamon-session| ${cinnamon-session}/bin/cinnamon-session|g" -i ./files/usr/bin/cinnamon-session-cinnamon -i ./files/usr/bin/cinnamon-session-cinnamon2d sed "s|/usr/bin|$out/bin|g" -i ./files/usr/share/xsessions/cinnamon.desktop ./files/usr/share/xsessions/cinnamon2d.desktop + + patchShebangs src/data-to-c.pl ''; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index a105f39ac4..dded4a9ff6 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -14,10 +14,10 @@ , polkit , libxkbfile , cinnamon-menus -, dbus-glib , libgnomekbd , libxklavier , networkmanager +, libgudev , libwacom , gnome , wrapGAppsHook @@ -31,17 +31,18 @@ , ninja , cinnamon-translations , python3 +, upower }: stdenv.mkDerivation rec { pname = "cinnamon-control-center"; - version = "5.2.0"; + version = "5.4.6"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-j7+2uLcHr7bO7i8OGqkw3ifawZULNyihhJ+h2D5gx/k="; + hash = "sha256-8BDmQT/xDnpwR2YC0TGaqWPnZ61IBmVvft2Mcf6YN+A="; }; buildInputs = [ @@ -51,12 +52,12 @@ stdenv.mkDerivation rec { libnotify cinnamon-menus libxml2 - dbus-glib polkit libgnomekbd libxklavier colord cinnamon-settings-daemon + libgudev libwacom gnome-online-accounts tzdata @@ -66,6 +67,7 @@ stdenv.mkDerivation rec { xorg.libXxf86misc xorg.libxkbfile gdk-pixbuf + upower ]; /* ./panels/datetime/test-timezone.c:4:#define TZ_DIR "/usr/share/zoneinfo/" diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix index ec786c7bac..0b9e10e740 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-desktop/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-desktop"; - version = "5.2.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-gOlSmcHjBjnLdDpgC5mZ4M3eUBTG3BuET6Kr/Xby14A="; + hash = "sha256-U05JiW6PaRAEEQ/uq3wmZSQGohMz4M86Ji9pBl2Azg8="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix index 3066d7fcd8..a345675504 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-gsettings-overrides/default.nix @@ -10,7 +10,7 @@ , muffin , nemo -, xapps +, xapp , cinnamon-desktop , cinnamon-session , cinnamon-settings-daemon @@ -28,7 +28,7 @@ let bulky muffin nemo - xapps + xapp cinnamon-desktop cinnamon-session cinnamon-settings-daemon diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix index 99008b4726..c3a60d6847 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-menus/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-menus"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-ioluv/GdWCNGP2jQqsyEbHncCFm8iu69yR8QVKQTJk8="; + hash = "sha256-Q4bgaX8nGSWHKHR3+hFTlHtNhSmZW8ZEHi8DaXKQ+fM="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 3d84a6a062..5f0ace4ad1 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -21,20 +21,21 @@ , pam , accountsservice , cairo -, xapps +, xapp +, xdotool , xorg , iso-flags-png-320x420 }: stdenv.mkDerivation rec { pname = "cinnamon-screensaver"; - version = "5.2.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-weQ5sw5SY89JFIxamCeLiSLy8xCXGg0Yxj/5Ca5r+6o="; + hash = "sha256-GRa3ChUCL/AFDg1F01DNwkC4tmrNaOWoOXwFvwpvSck="; }; nativeBuildInputs = [ @@ -60,8 +61,14 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXrandr - (python3.withPackages (pp: with pp; [ pygobject3 setproctitle xapp pycairo ])) - xapps + (python3.withPackages (pp: with pp; [ + pygobject3 + setproctitle + python3.pkgs.xapp # The scope prefix is required + pycairo + ])) + xapp + xdotool pam accountsservice cairo @@ -74,11 +81,6 @@ stdenv.mkDerivation rec { iso-flags-png-320x420 ]; - mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - ]; - postPatch = '' # cscreensaver hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 91c03796a8..261433e658 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -3,8 +3,6 @@ , cinnamon-settings-daemon , cinnamon-translations , dbus-glib -, docbook_xsl -, docbook_xml_dtd_412 , glib , gsettings-desktop-schemas , gtk3 @@ -19,8 +17,7 @@ , stdenv , systemd , wrapGAppsHook -, xapps -, xmlto +, xapp , xorg , libexecinfo , pango @@ -28,13 +25,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "5.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-E5ascwLnpa5NSBAPo9dXRhoraUntzDPHVV32uDU4U8k="; + hash = "sha256-m16nf3eC15ZT8eDvRTylBfxsnShkU1Sm8J9qcRGeGQo="; }; patches = [ @@ -49,7 +46,7 @@ stdenv.mkDerivation rec { pango xorg.libX11 xorg.libXext - xapps + xapp xorg.libXau xorg.libXcomposite @@ -73,18 +70,12 @@ stdenv.mkDerivation rec { ninja wrapGAppsHook libexecinfo - docbook_xsl - docbook_xml_dtd_412 python3 pkg-config libxslt - xmlto ]; mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" - "-Dgconf=false" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix index bf83c3d9f5..ed947ee2b5 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-settings-daemon/default.nix @@ -12,7 +12,6 @@ , libxklavier , wrapGAppsHook , pkg-config -, pulseaudio , lib , stdenv , systemd @@ -22,7 +21,6 @@ , polkit , librsvg , libwacom -, xf86_input_wacom , xorg , fontconfig , tzdata @@ -30,28 +28,17 @@ , libgudev , meson , ninja -, dbus -, dbus-glib }: stdenv.mkDerivation rec { pname = "cinnamon-settings-daemon"; - version = "5.2.0"; - - /* csd-power-manager.c:50:10: fatal error: csd-power-proxy.h: No such file or directory - #include "csd-power-proxy.h" - ^~~~~~~~~~~~~~~~~~~ - compilation terminated. */ - - # but this occurs only sometimes, so disabling parallel building - # also see https://github.com/linuxmint/cinnamon-settings-daemon/issues/248 - enableParallelBuilding = false; + version = "5.4.5"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-6omif4UxMrXWxL+R9lQ8ogxotW+3E9Kp99toH3PJtaU="; + hash = "sha256-qjI1z1MuaI5JFqjHap/+aYDQ0YuP9VNnnY6vy/AaKqs="; }; patches = [ @@ -59,8 +46,6 @@ stdenv.mkDerivation rec { ./use-sane-install-dir.patch ]; - mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - buildInputs = [ cinnamon-desktop colord @@ -72,7 +57,6 @@ stdenv.mkDerivation rec { libgnomekbd libnotify libxklavier - pulseaudio systemd upower dconf @@ -80,17 +64,13 @@ stdenv.mkDerivation rec { polkit librsvg libwacom - xf86_input_wacom xorg.libXext xorg.libX11 xorg.libXi - xorg.libXtst xorg.libXfixes fontconfig nss libgudev - dbus - dbus-glib ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix index f9337f7649..195d0268f3 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cinnamon-translations/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-translations"; - version = "5.2.0"; + version = "5.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-t3PydmS2+LU++2NcosgMr9KTXW0Qy1Re9+YcS3KMDi8="; + hash = "sha256-vt60qarNfTX9R5kGOeUBCskKK2zLdEE+ACT0EGvUeao="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix index 3ac4483c5c..74b1053818 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/cjs/default.nix @@ -8,7 +8,7 @@ , python3 , cairo , gnome -, xapps +, xapp , keybinder3 , upower , callPackage @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "cjs"; - version = "5.2.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cjs"; rev = version; - hash = "sha256-06sTk513qVMdznSHJzzB3XIPTcfjgxTB2o+ALqwPpHM="; + hash = "sha256-8LIVM9+Wt9V7iKUwqTBUTf8LiQ16NE3CYtCJknjl56o="; }; outputs = [ "out" "dev" ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { gnome.caribou keybinder3 upower - xapps + xapp ]; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/default.nix index 7f9d332ed1..5a803c6d48 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ config, pkgs, lib }: lib.makeScope pkgs.newScope (self: with self; { iso-flags-png-320x420 = pkgs.iso-flags.overrideAttrs (p: p // { @@ -31,8 +31,11 @@ lib.makeScope pkgs.newScope (self: with self; { mint-y-icons = callPackage ./mint-y-icons { }; muffin = callPackage ./muffin { }; pix = callPackage ./pix { }; - xapps = callPackage ./xapps { }; + xapp = callPackage ./xapp { }; warpinator = callPackage ./warpinator { }; xreader = callPackage ./xreader { }; xviewer = callPackage ./xviewer { }; -}) +}) // lib.optionalAttrs config.allowAliases { + # Aliases need to be outside the scope or they will shadow the attributes from parent scope. + xapps = pkgs.cinnamon.xapp; # added 2022-07-27 +} diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix index abc7c172cb..16ad172940 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-artwork/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mint-artwork"; - version = "1.5.4"; + version = "1.6.0"; src = fetchurl { url = "http://packages.linuxmint.com/pool/main/m/mint-artwork/mint-artwork_${version}.tar.xz"; - hash = "sha256-ZRJK1fzIF36BdUlVhLwdFdfgQvN2ashzjgpCxoOIbK8="; + hash = "sha256-un5T56zzN2vRVp42RHczDEKwrweSeygASkFJU5LXCDo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix index f25cb9df2f..bfb2d74e8e 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-themes/default.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "mint-themes"; - version = "1.8.8"; + version = "2.0.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "a833fba6917043bf410dee4364c9a36af1ce4c83"; - hash = "sha256-8abjjD0XoApvqB8SNlWsqIEp7ozgiERGS0kWglw2DWA="; + rev = "73d6cfea807ea84a645f43424c60916cb6214693"; + hash = "sha256-WyEabE3K7xuBzXuLqJO0N4nxrc67bKT5YD9yn/bELl0="; }; nativeBuildInputs = [ @@ -29,8 +29,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall mkdir -p $out mv usr/share $out + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix index bfcc95c4ff..2a57e0571e 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "mint-x-icons"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "286eb4acdfc3e3c77572dfd0cd70ffd4208d3a35"; - hash = "sha256-mZkCEBC1O2mW8rM1kpOWdC5CwIeafyBS95cMY6x1yco="; + rev = "4ab3c314db1b3751d87d5769629b28ac0ca3c671"; + hash = "sha256-cPRae3EjzVtAL1Ei2LB4UNUU/m87mFT94xY/NnNR6JM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix index c1afd2828d..212de96462 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "mint-y-icons"; - version = "1.5.8"; + version = "1.6.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; # they don't exactly do tags, it's just a named commit - rev = "9489bd161e9503d071227dd36057386a34cfc0a3"; - hash = "sha256-53yTCWNSJjCpVvrxLfsiaCPNDEZWxJgGVAmVNMNql2M="; + rev = "57d16eb85f2af40be17e2232d279bb65b689f5b7"; + hash = "sha256-voFYz0MiuqyNSngi4QZUJKDIjggQWOAV5B30zMP8iTk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix index 6f35d6b590..bf385a8186 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/default.nix @@ -1,100 +1,104 @@ -{ fetchFromGitHub +{ stdenv +, lib +, fetchFromGitHub +, substituteAll +, cairo , cinnamon-desktop +, dbus +, desktop-file-utils , glib -, file , gnome -, gnome-doc-utils -, fetchpatch , gobject-introspection +, graphene , gtk3 -, intltool , json-glib +, libcanberra +, libdrm +, libgnomekbd +, libgudev , libinput , libstartup_notification -, libXtst +, libwacom +, libXdamage , libxkbcommon +, libXtst +, mesa +, meson +, ninja +, pipewire , pkg-config -, lib -, stdenv +, python3 , udev -, xorg , wrapGAppsHook -, pango -, cairo -, gtk-doc -, docbook_xsl -, docbook_xml_dtd_43 -, docbook_xml_dtd_42 -, docbook_xml_dtd_412 -, autoconf -, automake -, gettext -, libtool +, xorgserver }: -# it's a frankensteins monster with some cinnamon sparkles added on top of it - stdenv.mkDerivation rec { pname = "muffin"; - version = "5.2.0"; + version = "5.4.5"; + + outputs = [ "out" "dev" "man" ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + zenity = gnome.zenity; + }) + ]; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-WAp0HbfRtwsPjJX1kPBqUStqLaudQPZ8E+h4jmggmw8="; + hash = "sha256-gtki0MTIMI1JggtVn0dAhkq364hkTuH7Zf7CF32Lc8E="; }; - buildInputs = [ - gtk3 - glib - pango - cairo - json-glib - cinnamon-desktop - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libxkbfile - xorg.xkeyboardconfig + nativeBuildInputs = [ + desktop-file-utils + mesa # needed for gbm + meson + ninja + pkg-config + python3 + wrapGAppsHook + xorgserver # for cvt command + ]; - libxkbcommon - gnome.zenity + buildInputs = [ + cairo + cinnamon-desktop + dbus + glib + gobject-introspection + gtk3 + libcanberra + libdrm + libgnomekbd + libgudev libinput libstartup_notification - libXtst + libwacom + libXdamage + libxkbcommon + pipewire udev - gobject-introspection ]; - nativeBuildInputs = [ - autoconf - automake - gettext - libtool - wrapGAppsHook - pkg-config - intltool - - gnome-doc-utils - gtk-doc - docbook_xsl - docbook_xml_dtd_43 - docbook_xml_dtd_42 - docbook_xml_dtd_412 + propagatedBuildInputs = [ + # required for pkg-config to detect muffin-clutter + json-glib + libXtst + graphene ]; - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py ''; meta = with lib; { homepage = "https://github.com/linuxmint/muffin"; description = "The window management library for the Cinnamon desktop (libmuffin) and its sample WM binary (muffin)"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = teams.cinnamon.members; }; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/fix-paths.patch new file mode 100644 index 0000000000..6ac0a431f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/muffin/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/core/util.c b/src/core/util.c +index 57b73747d..f424cc81c 100644 +--- a/src/core/util.c ++++ b/src/core/util.c +@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, + + args = g_ptr_array_new (); + +- append_argument (args, "zenity"); ++ append_argument (args, "@zenity@/bin/zenity"); + append_argument (args, type); + + if (display) diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix index e8bf145e50..4b013050ad 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/nemo/default.nix @@ -10,10 +10,9 @@ , wrapGAppsHook , libxml2 , gtk3 -, libnotify , gvfs , cinnamon-desktop -, xapps +, xapp , libexif , exempi , intltool @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { pname = "nemo"; - version = "5.2.4"; + version = "5.4.2"; # TODO: add plugins support (see https://github.com/NixOS/nixpkgs/issues/78327) @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-v63dFiBKtLCmRnwJ6u814lSv+tfPG+IIJtcWCnOEZjk="; + sha256 = "sha256-Xn9CgGe7j2APaJRLvx58z2w+sN7ZeDScQz53ZBBnsQs="; }; outputs = [ "out" "dev" ]; @@ -40,10 +39,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - libnotify cinnamon-desktop libxml2 - xapps + xapp libexif exempi gvfs @@ -61,8 +59,6 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" # use locales from cinnamon-translations "--localedir=${cinnamon-translations}/share/locale" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/pix/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/pix/default.nix index b5477cfeb0..ebd116882a 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/pix/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/pix/default.nix @@ -16,7 +16,7 @@ , pkg-config , shared-mime-info , wrapGAppsHook -, xapps +, xapp , yelp-tools , libsecret , webkitgtk @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "2.8.4"; + version = "2.8.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-yB8nLGvJZOViD+i4IkKN0yCDl5wRCvEbjzPDs7ZRMNA="; + sha256 = "sha256-aID0jxOMFegkcAflTY0VevZyN1HFivkTFi3has8MOY0="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - xapps + xapp libsecret webkitgtk libwebp diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix index 8ed66dc54d..ecd4aeec16 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/warpinator/default.nix @@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec { pname = "warpinator"; - version = "1.2.5"; + version = "1.2.13"; format = "other"; @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-pTLM4CrkBLEZS9IdM9IBSGH0WPOj1rlAgvWLOUy6MxY="; + hash = "sha256-iLImyfUsfn+mWrgMv5NnbOvvOlJnwJG4Btx1wwlgTeM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix similarity index 77% rename from third_party/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix rename to third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix index 7927026166..655284f20d 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/xapps/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/xapp/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, fetchpatch , glib , gobject-introspection , gtk3 @@ -21,23 +22,27 @@ }: stdenv.mkDerivation rec { - pname = "xapps"; - version = "2.2.8"; + pname = "xapp"; + version = "2.2.14"; outputs = [ "out" "dev" ]; + patches = [ + # Add missing gio-unix-2.0 dependency, can be removed on next update + # https://github.com/linuxmint/xapp/pull/156 + (fetchpatch { + url = "https://github.com/linuxmint/xapp/commit/052081f75d1c1212aeb6a913772723c81607bcb3.patch"; + sha256 = "sha256-VL70Y1FIa7lQ/zKjEx0GhaU1QRu4z6Yu400/bDbgZgM="; + }) + ]; + src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-70troRGklu5xGjBIrGvshcOX/UT96hIEFXyo4yj2GT4="; + hash = "sha256-BebsS7y/hRQSc4rYOIWJ+sSJ5fLZaCpNAE48JnviUUc="; }; - # TODO: https://github.com/NixOS/nixpkgs/issues/36468 - NIX_CFLAGS_COMPILE = [ - "-I${glib.dev}/include/gio-unix-2.0" - ]; - nativeBuildInputs = [ meson ninja @@ -91,7 +96,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/linuxmint/xapps"; + homepage = "https://github.com/linuxmint/xapp"; description = "Cross-desktop libraries and common resources"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix index 9864e1c0e1..67983d5056 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/xreader/default.nix @@ -8,7 +8,7 @@ , gtk3 , wrapGAppsHook , libxml2 -, xapps +, xapp , meson , pkg-config , cairo @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xreader"; - version = "3.3.0"; + version = "3.4.3"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-wBrP5SHGPvH/Gz9QY253zQuf8WSjV19oNB5aIqXGLZ8="; + sha256 = "sha256-GkJo/wc5StyeQv0pv5XK0Qy3o8EGpfPYY8gOMq0Afgs="; }; nativeBuildInputs = [ @@ -47,13 +47,12 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dmathjax-directory=${nodePackages.mathjax}" - "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ] ++ (map (x: "-D${x}=true") backends); buildInputs = [ glib gtk3 - xapps + xapp cairo libxml2 libsecret diff --git a/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix b/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix index 5f5720c253..2c55f61402 100644 --- a/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/cinnamon/xviewer/default.nix @@ -1,64 +1,67 @@ { stdenv , lib , fetchFromGitHub -, autoreconfHook , cinnamon-desktop -, file +, docbook_xsl +, exempi , gdk-pixbuf , glib , gobject-introspection -, gtk-doc , gtk3 -, intltool +, gtk-doc , itstool , lcms2 , libexif , libjpeg , libpeas -, libtool +, librsvg , libxml2 +, meson +, ninja , pkg-config -, shared-mime-info +, python3 , wrapGAppsHook -, xapps +, xapp , yelp-tools }: stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.4"; + version = "3.2.10"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-OyHSBXtJ/TExl06NLUAaIZq4u0+fI3YGQ37HRZeNP+0="; + sha256 = "sha256-c3K9yjeaAlyXqgxzHgnLXgqwaB5Fdw+mS9jricy8QA8="; }; nativeBuildInputs = [ - wrapGAppsHook - autoreconfHook cinnamon-desktop + docbook_xsl gdk-pixbuf gobject-introspection gtk-doc - intltool itstool - libtool + meson + ninja pkg-config + python3 + wrapGAppsHook yelp-tools ]; buildInputs = [ + exempi glib gtk3 + lcms2 libexif libjpeg libpeas + librsvg libxml2 - shared-mime-info - xapps - lcms2 + xapp ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/desktops/enlightenment/default.nix b/third_party/nixpkgs/pkgs/desktops/enlightenment/default.nix index 34b0ae86e4..76c6cc5895 100644 --- a/third_party/nixpkgs/pkgs/desktops/enlightenment/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/enlightenment/default.nix @@ -1,5 +1,7 @@ -{ callPackage, pkgs }: -{ +{ lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + #### CORE EFL efl = callPackage ./efl { }; @@ -13,4 +15,5 @@ evisum = callPackage ./evisum { }; rage = callPackage ./rage { }; terminology = callPackage ./terminology { }; -} + +}) diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix index 9c099f6529..7d4f5969d0 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { pname = "accerciser"; - version = "3.38.0"; + version = "3.40.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fd9vv2abd2if2qj4nlfy7mpd7rc4sx18zhmxd5ijlnfhkpggbp5"; + sha256 = "U3VF1kgTwtKxSne2TiQBABXpl3z1+zz4qmXbzgHqNiU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix index 0a8d46157a..c4a12cd5ca 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -119,7 +119,6 @@ stdenv.mkDerivation rec { "-DENABLE_UOA=OFF" "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DINCLUDE_INSTALL_DIR=${placeholder "dev"}/include" "-DWITH_PHONENUMBER=ON" "-DWITH_GWEATHER4=ON" diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix index cb7ba1ce5c..079e64ad3d 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -184,6 +184,7 @@ stdenv.mkDerivation rec { # We can generate it ourselves. rm -f man/gnome-shell.1 + rm data/theme/gnome-shell.css ''; preFixup = '' diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index 5d24a23e41..aad4744935 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { sha256 = "EyOdIgMiAaIr0pgzxXW2hIFnANLeFooVMCI1d8XAddw="; }; + patches = [ + # Fix pkexec detection on NixOS. + ./fix-paths.patch + ]; + nativeBuildInputs = [ pkg-config gettext diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch new file mode 100644 index 0000000000..ab6e845ae4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/gnome-system-monitor/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/src/gsm_pkexec.cpp b/src/gsm_pkexec.cpp +index 868969ba..51eb93b5 100644 +--- a/src/gsm_pkexec.cpp ++++ b/src/gsm_pkexec.cpp +@@ -33,6 +33,7 @@ gboolean gsm_pkexec_create_root_password_dialog(const char *command) + gboolean + procman_has_pkexec(void) + { +- return g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS); ++ return g_file_test("/run/wrappers/bin/pkexec", G_FILE_TEST_EXISTS) ++ || g_file_test("/usr/bin/pkexec", G_FILE_TEST_EXISTS); + } + diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix index d927fff955..9817f77b6b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/core/sushi/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { libepoxy gst_all_1.gstreamer gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly ]; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json index 019586c39a..2403a8e792 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json +++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/extensions.json @@ -28,17 +28,17 @@ , {"uuid": "impatience@gfxmonk.net", "name": "Impatience", "pname": "impatience", "description": "Speed up the gnome-shell animation speed", "link": "https://extensions.gnome.org/extension/277/impatience/", "shell_version_map": {"40": {"version": "20", "sha256": "19pr55n6mzxcwbg2cz1kmrk2wmcx22mmfqkdcx7m7rlvnvxs5pgg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9nZnhtb25rLm5ldC9kaXN0LzBpbnN0YWxsL2dub21lLXNoZWxsLWltcGF0aWVuY2UueG1sIiwKICAidXVpZCI6ICJpbXBhdGllbmNlQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "19pr55n6mzxcwbg2cz1kmrk2wmcx22mmfqkdcx7m7rlvnvxs5pgg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9nZnhtb25rLm5ldC9kaXN0LzBpbnN0YWxsL2dub21lLXNoZWxsLWltcGF0aWVuY2UueG1sIiwKICAidXVpZCI6ICJpbXBhdGllbmNlQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "19pr55n6mzxcwbg2cz1kmrk2wmcx22mmfqkdcx7m7rlvnvxs5pgg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNwZWVkIHVwIHRoZSBnbm9tZS1zaGVsbCBhbmltYXRpb24gc3BlZWQiLAogICJuYW1lIjogIkltcGF0aWVuY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9nZnhtb25rLm5ldC9kaXN0LzBpbnN0YWxsL2dub21lLXNoZWxsLWltcGF0aWVuY2UueG1sIiwKICAidXVpZCI6ICJpbXBhdGllbmNlQGdmeG1vbmsubmV0IiwKICAidmVyc2lvbiI6IDIwCn0="}}} , {"uuid": "windowoverlay-icons@sustmidown.centrum.cz", "name": "WindowOverlay Icons", "pname": "windowoverlay-icons", "description": "Add application icons to window overview", "link": "https://extensions.gnome.org/extension/302/windowoverlay-icons/", "shell_version_map": {"38": {"version": "37", "sha256": "108a5i5v62a9i61av5pib3b0hcpmb6pw3np7c29jfngs25n14wd3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhcHBsaWNhdGlvbiBpY29ucyB0byB3aW5kb3cgb3ZlcnZpZXciLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3aW5kb3dvdmVybGF5LWljb25zIiwKICAibmFtZSI6ICJXaW5kb3dPdmVybGF5IEljb25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndpbmRvd292ZXJsYXktaWNvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdXN0bWkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXdpbmRvd292ZXJsYXktaWNvbnMiLAogICJ1dWlkIjogIndpbmRvd292ZXJsYXktaWNvbnNAc3VzdG1pZG93bi5jZW50cnVtLmN6IiwKICAidmVyc2lvbiI6IDM3Cn0="}}} , {"uuid": "dash-to-dock@micxgx.gmail.com", "name": "Dash to Dock", "pname": "dash-to-dock", "description": "A dock for the Gnome Shell. This extension moves the dash out of the overview transforming it in a dock for an easier launching of applications and a faster switching between windows and desktops. Side and bottom placement options are available.", "link": "https://extensions.gnome.org/extension/307/dash-to-dock/", "shell_version_map": {"38": {"version": "69", "sha256": "1nmqg875lxbxn8plwgmsrkhq126hcv56yl6iyq5wc4ljp98niaw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbWljaGVsZWcuZ2l0aHViLmlvL2Rhc2gtdG8tZG9jay8iLAogICJ1dWlkIjogImRhc2gtdG8tZG9ja0BtaWN4Z3guZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDY5Cn0="}, "40": {"version": "71", "sha256": "071zxnbkh946x1fm16ddwlknaig15cm0dl7kvw97vhx6cw6668c3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNzEKfQ=="}, "41": {"version": "71", "sha256": "071zxnbkh946x1fm16ddwlknaig15cm0dl7kvw97vhx6cw6668c3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZG9jayBmb3IgdGhlIEdub21lIFNoZWxsLiBUaGlzIGV4dGVuc2lvbiBtb3ZlcyB0aGUgZGFzaCBvdXQgb2YgdGhlIG92ZXJ2aWV3IHRyYW5zZm9ybWluZyBpdCBpbiBhIGRvY2sgZm9yIGFuIGVhc2llciBsYXVuY2hpbmcgb2YgYXBwbGljYXRpb25zIGFuZCBhIGZhc3RlciBzd2l0Y2hpbmcgYmV0d2VlbiB3aW5kb3dzIGFuZCBkZXNrdG9wcy4gU2lkZSBhbmQgYm90dG9tIHBsYWNlbWVudCBvcHRpb25zIGFyZSBhdmFpbGFibGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaHRvZG9jayIsCiAgIm5hbWUiOiAiRGFzaCB0byBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9taWNoZWxlZy5naXRodWIuaW8vZGFzaC10by1kb2NrLyIsCiAgInV1aWQiOiAiZGFzaC10by1kb2NrQG1pY3hneC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNzEKfQ=="}}} -, {"uuid": "mythtv-fnx@fnxweb.com", "name": "MythTV", "pname": "mythtv", "description": "Displays MythTV status (free space and upcoming recordings)", "link": "https://extensions.gnome.org/extension/321/mythtv/", "shell_version_map": {"38": {"version": "10", "sha256": "070h11gk5zpxn5xbc71skdz174hbb72l0isia2vp7d9wy4ackl0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbnh3ZWIvZ25vbWUtc2hlbGwtbXl0aHR2IiwKICAidXVpZCI6ICJteXRodHYtZm54QGZueHdlYi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "12", "sha256": "188wd1g2rpp4igfdlnr28r95z14y4sj28mnwnk3wwv6wrpq47n4y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1teXRodHYiLAogICJ1dWlkIjogIm15dGh0di1mbnhAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "188wd1g2rpp4igfdlnr28r95z14y4sj28mnwnk3wwv6wrpq47n4y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1teXRodHYiLAogICJ1dWlkIjogIm15dGh0di1mbnhAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} +, {"uuid": "mythtv-fnx@fnxweb.com", "name": "MythTV", "pname": "mythtv", "description": "Displays MythTV status (free space and upcoming recordings)", "link": "https://extensions.gnome.org/extension/321/mythtv/", "shell_version_map": {"38": {"version": "10", "sha256": "070h11gk5zpxn5xbc71skdz174hbb72l0isia2vp7d9wy4ackl0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mbnh3ZWIvZ25vbWUtc2hlbGwtbXl0aHR2IiwKICAidXVpZCI6ICJteXRodHYtZm54QGZueHdlYi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "13", "sha256": "1zacmlidmkf1jys1cvwpx4yqkjj6hp0bdpw83gnmg7rmgnyls39d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1teXRodHYiLAogICJ1dWlkIjogIm15dGh0di1mbnhAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}, "42": {"version": "13", "sha256": "1zacmlidmkf1jys1cvwpx4yqkjj6hp0bdpw83gnmg7rmgnyls39d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIE15dGhUViBzdGF0dXMgKGZyZWUgc3BhY2UgYW5kIHVwY29taW5nIHJlY29yZGluZ3MpIiwKICAibmFtZSI6ICJNeXRoVFYiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1teXRodHYiLAogICJ1dWlkIjogIm15dGh0di1mbnhAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiAxMwp9"}}} , {"uuid": "middleclickclose@paolo.tranquilli.gmail.com", "name": "Quick Close in Overview", "pname": "middle-click-to-close-in-overview", "description": "Close windows with a button click (the middle one by default) when in overview mode", "link": "https://extensions.gnome.org/extension/352/middle-click-to-close-in-overview/", "shell_version_map": {"38": {"version": "17", "sha256": "1nv6cjyiz1i7fddh21h0zmrvzfi3y70y1f0xsv2zd0rfg6rf0r77", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAibG9jYWxlIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJRdWljayBDbG9zZSBpbiBPdmVydmlldyIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiUGFvbG8gVHJhbnF1aWxsaSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "23", "sha256": "1zbnizandqdsakncs3q7p6ylagdf49v5wz658vx47mh4mzbmisfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "1zbnizandqdsakncs3q7p6ylagdf49v5wz658vx47mh4mzbmisfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3A5MXBhdWwvbWlkZGxlY2xpY2tjbG9zZSIsCiAgInV1aWQiOiAibWlkZGxlY2xpY2tjbG9zZUBwYW9sby50cmFucXVpbGxpLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "25", "sha256": "1f4xppshgyh8mzc6jslscd2rjj1qj4vb6ikc1lrrqsn2i5lb76pw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIHdpbmRvd3Mgd2l0aCBhIGJ1dHRvbiBjbGljayAodGhlIG1pZGRsZSBvbmUgYnkgZGVmYXVsdCkgd2hlbiBpbiBvdmVydmlldyBtb2RlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWlkZGxlY2xpY2tjbG9zZSIsCiAgImxvY2FsZSI6ICIvdXNyL2xvY2FsL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiUXVpY2sgQ2xvc2UgaW4gT3ZlcnZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgIlBhb2xvIFRyYW5xdWlsbGkiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1pZGRsZWNsaWNrY2xvc2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcDkxcGF1bC9taWRkbGVjbGlja2Nsb3NlIiwKICAidXVpZCI6ICJtaWRkbGVjbGlja2Nsb3NlQHBhb2xvLnRyYW5xdWlsbGkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI1Cn0="}}} -, {"uuid": "status-area-horizontal-spacing@mathematical.coffee.gmail.com", "name": "Status Area Horizontal Spacing", "pname": "status-area-horizontal-spacing", "description": "Reduce the horizontal spacing between icons in the top-right status area", "link": "https://extensions.gnome.org/extension/355/status-area-horizontal-spacing/", "shell_version_map": {"38": {"version": "16", "sha256": "05hhj10hlcpbgd9sbvq89vxzqj6ndf21syas8zidy6yfy613b6l3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "41": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}}} +, {"uuid": "status-area-horizontal-spacing@mathematical.coffee.gmail.com", "name": "Status Area Horizontal Spacing", "pname": "status-area-horizontal-spacing", "description": "Reduce the horizontal spacing between icons in the top-right status area", "link": "https://extensions.gnome.org/extension/355/status-area-horizontal-spacing/", "shell_version_map": {"38": {"version": "16", "sha256": "05hhj10hlcpbgd9sbvq89vxzqj6ndf21syas8zidy6yfy613b6l3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjQiLAogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "40": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "41": {"version": "21", "sha256": "1szpxz6ybvq76di2a6bkyv234v0afw2bn12xjcgdzpzvxzr9y3da", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcDkxcGF1bC9zdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmctZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJzdGF0dXMtYXJlYS1ob3Jpem9udGFsLXNwYWNpbmdAbWF0aGVtYXRpY2FsLmNvZmZlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "22", "sha256": "02a68p0j8w434bvgq2s1q4hkj7pvs9b9kgsyfkbncqp44j8aqnwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlZHVjZSB0aGUgaG9yaXpvbnRhbCBzcGFjaW5nIGJldHdlZW4gaWNvbnMgaW4gdGhlIHRvcC1yaWdodCBzdGF0dXMgYXJlYSIsCiAgImRldi12ZXJzaW9uIjogIjIuMS40IiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3RhdHVzLWFyZWEtaG9yaXpvbnRhbC1zcGFjaW5nIiwKICAibmFtZSI6ICJTdGF0dXMgQXJlYSBIb3Jpem9udGFsIFNwYWNpbmciLAogICJzZXNzaW9uLW1vZGVzIjogWwogICAgInVzZXIiLAogICAgInVubG9jay1kaWFsb2ciCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wOTFwYXVsL3N0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZy1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInN0YXR1cy1hcmVhLWhvcml6b250YWwtc3BhY2luZ0BtYXRoZW1hdGljYWwuY29mZmVlLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} , {"uuid": "activities-config@nls1729", "name": "Activities Configurator", "pname": "activities-configurator", "description": "Activities Configurator, activities-config@nls1729 - Effective March 29, 2021 the extension is NOT MAINTAINED. I give my permission to anyone who may want to become the maintainer. I do not have the free time or energy necessary to maintain the extension.\n\nConfigure the Activities Button and Top Panel. Select an icon. Change the text. Disable Hot Corner or set the Hot Corner Threshold. Set Panel Background color and transparency plus much more to enhance your desktop. Click the icon or text with the secondary mouse button to launch the GS Extension Prefs.", "link": "https://extensions.gnome.org/extension/358/activities-configurator/", "shell_version_map": {"38": {"version": "89", "sha256": "1z00smimg5fj6ri35g80bvfzzy5xxxrgwy4idsakphszdwryi8ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2aXRpZXMgQ29uZmlndXJhdG9yLCBhY3Rpdml0aWVzLWNvbmZpZ0BubHMxNzI5IC0gIEVmZmVjdGl2ZSBNYXJjaCAyOSwgMjAyMSB0aGUgZXh0ZW5zaW9uIGlzIE5PVCBNQUlOVEFJTkVELiAgSSBnaXZlIG15IHBlcm1pc3Npb24gdG8gYW55b25lIHdobyBtYXkgd2FudCB0byBiZWNvbWUgdGhlIG1haW50YWluZXIuICBJIGRvIG5vdCBoYXZlIHRoZSBmcmVlIHRpbWUgb3IgZW5lcmd5IG5lY2Vzc2FyeSB0byBtYWludGFpbiB0aGUgZXh0ZW5zaW9uLlxuXG5Db25maWd1cmUgdGhlIEFjdGl2aXRpZXMgQnV0dG9uIGFuZCBUb3AgUGFuZWwuIFNlbGVjdCBhbiBpY29uLiBDaGFuZ2UgdGhlIHRleHQuIERpc2FibGUgSG90IENvcm5lciBvciBzZXQgdGhlIEhvdCBDb3JuZXIgVGhyZXNob2xkLiBTZXQgUGFuZWwgQmFja2dyb3VuZCBjb2xvciBhbmQgdHJhbnNwYXJlbmN5IHBsdXMgbXVjaCBtb3JlIHRvIGVuaGFuY2UgeW91ciBkZXNrdG9wLiAgQ2xpY2sgdGhlIGljb24gb3IgdGV4dCB3aXRoIHRoZSBzZWNvbmRhcnkgbW91c2UgYnV0dG9uIHRvIGxhdW5jaCB0aGUgR1MgRXh0ZW5zaW9uIFByZWZzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJhY3Rpdml0aWVzLWNvbmZpZyIsCiAgImdldHRleHQtZG9tYWluIjogImFjdGl2aXRpZXMtY29uZmlnLWV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQWN0aXZpdGllcyBDb25maWd1cmF0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWN0aXZpdGllcy1jb25maWciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmxzMTcyOS5naXRodWIuaW8vYWN0aXZpdGllc19jb25maWcuaHRtbCIsCiAgInV1aWQiOiAiYWN0aXZpdGllcy1jb25maWdAbmxzMTcyOSIsCiAgInZlcnNpb24iOiA4OQp9"}}} , {"uuid": "calc@danigm.wadobo.com", "name": "calc", "pname": "calc", "description": "Simple run dialog calculation", "link": "https://extensions.gnome.org/extension/388/calc/", "shell_version_map": {"40": {"version": "10", "sha256": "0zp9riszgiagai57mkl9pzj34fwg30l33ib611dddapvvj19y5cg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImNhbGNAZGFuaWdtLndhZG9iby5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0zp9riszgiagai57mkl9pzj34fwg30l33ib611dddapvvj19y5cg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImNhbGNAZGFuaWdtLndhZG9iby5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "0zp9riszgiagai57mkl9pzj34fwg30l33ib611dddapvvj19y5cg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBydW4gZGlhbG9nIGNhbGN1bGF0aW9uIiwKICAibmFtZSI6ICJjYWxjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImNhbGNAZGFuaWdtLndhZG9iby5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"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"}}} , {"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": "19", "sha256": "0028ndjfvsq48fnzpkx353b0nzcj04lqs92fz8fr4il6rmkx8a5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HbmlvdXJmL1VwdGltZS1JbmRpY2F0b3IiLAogICJ1dWlkIjogInVwdGltZS1pbmRpY2F0b3JAZ25pb3VyZmduaW91cmYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "40": {"version": "19", "sha256": "0028ndjfvsq48fnzpkx353b0nzcj04lqs92fz8fr4il6rmkx8a5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HbmlvdXJmL1VwdGltZS1JbmRpY2F0b3IiLAogICJ1dWlkIjogInVwdGltZS1pbmRpY2F0b3JAZ25pb3VyZmduaW91cmYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "0028ndjfvsq48fnzpkx353b0nzcj04lqs92fz8fr4il6rmkx8a5n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZGljYXRlcyB1cHRpbWUgaW4gc3RhdHVzIGFyZWEuIFdoZW4gY2xpY2tlZCwgYSBwb3B1cCBtZW51IGluZGljYXRlcyB0aGUgZGF0ZSB3aGVuIHRoZSBzeXN0ZW0gd2FzIHN0YXJ0ZWQuIiwKICAibmFtZSI6ICJVcHRpbWUgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HbmlvdXJmL1VwdGltZS1JbmRpY2F0b3IiLAogICJ1dWlkIjogInVwdGltZS1pbmRpY2F0b3JAZ25pb3VyZmduaW91cmYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"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": "41", "sha256": "0b3as6l7gd2k0swrgl0dah92l5gyia2slikllrakp2dfvpvxyd2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW9ucGF0YXBvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJ1dWlkIjogImNhZmZlaW5lQHBhdGFwb24uaW5mbyIsCiAgInZlcnNpb24iOiA0MQp9"}, "41": {"version": "41", "sha256": "0b3as6l7gd2k0swrgl0dah92l5gyia2slikllrakp2dfvpvxyd2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW9ucGF0YXBvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJ1dWlkIjogImNhZmZlaW5lQHBhdGFwb24uaW5mbyIsCiAgInZlcnNpb24iOiA0MQp9"}, "42": {"version": "41", "sha256": "0b3as6l7gd2k0swrgl0dah92l5gyia2slikllrakp2dfvpvxyd2g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHNjcmVlbnNhdmVyIGFuZCBhdXRvIHN1c3BlbmQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJuYW1lIjogIkNhZmZlaW5lIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNhZmZlaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZW9ucGF0YXBvbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2FmZmVpbmUiLAogICJ1dWlkIjogImNhZmZlaW5lQHBhdGFwb24uaW5mbyIsCiAgInZlcnNpb24iOiA0MQp9"}}} -, {"uuid": "backslide@codeisland.org", "name": "BackSlide", "pname": "backslide", "description": "Automatic background-image (wallpaper) slideshow for Gnome Shell", "link": "https://extensions.gnome.org/extension/543/backslide/", "shell_version_map": {"38": {"version": "18", "sha256": "1vm4w61cksj9ya5z4xcy7h96bk0wwi5njp0lyhnqa8j2fgsq5iin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9iaXRidWNrZXQub3JnL0x1a2FzS251dGgvYmFja3NsaWRlIiwKICAidXVpZCI6ICJiYWNrc2xpZGVAY29kZWlzbGFuZC5vcmciLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}}} +, {"uuid": "backslide@codeisland.org", "name": "BackSlide", "pname": "backslide", "description": "Automatic background-image (wallpaper) slideshow for Gnome Shell", "link": "https://extensions.gnome.org/extension/543/backslide/", "shell_version_map": {"38": {"version": "18", "sha256": "1vm4w61cksj9ya5z4xcy7h96bk0wwi5njp0lyhnqa8j2fgsq5iin", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9iaXRidWNrZXQub3JnL0x1a2FzS251dGgvYmFja3NsaWRlIiwKICAidXVpZCI6ICJiYWNrc2xpZGVAY29kZWlzbGFuZC5vcmciLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "0an1w35sbv5w7826xa3k8nl8hc3krxkzc8nhvgcp48z75n2wdksl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2JpdGJ1Y2tldC5vcmcvTHVrYXNLbnV0aC9iYWNrc2xpZGUiLAogICJ1dWlkIjogImJhY2tzbGlkZUBjb2RlaXNsYW5kLm9yZyIsCiAgInZlcnNpb24iOiAyNAp9"}, "42": {"version": "25", "sha256": "0kq3cpwwxl7d6rhan8y5fz12j1nga0n8bd4r5prs983sxb18xb6y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpYyBiYWNrZ3JvdW5kLWltYWdlICh3YWxscGFwZXIpIHNsaWRlc2hvdyBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYWNrc2xpZGUiLAogICJuYW1lIjogIkJhY2tTbGlkZSIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJMdWthcyBLbnV0aCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vYml0YnVja2V0Lm9yZy9MdWthc0tudXRoL2JhY2tzbGlkZSIsCiAgInV1aWQiOiAiYmFja3NsaWRlQGNvZGVpc2xhbmQub3JnIiwKICAidmVyc2lvbiI6IDI1Cn0="}}} , {"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": "107", "sha256": "0hcja35hvwlsgan7344j2bs8ky8p67icnqc0dpghb2aayn6wa103", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21sdXRmeS9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA3Cn0="}, "40": {"version": "107", "sha256": "0hcja35hvwlsgan7344j2bs8ky8p67icnqc0dpghb2aayn6wa103", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21sdXRmeS9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA3Cn0="}, "41": {"version": "107", "sha256": "0hcja35hvwlsgan7344j2bs8ky8p67icnqc0dpghb2aayn6wa103", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21sdXRmeS9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA3Cn0="}, "42": {"version": "107", "sha256": "0hcja35hvwlsgan7344j2bs8ky8p67icnqc0dpghb2aayn6wa103", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21sdXRmeS9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA3Cn0="}}} +, {"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": "108", "sha256": "1iv4idgbvb1q615yhj9421xp2rbhf733yz404ff744f0g92rw6n8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1eG9yMTMzNy9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA4Cn0="}, "40": {"version": "108", "sha256": "1iv4idgbvb1q615yhj9421xp2rbhf733yz404ff744f0g92rw6n8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1eG9yMTMzNy9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA4Cn0="}, "41": {"version": "108", "sha256": "1iv4idgbvb1q615yhj9421xp2rbhf733yz404ff744f0g92rw6n8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1eG9yMTMzNy9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA4Cn0="}, "42": {"version": "108", "sha256": "1iv4idgbvb1q615yhj9421xp2rbhf733yz404ff744f0g92rw6n8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSB0b3AgYmFyLCBleGNlcHQgaW4gb3ZlcnZpZXcuIEhvd2V2ZXIsIHRoZXJlIGlzIGFuIG9wdGlvbiB0byBzaG93IHRoZSBwYW5lbCB3aGVuZXZlciB0aGUgbW91c2UgcG9pbnRlciBhcHByb2FjaGVzIHRoZSBlZGdlIG9mIHRoZSBzY3JlZW4uIEFuZCBpZiBcImludGVsbGloaWRlXCIgaXMgZW5hYmxlZCwgdGhlIHBhbmVsIG9ubHkgaGlkZXMgd2hlbiBhIHdpbmRvdyB0YWtlcyB0aGUgc3BhY2UuXG5cbi0gUHJlc3MgYmFja3NwYWNlIHRvIHJlbW92ZSBrZXlib2FyZCBzaG9ydGN1dC5cbi0gTG9nIG9mZiBhbmQgb24gYWdhaW4gd2hlbiB0aGVyZSBpcyBhbiBlcnJvciBhZnRlciB1cGdyYWRpbmcuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaGlkZXRvcGJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1eG9yMTMzNy9oaWRldG9wYmFyIiwKICAidXVpZCI6ICJoaWRldG9wYmFyQG1hdGhpZXUuYmlkb24uY2EiLAogICJ2ZXJzaW9uIjogMTA4Cn0="}}} , {"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": "23", "sha256": "14n41x3808gp35wkd89cwprxgmh9w5sqfi5jx7i8rpa0cb1jzw34", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaWFkL2dub21lLWhkYXRlIiwKICAidXVpZCI6ICJoZGF0ZUBoYXR1bC5pbmZvIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "14n41x3808gp35wkd89cwprxgmh9w5sqfi5jx7i8rpa0cb1jzw34", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaWFkL2dub21lLWhkYXRlIiwKICAidXVpZCI6ICJoZGF0ZUBoYXR1bC5pbmZvIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "14n41x3808gp35wkd89cwprxgmh9w5sqfi5jx7i8rpa0cb1jzw34", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSGVicmV3IERhdGUgaW4gdGhlIFBhbmVsLlxuUmVxdWlyZXMgbGliaGRhdGUtZ2xpYiIsCiAgIm5hbWUiOiAiR25vbWUgSERhdGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMiIsCiAgICAiMy40IiwKICAgICIzLjYiLAogICAgIjMuOCIsCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtaWFkL2dub21lLWhkYXRlIiwKICAidXVpZCI6ICJoZGF0ZUBoYXR1bC5pbmZvIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"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/raw/master/CHANGELOG.md", "link": "https://extensions.gnome.org/extension/570/todotxt/", "shell_version_map": {"38": {"version": "33", "sha256": "0vk73vygk6p46f6axsyl9k33jmk2hhvrrynix3rq113nl5qwmy2j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi9yYXcvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS90b2RvLnR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24vdG9kby10eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0b2RvLnR4dEBiYXJ0LmxpYmVydC5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "35", "sha256": "0wh8wlic0qhfvyfvngm1vh7qhrs4709npn231q8vljgxav088p5k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi9yYXcvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAidG9kby50eHRAYmFydC5saWJlcnQuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "41": {"version": "37", "sha256": "0zmvkzak62akb95wkk0794cqr4zrzi78amljlfawnjw25i0sc8hd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi9yYXcvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}, "42": {"version": "37", "sha256": "0zmvkzak62akb95wkk0794cqr4zrzi78amljlfawnjw25i0sc8hd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgaW50ZXJmYWNlIGZvciB0b2RvLnR4dC4gXG5cblRvZG8udHh0IGlzIGEgZnV0dXJlLXByb29mIHN5bnRheCBmb3IgdGFza3MgKG5vdCBtYWRlIGJ5IG1lKSwgZm9yIG1vcmUgaW5mbzogaHR0cDovL3RvZG90eHQuY29tL1xuXG5Tb21lIGV4YW1wbGVzOlxuVGFzazogQmFzaWMgdGFza1xuKEEpIFRhc2s6IEhpZ2ggcHJpb3JpdHkgdGFza1xuVGFzayBAcHJvamVjdCArY29udGV4dDogVGFzayBpcyBwYXJ0IG9mIHByb2plY3QgYW5kIGhhcyBhIGNlcnRhaW4gY29udGV4dFxueCAyMDEzLTA4LTIyIFRhc2s6IFRhc2sgd2FzIGNvbXBsZXRlZCBvbiB0aGUgMjJuZCBvZiBBdWd1c3RcblxuRm9yIG1vcmUgaW5mbyBhYm91dCB0aGUgc3ludGF4OiBodHRwczovL2dpdGh1Yi5jb20vZ2luYXRyYXBhbmkvdG9kby50eHQtY2xpL3dpa2kvVGhlLVRvZG8udHh0LUZvcm1hdFxuXG5RdWljayBzdGFydDpcbldoZW4geW91IGZpcnN0IGVuYWJsZSB0aGUgZXh0ZW5zaW9uLCBjaGFuY2VzIGFyZSBoaWdoIHlvdSdsbCBzZWUgYSBbWF0gaW4geW91ciB0b3AgcGFuZWwuIElmIHlvdSBjbGljayB0aGUgW1hdLCB5b3Ugd2lsbCBiZSBhYmxlIHRvIGNob29zZSBiZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZWNlc3NhcnkgZmlsZXMgYXV0b21hdGljYWxseSBvciBzZWxlY3RpbmcgeW91ciBvd24gZXhpc3RpbmcgZmlsZXMgdG8gYmUgdXNlZCB3aXRoIHRoZSBleHRlbnNpb24uXG5cblBsZWFzZSB1c2UgdGhlIGlzc3VlIHRyYWNrZXIgb24gdGhlIGhvbWVwYWdlIHRvIHJlcG9ydCBidWdzIGFuZC9vciBmaWxlIGZlYXR1cmUgcmVxdWVzdHMsIHRoaXMgbWFrZXMgdHJhY2tpbmcgZWFzaWVyIGZvciBtZS4gVGhhbmtzIVxuXG5TZWUgdGhlIGluY2x1ZGVkIENIQU5HRUxPRy5tZCBmb3IgaW5mbyBhYm91dCBjaGFuZ2VzIGJldHdlZW4gZGlmZmVyZW50IHZlcnNpb25zLCBvciBzZWUgaXQgb25saW5lOiBodHRwczovL2dpdGxhYi5jb20vdG9kby50eHQtZ25vbWUtc2hlbGwtZXh0ZW5zaW9uL3RvZG8tdHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi9yYXcvbWFzdGVyL0NIQU5HRUxPRy5tZCIsCiAgIm5hbWUiOiAiVG9kby50eHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3RvZG8udHh0LWdub21lLXNoZWxsLWV4dGVuc2lvbi90b2RvLXR4dC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInRvZG8udHh0QGJhcnQubGliZXJ0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}}} , {"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=="}}} @@ -49,7 +49,7 @@ , {"uuid": "appindicatorsupport@rgcjonas.gmail.com", "name": "AppIndicator and KStatusNotifierItem Support", "pname": "appindicator-support", "description": "Adds AppIndicator, KStatusNotifierItem and legacy Tray icons support to the Shell", "link": "https://extensions.gnome.org/extension/615/appindicator-support/", "shell_version_map": {"38": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "40": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "41": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "42": {"version": "42", "sha256": "0141f3y8vhk3q9v0w295hb5j679rh04isqnmsnihmsjdnw61b7fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgQXBwSW5kaWNhdG9yLCBLU3RhdHVzTm90aWZpZXJJdGVtIGFuZCBsZWdhY3kgVHJheSBpY29ucyBzdXBwb3J0IHRvIHRoZSBTaGVsbCIsCiAgImdldHRleHQtZG9tYWluIjogIkFwcEluZGljYXRvckV4dGVuc2lvbiIsCiAgIm5hbWUiOiAiQXBwSW5kaWNhdG9yIGFuZCBLU3RhdHVzTm90aWZpZXJJdGVtIFN1cHBvcnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdWJ1bnR1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1hcHBpbmRpY2F0b3IiLAogICJ1dWlkIjogImFwcGluZGljYXRvcnN1cHBvcnRAcmdjam9uYXMuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}}} , {"uuid": "bitcoin-markets@ottoallmendinger.github.com", "name": "Bitcoin Markets", "pname": "bitcoin-markets", "description": "Display info on various crypto-currency exchanges.", "link": "https://extensions.gnome.org/extension/648/bitcoin-markets/", "shell_version_map": {"38": {"version": "57", "sha256": "1dbrkr49gi93nps610afvw2q68d1ialkhxsxd0waa8xgwjxwzyxd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjU3IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vT3R0b0FsbG1lbmRpbmdlci9nbm9tZS1zaGVsbC1iaXRjb2luLW1hcmtldHMvIiwKICAidXVpZCI6ICJiaXRjb2luLW1hcmtldHNAb3R0b2FsbG1lbmRpbmdlci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDU3Cn0="}, "40": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}, "41": {"version": "65", "sha256": "10jg1ixk0zfb67licr807wf68bzsdiv9fb9j40xjg49li72c6hrf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY1IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9PdHRvQWxsbWVuZGluZ2VyL2dub21lLXNoZWxsLWJpdGNvaW4tbWFya2V0cy8iLAogICJ1dWlkIjogImJpdGNvaW4tbWFya2V0c0BvdHRvYWxsbWVuZGluZ2VyLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNjUKfQ=="}, "42": {"version": "66", "sha256": "0a1156n4ding1ypjnxm1xz5cqihrf5m2d4bf2zmci29nsjina9c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgaW5mbyBvbiB2YXJpb3VzIGNyeXB0by1jdXJyZW5jeSBleGNoYW5nZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzIiwKICAiZ2l0LXZlcnNpb24iOiAidjY2IiwKICAibmFtZSI6ICJCaXRjb2luIE1hcmtldHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYml0Y29pbi1tYXJrZXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL090dG9BbGxtZW5kaW5nZXIvZ25vbWUtc2hlbGwtYml0Y29pbi1tYXJrZXRzLyIsCiAgInV1aWQiOiAiYml0Y29pbi1tYXJrZXRzQG90dG9hbGxtZW5kaW5nZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Ngp9"}}} , {"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": "28", "sha256": "068y5dy81ykmxy3cxi45xq0a0jg061fp22x9zhd4965kmvzqiq4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "41": {"version": "28", "sha256": "068y5dy81ykmxy3cxi45xq0a0jg061fp22x9zhd4965kmvzqiq4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "42": {"version": "28", "sha256": "068y5dy81ykmxy3cxi45xq0a0jg061fp22x9zhd4965kmvzqiq4g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} +, {"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": "29", "sha256": "13q4gwn8j0l9x24h2i3q14yxzfy4lbnzlp1afpzcxxrhlb64zm7y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "41": {"version": "29", "sha256": "13q4gwn8j0l9x24h2i3q14yxzfy4lbnzlp1afpzcxxrhlb64zm7y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "42": {"version": "29", "sha256": "13q4gwn8j0l9x24h2i3q14yxzfy4lbnzlp1afpzcxxrhlb64zm7y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNyZWF0b3IiOiAiTmVpIiwKICAiZGVzY3JpcHRpb24iOiAiRGlzcGxheSBDaGluZXNlIEx1bmFyIENhbGVuZGFyIGluIHBhbmVsXG5cblx1MjZhMFx1MjZhMFx1MjZhMCBkZXBlbmRlbmN5OiB0eXBlbGliLTFfMC1MdW5hckRhdGUtM18wIC8gZ2lyMS4yLWx1bmFyLWRhdGUtMi4wIiwKICAibmFtZSI6ICJMdW5hciBDYWxlbmRhciBcdTUxOWNcdTUzODYiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubHVuYXItY2FsZW5kYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibHVuYXJjYWxAYWlsaW4ubmVtdWkiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}}} , {"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": "45", "sha256": "0plk308mc45py7xp02y5bvsidyg4fgsph9p8wmr2wr0wyz74c0iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Vhc3lTY3JlZW5DYXN0L0Vhc3lTY3JlZW5DYXN0IiwKICAidXVpZCI6ICJFYXN5U2NyZWVuQ2FzdEBpYWNvcG9kZWVub3NlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDUKfQ=="}, "40": {"version": "45", "sha256": "0plk308mc45py7xp02y5bvsidyg4fgsph9p8wmr2wr0wyz74c0iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Vhc3lTY3JlZW5DYXN0L0Vhc3lTY3JlZW5DYXN0IiwKICAidXVpZCI6ICJFYXN5U2NyZWVuQ2FzdEBpYWNvcG9kZWVub3NlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDUKfQ=="}, "41": {"version": "45", "sha256": "0plk308mc45py7xp02y5bvsidyg4fgsph9p8wmr2wr0wyz74c0iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Vhc3lTY3JlZW5DYXN0L0Vhc3lTY3JlZW5DYXN0IiwKICAidXVpZCI6ICJFYXN5U2NyZWVuQ2FzdEBpYWNvcG9kZWVub3NlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDUKfQ=="}, "42": {"version": "45", "sha256": "0plk308mc45py7xp02y5bvsidyg4fgsph9p8wmr2wr0wyz74c0iq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHNpbXBsaWZpZXMgdGhlIHVzZSBvZiB0aGUgdmlkZW8gcmVjb3JkaW5nIGZ1bmN0aW9uIGludGVncmF0ZWQgaW4gZ25vbWUgc2hlbGwsIGFsbG93cyBxdWlja2x5IHRvIGNoYW5nZSB0aGUgdmFyaW91cyBzZXR0aW5ncyBvZiB0aGUgZGVza3RvcCByZWNvcmRpbmcuXG5cblNPVVJDRSBDT0RFIC0+ICBodHRwczovL2dpdGh1Yi5jb20vRWFzeVNjcmVlbkNhc3QvRWFzeVNjcmVlbkNhc3RcblxuVklERU8gLT4gIGh0dHBzOi8veW91dHUuYmUvODFFOUFydXJhS1VcblxuKipOT1RJQ0UqKlxuaWYgYW4gZXJyb3Igb2NjdXJzIGR1cmluZyB0aGUgdXBkYXRlIGlzIHJlY29tbWVuZGVkIHRvIHJlbG9hZCBHTk9NRSBTaGVsbCAoQWx0ICsgRjIsICdyJykgYW5kIHJlbG9hZCB0aGUgZXh0ZW5zaW9uJ3MgaW5zdGFsbGF0aW9uIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiRWFzeVNjcmVlbkNhc3RAaWFjb3BvZGVlbm9zZWUuZ21haWwuY29tIiwKICAibmFtZSI6ICJFYXN5U2NyZWVuQ2FzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5FYXN5U2NyZWVuQ2FzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Vhc3lTY3JlZW5DYXN0L0Vhc3lTY3JlZW5DYXN0IiwKICAidXVpZCI6ICJFYXN5U2NyZWVuQ2FzdEBpYWNvcG9kZWVub3NlZS5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDUKfQ=="}}} , {"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": "31", "sha256": "0zc37qnzmnc4l9j8q23bxl59xxwz31pk4wc3vamzwgz65ncjn469", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2Z4bW9uay9nbm9tZS1zaGVsbC1zY3JvbGwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAic2Nyb2xsLXdvcmtzcGFjZXNAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "41": {"version": "31", "sha256": "0zc37qnzmnc4l9j8q23bxl59xxwz31pk4wc3vamzwgz65ncjn469", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2Z4bW9uay9nbm9tZS1zaGVsbC1zY3JvbGwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAic2Nyb2xsLXdvcmtzcGFjZXNAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}, "42": {"version": "31", "sha256": "0zc37qnzmnc4l9j8q23bxl59xxwz31pk4wc3vamzwgz65ncjn469", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB3b3Jrc3BhY2VzIGJ5IHNjcm9sbGluZyBvdmVyIHRoZSB0b3AgcGFuZWwiLAogICJuYW1lIjogIlRvcCBQYW5lbCBXb3Jrc3BhY2UgU2Nyb2xsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJ0aW1AZ2Z4bW9uay5uZXQiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ldC5nZnhtb25rLnNjcm9sbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZ2Z4bW9uay9nbm9tZS1zaGVsbC1zY3JvbGwtd29ya3NwYWNlcyIsCiAgInV1aWQiOiAic2Nyb2xsLXdvcmtzcGFjZXNAZ2Z4bW9uay5uZXQiLAogICJ2ZXJzaW9uIjogMzEKfQ=="}}} , {"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"}}} @@ -57,7 +57,7 @@ , {"uuid": "pixel-saver@deadalnix.me", "name": "Pixel Saver", "pname": "pixel-saver", "description": "Pixel Saver is designed to save pixel by fusing activity bar and title bar in a natural way", "link": "https://extensions.gnome.org/extension/723/pixel-saver/", "shell_version_map": {"38": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "40": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "41": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "42": {"version": "26", "sha256": "1i284r5443cypw7jq31rrbc4f075piaq872331qnrrynv4s1k8cn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBpeGVsIFNhdmVyIGlzIGRlc2lnbmVkIHRvIHNhdmUgcGl4ZWwgYnkgZnVzaW5nIGFjdGl2aXR5IGJhciBhbmQgdGl0bGUgYmFyIGluIGEgbmF0dXJhbCB3YXkiLAogICJuYW1lIjogIlBpeGVsIFNhdmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIiwKICAgICI0MS4xIiwKICAgICI0MS4yIiwKICAgICI0MS4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGVhZGFsbml4L3BpeGVsLXNhdmVyIiwKICAidXVpZCI6ICJwaXhlbC1zYXZlckBkZWFkYWxuaXgubWUiLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} , {"uuid": "breakreminder@danielfalk22.gmail.com", "name": "Break Reminder", "pname": "break-reminder", "description": "Get a reminder to take a break", "link": "https://extensions.gnome.org/extension/734/break-reminder/", "shell_version_map": {"38": {"version": "6", "sha256": "0k21wj98ldx52m7s8sgndqziqnn7n0g2j45lsi31kfjydhyj3dmk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBhIHJlbWluZGVyIHRvIHRha2UgYSBicmVhayIsCiAgIm5hbWUiOiAiQnJlYWsgUmVtaW5kZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZWxmYWxrL2dub21lM2JyZWFrcmVtaW5kZXIiLAogICJ1dWlkIjogImJyZWFrcmVtaW5kZXJAZGFuaWVsZmFsazIyLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "Hide_Activities@shay.shayel.org", "name": "Hide Activities Button", "pname": "hide-activities-button", "description": "Hides the Activities button from the status bar (the hot corner and keyboard shortcut keeps working). To disable top left hot corner use 'No Topleft Hot Corner' extension — https://extensions.gnome.org/extension/118/no-topleft-hot-corner/ .", "link": "https://extensions.gnome.org/extension/744/hide-activities-button/", "shell_version_map": {"38": {"version": "13", "sha256": "0kr8ygb5wv2p2fzkd5gm7v9kcc54mdcrb4v1v3x1sniqgq69d856", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQWN0aXZpdGllc0BzaGF5LnNoYXllbC5vcmciLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "40": {"version": "13", "sha256": "0kr8ygb5wv2p2fzkd5gm7v9kcc54mdcrb4v1v3x1sniqgq69d856", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQWN0aXZpdGllc0BzaGF5LnNoYXllbC5vcmciLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "0kr8ygb5wv2p2fzkd5gm7v9kcc54mdcrb4v1v3x1sniqgq69d856", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQWN0aXZpdGllc0BzaGF5LnNoYXllbC5vcmciLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "0kr8ygb5wv2p2fzkd5gm7v9kcc54mdcrb4v1v3x1sniqgq69d856", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBBY3Rpdml0aWVzIGJ1dHRvbiBmcm9tIHRoZSBzdGF0dXMgYmFyICh0aGUgaG90IGNvcm5lciBhbmQga2V5Ym9hcmQgc2hvcnRjdXQga2VlcHMgd29ya2luZykuIFRvIGRpc2FibGUgdG9wIGxlZnQgaG90IGNvcm5lciB1c2UgJ05vIFRvcGxlZnQgSG90IENvcm5lcicgZXh0ZW5zaW9uIFx1MjAxNCBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTgvbm8tdG9wbGVmdC1ob3QtY29ybmVyLyAuIiwKICAibmFtZSI6ICJIaWRlIEFjdGl2aXRpZXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIkhpZGVfQWN0aXZpdGllc0BzaGF5LnNoYXllbC5vcmciLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} -, {"uuid": "openweather-extension@jenslody.de", "name": "OpenWeather", "pname": "openweather", "description": "Display weather information for any location on Earth in the GNOME Shell\n\nIf you get an ERROR after update:\n- Restart the GNOME shell (log out)\n- or Reboot completely", "link": "https://extensions.gnome.org/extension/750/openweather/", "shell_version_map": {"38": {"version": "105", "sha256": "197a7gr16x40kfq02zv1csc84kbah2z1183cs5qj4a4czgw6nmh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NrcmV3YmFsbC9vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQGplbnNsb2R5LmRlIiwKICAidmVyc2lvbiI6IDEwNQp9"}, "40": {"version": "114", "sha256": "01w84n4sg4knlnbbzzz3xf4f5ap4jabnzp21xdk3krkjvaabl7id", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW9wZW53ZWF0aGVyIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVud2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NrcmV3YmFsbC9vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQGplbnNsb2R5LmRlIiwKICAidmVyc2lvbiI6IDExNAp9"}, "41": {"version": "114", "sha256": "01w84n4sg4knlnbbzzz3xf4f5ap4jabnzp21xdk3krkjvaabl7id", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW9wZW53ZWF0aGVyIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVud2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NrcmV3YmFsbC9vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQGplbnNsb2R5LmRlIiwKICAidmVyc2lvbiI6IDExNAp9"}, "42": {"version": "117", "sha256": "1givfmbd29z0jrylrkq90c4yizj160s9zkvfsz8xmd0014y9wibk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW9wZW53ZWF0aGVyIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVud2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9za3Jld2JhbGwvb3BlbndlYXRoZXIiLAogICJ1dWlkIjogIm9wZW53ZWF0aGVyLWV4dGVuc2lvbkBqZW5zbG9keS5kZSIsCiAgInZlcnNpb24iOiAxMTcKfQ=="}}} +, {"uuid": "openweather-extension@jenslody.de", "name": "OpenWeather", "pname": "openweather", "description": "Display weather information for any location on Earth in the GNOME Shell\n\nIf you get an ERROR after update:\n- Restart the GNOME shell (log out)\n- or Reboot completely", "link": "https://extensions.gnome.org/extension/750/openweather/", "shell_version_map": {"38": {"version": "105", "sha256": "197a7gr16x40kfq02zv1csc84kbah2z1183cs5qj4a4czgw6nmh3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAibG9jYWxlZGlyIjogIi91c3IvbG9jYWwvc2hhcmUvbG9jYWxlIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NrcmV3YmFsbC9vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQGplbnNsb2R5LmRlIiwKICAidmVyc2lvbiI6IDEwNQp9"}, "40": {"version": "114", "sha256": "01w84n4sg4knlnbbzzz3xf4f5ap4jabnzp21xdk3krkjvaabl7id", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW9wZW53ZWF0aGVyIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVud2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NrcmV3YmFsbC9vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQGplbnNsb2R5LmRlIiwKICAidmVyc2lvbiI6IDExNAp9"}, "41": {"version": "114", "sha256": "01w84n4sg4knlnbbzzz3xf4f5ap4jabnzp21xdk3krkjvaabl7id", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW9wZW53ZWF0aGVyIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVud2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL3NrcmV3YmFsbC9vcGVud2VhdGhlciIsCiAgInV1aWQiOiAib3BlbndlYXRoZXItZXh0ZW5zaW9uQGplbnNsb2R5LmRlIiwKICAidmVyc2lvbiI6IDExNAp9"}, "42": {"version": "118", "sha256": "0c39iq30sb6y1z6c0n8n2qsj8ww7ww9pnaqg900f0pv06nzfmjpz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgd2VhdGhlciBpbmZvcm1hdGlvbiBmb3IgYW55IGxvY2F0aW9uIG9uIEVhcnRoIGluIHRoZSBHTk9NRSBTaGVsbFxuXG5JZiB5b3UgZ2V0IGFuIEVSUk9SIGFmdGVyIHVwZGF0ZTpcbi0gUmVzdGFydCB0aGUgR05PTUUgc2hlbGwgKGxvZyBvdXQpXG4tIG9yIFJlYm9vdCBjb21wbGV0ZWx5IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW9wZW53ZWF0aGVyIiwKICAibmFtZSI6ICJPcGVuV2VhdGhlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vcGVud2VhdGhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9za3Jld2JhbGwvb3BlbndlYXRoZXIiLAogICJ1dWlkIjogIm9wZW53ZWF0aGVyLWV4dGVuc2lvbkBqZW5zbG9keS5kZSIsCiAgInZlcnNpb24iOiAxMTgKfQ=="}}} , {"uuid": "audio-output-switcher@anduchs", "name": "Audio Output Switcher", "pname": "audio-output-switcher", "description": "Adds a switch for choosing audio output to the system menu.", "link": "https://extensions.gnome.org/extension/751/audio-output-switcher/", "shell_version_map": {"38": {"version": "19", "sha256": "02z1smlc0k308sr462l9pwf2gsldqdzjalbc364i4b7286qyakxc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2FkYXhpL2F1ZGlvLW91dHB1dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYXVkaW8tb3V0cHV0LXN3aXRjaGVyQGFuZHVjaHMiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "40": {"version": "19", "sha256": "02z1smlc0k308sr462l9pwf2gsldqdzjalbc364i4b7286qyakxc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2FkYXhpL2F1ZGlvLW91dHB1dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYXVkaW8tb3V0cHV0LXN3aXRjaGVyQGFuZHVjaHMiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "41": {"version": "19", "sha256": "02z1smlc0k308sr462l9pwf2gsldqdzjalbc364i4b7286qyakxc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2FkYXhpL2F1ZGlvLW91dHB1dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYXVkaW8tb3V0cHV0LXN3aXRjaGVyQGFuZHVjaHMiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}, "42": {"version": "19", "sha256": "02z1smlc0k308sr462l9pwf2gsldqdzjalbc364i4b7286qyakxc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBzd2l0Y2ggZm9yIGNob29zaW5nIGF1ZGlvIG91dHB1dCB0byB0aGUgc3lzdGVtIG1lbnUuIiwKICAibmFtZSI6ICJBdWRpbyBPdXRwdXQgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHA6Ly9naXRodWIuY29tL2FkYXhpL2F1ZGlvLW91dHB1dC1zd2l0Y2hlciIsCiAgInV1aWQiOiAiYXVkaW8tb3V0cHV0LXN3aXRjaGVyQGFuZHVjaHMiLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"uuid": "hibernate-status@dromi", "name": "Hibernate Status Button", "pname": "hibernate-status-button", "description": "Adds a Hibernate button in Status menu. Using Alt modifier, you can also select Hybrid Sleep instead.", "link": "https://extensions.gnome.org/extension/755/hibernate-status-button/", "shell_version_map": {"38": {"version": "27", "sha256": "0yqzg2nz040vsv0ilwkjkza03qxns18gq4055gq0c3k051jy6d4v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAibmFtZSI6ICJIaWJlcm5hdGUgU3RhdHVzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyZWxhbmdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1oaWJlcm5hdGUtc3RhdHVzIiwKICAidXVpZCI6ICJoaWJlcm5hdGUtc3RhdHVzQGRyb21pIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "40": {"version": "33", "sha256": "181j95bhmrkvxvpam8ysrxzsaznfkgnn92xxfkg86lavvyl1alv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJlbGFuZ2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWhpYmVybmF0ZS1zdGF0dXMiLAogICJ1dWlkIjogImhpYmVybmF0ZS1zdGF0dXNAZHJvbWkiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "181j95bhmrkvxvpam8ysrxzsaznfkgnn92xxfkg86lavvyl1alv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJlbGFuZ2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWhpYmVybmF0ZS1zdGF0dXMiLAogICJ1dWlkIjogImhpYmVybmF0ZS1zdGF0dXNAZHJvbWkiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "42": {"version": "33", "sha256": "181j95bhmrkvxvpam8ysrxzsaznfkgnn92xxfkg86lavvyl1alv5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBIaWJlcm5hdGUgYnV0dG9uIGluIFN0YXR1cyBtZW51LiBVc2luZyBBbHQgbW9kaWZpZXIsIHlvdSBjYW4gYWxzbyBzZWxlY3QgSHlicmlkIFNsZWVwIGluc3RlYWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiaGliZXJuYXRlLXN0YXR1cy1idXR0b24iLAogICJuYW1lIjogIkhpYmVybmF0ZSBTdGF0dXMgQnV0dG9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXJlbGFuZ2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWhpYmVybmF0ZS1zdGF0dXMiLAogICJ1dWlkIjogImhpYmVybmF0ZS1zdGF0dXNAZHJvbWkiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} , {"uuid": "minimizeall@scharlessantos.org", "name": "Minimize All", "pname": "minimize-all", "description": "Minimize all windows in current workspace", "link": "https://extensions.gnome.org/extension/760/minimize-all/", "shell_version_map": {"38": {"version": "20", "sha256": "15v6h4wcznrylip57spjdkz0jk6y7hcp47607pj0yx5dmxjaws86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIGFsbCB3aW5kb3dzIGluIGN1cnJlbnQgd29ya3NwYWNlIiwKICAibmFtZSI6ICJNaW5pbWl6ZSBBbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2NoYXJsZXNzYW50b3MvbWluaW1pemVhbGwiLAogICJ1dWlkIjogIm1pbmltaXplYWxsQHNjaGFybGVzc2FudG9zLm9yZyIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "15v6h4wcznrylip57spjdkz0jk6y7hcp47607pj0yx5dmxjaws86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplIGFsbCB3aW5kb3dzIGluIGN1cnJlbnQgd29ya3NwYWNlIiwKICAibmFtZSI6ICJNaW5pbWl6ZSBBbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc2NoYXJsZXNzYW50b3MvbWluaW1pemVhbGwiLAogICJ1dWlkIjogIm1pbmltaXplYWxsQHNjaGFybGVzc2FudG9zLm9yZyIsCiAgInZlcnNpb24iOiAyMAp9"}}} @@ -65,7 +65,7 @@ , {"uuid": "ProxySwitcher@flannaghan.com", "name": "Proxy Switcher", "pname": "proxy-switcher", "description": "Switches between the system proxy settings profiles defined in Network Settings.", "link": "https://extensions.gnome.org/extension/771/proxy-switcher/", "shell_version_map": {"38": {"version": "17", "sha256": "0ap55mxnhwzxzv95jfc4l3bz9v6z04yn53yf233vbjsdpx55vh38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbWZsYW5uYWdoYW4vcHJveHktc3dpdGNoZXIiLAogICJ1dWlkIjogIlByb3h5U3dpdGNoZXJAZmxhbm5hZ2hhbi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "40": {"version": "17", "sha256": "0ap55mxnhwzxzv95jfc4l3bz9v6z04yn53yf233vbjsdpx55vh38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbWZsYW5uYWdoYW4vcHJveHktc3dpdGNoZXIiLAogICJ1dWlkIjogIlByb3h5U3dpdGNoZXJAZmxhbm5hZ2hhbi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "0ap55mxnhwzxzv95jfc4l3bz9v6z04yn53yf233vbjsdpx55vh38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbWZsYW5uYWdoYW4vcHJveHktc3dpdGNoZXIiLAogICJ1dWlkIjogIlByb3h5U3dpdGNoZXJAZmxhbm5hZ2hhbi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "0ap55mxnhwzxzv95jfc4l3bz9v6z04yn53yf233vbjsdpx55vh38", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIGJldHdlZW4gdGhlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBwcm9maWxlcyBkZWZpbmVkIGluIE5ldHdvcmsgU2V0dGluZ3MuIiwKICAibmFtZSI6ICJQcm94eSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3RvbWZsYW5uYWdoYW4vcHJveHktc3dpdGNoZXIiLAogICJ1dWlkIjogIlByb3h5U3dpdGNoZXJAZmxhbm5hZ2hhbi5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "clipboard-indicator@tudmotu.com", "name": "Clipboard Indicator", "pname": "clipboard-indicator", "description": "Clipboard Manager extension for Gnome-Shell - Adds a clipboard indicator to the top panel, and caches clipboard history.\n\nSee contributors here:\nhttps://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator/graphs/contributors", "link": "https://extensions.gnome.org/extension/779/clipboard-indicator/", "shell_version_map": {"38": {"version": "37", "sha256": "1a9b5h4i17m3lmgs6qpmr30v2hjffsiad9rx0lgwcv7915a68pxp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LlxuXG5TZWUgY29udHJpYnV0b3JzIGhlcmU6XG5odHRwczovL2dpdGh1Yi5jb20vVHVkbW90dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2xpcGJvYXJkLWluZGljYXRvci9ncmFwaHMvY29udHJpYnV0b3JzIiwKICAibmFtZSI6ICJDbGlwYm9hcmQgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vVHVkbW90dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2xpcGJvYXJkLWluZGljYXRvciIsCiAgInV1aWQiOiAiY2xpcGJvYXJkLWluZGljYXRvckB0dWRtb3R1LmNvbSIsCiAgInZlcnNpb24iOiAzNwp9"}, "40": {"version": "38", "sha256": "1vd51yczzs2yhfql8n0hqnphfw05nkqkqrwnz4wcp1xqslrryi6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LlxuXG5TZWUgY29udHJpYnV0b3JzIGhlcmU6XG5odHRwczovL2dpdGh1Yi5jb20vVHVkbW90dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2xpcGJvYXJkLWluZGljYXRvci9ncmFwaHMvY29udHJpYnV0b3JzIiwKICAibmFtZSI6ICJDbGlwYm9hcmQgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogMzgKfQ=="}, "42": {"version": "42", "sha256": "1sgssg61z5dbqdcwychaxv0sv9g8392qa271iyn75p78l8lg03x9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsaXBib2FyZCBNYW5hZ2VyIGV4dGVuc2lvbiBmb3IgR25vbWUtU2hlbGwgLSBBZGRzIGEgY2xpcGJvYXJkIGluZGljYXRvciB0byB0aGUgdG9wIHBhbmVsLCBhbmQgY2FjaGVzIGNsaXBib2FyZCBoaXN0b3J5LlxuXG5TZWUgY29udHJpYnV0b3JzIGhlcmU6XG5odHRwczovL2dpdGh1Yi5jb20vVHVkbW90dS9nbm9tZS1zaGVsbC1leHRlbnNpb24tY2xpcGJvYXJkLWluZGljYXRvci9ncmFwaHMvY29udHJpYnV0b3JzIiwKICAibmFtZSI6ICJDbGlwYm9hcmQgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1R1ZG1vdHUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWNsaXBib2FyZC1pbmRpY2F0b3IiLAogICJ1dWlkIjogImNsaXBib2FyZC1pbmRpY2F0b3JAdHVkbW90dS5jb20iLAogICJ2ZXJzaW9uIjogNDIKfQ=="}}} , {"uuid": "pidgin@muffinmad", "name": "Pidgin IM integration", "pname": "pidgin-im-integration", "description": "Integrate Pidgin IMs in the Gnome Shell message tray", "link": "https://extensions.gnome.org/extension/782/pidgin-im-integration/", "shell_version_map": {"40": {"version": "43", "sha256": "08646prz1kf6maijn4dw5503j5psaijd6g2zlvc3lhvv2pvwjksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBQaWRnaW4gSU1zIGluIHRoZSBHbm9tZSBTaGVsbCBtZXNzYWdlIHRyYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tcGlkZ2luIiwKICAibmFtZSI6ICJQaWRnaW4gSU0gaW50ZWdyYXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlkZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXVmZmlubWFkL3BpZGdpbi1pbS1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBpZGdpbkBtdWZmaW5tYWQiLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, "41": {"version": "43", "sha256": "08646prz1kf6maijn4dw5503j5psaijd6g2zlvc3lhvv2pvwjksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBQaWRnaW4gSU1zIGluIHRoZSBHbm9tZSBTaGVsbCBtZXNzYWdlIHRyYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tcGlkZ2luIiwKICAibmFtZSI6ICJQaWRnaW4gSU0gaW50ZWdyYXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlkZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXVmZmlubWFkL3BpZGdpbi1pbS1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBpZGdpbkBtdWZmaW5tYWQiLAogICJ2ZXJzaW9uIjogNDMKfQ=="}, "42": {"version": "43", "sha256": "08646prz1kf6maijn4dw5503j5psaijd6g2zlvc3lhvv2pvwjksx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBQaWRnaW4gSU1zIGluIHRoZSBHbm9tZSBTaGVsbCBtZXNzYWdlIHRyYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tcGlkZ2luIiwKICAibmFtZSI6ICJQaWRnaW4gSU0gaW50ZWdyYXRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucGlkZ2luIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXVmZmlubWFkL3BpZGdpbi1pbS1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBpZGdpbkBtdWZmaW5tYWQiLAogICJ2ZXJzaW9uIjogNDMKfQ=="}}} -, {"uuid": "ShutdownTimer@neumann", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Shutdown/suspend the device after a specific time.\n\nMaximum timer value und default slider position can be modified in the settings.", "link": "https://extensions.gnome.org/extension/792/shutdowntimer/", "shell_version_map": {"38": {"version": "34", "sha256": "1glzjcdv90w5mx0xqj57i0s3qgazr5dcdcin1kwb5mqvc362dd68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "40": {"version": "34", "sha256": "1glzjcdv90w5mx0xqj57i0s3qgazr5dcdcin1kwb5mqvc362dd68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}, "41": {"version": "34", "sha256": "1glzjcdv90w5mx0xqj57i0s3qgazr5dcdcin1kwb5mqvc362dd68", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzQKfQ=="}}} +, {"uuid": "ShutdownTimer@neumann", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Shutdown/suspend the device after a specific time.\n\nMaximum timer value und default slider position can be modified in the settings.", "link": "https://extensions.gnome.org/extension/792/shutdowntimer/", "shell_version_map": {"38": {"version": "35", "sha256": "1ynbc63lslszd5qihz6kbjlhhibq0m6g572wspln2pxyar23v63a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}, "40": {"version": "35", "sha256": "1ynbc63lslszd5qihz6kbjlhhibq0m6g572wspln2pxyar23v63a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}, "41": {"version": "35", "sha256": "1ynbc63lslszd5qihz6kbjlhhibq0m6g572wspln2pxyar23v63a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNodXRkb3duL3N1c3BlbmQgdGhlIGRldmljZSBhZnRlciBhIHNwZWNpZmljIHRpbWUuXG5cbk1heGltdW0gdGltZXIgdmFsdWUgdW5kIGRlZmF1bHQgc2xpZGVyIHBvc2l0aW9uIGNhbiBiZSBtb2RpZmllZCBpbiB0aGUgc2V0dGluZ3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2h1dGRvd25UaW1lciIsCiAgIm5hbWUiOiAiU2h1dGRvd25UaW1lciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV0ZG93bnRpbWVyLW5ldW1hbm4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25ldW1hbm4tZC9TaHV0ZG93blRpbWVyIiwKICAidXVpZCI6ICJTaHV0ZG93blRpbWVyQG5ldW1hbm4iLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"uuid": "hide-dash@xenatt.github.com", "name": "Hide Dash X", "pname": "hide-dash", "description": "Hide the dash from the activities overview.", "link": "https://extensions.gnome.org/extension/805/hide-dash/", "shell_version_map": {"38": {"version": "10", "sha256": "059cy18awzv9qyn803zjyxiznacnf6pai8px2mb9mrbyf98153xz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGRhc2ggZnJvbSB0aGUgYWN0aXZpdGllcyBvdmVydmlldy4iLAogICJuYW1lIjogIkhpZGUgRGFzaCBYIiwKICAib3JpZ2luYWwtYXV0aG9yIjogInphY2JhcnRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0VkZW5ob2Zlci9NaW5pbWFsaXNtLUdub21lLVNoZWxsIiwKICAidXVpZCI6ICJoaWRlLWRhc2hAeGVuYXR0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} , {"uuid": "hide-workspace@xenatt.github.com", "name": "Hide Workspace Thumbnails", "pname": "hide-workspace-thumbnails", "description": "Hide workspace thumbnails from the overview. But don't worry they are still present and one can switch between them like usual with e.g. shortcuts..", "link": "https://extensions.gnome.org/extension/808/hide-workspace-thumbnails/", "shell_version_map": {"40": {"version": "16", "sha256": "0443zyqr2hwq5fj3h8zch8iav83xzj4bqn1k6qd5f2z46kvzj611", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgd29ya3NwYWNlIHRodW1ibmFpbHMgZnJvbSB0aGUgb3ZlcnZpZXcuIEJ1dCBkb24ndCB3b3JyeSB0aGV5IGFyZSBzdGlsbCBwcmVzZW50IGFuZCBvbmUgY2FuIHN3aXRjaCBiZXR3ZWVuIHRoZW0gbGlrZSB1c3VhbCB3aXRoIGUuZy4gc2hvcnRjdXRzLi4iLAogICJuYW1lIjogIkhpZGUgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMTAiLAogICAgIjMuMTIiLAogICAgIjMuMTQiLAogICAgIjMuMTYiLAogICAgIjMuMTgiLAogICAgIjMuMjAiLAogICAgIjMuMjIiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRWRlbmhvZmVyL01pbmltYWxpc20tR25vbWUtU2hlbGwiLAogICJ1dWlkIjogImhpZGUtd29ya3NwYWNlQHhlbmF0dC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} , {"uuid": "keyman@dpoetzsch.github.com", "name": "KeyMan", "pname": "keyman", "description": "Access passwords from the gnome keyring in a convenient way:\nSimply search for your password and copy it to clipboad by clicking it. After a certain amount of time it will be removed automatically (default is 5 seconds). As this only works if the keyrings are unlocked, this extension also provides easy access to lock/unlock keyrings.", "link": "https://extensions.gnome.org/extension/819/keyman/", "shell_version_map": {"40": {"version": "20", "sha256": "1wd76bdnzs7mxwwyvffw0fm8r8chsblz3dinpwiyc5d5kmlnyv5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kcG9ldHpzY2gva2V5bWFuIiwKICAidXVpZCI6ICJrZXltYW5AZHBvZXR6c2NoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "22", "sha256": "0ijqdsmz6mid30cav7is9ypl0862y2d877zagr75cnq3jshplfbj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjY2VzcyBwYXNzd29yZHMgZnJvbSB0aGUgZ25vbWUga2V5cmluZyBpbiBhIGNvbnZlbmllbnQgd2F5OlxuU2ltcGx5IHNlYXJjaCBmb3IgeW91ciBwYXNzd29yZCBhbmQgY29weSBpdCB0byBjbGlwYm9hZCBieSBjbGlja2luZyBpdC4gQWZ0ZXIgYSBjZXJ0YWluIGFtb3VudCBvZiB0aW1lIGl0IHdpbGwgYmUgcmVtb3ZlZCBhdXRvbWF0aWNhbGx5IChkZWZhdWx0IGlzIDUgc2Vjb25kcykuIEFzIHRoaXMgb25seSB3b3JrcyBpZiB0aGUga2V5cmluZ3MgYXJlIHVubG9ja2VkLCB0aGlzIGV4dGVuc2lvbiBhbHNvIHByb3ZpZGVzIGVhc3kgYWNjZXNzIHRvIGxvY2svdW5sb2NrIGtleXJpbmdzLiIsCiAgIm5hbWUiOiAiS2V5TWFuIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJrZXltYW5AcG9laGUuZGUiCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmtleW1hbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kcG9ldHpzY2gva2V5bWFuIiwKICAidXVpZCI6ICJrZXltYW5AZHBvZXR6c2NoLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} @@ -86,7 +86,7 @@ , {"uuid": "files-menu", "name": "Files Menu", "pname": "files-menu", "description": "Quickly navigate your file system and open files through a menu.", "link": "https://extensions.gnome.org/extension/907/files-menu/", "shell_version_map": {"41": {"version": "15", "sha256": "0aliry9bx3zncwywsz040kb42iz4x2nwdr9ihz3d9d92im0y8n7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbmF2aWdhdGUgeW91ciBmaWxlIHN5c3RlbSBhbmQgb3BlbiBmaWxlcyB0aHJvdWdoIGEgbWVudS4iLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJGaWxlcyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJBeGVsIHZvbiBCZXJ0b2xkaSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYmVydG9sZGlhL2ZpbGVzLW1lbnUiLAogICJ1dWlkIjogImZpbGVzLW1lbnUiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "0aliry9bx3zncwywsz040kb42iz4x2nwdr9ihz3d9d92im0y8n7m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgbmF2aWdhdGUgeW91ciBmaWxlIHN5c3RlbSBhbmQgb3BlbiBmaWxlcyB0aHJvdWdoIGEgbWVudS4iLAogICJsb2NhbGVkaXIiOiAibG9jYWxlIiwKICAibmFtZSI6ICJGaWxlcyBNZW51IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJBeGVsIHZvbiBCZXJ0b2xkaSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vYmVydG9sZGlhL2ZpbGVzLW1lbnUiLAogICJ1dWlkIjogImZpbGVzLW1lbnUiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "multi-monitors-add-on@spin83", "name": "Multi Monitors Add-On", "pname": "multi-monitors-add-on", "description": "Add multiple monitors overview and panel for gnome-shell.", "link": "https://extensions.gnome.org/extension/921/multi-monitors-add-on/", "shell_version_map": {"38": {"version": "23", "sha256": "1snj6xhl7qf3lmjvrn7sbgkmb3rpq4b4q88yfdlx5vrzn6sw5bzq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBtdWx0aXBsZSBtb25pdG9ycyBvdmVydmlldyBhbmQgcGFuZWwgZm9yIGdub21lLXNoZWxsLiIsCiAgImdldHRleHQtZG9tYWluIjogIm11bHRpLW1vbml0b3JzLWFkZC1vbiIsCiAgIm5hbWUiOiAiTXVsdGkgTW9uaXRvcnMgQWRkLU9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bHRpLW1vbml0b3JzLWFkZC1vbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NwaW44My9tdWx0aS1tb25pdG9ycy1hZGQtb24uZ2l0IiwKICAidXVpZCI6ICJtdWx0aS1tb25pdG9ycy1hZGQtb25Ac3BpbjgzIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "ping_indicator@trifonovkv.gmail.com", "name": "Ping Indicator", "pname": "ping-indicator", "description": "Display ping time", "link": "https://extensions.gnome.org/extension/923/ping-indicator/", "shell_version_map": {"38": {"version": "24", "sha256": "0arxcaxpybc1as2d9dqmmswjnjj7p11rvss4s84x6kz8i4xbhjy3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgcGluZyB0aW1lIiwKICAibmFtZSI6ICJQaW5nIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOC4xIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJpZm9ub3Zrdi9waW5nX2luZGljYXRvciIsCiAgInV1aWQiOiAicGluZ19pbmRpY2F0b3JAdHJpZm9ub3Zrdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMjQKfQ=="}}} -, {"uuid": "transcode-appsearch@k.kubusha@gmail.com", "name": "Transcode App Search", "pname": "transcodeappsearch", "description": "Searching apps both direct and transcoded name (English, Russian, Ukrainian langs)", "link": "https://extensions.gnome.org/extension/928/transcodeappsearch/", "shell_version_map": {"38": {"version": "9", "sha256": "0ia3f8pmnyzjvg7di0cgy7n6ppbpkma6y0xlwjb8hhp5wz3a11s1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGF0eWFuL2dub21lLWV4dGVuc2lvbi10cmFuc2NvZGUtc2VhcmNoYXBwIiwKICAidXVpZCI6ICJ0cmFuc2NvZGUtYXBwc2VhcmNoQGsua3VidXNoYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "0ia3f8pmnyzjvg7di0cgy7n6ppbpkma6y0xlwjb8hhp5wz3a11s1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGF0eWFuL2dub21lLWV4dGVuc2lvbi10cmFuc2NvZGUtc2VhcmNoYXBwIiwKICAidXVpZCI6ICJ0cmFuc2NvZGUtYXBwc2VhcmNoQGsua3VidXNoYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0ia3f8pmnyzjvg7di0cgy7n6ppbpkma6y0xlwjb8hhp5wz3a11s1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ncykiLAogICJuYW1lIjogIlRyYW5zY29kZSBBcHAgU2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGF0eWFuL2dub21lLWV4dGVuc2lvbi10cmFuc2NvZGUtc2VhcmNoYXBwIiwKICAidXVpZCI6ICJ0cmFuc2NvZGUtYXBwc2VhcmNoQGsua3VidXNoYUBnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"uuid": "transcode-appsearch@k.kubusha@gmail.com", "name": "Transcode App Search", "pname": "transcodeappsearch", "description": "Searching apps both direct and transcoded name (English, Russian, Ukrainian languages)", "link": "https://extensions.gnome.org/extension/928/transcodeappsearch/", "shell_version_map": {"38": {"version": "10", "sha256": "0wn3ic2q7pwdinsyvp7qbbmw1diw5fy4ggx4gjh7ivr651rd38yb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ndWFnZXMpIiwKICAibmFtZSI6ICJUcmFuc2NvZGUgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0YXR5YW4vZ25vbWUtZXh0ZW5zaW9uLXRyYW5zY29kZS1zZWFyY2hhcHAiLAogICJ1dWlkIjogInRyYW5zY29kZS1hcHBzZWFyY2hAay5rdWJ1c2hhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "0wn3ic2q7pwdinsyvp7qbbmw1diw5fy4ggx4gjh7ivr651rd38yb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ndWFnZXMpIiwKICAibmFtZSI6ICJUcmFuc2NvZGUgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0YXR5YW4vZ25vbWUtZXh0ZW5zaW9uLXRyYW5zY29kZS1zZWFyY2hhcHAiLAogICJ1dWlkIjogInRyYW5zY29kZS1hcHBzZWFyY2hAay5rdWJ1c2hhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "0wn3ic2q7pwdinsyvp7qbbmw1diw5fy4ggx4gjh7ivr651rd38yb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ndWFnZXMpIiwKICAibmFtZSI6ICJUcmFuc2NvZGUgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0YXR5YW4vZ25vbWUtZXh0ZW5zaW9uLXRyYW5zY29kZS1zZWFyY2hhcHAiLAogICJ1dWlkIjogInRyYW5zY29kZS1hcHBzZWFyY2hAay5rdWJ1c2hhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "0wn3ic2q7pwdinsyvp7qbbmw1diw5fy4ggx4gjh7ivr651rd38yb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaGluZyBhcHBzIGJvdGggZGlyZWN0IGFuZCB0cmFuc2NvZGVkIG5hbWUgKEVuZ2xpc2gsIFJ1c3NpYW4sIFVrcmFpbmlhbiBsYW5ndWFnZXMpIiwKICAibmFtZSI6ICJUcmFuc2NvZGUgQXBwIFNlYXJjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xMCIsCiAgICAiMy4xMiIsCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N0YXR5YW4vZ25vbWUtZXh0ZW5zaW9uLXRyYW5zY29kZS1zZWFyY2hhcHAiLAogICJ1dWlkIjogInRyYW5zY29kZS1hcHBzZWFyY2hAay5rdWJ1c2hhQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "synaptic-button@fthx", "name": "Synaptic Button", "pname": "synaptic-button", "description": "Button that directly starts Synaptic package manager.\n\n For snap management without Snap Store, consider Snap Manager extension.", "link": "https://extensions.gnome.org/extension/938/synaptic-button/", "shell_version_map": {"38": {"version": "4", "sha256": "0wdi35qz5rxs4fvcxlrvlyslrspsgfkryvh0na9vakbvhpmv7skv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiB0aGF0IGRpcmVjdGx5IHN0YXJ0cyBTeW5hcHRpYyBwYWNrYWdlIG1hbmFnZXIuXG5cbiBGb3Igc25hcCBtYW5hZ2VtZW50IHdpdGhvdXQgU25hcCBTdG9yZSwgY29uc2lkZXIgU25hcCBNYW5hZ2VyIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIlN5bmFwdGljIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvc3luYXB0aWMtYnV0dG9uIiwKICAidXVpZCI6ICJzeW5hcHRpYy1idXR0b25AZnRoeCIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "workspace_scroll@squgeim.com.np", "name": "Workspace Scroll", "pname": "workspace-scroll", "description": "Just scroll anywhere in the top panel to change the workspace.", "link": "https://extensions.gnome.org/extension/943/workspace-scroll/", "shell_version_map": {"40": {"version": "6", "sha256": "0pglhzy81zh9wwcmh1ynygkghq64s948k9qaa9vr3k514bq8b8n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2Nyb2xsIGFueXdoZXJlIGluIHRoZSB0b3AgcGFuZWwgdG8gY2hhbmdlIHRoZSB3b3Jrc3BhY2UuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0MC4xMCIsCiAgICAiNDAuNSIsCiAgICAiNDAuMTEiLAogICAgIjQwLjkiLAogICAgIjQwLjgiLAogICAgIjQwLjciLAogICAgIjQwLjYiLAogICAgIjQwLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zcXVnZWltL1dvcmtzcGFjZS1TY3JvbGwiLAogICJ1dWlkIjogIndvcmtzcGFjZV9zY3JvbGxAc3F1Z2VpbS5jb20ubnAiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0pglhzy81zh9wwcmh1ynygkghq64s948k9qaa9vr3k514bq8b8n0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkp1c3Qgc2Nyb2xsIGFueXdoZXJlIGluIHRoZSB0b3AgcGFuZWwgdG8gY2hhbmdlIHRoZSB3b3Jrc3BhY2UuIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU2Nyb2xsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIiwKICAgICI0MC4xIiwKICAgICI0MC4yIiwKICAgICI0MC4zIiwKICAgICI0MS4wIiwKICAgICI0MC4xMCIsCiAgICAiNDAuNSIsCiAgICAiNDAuMTEiLAogICAgIjQwLjkiLAogICAgIjQwLjgiLAogICAgIjQwLjciLAogICAgIjQwLjYiLAogICAgIjQwLjQiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zcXVnZWltL1dvcmtzcGFjZS1TY3JvbGwiLAogICJ1dWlkIjogIndvcmtzcGFjZV9zY3JvbGxAc3F1Z2VpbS5jb20ubnAiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "cpupower@mko-sl.de", "name": "CPU Power Manager", "pname": "cpu-power-manager", "description": "Manage your CPU's frequency scaling driver", "link": "https://extensions.gnome.org/extension/945/cpu-power-manager/", "shell_version_map": {"38": {"version": "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=="}}} @@ -113,7 +113,7 @@ , {"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"}}} , {"uuid": "applications-overview-tooltip@RaphaelRochet", "name": "Applications Overview Tooltip", "pname": "applications-overview-tooltip", "description": "Shows a tooltip over applications icons on applications overview with application name and/or description.", "link": "https://extensions.gnome.org/extension/1071/applications-overview-tooltip/", "shell_version_map": {"38": {"version": "11", "sha256": "0alvg0l46hls3jz3a5ic21fgbjbg0kv0nn0pkknzsgjfw5mmwz69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwIiwKICAidXVpZCI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcEBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "15", "sha256": "1bz8f4n4s4ap736yik7v672c646v1rs493qgrld3fdg47rvksrv2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwIiwKICAidXVpZCI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcEBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "41": {"version": "15", "sha256": "1bz8f4n4s4ap736yik7v672c646v1rs493qgrld3fdg47rvksrv2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwIiwKICAidXVpZCI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcEBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}, "42": {"version": "15", "sha256": "1bz8f4n4s4ap736yik7v672c646v1rs493qgrld3fdg47rvksrv2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGEgdG9vbHRpcCBvdmVyIGFwcGxpY2F0aW9ucyBpY29ucyBvbiBhcHBsaWNhdGlvbnMgb3ZlcnZpZXcgd2l0aCBhcHBsaWNhdGlvbiBuYW1lIGFuZC9vciBkZXNjcmlwdGlvbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcCIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIE92ZXJ2aWV3IFRvb2x0aXAiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXBwbGljYXRpb25zLW92ZXJ2aWV3LXRvb2x0aXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYXBoYWVsUm9jaGV0L2FwcGxpY2F0aW9ucy1vdmVydmlldy10b29sdGlwIiwKICAidXVpZCI6ICJhcHBsaWNhdGlvbnMtb3ZlcnZpZXctdG9vbHRpcEBSYXBoYWVsUm9jaGV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"uuid": "TwitchLive_Panel@extensions.maweki.de", "name": "TwitchLive Panel", "pname": "twitchlive-panel", "description": "A panel showing whether your favorite Twitch.tv streamers are streaming.\n\nCycles through the online streamers if multiples are configured. Click on the panel and then on streamer's name to launch the stream with a custom command (your browser or some other application).\n\nNeeds curl and mogrify to fully support streamer logos. For an extension version compatible with shell version 3.30 or earlier visit our github page.", "link": "https://extensions.gnome.org/extension/1078/twitchlive-panel/", "shell_version_map": {"40": {"version": "37", "sha256": "0g1s5f3si8hlgf3m033c1c9fxydhs3wcykf4rr1pkzd54q6a8vq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4gRm9yIGFuIGV4dGVuc2lvbiB2ZXJzaW9uIGNvbXBhdGlibGUgd2l0aCBzaGVsbCB2ZXJzaW9uIDMuMzAgb3IgZWFybGllciB2aXNpdCBvdXIgZ2l0aHViIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHdpdGNobGl2ZSIsCiAgIm5hbWUiOiAiVHdpdGNoTGl2ZSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2l0Y2hsaXZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdla2kvdHdpdGNobGl2ZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlR3aXRjaExpdmVfUGFuZWxAZXh0ZW5zaW9ucy5tYXdla2kuZGUiLAogICJ2ZXJzaW9uIjogMzcKfQ=="}, "41": {"version": "37", "sha256": "0g1s5f3si8hlgf3m033c1c9fxydhs3wcykf4rr1pkzd54q6a8vq9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgcGFuZWwgc2hvd2luZyB3aGV0aGVyIHlvdXIgZmF2b3JpdGUgVHdpdGNoLnR2IHN0cmVhbWVycyBhcmUgc3RyZWFtaW5nLlxuXG5DeWNsZXMgdGhyb3VnaCB0aGUgb25saW5lIHN0cmVhbWVycyBpZiBtdWx0aXBsZXMgYXJlIGNvbmZpZ3VyZWQuIENsaWNrIG9uIHRoZSBwYW5lbCBhbmQgdGhlbiBvbiBzdHJlYW1lcidzIG5hbWUgdG8gbGF1bmNoIHRoZSBzdHJlYW0gd2l0aCBhIGN1c3RvbSBjb21tYW5kICh5b3VyIGJyb3dzZXIgb3Igc29tZSBvdGhlciBhcHBsaWNhdGlvbikuXG5cbk5lZWRzIGN1cmwgYW5kIG1vZ3JpZnkgdG8gZnVsbHkgc3VwcG9ydCBzdHJlYW1lciBsb2dvcy4gRm9yIGFuIGV4dGVuc2lvbiB2ZXJzaW9uIGNvbXBhdGlibGUgd2l0aCBzaGVsbCB2ZXJzaW9uIDMuMzAgb3IgZWFybGllciB2aXNpdCBvdXIgZ2l0aHViIHBhZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHdpdGNobGl2ZSIsCiAgIm5hbWUiOiAiVHdpdGNoTGl2ZSBQYW5lbCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50d2l0Y2hsaXZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9tYXdla2kvdHdpdGNobGl2ZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlR3aXRjaExpdmVfUGFuZWxAZXh0ZW5zaW9ucy5tYXdla2kuZGUiLAogICJ2ZXJzaW9uIjogMzcKfQ=="}}} -, {"uuid": "cpufreq@konkor", "name": "cpufreq", "pname": "cpufreq", "description": "System Monitor and Power Manager.\n\nThe project is affected by the Russian war in Ukraine. The author lost everything in second time. His family has flee abroad and he's in military reserve waiting for his call.\n\n#HelpUkraine #StopTheWarInUkraine\n\nThis is a lightweight system monitor and power management tool. It needs root permission to able changing governors.\n\nFeatures:\n⚫ Compatible with many hardware architectures;\n⚫ CPU Frequency monitoring;\n⚫ CPU Governor management;\n⚫ CPU Frequency speed limits;\n⚫ CPU Boost supporting;\n⚫ CPU Core Power on/off;\n⚫ Saving/Restoring settings...\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1082/cpufreq/", "shell_version_map": {"38": {"version": "51", "sha256": "1adm5859k6pjr7mlv8fxdf9g25ijcqdz7a52bj69zpzpainf0xg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGUgcHJvamVjdCBpcyBhZmZlY3RlZCBieSB0aGUgUnVzc2lhbiB3YXIgaW4gVWtyYWluZS4gVGhlIGF1dGhvciBsb3N0IGV2ZXJ5dGhpbmcgaW4gc2Vjb25kIHRpbWUuIEhpcyBmYW1pbHkgaGFzIGZsZWUgYWJyb2FkIGFuZCBoZSdzIGluIG1pbGl0YXJ5IHJlc2VydmUgd2FpdGluZyBmb3IgaGlzIGNhbGwuXG5cbiNIZWxwVWtyYWluZSAjU3RvcFRoZVdhckluVWtyYWluZVxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL2NwdWZyZXEiLAogICJ1dWlkIjogImNwdWZyZXFAa29ua29yIiwKICAidmVyc2lvbiI6IDUxCn0="}, "40": {"version": "51", "sha256": "1adm5859k6pjr7mlv8fxdf9g25ijcqdz7a52bj69zpzpainf0xg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGUgcHJvamVjdCBpcyBhZmZlY3RlZCBieSB0aGUgUnVzc2lhbiB3YXIgaW4gVWtyYWluZS4gVGhlIGF1dGhvciBsb3N0IGV2ZXJ5dGhpbmcgaW4gc2Vjb25kIHRpbWUuIEhpcyBmYW1pbHkgaGFzIGZsZWUgYWJyb2FkIGFuZCBoZSdzIGluIG1pbGl0YXJ5IHJlc2VydmUgd2FpdGluZyBmb3IgaGlzIGNhbGwuXG5cbiNIZWxwVWtyYWluZSAjU3RvcFRoZVdhckluVWtyYWluZVxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL2NwdWZyZXEiLAogICJ1dWlkIjogImNwdWZyZXFAa29ua29yIiwKICAidmVyc2lvbiI6IDUxCn0="}, "41": {"version": "51", "sha256": "1adm5859k6pjr7mlv8fxdf9g25ijcqdz7a52bj69zpzpainf0xg1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGUgcHJvamVjdCBpcyBhZmZlY3RlZCBieSB0aGUgUnVzc2lhbiB3YXIgaW4gVWtyYWluZS4gVGhlIGF1dGhvciBsb3N0IGV2ZXJ5dGhpbmcgaW4gc2Vjb25kIHRpbWUuIEhpcyBmYW1pbHkgaGFzIGZsZWUgYWJyb2FkIGFuZCBoZSdzIGluIG1pbGl0YXJ5IHJlc2VydmUgd2FpdGluZyBmb3IgaGlzIGNhbGwuXG5cbiNIZWxwVWtyYWluZSAjU3RvcFRoZVdhckluVWtyYWluZVxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29ua29yL2NwdWZyZXEiLAogICJ1dWlkIjogImNwdWZyZXFAa29ua29yIiwKICAidmVyc2lvbiI6IDUxCn0="}}} +, {"uuid": "cpufreq@konkor", "name": "cpufreq", "pname": "cpufreq", "description": "System Monitor and Power Manager.\n\nThis is a lightweight system monitor and power management tool. It needs root permission to able changing governors.\n\nFeatures:\n⚫ Compatible with many hardware architectures;\n⚫ CPU Frequency monitoring;\n⚫ CPU Governor management;\n⚫ CPU Frequency speed limits;\n⚫ CPU Boost supporting;\n⚫ CPU Core Power on/off;\n⚫ Saving/Restoring settings...\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1082/cpufreq/", "shell_version_map": {"38": {"version": "52", "sha256": "130dafqn6kzb6sz691firyr2jl68zbwm9vzy1gfaziqlz3kqffkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvbmtvci9jcHVmcmVxIiwKICAidXVpZCI6ICJjcHVmcmVxQGtvbmtvciIsCiAgInZlcnNpb24iOiA1Mgp9"}, "40": {"version": "52", "sha256": "130dafqn6kzb6sz691firyr2jl68zbwm9vzy1gfaziqlz3kqffkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvbmtvci9jcHVmcmVxIiwKICAidXVpZCI6ICJjcHVmcmVxQGtvbmtvciIsCiAgInZlcnNpb24iOiA1Mgp9"}, "41": {"version": "52", "sha256": "130dafqn6kzb6sz691firyr2jl68zbwm9vzy1gfaziqlz3kqffkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvbmtvci9jcHVmcmVxIiwKICAidXVpZCI6ICJjcHVmcmVxQGtvbmtvciIsCiAgInZlcnNpb24iOiA1Mgp9"}, "42": {"version": "52", "sha256": "130dafqn6kzb6sz691firyr2jl68zbwm9vzy1gfaziqlz3kqffkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN5c3RlbSBNb25pdG9yIGFuZCBQb3dlciBNYW5hZ2VyLlxuXG5UaGlzIGlzIGEgbGlnaHR3ZWlnaHQgc3lzdGVtIG1vbml0b3IgYW5kIHBvd2VyIG1hbmFnZW1lbnQgdG9vbC4gSXQgbmVlZHMgcm9vdCBwZXJtaXNzaW9uIHRvIGFibGUgY2hhbmdpbmcgZ292ZXJub3JzLlxuXG5GZWF0dXJlczpcblx1MjZhYiBDb21wYXRpYmxlIHdpdGggbWFueSBoYXJkd2FyZSBhcmNoaXRlY3R1cmVzO1xuXHUyNmFiIENQVSBGcmVxdWVuY3kgbW9uaXRvcmluZztcblx1MjZhYiBDUFUgR292ZXJub3IgbWFuYWdlbWVudDtcblx1MjZhYiBDUFUgRnJlcXVlbmN5IHNwZWVkIGxpbWl0cztcblx1MjZhYiBDUFUgQm9vc3Qgc3VwcG9ydGluZztcblx1MjZhYiBDUFUgQ29yZSBQb3dlciBvbi9vZmY7XG5cdTI2YWIgU2F2aW5nL1Jlc3RvcmluZyBzZXR0aW5ncy4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJuYW1lIjogImNwdWZyZXEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3B1ZnJlcSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tvbmtvci9jcHVmcmVxIiwKICAidXVpZCI6ICJjcHVmcmVxQGtvbmtvciIsCiAgInZlcnNpb24iOiA1Mgp9"}}} , {"uuid": "simplenetspeed@biji.extension", "name": "Simple net speed", "pname": "simple-net-speed", "description": "Simply showing network speed. Left click to change modes:\n\n1. Total net speed in bits per second\n2. Total net speed in Bytes per second\n3. Up & down speed in bits per second\n4. Up & down speed in Bytes per second\n5. Total of downloaded in Bytes (Right click to reset counter)\n\nMiddle click to change font size", "link": "https://extensions.gnome.org/extension/1085/simple-net-speed/", "shell_version_map": {"38": {"version": "28", "sha256": "16cilh0rki5pp4kwhd9y51c5602l4l953x4sl4h7sqdnpwxnzibs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9zaW1wbGVuZXRzcGVlZCIsCiAgInV1aWQiOiAic2ltcGxlbmV0c3BlZWRAYmlqaS5leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "40": {"version": "28", "sha256": "16cilh0rki5pp4kwhd9y51c5602l4l953x4sl4h7sqdnpwxnzibs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9zaW1wbGVuZXRzcGVlZCIsCiAgInV1aWQiOiAic2ltcGxlbmV0c3BlZWRAYmlqaS5leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "41": {"version": "28", "sha256": "16cilh0rki5pp4kwhd9y51c5602l4l953x4sl4h7sqdnpwxnzibs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9zaW1wbGVuZXRzcGVlZCIsCiAgInV1aWQiOiAic2ltcGxlbmV0c3BlZWRAYmlqaS5leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}, "42": {"version": "28", "sha256": "16cilh0rki5pp4kwhd9y51c5602l4l953x4sl4h7sqdnpwxnzibs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBseSBzaG93aW5nIG5ldHdvcmsgc3BlZWQuIExlZnQgY2xpY2sgdG8gY2hhbmdlIG1vZGVzOlxuXG4xLiBUb3RhbCBuZXQgc3BlZWQgaW4gYml0cyBwZXIgc2Vjb25kXG4yLiBUb3RhbCBuZXQgc3BlZWQgaW4gQnl0ZXMgcGVyIHNlY29uZFxuMy4gVXAgJiBkb3duIHNwZWVkIGluIGJpdHMgcGVyIHNlY29uZFxuNC4gVXAgJiBkb3duIHNwZWVkIGluIEJ5dGVzIHBlciBzZWNvbmRcbjUuIFRvdGFsIG9mIGRvd25sb2FkZWQgaW4gQnl0ZXMgKFJpZ2h0IGNsaWNrIHRvIHJlc2V0IGNvdW50ZXIpXG5cbk1pZGRsZSBjbGljayB0byBjaGFuZ2UgZm9udCBzaXplIiwKICAibmFtZSI6ICJTaW1wbGUgbmV0IHNwZWVkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYmlqaS9zaW1wbGVuZXRzcGVlZCIsCiAgInV1aWQiOiAic2ltcGxlbmV0c3BlZWRAYmlqaS5leHRlbnNpb24iLAogICJ2ZXJzaW9uIjogMjgKfQ=="}}} , {"uuid": "gnome-shell-go-to-last-workspace@github.com", "name": "Go To Last Workspace", "pname": "go-to-last-workspace", "description": "Quickly toggle between two workspaces with one key", "link": "https://extensions.gnome.org/extension/1089/go-to-last-workspace/", "shell_version_map": {"38": {"version": "9", "sha256": "1gwdnz99qmdzprdbgjw23jf0d6xdiky3fbiy6s3h8xcncd1ac8yb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyamFuL2dub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZUBnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "40": {"version": "9", "sha256": "1gwdnz99qmdzprdbgjw23jf0d6xdiky3fbiy6s3h8xcncd1ac8yb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyamFuL2dub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZUBnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1gwdnz99qmdzprdbgjw23jf0d6xdiky3fbiy6s3h8xcncd1ac8yb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyamFuL2dub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZUBnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "1gwdnz99qmdzprdbgjw23jf0d6xdiky3fbiy6s3h8xcncd1ac8yb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgdG9nZ2xlIGJldHdlZW4gdHdvIHdvcmtzcGFjZXMgd2l0aCBvbmUga2V5IiwKICAibmFtZSI6ICJHbyBUbyBMYXN0IFdvcmtzcGFjZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nby10by1sYXN0LXdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FyamFuL2dub21lLXNoZWxsLWdvLXRvLWxhc3Qtd29ya3NwYWNlIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1nby10by1sYXN0LXdvcmtzcGFjZUBnaXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "KeepAwake@jepfa.de", "name": "Keep awake!", "pname": "keep-awake", "description": "Keep your computer awake! Prevents that your computer activates sceensaver, turns off its screen(s) or goes to hibernate when not actively used for a while. Click the indicator icon once to keep your computer awake for the current session. Click again to keep it awake also between restarts (indicated by a small lock icon on the indicator). Clicking again to not keep awake.", "link": "https://extensions.gnome.org/extension/1097/keep-awake/", "shell_version_map": {"38": {"version": "8", "sha256": "1wkiql18dwwwwkxb6815kw0p6fjzcf1bpa7cqciczc6ljjvsimx4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamVuc3BmYWhsL0tlZXBBd2FrZSIsCiAgInV1aWQiOiAiS2VlcEF3YWtlQGplcGZhLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "1wkiql18dwwwwkxb6815kw0p6fjzcf1bpa7cqciczc6ljjvsimx4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamVuc3BmYWhsL0tlZXBBd2FrZSIsCiAgInV1aWQiOiAiS2VlcEF3YWtlQGplcGZhLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1wkiql18dwwwwkxb6815kw0p6fjzcf1bpa7cqciczc6ljjvsimx4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamVuc3BmYWhsL0tlZXBBd2FrZSIsCiAgInV1aWQiOiAiS2VlcEF3YWtlQGplcGZhLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1wkiql18dwwwwkxb6815kw0p6fjzcf1bpa7cqciczc6ljjvsimx4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIktlZXAgeW91ciBjb21wdXRlciBhd2FrZSEgUHJldmVudHMgdGhhdCB5b3VyIGNvbXB1dGVyIGFjdGl2YXRlcyBzY2VlbnNhdmVyLCB0dXJucyBvZmYgaXRzIHNjcmVlbihzKSBvciBnb2VzIHRvIGhpYmVybmF0ZSB3aGVuIG5vdCBhY3RpdmVseSB1c2VkIGZvciBhIHdoaWxlLiBDbGljayB0aGUgaW5kaWNhdG9yIGljb24gb25jZSB0byBrZWVwIHlvdXIgY29tcHV0ZXIgYXdha2UgZm9yIHRoZSBjdXJyZW50IHNlc3Npb24uIENsaWNrIGFnYWluIHRvIGtlZXAgaXQgYXdha2UgYWxzbyBiZXR3ZWVuIHJlc3RhcnRzIChpbmRpY2F0ZWQgYnkgYSBzbWFsbCBsb2NrIGljb24gb24gdGhlIGluZGljYXRvcikuIENsaWNraW5nIGFnYWluIHRvIG5vdCBrZWVwIGF3YWtlLiIsCiAgIm5hbWUiOiAiS2VlcCBhd2FrZSEiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuS2VlcEF3YWtlQGplcGZhLmRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamVuc3BmYWhsL0tlZXBBd2FrZSIsCiAgInV1aWQiOiAiS2VlcEF3YWtlQGplcGZhLmRlIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} @@ -126,7 +126,7 @@ , {"uuid": "ibus-font-setting@ibus.github.com", "name": "ibus font setting", "pname": "ibus-font-setting", "description": "use ibus font setting of ibus setup dialog to enhance the user experience", "link": "https://extensions.gnome.org/extension/1121/ibus-font-setting/", "shell_version_map": {"38": {"version": "9", "sha256": "163byvsc3dj2w9xq498py1xjziyi98icyki1cd6wv7vxaxfmk7y6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3B3dS5mZWRvcmFwZW9wbGUub3JnL2lidXMvaWJ1cy1mb250LXNldHRpbmciLAogICJ1dWlkIjogImlidXMtZm9udC1zZXR0aW5nQGlidXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "11", "sha256": "0rgnv7bwqg30ly6zsmzs5sayi45k2ji5r87z4x32nni3wm7vhnhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vcHd1LmZlZG9yYXBlb3BsZS5vcmcvaWJ1cy9pYnVzLWZvbnQtc2V0dGluZyIsCiAgInV1aWQiOiAiaWJ1cy1mb250LXNldHRpbmdAaWJ1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "0rgnv7bwqg30ly6zsmzs5sayi45k2ji5r87z4x32nni3wm7vhnhk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInVzZSBpYnVzIGZvbnQgc2V0dGluZyBvZiBpYnVzIHNldHVwIGRpYWxvZyB0byBlbmhhbmNlIHRoZSB1c2VyIGV4cGVyaWVuY2UiLAogICJuYW1lIjogImlidXMgZm9udCBzZXR0aW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vcHd1LmZlZG9yYXBlb3BsZS5vcmcvaWJ1cy9pYnVzLWZvbnQtc2V0dGluZyIsCiAgInV1aWQiOiAiaWJ1cy1mb250LXNldHRpbmdAaWJ1cy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "github.notifications@alexandre.dufournet.gmail.com", "name": "Github Notifications", "pname": "github-notifications", "description": "Integrate Github's notifications within the gnome desktop environment\nSource code is available here: https://github.com/alexduf/gnome-github-notifications", "link": "https://extensions.gnome.org/extension/1125/github-notifications/", "shell_version_map": {"38": {"version": "17", "sha256": "0ccgbllyak1lyp14ynsg17zngfpxkc5v5asv3zwwmpk44bl984ny", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxNwp9"}, "40": {"version": "22", "sha256": "069lbl8f9c5kcj9nwdnh7bqlffw1kgp96pi46xg3pj8hxdibhahc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "069lbl8f9c5kcj9nwdnh7bqlffw1kgp96pi46xg3pj8hxdibhahc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "069lbl8f9c5kcj9nwdnh7bqlffw1kgp96pi46xg3pj8hxdibhahc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSBHaXRodWIncyBub3RpZmljYXRpb25zIHdpdGhpbiB0aGUgZ25vbWUgZGVza3RvcCBlbnZpcm9ubWVudFxuU291cmNlIGNvZGUgaXMgYXZhaWxhYmxlIGhlcmU6IGh0dHBzOi8vZ2l0aHViLmNvbS9hbGV4ZHVmL2dub21lLWdpdGh1Yi1ub3RpZmljYXRpb25zIiwKICAibmFtZSI6ICJHaXRodWIgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJnaXRodWIubm90aWZpY2F0aW9uc0BhbGV4YW5kcmUuZHVmb3VybmV0LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} , {"uuid": "desk-changer@eric.gach.gmail.com", "name": "Desk Changer", "pname": "desk-changer", "description": "Simple wallpaper changer with multiple profile support. Integrates into the shell by providing it's own panel icon. The daemon is written using gjs and runs independently of the extension as a background process.", "link": "https://extensions.gnome.org/extension/1131/desk-changer/", "shell_version_map": {"38": {"version": "24", "sha256": "1icvdlrdg9078xwrawh5wv9z7x4aw65zawjdygsbcd67z158iviw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmlnRS9kZXNrLWNoYW5nZXIvIiwKICAidXVpZCI6ICJkZXNrLWNoYW5nZXJAZXJpYy5nYWNoLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"}, "40": {"version": "24", "sha256": "1icvdlrdg9078xwrawh5wv9z7x4aw65zawjdygsbcd67z158iviw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmlnRS9kZXNrLWNoYW5nZXIvIiwKICAidXVpZCI6ICJkZXNrLWNoYW5nZXJAZXJpYy5nYWNoLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"}, "41": {"version": "24", "sha256": "1icvdlrdg9078xwrawh5wv9z7x4aw65zawjdygsbcd67z158iviw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmlnRS9kZXNrLWNoYW5nZXIvIiwKICAidXVpZCI6ICJkZXNrLWNoYW5nZXJAZXJpYy5nYWNoLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"}, "42": {"version": "24", "sha256": "1icvdlrdg9078xwrawh5wv9z7x4aw65zawjdygsbcd67z158iviw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSB3YWxscGFwZXIgY2hhbmdlciB3aXRoIG11bHRpcGxlIHByb2ZpbGUgc3VwcG9ydC4gSW50ZWdyYXRlcyBpbnRvIHRoZSBzaGVsbCBieSBwcm92aWRpbmcgaXQncyBvd24gcGFuZWwgaWNvbi4gVGhlIGRhZW1vbiBpcyB3cml0dGVuIHVzaW5nIGdqcyBhbmQgcnVucyBpbmRlcGVuZGVudGx5IG9mIHRoZSBleHRlbnNpb24gYXMgYSBiYWNrZ3JvdW5kIHByb2Nlc3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGVzay1jaGFuZ2VyIiwKICAibmFtZSI6ICJEZXNrIENoYW5nZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGVzay1jaGFuZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQmlnRS9kZXNrLWNoYW5nZXIvIiwKICAidXVpZCI6ICJkZXNrLWNoYW5nZXJAZXJpYy5nYWNoLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyNAp9"}}} -, {"uuid": "Shortcuts@kyle.aims.ac.za", "name": "Shortcuts", "pname": "shortcuts", "description": "This shows a pop-up of useful keyboard shortcuts when Super + S is pressed", "link": "https://extensions.gnome.org/extension/1144/shortcuts/", "shell_version_map": {"38": {"version": "10", "sha256": "04kpzrn692cgyv8w2x1c6lrrkpvn9kkafcs8bsji594agwyb4sc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wYWRkYXRyYXBwZXIvc2hvcnRjdXRzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2hvcnRjdXRzQGt5bGUuYWltcy5hYy56YSIsCiAgInZlcnNpb24iOiAxMAp9"}, "40": {"version": "10", "sha256": "04kpzrn692cgyv8w2x1c6lrrkpvn9kkafcs8bsji594agwyb4sc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wYWRkYXRyYXBwZXIvc2hvcnRjdXRzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2hvcnRjdXRzQGt5bGUuYWltcy5hYy56YSIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "04kpzrn692cgyv8w2x1c6lrrkpvn9kkafcs8bsji594agwyb4sc5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9wYWRkYXRyYXBwZXIvc2hvcnRjdXRzLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiU2hvcnRjdXRzQGt5bGUuYWltcy5hYy56YSIsCiAgInZlcnNpb24iOiAxMAp9"}}} +, {"uuid": "Shortcuts@kyle.aims.ac.za", "name": "Shortcuts", "pname": "shortcuts", "description": "This shows a pop-up of useful keyboard shortcuts when Super + S is pressed", "link": "https://extensions.gnome.org/extension/1144/shortcuts/", "shell_version_map": {"38": {"version": "11", "sha256": "0zlsl45l443wwnamjwb858w83kdbmwxxpnnxna66b8s8d8f4vys4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "0zlsl45l443wwnamjwb858w83kdbmwxxpnnxna66b8s8d8f4vys4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0zlsl45l443wwnamjwb858w83kdbmwxxpnnxna66b8s8d8f4vys4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0zlsl45l443wwnamjwb858w83kdbmwxxpnnxna66b8s8d8f4vys4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2hvd3MgYSBwb3AtdXAgb2YgdXNlZnVsIGtleWJvYXJkIHNob3J0Y3V0cyB3aGVuIFN1cGVyICsgUyBpcyBwcmVzc2VkIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiU2hvcnRjdXRzIiwKICAibmFtZSI6ICJTaG9ydGN1dHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2hvcnRjdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcGFkZGF0cmFwcGVyL3Nob3J0Y3V0cy1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIlNob3J0Y3V0c0BreWxlLmFpbXMuYWMuemEiLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "sensory-perception@HarlemSquirrel.github.io", "name": "Sensory Perception", "pname": "sensory-perception", "description": "Requires lm-sensors (or lm_sensors). Shows CPU temperature, disk temperature, video card temperature, voltage and fan RPM.", "link": "https://extensions.gnome.org/extension/1145/sensory-perception/", "shell_version_map": {"38": {"version": "13", "sha256": "16wc49khyk5arsis8kzpjgl6nl8gccc2y5sspq8rwnab22jnzwjh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxMwp9"}, "40": {"version": "18", "sha256": "0wlba8jkpvzirczc54jbapywds5icbsg97bjbzhc0qjiwbmicb96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}, "41": {"version": "18", "sha256": "0wlba8jkpvzirczc54jbapywds5icbsg97bjbzhc0qjiwbmicb96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}, "42": {"version": "18", "sha256": "0wlba8jkpvzirczc54jbapywds5icbsg97bjbzhc0qjiwbmicb96", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcXVpcmVzIGxtLXNlbnNvcnMgKG9yIGxtX3NlbnNvcnMpLiBTaG93cyBDUFUgdGVtcGVyYXR1cmUsIGRpc2sgdGVtcGVyYXR1cmUsIHZpZGVvIGNhcmQgdGVtcGVyYXR1cmUsIHZvbHRhZ2UgYW5kIGZhbiBSUE0uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2Vuc29yeS1wZXJjZXB0aW9uIiwKICAibmFtZSI6ICJTZW5zb3J5IFBlcmNlcHRpb24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2Vuc29yeS1wZXJjZXB0aW9uIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSGFybGVtU3F1aXJyZWwvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNlbnNvcnktcGVyY2VwdGlvbiIsCiAgInV1aWQiOiAic2Vuc29yeS1wZXJjZXB0aW9uQEhhcmxlbVNxdWlycmVsLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxOAp9"}}} , {"uuid": "activityAppLauncher@rastersoft.com", "name": "Activity App Launcher", "pname": "activity-app-launcher", "description": "Integrates a category-based application launcher in the activities window. IMPORTANT: it needs the 'gnome-menus' and 'libgnome-menu-3-dev'; they must be installed in the system before installing this extension.", "link": "https://extensions.gnome.org/extension/1149/activity-app-launcher/", "shell_version_map": {"38": {"version": "31", "sha256": "18jqnk4psdvdx1hydfss1870v0gnpxkmsm5yasnb0m5m484in0qv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAidXVpZCI6ICJhY3Rpdml0eUFwcExhdW5jaGVyQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}, "40": {"version": "34", "sha256": "0mjifm9dx3gwswdrjk1qr2kfan87dapkgn6adg2vw87dz0291q0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAidXVpZCI6ICJhY3Rpdml0eUFwcExhdW5jaGVyQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDM0Cn0="}, "41": {"version": "34", "sha256": "0mjifm9dx3gwswdrjk1qr2kfan87dapkgn6adg2vw87dz0291q0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAidXVpZCI6ICJhY3Rpdml0eUFwcExhdW5jaGVyQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDM0Cn0="}, "42": {"version": "34", "sha256": "0mjifm9dx3gwswdrjk1qr2kfan87dapkgn6adg2vw87dz0291q0k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZXMgYSBjYXRlZ29yeS1iYXNlZCBhcHBsaWNhdGlvbiBsYXVuY2hlciBpbiB0aGUgYWN0aXZpdGllcyB3aW5kb3cuIElNUE9SVEFOVDogaXQgbmVlZHMgdGhlICdnbm9tZS1tZW51cycgYW5kICdsaWJnbm9tZS1tZW51LTMtZGV2JzsgdGhleSBtdXN0IGJlIGluc3RhbGxlZCBpbiB0aGUgc3lzdGVtIGJlZm9yZSBpbnN0YWxsaW5nIHRoaXMgZXh0ZW5zaW9uLiIsCiAgIm5hbWUiOiAiQWN0aXZpdHkgQXBwIExhdW5jaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vcmFzdGVyc29mdC9hY3Rpdml0eUFwcExhdW5jaGVyIiwKICAidXVpZCI6ICJhY3Rpdml0eUFwcExhdW5jaGVyQHJhc3RlcnNvZnQuY29tIiwKICAidmVyc2lvbiI6IDM0Cn0="}}} , {"uuid": "shutdown-timer-gnome-shell-extension", "name": "ShutdownTimer", "pname": "shutdowntimer", "description": "Allows to shutdown, restart and suspend computer after selected amount of time or in selected time.", "link": "https://extensions.gnome.org/extension/1152/shutdowntimer/", "shell_version_map": {"40": {"version": "9", "sha256": "1y69lv3mq66xxfxabngnbb104d26i05cyhmx3dqf4kyf1kd6jqvx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBzaHV0ZG93biwgcmVzdGFydCBhbmQgc3VzcGVuZCBjb21wdXRlciBhZnRlciBzZWxlY3RlZCBhbW91bnQgb2YgdGltZSBvciBpbiBzZWxlY3RlZCB0aW1lLiIsCiAgImdldHRleHQtZG9tYWluIjogIkF1dG9tYXRpY1NodXRkb3duVGltZXIiLAogICJuYW1lIjogIlNodXRkb3duVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYXV0b21hdGljLXNodXRkb3duLXRpbWVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21rcmFqbmFrL3NodXRkb3duLXRpbWVyLWdub21lLXNoZWxsLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNodXRkb3duLXRpbWVyLWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInZlcnNpb24iOiA5Cn0="}}} @@ -149,7 +149,7 @@ , {"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": "33", "sha256": "0bdhgv3sgsdfh1zrdjc2iyg1dwjg2mn9gx287yhljl7v2yd73i5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zd2l0Y2h3b3Jrc3BhY2UiLAogICJ1dWlkIjogInN3aXRjaFdvcmtTcGFjZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMwp9"}, "41": {"version": "33", "sha256": "0bdhgv3sgsdfh1zrdjc2iyg1dwjg2mn9gx287yhljl7v2yd73i5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zd2l0Y2h3b3Jrc3BhY2UiLAogICJ1dWlkIjogInN3aXRjaFdvcmtTcGFjZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMwp9"}, "42": {"version": "33", "sha256": "0bdhgv3sgsdfh1zrdjc2iyg1dwjg2mn9gx287yhljl7v2yd73i5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB3b3Jrc3BhY2UgbGlrZSB1c2luZyBBTFQrVEFCIGtleSB0byBzd2l0Y2ggd2luZG93cyBcblxuIERlZmF1bHQgc2hvcnRjdXQga2V5IHRvIHN3aXRjaCB3b3Jrc3BhY2UgaXMgQ3RybCtBYm92ZV9UYWIgLiIsCiAgIm5hbWUiOiAiU3dpdGNoIFdvcmtzcGFjZSIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3Vud3hnL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zd2l0Y2h3b3Jrc3BhY2UiLAogICJ1dWlkIjogInN3aXRjaFdvcmtTcGFjZUBzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzMwp9"}}} , {"uuid": "noannoyance@sindex.com", "name": "NoAnnoyance", "pname": "noannoyance", "description": "Disable the “Window is ready” notification.", "link": "https://extensions.gnome.org/extension/1236/noannoyance/", "shell_version_map": {"38": {"version": "5", "sha256": "0x7p3i9qws8pgj3y2raw2vfgjwqm6rprrn3s7lck5bjx9ydri5b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIFx1MjAxY1dpbmRvdyBpcyByZWFkeVx1MjAxZCBub3RpZmljYXRpb24uIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaW5kZXgvbm8tYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBzaW5kZXguY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "0x7p3i9qws8pgj3y2raw2vfgjwqm6rprrn3s7lck5bjx9ydri5b6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIFx1MjAxY1dpbmRvdyBpcyByZWFkeVx1MjAxZCBub3RpZmljYXRpb24uIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zaW5kZXgvbm8tYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBzaW5kZXguY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "SomaFm-Radio@alireza6677.gmail.com", "name": "SomaFM internet radio", "pname": "somafm-internet-radio", "description": "Listen to SomaFm free internet radio in your GNOME desktop\n\n* Featues:\n- 32+ Channels\n- Volume slider\n- Favorites menu\n- Good sound quality\n- Supports most gnome-shell versions\n- Channel logos\n\n* Requirements:\n- Gstreamer and plugins:\nYou need to install 'gstreamer' and multimedia codecs/plugins for your distro.", "link": "https://extensions.gnome.org/extension/1237/somafm-internet-radio/", "shell_version_map": {"38": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}, "40": {"version": "29", "sha256": "07l6sa58azf3sav6858q48cbqazavq9bflfxdn0p9ys29h6mf50c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpc3RlbiB0byBTb21hRm0gZnJlZSBpbnRlcm5ldCByYWRpbyBpbiB5b3VyIEdOT01FIGRlc2t0b3BcblxuKiBGZWF0dWVzOlxuLSAzMisgQ2hhbm5lbHNcbi0gVm9sdW1lIHNsaWRlclxuLSBGYXZvcml0ZXMgbWVudVxuLSBHb29kIHNvdW5kIHF1YWxpdHlcbi0gU3VwcG9ydHMgbW9zdCBnbm9tZS1zaGVsbCB2ZXJzaW9uc1xuLSBDaGFubmVsIGxvZ29zXG5cbiogUmVxdWlyZW1lbnRzOlxuLSBHc3RyZWFtZXIgYW5kIHBsdWdpbnM6XG5Zb3UgbmVlZCB0byBpbnN0YWxsICdnc3RyZWFtZXInIGFuZCBtdWx0aW1lZGlhIGNvZGVjcy9wbHVnaW5zIGZvciB5b3VyIGRpc3Ryby4iLAogICJuYW1lIjogIlNvbWFGTSBpbnRlcm5ldCByYWRpbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAuMCIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vVGhlV2VpcmREZXYvc29tYWZtLXJhZGlvLWdub21lLWV4dCIsCiAgInV1aWQiOiAiU29tYUZtLVJhZGlvQGFsaXJlemE2Njc3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyOQp9"}}} -, {"uuid": "timepp@zagortenay333", "name": "Time ++", "pname": "time", "description": "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarm clock", "link": "https://extensions.gnome.org/extension/1238/time/", "shell_version_map": {"38": {"version": "155", "sha256": "1v71hlwrw9kbxfvka5w8cfqmvcjw3k9xjdwhwlk4i4q5k6kgjih3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInRyYW5zbGF0aW9uc191cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZS90cmVlL21hc3Rlci9kYXRhL3BvX2ZpbGVzIiwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUiLAogICJ1dWlkIjogInRpbWVwcEB6YWdvcnRlbmF5MzMzIiwKICAidmVyc2lvbiI6IDE1NQp9"}, "40": {"version": "163", "sha256": "0qb28jgpqz4nrigx2vjpsv2wfbnvkfk9rrc6aqgmh1mhhw3f7wfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidHJhbnNsYXRpb25zX3VybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lL3RyZWUvbWFzdGVyL2RhdGEvcG9fZmlsZXMiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZSIsCiAgInV1aWQiOiAidGltZXBwQHphZ29ydGVuYXkzMzMiLAogICJ2ZXJzaW9uIjogMTYzCn0="}, "41": {"version": "163", "sha256": "0qb28jgpqz4nrigx2vjpsv2wfbnvkfk9rrc6aqgmh1mhhw3f7wfa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidHJhbnNsYXRpb25zX3VybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lL3RyZWUvbWFzdGVyL2RhdGEvcG9fZmlsZXMiLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phZ29ydGVuYXkzMzMvdGltZXBwX19nbm9tZSIsCiAgInV1aWQiOiAidGltZXBwQHphZ29ydGVuYXkzMzMiLAogICJ2ZXJzaW9uIjogMTYzCn0="}}} +, {"uuid": "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": "164", "sha256": "0hl8sig6hx5yjwjszlbc8xrry00q4dvvxi09j349c2yi86zjwrac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNhY2hlLWZpbGUtZm9ybWF0LXZlcnNpb24iOiB7CiAgICAiYWxhcm1zIjogMywKICAgICJwb21vZG9ybyI6IDMsCiAgICAic3RvcHdhdGNoIjogNCwKICAgICJ0aW1lciI6IDMsCiAgICAidG9kbyI6IDEwCiAgfSwKICAiZGVzY3JpcHRpb24iOiAiQSB0b2RvLnR4dCBtYW5hZ2VyLCB0aW1lIHRyYWNrZXIsIHRpbWVyLCBzdG9wd2F0Y2gsIHBvbW9kb3JvLCBhbmQgYWxhcm0gY2xvY2siLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ0aW1lcHAiLAogICJpc3N1ZXNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvaXNzdWVzIiwKICAibmFtZSI6ICJUaW1lICsrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ0cmFuc2xhdGlvbnNfdXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96YWdvcnRlbmF5MzMzL3RpbWVwcF9fZ25vbWUvdHJlZS9tYXN0ZXIvZGF0YS9wb19maWxlcyIsCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vemFnb3J0ZW5heTMzMy90aW1lcHBfX2dub21lIiwKICAidXVpZCI6ICJ0aW1lcHBAemFnb3J0ZW5heTMzMyIsCiAgInZlcnNpb24iOiAxNjQKfQ=="}}} , {"uuid": "obmin@konkor", "name": "Obmin", "pname": "obmin", "description": "One-Click File Sharing for your network.\nObmin is lightweight HTTP(S) File Server for GNU/Linux systems.\n\nFeatures:\n⚫ Easy installation.\n⚫ Easy setup just choose file(s) locations and tune Obmin on.\n⚫ Doesn't require ROOT privileges.\n⚫ Doesn't require any special client side installation.\n⚫ HTTP transfer protocol available everywhere Linux, OSX, Windows, Android, iOS so.\n⚫ More ...\n\nFor more information and how-to see README.md", "link": "https://extensions.gnome.org/extension/1254/obmin/", "shell_version_map": {"38": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}, "41": {"version": "25", "sha256": "14liv381k2gdgcsgaqsarfg0ycrg0whhq0jzzzdzvnk9vs8jdni8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9uZS1DbGljayBGaWxlIFNoYXJpbmcgZm9yIHlvdXIgbmV0d29yay5cbk9ibWluIGlzIGxpZ2h0d2VpZ2h0IEhUVFAoUykgRmlsZSBTZXJ2ZXIgZm9yIEdOVS9MaW51eCBzeXN0ZW1zLlxuXG5GZWF0dXJlczpcblx1MjZhYiBFYXN5IGluc3RhbGxhdGlvbi5cblx1MjZhYiBFYXN5IHNldHVwIGp1c3QgY2hvb3NlIGZpbGUocykgbG9jYXRpb25zIGFuZCB0dW5lIE9ibWluIG9uLlxuXHUyNmFiIERvZXNuJ3QgcmVxdWlyZSBST09UIHByaXZpbGVnZXMuXG5cdTI2YWIgRG9lc24ndCByZXF1aXJlIGFueSBzcGVjaWFsIGNsaWVudCBzaWRlIGluc3RhbGxhdGlvbi5cblx1MjZhYiBIVFRQIHRyYW5zZmVyIHByb3RvY29sIGF2YWlsYWJsZSBldmVyeXdoZXJlIExpbnV4LCBPU1gsIFdpbmRvd3MsIEFuZHJvaWQsIGlPUyBzby5cblx1MjZhYiBNb3JlIC4uLlxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgaG93LXRvIHNlZSBSRUFETUUubWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zLW9ibWluIiwKICAibmFtZSI6ICJPYm1pbiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5vYm1pbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4xNCIsCiAgICAiMy4xNiIsCiAgICAiMy4xOCIsCiAgICAiMy4yMCIsCiAgICAiMy4yMiIsCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zMiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL29ibWluLmdpdGh1Yi5pbyIsCiAgInV1aWQiOiAib2JtaW5Aa29ua29yIiwKICAidmVyc2lvbiI6IDI1Cn0="}}} , {"uuid": "BingWallpaper@ineffable-gmail.com", "name": "Bing Wallpaper", "pname": "bing-wallpaper-changer", "description": "Lightweight GNOME shell extension to set your wallpaper to today's Microsoft Bing image of the day (the image you see when you visit Bing.com).\n\n *Disclaimer*: this extension is unofficial and not affiliated with Bing or Microsoft in any way. Images are protected by copyright and are licensed only for use as wallpapers.\n\nThis extension is based extensively on the NASA APOD extension by Elinvention (https://github.com/Elinvention) and inspired by Bing Desktop Wallpaper Changer by Utkarsh Gupta (https://github.com/UtkarshGpta).\n\nFeatures:\n* Fetches Bing wallpaper of the day and sets as both lock screen and desktop wallpaper (user selectable on GNOME versions that support it)\n* Optionally force a specific region (i.e. locale)\n* UHD supported resolutions\n* Only attempts to download wallpapers when they have been updated\n* Doesn't poll continuously - only once per day and on startup (schedules a refresh when Bing is due to update)\n *NEW: random mode\n *NEW: select wallpaper from previously downloaded images\n* English (en), German (de), Dutch (nl), Italian (it), Polish (pl), Chinese (zh_CN), French (fr_FR), Portuguese (pt, pt_BR), Russian (ru_RU), Spanish (es), Korean (ko, ko_KR, ko_KP), Indonesian (id), Catalan (ca), Norwegian Bokmål (nb) & Nynorsk (ni), Swedish (sv), Arabic (ar), Hungarian (hu) and Finnish (fi_FI) - a HUGE thanks to the translators\n\nAlways restart GNOME after manually updating extensions. Please report bugs to the GitHub page below:", "link": "https://extensions.gnome.org/extension/1262/bing-wallpaper-changer/", "shell_version_map": {"38": {"version": "40", "sha256": "1zsi177c2qcd5mfnngxlflw8j1af8lbq8fdc634d2fhpzvifhjvp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJCaW5nV2FsbHBhcGVyQGluZWZmYWJsZS1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}, "40": {"version": "40", "sha256": "1zsi177c2qcd5mfnngxlflw8j1af8lbq8fdc634d2fhpzvifhjvp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJCaW5nV2FsbHBhcGVyQGluZWZmYWJsZS1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}, "41": {"version": "40", "sha256": "1zsi177c2qcd5mfnngxlflw8j1af8lbq8fdc634d2fhpzvifhjvp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJCaW5nV2FsbHBhcGVyQGluZWZmYWJsZS1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}, "42": {"version": "40", "sha256": "1zsi177c2qcd5mfnngxlflw8j1af8lbq8fdc634d2fhpzvifhjvp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxpZ2h0d2VpZ2h0IEdOT01FIHNoZWxsIGV4dGVuc2lvbiB0byBzZXQgeW91ciB3YWxscGFwZXIgdG8gdG9kYXkncyBNaWNyb3NvZnQgQmluZyBpbWFnZSBvZiB0aGUgZGF5ICh0aGUgaW1hZ2UgeW91IHNlZSB3aGVuIHlvdSB2aXNpdCBCaW5nLmNvbSkuXG5cbiAqRGlzY2xhaW1lcio6IHRoaXMgZXh0ZW5zaW9uIGlzIHVub2ZmaWNpYWwgYW5kIG5vdCBhZmZpbGlhdGVkIHdpdGggQmluZyBvciBNaWNyb3NvZnQgaW4gYW55IHdheS4gSW1hZ2VzIGFyZSBwcm90ZWN0ZWQgYnkgY29weXJpZ2h0IGFuZCBhcmUgbGljZW5zZWQgb25seSBmb3IgdXNlIGFzIHdhbGxwYXBlcnMuXG5cblRoaXMgZXh0ZW5zaW9uIGlzIGJhc2VkIGV4dGVuc2l2ZWx5IG9uIHRoZSBOQVNBIEFQT0QgZXh0ZW5zaW9uIGJ5IEVsaW52ZW50aW9uIChodHRwczovL2dpdGh1Yi5jb20vRWxpbnZlbnRpb24pIGFuZCBpbnNwaXJlZCBieSBCaW5nIERlc2t0b3AgV2FsbHBhcGVyIENoYW5nZXIgYnkgVXRrYXJzaCBHdXB0YSAoaHR0cHM6Ly9naXRodWIuY29tL1V0a2Fyc2hHcHRhKS5cblxuRmVhdHVyZXM6XG4qIEZldGNoZXMgQmluZyB3YWxscGFwZXIgb2YgdGhlIGRheSBhbmQgc2V0cyBhcyBib3RoIGxvY2sgc2NyZWVuIGFuZCBkZXNrdG9wIHdhbGxwYXBlciAodXNlciBzZWxlY3RhYmxlIG9uIEdOT01FIHZlcnNpb25zIHRoYXQgc3VwcG9ydCBpdClcbiogT3B0aW9uYWxseSBmb3JjZSBhIHNwZWNpZmljIHJlZ2lvbiAoaS5lLiBsb2NhbGUpXG4qIFVIRCBzdXBwb3J0ZWQgcmVzb2x1dGlvbnNcbiogT25seSBhdHRlbXB0cyB0byBkb3dubG9hZCB3YWxscGFwZXJzIHdoZW4gdGhleSBoYXZlIGJlZW4gdXBkYXRlZFxuKiBEb2Vzbid0IHBvbGwgY29udGludW91c2x5IC0gb25seSBvbmNlIHBlciBkYXkgYW5kIG9uIHN0YXJ0dXAgKHNjaGVkdWxlcyBhIHJlZnJlc2ggd2hlbiBCaW5nIGlzIGR1ZSB0byB1cGRhdGUpXG4gKk5FVzogcmFuZG9tIG1vZGVcbiAqTkVXOiBzZWxlY3Qgd2FsbHBhcGVyIGZyb20gcHJldmlvdXNseSBkb3dubG9hZGVkIGltYWdlc1xuKiBFbmdsaXNoIChlbiksIEdlcm1hbiAoZGUpLCBEdXRjaCAobmwpLCBJdGFsaWFuIChpdCksIFBvbGlzaCAocGwpLCBDaGluZXNlICh6aF9DTiksIEZyZW5jaCAoZnJfRlIpLCBQb3J0dWd1ZXNlIChwdCwgcHRfQlIpLCBSdXNzaWFuIChydV9SVSksIFNwYW5pc2ggKGVzKSwgS29yZWFuIChrbywga29fS1IsIGtvX0tQKSwgSW5kb25lc2lhbiAoaWQpLCBDYXRhbGFuIChjYSksIE5vcndlZ2lhbiBCb2ttXHUwMGU1bCAobmIpICYgTnlub3JzayAobmkpLCBTd2VkaXNoIChzdiksIEFyYWJpYyAoYXIpLCBIdW5nYXJpYW4gKGh1KSBhbmQgRmlubmlzaCAoZmlfRkkpIC0gYSBIVUdFIHRoYW5rcyB0byB0aGUgdHJhbnNsYXRvcnNcblxuQWx3YXlzIHJlc3RhcnQgR05PTUUgYWZ0ZXIgbWFudWFsbHkgdXBkYXRpbmcgZXh0ZW5zaW9ucy4gUGxlYXNlIHJlcG9ydCBidWdzIHRvIHRoZSBHaXRIdWIgcGFnZSBiZWxvdzoiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJCaW5nV2FsbHBhcGVyIiwKICAibmFtZSI6ICJCaW5nIFdhbGxwYXBlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaW5nd2FsbHBhcGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVmZm8vYmluZy13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJCaW5nV2FsbHBhcGVyQGluZWZmYWJsZS1nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}}} , {"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"}}} @@ -195,7 +195,7 @@ , {"uuid": "transparent-window@pbxqdown.github.com", "name": "Transparent Window", "pname": "transparent-window", "description": "Change the opacity of windows by compiz-style shortcut Alt+scroll.\nYou can customize hotkey in Preference page if Alt key doesn't work.", "link": "https://extensions.gnome.org/extension/1454/transparent-window/", "shell_version_map": {"38": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "07qn7hwpv8pzwbgw60mr87ww10mwcz8x8w3d4gq4zszgynw63nbq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgb3BhY2l0eSBvZiB3aW5kb3dzIGJ5IGNvbXBpei1zdHlsZSBzaG9ydGN1dCBBbHQrc2Nyb2xsLlxuWW91IGNhbiBjdXN0b21pemUgaG90a2V5IGluIFByZWZlcmVuY2UgcGFnZSBpZiBBbHQga2V5IGRvZXNuJ3Qgd29yay4iLAogICJuYW1lIjogIlRyYW5zcGFyZW50IFdpbmRvdyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5UcmFuc3BhcmVudFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOC4xIiwKICAgICIzLjM2LjEiLAogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcGJ4cWRvd24vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRyYW5zcGFyZW50LXdpbmRvdyIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtd2luZG93QHBieHFkb3duLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "miniview@thesecretaryofwar.com", "name": "Miniview", "pname": "miniview", "description": "Mini preview of another window (like picture-in-picture on a TV)\n- Left-mouse drag: move preview window\n- Right-mouse drag (or ctrl + left mouse drag): resize preview window\n- Scroll wheel (or shift + click): change target window\n- Double click: raise target window\n- Shift + F12: toggle preview window (this can be changed or disabled in preferences)\n- Ctrl + scroll wheel: adjust opacity", "link": "https://extensions.gnome.org/extension/1459/miniview/", "shell_version_map": {"38": {"version": "13", "sha256": "135mg4d49cm6ba72z9174kv31y49wpvlfddh04pmbj2cy95wai46", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmkgcHJldmlldyBvZiBhbm90aGVyIHdpbmRvdyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVilcbi0gTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG4tIFJpZ2h0LW1vdXNlIGRyYWcgKG9yIGN0cmwgKyBsZWZ0IG1vdXNlIGRyYWcpOiByZXNpemUgcHJldmlldyB3aW5kb3dcbi0gU2Nyb2xsIHdoZWVsIChvciBzaGlmdCArIGNsaWNrKTogY2hhbmdlIHRhcmdldCB3aW5kb3dcbi0gRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG4tIFNoaWZ0ICsgRjEyOiB0b2dnbGUgcHJldmlldyB3aW5kb3cgKHRoaXMgY2FuIGJlIGNoYW5nZWQgb3IgZGlzYWJsZWQgaW4gcHJlZmVyZW5jZXMpXG4tIEN0cmwgKyBzY3JvbGwgd2hlZWw6IGFkanVzdCBvcGFjaXR5IiwKICAiZXh0ZW5zaW9uLWlkIjogIm1pbml2aWV3IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWluaXZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRoZXNlY3JldGFyeW9md2FyQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWluaXZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pYW1sZW1lYy9taW5pdmlldyIsCiAgInV1aWQiOiAibWluaXZpZXdAdGhlc2VjcmV0YXJ5b2Z3YXIuY29tIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "14", "sha256": "0ylnjpwvdzxsdh68k197rk5dhv1211vcrjhc5w9k39hd2mdhw4ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmkgcHJldmlldyBvZiBhbm90aGVyIHdpbmRvdyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVilcbi0gTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG4tIFJpZ2h0LW1vdXNlIGRyYWcgKG9yIGN0cmwgKyBsZWZ0IG1vdXNlIGRyYWcpOiByZXNpemUgcHJldmlldyB3aW5kb3dcbi0gU2Nyb2xsIHdoZWVsIChvciBzaGlmdCArIGNsaWNrKTogY2hhbmdlIHRhcmdldCB3aW5kb3dcbi0gRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG4tIFNoaWZ0ICsgRjEyOiB0b2dnbGUgcHJldmlldyB3aW5kb3cgKHRoaXMgY2FuIGJlIGNoYW5nZWQgb3IgZGlzYWJsZWQgaW4gcHJlZmVyZW5jZXMpXG4tIEN0cmwgKyBzY3JvbGwgd2hlZWw6IGFkanVzdCBvcGFjaXR5IiwKICAiZXh0ZW5zaW9uLWlkIjogIm1pbml2aWV3IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWluaXZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRoZXNlY3JldGFyeW9md2FyQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWluaXZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pYW1sZW1lYy9taW5pdmlldyIsCiAgInV1aWQiOiAibWluaXZpZXdAdGhlc2VjcmV0YXJ5b2Z3YXIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "0ylnjpwvdzxsdh68k197rk5dhv1211vcrjhc5w9k39hd2mdhw4ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmkgcHJldmlldyBvZiBhbm90aGVyIHdpbmRvdyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVilcbi0gTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG4tIFJpZ2h0LW1vdXNlIGRyYWcgKG9yIGN0cmwgKyBsZWZ0IG1vdXNlIGRyYWcpOiByZXNpemUgcHJldmlldyB3aW5kb3dcbi0gU2Nyb2xsIHdoZWVsIChvciBzaGlmdCArIGNsaWNrKTogY2hhbmdlIHRhcmdldCB3aW5kb3dcbi0gRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG4tIFNoaWZ0ICsgRjEyOiB0b2dnbGUgcHJldmlldyB3aW5kb3cgKHRoaXMgY2FuIGJlIGNoYW5nZWQgb3IgZGlzYWJsZWQgaW4gcHJlZmVyZW5jZXMpXG4tIEN0cmwgKyBzY3JvbGwgd2hlZWw6IGFkanVzdCBvcGFjaXR5IiwKICAiZXh0ZW5zaW9uLWlkIjogIm1pbml2aWV3IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWluaXZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRoZXNlY3JldGFyeW9md2FyQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWluaXZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pYW1sZW1lYy9taW5pdmlldyIsCiAgInV1aWQiOiAibWluaXZpZXdAdGhlc2VjcmV0YXJ5b2Z3YXIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "0ylnjpwvdzxsdh68k197rk5dhv1211vcrjhc5w9k39hd2mdhw4ch", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmkgcHJldmlldyBvZiBhbm90aGVyIHdpbmRvdyAobGlrZSBwaWN0dXJlLWluLXBpY3R1cmUgb24gYSBUVilcbi0gTGVmdC1tb3VzZSBkcmFnOiBtb3ZlIHByZXZpZXcgd2luZG93XG4tIFJpZ2h0LW1vdXNlIGRyYWcgKG9yIGN0cmwgKyBsZWZ0IG1vdXNlIGRyYWcpOiByZXNpemUgcHJldmlldyB3aW5kb3dcbi0gU2Nyb2xsIHdoZWVsIChvciBzaGlmdCArIGNsaWNrKTogY2hhbmdlIHRhcmdldCB3aW5kb3dcbi0gRG91YmxlIGNsaWNrOiByYWlzZSB0YXJnZXQgd2luZG93XG4tIFNoaWZ0ICsgRjEyOiB0b2dnbGUgcHJldmlldyB3aW5kb3cgKHRoaXMgY2FuIGJlIGNoYW5nZWQgb3IgZGlzYWJsZWQgaW4gcHJlZmVyZW5jZXMpXG4tIEN0cmwgKyBzY3JvbGwgd2hlZWw6IGFkanVzdCBvcGFjaXR5IiwKICAiZXh0ZW5zaW9uLWlkIjogIm1pbml2aWV3IiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWluaXZpZXciLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgInRoZXNlY3JldGFyeW9md2FyQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWluaXZpZXciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pYW1sZW1lYy9taW5pdmlldyIsCiAgInV1aWQiOiAibWluaXZpZXdAdGhlc2VjcmV0YXJ5b2Z3YXIuY29tIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "Vitals@CoreCoding.com", "name": "Vitals", "pname": "vitals", "description": "A glimpse into your computer's temperature, voltage, fan speed, memory usage, processor load, system resources, network speed and storage stats. This is a one stop shop to monitor all of your vital sensors. Uses asynchronous polling to provide a smooth user experience. Feature requests or bugs? Please use GitHub.", "link": "https://extensions.gnome.org/extension/1460/vitals/", "shell_version_map": {"38": {"version": "54", "sha256": "1wfaxzsbzkmnzvszwpapxwj1370idgpxwmyg8a0drvb1jxxq3v1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "40": {"version": "54", "sha256": "1wfaxzsbzkmnzvszwpapxwj1370idgpxwmyg8a0drvb1jxxq3v1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "41": {"version": "54", "sha256": "1wfaxzsbzkmnzvszwpapxwj1370idgpxwmyg8a0drvb1jxxq3v1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}, "42": {"version": "54", "sha256": "1wfaxzsbzkmnzvszwpapxwj1370idgpxwmyg8a0drvb1jxxq3v1y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ2xpbXBzZSBpbnRvIHlvdXIgY29tcHV0ZXIncyB0ZW1wZXJhdHVyZSwgdm9sdGFnZSwgZmFuIHNwZWVkLCBtZW1vcnkgdXNhZ2UsIHByb2Nlc3NvciBsb2FkLCBzeXN0ZW0gcmVzb3VyY2VzLCBuZXR3b3JrIHNwZWVkIGFuZCBzdG9yYWdlIHN0YXRzLiBUaGlzIGlzIGEgb25lIHN0b3Agc2hvcCB0byBtb25pdG9yIGFsbCBvZiB5b3VyIHZpdGFsIHNlbnNvcnMuIFVzZXMgYXN5bmNocm9ub3VzIHBvbGxpbmcgdG8gcHJvdmlkZSBhIHNtb290aCB1c2VyIGV4cGVyaWVuY2UuIEZlYXR1cmUgcmVxdWVzdHMgb3IgYnVncz8gUGxlYXNlIHVzZSBHaXRIdWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidml0YWxzIiwKICAibmFtZSI6ICJWaXRhbHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudml0YWxzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY29yZWNvZGluZy9WaXRhbHMiLAogICJ1dWlkIjogIlZpdGFsc0BDb3JlQ29kaW5nLmNvbSIsCiAgInZlcnNpb24iOiA1NAp9"}}} -, {"uuid": "panel-date-format@keiii.github.com", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/1462/panel-date-format/", "shell_version_map": {"40": {"version": "7", "sha256": "0afqf8hkmg1fmnz0nn6jq6k7yl7vs69w0malqhf1bqfsn5w7ksdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "0afqf8hkmg1fmnz0nn6jq6k7yl7vs69w0malqhf1bqfsn5w7ksdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "0afqf8hkmg1fmnz0nn6jq6k7yl7vs69w0malqhf1bqfsn5w7ksdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} +, {"uuid": "panel-date-format@keiii.github.com", "name": "Panel Date Format", "pname": "panel-date-format", "description": "Allows to customize the date format on the panel.", "link": "https://extensions.gnome.org/extension/1462/panel-date-format/", "shell_version_map": {"40": {"version": "8", "sha256": "0jj6r7q6g2b1k1xmgi1jrkcfzmvaf48kqm2cxp2avw8wqb6wsgm4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "0jj6r7q6g2b1k1xmgi1jrkcfzmvaf48kqm2cxp2avw8wqb6wsgm4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "0jj6r7q6g2b1k1xmgi1jrkcfzmvaf48kqm2cxp2avw8wqb6wsgm4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB0byBjdXN0b21pemUgdGhlIGRhdGUgZm9ybWF0IG9uIHRoZSBwYW5lbC4iLAogICJuYW1lIjogIlBhbmVsIERhdGUgRm9ybWF0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWRhdGUtZm9ybWF0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vS0VJSUkvZ25vbWUtc2hlbGwtcGFuZWwtZGF0ZS1mb3JtYXQiLAogICJ1dWlkIjogInBhbmVsLWRhdGUtZm9ybWF0QGtlaWlpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "desktop-icons@csoriano", "name": "Desktop Icons", "pname": "desktop-icons", "description": "Add icons to the desktop", "link": "https://extensions.gnome.org/extension/1465/desktop-icons/", "shell_version_map": {"38": {"version": "19", "sha256": "01qdh1kigl3ck1mzgha1a9218lpam5b54ai72mpvr64gkaax2mcv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBpY29ucyB0byB0aGUgZGVza3RvcCIsCiAgIm5hbWUiOiAiRGVza3RvcCBJY29ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvV29ybGQvU2hlbGxFeHRlbnNpb25zL2Rlc2t0b3AtaWNvbnMiLAogICJ1dWlkIjogImRlc2t0b3AtaWNvbnNAY3Nvcmlhbm8iLAogICJ2ZXJzaW9uIjogMTkKfQ=="}}} , {"uuid": "fullbattery@categulario.tk", "name": "Full Battery indicator", "pname": "full-battery-indicator", "description": "Notifies when battery is full", "link": "https://extensions.gnome.org/extension/1466/full-battery-indicator/", "shell_version_map": {"38": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "167d84phf68fi5bg9fvm4l7l8jq7k86a80adm0l56ngqygxqsyy8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWVzIHdoZW4gYmF0dGVyeSBpcyBmdWxsIiwKICAibmFtZSI6ICJGdWxsIEJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjMyIiwKICAgICIzLjI4LjMiLAogICAgIjMuMzQuNCIsCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4zIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2F0ZWd1bGFyaW8vZnVsbC1iYXR0ZXJ5LWdub21lLXNoZWxsLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZnVsbGJhdHRlcnlAY2F0ZWd1bGFyaW8udGsiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "rdesktop-menu@bastien.git.geekwu.org", "name": "Rdesktop launcher", "pname": "rdesktop-launcher", "description": "Add a servers status menu for quickly running rdesktop", "link": "https://extensions.gnome.org/extension/1467/rdesktop-launcher/", "shell_version_map": {"38": {"version": "15", "sha256": "1vhlx80jhghg38g13cn1i8410gi4nmhsqqhqklkfkz761rvg8fq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXQuZ2Vla3d1Lm9yZy9iYXN0aWVuL3JkZXNrdG9wLW1lbnUiLAogICJ1dWlkIjogInJkZXNrdG9wLW1lbnVAYmFzdGllbi5naXQuZ2Vla3d1Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "15", "sha256": "1vhlx80jhghg38g13cn1i8410gi4nmhsqqhqklkfkz761rvg8fq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXQuZ2Vla3d1Lm9yZy9iYXN0aWVuL3JkZXNrdG9wLW1lbnUiLAogICJ1dWlkIjogInJkZXNrdG9wLW1lbnVAYmFzdGllbi5naXQuZ2Vla3d1Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"}, "41": {"version": "15", "sha256": "1vhlx80jhghg38g13cn1i8410gi4nmhsqqhqklkfkz761rvg8fq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXQuZ2Vla3d1Lm9yZy9iYXN0aWVuL3JkZXNrdG9wLW1lbnUiLAogICJ1dWlkIjogInJkZXNrdG9wLW1lbnVAYmFzdGllbi5naXQuZ2Vla3d1Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"}, "42": {"version": "15", "sha256": "1vhlx80jhghg38g13cn1i8410gi4nmhsqqhqklkfkz761rvg8fq7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHNlcnZlcnMgc3RhdHVzIG1lbnUgZm9yIHF1aWNrbHkgcnVubmluZyByZGVza3RvcCIsCiAgImV4dGVuc2lvbi1pZCI6ICJyZGVza3RvcC1tZW51IiwKICAibmFtZSI6ICJSZGVza3RvcCBsYXVuY2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXQuZ2Vla3d1Lm9yZy9iYXN0aWVuL3JkZXNrdG9wLW1lbnUiLAogICJ1dWlkIjogInJkZXNrdG9wLW1lbnVAYmFzdGllbi5naXQuZ2Vla3d1Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"}}} @@ -255,13 +255,13 @@ , {"uuid": "horizontal-workspaces@gnome-shell-extensions.gcampax.github.com", "name": "Horizontal workspaces", "pname": "horizontal-workspaces", "description": "Use a horizontal workspace layout", "link": "https://extensions.gnome.org/extension/2141/horizontal-workspaces/", "shell_version_map": {"38": {"version": "5", "sha256": "0kbqcrs96v72yk0rf8jghy1a31651fyvgpi97yp46n4wmvc41vk7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSBhIGhvcml6b250YWwgd29ya3NwYWNlIGxheW91dCIsCiAgImV4dGVuc2lvbi1pZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb25zIiwKICAibmFtZSI6ICJIb3Jpem9udGFsIHdvcmtzcGFjZXMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgInV1aWQiOiAiaG9yaXpvbnRhbC13b3Jrc3BhY2VzQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuZ2NhbXBheC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "threefingerwindowmove@do.sch.dev.gmail.com", "name": "Three Finger Window Move", "pname": "three-finger-window-move", "description": "Allows moving windows around with a three finger trackpad gesture (Wayland only)", "link": "https://extensions.gnome.org/extension/2164/three-finger-window-move/", "shell_version_map": {"38": {"version": "7", "sha256": "1m7vwr6s6w297b0x0bmnj8fs2hl73pbys6m93lnb9inh5pmgiv1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBtb3Zpbmcgd2luZG93cyBhcm91bmQgd2l0aCBhIHRocmVlIGZpbmdlciB0cmFja3BhZCBnZXN0dXJlIChXYXlsYW5kIG9ubHkpIiwKICAibmFtZSI6ICJUaHJlZSBGaW5nZXIgV2luZG93IE1vdmUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kby1zY2gvZ25vbWUtc2hlbGwtdG91Y2hwYWQtd2luZG93LW1vdmUiLAogICJ1dWlkIjogInRocmVlZmluZ2Vyd2luZG93bW92ZUBkby5zY2guZGV2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "spotify-ad-block@danigm.net", "name": "Mute spotify ads", "pname": "mute-spotify-ads", "description": "Mute spotify ads", "link": "https://extensions.gnome.org/extension/2176/mute-spotify-ads/", "shell_version_map": {"38": {"version": "15", "sha256": "1sxqira8hgdjam2b3fya1zpgdl3539vhy6r87jvss4x4r92r8jyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFkLWJsb2NrQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "40": {"version": "15", "sha256": "1sxqira8hgdjam2b3fya1zpgdl3539vhy6r87jvss4x4r92r8jyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFkLWJsb2NrQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "1sxqira8hgdjam2b3fya1zpgdl3539vhy6r87jvss4x4r92r8jyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFkLWJsb2NrQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "1sxqira8hgdjam2b3fya1zpgdl3539vhy6r87jvss4x4r92r8jyr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJuYW1lIjogIk11dGUgc3BvdGlmeSBhZHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9kYW5pZ20vc3BvdGlmeS1hZC1ibG9ja2VyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFkLWJsb2NrQGRhbmlnbS5uZXQiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} -, {"uuid": "noannoyance@daase.net", "name": "NoAnnoyance v2", "pname": "noannoyance", "description": "Another extension, that removes the 'Window is ready' notification and puts the window into focus. In contrast to all the other extensions, this uses ES6 syntax and is actively maintained.", "link": "https://extensions.gnome.org/extension/2182/noannoyance/", "shell_version_map": {"38": {"version": "12", "sha256": "1wr1wxmaxb569m3wsfdhs0jdpq1zqx3bkk6dgn9iswbbr060bnd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "14", "sha256": "1q2q3cgkvf5yrdrr5pv68f75mxs9cykg1d8vx4gr3p8pxzgqmjgs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5vYW5ub3lhbmNlIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub2Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "1q2q3cgkvf5yrdrr5pv68f75mxs9cykg1d8vx4gr3p8pxzgqmjgs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5vYW5ub3lhbmNlIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub2Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "42": {"version": "14", "sha256": "1q2q3cgkvf5yrdrr5pv68f75mxs9cykg1d8vx4gr3p8pxzgqmjgs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5vYW5ub3lhbmNlIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub2Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} +, {"uuid": "noannoyance@daase.net", "name": "NoAnnoyance v2", "pname": "noannoyance", "description": "Another extension, that removes the 'Window is ready' notification and puts the window into focus. In contrast to all the other extensions, this uses ES6 syntax and is actively maintained.", "link": "https://extensions.gnome.org/extension/2182/noannoyance/", "shell_version_map": {"38": {"version": "12", "sha256": "1wr1wxmaxb569m3wsfdhs0jdpq1zqx3bkk6dgn9iswbbr060bnd0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "16", "sha256": "1b58y8rrgy7wdl2kfypb4xb7m9d40w157hnypq3y2060iwinnqpw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5vYW5ub3lhbmNlIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub2Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1b58y8rrgy7wdl2kfypb4xb7m9d40w157hnypq3y2060iwinnqpw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5vYW5ub3lhbmNlIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub2Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "42": {"version": "16", "sha256": "1b58y8rrgy7wdl2kfypb4xb7m9d40w157hnypq3y2060iwinnqpw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZXh0ZW5zaW9uLCB0aGF0IHJlbW92ZXMgdGhlICdXaW5kb3cgaXMgcmVhZHknIG5vdGlmaWNhdGlvbiBhbmQgcHV0cyB0aGUgd2luZG93IGludG8gZm9jdXMuIEluIGNvbnRyYXN0IHRvIGFsbCB0aGUgb3RoZXIgZXh0ZW5zaW9ucywgdGhpcyB1c2VzIEVTNiBzeW50YXggYW5kIGlzIGFjdGl2ZWx5IG1haW50YWluZWQuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW5vYW5ub3lhbmNlIiwKICAibmFtZSI6ICJOb0Fubm95YW5jZSB2MiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ub2Fubm95YW5jZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0Jqb2VybkRhYXNlL25vYW5ub3lhbmNlIiwKICAidXVpZCI6ICJub2Fubm95YW5jZUBkYWFzZS5uZXQiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} , {"uuid": "vim-altTab@kokong.info", "name": "VIM Alt-Tab", "pname": "vim-alt-tab", "description": "Add the ability to switch between windows and applications using vim-like keypresses (h, j, k, l)", "link": "https://extensions.gnome.org/extension/2212/vim-alt-tab/", "shell_version_map": {"38": {"version": "6", "sha256": "0k7k4fa5b8vdvycwwycwisrf5js2c65ixc88hi8x7czwkzml7mgd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tva28tbmcvdmltLWFsdFRhYiIsCiAgInV1aWQiOiAidmltLWFsdFRhYkBrb2tvbmcuaW5mbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "0k7k4fa5b8vdvycwwycwisrf5js2c65ixc88hi8x7czwkzml7mgd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tva28tbmcvdmltLWFsdFRhYiIsCiAgInV1aWQiOiAidmltLWFsdFRhYkBrb2tvbmcuaW5mbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0k7k4fa5b8vdvycwwycwisrf5js2c65ixc88hi8x7czwkzml7mgd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tva28tbmcvdmltLWFsdFRhYiIsCiAgInV1aWQiOiAidmltLWFsdFRhYkBrb2tvbmcuaW5mbyIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "0k7k4fa5b8vdvycwwycwisrf5js2c65ixc88hi8x7czwkzml7mgd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB0aGUgYWJpbGl0eSB0byBzd2l0Y2ggYmV0d2VlbiB3aW5kb3dzIGFuZCBhcHBsaWNhdGlvbnMgdXNpbmcgdmltLWxpa2Uga2V5cHJlc3NlcyAoaCwgaiwgaywgbCkiLAogICJleHRlbnNpb24taWQiOiAidmltLWFsdHRhYiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbnMiLAogICJuYW1lIjogIlZJTSBBbHQtVGFiIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJqd0BiYXJnc3Rlbi5vcmciLAogICAgInRob21hcy5ib3VmZm9uQGdtYWlsLmNvbSIsCiAgICAia29rb0Brb2tvbmcuaW5mbyIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudmltLWFsdHRhYiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2tva28tbmcvdmltLWFsdFRhYiIsCiAgInV1aWQiOiAidmltLWFsdFRhYkBrb2tvbmcuaW5mbyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "easy_docker_containers@red.software.systems", "name": "Easy Docker Containers", "pname": "easy-docker-containers", "description": "A GNOME Shell extension (GNOME Panel applet) to be able to generally control your available Docker containers.", "link": "https://extensions.gnome.org/extension/2224/easy-docker-containers/", "shell_version_map": {"38": {"version": "18", "sha256": "1rmari65bq7g6hh8gcvw382d69fkpgni0b4i1w1lz9jw91j9bn56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmVkU29mdHdhcmVTeXN0ZW1zL2Vhc3lfZG9ja2VyX2NvbnRhaW5lcnMiLAogICJ1dWlkIjogImVhc3lfZG9ja2VyX2NvbnRhaW5lcnNAcmVkLnNvZnR3YXJlLnN5c3RlbXMiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "40": {"version": "18", "sha256": "1rmari65bq7g6hh8gcvw382d69fkpgni0b4i1w1lz9jw91j9bn56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmVkU29mdHdhcmVTeXN0ZW1zL2Vhc3lfZG9ja2VyX2NvbnRhaW5lcnMiLAogICJ1dWlkIjogImVhc3lfZG9ja2VyX2NvbnRhaW5lcnNAcmVkLnNvZnR3YXJlLnN5c3RlbXMiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "41": {"version": "18", "sha256": "1rmari65bq7g6hh8gcvw382d69fkpgni0b4i1w1lz9jw91j9bn56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmVkU29mdHdhcmVTeXN0ZW1zL2Vhc3lfZG9ja2VyX2NvbnRhaW5lcnMiLAogICJ1dWlkIjogImVhc3lfZG9ja2VyX2NvbnRhaW5lcnNAcmVkLnNvZnR3YXJlLnN5c3RlbXMiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}, "42": {"version": "18", "sha256": "1rmari65bq7g6hh8gcvw382d69fkpgni0b4i1w1lz9jw91j9bn56", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgU2hlbGwgZXh0ZW5zaW9uIChHTk9NRSBQYW5lbCBhcHBsZXQpIHRvIGJlIGFibGUgdG8gZ2VuZXJhbGx5IGNvbnRyb2wgeW91ciBhdmFpbGFibGUgRG9ja2VyIGNvbnRhaW5lcnMuIiwKICAibmFtZSI6ICJFYXN5IERvY2tlciBDb250YWluZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmVkU29mdHdhcmVTeXN0ZW1zL2Vhc3lfZG9ja2VyX2NvbnRhaW5lcnMiLAogICJ1dWlkIjogImVhc3lfZG9ja2VyX2NvbnRhaW5lcnNAcmVkLnNvZnR3YXJlLnN5c3RlbXMiLAogICJ2ZXJzaW9uIjogMTgKfQ=="}}} , {"uuid": "nightthemeswitcher@romainvigier.fr", "name": "Night Theme Switcher", "pname": "night-theme-switcher", "description": "Make your desktop easy on the eye, day and night.\n\nAutomatically toggle the color scheme between light and dark, switch backgrounds and run custom commands at sunset and sunrise.\n\nSupports Night Light, Location Services, manual schedule and on-demand switch modes.\n", "link": "https://extensions.gnome.org/extension/2236/night-theme-switcher/", "shell_version_map": {"38": {"version": "46", "sha256": "138rih3y78qppl5mg86509d6y49s41g3lj74zb5sy6wszv7pv7fi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy5cbiIsCiAgImdldHRleHQtZG9tYWluIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJuYW1lIjogIk5pZ2h0IFRoZW1lIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9uaWdodHRoZW1lc3dpdGNoZXIucm9tYWludmlnaWVyLmZyIiwKICAidXVpZCI6ICJuaWdodHRoZW1lc3dpdGNoZXJAcm9tYWludmlnaWVyLmZyIiwKICAidmVyc2lvbiI6IDQ2Cn0="}, "40": {"version": "51", "sha256": "0q71z47bszijdg00d5mq3sc9ziliik4iqzm4qg22gc9cyz95c9v4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy5cbiIsCiAgImdldHRleHQtZG9tYWluIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJuYW1lIjogIk5pZ2h0IFRoZW1lIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA1MQp9"}, "41": {"version": "55", "sha256": "1946qhpgyxf73czkqjs9b2ggj93ibgxvi9drj0d71gyws3j7h2l3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy5cbiIsCiAgImdldHRleHQtZG9tYWluIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJuYW1lIjogIk5pZ2h0IFRoZW1lIFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5pZ2h0dGhlbWVzd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vbmlnaHR0aGVtZXN3aXRjaGVyLnJvbWFpbnZpZ2llci5mciIsCiAgInV1aWQiOiAibmlnaHR0aGVtZXN3aXRjaGVyQHJvbWFpbnZpZ2llci5mciIsCiAgInZlcnNpb24iOiA1NQp9"}, "42": {"version": "65", "sha256": "0frmzww6g0v647fm1183acwbnzixk2i40x1iy45al9x6jjdcdacg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgeW91ciBkZXNrdG9wIGVhc3kgb24gdGhlIGV5ZSwgZGF5IGFuZCBuaWdodC5cblxuQXV0b21hdGljYWxseSB0b2dnbGUgdGhlIGNvbG9yIHNjaGVtZSBiZXR3ZWVuIGxpZ2h0IGFuZCBkYXJrLCBzd2l0Y2ggYmFja2dyb3VuZHMgYW5kIHJ1biBjdXN0b20gY29tbWFuZHMgYXQgc3Vuc2V0IGFuZCBzdW5yaXNlLlxuXG5TdXBwb3J0cyBOaWdodCBMaWdodCwgTG9jYXRpb24gU2VydmljZXMsIG1hbnVhbCBzY2hlZHVsZSBhbmQgb24tZGVtYW5kIHN3aXRjaCBtb2Rlcy5cbiIsCiAgImdldHRleHQtZG9tYWluIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJuYW1lIjogIk5pZ2h0IFRoZW1lIFN3aXRjaGVyIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1bmxvY2stZGlhbG9nIiwKICAgICJ1c2VyIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uaWdodHRoZW1lc3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL25pZ2h0dGhlbWVzd2l0Y2hlci5yb21haW52aWdpZXIuZnIiLAogICJ1dWlkIjogIm5pZ2h0dGhlbWVzd2l0Y2hlckByb21haW52aWdpZXIuZnIiLAogICJ2ZXJzaW9uIjogNjUKfQ=="}}} , {"uuid": "binaryclock@vancha.march", "name": "binaryclock", "pname": "binaryclock", "description": "adds a binary clock to the gnome bar", "link": "https://extensions.gnome.org/extension/2284/binaryclock/", "shell_version_map": {"38": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1bvzlqfhwlk1sh9q3538yipjwzgndd4wnn2l8wc3sshb93ggvpg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZHMgYSBiaW5hcnkgY2xvY2sgdG8gdGhlIGdub21lIGJhciIsCiAgIm5hbWUiOiAiYmluYXJ5Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjgiLAogICAgIjMuMzQiLAogICAgIjMuMzIuMiIsCiAgICAiMy4zOCIsCiAgICAiMy4zNi43IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZhbmNoYS9nbm9tZVNoZWxsQmluYXJ5Q2xvY2svIiwKICAidXVpZCI6ICJiaW5hcnljbG9ja0B2YW5jaGEubWFyY2giLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "lgbutton@glerro.gnome.gitlab.io", "name": "Looking Glass Button", "pname": "looking-glass-button", "description": "Toggle the Looking Glass visibility by clicking on a panel icon.\n\nAnd from version 4 left clicking on the icon show a menu with new features like Restart Gnome Shell (not available on Wayland), Reload Theme, Open Extension Folder and Open Theme Folder (the last two require that xdg-open is installed).\n\nVersion 4 also drop the compatibility with Gnome Shell 3.30.", "link": "https://extensions.gnome.org/extension/2296/looking-glass-button/", "shell_version_map": {"38": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "0rkk1mivq0drvpjbg89gi7plpaza71r08cyvkymygwwi2sfwpy9l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSB0aGUgTG9va2luZyBHbGFzcyB2aXNpYmlsaXR5IGJ5IGNsaWNraW5nIG9uIGEgcGFuZWwgaWNvbi5cblxuQW5kIGZyb20gdmVyc2lvbiA0IGxlZnQgY2xpY2tpbmcgb24gdGhlIGljb24gc2hvdyBhIG1lbnUgd2l0aCBuZXcgZmVhdHVyZXMgbGlrZSBSZXN0YXJ0IEdub21lIFNoZWxsIChub3QgYXZhaWxhYmxlIG9uIFdheWxhbmQpLCBSZWxvYWQgVGhlbWUsIE9wZW4gRXh0ZW5zaW9uIEZvbGRlciBhbmQgT3BlbiBUaGVtZSBGb2xkZXIgKHRoZSBsYXN0IHR3byByZXF1aXJlIHRoYXQgeGRnLW9wZW4gaXMgaW5zdGFsbGVkKS5cblxuVmVyc2lvbiA0IGFsc28gZHJvcCB0aGUgY29tcGF0aWJpbGl0eSB3aXRoIEdub21lIFNoZWxsIDMuMzAuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWxnYnV0dG9uIiwKICAibmFtZSI6ICJMb29raW5nIEdsYXNzIEJ1dHRvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2dsZXJyby9nbm9tZS1zaGVsbC1leHRlbnNpb24tbGdidXR0b24iLAogICJ1dWlkIjogImxnYnV0dG9uQGdsZXJyby5nbm9tZS5naXRsYWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}}} -, {"uuid": "tp_wattmeter@gistart", "name": "tp_wattmeter", "pname": "tp_wattmeter", "description": "Shows battery power consumption of ThinkPad laptops", "link": "https://extensions.gnome.org/extension/2308/tp_wattmeter/", "shell_version_map": {"40": {"version": "4", "sha256": "1v8rw7msfy2d8nwnppdpci62sl6iw8973z5gsl8024awl27ni38z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcyIsCiAgIm5hbWUiOiAidHBfd2F0dG1ldGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2LjAiLAogICAgIjQwLjAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9naXN0YXJ0L3RwX3dhdHRtZXRlciIsCiAgInV1aWQiOiAidHBfd2F0dG1ldGVyQGdpc3RhcnQiLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "tp_wattmeter@gistart", "name": "tp_wattmeter", "pname": "tp_wattmeter", "description": "Shows battery power consumption of ThinkPad laptops. Now configurable!", "link": "https://extensions.gnome.org/extension/2308/tp_wattmeter/", "shell_version_map": {"40": {"version": "10", "sha256": "1zjll1qp126vz4n949bvyamllvgzp658lf9br5pj0vfhxngqm47b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcy4gTm93IGNvbmZpZ3VyYWJsZSEiLAogICJuYW1lIjogInRwX3dhdHRtZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dpc3RhcnQvdHBfd2F0dG1ldGVyIiwKICAidXVpZCI6ICJ0cF93YXR0bWV0ZXJAZ2lzdGFydCIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1zjll1qp126vz4n949bvyamllvgzp658lf9br5pj0vfhxngqm47b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcy4gTm93IGNvbmZpZ3VyYWJsZSEiLAogICJuYW1lIjogInRwX3dhdHRtZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dpc3RhcnQvdHBfd2F0dG1ldGVyIiwKICAidXVpZCI6ICJ0cF93YXR0bWV0ZXJAZ2lzdGFydCIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1zjll1qp126vz4n949bvyamllvgzp658lf9br5pj0vfhxngqm47b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIGJhdHRlcnkgcG93ZXIgY29uc3VtcHRpb24gb2YgVGhpbmtQYWQgbGFwdG9wcy4gTm93IGNvbmZpZ3VyYWJsZSEiLAogICJuYW1lIjogInRwX3dhdHRtZXRlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dpc3RhcnQvdHBfd2F0dG1ldGVyIiwKICAidXVpZCI6ICJ0cF93YXR0bWV0ZXJAZ2lzdGFydCIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "Denon_AVR_controler@sylter.fr", "name": "Denon AVR controler", "pname": "denon-avr-controler", "description": "Control a Denon audio video receiver through the network.\n- on/off switch\n- volume adjustment", "link": "https://extensions.gnome.org/extension/2371/denon-avr-controler/", "shell_version_map": {"38": {"version": "4", "sha256": "0c8ky3v70arnblix717jz9fsksr42673as9nmzfyh2p2h1zm03wq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgYSBEZW5vbiBhdWRpbyB2aWRlbyByZWNlaXZlciB0aHJvdWdoIHRoZSBuZXR3b3JrLlxuLSBvbi9vZmYgc3dpdGNoXG4tIHZvbHVtZSBhZGp1c3RtZW50IiwKICAibmFtZSI6ICJEZW5vbiBBVlIgY29udHJvbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2ZyYW1hZ2l0Lm9yZy9zeWx0ZXIvZGVub24tYXZyLWNvbnRyb2xlciIsCiAgInV1aWQiOiAiRGVub25fQVZSX2NvbnRyb2xlckBzeWx0ZXIuZnIiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "hide-universal-access@akiirui.github.io", "name": "Hide Universal Access", "pname": "hide-universal-access", "description": "Hide Universal Access icon from the status bar", "link": "https://extensions.gnome.org/extension/2398/hide-universal-access/", "shell_version_map": {"38": {"version": "11", "sha256": "1fxkn512cb24gv4gp5bih9mzjh5y4w7f5jml8hr5x6q1a42zakab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FraWlydWkvaGlkZS11bml2ZXJzYWwtYWNjZXNzIiwKICAidXVpZCI6ICJoaWRlLXVuaXZlcnNhbC1hY2Nlc3NAYWtpaXJ1aS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "1fxkn512cb24gv4gp5bih9mzjh5y4w7f5jml8hr5x6q1a42zakab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FraWlydWkvaGlkZS11bml2ZXJzYWwtYWNjZXNzIiwKICAidXVpZCI6ICJoaWRlLXVuaXZlcnNhbC1hY2Nlc3NAYWtpaXJ1aS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "1fxkn512cb24gv4gp5bih9mzjh5y4w7f5jml8hr5x6q1a42zakab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FraWlydWkvaGlkZS11bml2ZXJzYWwtYWNjZXNzIiwKICAidXVpZCI6ICJoaWRlLXVuaXZlcnNhbC1hY2Nlc3NAYWtpaXJ1aS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "1fxkn512cb24gv4gp5bih9mzjh5y4w7f5jml8hr5x6q1a42zakab", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyBpY29uIGZyb20gdGhlIHN0YXR1cyBiYXIiLAogICJuYW1lIjogIkhpZGUgVW5pdmVyc2FsIEFjY2VzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FraWlydWkvaGlkZS11bml2ZXJzYWwtYWNjZXNzIiwKICAidXVpZCI6ICJoaWRlLXVuaXZlcnNhbC1hY2Nlc3NAYWtpaXJ1aS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "roundrobintaborder@scottworley.com", "name": "Round Robin Tab Order", "pname": "round-robin-tab-order", "description": "Window switch order becomes round-robin instead of most-recently-used", "link": "https://extensions.gnome.org/extension/2446/round-robin-tab-order/", "shell_version_map": {"40": {"version": "3", "sha256": "0p2qfv6i43pi0hjsyz8xzxkxijr06b0d20q618y8gfj4ar82glv7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldpbmRvdyBzd2l0Y2ggb3JkZXIgYmVjb21lcyByb3VuZC1yb2JpbiBpbnN0ZWFkIG9mIG1vc3QtcmVjZW50bHktdXNlZCIsCiAgIm5hbWUiOiAiUm91bmQgUm9iaW4gVGFiIE9yZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMyIiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuZ25vbWUub3JnL2NodWNrL3JvdW5kLXJvYmluLXRhYi1vcmRlciIsCiAgInV1aWQiOiAicm91bmRyb2JpbnRhYm9yZGVyQHNjb3R0d29ybGV5LmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} @@ -270,12 +270,12 @@ , {"uuid": "reminder_alarm_clock@trifonovkv.gmail.com", "name": "Reminder Alarm Clock", "pname": "reminder-alarm-clock", "description": "The reminder alarm clock will remind you of an important event at the appointed time.", "link": "https://extensions.gnome.org/extension/2482/reminder-alarm-clock/", "shell_version_map": {"38": {"version": "40", "sha256": "0yljdig44gly3fky4ls42shbpvf2387kgnn1dfla9zmxxzjdkryq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4LjEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90cmlmb25vdmt2L1JlbWluZGVyQWxhcm1DbG9jayIsCiAgInV1aWQiOiAicmVtaW5kZXJfYWxhcm1fY2xvY2tAdHJpZm9ub3Zrdi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNDAKfQ=="}, "40": {"version": "42", "sha256": "05l8rss6nxcdv983iz5pxbqmkmhqwz7c24d7i7w4x40xz6lcn67z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJpZm9ub3Zrdi9SZW1pbmRlckFsYXJtQ2xvY2siLAogICJ1dWlkIjogInJlbWluZGVyX2FsYXJtX2Nsb2NrQHRyaWZvbm92a3YuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "41": {"version": "42", "sha256": "05l8rss6nxcdv983iz5pxbqmkmhqwz7c24d7i7w4x40xz6lcn67z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJpZm9ub3Zrdi9SZW1pbmRlckFsYXJtQ2xvY2siLAogICJ1dWlkIjogInJlbWluZGVyX2FsYXJtX2Nsb2NrQHRyaWZvbm92a3YuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}, "42": {"version": "42", "sha256": "05l8rss6nxcdv983iz5pxbqmkmhqwz7c24d7i7w4x40xz6lcn67z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSByZW1pbmRlciBhbGFybSBjbG9jayB3aWxsIHJlbWluZCB5b3Ugb2YgYW4gaW1wb3J0YW50IGV2ZW50IGF0IHRoZSBhcHBvaW50ZWQgdGltZS4iLAogICJuYW1lIjogIlJlbWluZGVyIEFsYXJtIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHJpZm9ub3Zrdi9SZW1pbmRlckFsYXJtQ2xvY2siLAogICJ1dWlkIjogInJlbWluZGVyX2FsYXJtX2Nsb2NrQHRyaWZvbm92a3YuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDQyCn0="}}} , {"uuid": "TaskBar@c0ldplasma", "name": "TaskBar 2020", "pname": "taskbar-updated", "description": "!!! Development stopped !!!! Look at Dash to Panel as an alternative: https://extensions.gnome.org/extension/1160/dash-to-panel/\n\n----------------------------------------------------------------------\n\nTaskBar 2020 displays icons of running applications and favorites on the top panel or alternatively on a new bottom panel. Activate, minimize or close tasks with a simple click. \n\nTaskBar 2020 is a dock-like windows list on the top/bottom bar. \n\nFork of zpydr/gnome-shell-extension-taskbar to support newer versions of GNOME", "link": "https://extensions.gnome.org/extension/2506/taskbar-updated/", "shell_version_map": {"38": {"version": "5", "sha256": "09yn1p0vmq70ll7vi3jdjvj479cm38r4am0mw08nca8hl4zdiamj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiEhISBEZXZlbG9wbWVudCBzdG9wcGVkICEhISEgIExvb2sgYXQgRGFzaCB0byBQYW5lbCBhcyBhbiBhbHRlcm5hdGl2ZTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cblRhc2tCYXIgMjAyMCBkaXNwbGF5cyBpY29ucyBvZiBydW5uaW5nIGFwcGxpY2F0aW9ucyBhbmQgZmF2b3JpdGVzIG9uIHRoZSB0b3AgcGFuZWwgb3IgYWx0ZXJuYXRpdmVseSBvbiBhIG5ldyBib3R0b20gcGFuZWwuIEFjdGl2YXRlLCBtaW5pbWl6ZSBvciBjbG9zZSB0YXNrcyB3aXRoIGEgc2ltcGxlIGNsaWNrLiBcblxuVGFza0JhciAyMDIwIGlzIGEgZG9jay1saWtlIHdpbmRvd3MgbGlzdCBvbiB0aGUgdG9wL2JvdHRvbSBiYXIuIFxuXG5Gb3JrIG9mIHpweWRyL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrYmFyIHRvIHN1cHBvcnQgbmV3ZXIgdmVyc2lvbnMgb2YgR05PTUUiLAogICJuYW1lIjogIlRhc2tCYXIgMjAyMCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2MwbGRwbGFzbWEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXRhc2tiYXIiLAogICJ1dWlkIjogIlRhc2tCYXJAYzBsZHBsYXNtYSIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "8", "sha256": "0a2fwmm1n5n2ifryb6yfzh4nj4h11qkphpxvp876fyll03y9p2m5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiEhISBEZXZlbG9wbWVudCBzdG9wcGVkICEhISEgIExvb2sgYXQgRGFzaCB0byBQYW5lbCBhcyBhbiBhbHRlcm5hdGl2ZTogaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMTE2MC9kYXNoLXRvLXBhbmVsL1xuXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5cblRhc2tCYXIgMjAyMCBkaXNwbGF5cyBpY29ucyBvZiBydW5uaW5nIGFwcGxpY2F0aW9ucyBhbmQgZmF2b3JpdGVzIG9uIHRoZSB0b3AgcGFuZWwgb3IgYWx0ZXJuYXRpdmVseSBvbiBhIG5ldyBib3R0b20gcGFuZWwuIEFjdGl2YXRlLCBtaW5pbWl6ZSBvciBjbG9zZSB0YXNrcyB3aXRoIGEgc2ltcGxlIGNsaWNrLiBcblxuVGFza0JhciAyMDIwIGlzIGEgZG9jay1saWtlIHdpbmRvd3MgbGlzdCBvbiB0aGUgdG9wL2JvdHRvbSBiYXIuIFxuXG5Gb3JrIG9mIHpweWRyL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrYmFyIHRvIHN1cHBvcnQgbmV3ZXIgdmVyc2lvbnMgb2YgR05PTUUiLAogICJuYW1lIjogIlRhc2tCYXIgMjAyMCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jMGxkcGxhc21hL2dub21lLXNoZWxsLWV4dGVuc2lvbi10YXNrYmFyIiwKICAidXVpZCI6ICJUYXNrQmFyQGMwbGRwbGFzbWEiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "kernel-indicator@elboulangero.gitlab.com", "name": "Kernel Indicator", "pname": "kernel-indicator", "description": "Display the kernel version in the top bar", "link": "https://extensions.gnome.org/extension/2512/kernel-indicator/", "shell_version_map": {"40": {"version": "5", "sha256": "11zfmsl5wnvz0lmv5vkfsyd14x3yfiaii70wzxjdwilgxazbhvl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZWxib3VsYW5nZXJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1rZXJuZWwtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJrZXJuZWwtaW5kaWNhdG9yQGVsYm91bGFuZ2Vyby5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "11zfmsl5wnvz0lmv5vkfsyd14x3yfiaii70wzxjdwilgxazbhvl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZWxib3VsYW5nZXJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1rZXJuZWwtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJrZXJuZWwtaW5kaWNhdG9yQGVsYm91bGFuZ2Vyby5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "11zfmsl5wnvz0lmv5vkfsyd14x3yfiaii70wzxjdwilgxazbhvl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgdGhlIGtlcm5lbCB2ZXJzaW9uIGluIHRoZSB0b3AgYmFyIiwKICAibmFtZSI6ICJLZXJuZWwgSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZWxib3VsYW5nZXJvL2dub21lLXNoZWxsLWV4dGVuc2lvbi1rZXJuZWwtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJrZXJuZWwtaW5kaWNhdG9yQGVsYm91bGFuZ2Vyby5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} -, {"uuid": "floatingDock@sun.wxg@gmail.com", "name": "Floating Dock", "pname": "floating-dock", "description": "Move dock anywhere on the desktop\n\nPress Ctrl+Alt+k to vi mode\nPress lowercase alphabet, open new window or active the window\nPress uppercase alphabet, force to open new window\n\nPoint on the main button, change workspace by mouse scroll\nRight click the main button, show some selections", "link": "https://extensions.gnome.org/extension/2542/floating-dock/", "shell_version_map": {"38": {"version": "12", "sha256": "1844hhr0z4wd0wvh29q0sxh6xmwq7chg3kr3sa3c46q8n97i78x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmdEb2NrIiwKICAidXVpZCI6ICJmbG9hdGluZ0RvY2tAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "21", "sha256": "0qj1vqd44clpr72j5lccvva48kzaz76zd48k6nxzvnkgh2n5dh29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nRG9jayIsCiAgInV1aWQiOiAiZmxvYXRpbmdEb2NrQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}, "41": {"version": "23", "sha256": "0ag8pq9sgk885912mqiyhsacfmgkn9n4jvyp0rk4nw0fghd1mgd9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nRG9jayIsCiAgInV1aWQiOiAiZmxvYXRpbmdEb2NrQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "30", "sha256": "07bi19lnzfd1nrkdy19d36pbrf24yl5wkxirq7vdbvwng02l7rhj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nRG9jayIsCiAgInV1aWQiOiAiZmxvYXRpbmdEb2NrQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMwCn0="}}} +, {"uuid": "floatingDock@sun.wxg@gmail.com", "name": "Floating Dock", "pname": "floating-dock", "description": "Move dock anywhere on the desktop\n\nPress Ctrl+Alt+k to vi mode\nPress lowercase alphabet, open new window or active the window\nPress uppercase alphabet, force to open new window\n\nPoint on the main button, change workspace by mouse scroll\nRight click the main button, show some selections", "link": "https://extensions.gnome.org/extension/2542/floating-dock/", "shell_version_map": {"38": {"version": "12", "sha256": "1844hhr0z4wd0wvh29q0sxh6xmwq7chg3kr3sa3c46q8n97i78x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3N1bnd4Zy9nbm9tZS1zaGVsbC1leHRlbnNpb24tZmxvYXRpbmdEb2NrIiwKICAidXVpZCI6ICJmbG9hdGluZ0RvY2tAc3VuLnd4Z0BnbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTIKfQ=="}, "40": {"version": "21", "sha256": "0qj1vqd44clpr72j5lccvva48kzaz76zd48k6nxzvnkgh2n5dh29", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nRG9jayIsCiAgInV1aWQiOiAiZmxvYXRpbmdEb2NrQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIxCn0="}, "41": {"version": "23", "sha256": "0ag8pq9sgk885912mqiyhsacfmgkn9n4jvyp0rk4nw0fghd1mgd9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nRG9jayIsCiAgInV1aWQiOiAiZmxvYXRpbmdEb2NrQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "31", "sha256": "1a5rzc5wrf0mddq7n081r5vihgny1m9skkfwg354x1xz3lxcqryy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgZG9jayBhbnl3aGVyZSBvbiB0aGUgZGVza3RvcFxuXG5QcmVzcyBDdHJsK0FsdCtrIHRvIHZpIG1vZGVcblByZXNzIGxvd2VyY2FzZSBhbHBoYWJldCwgb3BlbiBuZXcgd2luZG93IG9yIGFjdGl2ZSB0aGUgd2luZG93XG5QcmVzcyB1cHBlcmNhc2UgYWxwaGFiZXQsIGZvcmNlIHRvIG9wZW4gbmV3IHdpbmRvd1xuXG5Qb2ludCBvbiB0aGUgbWFpbiBidXR0b24sIGNoYW5nZSB3b3Jrc3BhY2UgYnkgbW91c2Ugc2Nyb2xsXG5SaWdodCBjbGljayB0aGUgbWFpbiBidXR0b24sIHNob3cgc29tZSBzZWxlY3Rpb25zIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJzdW4ud3hnQGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdW53eGcvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWZsb2F0aW5nRG9jayIsCiAgInV1aWQiOiAiZmxvYXRpbmdEb2NrQHN1bi53eGdAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMxCn0="}}} , {"uuid": "maxi@darkretailer.github.com", "name": "Maxi", "pname": "maxi", "description": "Maximize your windows vertical and/or horizontal (based on https://github.com/aXe1/gnome-shell-extension-maximized-by-default)", "link": "https://extensions.gnome.org/extension/2554/maxi/", "shell_version_map": {"40": {"version": "5", "sha256": "121nd6ggr9id3yfsrkiza7rjq19638p156ym83i3j57ikz6r3ky5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1heGltaXplIHlvdXIgd2luZG93cyB2ZXJ0aWNhbCBhbmQvb3IgaG9yaXpvbnRhbCAoYmFzZWQgb24gaHR0cHM6Ly9naXRodWIuY29tL2FYZTEvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplZC1ieS1kZWZhdWx0KSIsCiAgImV4dGVuc2lvbi1pZCI6ICJtYXhpIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucyIsCiAgIm5hbWUiOiAiTWF4aSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhcmtyZXRhaWxlci9nbm9tZS1zaGVsbC1leHRlbnNpb25fbWF4aSIsCiAgInV1aWQiOiAibWF4aUBkYXJrcmV0YWlsZXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "gnordvpn-local@isopolito", "name": "gNordVPN-Local", "pname": "gnordvpn-local", "description": "A Gnome extension that shows the NordVPN status in the top bar and provides the ability to configure certain aspects of the connection.", "link": "https://extensions.gnome.org/extension/2569/gnordvpn-local/", "shell_version_map": {"38": {"version": "10", "sha256": "0xpw8n29y5j8vfb1fkxn8ph78m4bhi1k8q830g1zzpr3gmsabadi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzguMSIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiMy4zOC40IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vSXNvcG9saXRvL2dOb3JkVlBOLUxvY2FsIiwKICAidXVpZCI6ICJnbm9yZHZwbi1sb2NhbEBpc29wb2xpdG8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "11", "sha256": "1l5g5g279agfa1b3v02z1lhb1yhgaaxan5vwkksc0ck2cm7pi9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "1l5g5g279agfa1b3v02z1lhb1yhgaaxan5vwkksc0ck2cm7pi9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "1l5g5g279agfa1b3v02z1lhb1yhgaaxan5vwkksc0ck2cm7pi9mq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgZXh0ZW5zaW9uIHRoYXQgc2hvd3MgdGhlIE5vcmRWUE4gc3RhdHVzIGluIHRoZSB0b3AgYmFyIGFuZCBwcm92aWRlcyB0aGUgYWJpbGl0eSB0byBjb25maWd1cmUgY2VydGFpbiBhc3BlY3RzIG9mIHRoZSBjb25uZWN0aW9uLiIsCiAgIm5hbWUiOiAiZ05vcmRWUE4tTG9jYWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9Jc29wb2xpdG8vZ05vcmRWUE4tTG9jYWwiLAogICJ1dWlkIjogImdub3JkdnBuLWxvY2FsQGlzb3BvbGl0byIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "fully-transparent-top-bar@aunetx", "name": "Smart transparent topbar", "pname": "fully-transparent-top-bar", "description": "Permits to change topbar's look and feel when free-floating.\n\nIf you have issues or recommandations, you can tell me on github so I can see them!", "link": "https://extensions.gnome.org/extension/2588/fully-transparent-top-bar/", "shell_version_map": {"38": {"version": "11", "sha256": "1mksqaxw7jzzdghzii1bhhkbsccxb23qa69f3x6hg32ig9qi762x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlBlcm1pdHMgdG8gY2hhbmdlIHRvcGJhcidzIGxvb2sgYW5kIGZlZWwgd2hlbiBmcmVlLWZsb2F0aW5nLlxuXG5JZiB5b3UgaGF2ZSBpc3N1ZXMgb3IgcmVjb21tYW5kYXRpb25zLCB5b3UgY2FuIHRlbGwgbWUgb24gZ2l0aHViIHNvIEkgY2FuIHNlZSB0aGVtISIsCiAgIm5hbWUiOiAiU21hcnQgdHJhbnNwYXJlbnQgdG9wYmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L2dub21lLXNoZWxsLWV4dGVuc2lvbi10cmFuc3BhcmVudC10b3AtYmFyIiwKICAidXVpZCI6ICJmdWxseS10cmFuc3BhcmVudC10b3AtYmFyQGF1bmV0eCIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "always-indicator@martin.zurowietz.de", "name": "Always Indicator", "pname": "always-indicator", "description": "Always show the new messages indicator on new messages. Features: 1) New message indicator is always shown if there are notifications. 2) The color of the indicator can be customized. 3) If 'do not disturb' is active, the icon is displayed in the custom color if there are notifications.", "link": "https://extensions.gnome.org/extension/2594/always-indicator/", "shell_version_map": {"40": {"version": "8", "sha256": "006pxfxpvw41fjbqpyyifr9r7fai5ghvfgb0wmdl8xm9ix1sh4j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "006pxfxpvw41fjbqpyyifr9r7fai5ghvfgb0wmdl8xm9ix1sh4j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "006pxfxpvw41fjbqpyyifr9r7fai5ghvfgb0wmdl8xm9ix1sh4j2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHRoZSBuZXcgbWVzc2FnZXMgaW5kaWNhdG9yIG9uIG5ldyBtZXNzYWdlcy4gRmVhdHVyZXM6IDEpIE5ldyBtZXNzYWdlIGluZGljYXRvciBpcyBhbHdheXMgc2hvd24gaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIDIpIFRoZSBjb2xvciBvZiB0aGUgaW5kaWNhdG9yIGNhbiBiZSBjdXN0b21pemVkLiAzKSBJZiAnZG8gbm90IGRpc3R1cmInIGlzIGFjdGl2ZSwgdGhlIGljb24gaXMgZGlzcGxheWVkIGluIHRoZSBjdXN0b20gY29sb3IgaWYgdGhlcmUgYXJlIG5vdGlmaWNhdGlvbnMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiYWx3YXlzLWluZGljYXRvciIsCiAgIm5hbWUiOiAiQWx3YXlzIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5hbHdheXMtaW5kaWNhdG9yLXNldHRpbmdzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXp1ci9nbm9tZS1zaGVsbC1hbHdheXMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJhbHdheXMtaW5kaWNhdG9yQG1hcnRpbi56dXJvd2lldHouZGUiLAogICJ2ZXJzaW9uIjogOAp9"}}} -, {"uuid": "eruption-profile-switcher@x3n0m0rph59.org", "name": "Eruption Profile Switcher", "pname": "eruption-profile-switcher", "description": "Runtime Profile switcher for the Eruption Realtime RGB LED Driver for Linux", "link": "https://extensions.gnome.org/extension/2621/eruption-profile-switcher/", "shell_version_map": {"38": {"version": "15", "sha256": "14zgczf2z7jv707whimggl3h31c44m1qdzncin38vdcdzhm2g7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9YM24wbTBycGg1OS9lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJlcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyQHgzbjBtMHJwaDU5Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "26", "sha256": "08crxqfn14digadyk8n2qm76kdc80m3hyhhb5gmshp02nk4l29c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "41": {"version": "26", "sha256": "08crxqfn14digadyk8n2qm76kdc80m3hyhhb5gmshp02nk4l29c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMjYKfQ=="}, "42": {"version": "26", "sha256": "08crxqfn14digadyk8n2qm76kdc80m3hyhhb5gmshp02nk4l29c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vWDNuMG0wcnBoNTkvZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZXJ1cHRpb24tcHJvZmlsZS1zd2l0Y2hlckB4M24wbTBycGg1OS5vcmciLAogICJ2ZXJzaW9uIjogMjYKfQ=="}}} +, {"uuid": "eruption-profile-switcher@x3n0m0rph59.org", "name": "Eruption Profile Switcher", "pname": "eruption-profile-switcher", "description": "Runtime Profile switcher for the Eruption Realtime RGB LED Driver for Linux", "link": "https://extensions.gnome.org/extension/2621/eruption-profile-switcher/", "shell_version_map": {"38": {"version": "15", "sha256": "14zgczf2z7jv707whimggl3h31c44m1qdzncin38vdcdzhm2g7hv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAuYmV0YSIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9YM24wbTBycGg1OS9lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJlcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyQHgzbjBtMHJwaDU5Lm9yZyIsCiAgInZlcnNpb24iOiAxNQp9"}, "40": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "41": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "27", "sha256": "1lcsf8611365d8pjk4s905jmj3sc8dq6y833fbv6yxbd36xvkghs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJ1bnRpbWUgUHJvZmlsZSBzd2l0Y2hlciBmb3IgdGhlIEVydXB0aW9uIFJlYWx0aW1lIFJHQiBMRUQgRHJpdmVyIGZvciBMaW51eCIsCiAgIm5hbWUiOiAiRXJ1cHRpb24gUHJvZmlsZSBTd2l0Y2hlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lcnVwdGlvbi1wcm9maWxlLXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC5iZXRhIiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIiwKICAgICI0MyIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1gzbjBtMHJwaDU5L2VydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXIiLAogICJ1dWlkIjogImVydXB0aW9uLXByb2ZpbGUtc3dpdGNoZXJAeDNuMG0wcnBoNTkub3JnIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} , {"uuid": "nbfcindicator@mgokcaykdev.gmail.com", "name": "Nbfc Indicator", "pname": "nbfc-indicator", "description": "Notebook Fan Control Indicator for Gnome Shell", "link": "https://extensions.gnome.org/extension/2624/nbfc-indicator/", "shell_version_map": {"40": {"version": "7", "sha256": "0hp7giwdcsk8p442q0x9214dv59ziyjswli6mccyb8v814k3p8ic", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGVib29rIEZhbiBDb250cm9sIEluZGljYXRvciBmb3IgR25vbWUgU2hlbGwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJuYmZjaW5kaWNhdG9yIiwKICAibmFtZSI6ICJOYmZjIEluZGljYXRvciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uYmZjaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01Hb2tjYXlLL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtbmJmY2luZGljYXRvciIsCiAgInV1aWQiOiAibmJmY2luZGljYXRvckBtZ29rY2F5a2Rldi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "user-id-in-top-panel@fthx", "name": "User id in top panel", "pname": "user-id-in-top-panel", "description": "Add ( user name :: user id @ host ) in top panel.", "link": "https://extensions.gnome.org/extension/2633/user-id-in-top-panel/", "shell_version_map": {"38": {"version": "6", "sha256": "16s1782mzb5ckshsy86ac9xj5xfk15hwzvzk4cfiimphfvkkw8x4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "7", "sha256": "1c6izbm9aygjh72nqiz8gn7z28kb18md6lkjisskagidxc0bjwn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "1c6izbm9aygjh72nqiz8gn7z28kb18md6lkjisskagidxc0bjwn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "1c6izbm9aygjh72nqiz8gn7z28kb18md6lkjisskagidxc0bjwn7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCAoIHVzZXIgbmFtZSA6OiB1c2VyIGlkIEAgaG9zdCApIGluIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIlVzZXIgaWQgaW4gdG9wIHBhbmVsIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJmdGh4IgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ1c2VyLWlkLWluLXRvcC1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "hide-minimized@danigm.net", "name": "Hide minimized", "pname": "hide-minimized", "description": "Hide minimized in overview", "link": "https://extensions.gnome.org/extension/2639/hide-minimized/", "shell_version_map": {"38": {"version": "6", "sha256": "02nm3nxz3adx6zs6qblmmkwnh01bxfv2zzka2imw36s09agc5g2s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "40": {"version": "6", "sha256": "02nm3nxz3adx6zs6qblmmkwnh01bxfv2zzka2imw36s09agc5g2s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "02nm3nxz3adx6zs6qblmmkwnh01bxfv2zzka2imw36s09agc5g2s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "02nm3nxz3adx6zs6qblmmkwnh01bxfv2zzka2imw36s09agc5g2s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgbWluaW1pemVkIGluIG92ZXJ2aWV3IiwKICAibmFtZSI6ICJIaWRlIG1pbmltaXplZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RhbmlnbS9oaWRlLW1pbmltaXplZCIsCiAgInV1aWQiOiAiaGlkZS1taW5pbWl6ZWRAZGFuaWdtLm5ldCIsCiAgInZlcnNpb24iOiA2Cn0="}}} @@ -320,7 +320,7 @@ , {"uuid": "user-theme-x@tuberry.github.io", "name": "User Themes X", "pname": "user-themes-x", "description": "Customizable user-theme with user stylesheet and dark theme auto-switch support\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3019/user-themes-x/", "shell_version_map": {"38": {"version": "21", "sha256": "08992jny17mbw3gvlfwzgis1ld3wfkkd5fwdyq2c4s6l412fr0mz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogInVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvdXNlci10aGVtZS14IiwKICAidXVpZCI6ICJ1c2VyLXRoZW1lLXhAdHViZXJyeS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "40": {"version": "24", "sha256": "12scyi48nfbrl2bvhq4rwdcj7vyvpdc86sa8iw1fg3y0cw6vlvq6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogInVzZXItdGhlbWUteCIsCiAgIm5hbWUiOiAiVXNlciBUaGVtZXMgWCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiam9obi5zdG93ZXJzQGdtYWlsLmNvbSIKICBdLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlci10aGVtZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3VzZXItdGhlbWUteCIsCiAgInV1aWQiOiAidXNlci10aGVtZS14QHR1YmVycnkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "25", "sha256": "101y4msarf1dglh0g4wybz4dx8zsz2yg8ny2q5rz3xy1cjj8ac5a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11c2VyLXRoZW1lLXgiLAogICJuYW1lIjogIlVzZXIgVGhlbWVzIFgiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS91c2VyLXRoZW1lLXgiLAogICJ1dWlkIjogInVzZXItdGhlbWUteEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyNQp9"}, "42": {"version": "28", "sha256": "0bszimlk03j49v9f8ab6kv3chg8p29zg6ms3l1nvicdifxyp534g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkN1c3RvbWl6YWJsZSB1c2VyLXRoZW1lIHdpdGggdXNlciBzdHlsZXNoZWV0IGFuZCBkYXJrIHRoZW1lIGF1dG8tc3dpdGNoIHN1cHBvcnRcblxuRm9yIHN1cHBvcnQsIHBsZWFzZSByZXBvcnQgYW55IGlzc3VlcyB2aWEgdGhlIGhvbWVwYWdlIGxpbmsgYmVsb3cuIiwKICAiZXh0ZW5zaW9uLWlkIjogInVzZXItdGhlbWUteCIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11c2VyLXRoZW1lLXgiLAogICJuYW1lIjogIlVzZXIgVGhlbWVzIFgiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImpvaG4uc3Rvd2Vyc0BnbWFpbC5jb20iCiAgXSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnVzZXItdGhlbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS91c2VyLXRoZW1lLXgiLAogICJ1dWlkIjogInVzZXItdGhlbWUteEB0dWJlcnJ5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyOAp9"}}} , {"uuid": "app_view_text@fawtytoo", "name": "Application View Text", "pname": "application-view-text", "description": "The text in the Application view can be hard to read on a light coloured background. This extension makes the text bolder with a drop shadow.\nAlso improves the visibility of the app running dot.", "link": "https://extensions.gnome.org/extension/3028/application-view-text/", "shell_version_map": {"38": {"version": "7", "sha256": "1dnf1rqg27y1c50sfmqcnswac93lkgml1hdaalq6lfzm8pbnpx0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB0ZXh0IGluIHRoZSBBcHBsaWNhdGlvbiB2aWV3IGNhbiBiZSBoYXJkIHRvIHJlYWQgb24gYSBsaWdodCBjb2xvdXJlZCBiYWNrZ3JvdW5kLiBUaGlzIGV4dGVuc2lvbiBtYWtlcyB0aGUgdGV4dCBib2xkZXIgd2l0aCBhIGRyb3Agc2hhZG93LlxuQWxzbyBpbXByb3ZlcyB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgYXBwIHJ1bm5pbmcgZG90LiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb24gVmlldyBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwX3ZpZXdfdGV4dEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1dnf1rqg27y1c50sfmqcnswac93lkgml1hdaalq6lfzm8pbnpx0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB0ZXh0IGluIHRoZSBBcHBsaWNhdGlvbiB2aWV3IGNhbiBiZSBoYXJkIHRvIHJlYWQgb24gYSBsaWdodCBjb2xvdXJlZCBiYWNrZ3JvdW5kLiBUaGlzIGV4dGVuc2lvbiBtYWtlcyB0aGUgdGV4dCBib2xkZXIgd2l0aCBhIGRyb3Agc2hhZG93LlxuQWxzbyBpbXByb3ZlcyB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgYXBwIHJ1bm5pbmcgZG90LiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb24gVmlldyBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwX3ZpZXdfdGV4dEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1dnf1rqg27y1c50sfmqcnswac93lkgml1hdaalq6lfzm8pbnpx0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoZSB0ZXh0IGluIHRoZSBBcHBsaWNhdGlvbiB2aWV3IGNhbiBiZSBoYXJkIHRvIHJlYWQgb24gYSBsaWdodCBjb2xvdXJlZCBiYWNrZ3JvdW5kLiBUaGlzIGV4dGVuc2lvbiBtYWtlcyB0aGUgdGV4dCBib2xkZXIgd2l0aCBhIGRyb3Agc2hhZG93LlxuQWxzbyBpbXByb3ZlcyB0aGUgdmlzaWJpbGl0eSBvZiB0aGUgYXBwIHJ1bm5pbmcgZG90LiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb24gVmlldyBUZXh0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYXBwX3ZpZXdfdGV4dEBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "vpn-snx-indicator@als.kz", "name": "VPN and SNX Indicator", "pname": "vpn-and-snx-indicator", "description": "A status indicator for a VPN and SNX(Check Point) connection.", "link": "https://extensions.gnome.org/extension/3049/vpn-and-snx-indicator/", "shell_version_map": {"38": {"version": "8", "sha256": "1mns39frrabpfdvmc7jcqxrlxs1mnjimdwa69hv5lawf0r498h9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgYSBWUE4gYW5kIFNOWChDaGVjayBQb2ludCkgY29ubmVjdGlvbi4iLAogICJuYW1lIjogIlZQTiBhbmQgU05YIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L3Zwbi1pbmRpY2F0b3Itc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ2cG4tc254LWluZGljYXRvckBhbHMua3oiLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "1mns39frrabpfdvmc7jcqxrlxs1mnjimdwa69hv5lawf0r498h9g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc3RhdHVzIGluZGljYXRvciBmb3IgYSBWUE4gYW5kIFNOWChDaGVjayBQb2ludCkgY29ubmVjdGlvbi4iLAogICJuYW1lIjogIlZQTiBhbmQgU05YIEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNi4wIiwKICAgICIzLjM4IiwKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxleGV5bG92Y2hpa292L3Zwbi1pbmRpY2F0b3Itc2hlbGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ2cG4tc254LWluZGljYXRvckBhbHMua3oiLAogICJ2ZXJzaW9uIjogOAp9"}}} -, {"uuid": "vlan-switcher@darcato.github.io", "name": "VLAN Switcher", "pname": "vlan-switcher", "description": "Activate and deactivate VLAN connections from the system panel.", "link": "https://extensions.gnome.org/extension/3061/vlan-switcher/", "shell_version_map": {"38": {"version": "3", "sha256": "1a9xz9s165nny9zc6ldlh0ij93q1mryy8v2hp3ja399jk4w9wp3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFyY2F0by9nbm9tZS12bGFuLXN3aXRjaGVyIiwKICAidXVpZCI6ICJ2bGFuLXN3aXRjaGVyQGRhcmNhdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "1a9xz9s165nny9zc6ldlh0ij93q1mryy8v2hp3ja399jk4w9wp3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFyY2F0by9nbm9tZS12bGFuLXN3aXRjaGVyIiwKICAidXVpZCI6ICJ2bGFuLXN3aXRjaGVyQGRhcmNhdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1a9xz9s165nny9zc6ldlh0ij93q1mryy8v2hp3ja399jk4w9wp3w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFyY2F0by9nbm9tZS12bGFuLXN3aXRjaGVyIiwKICAidXVpZCI6ICJ2bGFuLXN3aXRjaGVyQGRhcmNhdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "vlan-switcher@darcato.github.io", "name": "VLAN Switcher", "pname": "vlan-switcher", "description": "Activate and deactivate VLAN connections from the system panel.", "link": "https://extensions.gnome.org/extension/3061/vlan-switcher/", "shell_version_map": {"38": {"version": "4", "sha256": "03axq6rikn71d02qjwkb12igxv05y742i7dva3b8n87mjdzr5qc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFyY2F0by9nbm9tZS12bGFuLXN3aXRjaGVyIiwKICAidXVpZCI6ICJ2bGFuLXN3aXRjaGVyQGRhcmNhdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "03axq6rikn71d02qjwkb12igxv05y742i7dva3b8n87mjdzr5qc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFyY2F0by9nbm9tZS12bGFuLXN3aXRjaGVyIiwKICAidXVpZCI6ICJ2bGFuLXN3aXRjaGVyQGRhcmNhdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "03axq6rikn71d02qjwkb12igxv05y742i7dva3b8n87mjdzr5qc2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFjdGl2YXRlIGFuZCBkZWFjdGl2YXRlIFZMQU4gY29ubmVjdGlvbnMgZnJvbSB0aGUgc3lzdGVtIHBhbmVsLiIsCiAgIm5hbWUiOiAiVkxBTiBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZGFyY2F0by9nbm9tZS12bGFuLXN3aXRjaGVyIiwKICAidXVpZCI6ICJ2bGFuLXN3aXRjaGVyQGRhcmNhdG8uZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "ssss@tu.berry", "name": "Simple Subscriber", "pname": "ss-subscriber", "description": "Simple shadowsocks subscriber (SSD only), yet another proxy switcher for GNOME Shell\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3073/ss-subscriber/", "shell_version_map": {"38": {"version": "18", "sha256": "03gryl577559h2l1s3adi5gxa8ivp454p4lq7jng1db6smlpj95a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcy1zdWJzY3JpYmVyIiwKICAibmFtZSI6ICJTaW1wbGUgU3Vic2NyaWJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcy1zdWJzY3JpYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9zcy1zdWJzY3JpYmVyIiwKICAidXVpZCI6ICJzc3NzQHR1LmJlcnJ5IiwKICAidmVyc2lvbiI6IDE4Cn0="}, "40": {"version": "20", "sha256": "075d00xsbmr4qs554p2anddhkmgcx7xd4nn8prgmf4wpyfk87552", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzcy1zdWJzY3JpYmVyIiwKICAibmFtZSI6ICJTaW1wbGUgU3Vic2NyaWJlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zcy1zdWJzY3JpYmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc3Mtc3Vic2NyaWJlciIsCiAgInV1aWQiOiAic3Nzc0B0dS5iZXJyeSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "21", "sha256": "06ybzk62fbi88iqssl4pw0amsbcp09pnw99wxanh2jlvaakqgday", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjEKfQ=="}, "42": {"version": "23", "sha256": "078111h68zv03n6i4yw9jgdn9idxb91qpami64xl5g1rc75sc91w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBzaGFkb3dzb2NrcyBzdWJzY3JpYmVyIChTU0Qgb25seSksIHlldCBhbm90aGVyIHByb3h5IHN3aXRjaGVyIGZvciBHTk9NRSBTaGVsbFxuXG5Gb3Igc3VwcG9ydCwgcGxlYXNlIHJlcG9ydCBhbnkgaXNzdWVzIHZpYSB0aGUgaG9tZXBhZ2UgbGluayBiZWxvdy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1zaGVsbC1leHRlbnNpb24tc3Mtc3Vic2NyaWJlciIsCiAgIm5hbWUiOiAiU2ltcGxlIFN1YnNjcmliZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3Mtc3Vic2NyaWJlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NzLXN1YnNjcmliZXIiLAogICJ1dWlkIjogInNzc3NAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjMKfQ=="}}} , {"uuid": "extension-list@tu.berry", "name": "Extension List", "pname": "extension-list", "description": "Simple GNOME Shell extension manager in the top panel\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3088/extension-list/", "shell_version_map": {"38": {"version": "25", "sha256": "0cwabswbb5p0z156488ag095h558hf541650vfnjgw4nas7v2ccx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVuc2lvbi1saXN0IiwKICAibmFtZSI6ICJFeHRlbnNpb24gTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRlbnNpb24tbGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvZXh0ZW5zaW9uLWxpc3QiLAogICJ1dWlkIjogImV4dGVuc2lvbi1saXN0QHR1LmJlcnJ5IiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "27", "sha256": "0m13qzzbbx5rnq8a9xn09nvr3dy9zqkp8y9529y12250wyjafl1p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImV4dGVuc2lvbi1saXN0IiwKICAibmFtZSI6ICJFeHRlbnNpb24gTGlzdCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHRlbnNpb24tbGlzdCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2V4dGVuc2lvbi1saXN0IiwKICAidXVpZCI6ICJleHRlbnNpb24tbGlzdEB0dS5iZXJyeSIsCiAgInZlcnNpb24iOiAyNwp9"}, "41": {"version": "29", "sha256": "1yl2b9phvrgsdpkwqjfqpaqi2xcj5bcd4zabqkrfwngqsg17s85j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMjkKfQ=="}, "42": {"version": "30", "sha256": "1hnidb1f6cawfhmkql4y8kz3rq0ibqcfk678yz1n12l2gp3vvvz3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBTaGVsbCBleHRlbnNpb24gbWFuYWdlciBpbiB0aGUgdG9wIHBhbmVsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1leHRlbnNpb24tbGlzdCIsCiAgIm5hbWUiOiAiRXh0ZW5zaW9uIExpc3QiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZXh0ZW5zaW9uLWxpc3QiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9leHRlbnNpb24tbGlzdCIsCiAgInV1aWQiOiAiZXh0ZW5zaW9uLWxpc3RAdHUuYmVycnkiLAogICJ2ZXJzaW9uIjogMzAKfQ=="}}} , {"uuid": "MaximizeToEmptyWorkspace-extension@kaisersite.de", "name": "Maximize To Empty Workspace", "pname": "maximize-to-empty-workspace", "description": "New and maximized windows will be moved to empty workspaces.\nSupports multiple monitors.", "link": "https://extensions.gnome.org/extension/3100/maximize-to-empty-workspace/", "shell_version_map": {"38": {"version": "11", "sha256": "1cbbdgbgnara45152byr5yx52cbsfd48dpkick93ih2plk1gbm3l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWlzZXJhY20vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrYWlzZXJzaXRlLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "40": {"version": "11", "sha256": "1cbbdgbgnara45152byr5yx52cbsfd48dpkick93ih2plk1gbm3l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWlzZXJhY20vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrYWlzZXJzaXRlLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "1cbbdgbgnara45152byr5yx52cbsfd48dpkick93ih2plk1gbm3l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWlzZXJhY20vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrYWlzZXJzaXRlLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "1cbbdgbgnara45152byr5yx52cbsfd48dpkick93ih2plk1gbm3l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldyBhbmQgbWF4aW1pemVkIHdpbmRvd3Mgd2lsbCBiZSBtb3ZlZCB0byBlbXB0eSB3b3Jrc3BhY2VzLlxuU3VwcG9ydHMgbXVsdGlwbGUgbW9uaXRvcnMuIiwKICAibmFtZSI6ICJNYXhpbWl6ZSBUbyBFbXB0eSBXb3Jrc3BhY2UiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWlzZXJhY20vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLW1heGltaXplLXRvLWVtcHR5LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiTWF4aW1pemVUb0VtcHR5V29ya3NwYWNlLWV4dGVuc2lvbkBrYWlzZXJzaXRlLmRlIiwKICAidmVyc2lvbiI6IDExCn0="}}} @@ -340,7 +340,7 @@ , {"uuid": "touchpad_window_switcher@gonza.com", "name": "Touchpad Window Switcher", "pname": "tocuhpad-window-switcher", "description": "3 fingers window switcher. To make it work on Xorg check the service on github.\n\nUp - down: toggle between overview and show desktop (Needs Super+D shorcut to be set on Xorg. Set it with `gsettings set org.gnome.desktop.wm.keybindings show-desktop 'd'`).\n\nYou can also change windows by going to the overview (up) and moving to the left and right, and choosing the window with down. The overview is modified so it’s shown in chronological order.\n", "link": "https://extensions.gnome.org/extension/3294/tocuhpad-window-switcher/", "shell_version_map": {"38": {"version": "8", "sha256": "1x016p30z0pci3qlhpmfqrsgy0vwcfxqladny66ppbb32qisbkac", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIjMgZmluZ2VycyB3aW5kb3cgc3dpdGNoZXIuIFRvIG1ha2UgaXQgd29yayBvbiBYb3JnIGNoZWNrIHRoZSBzZXJ2aWNlIG9uIGdpdGh1Yi5cblxuVXAgLSBkb3duOiB0b2dnbGUgYmV0d2VlbiBvdmVydmlldyBhbmQgc2hvdyBkZXNrdG9wIChOZWVkcyBTdXBlcitEIHNob3JjdXQgdG8gYmUgc2V0IG9uIFhvcmcuIFNldCBpdCB3aXRoIGBnc2V0dGluZ3Mgc2V0IG9yZy5nbm9tZS5kZXNrdG9wLndtLmtleWJpbmRpbmdzIHNob3ctZGVza3RvcCAnPFN1cGVyPmQnYCkuXG5cbllvdSBjYW4gYWxzbyBjaGFuZ2Ugd2luZG93cyBieSBnb2luZyB0byB0aGUgb3ZlcnZpZXcgKHVwKSBhbmQgbW92aW5nIHRvIHRoZSBsZWZ0IGFuZCByaWdodCwgYW5kIGNob29zaW5nIHRoZSB3aW5kb3cgd2l0aCBkb3duLiBUaGUgb3ZlcnZpZXcgaXMgbW9kaWZpZWQgc28gaXRcdTIwMTlzIHNob3duIGluIGNocm9ub2xvZ2ljYWwgb3JkZXIuXG4iLAogICJuYW1lIjogIlRvdWNocGFkIFdpbmRvdyBTd2l0Y2hlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dvbnphYXJjci90b3VjaHBhZC13aW5kb3ctc3dpdGNoZXItZ25vbWUtZXh0IiwKICAidXVpZCI6ICJ0b3VjaHBhZF93aW5kb3dfc3dpdGNoZXJAZ29uemEuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "gnome-shell-duckduckgo-search-provider@keithcirkel.co.uk", "name": "DuckDuckGo Search Provider", "pname": "duckduckgo-search-provider", "description": "Add DuckDuckGo search suggestions to Gnome Shell Search", "link": "https://extensions.gnome.org/extension/3306/duckduckgo-search-provider/", "shell_version_map": {"38": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1ydbdm68i38fbaiscmnkz1ywak072ppz93fiqa37fwgr7hsamxg6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBEdWNrRHVja0dvIHNlYXJjaCBzdWdnZXN0aW9ucyB0byBHbm9tZSBTaGVsbCBTZWFyY2giLAogICJuYW1lIjogIkR1Y2tEdWNrR28gU2VhcmNoIFByb3ZpZGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MC4wIiwKICAgICI0MS4wIiwKICAgICI0Mi4wIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2VpdGhhbXVzL2dub21lLXNoZWxsLWR1Y2tkdWNrZ28tc2VhcmNoLXByb3ZpZGVyIiwKICAidXVpZCI6ICJnbm9tZS1zaGVsbC1kdWNrZHVja2dvLXNlYXJjaC1wcm92aWRlckBrZWl0aGNpcmtlbC5jby51ayIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "translate-indicator@athenstaedt.net", "name": "Translate Indicator", "pname": "translate-indicator", "description": "Translate extension for Gnome-Shell - based on translate-shell, inspired by Tudmotu's clipboard-indicator and gufoe's text-translator", "link": "https://extensions.gnome.org/extension/3318/translate-indicator/", "shell_version_map": {"38": {"version": "3", "sha256": "04c3hjbcbn8y9d94swmc3qiv63sjynn71jnwp08sgqa79nrn4cyg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsIC0gYmFzZWQgb24gdHJhbnNsYXRlLXNoZWxsLCBpbnNwaXJlZCBieSBUdWRtb3R1J3MgY2xpcGJvYXJkLWluZGljYXRvciBhbmQgZ3Vmb2UncyB0ZXh0LXRyYW5zbGF0b3IiLAogICJuYW1lIjogIlRyYW5zbGF0ZSBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zZXZlbnV6L2dub21lLXRyYW5zbGF0ZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1pbmRpY2F0b3JAYXRoZW5zdGFlZHQubmV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} -, {"uuid": "material-shell@papyelgringo", "name": "Material Shell", "pname": "material-shell", "description": "A modern desktop interface for Linux - packaged as an extension for GNOME Shell. Improve your user experience and get rid of the anarchy of traditional desktop workflows. Designed to simplify navigation and reduce the need to manipulate windows in order to improve productivity. It's meant to be 100% predictable and bring the benefits of tools coveted by professionals to everyone.", "link": "https://extensions.gnome.org/extension/3357/material-shell/", "shell_version_map": {"38": {"version": "12", "sha256": "1rjybqlgbjmflg21cm7js2gjzvdhw14lpzncpzwf18rh4mp2adnr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "21", "sha256": "03xdlladyph3ash9dq3zwvhrs3r2khqc4c7ckrwnr2apz1339b6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyMQp9"}, "41": {"version": "21", "sha256": "03xdlladyph3ash9dq3zwvhrs3r2khqc4c7ckrwnr2apz1339b6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyMQp9"}, "42": {"version": "21", "sha256": "03xdlladyph3ash9dq3zwvhrs3r2khqc4c7ckrwnr2apz1339b6m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyMQp9"}}} +, {"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": "23", "sha256": "0dgllnbkfvrhnrb97i2j9ws3ih5gkss81fbrriq14l921wx32qj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyMwp9"}, "41": {"version": "23", "sha256": "0dgllnbkfvrhnrb97i2j9ws3ih5gkss81fbrriq14l921wx32qj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyMwp9"}, "42": {"version": "23", "sha256": "0dgllnbkfvrhnrb97i2j9ws3ih5gkss81fbrriq14l921wx32qj4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImJpbmRpbmdzIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwuYmluZGluZ3MiLAogICJkZXNjcmlwdGlvbiI6ICJBIG1vZGVybiBkZXNrdG9wIGludGVyZmFjZSBmb3IgTGludXggLSBwYWNrYWdlZCBhcyBhbiBleHRlbnNpb24gZm9yIEdOT01FIFNoZWxsLiBJbXByb3ZlIHlvdXIgdXNlciBleHBlcmllbmNlIGFuZCBnZXQgcmlkIG9mIHRoZSBhbmFyY2h5IG9mIHRyYWRpdGlvbmFsIGRlc2t0b3Agd29ya2Zsb3dzLiBEZXNpZ25lZCB0byBzaW1wbGlmeSBuYXZpZ2F0aW9uIGFuZCByZWR1Y2UgdGhlIG5lZWQgdG8gbWFuaXB1bGF0ZSB3aW5kb3dzIGluIG9yZGVyIHRvIGltcHJvdmUgcHJvZHVjdGl2aXR5LiBJdCdzIG1lYW50IHRvIGJlIDEwMCUgcHJlZGljdGFibGUgYW5kIGJyaW5nIHRoZSBiZW5lZml0cyBvZiB0b29scyBjb3ZldGVkIGJ5IHByb2Zlc3Npb25hbHMgdG8gZXZlcnlvbmUuIiwKICAibGF5b3V0cyI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5tYXRlcmlhbHNoZWxsLmxheW91dHMiLAogICJuYW1lIjogIk1hdGVyaWFsIFNoZWxsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInRoZW1lIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1hdGVyaWFsc2hlbGwudGhlbWUiLAogICJ0d2Vha3MiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubWF0ZXJpYWxzaGVsbC50d2Vha3MiLAogICJ1cmwiOiAiaHR0cHM6Ly9tYXRlcmlhbC1zaGVsbC5jb20iLAogICJ1dWlkIjogIm1hdGVyaWFsLXNoZWxsQHBhcHllbGdyaW5nbyIsCiAgInZlcnNpb24iOiAyMwp9"}}} , {"uuid": "proxyprofiles@massamany.github.com", "name": "Proxy Profiles", "pname": "proxy-profiles", "description": "Swich easily between several proxy profiles.", "link": "https://extensions.gnome.org/extension/3379/proxy-profiles/", "shell_version_map": {"38": {"version": "5", "sha256": "1b2mabrvpkadxc6v5fczamh2hqh7va2990k10awxy18c0vm3p5kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aWNoIGVhc2lseSBiZXR3ZWVuIHNldmVyYWwgcHJveHkgcHJvZmlsZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJveHlwcm9maWxlcyIsCiAgIm5hbWUiOiAiUHJveHkgUHJvZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFzc2FtYW55L3Byb3h5cHJvZmlsZXMiLAogICJ1dWlkIjogInByb3h5cHJvZmlsZXNAbWFzc2FtYW55LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "1b2mabrvpkadxc6v5fczamh2hqh7va2990k10awxy18c0vm3p5kw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aWNoIGVhc2lseSBiZXR3ZWVuIHNldmVyYWwgcHJveHkgcHJvZmlsZXMuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicHJveHlwcm9maWxlcyIsCiAgIm5hbWUiOiAiUHJveHkgUHJvZmlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWFzc2FtYW55L3Byb3h5cHJvZmlsZXMiLAogICJ1dWlkIjogInByb3h5cHJvZmlsZXNAbWFzc2FtYW55LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "galaxy-buds-battery@pemmoura", "name": "Galaxy Buds Battery", "pname": "galaxy-buds-battery", "description": "Galaxy Buds battery indicator.", "link": "https://extensions.gnome.org/extension/3383/galaxy-buds-battery/", "shell_version_map": {"38": {"version": "6", "sha256": "1f25mc5idqaw3v9b2xffiij9y0pcrl8msz85p8cz2x5l2r3sc7wm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdhbGF4eSBCdWRzIGJhdHRlcnkgaW5kaWNhdG9yLiIsCiAgIm5hbWUiOiAiR2FsYXh5IEJ1ZHMgQmF0dGVyeSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BlbW1vdXJhL2dhbGF4eWJ1ZHMtZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJnYWxheHktYnVkcy1iYXR0ZXJ5QHBlbW1vdXJhIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "color-picker@tuberry", "name": "Color Picker", "pname": "color-picker", "description": "Simple color picker for gnome shell\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3396/color-picker/", "shell_version_map": {"38": {"version": "20", "sha256": "1ss4r8dpa7smxbyz41rw3wl1gy20bvy89xdvwfz6zfhv3db5vl86", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yLXBpY2tlciIsCiAgIm5hbWUiOiAiQ29sb3IgUGlja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yLXBpY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvY29sb3ItcGlja2VyIiwKICAidXVpZCI6ICJjb2xvci1waWNrZXJAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "25", "sha256": "0lx4bs7yfqkphb5cwmakl6xjf14q89m0yn70a882drakfhzgnagw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImNvbG9yLXBpY2tlciIsCiAgIm5hbWUiOiAiQ29sb3IgUGlja2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmNvbG9yLXBpY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L2NvbG9yLXBpY2tlciIsCiAgInV1aWQiOiAiY29sb3ItcGlja2VyQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogMjUKfQ=="}, "41": {"version": "27", "sha256": "1scc0cgdzrg9rmpr090myrsxhfgp03aqld9jh4grqbfza6lrz4jd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDI3Cn0="}, "42": {"version": "29", "sha256": "1hkjym4nkx3d984bm2j7lppg9k837vbm50wb65z1rjnm872r4vk8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjb2xvciBwaWNrZXIgZm9yIGdub21lIHNoZWxsXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1jb2xvci1waWNrZXIiLAogICJuYW1lIjogIkNvbG9yIFBpY2tlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jb2xvci1waWNrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHViZXJyeS9jb2xvci1waWNrZXIiLAogICJ1dWlkIjogImNvbG9yLXBpY2tlckB0dWJlcnJ5IiwKICAidmVyc2lvbiI6IDI5Cn0="}}} @@ -356,7 +356,7 @@ , {"uuid": "myHiddenTopBar@lendoK.github.com", "name": "myHiddenTopBar", "pname": "myhiddentopbar", "description": "really hides the toppanel", "link": "https://extensions.gnome.org/extension/3481/myhiddentopbar/", "shell_version_map": {"38": {"version": "2", "sha256": "1vrj1ih0rvds9xng0i4n2cah9akm2j2vhma3a7zjyvljxmw82w5x", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlYWxseSBoaWRlcyB0aGUgdG9wcGFuZWwiLAogICJuYW1lIjogIm15SGlkZGVuVG9wQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm15SGlkZGVuVG9wQmFyQGxlbmRvSy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "3", "sha256": "0fl9rcdxn2l2lpc8fhcbvzm9lx0i12674kk15rpgbzfj8xn26qkw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlYWxseSBoaWRlcyB0aGUgdG9wcGFuZWwiLAogICJuYW1lIjogIm15SGlkZGVuVG9wQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MC4wIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm15SGlkZGVuVG9wQmFyQGxlbmRvSy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "5", "sha256": "01b5d3bza10mcy0dj662dp1lk2if7pl71q3cfr7zwyk1fkkraizy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInJlYWxseSBoaWRlcyB0aGUgdG9wcGFuZWwiLAogICJuYW1lIjogIm15SGlkZGVuVG9wQmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJteUhpZGRlblRvcEJhckBsZW5kb0suZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "big-avatar@gustavoperedo.org", "name": "Big Avatar", "pname": "big-avatar", "description": "Add your username and icon to your menu panel, and run apps or shell commands.", "link": "https://extensions.gnome.org/extension/3488/big-avatar/", "shell_version_map": {"38": {"version": "6", "sha256": "077j74vvyndllbgrz6fsqd2dqmw2smsy93wn0hmaqz059n3f8rj8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB5b3VyIHVzZXJuYW1lIGFuZCBpY29uIHRvIHlvdXIgbWVudSBwYW5lbCwgYW5kIHJ1biBhcHBzIG9yIHNoZWxsIGNvbW1hbmRzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJiaWctYXZhdGFyIiwKICAibmFtZSI6ICJCaWcgQXZhdGFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJpZy1hdmF0YXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HdXN0YXZvUGVyZWRvL0JpZy1BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJiaWctYXZhdGFyQGd1c3Rhdm9wZXJlZG8ub3JnIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "16", "sha256": "08gpmdghgx3v3filx6jml6sfhgmmw7ljznbkrhrr3jirg9qxsgah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB5b3VyIHVzZXJuYW1lIGFuZCBpY29uIHRvIHlvdXIgbWVudSBwYW5lbCwgYW5kIHJ1biBhcHBzIG9yIHNoZWxsIGNvbW1hbmRzLiIsCiAgIm5hbWUiOiAiQmlnIEF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaWctYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VzdGF2b1BlcmVkby9CaWctQXZhdGFyLUdub21lLVNoZWxsLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlnLWF2YXRhckBndXN0YXZvcGVyZWRvLm9yZyIsCiAgInZlcnNpb24iOiAxNgp9"}, "41": {"version": "16", "sha256": "08gpmdghgx3v3filx6jml6sfhgmmw7ljznbkrhrr3jirg9qxsgah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB5b3VyIHVzZXJuYW1lIGFuZCBpY29uIHRvIHlvdXIgbWVudSBwYW5lbCwgYW5kIHJ1biBhcHBzIG9yIHNoZWxsIGNvbW1hbmRzLiIsCiAgIm5hbWUiOiAiQmlnIEF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaWctYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VzdGF2b1BlcmVkby9CaWctQXZhdGFyLUdub21lLVNoZWxsLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlnLWF2YXRhckBndXN0YXZvcGVyZWRvLm9yZyIsCiAgInZlcnNpb24iOiAxNgp9"}, "42": {"version": "16", "sha256": "08gpmdghgx3v3filx6jml6sfhgmmw7ljznbkrhrr3jirg9qxsgah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCB5b3VyIHVzZXJuYW1lIGFuZCBpY29uIHRvIHlvdXIgbWVudSBwYW5lbCwgYW5kIHJ1biBhcHBzIG9yIHNoZWxsIGNvbW1hbmRzLiIsCiAgIm5hbWUiOiAiQmlnIEF2YXRhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5iaWctYXZhdGFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vR3VzdGF2b1BlcmVkby9CaWctQXZhdGFyLUdub21lLVNoZWxsLUV4dGVuc2lvbiIsCiAgInV1aWQiOiAiYmlnLWF2YXRhckBndXN0YXZvcGVyZWRvLm9yZyIsCiAgInZlcnNpb24iOiAxNgp9"}}} , {"uuid": "volume-mixer@evermiss.net", "name": "Application Volume Mixer", "pname": "application-volume-mixer", "description": "Control volume output per-application\n\n\nAfter installing or updating the extension, an error may appear and you will need to log out and back into GNOME to activate the extension.", "link": "https://extensions.gnome.org/extension/3499/application-volume-mixer/", "shell_version_map": {"38": {"version": "10", "sha256": "0y945168sp4ajmzqwvk5siwf5bcg2c2bkzwwcf8gxwiiqxcw2daw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb25cblxuXG5BZnRlciBpbnN0YWxsaW5nIG9yIHVwZGF0aW5nIHRoZSBleHRlbnNpb24sIGFuIGVycm9yIG1heSBhcHBlYXIgYW5kIHlvdSB3aWxsIG5lZWQgdG8gbG9nIG91dCBhbmQgYmFjayBpbnRvIEdOT01FIHRvIGFjdGl2YXRlIHRoZSBleHRlbnNpb24uIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBWb2x1bWUgTWl4ZXIiLAogICJvcmdpbmFsLWF1dGhvciI6ICJteW1pbmRzdG9ybUBldmVybWlzcy5uZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9teW1pbmRzdG9ybS9nbm9tZS12b2x1bWUtbWl4ZXIiLAogICJ1dWlkIjogInZvbHVtZS1taXhlckBldmVybWlzcy5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "0y945168sp4ajmzqwvk5siwf5bcg2c2bkzwwcf8gxwiiqxcw2daw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb25cblxuXG5BZnRlciBpbnN0YWxsaW5nIG9yIHVwZGF0aW5nIHRoZSBleHRlbnNpb24sIGFuIGVycm9yIG1heSBhcHBlYXIgYW5kIHlvdSB3aWxsIG5lZWQgdG8gbG9nIG91dCBhbmQgYmFjayBpbnRvIEdOT01FIHRvIGFjdGl2YXRlIHRoZSBleHRlbnNpb24uIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBWb2x1bWUgTWl4ZXIiLAogICJvcmdpbmFsLWF1dGhvciI6ICJteW1pbmRzdG9ybUBldmVybWlzcy5uZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9teW1pbmRzdG9ybS9nbm9tZS12b2x1bWUtbWl4ZXIiLAogICJ1dWlkIjogInZvbHVtZS1taXhlckBldmVybWlzcy5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0y945168sp4ajmzqwvk5siwf5bcg2c2bkzwwcf8gxwiiqxcw2daw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb25cblxuXG5BZnRlciBpbnN0YWxsaW5nIG9yIHVwZGF0aW5nIHRoZSBleHRlbnNpb24sIGFuIGVycm9yIG1heSBhcHBlYXIgYW5kIHlvdSB3aWxsIG5lZWQgdG8gbG9nIG91dCBhbmQgYmFjayBpbnRvIEdOT01FIHRvIGFjdGl2YXRlIHRoZSBleHRlbnNpb24uIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBWb2x1bWUgTWl4ZXIiLAogICJvcmdpbmFsLWF1dGhvciI6ICJteW1pbmRzdG9ybUBldmVybWlzcy5uZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9teW1pbmRzdG9ybS9nbm9tZS12b2x1bWUtbWl4ZXIiLAogICJ1dWlkIjogInZvbHVtZS1taXhlckBldmVybWlzcy5uZXQiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "11", "sha256": "107y42fn0pqqxxf6g1sc5snkh42gr9w9jr9r7h4mlp1nzmj6hi42", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgdm9sdW1lIG91dHB1dCBwZXItYXBwbGljYXRpb25cblxuXG5BZnRlciBpbnN0YWxsaW5nIG9yIHVwZGF0aW5nIHRoZSBleHRlbnNpb24sIGFuIGVycm9yIG1heSBhcHBlYXIgYW5kIHlvdSB3aWxsIG5lZWQgdG8gbG9nIG91dCBhbmQgYmFjayBpbnRvIEdOT01FIHRvIGFjdGl2YXRlIHRoZSBleHRlbnNpb24uIiwKICAibmFtZSI6ICJBcHBsaWNhdGlvbiBWb2x1bWUgTWl4ZXIiLAogICJvcmdpbmFsLWF1dGhvciI6ICJteW1pbmRzdG9ybUBldmVybWlzcy5uZXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXltaW5kc3Rvcm0vZ25vbWUtdm9sdW1lLW1peGVyIiwKICAidXVpZCI6ICJ2b2x1bWUtbWl4ZXJAZXZlcm1pc3MubmV0IiwKICAidmVyc2lvbiI6IDExCn0="}}} -, {"uuid": "creative-control@sau.li", "name": "Creative Sound Blaster control", "pname": "creative-sound-blaster-control", "description": "Control Creative Sound Blaster", "link": "https://extensions.gnome.org/extension/3505/creative-sound-blaster-control/", "shell_version_map": {"38": {"version": "2", "sha256": "0pqps21c2p8fqndy9hd77j979h0wjbw0yzbmv6jmwk7rskv6zysg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"uuid": "creative-control@sau.li", "name": "Creative Sound Blaster control", "pname": "creative-sound-blaster-control", "description": "Control Creative Sound Blaster", "link": "https://extensions.gnome.org/extension/3505/creative-sound-blaster-control/", "shell_version_map": {"38": {"version": "3", "sha256": "1hzsxysm480clf1c21yp2lvmq4s6phly117ym0r2k8w0c96xr1sw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1hzsxysm480clf1c21yp2lvmq4s6phly117ym0r2k8w0c96xr1sw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1hzsxysm480clf1c21yp2lvmq4s6phly117ym0r2k8w0c96xr1sw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1hzsxysm480clf1c21yp2lvmq4s6phly117ym0r2k8w0c96xr1sw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgQ3JlYXRpdmUgU291bmQgQmxhc3RlciIsCiAgIm5hbWUiOiAiQ3JlYXRpdmUgU291bmQgQmxhc3RlciBjb250cm9sIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaXNhdWwzMi9nbm9tZS1zaGVsbC1leHRlbnNpb24tY3JlYXRpdmUtY29udHJvbCIsCiAgInV1aWQiOiAiY3JlYXRpdmUtY29udHJvbEBzYXUubGkiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "day-night-wallpaper@swapnilmadavi.github.io", "name": "Day Night Wallpaper", "pname": "day-night-wallpaper", "description": "Set separate wallpapers for day and night time.", "link": "https://extensions.gnome.org/extension/3512/day-night-wallpaper/", "shell_version_map": {"38": {"version": "2", "sha256": "082wrffxsa6qnp120ghlvhkb3isnnf9qizxfk6bbgqbzcvsax059", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBzZXBhcmF0ZSB3YWxscGFwZXJzIGZvciBkYXkgYW5kIG5pZ2h0IHRpbWUuIiwKICAibmFtZSI6ICJEYXkgTmlnaHQgV2FsbHBhcGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRheS1uaWdodC13YWxscGFwZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zd2FwbmlsbWFkYXZpL2RheS1uaWdodC13YWxscGFwZXItZ25vbWUtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJkYXktbmlnaHQtd2FsbHBhcGVyQHN3YXBuaWxtYWRhdmkuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "transparent-shell@siroj42.github.io", "name": "Transparent Shell", "pname": "transparent-shell", "description": "Make the main shell components (Top bar, dash, workspace view) transparent.", "link": "https://extensions.gnome.org/extension/3518/transparent-shell/", "shell_version_map": {"38": {"version": "6", "sha256": "11xdqaf7w2ki0q2m0798hk2am0ygglnbd4cq9hd77jl8akr8m20c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "9", "sha256": "0q83lylm0albagn8bnjp0538j0zcksvsqzz9gq6al6dyq5fvf7yz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "0q83lylm0albagn8bnjp0538j0zcksvsqzz9gq6al6dyq5fvf7yz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "0q83lylm0albagn8bnjp0538j0zcksvsqzz9gq6al6dyq5fvf7yz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIG1haW4gc2hlbGwgY29tcG9uZW50cyAoVG9wIGJhciwgZGFzaCwgd29ya3NwYWNlIHZpZXcpIHRyYW5zcGFyZW50LiIsCiAgIm5hbWUiOiAiVHJhbnNwYXJlbnQgU2hlbGwiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNwYXJlbnQtc2hlbGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9TaXJvajQyL2dub21lLWV4dGVuc2lvbi10cmFuc3BhcmVudC1zaGVsbCIsCiAgInV1aWQiOiAidHJhbnNwYXJlbnQtc2hlbGxAc2lyb2o0Mi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "true-color-invert@jackkenney", "name": "True Color Invert", "pname": "true-color-invert", "description": "Inverts the color of individual windows so they are hue-preserved.\nDefault shortcut is Super+I", "link": "https://extensions.gnome.org/extension/3530/true-color-invert/", "shell_version_map": {"38": {"version": "10", "sha256": "062501b7i5abrl32hcpdshbrrd9sjyr9830xvg5w5879ynsyc874", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "062501b7i5abrl32hcpdshbrrd9sjyr9830xvg5w5879ynsyc874", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "062501b7i5abrl32hcpdshbrrd9sjyr9830xvg5w5879ynsyc874", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "062501b7i5abrl32hcpdshbrrd9sjyr9830xvg5w5879ynsyc874", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludmVydHMgdGhlIGNvbG9yIG9mIGluZGl2aWR1YWwgd2luZG93cyBzbyB0aGV5IGFyZSBodWUtcHJlc2VydmVkLlxuRGVmYXVsdCBzaG9ydGN1dCBpcyBTdXBlcitJIiwKICAibmFtZSI6ICJUcnVlIENvbG9yIEludmVydCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50cnVlLWNvbG9yLWludmVydCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2phY2trZW5uZXkvZ25vbWUtdHJ1ZS1jb2xvci1pbnZlcnQiLAogICJ1dWlkIjogInRydWUtY29sb3ItaW52ZXJ0QGphY2trZW5uZXkiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} @@ -384,7 +384,7 @@ , {"uuid": "netspeedsimplified@prateekmedia.extension", "name": "Net speed Simplified", "pname": "net-speed-simplified", "description": "A Net Speed extension With Loads of Customization. Fork of simplenetspeed \n \nWhat's new\n☞ Add Use System Color Scheme option \n☞ Update Preferences logic \n☞ Filter more devices for net speed indicator \n\nFull CHANGELOG can be found on github releases page \n\nFeatures \n1. Clean UI \n2. Adjustable Refresh rate \n3. Preferences to manage extension \n4. Vertical Alignment Support \n5. Two Icon sets for Indicators \n\nFeature Highlights for Preferences \n1. Lock Mouse Actions option \n2. Advance Position options to pinpoint where to place the indicator on the Panel. \n3. Refresh time option by which you can change refresh rate value between 1.0 sec to 10.0 sec. \n4. Show Upload First option to show upload speed first \n5. Color Customizations for speed indicators \n6. Hide when Disconnected option \n7. Use Shorten Units option \n8. Limit Unit option and more... \n\nModes \n- Total net speed in b/s, kb/s, ... \n- Total net speed in B/s, KB/s, ... \n- Up & down speed in b/s, kb/s, ... \n- Up & down speed in B/s, KB/s, ... \n- Total downloads in B, KB, ... (Right click to reset counter) \n\nMouse Events \n- Left click to change modes \n- Right click(in 1-4 modes): Toggle the visibility of total loaded. \n- Right click(in 5th mode): Reset total downloaded. \n- Right Click(Four consecutive times): Toggle through horizontal/vertical alignment. \n- Middle click: Cycle through the font sizes.", "link": "https://extensions.gnome.org/extension/3724/net-speed-simplified/", "shell_version_map": {"38": {"version": "35", "sha256": "0nh00iach2mnrdij1ywp5l6vr064q9dfwwjv4g2n4mqiz9jxr1lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWQgXG4gXG5XaGF0J3MgbmV3XG5cdTI2MWUgQWRkIFVzZSBTeXN0ZW0gQ29sb3IgU2NoZW1lIG9wdGlvbiBcblx1MjYxZSBVcGRhdGUgUHJlZmVyZW5jZXMgbG9naWMgXG5cdTI2MWUgRmlsdGVyIG1vcmUgZGV2aWNlcyBmb3IgbmV0IHNwZWVkIGluZGljYXRvciBcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlIFxuXG5GZWF0dXJlcyBcbjEuIENsZWFuIFVJIFxuMi4gQWRqdXN0YWJsZSBSZWZyZXNoIHJhdGUgXG4zLiBQcmVmZXJlbmNlcyB0byBtYW5hZ2UgZXh0ZW5zaW9uIFxuNC4gVmVydGljYWwgQWxpZ25tZW50IFN1cHBvcnQgXG41LiBUd28gSWNvbiBzZXRzIGZvciBJbmRpY2F0b3JzIFxuXG5GZWF0dXJlIEhpZ2hsaWdodHMgZm9yIFByZWZlcmVuY2VzIFxuMS4gTG9jayBNb3VzZSBBY3Rpb25zIG9wdGlvbiBcbjIuIEFkdmFuY2UgUG9zaXRpb24gb3B0aW9ucyB0byBwaW5wb2ludCB3aGVyZSB0byBwbGFjZSB0aGUgaW5kaWNhdG9yIG9uIHRoZSBQYW5lbC4gXG4zLiBSZWZyZXNoIHRpbWUgb3B0aW9uIGJ5IHdoaWNoIHlvdSBjYW4gY2hhbmdlIHJlZnJlc2ggcmF0ZSB2YWx1ZSBiZXR3ZWVuIDEuMCBzZWMgdG8gMTAuMCBzZWMuIFxuNC4gU2hvdyBVcGxvYWQgRmlyc3Qgb3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBIaWRlIHdoZW4gRGlzY29ubmVjdGVkIG9wdGlvbiBcbjcuIFVzZSBTaG9ydGVuIFVuaXRzIG9wdGlvbiBcbjguIExpbWl0IFVuaXQgb3B0aW9uIGFuZCBtb3JlLi4uIFxuXG5Nb2RlcyBcbi0gVG90YWwgbmV0IHNwZWVkIGluIGIvcywga2IvcywgLi4uIFxuLSBUb3RhbCBuZXQgc3BlZWQgaW4gQi9zLCBLQi9zLCAuLi4gXG4tIFVwICYgZG93biBzcGVlZCBpbiBiL3MsIGtiL3MsIC4uLiBcbi0gVXAgJiBkb3duIHNwZWVkIGluIEIvcywgS0IvcywgLi4uIFxuLSBUb3RhbCBkb3dubG9hZHMgaW4gQiwgS0IsIC4uLiAoUmlnaHQgY2xpY2sgdG8gcmVzZXQgY291bnRlcikgXG5cbk1vdXNlIEV2ZW50cyBcbi0gTGVmdCBjbGljayB0byBjaGFuZ2UgbW9kZXMgXG4tIFJpZ2h0IGNsaWNrKGluIDEtNCBtb2Rlcyk6IFRvZ2dsZSB0aGUgdmlzaWJpbGl0eSBvZiB0b3RhbCBsb2FkZWQuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIGRvd25sb2FkZWQuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ByYXRlZWttZWRpYS9uZXRzcGVlZHNpbXBsaWZpZWQiLAogICJ1dWlkIjogIm5ldHNwZWVkc2ltcGxpZmllZEBwcmF0ZWVrbWVkaWEuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "40": {"version": "35", "sha256": "0nh00iach2mnrdij1ywp5l6vr064q9dfwwjv4g2n4mqiz9jxr1lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWQgXG4gXG5XaGF0J3MgbmV3XG5cdTI2MWUgQWRkIFVzZSBTeXN0ZW0gQ29sb3IgU2NoZW1lIG9wdGlvbiBcblx1MjYxZSBVcGRhdGUgUHJlZmVyZW5jZXMgbG9naWMgXG5cdTI2MWUgRmlsdGVyIG1vcmUgZGV2aWNlcyBmb3IgbmV0IHNwZWVkIGluZGljYXRvciBcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlIFxuXG5GZWF0dXJlcyBcbjEuIENsZWFuIFVJIFxuMi4gQWRqdXN0YWJsZSBSZWZyZXNoIHJhdGUgXG4zLiBQcmVmZXJlbmNlcyB0byBtYW5hZ2UgZXh0ZW5zaW9uIFxuNC4gVmVydGljYWwgQWxpZ25tZW50IFN1cHBvcnQgXG41LiBUd28gSWNvbiBzZXRzIGZvciBJbmRpY2F0b3JzIFxuXG5GZWF0dXJlIEhpZ2hsaWdodHMgZm9yIFByZWZlcmVuY2VzIFxuMS4gTG9jayBNb3VzZSBBY3Rpb25zIG9wdGlvbiBcbjIuIEFkdmFuY2UgUG9zaXRpb24gb3B0aW9ucyB0byBwaW5wb2ludCB3aGVyZSB0byBwbGFjZSB0aGUgaW5kaWNhdG9yIG9uIHRoZSBQYW5lbC4gXG4zLiBSZWZyZXNoIHRpbWUgb3B0aW9uIGJ5IHdoaWNoIHlvdSBjYW4gY2hhbmdlIHJlZnJlc2ggcmF0ZSB2YWx1ZSBiZXR3ZWVuIDEuMCBzZWMgdG8gMTAuMCBzZWMuIFxuNC4gU2hvdyBVcGxvYWQgRmlyc3Qgb3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBIaWRlIHdoZW4gRGlzY29ubmVjdGVkIG9wdGlvbiBcbjcuIFVzZSBTaG9ydGVuIFVuaXRzIG9wdGlvbiBcbjguIExpbWl0IFVuaXQgb3B0aW9uIGFuZCBtb3JlLi4uIFxuXG5Nb2RlcyBcbi0gVG90YWwgbmV0IHNwZWVkIGluIGIvcywga2IvcywgLi4uIFxuLSBUb3RhbCBuZXQgc3BlZWQgaW4gQi9zLCBLQi9zLCAuLi4gXG4tIFVwICYgZG93biBzcGVlZCBpbiBiL3MsIGtiL3MsIC4uLiBcbi0gVXAgJiBkb3duIHNwZWVkIGluIEIvcywgS0IvcywgLi4uIFxuLSBUb3RhbCBkb3dubG9hZHMgaW4gQiwgS0IsIC4uLiAoUmlnaHQgY2xpY2sgdG8gcmVzZXQgY291bnRlcikgXG5cbk1vdXNlIEV2ZW50cyBcbi0gTGVmdCBjbGljayB0byBjaGFuZ2UgbW9kZXMgXG4tIFJpZ2h0IGNsaWNrKGluIDEtNCBtb2Rlcyk6IFRvZ2dsZSB0aGUgdmlzaWJpbGl0eSBvZiB0b3RhbCBsb2FkZWQuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIGRvd25sb2FkZWQuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ByYXRlZWttZWRpYS9uZXRzcGVlZHNpbXBsaWZpZWQiLAogICJ1dWlkIjogIm5ldHNwZWVkc2ltcGxpZmllZEBwcmF0ZWVrbWVkaWEuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "41": {"version": "35", "sha256": "0nh00iach2mnrdij1ywp5l6vr064q9dfwwjv4g2n4mqiz9jxr1lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWQgXG4gXG5XaGF0J3MgbmV3XG5cdTI2MWUgQWRkIFVzZSBTeXN0ZW0gQ29sb3IgU2NoZW1lIG9wdGlvbiBcblx1MjYxZSBVcGRhdGUgUHJlZmVyZW5jZXMgbG9naWMgXG5cdTI2MWUgRmlsdGVyIG1vcmUgZGV2aWNlcyBmb3IgbmV0IHNwZWVkIGluZGljYXRvciBcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlIFxuXG5GZWF0dXJlcyBcbjEuIENsZWFuIFVJIFxuMi4gQWRqdXN0YWJsZSBSZWZyZXNoIHJhdGUgXG4zLiBQcmVmZXJlbmNlcyB0byBtYW5hZ2UgZXh0ZW5zaW9uIFxuNC4gVmVydGljYWwgQWxpZ25tZW50IFN1cHBvcnQgXG41LiBUd28gSWNvbiBzZXRzIGZvciBJbmRpY2F0b3JzIFxuXG5GZWF0dXJlIEhpZ2hsaWdodHMgZm9yIFByZWZlcmVuY2VzIFxuMS4gTG9jayBNb3VzZSBBY3Rpb25zIG9wdGlvbiBcbjIuIEFkdmFuY2UgUG9zaXRpb24gb3B0aW9ucyB0byBwaW5wb2ludCB3aGVyZSB0byBwbGFjZSB0aGUgaW5kaWNhdG9yIG9uIHRoZSBQYW5lbC4gXG4zLiBSZWZyZXNoIHRpbWUgb3B0aW9uIGJ5IHdoaWNoIHlvdSBjYW4gY2hhbmdlIHJlZnJlc2ggcmF0ZSB2YWx1ZSBiZXR3ZWVuIDEuMCBzZWMgdG8gMTAuMCBzZWMuIFxuNC4gU2hvdyBVcGxvYWQgRmlyc3Qgb3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBIaWRlIHdoZW4gRGlzY29ubmVjdGVkIG9wdGlvbiBcbjcuIFVzZSBTaG9ydGVuIFVuaXRzIG9wdGlvbiBcbjguIExpbWl0IFVuaXQgb3B0aW9uIGFuZCBtb3JlLi4uIFxuXG5Nb2RlcyBcbi0gVG90YWwgbmV0IHNwZWVkIGluIGIvcywga2IvcywgLi4uIFxuLSBUb3RhbCBuZXQgc3BlZWQgaW4gQi9zLCBLQi9zLCAuLi4gXG4tIFVwICYgZG93biBzcGVlZCBpbiBiL3MsIGtiL3MsIC4uLiBcbi0gVXAgJiBkb3duIHNwZWVkIGluIEIvcywgS0IvcywgLi4uIFxuLSBUb3RhbCBkb3dubG9hZHMgaW4gQiwgS0IsIC4uLiAoUmlnaHQgY2xpY2sgdG8gcmVzZXQgY291bnRlcikgXG5cbk1vdXNlIEV2ZW50cyBcbi0gTGVmdCBjbGljayB0byBjaGFuZ2UgbW9kZXMgXG4tIFJpZ2h0IGNsaWNrKGluIDEtNCBtb2Rlcyk6IFRvZ2dsZSB0aGUgdmlzaWJpbGl0eSBvZiB0b3RhbCBsb2FkZWQuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIGRvd25sb2FkZWQuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ByYXRlZWttZWRpYS9uZXRzcGVlZHNpbXBsaWZpZWQiLAogICJ1dWlkIjogIm5ldHNwZWVkc2ltcGxpZmllZEBwcmF0ZWVrbWVkaWEuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDM1Cn0="}, "42": {"version": "35", "sha256": "0nh00iach2mnrdij1ywp5l6vr064q9dfwwjv4g2n4mqiz9jxr1lv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgTmV0IFNwZWVkIGV4dGVuc2lvbiBXaXRoIExvYWRzIG9mIEN1c3RvbWl6YXRpb24uIEZvcmsgb2Ygc2ltcGxlbmV0c3BlZWQgXG4gXG5XaGF0J3MgbmV3XG5cdTI2MWUgQWRkIFVzZSBTeXN0ZW0gQ29sb3IgU2NoZW1lIG9wdGlvbiBcblx1MjYxZSBVcGRhdGUgUHJlZmVyZW5jZXMgbG9naWMgXG5cdTI2MWUgRmlsdGVyIG1vcmUgZGV2aWNlcyBmb3IgbmV0IHNwZWVkIGluZGljYXRvciBcblxuRnVsbCBDSEFOR0VMT0cgY2FuIGJlIGZvdW5kIG9uIGdpdGh1YiByZWxlYXNlcyBwYWdlIFxuXG5GZWF0dXJlcyBcbjEuIENsZWFuIFVJIFxuMi4gQWRqdXN0YWJsZSBSZWZyZXNoIHJhdGUgXG4zLiBQcmVmZXJlbmNlcyB0byBtYW5hZ2UgZXh0ZW5zaW9uIFxuNC4gVmVydGljYWwgQWxpZ25tZW50IFN1cHBvcnQgXG41LiBUd28gSWNvbiBzZXRzIGZvciBJbmRpY2F0b3JzIFxuXG5GZWF0dXJlIEhpZ2hsaWdodHMgZm9yIFByZWZlcmVuY2VzIFxuMS4gTG9jayBNb3VzZSBBY3Rpb25zIG9wdGlvbiBcbjIuIEFkdmFuY2UgUG9zaXRpb24gb3B0aW9ucyB0byBwaW5wb2ludCB3aGVyZSB0byBwbGFjZSB0aGUgaW5kaWNhdG9yIG9uIHRoZSBQYW5lbC4gXG4zLiBSZWZyZXNoIHRpbWUgb3B0aW9uIGJ5IHdoaWNoIHlvdSBjYW4gY2hhbmdlIHJlZnJlc2ggcmF0ZSB2YWx1ZSBiZXR3ZWVuIDEuMCBzZWMgdG8gMTAuMCBzZWMuIFxuNC4gU2hvdyBVcGxvYWQgRmlyc3Qgb3B0aW9uIHRvIHNob3cgdXBsb2FkIHNwZWVkIGZpcnN0IFxuNS4gQ29sb3IgQ3VzdG9taXphdGlvbnMgZm9yIHNwZWVkIGluZGljYXRvcnMgXG42LiBIaWRlIHdoZW4gRGlzY29ubmVjdGVkIG9wdGlvbiBcbjcuIFVzZSBTaG9ydGVuIFVuaXRzIG9wdGlvbiBcbjguIExpbWl0IFVuaXQgb3B0aW9uIGFuZCBtb3JlLi4uIFxuXG5Nb2RlcyBcbi0gVG90YWwgbmV0IHNwZWVkIGluIGIvcywga2IvcywgLi4uIFxuLSBUb3RhbCBuZXQgc3BlZWQgaW4gQi9zLCBLQi9zLCAuLi4gXG4tIFVwICYgZG93biBzcGVlZCBpbiBiL3MsIGtiL3MsIC4uLiBcbi0gVXAgJiBkb3duIHNwZWVkIGluIEIvcywgS0IvcywgLi4uIFxuLSBUb3RhbCBkb3dubG9hZHMgaW4gQiwgS0IsIC4uLiAoUmlnaHQgY2xpY2sgdG8gcmVzZXQgY291bnRlcikgXG5cbk1vdXNlIEV2ZW50cyBcbi0gTGVmdCBjbGljayB0byBjaGFuZ2UgbW9kZXMgXG4tIFJpZ2h0IGNsaWNrKGluIDEtNCBtb2Rlcyk6IFRvZ2dsZSB0aGUgdmlzaWJpbGl0eSBvZiB0b3RhbCBsb2FkZWQuIFxuLSBSaWdodCBjbGljayhpbiA1dGggbW9kZSk6IFJlc2V0IHRvdGFsIGRvd25sb2FkZWQuIFxuLSBSaWdodCBDbGljayhGb3VyIGNvbnNlY3V0aXZlIHRpbWVzKTogVG9nZ2xlIHRocm91Z2ggaG9yaXpvbnRhbC92ZXJ0aWNhbCBhbGlnbm1lbnQuIFxuLSBNaWRkbGUgY2xpY2s6IEN5Y2xlIHRocm91Z2ggdGhlIGZvbnQgc2l6ZXMuIiwKICAibmFtZSI6ICJOZXQgc3BlZWQgU2ltcGxpZmllZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ByYXRlZWttZWRpYS9uZXRzcGVlZHNpbXBsaWZpZWQiLAogICJ1dWlkIjogIm5ldHNwZWVkc2ltcGxpZmllZEBwcmF0ZWVrbWVkaWEuZXh0ZW5zaW9uIiwKICAidmVyc2lvbiI6IDM1Cn0="}}} , {"uuid": "cpupower-governors@icar.github.com", "name": "CPU Power Governor", "pname": "cpu-power-governor", "description": "Enables the ability to swap between kernel governors for the CPU useful for laptops.\n\nRequires: polkit, cpupower\nGithub: https://github.com/juxuanu/cpupower-governors", "link": "https://extensions.gnome.org/extension/3727/cpu-power-governor/", "shell_version_map": {"38": {"version": "2", "sha256": "1hb239w4cpz6yzs3pzd3hhrwswh6w5c5xw6dqn57m26cazh843qk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgdGhlIGFiaWxpdHkgdG8gc3dhcCBiZXR3ZWVuIGtlcm5lbCBnb3Zlcm5vcnMgZm9yIHRoZSBDUFUgdXNlZnVsIGZvciBsYXB0b3BzLlxuXG5SZXF1aXJlczogcG9sa2l0LCBjcHVwb3dlclxuR2l0aHViOiBodHRwczovL2dpdGh1Yi5jb20vanV4dWFudS9jcHVwb3dlci1nb3Zlcm5vcnMiLAogICJuYW1lIjogIkNQVSBQb3dlciBHb3Zlcm5vciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJjcHVwb3dlci1nb3Zlcm5vcnNAaWNhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "floating-dock@nandoferreira_prof@hotmail.com", "name": "Floating Dock", "pname": "floating-dock", "description": "A Custom Floating Dock fork, now you can change the margin and border radius of the dock.", "link": "https://extensions.gnome.org/extension/3730/floating-dock/", "shell_version_map": {"38": {"version": "1", "sha256": "0giksm5fvrj412v8xnf2hi4s0yi2mqd9prd84npv8jxkfv78y414", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm5hbmRvZmVycmVpcmFfcHJvZkBob3RtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "4", "sha256": "0ca22s5vbs6d32ppikmg0xcf5335qmighq6cpvly51q44hlqjamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0ca22s5vbs6d32ppikmg0xcf5335qmighq6cpvly51q44hlqjamg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgQ3VzdG9tIEZsb2F0aW5nIERvY2sgZm9yaywgbm93IHlvdSBjYW4gY2hhbmdlIHRoZSBtYXJnaW4gYW5kIGJvcmRlciByYWRpdXMgb2YgdGhlIGRvY2suIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZmxvYXRpbmdkb2NrIiwKICAibmFtZSI6ICJGbG9hdGluZyBEb2NrIiwKICAib3JpZ2luYWwtYXV0aG9yIjogIm1pY3hneEBnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Zlci1tb3JlaXJhL2Zsb2F0aW5nLWRvY2siLAogICJ1dWlkIjogImZsb2F0aW5nLWRvY2tAbmFuZG9mZXJyZWlyYV9wcm9mQGhvdG1haWwuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "tiling-assistant@leleat-on-github", "name": "Tiling Assistant", "pname": "tiling-assistant", "description": "Expand GNOME's 2 column tiling and add a Windows-snap-assist-inspired popup...", "link": "https://extensions.gnome.org/extension/3733/tiling-assistant/", "shell_version_map": {"38": {"version": "23", "sha256": "1b9hpll26ggwhw4f52wgflzjfqksmyfy5wyg1rpz41lr1dmva8vk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTGVsZWF0L1RpbGluZy1Bc3Npc3RhbnQiLAogICJ1dWlkIjogInRpbGluZy1hc3Npc3RhbnRAbGVsZWF0LW9uLWdpdGh1YiIsCiAgInZlcnNpb24iOiAyMwp9"}, "40": {"version": "32", "sha256": "14kvgygfia1961i4v933bg7j2l4mzy7hv7f53sc5giwpmcsj3b5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDMyCn0="}, "41": {"version": "32", "sha256": "14kvgygfia1961i4v933bg7j2l4mzy7hv7f53sc5giwpmcsj3b5v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9MZWxlYXQvVGlsaW5nLUFzc2lzdGFudCIsCiAgInV1aWQiOiAidGlsaW5nLWFzc2lzdGFudEBsZWxlYXQtb24tZ2l0aHViIiwKICAidmVyc2lvbiI6IDMyCn0="}, "42": {"version": "33", "sha256": "18c7qbn29zxkjs24yw2y4fcj8pf56qscgsr7w9975qp2fym1wkx7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9UaWxpbmctQXNzaXN0YW50IiwKICAidXVpZCI6ICJ0aWxpbmctYXNzaXN0YW50QGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} +, {"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": "35", "sha256": "028sfwlzvv3h51ryszhgi7fxa4r3r1z5h1i73bmc8pryzglm52c6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4cGFuZCBHTk9NRSdzIDIgY29sdW1uIHRpbGluZyBhbmQgYWRkIGEgV2luZG93cy1zbmFwLWFzc2lzdC1pbnNwaXJlZCBwb3B1cC4uLiIsCiAgIm5hbWUiOiAiVGlsaW5nIEFzc2lzdGFudCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aWxpbmctYXNzaXN0YW50IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlbGVhdC9UaWxpbmctQXNzaXN0YW50IiwKICAidXVpZCI6ICJ0aWxpbmctYXNzaXN0YW50QGxlbGVhdC1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMzUKfQ=="}}} , {"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": "22", "sha256": "1m80ap2zmx3m18p1mwljasx4xldaj43y7pssff0jhpwgdb9p0rmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9odWUtbGlnaHRzIiwKICAidXVpZCI6ICJodWUtbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "40": {"version": "22", "sha256": "1m80ap2zmx3m18p1mwljasx4xldaj43y7pssff0jhpwgdb9p0rmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9odWUtbGlnaHRzIiwKICAidXVpZCI6ICJodWUtbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "41": {"version": "22", "sha256": "1m80ap2zmx3m18p1mwljasx4xldaj43y7pssff0jhpwgdb9p0rmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9odWUtbGlnaHRzIiwKICAidXVpZCI6ICJodWUtbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}, "42": {"version": "22", "sha256": "1m80ap2zmx3m18p1mwljasx4xldaj43y7pssff0jhpwgdb9p0rmz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGNvbnRyb2xzIFBoaWxpcHMgSHVlIGNvbXBhdGlibGUgbGlnaHRzIHVzaW5nIFBoaWxpcHMgSHVlIEJyaWRnZSBvbiB5b3VyIGxvY2FsIG5ldHdvcmssIGl0IGFsc28gYWxsb3dzIGNvbnRyb2xsaW5nIFBoaWxpcHMgSHVlIFN5bmMgQm94LiBJZiB5b3UgYXJlIGV4cGVyaWVuY2luZyBhbiBlcnJvciBvbiB0aGUgdXBncmFkZSwgcGxlYXNlIGxvZyBvdXQgYW5kIGxvZyBpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJodWUtbGlnaHRzIiwKICAibmFtZSI6ICJIdWUgTGlnaHRzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9odWUtbGlnaHRzIiwKICAidXVpZCI6ICJodWUtbGlnaHRzQGNobHVtc2t5dmFjbGF2LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAyMgp9"}}} , {"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": "12", "sha256": "1km8fmymx7127lva1hz0rfc1nash9hc3h8wya04hgiz64m596y5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "40": {"version": "12", "sha256": "1km8fmymx7127lva1hz0rfc1nash9hc3h8wya04hgiz64m596y5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "1km8fmymx7127lva1hz0rfc1nash9hc3h8wya04hgiz64m596y5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "1km8fmymx7127lva1hz0rfc1nash9hc3h8wya04hgiz64m596y5b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hZ2ljIGxhbXAgZWZmZWN0IGluc3BpcmVkIGJ5IHRoZSBDb21waXogb25lc1xuXG5OQjpcbkluIGNhc2Ugb2YgdXBkYXRlIGVycm9yIHBsZWFzZSByZXN0YXJ0IEdub21lIFNoZWxsIChvbiBYb3JnIHByZXNzIEFMVCtGMiB0aGVuIHdyaXRlIHIgYW5kIHByZXNzIGVudGVyLCBvbiBXYXlsYW5kIGVuZCB0aGUgc2Vzc2lvbiBhbmQgbG9nIGluIGFnYWluKSIsCiAgIm5hbWUiOiAiQ29tcGl6IGFsaWtlIG1hZ2ljIGxhbXAgZWZmZWN0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGVybWVzODMvY29tcGl6LWFsaWtlLW1hZ2ljLWxhbXAtZWZmZWN0IiwKICAidXVpZCI6ICJjb21waXotYWxpa2UtbWFnaWMtbGFtcC1lZmZlY3RAaGVybWVzODMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxMgp9"}}} @@ -394,7 +394,7 @@ , {"uuid": "battery-status@atareao.es", "name": "Battery Status", "pname": "battery-status", "description": "Get information about your battery status", "link": "https://extensions.gnome.org/extension/3763/battery-status/", "shell_version_map": {"40": {"version": "6", "sha256": "00zz3f00bdr95579250m7blrgavqziwh88dw45x928lq06xb052w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby9iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYmF0dGVyeS1zdGF0dXNAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "00zz3f00bdr95579250m7blrgavqziwh88dw45x928lq06xb052w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby9iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYmF0dGVyeS1zdGF0dXNAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "00zz3f00bdr95579250m7blrgavqziwh88dw45x928lq06xb052w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdldCBpbmZvcm1hdGlvbiBhYm91dCB5b3VyIGJhdHRlcnkgc3RhdHVzIiwKICAiZXh0ZW5zaW9uLWlkIjogImJhdHRlcnktc3RhdHVzQGF0YXJlYW8uZXMiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJiYXR0ZXJ5LXN0YXR1c0BhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJiYXR0ZXJ5LXN0YXR1cy1pY29uIiwKICAibmFtZSI6ICJCYXR0ZXJ5IFN0YXR1cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJlcy5hdGFyZWFvLmJhdHRlcnktc3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXRhcmVhby9iYXR0ZXJ5LXN0YXR1cyIsCiAgInV1aWQiOiAiYmF0dGVyeS1zdGF0dXNAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "distinct@sireliah.com", "name": "Distinct Windows", "pname": "distinct-windows", "description": "Visually differentiate windows with colors and symbols", "link": "https://extensions.gnome.org/extension/3769/distinct-windows/", "shell_version_map": {"38": {"version": "4", "sha256": "1iqga92l9mk3ykf8bdy9igvqfx9k78jasdmqsrrz9zcz33d7k4h7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlZpc3VhbGx5IGRpZmZlcmVudGlhdGUgd2luZG93cyB3aXRoIGNvbG9ycyBhbmQgc3ltYm9scyIsCiAgIm5hbWUiOiAiRGlzdGluY3QgV2luZG93cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NpcmVsaWFoL2Rpc3RpbmN0LXdpbmRvd3MiLAogICJ1dWlkIjogImRpc3RpbmN0QHNpcmVsaWFoLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "miniCal2@breiq", "name": "Minimalist Calendar 2", "pname": "minimalist-calendar-2", "description": "Remove event list and clock/calendar app buttons from the calendar window.", "link": "https://extensions.gnome.org/extension/3775/minimalist-calendar-2/", "shell_version_map": {"38": {"version": "1", "sha256": "1nh10ik3zk3r4jr31mr8nw8nnamgj3mk1f3im06657wv18x9wvam", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBldmVudCBsaXN0IGFuZCBjbG9jay9jYWxlbmRhciBhcHAgYnV0dG9ucyBmcm9tIHRoZSBjYWxlbmRhciB3aW5kb3cuIiwKICAibmFtZSI6ICJNaW5pbWFsaXN0IENhbGVuZGFyIDIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAibWluaUNhbDJAYnJlaXEiLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "ddterm@amezin.github.com", "name": "ddterm", "pname": "ddterm", "description": "Another drop down terminal extension for GNOME Shell. With tabs. Works on Wayland natively", "link": "https://extensions.gnome.org/extension/3780/ddterm/", "shell_version_map": {"38": {"version": "30", "sha256": "1qjqqrhvqwh279f2cwcgy83xp72w37i3i35my0xsd2v8fcsm1j7y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtZXppbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "40": {"version": "30", "sha256": "1qjqqrhvqwh279f2cwcgy83xp72w37i3i35my0xsd2v8fcsm1j7y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtZXppbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "41": {"version": "30", "sha256": "1qjqqrhvqwh279f2cwcgy83xp72w37i3i35my0xsd2v8fcsm1j7y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtZXppbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}, "42": {"version": "30", "sha256": "1qjqqrhvqwh279f2cwcgy83xp72w37i3i35my0xsd2v8fcsm1j7y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FtZXppbi9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzAKfQ=="}}} +, {"uuid": "ddterm@amezin.github.com", "name": "ddterm", "pname": "ddterm", "description": "Another drop down terminal extension for GNOME Shell. With tabs. Works on Wayland natively", "link": "https://extensions.gnome.org/extension/3780/ddterm/", "shell_version_map": {"38": {"version": "33", "sha256": "12mk3bfy7sqy0pi5xqhyvza77m3hl8yfbyhwbym9plfhm33qv6d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RkdGVybS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "40": {"version": "33", "sha256": "12mk3bfy7sqy0pi5xqhyvza77m3hl8yfbyhwbym9plfhm33qv6d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RkdGVybS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "41": {"version": "33", "sha256": "12mk3bfy7sqy0pi5xqhyvza77m3hl8yfbyhwbym9plfhm33qv6d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RkdGVybS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}, "42": {"version": "33", "sha256": "12mk3bfy7sqy0pi5xqhyvza77m3hl8yfbyhwbym9plfhm33qv6d6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFub3RoZXIgZHJvcCBkb3duIHRlcm1pbmFsIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwuIFdpdGggdGFicy4gV29ya3Mgb24gV2F5bGFuZCBuYXRpdmVseSIsCiAgImdldHRleHQtZG9tYWluIjogImRkdGVybUBhbWV6aW4uZ2l0aHViLmNvbSIsCiAgIm5hbWUiOiAiZGR0ZXJtIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImNvbS5naXRodWIuYW1lemluLmRkdGVybSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2RkdGVybS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGR0ZXJtIiwKICAidXVpZCI6ICJkZHRlcm1AYW1lemluLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMzMKfQ=="}}} , {"uuid": "favorites-only-dash@nahuelwexd.github.io", "name": "Favorites-only Dash", "pname": "favorites-only-dash", "description": "Show only favorite apps on Dash", "link": "https://extensions.gnome.org/extension/3789/favorites-only-dash/", "shell_version_map": {"38": {"version": "1", "sha256": "110h019563j33gksaq5fs0z71sz1mslq1sbsmhk9mj3qggd9vs65", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgb25seSBmYXZvcml0ZSBhcHBzIG9uIERhc2giLAogICJuYW1lIjogIkZhdm9yaXRlcy1vbmx5IERhc2giLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZmF2b3JpdGVzLW9ubHktZGFzaEBuYWh1ZWx3ZXhkLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "notification-timeout@chlumskyvaclav.gmail.com", "name": "Notification Timeout", "pname": "notification-timeout", "description": "This extension allows configuring the same timeout for all notifications. It also allows ignoring the idle state.", "link": "https://extensions.gnome.org/extension/3795/notification-timeout/", "shell_version_map": {"38": {"version": "5", "sha256": "1az6bbfzsq57nn83i4f4jl61z1n965iayfk7aavwya9z965lyafk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXRpbWVvdXRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "40": {"version": "5", "sha256": "1az6bbfzsq57nn83i4f4jl61z1n965iayfk7aavwya9z965lyafk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXRpbWVvdXRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1az6bbfzsq57nn83i4f4jl61z1n965iayfk7aavwya9z965lyafk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXRpbWVvdXRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1az6bbfzsq57nn83i4f4jl61z1n965iayfk7aavwya9z965lyafk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGFsbG93cyBjb25maWd1cmluZyB0aGUgc2FtZSB0aW1lb3V0IGZvciBhbGwgbm90aWZpY2F0aW9ucy4gSXQgYWxzbyBhbGxvd3MgaWdub3JpbmcgdGhlIGlkbGUgc3RhdGUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibm90aWZpY2F0aW9uLXRpbWVvdXQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBUaW1lb3V0IiwKICAib3JpZ2luYWwtYXV0aG9yIjogImNobHVtc2t5dmFjbGF2QGdtYWlsLmNvbSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3ZjaGx1bS9ub3RpZmljYXRpb24tdGltZW91dCIsCiAgInV1aWQiOiAibm90aWZpY2F0aW9uLXRpbWVvdXRAY2hsdW1za3l2YWNsYXYuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "podman-as-docker@alberto.yomerengues.xyz", "name": "Podman and Docker", "pname": "podman-as-docker", "description": "podman extension as docker\nIn order to get it work on podman, you just need to create an alias\nSimply put: alias docker=podman\nand install podman-docker", "link": "https://extensions.gnome.org/extension/3799/podman-as-docker/", "shell_version_map": {"38": {"version": "1", "sha256": "18bkd6z5hm6zidh7xv8v3jvj36lmxzx4dar7nwa7nq3p51km6crz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInBvZG1hbiBleHRlbnNpb24gYXMgZG9ja2VyXG5JbiBvcmRlciB0byBnZXQgaXQgd29yayBvbiBwb2RtYW4sIHlvdSBqdXN0IG5lZWQgdG8gY3JlYXRlIGFuIGFsaWFzXG5TaW1wbHkgcHV0OiBhbGlhcyBkb2NrZXI9cG9kbWFuXG5hbmQgaW5zdGFsbCBwb2RtYW4tZG9ja2VyIiwKICAibmFtZSI6ICJQb2RtYW4gYW5kIERvY2tlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJwb2RtYW4tYXMtZG9ja2VyQGFsYmVydG8ueW9tZXJlbmd1ZXMueHl6IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} @@ -422,7 +422,7 @@ , {"uuid": "toggle-alacritty@itstime.tech", "name": "Toggle Alacritty", "pname": "toggle-alacritty", "description": "Toggles Alacritty window via hotkey: Alt+z\n\nIf Alacritty is not launched, attempts to start it (/usr/bin/alacritty)\n\nWorks under both Wayland and X11\n\nTo change hotkey please follow instruction in the README.md:", "link": "https://extensions.gnome.org/extension/3942/toggle-alacritty/", "shell_version_map": {"38": {"version": "4", "sha256": "1kz5a8x9fpvilcd4p9pn6cmsj6gvq44cg85yhkgdi9x2qpd52fn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLWFsYWNyaXR0eS10b2dnbGUiLAogICJ1dWlkIjogInRvZ2dsZS1hbGFjcml0dHlAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "1kz5a8x9fpvilcd4p9pn6cmsj6gvq44cg85yhkgdi9x2qpd52fn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLWFsYWNyaXR0eS10b2dnbGUiLAogICJ1dWlkIjogInRvZ2dsZS1hbGFjcml0dHlAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1kz5a8x9fpvilcd4p9pn6cmsj6gvq44cg85yhkgdi9x2qpd52fn1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZXMgQWxhY3JpdHR5IHdpbmRvdyB2aWEgaG90a2V5OiBBbHQrelxuXG5JZiBBbGFjcml0dHkgaXMgbm90IGxhdW5jaGVkLCBhdHRlbXB0cyB0byBzdGFydCBpdCAoL3Vzci9iaW4vYWxhY3JpdHR5KVxuXG5Xb3JrcyB1bmRlciBib3RoIFdheWxhbmQgYW5kIFgxMVxuXG5UbyBjaGFuZ2UgaG90a2V5IHBsZWFzZSBmb2xsb3cgaW5zdHJ1Y3Rpb24gaW4gdGhlIFJFQURNRS5tZDoiLAogICJuYW1lIjogIlRvZ2dsZSBBbGFjcml0dHkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudG9nZ2xlLWFsYWNyaXR0eSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLWFsYWNyaXR0eS10b2dnbGUiLAogICJ1dWlkIjogInRvZ2dsZS1hbGFjcml0dHlAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "hide-panel@fthx", "name": "Hide Panel", "pname": "hide-panel", "description": "Hide top panel except in overview. Switch button in panel.\n\nVery very light extension. There is a 1 pixel wide line at the top of the screen that allows to blindly use the panel menus. This is needed to keep the native hot corner active without having to recreate it.", "link": "https://extensions.gnome.org/extension/3948/hide-panel/", "shell_version_map": {"38": {"version": "8", "sha256": "0nrj0kxfdxx7nmw0zai070ca5lv5r43bpgm2binv31xjyh385849", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy4gU3dpdGNoIGJ1dHRvbiBpbiBwYW5lbC5cblxuVmVyeSB2ZXJ5IGxpZ2h0IGV4dGVuc2lvbi4gVGhlcmUgaXMgYSAxIHBpeGVsIHdpZGUgbGluZSBhdCB0aGUgdG9wIG9mIHRoZSBzY3JlZW4gdGhhdCBhbGxvd3MgdG8gYmxpbmRseSB1c2UgdGhlIHBhbmVsIG1lbnVzLiBUaGlzIGlzIG5lZWRlZCB0byBrZWVwIHRoZSBuYXRpdmUgaG90IGNvcm5lciBhY3RpdmUgd2l0aG91dCBoYXZpbmcgdG8gcmVjcmVhdGUgaXQuIiwKICAibmFtZSI6ICJIaWRlIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbCIsCiAgInV1aWQiOiAiaGlkZS1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "0nrj0kxfdxx7nmw0zai070ca5lv5r43bpgm2binv31xjyh385849", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdG9wIHBhbmVsIGV4Y2VwdCBpbiBvdmVydmlldy4gU3dpdGNoIGJ1dHRvbiBpbiBwYW5lbC5cblxuVmVyeSB2ZXJ5IGxpZ2h0IGV4dGVuc2lvbi4gVGhlcmUgaXMgYSAxIHBpeGVsIHdpZGUgbGluZSBhdCB0aGUgdG9wIG9mIHRoZSBzY3JlZW4gdGhhdCBhbGxvd3MgdG8gYmxpbmRseSB1c2UgdGhlIHBhbmVsIG1lbnVzLiBUaGlzIGlzIG5lZWRlZCB0byBrZWVwIHRoZSBuYXRpdmUgaG90IGNvcm5lciBhY3RpdmUgd2l0aG91dCBoYXZpbmcgdG8gcmVjcmVhdGUgaXQuIiwKICAibmFtZSI6ICJIaWRlIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2Z0aHgvaGlkZS1wYW5lbCIsCiAgInV1aWQiOiAiaGlkZS1wYW5lbEBmdGh4IiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "persistent-email-notifications@fthx", "name": "Persistent Email Notifications", "pname": "persistent-email-notifications", "description": "Never hide a new mail notification, except if you close it.\n\nVery very light extension. Email clients supported: Thunderbird, Evolution, Geary, Mailspring, TypeApp, BlueMail. Please ask for another email client if needed.", "link": "https://extensions.gnome.org/extension/3951/persistent-email-notifications/", "shell_version_map": {"38": {"version": "3", "sha256": "06m6fhs50vlrwkgdk6cvkcl5f155a1w8szs1g9pzryf8mmldgmdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbWFpbCBub3RpZmljYXRpb24sIGV4Y2VwdCBpZiB5b3UgY2xvc2UgaXQuXG5cblZlcnkgdmVyeSBsaWdodCBleHRlbnNpb24uIEVtYWlsIGNsaWVudHMgc3VwcG9ydGVkOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZywgVHlwZUFwcCwgQmx1ZU1haWwuIFBsZWFzZSBhc2sgZm9yIGFub3RoZXIgZW1haWwgY2xpZW50IGlmIG5lZWRlZC4iLAogICJuYW1lIjogIlBlcnNpc3RlbnQgRW1haWwgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3BlcnNpc3RlbnQtZW1haWwtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAicGVyc2lzdGVudC1lbWFpbC1ub3RpZmljYXRpb25zQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "06m6fhs50vlrwkgdk6cvkcl5f155a1w8szs1g9pzryf8mmldgmdd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5ldmVyIGhpZGUgYSBuZXcgbWFpbCBub3RpZmljYXRpb24sIGV4Y2VwdCBpZiB5b3UgY2xvc2UgaXQuXG5cblZlcnkgdmVyeSBsaWdodCBleHRlbnNpb24uIEVtYWlsIGNsaWVudHMgc3VwcG9ydGVkOiBUaHVuZGVyYmlyZCwgRXZvbHV0aW9uLCBHZWFyeSwgTWFpbHNwcmluZywgVHlwZUFwcCwgQmx1ZU1haWwuIFBsZWFzZSBhc2sgZm9yIGFub3RoZXIgZW1haWwgY2xpZW50IGlmIG5lZWRlZC4iLAogICJuYW1lIjogIlBlcnNpc3RlbnQgRW1haWwgTm90aWZpY2F0aW9ucyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L3BlcnNpc3RlbnQtZW1haWwtbm90aWZpY2F0aW9ucyIsCiAgInV1aWQiOiAicGVyc2lzdGVudC1lbWFpbC1ub3RpZmljYXRpb25zQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "horizontal-workspace-indicator@tty2.io", "name": "Workspace indicator", "pname": "workspace-indicator", "description": "Workspace indicator shows the amount of opened workspaces and highlights the current one using unicode characters.\n\nYou can use it as an indicator only but widget is clickable. Left button click: move to left, right click: move right. Middle click calls overview.\n\nThere could be an error with the extension after update. The solution is to logout and login again.\n\nIf your indicator looks different from one on screen shot, install DejaVu Sans or Ubuntu font.", "link": "https://extensions.gnome.org/extension/3952/workspace-indicator/", "shell_version_map": {"38": {"version": "9", "sha256": "1inrxf5n2agv94zcqljbkna2lhdj84ppdirfq80035dj6iwpfaz9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuVGhlcmUgY291bGQgYmUgYW4gZXJyb3Igd2l0aCB0aGUgZXh0ZW5zaW9uIGFmdGVyIHVwZGF0ZS4gVGhlIHNvbHV0aW9uIGlzIHRvIGxvZ291dCBhbmQgbG9naW4gYWdhaW4uXG5cbklmIHlvdXIgaW5kaWNhdG9yIGxvb2tzIGRpZmZlcmVudCBmcm9tIG9uZSBvbiBzY3JlZW4gc2hvdCwgaW5zdGFsbCBEZWphVnUgU2FucyBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "13", "sha256": "1r4zw85wwx2idlqiw9gmrmxb3infjvvy8nz1i47pk0ry81h94y7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuVGhlcmUgY291bGQgYmUgYW4gZXJyb3Igd2l0aCB0aGUgZXh0ZW5zaW9uIGFmdGVyIHVwZGF0ZS4gVGhlIHNvbHV0aW9uIGlzIHRvIGxvZ291dCBhbmQgbG9naW4gYWdhaW4uXG5cbklmIHlvdXIgaW5kaWNhdG9yIGxvb2tzIGRpZmZlcmVudCBmcm9tIG9uZSBvbiBzY3JlZW4gc2hvdCwgaW5zdGFsbCBEZWphVnUgU2FucyBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "1r4zw85wwx2idlqiw9gmrmxb3infjvvy8nz1i47pk0ry81h94y7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuVGhlcmUgY291bGQgYmUgYW4gZXJyb3Igd2l0aCB0aGUgZXh0ZW5zaW9uIGFmdGVyIHVwZGF0ZS4gVGhlIHNvbHV0aW9uIGlzIHRvIGxvZ291dCBhbmQgbG9naW4gYWdhaW4uXG5cbklmIHlvdXIgaW5kaWNhdG9yIGxvb2tzIGRpZmZlcmVudCBmcm9tIG9uZSBvbiBzY3JlZW4gc2hvdCwgaW5zdGFsbCBEZWphVnUgU2FucyBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "1r4zw85wwx2idlqiw9gmrmxb3infjvvy8nz1i47pk0ry81h94y7q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuVGhlcmUgY291bGQgYmUgYW4gZXJyb3Igd2l0aCB0aGUgZXh0ZW5zaW9uIGFmdGVyIHVwZGF0ZS4gVGhlIHNvbHV0aW9uIGlzIHRvIGxvZ291dCBhbmQgbG9naW4gYWdhaW4uXG5cbklmIHlvdXIgaW5kaWNhdG9yIGxvb2tzIGRpZmZlcmVudCBmcm9tIG9uZSBvbiBzY3JlZW4gc2hvdCwgaW5zdGFsbCBEZWphVnUgU2FucyBvciBVYnVudHUgZm9udC4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDEzCn0="}}} +, {"uuid": "horizontal-workspace-indicator@tty2.io", "name": "Workspace indicator", "pname": "workspace-indicator", "description": "Workspace indicator shows the amount of opened workspaces and highlights the current one using unicode characters.\n\nYou can use it as an indicator only but widget is clickable. Left button click: move to left, right click: move right. Middle click calls overview.\n\nIf your indicator looks different from one on screen shot, install DejaVu Serif or Ubuntu font.\n\nUpdate 2022.07.25: there can be issues with appearance related with fonts. Update extension.", "link": "https://extensions.gnome.org/extension/3952/workspace-indicator/", "shell_version_map": {"38": {"version": "9", "sha256": "1s0h2wgrikqfq0cmss64axzwp6njbfbfgp92icx7d8rk4cc07sdn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC5cblxuVXBkYXRlIDIwMjIuMDcuMjU6IHRoZXJlIGNhbiBiZSBpc3N1ZXMgd2l0aCBhcHBlYXJhbmNlIHJlbGF0ZWQgd2l0aCBmb250cy4gVXBkYXRlIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R0eTIvaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3JAdHR5Mi5pbyIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "14", "sha256": "0df6w9ypy5h8mfcbijah2qc7hhlzrbmp1rifnl2a1pb2jwf4cgx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC5cblxuVXBkYXRlIDIwMjIuMDcuMjU6IHRoZXJlIGNhbiBiZSBpc3N1ZXMgd2l0aCBhcHBlYXJhbmNlIHJlbGF0ZWQgd2l0aCBmb250cy4gVXBkYXRlIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "0df6w9ypy5h8mfcbijah2qc7hhlzrbmp1rifnl2a1pb2jwf4cgx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC5cblxuVXBkYXRlIDIwMjIuMDcuMjU6IHRoZXJlIGNhbiBiZSBpc3N1ZXMgd2l0aCBhcHBlYXJhbmNlIHJlbGF0ZWQgd2l0aCBmb250cy4gVXBkYXRlIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "0df6w9ypy5h8mfcbijah2qc7hhlzrbmp1rifnl2a1pb2jwf4cgx1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0b3Igc2hvd3MgdGhlIGFtb3VudCBvZiBvcGVuZWQgd29ya3NwYWNlcyBhbmQgaGlnaGxpZ2h0cyB0aGUgY3VycmVudCBvbmUgdXNpbmcgdW5pY29kZSBjaGFyYWN0ZXJzLlxuXG5Zb3UgY2FuIHVzZSBpdCBhcyBhbiBpbmRpY2F0b3Igb25seSBidXQgd2lkZ2V0IGlzIGNsaWNrYWJsZS4gTGVmdCBidXR0b24gY2xpY2s6IG1vdmUgdG8gbGVmdCwgcmlnaHQgY2xpY2s6IG1vdmUgcmlnaHQuIE1pZGRsZSBjbGljayBjYWxscyBvdmVydmlldy5cblxuSWYgeW91ciBpbmRpY2F0b3IgbG9va3MgZGlmZmVyZW50IGZyb20gb25lIG9uIHNjcmVlbiBzaG90LCBpbnN0YWxsIERlamFWdSBTZXJpZiBvciBVYnVudHUgZm9udC5cblxuVXBkYXRlIDIwMjIuMDcuMjU6IHRoZXJlIGNhbiBiZSBpc3N1ZXMgd2l0aCBhcHBlYXJhbmNlIHJlbGF0ZWQgd2l0aCBmb250cy4gVXBkYXRlIGV4dGVuc2lvbi4iLAogICJuYW1lIjogIldvcmtzcGFjZSBpbmRpY2F0b3IiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaG9yaXpvbnRhbC13b3Jrc3BhY2UtaW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdHR5Mi9ob3Jpem9udGFsLXdvcmtzcGFjZS1pbmRpY2F0b3IiLAogICJ1dWlkIjogImhvcml6b250YWwtd29ya3NwYWNlLWluZGljYXRvckB0dHkyLmlvIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} , {"uuid": "kitchentimer@blackjackshellac.ca", "name": "Kitchen Timer", "pname": "kitchen-timer", "description": "General purpose timer extension for Gnome Shell\n\nPlease report issues on github\n\nIf updating the extension reports an ERROR, it should work after the next reboot or if you logout and login again.", "link": "https://extensions.gnome.org/extension/3955/kitchen-timer/", "shell_version_map": {"38": {"version": "28", "sha256": "0k1ahswl2ipjz1v1z1j96lndbk26rgfr2ra2g78lvzjiv6j42sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYWwgcHVycG9zZSB0aW1lciBleHRlbnNpb24gZm9yIEdub21lIFNoZWxsXG5cblBsZWFzZSByZXBvcnQgaXNzdWVzIG9uIGdpdGh1YlxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IsIGl0IHNob3VsZCB3b3JrIGFmdGVyIHRoZSBuZXh0IHJlYm9vdCBvciBpZiB5b3UgbG9nb3V0IGFuZCBsb2dpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJraXRjaGVuLXRpbWVyLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogIktpdGNoZW4gVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2l0Y2hlbi10aW1lci1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMva2l0Y2hlblRpbWVyIiwKICAidXVpZCI6ICJraXRjaGVudGltZXJAYmxhY2tqYWNrc2hlbGxhYy5jYSIsCiAgInZlcnNpb24iOiAyOAp9"}, "40": {"version": "28", "sha256": "0k1ahswl2ipjz1v1z1j96lndbk26rgfr2ra2g78lvzjiv6j42sdf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdlbmVyYWwgcHVycG9zZSB0aW1lciBleHRlbnNpb24gZm9yIEdub21lIFNoZWxsXG5cblBsZWFzZSByZXBvcnQgaXNzdWVzIG9uIGdpdGh1YlxuXG5JZiB1cGRhdGluZyB0aGUgZXh0ZW5zaW9uIHJlcG9ydHMgYW4gRVJST1IsIGl0IHNob3VsZCB3b3JrIGFmdGVyIHRoZSBuZXh0IHJlYm9vdCBvciBpZiB5b3UgbG9nb3V0IGFuZCBsb2dpbiBhZ2Fpbi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJraXRjaGVuLXRpbWVyLWJsYWNramFja3NoZWxsYWMiLAogICJuYW1lIjogIktpdGNoZW4gVGltZXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMua2l0Y2hlbi10aW1lci1ibGFja2phY2tzaGVsbGFjIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JsYWNramFja3NoZWxsYWMva2l0Y2hlblRpbWVyIiwKICAidXVpZCI6ICJraXRjaGVudGltZXJAYmxhY2tqYWNrc2hlbGxhYy5jYSIsCiAgInZlcnNpb24iOiAyOAp9"}}} , {"uuid": "gnome-fuzzy-app-search@gnome-shell-extensions.Czarlie.gitlab.com", "name": "GNOME Fuzzy App Search", "pname": "gnome-fuzzy-app-search", "description": "Fuzzy application search results for Gnome Search", "link": "https://extensions.gnome.org/extension/3956/gnome-fuzzy-app-search/", "shell_version_map": {"38": {"version": "16", "sha256": "0yhc4rrxdqkd2in0vi3kxc7q3llbk88r47fqbvvlbcf8viv7blkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQ3phcmxpZS9nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAidXVpZCI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuQ3phcmxpZS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "40": {"version": "16", "sha256": "0yhc4rrxdqkd2in0vi3kxc7q3llbk88r47fqbvvlbcf8viv7blkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQ3phcmxpZS9nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAidXVpZCI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuQ3phcmxpZS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "16", "sha256": "0yhc4rrxdqkd2in0vi3kxc7q3llbk88r47fqbvvlbcf8viv7blkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQ3phcmxpZS9nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAidXVpZCI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuQ3phcmxpZS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "42": {"version": "16", "sha256": "0yhc4rrxdqkd2in0vi3kxc7q3llbk88r47fqbvvlbcf8viv7blkq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImF1dGhvciI6ICJDemFybGllIDxsZWVlNDlAZ21haWwuY29tPiIsCiAgImF1dGhvci1odG1sIjogIkN6YXJsaWUgJmx0OzxhIGhyZWY9XCJtYWlsdG86bGVlZTQ5Ljd4N0BnbWFpbC5jb21cIj5sZWVlNDkuN3g3QGdtYWlsLmNvbTwvYT4mZ3Q7IiwKICAiZGVzY3JpcHRpb24iOiAiRnV6enkgYXBwbGljYXRpb24gc2VhcmNoIHJlc3VsdHMgZm9yIEdub21lIFNlYXJjaCIsCiAgImRlc2NyaXB0aW9uLWh0bWwiOiAiPGEgaHJlZj1cImh0dHBzOi8vZW4ud2lraXBlZGlhLm9yZy93aWtpL0FwcHJveGltYXRlX3N0cmluZ19tYXRjaGluZ1wiPkZ1enp5PC9hPiBhcHBsaWNhdGlvbiBzZWFyY2ggcmVzdWx0cyBmb3IgPGEgaHJlZj1cImh0dHBzOi8vZGV2ZWxvcGVyLmdub21lLm9yZy9TZWFyY2hQcm92aWRlci9cIj5Hbm9tZSBTZWFyY2g8L2E+LiIsCiAgImVtYWlsIjogImxlZWU0OS43eDdAZ21haWwuY29tIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtZnV6enktYXBwLXNlYXJjaCIsCiAgImxpY2Vuc2UiOiAiR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgdjMuMCIsCiAgImxpY2Vuc2UtaHRtbCI6ICJUaGlzIHByb2dyYW0gY29tZXMgd2l0aCBBQlNPTFVURUxZIE5PIFdBUlJBTlRZLlxuU2VlIHRoZSA8YSBocmVmPVwiaHR0cHM6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy9ncGwtMy4wLmh0bWxcIj5HTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSB2My4wPC9hPiBmb3IgZGV0YWlscy4iLAogICJuYW1lIjogIkdOT01FIEZ1enp5IEFwcCBTZWFyY2giLAogICJvcmlnaW5hbC1hdXRob3IiOiAiRnJhbmpvIEZpbG8gPGZmZmlsbzY2NkBnbWFpbC5jb20+IiwKICAib3JpZ2luYWwtYXV0aG9yLWh0bWwiOiAiRnJhbmpvIEZpbG8gJmx0OzxhIGhyZWY9XCJtYWlsdG86ZmZmaWxvNjY2QGdtYWlsLmNvbVwiPmZmZmlsbzY2NkBnbWFpbC5jb208L2E+Jmd0OyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQ3phcmxpZS9nbm9tZS1mdXp6eS1hcHAtc2VhcmNoIiwKICAidXVpZCI6ICJnbm9tZS1mdXp6eS1hcHAtc2VhcmNoQGdub21lLXNoZWxsLWV4dGVuc2lvbnMuQ3phcmxpZS5naXRsYWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} , {"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=="}}} @@ -431,7 +431,7 @@ , {"uuid": "gnome4synology@psasse.gmx.de", "name": "Movie Search provider for Synology®", "pname": "gnome-movie-search-provider-for-synology", "description": "search provider for movie titles on Synology® NAS including offline search (yet to come)", "link": "https://extensions.gnome.org/extension/3969/gnome-movie-search-provider-for-synology/", "shell_version_map": {"40": {"version": "14", "sha256": "133jgh7s8mdc4dbcwr623yyrpfb8nv96iggsk2kb18lkw2rcf3xi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogInNlYXJjaCBwcm92aWRlciBmb3IgbW92aWUgdGl0bGVzIG9uIFN5bm9sb2d5XHUwMGFlIE5BUyBpbmNsdWRpbmcgb2ZmbGluZSBzZWFyY2ggKHlldCB0byBjb21lKSIsCiAgIm5hbWUiOiAiTW92aWUgU2VhcmNoIHByb3ZpZGVyIGZvciBTeW5vbG9neVx1MDBhZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wc2Fzc2U3Mi9tb3ZpZXM0c3lub2xvZ3kiLAogICJ1dWlkIjogImdub21lNHN5bm9sb2d5QHBzYXNzZS5nbXguZGUiLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "guillotine@fopdoodle.net", "name": "Guillotine", "pname": "guillotine", "description": "Guillotine is a gnome extension designed for efficiently carrying out executions of commands from a customizable menu. Simply speaking: it is a highly customizable menu that enables you to launch commands and toggle services.", "link": "https://extensions.gnome.org/extension/3981/guillotine/", "shell_version_map": {"38": {"version": "3", "sha256": "0r171an47d1fdhzwiq7kg59hasibmcvvcsv9z9xd1kh5jahzmam5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZW50ZTc2L2d1aWxsb3RpbmUvIiwKICAidXVpZCI6ICJndWlsbG90aW5lQGZvcGRvb2RsZS5uZXQiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "15", "sha256": "10i86kx5j5rd1hamj8b3kn6lhmv9zb9xid98f2l5l1sna74xh161", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZW50ZTc2L2d1aWxsb3RpbmUvIiwKICAidXVpZCI6ICJndWlsbG90aW5lQGZvcGRvb2RsZS5uZXQiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "41": {"version": "15", "sha256": "10i86kx5j5rd1hamj8b3kn6lhmv9zb9xid98f2l5l1sna74xh161", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZW50ZTc2L2d1aWxsb3RpbmUvIiwKICAidXVpZCI6ICJndWlsbG90aW5lQGZvcGRvb2RsZS5uZXQiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}, "42": {"version": "15", "sha256": "10i86kx5j5rd1hamj8b3kn6lhmv9zb9xid98f2l5l1sna74xh161", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkd1aWxsb3RpbmUgaXMgYSBnbm9tZSBleHRlbnNpb24gZGVzaWduZWQgZm9yIGVmZmljaWVudGx5IGNhcnJ5aW5nIG91dCBleGVjdXRpb25zIG9mIGNvbW1hbmRzIGZyb20gYSBjdXN0b21pemFibGUgbWVudS4gU2ltcGx5IHNwZWFraW5nOiBpdCBpcyBhIGhpZ2hseSBjdXN0b21pemFibGUgbWVudSB0aGF0IGVuYWJsZXMgeW91IHRvIGxhdW5jaCBjb21tYW5kcyBhbmQgdG9nZ2xlIHNlcnZpY2VzLiIsCiAgIm5hbWUiOiAiR3VpbGxvdGluZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5ndWlsbG90aW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vZW50ZTc2L2d1aWxsb3RpbmUvIiwKICAidXVpZCI6ICJndWlsbG90aW5lQGZvcGRvb2RsZS5uZXQiLAogICJ2ZXJzaW9uIjogMTUKfQ=="}}} , {"uuid": "shuzhi@tuberry", "name": "Shu Zhi", "pname": "shu-zhi", "description": "Wallpaper generation extension for GNOME Shell, inspired by Jizhi\n\nFor support, please report any issues via the homepage link below.", "link": "https://extensions.gnome.org/extension/3985/shu-zhi/", "shell_version_map": {"38": {"version": "7", "sha256": "1yk39q1ydv7kmb8shi4cp7pf5zvpmj99gjl9svack4773dj9rrwi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogInNodXpoaSIsCiAgIm5hbWUiOiAiU2h1IFpoaSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaHV6aGkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90dWJlcnJ5L3NodXpoaSIsCiAgInV1aWQiOiAic2h1emhpQHR1YmVycnkiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "17", "sha256": "1n0ajmm6d7y6kify6k9g3j2kc3ass9s7zyif5jhr1djzsi6knpq0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxNwp9"}, "41": {"version": "19", "sha256": "1ib82yf7gh97hygbrxccpsh75jpg65rp834vygi25kyf0b8fykff", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "21", "sha256": "1pbldn51jjfq45d3bl7nfciff1mn3krl7dhiwp9hqrp3hchlassd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldhbGxwYXBlciBnZW5lcmF0aW9uIGV4dGVuc2lvbiBmb3IgR05PTUUgU2hlbGwsIGluc3BpcmVkIGJ5IEppemhpXG5cbkZvciBzdXBwb3J0LCBwbGVhc2UgcmVwb3J0IGFueSBpc3N1ZXMgdmlhIHRoZSBob21lcGFnZSBsaW5rIGJlbG93LiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1zaHV6aGkiLAogICJuYW1lIjogIlNodSBaaGkiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2h1emhpIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3R1YmVycnkvc2h1emhpIiwKICAidXVpZCI6ICJzaHV6aGlAdHViZXJyeSIsCiAgInZlcnNpb24iOiAyMQp9"}}} -, {"uuid": "zilence@apankowski.github.com", "name": "Zilence", "pname": "zilence", "description": "Turns off notifications while sharing screen during a Zoom call", "link": "https://extensions.gnome.org/extension/3988/zilence/", "shell_version_map": {"38": {"version": "3", "sha256": "03svlpgsjz8i3a7y75m8whx7yr7pqiv5c2x6vgp399h4wjxdl4br", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICI1NTUxMzk0YTFmNmYxMDlkZDgxNzhkNTg5ODNhN2MwMTE1YzVmYmRjIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FwYW5rb3dza2kvemlsZW5jZSIsCiAgInV1aWQiOiAiemlsZW5jZUBhcGFua293c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "03svlpgsjz8i3a7y75m8whx7yr7pqiv5c2x6vgp399h4wjxdl4br", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImNvbW1pdCI6ICI1NTUxMzk0YTFmNmYxMDlkZDgxNzhkNTg5ODNhN2MwMTE1YzVmYmRjIiwKICAiZGVzY3JpcHRpb24iOiAiVHVybnMgb2ZmIG5vdGlmaWNhdGlvbnMgd2hpbGUgc2hhcmluZyBzY3JlZW4gZHVyaW5nIGEgWm9vbSBjYWxsIiwKICAibmFtZSI6ICJaaWxlbmNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FwYW5rb3dza2kvemlsZW5jZSIsCiAgInV1aWQiOiAiemlsZW5jZUBhcGFua293c2tpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"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": "27", "sha256": "0gibbkzk5806d899csqkbk23dcp9nxawpssnsj7y9ksl11apnphp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJsdWV0b290aCBiYXR0ZXJ5IGluZGljYXRvciIsCiAgImdldHRleHQtZG9tYWluIjogImJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgIm5hbWUiOiAiQmx1ZXRvb3RoIGJhdHRlcnkgaW5kaWNhdG9yIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmJsdWV0b290aF9iYXR0ZXJ5X2luZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NaWNoYWxXL2dub21lLWJsdWV0b290aC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiYmx1ZXRvb3RoLWJhdHRlcnlAbWljaGFsdy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDI3Cn0="}}} , {"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": "8", "sha256": "0yl2fxs1pl9i9yfgks1ypvzdpyzagjf5s51x0lxnw76ciwrrg47v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiwgSVB2NiBhbmQgVlBOIGluIHRoZSBHTk9NRSBwYW5lbC4gQ2xpY2sgb24gdGhlIGFkZHJlc3MgdG8gY3ljbGUgdHJvdWdoIGRpZmZlcmVudCBpbnRlcmZhY2VzLiIsCiAgIm5hbWUiOiAiQWxsIElQIEFkZHJlc3NlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "0yl2fxs1pl9i9yfgks1ypvzdpyzagjf5s51x0lxnw76ciwrrg47v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiwgSVB2NiBhbmQgVlBOIGluIHRoZSBHTk9NRSBwYW5lbC4gQ2xpY2sgb24gdGhlIGFkZHJlc3MgdG8gY3ljbGUgdHJvdWdoIGRpZmZlcmVudCBpbnRlcmZhY2VzLiIsCiAgIm5hbWUiOiAiQWxsIElQIEFkZHJlc3NlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0yl2fxs1pl9i9yfgks1ypvzdpyzagjf5s51x0lxnw76ciwrrg47v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiwgSVB2NiBhbmQgVlBOIGluIHRoZSBHTk9NRSBwYW5lbC4gQ2xpY2sgb24gdGhlIGFkZHJlc3MgdG8gY3ljbGUgdHJvdWdoIGRpZmZlcmVudCBpbnRlcmZhY2VzLiIsCiAgIm5hbWUiOiAiQWxsIElQIEFkZHJlc3NlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "0yl2fxs1pl9i9yfgks1ypvzdpyzagjf5s51x0lxnw76ciwrrg47v", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgSVAgYWRkcmVzc2VzIGZvciBMQU4sIFdBTiwgSVB2NiBhbmQgVlBOIGluIHRoZSBHTk9NRSBwYW5lbC4gQ2xpY2sgb24gdGhlIGFkZHJlc3MgdG8gY3ljbGUgdHJvdWdoIGRpZmZlcmVudCBpbnRlcmZhY2VzLiIsCiAgIm5hbWUiOiAiQWxsIElQIEFkZHJlc3NlcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3BoYXZla2VzL2dub21lLWV4dGVuc2lvbi1hbGwtaXAtYWRkcmVzc2VzIiwKICAidXVpZCI6ICJnbm9tZS1leHRlbnNpb24tYWxsLWlwLWFkZHJlc3Nlc0BoYXZla2VzLmV1IiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"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"}}} @@ -452,10 +452,10 @@ , {"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": "4", "sha256": "0b38pcdxyx8znhw7bn4f1x07g672f8rm6k7hhrkdr3v676z3s93n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN3aXRjaHR3b2xheW91dHNAcXRtYXguZGV2IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0b38pcdxyx8znhw7bn4f1x07g672f8rm6k7hhrkdr3v676z3s93n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN3aXRjaHR3b2xheW91dHNAcXRtYXguZGV2IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0b38pcdxyx8znhw7bn4f1x07g672f8rm6k7hhrkdr3v676z3s93n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN3aXRjaHR3b2xheW91dHNAcXRtYXguZGV2IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0b38pcdxyx8znhw7bn4f1x07g672f8rm6k7hhrkdr3v676z3s93n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIG1ha2VzIFhLQiBzaG9ydGN1dHMgdG8gc3dpdGNoIGtleWJvYXJkIGxheW91dHMgKHN1Y2ggYXMgQ2FwcyBMb2NrLCBDdHJsK1NoaWZ0LCBldGMuKSBjeWNsZSBiZXR3ZWVuIHRoZSB0d28gZmlyc3QgbGF5b3V0cy4gVGhlIG90aGVyIG9uZXMgc3RpbGwgY2FuIGJlIHNlbGVjdGVkIHZpYSB0aGUgbWVudSBvciB1c2luZyBHTk9NRSdzIHNob3J0Y3V0cyAoU3VwZXIrU3BhY2UsIFNoaWZ0K1N1cGVyK1NwYWNlKS4gSXQncyB1c2VmdWwgd2hlbiB5b3UgaGF2ZSB0d28gcHJpbWFyeSBsYXlvdXRzIGFuZCBtb3JlIGFkZGl0aW9uYWwsIHdoaWNoIGFyZSB1c2VkIG1vcmUgcmFyZWx5LiIsCiAgIm5hbWUiOiAiU3dpdGNoIFR3byBMYXlvdXRzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInN3aXRjaHR3b2xheW91dHNAcXRtYXguZGV2IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"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=="}}} , {"uuid": "disable-gestures-2021@verycrazydog.gmail.com", "name": "Disable Gestures 2021", "pname": "disable-gestures-2021", "description": "Disable all GNOME built-in gestures. Useful for kiosks and touch screen apps.", "link": "https://extensions.gnome.org/extension/4049/disable-gestures-2021/", "shell_version_map": {"38": {"version": "4", "sha256": "116icgf3g079f8pibcb9jb1jc3y97hjf6fcqq1yb1bcsrx4wp0w5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2ggc2NyZWVuIGFwcHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIEdlc3R1cmVzIDIwMjEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WZXJ5Q3JhenlEb2cvZ25vbWUtZGlzYWJsZS1nZXN0dXJlcyIsCiAgInV1aWQiOiAiZGlzYWJsZS1nZXN0dXJlcy0yMDIxQHZlcnljcmF6eWRvZy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "116icgf3g079f8pibcb9jb1jc3y97hjf6fcqq1yb1bcsrx4wp0w5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2ggc2NyZWVuIGFwcHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIEdlc3R1cmVzIDIwMjEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WZXJ5Q3JhenlEb2cvZ25vbWUtZGlzYWJsZS1nZXN0dXJlcyIsCiAgInV1aWQiOiAiZGlzYWJsZS1nZXN0dXJlcy0yMDIxQHZlcnljcmF6eWRvZy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "116icgf3g079f8pibcb9jb1jc3y97hjf6fcqq1yb1bcsrx4wp0w5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2ggc2NyZWVuIGFwcHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIEdlc3R1cmVzIDIwMjEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WZXJ5Q3JhenlEb2cvZ25vbWUtZGlzYWJsZS1nZXN0dXJlcyIsCiAgInV1aWQiOiAiZGlzYWJsZS1nZXN0dXJlcy0yMDIxQHZlcnljcmF6eWRvZy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "116icgf3g079f8pibcb9jb1jc3y97hjf6fcqq1yb1bcsrx4wp0w5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgYWxsIEdOT01FIGJ1aWx0LWluIGdlc3R1cmVzLiBVc2VmdWwgZm9yIGtpb3NrcyBhbmQgdG91Y2ggc2NyZWVuIGFwcHMuIiwKICAibmFtZSI6ICJEaXNhYmxlIEdlc3R1cmVzIDIwMjEiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WZXJ5Q3JhenlEb2cvZ25vbWUtZGlzYWJsZS1nZXN0dXJlcyIsCiAgInV1aWQiOiAiZGlzYWJsZS1nZXN0dXJlcy0yMDIxQHZlcnljcmF6eWRvZy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "pi-hole@fnxweb.com", "name": "pi-hole", "pname": "pi-hole", "description": "Status and basic controls of local Pi-Hole", "link": "https://extensions.gnome.org/extension/4051/pi-hole/", "shell_version_map": {"38": {"version": "1", "sha256": "0m19lv8zfhh8vqn0ln4a8g4g4hw9p6h98gb656vb0hblp5gsycfm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBhbmQgYmFzaWMgY29udHJvbHMgb2YgbG9jYWwgUGktSG9sZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1mbnh3ZWItcGktaG9sZSIsCiAgIm5hbWUiOiAicGktaG9sZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbnh3ZWItcGktaG9sZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1waS1ob2xlIiwKICAidXVpZCI6ICJwaS1ob2xlQGZueHdlYi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "3", "sha256": "1brgdlxr5l4a5w821r0jy8r2k7h6n0cg344a4r00aj899i9wv8dp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBhbmQgYmFzaWMgY29udHJvbHMgb2YgbG9jYWwgUGktSG9sZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1mbnh3ZWItcGktaG9sZSIsCiAgIm5hbWUiOiAicGktaG9sZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbnh3ZWItcGktaG9sZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZm54d2ViL2dub21lLXNoZWxsLXBpLWhvbGUiLAogICJ1dWlkIjogInBpLWhvbGVAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "1brgdlxr5l4a5w821r0jy8r2k7h6n0cg344a4r00aj899i9wv8dp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBhbmQgYmFzaWMgY29udHJvbHMgb2YgbG9jYWwgUGktSG9sZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1mbnh3ZWItcGktaG9sZSIsCiAgIm5hbWUiOiAicGktaG9sZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbnh3ZWItcGktaG9sZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZm54d2ViL2dub21lLXNoZWxsLXBpLWhvbGUiLAogICJ1dWlkIjogInBpLWhvbGVAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "pi-hole@fnxweb.com", "name": "pi-hole", "pname": "pi-hole", "description": "Status and basic controls of local Pi-Hole", "link": "https://extensions.gnome.org/extension/4051/pi-hole/", "shell_version_map": {"38": {"version": "1", "sha256": "0m19lv8zfhh8vqn0ln4a8g4g4hw9p6h98gb656vb0hblp5gsycfm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBhbmQgYmFzaWMgY29udHJvbHMgb2YgbG9jYWwgUGktSG9sZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1mbnh3ZWItcGktaG9sZSIsCiAgIm5hbWUiOiAicGktaG9sZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbnh3ZWItcGktaG9sZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ZueHdlYi9nbm9tZS1zaGVsbC1waS1ob2xlIiwKICAidXVpZCI6ICJwaS1ob2xlQGZueHdlYi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "5", "sha256": "1dqa2bpigmycq6nsr04p8n91aj8pmzw5vn0d2za112mizzmb7xpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBhbmQgYmFzaWMgY29udHJvbHMgb2YgbG9jYWwgUGktSG9sZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1mbnh3ZWItcGktaG9sZSIsCiAgIm5hbWUiOiAicGktaG9sZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbnh3ZWItcGktaG9sZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZm54d2ViL2dub21lLXNoZWxsLXBpLWhvbGUiLAogICJ1dWlkIjogInBpLWhvbGVAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1dqa2bpigmycq6nsr04p8n91aj8pmzw5vn0d2za112mizzmb7xpc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN0YXR1cyBhbmQgYmFzaWMgY29udHJvbHMgb2YgbG9jYWwgUGktSG9sZSIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi1mbnh3ZWItcGktaG9sZSIsCiAgIm5hbWUiOiAicGktaG9sZSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mbnh3ZWItcGktaG9sZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZm54d2ViL2dub21lLXNoZWxsLXBpLWhvbGUiLAogICJ1dWlkIjogInBpLWhvbGVAZm54d2ViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "miniCal3@mtharpe", "name": "Minimalist Calendar 3", "pname": "minimalist-calendar-3", "description": "Remove event list and clock/calendar app buttons from the calendar window. This is just an updated version of v2 by breiq", "link": "https://extensions.gnome.org/extension/4052/minimalist-calendar-3/", "shell_version_map": {"38": {"version": "3", "sha256": "1vmqx1w9aymwb2a09b07fj18kxpki6blvzbvfamvk84b6x2qcxkn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBldmVudCBsaXN0IGFuZCBjbG9jay9jYWxlbmRhciBhcHAgYnV0dG9ucyBmcm9tIHRoZSBjYWxlbmRhciB3aW5kb3cuIFRoaXMgaXMganVzdCBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdjIgYnkgYnJlaXEiLAogICJuYW1lIjogIk1pbmltYWxpc3QgQ2FsZW5kYXIgMyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXRoYXJwZS9nbm9tZS1taW5DYWwzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibWluaUNhbDNAbXRoYXJwZSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1vmqx1w9aymwb2a09b07fj18kxpki6blvzbvfamvk84b6x2qcxkn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBldmVudCBsaXN0IGFuZCBjbG9jay9jYWxlbmRhciBhcHAgYnV0dG9ucyBmcm9tIHRoZSBjYWxlbmRhciB3aW5kb3cuIFRoaXMgaXMganVzdCBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdjIgYnkgYnJlaXEiLAogICJuYW1lIjogIk1pbmltYWxpc3QgQ2FsZW5kYXIgMyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXRoYXJwZS9nbm9tZS1taW5DYWwzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibWluaUNhbDNAbXRoYXJwZSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1vmqx1w9aymwb2a09b07fj18kxpki6blvzbvfamvk84b6x2qcxkn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZSBldmVudCBsaXN0IGFuZCBjbG9jay9jYWxlbmRhciBhcHAgYnV0dG9ucyBmcm9tIHRoZSBjYWxlbmRhciB3aW5kb3cuIFRoaXMgaXMganVzdCBhbiB1cGRhdGVkIHZlcnNpb24gb2YgdjIgYnkgYnJlaXEiLAogICJuYW1lIjogIk1pbmltYWxpc3QgQ2FsZW5kYXIgMyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXRoYXJwZS9nbm9tZS1taW5DYWwzLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAibWluaUNhbDNAbXRoYXJwZSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "spotify-artwork-fixer@wjt.me.uk", "name": "Spotify Artwork Fixer", "pname": "spotify-artwork-fixer", "description": "Fix Spotify artwork missing in media notification", "link": "https://extensions.gnome.org/extension/4055/spotify-artwork-fixer/", "shell_version_map": {"38": {"version": "6", "sha256": "0jvvz9p576x95l6592icnswcbs2nhm0i01wpb8a45xy6iwb07nfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBTcG90aWZ5IGFydHdvcmsgbWlzc2luZyBpbiBtZWRpYSBub3RpZmljYXRpb24iLAogICJuYW1lIjogIlNwb3RpZnkgQXJ0d29yayBGaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvZ25vbWUtc2hlbGwtc3BvdGlmeS1hcnR3b3JrLWZpeGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFydHdvcmstZml4ZXJAd2p0Lm1lLnVrIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "40": {"version": "6", "sha256": "0jvvz9p576x95l6592icnswcbs2nhm0i01wpb8a45xy6iwb07nfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBTcG90aWZ5IGFydHdvcmsgbWlzc2luZyBpbiBtZWRpYSBub3RpZmljYXRpb24iLAogICJuYW1lIjogIlNwb3RpZnkgQXJ0d29yayBGaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvZ25vbWUtc2hlbGwtc3BvdGlmeS1hcnR3b3JrLWZpeGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFydHdvcmstZml4ZXJAd2p0Lm1lLnVrIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0jvvz9p576x95l6592icnswcbs2nhm0i01wpb8a45xy6iwb07nfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZpeCBTcG90aWZ5IGFydHdvcmsgbWlzc2luZyBpbiBtZWRpYSBub3RpZmljYXRpb24iLAogICJuYW1lIjogIlNwb3RpZnkgQXJ0d29yayBGaXhlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvZ25vbWUtc2hlbGwtc3BvdGlmeS1hcnR3b3JrLWZpeGVyIiwKICAidXVpZCI6ICJzcG90aWZ5LWFydHdvcmstZml4ZXJAd2p0Lm1lLnVrIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} -, {"uuid": "custom-vpn-toggler@giteduberger.fr", "name": "Custom VPN Toggler (and indicator)", "pname": "custom-vpn-toggler", "description": "See the status of a VPN (with its icon) and toggle VPN.", "link": "https://extensions.gnome.org/extension/4061/custom-vpn-toggler/", "shell_version_map": {"38": {"version": "8", "sha256": "18600grli2q1m1pms46900wvzy15i4a5f8m9byz1cyizsri17zpl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20tdnBuLXRvZ2dsZXJAZ2l0ZWR1YmVyZ2VyLmZyIiwKICAibmFtZSI6ICJDdXN0b20gVlBOIFRvZ2dsZXIgKGFuZCBpbmRpY2F0b3IpIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogImZyLmdpdGVkdWJlcmdlci5jdXN0b20tdnBuLXRvZ2dsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9YYXZpZXJCZXJnZXIvY3VzdG9tLXZwbi10b2dnbGVyIiwKICAidXVpZCI6ICJjdXN0b20tdnBuLXRvZ2dsZXJAZ2l0ZWR1YmVyZ2VyLmZyIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "10", "sha256": "1spmrz280klkgiipnk69182cjfijdhc9hpmkzy7592iryyzi0m02", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4iLAogICJleHRlbnNpb24taWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyLmdpdGVkdWJlcmdlci5mciIsCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbS12cG4tdG9nZ2xlciIsCiAgIm5hbWUiOiAiQ3VzdG9tIFZQTiBUb2dnbGVyIChhbmQgaW5kaWNhdG9yKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tdnBuLXRvZ2dsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9YYXZpZXJCZXJnZXIvY3VzdG9tLXZwbi10b2dnbGVyIiwKICAidXVpZCI6ICJjdXN0b20tdnBuLXRvZ2dsZXJAZ2l0ZWR1YmVyZ2VyLmZyIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1spmrz280klkgiipnk69182cjfijdhc9hpmkzy7592iryyzi0m02", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4iLAogICJleHRlbnNpb24taWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyLmdpdGVkdWJlcmdlci5mciIsCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbS12cG4tdG9nZ2xlciIsCiAgIm5hbWUiOiAiQ3VzdG9tIFZQTiBUb2dnbGVyIChhbmQgaW5kaWNhdG9yKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tdnBuLXRvZ2dsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9YYXZpZXJCZXJnZXIvY3VzdG9tLXZwbi10b2dnbGVyIiwKICAidXVpZCI6ICJjdXN0b20tdnBuLXRvZ2dsZXJAZ2l0ZWR1YmVyZ2VyLmZyIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "1spmrz280klkgiipnk69182cjfijdhc9hpmkzy7592iryyzi0m02", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4iLAogICJleHRlbnNpb24taWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyLmdpdGVkdWJlcmdlci5mciIsCiAgImdldHRleHQtZG9tYWluIjogImN1c3RvbS12cG4tdG9nZ2xlciIsCiAgIm5hbWUiOiAiQ3VzdG9tIFZQTiBUb2dnbGVyIChhbmQgaW5kaWNhdG9yKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20tdnBuLXRvZ2dsZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9YYXZpZXJCZXJnZXIvY3VzdG9tLXZwbi10b2dnbGVyIiwKICAidXVpZCI6ICJjdXN0b20tdnBuLXRvZ2dsZXJAZ2l0ZWR1YmVyZ2VyLmZyIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"uuid": "custom-vpn-toggler@giteduberger.fr", "name": "Custom VPN Toggler (and indicator)", "pname": "custom-vpn-toggler", "description": "See the status of a VPN (with its icon) and toggle VPN. \nCompatible with FortinetVPN, GlobalProtect, NetExtender, NordVpn, OpenVPN...", "link": "https://extensions.gnome.org/extension/4061/custom-vpn-toggler/", "shell_version_map": {"38": {"version": "8", "sha256": "01nmh9bmwp2w70d4icn61hxl548bspcy7k49ld5pqnpch3i0pa47", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgIm5hbWUiOiAiQ3VzdG9tIFZQTiBUb2dnbGVyIChhbmQgaW5kaWNhdG9yKSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJmci5naXRlZHViZXJnZXIuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "10", "sha256": "1rawssdlj563nzp5i1w6is8q3v0699zaf12apn7h7jxsqr6qwajf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbS12cG4tdG9nZ2xlci5naXRlZHViZXJnZXIuZnIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20tdnBuLXRvZ2dsZXIiLAogICJuYW1lIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiAxMAp9"}, "41": {"version": "10", "sha256": "1rawssdlj563nzp5i1w6is8q3v0699zaf12apn7h7jxsqr6qwajf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbS12cG4tdG9nZ2xlci5naXRlZHViZXJnZXIuZnIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20tdnBuLXRvZ2dsZXIiLAogICJuYW1lIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiAxMAp9"}, "42": {"version": "10", "sha256": "1rawssdlj563nzp5i1w6is8q3v0699zaf12apn7h7jxsqr6qwajf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSBhbmQgdG9nZ2xlIFZQTi4gXG5Db21wYXRpYmxlIHdpdGggRm9ydGluZXRWUE4sIEdsb2JhbFByb3RlY3QsIE5ldEV4dGVuZGVyLCBOb3JkVnBuLCBPcGVuVlBOLi4uIiwKICAiZXh0ZW5zaW9uLWlkIjogImN1c3RvbS12cG4tdG9nZ2xlci5naXRlZHViZXJnZXIuZnIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20tdnBuLXRvZ2dsZXIiLAogICJuYW1lIjogIkN1c3RvbSBWUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY3VzdG9tLXZwbi10b2dnbGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vWGF2aWVyQmVyZ2VyL2N1c3RvbS12cG4tdG9nZ2xlciIsCiAgInV1aWQiOiAiY3VzdG9tLXZwbi10b2dnbGVyQGdpdGVkdWJlcmdlci5mciIsCiAgInZlcnNpb24iOiAxMAp9"}}} , {"uuid": "geary-tray-icon@taylantatli.github.com", "name": "Geary Tray Icon", "pname": "geary-tray-icon", "description": "Adds an icon to the panel to open mailbox and creating new mail.", "link": "https://extensions.gnome.org/extension/4073/geary-tray-icon/", "shell_version_map": {"38": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "0nq7jf63yln8w4fivflwncdrdzagzky0ds9qzj43s1vhp046wbf8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYW4gaWNvbiB0byB0aGUgcGFuZWwgdG8gb3BlbiBtYWlsYm94IGFuZCBjcmVhdGluZyBuZXcgbWFpbC4iLAogICJuYW1lIjogIkdlYXJ5IFRyYXkgSWNvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1RheWxhblRhdGxpL2dlYXJ5LXRyYXktaWNvbiIsCiAgInV1aWQiOiAiZ2VhcnktdHJheS1pY29uQHRheWxhbnRhdGxpLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "shell-restarter@koolskateguy89.github.io", "name": "Shell Restarter", "pname": "shell-restarter", "description": "Tired of pressing Alt+F2+R?\nWell you can restart GNOME Shell with just the press of a button! (May or may not work on Wayland)", "link": "https://extensions.gnome.org/extension/4075/shell-restarter/", "shell_version_map": {"38": {"version": "5", "sha256": "19v3sxbsrk0cskq7cikwz6w95m8q2v56hyrkwj595c8m8i0x6i1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpcmVkIG9mIHByZXNzaW5nIEFsdCtGMitSP1xuV2VsbCB5b3UgY2FuIHJlc3RhcnQgR05PTUUgU2hlbGwgd2l0aCBqdXN0IHRoZSBwcmVzcyBvZiBhIGJ1dHRvbiEgKE1heSBvciBtYXkgbm90IHdvcmsgb24gV2F5bGFuZCkiLAogICJuYW1lIjogIlNoZWxsIFJlc3RhcnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaGVsbC1yZXN0YXJ0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29vbHNrYXRlZ3V5ODkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNoZWxsLXJlc3RhcnRlciIsCiAgInV1aWQiOiAic2hlbGwtcmVzdGFydGVyQGtvb2xza2F0ZWd1eTg5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "19v3sxbsrk0cskq7cikwz6w95m8q2v56hyrkwj595c8m8i0x6i1g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpcmVkIG9mIHByZXNzaW5nIEFsdCtGMitSP1xuV2VsbCB5b3UgY2FuIHJlc3RhcnQgR05PTUUgU2hlbGwgd2l0aCBqdXN0IHRoZSBwcmVzcyBvZiBhIGJ1dHRvbiEgKE1heSBvciBtYXkgbm90IHdvcmsgb24gV2F5bGFuZCkiLAogICJuYW1lIjogIlNoZWxsIFJlc3RhcnRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaGVsbC1yZXN0YXJ0ZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va29vbHNrYXRlZ3V5ODkvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXNoZWxsLXJlc3RhcnRlciIsCiAgInV1aWQiOiAic2hlbGwtcmVzdGFydGVyQGtvb2xza2F0ZWd1eTg5LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "iqair@wotmshuaisi_github", "name": "Iqair Gnome Extension", "pname": "iqair-gnome-extension", "description": "Gnome extension for tracking air quality in real-time. data provider: https://iqair.com/. to get an API token: https://www.iqair.com/us/dashboard/api", "link": "https://extensions.gnome.org/extension/4082/iqair-gnome-extension/", "shell_version_map": {"38": {"version": "6", "sha256": "150rn9gk6nzba30g38bjpgjyqr2a25cysg6fd6p1is92w8lknls4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "07fv1z9rk9xjdrqrvs9cglmq5dbcnf3dgjfz7dnflabcrb9yqisv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIGV4dGVuc2lvbiBmb3IgdHJhY2tpbmcgYWlyIHF1YWxpdHkgaW4gcmVhbC10aW1lLiBkYXRhIHByb3ZpZGVyOiBodHRwczovL2lxYWlyLmNvbS8uIHRvIGdldCBhbiBBUEkgdG9rZW46IGh0dHBzOi8vd3d3LmlxYWlyLmNvbS91cy9kYXNoYm9hcmQvYXBpIiwKICAibmFtZSI6ICJJcWFpciBHbm9tZSBFeHRlbnNpb24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS93b3Rtc2h1YWlzaS9pcWFpckdub21lRXh0ZW5zaW9uIiwKICAidXVpZCI6ICJpcWFpckB3b3Rtc2h1YWlzaV9naXRodWIiLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} @@ -465,7 +465,7 @@ , {"uuid": "right_click_for_apps@briansayre", "name": "Right Click for Apps", "pname": "right-click-for-apps", "description": "Allows you to right-click the Activities button to reveal the application menu.", "link": "https://extensions.gnome.org/extension/4090/right-click-for-apps/", "shell_version_map": {"38": {"version": "1", "sha256": "1rzx8ksl48badrwyqxwbgvfgf48z642mdwl57aq280ng61nrndaf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyB5b3UgdG8gcmlnaHQtY2xpY2sgdGhlIEFjdGl2aXRpZXMgYnV0dG9uIHRvIHJldmVhbCB0aGUgYXBwbGljYXRpb24gbWVudS4iLAogICJuYW1lIjogIlJpZ2h0IENsaWNrIGZvciBBcHBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnJpYW5zYXlyZS9SaWdodC1DbGljay1Gb3ItQXBwcyIsCiAgInV1aWQiOiAicmlnaHRfY2xpY2tfZm9yX2FwcHNAYnJpYW5zYXlyZSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "devbar@ludvigbostrom", "name": "DevBar", "pname": "devbar", "description": "This extension helps you keep track of your development workflow.", "link": "https://extensions.gnome.org/extension/4091/devbar/", "shell_version_map": {"38": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "40": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1yj7qpadlcgq1p85rk76gdffyp9mm2h6a7p5c43xqjqnjdpf561f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIGhlbHBzIHlvdSBrZWVwIHRyYWNrIG9mIHlvdXIgZGV2ZWxvcG1lbnQgd29ya2Zsb3cuIiwKICAibmFtZSI6ICJEZXZCYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x1ZHZpZ2Jvc3Ryb20vRGV2QmFyR25vbWUiLAogICJ1dWlkIjogImRldmJhckBsdWR2aWdib3N0cm9tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "notifications_to_file@fawtytoo", "name": "Notifications Logger", "pname": "notifications-to-file", "description": "Notifications are appended to a file in $HOME/.notifications/ with one file created per day.\nEntries show the following information:\nTimestamp\nWhether the banner was shown\nThe urgency\nThe title\nBanner text", "link": "https://extensions.gnome.org/extension/4093/notifications-to-file/", "shell_version_map": {"38": {"version": "4", "sha256": "1pnb8qp5kq42dp4hxbsx4chlzd5xpg9fdnjfa11xf9n7x38sckdv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgTG9nZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "1pnb8qp5kq42dp4hxbsx4chlzd5xpg9fdnjfa11xf9n7x38sckdv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgTG9nZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1pnb8qp5kq42dp4hxbsx4chlzd5xpg9fdnjfa11xf9n7x38sckdv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgTG9nZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1pnb8qp5kq42dp4hxbsx4chlzd5xpg9fdnjfa11xf9n7x38sckdv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vdGlmaWNhdGlvbnMgYXJlIGFwcGVuZGVkIHRvIGEgZmlsZSBpbiAkSE9NRS8ubm90aWZpY2F0aW9ucy8gd2l0aCBvbmUgZmlsZSBjcmVhdGVkIHBlciBkYXkuXG5FbnRyaWVzIHNob3cgdGhlIGZvbGxvd2luZyBpbmZvcm1hdGlvbjpcblRpbWVzdGFtcFxuV2hldGhlciB0aGUgYmFubmVyIHdhcyBzaG93blxuVGhlIHVyZ2VuY3lcblRoZSB0aXRsZVxuQmFubmVyIHRleHQiLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbnMgTG9nZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbnNfdG9fZmlsZUBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiA0Cn0="}}} -, {"uuid": "change_desktop_background_when_empty@fawtytoo", "name": "Change Desktop Background When Workspace Empty", "pname": "change-desktop-background-when-workspace-empty", "description": "Changes the desktop background when the workspace is or becomes empty, such as switching to an empty workspace, when all windows on a workspace are closed, or after login.\nNo folder needs to be set explicitly, as it will use the folder that the current background is in.", "link": "https://extensions.gnome.org/extension/4096/change-desktop-background-when-workspace-empty/", "shell_version_map": {"38": {"version": "14", "sha256": "1f01kppgipj2ga70cgzzgl7wjrngfrmia9xi1r5i5m76lybyb2ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2hhbmdlX2Rlc2t0b3BfYmFja2dyb3VuZF93aGVuX2VtcHR5QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "14", "sha256": "1f01kppgipj2ga70cgzzgl7wjrngfrmia9xi1r5i5m76lybyb2ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2hhbmdlX2Rlc2t0b3BfYmFja2dyb3VuZF93aGVuX2VtcHR5QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "1f01kppgipj2ga70cgzzgl7wjrngfrmia9xi1r5i5m76lybyb2ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2hhbmdlX2Rlc2t0b3BfYmFja2dyb3VuZF93aGVuX2VtcHR5QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "1f01kppgipj2ga70cgzzgl7wjrngfrmia9xi1r5i5m76lybyb2ak", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2hhbmdlX2Rlc2t0b3BfYmFja2dyb3VuZF93aGVuX2VtcHR5QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE0Cn0="}}} +, {"uuid": "change_desktop_background_when_empty@fawtytoo", "name": "Change Desktop Background When Workspace Empty", "pname": "change-desktop-background-when-workspace-empty", "description": "Changes the desktop background when the workspace is or becomes empty, such as switching to an empty workspace, when all windows on a workspace are closed, or after login.\nNo folder needs to be set explicitly, as it will use the folder that the current background is in.", "link": "https://extensions.gnome.org/extension/4096/change-desktop-background-when-workspace-empty/", "shell_version_map": {"38": {"version": "16", "sha256": "05h6rkf04syr0cpyhhbcbx9w83rdq8xq8dgfkzwbzxfg0avqlcd9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2hhbmdlX2Rlc2t0b3BfYmFja2dyb3VuZF93aGVuX2VtcHR5QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "40": {"version": "16", "sha256": "05h6rkf04syr0cpyhhbcbx9w83rdq8xq8dgfkzwbzxfg0avqlcd9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2hhbmdlX2Rlc2t0b3BfYmFja2dyb3VuZF93aGVuX2VtcHR5QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "16", "sha256": "05h6rkf04syr0cpyhhbcbx9w83rdq8xq8dgfkzwbzxfg0avqlcd9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2hhbmdlX2Rlc2t0b3BfYmFja2dyb3VuZF93aGVuX2VtcHR5QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "42": {"version": "16", "sha256": "05h6rkf04syr0cpyhhbcbx9w83rdq8xq8dgfkzwbzxfg0avqlcd9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGRlc2t0b3AgYmFja2dyb3VuZCB3aGVuIHRoZSB3b3Jrc3BhY2UgaXMgb3IgYmVjb21lcyBlbXB0eSwgc3VjaCBhcyBzd2l0Y2hpbmcgdG8gYW4gZW1wdHkgd29ya3NwYWNlLCB3aGVuIGFsbCB3aW5kb3dzIG9uIGEgd29ya3NwYWNlIGFyZSBjbG9zZWQsIG9yIGFmdGVyIGxvZ2luLlxuTm8gZm9sZGVyIG5lZWRzIHRvIGJlIHNldCBleHBsaWNpdGx5LCBhcyBpdCB3aWxsIHVzZSB0aGUgZm9sZGVyIHRoYXQgdGhlIGN1cnJlbnQgYmFja2dyb3VuZCBpcyBpbi4iLAogICJuYW1lIjogIkNoYW5nZSBEZXNrdG9wIEJhY2tncm91bmQgV2hlbiBXb3Jrc3BhY2UgRW1wdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiY2hhbmdlX2Rlc2t0b3BfYmFja2dyb3VuZF93aGVuX2VtcHR5QGZhd3R5dG9vIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} , {"uuid": "translate-clipboard@lsnow.github.io", "name": "Translate clipboard", "pname": "translate-clipboard", "description": "Translate clipboard text", "link": "https://extensions.gnome.org/extension/4097/translate-clipboard/", "shell_version_map": {"38": {"version": "1", "sha256": "071x3q6y7s8qx4i3lis79g5nc68ld8ln5q8qgc713nvjgfsg05hs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "16", "sha256": "11r7r4azaf94f453ima2sms0ycaygh0l3k30dm5zpbkdp4pbczbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDEuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "16", "sha256": "11r7r4azaf94f453ima2sms0ycaygh0l3k30dm5zpbkdp4pbczbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIsCiAgICAiNDEuMCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xzbm93L3RyYW5zbGF0ZS1jbGlwYm9hcmQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1jbGlwYm9hcmRAbHNub3cuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "42": {"version": "17", "sha256": "0rq6fc479x0hjkbam37pcnax909bssybz1ibnn7a0nx1ai9zkxr7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSBjbGlwYm9hcmQgdGV4dCIsCiAgIm5hbWUiOiAiVHJhbnNsYXRlIGNsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sc25vdy90cmFuc2xhdGUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJ0cmFuc2xhdGUtY2xpcGJvYXJkQGxzbm93LmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNwp9"}}} , {"uuid": "no-overview@fthx", "name": "No overview at start-up", "pname": "no-overview", "description": "No overview at start-up. For GNOME Shell 40+.", "link": "https://extensions.gnome.org/extension/4099/no-overview/", "shell_version_map": {"40": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}, "41": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}, "42": {"version": "11", "sha256": "15abz4w5n4md1b0f7c403hiyifslgw7dw2jlhzpn47r7k7giwpdk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk5vIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLiBGb3IgR05PTUUgU2hlbGwgNDArLiIsCiAgIm5hbWUiOiAiTm8gb3ZlcnZpZXcgYXQgc3RhcnQtdXAiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImZ0aHgiCiAgXSwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9uby1vdmVydmlldyIsCiAgInV1aWQiOiAibm8tb3ZlcnZpZXdAZnRoeCIsCiAgInZlcnNpb24iOiAxMQp9"}}} , {"uuid": "notification-position@drugo.dev", "name": "Notification Banner Position", "pname": "notification-banner-position", "description": "Changes position of the notification banner from the default to the right side of the screen.", "link": "https://extensions.gnome.org/extension/4105/notification-banner-position/", "shell_version_map": {"38": {"version": "6", "sha256": "0fknms2di01y348zal27s109z6m12hw9pnra3i2ajkci7nq5x7vl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JydW5vZHJ1Z293aWNrL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1wb3NpdGlvbkBkcnVnby5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "0fknms2di01y348zal27s109z6m12hw9pnra3i2ajkci7nq5x7vl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JydW5vZHJ1Z293aWNrL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1wb3NpdGlvbkBkcnVnby5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0fknms2di01y348zal27s109z6m12hw9pnra3i2ajkci7nq5x7vl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JydW5vZHJ1Z293aWNrL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1wb3NpdGlvbkBkcnVnby5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "0fknms2di01y348zal27s109z6m12hw9pnra3i2ajkci7nq5x7vl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgcG9zaXRpb24gb2YgdGhlIG5vdGlmaWNhdGlvbiBiYW5uZXIgZnJvbSB0aGUgZGVmYXVsdCB0byB0aGUgcmlnaHQgc2lkZSBvZiB0aGUgc2NyZWVuLiIsCiAgIm5hbWUiOiAiTm90aWZpY2F0aW9uIEJhbm5lciBQb3NpdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2JydW5vZHJ1Z293aWNrL25vdGlmaWNhdGlvbi1wb3NpdGlvbi1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogIm5vdGlmaWNhdGlvbi1wb3NpdGlvbkBkcnVnby5kZXYiLAogICJ2ZXJzaW9uIjogNgp9"}}} @@ -480,14 +480,14 @@ , {"uuid": "espresso@coadmunkee.github.com", "name": "Espresso", "pname": "espresso", "description": "Control when to disable the usual auto suspend and screensaver functionality and optionally Night Light as well. Options to show as an icon in the top panel, enable when a fullscreen app is running, restore state across reboots, provide notifications, enable when specific app are running, pause Night Light when Espresso is enabled or only when specific apps are running. Espresso also supports docking stations with options to enable when charging or when docked to external monitors.\n\nEspresso is a fork of the Caffeine extension.\n\nPlease leave feedback or report issues through the Extension Homepage", "link": "https://extensions.gnome.org/extension/4135/espresso/", "shell_version_map": {"40": {"version": "6", "sha256": "0crkisqgrqh7lgls9mh59hziajkzwn08mcpcifmd8gr95qvrdmgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgd2hlbiB0byBkaXNhYmxlIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgYXMgd2VsbC4gT3B0aW9ucyB0byBzaG93IGFzIGFuIGljb24gaW4gdGhlIHRvcCBwYW5lbCwgZW5hYmxlIHdoZW4gYSBmdWxsc2NyZWVuIGFwcCBpcyBydW5uaW5nLCByZXN0b3JlIHN0YXRlIGFjcm9zcyByZWJvb3RzLCBwcm92aWRlIG5vdGlmaWNhdGlvbnMsIGVuYWJsZSB3aGVuIHNwZWNpZmljIGFwcCBhcmUgcnVubmluZywgcGF1c2UgTmlnaHQgTGlnaHQgd2hlbiBFc3ByZXNzbyBpcyBlbmFibGVkIG9yIG9ubHkgd2hlbiBzcGVjaWZpYyBhcHBzIGFyZSBydW5uaW5nLiBFc3ByZXNzbyBhbHNvIHN1cHBvcnRzIGRvY2tpbmcgc3RhdGlvbnMgd2l0aCBvcHRpb25zIHRvIGVuYWJsZSB3aGVuIGNoYXJnaW5nIG9yIHdoZW4gZG9ja2VkIHRvIGV4dGVybmFsIG1vbml0b3JzLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0crkisqgrqh7lgls9mh59hziajkzwn08mcpcifmd8gr95qvrdmgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgd2hlbiB0byBkaXNhYmxlIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgYXMgd2VsbC4gT3B0aW9ucyB0byBzaG93IGFzIGFuIGljb24gaW4gdGhlIHRvcCBwYW5lbCwgZW5hYmxlIHdoZW4gYSBmdWxsc2NyZWVuIGFwcCBpcyBydW5uaW5nLCByZXN0b3JlIHN0YXRlIGFjcm9zcyByZWJvb3RzLCBwcm92aWRlIG5vdGlmaWNhdGlvbnMsIGVuYWJsZSB3aGVuIHNwZWNpZmljIGFwcCBhcmUgcnVubmluZywgcGF1c2UgTmlnaHQgTGlnaHQgd2hlbiBFc3ByZXNzbyBpcyBlbmFibGVkIG9yIG9ubHkgd2hlbiBzcGVjaWZpYyBhcHBzIGFyZSBydW5uaW5nLiBFc3ByZXNzbyBhbHNvIHN1cHBvcnRzIGRvY2tpbmcgc3RhdGlvbnMgd2l0aCBvcHRpb25zIHRvIGVuYWJsZSB3aGVuIGNoYXJnaW5nIG9yIHdoZW4gZG9ja2VkIHRvIGV4dGVybmFsIG1vbml0b3JzLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "0crkisqgrqh7lgls9mh59hziajkzwn08mcpcifmd8gr95qvrdmgv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgd2hlbiB0byBkaXNhYmxlIHRoZSB1c3VhbCBhdXRvIHN1c3BlbmQgYW5kIHNjcmVlbnNhdmVyIGZ1bmN0aW9uYWxpdHkgYW5kIG9wdGlvbmFsbHkgTmlnaHQgTGlnaHQgYXMgd2VsbC4gT3B0aW9ucyB0byBzaG93IGFzIGFuIGljb24gaW4gdGhlIHRvcCBwYW5lbCwgZW5hYmxlIHdoZW4gYSBmdWxsc2NyZWVuIGFwcCBpcyBydW5uaW5nLCByZXN0b3JlIHN0YXRlIGFjcm9zcyByZWJvb3RzLCBwcm92aWRlIG5vdGlmaWNhdGlvbnMsIGVuYWJsZSB3aGVuIHNwZWNpZmljIGFwcCBhcmUgcnVubmluZywgcGF1c2UgTmlnaHQgTGlnaHQgd2hlbiBFc3ByZXNzbyBpcyBlbmFibGVkIG9yIG9ubHkgd2hlbiBzcGVjaWZpYyBhcHBzIGFyZSBydW5uaW5nLiBFc3ByZXNzbyBhbHNvIHN1cHBvcnRzIGRvY2tpbmcgc3RhdGlvbnMgd2l0aCBvcHRpb25zIHRvIGVuYWJsZSB3aGVuIGNoYXJnaW5nIG9yIHdoZW4gZG9ja2VkIHRvIGV4dGVybmFsIG1vbml0b3JzLlxuXG5Fc3ByZXNzbyBpcyBhIGZvcmsgb2YgdGhlIENhZmZlaW5lIGV4dGVuc2lvbi5cblxuUGxlYXNlIGxlYXZlIGZlZWRiYWNrIG9yIHJlcG9ydCBpc3N1ZXMgdGhyb3VnaCB0aGUgRXh0ZW5zaW9uIEhvbWVwYWdlIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAibmFtZSI6ICJFc3ByZXNzbyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5lc3ByZXNzbyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvYWRtdW5rZWUvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWVzcHJlc3NvIiwKICAidXVpZCI6ICJlc3ByZXNzb0Bjb2FkbXVua2VlLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "salat-dz@salat-dz.com", "name": "Salat Dz", "pname": "salat-dz", "description": "Show next salat using Salat Dz API", "link": "https://extensions.gnome.org/extension/4136/salat-dz/", "shell_version_map": {"38": {"version": "1", "sha256": "1kga5w2yp375h6lj3fmzr1agg43phyj5f45d7hjv04c405d32p8s", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgbmV4dCBzYWxhdCB1c2luZyBTYWxhdCBEeiBBUEkiLAogICJuYW1lIjogIlNhbGF0IER6IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL3NhbGF0LnB5dGhvbmFueXdoZXJlLmNvbSIsCiAgInV1aWQiOiAic2FsYXQtZHpAc2FsYXQtZHouY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "user-at-host@cmm.github.com", "name": "Add user@host to top panel", "pname": "add-userhost-to-panel", "description": "Adds user@host to the top panel, on the left.\n\nNothing fancy, no support -- fork at will, the thing is very simple.", "link": "https://extensions.gnome.org/extension/4141/add-userhost-to-panel/", "shell_version_map": {"38": {"version": "7", "sha256": "1kpi9zp1lahaps44fy0xxjfjflxhaadczrfnbw0knmwjwby246f4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NtbS9nbm9tZS11c2VyLWF0LWhvc3QiLAogICJ1dWlkIjogInVzZXItYXQtaG9zdEBjbW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1kpi9zp1lahaps44fy0xxjfjflxhaadczrfnbw0knmwjwby246f4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NtbS9nbm9tZS11c2VyLWF0LWhvc3QiLAogICJ1dWlkIjogInVzZXItYXQtaG9zdEBjbW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1kpi9zp1lahaps44fy0xxjfjflxhaadczrfnbw0knmwjwby246f4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NtbS9nbm9tZS11c2VyLWF0LWhvc3QiLAogICJ1dWlkIjogInVzZXItYXQtaG9zdEBjbW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "1kpi9zp1lahaps44fy0xxjfjflxhaadczrfnbw0knmwjwby246f4", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlckBob3N0IHRvIHRoZSB0b3AgcGFuZWwsIG9uIHRoZSBsZWZ0LlxuXG5Ob3RoaW5nIGZhbmN5LCBubyBzdXBwb3J0IC0tIGZvcmsgYXQgd2lsbCwgdGhlIHRoaW5nIGlzIHZlcnkgc2ltcGxlLiIsCiAgIm5hbWUiOiAiQWRkIHVzZXJAaG9zdCB0byB0b3AgcGFuZWwiLAogICJvcmlnaW5hbC1hdXRob3IiOiAiZGFuZGFtYW45NiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NtbS9nbm9tZS11c2VyLWF0LWhvc3QiLAogICJ1dWlkIjogInVzZXItYXQtaG9zdEBjbW0uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} -, {"uuid": "vertical-overview@RensAlthuis.github.com", "name": "Vertical overview", "pname": "vertical-overview", "description": "Bringing back vertically stacked workspaces", "link": "https://extensions.gnome.org/extension/4144/vertical-overview/", "shell_version_map": {"40": {"version": "8", "sha256": "0h865ipn97k9yrj4r0qhfdj2vnwk92720ahim22sw86605ljc77z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInJlbnMuYWx0aHVpc0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC1vdmVydmlld0BSZW5zQWx0aHVpcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0h865ipn97k9yrj4r0qhfdj2vnwk92720ahim22sw86605ljc77z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInJlbnMuYWx0aHVpc0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC1vdmVydmlld0BSZW5zQWx0aHVpcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "9", "sha256": "09dxjlccsmclwjv7mwzlr990llzn6iz4b3cxmhmz5zpabdvmz072", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIG92ZXJ2aWV3IiwKICAib3JpZ2luYWwtYXV0aG9yIjogInJlbnMuYWx0aHVpc0BnbWFpbC5jb20iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInZlcnRpY2FsLW92ZXJ2aWV3QFJlbnNBbHRodWlzLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogOQp9"}}} +, {"uuid": "vertical-overview@RensAlthuis.github.com", "name": "Vertical overview", "pname": "vertical-overview", "description": "Bringing back vertically stacked workspaces\n\n", "link": "https://extensions.gnome.org/extension/4144/vertical-overview/", "shell_version_map": {"40": {"version": "8", "sha256": "0jiwqv07gvrwy7yzk7fn3zxx0jvplhwnza5hw2c1hb3mjfj85bqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXNcblxuIiwKICAibmFtZSI6ICJWZXJ0aWNhbCBvdmVydmlldyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJyZW5zLmFsdGh1aXNAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidmVydGljYWwtb3ZlcnZpZXdAUmVuc0FsdGh1aXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "0jiwqv07gvrwy7yzk7fn3zxx0jvplhwnza5hw2c1hb3mjfj85bqa", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXNcblxuIiwKICAibmFtZSI6ICJWZXJ0aWNhbCBvdmVydmlldyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJyZW5zLmFsdGh1aXNAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAidmVydGljYWwtb3ZlcnZpZXdAUmVuc0FsdGh1aXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "9", "sha256": "1aj3sisq06lp5m2i1hzgmaiz76jp6ikf9a3q4rqlz4gclssg1alf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJyaW5naW5nIGJhY2sgdmVydGljYWxseSBzdGFja2VkIHdvcmtzcGFjZXNcblxuIiwKICAibmFtZSI6ICJWZXJ0aWNhbCBvdmVydmlldyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJyZW5zLmFsdGh1aXNAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ2ZXJ0aWNhbC1vdmVydmlld0BSZW5zQWx0aHVpcy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "workspace-isolated_app-switcher@lestibournes", "name": "Workspace-Isolated App-Switcher", "pname": "workspace-isolated-app-switcher", "description": "App-Switcher modification that shows only the apps that are running on the current workspace. Fork of App-Switcher Current Workspace First by fawtytoo.", "link": "https://extensions.gnome.org/extension/4145/workspace-isolated-app-switcher/", "shell_version_map": {"38": {"version": "1", "sha256": "0bcf8l1sb73f0ggvavkfjk10s67k7w4f3yr0s9inil6z8pbk7bsr", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcC1Td2l0Y2hlciBtb2RpZmljYXRpb24gdGhhdCBzaG93cyBvbmx5IHRoZSBhcHBzIHRoYXQgYXJlIHJ1bm5pbmcgb24gdGhlIGN1cnJlbnQgd29ya3NwYWNlLiBGb3JrIG9mIEFwcC1Td2l0Y2hlciBDdXJyZW50IFdvcmtzcGFjZSBGaXJzdCBieSBmYXd0eXRvby4iLAogICJuYW1lIjogIldvcmtzcGFjZS1Jc29sYXRlZCBBcHAtU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMjIiLAogICAgIjMuMjQiLAogICAgIjMuMjYiLAogICAgIjMuMjgiLAogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAid29ya3NwYWNlLWlzb2xhdGVkX2FwcC1zd2l0Y2hlckBsZXN0aWJvdXJuZXMiLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"uuid": "kubectl@infinicode.de", "name": "Kubectl Extension", "pname": "kubectl-extension", "description": "Quick panel access to kubernetes resources utilizing kubectl CLI", "link": "https://extensions.gnome.org/extension/4147/kubectl-extension/", "shell_version_map": {"38": {"version": "6", "sha256": "1avc1k7lhzwnzys5296s4wcj71bvzngn2r1bsjxjdfdam58vpghw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHBhbmVsIGFjY2VzcyB0byBrdWJlcm5ldGVzIHJlc291cmNlcyB1dGlsaXppbmcga3ViZWN0bCBDTEkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJrdWJlY3RsQGluZmluaWNvZGUuZGUiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkt1YmVjdGwgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmVjdGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL2t1YmVjdGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJrdWJlY3RsQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogNgp9"}, "40": {"version": "6", "sha256": "1avc1k7lhzwnzys5296s4wcj71bvzngn2r1bsjxjdfdam58vpghw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHBhbmVsIGFjY2VzcyB0byBrdWJlcm5ldGVzIHJlc291cmNlcyB1dGlsaXppbmcga3ViZWN0bCBDTEkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJrdWJlY3RsQGluZmluaWNvZGUuZGUiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkt1YmVjdGwgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmVjdGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL2t1YmVjdGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJrdWJlY3RsQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "1avc1k7lhzwnzys5296s4wcj71bvzngn2r1bsjxjdfdam58vpghw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHBhbmVsIGFjY2VzcyB0byBrdWJlcm5ldGVzIHJlc291cmNlcyB1dGlsaXppbmcga3ViZWN0bCBDTEkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJrdWJlY3RsQGluZmluaWNvZGUuZGUiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkt1YmVjdGwgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmVjdGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL2t1YmVjdGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJrdWJlY3RsQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "1avc1k7lhzwnzys5296s4wcj71bvzngn2r1bsjxjdfdam58vpghw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIHBhbmVsIGFjY2VzcyB0byBrdWJlcm5ldGVzIHJlc291cmNlcyB1dGlsaXppbmcga3ViZWN0bCBDTEkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJrdWJlY3RsQGluZmluaWNvZGUuZGUiLAogICJsb2NhbGVkaXIiOiAiL3Vzci9sb2NhbC9zaGFyZS9sb2NhbGUiLAogICJuYW1lIjogIkt1YmVjdGwgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmt1YmVjdGwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaW5hdGljL2t1YmVjdGwtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJrdWJlY3RsQGluZmluaWNvZGUuZGUiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"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": "4", "sha256": "0yxg7dmlkm4islaz1y3as5p04b80r192vc3n4zx0ga1nnp80w8p9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbHlueFpob3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsd2F5cy1zaG93LXdvcmtzcGFjZS10aHVtYm5haWxzLyIsCiAgInV1aWQiOiAiYWx3YXlzc2hvd3dvcmtzcGFjZXRodW1ibmFpbHNAYWx5bngub25lIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0yxg7dmlkm4islaz1y3as5p04b80r192vc3n4zx0ga1nnp80w8p9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbHlueFpob3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsd2F5cy1zaG93LXdvcmtzcGFjZS10aHVtYm5haWxzLyIsCiAgInV1aWQiOiAiYWx3YXlzc2hvd3dvcmtzcGFjZXRodW1ibmFpbHNAYWx5bngub25lIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0yxg7dmlkm4islaz1y3as5p04b80r192vc3n4zx0ga1nnp80w8p9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsd2F5cyBzaG93IHdvcmtzcGFjZSB0aHVtYm5haWxzIGV2ZW4gdGhlcmUgaXMgb25seSBvbmUgd29ya3NwYWNlLiIsCiAgIm5hbWUiOiAiQWx3YXlzIFNob3cgV29ya3NwYWNlIFRodW1ibmFpbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BbHlueFpob3UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFsd2F5cy1zaG93LXdvcmtzcGFjZS10aHVtYm5haWxzLyIsCiAgInV1aWQiOiAiYWx3YXlzc2hvd3dvcmtzcGFjZXRodW1ibmFpbHNAYWx5bngub25lIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "gnome-ui-tune@itstime.tech", "name": "Gnome 4x UI Improvements", "pname": "gnome-40-ui-improvements", "description": "Tunes gnome 40/41/42's Overview UI to make it more usable.\n\nChanges:\n- Search textbox is hidden by default and shown only when user begins to type-to-search\n- Scale of workspaces' thumbnails increased 2x\n- Restores wallpaper on workspaces' thumbnails. No more gray background\n- Show workspaces' thumbnails even when there is only one workspace\n- Firefox's PIP (picture in picture) window is now displayed on the overview screen\n\nAll modifications can be disabled in the extension's settings.\n\nATTENTION!\nAfter extension update, gnome-shell restart is required:\nX11: Alt+F2 => r\nWayland: logout => login", "link": "https://extensions.gnome.org/extension/4158/gnome-40-ui-improvements/", "shell_version_map": {"40": {"version": "13", "sha256": "1ypf74vlisn6rvjq243m6839hglgahzb4zd21hg1d1cldzw34i3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxLzQyJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLXVpLXR1bmUiLAogICJ1dWlkIjogImdub21lLXVpLXR1bmVAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "1ypf74vlisn6rvjq243m6839hglgahzb4zd21hg1d1cldzw34i3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxLzQyJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLXVpLXR1bmUiLAogICJ1dWlkIjogImdub21lLXVpLXR1bmVAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "1ypf74vlisn6rvjq243m6839hglgahzb4zd21hg1d1cldzw34i3i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlR1bmVzIGdub21lIDQwLzQxLzQyJ3MgT3ZlcnZpZXcgVUkgdG8gbWFrZSBpdCBtb3JlIHVzYWJsZS5cblxuQ2hhbmdlczpcbi0gU2VhcmNoIHRleHRib3ggaXMgaGlkZGVuIGJ5IGRlZmF1bHQgYW5kIHNob3duIG9ubHkgd2hlbiB1c2VyIGJlZ2lucyB0byB0eXBlLXRvLXNlYXJjaFxuLSBTY2FsZSBvZiB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGluY3JlYXNlZCAyeFxuLSBSZXN0b3JlcyB3YWxscGFwZXIgb24gd29ya3NwYWNlcycgdGh1bWJuYWlscy4gTm8gbW9yZSBncmF5IGJhY2tncm91bmRcbi0gU2hvdyB3b3Jrc3BhY2VzJyB0aHVtYm5haWxzIGV2ZW4gd2hlbiB0aGVyZSBpcyBvbmx5IG9uZSB3b3Jrc3BhY2Vcbi0gRmlyZWZveCdzIFBJUCAocGljdHVyZSBpbiBwaWN0dXJlKSB3aW5kb3cgaXMgbm93IGRpc3BsYXllZCBvbiB0aGUgb3ZlcnZpZXcgc2NyZWVuXG5cbkFsbCBtb2RpZmljYXRpb25zIGNhbiBiZSBkaXNhYmxlZCBpbiB0aGUgZXh0ZW5zaW9uJ3Mgc2V0dGluZ3MuXG5cbkFUVEVOVElPTiFcbkFmdGVyIGV4dGVuc2lvbiB1cGRhdGUsIGdub21lLXNoZWxsIHJlc3RhcnQgaXMgcmVxdWlyZWQ6XG5YMTE6IEFsdCtGMiA9PiByXG5XYXlsYW5kOiBsb2dvdXQgPT4gbG9naW4iLAogICJuYW1lIjogIkdub21lIDR4IFVJIEltcHJvdmVtZW50cyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nbm9tZS11aS10dW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXh4YXB5L2dub21lLXVpLXR1bmUiLAogICJ1dWlkIjogImdub21lLXVpLXR1bmVAaXRzdGltZS50ZWNoIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"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 corners/edges or custom keyboard shortcuts can trigger any of dozens of built-in actions that helps you navigate and control your desktop environment, or your own shell commands.\n\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: 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": "19", "sha256": "1nwbw4lnpcs0j5lry3bpakly19z2vm0i7j3kqg4f4mihwh6204hk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3IgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgdGhhdCBoZWxwcyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgeW91ciBkZXNrdG9wIGVudmlyb25tZW50LCBvciB5b3VyIG93biBzaGVsbCBjb21tYW5kcy5cblxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS5cbkRvIE5PVCB1c2UgYnVnIHJlcG9ydCBmb3JtIG9uIHRoaXMgcGFnZSwgSSB3aWxsIE5PVCByZXNwb25kIHRvIGl0LlxuXG5rZXl3b3Jkczogb3ZlcnZpZXcsIGFwcCBncmlkLCBjb21tYW5kLCBicmlnaHRuZXNzLCBjb250cmFzdCwgdHJhbnNwYXJlbnQsIG9wYWNpdHksIGNvbG9yIGVmZmVjdCwgaW52ZXJ0IGxpZ2h0bmVzcywgY29sb3IgdGludCwgY29sb3IgYmxpbmQgZmlsdGVyLCBzaW11bGF0aW9uLCBkZXNhdHVyYXRlLCBuaWdodCBsaWdodHMsIGRhcmsgdGhlbWUsIHZvbHVtZSwgbXV0ZSwgbWFnbmlmaWVyLCB6b29tLCBzY3JlZW4ga2V5Ym9hcmQsIHJlYWRlciwgbGFyZ2UgdGV4dCwgZm9yY2UgY2xvc2UsIGtpbGwgLTksIHNob3cgZGVza3RvcCwgcmVvcmRlciB3b3Jrc3BhY2UsIHdpbmRvdyB0aHVtYm5haWwgLyBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycy90cmVlL2dkaCIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "40": {"version": "19", "sha256": "1nwbw4lnpcs0j5lry3bpakly19z2vm0i7j3kqg4f4mihwh6204hk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3IgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgdGhhdCBoZWxwcyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgeW91ciBkZXNrdG9wIGVudmlyb25tZW50LCBvciB5b3VyIG93biBzaGVsbCBjb21tYW5kcy5cblxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS5cbkRvIE5PVCB1c2UgYnVnIHJlcG9ydCBmb3JtIG9uIHRoaXMgcGFnZSwgSSB3aWxsIE5PVCByZXNwb25kIHRvIGl0LlxuXG5rZXl3b3Jkczogb3ZlcnZpZXcsIGFwcCBncmlkLCBjb21tYW5kLCBicmlnaHRuZXNzLCBjb250cmFzdCwgdHJhbnNwYXJlbnQsIG9wYWNpdHksIGNvbG9yIGVmZmVjdCwgaW52ZXJ0IGxpZ2h0bmVzcywgY29sb3IgdGludCwgY29sb3IgYmxpbmQgZmlsdGVyLCBzaW11bGF0aW9uLCBkZXNhdHVyYXRlLCBuaWdodCBsaWdodHMsIGRhcmsgdGhlbWUsIHZvbHVtZSwgbXV0ZSwgbWFnbmlmaWVyLCB6b29tLCBzY3JlZW4ga2V5Ym9hcmQsIHJlYWRlciwgbGFyZ2UgdGV4dCwgZm9yY2UgY2xvc2UsIGtpbGwgLTksIHNob3cgZGVza3RvcCwgcmVvcmRlciB3b3Jrc3BhY2UsIHdpbmRvdyB0aHVtYm5haWwgLyBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycy90cmVlL2dkaCIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "41": {"version": "19", "sha256": "1nwbw4lnpcs0j5lry3bpakly19z2vm0i7j3kqg4f4mihwh6204hk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3IgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgdGhhdCBoZWxwcyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgeW91ciBkZXNrdG9wIGVudmlyb25tZW50LCBvciB5b3VyIG93biBzaGVsbCBjb21tYW5kcy5cblxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS5cbkRvIE5PVCB1c2UgYnVnIHJlcG9ydCBmb3JtIG9uIHRoaXMgcGFnZSwgSSB3aWxsIE5PVCByZXNwb25kIHRvIGl0LlxuXG5rZXl3b3Jkczogb3ZlcnZpZXcsIGFwcCBncmlkLCBjb21tYW5kLCBicmlnaHRuZXNzLCBjb250cmFzdCwgdHJhbnNwYXJlbnQsIG9wYWNpdHksIGNvbG9yIGVmZmVjdCwgaW52ZXJ0IGxpZ2h0bmVzcywgY29sb3IgdGludCwgY29sb3IgYmxpbmQgZmlsdGVyLCBzaW11bGF0aW9uLCBkZXNhdHVyYXRlLCBuaWdodCBsaWdodHMsIGRhcmsgdGhlbWUsIHZvbHVtZSwgbXV0ZSwgbWFnbmlmaWVyLCB6b29tLCBzY3JlZW4ga2V5Ym9hcmQsIHJlYWRlciwgbGFyZ2UgdGV4dCwgZm9yY2UgY2xvc2UsIGtpbGwgLTksIHNob3cgZGVza3RvcCwgcmVvcmRlciB3b3Jrc3BhY2UsIHdpbmRvdyB0aHVtYm5haWwgLyBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycy90cmVlL2dkaCIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}, "42": {"version": "19", "sha256": "1nwbw4lnpcs0j5lry3bpakly19z2vm0i7j3kqg4f4mihwh6204hk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3IgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgdGhhdCBoZWxwcyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgeW91ciBkZXNrdG9wIGVudmlyb25tZW50LCBvciB5b3VyIG93biBzaGVsbCBjb21tYW5kcy5cblxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS5cbkRvIE5PVCB1c2UgYnVnIHJlcG9ydCBmb3JtIG9uIHRoaXMgcGFnZSwgSSB3aWxsIE5PVCByZXNwb25kIHRvIGl0LlxuXG5rZXl3b3Jkczogb3ZlcnZpZXcsIGFwcCBncmlkLCBjb21tYW5kLCBicmlnaHRuZXNzLCBjb250cmFzdCwgdHJhbnNwYXJlbnQsIG9wYWNpdHksIGNvbG9yIGVmZmVjdCwgaW52ZXJ0IGxpZ2h0bmVzcywgY29sb3IgdGludCwgY29sb3IgYmxpbmQgZmlsdGVyLCBzaW11bGF0aW9uLCBkZXNhdHVyYXRlLCBuaWdodCBsaWdodHMsIGRhcmsgdGhlbWUsIHZvbHVtZSwgbXV0ZSwgbWFnbmlmaWVyLCB6b29tLCBzY3JlZW4ga2V5Ym9hcmQsIHJlYWRlciwgbGFyZ2UgdGV4dCwgZm9yY2UgY2xvc2UsIGtpbGwgLTksIHNob3cgZGVza3RvcCwgcmVvcmRlciB3b3Jrc3BhY2UsIHdpbmRvdyB0aHVtYm5haWwgLyBwcmV2aWV3LCBsb29raW5nIGdsYXNzLCBjdXN0b20gbWVudSwgd2luZG93LCB3b3Jrc3BhY2UsIHN3aXRjaGVyLCBoaWRlIHBhbmVsIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkIiwKICAibmFtZSI6ICJDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL2N1c3RvbS1ob3QtY29ybmVycy90cmVlL2dkaCIsCiAgInV1aWQiOiAiY3VzdG9tLWhvdC1jb3JuZXJzLWV4dGVuZGVkQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOQp9"}}} -, {"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": "10", "sha256": "1h6lms1szjp2rz6q3hs8s0jsv71lyiabgygy4cqp1lj834k9hqpd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlb3BoOS9oYXNzLWdzaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImhhc3MtZ3NoZWxsQGdlb3BoOS1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "1h6lms1szjp2rz6q3hs8s0jsv71lyiabgygy4cqp1lj834k9hqpd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlb3BoOS9oYXNzLWdzaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImhhc3MtZ3NoZWxsQGdlb3BoOS1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "1h6lms1szjp2rz6q3hs8s0jsv71lyiabgygy4cqp1lj834k9hqpd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgSG9tZSBBc3Npc3RhbnQuIENoZWNrIHRoZSBSRUFETUUgb24gZ2l0aHViIGZvciBhZGRpdGlvbmFsIGhlbHAhXG5cbk1haW4gcG9pbnRzOlxuLSBZb3UgbmVlZCB0byBwcm92aWRlIHRoZSB1cmwgb2YgeW91ciBoYXNzLCBhIGxvbmcgbGl2ZSBhY2Nlc3MgdG9rZW4gb2J0YWluZWQgZnJvbSB5b3VyIHByb2ZpbGUgcGFnZSAob24geW91ciBoYXNzIHdlYiBpbnN0YW5jZSkgYW5kIHRoZSBlbnRpdHkgaWRzIG9mIHRoZSBlbnRpdGllcyB5b3Ugd2FudCB0byBoYXZlIGFzIHRvZ2dsYWJsZS5cbi0gSW4gb3JkZXIgdG8gYWRkIHNvbWUgbG9jYWwgdGVtcGVyYXR1cmUvaHVtaWRpdHkgc2Vuc29yLCB5b3UgbWF5IGFsc28gcHJvdmlkZSBhIHRlbXBlcmF0dXJlIGFuZC9vciBhIGh1bWlkaXR5IGVudGl0eSBpZCAod2hpY2ggc2hvdWxkIG1hdGNoIHRoZSBjb3JyZXNwb25kaW5nIGlkcyBvZiB5b3VyIGhhc3MgaW5zdGFuY2UpLiIsCiAgIm5hbWUiOiAiSG9tZSBBc3Npc3RhbnQgRXh0ZW5zaW9uIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmhhc3MtZGF0YSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2dlb3BoOS9oYXNzLWdzaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogImhhc3MtZ3NoZWxsQGdlb3BoOS1vbi1naXRodWIiLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"uuid": "custom-hot-corners-extended@G-dH.github.com", "name": "Custom Hot Corners - Extended", "pname": "custom-hot-corners-extended", "description": "Give a function to any corner or edge of your monitors and expand your keyboard capabilities.\nMouse pointer pressure, clicks and scrolls over the corners/edges or custom keyboard shortcuts can trigger any of dozens of built-in actions that helps you navigate and control your desktop environment, or your own shell commands.\n\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, workspace, switcher, hide panel", "link": "https://extensions.gnome.org/extension/4167/custom-hot-corners-extended/", "shell_version_map": {"38": {"version": "20", "sha256": "0b1rva1yk9242qgv9rkf19jdm18jhzpqv0kc0qqfx4xjf68pkchf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3IgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgdGhhdCBoZWxwcyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgeW91ciBkZXNrdG9wIGVudmlyb25tZW50LCBvciB5b3VyIG93biBzaGVsbCBjb21tYW5kcy5cblxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS5cbkRvIE5PVCB1c2UgYnVnIHJlcG9ydCBmb3JtIG9uIHRoaXMgcGFnZSwgSSB3aWxsIE5PVCByZXNwb25kIHRvIGl0LlxuXG5rZXl3b3Jkczoga2V5Ym9hcmQgc2hvcnRjdXQsIHN3aXRjaCB3aW5kb3dzLCBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "40": {"version": "20", "sha256": "0b1rva1yk9242qgv9rkf19jdm18jhzpqv0kc0qqfx4xjf68pkchf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3IgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgdGhhdCBoZWxwcyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgeW91ciBkZXNrdG9wIGVudmlyb25tZW50LCBvciB5b3VyIG93biBzaGVsbCBjb21tYW5kcy5cblxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS5cbkRvIE5PVCB1c2UgYnVnIHJlcG9ydCBmb3JtIG9uIHRoaXMgcGFnZSwgSSB3aWxsIE5PVCByZXNwb25kIHRvIGl0LlxuXG5rZXl3b3Jkczoga2V5Ym9hcmQgc2hvcnRjdXQsIHN3aXRjaCB3aW5kb3dzLCBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "41": {"version": "20", "sha256": "0b1rva1yk9242qgv9rkf19jdm18jhzpqv0kc0qqfx4xjf68pkchf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3IgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgdGhhdCBoZWxwcyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgeW91ciBkZXNrdG9wIGVudmlyb25tZW50LCBvciB5b3VyIG93biBzaGVsbCBjb21tYW5kcy5cblxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS5cbkRvIE5PVCB1c2UgYnVnIHJlcG9ydCBmb3JtIG9uIHRoaXMgcGFnZSwgSSB3aWxsIE5PVCByZXNwb25kIHRvIGl0LlxuXG5rZXl3b3Jkczoga2V5Ym9hcmQgc2hvcnRjdXQsIHN3aXRjaCB3aW5kb3dzLCBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}, "42": {"version": "20", "sha256": "0b1rva1yk9242qgv9rkf19jdm18jhzpqv0kc0qqfx4xjf68pkchf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdpdmUgYSBmdW5jdGlvbiB0byBhbnkgY29ybmVyIG9yIGVkZ2Ugb2YgeW91ciBtb25pdG9ycyBhbmQgZXhwYW5kIHlvdXIga2V5Ym9hcmQgY2FwYWJpbGl0aWVzLlxuTW91c2UgcG9pbnRlciBwcmVzc3VyZSwgY2xpY2tzIGFuZCBzY3JvbGxzIG92ZXIgdGhlIGNvcm5lcnMvZWRnZXMgb3IgY3VzdG9tIGtleWJvYXJkIHNob3J0Y3V0cyBjYW4gdHJpZ2dlciBhbnkgb2YgZG96ZW5zIG9mIGJ1aWx0LWluIGFjdGlvbnMgdGhhdCBoZWxwcyB5b3UgbmF2aWdhdGUgYW5kIGNvbnRyb2wgeW91ciBkZXNrdG9wIGVudmlyb25tZW50LCBvciB5b3VyIG93biBzaGVsbCBjb21tYW5kcy5cblxuU2lnbmlmaWNhbnQgcGFydCBvZiBhdmFpbGFibGUgYWN0aW9ucyBhcmUgdmlzdWFsIGFkanVzdG1lbnRzIChjb250cmFzdCwgYnJpZ2h0bmVzcywgb3BhY2l0eSkgYW5kIGNvbG9yIGZpbHRlcnMgKHJlZCwgZ3JlZW4sIGRlc2F0dXJhdGUsIGxpZ2h0bmVzcyBhbmQgY29sb3IgaW52ZXJzaW9ucykgLCBpbmNsdWRpbmcgY29ycmVjdGlvbiBmaWx0ZXJzIGZvciBjb2xvcmJsaW5kIHVzZXJzIGFuZCBjYiBzaW11bGF0aW9uIGZpbHRlcnMgZm9yIGRldmVsb3BlcnMuXG5cblJlc3RhcnQgeW91ciBHbm9tZSBTaGVsbCBhZnRlciBlYWNoIHVwZGF0ZSBvZiB0aGUgZXh0ZW5zaW9uIHRvIGxvYWQgbmV3IGNvZGUsIGFuZCByZWxvYWQgdGhpcyBzaXRlIHRvIGdldCByaWQgb2YgdGhlIGVycm9yIG1lc3NhZ2UsIGJlZm9yZSB5b3UgcG9zdCBhIGJ1ZyByZXBvcnQuXG5cblBsZWFzZSByZXBvcnQgYnVncy9pc3N1ZXMgb24gR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS5cbkRvIE5PVCB1c2UgYnVnIHJlcG9ydCBmb3JtIG9uIHRoaXMgcGFnZSwgSSB3aWxsIE5PVCByZXNwb25kIHRvIGl0LlxuXG5rZXl3b3Jkczoga2V5Ym9hcmQgc2hvcnRjdXQsIHN3aXRjaCB3aW5kb3dzLCBvdmVydmlldywgYXBwIGdyaWQsIGNvbW1hbmQsIGJyaWdodG5lc3MsIGNvbnRyYXN0LCB0cmFuc3BhcmVudCwgb3BhY2l0eSwgY29sb3IgZWZmZWN0LCBpbnZlcnQgbGlnaHRuZXNzLCBjb2xvciB0aW50LCBjb2xvciBibGluZCBmaWx0ZXIsIHNpbXVsYXRpb24sIGRlc2F0dXJhdGUsIG5pZ2h0IGxpZ2h0cywgZGFyayB0aGVtZSwgdm9sdW1lLCBtdXRlLCBtYWduaWZpZXIsIHpvb20sIHNjcmVlbiBrZXlib2FyZCwgcmVhZGVyLCBsYXJnZSB0ZXh0LCBmb3JjZSBjbG9zZSwga2lsbCAtOSwgc2hvdyBkZXNrdG9wLCByZW9yZGVyIHdvcmtzcGFjZSwgd2luZG93IHRodW1ibmFpbCAvIHByZXZpZXcsIGxvb2tpbmcgZ2xhc3MsIGN1c3RvbSBtZW51LCB3aW5kb3csIHdvcmtzcGFjZSwgc3dpdGNoZXIsIGhpZGUgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWQiLAogICJuYW1lIjogIkN1c3RvbSBIb3QgQ29ybmVycyAtIEV4dGVuZGVkIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmN1c3RvbS1ob3QtY29ybmVycy1leHRlbmRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvY3VzdG9tLWhvdC1jb3JuZXJzL3RyZWUvZ2RoIiwKICAidXVpZCI6ICJjdXN0b20taG90LWNvcm5lcnMtZXh0ZW5kZWRARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIwCn0="}}} +, {"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": "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": "7", "sha256": "11c26d8iwii76i0zwvrdsjypqrq1qi6xsjlx31128pnxsacbj4bs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9zeXN0ZW1kLW1hbmFnZXIiLAogICJ1dWlkIjogInN5c3RlbWQtbWFuYWdlckBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogNwp9"}, "40": {"version": "7", "sha256": "11c26d8iwii76i0zwvrdsjypqrq1qi6xsjlx31128pnxsacbj4bs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9zeXN0ZW1kLW1hbmFnZXIiLAogICJ1dWlkIjogInN5c3RlbWQtbWFuYWdlckBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogNwp9"}, "41": {"version": "7", "sha256": "11c26d8iwii76i0zwvrdsjypqrq1qi6xsjlx31128pnxsacbj4bs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9zeXN0ZW1kLW1hbmFnZXIiLAogICJ1dWlkIjogInN5c3RlbWQtbWFuYWdlckBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogNwp9"}, "42": {"version": "7", "sha256": "11c26d8iwii76i0zwvrdsjypqrq1qi6xsjlx31128pnxsacbj4bs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBzeXN0ZW1kIHNlcnZpY2VzIG9uL29mZiBmcm9tIGEgcG9wdXAgbWVudSBpbiB0aGUgdG9wIGdub21lIHBhbmVsLiBDYW4gYmUgdXNlZCB0byBzdGFydCBzZXJ2aWNlcyBsaWtlIGFwYWNoZTIsIG15c3FsLCBwb3N0Z3Jlcy4gSXQgdXNlcyBgcGtleGVjJyB0byBydW4gYHN5dGVtY3RsJy4gSWYgeW91IHdhbnQgdG8gc3RhcnQgc2VydmljZXMgd2l0aG91dCBlbnRlcmluZyBhIHBhc3N3b3JkIHlvdSBoYXZlIHRvIHBvbGtpdCBwb2xpY3kgZmlsZS4gQW4gZXhhbXBsZSBwb2xpY3kgZmlsZSBjYW4gYmUgZm91bmQgaW4gdGhlIGdpdGh1YiByZXBvc2l0b3J5LiIsCiAgImdldHRleHQtZG9tYWluIjogInN5c3RlbWQtbWFuYWdlciIsCiAgIm5hbWUiOiAiU3lzdGVtZCBNYW5hZ2VyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN5c3RlbWQtbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcmRwaXhlbC9zeXN0ZW1kLW1hbmFnZXIiLAogICJ1dWlkIjogInN5c3RlbWQtbWFuYWdlckBoYXJkcGl4ZWwuZXUiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "auto-activities@acedron.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.", "link": "https://extensions.gnome.org/extension/4179/auto-activities/", "shell_version_map": {"40": {"version": "14", "sha256": "1ccaf3v4pz0kqxcchcwwqx7654fnfvs5dldhdjdxsnf2419cgvg0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLiIsCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFjZWRyb25zQHlhaG9vLmNvLmpwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFuLW5ld2lrby9hdXRvLWFjdGl2aXRpZXMiLAogICJ1dWlkIjogImF1dG8tYWN0aXZpdGllc0BhY2Vkcm9uLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "41": {"version": "14", "sha256": "1ccaf3v4pz0kqxcchcwwqx7654fnfvs5dldhdjdxsnf2419cgvg0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLiIsCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFjZWRyb25zQHlhaG9vLmNvLmpwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFuLW5ld2lrby9hdXRvLWFjdGl2aXRpZXMiLAogICJ1dWlkIjogImF1dG8tYWN0aXZpdGllc0BhY2Vkcm9uLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}, "42": {"version": "14", "sha256": "1ccaf3v4pz0kqxcchcwwqx7654fnfvs5dldhdjdxsnf2419cgvg0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgYWN0aXZpdGllcyBvdmVydmlldyB3aGVuIHRoZXJlIGFyZSBubyB3aW5kb3dzLCBvciBoaWRlIGl0IHdoZW4gdGhlcmUgYXJlIG5ldyB3aW5kb3dzLiIsCiAgImdldHRleHQtZG9tYWluIjogImF1dG8tYWN0aXZpdGllcyIsCiAgIm5hbWUiOiAiQXV0byBBY3Rpdml0aWVzIiwKICAib3JpZ2luYWwtYXV0aG9yIjogImFjZWRyb25zQHlhaG9vLmNvLmpwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vamFuLW5ld2lrby9hdXRvLWFjdGl2aXRpZXMiLAogICJ1dWlkIjogImF1dG8tYWN0aXZpdGllc0BhY2Vkcm9uLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAxNAp9"}}} @@ -514,7 +514,7 @@ , {"uuid": "rippleremove@slippinggitty", "name": "Ripple Remove", "pname": "ripple-remove", "description": "Removes the ripple effect from the Activities hot corner", "link": "https://extensions.gnome.org/extension/4264/ripple-remove/", "shell_version_map": {"40": {"version": "1", "sha256": "1dnk8nfnv5hp8c11fzhn5vscicij4lk9i1vz25fz6sjc3rn1a9pq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlbW92ZXMgdGhlIHJpcHBsZSBlZmZlY3QgZnJvbSB0aGUgQWN0aXZpdGllcyBob3QgY29ybmVyIiwKICAibmFtZSI6ICJSaXBwbGUgUmVtb3ZlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5zbGlwcGluZ2l0dHkucmlwcGxlcmVtb3ZlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJyaXBwbGVyZW1vdmVAc2xpcHBpbmdnaXR0eSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "quickmenu@slippinggitty", "name": "Quick Menu [DEAD]", "pname": "quick-menu", "description": "This is a fork of fedoramenu (which is a fork of Big Sur Menu by fausto) that scrubs references of Fedora by replacing the icon with the GNOME logo.\n\nQuick Menu is a panel applet similar to the Apple menu found on macOS.\n\nEDIT: This extension's purpose is dead. Check out Tofu Menu, which is fedoramenu, but with the ability to change the icon. https://extensions.gnome.org/extension/4272/tofu-menu/", "link": "https://extensions.gnome.org/extension/4266/quick-menu/", "shell_version_map": {"40": {"version": "1", "sha256": "1qla029n79366a7xvg2d9v0wa7272bqj40ggvbjrfsbd8x066aca", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYSBmb3JrIG9mIGZlZG9yYW1lbnUgKHdoaWNoIGlzIGEgZm9yayBvZiBCaWcgU3VyIE1lbnUgYnkgZmF1c3RvKSB0aGF0IHNjcnVicyByZWZlcmVuY2VzIG9mIEZlZG9yYSBieSByZXBsYWNpbmcgdGhlIGljb24gd2l0aCB0aGUgR05PTUUgbG9nby5cblxuUXVpY2sgTWVudSBpcyBhIHBhbmVsIGFwcGxldCBzaW1pbGFyIHRvIHRoZSBBcHBsZSBtZW51IGZvdW5kIG9uIG1hY09TLlxuXG5FRElUOiBUaGlzIGV4dGVuc2lvbidzIHB1cnBvc2UgaXMgZGVhZC4gQ2hlY2sgb3V0IFRvZnUgTWVudSwgd2hpY2ggaXMgZmVkb3JhbWVudSwgYnV0IHdpdGggdGhlIGFiaWxpdHkgdG8gY2hhbmdlIHRoZSBpY29uLiBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi80MjcyL3RvZnUtbWVudS8iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJxdWljay1tZW51IiwKICAibmFtZSI6ICJRdWljayBNZW51IFtERUFEXSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuc2xpcHBpbmdpdHR5LnF1aWNrLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2xpcHBpbmdHaXR0eS9xdWlja21lbnUiLAogICJ1dWlkIjogInF1aWNrbWVudUBzbGlwcGluZ2dpdHR5IiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "show-desktop-applet@valent-in", "name": "Show Desktop Applet", "pname": "show-desktop-applet", "description": "Minimize/unminimize all open windows with a single click.\n\nForked from https://extensions.gnome.org/extension/1194/show-desktop-button/\n\nFeatures:\n- Windows-like behavior\n- Can be placed at the end of panel\n- Hotkey support (can be activated in settings)", "link": "https://extensions.gnome.org/extension/4267/show-desktop-applet/", "shell_version_map": {"38": {"version": "3", "sha256": "1cm3mfcijjgm9wy2m5hvc6q4ra4b4nqpwl8zhvpf2gxp7vrg4l2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WYWxlbnQtaW4vU2hvdy1EZXNrdG9wLUFwcGxldCIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWFwcGxldEB2YWxlbnQtaW4iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1cm3mfcijjgm9wy2m5hvc6q4ra4b4nqpwl8zhvpf2gxp7vrg4l2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WYWxlbnQtaW4vU2hvdy1EZXNrdG9wLUFwcGxldCIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWFwcGxldEB2YWxlbnQtaW4iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1cm3mfcijjgm9wy2m5hvc6q4ra4b4nqpwl8zhvpf2gxp7vrg4l2y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1pbmltaXplL3VubWluaW1pemUgYWxsIG9wZW4gd2luZG93cyB3aXRoIGEgc2luZ2xlIGNsaWNrLlxuXG5Gb3JrZWQgZnJvbSBodHRwczovL2V4dGVuc2lvbnMuZ25vbWUub3JnL2V4dGVuc2lvbi8xMTk0L3Nob3ctZGVza3RvcC1idXR0b24vXG5cbkZlYXR1cmVzOlxuLSBXaW5kb3dzLWxpa2UgYmVoYXZpb3Jcbi0gQ2FuIGJlIHBsYWNlZCBhdCB0aGUgZW5kIG9mIHBhbmVsXG4tIEhvdGtleSBzdXBwb3J0IChjYW4gYmUgYWN0aXZhdGVkIGluIHNldHRpbmdzKSIsCiAgImV4dGVuc2lvbi1pZCI6ICJzaG93LWRlc2t0b3AtYXBwbGV0IiwKICAiZ2V0dGV4dC1kb21haW4iOiAic2hvdy1kZXNrdG9wLWFwcGxldCIsCiAgImxvY2FsZWRpciI6ICIvdXNyL3NoYXJlL2xvY2FsZSIsCiAgIm5hbWUiOiAiU2hvdyBEZXNrdG9wIEFwcGxldCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5zaG93LWRlc2t0b3AtYXBwbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9WYWxlbnQtaW4vU2hvdy1EZXNrdG9wLUFwcGxldCIsCiAgInV1aWQiOiAic2hvdy1kZXNrdG9wLWFwcGxldEB2YWxlbnQtaW4iLAogICJ2ZXJzaW9uIjogMwp9"}}} -, {"uuid": "AlphabeticalAppGrid@stuarthayhurst", "name": "Alphabetical App Grid", "pname": "alphabetical-app-grid", "description": "Restore the alphabetical ordering of the app grid", "link": "https://extensions.gnome.org/extension/4269/alphabetical-app-grid/", "shell_version_map": {"38": {"version": "24", "sha256": "0v2s215c9gahr2farhx66qhiq5k8qvchnqhw25bhly1klfd21gbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDI0Cn0="}, "40": {"version": "24", "sha256": "0v2s215c9gahr2farhx66qhiq5k8qvchnqhw25bhly1klfd21gbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "24", "sha256": "0v2s215c9gahr2farhx66qhiq5k8qvchnqhw25bhly1klfd21gbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDI0Cn0="}, "42": {"version": "24", "sha256": "0v2s215c9gahr2farhx66qhiq5k8qvchnqhw25bhly1klfd21gbh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDI0Cn0="}}} +, {"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": "25", "sha256": "01012rr9azwidh5anwl54g33c2z1yfz9sz1bdjdc7c895jzzr07g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDI1Cn0="}, "40": {"version": "25", "sha256": "01012rr9azwidh5anwl54g33c2z1yfz9sz1bdjdc7c895jzzr07g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDI1Cn0="}, "41": {"version": "25", "sha256": "01012rr9azwidh5anwl54g33c2z1yfz9sz1bdjdc7c895jzzr07g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDI1Cn0="}, "42": {"version": "25", "sha256": "01012rr9azwidh5anwl54g33c2z1yfz9sz1bdjdc7c895jzzr07g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlYnVnIjogZmFsc2UsCiAgImRlc2NyaXB0aW9uIjogIlJlc3RvcmUgdGhlIGFscGhhYmV0aWNhbCBvcmRlcmluZyBvZiB0aGUgYXBwIGdyaWQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAibmFtZSI6ICJBbHBoYWJldGljYWwgQXBwIEdyaWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuYWxwaGFiZXRpY2FsLWFwcC1ncmlkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc3R1YXJ0aGF5aHVyc3QvYWxwaGFiZXRpY2FsLWdyaWQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJBbHBoYWJldGljYWxBcHBHcmlkQHN0dWFydGhheWh1cnN0IiwKICAidmVyc2lvbiI6IDI1Cn0="}}} , {"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"}}} @@ -527,15 +527,15 @@ , {"uuid": "user-pics@comfy", "name": "User Pics", "pname": "user-pics", "description": "lucasalveslm's User Account Image for gnome-shell 3.38", "link": "https://extensions.gnome.org/extension/4301/user-pics/", "shell_version_map": {"38": {"version": "3", "sha256": "1rv6x551dm3hynfkm291b4c552j9d6q89ixmrq0x97xgw75n14fx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImx1Y2FzYWx2ZXNsbSdzIFVzZXIgQWNjb3VudCBJbWFnZSBmb3IgZ25vbWUtc2hlbGwgMy4zOCIsCiAgIm5hbWUiOiAiVXNlciBQaWNzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInVzZXItcGljc0Bjb21meSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "screendarker@yingshaoxo.github.com", "name": "Screen Darker", "pname": "screen-darker", "description": "Help you do a switch between a darker screen and brighter screen by one click.", "link": "https://extensions.gnome.org/extension/4304/screen-darker/", "shell_version_map": {"38": {"version": "1", "sha256": "1zlncw0y5crq6n0slhq1f9npzvkkcyh0187z88mzycr55nl4rsx8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhlbHAgeW91IGRvIGEgc3dpdGNoIGJldHdlZW4gYSBkYXJrZXIgc2NyZWVuIGFuZCBicmlnaHRlciBzY3JlZW4gYnkgb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiU2NyZWVuIERhcmtlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3lpbmdzaGFveG8vZ25vbWUtc2hlbGwtc2NyZWVuLWRhcmtlciIsCiAgInV1aWQiOiAic2NyZWVuZGFya2VyQHlpbmdzaGFveG8uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "network-stats@gnome.noroadsleft.xyz", "name": "Network Stats", "pname": "network-stats", "description": "Displays internet upload speed, download speed, bandwidth, data usage. \n\n visit github page for instructions, suggestions and feature requests. \n\n ERROR while updating extension ? restart your system or reload gnome shell. Alt + F2 then r + Enter", "link": "https://extensions.gnome.org/extension/4308/network-stats/", "shell_version_map": {"38": {"version": "14", "sha256": "13kc4ga2wvka3p0kwyy35wjlcnb2zr19xqhkbisn0n36y59cd2f9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25vcm9hZHNsZWZ0MDAwL2dub21lLW5ldHdvcmstc3RhdHMiLAogICJ1dWlkIjogIm5ldHdvcmstc3RhdHNAZ25vbWUubm9yb2Fkc2xlZnQueHl6IiwKICAidmVyc2lvbiI6IDE0Cn0="}, "40": {"version": "14", "sha256": "13kc4ga2wvka3p0kwyy35wjlcnb2zr19xqhkbisn0n36y59cd2f9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25vcm9hZHNsZWZ0MDAwL2dub21lLW5ldHdvcmstc3RhdHMiLAogICJ1dWlkIjogIm5ldHdvcmstc3RhdHNAZ25vbWUubm9yb2Fkc2xlZnQueHl6IiwKICAidmVyc2lvbiI6IDE0Cn0="}, "41": {"version": "14", "sha256": "13kc4ga2wvka3p0kwyy35wjlcnb2zr19xqhkbisn0n36y59cd2f9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25vcm9hZHNsZWZ0MDAwL2dub21lLW5ldHdvcmstc3RhdHMiLAogICJ1dWlkIjogIm5ldHdvcmstc3RhdHNAZ25vbWUubm9yb2Fkc2xlZnQueHl6IiwKICAidmVyc2lvbiI6IDE0Cn0="}, "42": {"version": "14", "sha256": "13kc4ga2wvka3p0kwyy35wjlcnb2zr19xqhkbisn0n36y59cd2f9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGludGVybmV0IHVwbG9hZCBzcGVlZCwgZG93bmxvYWQgc3BlZWQsIGJhbmR3aWR0aCwgZGF0YSB1c2FnZS4gXG5cbiB2aXNpdCBnaXRodWIgcGFnZSBmb3IgaW5zdHJ1Y3Rpb25zLCBzdWdnZXN0aW9ucyBhbmQgZmVhdHVyZSByZXF1ZXN0cy4gXG5cbiBFUlJPUiB3aGlsZSB1cGRhdGluZyBleHRlbnNpb24gPyByZXN0YXJ0IHlvdXIgc3lzdGVtIG9yIHJlbG9hZCBnbm9tZSBzaGVsbC4gQWx0ICsgRjIgIHRoZW4gIHIgKyBFbnRlciIsCiAgImdldHRleHQtZG9tYWluIjogIm5ldHdvcmstc3RhdHMiLAogICJuYW1lIjogIk5ldHdvcmsgU3RhdHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubmV0d29yay1zdGF0cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4yNCIsCiAgICAiMy4yNiIsCiAgICAiMy4yOCIsCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25vcm9hZHNsZWZ0MDAwL2dub21lLW5ldHdvcmstc3RhdHMiLAogICJ1dWlkIjogIm5ldHdvcmstc3RhdHNAZ25vbWUubm9yb2Fkc2xlZnQueHl6IiwKICAidmVyc2lvbiI6IDE0Cn0="}}} -, {"uuid": "screen-lock@garciabaameiro.com", "name": "Screen lock", "pname": "extension-list", "description": "Simple gnome shell extension to use xscreensaver in top panel", "link": "https://extensions.gnome.org/extension/4311/extension-list/", "shell_version_map": {"40": {"version": "1", "sha256": "1jas7pcn3a28fnfs3azrbiqf22gx337js6if8v8vsb15994pbak6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBnbm9tZSBzaGVsbCBleHRlbnNpb24gdG8gdXNlIHhzY3JlZW5zYXZlciBpbiB0b3AgcGFuZWwiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJzY3JlZW4tbG9jayIsCiAgIm5hbWUiOiAiU2NyZWVuIGxvY2siLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc2NyZWVuLWxvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2F3eWVyMTMvc2NyZWVuLWxvY2siLAogICJ1dWlkIjogInNjcmVlbi1sb2NrQGdhcmNpYWJhYW1laXJvLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "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": "4", "sha256": "1lgqiph6mf01w689vnjw7sgp54h2m6pnvccy625nz924mf8xql6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9raXJieWtldmluc29uL2ZvcmNlLXNob3ctb3NrIiwKICAidXVpZCI6ICJmb3JjZS1zaG93LW9za0BicnVoLmx0ZCIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "1lgqiph6mf01w689vnjw7sgp54h2m6pnvccy625nz924mf8xql6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9raXJieWtldmluc29uL2ZvcmNlLXNob3ctb3NrIiwKICAidXVpZCI6ICJmb3JjZS1zaG93LW9za0BicnVoLmx0ZCIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "1lgqiph6mf01w689vnjw7sgp54h2m6pnvccy625nz924mf8xql6b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgdGhlIG9uLXNjcmVlbiBrZXlib2FyZCByZWdhcmRsZXNzIG9mIHdoZXRoZXIgdGhlIHRvdWNoIG1vZGUgaXMgZW5hYmxlZCIsCiAgIm5hbWUiOiAiRm9yY2UgU2hvdyBPU0siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9raXJieWtldmluc29uL2ZvcmNlLXNob3ctb3NrIiwKICAidXVpZCI6ICJmb3JjZS1zaG93LW9za0BicnVoLmx0ZCIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "asusctl-gex@asus-linux.org", "name": "asusctl-gex", "pname": "asusctl-gex", "description": "asusctl-gex is a frontend for some functionalities of asusctl and supergfxctl that were born inside the asus-linux.org community.\n\nasusctl is not required\nsupergfxctl is required if you have a dual GPU laptop and want to switch between various GPU modes. It is tested on a variaty of laptops including Intel / Nvidia, AMD / Nvidia, Intel / AMD and AMD / AMD GPU combinations.\n\nTo learn more about it, please have a look at:\nhttps://gitlab.com/asus-linux/asusctl\nhttps://gitlab.com/asus-linux/supergfxctl\nhttps://gitlab.com/asus-linux/asusctl-gex\n\nhttps://asus-linux.org/", "link": "https://extensions.gnome.org/extension/4320/asusctl-gex/", "shell_version_map": {"40": {"version": "9", "sha256": "0ivnw4bw494l5zi82yap54zd035kvr4pg6rfkz7ivwccf3y0gfzg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFzdXNjdGwtZ2V4IGlzIGEgZnJvbnRlbmQgZm9yIHNvbWUgZnVuY3Rpb25hbGl0aWVzIG9mIGFzdXNjdGwgYW5kIHN1cGVyZ2Z4Y3RsIHRoYXQgd2VyZSBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LlxuXG5hc3VzY3RsIGlzIG5vdCByZXF1aXJlZFxuc3VwZXJnZnhjdGwgaXMgcmVxdWlyZWQgaWYgeW91IGhhdmUgYSBkdWFsIEdQVSBsYXB0b3AgYW5kIHdhbnQgdG8gc3dpdGNoIGJldHdlZW4gdmFyaW91cyBHUFUgbW9kZXMuIEl0IGlzIHRlc3RlZCBvbiBhIHZhcmlhdHkgb2YgbGFwdG9wcyBpbmNsdWRpbmcgSW50ZWwgLyBOdmlkaWEsIEFNRCAvIE52aWRpYSwgSW50ZWwgLyBBTUQgYW5kIEFNRCAvIEFNRCBHUFUgY29tYmluYXRpb25zLlxuXG5UbyBsZWFybiBtb3JlIGFib3V0IGl0LCBwbGVhc2UgaGF2ZSBhIGxvb2sgYXQ6XG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9hc3VzY3RsXG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9zdXBlcmdmeGN0bFxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvYXN1c2N0bC1nZXhcblxuaHR0cHM6Ly9hc3VzLWxpbnV4Lm9yZy8iLAogICJuYW1lIjogImFzdXNjdGwtZ2V4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzdXNjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFzdXNjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAiYXN1c2N0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "0ivnw4bw494l5zi82yap54zd035kvr4pg6rfkz7ivwccf3y0gfzg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFzdXNjdGwtZ2V4IGlzIGEgZnJvbnRlbmQgZm9yIHNvbWUgZnVuY3Rpb25hbGl0aWVzIG9mIGFzdXNjdGwgYW5kIHN1cGVyZ2Z4Y3RsIHRoYXQgd2VyZSBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LlxuXG5hc3VzY3RsIGlzIG5vdCByZXF1aXJlZFxuc3VwZXJnZnhjdGwgaXMgcmVxdWlyZWQgaWYgeW91IGhhdmUgYSBkdWFsIEdQVSBsYXB0b3AgYW5kIHdhbnQgdG8gc3dpdGNoIGJldHdlZW4gdmFyaW91cyBHUFUgbW9kZXMuIEl0IGlzIHRlc3RlZCBvbiBhIHZhcmlhdHkgb2YgbGFwdG9wcyBpbmNsdWRpbmcgSW50ZWwgLyBOdmlkaWEsIEFNRCAvIE52aWRpYSwgSW50ZWwgLyBBTUQgYW5kIEFNRCAvIEFNRCBHUFUgY29tYmluYXRpb25zLlxuXG5UbyBsZWFybiBtb3JlIGFib3V0IGl0LCBwbGVhc2UgaGF2ZSBhIGxvb2sgYXQ6XG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9hc3VzY3RsXG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9zdXBlcmdmeGN0bFxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvYXN1c2N0bC1nZXhcblxuaHR0cHM6Ly9hc3VzLWxpbnV4Lm9yZy8iLAogICJuYW1lIjogImFzdXNjdGwtZ2V4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzdXNjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFzdXNjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAiYXN1c2N0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "0ivnw4bw494l5zi82yap54zd035kvr4pg6rfkz7ivwccf3y0gfzg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFzdXNjdGwtZ2V4IGlzIGEgZnJvbnRlbmQgZm9yIHNvbWUgZnVuY3Rpb25hbGl0aWVzIG9mIGFzdXNjdGwgYW5kIHN1cGVyZ2Z4Y3RsIHRoYXQgd2VyZSBib3JuIGluc2lkZSB0aGUgYXN1cy1saW51eC5vcmcgY29tbXVuaXR5LlxuXG5hc3VzY3RsIGlzIG5vdCByZXF1aXJlZFxuc3VwZXJnZnhjdGwgaXMgcmVxdWlyZWQgaWYgeW91IGhhdmUgYSBkdWFsIEdQVSBsYXB0b3AgYW5kIHdhbnQgdG8gc3dpdGNoIGJldHdlZW4gdmFyaW91cyBHUFUgbW9kZXMuIEl0IGlzIHRlc3RlZCBvbiBhIHZhcmlhdHkgb2YgbGFwdG9wcyBpbmNsdWRpbmcgSW50ZWwgLyBOdmlkaWEsIEFNRCAvIE52aWRpYSwgSW50ZWwgLyBBTUQgYW5kIEFNRCAvIEFNRCBHUFUgY29tYmluYXRpb25zLlxuXG5UbyBsZWFybiBtb3JlIGFib3V0IGl0LCBwbGVhc2UgaGF2ZSBhIGxvb2sgYXQ6XG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9hc3VzY3RsXG5odHRwczovL2dpdGxhYi5jb20vYXN1cy1saW51eC9zdXBlcmdmeGN0bFxuaHR0cHM6Ly9naXRsYWIuY29tL2FzdXMtbGludXgvYXN1c2N0bC1nZXhcblxuaHR0cHM6Ly9hc3VzLWxpbnV4Lm9yZy8iLAogICJuYW1lIjogImFzdXNjdGwtZ2V4IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFzdXNjdGwtZ2V4IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFzdXNjdGwtZ2V4QGFzdXMtbGludXgub3JnIiwKICAidXVpZC1kZXYiOiAiYXN1c2N0bC1nZXgtZGV2QGFzdXMtbGludXgub3JnIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "hide-activities-button@nmingori.gnome-shell-extensions.org", "name": "Hide Activities Button", "pname": "hide-activities-button", "description": "Hide Activities Button on the top panel. For Gnome 40 or 3.6+", "link": "https://extensions.gnome.org/extension/4325/hide-activities-button/", "shell_version_map": {"38": {"version": "1", "sha256": "0644h9cqy07h1fgr9wcjp4agvszrcpk6f0yr725hxfil600k5m9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4gRm9yIEdub21lIDQwIG9yIDMuNisiLAogICJuYW1lIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25taW5nb3JpL2dub21lLWhpZGUtYWN0aXRpdmllcy1idXR0b24iLAogICJ1dWlkIjogImhpZGUtYWN0aXZpdGllcy1idXR0b25Abm1pbmdvcmkuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5vcmciLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "0644h9cqy07h1fgr9wcjp4agvszrcpk6f0yr725hxfil600k5m9b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4gRm9yIEdub21lIDQwIG9yIDMuNisiLAogICJuYW1lIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuNiIsCiAgICAiMy44IiwKICAgICIzLjEwIiwKICAgICIzLjEyIiwKICAgICIzLjE0IiwKICAgICIzLjE2IiwKICAgICIzLjE4IiwKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICIzLjI2IiwKICAgICIzLjI4IiwKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL25taW5nb3JpL2dub21lLWhpZGUtYWN0aXRpdmllcy1idXR0b24iLAogICJ1dWlkIjogImhpZGUtYWN0aXZpdGllcy1idXR0b25Abm1pbmdvcmkuZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy5vcmciLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "apt-shortcuts@rx1310", "name": "Shortcuts for APT", "pname": "shortcuts-for-apt", "description": "A small extension that adds buttons to the panel to check for APT updates through the terminal without entering commands.", "link": "https://extensions.gnome.org/extension/4328/shortcuts-for-apt/", "shell_version_map": {"38": {"version": "2", "sha256": "1dagzbryg85hgdksxqb90j6ia1b4rfpm46jihviivc8jz1iqb6f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgQVBUIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgQVBUIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3J4MTMxMC9nbm9tZS1leHRlbnNpb25fYXB0dXBkYXRlIiwKICAidXVpZCI6ICJhcHQtc2hvcnRjdXRzQHJ4MTMxMCIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1dagzbryg85hgdksxqb90j6ia1b4rfpm46jihviivc8jz1iqb6f0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgQVBUIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgQVBUIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3J4MTMxMC9nbm9tZS1leHRlbnNpb25fYXB0dXBkYXRlIiwKICAidXVpZCI6ICJhcHQtc2hvcnRjdXRzQHJ4MTMxMCIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "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": "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": "4", "sha256": "0z1kkvplvqywjpxw9cv2lv0bhl1m56fmq7d98gcv4iqh94s1p2zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "40": {"version": "4", "sha256": "0z1kkvplvqywjpxw9cv2lv0bhl1m56fmq7d98gcv4iqh94s1p2zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0z1kkvplvqywjpxw9cv2lv0bhl1m56fmq7d98gcv4iqh94s1p2zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0z1kkvplvqywjpxw9cv2lv0bhl1m56fmq7d98gcv4iqh94s1p2zm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJhbGxvd2xvY2tlZHJlbW90ZWRlc2t0b3BAa2FtZW5zLnVzIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"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": "7", "sha256": "04w9kkkpfppajwi0ph14sc8pm8wjf0pd7av84y9ggdybd3i3wh9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93IHJlbW90ZSBkZXNrdG9wIGNvbm5lY3Rpb25zIHdoZW4gdGhlIHNjcmVlbiBpcyBsb2NrZWQiLAogICJuYW1lIjogIkFsbG93IExvY2tlZCBSZW1vdGUgRGVza3RvcCIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImFsbG93bG9ja2VkcmVtb3RlZGVza3RvcEBrYW1lbnMudXMiLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"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": "3", "sha256": "1lbpscd4lyhm9hy7w287pqaam73qgx756dyk17zysksg3fjhp3w8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF3ZWlsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdW1ibGUtcGluZyIsCiAgInV1aWQiOiAibXVtYmxlLXBpbmdAbWF3ZWlsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "1lbpscd4lyhm9hy7w287pqaam73qgx756dyk17zysksg3fjhp3w8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF3ZWlsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdW1ibGUtcGluZyIsCiAgInV1aWQiOiAibXVtYmxlLXBpbmdAbWF3ZWlsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "1lbpscd4lyhm9hy7w287pqaam73qgx756dyk17zysksg3fjhp3w8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF3ZWlsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdW1ibGUtcGluZyIsCiAgInV1aWQiOiAibXVtYmxlLXBpbmdAbWF3ZWlsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "1lbpscd4lyhm9hy7w287pqaam73qgx756dyk17zysksg3fjhp3w8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGhvdyBtYW55IHVzZXJzIGFyZSBjdXJyZW50bHkgb25saW5lIG9uIGEgbXVtYmxlIHNlcnZlciIsCiAgImdldHRleHQtZG9tYWluIjogIm11bWJsZS1waW5nIiwKICAibmFtZSI6ICJNdW1ibGVQaW5nIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm11bWJsZS1waW5nIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWF3ZWlsL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tdW1ibGUtcGluZyIsCiAgInV1aWQiOiAibXVtYmxlLXBpbmdAbWF3ZWlsLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"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": "6", "sha256": "0pz14h5pf774bl4ij9qg7d8cgc60kyv0q5gmf9isgk38javqdwis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5keXJpY2hhcmRzb24vc2ltcGx5LXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNpbXBseS53b3Jrc3BhY2VzQGFuZHlyaWNoYXJkc29uLmRldiIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "0pz14h5pf774bl4ij9qg7d8cgc60kyv0q5gmf9isgk38javqdwis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5keXJpY2hhcmRzb24vc2ltcGx5LXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNpbXBseS53b3Jrc3BhY2VzQGFuZHlyaWNoYXJkc29uLmRldiIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "0pz14h5pf774bl4ij9qg7d8cgc60kyv0q5gmf9isgk38javqdwis", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBseSBXb3Jrc3BhY2VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYW5keXJpY2hhcmRzb24vc2ltcGx5LXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInNpbXBseS53b3Jrc3BhY2VzQGFuZHlyaWNoYXJkc29uLmRldiIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"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=="}}} @@ -562,13 +562,13 @@ , {"uuid": "advanced-alt-tab@G-dH.github.com", "name": "AATWS - Advanced Alt-Tab Window Switcher", "pname": "advanced-alttab-window-switcher", "description": "Highly customizable replacement for the Alt/Super+Tab window/app switchers that offers 'type to search' mode, various filtering and sorting options, workspace and monitor navigation, configurable hotkeys for navigation and window/app control and an app launcher.\nAATWS is compatible with Custom Hot Corners - Extended extension, allows to configure any mouse button and scroll wheel and can be used as a mouse controlled 'dock'.\n\nNote that GNOME has 3 built-in window switcher popups and this extension replaces all of them. The first one is grouping windows by applications and is used as default in vanilla GNOME distributions. The second one offers window list and the third one windows of the currently focused application. You can set keyboard shortcuts for all the switchers in the Gnome Settings.\n\nFollow the link below for more information and bug reports.\n\nKeywords: alttab, search, find, window search, popup delay, applications, apps, dock, monitor, thumbnail, preview, move windows, launch app, switch, VIM.", "link": "https://extensions.gnome.org/extension/4412/advanced-alttab-window-switcher/", "shell_version_map": {"38": {"version": "18", "sha256": "1yffq1i2pczjgy5kgj0mnqp5asimvw5ajnr62p2ywy2di2g2zryb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "40": {"version": "18", "sha256": "1yffq1i2pczjgy5kgj0mnqp5asimvw5ajnr62p2ywy2di2g2zryb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "41": {"version": "18", "sha256": "1yffq1i2pczjgy5kgj0mnqp5asimvw5ajnr62p2ywy2di2g2zryb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}, "42": {"version": "18", "sha256": "1yffq1i2pczjgy5kgj0mnqp5asimvw5ajnr62p2ywy2di2g2zryb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hseSBjdXN0b21pemFibGUgcmVwbGFjZW1lbnQgZm9yIHRoZSBBbHQvU3VwZXIrVGFiIHdpbmRvdy9hcHAgc3dpdGNoZXJzIHRoYXQgb2ZmZXJzICd0eXBlIHRvIHNlYXJjaCcgbW9kZSwgdmFyaW91cyBmaWx0ZXJpbmcgYW5kIHNvcnRpbmcgb3B0aW9ucywgd29ya3NwYWNlIGFuZCBtb25pdG9yIG5hdmlnYXRpb24sIGNvbmZpZ3VyYWJsZSBob3RrZXlzIGZvciBuYXZpZ2F0aW9uIGFuZCB3aW5kb3cvYXBwIGNvbnRyb2wgYW5kIGFuIGFwcCBsYXVuY2hlci5cbkFBVFdTIGlzIGNvbXBhdGlibGUgd2l0aCBDdXN0b20gSG90IENvcm5lcnMgLSBFeHRlbmRlZCBleHRlbnNpb24sIGFsbG93cyB0byBjb25maWd1cmUgYW55IG1vdXNlIGJ1dHRvbiBhbmQgc2Nyb2xsIHdoZWVsIGFuZCBjYW4gYmUgdXNlZCBhcyBhIG1vdXNlIGNvbnRyb2xsZWQgJ2RvY2snLlxuXG5Ob3RlIHRoYXQgR05PTUUgaGFzIDMgYnVpbHQtaW4gd2luZG93IHN3aXRjaGVyIHBvcHVwcyBhbmQgdGhpcyBleHRlbnNpb24gcmVwbGFjZXMgYWxsIG9mIHRoZW0uIFRoZSBmaXJzdCBvbmUgaXMgZ3JvdXBpbmcgd2luZG93cyBieSBhcHBsaWNhdGlvbnMgYW5kIGlzIHVzZWQgYXMgZGVmYXVsdCBpbiB2YW5pbGxhIEdOT01FIGRpc3RyaWJ1dGlvbnMuIFRoZSBzZWNvbmQgb25lIG9mZmVycyB3aW5kb3cgbGlzdCBhbmQgdGhlIHRoaXJkIG9uZSB3aW5kb3dzIG9mIHRoZSBjdXJyZW50bHkgZm9jdXNlZCBhcHBsaWNhdGlvbi4gWW91IGNhbiBzZXQga2V5Ym9hcmQgc2hvcnRjdXRzIGZvciBhbGwgdGhlIHN3aXRjaGVycyBpbiB0aGUgR25vbWUgU2V0dGluZ3MuXG5cbkZvbGxvdyB0aGUgbGluayBiZWxvdyBmb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYnVnIHJlcG9ydHMuXG5cbktleXdvcmRzOiBhbHR0YWIsIHNlYXJjaCwgZmluZCwgd2luZG93IHNlYXJjaCwgcG9wdXAgZGVsYXksIGFwcGxpY2F0aW9ucywgYXBwcywgZG9jaywgbW9uaXRvciwgdGh1bWJuYWlsLCBwcmV2aWV3LCBtb3ZlIHdpbmRvd3MsIGxhdW5jaCBhcHAsIHN3aXRjaCwgVklNLiIsCiAgImdldHRleHQtZG9tYWluIjogImFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAibmFtZSI6ICJBQVRXUyAtIEFkdmFuY2VkIEFsdC1UYWIgV2luZG93IFN3aXRjaGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmFkdmFuY2VkLWFsdC10YWItd2luZG93LXN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9hZHZhbmNlZC1hbHR0YWItd2luZG93LXN3aXRjaGVyIiwKICAidXVpZCI6ICJhZHZhbmNlZC1hbHQtdGFiQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxOAp9"}}} , {"uuid": "improvedosk@nick-shmyrev.dev", "name": "Improved OSK", "pname": "improved-osk", "description": "Makes Gnome's onscreen keyboard more useable with e.g. more keys.\nThis extension is a fork of https://extensions.gnome.org/extension/3330/improved-onscreen-keyboard/ by SebastianLuebke.", "link": "https://extensions.gnome.org/extension/4413/improved-osk/", "shell_version_map": {"38": {"version": "8", "sha256": "01n9gllpxvscg56awq8pmyb538mki5zddqyz7cf2c4j2s8glmaz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "01n9gllpxvscg56awq8pmyb538mki5zddqyz7cf2c4j2s8glmaz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "01n9gllpxvscg56awq8pmyb538mki5zddqyz7cf2c4j2s8glmaz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "01n9gllpxvscg56awq8pmyb538mki5zddqyz7cf2c4j2s8glmaz8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIEdub21lJ3Mgb25zY3JlZW4ga2V5Ym9hcmQgbW9yZSB1c2VhYmxlIHdpdGggZS5nLiBtb3JlIGtleXMuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgaHR0cHM6Ly9leHRlbnNpb25zLmdub21lLm9yZy9leHRlbnNpb24vMzMzMC9pbXByb3ZlZC1vbnNjcmVlbi1rZXlib2FyZC8gYnkgU2ViYXN0aWFuTHVlYmtlLiIsCiAgIm5hbWUiOiAiSW1wcm92ZWQgT1NLIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmljay1zaG15cmV2L2ltcHJvdmVkLW9zay1nbm9tZS1leHQiLAogICJ1dWlkIjogImltcHJvdmVkb3NrQG5pY2stc2hteXJldi5kZXYiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "fedora-update@pepe386", "name": "Fedora Linux Updates Indicator", "pname": "fedora-linux-updates-indicator", "description": "Update indicator for Fedora Linux and GNOME Shell.", "link": "https://extensions.gnome.org/extension/4415/fedora-linux-updates-indicator/", "shell_version_map": {"40": {"version": "5", "sha256": "1j6q1mgl75mjbr53z88vj2ablnrp4nx0q2a416wdgbiiwdazidbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXBlMzg2L2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogImZlZG9yYS11cGRhdGVAcGVwZTM4NiIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1j6q1mgl75mjbr53z88vj2ablnrp4nx0q2a416wdgbiiwdazidbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXBlMzg2L2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogImZlZG9yYS11cGRhdGVAcGVwZTM4NiIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1j6q1mgl75mjbr53z88vj2ablnrp4nx0q2a416wdgbiiwdazidbw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVwZGF0ZSBpbmRpY2F0b3IgZm9yIEZlZG9yYSBMaW51eCBhbmQgR05PTUUgU2hlbGwuIiwKICAibmFtZSI6ICJGZWRvcmEgTGludXggVXBkYXRlcyBJbmRpY2F0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9wZXBlMzg2L2ZlZG9yYS11cGRhdGUiLAogICJ1dWlkIjogImZlZG9yYS11cGRhdGVAcGVwZTM4NiIsCiAgInZlcnNpb24iOiA1Cn0="}}} -, {"uuid": "readingstrip@lupantano.gihthub", "name": "Reading Strip", "pname": "reading-strip", "description": "It is a extension for Gnome-Shell with an equivalent function to a reading guide on the computer, that's really useful for people with dyslexia.", "link": "https://extensions.gnome.org/extension/4419/reading-strip/", "shell_version_map": {"40": {"version": "16", "sha256": "1s210wdz8cg87mfznghq1wcwpvhd0fzjgvfydpw3brr3fd9l2ldc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "41": {"version": "16", "sha256": "1s210wdz8cg87mfznghq1wcwpvhd0fzjgvfydpw3brr3fd9l2ldc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}, "42": {"version": "16", "sha256": "1s210wdz8cg87mfznghq1wcwpvhd0fzjgvfydpw3brr3fd9l2ldc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0IGlzIGEgZXh0ZW5zaW9uIGZvciBHbm9tZS1TaGVsbCB3aXRoIGFuIGVxdWl2YWxlbnQgZnVuY3Rpb24gdG8gYSByZWFkaW5nIGd1aWRlIG9uIHRoZSBjb21wdXRlciwgdGhhdCdzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSB3aXRoIGR5c2xleGlhLiIsCiAgIm5hbWUiOiAiUmVhZGluZyBTdHJpcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yZWFkaW5nc3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9sdXBhbnRhbm8vcmVhZGluZ3N0cmlwIiwKICAidXVpZCI6ICJyZWFkaW5nc3RyaXBAbHVwYW50YW5vLmdpaHRodWIiLAogICJ2ZXJzaW9uIjogMTYKfQ=="}}} +, {"uuid": "readingstrip@lupantano.gihthub", "name": "Reading Strip", "pname": "reading-strip", "description": "It’s an extension for Gnome-Shell. It works as a reading guide for computer and this is really useful for people affected by dyslexia. It works great in helping children focusing to read very well, it marks the sentence that they are reading and hides the previous and the next one. It's already used in education projects at schools, it puts the attention on screen but it's also really useful for programmers and graphic designers who want to check their works.", "link": "https://extensions.gnome.org/extension/4419/reading-strip/", "shell_version_map": {"38": {"version": "23", "sha256": "0zca565nrz40ykkgv5rvf8lcyz82xqikwjqfd343n9dwz3q7v48y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVwYW50YW5vL3JlYWRpbmdzdHJpcCIsCiAgInV1aWQiOiAicmVhZGluZ3N0cmlwQGx1cGFudGFuby5naWh0aHViIiwKICAidmVyc2lvbiI6IDIzCn0="}, "40": {"version": "23", "sha256": "0zca565nrz40ykkgv5rvf8lcyz82xqikwjqfd343n9dwz3q7v48y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVwYW50YW5vL3JlYWRpbmdzdHJpcCIsCiAgInV1aWQiOiAicmVhZGluZ3N0cmlwQGx1cGFudGFuby5naWh0aHViIiwKICAidmVyc2lvbiI6IDIzCn0="}, "41": {"version": "23", "sha256": "0zca565nrz40ykkgv5rvf8lcyz82xqikwjqfd343n9dwz3q7v48y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVwYW50YW5vL3JlYWRpbmdzdHJpcCIsCiAgInV1aWQiOiAicmVhZGluZ3N0cmlwQGx1cGFudGFuby5naWh0aHViIiwKICAidmVyc2lvbiI6IDIzCn0="}, "42": {"version": "23", "sha256": "0zca565nrz40ykkgv5rvf8lcyz82xqikwjqfd343n9dwz3q7v48y", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkl0XHUyMDE5cyBhbiBleHRlbnNpb24gZm9yIEdub21lLVNoZWxsLiBJdCB3b3JrcyBhcyBhIHJlYWRpbmcgZ3VpZGUgZm9yIGNvbXB1dGVyIGFuZCB0aGlzIGlzIHJlYWxseSB1c2VmdWwgZm9yIHBlb3BsZSBhZmZlY3RlZCBieSBkeXNsZXhpYS4gSXQgd29ya3MgZ3JlYXQgaW4gaGVscGluZyBjaGlsZHJlbiBmb2N1c2luZyB0byByZWFkIHZlcnkgd2VsbCwgaXQgbWFya3MgdGhlIHNlbnRlbmNlIHRoYXQgdGhleSBhcmUgcmVhZGluZyBhbmQgaGlkZXMgdGhlIHByZXZpb3VzIGFuZCB0aGUgbmV4dCBvbmUuIEl0J3MgYWxyZWFkeSB1c2VkIGluIGVkdWNhdGlvbiBwcm9qZWN0cyBhdCBzY2hvb2xzLCBpdCBwdXRzIHRoZSBhdHRlbnRpb24gb24gc2NyZWVuIGJ1dCBpdCdzIGFsc28gcmVhbGx5IHVzZWZ1bCBmb3IgcHJvZ3JhbW1lcnMgYW5kIGdyYXBoaWMgZGVzaWduZXJzIHdobyB3YW50IHRvIGNoZWNrIHRoZWlyIHdvcmtzLiIsCiAgImdldHRleHQtZG9tYWluIjogInJlYWRpbmctc3RyaXAiLAogICJuYW1lIjogIlJlYWRpbmcgU3RyaXAiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiLAogICAgIjQzIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHVwYW50YW5vL3JlYWRpbmdzdHJpcCIsCiAgInV1aWQiOiAicmVhZGluZ3N0cmlwQGx1cGFudGFuby5naWh0aHViIiwKICAidmVyc2lvbiI6IDIzCn0="}}} , {"uuid": "gnome-clipboard@b00f.github.io", "name": "Gnome Clipboard", "pname": "gnome-clipboard", "description": "A gnome shell extension to manage your clipboard.", "link": "https://extensions.gnome.org/extension/4422/gnome-clipboard/", "shell_version_map": {"38": {"version": "8", "sha256": "1zgymry549c6pmj1c0f6gvpyyfj0z93fwbhhxa67fx3nf95gb3kv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "14", "sha256": "1cflqd12djby97ji6a595hrszimyxdzd1wwbrcdsb1519cc8gj8d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "41": {"version": "14", "sha256": "1cflqd12djby97ji6a595hrszimyxdzd1wwbrcdsb1519cc8gj8d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}, "42": {"version": "14", "sha256": "1cflqd12djby97ji6a595hrszimyxdzd1wwbrcdsb1519cc8gj8d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZ25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIG1hbmFnZSB5b3VyIGNsaXBib2FyZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJnbm9tZS1jbGlwYm9hcmQiLAogICJuYW1lIjogIkdub21lIENsaXBib2FyZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2IwMGYvZ25vbWUtY2xpcGJvYXJkIiwKICAidXVpZCI6ICJnbm9tZS1jbGlwYm9hcmRAYjAwZi5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTQKfQ=="}}} , {"uuid": "thanatophobia@yatx.one", "name": "Thanatophobia", "pname": "thanatophobia", "description": "Displays your age in real time. \n\nGreat source of motivation according to terror management theory!", "link": "https://extensions.gnome.org/extension/4425/thanatophobia/", "shell_version_map": {"40": {"version": "8", "sha256": "1bak0ap7rf6101qhvlbjiw41dwqiz21yg3px9l2dqkf751jmq7gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V5b3RlZC90aGFuYXRvcGhvYmlhIiwKICAidXVpZCI6ICJ0aGFuYXRvcGhvYmlhQHlhdHgub25lIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "1bak0ap7rf6101qhvlbjiw41dwqiz21yg3px9l2dqkf751jmq7gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V5b3RlZC90aGFuYXRvcGhvYmlhIiwKICAidXVpZCI6ICJ0aGFuYXRvcGhvYmlhQHlhdHgub25lIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "1bak0ap7rf6101qhvlbjiw41dwqiz21yg3px9l2dqkf751jmq7gz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHlvdXIgYWdlIGluIHJlYWwgdGltZS4gXG5cbkdyZWF0IHNvdXJjZSBvZiBtb3RpdmF0aW9uIGFjY29yZGluZyB0byB0ZXJyb3IgbWFuYWdlbWVudCB0aGVvcnkhIiwKICAibmFtZSI6ICJUaGFuYXRvcGhvYmlhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V5b3RlZC90aGFuYXRvcGhvYmlhIiwKICAidXVpZCI6ICJ0aGFuYXRvcGhvYmlhQHlhdHgub25lIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "typewriter-kb@zzzheka97.gmail.com", "name": "Typewriter Keyboard", "pname": "typewriter-keyboard", "description": "Add a typewriter effect to your keyboard.\n \nThis extension is based on typewriter-kb application \n(https://github.com/ZhekehZ/linux-typewriter-kb), which \nis required to run the extension, but is not part of it.\n \n-------------------------------------------\nIcons made by Freepik from www.flaticon.com", "link": "https://extensions.gnome.org/extension/4427/typewriter-keyboard/", "shell_version_map": {"38": {"version": "3", "sha256": "0f4w8bf0vp6s79zcfwa0r7ksazrvl309v8jdbfjf0800dc0zsnw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "0f4w8bf0vp6s79zcfwa0r7ksazrvl309v8jdbfjf0800dc0zsnw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "0f4w8bf0vp6s79zcfwa0r7ksazrvl309v8jdbfjf0800dc0zsnw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "0f4w8bf0vp6s79zcfwa0r7ksazrvl309v8jdbfjf0800dc0zsnw0", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHR5cGV3cml0ZXIgZWZmZWN0IHRvIHlvdXIga2V5Ym9hcmQuXG4gXG5UaGlzIGV4dGVuc2lvbiBpcyBiYXNlZCBvbiB0eXBld3JpdGVyLWtiIGFwcGxpY2F0aW9uIFxuKGh0dHBzOi8vZ2l0aHViLmNvbS9aaGVrZWhaL2xpbnV4LXR5cGV3cml0ZXIta2IpLCB3aGljaCBcbmlzIHJlcXVpcmVkIHRvIHJ1biB0aGUgZXh0ZW5zaW9uLCBidXQgaXMgbm90IHBhcnQgb2YgaXQuXG4gXG4tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tXG5JY29ucyBtYWRlIGJ5IEZyZWVwaWsgZnJvbSB3d3cuZmxhdGljb24uY29tIiwKICAibmFtZSI6ICJUeXBld3JpdGVyIEtleWJvYXJkIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInR5cGV3cml0ZXIta2JAenp6aGVrYTk3LmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "dark-side@kamil-galek.pl", "name": "Dark side of Gnome", "pname": "dark-side-of-gnome", "description": "Join the dark side with some of your apps. For now it won't work with every app.", "link": "https://extensions.gnome.org/extension/4430/dark-side-of-gnome/", "shell_version_map": {"40": {"version": "2", "sha256": "08kzwpn22qwgyrps4khwkarn4rakr1rn57wg94wpfgd9pfbgb7ri", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkpvaW4gdGhlIGRhcmsgc2lkZSB3aXRoIHNvbWUgb2YgeW91ciBhcHBzLiBGb3Igbm93IGl0IHdvbid0IHdvcmsgd2l0aCBldmVyeSBhcHAuIiwKICAibmFtZSI6ICJEYXJrIHNpZGUgb2YgR25vbWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRhcmstc2lkZUBrYW1pbC1nYWxlay5wbCIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "wizlight@iabhilashjoshi", "name": "Wiz Light", "pname": "wiz-light", "description": "Control Wiz Connected Lights Through Gnome Shell\n\nRequirements:\n #Wiz enabled smart bulb\n #python3 (To install use command \"sudo apt install python3\")\n #pywizlight (To install use command \"pip3 install pywizlight\")\n\nTo Use go to the location where extension is installed (usually stored in \"~/.local/share/gnome-shell/extensions\") and change IP address in extension.js file to your smart bulb's IP address and then extension should work.", "link": "https://extensions.gnome.org/extension/4436/wiz-light/", "shell_version_map": {"38": {"version": "4", "sha256": "0pby93ivqz2ymdskyjp6ajc2c588dbpq7vjj7b7d8mc03hvkap5z", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbnRyb2wgV2l6IENvbm5lY3RlZCBMaWdodHMgVGhyb3VnaCBHbm9tZSBTaGVsbFxuXG5SZXF1aXJlbWVudHM6XG4gICAgICAgICNXaXogZW5hYmxlZCBzbWFydCBidWxiXG4gICAgICAgICNweXRob24zICAoVG8gaW5zdGFsbCAgdXNlIGNvbW1hbmQgXCJzdWRvIGFwdCBpbnN0YWxsIHB5dGhvbjNcIilcbiAgICAgICAgI3B5d2l6bGlnaHQgKFRvIGluc3RhbGwgdXNlIGNvbW1hbmQgXCJwaXAzIGluc3RhbGwgcHl3aXpsaWdodFwiKVxuXG5UbyBVc2UgZ28gdG8gdGhlIGxvY2F0aW9uIHdoZXJlIGV4dGVuc2lvbiBpcyBpbnN0YWxsZWQgKHVzdWFsbHkgc3RvcmVkIGluIFwifi8ubG9jYWwvc2hhcmUvZ25vbWUtc2hlbGwvZXh0ZW5zaW9uc1wiKSBhbmQgY2hhbmdlIElQIGFkZHJlc3MgaW4gZXh0ZW5zaW9uLmpzIGZpbGUgdG8geW91ciBzbWFydCBidWxiJ3MgSVAgYWRkcmVzcyBhbmQgdGhlbiBleHRlbnNpb24gc2hvdWxkIHdvcmsuIiwKICAibmFtZSI6ICJXaXogTGlnaHQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hbHBoYXNwZWFyL1dpei1MaWdodCIsCiAgInV1aWQiOiAid2l6bGlnaHRAaWFiaGlsYXNoam9zaGkiLAogICJ2ZXJzaW9uIjogNAp9"}}} -, {"uuid": "gSnap@micahosborne", "name": "gSnap", "pname": "gsnap", "description": "Organize windows in customizable snap zones like FancyZones on Windows.", "link": "https://extensions.gnome.org/extension/4442/gsnap/", "shell_version_map": {"40": {"version": "9", "sha256": "1yh6kpdvpbz5af5n59khzkh6wzribw5fnw1grsmdmwgb188m87in", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dub21lU25hcEV4dGVuc2lvbnMvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "41": {"version": "9", "sha256": "1yh6kpdvpbz5af5n59khzkh6wzribw5fnw1grsmdmwgb188m87in", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dub21lU25hcEV4dGVuc2lvbnMvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "42": {"version": "9", "sha256": "1yh6kpdvpbz5af5n59khzkh6wzribw5fnw1grsmdmwgb188m87in", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0dub21lU25hcEV4dGVuc2lvbnMvZ1NuYXAiLAogICJ1dWlkIjogImdTbmFwQG1pY2Fob3Nib3JuZSIsCiAgInZlcnNpb24iOiA5Cn0="}}} +, {"uuid": "gSnap@micahosborne", "name": "gSnap", "pname": "gsnap", "description": "Organize windows in customizable snap zones like FancyZones on Windows.", "link": "https://extensions.gnome.org/extension/4442/gsnap/", "shell_version_map": {"40": {"version": "11", "sha256": "0xg7pn262j62jbk3ghr72g3wbghgbxv5jjmib18d1ndzripfsyv8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2Fob3Nib3JuZS9nU25hcCIsCiAgInV1aWQiOiAiZ1NuYXBAbWljYWhvc2Jvcm5lIiwKICAidmVyc2lvbiI6IDExCn0="}, "41": {"version": "11", "sha256": "0xg7pn262j62jbk3ghr72g3wbghgbxv5jjmib18d1ndzripfsyv8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2Fob3Nib3JuZS9nU25hcCIsCiAgInV1aWQiOiAiZ1NuYXBAbWljYWhvc2Jvcm5lIiwKICAidmVyc2lvbiI6IDExCn0="}, "42": {"version": "11", "sha256": "0xg7pn262j62jbk3ghr72g3wbghgbxv5jjmib18d1ndzripfsyv8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk9yZ2FuaXplIHdpbmRvd3MgaW4gY3VzdG9taXphYmxlIHNuYXAgem9uZXMgbGlrZSBGYW5jeVpvbmVzIG9uIFdpbmRvd3MuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZ3NuYXBAbWljYWhvc2Jvcm5lIiwKICAibmFtZSI6ICJnU25hcCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5nc25hcCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21pY2Fob3Nib3JuZS9nU25hcCIsCiAgInV1aWQiOiAiZ1NuYXBAbWljYWhvc2Jvcm5lIiwKICAidmVyc2lvbiI6IDExCn0="}}} , {"uuid": "appswitcheronlyoncurrentworkspace@ermesonsampaio.com", "name": "Alt + Tab only on current workspace", "pname": "alt-tab-only-on-current-workspace", "description": "Force alt + tab to switch only in the current workspace.", "link": "https://extensions.gnome.org/extension/4443/alt-tab-only-on-current-workspace/", "shell_version_map": {"40": {"version": "3", "sha256": "1jl7gi45gz9fliggkwdg44rdqcirh6qxfkvc639vbw2sgmpbmcvw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmNlIGFsdCArIHRhYiB0byBzd2l0Y2ggb25seSBpbiB0aGUgY3VycmVudCB3b3Jrc3BhY2UuIiwKICAibmFtZSI6ICJBbHQgKyBUYWIgb25seSBvbiBjdXJyZW50IHdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lcm1lc29uc2FtcGFpby9hcHAtc3dpdGNoZXItb25seS1vbi1jdXJyZW50LXdvcmtzcGFjZSIsCiAgInV1aWQiOiAiYXBwc3dpdGNoZXJvbmx5b25jdXJyZW50d29ya3NwYWNlQGVybWVzb25zYW1wYWlvLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "logomenu@aryan_k", "name": "Logo Menu", "pname": "logo-menu", "description": "Logo Menu - Menu similar to Apple's macOS menu for the GNOME Desktop\nThis extension gives a simple menu along with the ability to get the icon of your distro on top left part of the panel for a great look.\nThe Icon can be customized through settings, it has both Linux and BSD logos.\nfor more screenshots, visit GitHub.\n\nThe default Terminal and Software center can also be changed.\n\nThis extension is a fork of - https://github.com/tofutech/tofumenu\n\nThe original project is no more supported thus I made this.", "link": "https://extensions.gnome.org/extension/4451/logo-menu/", "shell_version_map": {"38": {"version": "13", "sha256": "0bv9dm3c7dc6xvr3bsi7ibaz9f0cw6rycyz6p53qvrf4zzavnjhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEzCn0="}, "40": {"version": "13", "sha256": "0bv9dm3c7dc6xvr3bsi7ibaz9f0cw6rycyz6p53qvrf4zzavnjhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEzCn0="}, "41": {"version": "13", "sha256": "0bv9dm3c7dc6xvr3bsi7ibaz9f0cw6rycyz6p53qvrf4zzavnjhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEzCn0="}, "42": {"version": "13", "sha256": "0bv9dm3c7dc6xvr3bsi7ibaz9f0cw6rycyz6p53qvrf4zzavnjhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxvZ28gTWVudSAtIE1lbnUgc2ltaWxhciB0byBBcHBsZSdzIG1hY09TIG1lbnUgZm9yIHRoZSBHTk9NRSBEZXNrdG9wXG5UaGlzIGV4dGVuc2lvbiBnaXZlcyBhIHNpbXBsZSBtZW51IGFsb25nIHdpdGggdGhlIGFiaWxpdHkgdG8gZ2V0IHRoZSBpY29uIG9mIHlvdXIgZGlzdHJvIG9uIHRvcCBsZWZ0IHBhcnQgb2YgdGhlIHBhbmVsIGZvciBhIGdyZWF0IGxvb2suXG5UaGUgSWNvbiBjYW4gYmUgY3VzdG9taXplZCB0aHJvdWdoIHNldHRpbmdzLCBpdCBoYXMgYm90aCBMaW51eCBhbmQgQlNEIGxvZ29zLlxuZm9yIG1vcmUgc2NyZWVuc2hvdHMsIHZpc2l0IEdpdEh1Yi5cblxuVGhlIGRlZmF1bHQgVGVybWluYWwgYW5kIFNvZnR3YXJlIGNlbnRlciBjYW4gYWxzbyBiZSBjaGFuZ2VkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBhIGZvcmsgb2YgLSBodHRwczovL2dpdGh1Yi5jb20vdG9mdXRlY2gvdG9mdW1lbnVcblxuVGhlIG9yaWdpbmFsIHByb2plY3QgaXMgbm8gbW9yZSBzdXBwb3J0ZWQgdGh1cyBJIG1hZGUgdGhpcy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJsb2dvLW1lbnUiLAogICJuYW1lIjogIkxvZ28gTWVudSIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuYXJ5YW5fay5sb2dvLW1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzAiLAogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9BcnlhbjIwL0xvZ29tZW51IiwKICAidXVpZCI6ICJsb2dvbWVudUBhcnlhbl9rIiwKICAidmVyc2lvbiI6IDEzCn0="}}} , {"uuid": "rog-manager@rog", "name": "Rog Asus Manager", "pname": "rog-asus-manager", "description": "Asus ROG manager", "link": "https://extensions.gnome.org/extension/4452/rog-asus-manager/", "shell_version_map": {"38": {"version": "4", "sha256": "194k3qzjd05rki20ww0nv8001aiyp4ih9abv82g64058x8rmnff5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFzdXMgUk9HIG1hbmFnZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyb2ctbWFuYWdlciIsCiAgIm5hbWUiOiAiUm9nIEFzdXMgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yb2dtYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxlamFuZHJvLW1vdXJhcy9yb2ctbWFuYWdlciIsCiAgInV1aWQiOiAicm9nLW1hbmFnZXJAcm9nIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} @@ -576,7 +576,7 @@ , {"uuid": "expandable-notifications@kaan.g.inam.org", "name": "Expandable Notifications", "pname": "expandable-notifications", "description": "Makes the notifications in the notification list expandable. Using gsettings, you can choose between three modes: AUTO, ARROW and CRITICAL. \nAUTO will expand the notifications in the notification list automatically. \nARROW adds an arrow that lets you choose what to expand or unexpand. \nCRITICAL is similar to arrow, but expands notifications with the urgency critical automatically. \n\nFor more information and an example command to change the mode, I recommend to look at the repository.", "link": "https://extensions.gnome.org/extension/4463/expandable-notifications/", "shell_version_map": {"40": {"version": "10", "sha256": "0ry4nd0mb9qyfx3m7n14byhv9v2zzg66gg19zgsl5hpbai60cnzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC4gXG5BVVRPIHdpbGwgZXhwYW5kIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBhdXRvbWF0aWNhbGx5LiBcbkFSUk9XIGFkZHMgYW4gYXJyb3cgdGhhdCBsZXRzIHlvdSBjaG9vc2Ugd2hhdCB0byBleHBhbmQgb3IgdW5leHBhbmQuIFxuQ1JJVElDQUwgaXMgc2ltaWxhciB0byBhcnJvdywgYnV0IGV4cGFuZHMgbm90aWZpY2F0aW9ucyB3aXRoIHRoZSB1cmdlbmN5IGNyaXRpY2FsIGF1dG9tYXRpY2FsbHkuIFxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYW4gZXhhbXBsZSBjb21tYW5kIHRvIGNoYW5nZSB0aGUgbW9kZSwgSSByZWNvbW1lbmQgdG8gbG9vayBhdCB0aGUgcmVwb3NpdG9yeS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWFuZ2luYW0vZXhwYW5kYWJsZS1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnNAa2Fhbi5nLmluYW0ub3JnIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "0ry4nd0mb9qyfx3m7n14byhv9v2zzg66gg19zgsl5hpbai60cnzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC4gXG5BVVRPIHdpbGwgZXhwYW5kIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBhdXRvbWF0aWNhbGx5LiBcbkFSUk9XIGFkZHMgYW4gYXJyb3cgdGhhdCBsZXRzIHlvdSBjaG9vc2Ugd2hhdCB0byBleHBhbmQgb3IgdW5leHBhbmQuIFxuQ1JJVElDQUwgaXMgc2ltaWxhciB0byBhcnJvdywgYnV0IGV4cGFuZHMgbm90aWZpY2F0aW9ucyB3aXRoIHRoZSB1cmdlbmN5IGNyaXRpY2FsIGF1dG9tYXRpY2FsbHkuIFxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYW4gZXhhbXBsZSBjb21tYW5kIHRvIGNoYW5nZSB0aGUgbW9kZSwgSSByZWNvbW1lbmQgdG8gbG9vayBhdCB0aGUgcmVwb3NpdG9yeS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWFuZ2luYW0vZXhwYW5kYWJsZS1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnNAa2Fhbi5nLmluYW0ub3JnIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "0ry4nd0mb9qyfx3m7n14byhv9v2zzg66gg19zgsl5hpbai60cnzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBleHBhbmRhYmxlLiBVc2luZyBnc2V0dGluZ3MsIHlvdSBjYW4gY2hvb3NlIGJldHdlZW4gdGhyZWUgbW9kZXM6IEFVVE8sIEFSUk9XIGFuZCBDUklUSUNBTC4gXG5BVVRPIHdpbGwgZXhwYW5kIHRoZSBub3RpZmljYXRpb25zIGluIHRoZSBub3RpZmljYXRpb24gbGlzdCBhdXRvbWF0aWNhbGx5LiBcbkFSUk9XIGFkZHMgYW4gYXJyb3cgdGhhdCBsZXRzIHlvdSBjaG9vc2Ugd2hhdCB0byBleHBhbmQgb3IgdW5leHBhbmQuIFxuQ1JJVElDQUwgaXMgc2ltaWxhciB0byBhcnJvdywgYnV0IGV4cGFuZHMgbm90aWZpY2F0aW9ucyB3aXRoIHRoZSB1cmdlbmN5IGNyaXRpY2FsIGF1dG9tYXRpY2FsbHkuIFxuXG5Gb3IgbW9yZSBpbmZvcm1hdGlvbiBhbmQgYW4gZXhhbXBsZSBjb21tYW5kIHRvIGNoYW5nZSB0aGUgbW9kZSwgSSByZWNvbW1lbmQgdG8gbG9vayBhdCB0aGUgcmVwb3NpdG9yeS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMiLAogICJuYW1lIjogIkV4cGFuZGFibGUgTm90aWZpY2F0aW9ucyIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5leHBhbmRhYmxlLW5vdGlmaWNhdGlvbnMtc2V0dGluZ3MiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9rYWFuZ2luYW0vZXhwYW5kYWJsZS1ub3RpZmljYXRpb25zIiwKICAidXVpZCI6ICJleHBhbmRhYmxlLW5vdGlmaWNhdGlvbnNAa2Fhbi5nLmluYW0ub3JnIiwKICAidmVyc2lvbiI6IDEwCn0="}}} , {"uuid": "orange-share@Yannis4444.github.com", "name": "Orange Share", "pname": "orange-share", "description": "A small python server that accepts requests from an apple shortcut to allow sharing all sorts of media from iOS. It allows sending content right from the share sheet - similar to AirDrop between Apple Devices", "link": "https://extensions.gnome.org/extension/4469/orange-share/", "shell_version_map": {"40": {"version": "7", "sha256": "14xc3j2k6fjh0nif22j3q0xk52ba2qpj96rq80g6cv3cyy8ihi2b", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgcHl0aG9uIHNlcnZlciB0aGF0IGFjY2VwdHMgcmVxdWVzdHMgZnJvbSBhbiBhcHBsZSBzaG9ydGN1dCB0byBhbGxvdyBzaGFyaW5nIGFsbCBzb3J0cyBvZiBtZWRpYSBmcm9tIGlPUy4gSXQgYWxsb3dzIHNlbmRpbmcgY29udGVudCByaWdodCBmcm9tIHRoZSBzaGFyZSBzaGVldCAtIHNpbWlsYXIgdG8gQWlyRHJvcCBiZXR3ZWVuIEFwcGxlIERldmljZXMiLAogICJuYW1lIjogIk9yYW5nZSBTaGFyZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ZYW5uaXM0NDQ0L09yYW5nZS1TaGFyZS8iLAogICJ1dWlkIjogIm9yYW5nZS1zaGFyZUBZYW5uaXM0NDQ0LmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} , {"uuid": "mediacontrols@cliffniff.github.com", "name": "Media Controls", "pname": "media-controls", "description": "Show controls and information of the currently playing media in the panel.\n\n - Highly customizable\n - Support GNOME 3.36(beta) , 3.38, 40, 41\n - Caches album art\n - Control every element in the extension", "link": "https://extensions.gnome.org/extension/4470/media-controls/", "shell_version_map": {"38": {"version": "20", "sha256": "0cvn15w11vgjpgrwb7436gyy6v7zlbnfk8bd34wyijfd9ny7d0xj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MVxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "40": {"version": "20", "sha256": "0cvn15w11vgjpgrwb7436gyy6v7zlbnfk8bd34wyijfd9ny7d0xj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MVxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}, "41": {"version": "20", "sha256": "0cvn15w11vgjpgrwb7436gyy6v7zlbnfk8bd34wyijfd9ny7d0xj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY29udHJvbHMgYW5kIGluZm9ybWF0aW9uIG9mIHRoZSBjdXJyZW50bHkgcGxheWluZyBtZWRpYSBpbiB0aGUgcGFuZWwuXG5cbiAgICAtIEhpZ2hseSBjdXN0b21pemFibGVcbiAgICAtIFN1cHBvcnQgR05PTUUgMy4zNihiZXRhKSAsIDMuMzgsIDQwLCA0MVxuICAgIC0gQ2FjaGVzIGFsYnVtIGFydFxuICAgIC0gQ29udHJvbCBldmVyeSBlbGVtZW50IGluIHRoZSBleHRlbnNpb24iLAogICJuYW1lIjogIk1lZGlhIENvbnRyb2xzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm1lZGlhY29udHJvbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NsaWZmbmlmZi9tZWRpYS1jb250cm9scyIsCiAgInV1aWQiOiAibWVkaWFjb250cm9sc0BjbGlmZm5pZmYuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyMAp9"}}} -, {"uuid": "sp-tray@sp-tray.esenliyim.github.com", "name": "spotify-tray", "pname": "spotify-tray", "description": "Adds a button to the panel that shows information Spotify playback. For bug reports, feature requests, translation contributions, etc., please visit the extension's github page.", "link": "https://extensions.gnome.org/extension/4472/spotify-tray/", "shell_version_map": {"38": {"version": "16", "sha256": "044v981zj15pbz4zihiscf95nb1ykcc501c6wnkdf7lfhybq89nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "40": {"version": "16", "sha256": "044v981zj15pbz4zihiscf95nb1ykcc501c6wnkdf7lfhybq89nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "41": {"version": "16", "sha256": "044v981zj15pbz4zihiscf95nb1ykcc501c6wnkdf7lfhybq89nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "42": {"version": "16", "sha256": "044v981zj15pbz4zihiscf95nb1ykcc501c6wnkdf7lfhybq89nd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} +, {"uuid": "sp-tray@sp-tray.esenliyim.github.com", "name": "spotify-tray", "pname": "spotify-tray", "description": "Adds a button to the panel that shows information Spotify playback. For bug reports, feature requests, translation contributions, etc., please visit the extension's github page.", "link": "https://extensions.gnome.org/extension/4472/spotify-tray/", "shell_version_map": {"38": {"version": "17", "sha256": "11gyy143n5bvsrydlr4hvy3ggn49k1pxk1d7x11dafic8xxwv5cl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "40": {"version": "17", "sha256": "11gyy143n5bvsrydlr4hvy3ggn49k1pxk1d7x11dafic8xxwv5cl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "41": {"version": "17", "sha256": "11gyy143n5bvsrydlr4hvy3ggn49k1pxk1d7x11dafic8xxwv5cl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}, "42": {"version": "17", "sha256": "11gyy143n5bvsrydlr4hvy3ggn49k1pxk1d7x11dafic8xxwv5cl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgYSBidXR0b24gdG8gdGhlIHBhbmVsIHRoYXQgc2hvd3MgaW5mb3JtYXRpb24gU3BvdGlmeSBwbGF5YmFjay4gRm9yIGJ1ZyByZXBvcnRzLCBmZWF0dXJlIHJlcXVlc3RzLCB0cmFuc2xhdGlvbiBjb250cmlidXRpb25zLCBldGMuLCBwbGVhc2UgdmlzaXQgdGhlIGV4dGVuc2lvbidzIGdpdGh1YiBwYWdlLiIsCiAgIm5hbWUiOiAic3BvdGlmeS10cmF5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwLXRyYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lc2VubGl5aW0vc3AtdHJheSIsCiAgInV1aWQiOiAic3AtdHJheUBzcC10cmF5LmVzZW5saXlpbS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDE3Cn0="}}} , {"uuid": "aws-default-profile-switcher@kevin-chappell.com", "name": "AWS Default Profile Switcher", "pname": "aws-default-profile-switcher", "description": "Gnome shell extension for quickly setting named profiles as the default", "link": "https://extensions.gnome.org/extension/4473/aws-default-profile-switcher/", "shell_version_map": {"38": {"version": "3", "sha256": "0mal1290kdvqv60m0ps42hnx801knh5vd4mlwg1z7ydj9sw31cfg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkdub21lIHNoZWxsIGV4dGVuc2lvbiBmb3IgcXVpY2tseSBzZXR0aW5nIG5hbWVkIHByb2ZpbGVzIGFzIHRoZSBkZWZhdWx0IiwKICAibmFtZSI6ICJBV1MgRGVmYXVsdCBQcm9maWxlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2V2aW5jaGFwcGVsbC9hd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyIiwKICAidXVpZCI6ICJhd3MtZGVmYXVsdC1wcm9maWxlLXN3aXRjaGVyQGtldmluLWNoYXBwZWxsLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "hide-panel-for-fullscreen-windows-only@github.freder", "name": "Hide panel (only when active window is fullscreen)", "pname": "hide-panel-only-when-active-window-is-fullscreen", "description": "hide top panel only when a fullscreen application has focus", "link": "https://extensions.gnome.org/extension/4475/hide-panel-only-when-active-window-is-fullscreen/", "shell_version_map": {"40": {"version": "2", "sha256": "1hd5agdjq73qiqip0m3grmlxk8klp26pd71cz555414mi3f9mww3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGUgdG9wIHBhbmVsIG9ubHkgd2hlbiBhIGZ1bGxzY3JlZW4gYXBwbGljYXRpb24gaGFzIGZvY3VzIiwKICAibmFtZSI6ICJIaWRlIHBhbmVsIChvbmx5IHdoZW4gYWN0aXZlIHdpbmRvdyBpcyBmdWxsc2NyZWVuKSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mcmVkZXIvaGlkZS1wYW5lbC1mb3ItZnVsbHNjcmVlbi13aW5kb3dzLW9ubHkiLAogICJ1dWlkIjogImhpZGUtcGFuZWwtZm9yLWZ1bGxzY3JlZW4td2luZG93cy1vbmx5QGdpdGh1Yi5mcmVkZXIiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "netspeed@alynx.one", "name": "Net Speed", "pname": "net-speed", "description": "Show current net speed on panel.", "link": "https://extensions.gnome.org/extension/4478/net-speed/", "shell_version_map": {"40": {"version": "2", "sha256": "0j48ai7nqkpr0ymypsicdp7nw59hx9rgya8qws58wx56q9bznl69", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3cgY3VycmVudCBuZXQgc3BlZWQgb24gcGFuZWwuIiwKICAibmFtZSI6ICJOZXQgU3BlZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogIm5ldHNwZWVkQGFseW54Lm9uZSIsCiAgInZlcnNpb24iOiAyCn0="}}} @@ -596,7 +596,7 @@ , {"uuid": "autohide-volume@unboiled.info", "name": "Autohide Volume", "pname": "autohide-volume", "description": "Autohide volume indicator when muted\n\nI'm not interested in the fact my output audio device is muted: this is how it's supposed to be. But if it's unmuted, then I want to see the icon.\n\nExcept when the mic is on, then I'm probably in a call, frantically figuring out what's wrong.", "link": "https://extensions.gnome.org/extension/4539/autohide-volume/", "shell_version_map": {"41": {"version": "2", "sha256": "1mxzrj5a9zdnkb2hvlmqnwnshnnyw43al59x466jp2pa7si6qy17", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZFxuXG5JJ20gbm90IGludGVyZXN0ZWQgaW4gdGhlIGZhY3QgbXkgb3V0cHV0IGF1ZGlvIGRldmljZSBpcyBtdXRlZDogdGhpcyBpcyBob3cgaXQncyBzdXBwb3NlZCB0byBiZS4gQnV0IGlmIGl0J3MgdW5tdXRlZCwgdGhlbiBJIHdhbnQgdG8gc2VlIHRoZSBpY29uLlxuXG5FeGNlcHQgd2hlbiB0aGUgbWljIGlzIG9uLCB0aGVuIEknbSBwcm9iYWJseSBpbiBhIGNhbGwsIGZyYW50aWNhbGx5IGZpZ3VyaW5nIG91dCB3aGF0J3Mgd3JvbmcuIiwKICAibmFtZSI6ICJBdXRvaGlkZSBWb2x1bWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vdDE4NDI1Ni9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXV0b2hpZGUtdm9sdW1lIiwKICAidXVpZCI6ICJhdXRvaGlkZS12b2x1bWVAdW5ib2lsZWQuaW5mbyIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "1mxzrj5a9zdnkb2hvlmqnwnshnnyw43al59x466jp2pa7si6qy17", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9oaWRlIHZvbHVtZSBpbmRpY2F0b3Igd2hlbiBtdXRlZFxuXG5JJ20gbm90IGludGVyZXN0ZWQgaW4gdGhlIGZhY3QgbXkgb3V0cHV0IGF1ZGlvIGRldmljZSBpcyBtdXRlZDogdGhpcyBpcyBob3cgaXQncyBzdXBwb3NlZCB0byBiZS4gQnV0IGlmIGl0J3MgdW5tdXRlZCwgdGhlbiBJIHdhbnQgdG8gc2VlIHRoZSBpY29uLlxuXG5FeGNlcHQgd2hlbiB0aGUgbWljIGlzIG9uLCB0aGVuIEknbSBwcm9iYWJseSBpbiBhIGNhbGwsIGZyYW50aWNhbGx5IGZpZ3VyaW5nIG91dCB3aGF0J3Mgd3JvbmcuIiwKICAibmFtZSI6ICJBdXRvaGlkZSBWb2x1bWUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cDovL2dpdGh1Yi5jb20vdDE4NDI1Ni9nbm9tZS1zaGVsbC1leHRlbnNpb24tYXV0b2hpZGUtdm9sdW1lIiwKICAidXVpZCI6ICJhdXRvaGlkZS12b2x1bWVAdW5ib2lsZWQuaW5mbyIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"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": "20", "sha256": "05z28pam3jmy0xisyr74lhss7xskz8pxrvyj6ayc98awagwdkjcm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "40": {"version": "20", "sha256": "05z28pam3jmy0xisyr74lhss7xskz8pxrvyj6ayc98awagwdkjcm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "41": {"version": "20", "sha256": "05z28pam3jmy0xisyr74lhss7xskz8pxrvyj6ayc98awagwdkjcm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}, "42": {"version": "20", "sha256": "05z28pam3jmy0xisyr74lhss7xskz8pxrvyj6ayc98awagwdkjcm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMjAKfQ=="}}} +, {"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": "22", "sha256": "06jgfr4wydy5cy2jdf2kn93yfy040c9iyngnvs7h2asd5i9g2g6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "40": {"version": "22", "sha256": "06jgfr4wydy5cy2jdf2kn93yfy040c9iyngnvs7h2asd5i9g2g6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "41": {"version": "22", "sha256": "06jgfr4wydy5cy2jdf2kn93yfy040c9iyngnvs7h2asd5i9g2g6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}, "42": {"version": "22", "sha256": "06jgfr4wydy5cy2jdf2kn93yfy040c9iyngnvs7h2asd5i9g2g6g", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyBvbiBhIGN1c3RvbSBncmlkIHVzaW5nIHlvdXIga2V5Ym9hcmQuIFR5cGUgU3VwZXItVCB0byBzaG93IHRoZSBncmlkLCB0aGVuIHR5cGUgdHdvIHRpbGVzIChvciB0aGUgc2FtZSB0aWxlIHR3aWNlKSB0byBtb3ZlIHRoZSBhY3RpdmUgd2luZG93LlxuXG5UaGUgZ3JpZCBjYW4gYmUgdXAgdG8gNHgzIChjb3JyZXNwb25kaW5nIHRvIG9uZSBoYW5kIG9uIHRoZSBrZXlib2FyZCkgYW5kIGVhY2ggcm93L2NvbHVtbiBjYW4gYmUgd2VpZ2h0ZWQgdG8gdGFrZSB1cCBtb3JlIG9yIGxlc3Mgc3BhY2UuIiwKICAibmFtZSI6ICJUYWN0aWxlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnRhY3RpbGUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzQiLAogICAgIjMuMzIiLAogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9sdW5kYWwvdGFjdGlsZSIsCiAgInV1aWQiOiAidGFjdGlsZUBsdW5kYWwuaW8iLAogICJ2ZXJzaW9uIjogMjIKfQ=="}}} , {"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": "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="}}} @@ -611,20 +611,20 @@ , {"uuid": "simulate-switching-workspaces-on-active-monitor@micheledaros.com", "name": "Switch workspaces on active monitor", "pname": "switch-workspaces-on-active-monitor", "description": "Simulates switching the workspace on the active monitor only. Ctrl+Alt+q switches to the previous workspace, Ctrl+Alt+a switches to the next", "link": "https://extensions.gnome.org/extension/4586/switch-workspaces-on-active-monitor/", "shell_version_map": {"38": {"version": "8", "sha256": "1yakh03r6qz08994bigzr9m5qqgm9ab2c02s1rab5rwym0a4d0vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "1yakh03r6qz08994bigzr9m5qqgm9ab2c02s1rab5rwym0a4d0vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1yakh03r6qz08994bigzr9m5qqgm9ab2c02s1rab5rwym0a4d0vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1yakh03r6qz08994bigzr9m5qqgm9ab2c02s1rab5rwym0a4d0vq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXVsYXRlcyBzd2l0Y2hpbmcgdGhlIHdvcmtzcGFjZSBvbiB0aGUgYWN0aXZlIG1vbml0b3Igb25seS4gQ3RybCtBbHQrcSBzd2l0Y2hlcyB0byB0aGUgcHJldmlvdXMgd29ya3NwYWNlLCBDdHJsK0FsdCthIHN3aXRjaGVzIHRvIHRoZSBuZXh0IiwKICAibmFtZSI6ICJTd2l0Y2ggd29ya3NwYWNlcyBvbiBhY3RpdmUgbW9uaXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiAiZGFyb3NtaWNAZ21haWwuY29tIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNpbXVsYXRlLXN3aXRjaGluZy13b3Jrc3BhY2VzLW9uLWFjdGl2ZS1tb25pdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWljaGVsZWRhcm9zL2dub21lLXNoZWxsLWV4dGVuc2lvbi1zaW11bGF0ZS1zd2l0Y2hpbmctd29ya3NwYWNlcy1vbi1hY3RpdmUtbW9uaXRvciIsCiAgInV1aWQiOiAic2ltdWxhdGUtc3dpdGNoaW5nLXdvcmtzcGFjZXMtb24tYWN0aXZlLW1vbml0b3JAbWljaGVsZWRhcm9zLmNvbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "newworkspaceshortcut@barnix.io", "name": "New Workspace Shortcut", "pname": "new-workspace-shortcut", "description": "This extension will enable the following:\n\nMove-window-to-new-workspace Shortcut: \n - Use a shortcut to move the in-focus window to a *new* workspace on the right of your current workspace: `Ctl + Super + Shift + Right`\n - Or to the left / *backward*: `Ctl + Super + Shift + Left`\n\n\nNew-empty-workspace Shortcut:\n - Use a shortcut to create an *empty* workspace on the right: `Ctl + Super + Alt + Right`\n - Or to the left / *backward*: `Ctl + Super + Alt + Left`\n\n\nReorder-workspace Shortcut:\n - Use a shortcut to move an entire workspace left or right of the current workspace: `Ctl + Super + Left` or `Ctl + Super + Right`\n\nFor more info, see the github page", "link": "https://extensions.gnome.org/extension/4597/new-workspace-shortcut/", "shell_version_map": {"41": {"version": "8", "sha256": "1dpvinjrgw5xspa614dkpr8v2ivzqvqsv3w652xwyhnwjsh9hxfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQgb2YgeW91ciBjdXJyZW50IHdvcmtzcGFjZTogYEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodGBcbiAgLSBPciB0byB0aGUgbGVmdCAvICpiYWNrd2FyZCo6IGBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdGBcblxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIGNyZWF0ZSBhbiAqZW1wdHkqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQ6IGBDdGwgKyBTdXBlciArIEFsdCArIFJpZ2h0YFxuICAtIE9yIHRvIHRoZSBsZWZ0IC8gKmJhY2t3YXJkKjogYEN0bCArIFN1cGVyICsgQWx0ICsgTGVmdGBcblxuXG5SZW9yZGVyLXdvcmtzcGFjZSBTaG9ydGN1dDpcbiAgLSBVc2UgYSBzaG9ydGN1dCB0byBtb3ZlIGFuIGVudGlyZSB3b3Jrc3BhY2UgbGVmdCBvciByaWdodCBvZiB0aGUgY3VycmVudCB3b3Jrc3BhY2U6IGBDdGwgKyBTdXBlciArIExlZnRgIG9yIGBDdGwgKyBTdXBlciArIFJpZ2h0YFxuXG5Gb3IgbW9yZSBpbmZvLCBzZWUgdGhlIGdpdGh1YiBwYWdlIiwKICAibmFtZSI6ICJOZXcgV29ya3NwYWNlIFNob3J0Y3V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ld3dvcmtzcGFjZXNob3J0Y3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXJuc2NvdHQvbmV3d29ya3NwYWNlc2hvcnRjdXQtYmFybml4LmlvIiwKICAidXVpZCI6ICJuZXd3b3Jrc3BhY2VzaG9ydGN1dEBiYXJuaXguaW8iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "1dpvinjrgw5xspa614dkpr8v2ivzqvqsv3w652xwyhnwjsh9hxfn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHdpbGwgZW5hYmxlIHRoZSBmb2xsb3dpbmc6XG5cbk1vdmUtd2luZG93LXRvLW5ldy13b3Jrc3BhY2UgU2hvcnRjdXQ6IFxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIG1vdmUgdGhlIGluLWZvY3VzIHdpbmRvdyB0byBhICpuZXcqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQgb2YgeW91ciBjdXJyZW50IHdvcmtzcGFjZTogYEN0bCArIFN1cGVyICsgU2hpZnQgKyBSaWdodGBcbiAgLSBPciB0byB0aGUgbGVmdCAvICpiYWNrd2FyZCo6IGBDdGwgKyBTdXBlciArIFNoaWZ0ICsgTGVmdGBcblxuXG5OZXctZW1wdHktd29ya3NwYWNlIFNob3J0Y3V0OlxuICAtIFVzZSBhIHNob3J0Y3V0IHRvIGNyZWF0ZSBhbiAqZW1wdHkqIHdvcmtzcGFjZSBvbiB0aGUgcmlnaHQ6IGBDdGwgKyBTdXBlciArIEFsdCArIFJpZ2h0YFxuICAtIE9yIHRvIHRoZSBsZWZ0IC8gKmJhY2t3YXJkKjogYEN0bCArIFN1cGVyICsgQWx0ICsgTGVmdGBcblxuXG5SZW9yZGVyLXdvcmtzcGFjZSBTaG9ydGN1dDpcbiAgLSBVc2UgYSBzaG9ydGN1dCB0byBtb3ZlIGFuIGVudGlyZSB3b3Jrc3BhY2UgbGVmdCBvciByaWdodCBvZiB0aGUgY3VycmVudCB3b3Jrc3BhY2U6IGBDdGwgKyBTdXBlciArIExlZnRgIG9yIGBDdGwgKyBTdXBlciArIFJpZ2h0YFxuXG5Gb3IgbW9yZSBpbmZvLCBzZWUgdGhlIGdpdGh1YiBwYWdlIiwKICAibmFtZSI6ICJOZXcgV29ya3NwYWNlIFNob3J0Y3V0IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm5ld3dvcmtzcGFjZXNob3J0Y3V0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9iYXJuc2NvdHQvbmV3d29ya3NwYWNlc2hvcnRjdXQtYmFybml4LmlvIiwKICAidXVpZCI6ICJuZXd3b3Jrc3BhY2VzaG9ydGN1dEBiYXJuaXguaW8iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "p.stonham@switcheroo.org", "name": "Switcheroo", "pname": "switcheroo", "description": "Switch to the first window with the title x\n\nA very small extension to allow you to switch windows via gdbus. This is particularly useful if you are using wayland as utilities such as wmctrl won't work.\n\nSince Gnome 41 removed org.gnome.Shell.Eval for security reasons, if you ever used a command such as:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/gnome/Shell --method org.gnome.Shell.Eval\"var mw = global.get_window_actors().map(w=>w.meta_window).find(mw=>mw.get_title().includes('Firefox'));mw && mw.activate(0)\"\n\nthis can now be replaced with:\n\ngdbus call --session --dest org.gnome.Shell --object-path /org/switcheroo/Switcheroo --method org.switcheroo.Switcheroo.Set Firefox\n\nThis can then be assigned to a shortcut key in Gnome settings or called programmatically.", "link": "https://extensions.gnome.org/extension/4600/switcheroo/", "shell_version_map": {"41": {"version": "3", "sha256": "0pfjhx8pm26zpizazd2pbpfqsr8vwc6znrm1cbf4ydcyvfxsnwwh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaCB0byB0aGUgZmlyc3Qgd2luZG93IHdpdGggdGhlIHRpdGxlIHhcblxuQSB2ZXJ5IHNtYWxsIGV4dGVuc2lvbiB0byBhbGxvdyB5b3UgdG8gc3dpdGNoIHdpbmRvd3MgdmlhIGdkYnVzLiBUaGlzIGlzIHBhcnRpY3VsYXJseSB1c2VmdWwgaWYgeW91IGFyZSB1c2luZyB3YXlsYW5kIGFzIHV0aWxpdGllcyBzdWNoIGFzIHdtY3RybCB3b24ndCB3b3JrLlxuXG5TaW5jZSBHbm9tZSA0MSByZW1vdmVkIG9yZy5nbm9tZS5TaGVsbC5FdmFsIGZvciBzZWN1cml0eSByZWFzb25zLCBpZiB5b3UgZXZlciB1c2VkIGEgY29tbWFuZCBzdWNoIGFzOlxuXG5nZGJ1cyBjYWxsIC0tc2Vzc2lvbiAtLWRlc3Qgb3JnLmdub21lLlNoZWxsIC0tb2JqZWN0LXBhdGggL29yZy9nbm9tZS9TaGVsbCAtLW1ldGhvZCBvcmcuZ25vbWUuU2hlbGwuRXZhbFwidmFyIG13ID0gZ2xvYmFsLmdldF93aW5kb3dfYWN0b3JzKCkubWFwKHc9Jmd0O3cubWV0YV93aW5kb3cpLmZpbmQobXc9Jmd0O213LmdldF90aXRsZSgpLmluY2x1ZGVzKCdGaXJlZm94JykpO213ICZhbXA7JmFtcDsgbXcuYWN0aXZhdGUoMClcIlxuXG50aGlzIGNhbiBub3cgYmUgcmVwbGFjZWQgd2l0aDpcblxuZ2RidXMgY2FsbCAtLXNlc3Npb24gLS1kZXN0IG9yZy5nbm9tZS5TaGVsbCAtLW9iamVjdC1wYXRoIC9vcmcvc3dpdGNoZXJvby9Td2l0Y2hlcm9vIC0tbWV0aG9kIG9yZy5zd2l0Y2hlcm9vLlN3aXRjaGVyb28uU2V0IEZpcmVmb3hcblxuVGhpcyBjYW4gdGhlbiBiZSBhc3NpZ25lZCB0byBhIHNob3J0Y3V0IGtleSBpbiBHbm9tZSBzZXR0aW5ncyBvciBjYWxsZWQgcHJvZ3JhbW1hdGljYWxseS4iLAogICJuYW1lIjogIlN3aXRjaGVyb28iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogInAuc3RvbmhhbUBzd2l0Y2hlcm9vLm9yZyIsCiAgInZlcnNpb24iOiAzCn0="}}} -, {"uuid": "sane-airplane-mode@kippi", "name": "Sane Airplane Mode", "pname": "sane-airplane-mode", "description": "Make airplane mode sane again! This extension gives you better control over the airplane mode. \nHint: With this extension you can also turn off the annoying \"Bluetooth gets turned on when I disable airplane mode\" behaviour.", "link": "https://extensions.gnome.org/extension/4604/sane-airplane-mode/", "shell_version_map": {"40": {"version": "8", "sha256": "02g8mvw503yayabsw3a9fjl23awf8b3bcm1sn4ckb9cdrfirqvlm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hLaXBwaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2FuZS1haXJwbGFuZS1tb2RlIiwKICAidXVpZCI6ICJzYW5lLWFpcnBsYW5lLW1vZGVAa2lwcGkiLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "02g8mvw503yayabsw3a9fjl23awf8b3bcm1sn4ckb9cdrfirqvlm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hLaXBwaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2FuZS1haXJwbGFuZS1tb2RlIiwKICAidXVpZCI6ICJzYW5lLWFpcnBsYW5lLW1vZGVAa2lwcGkiLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "02g8mvw503yayabsw3a9fjl23awf8b3bcm1sn4ckb9cdrfirqvlm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gXG5IaW50OiBXaXRoIHRoaXMgZXh0ZW5zaW9uIHlvdSBjYW4gYWxzbyB0dXJuIG9mZiB0aGUgYW5ub3lpbmcgXCJCbHVldG9vdGggZ2V0cyB0dXJuZWQgb24gd2hlbiBJIGRpc2FibGUgYWlycGxhbmUgbW9kZVwiIGJlaGF2aW91ci4iLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hLaXBwaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2FuZS1haXJwbGFuZS1tb2RlIiwKICAidXVpZCI6ICJzYW5lLWFpcnBsYW5lLW1vZGVAa2lwcGkiLAogICJ2ZXJzaW9uIjogOAp9"}}} +, {"uuid": "sane-airplane-mode@kippi", "name": "Sane Airplane Mode", "pname": "sane-airplane-mode", "description": "Make airplane mode sane again! This extension gives you better control over the airplane mode. Or at least it is my attempt to make a utterly broken airplane mode implementation somewhat sane to handle.\n\nHint: With this extension you can also turn off the annoying \"Bluetooth gets turned on when I disable airplane mode\" behavior. \n\nTo everyone who is experiencing issues with this extension: Please report errors on GitHub!", "link": "https://extensions.gnome.org/extension/4604/sane-airplane-mode/", "shell_version_map": {"40": {"version": "8", "sha256": "0fkk9g35yfybqdg5mvv76b8hn8xdyxav92mk2cqn6gh1l5z0zgc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gT3IgYXQgbGVhc3QgaXQgaXMgbXkgYXR0ZW1wdCB0byBtYWtlIGEgdXR0ZXJseSBicm9rZW4gYWlycGxhbmUgbW9kZSBpbXBsZW1lbnRhdGlvbiBzb21ld2hhdCBzYW5lIHRvIGhhbmRsZS5cblxuSGludDogV2l0aCB0aGlzIGV4dGVuc2lvbiB5b3UgY2FuIGFsc28gdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIGdldHMgdHVybmVkIG9uIHdoZW4gSSBkaXNhYmxlIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvci4gXG5cblRvIGV2ZXJ5b25lIHdobyBpcyBleHBlcmllbmNpbmcgaXNzdWVzIHdpdGggdGhpcyBleHRlbnNpb246IFBsZWFzZSByZXBvcnQgZXJyb3JzIG9uIEdpdEh1YiEiLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hLaXBwaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2FuZS1haXJwbGFuZS1tb2RlIiwKICAidXVpZCI6ICJzYW5lLWFpcnBsYW5lLW1vZGVAa2lwcGkiLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "0fkk9g35yfybqdg5mvv76b8hn8xdyxav92mk2cqn6gh1l5z0zgc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gT3IgYXQgbGVhc3QgaXQgaXMgbXkgYXR0ZW1wdCB0byBtYWtlIGEgdXR0ZXJseSBicm9rZW4gYWlycGxhbmUgbW9kZSBpbXBsZW1lbnRhdGlvbiBzb21ld2hhdCBzYW5lIHRvIGhhbmRsZS5cblxuSGludDogV2l0aCB0aGlzIGV4dGVuc2lvbiB5b3UgY2FuIGFsc28gdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIGdldHMgdHVybmVkIG9uIHdoZW4gSSBkaXNhYmxlIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvci4gXG5cblRvIGV2ZXJ5b25lIHdobyBpcyBleHBlcmllbmNpbmcgaXNzdWVzIHdpdGggdGhpcyBleHRlbnNpb246IFBsZWFzZSByZXBvcnQgZXJyb3JzIG9uIEdpdEh1YiEiLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hLaXBwaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2FuZS1haXJwbGFuZS1tb2RlIiwKICAidXVpZCI6ICJzYW5lLWFpcnBsYW5lLW1vZGVAa2lwcGkiLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "0fkk9g35yfybqdg5mvv76b8hn8xdyxav92mk2cqn6gh1l5z0zgc7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgYWlycGxhbmUgbW9kZSBzYW5lIGFnYWluISBUaGlzIGV4dGVuc2lvbiBnaXZlcyB5b3UgYmV0dGVyIGNvbnRyb2wgb3ZlciB0aGUgYWlycGxhbmUgbW9kZS4gT3IgYXQgbGVhc3QgaXQgaXMgbXkgYXR0ZW1wdCB0byBtYWtlIGEgdXR0ZXJseSBicm9rZW4gYWlycGxhbmUgbW9kZSBpbXBsZW1lbnRhdGlvbiBzb21ld2hhdCBzYW5lIHRvIGhhbmRsZS5cblxuSGludDogV2l0aCB0aGlzIGV4dGVuc2lvbiB5b3UgY2FuIGFsc28gdHVybiBvZmYgdGhlIGFubm95aW5nIFwiQmx1ZXRvb3RoIGdldHMgdHVybmVkIG9uIHdoZW4gSSBkaXNhYmxlIGFpcnBsYW5lIG1vZGVcIiBiZWhhdmlvci4gXG5cblRvIGV2ZXJ5b25lIHdobyBpcyBleHBlcmllbmNpbmcgaXNzdWVzIHdpdGggdGhpcyBleHRlbnNpb246IFBsZWFzZSByZXBvcnQgZXJyb3JzIG9uIEdpdEh1YiEiLAogICJuYW1lIjogIlNhbmUgQWlycGxhbmUgTW9kZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3hLaXBwaS9nbm9tZS1zaGVsbC1leHRlbnNpb24tc2FuZS1haXJwbGFuZS1tb2RlIiwKICAidXVpZCI6ICJzYW5lLWFpcnBsYW5lLW1vZGVAa2lwcGkiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "undecorate@tabdeveloper.com", "name": "Undecorate Window for Wayland", "pname": "undecorate-window-for-wayland", "description": "Adds undecorate option to window menu to toggle window decoration.", "link": "https://extensions.gnome.org/extension/4606/undecorate-window-for-wayland/", "shell_version_map": {"40": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "1ikbxwqdc204w6vjn1slbrmqvxmkcbyzgqg35jacv8r1z66n6nwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdW5kZWNvcmF0ZSBvcHRpb24gdG8gd2luZG93IG1lbnUgdG8gdG9nZ2xlIHdpbmRvdyBkZWNvcmF0aW9uLiIsCiAgImdldHRleHQtZG9tYWluIjogImdub21lLXNoZWxsLWV4dGVuc2lvbi11bmRlY29yYXRlIiwKICAibmFtZSI6ICJVbmRlY29yYXRlIFdpbmRvdyBmb3IgV2F5bGFuZCIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAic3VuLnd4Z0BnbWFpbC5jb20iLAogICAgInRpbUB0YWJkZXZlbG9wZXIuY29tIgogIF0sCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy51bmRlY29yYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjIwIiwKICAgICIzLjIyIiwKICAgICIzLjI0IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vdGJyYW55ZW4vZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXVuZGVjb3JhdGUiLAogICJ1dWlkIjogInVuZGVjb3JhdGVAdGFiZGV2ZWxvcGVyLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "zenbook-duo@laurinneff.ch", "name": "Asus ZenBook Duo Integration", "pname": "asus-zenbook-duo-integration", "description": "Integrate the features of the Asus ZenBook Duo into GNOME", "link": "https://extensions.gnome.org/extension/4607/asus-zenbook-duo-integration/", "shell_version_map": {"40": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1xljk5qklm8f9k6hx6ax2axp6r6si510706bksrsbzy72i2dp46w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkludGVncmF0ZSB0aGUgZmVhdHVyZXMgb2YgdGhlIEFzdXMgWmVuQm9vayBEdW8gaW50byBHTk9NRSIsCiAgIm5hbWUiOiAiQXN1cyBaZW5Cb29rIER1byBJbnRlZ3JhdGlvbiIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdXJpbm5lZmYvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXplbmJvb2stZHVvIiwKICAidXVpZCI6ICJ6ZW5ib29rLWR1b0BsYXVyaW5uZWZmLmNoIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "batterythreshold@francku.gitlab.com", "name": "Battery threshold", "pname": "battery-threshold", "description": "A simple extension for gnome-shell that let easily set a threshold to limit battery charge level.\n\nThis extension uses \"pkexec\" since sudo permissions are needed to change the threshold level.\n\nTested on Fedora Silverblue 35 (gnome-shell 3.41) and Fedora Silverblue 36 (gnome-shell 3.42)on an Asus Vivobook.\n\nGithub page: https://github.com/francku/gnome-shell-extension-battery-threshold", "link": "https://extensions.gnome.org/extension/4612/battery-threshold/", "shell_version_map": {"41": {"version": "2", "sha256": "1zygyzif2h6ylzw6ajih3mwpr561afla4r2k7dflnksl0cch69f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBhbmQgRmVkb3JhIFNpbHZlcmJsdWUgMzYgKGdub21lLXNoZWxsIDMuNDIpb24gYW4gQXN1cyBWaXZvYm9vay5cblxuR2l0aHViIHBhZ2U6IGh0dHBzOi8vZ2l0aHViLmNvbS9mcmFuY2t1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgIm5hbWUiOiAiQmF0dGVyeSB0aHJlc2hvbGQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "1zygyzif2h6ylzw6ajih3mwpr561afla4r2k7dflnksl0cch69f2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiBmb3IgZ25vbWUtc2hlbGwgdGhhdCBsZXQgZWFzaWx5IHNldCBhIHRocmVzaG9sZCB0byBsaW1pdCBiYXR0ZXJ5IGNoYXJnZSBsZXZlbC5cblxuVGhpcyBleHRlbnNpb24gdXNlcyBcInBrZXhlY1wiIHNpbmNlIHN1ZG8gcGVybWlzc2lvbnMgYXJlIG5lZWRlZCB0byBjaGFuZ2UgdGhlIHRocmVzaG9sZCBsZXZlbC5cblxuVGVzdGVkIG9uIEZlZG9yYSBTaWx2ZXJibHVlIDM1IChnbm9tZS1zaGVsbCAzLjQxKSBhbmQgRmVkb3JhIFNpbHZlcmJsdWUgMzYgKGdub21lLXNoZWxsIDMuNDIpb24gYW4gQXN1cyBWaXZvYm9vay5cblxuR2l0aHViIHBhZ2U6IGh0dHBzOi8vZ2l0aHViLmNvbS9mcmFuY2t1L2dub21lLXNoZWxsLWV4dGVuc2lvbi1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgIm5hbWUiOiAiQmF0dGVyeSB0aHJlc2hvbGQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJiYXR0ZXJ5dGhyZXNob2xkQGZyYW5ja3UuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "one-third-window@chmouel.com", "name": "One third window", "pname": "one-third-window", "description": "Center or Cycle the current window by one third of the screen via a keyboard shortcut.", "link": "https://extensions.gnome.org/extension/4615/one-third-window/", "shell_version_map": {"38": {"version": "7", "sha256": "0fisinjf8x31zb71qfs8hqyyls37425456yy0p9mmapzs562pj5w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNlbnRlciBvciBDeWNsZSB0aGUgY3VycmVudCB3aW5kb3cgYnkgb25lIHRoaXJkIG9mIHRoZSBzY3JlZW4gdmlhIGEga2V5Ym9hcmQgc2hvcnRjdXQuIiwKICAibmFtZSI6ICJPbmUgdGhpcmQgd2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9uZXRoaXJkd2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2htb3VlbC9vbmUtdGhpcmQtd2luZG93LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAib25lLXRoaXJkLXdpbmRvd0BjaG1vdWVsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "0fisinjf8x31zb71qfs8hqyyls37425456yy0p9mmapzs562pj5w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNlbnRlciBvciBDeWNsZSB0aGUgY3VycmVudCB3aW5kb3cgYnkgb25lIHRoaXJkIG9mIHRoZSBzY3JlZW4gdmlhIGEga2V5Ym9hcmQgc2hvcnRjdXQuIiwKICAibmFtZSI6ICJPbmUgdGhpcmQgd2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9uZXRoaXJkd2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2htb3VlbC9vbmUtdGhpcmQtd2luZG93LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAib25lLXRoaXJkLXdpbmRvd0BjaG1vdWVsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0fisinjf8x31zb71qfs8hqyyls37425456yy0p9mmapzs562pj5w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNlbnRlciBvciBDeWNsZSB0aGUgY3VycmVudCB3aW5kb3cgYnkgb25lIHRoaXJkIG9mIHRoZSBzY3JlZW4gdmlhIGEga2V5Ym9hcmQgc2hvcnRjdXQuIiwKICAibmFtZSI6ICJPbmUgdGhpcmQgd2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9uZXRoaXJkd2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2htb3VlbC9vbmUtdGhpcmQtd2luZG93LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAib25lLXRoaXJkLXdpbmRvd0BjaG1vdWVsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "0fisinjf8x31zb71qfs8hqyyls37425456yy0p9mmapzs562pj5w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNlbnRlciBvciBDeWNsZSB0aGUgY3VycmVudCB3aW5kb3cgYnkgb25lIHRoaXJkIG9mIHRoZSBzY3JlZW4gdmlhIGEga2V5Ym9hcmQgc2hvcnRjdXQuIiwKICAibmFtZSI6ICJPbmUgdGhpcmQgd2luZG93IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLm9uZXRoaXJkd2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vY2htb3VlbC9vbmUtdGhpcmQtd2luZG93LWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAib25lLXRoaXJkLXdpbmRvd0BjaG1vdWVsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "hideTopBarWindow@kinzoku.one", "name": "Hide Top Bar Window", "pname": "hide-top-bar-window", "description": "Hides the selected window entry in the top bar.", "link": "https://extensions.gnome.org/extension/4621/hide-top-bar-window/", "shell_version_map": {"41": {"version": "1", "sha256": "0r7f8qb23ilz42pbbcd4rh22nnczqa9bags6msri1hl68lbv1qwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBzZWxlY3RlZCB3aW5kb3cgZW50cnkgaW4gdGhlIHRvcCBiYXIuIiwKICAibmFtZSI6ICJIaWRlIFRvcCBCYXIgV2luZG93IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIsCiAgICAiNDEuMSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9raW56b2t1Lm9uZSIsCiAgInV1aWQiOiAiaGlkZVRvcEJhcldpbmRvd0BraW56b2t1Lm9uZSIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "alphatint@saifulbkhan.github.com", "name": "AlphaTint", "pname": "alphatint", "description": "Artificially reduce brightness of your displays (including external monitors).\n\nIt is a fork of ColorTint modified to reduce brightness without an alpha channel.", "link": "https://extensions.gnome.org/extension/4624/alphatint/", "shell_version_map": {"40": {"version": "4", "sha256": "0yzip19k148y7yjkgxirhmi5sqj8brgnxij310ka5sl3big95rqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FpZnVsYmtoYW4vYWxwaGEtdGludCIsCiAgInV1aWQiOiAiYWxwaGF0aW50QHNhaWZ1bGJraGFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0yzip19k148y7yjkgxirhmi5sqj8brgnxij310ka5sl3big95rqb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vc2FpZnVsYmtoYW4vYWxwaGEtdGludCIsCiAgInV1aWQiOiAiYWxwaGF0aW50QHNhaWZ1bGJraGFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogNAp9"}}} +, {"uuid": "alphatint@saifulbkhan.github.com", "name": "AlphaTint", "pname": "alphatint", "description": "Artificially reduce brightness of your displays (including external monitors).\n\nIt is a fork of ColorTint modified to reduce brightness without an alpha channel.", "link": "https://extensions.gnome.org/extension/4624/alphatint/", "shell_version_map": {"40": {"version": "6", "sha256": "0b76kxjpx2vwsib6lchg2b7b0ggvm83dma2diydwwi5rjichl3kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhaWZ1bGJraGFuL2FscGhhLXRpbnQiLAogICJ1dWlkIjogImFscGhhdGludEBzYWlmdWxia2hhbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "0b76kxjpx2vwsib6lchg2b7b0ggvm83dma2diydwwi5rjichl3kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhaWZ1bGJraGFuL2FscGhhLXRpbnQiLAogICJ1dWlkIjogImFscGhhdGludEBzYWlmdWxia2hhbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "0b76kxjpx2vwsib6lchg2b7b0ggvm83dma2diydwwi5rjichl3kh", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFydGlmaWNpYWxseSByZWR1Y2UgYnJpZ2h0bmVzcyBvZiB5b3VyIGRpc3BsYXlzIChpbmNsdWRpbmcgZXh0ZXJuYWwgbW9uaXRvcnMpLlxuXG5JdCBpcyBhIGZvcmsgb2YgQ29sb3JUaW50IG1vZGlmaWVkIHRvIHJlZHVjZSBicmlnaHRuZXNzIHdpdGhvdXQgYW4gYWxwaGEgY2hhbm5lbC4iLAogICJuYW1lIjogIkFscGhhVGludCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3NhaWZ1bGJraGFuL2FscGhhLXRpbnQiLAogICJ1dWlkIjogImFscGhhdGludEBzYWlmdWxia2hhbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "focus-changer@heartmire", "name": "Focus changer", "pname": "focus-changer", "description": "Change focus between windows in all directions.\n\nThe extension will first try to find a suitable window within the same monitor. If there is none, it will try to find one on the next monitor in that direction (in a multi-monitor setup).\n\nDefault shortcuts (can be changed in preferences):\n+h = Focus left\n+j = Focus down\n+k = Focus up\n+l = Focus right", "link": "https://extensions.gnome.org/extension/4627/focus-changer/", "shell_version_map": {"38": {"version": "9", "sha256": "0ngn0bw0f2fpp0vv4hq7gb0vx2xq2gk3nkkb6p393i9qbr42l3y1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiA5Cn0="}, "40": {"version": "12", "sha256": "0lzz8850wy0vqxjv8lc792p59r1qpyy39v3iv9zcy95ra2h8mxs3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "41": {"version": "12", "sha256": "0lzz8850wy0vqxjv8lc792p59r1qpyy39v3iv9zcy95ra2h8mxs3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAxMgp9"}, "42": {"version": "12", "sha256": "0lzz8850wy0vqxjv8lc792p59r1qpyy39v3iv9zcy95ra2h8mxs3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSBmb2N1cyBiZXR3ZWVuIHdpbmRvd3MgaW4gYWxsIGRpcmVjdGlvbnMuXG5cblRoZSBleHRlbnNpb24gd2lsbCBmaXJzdCB0cnkgdG8gZmluZCBhIHN1aXRhYmxlIHdpbmRvdyB3aXRoaW4gdGhlIHNhbWUgbW9uaXRvci4gSWYgdGhlcmUgaXMgbm9uZSwgaXQgd2lsbCB0cnkgdG8gZmluZCBvbmUgb24gdGhlIG5leHQgbW9uaXRvciBpbiB0aGF0IGRpcmVjdGlvbiAoaW4gYSBtdWx0aS1tb25pdG9yIHNldHVwKS5cblxuRGVmYXVsdCBzaG9ydGN1dHMgKGNhbiBiZSBjaGFuZ2VkIGluIHByZWZlcmVuY2VzKTpcbjxTdXBlcj4raCA9IEZvY3VzIGxlZnRcbjxTdXBlcj4raiA9IEZvY3VzIGRvd25cbjxTdXBlcj4rayA9IEZvY3VzIHVwXG48U3VwZXI+K2wgPSBGb2N1cyByaWdodCIsCiAgIm5hbWUiOiAiRm9jdXMgY2hhbmdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcnRpbmhqYXJ0bXlyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1mb2N1cy1jaGFuZ2VyIiwKICAidXVpZCI6ICJmb2N1cy1jaGFuZ2VyQGhlYXJ0bWlyZSIsCiAgInZlcnNpb24iOiAxMgp9"}}} , {"uuid": "no-titlebar-when-maximized@alec.ninja", "name": "No Titlebar When Maximized", "pname": "no-titlebar-when-maximized", "description": "Hides the classic title bar of maximized X.Org windows", "link": "https://extensions.gnome.org/extension/4630/no-titlebar-when-maximized/", "shell_version_map": {"41": {"version": "5", "sha256": "0gawpvbybkm4mlvx4h9d2bzqgll6rdgbmd9m1ia90bb2rzplmhii", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZWNkb3RuaW5qYS9uby10aXRsZWJhci13aGVuLW1heGltaXplZCIsCiAgInV1aWQiOiAibm8tdGl0bGViYXItd2hlbi1tYXhpbWl6ZWRAYWxlYy5uaW5qYSIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "0gawpvbybkm4mlvx4h9d2bzqgll6rdgbmd9m1ia90bb2rzplmhii", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGVzIHRoZSBjbGFzc2ljIHRpdGxlIGJhciBvZiBtYXhpbWl6ZWQgWC5Pcmcgd2luZG93cyIsCiAgIm5hbWUiOiAiTm8gVGl0bGViYXIgV2hlbiBNYXhpbWl6ZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZWNkb3RuaW5qYS9uby10aXRsZWJhci13aGVuLW1heGltaXplZCIsCiAgInV1aWQiOiAibm8tdGl0bGViYXItd2hlbi1tYXhpbWl6ZWRAYWxlYy5uaW5qYSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "cryptowatch@d0x2f.github.com", "name": "CryptoWatch", "pname": "cryptowatch", "description": "Display live crypto portfolio balances.", "link": "https://extensions.gnome.org/extension/4633/cryptowatch/", "shell_version_map": {"40": {"version": "9", "sha256": "18gq0ylx5s0y71fr9pd67nd27dzkhgr5ympw39ijh763hnx2nlpw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2QweDJmL0NyeXB0b1dhdGNoIiwKICAidXVpZCI6ICJjcnlwdG93YXRjaEBkMHgyZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "18gq0ylx5s0y71fr9pd67nd27dzkhgr5ympw39ijh763hnx2nlpw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2QweDJmL0NyeXB0b1dhdGNoIiwKICAidXVpZCI6ICJjcnlwdG93YXRjaEBkMHgyZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "18gq0ylx5s0y71fr9pd67nd27dzkhgr5ympw39ijh763hnx2nlpw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXkgbGl2ZSBjcnlwdG8gcG9ydGZvbGlvIGJhbGFuY2VzLiIsCiAgImV4dGVuc2lvbi1pZCI6ICJjcnlwdG93YXRjaCIsCiAgImdldHRleHQtZG9tYWluIjogImNyeXB0b3dhdGNoIiwKICAibmFtZSI6ICJDcnlwdG9XYXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5jcnlwdG93YXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2QweDJmL0NyeXB0b1dhdGNoIiwKICAidXVpZCI6ICJjcnlwdG93YXRjaEBkMHgyZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "mousefollowsfocus@matthes.biz", "name": "Mouse Follows Focus", "pname": "mouse-follows-focus", "description": "Are you a power-user?\nDo you like using Super+1,2,3 to access your favorite apps?\nAre you annoyed that you have to manually move your mouse between screens because it can't keep up with your keyboard shortcuts?\nThen this extension is for you!\n\nThis simple GNOME shell extension does the opposite of the 'focus follows mouse' setting. It makes the mouse follow your keyboard focus. Whenever you focus a window, if the cursor isn't already in it, it will jump to the windows center, making it easy to interact with it.", "link": "https://extensions.gnome.org/extension/4642/mouse-follows-focus/", "shell_version_map": {"41": {"version": "4", "sha256": "1zsy76sab87s74p30sxdp1cki1w956gm0sw27anpx1z6yih50rdv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFyZSB5b3UgYSBwb3dlci11c2VyP1xuRG8geW91IGxpa2UgdXNpbmcgU3VwZXIrMSwyLDMgdG8gYWNjZXNzIHlvdXIgZmF2b3JpdGUgYXBwcz9cbkFyZSB5b3UgYW5ub3llZCB0aGF0IHlvdSBoYXZlIHRvIG1hbnVhbGx5IG1vdmUgeW91ciBtb3VzZSBiZXR3ZWVuIHNjcmVlbnMgYmVjYXVzZSBpdCBjYW4ndCBrZWVwIHVwIHdpdGggeW91ciBrZXlib2FyZCBzaG9ydGN1dHM/XG5UaGVuIHRoaXMgZXh0ZW5zaW9uIGlzIGZvciB5b3UhXG5cblRoaXMgc2ltcGxlIEdOT01FIHNoZWxsIGV4dGVuc2lvbiBkb2VzIHRoZSBvcHBvc2l0ZSBvZiB0aGUgJ2ZvY3VzIGZvbGxvd3MgbW91c2UnIHNldHRpbmcuIEl0IG1ha2VzIHRoZSBtb3VzZSBmb2xsb3cgeW91ciBrZXlib2FyZCBmb2N1cy4gV2hlbmV2ZXIgeW91IGZvY3VzIGEgd2luZG93LCBpZiB0aGUgY3Vyc29yIGlzbid0IGFscmVhZHkgaW4gaXQsIGl0IHdpbGwganVtcCB0byB0aGUgd2luZG93cyBjZW50ZXIsIG1ha2luZyBpdCBlYXN5IHRvIGludGVyYWN0IHdpdGggaXQuIiwKICAibmFtZSI6ICJNb3VzZSBGb2xsb3dzIEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0xlb25NYXR0aGVzL21vdXNlZm9sbG93c2ZvY3VzIiwKICAidXVpZCI6ICJtb3VzZWZvbGxvd3Nmb2N1c0BtYXR0aGVzLmJpeiIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "gnome-extension-pass-search-provider.lavrov.github.com", "name": "Pass Search Provider", "pname": "pass-search-provider", "description": "Shows matching pass entries in gnome search", "link": "https://extensions.gnome.org/extension/4645/pass-search-provider/", "shell_version_map": {"40": {"version": "6", "sha256": "06msk4zds1q6jjdw6g7akbsiyfz0avwvydpykcylhhc9ribzsncn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIG1hdGNoaW5nIHBhc3MgZW50cmllcyBpbiBnbm9tZSBzZWFyY2giLAogICJuYW1lIjogIlBhc3MgU2VhcmNoIFByb3ZpZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xhdnJvdi9nbm9tZS1leHRlbnNpb24tcGFzcy1zZWFyY2gtcHJvdmlkZXIiLAogICJ1dWlkIjogImdub21lLWV4dGVuc2lvbi1wYXNzLXNlYXJjaC1wcm92aWRlci5sYXZyb3YuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "desktop-cube@schneegans.github.com", "name": "Desktop Cube", "pname": "desktop-cube", "description": "Indulge in nostalgia with useless 3D effects.", "link": "https://extensions.gnome.org/extension/4648/desktop-cube/", "shell_version_map": {"40": {"version": "10", "sha256": "1cpal5shcf1p2lsls05rr1l2a2crajbwjdb0idany1psrzwn1z9p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "41": {"version": "10", "sha256": "1cpal5shcf1p2lsls05rr1l2a2crajbwjdb0idany1psrzwn1z9p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}, "42": {"version": "10", "sha256": "1cpal5shcf1p2lsls05rr1l2a2crajbwjdb0idany1psrzwn1z9p", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluZHVsZ2UgaW4gbm9zdGFsZ2lhIHdpdGggdXNlbGVzcyAzRCBlZmZlY3RzLiIsCiAgImdldHRleHQtZG9tYWluIjogImRlc2t0b3AtY3ViZSIsCiAgIm5hbWUiOiAiRGVza3RvcCBDdWJlIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRlc2t0b3AtY3ViZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1NjaG5lZWdhbnMvRGVza3RvcC1DdWJlIiwKICAidXVpZCI6ICJkZXNrdG9wLWN1YmVAc2NobmVlZ2Fucy5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} -, {"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": "4", "sha256": "092b997khrxlndq4p905wx4ajm00gx94xf7dr6995383hmlh7zpf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "092b997khrxlndq4p905wx4ajm00gx94xf7dr6995383hmlh7zpf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "092b997khrxlndq4p905wx4ajm00gx94xf7dr6995383hmlh7zpf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "notification-banner-reloaded@marcinjakubowski.github.com", "name": "Notification Banner Reloaded", "pname": "notification-banner-reloaded", "description": "Configure notification banner position and animation to your liking", "link": "https://extensions.gnome.org/extension/4651/notification-banner-reloaded/", "shell_version_map": {"40": {"version": "5", "sha256": "1sc8s3qiwcvwydva7biaw2val5ki1cqrpybhpk9by1p6kk1cg5vg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1sc8s3qiwcvwydva7biaw2val5ki1cqrpybhpk9by1p6kk1cg5vg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1sc8s3qiwcvwydva7biaw2val5ki1cqrpybhpk9by1p6kk1cg5vg", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvbmZpZ3VyZSBub3RpZmljYXRpb24gYmFubmVyIHBvc2l0aW9uIGFuZCBhbmltYXRpb24gdG8geW91ciBsaWtpbmciLAogICJuYW1lIjogIk5vdGlmaWNhdGlvbiBCYW5uZXIgUmVsb2FkZWQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMubm90aWZpY2F0aW9uLWJhbm5lci1yZWxvYWRlZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21hcmNpbmpha3Vib3dza2kvbm90aWZpY2F0aW9uLXBvc2l0aW9uLXJlbG9hZGVkIiwKICAidXVpZCI6ICJub3RpZmljYXRpb24tYmFubmVyLXJlbG9hZGVkQG1hcmNpbmpha3Vib3dza2kuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "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": "21", "sha256": "10bqxzvky4788jkgsclh090qg744glk1cz62rda7hd4085nvrpy7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JydW5vLmVuZ2xlcnQvZ25vbWUtZXh0ZW5zaW9uLWJyaWdodG5lc3MiLAogICJ1dWlkIjogImdub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzQGJydW5vLmVuZ2xlcnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}, "41": {"version": "21", "sha256": "10bqxzvky4788jkgsclh090qg744glk1cz62rda7hd4085nvrpy7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JydW5vLmVuZ2xlcnQvZ25vbWUtZXh0ZW5zaW9uLWJyaWdodG5lc3MiLAogICJ1dWlkIjogImdub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzQGJydW5vLmVuZ2xlcnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}, "42": {"version": "21", "sha256": "10bqxzvky4788jkgsclh090qg744glk1cz62rda7hd4085nvrpy7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyB2aWEgRERDLiBJdCByZXF1aXJlcyBkZGN1dGlsIHRvIGJlIGluc3RhbGxlZCwgSTJDIHBlcm1pc3Npb25zIGZvciBub24tcm9vdCB1c2VycyBjb25maWd1cmVkLiIsCiAgIm5hbWUiOiAiQWRqdXN0IERpc3BsYXkgQnJpZ2h0bmVzcyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRsYWIuY29tL2JydW5vLmVuZ2xlcnQvZ25vbWUtZXh0ZW5zaW9uLWJyaWdodG5lc3MiLAogICJ1dWlkIjogImdub21lLWV4dGVuc2lvbi1icmlnaHRuZXNzQGJydW5vLmVuZ2xlcnQuZ2l0bGFiLmNvbSIsCiAgInZlcnNpb24iOiAyMQp9"}}} , {"uuid": "date-menu-formatter@marcinjakubowski.github.com", "name": "Date Menu Formatter", "pname": "date-menu-formatter", "description": "Allows customization of the date display in the panel.\n\nMight be especially useful if you're using a horizontal panel which does not at all work well with the default date display.\n\nCHANGELOG\nVersion 5: added support for multiple Dash To Panel panels\nVersion 6: fixed issues on earlier Gnome Shell versions", "link": "https://extensions.gnome.org/extension/4655/date-menu-formatter/", "shell_version_map": {"40": {"version": "7", "sha256": "0l6fx4dfqr1pkpg7ckiynicwjzjrdn31mcbksk1a199scivkhilk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRhdGUtbWVudS1mb3JtYXR0ZXJAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "41": {"version": "7", "sha256": "0l6fx4dfqr1pkpg7ckiynicwjzjrdn31mcbksk1a199scivkhilk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRhdGUtbWVudS1mb3JtYXR0ZXJAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}, "42": {"version": "7", "sha256": "0l6fx4dfqr1pkpg7ckiynicwjzjrdn31mcbksk1a199scivkhilk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFsbG93cyBjdXN0b21pemF0aW9uIG9mIHRoZSBkYXRlIGRpc3BsYXkgaW4gdGhlIHBhbmVsLlxuXG5NaWdodCBiZSBlc3BlY2lhbGx5IHVzZWZ1bCBpZiB5b3UncmUgdXNpbmcgYSBob3Jpem9udGFsIHBhbmVsIHdoaWNoIGRvZXMgbm90IGF0IGFsbCB3b3JrIHdlbGwgd2l0aCB0aGUgZGVmYXVsdCBkYXRlIGRpc3BsYXkuXG5cbkNIQU5HRUxPR1xuVmVyc2lvbiA1OiBhZGRlZCBzdXBwb3J0IGZvciBtdWx0aXBsZSBEYXNoIFRvIFBhbmVsIHBhbmVsc1xuVmVyc2lvbiA2OiBmaXhlZCBpc3N1ZXMgb24gZWFybGllciBHbm9tZSBTaGVsbCB2ZXJzaW9ucyIsCiAgIm5hbWUiOiAiRGF0ZSBNZW51IEZvcm1hdHRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXRlLW1lbnUtZm9ybWF0dGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICIiLAogICJ1dWlkIjogImRhdGUtbWVudS1mb3JtYXR0ZXJAbWFyY2luamFrdWJvd3NraS5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "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="}}} @@ -639,42 +639,42 @@ , {"uuid": "useless-gaps@pimsnel.com", "name": "Useless Gaps", "pname": "useless-gaps", "description": "For aesthetic purposes adds useless gaps around tiled and maximized windows\n\nFeature requests and bug reports on github get my attention ealier.\nIf you like this extension please star it on Github.", "link": "https://extensions.gnome.org/extension/4684/useless-gaps/", "shell_version_map": {"38": {"version": "8", "sha256": "16md01fp6mvizak8a59rxq1m2bx0s4k9h48097915r5xmfc0vpd8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93c1xuXG5GZWF0dXJlIHJlcXVlc3RzIGFuZCBidWcgcmVwb3J0cyBvbiBnaXRodWIgZ2V0IG15IGF0dGVudGlvbiBlYWxpZXIuXG5JZiB5b3UgbGlrZSB0aGlzIGV4dGVuc2lvbiBwbGVhc2Ugc3RhciBpdCBvbiBHaXRodWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidXNlbGVzcy1nYXBzIiwKICAibmFtZSI6ICJVc2VsZXNzIEdhcHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlbGVzcy1nYXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "40": {"version": "8", "sha256": "16md01fp6mvizak8a59rxq1m2bx0s4k9h48097915r5xmfc0vpd8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93c1xuXG5GZWF0dXJlIHJlcXVlc3RzIGFuZCBidWcgcmVwb3J0cyBvbiBnaXRodWIgZ2V0IG15IGF0dGVudGlvbiBlYWxpZXIuXG5JZiB5b3UgbGlrZSB0aGlzIGV4dGVuc2lvbiBwbGVhc2Ugc3RhciBpdCBvbiBHaXRodWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidXNlbGVzcy1nYXBzIiwKICAibmFtZSI6ICJVc2VsZXNzIEdhcHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlbGVzcy1nYXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "41": {"version": "8", "sha256": "16md01fp6mvizak8a59rxq1m2bx0s4k9h48097915r5xmfc0vpd8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93c1xuXG5GZWF0dXJlIHJlcXVlc3RzIGFuZCBidWcgcmVwb3J0cyBvbiBnaXRodWIgZ2V0IG15IGF0dGVudGlvbiBlYWxpZXIuXG5JZiB5b3UgbGlrZSB0aGlzIGV4dGVuc2lvbiBwbGVhc2Ugc3RhciBpdCBvbiBHaXRodWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidXNlbGVzcy1nYXBzIiwKICAibmFtZSI6ICJVc2VsZXNzIEdhcHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlbGVzcy1nYXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}, "42": {"version": "8", "sha256": "16md01fp6mvizak8a59rxq1m2bx0s4k9h48097915r5xmfc0vpd8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBhZXN0aGV0aWMgcHVycG9zZXMgYWRkcyB1c2VsZXNzIGdhcHMgYXJvdW5kIHRpbGVkIGFuZCBtYXhpbWl6ZWQgd2luZG93c1xuXG5GZWF0dXJlIHJlcXVlc3RzIGFuZCBidWcgcmVwb3J0cyBvbiBnaXRodWIgZ2V0IG15IGF0dGVudGlvbiBlYWxpZXIuXG5JZiB5b3UgbGlrZSB0aGlzIGV4dGVuc2lvbiBwbGVhc2Ugc3RhciBpdCBvbiBHaXRodWIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidXNlbGVzcy1nYXBzIiwKICAibmFtZSI6ICJVc2VsZXNzIEdhcHMiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudXNlbGVzcy1nYXBzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWlwbWlwL2dub21lLXNoZWxsLWV4dGVuc2lvbnMtdXNlbGVzcy1nYXBzIiwKICAidXVpZCI6ICJ1c2VsZXNzLWdhcHNAcGltc25lbC5jb20iLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"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="}}} , {"uuid": "focus-follows-workspace@christopher.luebbemeier.gmail.com", "name": "Focus Follows Workspace", "pname": "focus-follows-workspace", "description": "Focus the primary monitor after switching workspaces via keyboard.\n\nThis extension is meant to be used with a multi-monitor setup with the setting \"Workspaces on primary display only\". It enables quick switching to an application on a given workspace via keyboard by preventing the focus from being restored to a window on a secondary monitor.", "link": "https://extensions.gnome.org/extension/4688/focus-follows-workspace/", "shell_version_map": {"41": {"version": "1", "sha256": "1xllg9wp7phrqa9897m9al740k60v01zird49vwwm24wzpmyby9k", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvY3VzIHRoZSBwcmltYXJ5IG1vbml0b3IgYWZ0ZXIgc3dpdGNoaW5nIHdvcmtzcGFjZXMgdmlhIGtleWJvYXJkLlxuXG5UaGlzIGV4dGVuc2lvbiBpcyBtZWFudCB0byBiZSB1c2VkIHdpdGggYSBtdWx0aS1tb25pdG9yIHNldHVwIHdpdGggdGhlIHNldHRpbmcgXCJXb3Jrc3BhY2VzIG9uIHByaW1hcnkgZGlzcGxheSBvbmx5XCIuIEl0IGVuYWJsZXMgcXVpY2sgc3dpdGNoaW5nIHRvIGFuIGFwcGxpY2F0aW9uIG9uIGEgZ2l2ZW4gd29ya3NwYWNlIHZpYSBrZXlib2FyZCBieSBwcmV2ZW50aW5nIHRoZSBmb2N1cyBmcm9tIGJlaW5nIHJlc3RvcmVkIHRvIGEgd2luZG93IG9uIGEgc2Vjb25kYXJ5IG1vbml0b3IuIiwKICAibmFtZSI6ICJGb2N1cyBGb2xsb3dzIFdvcmtzcGFjZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL2ZvY3VzLWZvbGxvd3Mtd29ya3NwYWNlIiwKICAidXVpZCI6ICJmb2N1cy1mb2xsb3dzLXdvcmtzcGFjZUBjaHJpc3RvcGhlci5sdWViYmVtZWllci5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "pip-on-top@rafostar.github.com", "name": "PiP on top", "pname": "pip-on-top", "description": "Makes \"Picture-in-Picture\" windows stay on top (even on Wayland session). Compatible with Firefox and Clapper media player.", "link": "https://extensions.gnome.org/extension/4691/pip-on-top/", "shell_version_map": {"38": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} +, {"uuid": "pip-on-top@rafostar.github.com", "name": "PiP on top", "pname": "pip-on-top", "description": "Makes \"Picture-in-Picture\" windows stay on top (even on Wayland session). Compatible with Firefox and Clapper media player.", "link": "https://extensions.gnome.org/extension/4691/pip-on-top/", "shell_version_map": {"38": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1920nd7dr2159606mlv3c4fkambw1yx0a65rr961qx3w6jwd1pym", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SYWZvc3Rhci9nbm9tZS1zaGVsbC1leHRlbnNpb24tcGlwLW9uLXRvcCIsCiAgInV1aWQiOiAicGlwLW9uLXRvcEByYWZvc3Rhci5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "4", "sha256": "1gppfxk8nrg4zk18hmlnkn1q0vbm1rgykm9pibl6n7pbf30snp5m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2VzIFwiUGljdHVyZS1pbi1QaWN0dXJlXCIgd2luZG93cyBzdGF5IG9uIHRvcCAoZXZlbiBvbiBXYXlsYW5kIHNlc3Npb24pLiBDb21wYXRpYmxlIHdpdGggRmlyZWZveCBhbmQgQ2xhcHBlciBtZWRpYSBwbGF5ZXIuIiwKICAiZXh0ZW5zaW9uLWlkIjogInBpcC1vbi10b3AiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJwaXAtb24tdG9wIiwKICAibmFtZSI6ICJQaVAgb24gdG9wIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBpcC1vbi10b3AiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vUmFmb3N0YXIvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBpcC1vbi10b3AiLAogICJ1dWlkIjogInBpcC1vbi10b3BAcmFmb3N0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "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": "19", "sha256": "0rji6f2nfzanl5wp2b0hyphpbb7ymwgx913wy3ms0z2wqjgsld3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "0rji6f2nfzanl5wp2b0hyphpbb7ymwgx913wy3ms0z2wqjgsld3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "0rji6f2nfzanl5wp2b0hyphpbb7ymwgx913wy3ms0z2wqjgsld3a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJvdW5kZWQgU3lzdGVtIE1lbnUgQnV0dG9ucyIsCiAgIm5hbWUiOiAiUm91bmRlZCBTeXN0ZW0gTWVudSBCdXR0b25zIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnJvdW5kLXN5c3RlbS1tZW51LWJ1dHRvbnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9QUkFUQVAtS1VNQVIvcm91bmRlZC1zeXN0ZW0tbWVudS1idXR0b25zIiwKICAidXVpZCI6ICJyb3VuZGVkU3lzdGVtTWVudUJ1dHRvbnNAcHJhdGFwLmZhc3RtYWlsLmZtIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} , {"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": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "1mdmwhlrdpfw3zw66575kd8xc0isgw0gnx3qq3f5d70c8wk7ijhx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZ2hsaWdodHMgdGhlIGZvY3Vzc2VkIHdpbmRvdyB3aXRoIGEgdGVtcG9yYXJ5IGJvcmRlciIsCiAgIm5hbWUiOiAiSGlnaGxpZ2h0IEZvY3VzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9taXBtaXAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9ucy1oaWdobGlnaHQtZm9jdXMiLAogICJ1dWlkIjogImhpZ2hsaWdodC1mb2N1c0BwaW1zbmVsLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "awesome-tiles@velitasali.com", "name": "Awesome Tiles", "pname": "awesome-tiles", "description": "Tile windows using keyboard shortcuts.", "link": "https://extensions.gnome.org/extension/4702/awesome-tiles/", "shell_version_map": {"40": {"version": "6", "sha256": "1j4f230109r4ib28i6anx0y2rckwp1ahq61brj3ladk1xgz7sl8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2dub21lLWF3ZXNvbWUtdGlsZXMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhd2Vzb21lLXRpbGVzQHZlbGl0YXNhbGkuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1j4f230109r4ib28i6anx0y2rckwp1ahq61brj3ladk1xgz7sl8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2dub21lLWF3ZXNvbWUtdGlsZXMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhd2Vzb21lLXRpbGVzQHZlbGl0YXNhbGkuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1j4f230109r4ib28i6anx0y2rckwp1ahq61brj3ladk1xgz7sl8f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRpbGUgd2luZG93cyB1c2luZyBrZXlib2FyZCBzaG9ydGN1dHMuIiwKICAibmFtZSI6ICJBd2Vzb21lIFRpbGVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF3ZXNvbWUtdGlsZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS92ZWxpdGFzYWxpL2dub21lLWF3ZXNvbWUtdGlsZXMtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJhd2Vzb21lLXRpbGVzQHZlbGl0YXNhbGkuY29tIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "dock-from-dash@fthx", "name": "Dock from Dash", "pname": "dock-from-dash", "description": "Dock for GNOME Shell 40+. Does use native GNOME Shell Dash. Very light extension.\n\n Hover the bottom of your screen and GNOME Shell dash will appear without overview and will hide when you leave the dash. Native GNOME Shell click behavior is modified: minimize if one window is open, overview if many windows are open. Scroll on the dock to change workspace. Some preferences in UI (thanks @rastersoft).\n\n I'm not notified of messages here, please report bugs only through GitHub.", "link": "https://extensions.gnome.org/extension/4703/dock-from-dash/", "shell_version_map": {"40": {"version": "57", "sha256": "1qw7gi0gb95rym7vd6wdanjnp3m8qyjsa57kxsr3p5hjq7gp68i8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kb2NrLWZyb20tZGFzaCIsCiAgInV1aWQiOiAiZG9jay1mcm9tLWRhc2hAZnRoeCIsCiAgInZlcnNpb24iOiA1Nwp9"}, "41": {"version": "57", "sha256": "1qw7gi0gb95rym7vd6wdanjnp3m8qyjsa57kxsr3p5hjq7gp68i8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kb2NrLWZyb20tZGFzaCIsCiAgInV1aWQiOiAiZG9jay1mcm9tLWRhc2hAZnRoeCIsCiAgInZlcnNpb24iOiA1Nwp9"}, "42": {"version": "57", "sha256": "1qw7gi0gb95rym7vd6wdanjnp3m8qyjsa57kxsr3p5hjq7gp68i8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRvY2sgZm9yIEdOT01FIFNoZWxsIDQwKy4gRG9lcyB1c2UgbmF0aXZlIEdOT01FIFNoZWxsIERhc2guIFZlcnkgbGlnaHQgZXh0ZW5zaW9uLlxuXG4gSG92ZXIgdGhlIGJvdHRvbSBvZiB5b3VyIHNjcmVlbiBhbmQgR05PTUUgU2hlbGwgZGFzaCB3aWxsIGFwcGVhciB3aXRob3V0IG92ZXJ2aWV3IGFuZCB3aWxsIGhpZGUgd2hlbiB5b3UgbGVhdmUgdGhlIGRhc2guIE5hdGl2ZSBHTk9NRSBTaGVsbCBjbGljayBiZWhhdmlvciBpcyBtb2RpZmllZDogbWluaW1pemUgaWYgb25lIHdpbmRvdyBpcyBvcGVuLCBvdmVydmlldyBpZiBtYW55IHdpbmRvd3MgYXJlIG9wZW4uIFNjcm9sbCBvbiB0aGUgZG9jayB0byBjaGFuZ2Ugd29ya3NwYWNlLiBTb21lIHByZWZlcmVuY2VzIGluIFVJICh0aGFua3MgQHJhc3RlcnNvZnQpLlxuXG4gSSdtIG5vdCBub3RpZmllZCBvZiBtZXNzYWdlcyBoZXJlLCBwbGVhc2UgcmVwb3J0IGJ1Z3Mgb25seSB0aHJvdWdoIEdpdEh1Yi4iLAogICJuYW1lIjogIkRvY2sgZnJvbSBEYXNoIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9kb2NrLWZyb20tZGFzaCIsCiAgInV1aWQiOiAiZG9jay1mcm9tLWRhc2hAZnRoeCIsCiAgInZlcnNpb24iOiA1Nwp9"}}} -, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "Close and save open windows. And restore them. Most importantly, it supports both X11 and Wayland!\n\nMain features:\n- Close open windows\n- Close apps with multiple windows 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- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Trash saved session\n- Search saved session by the session name fuzzily", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "19", "sha256": "0rp1aqv0xjqx8wk6w043yh4apcn6r35ag9dv1f119q10f06h4nb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlbS4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhXG5cbk1haW4gZmVhdHVyZXM6XG4tIENsb3NlIG9wZW4gd2luZG93c1xuLSBDbG9zZSBhcHBzIHdpdGggbXVsdGlwbGUgd2luZG93cyB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "41": {"version": "19", "sha256": "0rp1aqv0xjqx8wk6w043yh4apcn6r35ag9dv1f119q10f06h4nb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlbS4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhXG5cbk1haW4gZmVhdHVyZXM6XG4tIENsb3NlIG9wZW4gd2luZG93c1xuLSBDbG9zZSBhcHBzIHdpdGggbXVsdGlwbGUgd2luZG93cyB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}, "42": {"version": "19", "sha256": "0rp1aqv0xjqx8wk6w043yh4apcn6r35ag9dv1f119q10f06h4nb5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlbS4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhXG5cbk1haW4gZmVhdHVyZXM6XG4tIENsb3NlIG9wZW4gd2luZG93c1xuLSBDbG9zZSBhcHBzIHdpdGggbXVsdGlwbGUgd2luZG93cyB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDE5Cn0="}}} +, {"uuid": "another-window-session-manager@gmail.com", "name": "Another Window Session Manager", "pname": "another-window-session-manager", "description": "Close and save open windows. And restore them. Most importantly, it supports both X11 and Wayland!\n\nMain features:\n- Close open windows\n- Close apps with multiple windows 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- Move windows to their own workspace according to a saved session\n- Support multi-monitor\n- Trash saved session\n- Search saved session by the session name fuzzily", "link": "https://extensions.gnome.org/extension/4709/another-window-session-manager/", "shell_version_map": {"40": {"version": "24", "sha256": "12g8kbqbyzkqphxffg2k59rwlcphir7dpp4pi29qj169121p133i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlbS4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhXG5cbk1haW4gZmVhdHVyZXM6XG4tIENsb3NlIG9wZW4gd2luZG93c1xuLSBDbG9zZSBhcHBzIHdpdGggbXVsdGlwbGUgd2luZG93cyB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "41": {"version": "24", "sha256": "12g8kbqbyzkqphxffg2k59rwlcphir7dpp4pi29qj169121p133i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlbS4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhXG5cbk1haW4gZmVhdHVyZXM6XG4tIENsb3NlIG9wZW4gd2luZG93c1xuLSBDbG9zZSBhcHBzIHdpdGggbXVsdGlwbGUgd2luZG93cyB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}, "42": {"version": "24", "sha256": "12g8kbqbyzkqphxffg2k59rwlcphir7dpp4pi29qj169121p133i", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNsb3NlIGFuZCBzYXZlIG9wZW4gd2luZG93cy4gQW5kIHJlc3RvcmUgdGhlbS4gTW9zdCBpbXBvcnRhbnRseSwgaXQgc3VwcG9ydHMgYm90aCBYMTEgYW5kIFdheWxhbmQhXG5cbk1haW4gZmVhdHVyZXM6XG4tIENsb3NlIG9wZW4gd2luZG93c1xuLSBDbG9zZSBhcHBzIHdpdGggbXVsdGlwbGUgd2luZG93cyB2aWEgYHlkb3Rvb2xgIHNvIHlvdSBkb24ndCBsb3NlIHNlc3Npb25zIG9mIHRoaXMgYXBwLiBQbGVhc2Ugc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9ubHBzdWdlL2dub21lLXNoZWxsLWV4dGVuc2lvbi1hbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXIjaG93LXRvLXJlc3RvcmUtYS1zZXNzaW9uLWF0LXN0YXJ0dXAgdG8gbGVhcm4gaG93IHRvIG1ha2UgYENsb3NlIGJ5IHJ1bGVzYCB3b3JrXG4tIFNhdmUgb3BlbiB3aW5kb3dzXG4tIFJlc3RvcmUgc2Vzc2lvbihzKVxuLSBSZXN0b3JlIGEgc2Vzc2lvbiBhdCBzdGFydHVwLiBQbGVhc2Ugbm90ZSB0aGF0IHRoaXMgZmVhdHVyZSBpcyBkaXNhYmxlZCBieSBkZWZhdWx0LiBTZWUgaHR0cHM6Ly9naXRodWIuY29tL25scHN1Z2UvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFub3RoZXItd2luZG93LXNlc3Npb24tbWFuYWdlciNob3ctdG8tcmVzdG9yZS1hLXNlc3Npb24tYXQtc3RhcnR1cCB0byBsZWFybiBob3cgdG8gZW5hYmxlIGFuZCB1c2UgaXRcbi0gUmVzdG9yZSB3aW5kb3cgc3RhdGUsIGluY2x1ZGluZyBBbHdheXMgb24gVG9wLCAgQWx3YXlzIG9uIFZpc2libGUgV29ya3NwYWNlIGFuZCBtYXhpbWl6YXRpb25cbi0gUmVzdG9yZSB3aW5kb3cgd29ya3NwYWNlLCBzaXplIGFuZCBwb3NpdGlvblxuLSBNb3ZlIHdpbmRvd3MgdG8gdGhlaXIgb3duIHdvcmtzcGFjZSBhY2NvcmRpbmcgdG8gYSBzYXZlZCBzZXNzaW9uXG4tIFN1cHBvcnQgbXVsdGktbW9uaXRvclxuLSBUcmFzaCBzYXZlZCBzZXNzaW9uXG4tIFNlYXJjaCBzYXZlZCBzZXNzaW9uIGJ5IHRoZSBzZXNzaW9uIG5hbWUgZnV6emlseSIsCiAgIm5hbWUiOiAiQW5vdGhlciBXaW5kb3cgU2Vzc2lvbiBNYW5hZ2VyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmxwc3VnZS9nbm9tZS1zaGVsbC1leHRlbnNpb24tYW5vdGhlci13aW5kb3ctc2Vzc2lvbi1tYW5hZ2VyIiwKICAidXVpZCI6ICJhbm90aGVyLXdpbmRvdy1zZXNzaW9uLW1hbmFnZXJAZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDI0Cn0="}}} , {"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": "2", "sha256": "1xsnrdzqckr5l6lp8biz2zamkmsagdi43nhhlf15wbk7919xnrbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAicHJldmVudC1kb3VibGUtZW1wdHktd2luZG93QHNpbGxpZXdvdXMubmwiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1xsnrdzqckr5l6lp8biz2zamkmsagdi43nhhlf15wbk7919xnrbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAicHJldmVudC1kb3VibGUtZW1wdHktd2luZG93QHNpbGxpZXdvdXMubmwiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1xsnrdzqckr5l6lp8biz2zamkmsagdi43nhhlf15wbk7919xnrbi", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNldCBNSU5fTlVNQkVSX1dPUktTUEFDRVMgdG8gMSBzbyB0aGVyZSBpcyBvbmx5IG9uZSBlbXB0eSB3b3Jrc3BhY2Ugd2hlbiB0aGVyZSBhcmUgbm8gd2luZG93cyBvcGVuLlxuXG5odHRwczovL2dpdGxhYi5jb20vZzM3ODYvcHJldmVudC1kb3VibGUtZW1wdHktd2luZG93IiwKICAibmFtZSI6ICJQcmV2ZW50IGRvdWJsZSBlbXB0eSB3aW5kb3ciLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAicHJldmVudC1kb3VibGUtZW1wdHktd2luZG93QHNpbGxpZXdvdXMubmwiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"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": "5", "sha256": "1xax3bqn290s2h38wp041nxpqsvl7y02s2kqcky6lkzihwqkh40j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzICYgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtZGlzcGxheS1kZGMtYnJpZ2h0bmVzcy12b2x1bWUvIiwKICAidXVpZCI6ICJkaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZUBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "1xax3bqn290s2h38wp041nxpqsvl7y02s2kqcky6lkzihwqkh40j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzICYgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtZGlzcGxheS1kZGMtYnJpZ2h0bmVzcy12b2x1bWUvIiwKICAidXVpZCI6ICJkaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZUBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "1xax3bqn290s2h38wp041nxpqsvl7y02s2kqcky6lkzihwqkh40j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBHTk9NRSBleHRlbnNpb24gdG8gY29udHJvbCBkaXNwbGF5cycgYnJpZ2h0bmVzcyBhbmQgYXVkaW8gdm9sdW1lIHZpYSBEREMuIEl0IHJlcXVpcmVzIGRkY3V0aWwgdG8gYmUgaW5zdGFsbGVkLCBpMmMgcGVybWlzc2lvbnMgZm9yIG5vbi1yb290IHVzZXJzIGNvbmZpZ3VyZWQuIiwKICAibmFtZSI6ICJEaXNwbGF5IEREQyBCcmlnaHRuZXNzICYgVm9sdW1lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vU2FHckxhbmQvZ25vbWUtc2hlbGwtZGlzcGxheS1kZGMtYnJpZ2h0bmVzcy12b2x1bWUvIiwKICAidXVpZCI6ICJkaXNwbGF5LWRkYy1icmlnaHRuZXNzLXZvbHVtZUBzYWdybGFuZC5kZSIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"uuid": "disable_hover@fawtytoo", "name": "Disable Hover On App & Window Switcher Popups", "pname": "disable-hover-on-app-window-switcher-popups", "description": "Prevents the mouse cursor interfering with either the App Switcher or the Window Switcher popups.\nNote: It doesn't prevent mouse clicks.\n\nThese are the switcher popups that are invoked from keyboard shortcuts, e.g. Alt+Tab or Super+Tab.", "link": "https://extensions.gnome.org/extension/4714/disable-hover-on-app-window-switcher-popups/", "shell_version_map": {"38": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "1nd538h9g8l18v0vw29ishilxpj0a7p6np281blqxwssix2dqn5c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlByZXZlbnRzIHRoZSBtb3VzZSBjdXJzb3IgaW50ZXJmZXJpbmcgd2l0aCBlaXRoZXIgdGhlIEFwcCBTd2l0Y2hlciBvciB0aGUgV2luZG93IFN3aXRjaGVyIHBvcHVwcy5cbk5vdGU6IEl0IGRvZXNuJ3QgcHJldmVudCBtb3VzZSBjbGlja3MuXG5cblRoZXNlIGFyZSB0aGUgc3dpdGNoZXIgcG9wdXBzIHRoYXQgYXJlIGludm9rZWQgZnJvbSBrZXlib2FyZCBzaG9ydGN1dHMsIGUuZy4gQWx0K1RhYiBvciBTdXBlcitUYWIuIiwKICAibmFtZSI6ICJEaXNhYmxlIEhvdmVyIE9uIEFwcCAmIFdpbmRvdyBTd2l0Y2hlciBQb3B1cHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiZGlzYWJsZV9ob3ZlckBmYXd0eXRvbyIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "countdown-timer@eexpss.gmail.com", "name": "Countdown & Timer", "pname": "countdown-timer", "description": "Countdown in minutes, or enter text containing HH:MM format to set the Timer.", "link": "https://extensions.gnome.org/extension/4720/countdown-timer/", "shell_version_map": {"40": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "08va385j93b9d1n8w7b3sia656abl4x25ka1kff4kzg0rd0b74c8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biBpbiBtaW51dGVzLCBvciBlbnRlciB0ZXh0IGNvbnRhaW5pbmcgSEg6TU0gZm9ybWF0IHRvIHNldCB0aGUgVGltZXIuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY291bnRkb3duLXRpbWVyIiwKICAibmFtZSI6ICJDb3VudGRvd24gJiBUaW1lciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNvdW50ZG93bi10aW1lci8iLAogICJ1dWlkIjogImNvdW50ZG93bi10aW1lckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} , {"uuid": "workspace-dry-names@benmoussatmouad.github.io", "name": "Worksapce Dry Names", "pname": "worksapce-dry-names", "description": "Workspace dry-names is a simple gnome extension that enables tags for desktop workspaces. It shows text labels on the left side of the main panel with randomly generated cities names (or an other category of names). Names can also be modified.\n\nhttps://github.com/benmoussatMouad/gnome-workspace-dry-names.git", "link": "https://extensions.gnome.org/extension/4721/worksapce-dry-names/", "shell_version_map": {"38": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}, "40": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}, "41": {"version": "1", "sha256": "0ljprv3ar01p1y24p6j7hc8g7afca7ir0b2zyapjpzndz7mv1zcl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBkcnktbmFtZXMgaXMgYSBzaW1wbGUgZ25vbWUgZXh0ZW5zaW9uIHRoYXQgZW5hYmxlcyB0YWdzIGZvciBkZXNrdG9wIHdvcmtzcGFjZXMuIEl0IHNob3dzIHRleHQgbGFiZWxzIG9uIHRoZSBsZWZ0IHNpZGUgb2YgdGhlIG1haW4gcGFuZWwgd2l0aCByYW5kb21seSBnZW5lcmF0ZWQgY2l0aWVzIG5hbWVzIChvciBhbiBvdGhlciBjYXRlZ29yeSBvZiBuYW1lcykuIE5hbWVzIGNhbiBhbHNvIGJlIG1vZGlmaWVkLlxuXG5odHRwczovL2dpdGh1Yi5jb20vYmVubW91c3NhdE1vdWFkL2dub21lLXdvcmtzcGFjZS1kcnktbmFtZXMuZ2l0IiwKICAibmFtZSI6ICJXb3Jrc2FwY2UgRHJ5IE5hbWVzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndvcmtzcGFjZS1kcnktbmFtZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ3b3Jrc3BhY2UtZHJ5LW5hbWVzQGJlbm1vdXNzYXRtb3VhZC5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"uuid": "window-calls@domandoman.xyz", "name": "Window Calls", "pname": "window-calls", "description": "Add new dbus call for windows to get windows list and some of theirs properties", "link": "https://extensions.gnome.org/extension/4724/window-calls/", "shell_version_map": {"41": {"version": "2", "sha256": "02z265maw4a0rkw5y4an2j7spjqif44nxf47q5qr6cwnvmfpw6ci", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMiLAogICJuYW1lIjogIldpbmRvdyBDYWxscyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2t5aWNreS93aW5kb3ctY2FsbHMiLAogICJ1dWlkIjogIndpbmRvdy1jYWxsc0Bkb21hbmRvbWFuLnh5eiIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"uuid": "window-calls@domandoman.xyz", "name": "Window Calls", "pname": "window-calls", "description": "Add new dbus call for windows to get windows list and some of theirs properties. Also enables you to move given window to certain workspace by id! Move on github homepage", "link": "https://extensions.gnome.org/extension/4724/window-calls/", "shell_version_map": {"41": {"version": "2", "sha256": "1165giakrw4lrz23c5l9pc8drxb3kln632dk99f9if69yxw3453l", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMuIEFsc28gZW5hYmxlcyB5b3UgdG8gbW92ZSBnaXZlbiB3aW5kb3cgdG8gY2VydGFpbiB3b3Jrc3BhY2UgYnkgaWQhIE1vdmUgb24gZ2l0aHViIGhvbWVwYWdlIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNreWlja3kvd2luZG93LWNhbGxzIiwKICAidXVpZCI6ICJ3aW5kb3ctY2FsbHNAZG9tYW5kb21hbi54eXoiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "3", "sha256": "0wazlbz53xvxyw9pc7amyir6g4xs551d7pr37z89x7qk2dy26h0q", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMuIEFsc28gZW5hYmxlcyB5b3UgdG8gbW92ZSBnaXZlbiB3aW5kb3cgdG8gY2VydGFpbiB3b3Jrc3BhY2UgYnkgaWQhIE1vdmUgb24gZ2l0aHViIGhvbWVwYWdlIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNreWlja3kvd2luZG93LWNhbGxzIiwKICAidXVpZCI6ICJ3aW5kb3ctY2FsbHNAZG9tYW5kb21hbi54eXoiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "primary_input_on_lockscreen@sagidayan.com", "name": "Primary Input on LockScreen", "pname": "primary-input-on-lockscreen", "description": "Automatically change input layout to primary on lock screen", "link": "https://extensions.gnome.org/extension/4727/primary-input-on-lockscreen/", "shell_version_map": {"40": {"version": "3", "sha256": "00i0wl4yb5gmj35zzj0b8kbdbm7y50b0kls6dlackdxbqgh88ji3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zYWdpZGF5YW4vcHJpbWFyeS1pbnB1dC1vbi1sb2Nrc2NyZWVuIiwKICAidXVpZCI6ICJwcmltYXJ5X2lucHV0X29uX2xvY2tzY3JlZW5Ac2FnaWRheWFuLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "00i0wl4yb5gmj35zzj0b8kbdbm7y50b0kls6dlackdxbqgh88ji3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zYWdpZGF5YW4vcHJpbWFyeS1pbnB1dC1vbi1sb2Nrc2NyZWVuIiwKICAidXVpZCI6ICJwcmltYXJ5X2lucHV0X29uX2xvY2tzY3JlZW5Ac2FnaWRheWFuLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "42": {"version": "3", "sha256": "00i0wl4yb5gmj35zzj0b8kbdbm7y50b0kls6dlackdxbqgh88ji3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hhbmdlIGlucHV0IGxheW91dCB0byBwcmltYXJ5IG9uIGxvY2sgc2NyZWVuIiwKICAibmFtZSI6ICJQcmltYXJ5IElucHV0IG9uIExvY2tTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9zYWdpZGF5YW4vcHJpbWFyeS1pbnB1dC1vbi1sb2Nrc2NyZWVuIiwKICAidXVpZCI6ICJwcmltYXJ5X2lucHV0X29uX2xvY2tzY3JlZW5Ac2FnaWRheWFuLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "browser-tabs@com.github.harshadgavali", "name": "Browser tabs", "pname": "browser-tabs", "description": "Search and switch to browser tabs using GNOME overview/ArcMenu\n\nSee following github link for installing necessary browser extension and host app!", "link": "https://extensions.gnome.org/extension/4733/browser-tabs/", "shell_version_map": {"40": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1r1m6cfi9pv0sz651b95ji2rk40rhwmdnivq2jaf030w3qrkwysf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlYXJjaCBhbmQgc3dpdGNoIHRvIGJyb3dzZXIgdGFicyB1c2luZyBHTk9NRSBvdmVydmlldy9BcmNNZW51XG5cblNlZSBmb2xsb3dpbmcgZ2l0aHViIGxpbmsgZm9yIGluc3RhbGxpbmcgbmVjZXNzYXJ5IGJyb3dzZXIgZXh0ZW5zaW9uIGFuZCBob3N0IGFwcCEiLAogICJuYW1lIjogIkJyb3dzZXIgdGFicyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hhcnNoYWRnYXZhbGkvc2VhcmNocHJvdmlkZXItZm9yLWJyb3dzZXItdGFicy5naXQvIiwKICAidXVpZCI6ICJicm93c2VyLXRhYnNAY29tLmdpdGh1Yi5oYXJzaGFkZ2F2YWxpIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "smart-auto-move@khimaros.com", "name": "Smart Auto Move", "pname": "smart-auto-move", "description": "Smart Auto Move learns the size and position of your application windows and restores them to the correct place on subsequent launches. Supports Wayland.\n\nNOTE: Optimized for use with static workspaces. For more control, can be set to default IGNORE and then selectively RESTORE only desired apps.", "link": "https://extensions.gnome.org/extension/4736/smart-auto-move/", "shell_version_map": {"41": {"version": "16", "sha256": "1lzz38qplz2qgfrkjnx72mkjixcmv8ydna3kfnysbisr0ab9klh6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2hpbWFyb3Mvc21hcnQtYXV0by1tb3ZlIiwKICAidXVpZCI6ICJzbWFydC1hdXRvLW1vdmVAa2hpbWFyb3MuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}, "42": {"version": "16", "sha256": "1lzz38qplz2qgfrkjnx72mkjixcmv8ydna3kfnysbisr0ab9klh6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNtYXJ0IEF1dG8gTW92ZSBsZWFybnMgdGhlIHNpemUgYW5kIHBvc2l0aW9uIG9mIHlvdXIgYXBwbGljYXRpb24gd2luZG93cyBhbmQgcmVzdG9yZXMgdGhlbSB0byB0aGUgY29ycmVjdCBwbGFjZSBvbiBzdWJzZXF1ZW50IGxhdW5jaGVzLiBTdXBwb3J0cyBXYXlsYW5kLlxuXG5OT1RFOiBPcHRpbWl6ZWQgZm9yIHVzZSB3aXRoIHN0YXRpYyB3b3Jrc3BhY2VzLiBGb3IgbW9yZSBjb250cm9sLCBjYW4gYmUgc2V0IHRvIGRlZmF1bHQgSUdOT1JFIGFuZCB0aGVuIHNlbGVjdGl2ZWx5IFJFU1RPUkUgb25seSBkZXNpcmVkIGFwcHMuIiwKICAibmFtZSI6ICJTbWFydCBBdXRvIE1vdmUiLAogICJvcmlnaW5hbC1hdXRob3IiOiAia2hpbWFyb3MiLAogICJzZXR0aW5ncy1wYXRoIjogIi9vcmcvZ25vbWUvc2hlbGwvZXh0ZW5zaW9ucy9zbWFydC1hdXRvLW1vdmUvIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNtYXJ0LWF1dG8tbW92ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20va2hpbWFyb3Mvc21hcnQtYXV0by1tb3ZlIiwKICAidXVpZCI6ICJzbWFydC1hdXRvLW1vdmVAa2hpbWFyb3MuY29tIiwKICAidmVyc2lvbiI6IDE2Cn0="}}} , {"uuid": "hplip-menu2@grizzlysmit.smit.id.au", "name": "Alternate Menu for Hplip2", "pname": "alternate-menu-for-hplip2", "description": "control your hp printers by calling the device manager hp-toolbox, also some useful links\nMotivation: the hp-systray doesn't work reliably under gnome shell\nyou need to have installed hplip in order to use this\nChoice of using a printer icon or a hp_logo.png if it's installed in the same place as mine on Ubuntu\nyou could use symbolic links to fake the path.\nThis is a replacement for the old \"Alternate Menu for Hplip\" which doesn't work under the new Gome-Shell I have cleaned it up a bit and it has a few new menu's but it is still basically the same thing.\n Added even more menus all most all system settings ones.\n\nNote: the menu will be too big if your resolution is way too low like 800x600 I have no soln for this just now.", "link": "https://extensions.gnome.org/extension/4739/alternate-menu-for-hplip2/", "shell_version_map": {"40": {"version": "5", "sha256": "1r6iv02zlkkcq0h57agirm6sqi17pcqkyjlsd5bn8h4hykc7bwb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "41": {"version": "5", "sha256": "1r6iv02zlkkcq0h57agirm6sqi17pcqkyjlsd5bn8h4hykc7bwb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDUKfQ=="}, "42": {"version": "5", "sha256": "1r6iv02zlkkcq0h57agirm6sqi17pcqkyjlsd5bn8h4hykc7bwb7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImNvbnRyb2wgeW91ciBocCBwcmludGVycyBieSBjYWxsaW5nIHRoZSBkZXZpY2UgbWFuYWdlciBocC10b29sYm94LCBhbHNvIHNvbWUgdXNlZnVsIGxpbmtzXG5Nb3RpdmF0aW9uOiB0aGUgaHAtc3lzdHJheSBkb2Vzbid0IHdvcmsgcmVsaWFibHkgdW5kZXIgZ25vbWUgc2hlbGxcbnlvdSBuZWVkIHRvIGhhdmUgaW5zdGFsbGVkIGhwbGlwIGluIG9yZGVyIHRvIHVzZSB0aGlzXG5DaG9pY2Ugb2YgdXNpbmcgYSBwcmludGVyIGljb24gb3IgYSBocF9sb2dvLnBuZyBpZiBpdCdzIGluc3RhbGxlZCBpbiB0aGUgc2FtZSBwbGFjZSBhcyBtaW5lIG9uIFVidW50dVxueW91IGNvdWxkIHVzZSBzeW1ib2xpYyBsaW5rcyB0byBmYWtlIHRoZSBwYXRoLlxuVGhpcyBpcyBhIHJlcGxhY2VtZW50IGZvciB0aGUgb2xkIFwiQWx0ZXJuYXRlIE1lbnUgZm9yIEhwbGlwXCIgd2hpY2ggZG9lc24ndCB3b3JrIHVuZGVyIHRoZSBuZXcgR29tZS1TaGVsbCBJIGhhdmUgY2xlYW5lZCBpdCB1cCBhIGJpdCBhbmQgaXQgaGFzIGEgZmV3IG5ldyBtZW51J3MgYnV0IGl0IGlzIHN0aWxsIGJhc2ljYWxseSB0aGUgc2FtZSB0aGluZy5cbiBBZGRlZCBldmVuIG1vcmUgbWVudXMgYWxsIG1vc3QgYWxsIHN5c3RlbSBzZXR0aW5ncyBvbmVzLlxuXG5Ob3RlOiB0aGUgbWVudSB3aWxsIGJlIHRvbyBiaWcgaWYgeW91ciByZXNvbHV0aW9uIGlzIHdheSB0b28gbG93IGxpa2UgODAweDYwMCBJIGhhdmUgbm8gc29sbiBmb3IgdGhpcyBqdXN0IG5vdy4iLAogICJuYW1lIjogIkFsdGVybmF0ZSBNZW51IGZvciBIcGxpcDIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuaHBsaXAtbWVudTIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9ncml6emx5c21pdC9ocGxpcC1tZW51Mi1ncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidXVpZCI6ICJocGxpcC1tZW51MkBncml6emx5c21pdC5zbWl0LmlkLmF1IiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"uuid": "dash-from-panel@fthx", "name": "Dash from Panel", "pname": "dash-from-panel", "description": "Top dock for GNOME 40+. Hover top panel and GNOME Shell dash appears without overview.\n\n Scroll on dock or panel changes workspace. Preferences UI.\n\n Does use native GNOME Shell Dash. Very light extension.\n\n Please report bugs through GitHub.", "link": "https://extensions.gnome.org/extension/4741/dash-from-panel/", "shell_version_map": {"40": {"version": "3", "sha256": "10lcxqkg9i7gjvgdb01b6fahj5yr7c614yj4jcz9ywi5v571b1hw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBTY3JvbGwgb24gZG9jayBvciBwYW5lbCBjaGFuZ2VzIHdvcmtzcGFjZS4gUHJlZmVyZW5jZXMgVUkuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "10lcxqkg9i7gjvgdb01b6fahj5yr7c614yj4jcz9ywi5v571b1hw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBTY3JvbGwgb24gZG9jayBvciBwYW5lbCBjaGFuZ2VzIHdvcmtzcGFjZS4gUHJlZmVyZW5jZXMgVUkuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "10lcxqkg9i7gjvgdb01b6fahj5yr7c614yj4jcz9ywi5v571b1hw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvcCBkb2NrIGZvciBHTk9NRSA0MCsuIEhvdmVyIHRvcCBwYW5lbCBhbmQgR05PTUUgU2hlbGwgZGFzaCBhcHBlYXJzIHdpdGhvdXQgb3ZlcnZpZXcuXG5cbiBTY3JvbGwgb24gZG9jayBvciBwYW5lbCBjaGFuZ2VzIHdvcmtzcGFjZS4gUHJlZmVyZW5jZXMgVUkuXG5cbiBEb2VzIHVzZSBuYXRpdmUgR05PTUUgU2hlbGwgRGFzaC4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBQbGVhc2UgcmVwb3J0IGJ1Z3MgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJEYXNoIGZyb20gUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2gtZnJvbS1wYW5lbCIsCiAgInV1aWQiOiAiZGFzaC1mcm9tLXBhbmVsQGZ0aHgiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "clip-translator@eexpss.gmail.com", "name": "Clip Translator", "pname": "clip-translator", "description": "* Translate from Clipboard content", "link": "https://extensions.gnome.org/extension/4744/clip-translator/", "shell_version_map": {"40": {"version": "13", "sha256": "0i5gcmxxl8p0zfh6jbdrhb6s4dw7wrfl74h0z527zwfzb454yj20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "41": {"version": "13", "sha256": "0i5gcmxxl8p0zfh6jbdrhb6s4dw7wrfl74h0z527zwfzb454yj20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}, "42": {"version": "13", "sha256": "0i5gcmxxl8p0zfh6jbdrhb6s4dw7wrfl74h0z527zwfzb454yj20", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogVHJhbnNsYXRlIGZyb20gQ2xpcGJvYXJkIGNvbnRlbnQiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLXRyYW5zbGF0b3IiLAogICJuYW1lIjogIkNsaXAgVHJhbnNsYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dzLWNsaXAtdHJhbnNsYXRvciIsCiAgInV1aWQiOiAiY2xpcC10cmFuc2xhdG9yQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTMKfQ=="}}} -, {"uuid": "hidedate@hidedate.com", "name": "Hide Date", "pname": "hide-date", "description": "hides date and clocks", "link": "https://extensions.gnome.org/extension/4747/hide-date/", "shell_version_map": {"38": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "40": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}, "41": {"version": "3", "sha256": "1k0dbq26lnc2dj6w0jmjv2xyih405k02w9c7m220nspbwhspzpw6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9idXNyYWNhZ2xpeWFuL0dub21lLUV4dGVuc2lvbi1FeGFtcGxlcy90cmVlL21haW4vaGlkZWRhdGUlNDBoaWRlZGF0ZS5jb20iLAogICJ1dWlkIjogImhpZGVkYXRlQGhpZGVkYXRlLmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} +, {"uuid": "hidedate@hidedate.com", "name": "Hide Date", "pname": "hide-date", "description": "hides date and clocks", "link": "https://extensions.gnome.org/extension/4747/hide-date/", "shell_version_map": {"38": {"version": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "40": {"version": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "41": {"version": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}, "42": {"version": "5", "sha256": "0bg0dsmx89ndf6gkhhqy8av6jvcgfzdnnalj51vvcgcprz5msm5j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImhpZGVzIGRhdGUgYW5kIGNsb2NrcyIsCiAgIm5hbWUiOiAiSGlkZSBEYXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYnVzcmFjYWdsaXlhbi9Hbm9tZS1FeHRlbnNpb24tRXhhbXBsZXMvdHJlZS9tYWluL2hpZGVkYXRlJTQwaGlkZWRhdGUuY29tIiwKICAidXVpZCI6ICJoaWRlZGF0ZUBoaWRlZGF0ZS5jb20iLAogICJ2ZXJzaW9uIjogNQp9"}}} , {"uuid": "toggleimwheel@mijorus.it", "name": "Toggle imwheel", "pname": "toggle-imwheel", "description": "This simple extension wants to mitigate the lack of a dedicated mouse wheel control on most of the modern linux distributions. Many are using imwheel as a temporary fix; however, if you are using a laptop, you might want to have two different settings for the touchpad and the mouse. \n This extension will add an icon in the top bar which lets you toggle imwheel between two custom settings. \n https://github.com/mijorus/toggle-imwheel", "link": "https://extensions.gnome.org/extension/4748/toggle-imwheel/", "shell_version_map": {"40": {"version": "6", "sha256": "0kf477yyhqy0lkg4r48lgwzadpjs4fxyw0v6yaf412swz7h7713c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBhIGxhcHRvcCwgeW91IG1pZ2h0IHdhbnQgdG8gaGF2ZSB0d28gZGlmZmVyZW50IHNldHRpbmdzIGZvciB0aGUgdG91Y2hwYWQgYW5kIHRoZSBtb3VzZS4gXG4gVGhpcyBleHRlbnNpb24gd2lsbCBhZGQgYW4gaWNvbiBpbiB0aGUgdG9wIGJhciB3aGljaCBsZXRzIHlvdSB0b2dnbGUgaW13aGVlbCBiZXR3ZWVuIHR3byBjdXN0b20gc2V0dGluZ3MuIFxuIGh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b2dnbGVpbXdoZWVsQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "41": {"version": "6", "sha256": "0kf477yyhqy0lkg4r48lgwzadpjs4fxyw0v6yaf412swz7h7713c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBhIGxhcHRvcCwgeW91IG1pZ2h0IHdhbnQgdG8gaGF2ZSB0d28gZGlmZmVyZW50IHNldHRpbmdzIGZvciB0aGUgdG91Y2hwYWQgYW5kIHRoZSBtb3VzZS4gXG4gVGhpcyBleHRlbnNpb24gd2lsbCBhZGQgYW4gaWNvbiBpbiB0aGUgdG9wIGJhciB3aGljaCBsZXRzIHlvdSB0b2dnbGUgaW13aGVlbCBiZXR3ZWVuIHR3byBjdXN0b20gc2V0dGluZ3MuIFxuIGh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b2dnbGVpbXdoZWVsQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogNgp9"}, "42": {"version": "6", "sha256": "0kf477yyhqy0lkg4r48lgwzadpjs4fxyw0v6yaf412swz7h7713c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgc2ltcGxlIGV4dGVuc2lvbiB3YW50cyB0byBtaXRpZ2F0ZSB0aGUgbGFjayBvZiBhIGRlZGljYXRlZCBtb3VzZSB3aGVlbCBjb250cm9sIG9uIG1vc3Qgb2YgdGhlIG1vZGVybiBsaW51eCBkaXN0cmlidXRpb25zLiBNYW55IGFyZSB1c2luZyBpbXdoZWVsIGFzIGEgdGVtcG9yYXJ5IGZpeDsgaG93ZXZlciwgaWYgeW91IGFyZSB1c2luZyBhIGxhcHRvcCwgeW91IG1pZ2h0IHdhbnQgdG8gaGF2ZSB0d28gZGlmZmVyZW50IHNldHRpbmdzIGZvciB0aGUgdG91Y2hwYWQgYW5kIHRoZSBtb3VzZS4gXG4gVGhpcyBleHRlbnNpb24gd2lsbCBhZGQgYW4gaWNvbiBpbiB0aGUgdG9wIGJhciB3aGljaCBsZXRzIHlvdSB0b2dnbGUgaW13aGVlbCBiZXR3ZWVuIHR3byBjdXN0b20gc2V0dGluZ3MuIFxuIGh0dHBzOi8vZ2l0aHViLmNvbS9taWpvcnVzL3RvZ2dsZS1pbXdoZWVsIiwKICAibmFtZSI6ICJUb2dnbGUgaW13aGVlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJ0b2dnbGVpbXdoZWVsQG1pam9ydXMuaXQiLAogICJ2ZXJzaW9uIjogNgp9"}}} , {"uuid": "yakuake-extension@kde.org", "name": "Yakuake", "pname": "yakuake", "description": "A Gnome shell extension to use Yakuake on Gnome. Adds a global shortcut to show/hide yakuake and makes the console appear focussed.", "link": "https://extensions.gnome.org/extension/4757/yakuake/", "shell_version_map": {"40": {"version": "6", "sha256": "069fk11nr2nnssyb8ljzdf3xb15lvbgny2jp8skq1ky7w8k7a0cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}, "41": {"version": "6", "sha256": "069fk11nr2nnssyb8ljzdf3xb15lvbgny2jp8skq1ky7w8k7a0cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}, "42": {"version": "6", "sha256": "069fk11nr2nnssyb8ljzdf3xb15lvbgny2jp8skq1ky7w8k7a0cx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR25vbWUgc2hlbGwgZXh0ZW5zaW9uIHRvIHVzZSBZYWt1YWtlIG9uIEdub21lLiBBZGRzIGEgZ2xvYmFsIHNob3J0Y3V0IHRvIHNob3cvaGlkZSB5YWt1YWtlIGFuZCBtYWtlcyB0aGUgY29uc29sZSBhcHBlYXIgZm9jdXNzZWQuIiwKICAibmFtZSI6ICJZYWt1YWtlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYWxiZXJ0dmFrYS95YWt1YWtlLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAieWFrdWFrZS1leHRlbnNpb25Aa2RlLm9yZyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "dnf-shotcuts@rx1310", "name": "Shortcuts for DNF", "pname": "shortcuts-for-dnf", "description": "A small extension that adds buttons to the panel to check for DNF updates through the terminal without entering commands.", "link": "https://extensions.gnome.org/extension/4758/shortcuts-for-dnf/", "shell_version_map": {"38": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0hknf92ijxg6xcadk7sac3qvlc8lpyf80013vkmzai7bbbbcypsm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc21hbGwgZXh0ZW5zaW9uIHRoYXQgYWRkcyBidXR0b25zIHRvIHRoZSBwYW5lbCB0byBjaGVjayBmb3IgRE5GIHVwZGF0ZXMgdGhyb3VnaCB0aGUgdGVybWluYWwgd2l0aG91dCBlbnRlcmluZyBjb21tYW5kcy4iLAogICJuYW1lIjogIlNob3J0Y3V0cyBmb3IgRE5GIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcngxMzEwL2dub21lLWV4dGVuc2lvbl9hcHR1cGRhdGUiLAogICJ1dWlkIjogImRuZi1zaG90Y3V0c0ByeDEzMTAiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "speedbackground@luke.vader", "name": "Speed background", "pname": "speed-background", "description": "Increase how often Gnome will check the background.", "link": "https://extensions.gnome.org/extension/4761/speed-background/", "shell_version_map": {"40": {"version": "6", "sha256": "1dwq6v0w15ycrfmma67csjha8axdc11y0dj05fpp2y4b4sgahy53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x1a2VWYWRlci1JVi9nbm9tZS1zcGVlZC1iYWNrZ3JvdW5kLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNwZWVkYmFja2dyb3VuZEBsdWtlLnZhZGVyIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "41": {"version": "6", "sha256": "1dwq6v0w15ycrfmma67csjha8axdc11y0dj05fpp2y4b4sgahy53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x1a2VWYWRlci1JVi9nbm9tZS1zcGVlZC1iYWNrZ3JvdW5kLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNwZWVkYmFja2dyb3VuZEBsdWtlLnZhZGVyIiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "6", "sha256": "1dwq6v0w15ycrfmma67csjha8axdc11y0dj05fpp2y4b4sgahy53", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkluY3JlYXNlIGhvdyBvZnRlbiBHbm9tZSB3aWxsIGNoZWNrIHRoZSBiYWNrZ3JvdW5kLiIsCiAgIm5hbWUiOiAiU3BlZWQgYmFja2dyb3VuZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0x1a2VWYWRlci1JVi9nbm9tZS1zcGVlZC1iYWNrZ3JvdW5kLWV4dGVuc2lvbi8iLAogICJ1dWlkIjogInNwZWVkYmFja2dyb3VuZEBsdWtlLnZhZGVyIiwKICAidmVyc2lvbiI6IDYKfQ=="}}} , {"uuid": "bottom-panel@sulincix", "name": "Bottom Panel", "pname": "bottompanel", "description": "move top panel to bottom", "link": "https://extensions.gnome.org/extension/4764/bottompanel/", "shell_version_map": {"38": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "0xfmhgd9pgbwjwclf5v9gbhr5mhkh5yl5cxb5wbj9gi20ppl8366", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1vdmUgdG9wIHBhbmVsIHRvIGJvdHRvbSIsCiAgIm5hbWUiOiAiQm90dG9tIFBhbmVsIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjMwIiwKICAgICIzLjM0IiwKICAgICIzLjMyIiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAiYm90dG9tLXBhbmVsQHN1bGluY2l4IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "FuzzyClock@johngoetz", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {"40": {"version": "3", "sha256": "0g1lqs3xk6i119wxvcl95z8fqz9jlzbxq1bc5l6bqa44h1m20pmn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0g1lqs3xk6i119wxvcl95z8fqz9jlzbxq1bc5l6bqa44h1m20pmn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "0g1lqs3xk6i119wxvcl95z8fqz9jlzbxq1bc5l6bqa44h1m20pmn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogMwp9"}}} +, {"uuid": "FuzzyClock@johngoetz", "name": "Fuzzy Clock", "pname": "fuzzy-clock", "description": "A human-readable clock for the gnome-shell panel", "link": "https://extensions.gnome.org/extension/4771/fuzzy-clock/", "shell_version_map": {"40": {"version": "4", "sha256": "10bhb3abmiinh6aw0jddljd47sllp0gqhwl2wz1wigfw0kp93mwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "10bhb3abmiinh6aw0jddljd47sllp0gqhwl2wz1wigfw0kp93mwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "10bhb3abmiinh6aw0jddljd47sllp0gqhwl2wz1wigfw0kp93mwj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgaHVtYW4tcmVhZGFibGUgY2xvY2sgZm9yIHRoZSBnbm9tZS1zaGVsbCBwYW5lbCIsCiAgIm5hbWUiOiAiRnV6enkgQ2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9qb2huZ29ldHovRnV6enlDbG9jayIsCiAgInV1aWQiOiAiRnV6enlDbG9ja0Bqb2huZ29ldHoiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "clip-note@eexpss.gmail.com", "name": "Clip Note", "pname": "clip-note", "description": "Save clip contents to multiple notes with separate tags. Notes locate at ~/.local/share/clip-note/. Dots in filename means splited tags.", "link": "https://extensions.gnome.org/extension/4774/clip-note/", "shell_version_map": {"40": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0bfpxlvyibcpd7vi1a65r5awggmh8i9yc705mfb6vpm92ry7iny3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNhdmUgY2xpcCBjb250ZW50cyB0byBtdWx0aXBsZSBub3RlcyB3aXRoIHNlcGFyYXRlIHRhZ3MuIE5vdGVzIGxvY2F0ZSBhdCB+Ly5sb2NhbC9zaGFyZS9jbGlwLW5vdGUvLiBEb3RzIGluIGZpbGVuYW1lIG1lYW5zIHNwbGl0ZWQgdGFncy4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJjbGlwLW5vdGUiLAogICJuYW1lIjogIkNsaXAgTm90ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2VleHByZXNzL2dub21lLXNoZWxsLWNsaXAtbm90ZSIsCiAgInV1aWQiOiAiY2xpcC1ub3RlQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"uuid": "ssh-tray@mario.cardia.com.br", "name": "SSH Tray", "pname": "ssh-tray", "description": "Simple SSH extension to allow you to connect to your hosts at ~/.ssh/config and ~/ssh/know_hosts file from Gnome top bar.", "link": "https://extensions.gnome.org/extension/4779/ssh-tray/", "shell_version_map": {"41": {"version": "1", "sha256": "1c7ndcv3bnsc95sijdkq39fshybpaq9fqdk3gvwm1lx40r1ibgih", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBTU0ggZXh0ZW5zaW9uIHRvIGFsbG93IHlvdSB0byBjb25uZWN0IHRvIHlvdXIgaG9zdHMgYXQgfi8uc3NoL2NvbmZpZyBhbmQgfi9zc2gva25vd19ob3N0cyBmaWxlIGZyb20gR25vbWUgdG9wIGJhci4iLAogICJuYW1lIjogIlNTSCBUcmF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MSIKICBdLAogICJ1cmwiOiAiIiwKICAidXVpZCI6ICJzc2gtdHJheUBtYXJpby5jYXJkaWEuY29tLmJyIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "glasa@lyrahgames.github.io", "name": "Glasa", "pname": "glasa", "description": "This extension puts an icon in the panel consisting of two comic-like eyes following the cursor.", "link": "https://extensions.gnome.org/extension/4780/glasa/", "shell_version_map": {"38": {"version": "2", "sha256": "0j45y91xal9vpk5iznkxydhq4dw55hvwqyfhvq48i5zlzxfirrvn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1nkv8bjsjdp4scklmpn7f74fhnyqd65dvhlplzn54qad74afdjdj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2x5cmFoZ2FtZXMvZ25vbWUtZXh0ZW5zaW9uLWdsYXNhIiwKICAidXVpZCI6ICJnbGFzYUBseXJhaGdhbWVzLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "8", "sha256": "0g82ks2kcn7a9jc31yj8lqyblbhxqph9h5kh1n8srqgz03lzx8pv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgZXh0ZW5zaW9uIHB1dHMgYW4gaWNvbiBpbiB0aGUgcGFuZWwgY29uc2lzdGluZyBvZiB0d28gY29taWMtbGlrZSBleWVzIGZvbGxvd2luZyB0aGUgY3Vyc29yLiIsCiAgIm5hbWUiOiAiR2xhc2EiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbHlyYWhnYW1lcy9nbm9tZS1leHRlbnNpb24tZ2xhc2EiLAogICJ1dWlkIjogImdsYXNhQGx5cmFoZ2FtZXMuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"uuid": "avatar@pawel.swiszcz.com", "name": "Avatar", "pname": "avatar", "description": "The Avatar Extension can add into the panel: \n * Avatar (horizontal/vertical, shades, visibility of username and hostname) \n * Primary buttons \n * MPRIS \n * Top image (can be Your own image from system) ", "link": "https://extensions.gnome.org/extension/4782/avatar/", "shell_version_map": {"41": {"version": "17", "sha256": "0a3i784bnzi3fc78dic8mikzplh7w8jjjcmjh5i32b6aa1mh7kij", "metadata": "ewogICJ1dWlkIjogImF2YXRhckBwYXdlbC5zd2lzemN6LmNvbSIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAiZGVzY3JpcHRpb24iOiAiVGhlIEF2YXRhciBFeHRlbnNpb24gY2FuIGFkZCBpbnRvIHRoZSBwYW5lbDogXG4gKiBBdmF0YXIgKGhvcml6b250YWwvdmVydGljYWwsIHNoYWRlcywgdmlzaWJpbGl0eSBvZiB1c2VybmFtZSBhbmQgaG9zdG5hbWUpIFxuICogUHJpbWFyeSBidXR0b25zIFxuICogTVBSSVMgXG4gKiBUb3AgaW1hZ2UgKGNhbiBiZSBZb3VyIG93biBpbWFnZSBmcm9tIHN5c3RlbSkgIiwKICAidmVyc2lvbiI6IDE3LAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIgp9Cg=="}, "42": {"version": "17", "sha256": "0a3i784bnzi3fc78dic8mikzplh7w8jjjcmjh5i32b6aa1mh7kij", "metadata": "ewogICJ1dWlkIjogImF2YXRhckBwYXdlbC5zd2lzemN6LmNvbSIsCiAgIm5hbWUiOiAiQXZhdGFyIiwKICAiZGVzY3JpcHRpb24iOiAiVGhlIEF2YXRhciBFeHRlbnNpb24gY2FuIGFkZCBpbnRvIHRoZSBwYW5lbDogXG4gKiBBdmF0YXIgKGhvcml6b250YWwvdmVydGljYWwsIHNoYWRlcywgdmlzaWJpbGl0eSBvZiB1c2VybmFtZSBhbmQgaG9zdG5hbWUpIFxuICogUHJpbWFyeSBidXR0b25zIFxuICogTVBSSVMgXG4gKiBUb3AgaW1hZ2UgKGNhbiBiZSBZb3VyIG93biBpbWFnZSBmcm9tIHN5c3RlbSkgIiwKICAidmVyc2lvbiI6IDE3LAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Bhd2Vsc3dpc3pjei9BdmF0YXItR25vbWUtU2hlbGwtRXh0ZW5zaW9uIgp9Cg=="}}} , {"uuid": "default-workspace@mateusrodcosta.com", "name": "Default Workspace", "pname": "default-workspace", "description": "Switches to the specified workspace on login.\nUseful for fixed number of workspace setups where the first workspace isn't the main one.", "link": "https://extensions.gnome.org/extension/4783/default-workspace/", "shell_version_map": {"40": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "05s1bzh917vv3j7xfx2gljwfzxkb9lsvp8zgcgch75hfvywvpgb9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN3aXRjaGVzIHRvIHRoZSBzcGVjaWZpZWQgd29ya3NwYWNlIG9uIGxvZ2luLlxuVXNlZnVsIGZvciBmaXhlZCBudW1iZXIgb2Ygd29ya3NwYWNlIHNldHVwcyB3aGVyZSB0aGUgZmlyc3Qgd29ya3NwYWNlIGlzbid0IHRoZSBtYWluIG9uZS4iLAogICJuYW1lIjogIkRlZmF1bHQgV29ya3NwYWNlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9NYXRldXNSb2RDb3N0YS9nbm9tZS1zaGVsbC1leHRlbnNpb24tZGVmYXVsdC13b3Jrc3BhY2UiLAogICJ1dWlkIjogImRlZmF1bHQtd29ya3NwYWNlQG1hdGV1c3JvZGNvc3RhLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "alt-mouse@eexpss.gmail.com", "name": "Alt Mouse", "pname": "alt-mouse", "description": "* Alt + Mouse control window\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 in one place\n- adds ws switcher Wraparoud and Ignore Last (empty) Workspace options\n- allows to disable or customize switcher popup\n- allows adding content to the workspace switcher popup - Workspace Name, Current Application Name, Workspace Index\n- ws switcher popup appearance customization includes position on screen, timings, size, colors , orientation", "link": "https://extensions.gnome.org/extension/4788/workspace-switcher-manager/", "shell_version_map": {"38": {"version": "7", "sha256": "0395pbs962l7zf7bcfr4wdqi897w0vz48v4qj46b7wdn7f9akvvk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "0395pbs962l7zf7bcfr4wdqi897w0vz48v4qj46b7wdn7f9akvvk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0395pbs962l7zf7bcfr4wdqi897w0vz48v4qj46b7wdn7f9akvvk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "0395pbs962l7zf7bcfr4wdqi897w0vz48v4qj46b7wdn7f9akvvk", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgaW4gb25lIHBsYWNlXG4tIGFkZHMgd3Mgc3dpdGNoZXIgV3JhcGFyb3VkIGFuZCBJZ25vcmUgTGFzdCAoZW1wdHkpIFdvcmtzcGFjZSBvcHRpb25zXG4tIGFsbG93cyB0byBkaXNhYmxlIG9yIGN1c3RvbWl6ZSBzd2l0Y2hlciBwb3B1cFxuLSBhbGxvd3MgYWRkaW5nIGNvbnRlbnQgdG8gdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCAtIFdvcmtzcGFjZSBOYW1lLCBDdXJyZW50IEFwcGxpY2F0aW9uIE5hbWUsIFdvcmtzcGFjZSBJbmRleFxuLSB3cyBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"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", "link": "https://extensions.gnome.org/extension/4788/workspace-switcher-manager/", "shell_version_map": {"38": {"version": "7", "sha256": "13bkgdrf5pdqj6w63adn4hhjqi6f2bilppfwrbr4g909ci8qsfg5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "13bkgdrf5pdqj6w63adn4hhjqi6f2bilppfwrbr4g909ci8qsfg5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "13bkgdrf5pdqj6w63adn4hhjqi6f2bilppfwrbr4g909ci8qsfg5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "13bkgdrf5pdqj6w63adn4hhjqi6f2bilppfwrbr4g909ci8qsfg5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCB1c2VmdWwhIEN1c3RvbWl6ZSB5b3VyIHdvcmtzcGFjZSBzd2l0Y2hlciBiZWhhdmlvciBhbmQgdGhlIGNvbnRlbnQsIGRpbWVuc2lvbnMsIHBvc2l0aW9uLCBvcmllbnRhdGlvbiBhbmQgY29sb3JzIG9mIGl0cyBwb3B1cCBpbmRpY2F0b3IuXG5cbi0gYWxsIEdOT01FIHdvcmtzcGFjZSByZWxhdGVkIG9wdGlvbnMgYXQgb25lIHBsYWNlXG4tIGFsbG93cyB0byBzd2l0Y2ggd29ya3NwYWNlcyBvcmllbnRhdGlvbiB0byBob3Jpem9udGFsIG9yIHZlcnRpY2FsXG4tIGFkZHMgd29ya3NwYWNlIHN3aXRjaGVyICdXcmFwYXJvdWQnIGFuZCAnSWdub3JlIExhc3QgKGVtcHR5KSBXb3Jrc3BhY2UnIG9wdGlvbnNcbi0gYWxsb3dzIHRvIGRpc2FibGUgb3IgY3VzdG9taXplIHN3aXRjaGVyIHBvcHVwXG4tIGFsbG93cyBhZGRpbmcgY29udGVudCB0byB0aGUgd29ya3NwYWNlIHN3aXRjaGVyIHBvcHVwIC0gV29ya3NwYWNlIE5hbWUsIEN1cnJlbnQgQXBwbGljYXRpb24gTmFtZSwgV29ya3NwYWNlIEluZGV4XG4tIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cCBhcHBlYXJhbmNlIGN1c3RvbWl6YXRpb24gaW5jbHVkZXMgcG9zaXRpb24gb24gc2NyZWVuLCB0aW1pbmdzLCBzaXplLCBjb2xvcnMgLCBvcmllbnRhdGlvbiIsCiAgImdldHRleHQtZG9tYWluIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyIiwKICAibmFtZSI6ICJXb3Jrc3BhY2UgU3dpdGNoZXIgTWFuYWdlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy53b3Jrc3BhY2Utc3dpdGNoZXItbWFuYWdlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvd29ya3NwYWNlLXN3aXRjaGVyLW1hbmFnZXIiLAogICJ1dWlkIjogIndvcmtzcGFjZS1zd2l0Y2hlci1tYW5hZ2VyQEctZEguZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"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": "6", "sha256": "0yrrh10n7nkj8x1kmsndqlwcv5crad77a52vmq1xbcb24m3aswgp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWV0YWwwMzMyNi9nbm9tZS1mcmVxdWVuY3ktYm9vc3Qtc3dpdGNoIiwKICAidXVpZCI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAidmVyc2lvbiI6IDYKfQ=="}}} -, {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Fork of Pop COSMIC: Binds Pop Launcher on Super-Key when Pop COSMIC Extension is disabled", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {"38": {"version": "4", "sha256": "004h856a0mb8d4s6pqjbk6k855pnpig555f00wazgivgscv7x2r3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA0Cn0="}, "40": {"version": "4", "sha256": "004h856a0mb8d4s6pqjbk6k855pnpig555f00wazgivgscv7x2r3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA0Cn0="}, "41": {"version": "4", "sha256": "004h856a0mb8d4s6pqjbk6k855pnpig555f00wazgivgscv7x2r3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA0Cn0="}, "42": {"version": "4", "sha256": "004h856a0mb8d4s6pqjbk6k855pnpig555f00wazgivgscv7x2r3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvcG9wLWxhdW5jaGVyLXN1cGVyLWtleSIsCiAgInV1aWQiOiAicG9wLWxhdW5jaGVyLXN1cGVyLWtleUBNYW5lTGlwcGVydCIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "freq-boost-switch@metal03326", "name": "Frequency Boost Switch", "pname": "frequency-boost-switch", "description": "Add a toggle to enable/disable CPU frequency boost in Gnome Power Profiles menu.", "link": "https://extensions.gnome.org/extension/4792/frequency-boost-switch/", "shell_version_map": {"41": {"version": "6", "sha256": "0yrrh10n7nkj8x1kmsndqlwcv5crad77a52vmq1xbcb24m3aswgp", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWV0YWwwMzMyNi9nbm9tZS1mcmVxdWVuY3ktYm9vc3Qtc3dpdGNoIiwKICAidXVpZCI6ICJmcmVxLWJvb3N0LXN3aXRjaEBtZXRhbDAzMzI2IiwKICAidmVyc2lvbiI6IDYKfQ=="}, "42": {"version": "8", "sha256": "0ldkfawgpdzzicr7ja1v1lyjg38pw0mh2i91gm3bdf9wxln4d6j7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIHRvZ2dsZSB0byBlbmFibGUvZGlzYWJsZSBDUFUgZnJlcXVlbmN5IGJvb3N0IGluIEdub21lIFBvd2VyIFByb2ZpbGVzIG1lbnUuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZnJlcS1ib29zdC1zd2l0Y2hAbWV0YWwwMzMyNiIsCiAgIm5hbWUiOiAiRnJlcXVlbmN5IEJvb3N0IFN3aXRjaCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5mcmVxLWJvb3N0LXN3aXRjaCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0bGFiLmNvbS9tZXRhbDAzMzI2L2dub21lLWZyZXF1ZW5jeS1ib29zdC1zd2l0Y2giLAogICJ1dWlkIjogImZyZXEtYm9vc3Qtc3dpdGNoQG1ldGFsMDMzMjYiLAogICJ2ZXJzaW9uIjogOAp9"}}} +, {"uuid": "pop-launcher-super-key@ManeLippert", "name": "Pop Launcher Super-Key", "pname": "pop-launcher-super-key", "description": "Fork of Pop COSMIC: Binds Pop Launcher on Super-Key when Pop COSMIC Extension is disabled", "link": "https://extensions.gnome.org/extension/4797/pop-launcher-super-key/", "shell_version_map": {"38": {"version": "4", "sha256": "0j2ydxh7nv3bq7y7a48rw0hrwnckf9nfqpwscpsl16wv1cz30r7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJ1dWlkIjogInBvcC1sYXVuY2hlci1zdXBlci1rZXlATWFuZUxpcHBlcnQiLAogICJ2ZXJzaW9uIjogNAp9"}, "40": {"version": "4", "sha256": "0j2ydxh7nv3bq7y7a48rw0hrwnckf9nfqpwscpsl16wv1cz30r7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJ1dWlkIjogInBvcC1sYXVuY2hlci1zdXBlci1rZXlATWFuZUxpcHBlcnQiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0j2ydxh7nv3bq7y7a48rw0hrwnckf9nfqpwscpsl16wv1cz30r7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJ1dWlkIjogInBvcC1sYXVuY2hlci1zdXBlci1rZXlATWFuZUxpcHBlcnQiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0j2ydxh7nv3bq7y7a48rw0hrwnckf9nfqpwscpsl16wv1cz30r7j", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIENPU01JQzogQmluZHMgUG9wIExhdW5jaGVyIG9uIFN1cGVyLUtleSB3aGVuIFBvcCBDT1NNSUMgRXh0ZW5zaW9uIGlzIGRpc2FibGVkIiwKICAibmFtZSI6ICJQb3AgTGF1bmNoZXIgU3VwZXItS2V5IiwKICAib3JpZ2luYWwtYXV0aG9ycyI6ICJTeXN0ZW03NiIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5wb3AtbGF1bmNoZXItc3VwZXIta2V5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTWFuZUxpcHBlcnQvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLXBvcC1sYXVuY2hlci1zdXBlci1rZXkiLAogICJ1dWlkIjogInBvcC1sYXVuY2hlci1zdXBlci1rZXlATWFuZUxpcHBlcnQiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"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": "11", "sha256": "1m4d92v7ym8as25kpm3l00dnf5rzp36m2p9jdjmbk3i5xk1dk61a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovdGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "1m4d92v7ym8as25kpm3l00dnf5rzp36m2p9jdjmbk3i5xk1dk61a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZS9EaXNhYmxlIGJhdHRlcnkgdGhyZXNob2xkIG9uIExlbm92byBUaGlua3BhZCBsYXB0b3BzLlxuXG5JZiB5b3UgbWFpbmx5IHVzZSB0aGUgc3lzdGVtIHdpdGggdGhlIEFDIHBvd2VyIGFkYXB0ZXIgY29ubmVjdGVkIGFuZCBvbmx5IHVzZSB0aGUgYmF0dGVyeSBzcG9yYWRpY2FsbHksIHlvdSBjYW4gaW5jcmVhc2UgYmF0dGVyeSBsaWZlIGJ5IHNldHRpbmcgdGhlIG1heGltdW0gY2hhcmdlIHZhbHVlIHRvIGxlc3MgdGhhbiAxMDAlLiBUaGlzIGlzIHVzZWZ1bCBiZWNhdXNlIGJhdHRlcmllcyB0aGF0IGFyZSB1c2VkIHNwb3JhZGljYWxseSBoYXZlIGEgbG9uZ2VyIGxpZmVzcGFuIHdoZW4ga2VwdCBhdCBsZXNzIHRoYW4gZnVsbCBjaGFyZ2UuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGRAbWFyY29zZGFsdmFyZXoub3JnIiwKICAibmFtZSI6ICJUaGlua3BhZCBCYXR0ZXJ5IFRocmVzaG9sZCIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy50aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vbWFyY29zZGFsdmFyZXovdGhpbmtwYWQtYmF0dGVyeS10aHJlc2hvbGQtZXh0ZW5zaW9uIiwKICAidXVpZCI6ICJ0aGlua3BhZC1iYXR0ZXJ5LXRocmVzaG9sZEBtYXJjb3NkYWx2YXJlei5vcmciLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"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": "4", "sha256": "13mc18sds1z0ij1x8plx5d4b4mk4zkwx3hngh3z2ib7db8la7wdw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgR05PTUUgc2hlbGwgZXh0ZW5zaW9uIHRvIGtlZXAgdGhlIG9sZCB0b3BiYXIgY29ybmVycywgd2hpY2ggd2VyZSByZW1vdmVkIGZvciBHTk9NRSA0Mi4gSXQgYWxzbyBhbGxvd3MgeW91IHRvIGN1c3RvbWl6ZSB0aGUgcm91bmRlZCBjb3JuZXJzLCBldmVuIGlmIHlvdSB1c2UgR05PTUUgNDAgb3IgNDEuXG5cbkl0IGlzIHdpZGVseSBiYXNlZCBvbiBhbHJlYWR5IGV4aXN0aW5nIGdub21lLXNoZWxsIGNvZGUsIGFuZCBvbiBhIG1lcmdlIHJlcXVlc3QgYnkgQWxleGFuZGVyIE1pa2hheWxlbmtvOiBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZ25vbWUtc2hlbGwvLS9tZXJnZV9yZXF1ZXN0cy8xMzI4IiwKICAibmFtZSI6ICJQYW5lbCBjb3JuZXJzIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnBhbmVsLWNvcm5lcnMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXVuZXR4L3BhbmVsLWNvcm5lcnMiLAogICJ1dWlkIjogInBhbmVsLWNvcm5lcnNAYXVuZXR4IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} @@ -682,7 +682,7 @@ , {"uuid": "cairo@eexpss.gmail.com", "name": "Cairo Clock", "pname": "cairo-clock", "description": "Cairo Clock. \n Click the clock face to set the alarm, click the center circle to enable the alarm.\n Alt + click on main icon, background of icon become green, this enable Popup per hour function. \n Ctrl + click on main icon, can test the alarm effect.\n In case of alarm, the clock will swing dynamically.", "link": "https://extensions.gnome.org/extension/4809/cairo-clock/", "shell_version_map": {"40": {"version": "17", "sha256": "161nflaca6l269m4v0g62yci3ffbahfk0id9f0215wqgnm1paap9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "41": {"version": "17", "sha256": "161nflaca6l269m4v0g62yci3ffbahfk0id9f0215wqgnm1paap9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}, "42": {"version": "17", "sha256": "161nflaca6l269m4v0g62yci3ffbahfk0id9f0215wqgnm1paap9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNhaXJvIENsb2NrLiBcbiBDbGljayB0aGUgY2xvY2sgZmFjZSB0byBzZXQgdGhlIGFsYXJtLCBjbGljayB0aGUgY2VudGVyIGNpcmNsZSB0byBlbmFibGUgdGhlIGFsYXJtLlxuIEFsdCArIGNsaWNrIG9uIG1haW4gaWNvbiwgYmFja2dyb3VuZCBvZiBpY29uIGJlY29tZSBncmVlbiwgdGhpcyBlbmFibGUgUG9wdXAgcGVyIGhvdXIgZnVuY3Rpb24uIFxuIEN0cmwgKyBjbGljayBvbiBtYWluIGljb24sIGNhbiB0ZXN0IHRoZSBhbGFybSBlZmZlY3QuXG4gSW4gY2FzZSBvZiBhbGFybSwgdGhlIGNsb2NrIHdpbGwgc3dpbmcgZHluYW1pY2FsbHkuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiY2Fpcm8tY2xvY2siLAogICJuYW1lIjogIkNhaXJvIENsb2NrIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ25vbWUtc2hlbGwtY2Fpcm8iLAogICJ1dWlkIjogImNhaXJvQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMTcKfQ=="}}} , {"uuid": "WallpaperSwitcher@Rishu", "name": "Wallpaper Switcher", "pname": "wallpaper-switcher", "description": "Extension to automatically Change wallpaper after a given interval", "link": "https://extensions.gnome.org/extension/4812/wallpaper-switcher/", "shell_version_map": {"38": {"version": "3", "sha256": "0a1zkl3dfdbql6d1n7f2l2xi77p8f6vq1f96gyny17vxpjbhghbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhdXRvbWF0aWNhbGx5IENoYW5nZSB3YWxscGFwZXIgYWZ0ZXIgYSBnaXZlbiBpbnRlcnZhbCIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "0a1zkl3dfdbql6d1n7f2l2xi77p8f6vq1f96gyny17vxpjbhghbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhdXRvbWF0aWNhbGx5IENoYW5nZSB3YWxscGFwZXIgYWZ0ZXIgYSBnaXZlbiBpbnRlcnZhbCIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0a1zkl3dfdbql6d1n7f2l2xi77p8f6vq1f96gyny17vxpjbhghbv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhdXRvbWF0aWNhbGx5IENoYW5nZSB3YWxscGFwZXIgYWZ0ZXIgYSBnaXZlbiBpbnRlcnZhbCIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM0IiwKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmlzaHVpbmZpbml0eS9XYWxscGFwZXJTd2l0Y2hlciIsCiAgInV1aWQiOiAiV2FsbHBhcGVyU3dpdGNoZXJAUmlzaHUiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "7", "sha256": "1sndilvviid6jnlb593wnbs2sicp6c2jl8ppa510yvvsrna0n95c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhdXRvbWF0aWNhbGx5IENoYW5nZSB3YWxscGFwZXIgYWZ0ZXIgYSBnaXZlbiBpbnRlcnZhbCIsCiAgIm5hbWUiOiAiV2FsbHBhcGVyIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jpc2h1aW5maW5pdHkvV2FsbHBhcGVyU3dpdGNoZXIiLAogICJ1dWlkIjogIldhbGxwYXBlclN3aXRjaGVyQFJpc2h1IiwKICAidmVyc2lvbiI6IDcKfQ=="}}} , {"uuid": "areustatus@carissimi.eu", "name": "AREU Status", "pname": "areu-status", "description": "Displays the number of ambulances that are in a mission in Lombardy, Italy", "link": "https://extensions.gnome.org/extension/4814/areu-status/", "shell_version_map": {"38": {"version": "2", "sha256": "1jycm5xgzp1ph4h9j9m5ki0rn5wabh6gwblc1bc3fn6bx1zplymy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vci1jYXJpc3NpbWkvYXJldS1zdGF0dXMtZ25vbWUiLAogICJ1dWlkIjogImFyZXVzdGF0dXNAY2FyaXNzaW1pLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "40": {"version": "2", "sha256": "1jycm5xgzp1ph4h9j9m5ki0rn5wabh6gwblc1bc3fn6bx1zplymy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vci1jYXJpc3NpbWkvYXJldS1zdGF0dXMtZ25vbWUiLAogICJ1dWlkIjogImFyZXVzdGF0dXNAY2FyaXNzaW1pLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "41": {"version": "2", "sha256": "1jycm5xgzp1ph4h9j9m5ki0rn5wabh6gwblc1bc3fn6bx1zplymy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIHRoZSBudW1iZXIgb2YgYW1idWxhbmNlcyB0aGF0IGFyZSBpbiBhIG1pc3Npb24gaW4gTG9tYmFyZHksIEl0YWx5IiwKICAibmFtZSI6ICJBUkVVIFN0YXR1cyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zMCIsCiAgICAiMy4zNCIsCiAgICAiMy4zMiIsCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vci1jYXJpc3NpbWkvYXJldS1zdGF0dXMtZ25vbWUiLAogICJ1dWlkIjogImFyZXVzdGF0dXNAY2FyaXNzaW1pLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "colorful-battery-indicator@aneruam", "name": "Colorful Battery Indicator", "pname": "colorful-battery-indicator", "description": "Make color of battery indicator change with level of battery charge.\n\nGNOME 42 now supported.", "link": "https://extensions.gnome.org/extension/4817/colorful-battery-indicator/", "shell_version_map": {"38": {"version": "5", "sha256": "0dymvvka5g6qliswd8jayi71y5g12fc08vdy3xyzfvv256j4sxik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UuXG5cbkdOT01FIDQyIG5vdyBzdXBwb3J0ZWQuIiwKICAibmFtZSI6ICJDb2xvcmZ1bCBCYXR0ZXJ5IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "40": {"version": "5", "sha256": "0dymvvka5g6qliswd8jayi71y5g12fc08vdy3xyzfvv256j4sxik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UuXG5cbkdOT01FIDQyIG5vdyBzdXBwb3J0ZWQuIiwKICAibmFtZSI6ICJDb2xvcmZ1bCBCYXR0ZXJ5IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "0dymvvka5g6qliswd8jayi71y5g12fc08vdy3xyzfvv256j4sxik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UuXG5cbkdOT01FIDQyIG5vdyBzdXBwb3J0ZWQuIiwKICAibmFtZSI6ICJDb2xvcmZ1bCBCYXR0ZXJ5IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "0dymvvka5g6qliswd8jayi71y5g12fc08vdy3xyzfvv256j4sxik", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UuXG5cbkdOT01FIDQyIG5vdyBzdXBwb3J0ZWQuIiwKICAibmFtZSI6ICJDb2xvcmZ1bCBCYXR0ZXJ5IEluZGljYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "colorful-battery-indicator@aneruam", "name": "Colorful Battery Indicator", "pname": "colorful-battery-indicator", "description": "Make color of battery indicator change with level of battery charge", "link": "https://extensions.gnome.org/extension/4817/colorful-battery-indicator/", "shell_version_map": {"38": {"version": "8", "sha256": "1v1l367fjzpjqsq3yb75xyly1yx10hvgndxlwn1i8rnrs5gyh2ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UiLAogICJuYW1lIjogIkNvbG9yZnVsIEJhdHRlcnkgSW5kaWNhdG9yIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "40": {"version": "8", "sha256": "1v1l367fjzpjqsq3yb75xyly1yx10hvgndxlwn1i8rnrs5gyh2ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UiLAogICJuYW1lIjogIkNvbG9yZnVsIEJhdHRlcnkgSW5kaWNhdG9yIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "41": {"version": "8", "sha256": "1v1l367fjzpjqsq3yb75xyly1yx10hvgndxlwn1i8rnrs5gyh2ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UiLAogICJuYW1lIjogIkNvbG9yZnVsIEJhdHRlcnkgSW5kaWNhdG9yIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA4Cn0="}, "42": {"version": "8", "sha256": "1v1l367fjzpjqsq3yb75xyly1yx10hvgndxlwn1i8rnrs5gyh2ry", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1ha2UgY29sb3Igb2YgYmF0dGVyeSBpbmRpY2F0b3IgY2hhbmdlIHdpdGggbGV2ZWwgb2YgYmF0dGVyeSBjaGFyZ2UiLAogICJuYW1lIjogIkNvbG9yZnVsIEJhdHRlcnkgSW5kaWNhdG9yIiwKICAic2Vzc2lvbi1tb2RlcyI6IFsKICAgICJ1c2VyIiwKICAgICJ1bmxvY2stZGlhbG9nIgogIF0sCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FuZXJ1YS9nbm9tZS1jb2xvcmZ1bC1iYXR0ZXJ5LWluZGljYXRvciIsCiAgInV1aWQiOiAiY29sb3JmdWwtYmF0dGVyeS1pbmRpY2F0b3JAYW5lcnVhbSIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "inactivity@fedeantuna.github.io", "name": "Inactivity", "pname": "inactivity", "description": "Hide Activities Button on the top panel.", "link": "https://extensions.gnome.org/extension/4818/inactivity/", "shell_version_map": {"41": {"version": "1", "sha256": "1qc16xhgp2wachcxw9ivf8r4nai2k0xj9vph8k0zvc0shwkpjzag", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkluYWN0aXZpdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmVkZWFudHVuYS9pbmFjdGl2aXR5IiwKICAidXVpZCI6ICJpbmFjdGl2aXR5QGZlZGVhbnR1bmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "4", "sha256": "0capz1lzk9kg7bxaz5ccsnlj3c3sihpxyhx1cys1gq20h76rx9b8", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgQWN0aXZpdGllcyBCdXR0b24gb24gdGhlIHRvcCBwYW5lbC4iLAogICJuYW1lIjogIkluYWN0aXZpdHkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZmVkZWFudHVuYS9pbmFjdGl2aXR5IiwKICAidXVpZCI6ICJpbmFjdGl2aXR5QGZlZGVhbnR1bmEuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} , {"uuid": "m3u8-play@eexpss.gmail.com", "name": "M3U8 Play", "pname": "m3u8-play", "description": "* M3U8 Play. Search and select to play (use `ffplay/ffmpeg`). `m3u8` files need put into `~/.local/share/m3u8-play/`", "link": "https://extensions.gnome.org/extension/4824/m3u8-play/", "shell_version_map": {"40": {"version": "7", "sha256": "0bjxq76s6p6g5gdyxlflsdkccnyaca8cicm9w7i56n7i1db6r2bn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogTTNVOCBQbGF5LiBTZWFyY2ggYW5kIHNlbGVjdCB0byBwbGF5ICh1c2UgYGZmcGxheS9mZm1wZWdgKS4gYG0zdThgIGZpbGVzIG5lZWQgcHV0IGludG8gYH4vLmxvY2FsL3NoYXJlL20zdTgtcGxheS9gIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibTN1OC1wbGF5IiwKICAibmFtZSI6ICJNM1U4IFBsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1tM3U4LXBsYXkvIiwKICAidXVpZCI6ICJtM3U4LXBsYXlAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "0bjxq76s6p6g5gdyxlflsdkccnyaca8cicm9w7i56n7i1db6r2bn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogTTNVOCBQbGF5LiBTZWFyY2ggYW5kIHNlbGVjdCB0byBwbGF5ICh1c2UgYGZmcGxheS9mZm1wZWdgKS4gYG0zdThgIGZpbGVzIG5lZWQgcHV0IGludG8gYH4vLmxvY2FsL3NoYXJlL20zdTgtcGxheS9gIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibTN1OC1wbGF5IiwKICAibmFtZSI6ICJNM1U4IFBsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1tM3U4LXBsYXkvIiwKICAidXVpZCI6ICJtM3U4LXBsYXlAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "0bjxq76s6p6g5gdyxlflsdkccnyaca8cicm9w7i56n7i1db6r2bn", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIiogTTNVOCBQbGF5LiBTZWFyY2ggYW5kIHNlbGVjdCB0byBwbGF5ICh1c2UgYGZmcGxheS9mZm1wZWdgKS4gYG0zdThgIGZpbGVzIG5lZWQgcHV0IGludG8gYH4vLmxvY2FsL3NoYXJlL20zdTgtcGxheS9gIiwKICAiZ2V0dGV4dC1kb21haW4iOiAibTN1OC1wbGF5IiwKICAibmFtZSI6ICJNM1U4IFBsYXkiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy1tM3U4LXBsYXkvIiwKICAidXVpZCI6ICJtM3U4LXBsYXlAZWV4cHNzLmdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "gnome-edge-gap@necropolina", "name": "Edge Gap", "pname": "edge-gap", "description": "add configurable-width gaps around the edge of your screen", "link": "https://extensions.gnome.org/extension/4827/edge-gap/", "shell_version_map": {"40": {"version": "3", "sha256": "12shbvqdj6834lvw23s9z4f3ayhvma363yvzga0m85x0fzs6bna5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBjb25maWd1cmFibGUtd2lkdGggZ2FwcyBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "12shbvqdj6834lvw23s9z4f3ayhvma363yvzga0m85x0fzs6bna5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBjb25maWd1cmFibGUtd2lkdGggZ2FwcyBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "12shbvqdj6834lvw23s9z4f3ayhvma363yvzga0m85x0fzs6bna5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogImFkZCBjb25maWd1cmFibGUtd2lkdGggZ2FwcyBhcm91bmQgdGhlIGVkZ2Ugb2YgeW91ciBzY3JlZW4iLAogICJuYW1lIjogIkVkZ2UgR2FwIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmdub21lLWVkZ2UtZ2FwIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbmVjcm9wb2xpbmEvZ25vbWUtZWRnZS1nYXAiLAogICJ1dWlkIjogImdub21lLWVkZ2UtZ2FwQG5lY3JvcG9saW5hIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} @@ -708,10 +708,10 @@ , {"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": "10", "sha256": "0j2316f3l4v1vqc2pxdivkbj90flcr1irczw50rp7wvmhhfm74mc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "40": {"version": "10", "sha256": "0j2316f3l4v1vqc2pxdivkbj90flcr1irczw50rp7wvmhhfm74mc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "41": {"version": "10", "sha256": "0j2316f3l4v1vqc2pxdivkbj90flcr1irczw50rp7wvmhhfm74mc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}, "42": {"version": "10", "sha256": "0j2316f3l4v1vqc2pxdivkbj90flcr1irczw50rp7wvmhhfm74mc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTAKfQ=="}}} +, {"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": "11", "sha256": "0mswrakibw50gmm6libgjdmll24k3s04zv0lvw73n7q269qzrwsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "40": {"version": "11", "sha256": "0mswrakibw50gmm6libgjdmll24k3s04zv0lvw73n7q269qzrwsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "41": {"version": "11", "sha256": "0mswrakibw50gmm6libgjdmll24k3s04zv0lvw73n7q269qzrwsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}, "42": {"version": "11", "sha256": "0mswrakibw50gmm6libgjdmll24k3s04zv0lvw73n7q269qzrwsv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgc2hvdyBhbmQgbG9hZCBFYXN5RWZmZWN0cyBQcmVzZXRzIiwKICAibmFtZSI6ICJFYXN5RWZmZWN0cyBQcmVzZXQgU2VsZWN0b3IiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS91bHZpbGxlL2VlcHJlc2V0c2VsZWN0b3IiLAogICJ1dWlkIjogImVlcHJlc2V0c2VsZWN0b3JAdWx2aWxsZS5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMTEKfQ=="}}} , {"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", "link": "https://extensions.gnome.org/extension/4919/weather/", "shell_version_map": {"40": {"version": "3", "sha256": "0a9sgmpmj0xr9b2bqp0q11n4zzs47vfnbk24428b3g024cfhya75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXkiLAogICJuYW1lIjogIldlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy13ZWF0aGVyIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0a9sgmpmj0xr9b2bqp0q11n4zzs47vfnbk24428b3g024cfhya75", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXkiLAogICJuYW1lIjogIldlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9lZXhwcmVzcy9ncy13ZWF0aGVyIiwKICAidXVpZCI6ICJ3ZWF0aGVyQGVleHBzcy5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "10", "sha256": "0sqqdjhg6i67v8zr7zmf5kflba2vnyk6hnyxkk896sc1rsx8lr16", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGlvbiBXZWF0aGVyLiBcbk1vdXNlIDE6IHNob3cgd2VhdGhlclxuTW91c2UgMjogcmVmcmVzaCB3ZWF0aGVyXG5Nb3VzZSAzOiBkaXNtaXNzXG5TY3JvbGxVcDogaW5jcmVhc2UgZGF5XG5TY3JvbGxEb3duOiBkZWNyZWFzZSBkYXkiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ3ZWF0aGVyIiwKICAibmFtZSI6ICJXZWF0aGVyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLndlYXRoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZWV4cHJlc3MvZ3Mtd2VhdGhlciIsCiAgInV1aWQiOiAid2VhdGhlckBlZXhwc3MuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDEwCn0="}}} +, {"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": "3", "sha256": "0wb4s9h3abygrdj2ynv16wc2fk0k7h9d1q97vd2kzxb20rhb87i5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWFyb25CUGFkZW4vd2hpdGVib3JkZXItYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidXVpZCI6ICJ3aGl0ZWJvcmRlckBhYXJvbmJwYWRlbi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "40": {"version": "3", "sha256": "0wb4s9h3abygrdj2ynv16wc2fk0k7h9d1q97vd2kzxb20rhb87i5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWFyb25CUGFkZW4vd2hpdGVib3JkZXItYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidXVpZCI6ICJ3aGl0ZWJvcmRlckBhYXJvbmJwYWRlbi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "41": {"version": "3", "sha256": "0wb4s9h3abygrdj2ynv16wc2fk0k7h9d1q97vd2kzxb20rhb87i5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWFyb25CUGFkZW4vd2hpdGVib3JkZXItYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidXVpZCI6ICJ3aGl0ZWJvcmRlckBhYXJvbmJwYWRlbi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "0wb4s9h3abygrdj2ynv16wc2fk0k7h9d1q97vd2kzxb20rhb87i5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRyYXcgYSB3aGl0ZSBib3JkZXIgYXJvdW5kIHRoZSBkZXNrdG9wIHRvIGVuYWJsZSAoaG9wZWZ1bGx5KSB1bml2ZXJzYWwgYXBwbGljYXRpb24gc3VwcG9ydCBmb3IgdGhlIFNpbmRlbiBMaWdodGd1bi4iLAogICJuYW1lIjogIldoaXRlIEJvcmRlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vQWFyb25CUGFkZW4vd2hpdGVib3JkZXItYWFyb25icGFkZW4uZ21haWwuY29tIiwKICAidXVpZCI6ICJ3aGl0ZWJvcmRlckBhYXJvbmJwYWRlbi5nbWFpbC5jb20iLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"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. Works with Spotify, VLC, Rhythmbox, Firefox, Chromium based browsers and (probably) any mpris compatible player.", "link": "https://extensions.gnome.org/extension/4928/mpris-label/", "shell_version_map": {"38": {"version": "1", "sha256": "1nrnb41gzbw691r3c5malpsfzfhgq551gg3c3pff3f9wcrc5bc3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBXb3JrcyB3aXRoIFNwb3RpZnksIFZMQywgUmh5dGhtYm94LCBGaXJlZm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "40": {"version": "1", "sha256": "1nrnb41gzbw691r3c5malpsfzfhgq551gg3c3pff3f9wcrc5bc3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBXb3JrcyB3aXRoIFNwb3RpZnksIFZMQywgUmh5dGhtYm94LCBGaXJlZm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "1nrnb41gzbw691r3c5malpsfzfhgq551gg3c3pff3f9wcrc5bc3c", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIGEgbGFiZWwgaW4gdGhlIHRvcCBiYXIgd2l0aCBtZXRhZGF0YSBmcm9tIGFuIG1wcmlzIGNvbXBhdGlibGUgc291cmNlLiBXb3JrcyB3aXRoIFNwb3RpZnksIFZMQywgUmh5dGhtYm94LCBGaXJlZm94LCBDaHJvbWl1bSBiYXNlZCBicm93c2VycyBhbmQgKHByb2JhYmx5KSBhbnkgbXByaXMgY29tcGF0aWJsZSBwbGF5ZXIuIiwKICAibmFtZSI6ICJNcHJpcyBMYWJlbCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiMy4zNiIsCiAgICAiMy4zOCIsCiAgICAiNDAiLAogICAgIjQxIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vTW9vbi0weGZmL2dub21lLW1wcmlzLWxhYmVsIiwKICAidXVpZCI6ICJtcHJpc0xhYmVsQG1vb24tMHhmZi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} @@ -724,14 +724,14 @@ , {"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": "15", "sha256": "12dyjw7xn08fqzlwcqb78rdiw560v73ankdx0427bs350ac8cs5r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBjbGlwYm9hcmQgbWFuYWdlci4iLAogICJuYW1lIjogIkNsaXBtYW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvQ2xpcG1hbiIsCiAgInV1aWQiOiAiY2xpcG1hbkBwb3Bvdjg5NS51a3IubmV0IiwKICAidmVyc2lvbiI6IDE1Cn0="}}} , {"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.\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": "1", "sha256": "1v0axd614hrrrzqps6nkg9daki8fcykfd20w201gxvdnmrvfspkc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi5cblxuTW9yZSBkZXRhaWxzOiBodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2h1czNoL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZG5ldC1mcmllbmRzLXBhbmVsIiwKICAidXVpZCI6ICJkZG5ldC1mcmllbmRzLXBhbmVsQGh1czNoIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "41": {"version": "1", "sha256": "1v0axd614hrrrzqps6nkg9daki8fcykfd20w201gxvdnmrvfspkc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkF1dG9tYXRpY2FsbHkgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGFuZCBqb2luIHRoZW0gZnJvbSB5b3VyIHRvcCBiYXIuXG5cblRoaXMgZXh0ZW5zaW9uIHdpbGwgY2hlY2sgZm9yIG9ubGluZSBERE5ldCBmcmllbmRzIGV2ZXJ5IDEgbWludXRlIGFuZCBzaG93IHRoZWlyIGNvdW50IGluIHlvdXIgdG9wIGJhci4gWW91IGNhbiBjbGljayB0aGUgaW5kaWNhdG9yIHRvIGV4cGFuZCB0aGUgcGFuZWwgYW5kIHNlZSBtb3JlIGRldGFpbHMgbGlrZSB3aGF0IG1hcCBlYWNoIGZyaWVuZCBpcyBwbGF5aW5nLCB5b3UgY2FuIGNsaWNrIG9uIGEgZnJpZW5kIGxpc3QgaXRlbSB0byBsYXVuY2ggdGhlIGdhbWUgYW5kIGNvbm5lY3QgdG8gdGhlIHNlcnZlciB0aGV5IGFyZSBpbi5cblxuTW9yZSBkZXRhaWxzOiBodHRwczovL2dpdGh1Yi5jb20vaHVzM2gvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWRkbmV0LWZyaWVuZHMtcGFuZWwiLAogICJuYW1lIjogIkRETmV0IEZyaWVuZHMgUGFuZWwiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2h1czNoL2dub21lLXNoZWxsLWV4dGVuc2lvbi1kZG5ldC1mcmllbmRzLXBhbmVsIiwKICAidXVpZCI6ICJkZG5ldC1mcmllbmRzLXBhbmVsQGh1czNoIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} -, {"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": "4", "sha256": "09chmx04cxs42zpz8i7535nhggd681g11zkawwagq225gsma0yls", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gZ2xvYmFsIGRhcmsgYW5kIGxpZ2h0IHRoZW1lcy4gRm9yIEdOT01FIFNoZWxsIDQyKy4iLAogICJuYW1lIjogIkxpZ2h0L0RhcmsgVGhlbWUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC90aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAidGhlbWUtc3dpdGNoZXJAZnRoeCIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"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": "5", "sha256": "14nfjcls9fj0my923jyiznlq482r1apgz9q83idz9b0qr50fi3ah", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkJ1dHRvbiBpbiBwYW5lbDogc3dpdGNoIGJldHdlZW4gZ2xvYmFsIGRhcmsgYW5kIGxpZ2h0IHRoZW1lcy4gRm9yIEdOT01FIFNoZWxsIDQyKy4iLAogICJuYW1lIjogIkxpZ2h0L0RhcmsgVGhlbWUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC90aGVtZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAidGhlbWUtc3dpdGNoZXJAZnRoeCIsCiAgInZlcnNpb24iOiA1Cn0="}}} , {"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": "2", "sha256": "153c6gwlgpi6lhsd2ym9qhcp6add58za3i2djdqj39n9zx0q1gy2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzZWxpZ2VyL3dpbmRvdy1jYWxscy1leHRlbmRlZCIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzLWV4dGVuZGVkQGhzZWxpZ2VyLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}, "42": {"version": "2", "sha256": "153c6gwlgpi6lhsd2ym9qhcp6add58za3i2djdqj39n9zx0q1gy2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBuZXcgZGJ1cyBjYWxsIGZvciB3aW5kb3dzIHRvIGdldCB3aW5kb3dzIGxpc3QgYW5kIHNvbWUgb2YgdGhlaXJzIHByb3BlcnRpZXMsIHBsdXMgZGV0YWlscyBvbiB3aW5kb3cgdW5kZXIgZm9jdXMuIiwKICAibmFtZSI6ICJXaW5kb3cgQ2FsbHMgRXh0ZW5kZWQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzZWxpZ2VyL3dpbmRvdy1jYWxscy1leHRlbmRlZCIsCiAgInV1aWQiOiAid2luZG93LWNhbGxzLWV4dGVuZGVkQGhzZWxpZ2VyLmV1IiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"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": "2", "sha256": "01689ldy0ghjj75i5pncb4nhl8w4yzwj0pb8y5q8wkiirv7h0cxy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01lZGFpUDkwL2dub21lLXN1ci1jbG9jayIsCiAgInV1aWQiOiAiU3VyX0Nsb2NrQG1lZGFpcDkwLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "01689ldy0ghjj75i5pncb4nhl8w4yzwj0pb8y5q8wkiirv7h0cxy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01lZGFpUDkwL2dub21lLXN1ci1jbG9jayIsCiAgInV1aWQiOiAiU3VyX0Nsb2NrQG1lZGFpcDkwLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "01689ldy0ghjj75i5pncb4nhl8w4yzwj0pb8y5q8wkiirv7h0cxy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1vdmUgdGhlIGNsb2NrIHRvIHRoZSBsZWZ0IG9yIHRoZSByaWdodCBvZiB0aGUgc3lzdGVtIGluZGljYXRvcnMgbGlrZSBpbiBNYWNPcy4iLAogICJuYW1lIjogIlN1ciBDbG9jayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01lZGFpUDkwL2dub21lLXN1ci1jbG9jayIsCiAgInV1aWQiOiAiU3VyX0Nsb2NrQG1lZGFpcDkwLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "disable-workspace-switcher@jbradaric.me", "name": "Disable Workspace Switcher", "pname": "disable-workspace-switcher", "description": "Disable the workspace switcher popup.", "link": "https://extensions.gnome.org/extension/4980/disable-workspace-switcher/", "shell_version_map": {"42": {"version": "1", "sha256": "0wpkcaqnlwg5065ygmmqiai9vqwwwl3kd22zhg2s6kcxz3b42is6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc2FibGUgdGhlIHdvcmtzcGFjZSBzd2l0Y2hlciBwb3B1cC4iLAogICJuYW1lIjogIkRpc2FibGUgV29ya3NwYWNlIFN3aXRjaGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2picmFkYXJpYy9kaXNhYmxlLXdvcmtzcGFjZS1zd2l0Y2hlciIsCiAgInV1aWQiOiAiZGlzYWJsZS13b3Jrc3BhY2Utc3dpdGNoZXJAamJyYWRhcmljLm1lIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} , {"uuid": "nextcloud-folder@cosinus.org", "name": "Nextcloud Folder", "pname": "nextcloud-folder", "description": "Simple and lightweight GNOME 42+ extension to open Nextcloud folder in one click.", "link": "https://extensions.gnome.org/extension/4983/nextcloud-folder/", "shell_version_map": {"42": {"version": "4", "sha256": "1cdkfd03y0bfh09m40zikl51mcli311sarjqicnnqw6bzj1zqskj", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBhbmQgbGlnaHR3ZWlnaHQgR05PTUUgNDIrIGV4dGVuc2lvbiB0byBvcGVuIE5leHRjbG91ZCBmb2xkZXIgaW4gb25lIGNsaWNrLiIsCiAgIm5hbWUiOiAiTmV4dGNsb3VkIEZvbGRlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5uZXh0Y2xvdWQtZm9sZGVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2FsZXNjZGIvbmV4dGNsb3VkLWZvbGRlciIsCiAgInV1aWQiOiAibmV4dGNsb3VkLWZvbGRlckBjb3NpbnVzLm9yZyIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "php-laravel-valet@rahulhaque", "name": "PHP Laravel Valet", "pname": "php-laravel-valet", "description": "A PHP Laravel Valet status indicator and manager.", "link": "https://extensions.gnome.org/extension/4985/php-laravel-valet/", "shell_version_map": {"40": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}, "41": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}, "42": {"version": "4", "sha256": "0h1hfh8i6sqzi0dy0sbh35s7flncqwpsxha4yr1bgrmg2a0gshzw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgUEhQIExhcmF2ZWwgVmFsZXQgc3RhdHVzIGluZGljYXRvciBhbmQgbWFuYWdlci4iLAogICJuYW1lIjogIlBIUCBMYXJhdmVsIFZhbGV0IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcmFodWxoYXF1ZS9waHAtbGFyYXZlbC12YWxldC1nbm9tZS1zaGVsbC1leHRlbnNpb24iLAogICJ1dWlkIjogInBocC1sYXJhdmVsLXZhbGV0QHJhaHVsaGFxdWUiLAogICJ2ZXJzaW9uIjogNAp9"}}} , {"uuid": "Home-Server@sven.kramer", "name": "Home-Server", "pname": "home-server", "description": "A simple Indicator that shows my home-server status (online / offline) on the main panel. Furthermore a wake on lan can be triggered. For WOL functionality, its necessary that you have 'wakeonlan' installed.", "link": "https://extensions.gnome.org/extension/4989/home-server/", "shell_version_map": {"38": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "05cwv23w1438pg38ixhrvm360g3s11vrl8wqk84ai2xgydy94z2f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIEluZGljYXRvciB0aGF0IHNob3dzIG15IGhvbWUtc2VydmVyIHN0YXR1cyAob25saW5lIC8gb2ZmbGluZSkgb24gdGhlIG1haW4gcGFuZWwuIEZ1cnRoZXJtb3JlIGEgd2FrZSBvbiBsYW4gY2FuIGJlIHRyaWdnZXJlZC4gRm9yIFdPTCBmdW5jdGlvbmFsaXR5LCBpdHMgbmVjZXNzYXJ5IHRoYXQgeW91IGhhdmUgJ3dha2VvbmxhbicgaW5zdGFsbGVkLiIsCiAgIm1pbm9yIjogMSwKICAibmFtZSI6ICJIb21lLVNlcnZlciIsCiAgInJldmlzaW9uIjogMSwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLkhvbWUtU2VydmVyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL3d3dy5zdmVuLWtyYW1lci5ldS9saW51eC9nbm9tZS1zaGVsbC1leHRlbnNpb24vaG9tZS1zZXJ2ZXIvIiwKICAidXVpZCI6ICJIb21lLVNlcnZlckBzdmVuLmtyYW1lciIsCiAgInZlcnNpb24iOiAxCn0="}}} -, {"uuid": "dash2dock-lite@icedman.github.com", "name": "Dash2Dock Lite", "pname": "dash2dock-lite", "description": "minimal implementation of dash to dock", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "5", "sha256": "06x55wbmb1jrw6v4kc21lyg05iwzlzpkpgrqxhs5svbglchnird7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "41": {"version": "5", "sha256": "06x55wbmb1jrw6v4kc21lyg05iwzlzpkpgrqxhs5svbglchnird7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}, "42": {"version": "5", "sha256": "06x55wbmb1jrw6v4kc21lyg05iwzlzpkpgrqxhs5svbglchnird7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIm1pbmltYWwgaW1wbGVtZW50YXRpb24gb2YgZGFzaCB0byBkb2NrIiwKICAiZ2V0dGV4dC1kb21haW4iOiAiZGFzaDJkb2NrLWxpdGUiLAogICJuYW1lIjogIkRhc2gyRG9jayBMaXRlIiwKICAib3JpZ2luYWwtYXV0aG9ycyI6IFsKICAgICJpY2VkbWFuIgogIF0sCiAgInNjaGVtYS1pZCI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5kYXNoMmRvY2stbGl0ZSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaDJkb2NrLWxpdGUiLAogICJ1dWlkIjogImRhc2gyZG9jay1saXRlQGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA1Cn0="}}} +, {"uuid": "dash2dock-lite@icedman.github.com", "name": "Dash2Dock Lite", "pname": "dash2dock-lite", "description": "A minimal implementation of Dash to Dock with Animation", "link": "https://extensions.gnome.org/extension/4994/dash2dock-lite/", "shell_version_map": {"40": {"version": "8", "sha256": "0jbkpz8fy33hrhrmrbax3ci2y6lxi2zzi46x62gh9krn48vb31hl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBpbXBsZW1lbnRhdGlvbiBvZiBEYXNoIHRvIERvY2sgd2l0aCBBbmltYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNoMmRvY2stbGl0ZSIsCiAgIm5hbWUiOiAiRGFzaDJEb2NrIExpdGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "41": {"version": "8", "sha256": "0jbkpz8fy33hrhrmrbax3ci2y6lxi2zzi46x62gh9krn48vb31hl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBpbXBsZW1lbnRhdGlvbiBvZiBEYXNoIHRvIERvY2sgd2l0aCBBbmltYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNoMmRvY2stbGl0ZSIsCiAgIm5hbWUiOiAiRGFzaDJEb2NrIExpdGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}, "42": {"version": "8", "sha256": "0jbkpz8fy33hrhrmrbax3ci2y6lxi2zzi46x62gh9krn48vb31hl", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgbWluaW1hbCBpbXBsZW1lbnRhdGlvbiBvZiBEYXNoIHRvIERvY2sgd2l0aCBBbmltYXRpb24iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNoMmRvY2stbGl0ZSIsCiAgIm5hbWUiOiAiRGFzaDJEb2NrIExpdGUiLAogICJvcmlnaW5hbC1hdXRob3JzIjogWwogICAgImljZWRtYW4iCiAgXSwKICAic2NoZW1hLWlkIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmRhc2gyZG9jay1saXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWNlZG1hbi9kYXNoMmRvY2stbGl0ZSIsCiAgInV1aWQiOiAiZGFzaDJkb2NrLWxpdGVAaWNlZG1hbi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDgKfQ=="}}} , {"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": "3", "sha256": "0mdlskrjvn6j1mcy3484vwwwjg4j9b0km1mdlkkrssx5rk9x97xv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZSB0aGUgR1RLMyB0aGVtZSB0byBsaWdodC9kYXJrIHZhcmlhbnQgYmFzZWQgb24gdGhlIHN5c3RlbSBjb2xvciBzY2hlbWUgb24gR25vbWUgNDIiLAogICJuYW1lIjogIkxlZ2FjeSAoR1RLMykgVGhlbWUgU2NoZW1lIEF1dG8gU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbXVrdWwyOS9sZWdhY3ktdGhlbWUtYXV0by1zd2l0Y2hlci1nbm9tZS1leHRlbnNpb24iLAogICJ1dWlkIjogImxlZ2FjeXNjaGVtZWF1dG9zd2l0Y2hlckBqb3NoaW11a3VsMjkuZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"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.", "link": "https://extensions.gnome.org/extension/5004/dash-to-dock-for-cosmic/", "shell_version_map": {"40": {"version": "1", "sha256": "09chdybydr3q3f630w42wx81g0zb4kzp3mnwijj9dqsvjimag8n2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJtaWN4Z3hAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "09chdybydr3q3f630w42wx81g0zb4kzp3mnwijj9dqsvjimag8n2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJtaWN4Z3hAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "09chdybydr3q3f630w42wx81g0zb4kzp3mnwijj9dqsvjimag8n2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgRGFzaCB0byBEb2NrIGZvcmsgZm9yIHRoZSBDT1NNSUMvR05PTUUgU2hlbGwsIGZpeGVzIGNvbmZsaWN0IHdpdGggQ29zbWljIFdvcmtzcGFjZS4gIEl0IHByZXZlbnRzIENvc21pYyBXb3Jrc3BhY2VzIGZyb20gYnJlYWtpbmcgYWZ0ZXIgc3VzcGVuZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJkYXNodG9kb2NrIiwKICAibmFtZSI6ICJEYXNoIHRvIERvY2sgZm9yIENPU01JQyIsCiAgIm9yaWdpbmFsLWF1dGhvciI6ICJtaWN4Z3hAZ21haWwuY29tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaGFsZm1leGljYW4vZGFzaC10by1kb2NrLXBvcC90cmVlL3VidW50dS1kb2NrIiwKICAidXVpZCI6ICJkYXNoLXRvLWRvY2stY29zbWljLUBoYWxmbWV4aWNhbmhhbGZhbWF6aW5nQGdtYWlsLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} @@ -753,7 +753,7 @@ , {"uuid": "vpn-toggler@rheddes.nl", "name": "VPN Toggler", "pname": "vpn-toggler", "description": "A forked version of (https://extensions.gnome.org/extension/4061/custom-vpn-toggler/).\nVPN Toggler (and indicator) allows to see the status of a VPN (with its icon), see IP address associated and permit to start and stop VPN (from a menu).\n\nThis plugin required an additional script to interact with VPN. \nAn example for Open VPN is available on extension repository. \nFollow the link to Extension Web Site and see README.", "link": "https://extensions.gnome.org/extension/5075/vpn-toggler/", "shell_version_map": {"42": {"version": "2", "sha256": "1xxxqzr8q6zjrvkdhlkq8nfa5nv56sdnm1fyl3nxv453hfhdqmzs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgZm9ya2VkIHZlcnNpb24gb2YgKGh0dHBzOi8vZXh0ZW5zaW9ucy5nbm9tZS5vcmcvZXh0ZW5zaW9uLzQwNjEvY3VzdG9tLXZwbi10b2dnbGVyLykuXG5WUE4gVG9nZ2xlciAoYW5kIGluZGljYXRvcikgYWxsb3dzIHRvIHNlZSB0aGUgc3RhdHVzIG9mIGEgVlBOICh3aXRoIGl0cyBpY29uKSwgc2VlIElQIGFkZHJlc3MgYXNzb2NpYXRlZCBhbmQgcGVybWl0IHRvIHN0YXJ0IGFuZCBzdG9wIFZQTiAoZnJvbSBhIG1lbnUpLlxuXG5UaGlzIHBsdWdpbiByZXF1aXJlZCBhbiBhZGRpdGlvbmFsIHNjcmlwdCB0byBpbnRlcmFjdCB3aXRoIFZQTi4gXG5BbiBleGFtcGxlIGZvciBPcGVuIFZQTiBpcyBhdmFpbGFibGUgb24gZXh0ZW5zaW9uIHJlcG9zaXRvcnkuIFxuRm9sbG93IHRoZSBsaW5rIHRvIEV4dGVuc2lvbiBXZWIgU2l0ZSBhbmQgc2VlIFJFQURNRS4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ2cG4tdG9nZ2xlckByaGVkZGVzLm5sIiwKICAibmFtZSI6ICJWUE4gVG9nZ2xlciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy52cG4tdG9nZ2xlciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9SaGVkZGVzL3Zwbi10b2dnbGVyIiwKICAidXVpZCI6ICJ2cG4tdG9nZ2xlckByaGVkZGVzLm5sIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"uuid": "mozillavpn@inytar.github.com", "name": "Mozilla VPN Indicator", "pname": "mozilla-vpn-indicator", "description": "Toggle Mozilla VPN\n\nA simple indicator that can be used together with the Mozilla VPN linuxdaemon (https://github.com/mozilla-mobile/mozilla-vpn-client) to activate and deactivate the VPN.\n\nThis extension is in no way associated with Mozilla.", "link": "https://extensions.gnome.org/extension/5078/mozilla-vpn-indicator/", "shell_version_map": {"40": {"version": "1", "sha256": "18wq3m5ifvzwhj3pidfs2vnx0pj7w602iqizfgvp572qpxj6xayd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBNb3ppbGxhIFZQTlxuXG5BIHNpbXBsZSBpbmRpY2F0b3IgdGhhdCBjYW4gYmUgdXNlZCB0b2dldGhlciB3aXRoIHRoZSBNb3ppbGxhIFZQTiBsaW51eGRhZW1vbiAoaHR0cHM6Ly9naXRodWIuY29tL21vemlsbGEtbW9iaWxlL21vemlsbGEtdnBuLWNsaWVudCkgdG8gYWN0aXZhdGUgYW5kIGRlYWN0aXZhdGUgdGhlIFZQTi5cblxuVGhpcyBleHRlbnNpb24gaXMgaW4gbm8gd2F5IGFzc29jaWF0ZWQgd2l0aCBNb3ppbGxhLiIsCiAgIm5hbWUiOiAiTW96aWxsYSBWUE4gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW55dGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3ppbGxhLXZwbiIsCiAgInV1aWQiOiAibW96aWxsYXZwbkBpbnl0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "18wq3m5ifvzwhj3pidfs2vnx0pj7w602iqizfgvp572qpxj6xayd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBNb3ppbGxhIFZQTlxuXG5BIHNpbXBsZSBpbmRpY2F0b3IgdGhhdCBjYW4gYmUgdXNlZCB0b2dldGhlciB3aXRoIHRoZSBNb3ppbGxhIFZQTiBsaW51eGRhZW1vbiAoaHR0cHM6Ly9naXRodWIuY29tL21vemlsbGEtbW9iaWxlL21vemlsbGEtdnBuLWNsaWVudCkgdG8gYWN0aXZhdGUgYW5kIGRlYWN0aXZhdGUgdGhlIFZQTi5cblxuVGhpcyBleHRlbnNpb24gaXMgaW4gbm8gd2F5IGFzc29jaWF0ZWQgd2l0aCBNb3ppbGxhLiIsCiAgIm5hbWUiOiAiTW96aWxsYSBWUE4gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW55dGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3ppbGxhLXZwbiIsCiAgInV1aWQiOiAibW96aWxsYXZwbkBpbnl0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "18wq3m5ifvzwhj3pidfs2vnx0pj7w602iqizfgvp572qpxj6xayd", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRvZ2dsZSBNb3ppbGxhIFZQTlxuXG5BIHNpbXBsZSBpbmRpY2F0b3IgdGhhdCBjYW4gYmUgdXNlZCB0b2dldGhlciB3aXRoIHRoZSBNb3ppbGxhIFZQTiBsaW51eGRhZW1vbiAoaHR0cHM6Ly9naXRodWIuY29tL21vemlsbGEtbW9iaWxlL21vemlsbGEtdnBuLWNsaWVudCkgdG8gYWN0aXZhdGUgYW5kIGRlYWN0aXZhdGUgdGhlIFZQTi5cblxuVGhpcyBleHRlbnNpb24gaXMgaW4gbm8gd2F5IGFzc29jaWF0ZWQgd2l0aCBNb3ppbGxhLiIsCiAgIm5hbWUiOiAiTW96aWxsYSBWUE4gSW5kaWNhdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaW55dGFyL2dub21lLXNoZWxsLWV4dGVuc2lvbi1tb3ppbGxhLXZwbiIsCiAgInV1aWQiOiAibW96aWxsYXZwbkBpbnl0YXIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "this.simple-indication-of-workspaces@azate.email", "name": "Simple indication of workspaces", "pname": "simple-indication-of-workspaces", "description": "Workspace indication with an i3/polybar style.", "link": "https://extensions.gnome.org/extension/5081/simple-indication-of-workspaces/", "shell_version_map": {"42": {"version": "2", "sha256": "00lh574s9zcvxfqkrlf7acaz1k0fz2c5gj0hvjfmwg4l7mmyqiy7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIldvcmtzcGFjZSBpbmRpY2F0aW9uIHdpdGggYW4gaTMvcG9seWJhciBzdHlsZS4iLAogICJuYW1lIjogIlNpbXBsZSBpbmRpY2F0aW9uIG9mIHdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vYXphdGUvc2ltcGxlLWluZGljYXRpb24tb2Ytd29ya3NwYWNlcyIsCiAgInV1aWQiOiAidGhpcy5zaW1wbGUtaW5kaWNhdGlvbi1vZi13b3Jrc3BhY2VzQGF6YXRlLmVtYWlsIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} -, {"uuid": "WallpaperOverlay@Rishu", "name": "Wallpaper Overlay", "pname": "wallpaper-overlay", "description": "Extension to apply overlays on wallpaper\nFeatures:\n* Option to choose primary colour of the overlay\n* Apply multiple overlays at once\n* You can use custom overlays (png or svg file) and apply it on your wallpaper\n* Option to auto-apply whenever the desktop wallpaper changes\n* Compatible with Wallpaper Switcher(gnome extension) so as to provide smooth experience\n* You can download more custom overlays from https://rishuinfinity.github.io/wallpaper-overlays-collection/", "link": "https://extensions.gnome.org/extension/5082/wallpaper-overlay/", "shell_version_map": {"42": {"version": "8", "sha256": "1vi03i533pxzd1r2wjaqka9jg55v49irwxnbp5gk85kvky6zccks", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhcHBseSBvdmVybGF5cyBvbiB3YWxscGFwZXJcbkZlYXR1cmVzOlxuKiBPcHRpb24gdG8gY2hvb3NlIHByaW1hcnkgY29sb3VyIG9mIHRoZSBvdmVybGF5XG4qIEFwcGx5IG11bHRpcGxlIG92ZXJsYXlzIGF0IG9uY2VcbiogWW91IGNhbiB1c2UgY3VzdG9tIG92ZXJsYXlzIChwbmcgb3Igc3ZnIGZpbGUpIGFuZCBhcHBseSBpdCBvbiB5b3VyIHdhbGxwYXBlclxuKiBPcHRpb24gdG8gYXV0by1hcHBseSB3aGVuZXZlciB0aGUgZGVza3RvcCB3YWxscGFwZXIgY2hhbmdlc1xuKiBDb21wYXRpYmxlIHdpdGggV2FsbHBhcGVyIFN3aXRjaGVyKGdub21lIGV4dGVuc2lvbikgc28gYXMgdG8gcHJvdmlkZSBzbW9vdGggZXhwZXJpZW5jZVxuKiBZb3UgY2FuIGRvd25sb2FkIG1vcmUgY3VzdG9tIG92ZXJsYXlzIGZyb20gaHR0cHM6Ly9yaXNodWluZmluaXR5LmdpdGh1Yi5pby93YWxscGFwZXItb3ZlcmxheXMtY29sbGVjdGlvbi8iLAogICJuYW1lIjogIldhbGxwYXBlciBPdmVybGF5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3Jpc2h1aW5maW5pdHkvV2FsbHBhcGVyT3ZlcmxheSIsCiAgInV1aWQiOiAiV2FsbHBhcGVyT3ZlcmxheUBSaXNodSIsCiAgInZlcnNpb24iOiA4Cn0="}}} +, {"uuid": "WallpaperOverlay@Rishu", "name": "Wallpaper Overlay", "pname": "wallpaper-overlay", "description": "Extension to apply overlays on wallpaper\nMake sure imagemagick is installed.\nFeatures:\n* Option to choose primary colour of the overlay\n* Apply multiple overlays at once\n* You can use custom overlays (png or svg file) and apply it on your wallpaper\n* Option to auto-apply whenever the desktop wallpaper changes\n* Compatible with Wallpaper Switcher(gnome extension) so as to provide smooth experience\n* You can download more custom overlays from https://rishuinfinity.github.io/wallpaper-overlays-collection/", "link": "https://extensions.gnome.org/extension/5082/wallpaper-overlay/", "shell_version_map": {"42": {"version": "8", "sha256": "0xxsws1ggc3xi84qgch5kpdp4q8641vzw4gsxb8rgyf5rvhdj76m", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkV4dGVuc2lvbiB0byBhcHBseSBvdmVybGF5cyBvbiB3YWxscGFwZXJcbk1ha2Ugc3VyZSBpbWFnZW1hZ2ljayBpcyBpbnN0YWxsZWQuXG5GZWF0dXJlczpcbiogT3B0aW9uIHRvIGNob29zZSBwcmltYXJ5IGNvbG91ciBvZiB0aGUgb3ZlcmxheVxuKiBBcHBseSBtdWx0aXBsZSBvdmVybGF5cyBhdCBvbmNlXG4qIFlvdSBjYW4gdXNlIGN1c3RvbSBvdmVybGF5cyAocG5nIG9yIHN2ZyBmaWxlKSBhbmQgYXBwbHkgaXQgb24geW91ciB3YWxscGFwZXJcbiogT3B0aW9uIHRvIGF1dG8tYXBwbHkgd2hlbmV2ZXIgdGhlIGRlc2t0b3Agd2FsbHBhcGVyIGNoYW5nZXNcbiogQ29tcGF0aWJsZSB3aXRoIFdhbGxwYXBlciBTd2l0Y2hlcihnbm9tZSBleHRlbnNpb24pIHNvIGFzIHRvIHByb3ZpZGUgc21vb3RoIGV4cGVyaWVuY2VcbiogWW91IGNhbiBkb3dubG9hZCBtb3JlIGN1c3RvbSBvdmVybGF5cyBmcm9tIGh0dHBzOi8vcmlzaHVpbmZpbml0eS5naXRodWIuaW8vd2FsbHBhcGVyLW92ZXJsYXlzLWNvbGxlY3Rpb24vIiwKICAibmFtZSI6ICJXYWxscGFwZXIgT3ZlcmxheSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9yaXNodWluZmluaXR5L1dhbGxwYXBlck92ZXJsYXkiLAogICJ1dWlkIjogIldhbGxwYXBlck92ZXJsYXlAUmlzaHUiLAogICJ2ZXJzaW9uIjogOAp9"}}} , {"uuid": "startup-measure@marco.trevi.me", "name": "Applications Startup Time Measure", "pname": "startup-measure", "description": "Shows startup time of an application", "link": "https://extensions.gnome.org/extension/5087/startup-measure/", "shell_version_map": {"38": {"version": "9", "sha256": "1a5vm06awhqj21rvn93k8kywfn5zbi5gazvnghnv46mma2riga7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHN0YXJ0dXAgdGltZSBvZiBhbiBhcHBsaWNhdGlvbiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIFN0YXJ0dXAgVGltZSBNZWFzdXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvM3YxbjAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcHMtc3RhcnR1cC1tZWFzdXJlIiwKICAidXVpZCI6ICJzdGFydHVwLW1lYXN1cmVAbWFyY28udHJldmkubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, "40": {"version": "9", "sha256": "1a5vm06awhqj21rvn93k8kywfn5zbi5gazvnghnv46mma2riga7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHN0YXJ0dXAgdGltZSBvZiBhbiBhcHBsaWNhdGlvbiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIFN0YXJ0dXAgVGltZSBNZWFzdXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvM3YxbjAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcHMtc3RhcnR1cC1tZWFzdXJlIiwKICAidXVpZCI6ICJzdGFydHVwLW1lYXN1cmVAbWFyY28udHJldmkubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, "41": {"version": "9", "sha256": "1a5vm06awhqj21rvn93k8kywfn5zbi5gazvnghnv46mma2riga7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHN0YXJ0dXAgdGltZSBvZiBhbiBhcHBsaWNhdGlvbiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIFN0YXJ0dXAgVGltZSBNZWFzdXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvM3YxbjAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcHMtc3RhcnR1cC1tZWFzdXJlIiwKICAidXVpZCI6ICJzdGFydHVwLW1lYXN1cmVAbWFyY28udHJldmkubWUiLAogICJ2ZXJzaW9uIjogOQp9"}, "42": {"version": "9", "sha256": "1a5vm06awhqj21rvn93k8kywfn5zbi5gazvnghnv46mma2riga7f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNob3dzIHN0YXJ0dXAgdGltZSBvZiBhbiBhcHBsaWNhdGlvbiIsCiAgIm5hbWUiOiAiQXBwbGljYXRpb25zIFN0YXJ0dXAgVGltZSBNZWFzdXJlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvM3YxbjAvZ25vbWUtc2hlbGwtZXh0ZW5zaW9uLWFwcHMtc3RhcnR1cC1tZWFzdXJlIiwKICAidXVpZCI6ICJzdGFydHVwLW1lYXN1cmVAbWFyY28udHJldmkubWUiLAogICJ2ZXJzaW9uIjogOQp9"}}} , {"uuid": "mute-unmute@mcast.gnomext.com", "name": "Mute/Unmute", "pname": "muteunmute", "description": "Let mute/unmute audio by clicking the audio output icon of the volume slider. It uses mute/unmute API so that the system remember unmuted volume level.", "link": "https://extensions.gnome.org/extension/5088/muteunmute/", "shell_version_map": {"38": {"version": "7", "sha256": "1xzpmhpp4z21n3gw8gi4mnmcp737pvsslsa2ng58y2iiwn53xgl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBtdXRlL3VubXV0ZSBhdWRpbyBieSBjbGlja2luZyB0aGUgYXVkaW8gb3V0cHV0IGljb24gb2YgdGhlIHZvbHVtZSBzbGlkZXIuIEl0IHVzZXMgbXV0ZS91bm11dGUgQVBJIHNvIHRoYXQgdGhlIHN5c3RlbSByZW1lbWJlciB1bm11dGVkIHZvbHVtZSBsZXZlbC4iLAogICJuYW1lIjogIk11dGUvVW5tdXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWhwbGVkL211dGUtdW5tdXRlIiwKICAidXVpZCI6ICJtdXRlLXVubXV0ZUBtY2FzdC5nbm9tZXh0LmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "40": {"version": "7", "sha256": "1xzpmhpp4z21n3gw8gi4mnmcp737pvsslsa2ng58y2iiwn53xgl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBtdXRlL3VubXV0ZSBhdWRpbyBieSBjbGlja2luZyB0aGUgYXVkaW8gb3V0cHV0IGljb24gb2YgdGhlIHZvbHVtZSBzbGlkZXIuIEl0IHVzZXMgbXV0ZS91bm11dGUgQVBJIHNvIHRoYXQgdGhlIHN5c3RlbSByZW1lbWJlciB1bm11dGVkIHZvbHVtZSBsZXZlbC4iLAogICJuYW1lIjogIk11dGUvVW5tdXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWhwbGVkL211dGUtdW5tdXRlIiwKICAidXVpZCI6ICJtdXRlLXVubXV0ZUBtY2FzdC5nbm9tZXh0LmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "41": {"version": "7", "sha256": "1xzpmhpp4z21n3gw8gi4mnmcp737pvsslsa2ng58y2iiwn53xgl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBtdXRlL3VubXV0ZSBhdWRpbyBieSBjbGlja2luZyB0aGUgYXVkaW8gb3V0cHV0IGljb24gb2YgdGhlIHZvbHVtZSBzbGlkZXIuIEl0IHVzZXMgbXV0ZS91bm11dGUgQVBJIHNvIHRoYXQgdGhlIHN5c3RlbSByZW1lbWJlciB1bm11dGVkIHZvbHVtZSBsZXZlbC4iLAogICJuYW1lIjogIk11dGUvVW5tdXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWhwbGVkL211dGUtdW5tdXRlIiwKICAidXVpZCI6ICJtdXRlLXVubXV0ZUBtY2FzdC5nbm9tZXh0LmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}, "42": {"version": "7", "sha256": "1xzpmhpp4z21n3gw8gi4mnmcp737pvsslsa2ng58y2iiwn53xgl9", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkxldCBtdXRlL3VubXV0ZSBhdWRpbyBieSBjbGlja2luZyB0aGUgYXVkaW8gb3V0cHV0IGljb24gb2YgdGhlIHZvbHVtZSBzbGlkZXIuIEl0IHVzZXMgbXV0ZS91bm11dGUgQVBJIHNvIHRoYXQgdGhlIHN5c3RlbSByZW1lbWJlciB1bm11dGVkIHZvbHVtZSBsZXZlbC4iLAogICJuYW1lIjogIk11dGUvVW5tdXRlIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vaWhwbGVkL211dGUtdW5tdXRlIiwKICAidXVpZCI6ICJtdXRlLXVubXV0ZUBtY2FzdC5nbm9tZXh0LmNvbSIsCiAgInZlcnNpb24iOiA3Cn0="}}} , {"uuid": "space-bar@luchrioh", "name": "Space Bar", "pname": "space-bar", "description": "Replaces the 'Activities' button with an i3-like workspaces bar.\n\nOriginally a fork of the extension Workspaces Bar by fthx, this extension grew into a more comprehensive set of features to support a workspace-based workflow.\n\nFeatures:\n- First class support for static and dynamic workspaces as well as multi-monitor setups\n- Add, remove, and rename workspaces\n- Rearrange workspaces via drag and drop\n- Automatically updates workspace names to reflect changes of workspaces\n- Automatically assign workspace names based on started applications\n- Keyboard shortcuts extend and refine system shortcuts\n- Scroll through workspaces by mouse wheel over the panel\n\nLimitations:\n- Adding workspaces by dragging a window in overview between existing workspaces is not recognized and will confuse workspace names", "link": "https://extensions.gnome.org/extension/5090/space-bar/", "shell_version_map": {"42": {"version": "4", "sha256": "1jaz9zhsx38s4jsb7n2l6czmx7lpvk80jqa5s36lap0ibdr6c4ls", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlcGxhY2VzIHRoZSAnQWN0aXZpdGllcycgYnV0dG9uIHdpdGggYW4gaTMtbGlrZSB3b3Jrc3BhY2VzIGJhci5cblxuT3JpZ2luYWxseSBhIGZvcmsgb2YgdGhlIGV4dGVuc2lvbiBXb3Jrc3BhY2VzIEJhciBieSBmdGh4LCB0aGlzIGV4dGVuc2lvbiBncmV3IGludG8gYSBtb3JlIGNvbXByZWhlbnNpdmUgc2V0IG9mIGZlYXR1cmVzIHRvIHN1cHBvcnQgYSB3b3Jrc3BhY2UtYmFzZWQgd29ya2Zsb3cuXG5cbkZlYXR1cmVzOlxuLSAgIEZpcnN0IGNsYXNzIHN1cHBvcnQgZm9yIHN0YXRpYyBhbmQgZHluYW1pYyB3b3Jrc3BhY2VzIGFzIHdlbGwgYXMgbXVsdGktbW9uaXRvciBzZXR1cHNcbi0gICBBZGQsIHJlbW92ZSwgYW5kIHJlbmFtZSB3b3Jrc3BhY2VzXG4tICAgUmVhcnJhbmdlIHdvcmtzcGFjZXMgdmlhIGRyYWcgYW5kIGRyb3Bcbi0gICBBdXRvbWF0aWNhbGx5IHVwZGF0ZXMgd29ya3NwYWNlIG5hbWVzIHRvIHJlZmxlY3QgY2hhbmdlcyBvZiB3b3Jrc3BhY2VzXG4tICAgQXV0b21hdGljYWxseSBhc3NpZ24gd29ya3NwYWNlIG5hbWVzIGJhc2VkIG9uIHN0YXJ0ZWQgYXBwbGljYXRpb25zXG4tICAgS2V5Ym9hcmQgc2hvcnRjdXRzIGV4dGVuZCBhbmQgcmVmaW5lIHN5c3RlbSBzaG9ydGN1dHNcbi0gICBTY3JvbGwgdGhyb3VnaCB3b3Jrc3BhY2VzIGJ5IG1vdXNlIHdoZWVsIG92ZXIgdGhlIHBhbmVsXG5cbkxpbWl0YXRpb25zOlxuLSAgIEFkZGluZyB3b3Jrc3BhY2VzIGJ5IGRyYWdnaW5nIGEgd2luZG93IGluIG92ZXJ2aWV3IGJldHdlZW4gZXhpc3Rpbmcgd29ya3NwYWNlcyBpcyBub3QgcmVjb2duaXplZCBhbmQgd2lsbCBjb25mdXNlIHdvcmtzcGFjZSBuYW1lcyIsCiAgIm5hbWUiOiAiU3BhY2UgQmFyIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnNwYWNlLWJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9jaHJpc3RvcGhlci1sL3NwYWNlLWJhciIsCiAgInV1aWQiOiAic3BhY2UtYmFyQGx1Y2hyaW9oIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} @@ -761,25 +761,35 @@ , {"uuid": "favorites-apps-indicator@zecarneiro.pt", "name": "Favorites Apps Indicator", "pname": "favorites-apps-indicator", "description": "Your favorites commands and Apps Menu Indicator", "link": "https://extensions.gnome.org/extension/5096/favorites-apps-indicator/", "shell_version_map": {"42": {"version": "4", "sha256": "1hxb94bniwk0gvd4dk193rhjsqhawpcm3x5vi5djflqhc37bjzp6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIllvdXIgZmF2b3JpdGVzIGNvbW1hbmRzIGFuZCBBcHBzIE1lbnUgSW5kaWNhdG9yIiwKICAibmFtZSI6ICJGYXZvcml0ZXMgQXBwcyBJbmRpY2F0b3IiLAogICJvcmlnaW5hbC1hdXRob3JzIjogIkpvc1x1MDBlOSBNLiBDLiBOb3JvbmhhIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3plY2FybmVpcm8vZmF2b3JpdGVzLWFwcHMtaW5kaWNhdG9yIiwKICAidXVpZCI6ICJmYXZvcml0ZXMtYXBwcy1pbmRpY2F0b3JAemVjYXJuZWlyby5wdCIsCiAgInZlcnNpb24iOiA0Cn0="}}} , {"uuid": "hot-bottom@fthx", "name": "Hot Bottom", "pname": "hot-bottom", "description": "Enter overview when you hover the bottom of the screen. Very light extension.\n\n For GNOME Shell 40+. The width of the show zone is the same as the Gnome Shell dash.\n\n I'm not notified of messages here, please report bugs only through GitHub.", "link": "https://extensions.gnome.org/extension/5099/hot-bottom/", "shell_version_map": {"40": {"version": "2", "sha256": "0xarbsardhqzpcwxa59vyb11v90fl9qj03kdrn8sqmcjs48xir3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9ob3QtYm90dG9tIiwKICAidXVpZCI6ICJob3QtYm90dG9tQGZ0aHgiLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "0xarbsardhqzpcwxa59vyb11v90fl9qj03kdrn8sqmcjs48xir3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9ob3QtYm90dG9tIiwKICAidXVpZCI6ICJob3QtYm90dG9tQGZ0aHgiLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "0xarbsardhqzpcwxa59vyb11v90fl9qj03kdrn8sqmcjs48xir3f", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVudGVyIG92ZXJ2aWV3IHdoZW4geW91IGhvdmVyIHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gVmVyeSBsaWdodCBleHRlbnNpb24uXG5cbiBGb3IgR05PTUUgU2hlbGwgNDArLiBUaGUgd2lkdGggb2YgdGhlIHNob3cgem9uZSBpcyB0aGUgc2FtZSBhcyB0aGUgR25vbWUgU2hlbGwgZGFzaC5cblxuIEknbSBub3Qgbm90aWZpZWQgb2YgbWVzc2FnZXMgaGVyZSwgcGxlYXNlIHJlcG9ydCBidWdzIG9ubHkgdGhyb3VnaCBHaXRIdWIuIiwKICAibmFtZSI6ICJIb3QgQm90dG9tIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnRoeC9ob3QtYm90dG9tIiwKICAidXVpZCI6ICJob3QtYm90dG9tQGZ0aHgiLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "docker@stickman_0x00.com", "name": "Docker", "pname": "docker", "description": "Quick access to docker.", "link": "https://extensions.gnome.org/extension/5103/docker/", "shell_version_map": {"42": {"version": "7", "sha256": "1bk4axj1zmvbc44m21h5959ic5wdci6cqxi9rsbiqjx352r2hr78", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrIGFjY2VzcyB0byBkb2NrZXIuIiwKICAibmFtZSI6ICJEb2NrZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vc3RpY2ttYW5fMHgwMC9nbm9tZV9zaGVsbF9leHRlbnNpb25fZG9ja2VyIiwKICAidXVpZCI6ICJkb2NrZXJAc3RpY2ttYW5fMHgwMC5jb20iLAogICJ2ZXJzaW9uIjogNwp9"}}} -, {"uuid": "reboottouefi@ubaygd.com", "name": "RebootToUEFI", "pname": "reboottouefi", "description": "This is a small Gnome extension that adds the ability to reboot directly to the UEFI.", "link": "https://extensions.gnome.org/extension/5105/reboottouefi/", "shell_version_map": {"42": {"version": "1", "sha256": "1zhliqi84wplbpjy0w7cdcalxw6xk4grxh0jdm3gqkiw6mxbl9x2", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRoaXMgaXMgYSBzbWFsbCBHbm9tZSBleHRlbnNpb24gdGhhdCBhZGRzIHRoZSBhYmlsaXR5IHRvIHJlYm9vdCBkaXJlY3RseSB0byB0aGUgVUVGSS4iLAogICJuYW1lIjogIlJlYm9vdFRvVUVGSSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogIiIsCiAgInV1aWQiOiAicmVib290dG91ZWZpQHViYXlnZC5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"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": "2", "sha256": "1isscyn5nd16g6xmrbi81vz6x64qjqa1c1hwgz57y0z2p11k1na7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlJlYm9vdCBzeXN0ZW0gaW50byBVRUZJIiwKICAibGljZW5zZSI6ICJHUEx2MyIsCiAgIm5hbWUiOiAiUmVib290VG9VRUZJIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL1ViYXlHRC9yZWJvb3R0b3VlZmkiLAogICJ1dWlkIjogInJlYm9vdHRvdWVmaUB1YmF5Z2QuY29tIiwKICAidmVyc2lvbiI6IDIKfQ=="}}} , {"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. (Currently only supports single display)\n", "link": "https://extensions.gnome.org/extension/5111/display-scale-switcher/", "shell_version_map": {"42": {"version": "1", "sha256": "06sh5j6achhy13v1vprivpndwwv2h3y0x5qg17s1lkhbdyy4fxm5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlF1aWNrbHkgY2hhbmdlIHRoZSBkaXNwbGF5IHNjYWxpbmcgZmFjdG9yIGZyb20gdGhlIHN5c3RlbSBtZW51LiAoQ3VycmVudGx5IG9ubHkgc3VwcG9ydHMgc2luZ2xlIGRpc3BsYXkpXG4iLAogICJuYW1lIjogIkRpc3BsYXkgU2NhbGUgU3dpdGNoZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20va25va2VsbWFhdC9kaXNwbGF5LXNjYWxlLXN3aXRjaGVyLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAiZGlzcGxheS1zY2FsZS1zd2l0Y2hlckBrbm9rZWxtYWF0LmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} -, {"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": "4", "sha256": "0iyc5xswimsnyjgc37ccichxfqlhsk6gswnk52nnf4h71zsgj8sx", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21heGdhbGx1cC90YWlsc2NhbGUtc3RhdHVzIiwKICAidXVpZCI6ICJ0YWlsc2NhbGUtc3RhdHVzQG1heGdhbGx1cC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"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": "5", "sha256": "1n9magr8445ayh5sdnj2glhd59lgyh24nf2cjylds12qiaa3kxvq", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk1hbmFnZSBUYWlsc2NhbGUgY29ubmVjdGlvbnMgYW5kIGNoZWNrIHN0YXR1cyBmcm9tIGRlc2t0b3AgcmVhZCBtb3JlIGF0IGh0dHBzOi8vZ2l0aHViLmNvbS9tYXhnYWxsdXAvdGFpbHNjYWxlLXN0YXR1cy9ibG9iL21haW4vUkVBRE1FLm1kIiwKICAibmFtZSI6ICJUYWlsc2NhbGUgU3RhdHVzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL21heGdhbGx1cC90YWlsc2NhbGUtc3RhdHVzIiwKICAidXVpZCI6ICJ0YWlsc2NhbGUtc3RhdHVzQG1heGdhbGx1cC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} , {"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": "1", "sha256": "1k1qxygahg7h5x5g2b6c13j0hnv0sy9k82nw45ixjkzmfrx99pr6", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNpbXBsZSBUaW1lciBpcyBhIEdub21lIFNoZWxsIEV4dGVuc2lvbiB0aGF0IGFkZHMgYSBUaW1lciB0byB0aGUgUGFuZWwuIiwKICAibmFtZSI6ICJTaW1wbGUgVGltZXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL01ham9ydG9tVlIvc2ltcGxlLXRpbWVyLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic2ltcGxlLXRpbWVyQG1ham9ydG9tdnIuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "translate-assistant@atareao.es", "name": "Translate assistant", "pname": "translate-assistant", "description": "Translate with DeepL Translator", "link": "https://extensions.gnome.org/extension/5124/translate-assistant/", "shell_version_map": {"42": {"version": "6", "sha256": "0rql3ax7m3pr8g5h7iadl4isa2wv2wyzl9n0nihwf2js19i6ya97", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRyYW5zbGF0ZSB3aXRoIERlZXBMIFRyYW5zbGF0b3IiLAogICJleHRlbnNpb24taWQiOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiZ2V0dGV4dC1kb21haW4iOiAidHJhbnNsYXRlLWFzc2lzdGFudEBhdGFyZWFvLmVzIiwKICAiaWNvbiI6ICJ0cmFuc2xhdGUtYXNzaXN0YW50LWljb24iLAogICJuYW1lIjogIlRyYW5zbGF0ZSBhc3Npc3RhbnQiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMudHJhbnNsYXRlLWFzc2lzdGFudCIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdGFyZWFvL3RyYW5zbGF0ZS1hc3Npc3RhbnQiLAogICJ1dWlkIjogInRyYW5zbGF0ZS1hc3Npc3RhbnRAYXRhcmVhby5lcyIsCiAgInZlcnNpb24iOiA2Cn0="}}} , {"uuid": "stand-with-ukraine@vshut", "name": "Stand With Ukraine", "pname": "stand-with-ukraine", "description": "Displays Ukraine emoji flag in the top panel and provides menu with useful links.", "link": "https://extensions.gnome.org/extension/5126/stand-with-ukraine/", "shell_version_map": {"38": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "40": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "41": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}, "42": {"version": "3", "sha256": "1iqhy6jf6l74dig8lfd5kyqn6rc0f1f43qr9xk3396f2l1wjy6vf", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkRpc3BsYXlzIFVrcmFpbmUgZW1vamkgZmxhZyBpbiB0aGUgdG9wIHBhbmVsIGFuZCBwcm92aWRlcyBtZW51IHdpdGggdXNlZnVsIGxpbmtzLiIsCiAgIm5hbWUiOiAiU3RhbmQgV2l0aCBVa3JhaW5lIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICIzLjM2IiwKICAgICIzLjM4IiwKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vdmxhZHNodXQvc3RhbmQtd2l0aC11a3JhaW5lLWdub21lLWV4dGVuc2lvbiIsCiAgInV1aWQiOiAic3RhbmQtd2l0aC11a3JhaW5lQHZzaHV0IiwKICAidmVyc2lvbiI6IDMKfQ=="}}} , {"uuid": "audio-selector@harald65.simon.gmail.com", "name": "Audio Selector", "pname": "audio-selector", "description": "Select audio output and/or input port", "link": "https://extensions.gnome.org/extension/5135/audio-selector/", "shell_version_map": {"42": {"version": "5", "sha256": "00ww12j34fpbrqlxkc6d47s0i542byz6r39yrshyf8xrcs8r7ifm", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlNlbGVjdCBhdWRpbyBvdXRwdXQgYW5kL29yIGlucHV0IHBvcnQiLAogICJuYW1lIjogIkF1ZGlvIFNlbGVjdG9yIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2hzNjUvR25vbWUtU2hlbGwtRXh0ZW5zaW9uLUF1ZGlvLVNlbGVjdG9yLmdpdCIsCiAgInV1aWQiOiAiYXVkaW8tc2VsZWN0b3JAaGFyYWxkNjUuc2ltb24uZ21haWwuY29tIiwKICAidmVyc2lvbiI6IDUKfQ=="}}} -, {"uuid": "dashbar@fthx", "name": "DashBar", "pname": "dashbar", "description": "Task bar. Very light extension.\n\n Features:\n\n - Hide overview at start-up.\n\n - Scroll on taskbar to change workspace.\n\n - Show desktop button. Left click to minimize all windows. Right click to activate all windows.\n\n - Show apps button. Left click to enter overview. Right click to show apps overview.\n\n - GNOME Shell dash items in top bar. Left click to toggle (or cycle if many app windows). Right click to show app menu. Middle click to open new window. Drag'n'drop favorites.\n\n - Remove 'Activities' button.\n\n - Change 'Places' extension label to an icon.\n\n No settings. If you want customization through preferences UI, please consider BaBar or Dash to Panel.\n\n ----------\n\n Please report any bug only through GitHub, I'm not notified here.", "link": "https://extensions.gnome.org/extension/5143/dashbar/", "shell_version_map": {"42": {"version": "7", "sha256": "0p6yfxsla904s7p65gqj02hipkyza9qlyi1q3rihr8kwkz9vm2dv", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciB0byBjaGFuZ2Ugd29ya3NwYWNlLlxuXG4gLSBTaG93IGRlc2t0b3AgYnV0dG9uLiBMZWZ0IGNsaWNrIHRvIG1pbmltaXplIGFsbCB3aW5kb3dzLiBSaWdodCBjbGljayB0byBhY3RpdmF0ZSBhbGwgd2luZG93cy5cblxuIC0gU2hvdyBhcHBzIGJ1dHRvbi4gTGVmdCBjbGljayB0byBlbnRlciBvdmVydmlldy4gUmlnaHQgY2xpY2sgdG8gc2hvdyBhcHBzIG92ZXJ2aWV3LlxuXG4gLSBHTk9NRSBTaGVsbCBkYXNoIGl0ZW1zIGluIHRvcCBiYXIuIExlZnQgY2xpY2sgdG8gdG9nZ2xlIChvciBjeWNsZSBpZiBtYW55IGFwcCB3aW5kb3dzKS4gUmlnaHQgY2xpY2sgdG8gc2hvdyBhcHAgbWVudS4gTWlkZGxlIGNsaWNrIHRvIG9wZW4gbmV3IHdpbmRvdy4gRHJhZyduJ2Ryb3AgZmF2b3JpdGVzLlxuXG4gLSBSZW1vdmUgJ0FjdGl2aXRpZXMnIGJ1dHRvbi5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gTm8gc2V0dGluZ3MuIElmIHlvdSB3YW50IGN1c3RvbWl6YXRpb24gdGhyb3VnaCBwcmVmZXJlbmNlcyBVSSwgcGxlYXNlIGNvbnNpZGVyIEJhQmFyIG9yIERhc2ggdG8gUGFuZWwuXG5cbiAtLS0tLS0tLS0tXG5cbiBQbGVhc2UgcmVwb3J0IGFueSBidWcgb25seSB0aHJvdWdoIEdpdEh1YiwgSSdtIG5vdCBub3RpZmllZCBoZXJlLiIsCiAgIm5hbWUiOiAiRGFzaEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2hiYXIiLAogICJ1dWlkIjogImRhc2hiYXJAZnRoeCIsCiAgInZlcnNpb24iOiA3Cn0="}}} +, {"uuid": "dashbar@fthx", "name": "DashBar", "pname": "dashbar", "description": "Task bar. Very light extension.\n\n Features:\n\n - Hide overview at start-up.\n\n - Scroll on taskbar to change workspace.\n\n - Show desktop button. Left click to minimize all windows. Right click to activate all windows.\n\n - Show apps button. Left click to enter overview. Right click to show apps overview.\n\n - GNOME Shell dash items in top bar. Left click to toggle (or cycle if many app windows). Right click to show app menu. Middle click to open new window. Drag'n'drop favorites.\n\n - Remove 'Activities' button.\n\n - Change 'Places' extension label to an icon.\n\n No settings. If you want customization through preferences UI, please consider BaBar or Dash to Panel.\n\n ----------\n\n Please report any bug only through GitHub, I'm not notified here.", "link": "https://extensions.gnome.org/extension/5143/dashbar/", "shell_version_map": {"42": {"version": "8", "sha256": "043g41llm6s18ijbm3sz5ya0hdrpdd03h6wmydvyaq26xlimh7cb", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2sgYmFyLiBWZXJ5IGxpZ2h0IGV4dGVuc2lvbi5cblxuIEZlYXR1cmVzOlxuXG4gLSBIaWRlIG92ZXJ2aWV3IGF0IHN0YXJ0LXVwLlxuXG4gLSBTY3JvbGwgb24gdGFza2JhciB0byBjaGFuZ2Ugd29ya3NwYWNlLlxuXG4gLSBTaG93IGRlc2t0b3AgYnV0dG9uLiBMZWZ0IGNsaWNrIHRvIG1pbmltaXplIGFsbCB3aW5kb3dzLiBSaWdodCBjbGljayB0byBhY3RpdmF0ZSBhbGwgd2luZG93cy5cblxuIC0gU2hvdyBhcHBzIGJ1dHRvbi4gTGVmdCBjbGljayB0byBlbnRlciBvdmVydmlldy4gUmlnaHQgY2xpY2sgdG8gc2hvdyBhcHBzIG92ZXJ2aWV3LlxuXG4gLSBHTk9NRSBTaGVsbCBkYXNoIGl0ZW1zIGluIHRvcCBiYXIuIExlZnQgY2xpY2sgdG8gdG9nZ2xlIChvciBjeWNsZSBpZiBtYW55IGFwcCB3aW5kb3dzKS4gUmlnaHQgY2xpY2sgdG8gc2hvdyBhcHAgbWVudS4gTWlkZGxlIGNsaWNrIHRvIG9wZW4gbmV3IHdpbmRvdy4gRHJhZyduJ2Ryb3AgZmF2b3JpdGVzLlxuXG4gLSBSZW1vdmUgJ0FjdGl2aXRpZXMnIGJ1dHRvbi5cblxuIC0gQ2hhbmdlICdQbGFjZXMnIGV4dGVuc2lvbiBsYWJlbCB0byBhbiBpY29uLlxuXG4gTm8gc2V0dGluZ3MuIElmIHlvdSB3YW50IGN1c3RvbWl6YXRpb24gdGhyb3VnaCBwcmVmZXJlbmNlcyBVSSwgcGxlYXNlIGNvbnNpZGVyIEJhQmFyIG9yIERhc2ggdG8gUGFuZWwuXG5cbiAtLS0tLS0tLS0tXG5cbiBQbGVhc2UgcmVwb3J0IGFueSBidWcgb25seSB0aHJvdWdoIEdpdEh1YiwgSSdtIG5vdCBub3RpZmllZCBoZXJlLiIsCiAgIm5hbWUiOiAiRGFzaEJhciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mdGh4L2Rhc2hiYXIiLAogICJ1dWlkIjogImRhc2hiYXJAZnRoeCIsCiAgInZlcnNpb24iOiA4Cn0="}}} , {"uuid": "extended-screen@free-bots.github.io", "name": "Extended Screen", "pname": "extended-screen", "description": "Enables Gnome 42 hidden extending screen feature... please make sure that gnome-remote-desktop is installed", "link": "https://extensions.gnome.org/extension/5146/extended-screen/", "shell_version_map": {"42": {"version": "2", "sha256": "156zzlkfwgl36wj946yhm9s5v7jig0a2f6prgxq0qm7hhcdvwhap", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkVuYWJsZXMgR25vbWUgNDIgaGlkZGVuIGV4dGVuZGluZyBzY3JlZW4gZmVhdHVyZS4uLiBwbGVhc2UgbWFrZSBzdXJlIHRoYXQgZ25vbWUtcmVtb3RlLWRlc2t0b3AgaXMgaW5zdGFsbGVkIiwKICAibmFtZSI6ICJFeHRlbmRlZCBTY3JlZW4iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vZnJlZS1ib3RzL2V4dGVuZGVkLXNjcmVlbiIsCiAgInV1aWQiOiAiZXh0ZW5kZWQtc2NyZWVuQGZyZWUtYm90cy5naXRodWIuaW8iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"uuid": "waylandorx11@injcristianrojas.github.com", "name": "Wayland or X11?", "pname": "wayland-or-x11", "description": "Am I using Wayland or X11?\n\nSimple extension that shows if you are using GNOME on Wayland or X11.\n\nIssues? Drop them at https://github.com/injcristianrojas/waylandorx11/issues", "link": "https://extensions.gnome.org/extension/5149/wayland-or-x11/", "shell_version_map": {"40": {"version": "2", "sha256": "179glvkmnb24qnsnggmdc9pn3xvvn8i874d5l6416k352vk677k1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/XG5cblNpbXBsZSBleHRlbnNpb24gdGhhdCBzaG93cyBpZiB5b3UgYXJlIHVzaW5nIEdOT01FIG9uIFdheWxhbmQgb3IgWDExLlxuXG5Jc3N1ZXM/IERyb3AgdGhlbSBhdCBodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy93YXlsYW5kb3J4MTEvaXNzdWVzIiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMT8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "179glvkmnb24qnsnggmdc9pn3xvvn8i874d5l6416k352vk677k1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/XG5cblNpbXBsZSBleHRlbnNpb24gdGhhdCBzaG93cyBpZiB5b3UgYXJlIHVzaW5nIEdOT01FIG9uIFdheWxhbmQgb3IgWDExLlxuXG5Jc3N1ZXM/IERyb3AgdGhlbSBhdCBodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy93YXlsYW5kb3J4MTEvaXNzdWVzIiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMT8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "179glvkmnb24qnsnggmdc9pn3xvvn8i874d5l6416k352vk677k1", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFtIEkgdXNpbmcgV2F5bGFuZCBvciBYMTE/XG5cblNpbXBsZSBleHRlbnNpb24gdGhhdCBzaG93cyBpZiB5b3UgYXJlIHVzaW5nIEdOT01FIG9uIFdheWxhbmQgb3IgWDExLlxuXG5Jc3N1ZXM/IERyb3AgdGhlbSBhdCBodHRwczovL2dpdGh1Yi5jb20vaW5qY3Jpc3RpYW5yb2phcy93YXlsYW5kb3J4MTEvaXNzdWVzIiwKICAibmFtZSI6ICJXYXlsYW5kIG9yIFgxMT8iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pbmpjcmlzdGlhbnJvamFzL3dheWxhbmRvcngxMSIsCiAgInV1aWQiOiAid2F5bGFuZG9yeDExQGluamNyaXN0aWFucm9qYXMuZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} , {"uuid": "azclock@azclock.gitlab.com", "name": "Desktop Clock", "pname": "desktop-clock", "description": "Add a clock to the desktop!\n\nNote: Desktop Icons extension prevents the ability to move the clock. Turn off Desktop Icons extensions temporarily to move the clock around.", "link": "https://extensions.gnome.org/extension/5156/desktop-clock/", "shell_version_map": {"42": {"version": "1", "sha256": "0j8q97a4lv70by0c4383caa2i363gm7l1wsmrjs1iwppc7qmlm0d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCBhIGNsb2NrIHRvIHRoZSBkZXNrdG9wIVxuXG5Ob3RlOiBEZXNrdG9wIEljb25zIGV4dGVuc2lvbiBwcmV2ZW50cyB0aGUgYWJpbGl0eSB0byBtb3ZlIHRoZSBjbG9jay4gVHVybiBvZmYgRGVza3RvcCBJY29ucyBleHRlbnNpb25zIHRlbXBvcmFyaWx5IHRvIG1vdmUgdGhlIGNsb2NrIGFyb3VuZC4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJhemNsb2NrIiwKICAibmFtZSI6ICJEZXNrdG9wIENsb2NrIiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLmF6Y2xvY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGxhYi5jb20vQW5kcmV3WmFlY2gvYXpjbG9jayIsCiAgInV1aWQiOiAiYXpjbG9ja0BhemNsb2NrLmdpdGxhYi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} , {"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": "noa11y@popov895.ukr.net", "name": "No a11y", "pname": "no-a11y", "description": "Hide the accessibility button on the top bar.", "link": "https://extensions.gnome.org/extension/5162/no-a11y/", "shell_version_map": {"42": {"version": "1", "sha256": "0nv9iwyx0pqf81jhdgfm5dsjh7ryp8y25w32l1ll1w7223chz2v7", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkhpZGUgdGhlIGFjY2Vzc2liaWxpdHkgYnV0dG9uIG9uIHRoZSB0b3AgYmFyLiIsCiAgIm5hbWUiOiAiTm8gYTExeSIsCiAgInNlc3Npb24tbW9kZXMiOiBbCiAgICAidXNlciIsCiAgICAidW5sb2NrLWRpYWxvZyIKICBdLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vcG9wb3Y4OTUvbm9hMTF5IiwKICAidXVpZCI6ICJub2ExMXlAcG9wb3Y4OTUudWtyLm5ldCIsCiAgInZlcnNpb24iOiAxCn0="}}} , {"uuid": "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": "4", "sha256": "1snl3ij055gcsmrk0dk6y1z1a9f4l6ydqqwf8hbgblw4iaiha1mw", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVQb3dlciBCYXR0ZXJ5IEluZGljYXRvci4iLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJ1cG93ZXJfYmF0dGVyeV9pbmRpY2F0b3IiLAogICJuYW1lIjogIlVQb3dlciBCYXR0ZXJ5IiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2NvZGlsaWEvdXBvd2VyLWJhdHRlcnkiLAogICJ1dWlkIjogInVwb3dlci1iYXR0ZXJ5QGNvZGlsaWEuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "Vertical Workspaces", "pname": "vertical-workspaces", "description": "Changes the horizontal orientation of workspaces to vertical and adds customizations of the Activities Overview layout.\n\nPlease report bugs and feature requests on the GitHub page linked below as Extension Homepage. Thank you.", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {"40": {"version": "4", "sha256": "0769kd05cynzjpd1nvygy81gwryngbjnny0jjxrwqhyxjlxdz5p5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGhvcml6b250YWwgb3JpZW50YXRpb24gb2Ygd29ya3NwYWNlcyB0byB2ZXJ0aWNhbCBhbmQgYWRkcyBjdXN0b21pemF0aW9ucyBvZiB0aGUgQWN0aXZpdGllcyBPdmVydmlldyBsYXlvdXQuXG5cblBsZWFzZSByZXBvcnQgYnVncyBhbmQgZmVhdHVyZSByZXF1ZXN0cyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS4gVGhhbmsgeW91LiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "0769kd05cynzjpd1nvygy81gwryngbjnny0jjxrwqhyxjlxdz5p5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGhvcml6b250YWwgb3JpZW50YXRpb24gb2Ygd29ya3NwYWNlcyB0byB2ZXJ0aWNhbCBhbmQgYWRkcyBjdXN0b21pemF0aW9ucyBvZiB0aGUgQWN0aXZpdGllcyBPdmVydmlldyBsYXlvdXQuXG5cblBsZWFzZSByZXBvcnQgYnVncyBhbmQgZmVhdHVyZSByZXF1ZXN0cyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS4gVGhhbmsgeW91LiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "0769kd05cynzjpd1nvygy81gwryngbjnny0jjxrwqhyxjlxdz5p5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGhvcml6b250YWwgb3JpZW50YXRpb24gb2Ygd29ya3NwYWNlcyB0byB2ZXJ0aWNhbCBhbmQgYWRkcyBjdXN0b21pemF0aW9ucyBvZiB0aGUgQWN0aXZpdGllcyBPdmVydmlldyBsYXlvdXQuXG5cblBsZWFzZSByZXBvcnQgYnVncyBhbmQgZmVhdHVyZSByZXF1ZXN0cyBvbiB0aGUgR2l0SHViIHBhZ2UgbGlua2VkIGJlbG93IGFzIEV4dGVuc2lvbiBIb21lcGFnZS4gVGhhbmsgeW91LiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} -, {"uuid": "rocketbar@chepkun.github.com", "name": "Rocketbar", "pname": "rocketbar", "description": "Taskbar and misc additions for the GNOME Shell.\n\n# Key Features:\n\nTaskbar\n - Optimized for best performance\n - Doesn't hurt CPU and Shell on every mouse click\n - Highly customizable\n - Dominant color support for app buttons and indicators\n - Optimized to work with a fully transparent panel\n - Supports both top and bottom positions of the Main panel\n - Per app customization feature\n - Drag and Drop support to reorder existing and pin new apps in the taskbar\n - Displaying of notification badges on app buttons\n - Tooltips with additional information such as windows count and notification count\n - Set focus on urgent windows of an active application automatically (Fixes 'Open Folder' dialog in VS Code and so on)\n\nShell Tweaks\n - Dash killing feature to hide the Dash and prevent it from rendering behind the scene\n - Scroll the Main panel to change sound volume and middle click to toggle mute\n - Activities button click behavior override\n - Overview empty space clicks support\n - Fullscreen Hot Corner", "link": "https://extensions.gnome.org/extension/5180/rocketbar/", "shell_version_map": {"42": {"version": "3", "sha256": "1f5sa8zhm8g23qyn3b5nfzg2r59a4zg3r19hbfbnxyyww7rvbcpy", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuXG5cbiMgS2V5IEZlYXR1cmVzOlxuXG5UYXNrYmFyXG4gICAgLSBPcHRpbWl6ZWQgZm9yIGJlc3QgcGVyZm9ybWFuY2VcbiAgICAtIERvZXNuJ3QgaHVydCBDUFUgYW5kIFNoZWxsIG9uIGV2ZXJ5IG1vdXNlIGNsaWNrXG4gICAgLSBIaWdobHkgY3VzdG9taXphYmxlXG4gICAgLSBEb21pbmFudCBjb2xvciBzdXBwb3J0IGZvciBhcHAgYnV0dG9ucyBhbmQgaW5kaWNhdG9yc1xuICAgIC0gT3B0aW1pemVkIHRvIHdvcmsgd2l0aCBhIGZ1bGx5IHRyYW5zcGFyZW50IHBhbmVsXG4gICAgLSBTdXBwb3J0cyBib3RoIHRvcCBhbmQgYm90dG9tIHBvc2l0aW9ucyBvZiB0aGUgTWFpbiBwYW5lbFxuICAgIC0gUGVyIGFwcCBjdXN0b21pemF0aW9uIGZlYXR1cmVcbiAgICAtIERyYWcgYW5kIERyb3Agc3VwcG9ydCB0byByZW9yZGVyIGV4aXN0aW5nIGFuZCBwaW4gbmV3IGFwcHMgaW4gdGhlIHRhc2tiYXJcbiAgICAtIERpc3BsYXlpbmcgb2Ygbm90aWZpY2F0aW9uIGJhZGdlcyBvbiBhcHAgYnV0dG9uc1xuICAgIC0gVG9vbHRpcHMgd2l0aCBhZGRpdGlvbmFsIGluZm9ybWF0aW9uIHN1Y2ggYXMgd2luZG93cyBjb3VudCBhbmQgbm90aWZpY2F0aW9uIGNvdW50XG4gICAgLSBTZXQgZm9jdXMgb24gdXJnZW50IHdpbmRvd3Mgb2YgYW4gYWN0aXZlIGFwcGxpY2F0aW9uIGF1dG9tYXRpY2FsbHkgKEZpeGVzICdPcGVuIEZvbGRlcicgZGlhbG9nIGluIFZTIENvZGUgYW5kIHNvIG9uKVxuXG5TaGVsbCBUd2Vha3NcbiAgICAtIERhc2gga2lsbGluZyBmZWF0dXJlIHRvIGhpZGUgdGhlIERhc2ggYW5kIHByZXZlbnQgaXQgZnJvbSByZW5kZXJpbmcgYmVoaW5kIHRoZSBzY2VuZVxuICAgIC0gU2Nyb2xsIHRoZSBNYWluIHBhbmVsIHRvIGNoYW5nZSBzb3VuZCB2b2x1bWUgYW5kIG1pZGRsZSBjbGljayB0byB0b2dnbGUgbXV0ZVxuICAgIC0gQWN0aXZpdGllcyBidXR0b24gY2xpY2sgYmVoYXZpb3Igb3ZlcnJpZGVcbiAgICAtIE92ZXJ2aWV3IGVtcHR5IHNwYWNlIGNsaWNrcyBzdXBwb3J0XG4gICAgLSBGdWxsc2NyZWVuIEhvdCBDb3JuZXIiLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJyb2NrZXRiYXIiLAogICJuYW1lIjogIlJvY2tldGJhciIsCiAgInNldHRpbmdzLXNjaGVtYSI6ICJvcmcuZ25vbWUuc2hlbGwuZXh0ZW5zaW9ucy5yb2NrZXRiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbGludXgtaXMtYXdlc29tZS9nbm9tZV9leHRlbnNpb25fcm9ja2V0YmFyIiwKICAidXVpZCI6ICJyb2NrZXRiYXJAY2hlcGt1bi5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "vertical-workspaces@G-dH.github.com", "name": "Vertical Workspaces", "pname": "vertical-workspaces", "description": "Changes the horizontal orientation of workspaces to vertical and adds options to customize Activities overview layout and content.\n\nSince version 8 also vertical Dash on left or right.\n\nIf you find this extension useful, please leave a comment, your feedback is important to me and helps to keep me motivated.\n\nPlease report bugs and feature requests on the GitHub page linked below as Extension Homepage.", "link": "https://extensions.gnome.org/extension/5177/vertical-workspaces/", "shell_version_map": {"40": {"version": "9", "sha256": "1l7axll336y338f1yw1pd34wv96rrzp10llk9jd7pq97msdqzf6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGhvcml6b250YWwgb3JpZW50YXRpb24gb2Ygd29ya3NwYWNlcyB0byB2ZXJ0aWNhbCBhbmQgYWRkcyBvcHRpb25zIHRvIGN1c3RvbWl6ZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IGxheW91dCBhbmQgY29udGVudC5cblxuU2luY2UgdmVyc2lvbiA4IGFsc28gdmVydGljYWwgRGFzaCBvbiBsZWZ0IG9yIHJpZ2h0LlxuXG5JZiB5b3UgZmluZCB0aGlzIGV4dGVuc2lvbiB1c2VmdWwsIHBsZWFzZSBsZWF2ZSBhIGNvbW1lbnQsIHlvdXIgZmVlZGJhY2sgaXMgaW1wb3J0YW50IHRvIG1lIGFuZCBoZWxwcyB0byBrZWVwIG1lIG1vdGl2YXRlZC5cblxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "41": {"version": "9", "sha256": "1l7axll336y338f1yw1pd34wv96rrzp10llk9jd7pq97msdqzf6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGhvcml6b250YWwgb3JpZW50YXRpb24gb2Ygd29ya3NwYWNlcyB0byB2ZXJ0aWNhbCBhbmQgYWRkcyBvcHRpb25zIHRvIGN1c3RvbWl6ZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IGxheW91dCBhbmQgY29udGVudC5cblxuU2luY2UgdmVyc2lvbiA4IGFsc28gdmVydGljYWwgRGFzaCBvbiBsZWZ0IG9yIHJpZ2h0LlxuXG5JZiB5b3UgZmluZCB0aGlzIGV4dGVuc2lvbiB1c2VmdWwsIHBsZWFzZSBsZWF2ZSBhIGNvbW1lbnQsIHlvdXIgZmVlZGJhY2sgaXMgaW1wb3J0YW50IHRvIG1lIGFuZCBoZWxwcyB0byBrZWVwIG1lIG1vdGl2YXRlZC5cblxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}, "42": {"version": "9", "sha256": "1l7axll336y338f1yw1pd34wv96rrzp10llk9jd7pq97msdqzf6d", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNoYW5nZXMgdGhlIGhvcml6b250YWwgb3JpZW50YXRpb24gb2Ygd29ya3NwYWNlcyB0byB2ZXJ0aWNhbCBhbmQgYWRkcyBvcHRpb25zIHRvIGN1c3RvbWl6ZSBBY3Rpdml0aWVzIG92ZXJ2aWV3IGxheW91dCBhbmQgY29udGVudC5cblxuU2luY2UgdmVyc2lvbiA4IGFsc28gdmVydGljYWwgRGFzaCBvbiBsZWZ0IG9yIHJpZ2h0LlxuXG5JZiB5b3UgZmluZCB0aGlzIGV4dGVuc2lvbiB1c2VmdWwsIHBsZWFzZSBsZWF2ZSBhIGNvbW1lbnQsIHlvdXIgZmVlZGJhY2sgaXMgaW1wb3J0YW50IHRvIG1lIGFuZCBoZWxwcyB0byBrZWVwIG1lIG1vdGl2YXRlZC5cblxuUGxlYXNlIHJlcG9ydCBidWdzIGFuZCBmZWF0dXJlIHJlcXVlc3RzIG9uIHRoZSBHaXRIdWIgcGFnZSBsaW5rZWQgYmVsb3cgYXMgRXh0ZW5zaW9uIEhvbWVwYWdlLiIsCiAgImdldHRleHQtZG9tYWluIjogInZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJuYW1lIjogIlZlcnRpY2FsIFdvcmtzcGFjZXMiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9HLWRIL3ZlcnRpY2FsLXdvcmtzcGFjZXMiLAogICJ1dWlkIjogInZlcnRpY2FsLXdvcmtzcGFjZXNARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDkKfQ=="}}} +, {"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": "4", "sha256": "1spfksf2l0haln5cvs4vsa3b4fskqalr3asci9479yda5zy4n8ly", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlRhc2tiYXIgYW5kIG1pc2MgYWRkaXRpb25zIGZvciB0aGUgR05PTUUgU2hlbGwuIiwKICAiZ2V0dGV4dC1kb21haW4iOiAicm9ja2V0YmFyIiwKICAibmFtZSI6ICJSb2NrZXRiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMucm9ja2V0YmFyIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2xpbnV4LWlzLWF3ZXNvbWUvZ25vbWVfZXh0ZW5zaW9uX3JvY2tldGJhciIsCiAgInV1aWQiOiAicm9ja2V0YmFyQGNoZXBrdW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiA0Cn0="}}} +, {"uuid": "contestcountdown@raghav", "name": "Contest Countdown", "pname": "contest-countdown", "description": "Countdown to next codeforces contest. This extension uses the API of codeforces.com to get the list of all upcoming contests. A countdown to the closest upcoming contest (that you are participating in) is shown in the panel, which can be clicked on to view the list of all upcoming contests.", "link": "https://extensions.gnome.org/extension/5183/contest-countdown/", "shell_version_map": {"40": {"version": "3", "sha256": "096vwrc9b5lxg1zk7v8w6ynwnp7x3n3h9f3r5p02rdqy73ybsqia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGVmb3JjZXMgY29udGVzdC4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGNvZGVmb3JjZXMuY29tIHRvIGdldCB0aGUgbGlzdCBvZiBhbGwgdXBjb21pbmcgY29udGVzdHMuIEEgY291bnRkb3duIHRvIHRoZSBjbG9zZXN0IHVwY29taW5nIGNvbnRlc3QgKHRoYXQgeW91IGFyZSBwYXJ0aWNpcGF0aW5nIGluKSBpcyBzaG93biBpbiB0aGUgcGFuZWwsIHdoaWNoIGNhbiBiZSBjbGlja2VkIG9uIHRvIHZpZXcgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiIsCiAgIm5hbWUiOiAiQ29udGVzdCBDb3VudGRvd24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udGVzdC1jb3VudGRvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZy1oYXYvY29udGVzdGNvdW50ZG93biIsCiAgInV1aWQiOiAiY29udGVzdGNvdW50ZG93bkByYWdoYXYiLAogICJ2ZXJzaW9uIjogMwp9"}, "42": {"version": "3", "sha256": "096vwrc9b5lxg1zk7v8w6ynwnp7x3n3h9f3r5p02rdqy73ybsqia", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkNvdW50ZG93biB0byBuZXh0IGNvZGVmb3JjZXMgY29udGVzdC4gVGhpcyBleHRlbnNpb24gdXNlcyB0aGUgQVBJIG9mIGNvZGVmb3JjZXMuY29tIHRvIGdldCB0aGUgbGlzdCBvZiBhbGwgdXBjb21pbmcgY29udGVzdHMuIEEgY291bnRkb3duIHRvIHRoZSBjbG9zZXN0IHVwY29taW5nIGNvbnRlc3QgKHRoYXQgeW91IGFyZSBwYXJ0aWNpcGF0aW5nIGluKSBpcyBzaG93biBpbiB0aGUgcGFuZWwsIHdoaWNoIGNhbiBiZSBjbGlja2VkIG9uIHRvIHZpZXcgdGhlIGxpc3Qgb2YgYWxsIHVwY29taW5nIGNvbnRlc3RzLiIsCiAgIm5hbWUiOiAiQ29udGVzdCBDb3VudGRvd24iLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuY29udGVzdC1jb3VudGRvd24iLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQwIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3JhZy1oYXYvY29udGVzdGNvdW50ZG93biIsCiAgInV1aWQiOiAiY29udGVzdGNvdW50ZG93bkByYWdoYXYiLAogICJ2ZXJzaW9uIjogMwp9"}}} , {"uuid": "toggle-window@togglewindow.com", "name": "Toggle Window", "pname": "toggle-window", "description": "For security reasons, since Gnome 41, cann't invoke '**org.gnome.Shell.Eval**' to control the behavior of window, we expose a D-Bus interface to activate/minimized a window by WMclass name.", "link": "https://extensions.gnome.org/extension/5185/toggle-window/", "shell_version_map": {"42": {"version": "3", "sha256": "03d53mf46jdypbqvw5720cc4ii39q87jscnnnwmqcd2x6sn6c0xs", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvciBzZWN1cml0eSByZWFzb25zLCBzaW5jZSBHbm9tZSA0MSwgY2Fubid0IGludm9rZSAnKipvcmcuZ25vbWUuU2hlbGwuRXZhbCoqJyB0byBjb250cm9sIHRoZSBiZWhhdmlvciBvZiB3aW5kb3csIHdlIGV4cG9zZSBhIEQtQnVzIGludGVyZmFjZSB0byBhY3RpdmF0ZS9taW5pbWl6ZWQgYSB3aW5kb3cgYnkgV01jbGFzcyBuYW1lLiIsCiAgIm5hbWUiOiAiVG9nZ2xlIFdpbmRvdyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS96aGFuZ2ppYWtvdXpmL3RvZ2dsZV93aW5kb3ciLAogICJ1dWlkIjogInRvZ2dsZS13aW5kb3dAdG9nZ2xld2luZG93LmNvbSIsCiAgInZlcnNpb24iOiAzCn0="}}} , {"uuid": "super-key@tommimon.github.com", "name": "Super Key", "pname": "super-key", "description": "Fork of Pop Launcher Super-Key: Bind the Super-Key to a custom action", "link": "https://extensions.gnome.org/extension/5188/super-key/", "shell_version_map": {"42": {"version": "2", "sha256": "1fgr7zb5hdb8a0ghw735hhizqq4jpqji8gh3y46pqnk7dli3ykjc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkZvcmsgb2YgUG9wIExhdW5jaGVyIFN1cGVyLUtleTogQmluZCB0aGUgU3VwZXItS2V5IHRvIGEgY3VzdG9tIGFjdGlvbiIsCiAgIm5hbWUiOiAiU3VwZXIgS2V5IiwKICAic2V0dGluZ3Mtc2NoZW1hIjogIm9yZy5nbm9tZS5zaGVsbC5leHRlbnNpb25zLnN1cGVyLWtleSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS90b21taW1vbiIsCiAgInV1aWQiOiAic3VwZXIta2V5QHRvbW1pbW9uLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} , {"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.\n\nIncludes following options:\nOverview:\n- Shift Reorders Workspace (Shift + scroll / Shift + Page Up/Down)\n- Ctrl + Space Activates Dash\n- Move Titles Into Windows\n- Always Show Window Titles\n- Hover Selects Window For Activation (hover window preview and press Super to activate it)\n- Fullscreen Hot Corner\n\nDash:\n- Shift + Click Moves App To Current Workspace\n- Hovering Icon Highlights App Windows\n- Scroll Switches App Windows Workspaces\n- Show Windows Before Activation\n\nApp Icon Menu Items:\n- Force Quit\n- Move App to Current Workspace\n- Close Windows on Current Workspace\n\nWindow Search Provider:\n- Space Activates Window Search\n- Enable Commands in Search Entry\n- Shift Moves Window to Current Workspace\n- Ctrl + Shift Moves All Windows (from search result) to Current Workspace\n- Secondary Click On Workspace Activates Window Search", "link": "https://extensions.gnome.org/extension/5192/ofp-overview-feature-pack/", "shell_version_map": {"41": {"version": "1", "sha256": "1vsp3wzdihi98349xy30q0fflxqwgza0wyxq3vp2qig7bzny6j9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIE92ZXJ2aWV3IGFuZCBEYXNoLlxuXG5JbmNsdWRlcyBmb2xsb3dpbmcgb3B0aW9uczpcbk92ZXJ2aWV3OlxuLSBTaGlmdCBSZW9yZGVycyBXb3Jrc3BhY2UgKFNoaWZ0ICsgc2Nyb2xsIC8gU2hpZnQgKyBQYWdlIFVwL0Rvd24pXG4tIEN0cmwgKyBTcGFjZSBBY3RpdmF0ZXMgRGFzaFxuLSBNb3ZlIFRpdGxlcyBJbnRvIFdpbmRvd3Ncbi0gQWx3YXlzIFNob3cgV2luZG93IFRpdGxlc1xuLSBIb3ZlciBTZWxlY3RzIFdpbmRvdyBGb3IgQWN0aXZhdGlvbiAoaG92ZXIgd2luZG93IHByZXZpZXcgYW5kIHByZXNzIFN1cGVyIHRvIGFjdGl2YXRlIGl0KVxuLSBGdWxsc2NyZWVuIEhvdCBDb3JuZXJcblxuRGFzaDpcbi0gU2hpZnQgKyBDbGljayBNb3ZlcyBBcHAgVG8gQ3VycmVudCBXb3Jrc3BhY2Vcbi0gSG92ZXJpbmcgSWNvbiBIaWdobGlnaHRzIEFwcCBXaW5kb3dzXG4tIFNjcm9sbCBTd2l0Y2hlcyBBcHAgV2luZG93cyBXb3Jrc3BhY2VzXG4tIFNob3cgV2luZG93cyBCZWZvcmUgQWN0aXZhdGlvblxuXG5BcHAgSWNvbiBNZW51IEl0ZW1zOlxuLSBGb3JjZSBRdWl0XG4tIE1vdmUgQXBwIHRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIENsb3NlIFdpbmRvd3Mgb24gQ3VycmVudCBXb3Jrc3BhY2VcblxuV2luZG93IFNlYXJjaCBQcm92aWRlcjpcbi0gU3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2hcbi0gRW5hYmxlIENvbW1hbmRzIGluIFNlYXJjaCBFbnRyeVxuLSBTaGlmdCBNb3ZlcyBXaW5kb3cgdG8gQ3VycmVudCBXb3Jrc3BhY2Vcbi0gQ3RybCArIFNoaWZ0IE1vdmVzIEFsbCBXaW5kb3dzIChmcm9tIHNlYXJjaCByZXN1bHQpIHRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIFNlY29uZGFyeSBDbGljayBPbiBXb3Jrc3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2giLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJuYW1lIjogIk9GUCAtIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9vdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJ1dWlkIjogIm92ZXJ2aWV3LWZlYXR1cmUtcGFja0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}, "42": {"version": "1", "sha256": "1vsp3wzdihi98349xy30q0fflxqwgza0wyxq3vp2qig7bzny6j9n", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIE92ZXJ2aWV3IGFuZCBEYXNoLlxuXG5JbmNsdWRlcyBmb2xsb3dpbmcgb3B0aW9uczpcbk92ZXJ2aWV3OlxuLSBTaGlmdCBSZW9yZGVycyBXb3Jrc3BhY2UgKFNoaWZ0ICsgc2Nyb2xsIC8gU2hpZnQgKyBQYWdlIFVwL0Rvd24pXG4tIEN0cmwgKyBTcGFjZSBBY3RpdmF0ZXMgRGFzaFxuLSBNb3ZlIFRpdGxlcyBJbnRvIFdpbmRvd3Ncbi0gQWx3YXlzIFNob3cgV2luZG93IFRpdGxlc1xuLSBIb3ZlciBTZWxlY3RzIFdpbmRvdyBGb3IgQWN0aXZhdGlvbiAoaG92ZXIgd2luZG93IHByZXZpZXcgYW5kIHByZXNzIFN1cGVyIHRvIGFjdGl2YXRlIGl0KVxuLSBGdWxsc2NyZWVuIEhvdCBDb3JuZXJcblxuRGFzaDpcbi0gU2hpZnQgKyBDbGljayBNb3ZlcyBBcHAgVG8gQ3VycmVudCBXb3Jrc3BhY2Vcbi0gSG92ZXJpbmcgSWNvbiBIaWdobGlnaHRzIEFwcCBXaW5kb3dzXG4tIFNjcm9sbCBTd2l0Y2hlcyBBcHAgV2luZG93cyBXb3Jrc3BhY2VzXG4tIFNob3cgV2luZG93cyBCZWZvcmUgQWN0aXZhdGlvblxuXG5BcHAgSWNvbiBNZW51IEl0ZW1zOlxuLSBGb3JjZSBRdWl0XG4tIE1vdmUgQXBwIHRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIENsb3NlIFdpbmRvd3Mgb24gQ3VycmVudCBXb3Jrc3BhY2VcblxuV2luZG93IFNlYXJjaCBQcm92aWRlcjpcbi0gU3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2hcbi0gRW5hYmxlIENvbW1hbmRzIGluIFNlYXJjaCBFbnRyeVxuLSBTaGlmdCBNb3ZlcyBXaW5kb3cgdG8gQ3VycmVudCBXb3Jrc3BhY2Vcbi0gQ3RybCArIFNoaWZ0IE1vdmVzIEFsbCBXaW5kb3dzIChmcm9tIHNlYXJjaCByZXN1bHQpIHRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIFNlY29uZGFyeSBDbGljayBPbiBXb3Jrc3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2giLAogICJnZXR0ZXh0LWRvbWFpbiI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJuYW1lIjogIk9GUCAtIE92ZXJ2aWV3IEZlYXR1cmUgUGFjayIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vRy1kSC9vdmVydmlldy1mZWF0dXJlLXBhY2siLAogICJ1dWlkIjogIm92ZXJ2aWV3LWZlYXR1cmUtcGFja0BHLWRILmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMQp9"}}} +, {"uuid": "overview-feature-pack@G-dH.github.com", "name": "OFP - Overview Feature Pack", "pname": "ofp-overview-feature-pack", "description": "Adds useful features to the Activities Overview and Dash, including powerful window search provider.\n\nIncludes following options:\nOverview:\n- Shift Reorders Workspace (Shift + scroll / Shift + Page Up/Down)\n- Ctrl + Space Activates Dash\n- Move Titles Into Windows\n- Always Show Window Titles\n- Hover Selects Window For Activation (hover window preview and press Super to activate it)\n- Fullscreen Hot Corner\n\nDash:\n- Shift + Click Moves App To Current Workspace\n- Hovering Icon Highlights App Windows\n- Scroll Switches App Windows Workspaces\n- Show Windows Before Activation\n\nApp Icon Menu Items:\n- Force Quit\n- Move App to Current Workspace\n- Close Windows on Current Workspace\n\nSearch:\n- Enable Window Search Provider\n- Space Activates Window Search\n- Enable Commands in Search Entry\n- Shift Moves Window to Current Workspace\n- Ctrl + Shift Moves All Windows (from search result) to Current Workspace\n- Secondary Click On Workspace Activates Window Search\n\nKeywords: reorder, move, order", "link": "https://extensions.gnome.org/extension/5192/ofp-overview-feature-pack/", "shell_version_map": {"41": {"version": "1", "sha256": "1s12bydj872if4jma2zdv4xyih0rva4sq8k3mba423qd90r1ryix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIE92ZXJ2aWV3IGFuZCBEYXNoLCBpbmNsdWRpbmcgcG93ZXJmdWwgd2luZG93IHNlYXJjaCBwcm92aWRlci5cblxuSW5jbHVkZXMgZm9sbG93aW5nIG9wdGlvbnM6XG5PdmVydmlldzpcbi0gU2hpZnQgUmVvcmRlcnMgV29ya3NwYWNlIChTaGlmdCArIHNjcm9sbCAvIFNoaWZ0ICsgUGFnZSBVcC9Eb3duKVxuLSBDdHJsICsgU3BhY2UgQWN0aXZhdGVzIERhc2hcbi0gTW92ZSBUaXRsZXMgSW50byBXaW5kb3dzXG4tIEFsd2F5cyBTaG93IFdpbmRvdyBUaXRsZXNcbi0gSG92ZXIgU2VsZWN0cyBXaW5kb3cgRm9yIEFjdGl2YXRpb24gKGhvdmVyIHdpbmRvdyBwcmV2aWV3IGFuZCBwcmVzcyBTdXBlciB0byBhY3RpdmF0ZSBpdClcbi0gRnVsbHNjcmVlbiBIb3QgQ29ybmVyXG5cbkRhc2g6XG4tIFNoaWZ0ICsgQ2xpY2sgTW92ZXMgQXBwIFRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIEhvdmVyaW5nIEljb24gSGlnaGxpZ2h0cyBBcHAgV2luZG93c1xuLSBTY3JvbGwgU3dpdGNoZXMgQXBwIFdpbmRvd3MgV29ya3NwYWNlc1xuLSBTaG93IFdpbmRvd3MgQmVmb3JlIEFjdGl2YXRpb25cblxuQXBwIEljb24gTWVudSBJdGVtczpcbi0gRm9yY2UgUXVpdFxuLSBNb3ZlIEFwcCB0byBDdXJyZW50IFdvcmtzcGFjZVxuLSBDbG9zZSBXaW5kb3dzIG9uIEN1cnJlbnQgV29ya3NwYWNlXG5cblNlYXJjaDpcbi0gRW5hYmxlIFdpbmRvdyBTZWFyY2ggUHJvdmlkZXJcbi0gU3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2hcbi0gRW5hYmxlIENvbW1hbmRzIGluIFNlYXJjaCBFbnRyeVxuLSBTaGlmdCBNb3ZlcyBXaW5kb3cgdG8gQ3VycmVudCBXb3Jrc3BhY2Vcbi0gQ3RybCArIFNoaWZ0IE1vdmVzIEFsbCBXaW5kb3dzIChmcm9tIHNlYXJjaCByZXN1bHQpIHRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIFNlY29uZGFyeSBDbGljayBPbiBXb3Jrc3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2hcblxuS2V5d29yZHM6IHJlb3JkZXIsIG1vdmUsIG9yZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3ZlcnZpZXctZmVhdHVyZS1wYWNrIiwKICAibmFtZSI6ICJPRlAgLSBPdmVydmlldyBGZWF0dXJlIFBhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvb3ZlcnZpZXctZmVhdHVyZS1wYWNrIiwKICAidXVpZCI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2tARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}, "42": {"version": "1", "sha256": "1s12bydj872if4jma2zdv4xyih0rva4sq8k3mba423qd90r1ryix", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZHMgdXNlZnVsIGZlYXR1cmVzIHRvIHRoZSBBY3Rpdml0aWVzIE92ZXJ2aWV3IGFuZCBEYXNoLCBpbmNsdWRpbmcgcG93ZXJmdWwgd2luZG93IHNlYXJjaCBwcm92aWRlci5cblxuSW5jbHVkZXMgZm9sbG93aW5nIG9wdGlvbnM6XG5PdmVydmlldzpcbi0gU2hpZnQgUmVvcmRlcnMgV29ya3NwYWNlIChTaGlmdCArIHNjcm9sbCAvIFNoaWZ0ICsgUGFnZSBVcC9Eb3duKVxuLSBDdHJsICsgU3BhY2UgQWN0aXZhdGVzIERhc2hcbi0gTW92ZSBUaXRsZXMgSW50byBXaW5kb3dzXG4tIEFsd2F5cyBTaG93IFdpbmRvdyBUaXRsZXNcbi0gSG92ZXIgU2VsZWN0cyBXaW5kb3cgRm9yIEFjdGl2YXRpb24gKGhvdmVyIHdpbmRvdyBwcmV2aWV3IGFuZCBwcmVzcyBTdXBlciB0byBhY3RpdmF0ZSBpdClcbi0gRnVsbHNjcmVlbiBIb3QgQ29ybmVyXG5cbkRhc2g6XG4tIFNoaWZ0ICsgQ2xpY2sgTW92ZXMgQXBwIFRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIEhvdmVyaW5nIEljb24gSGlnaGxpZ2h0cyBBcHAgV2luZG93c1xuLSBTY3JvbGwgU3dpdGNoZXMgQXBwIFdpbmRvd3MgV29ya3NwYWNlc1xuLSBTaG93IFdpbmRvd3MgQmVmb3JlIEFjdGl2YXRpb25cblxuQXBwIEljb24gTWVudSBJdGVtczpcbi0gRm9yY2UgUXVpdFxuLSBNb3ZlIEFwcCB0byBDdXJyZW50IFdvcmtzcGFjZVxuLSBDbG9zZSBXaW5kb3dzIG9uIEN1cnJlbnQgV29ya3NwYWNlXG5cblNlYXJjaDpcbi0gRW5hYmxlIFdpbmRvdyBTZWFyY2ggUHJvdmlkZXJcbi0gU3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2hcbi0gRW5hYmxlIENvbW1hbmRzIGluIFNlYXJjaCBFbnRyeVxuLSBTaGlmdCBNb3ZlcyBXaW5kb3cgdG8gQ3VycmVudCBXb3Jrc3BhY2Vcbi0gQ3RybCArIFNoaWZ0IE1vdmVzIEFsbCBXaW5kb3dzIChmcm9tIHNlYXJjaCByZXN1bHQpIHRvIEN1cnJlbnQgV29ya3NwYWNlXG4tIFNlY29uZGFyeSBDbGljayBPbiBXb3Jrc3BhY2UgQWN0aXZhdGVzIFdpbmRvdyBTZWFyY2hcblxuS2V5d29yZHM6IHJlb3JkZXIsIG1vdmUsIG9yZGVyIiwKICAiZ2V0dGV4dC1kb21haW4iOiAib3ZlcnZpZXctZmVhdHVyZS1wYWNrIiwKICAibmFtZSI6ICJPRlAgLSBPdmVydmlldyBGZWF0dXJlIFBhY2siLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL0ctZEgvb3ZlcnZpZXctZmVhdHVyZS1wYWNrIiwKICAidXVpZCI6ICJvdmVydmlldy1mZWF0dXJlLXBhY2tARy1kSC5naXRodWIuY29tIiwKICAidmVyc2lvbiI6IDEKfQ=="}}} +, {"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": "A simple extension that adds the current time to the date menu.", "link": "https://extensions.gnome.org/extension/5204/time-in-date-menu/", "shell_version_map": {"38": {"version": "1", "sha256": "14dma9s71fza2pvd41p8lxp9k2pgzclx3x3vz96znl0nr8lg0rr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IGFkZHMgdGhlIGN1cnJlbnQgdGltZSB0byB0aGUgZGF0ZSBtZW51LiIsCiAgIm5hbWUiOiAiVGltZSBpbiBkYXRlIG1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LbmVkbWUvVGltZS1pbi1kYXRlLW1lbnUiLAogICJ1dWlkIjogInRpbWUtaW4tZGF0ZS1tZW51QGtuZWRtZSIsCiAgInZlcnNpb24iOiAxCn0="}, "40": {"version": "1", "sha256": "14dma9s71fza2pvd41p8lxp9k2pgzclx3x3vz96znl0nr8lg0rr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IGFkZHMgdGhlIGN1cnJlbnQgdGltZSB0byB0aGUgZGF0ZSBtZW51LiIsCiAgIm5hbWUiOiAiVGltZSBpbiBkYXRlIG1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LbmVkbWUvVGltZS1pbi1kYXRlLW1lbnUiLAogICJ1dWlkIjogInRpbWUtaW4tZGF0ZS1tZW51QGtuZWRtZSIsCiAgInZlcnNpb24iOiAxCn0="}, "41": {"version": "1", "sha256": "14dma9s71fza2pvd41p8lxp9k2pgzclx3x3vz96znl0nr8lg0rr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IGFkZHMgdGhlIGN1cnJlbnQgdGltZSB0byB0aGUgZGF0ZSBtZW51LiIsCiAgIm5hbWUiOiAiVGltZSBpbiBkYXRlIG1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LbmVkbWUvVGltZS1pbi1kYXRlLW1lbnUiLAogICJ1dWlkIjogInRpbWUtaW4tZGF0ZS1tZW51QGtuZWRtZSIsCiAgInZlcnNpb24iOiAxCn0="}, "42": {"version": "1", "sha256": "14dma9s71fza2pvd41p8lxp9k2pgzclx3x3vz96znl0nr8lg0rr3", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkEgc2ltcGxlIGV4dGVuc2lvbiB0aGF0IGFkZHMgdGhlIGN1cnJlbnQgdGltZSB0byB0aGUgZGF0ZSBtZW51LiIsCiAgIm5hbWUiOiAiVGltZSBpbiBkYXRlIG1lbnUiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzYiLAogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9LbmVkbWUvVGltZS1pbi1kYXRlLW1lbnUiLAogICJ1dWlkIjogInRpbWUtaW4tZGF0ZS1tZW51QGtuZWRtZSIsCiAgInZlcnNpb24iOiAxCn0="}}} +, {"uuid": "suspend-to-topbar@madebysteven.nl", "name": "Suspend button in topbar", "pname": "suspend-button-in-top-bar", "description": "Suspend your computer via a topbar button, added settings to the fork for asking to suspend or cancel. Original project: https://github.com/trofosila/suspend-to-topbar", "link": "https://extensions.gnome.org/extension/5213/suspend-button-in-top-bar/", "shell_version_map": {"38": {"version": "4", "sha256": "1gwf4axjwvwmlribsv6g0w1xdifdxxbr5mjjp6yl3xkz6rkbip9w", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlN1c3BlbmQgeW91ciBjb21wdXRlciB2aWEgYSB0b3BiYXIgYnV0dG9uLCBhZGRlZCBzZXR0aW5ncyB0byB0aGUgZm9yayBmb3IgYXNraW5nIHRvIHN1c3BlbmQgb3IgY2FuY2VsLiBPcmlnaW5hbCBwcm9qZWN0OiBodHRwczovL2dpdGh1Yi5jb20vdHJvZm9zaWxhL3N1c3BlbmQtdG8tdG9wYmFyIiwKICAibmFtZSI6ICJTdXNwZW5kIGJ1dHRvbiBpbiB0b3BiYXIiLAogICJzZXR0aW5ncy1zY2hlbWEiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuc3VzcGVuZC10by10b3BiYXIiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9zdGV2ZW5kZWpvbmdubC9zdXNwZW5kLXRvLXRvcGJhciIsCiAgInV1aWQiOiAic3VzcGVuZC10by10b3BiYXJAbWFkZWJ5c3RldmVuLm5sIiwKICAidmVyc2lvbiI6IDQKfQ=="}}} +, {"uuid": "mutter-primary-gpu@zaidka.github.io", "name": "Mutter Primary GPU", "pname": "mutter-primary-gpu", "description": "Override primary GPU selection for Wayland", "link": "https://extensions.gnome.org/extension/5218/mutter-primary-gpu/", "shell_version_map": {"42": {"version": "3", "sha256": "0i7q860mzk65cbqsm9q29sjg8k6ai8kv715rkw1wb2lx2xig434a", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIk92ZXJyaWRlIHByaW1hcnkgR1BVIHNlbGVjdGlvbiBmb3IgV2F5bGFuZCIsCiAgIm5hbWUiOiAiTXV0dGVyIFByaW1hcnkgR1BVIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL3phaWRrYS9tdXR0ZXItcHJpbWFyeS1ncHUiLAogICJ1dWlkIjogIm11dHRlci1wcmltYXJ5LWdwdUB6YWlka2EuZ2l0aHViLmlvIiwKICAidmVyc2lvbiI6IDMKfQ=="}}} +, {"uuid": "tophat@fflewddur.github.io", "name": "TopHat", "pname": "tophat", "description": "An elegant system resource monitor.", "link": "https://extensions.gnome.org/extension/5219/tophat/", "shell_version_map": {"38": {"version": "2", "sha256": "17z076nccql06w316bwvznfvmsn09knzkbca8s3vg2i8mv1nm1hz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IuIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "40": {"version": "2", "sha256": "17z076nccql06w316bwvznfvmsn09knzkbca8s3vg2i8mv1nm1hz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IuIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "41": {"version": "2", "sha256": "17z076nccql06w316bwvznfvmsn09knzkbca8s3vg2i8mv1nm1hz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IuIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}, "42": {"version": "2", "sha256": "17z076nccql06w316bwvznfvmsn09knzkbca8s3vg2i8mv1nm1hz", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuIGVsZWdhbnQgc3lzdGVtIHJlc291cmNlIG1vbml0b3IuIiwKICAibmFtZSI6ICJUb3BIYXQiLAogICJzaGVsbC12ZXJzaW9uIjogWwogICAgIjMuMzgiLAogICAgIjQwIiwKICAgICI0MSIsCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9mZmxld2RkdXIvdG9waGF0IiwKICAidXVpZCI6ICJ0b3BoYXRAZmZsZXdkZHVyLmdpdGh1Yi5pbyIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"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": "2", "sha256": "1lf0kf6n4v2hqs15lfnk6dxvqf71p347730qpzb0h17b621bybfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaC1hbmltYXRvciIsCiAgInV1aWQiOiAiZGFzaC1hbmltYXRvckBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "41": {"version": "2", "sha256": "1lf0kf6n4v2hqs15lfnk6dxvqf71p347730qpzb0h17b621bybfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaC1hbmltYXRvciIsCiAgInV1aWQiOiAiZGFzaC1hbmltYXRvckBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}, "42": {"version": "2", "sha256": "1lf0kf6n4v2hqs15lfnk6dxvqf71p347730qpzb0h17b621bybfc", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFuaW1hdGUgdGhlIGljb25zIG9mIGRhc2ggdG8gZG9jayIsCiAgImdldHRleHQtZG9tYWluIjogImRhc2gtYW5pbWF0b3IiLAogICJuYW1lIjogIkRhc2ggdG8gRG9jayBBbmltYXRvciIsCiAgIm9yaWdpbmFsLWF1dGhvcnMiOiBbCiAgICAiaWNlZG1hbiIKICBdLAogICJzY2hlbWEtaWQiOiAib3JnLmdub21lLnNoZWxsLmV4dGVuc2lvbnMuZGFzaC1hbmltYXRvciIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDAiLAogICAgIjQxIiwKICAgICI0MiIKICBdLAogICJ1cmwiOiAiaHR0cHM6Ly9naXRodWIuY29tL2ljZWRtYW4vZGFzaC1hbmltYXRvciIsCiAgInV1aWQiOiAiZGFzaC1hbmltYXRvckBpY2VkbWFuLmdpdGh1Yi5jb20iLAogICJ2ZXJzaW9uIjogMgp9"}}} +, {"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": "2", "sha256": "0dyjzqijgx96dzj76hl2n1cnpv67lmm29qa4g7800a43dyg4d3f5", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIlVzZSA0IGZpbmdlcnMgc3dpcGUgdG8gY2hhbmdlIHdvcmtzcGFjZSBpbnN0ZWFkIG9mIDMuIiwKICAibmFtZSI6ICJTd2FwIEZpbmdlciBHZXN0dXJlcyAoMyB0byA0KSIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9pY2VkbWFuL3N3YXAtZmluZ2VyLWdlc3R1cmVzLTMtNCIsCiAgInV1aWQiOiAic3dhcC1maW5nZXItZ2VzdHVyZXMtMy00QGljZWRtYW4uZ2l0aHViLmNvbSIsCiAgInZlcnNpb24iOiAyCn0="}}} +, {"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": "6", "sha256": "1rnxl87ff0jhw9zgwgby6wbjvvy29wl0h9q4p6yvfikn1bpxzw7r", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFwcGxpZXMgZ2VuZXJhdGVkIGxpYmFkd2FpdGEgdGhlbWUgZnJvbSB3YWxscGFwZXIgdXNpbmcgTWF0ZXJpYWwgWW91IiwKICAibmFtZSI6ICJNYXRlcmlhbCBZb3UgQ29sb3IgVGhlbWluZyIsCiAgInNoZWxsLXZlcnNpb24iOiBbCiAgICAiNDIiCiAgXSwKICAidXJsIjogImh0dHBzOi8vZ2l0aHViLmNvbS9hdmFuaXNoc3ViYmlhaC9tYXRlcmlhbC15b3UtdGhlbWUiLAogICJ1dWlkIjogIm1hdGVyaWFsLXlvdS10aGVtZUBhc3ViYmlhaC5jb20iLAogICJ2ZXJzaW9uIjogNgp9"}}} +, {"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": "4", "sha256": "1dj0yzpbn1iv20ky29nbbv292p1mlg39whx1bpajdhypz687rp09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veWlsb3p0L3JvdW5kZWQtd2luZG93LWNvcm5lcnMiLAogICJ1dWlkIjogInJvdW5kZWQtd2luZG93LWNvcm5lcnNAeWlsb3p0IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "41": {"version": "4", "sha256": "1dj0yzpbn1iv20ky29nbbv292p1mlg39whx1bpajdhypz687rp09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veWlsb3p0L3JvdW5kZWQtd2luZG93LWNvcm5lcnMiLAogICJ1dWlkIjogInJvdW5kZWQtd2luZG93LWNvcm5lcnNAeWlsb3p0IiwKICAidmVyc2lvbiI6IDQKfQ=="}, "42": {"version": "4", "sha256": "1dj0yzpbn1iv20ky29nbbv292p1mlg39whx1bpajdhypz687rp09", "metadata": "ewogICJfZ2VuZXJhdGVkIjogIkdlbmVyYXRlZCBieSBTd2VldFRvb3RoLCBkbyBub3QgZWRpdCIsCiAgImRlc2NyaXB0aW9uIjogIkFkZCByb3VuZGVkIGNvcm5lcnMgZm9yIGFsbCB3aW5kb3dzIiwKICAibmFtZSI6ICJSb3VuZGVkIFdpbmRvdyBDb3JuZXJzIiwKICAic2hlbGwtdmVyc2lvbiI6IFsKICAgICI0MCIsCiAgICAiNDEiLAogICAgIjQyIgogIF0sCiAgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20veWlsb3p0L3JvdW5kZWQtd2luZG93LWNvcm5lcnMiLAogICJ1dWlkIjogInJvdW5kZWQtd2luZG93LWNvcm5lcnNAeWlsb3p0IiwKICAidmVyc2lvbiI6IDQKfQ=="}}} ] diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix index ce2c1f2f14..def8e297b5 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/make/default.nix @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { "GNUSTEP_INSTALLATION_DOMAIN=SYSTEM" ]; - buildInputs = [ clang which libobjc ]; + nativeBuildInputs = [ clang which ]; + buildInputs = [ libobjc ]; + patches = [ ./fixup-paths.patch ]; setupHook = ./setup-hook.sh; meta = { diff --git a/third_party/nixpkgs/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/make/gsmakeDerivation.nix index eff7f3eac8..11aa53b77b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnustep/make/gsmakeDerivation.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnustep/make/gsmakeDerivation.nix @@ -1,7 +1,7 @@ { lib, stdenv, make, makeWrapper, which }: -{ buildInputs ? [], ...} @ args: +{ nativeBuildInputs ? [], ...} @ args: stdenv.mkDerivation (args // { - buildInputs = [ makeWrapper make which ] ++ buildInputs; + nativeBuildInputs = [ makeWrapper make which ] ++ nativeBuildInputs; builder = ./builder.sh; setupHook = ./setup-hook.sh; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix index b83289056d..80312574f3 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -12,6 +12,7 @@ , lxqt-build-tools , libfm-qt , libexif +, menu-cache , lxqtUpdateScript }: @@ -42,6 +43,7 @@ mkDerivation rec { xorg.libpthreadstubs xorg.libXdmcp libexif + menu-cache ]; passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index e5f3246b06..d5bfb1dd3b 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , pkg-config +, libexif , lxqt , qtbase , qttools @@ -32,6 +33,7 @@ mkDerivation rec { ]; buildInputs = [ + libexif qtbase qttools qtx11extras diff --git a/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix index c88e3a72ea..1a35169d5a 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , gettext @@ -12,10 +13,14 @@ , texlive , mate , wrapGAppsHook -, enableEpub ? true, webkitgtk -, enableDjvu ? true, djvulibre -, enablePostScript ? true, libspectre -, enableXps ? true, libgxps +, enableEpub ? true +, webkitgtk +, enableDjvu ? true +, djvulibre +, enablePostScript ? true +, libspectre +, enableXps ? true +, libgxps , enableImages ? false , mateUpdateScript }: @@ -47,7 +52,7 @@ stdenv.mkDerivation rec { mate.caja mate.mate-desktop hicolor-icon-theme - texlive.bin.core # for synctex, used by the pdf back-end + texlive.bin.core # for synctex, used by the pdf back-end ] ++ optionals enableDjvu [ djvulibre ] ++ optionals enableEpub [ webkitgtk ] diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix index 0d347b39f1..3806d8cf48 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchurl, substituteAll -, pkg-config, gobject-introspection, gdk-pixbuf -, gtk3, mate, python3, dropbox, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, gobject-introspection +, gdk-pixbuf +, gtk3 +, mate +, python3 +, dropbox +, mateUpdateScript +}: let dropboxd = "${dropbox}/bin/dropbox"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix index 25563c5d5a..cc3a6ce30c 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript -, glib, substituteAll }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, gupnp +, mate +, imagemagick +, wrapGAppsHook +, mateUpdateScript +, glib +, substituteAll +}: stdenv.mkDerivation rec { pname = "caja-extensions"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix index dd9ab9be1d..4de6d5d6d7 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/caja-with-extensions/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ], mateUpdateScript }: +{ stdenv +, lib +, makeWrapper +, caja-extensions +, caja +, extensions ? [ caja-extensions ] +, mateUpdateScript +}: stdenv.mkDerivation { pname = "${caja.pname}-with-extensions"; @@ -6,7 +13,9 @@ stdenv.mkDerivation { dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; inherit caja; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix index 0981826646..649f6f3c7e 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libnotify +, libxml2 +, libexif +, exempi +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "caja"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/default.nix index b9ce82e345..092d113465 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/default.nix @@ -1,14 +1,13 @@ -{ pkgs, newScope }: +{ pkgs, lib }: let - callPackage = newScope self; - - self = rec { + packages = self: with self; { # Update script tailored to mate packages from git repository - mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }: - pkgs.httpTwoLevelsUpdater { - inherit pname version odd-unstable url; + mateUpdateScript = { pname, version, odd-unstable ? true, rev-prefix ? "v", url ? null }: + pkgs.gitUpdater { + inherit pname version odd-unstable rev-prefix; + url = if url == null then "https://git.mate-desktop.org/${pname}" else url; attrPath = "mate.${pname}"; }; @@ -100,4 +99,4 @@ let }; -in self +in lib.makeScope pkgs.newScope packages diff --git a/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix index 7fde8fb195..98e03044ad 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, gtk3 +, file +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "engrampa"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix index 9862c3059d..45f9a714c2 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, exempi +, lcms2 +, libexif +, libjpeg +, librsvg +, libxml2 +, libpeas +, shared-mime-info +, gtk3 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "eom"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix index d7969f55ef..4a0e1b604a 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libxklavier +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "libmatekbd"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1b8iv2hmy8z2zzdsx8j5g583ddxh178bq8dnlqng9ifbn35fh3i2"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ gtk3 libxklavier ]; + buildInputs = [ + gtk3 + libxklavier + ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix index 2ef34f2ea6..5021a0f870 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,6 +1,14 @@ -{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib -, alsaSupport ? stdenv.isLinux, alsa-lib -, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio +{ config +, lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, alsaSupport ? stdenv.isLinux +, alsa-lib +, pulseaudioSupport ? config.pulseaudio or true +, libpulseaudio , ossSupport ? false , mateUpdateScript }: @@ -14,11 +22,16 @@ stdenv.mkDerivation rec { sha256 = "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ glib ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio; + buildInputs = [ + glib + ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio; configureFlags = lib.optional ossSupport "--enable-oss"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix index 3d99b0ccd8..f68d33a4a5 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/libmateweather/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libsoup +, tzdata +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "libmateweather"; @@ -9,9 +18,16 @@ stdenv.mkDerivation rec { sha256 = "05bvc220p135l6qnhh3qskljxffds0f7fjbjnrpq524w149rgzd7"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ gtk3 libsoup tzdata ]; + buildInputs = [ + gtk3 + libsoup + tzdata + ]; configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" diff --git a/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix index 597538a9f8..612a2c22b1 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/marco/default.nix @@ -1,5 +1,22 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop -, libXdamage, libXpresent, libstartup_notification, gnome, glib, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, libcanberra-gtk3 +, libgtop +, libXdamage +, libXpresent +, libstartup_notification +, gnome +, glib +, gtk3 +, mate-settings-daemon +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "marco"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix index 30b51e9ed5..8fafe4237d 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-applets/default.nix @@ -1,14 +1,37 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, dbus-glib, glib, gtk3, gtksourceview3 -, gucharmap, libmateweather, libnl, libwnck, libgtop, libxml2, libnotify, mate-panel, polkit -, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, dbus-glib +, glib +, gtk3 +, gtksourceview3 +, gucharmap +, libmateweather +, libnl +, libwnck +, libgtop +, libxml2 +, libnotify +, mate-panel +, polkit +, upower +, wirelesstools +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-applets"; - version = "1.26.0"; + version = "1.26.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xy9dwiqvmimqshbfq80jxq65aznlgx491lqq8rl4x8c9sdl7q5p"; + sha256 = "Orj2HbN23DM85MGHIsY6B/qz6OEnK34OCXrUWXsXwsI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix index 3076a7170c..cb006cf532 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, gettext +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-backgrounds"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix index b26347f733..12ea1adf55 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-calc/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libmpc, libxml2, mpfr, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, libmpc +, libxml2 +, mpfr +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-calc"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix index c3d2910e86..e247eef07c 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-common/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-common"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix index 58828aa52b..25d8f889d3 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib -, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, glib -, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, dbus-glib +, libxklavier +, libcanberra-gtk3 +, librsvg +, libappindicator-gtk3 +, glib +, desktop-file-utils +, dconf +, gtk3 +, polkit +, mate +, hicolor-icon-theme +, wrapGAppsHook , mateUpdateScript }: diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix index e4928ac748..85d6ca4053 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, isocodes +, gnome +, gtk3 +, dconf +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-desktop"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 69f780f608..0b46d092c7 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gtk3 +, mate +, hicolor-icon-theme +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-icon-theme-faenza"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; - nativeBuildInputs = [ autoreconfHook gtk3 ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; - propagatedBuildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; + propagatedBuildInputs = [ + mate.mate-icon-theme + hicolor-icon-theme + ]; dontDropIconThemeCache = true; @@ -23,12 +37,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { inherit pname version; }; + passthru.updateScript = mateUpdateScript { + inherit pname version; + url = "https://github.com/mate-desktop-legacy-archive/mate-icon-theme-faenza"; + }; meta = with lib; { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2Plus; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = teams.mate.members; }; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix index 001b6e4187..0f4f7a71e2 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, iconnamingutils +, librsvg +, gtk3 +, hicolor-icon-theme +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-icon-theme"; @@ -9,9 +19,15 @@ stdenv.mkDerivation rec { sha256 = "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1"; }; - nativeBuildInputs = [ pkg-config gettext iconnamingutils ]; + nativeBuildInputs = [ + pkg-config + gettext + iconnamingutils + ]; - buildInputs = [ librsvg ]; + buildInputs = [ + librsvg + ]; propagatedBuildInputs = [ hicolor-icon-theme diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix index 08985608cd..be5db13e11 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libindicator-gtk3 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix index 839e1dc203..5663821ab4 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, libtool +, libxml2 +, libcanberra-gtk3 +, gtk3 +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-media"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix index 2d384d4687..cab4bc0b16 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-menus/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, gobject-introspection +, python3 +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-menus"; @@ -9,9 +18,16 @@ stdenv.mkDerivation rec { sha256 = "1r7zf64aclaplz77hkl9kq0xnz6jk1l49z64i8v56c41pm59c283"; }; - nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; + nativeBuildInputs = [ + pkg-config + gettext + gobject-introspection + ]; - buildInputs = [ glib python3 ]; + buildInputs = [ + glib + python3 + ]; makeFlags = [ "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix index f9c4737bab..fbbedce99a 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libwnck +, libfakekey +, libXtst +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-netbook"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix index a66f8de434..1e79e77869 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,5 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, - libnotify, libwnck, gtk3, libxml2, mate-desktop, mate-panel, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, libcanberra-gtk3 +, libnotify +, libwnck +, gtk3 +, libxml2 +, mate-desktop +, mate-panel +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix index 77569e1166..258fe5f68f 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, glib +, libwnck +, librsvg +, libxml2 +, dconf +, gtk3 +, mate +, hicolor-icon-theme +, gobject-introspection +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-panel"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix index 9b1d77d782..1c67e62bb8 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, gobject-introspection +, libappindicator-gtk3 +, libindicator-gtk3 +, polkit +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-polkit"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix index 72f9ba93a4..d77fb6b5b2 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, libsecret, dbus-glib, upower, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, itstool +, libxml2 +, mate-panel +, libnotify +, libcanberra-gtk3 +, libsecret +, dbus-glib +, upower +, gtk3 +, libtool +, polkit +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -17,17 +36,17 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib - itstool - libxml2 - libcanberra-gtk3 - gtk3 - libsecret - libnotify - dbus-glib - upower - polkit - mate-panel + glib + itstool + libxml2 + libcanberra-gtk3 + gtk3 + libsecret + libnotify + dbus-glib + upower + polkit + mate-panel ]; configureFlags = [ "--enable-applets" ]; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix index d80a19e29b..e9994e15e6 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, dbus-glib +, libXScrnSaver +, libnotify +, libxml2 +, pam +, systemd +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-screensaver"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix index 6faceee002..48a16c84d1 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify -, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, libxml2 +, libxslt +, libatasmart +, libnotify +, lm_sensors +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix index dba5c374f9..03a18008e4 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,6 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd, - libSM, libXtst, gtk3, libepoxy, polkit, hicolor-icon-theme, mate, - wrapGAppsHook, fetchpatch, mateUpdateScript +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, xtrans +, dbus-glib +, systemd +, libSM +, libXtst +, gtk3 +, libepoxy +, polkit +, hicolor-icon-theme +, mate +, wrapGAppsHook +, fetchpatch +, mateUpdateScript }: stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix index ff46b339b2..20a9a97d25 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,7 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier, - libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, - pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, - wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, dbus-glib +, libxklavier +, libcanberra-gtk3 +, libnotify +, nss +, polkit +, dconf +, gtk3 +, mate +, pulseaudioSupport ? stdenv.config.pulseaudio or true +, libpulseaudio +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-settings-daemon"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix index 8fe7a4cf2b..1bbe53c447 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix @@ -1,16 +1,31 @@ -{ stdenv, mate, glib, wrapGAppsHook }: +{ stdenv +, mate +, glib +, wrapGAppsHook +}: stdenv.mkDerivation { pname = "${mate.mate-settings-daemon.pname}-wrapped"; version = mate.mate-settings-daemon.version; - nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ glib mate.mate-control-center ]; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + glib + mate.mate-control-center + ]; + dontWrapGApps = true; + dontUnpack = true; + installPhase = '' mkdir -p $out/etc/xdg/autostart cp ${mate.mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart ''; + postFixup = '' mkdir -p $out/libexec makeWrapper ${mate.mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \ @@ -18,5 +33,6 @@ stdenv.mkDerivation { substituteInPlace $out/etc/xdg/autostart/mate-settings-daemon.desktop \ --replace "${mate.mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon" ''; + meta = mate.mate-settings-daemon.meta // { priority = -10; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix index 9b4a510b72..9da865f2dc 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtkmm3 +, libxml2 +, libgtop +, libwnck +, librsvg +, polkit +, systemd +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-system-monitor"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix index fcae87a869..9f19d905ca 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript, nixosTests }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, mate-desktop +, dconf +, vte +, pcre2 +, wrapGAppsHook +, mateUpdateScript +, nixosTests +}: stdenv.mkDerivation rec { pname = "mate-terminal"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix index 2745019762..af186e4c5a 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-themes/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3, - gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, mate-icon-theme +, gtk2 +, gtk3 +, gtk_engines +, gtk-engine-murrine +, gdk-pixbuf +, librsvg +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-themes"; @@ -10,11 +22,23 @@ stdenv.mkDerivation rec { sha256 = "1avgzccdmr7y18rnp3xrhwk82alv2dlig3wh7ivgahcqdiiavrb1"; }; - nativeBuildInputs = [ pkg-config gettext gtk3 ]; + nativeBuildInputs = [ + pkg-config + gettext + gtk3 + ]; - buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; + buildInputs = [ + mate-icon-theme + gtk2 + gtk_engines + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; dontDropIconThemeCache = true; @@ -24,10 +48,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = mateUpdateScript { - inherit pname version; - url = "https://pub.mate-desktop.org/releases/themes"; - }; + passthru.updateScript = mateUpdateScript { inherit pname version; }; meta = with lib; { description = "A set of themes from MATE"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix index ecbe2e667a..f24b02e793 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, gettext +, itstool +, libxml2 +, yelp +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-user-guide"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1h620ngryqc4m8ybvc92ba8404djnm0l65f34mlw38g9ad8d9085"; }; - nativeBuildInputs = [ itstool gettext libxml2 ]; + nativeBuildInputs = [ + itstool + gettext + libxml2 + ]; - buildInputs = [ yelp ]; + buildInputs = [ + yelp + ]; postPatch = '' substituteInPlace mate-user-guide.desktop.in.in \ diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix index 264389a688..04a09d6f06 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2 -, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, dbus-glib +, libnotify +, libxml2 +, libcanberra-gtk3 +, mod_dnssd +, apacheHttpd +, hicolor-icon-theme +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-user-share"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix index 48e662f54f..13e5e5154c 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mate-utils/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3 -, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, glib +, gtk3 +, libxml2 +, libgtop +, libcanberra-gtk3 +, inkscape +, udisks2 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-utils"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix index 6388b2319e..a4c08eba61 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,15 @@ -{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection, mateUpdateScript }: +{ lib +, python3 +, fetchurl +, pkg-config +, gettext +, mate +, gtk3 +, glib +, wrapGAppsHook +, gobject-introspection +, mateUpdateScript +}: python3.pkgs.buildPythonApplication rec { pname = "mozo"; @@ -12,11 +23,22 @@ python3.pkgs.buildPythonApplication rec { sha256 = "DyRCmjsDe9BojsTDkdnYeB5Csj7zRfXlCvHnLF7y+jk="; }; - nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ + pkg-config + gettext + gobject-introspection + wrapGAppsHook + ]; - propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ]; + propagatedBuildInputs = [ + mate.mate-menus + python3.pkgs.pygobject3 + ]; - buildInputs = [ gtk3 glib ]; + buildInputs = [ + gtk3 + glib + ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix index 53b0251229..76ea344a88 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/pluma/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 -, adwaita-icon-theme, gtksourceview4, libpeas, mate-desktop, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, perl +, itstool +, isocodes +, enchant +, libxml2 +, python3 +, adwaita-icon-theme +, gtksourceview4 +, libpeas +, mate-desktop +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "pluma"; diff --git a/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix b/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix index 452a7943d6..0b0a1a833f 100644 --- a/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/mate/python-caja/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, mate +, python3Packages +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "python-caja"; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh index ad12c22256..549f3e3c94 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.4/ -A '*.tar.xz' ) diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix index 847ef41ee8..74c6b1b7fa 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix @@ -61,7 +61,6 @@ mkDerivation { CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ]; - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; 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/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix index f7c02d8699..4cffaba594 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/srcs.nix @@ -4,427 +4,427 @@ { bluedevil = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/bluedevil-5.25.3.tar.xz"; - sha256 = "059nm5rd5l8ql78slrjcgkjhka7g1rnh0f1nbgf57qccs7wp6qb5"; - name = "bluedevil-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/bluedevil-5.25.4.tar.xz"; + sha256 = "1cygnmigwqx1mqynfafcypkvf9bmz05rmrfwlxsksvll8yd9xn84"; + name = "bluedevil-5.25.4.tar.xz"; }; }; breeze = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-5.25.3.tar.xz"; - sha256 = "0za75ckgfcdxrh2qxgyl2c1273g2xqwmd55njsis1yvwryadypqw"; - name = "breeze-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-5.25.4.tar.xz"; + sha256 = "0lw0vj07z8l19v2z31d601kfanqixy3dbsv0lf8q273xv3li9sbp"; + name = "breeze-5.25.4.tar.xz"; }; }; breeze-grub = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-grub-5.25.3.tar.xz"; - sha256 = "12l6skbbr4wv86k5f8969lg9m30x2nrgm38w0mr7fnsqavpbm7v6"; - name = "breeze-grub-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-grub-5.25.4.tar.xz"; + sha256 = "10n380h77czwgbpcjhriai43pk9q08l9j819nqm9wbwmsw7gj31s"; + name = "breeze-grub-5.25.4.tar.xz"; }; }; breeze-gtk = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-gtk-5.25.3.tar.xz"; - sha256 = "1nmnxrhidv420bqm97cgmck44kzi6sdqaqg3bim07hbnzbq76d6r"; - name = "breeze-gtk-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-gtk-5.25.4.tar.xz"; + sha256 = "1x9a74f2anybvgmj4yl7pzz14jckjly55sb8hhlyrd1mp2k8p4mi"; + name = "breeze-gtk-5.25.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/breeze-plymouth-5.25.3.tar.xz"; - sha256 = "1lvsr48mrfjjvs132x2bn4dpwals8k8xinddn9nxykvqw5fiw3wd"; - name = "breeze-plymouth-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/breeze-plymouth-5.25.4.tar.xz"; + sha256 = "0wfhhaknvy51zrgfkcjrgc5s3q8y3pqb4r92nr37055cdvncwz79"; + name = "breeze-plymouth-5.25.4.tar.xz"; }; }; discover = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/discover-5.25.3.tar.xz"; - sha256 = "0bdg5gxl4zymmy44pvxs9nlk71psdra3778z20ss1j1k3x8dhlrs"; - name = "discover-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/discover-5.25.4.tar.xz"; + sha256 = "154sjr7c8dwlf1m22vh3wqiyfii8xpmxmfrf36i9r0xyb0zb5zg6"; + name = "discover-5.25.4.tar.xz"; }; }; drkonqi = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/drkonqi-5.25.3.tar.xz"; - sha256 = "11g6pqxb4gjcg9jsm3z9yiqljkks30i2mvanvas5ds1y4py3q7a1"; - name = "drkonqi-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/drkonqi-5.25.4.tar.xz"; + sha256 = "06na44x22bxd94r24xkzc373d0rhmv6l1awfq0bzh9cxpy8yg3f4"; + name = "drkonqi-5.25.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kactivitymanagerd-5.25.3.tar.xz"; - sha256 = "1095rmvgc9fzflpd9l1kzwdgk5zh7wxyyx7vzzb1kpdhvg4nwx57"; - name = "kactivitymanagerd-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kactivitymanagerd-5.25.4.tar.xz"; + sha256 = "1cpz08jkmxw9576h9mkn15vwg3bxgk8k6w4f38rkiasxzj6zfamd"; + name = "kactivitymanagerd-5.25.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kde-cli-tools-5.25.3.tar.xz"; - sha256 = "0m8v51ngxfwjianvw1ydr2dpblgik8kv7zw8mi95361kck9jh31h"; - name = "kde-cli-tools-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kde-cli-tools-5.25.4.tar.xz"; + sha256 = "00p6vm9qw871hjclvw21nh93dq60r1ylb95hscx917gfx42dan8x"; + name = "kde-cli-tools-5.25.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kde-gtk-config-5.25.3.tar.xz"; - sha256 = "0xjb0vff7mw1kfj5b472plclk80hdqxi2858m3nmkh41bl6a523r"; - name = "kde-gtk-config-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kde-gtk-config-5.25.4.tar.xz"; + sha256 = "03cr5v7sr67vhcidr87min8z1ld5dm0n6yh79c1ghp1hp5ndscl8"; + name = "kde-gtk-config-5.25.4.tar.xz"; }; }; kdecoration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kdecoration-5.25.3.tar.xz"; - sha256 = "0b6ynqkndmlac89hv339k365m7wykp9y238df62jlq4vpr1r9x9y"; - name = "kdecoration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kdecoration-5.25.4.tar.xz"; + sha256 = "1yw7qjrf0c9xl2mncasbh3c1nf3c8x1v8ccfnp540z9slqi5qfmi"; + name = "kdecoration-5.25.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kdeplasma-addons-5.25.3.tar.xz"; - sha256 = "0z976qy49dbvn8nskkrwc1zfnjd3gdzbxzwkg0ini6vypfysybqm"; - name = "kdeplasma-addons-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kdeplasma-addons-5.25.4.tar.xz"; + sha256 = "1lgmmqr798cfxmllalgzixf3v9xbiiazbn3vkcdqxcj6cjf730c0"; + name = "kdeplasma-addons-5.25.4.tar.xz"; }; }; kgamma5 = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kgamma5-5.25.3.tar.xz"; - sha256 = "10750h6pb98c39s6ijk353jahwjhnj2nqmsmspx9jdz8ig20ygm0"; - name = "kgamma5-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kgamma5-5.25.4.tar.xz"; + sha256 = "1m72dl1rxsh56pmacx0q0qda7lr4359azik2lnhw7nhs30z4p25a"; + name = "kgamma5-5.25.4.tar.xz"; }; }; khotkeys = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/khotkeys-5.25.3.tar.xz"; - sha256 = "1v4c7lljdvl56mkk8hgbrrx13jdsq7mg8ggrf3qnv1x48yi31rdj"; - name = "khotkeys-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/khotkeys-5.25.4.tar.xz"; + sha256 = "0hkicwkcjb4p4k5yh8d60h6khsvrqkhjx42aby6rxd3mgvrqd3xy"; + name = "khotkeys-5.25.4.tar.xz"; }; }; kinfocenter = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kinfocenter-5.25.3.tar.xz"; - sha256 = "17hkyraqk4cwrv3rnlbw5jby7v8yv4mfxign1f3n5ldq76v9van1"; - name = "kinfocenter-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kinfocenter-5.25.4.tar.xz"; + sha256 = "0ns2xsqghglg4ikq7w556y1kh20gs677km1vs0paw50xhi7jzbd2"; + name = "kinfocenter-5.25.4.tar.xz"; }; }; kmenuedit = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kmenuedit-5.25.3.tar.xz"; - sha256 = "0y374al92r0v5adi7jxj6lghbhjg07ym78xsx09qn48h5c0s34pp"; - name = "kmenuedit-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kmenuedit-5.25.4.tar.xz"; + sha256 = "1y3ml4jscb28nvadh7iq2y240qifv71dv2nkd32i69h52xdrvz27"; + name = "kmenuedit-5.25.4.tar.xz"; }; }; kscreen = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kscreen-5.25.3.tar.xz"; - sha256 = "0p9pzigll9b5jj232sz05znf5syycif0dzvccxds6z0yr124jlvz"; - name = "kscreen-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kscreen-5.25.4.tar.xz"; + sha256 = "1wjpyq56iw8axbjhsa82w67g54v6y3rv5nx623d1kddvlzlhh8pf"; + name = "kscreen-5.25.4.tar.xz"; }; }; kscreenlocker = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kscreenlocker-5.25.3.tar.xz"; - sha256 = "1kii3r3j89avwyb00wrw80k5sj0q4wqgmy1q0yxfps9jk729k3wc"; - name = "kscreenlocker-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kscreenlocker-5.25.4.tar.xz"; + sha256 = "0zfvkdvyqxxxgpiimqjxhavwna0z94i28ky8qmvbcmn1705x5lvx"; + name = "kscreenlocker-5.25.4.tar.xz"; }; }; ksshaskpass = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/ksshaskpass-5.25.3.tar.xz"; - sha256 = "0sfl77szvfq9c7v0gsv5nnf7h5kxigyy2z2p1cwmhm1pq4n606nk"; - name = "ksshaskpass-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/ksshaskpass-5.25.4.tar.xz"; + sha256 = "0dzhddylzigaaigacynncd5q0s4884dgr4wyrrdpqj42d47wjikz"; + name = "ksshaskpass-5.25.4.tar.xz"; }; }; ksystemstats = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/ksystemstats-5.25.3.tar.xz"; - sha256 = "0s08mazc081wxbccmb4s35i7p57an8nlxmw25lh1j83jj06gyd4f"; - name = "ksystemstats-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/ksystemstats-5.25.4.tar.xz"; + sha256 = "0ray2v90vv1j1sbd7fx4x5n7s7xwlil1zynwi4pzpgnyi13zq60x"; + name = "ksystemstats-5.25.4.tar.xz"; }; }; kwallet-pam = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwallet-pam-5.25.3.tar.xz"; - sha256 = "1i345vl0sfzg8zmz6h8hsxmx9cbdb7072avc6yz42ra9yf4372jb"; - name = "kwallet-pam-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwallet-pam-5.25.4.tar.xz"; + sha256 = "14j3xngwliqhhvw60izv5kdjvv8xhqw8cjsc4l22v8jj4m8yw2xk"; + name = "kwallet-pam-5.25.4.tar.xz"; }; }; kwayland-integration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwayland-integration-5.25.3.tar.xz"; - sha256 = "0d45wigxspvv561fjam8yiyq6277n5wgv2sn8ymvqbal8v801bjf"; - name = "kwayland-integration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwayland-integration-5.25.4.tar.xz"; + sha256 = "1iqnwcp08kg91pwm3i4grd0i4bqf8h1z0n0fhcw6l0cbhdkcad39"; + name = "kwayland-integration-5.25.4.tar.xz"; }; }; kwin = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwin-5.25.3.tar.xz"; - sha256 = "1vyh5ymvkzxsgs4904ijac6xrb5fgxpypc8mlnwcca1gd9xpr4jj"; - name = "kwin-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwin-5.25.4.tar.xz"; + sha256 = "0zahw7hd3g775a6iyglvv60h9vw52jc9pg9ffkg4mpqb00f159p8"; + name = "kwin-5.25.4.tar.xz"; }; }; kwrited = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/kwrited-5.25.3.tar.xz"; - sha256 = "133ampgha0348m5ild1dg48jpblk4c16d6nk759yywz8125wyapc"; - name = "kwrited-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/kwrited-5.25.4.tar.xz"; + sha256 = "0xn20irka7adbqfc8w6gnhwp0pbv7bz7l7g16qddv1wq3xix9053"; + name = "kwrited-5.25.4.tar.xz"; }; }; layer-shell-qt = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/layer-shell-qt-5.25.3.tar.xz"; - sha256 = "06rxqm4wh4mcszrwb2dbgpxj3dqfx0rccyyjp091lbsncqm1gib0"; - name = "layer-shell-qt-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/layer-shell-qt-5.25.4.tar.xz"; + sha256 = "0pd88nnp925l09gzq4cajjnx810df4n0ssd65i1bmvgnxynzh5i7"; + name = "layer-shell-qt-5.25.4.tar.xz"; }; }; libkscreen = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/libkscreen-5.25.3.tar.xz"; - sha256 = "1mxkrk04wcyw4xbfiyxbp5iwnhqr10yk39zx5bbjd9zag0vdi7z5"; - name = "libkscreen-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/libkscreen-5.25.4.tar.xz"; + sha256 = "17ib0sgrhmmf3f8w3fni0825xz5581av5vnz8gca41vyf12css25"; + name = "libkscreen-5.25.4.tar.xz"; }; }; libksysguard = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/libksysguard-5.25.3.tar.xz"; - sha256 = "1mrrrxjvqmrnkjwafvqrd2hlvl9gr9y4hn7dv0gf70lp5bl06i89"; - name = "libksysguard-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/libksysguard-5.25.4.tar.xz"; + sha256 = "1kzpimhkagsmqj0cky4cfav1kbzyfjaj2l5xdapnmaygbm6r8086"; + name = "libksysguard-5.25.4.tar.xz"; }; }; milou = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/milou-5.25.3.tar.xz"; - sha256 = "1xb3i5dn6r4mglci8llchjz484zsw3kqyl9ag8wch54b5cjmz4ap"; - name = "milou-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/milou-5.25.4.tar.xz"; + sha256 = "17npfn7gwiqrvy5w8vzpc38c4bgkx3vjgjkm1caizn04zfk7xar7"; + name = "milou-5.25.4.tar.xz"; }; }; oxygen = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/oxygen-5.25.3.tar.xz"; - sha256 = "0ynkmnmd1x36zn6x4chvpsrsi5rfqmk45qqxdx60x0w1hhi3x6bh"; - name = "oxygen-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/oxygen-5.25.4.tar.xz"; + sha256 = "1cd76fa2szhb3apabyvl76p8vdk97229g5sgv94xx9pr7rx8a67y"; + name = "oxygen-5.25.4.tar.xz"; }; }; oxygen-sounds = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/oxygen-sounds-5.25.3.tar.xz"; - sha256 = "1hdqdq3qxpcyfs5gsmlpb3pjvixyr1ny4qwqq18givz8jbah3vkz"; - name = "oxygen-sounds-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/oxygen-sounds-5.25.4.tar.xz"; + sha256 = "0v8j8kf86ri1z14mgqc1c6kkpsbih8rjph35sr5y0i4av9mh6p9b"; + name = "oxygen-sounds-5.25.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-browser-integration-5.25.3.tar.xz"; - sha256 = "1krf9fchs3w0r1irzrdrxgwcgfsyhm2384q0c5vp5xg7dh10xvz2"; - name = "plasma-browser-integration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-browser-integration-5.25.4.tar.xz"; + sha256 = "1l3n4psbqimfar5qsmrfp3nhgg3v9yy93rkjpvyqgdmizi44scqw"; + name = "plasma-browser-integration-5.25.4.tar.xz"; }; }; plasma-desktop = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-desktop-5.25.3.tar.xz"; - sha256 = "134dgqqak5d3427znlj138f0k48qhkzs7pqi19yn89fbzw5vg8s8"; - name = "plasma-desktop-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-desktop-5.25.4.tar.xz"; + sha256 = "1jkjc412n1wn17qrmx0sv91pzv5xjsljms3bsln6bbxj5fkhmkfm"; + name = "plasma-desktop-5.25.4.tar.xz"; }; }; plasma-disks = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-disks-5.25.3.tar.xz"; - sha256 = "1dyxa5x4v6w8fn8956wcc9mvncnjf43cpn0algp54f9ndy1jaalw"; - name = "plasma-disks-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-disks-5.25.4.tar.xz"; + sha256 = "04hs8jg7f5bm5rjcb6i6zidyamq6cfry5sm5mj6hqdj0qmn9i396"; + name = "plasma-disks-5.25.4.tar.xz"; }; }; plasma-firewall = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-firewall-5.25.3.tar.xz"; - sha256 = "0cwk4scadk4pd7v93arkrn1wgyc4d81995znp23vd9pmlaazyikv"; - name = "plasma-firewall-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-firewall-5.25.4.tar.xz"; + sha256 = "12rmf7x8dyyb1k5ycj43kn4c0wzidig4h5wdh1igrgcvyypmjjcl"; + name = "plasma-firewall-5.25.4.tar.xz"; }; }; plasma-integration = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-integration-5.25.3.tar.xz"; - sha256 = "1wsz0vbb0kj4542h7zca9yc6xz90ziv4lbm39d7dxr9hm94cdbjk"; - name = "plasma-integration-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-integration-5.25.4.tar.xz"; + sha256 = "1cbcp722pzbfiqfl5rcw6py74jbxg83k96kdx2m0g3ix1f0dmkbi"; + name = "plasma-integration-5.25.4.tar.xz"; }; }; plasma-mobile = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-mobile-5.25.3.tar.xz"; - sha256 = "1dzfbqg2zmdr0dlm99c3pj9iy6yagshlfj9x018sa0bzjysf29g3"; - name = "plasma-mobile-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-mobile-5.25.4.tar.xz"; + sha256 = "0b0n3mjlj33191jgs8xqbk35y5nglfz4d8dih3qmg3kbs81qizwy"; + name = "plasma-mobile-5.25.4.tar.xz"; }; }; plasma-nano = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-nano-5.25.3.tar.xz"; - sha256 = "00m95c1cb3g8v8w0d4vnbnjhjmr5hw7gljn8nc705mpxsx03c3kd"; - name = "plasma-nano-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-nano-5.25.4.tar.xz"; + sha256 = "1pn6025wb3w855f3vy77879qlrb266bikw3nhar1dzv3sfgxw4w9"; + name = "plasma-nano-5.25.4.tar.xz"; }; }; plasma-nm = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-nm-5.25.3.tar.xz"; - sha256 = "0k8zwjjy8d5lp1slky13fx5j6kjsbs4irz3x5fm54aki15hdcjx7"; - name = "plasma-nm-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-nm-5.25.4.tar.xz"; + sha256 = "147p572pmkrgg52pvwhzs8lvxy3rs8y622n9lj7hjc6hrlh14qk2"; + name = "plasma-nm-5.25.4.tar.xz"; }; }; plasma-pa = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-pa-5.25.3.tar.xz"; - sha256 = "17881v0fff5mbgh6rgx4a2hk9m35flqijckwlyj2kcrcsqi3aq21"; - name = "plasma-pa-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-pa-5.25.4.tar.xz"; + sha256 = "0v92jk826jj2kf11hlxh3xrxl9nsj6835ik2pmb192xbn6gpb4lm"; + name = "plasma-pa-5.25.4.tar.xz"; }; }; plasma-sdk = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-sdk-5.25.3.tar.xz"; - sha256 = "1hhffvqvxlhdyg8v7b7drb0n4fnkxlvy0xfffnnln66pknxk7s5w"; - name = "plasma-sdk-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-sdk-5.25.4.tar.xz"; + sha256 = "00s345l5jj1kfdvyyfq8718khfy88n6gyajb07n582q266mry39l"; + name = "plasma-sdk-5.25.4.tar.xz"; }; }; plasma-systemmonitor = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-systemmonitor-5.25.3.tar.xz"; - sha256 = "07mxkm0ynq0xiqc1p4iqjc4c1x7198hr15r9ysajgs0sf9bcd6hx"; - name = "plasma-systemmonitor-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-systemmonitor-5.25.4.tar.xz"; + sha256 = "1fj0vyjdk6h3f4p9aagh03hyhbf69y2qwlavs2zr7d0iadih7b4c"; + name = "plasma-systemmonitor-5.25.4.tar.xz"; }; }; plasma-tests = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-tests-5.25.3.tar.xz"; - sha256 = "0d7vhb75p2rhfbysa7bg80836ycryg4jcn91grag8y7pcq6m6zzn"; - name = "plasma-tests-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-tests-5.25.4.tar.xz"; + sha256 = "0d86zmlmagik2chagsm549yg78vy2qw3kl67skrlrmbkv82dhrz2"; + name = "plasma-tests-5.25.4.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-thunderbolt-5.25.3.tar.xz"; - sha256 = "05bdq7vdwpyyrfgvp48m8dbsjhvnaf84zhbcyjvjygvlhzdm8j57"; - name = "plasma-thunderbolt-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-thunderbolt-5.25.4.tar.xz"; + sha256 = "0hjvkss0qfmwhrsba83wfxwxhikvzf56faan325ic0iv7fdaj3ns"; + name = "plasma-thunderbolt-5.25.4.tar.xz"; }; }; plasma-vault = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-vault-5.25.3.tar.xz"; - sha256 = "1phb7rygvm2c0n0yf5xyj3xpm1apfq3knfyiasgbjl4z6aimq406"; - name = "plasma-vault-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-vault-5.25.4.tar.xz"; + sha256 = "10ym2gk46yr1vgjnm1li1shdawklvvy3yvjcanm8ic5llchbxvzq"; + name = "plasma-vault-5.25.4.tar.xz"; }; }; plasma-workspace = { - version = "5.25.3.1"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-workspace-5.25.3.1.tar.xz"; - sha256 = "09hgd1k0095s18a4147qihbsl5v8hadj7hm3zixf362sydgkal51"; - name = "plasma-workspace-5.25.3.1.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-workspace-5.25.4.tar.xz"; + sha256 = "1aw9ms6rzxrk384xzdc3sqwqs1shbnkap40vfwxp4jamjk0pyglw"; + name = "plasma-workspace-5.25.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plasma-workspace-wallpapers-5.25.3.tar.xz"; - sha256 = "15swpsqjdxxzkjw0phs4h7p3l4lfshsqv6pk3qbfbp91dd05cplh"; - name = "plasma-workspace-wallpapers-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plasma-workspace-wallpapers-5.25.4.tar.xz"; + sha256 = "1vjrfmzib17cb9r2q17rv4zmnqsk5mf55vy8kzx71djjif7gaqiy"; + name = "plasma-workspace-wallpapers-5.25.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/plymouth-kcm-5.25.3.tar.xz"; - sha256 = "0sb0gh0sh8lc13pbqkl8icjakzk0h7r3l6v3kwg0jyvmk0if1bpj"; - name = "plymouth-kcm-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/plymouth-kcm-5.25.4.tar.xz"; + sha256 = "1wbgcccc1ili3j0k1njgj1q6jl35s20gf9m25s9d3mjwd9xnxrbv"; + name = "plymouth-kcm-5.25.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.25.3"; + version = "1-5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/polkit-kde-agent-1-5.25.3.tar.xz"; - sha256 = "0j067ps86zk38r0spcfpv33mxiagdnrkyy033v8gnsiayhrp9pcm"; - name = "polkit-kde-agent-1-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/polkit-kde-agent-1-5.25.4.tar.xz"; + sha256 = "0skadgzv97vfl4n2x889fiy5gsr6n894fr5viq3rizs0qsqc68b5"; + name = "polkit-kde-agent-1-5.25.4.tar.xz"; }; }; powerdevil = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/powerdevil-5.25.3.tar.xz"; - sha256 = "1lfws0rj2kbqvgm7gb4h6gmrpa71jbqgfmvmd2n4l9bxxx73rbh2"; - name = "powerdevil-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/powerdevil-5.25.4.tar.xz"; + sha256 = "1nznjxi59xc6pmyh0vainznhp9ig1ini3i87iapayawpnpf8sdxx"; + name = "powerdevil-5.25.4.tar.xz"; }; }; qqc2-breeze-style = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/qqc2-breeze-style-5.25.3.tar.xz"; - sha256 = "1j714iaysfqkr997q94pv2abj433ps43myy37p8ss0v8pra9hn5c"; - name = "qqc2-breeze-style-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/qqc2-breeze-style-5.25.4.tar.xz"; + sha256 = "0sylffvbfdi44lmz6s78scf2p2iswf6p8g209wbd5fm1dgi6yi2z"; + name = "qqc2-breeze-style-5.25.4.tar.xz"; }; }; sddm-kcm = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/sddm-kcm-5.25.3.tar.xz"; - sha256 = "1mipvf25vjhdrww9cinp4v7g73swk364zfkyk4fypw8bccrbfpsd"; - name = "sddm-kcm-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/sddm-kcm-5.25.4.tar.xz"; + sha256 = "1gqz9j6vha8i6bra63pfqrpl5wsg9a7qz351z5rkj5jwnkw1dxl7"; + name = "sddm-kcm-5.25.4.tar.xz"; }; }; systemsettings = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/systemsettings-5.25.3.tar.xz"; - sha256 = "00n4r51qp03cwfsdrsza2nv5558zs8dyd6fywcycjd1ryqiyrl4r"; - name = "systemsettings-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/systemsettings-5.25.4.tar.xz"; + sha256 = "130739bfxl1jwkn3f4h7dnr7dv2i76g6sd2svmg0qy60cnwvcgcv"; + name = "systemsettings-5.25.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.25.3"; + version = "5.25.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.25.3/xdg-desktop-portal-kde-5.25.3.tar.xz"; - sha256 = "07pcpxq7j1b62wwds6q2niyh74dc9i2lwvka77g1ii55syybm7n7"; - name = "xdg-desktop-portal-kde-5.25.3.tar.xz"; + url = "${mirror}/stable/plasma/5.25.4/xdg-desktop-portal-kde-5.25.4.tar.xz"; + sha256 = "13gva3mci9gawlxpw4ymdma8w6lc2b3y8z36699kmzli4vib214g"; + name = "xdg-desktop-portal-kde-5.25.4.tar.xz"; }; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix index 7d5ef0a288..d58ae684fc 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/catfish/default.nix @@ -1,15 +1,29 @@ -{ lib, fetchurl, file, which, intltool, gobject-introspection, - findutils, xdg-utils, dconf, gtk3, python3Packages, xfconf, - wrapGAppsHook +{ lib +, fetchFromGitLab +, gitUpdater +, file +, which +, intltool +, gobject-introspection +, findutils +, xdg-utils +, dconf +, gtk3 +, python3Packages +, xfconf +, wrapGAppsHook }: python3Packages.buildPythonApplication rec { pname = "catfish"; - version = "4.16.3"; + version = "4.16.4"; - src = fetchurl { - url = "https://archive.xfce.org/src/apps/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-6amaYtEJgTkVCN1D88v6LVCmm9a30e7vfTC6TGc9z9o="; + src = fetchFromGitLab { + domain = "gitlab.xfce.org"; + owner = "apps"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "sha256-hdrEFdBa/4i/PF7VyEI7ObiJXLIRW+RFSe8yGnUpqRc="; }; nativeBuildInputs = [ @@ -51,6 +65,11 @@ python3Packages.buildPythonApplication rec { # Disable check because there is no test in the source distribution doCheck = false; + passthru.updateScript = gitUpdater { + inherit pname version; + rev-prefix = "${pname}-"; + }; + meta = with lib; { homepage = "https://docs.xfce.org/apps/catfish/start"; description = "Handy file search tool"; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix index 1da88a0104..884fffb35f 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/mousepad/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "mousepad"; - version = "0.5.9"; + version = "0.5.10"; odd-unstable = false; - sha256 = "sha256-xuSv2H1+/NNUAm+D8f+f5fPVR97iJ5vIDzPa3S0HLM0="; + sha256 = "sha256-AKyFCzQE6OfMzKh5Lk16W01255vPeco1II80oLqT4oM="; nativeBuildInputs = [ gobject-introspection ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/applications/ristretto/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/applications/ristretto/default.nix index 281cc78a0b..6a092fce88 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/applications/ristretto/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/applications/ristretto/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "ristretto"; - version = "0.12.2"; + version = "0.12.3"; - sha256 = "sha256-OIt92DpDAZpy/fAOauGnzsufUi+y3Ag7KblZ5EUGuyQ="; + sha256 = "sha256-Tkjl01OD6yDbKAHzZVRG7c7KnP0MURmsc0d0DbcFuFk="; buildInputs = [ glib gtk3 libexif libxfce4ui libxfce4util xfconf ]; diff --git a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 91714976f8..7cedaaca75 100644 --- a/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.16.2"; + version = "4.16.3"; - sha256 = "sha256-DkybMfkgsC8fJuhOWLzKO5f2Y8YtqzUXMH/npTv21yY="; + sha256 = "sha256-Jd1PJrIqzsutParZu8rNMuzHnycjr3eeZGXWIG3PqZY="; postPatch = '' for f in xfsettingsd/pointers.c dialogs/mouse-settings/main.c; do diff --git a/third_party/nixpkgs/pkgs/development/compilers/4th/default.nix b/third_party/nixpkgs/pkgs/development/compilers/4th/default.nix index d76a5cc733..e2fd7567f1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/4th/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/4th/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "4th"; - version = "3.64.0"; + version = "3.64.1"; src = fetchurl { url = "https://sourceforge.net/projects/forth-4th/files/${pname}-${version}/${pname}-${version}-unix.tar.gz"; - hash = "sha256-wJBekjFsFRIkhY/P/yHBQ8he+k+fGyrePGTP2Yjgpqg="; + hash = "sha256-+W6nTNsqrf3Dvr+NbSz3uJdrXVbBI3OHR5v/rs7en+M="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix index ae28923871..d6accbdbf1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bluespec/default.nix @@ -126,6 +126,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/B-Lang-org/bsc"; license = lib.licenses.bsd3; platforms = [ "x86_64-linux" ]; + mainProgram = "bsc"; # darwin fails at https://github.com/B-Lang-org/bsc/pull/35#issuecomment-583731562 # aarch64 fails, as GHC fails with "ghc: could not execute: opt" maintainers = with lib.maintainers; [ jcumming thoughtpolice ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/bupc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bupc/default.nix index 07395ed5ae..947a154a3d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bupc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bupc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "berkeley_upc"; - version = "2.22.0"; + version = "2020.12.0"; src = fetchurl { url = "http://upc.lbl.gov/download/release/berkeley_upc-${version}.tar.gz"; - sha256 = "041l215x8z1cvjcx7kwjdgiaf9rl2d778k6kiv8q09bc68nwd44m"; + sha256 = "sha256-JdpFORlXHpCQE+TivoQQnjQlxQN7C8BNfHvTOSwXbYQ="; }; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://upc.lbl.gov/"; license = licenses.mit; - platforms = with platforms; [ linux ]; + platforms = platforms.linux; maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix b/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix index 35064db543..06fac6f6a3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20220502"; + version = "20220803"; src = fetchurl { url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar"; - sha256 = "sha256-ha0y/voqnYpZ7VmAkfZ/r/Iw7KAV+2ELOfWCpFjOdd4="; + sha256 = "sha256-1h+/i2csV/rCdMVOFsoNG/HrzGfUPPEEfAeRUKnPNSs="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix index 369828ff10..7070d3d539 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "cmdstan"; - version = "2.29.2"; + version = "2.30.1"; # includes stanc binaries needed to build cmdstand src = fetchurl { url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; - sha256 = "sha256-VntTH6c//fcGyqF+szROHftB6GmTyvi6QIdf+RAzUVM="; + sha256 = "sha256-urdtzvp/TJVVlcC/BJZ3BQf8arDfWJboz4wtsKF+7bk="; }; buildFlags = [ "build" ]; @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { doCheck = true; checkInputs = [ python3 ]; + CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_BOOST_LGAMMA"; + postPatch = '' substituteInPlace stan/lib/stan_math/make/libraries \ --replace "/usr/bin/env bash" "bash" @@ -42,7 +44,7 @@ stdenv.mkDerivation rec { preFixup = "rm -rf $(pwd)"; meta = { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isLinux && stdenv.isAarch64; description = "Command-line interface to Stan"; longDescription = '' Stan is a probabilistic programming language implementing full Bayesian diff --git a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix index 9cf3bebe7e..88274ef73c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/crystal/default.nix @@ -2,6 +2,7 @@ , callPackage , fetchFromGitHub , fetchurl +, fetchpatch , lib # Dependencies , boehmgc @@ -97,6 +98,16 @@ let inherit sha256; }; + patches = lib.optionals (lib.versionOlder version "1.2.0") [ + # add support for DWARF5 debuginfo, fixes builds on recent compilers + # the PR is 8 commits from 2019, so just fetch the whole thing + # and hope it doesn't change + (fetchpatch { + url = "https://github.com/crystal-lang/crystal/pull/11399.patch"; + sha256 = "sha256-CjNpkQQ2UREADmlyLUt7zbhjXf0rTjFhNbFYLwJKkc8="; + }) + ]; + outputs = [ "out" "lib" "bin" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix index bf02d623e5..0e4baf3ce5 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dale/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { homepage = "https://github.com/tomhrr/dale"; license = licenses.bsd3; maintainers = with maintainers; [ amiloradovsky ]; - platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; # failed on Darwin: linker couldn't find the FFI lib # failed on AArch64: because LLVM 3.5 is failed there }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix index faf6ffd8a2..6eb5d10cd4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.nix @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { pname = "elm-json"; - version = "0.2.10"; + version = "0.2.12"; src = fetchurl { url = "https://github.com/zwilias/elm-json/archive/v${version}.tar.gz"; - sha256 = "sha256:03azh7wvl60h6w7ffpvl49s7jr7bxpladcm4fzcasakg26i5a71x"; + sha256 = "sha256:nlpxlPzWk3wwDgczuMI9T6DFY1YtQpQ1R4BhdPbzZBs="; }; cargoPatches = [ ./elm-json.patch ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { curl openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; - cargoSha256 = "sha256:01zasrqf1va58i52s3kwdkj1rnwy80gv00xi6npfshjirj3ix07f"; + cargoSha256 = "sha256:8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc="; # Tests perform networking and therefore can't work in sandbox doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.patch b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.patch index d7f434c8eb..54df030192 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json.patch @@ -1,24 +1,24 @@ diff --git a/Cargo.lock b/Cargo.lock -index 5440d72..6e173fa 100644 +index b9bf434..58cfe81 100644 --- a/Cargo.lock +++ b/Cargo.lock -@@ -774,15 +774,6 @@ version = "0.1.2" +@@ -685,15 +685,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" -[[package]] -name = "openssl-src" --version = "111.11.0+1.1.1h" +-version = "111.17.0+1.1.1m" -source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "380fe324132bea01f45239fadfec9343adb044615f29930d039bec1ae7b9fa5b" +-checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" - version = "0.9.58" -@@ -792,7 +783,6 @@ dependencies = [ + version = "0.9.72" +@@ -703,7 +694,6 @@ dependencies = [ "autocfg", "cc", "libc", @@ -27,17 +27,17 @@ index 5440d72..6e173fa 100644 "vcpkg", ] diff --git a/Cargo.toml b/Cargo.toml -index 4d319f2..6f4d0e5 100644 +index bc97f20..54d3b14 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -21,8 +21,8 @@ colored = "2.0" +@@ -17,8 +17,8 @@ colored = "2.0" dialoguer = "0.6" dirs = "3.0" fs2 = "0.4" --isahc = { version = "0.9", features = ["static-ssl"] } --curl = {version = "0.4", features = ["static-curl", "static-ssl", "force-system-lib-on-osx", "http2"]} -+isahc = "0.9" -+curl = {version = "0.4", features = ["force-system-lib-on-osx", "http2"]} +-isahc = { version = "1.6.0", default-features = false, features = ["static-ssl", "static-curl"] } +-curl = {version = "0.4.42", default-features = false, features = ["ssl", "static-curl", "static-ssl", "force-system-lib-on-osx"]} ++isahc = { version = "1.6.0", default-features = false } ++curl = {version = "0.4.42", default-features = false, features = ["ssl", "force-system-lib-on-osx"]} ctrlc = "3.1" console = "0.12" - + anyhow = "1.0" diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix index b8544d01ea..44ba33247b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.15"; + version = "3.1.17"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "sha256-aRevSQZsJepRcoeRf5U504FV707ZarpiG8qbD/v3OPg="; + sha256 = "sha256-xOt9Znn5kCcieRHnXk794rMpgTzoR8pIKBXv/GeKcuw="; rev = version; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json b/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json index 7a5316b9b6..bf7d2c0642 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json @@ -1,6 +1,6 @@ { "name": "emscripten", - "version": "3.1.15", + "version": "3.1.17", "private": true, "devDependencies": { "es-check": "^6.2.1", diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/11/default.nix new file mode 100644 index 0000000000..1e7e1c307c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc-arm-embedded/11/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenv +, fetchurl +, ncurses5 +, python38 +}: + +stdenv.mkDerivation rec { + pname = "gcc-arm-embedded"; + version = "11.3.rel1"; + + platform = { + aarch64-darwin = "darwin-x86_64"; # use intel binaries via rosetta + aarch64-linux = "aarch64"; + x86_64-darwin = "darwin-x86_64"; + x86_64-linux = "x86_64"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + src = fetchurl { + url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz"; + sha256 = { + aarch64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; + aarch64-linux = "0pmm5r0k5mxd5drbn2s8a7qkm8c4fi8j5y31c70yrp0qs08kqwbc"; + x86_64-darwin = "1kr9kd9p2xk84fa99zf3gz5lkww2i9spqkjigjwakfkzbva56qw2"; + x86_64-linux = "08b1w1zmj4z80k59zmlc1bf34lg8d7z65fwvp5ir2pb1d1zxh86l"; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + }; + + dontConfigure = true; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + installPhase = '' + mkdir -p $out + cp -r * $out + ''; + + preFixup = '' + find $out -type f | while read f; do + patchelf "$f" > /dev/null 2>&1 || continue + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 ]} "$f" || true + done + ''; + + meta = with lib; { + description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors"; + homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm"; + license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ]; + maintainers = with maintainers; [ prusnak ]; + platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix index 1b9f542894..1c223fa82f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/10/default.nix @@ -24,9 +24,6 @@ , libcCross ? null , threadsCross ? null # for MinGW , crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system - && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -86,7 +83,7 @@ let majorVersion = "10"; in stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + pname = "${crossNameAddon}${name}"; inherit version; builder = ../builder.sh; @@ -191,7 +188,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic; }; dontDisableStatic = true; @@ -231,9 +228,11 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - dontStrip = !stripped; - - installTargets = optional stripped "install-strip"; + inherit + (import ../common/strip-attributes.nix { inherit stdenv; }) + stripDebugList + stripDebugListTarget + preFixup; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -274,8 +273,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); + description = "GNU Compiler Collection, version ${version}"; longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix index 1dc9ed0a26..ca3a89af18 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/11/default.nix @@ -24,9 +24,6 @@ , libcCross ? null , threadsCross ? null # for MinGW , crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system - && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -92,7 +89,7 @@ let majorVersion = "11"; in stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + pname = "${crossNameAddon}${name}"; inherit version; builder = ../builder.sh; @@ -199,7 +196,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic; }; dontDisableStatic = true; @@ -239,9 +236,11 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - dontStrip = !stripped; - - installTargets = optional stripped "install-strip"; + inherit + (import ../common/strip-attributes.nix { inherit stdenv; }) + stripDebugList + stripDebugListTarget + preFixup; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -282,8 +281,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); + description = "GNU Compiler Collection, version ${version}"; longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix index 20bc9dcf44..6fdc31079a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/12/default.nix @@ -24,9 +24,6 @@ , libcCross ? null , threadsCross ? null # for MinGW , crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system - && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -89,7 +86,7 @@ let majorVersion = "12"; in stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + pname = "${crossNameAddon}${name}"; inherit version; builder = ../builder.sh; @@ -194,7 +191,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic; }; dontDisableStatic = true; @@ -234,9 +231,11 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - dontStrip = !stripped; - - installTargets = optional stripped "install-strip"; + inherit + (import ../common/strip-attributes.nix { inherit stdenv; }) + stripDebugList + stripDebugListTarget + preFixup; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -277,8 +276,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); + description = "GNU Compiler Collection, version ${version}"; longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix index 8cd0d3c9ce..bc93d6e135 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.8/default.nix @@ -28,9 +28,6 @@ , libcCross ? null , threadsCross ? null # for MinGW , crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform , gnused ? null , buildPackages }: @@ -124,7 +121,7 @@ in assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + pname = "${crossNameAddon}${name}"; inherit version; builder = ../builder.sh; @@ -198,7 +195,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform langJava langGo; + inherit version targetPlatform hostPlatform langJava langGo crossStageStatic; }; dontDisableStatic = true; @@ -238,12 +235,14 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - dontStrip = !stripped; + inherit + (import ../common/strip-attributes.nix { inherit stdenv; }) + stripDebugList + stripDebugListTarget + preFixup; doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = optional stripped "install-strip"; - # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -297,8 +296,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); + description = "GNU Compiler Collection, version ${version}"; longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix index 571d0b0231..cc675de225 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/4.9/default.nix @@ -28,9 +28,6 @@ , libcCross ? null , threadsCross ? null # for MinGW , crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform == stdenv.buildPlatform - && stdenv.targetPlatform == stdenv.hostPlatform , gnused ? null , buildPackages }: @@ -140,7 +137,7 @@ in assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + pname = "${crossNameAddon}${name}"; inherit version; builder = ../builder.sh; @@ -218,7 +215,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform langJava langGo; + inherit version targetPlatform hostPlatform langJava langGo crossStageStatic; }; dontDisableStatic = true; @@ -258,12 +255,14 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - dontStrip = !stripped; + inherit + (import ../common/strip-attributes.nix { inherit stdenv; }) + stripDebugList + stripDebugListTarget + preFixup; doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = optional stripped "install-strip"; - # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -316,8 +315,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); + description = "GNU Compiler Collection, version ${version}"; longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index 62b46df1ab..d108dc11f1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -31,9 +31,6 @@ , libcCross ? null , threadsCross ? null # for MinGW , crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system - && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -121,7 +118,7 @@ in assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + pname = "${crossNameAddon}${name}"; inherit version; builder = ../builder.sh; @@ -230,7 +227,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langJava langAda langGo; + inherit version targetPlatform hostPlatform gnatboot langJava langAda langGo crossStageStatic; }; dontDisableStatic = true; @@ -270,12 +267,14 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - dontStrip = !stripped; + inherit + (import ../common/strip-attributes.nix { inherit stdenv; }) + stripDebugList + stripDebugListTarget + preFixup; doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = optional stripped "install-strip"; - # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -328,8 +327,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); + description = "GNU Compiler Collection, version ${version}"; longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix index 1abf14c8a8..e4e1f2038d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/7/default.nix @@ -21,9 +21,6 @@ , libcCross ? null , threadsCross ? null # for MinGW , crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system - && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -94,7 +91,7 @@ let majorVersion = "7"; in stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + pname = "${crossNameAddon}${name}"; inherit version; builder = ../builder.sh; @@ -197,7 +194,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform langGo; + inherit version targetPlatform hostPlatform langGo crossStageStatic; }; dontDisableStatic = true; @@ -237,12 +234,14 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - dontStrip = !stripped; + inherit + (import ../common/strip-attributes.nix { inherit stdenv; }) + stripDebugList + stripDebugListTarget + preFixup; doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv - installTargets = optional stripped "install-strip"; - # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -282,8 +281,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); + description = "GNU Compiler Collection, version ${version}"; longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix index 2dd265b648..7e94ec61c6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/8/default.nix @@ -21,9 +21,6 @@ , libcCross ? null , threadsCross ? null # for MinGW , crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system - && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -78,7 +75,7 @@ let majorVersion = "8"; in stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + pname = "${crossNameAddon}${name}"; inherit version; builder = ../builder.sh; @@ -180,7 +177,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform langGo; + inherit version targetPlatform hostPlatform langGo crossStageStatic; }; dontDisableStatic = true; @@ -218,9 +215,11 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - dontStrip = !stripped; - - installTargets = optional stripped "install-strip"; + inherit + (import ../common/strip-attributes.nix { inherit stdenv; }) + stripDebugList + stripDebugListTarget + preFixup; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -261,8 +260,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); + description = "GNU Compiler Collection, version ${version}"; longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix index 30ae18e491..707ead542f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/9/default.nix @@ -24,9 +24,6 @@ , libcCross ? null , threadsCross ? null # for MinGW , crossStageStatic ? false -, # Strip kills static libs of other archs (hence no cross) - stripped ? stdenv.hostPlatform.system == stdenv.buildPlatform.system - && stdenv.targetPlatform.system == stdenv.hostPlatform.system , gnused ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places , buildPackages @@ -89,7 +86,7 @@ let majorVersion = "9"; in stdenv.mkDerivation ({ - pname = "${crossNameAddon}${name}${if stripped then "" else "-debug"}"; + pname = "${crossNameAddon}${name}"; inherit version; builder = ../builder.sh; @@ -193,7 +190,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit lib; - inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit; + inherit version targetPlatform hostPlatform gnatboot langAda langGo langJit crossStageStatic; }; dontDisableStatic = true; @@ -233,9 +230,11 @@ stdenv.mkDerivation ({ (targetPlatform == hostPlatform && hostPlatform == buildPlatform) (if profiledCompiler then "profiledbootstrap" else "bootstrap"); - dontStrip = !stripped; - - installTargets = optional stripped "install-strip"; + inherit + (import ../common/strip-attributes.nix { inherit stdenv; }) + stripDebugList + stripDebugListTarget + preFixup; # https://gcc.gnu.org/install/specific.html#x86-64-x-solaris210 ${if hostPlatform.system == "x86_64-solaris" then "CC" else null} = "gcc -m64"; @@ -276,8 +275,7 @@ stdenv.mkDerivation ({ meta = { homepage = "https://gcc.gnu.org/"; license = lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); + description = "GNU Compiler Collection, version ${version}"; longDescription = '' The GNU Compiler Collection includes compiler front ends for C, C++, diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh b/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh index 9d0514f175..a9b33d9a3e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh @@ -147,11 +147,6 @@ if test "$noSysDirs" = "1"; then fi fi -if [ -n "${targetConfig-}" ]; then - # if stripping gcc, include target directory too - stripDebugList="${stripDebugList-lib lib32 lib64 libexec bin sbin} $targetConfig" -fi - eval "$oldOpts" providedPreConfigure="$preConfigure"; @@ -171,15 +166,6 @@ preConfigure() { rm -Rf zlib fi - if test -f "$NIX_CC/nix-support/orig-libc"; then - # Patch the configure script so it finds glibc headers. It's - # important for example in order not to get libssp built, - # because its functionality is in glibc already. - sed -i \ - -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$libc_dev/include", \ - gcc/configure - fi - if test -n "$crossMingw" -a -n "$crossStageStatic"; then mkdir -p ../mingw # --with-build-sysroot expects that: diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix index bebf91114d..8ac7152d7e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -97,7 +97,7 @@ let # In uclibc cases, libgomp needs an additional '-ldl' # and as I don't know how to pass it, I disable libgomp. "--disable-libgomp" - ] ++ lib.optional (targetPlatform.libc == "newlib") "--with-newlib" + ] ++ lib.optional (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); @@ -111,8 +111,30 @@ let "--with-mpc=${libmpc}" ] ++ lib.optional (libelf != null) "--with-libelf=${libelf}" - ++ lib.optional (!(crossMingw && crossStageStatic)) - "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include" + ++ lib.optionals (!crossStageStatic) [ + (if libcCross == null + then "--with-native-system-header-dir=${lib.getDev stdenv.cc.libc}/include" + else "--with-native-system-header-dir=${lib.getDev libcCross}${libcCross.incdir or "/include"}") + # gcc builds for cross-compilers (build != host) or cross-built + # gcc (host != target) always apply the offset prefix to disentangle + # target headers from build or host headers: + # ${with_build_sysroot}${native_system_header_dir} + # or ${test_exec_prefix}/${target_noncanonical}/sys-include + # or ${with_sysroot}${native_system_header_dir} + # While native build (build == host == target) uses passed headers + # path as is: + # ${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 + # and many modern features get disabled (libssp is used instead of + # target-specific implementations and similar). More details at: + # https://github.com/NixOS/nixpkgs/pull/181802#issuecomment-1186822355 + # + # We pick "/" path to effectively avoid sysroot offset and make it work + # as a native case. + "--with-build-sysroot=/" + ] # Basic configuration ++ [ @@ -195,7 +217,7 @@ let ++ lib.optional (langJava && javaAntlr != null) "--with-antlr-jar=${javaAntlr}" # TODO: aarch64-darwin has clang stdenv and its arch and cpu flag values are incompatible with gcc - ++ lib.optional (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }) + ++ lib.optionals (!(stdenv.isDarwin && stdenv.isAarch64)) (import ../common/platform-flags.nix { inherit (stdenv) targetPlatform; inherit lib; }) ++ lib.optionals (targetPlatform != hostPlatform) crossConfigureFlags ++ lib.optional (targetPlatform != hostPlatform) "--disable-bootstrap" @@ -222,9 +244,6 @@ let ++ lib.optionals (langD) [ "--with-target-system-zlib=yes" ] - # Make -fcommon default on gcc10 - # TODO: fix all packages (probably 100+) and remove that - ++ lib.optional (version >= "10.1.0") "--with-specs=%{!fno-common:%{!fcommon:-fcommon}}" ; in configureFlags diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix index 310e7f8b57..180d5f16e9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -3,7 +3,9 @@ , langAda ? false , langJava ? false , langJit ? false -, langGo }: +, langGo +, crossStageStatic +}: assert langJava -> lib.versionOlder version "7"; assert langAda -> gnatboot != null; let @@ -67,3 +69,12 @@ in lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' + lib.optionalString (targetPlatform.config == hostPlatform.config && targetPlatform != hostPlatform) '' substituteInPlace configure --replace is_cross_compiler=no is_cross_compiler=yes '' + +# Normally (for host != target case) --without-headers automatically +# enables 'inhibit_libc=true' in gcc's gcc/configure.ac. But case of +# gcc->clang "cross"-compilation manages to evade it: there +# hostPlatform != targetPlatform, hostPlatform.config == targetPlatform.config. +# We explicitly inhibit libc headers use in this case as well. ++ lib.optionalString (targetPlatform != hostPlatform && crossStageStatic) '' + export inhibit_libc=true +'' diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/strip-attributes.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/strip-attributes.nix new file mode 100644 index 0000000000..997c068cba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/strip-attributes.nix @@ -0,0 +1,53 @@ +{ stdenv }: + +{ + # Note [Cross-compiler stripping] + # gcc requires delicate stripping as it installs ELF files for both + # HOST and TARGET platforms. It requires according strip tool otherwise + # strip could remove sections it's not aware of. + # Example ARM breakage by x86_64 strip: https://bugs.gentoo.org/697428 + # + # Let's recap the file layout for directories with object files for a + # cross-compiler (host != target): + # `- bin: HOST + # lib/*.{a,o}: HOST + # `- gcc///*.{a,o}: TARGET + # `- plugin/: HOST + # `- lib{,32,64,x32}: symlink to lib or identical layout + # `- libexec/: HOST + # `- /: TARGET + # + # (host == target) has identical directory layout. + + # The rest of stripDebugList{Host,Target} will be populated in + # postInstall. + stripDebugList = [ "bin" "libexec" ]; + stripDebugListTarget = [ stdenv.targetPlatform.config ]; + + preFixup = '' + # Populate most delicated lib/ part of stripDebugList{,Target} + updateDebugListPaths() { + local oldOpts + oldOpts="$(shopt -p nullglob)" || true + shopt -s nullglob + + pushd $out + + local -ar hostFiles=( + lib{,32,64}/*.{a.o} + lib{,32,64}/gcc/${stdenv.targetPlatform.config}/*/plugin + ) + local -ar targetFiles=( + lib{,32,64}/gcc/${stdenv.targetPlatform.config}/*/*.{a.o} + ) + + stripDebugList="$stripDebugList ''${hostFiles[*]}" + stripDebugListTarget="$stripDebugListTarget ''${targetFiles[*]}" + + popd + + eval "$oldOpts" + } + updateDebugListPaths + ''; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.3.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.3.nix rename to third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix index a7a80f4b9f..cfbc403a38 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.3.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.2.4.nix @@ -6,8 +6,6 @@ , xattr, autoSignDarwinBinariesHook , bash -, autoreconfHook # GHC 9.2.3 tarballs don't have autoconf run on them - , libiconv ? null, ncurses , glibcLocales ? null @@ -176,12 +174,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; stdenv.mkDerivation (rec { - version = "9.2.3"; + version = "9.2.4"; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "50ecdc2bef013e518f9a62a15245d7db0e4409d737c43b1cea7306fd82e1669e"; + sha256 = "15213888064a0ec4e7723d075f31b87a678ce0851773d58b44ef7aa3de996458"; }; enableParallelBuilding = true; @@ -231,12 +229,7 @@ stdenv.mkDerivation (rec { # 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 - # GHC 9.2.3 tarball is not properly prepared - ./boot - - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" '' + lib.optionalString (!stdenv.isDarwin) '' @@ -301,7 +294,6 @@ stdenv.mkDerivation (rec { dontAddExtraLibs = true; nativeBuildInputs = [ - autoreconfHook # GHC 9.2.3 tarball hasn't autoconf run on it perl autoconf automake m4 python3 ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.1.nix new file mode 100644 index 0000000000..e24f9fbb37 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.4.1.nix @@ -0,0 +1,387 @@ +# Preliminary GHC 9.4.1 expression using the make build system. +# TODO(@sternenseemann): port to hadrian, so we are prepared for 9.6 +# where make support will be dropped. +{ 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) +, gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic + +, # Whether to build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") + +, # Whether to build sphinx documentation. + enableDocs ? ( + # Docs disabled for musl and cross because it's a large task to keep + # all `sphinx` dependencies building in those environments. + # `sphinx` pulls in among others: + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. + (stdenv.targetPlatform == stdenv.hostPlatform) + && !stdenv.hostPlatform.isMusl + ) + +, enableHaddockProgram ? + # Disabled for cross; see note [HADDOCK_DOCS]. + (stdenv.targetPlatform == stdenv.hostPlatform) + +, # Whether to disable the large address space allocator + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS +}: + +assert !enableNativeBignum -> gmp != null; + +# Cross cannot currently build the `haddock` program for silly reasons, +# see note [HADDOCK_DOCS]. +assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} + BUILD_SPHINX_PDF = NO + '' + + # Note [HADDOCK_DOCS]: + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` + # program is built (which we generally always want to have a complete GHC install) + # and whether it is run on the GHC sources to generate hyperlinked source code + # (which is impossible for cross-compilation); see: + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 + # This implies that currently a cross-compiled GHC will never have a `haddock` + # program, so it can never generate haddocks for any packages. + # If this is solved in the future, we'd like to unconditionally + # build the haddock program (removing the `enableHaddockProgram` option). + '' + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} + # Build haddocks for boot packages with hyperlinking + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump + + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} + '' + lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + '' + lib.optionalString (!enableProfiledLibs) '' + GhcLibWays = "v dyn" + '' + + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell + lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: lib.optional enableTerminfo ncurses + ++ [libffi] + ++ lib.optional (!enableNativeBignum) gmp + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? + # GHC doesn't seem to have {LLC,OPT}_HOST + toolsForTarget = [ + pkgsBuildTarget.targetPackages.stdenv.cc + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped + # derivation for certain tools depending on the platform. + bintoolsFor = { + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is + # part of the bintools wrapper (due to codesigning requirements), but not on + # x86_64-darwin. + install_name_tool = + if stdenv.targetPlatform.isAarch64 + then targetCC.bintools + else targetCC.bintools.bintools; + # Same goes for strip. + strip = + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin + then targetCC.bintools + else targetCC.bintools.bintools; + }; + + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 + # see #84670 and #49071 for more background. + useLdGold = targetPlatform.linker == "gold" || + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); + + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. + variantSuffix = lib.concatStrings [ + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") + (lib.optionalString enableNativeBignum "-native-bignum") + ]; + +in + +# C compiler, bintools and LLVM are used at build time, but will also leak into +# the resulting GHC's settings file and used at runtime. This means that we are +# currently only able to build GHC if hostPlatform == buildPlatform. +assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; +assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; +assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; + +stdenv.mkDerivation (rec { + version = "9.4.0.20220721"; + pname = "${targetPrefix}ghc${variantSuffix}"; + + src = fetchurl { + url = "https://downloads.haskell.org/ghc/9.4.1-rc1/ghc-${version}-src.tar.xz"; + sha256 = "bca8c52f76d8747a66291181de2de7bdf9ff80093808fe39bf5cbff0f116c426"; + }; + + 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; + }) + # fix race condition in make build system + (fetchpatch { + name = "ghc-hs-boot-copying-fix.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4f17eff0cbd125eca55b68f4927befdd45008eb6.diff"; + sha256 = "0anq3w9z9mhxb0wx6rvxac3n7rl3apcma9zk3r9zz9hj9v7vkqzx"; + }) + ]; + + 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 + # GHC 9.4.1-rc1 tarball is not properly prepared, also the boot script has been renamed + # https://gitlab.haskell.org/ghc/ghc/-/issues/21626#note_444654 + # TODO(@sternenseemann): make source-dist rules include all boot-generated files + ./boot.source + + # Too restrictive upper bound on Cabal the make build system chokes on + # XXX(@sternenseemann): this should be upstreamed + substituteInPlace utils/ghc-cabal/ghc-cabal.cabal --replace "3.8" "3.9" + + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" + '' + lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ lib.optional (targetPlatform != hostPlatform) "target"; + + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ lib.optionals (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" + ] ++ lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ lib.optionals useLdGold [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ lib.optionals (disableLargeAddressSpace) [ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatibility. + strictDeps = true; + + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + autoSignDarwinBinariesHook + ] ++ lib.optionals enableDocs [ + sphinx + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); + + depsTargetTarget = map lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = + [ "format" ] + # In nixpkgs, musl based builds currently enable `pie` hardening by default + # (see `defaultHardeningFlags` in `make-derivation.nix`). + # But GHC cannot currently produce outputs that are ready for `-pie` linking. + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. + # See: + # * https://github.com/NixOS/nixpkgs/issues/129247 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; + + # big-parallel allows us to build with more than 2 cores on + # Hydra which already warrants a significant speedup + requiredSystemFeatures = [ "big-parallel" ]; + + postInstall = '' + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # This is used by the haskell builder to query + # the presence of the haddock program. + hasHaddock = enableHaddockProgram; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; + }; + + meta = { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + maintainers = with lib.maintainers; [ + guibou + ] ++ lib.teams.haskell.members; + timeout = 24 * 3600; + inherit (ghc.meta) license platforms; + }; + +} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix index 266ee97a2e..758b04a710 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat, zlib, llvm, lib +{ stdenv, fetchFromGitHub, fetchpatch, callPackage, gnat11, zlib, llvm, lib , backend ? "mcode" }: assert backend == "mcode" || backend == "llvm"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { LIBRARY_PATH = "${stdenv.cc.libc}/lib"; - buildInputs = [ gnat zlib ] ++ lib.optional (backend == "llvm") [ llvm ]; + buildInputs = [ gnat11 zlib ] ++ lib.optional (backend == "llvm") [ llvm ]; propagatedBuildInputs = lib.optionals (backend == "llvm") [ zlib ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix index 30d4882a50..d6202a5e2b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.21.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BI8qEaNasNxcMJ7jJYKyFP3ypgh+P39F9tAzzqxA4BI="; + sha256 = "sha256-/mP15jPZiiavnZ7fwFehSSzJUtVVmksj1xfbDOycxmQ="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security libiconv ]; - cargoSha256 = "sha256-avwdgX7FaBIOMumJknWBLc50JgtzGpM6S+Du7U/FE6Q="; + cargoSha256 = "sha256-JAQQiCnl/EMKCMqoL8WkwUcjng+MSz2Cjb3L5yyrQ+E="; meta = with lib; { description = "A statically typed language for the Erlang VM"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/gnatboot/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gnatboot/default.nix index b7fb8463d9..4e1301e47a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gnatboot/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gnatboot/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnatboot"; - version = "11.2.0-4"; + version = "12.1.0-2"; src = fetchzip { url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-${version}/gnat-x86_64-linux-${version}.tar.gz"; - hash = "sha256-8fMBJp6igH+Md5jE4LMubDmC4GLt4A+bZG/Xcz2LAJQ="; + hash = "sha256-EPDPOOjWJnJsUM7GGxj20/PXumjfLoMIEFX1EDtvWVY="; }; nativeBuildInputs = [ @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/gnat"; license = licenses.gpl3; maintainers = with maintainers; [ ethindp ]; - platforms = with platforms; [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix index 44c966fa97..3f1268a9d6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix @@ -1,5 +1,22 @@ -{ lib, stdenv, fetchurl, gcc, makeWrapper -, db, gmp, ncurses }: +{ lib +, stdenv +, fetchurl +, autoconf269 +, automake +, libtool +# libs +, cjson +, db +, gmp +, libxml2 +, ncurses +# docs +, help2man +, texinfo +, texlive +# test +, writeText +}: stdenv.mkDerivation rec { pname = "gnu-cobol"; @@ -10,27 +27,76 @@ stdenv.mkDerivation rec { sha256 = "0x15ybfm63g7c9340fc6712h9v59spnbyaz4rf85pmnp3zbhaw2r"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + autoconf269 + automake + libtool + help2man + texinfo + texlive.combined.scheme-basic + ]; - buildInputs = [ db gmp ncurses ]; + buildInputs = [ + cjson + db + gmp + libxml2 + ncurses + ]; - cflags = lib.concatMapStringsSep " " (p: "-L" + (lib.getLib p) + "/lib ") buildInputs; - ldflags = lib.concatMapStringsSep " " (p: "-I" + (lib.getDev p) + "/include ") buildInputs; + outputs = [ "bin" "dev" "lib" "out" ]; + # XXX: Without this, we get a cycle between bin and dev + propagatedBuildOutputs = []; - cobolCCFlags = "-I$out/include ${ldflags} -L$out/lib ${cflags}"; + # Skips a broken test + postPatch = '' + sed -i '/^AT_CHECK.*crud\.cob/i AT_SKIP_IF([true])' tests/testsuite.src/listings.at + ''; - postInstall = with lib; '' - wrapProgram "$out/bin/cobc" \ - --set COB_CC "${gcc}/bin/gcc" \ - --prefix COB_LDFLAGS " " "${cobolCCFlags}" \ - --prefix COB_CFLAGS " " "${cobolCCFlags}" + preConfigure = '' + autoconf + aclocal + automake + ''; + + enableParallelBuilding = true; + + installFlags = [ "install-pdf" "install-html" "localedir=$out/share/locale" ]; + + # Tests must run after install. + doCheck = false; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + # Run tests + make -j$NIX_BUILD_CORES check + + # Sanity check + message="Hello, COBOL!" + # XXX: Don't for a second think you can just get rid of these spaces, they + # are load bearing. + tee hello.cbl < stdenv.targetPlatform.isWindows; - let - go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; + go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { }; goBootstrap = runCommand "go-bootstrap" { } '' mkdir $out @@ -36,19 +32,19 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; "aarch64" = "arm64"; "arm" = "arm"; "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "i686" = "386"; "mips" = "mips"; + "mips64el" = "mips64le"; "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; "riscv64" = "riscv64"; "s390x" = "s390x"; - "powerpc64le" = "ppc64le"; - "mips64el" = "mips64le"; + "x86_64" = "amd64"; }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, @@ -57,14 +53,13 @@ let isCross = stdenv.buildPlatform != stdenv.targetPlatform; in - stdenv.mkDerivation rec { pname = "go"; - version = "1.17.12"; + version = "1.17.13"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-DVG1s/KAwPAfU0WYwCGdtYePM32mE3qe5ph3dBNgcgk="; + sha256 = "sha256-oaSLI6+yBvlee7qpuJjZZfkIJvbx0fwMHXhK2gzTAP0="; }; strictDeps = true; @@ -80,7 +75,7 @@ stdenv.mkDerivation rec { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional (threadsCross != null) threadsCross; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; hardeningDisable = [ "all" ]; @@ -283,10 +278,10 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with lib; { - homepage = "https://go.dev/"; description = "The Go Programming language"; + homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix index 05c40b6893..489ed133c6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.18.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , tzdata , iana-etc @@ -17,15 +18,11 @@ , runtimeShell , buildPackages , pkgsBuildTarget -, callPackage -, threadsCross ? null # for MinGW +, threadsCross }: -# threadsCross is just for MinGW -assert threadsCross != null -> stdenv.targetPlatform.isWindows; - let - go_bootstrap = buildPackages.callPackage ./bootstrap.nix { }; + go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { }; goBootstrap = runCommand "go-bootstrap" { } '' mkdir $out @@ -36,19 +33,19 @@ let ''; goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; "aarch64" = "arm64"; "arm" = "arm"; "armv5tel" = "arm"; "armv6l" = "arm"; "armv7l" = "arm"; + "i686" = "386"; "mips" = "mips"; + "mips64el" = "mips64le"; "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; "riscv64" = "riscv64"; "s390x" = "s390x"; - "powerpc64le" = "ppc64le"; - "mips64el" = "mips64le"; + "x86_64" = "amd64"; }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); # We need a target compiler which is still runnable at build time, @@ -57,7 +54,6 @@ let isCross = stdenv.buildPlatform != stdenv.targetPlatform; in - stdenv.mkDerivation rec { pname = "go"; version = "1.18.4"; @@ -80,7 +76,7 @@ stdenv.mkDerivation rec { depsBuildTarget = lib.optional isCross targetCC; - depsTargetTarget = lib.optional (threadsCross != null) threadsCross; + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; hardeningDisable = [ "all" ]; @@ -172,7 +168,11 @@ stdenv.mkDerivation rec { touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd ''; - patches = [ + patches = let + fetchBase64Patch = args: (fetchpatch args).overrideAttrs (o: { + postFetch = "mv $out p; base64 -d p > $out; " + o.postFetch; + }); + in [ ./remove-tools-1.11.patch ./ssl-cert-file-1.16.patch ./remove-test-pie-1.15.patch @@ -182,6 +182,12 @@ stdenv.mkDerivation rec { ./skip-nohup-tests.patch ./skip-cgo-tests-1.15.patch ./go_no_vendor_checks-1.16.patch + + # https://go-review.googlesource.com/c/go/+/417615/ + (fetchBase64Patch { + url = "https://go-review.googlesource.com/changes/go~417615/revisions/3/patch"; + sha256 = "sha256-Gu5eZUwGGch7et75A/BNynbs4VlQUBClVUxjxPkdjOs="; + }) ]; postPatch = '' @@ -277,10 +283,10 @@ stdenv.mkDerivation rec { disallowedReferences = [ goBootstrap ]; meta = with lib; { - homepage = "https://go.dev/"; description = "The Go Programming language"; + homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.darwin ++ platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix new file mode 100644 index 0000000000..f5b5116334 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.19.nix @@ -0,0 +1,280 @@ +{ lib +, stdenv +, fetchurl +, tzdata +, iana-etc +, runCommand +, perl +, which +, pkg-config +, procps +, pcre +, cacert +, Security +, Foundation +, xcbuild +, mailcap +, runtimeShell +, buildPackages +, pkgsBuildTarget +, threadsCross +}: + +let + go_bootstrap = buildPackages.callPackage ./bootstrap116.nix { }; + + goBootstrap = runCommand "go-bootstrap" { } '' + mkdir $out + cp -rf ${go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "i686" = "386"; + "mips" = "mips"; + "mips64el" = "mips64le"; + "mipsel" = "mipsle"; + "powerpc64le" = "ppc64le"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; + "x86_64" = "amd64"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; + + isCross = stdenv.buildPlatform != stdenv.targetPlatform; +in +stdenv.mkDerivation rec { + pname = "go"; + version = "1.19"; + + src = fetchurl { + url = "https://go.dev/dl/go${version}.src.tar.gz"; + sha256 = "sha256-lBnMcNxaJSPymncFPK//ZY7SHvNWHZtrAgKA686rKLk="; + }; + + strictDeps = true; + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkg-config procps ]; + buildInputs = [ cacert pcre ] + ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ xcbuild ]; + + depsTargetTargetPropagated = lib.optionals stdenv.isDarwin [ Security Foundation ]; + + depsBuildTarget = lib.optional isCross targetCC; + + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Fails on aarch64 + sed -i '/TestFallocate/aif true \{ return\; \}' src/cmd/link/internal/ld/fallocate_test.go + # Skip this test since ssl patches mess it up. + sed -i '/TestLoadSystemCertsLoadColonSeparatedDirs/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # Disable another PIE test which breaks. + sed -i '/TestTrivialPIE/aif true \{ return\; \}' misc/cgo/testshared/shared_test.go + # Disable the BuildModePie test + sed -i '/TestBuildmodePIE/aif true \{ return\; \}' src/cmd/go/go_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + lib.optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.16.patch + ./remove-test-pie-1.15.patch + ./skip-chown-tests-1.16.patch + ./skip-external-network-tests-1.16.patch + ./skip-nohup-tests.patch + ./skip-cgo-tests-1.19.patch + ./go_no_vendor_checks-1.16.patch + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = + if isCross then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = + if isCross then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + ${lib.optionalString isCross '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${lib.optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + meta = with lib; { + description = "The Go Programming language"; + homepage = "https://go.dev/"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.darwin ++ platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap.nix b/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap116.nix similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/go/bootstrap.nix rename to third_party/nixpkgs/pkgs/development/compilers/go/bootstrap116.nix diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap117.nix b/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap117.nix new file mode 100644 index 0000000000..3afa2ba9a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/bootstrap117.nix @@ -0,0 +1,15 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "1.17.13"; + hashes = { + # Use `print-hashes.sh ${version}` to generate the list below + darwin-amd64 = "c101beaa232e0f448fab692dc036cd6b4677091ff89c4889cc8754b1b29c6608"; + darwin-arm64 = "e4ccc9c082d91eaa0b866078b591fc97d24b91495f12deb3dd2d8eda4e55a6ea"; + linux-386 = "5e02f35aecc6b89679f631e0edf12c49922dd31c8140cf8dd725c5797a9f2425"; + linux-amd64 = "4cdd2bc664724dc7db94ad51b503512c5ae7220951cac568120f64f8e94399fc"; + linux-arm64 = "914daad3f011cc2014dea799bb7490442677e4ad6de0b2ac3ded6cee7e3f493d"; + linux-armv6l = "260431d7deeb8893c21e71fcbbb1fde3258616d8eba584c8d72060228ab42c86"; + linux-ppc64le = "bd0763fb130f8412672ffe1e4a8e65888ebe2419e5caa9a67ac21e8c298aa254"; + linux-s390x = "08f6074e1e106cbe5d78622357db71a93648c7a4c4e4b02e3b5f2a1828914c76"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/print-hashes.sh b/third_party/nixpkgs/pkgs/development/compilers/go/print-hashes.sh index f095b67c62..ed3e62b941 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/go/print-hashes.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/go/print-hashes.sh @@ -1,15 +1,16 @@ -#!/usr/bin/env bash +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq +# shellcheck shell=bash set -euo pipefail BASEURL=https://go.dev/dl/ VERSION=${1:-} -if [[ -z $VERSION ]] -then - echo "No version supplied" - exit -1 +if [[ -z ${VERSION} ]]; then + echo "No version supplied" + exit 1 fi -curl -s "${BASEURL}?mode=json&include=all" | \ - jq '.[] | select(.version == "go'${VERSION}'")' | \ - jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' +curl -s "${BASEURL}?mode=json&include=all" | + jq '.[] | select(.version == "go'"${VERSION}"'")' | + jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/skip-cgo-tests-1.19.patch b/third_party/nixpkgs/pkgs/development/compilers/go/skip-cgo-tests-1.19.patch new file mode 100644 index 0000000000..fa65cd6e98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/go/skip-cgo-tests-1.19.patch @@ -0,0 +1,13 @@ +diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go +index e1cd4965c3..0980d044df 100644 +--- a/src/cmd/dist/test.go ++++ b/src/cmd/dist/test.go +@@ -1136,7 +1136,7 @@ func (t *tester) cgoTest(dt *distTest) error { + t.addCmd(dt, "misc/cgo/test", t.goTest(), "-buildmode=pie", "-ldflags=-linkmode=internal") + } + t.addCmd(dt, "misc/cgo/testtls", t.goTest(), "-buildmode=pie", ".") +- t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie", ".") ++ //t.addCmd(dt, "misc/cgo/nocgo", t.goTest(), "-buildmode=pie", ".") + } + } + } diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix index 6badaa3b4c..b371ae02c8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/default.nix @@ -15,8 +15,8 @@ let Don't change these values! They will be updated by the update script, see ./update.nix. */ - graalvm11-ce-release-version = "22.1.0"; - graalvm17-ce-release-version = "22.1.0"; + graalvm11-ce-release-version = "22.2.0"; + graalvm17-ce-release-version = "22.2.0"; products = [ "graalvm-ce" diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json index 38f4a4eda9..bb1e2b40dd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm11-ce-sources.json @@ -1,42 +1,42 @@ { "darwin-aarch64": { - "graalvm-ce|java11|22.1.0": { - "sha256": "06bc19a0b1e93aa3df5e15c08e97f8cef624cb6070eeae40a69a51ec7fd41152", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-darwin-aarch64-22.1.0.tar.gz" + "graalvm-ce|java11|22.2.0": { + "sha256": "ee513cec2ef7b34ae6fbb8a3015c227ab2a24bfb2771c16152f15a1846df01f4", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-darwin-aarch64-22.2.0.tar.gz" }, - "native-image-installable-svm|java11|22.1.0": { - "sha256": "21f84ccf7b979dccc9091032fe76b5737b38e0092f282107cef75143dadb3bdb", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-darwin-aarch64-22.1.0.jar" + "native-image-installable-svm|java11|22.2.0": { + "sha256": "aba76d671017f93cdaae5102607d0bc7a1398adc5de8a4b1e308fa366d5983f9", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-darwin-aarch64-22.2.0.jar" } }, "darwin-amd64": { - "graalvm-ce|java11|22.1.0": { - "sha256": "c4c9df94ca47b83b582758b87d39042732ba0193fc63f1ab93f6818005a1fe6b", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-darwin-amd64-22.1.0.tar.gz" + "graalvm-ce|java11|22.2.0": { + "sha256": "3c6aca6faefa9e1f73de45fc56cc07d6f7864f63ce0b95148002dadb8f78cd86", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-darwin-amd64-22.2.0.tar.gz" }, - "native-image-installable-svm|java11|22.1.0": { - "sha256": "e0758687f4bd46f15fcee9b0a5bdd65d702ec81c41d465ee7229d3f4465bcf13", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-darwin-amd64-22.1.0.jar" + "native-image-installable-svm|java11|22.2.0": { + "sha256": "de9bf830d000a54934a01149691a9a8d4ef6e33414776abd14f95c65b149c908", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-darwin-amd64-22.2.0.jar" } }, "linux-aarch64": { - "graalvm-ce|java11|22.1.0": { - "sha256": "050a4d471247d91935f7f485e92d678f0163e1d6209e26e8fe75d7c924f73e71", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-linux-aarch64-22.1.0.tar.gz" + "graalvm-ce|java11|22.2.0": { + "sha256": "1ab64b35ed2478160bc6725d13ff5a2b9e31676b59ea3aaa9aca7a3a3db47132", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-aarch64-22.2.0.tar.gz" }, - "native-image-installable-svm|java11|22.1.0": { - "sha256": "12715793b223ce1db7ec7d0a339f0b578a0c9fb6dcc6607044e5af4fd33b25a7", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-linux-aarch64-22.1.0.jar" + "native-image-installable-svm|java11|22.2.0": { + "sha256": "0454b699ad969791984f4d1200c1834decb33c1f1e15e95b35f8f484b18c7783", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-aarch64-22.2.0.jar" } }, "linux-amd64": { - "graalvm-ce|java11|22.1.0": { - "sha256": "78c628707007bb97b09562932ee16f50beb1c3fa4a36e4311a0465a4a718e683", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java11-linux-amd64-22.1.0.tar.gz" + "graalvm-ce|java11|22.2.0": { + "sha256": "882363c75d1b1782a48bbf7dd8b155ab231b0957fd5885941376d90b69f21b9e", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java11-linux-amd64-22.2.0.tar.gz" }, - "native-image-installable-svm|java11|22.1.0": { - "sha256": "36e4a2a9a73a19b03883f9e783bc8bde7c214bb0fa4b617379cb81798de425bf", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java11-linux-amd64-22.1.0.jar" + "native-image-installable-svm|java11|22.2.0": { + "sha256": "84e5fb2391272e69f3e08f385b178d314b9b096d7837277a67fcdc597a4e1ca3", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java11-linux-amd64-22.2.0.jar" } } } diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json index dba9d9c9da..7685e35ebe 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition/graalvm17-ce-sources.json @@ -1,42 +1,42 @@ { "darwin-aarch64": { - "graalvm-ce|java17|22.1.0": { - "sha256": "06075cd390bd261721392cd6fd967b1d28c0500d1b5625272ea906038e5cd533", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-darwin-aarch64-22.1.0.tar.gz" + "graalvm-ce|java17|22.2.0": { + "sha256": "cfbeb38cd707a330048ab2140cb185176201c5cb654df752fcb4bd95e899b4ec", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-aarch64-22.2.0.tar.gz" }, - "native-image-installable-svm|java17|22.1.0": { - "sha256": "beabecdd5b87e7536772d4dfe70abf4c5dd9847e87615464cf309138d21c39af", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-darwin-aarch64-22.1.0.jar" + "native-image-installable-svm|java17|22.2.0": { + "sha256": "c6584429fe443f5415a7ec0545072b069f2e10bef1dbd6e7cb7fdec6ddb89b62", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-darwin-aarch64-22.2.0.jar" } }, "darwin-amd64": { - "graalvm-ce|java17|22.1.0": { - "sha256": "b9327fa73531a822d9a27d25980396353869eefbd73fdcef89b4fceb9f529c75", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-darwin-amd64-22.1.0.tar.gz" + "graalvm-ce|java17|22.2.0": { + "sha256": "b92b6f5f7f11282f20c8f8b94ea1c16d776cbadd7b254119836a7ace9f513b0d", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-darwin-amd64-22.2.0.tar.gz" }, - "native-image-installable-svm|java17|22.1.0": { - "sha256": "e6bfe208bb28cd1d98da55e00fa705890a7f69286b919947b07d18cc9bb9c270", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-darwin-amd64-22.1.0.jar" + "native-image-installable-svm|java17|22.2.0": { + "sha256": "a751d0c0dcdc7e06dd0166d731a482a6937f36a1b69ef62f9e9f443922e85861", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-darwin-amd64-22.2.0.jar" } }, "linux-aarch64": { - "graalvm-ce|java17|22.1.0": { - "sha256": "05128e361ed44beebc89495faaa504b0b975bf93aa5e512e217b3cf5e42dfada", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-linux-aarch64-22.1.0.tar.gz" + "graalvm-ce|java17|22.2.0": { + "sha256": "3025cc887bdaa088c89601b42931abc61dfd108aaad386abee8c1e08c913504d", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-linux-aarch64-22.2.0.tar.gz" }, - "native-image-installable-svm|java17|22.1.0": { - "sha256": "6e10f6953ec8b9509c7a7d0194d57f265cf2a05dcb8f3272a6a8e847bda49cda", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-linux-aarch64-22.1.0.jar" + "native-image-installable-svm|java17|22.2.0": { + "sha256": "eeac78046e059e77542eec1fac7c0423bf5fa73eb6fb01b25100d8a6f81eecc0", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-linux-aarch64-22.2.0.jar" } }, "linux-amd64": { - "graalvm-ce|java17|22.1.0": { - "sha256": "f11d46098efbf78465a875c502028767e3de410a31e45d92a9c5cf5046f42aa2", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/graalvm-ce-java17-linux-amd64-22.1.0.tar.gz" + "graalvm-ce|java17|22.2.0": { + "sha256": "cd903566d030bf44a8c5c0f50914fc9c9d89cb2954e1f90512b137a0bfedc3ca", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/graalvm-ce-java17-linux-amd64-22.2.0.tar.gz" }, - "native-image-installable-svm|java17|22.1.0": { - "sha256": "d81eecea15ebbf4f24850860c14104eaf6f8ae74574330e22afac533b8f96738", - "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.1.0/native-image-installable-svm-java17-linux-amd64-22.1.0.jar" + "native-image-installable-svm|java17|22.2.0": { + "sha256": "74656070429f8b24dd6770c2d274f272542116e3963291de74abed74c38ed08a", + "url": "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-22.2.0/native-image-installable-svm-java17-linux-amd64-22.2.0.jar" } } } diff --git a/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix b/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix index 916d8fa56f..853cf1a663 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix @@ -32,12 +32,6 @@ llvmPackages.stdenv.mkDerivation rec { cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" ]; - # To handle the lack of 'local' RPATH; required, as they call one of - # their built binaries requiring their libs, in the build process. - preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/src''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas diff --git a/third_party/nixpkgs/pkgs/development/compilers/hare/default.nix b/third_party/nixpkgs/pkgs/development/compilers/hare/default.nix new file mode 100644 index 0000000000..c04897fad1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/hare/default.nix @@ -0,0 +1,7 @@ +{ config, lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + + harec = callPackage ./harec { }; + hare = callPackage ./hare { }; +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/hare/config-template.mk b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/config-template.mk similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/hare/config-template.mk rename to third_party/nixpkgs/pkgs/development/compilers/hare/hare/config-template.mk diff --git a/third_party/nixpkgs/pkgs/development/compilers/hare/hare.nix b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/default.nix similarity index 88% rename from third_party/nixpkgs/pkgs/development/compilers/hare/hare.nix rename to third_party/nixpkgs/pkgs/development/compilers/hare/hare/default.nix index e24fc68ab4..9411f4e4e9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hare/hare.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/default.nix @@ -9,16 +9,15 @@ , substituteAll }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hare"; - version = "unstable-2022-06-18"; + version = "unstable-2022-07-30"; src = fetchFromSourcehut { - name = pname + "-src"; owner = "~sircmpwn"; - repo = pname; - rev = "ac9b2c35c09d555e09dbd81c5ed95bdfa14313ba"; - hash = "sha256-eeS14LGkbi9IamvKzK+HF0Rvk9NFp4QVYcrHwNSNBx4="; + repo = "hare"; + rev = "296925c91d79362d6b8ac94e0336a38e9af0f1c9"; + hash = "sha256-LeIUnpTMZ6vxgAy/LPm9/IMit41RgezdVESIv+gQFHc="; }; patches = [ ./disable-failing-test-cases.patch ]; @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { qbe ]; - setupHook = ./setup-hook.sh; strictDeps = true; configurePhase = @@ -86,6 +84,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/hare --prefix PATH : ${binPath} ''; + setupHook = ./setup-hook.sh; + meta = with lib; { homepage = "http://harelang.org/"; description = @@ -94,4 +94,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ AndersonTorres ]; inherit (harec.meta) platforms badPlatforms; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/hare/disable-failing-test-cases.patch b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch similarity index 100% rename from third_party/nixpkgs/pkgs/development/compilers/hare/disable-failing-test-cases.patch rename to third_party/nixpkgs/pkgs/development/compilers/hare/hare/disable-failing-test-cases.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/hare/setup-hook.sh b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/setup-hook.sh similarity index 83% rename from third_party/nixpkgs/pkgs/development/compilers/hare/setup-hook.sh rename to third_party/nixpkgs/pkgs/development/compilers/hare/hare/setup-hook.sh index 999b91df12..d2d2c34354 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hare/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/hare/hare/setup-hook.sh @@ -1,5 +1,3 @@ -export HARECACHE="$NIX_BUILD_TOP/.harecache" - addHarepath () { for haredir in third-party stdlib; do if [[ -d "$1/src/hare/$haredir" ]]; then diff --git a/third_party/nixpkgs/pkgs/development/compilers/hare/harec.nix b/third_party/nixpkgs/pkgs/development/compilers/hare/harec/default.nix similarity index 78% rename from third_party/nixpkgs/pkgs/development/compilers/hare/harec.nix rename to third_party/nixpkgs/pkgs/development/compilers/hare/harec/default.nix index 4c77a77bd0..bdc9ef56b9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/hare/harec.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/hare/harec/default.nix @@ -4,16 +4,15 @@ , qbe }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "harec"; - version = "unstable-2022-06-20"; + version = "unstable-2022-07-02"; src = fetchFromSourcehut { - name = pname + "-src"; owner = "~sircmpwn"; - repo = pname; - rev = "2eccbc4b959a590dda91143c8487edda841106d9"; - hash = "sha256-pwy7cNxAqIbhx9kpcjfgk7sCEns9oA6zhKSQJdHLZCM="; + repo = "harec"; + rev = "56359312644f76941de1878d33a1a0b840be8056"; + hash = "sha256-8SFYRJSvX8hmsHBgaLUfhLUV7d54im22ETZds1eASc4="; }; nativeBuildInputs = [ @@ -42,4 +41,4 @@ stdenv.mkDerivation rec { lib.intersectLists (freebsd ++ linux) (aarch64 ++ x86_64 ++ riscv64); badPlatforms = with platforms; darwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix index c362abbc1f..b70a3e13ab 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/haxe/default.nix @@ -115,7 +115,7 @@ let description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; homepage = "https://haxe.org"; license = with licenses; [ gpl2Plus mit ]; # based on upstream opam file - maintainers = [ maintainers.marcweber maintainers.locallycompact ]; + maintainers = [ maintainers.marcweber maintainers.locallycompact maintainers.logo ]; platforms = platforms.linux ++ platforms.darwin; }; }; @@ -147,7 +147,7 @@ in { sha256 = "0rns6d28qzkbai6yyws08yzbyvxfn848nj0fsji7chdi0y7pzzj0"; }; haxe_4_2 = generic { - version = "4.2.1"; - sha256 = "sha256-0j6M21dh8DB1gC/bPYNJrVuDbJyqQbP+61ItO5RBUcA="; + version = "4.2.5"; + sha256 = "sha256-Y0gx6uOQX4OZgg8nK4GJxRR1rKh0S2JUjZQFVQ4cfTs="; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix index acdd8a034e..79203ce7e0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.6-bin.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ninjin raskin ]; platforms = [ "x86_64-linux" ]; + mainProgram = "julia"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/julia/1.7-bin.nix b/third_party/nixpkgs/pkgs/development/compilers/julia/1.7-bin.nix index 70c9e6cb1c..5352d38a22 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/julia/1.7-bin.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/julia/1.7-bin.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ ninjin raskin ]; platforms = [ "x86_64-linux" ]; + mainProgram = "julia"; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/jwasm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/jwasm/default.nix index b2e298fa65..ebc5cad5f9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/jwasm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/jwasm/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "jwasm"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "Baron-von-Riedesel"; repo = "JWasm"; rev = "v${version}"; - hash = "sha256-BUSsF73Q2vq6tF/YHMUyAmmFE/WWVQLRFJZkOD8T7f8="; + hash = "sha256-ef4uEtEpnqYGhFmxuefJ40zyOuHsiPOLpH/52i7a7KI="; }; outputs = [ "out" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/kaitai-struct-compiler/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kaitai-struct-compiler/default.nix index 8561e7eae7..7d34bb312c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kaitai-struct-compiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kaitai-struct-compiler/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "kaitai-struct-compiler"; - version = "0.9"; + version = "0.10"; src = fetchzip { url = "https://github.com/kaitai-io/kaitai_struct_compiler/releases/download/${version}/kaitai-struct-compiler-${version}.zip"; - sha256 = "sha256-2HSasigpJDuWNejNVklnpQwaA4MC030S9taF/7YvzgY="; + sha256 = "sha256-oY1OiEq619kLmQPMRQ4sjuBnTXgJ2WfvsEj1JrxUGPA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/lingua-franca/default.nix b/third_party/nixpkgs/pkgs/development/compilers/lingua-franca/default.nix index 8944c4b757..5f5de16b44 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/lingua-franca/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/lingua-franca/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lfc"; - version = "0.2.0"; + version = "0.3.0"; src = fetchzip { url = "https://github.com/lf-lang/lingua-franca/releases/download/v${version}/lfc_${version}.zip"; - sha256 = "rBx7UnPLufZBO7lG0In5upHqYCyRtI4kQv0V83CZHew="; + sha256 = "sha256-jSINlwHfSOPbti3LJTXpSk6lcUtwKfz7CMLtq2OuNns="; }; buildInputs = [ jdk17_headless ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix index 128ac57093..bb1b90b36a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/llvm/default.nix @@ -244,12 +244,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix index 58439f02a5..4bcdb3ca78 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/clang/default.nix @@ -50,18 +50,6 @@ let ./purity.patch # https://reviews.llvm.org/D51899 ./gnu-install-dirs.patch - # Revert: [Driver] Default to -fno-common for all targets - # https://reviews.llvm.org/D75056 - # - # Maintains compatibility with packages that haven't been fixed yet, and - # matches gcc10's configuration in nixpkgs. - (fetchpatch { - revert = true; - url = "https://github.com/llvm/llvm-project/commit/0a9fc9233e172601e26381810d093e02ef410f65.diff"; - stripLen = 1; - excludes = [ "docs/*" "test/*" ]; - sha256 = "0gxgmi0qbm89mq911dahallhi8m6wa9vpklklqmxafx4rplrr8ph"; - }) (substituteAll { src = ../../clang-11-12-LLVMgold-path.patch; libllvmLibdir = "${libllvm.lib}/lib"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix index f7a5044834..a038795a4d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm/default.nix @@ -256,12 +256,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix index 4b2907ed30..d1497e6db1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" "-DCOMPILER_RT_BUILD_PROFILE=OFF" "-DCOMPILER_RT_BUILD_MEMPROF=OFF" - ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix index 56a3d01e4b..435744b073 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/llvm/default.nix @@ -244,12 +244,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index 10b89b91b9..7b9312eecf 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_PROFILE=OFF" "-DCOMPILER_RT_BUILD_MEMPROF=OFF" "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary - ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix index b1dce12fac..6372655b7e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -206,12 +206,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix index cddfd5c238..508b9466e7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/compiler-rt/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_PROFILE=OFF" "-DCOMPILER_RT_BUILD_MEMPROF=OFF" "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary - ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix index b18b558d5b..3a1ba402ef 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/default.nix @@ -18,7 +18,7 @@ }: let - release_version = "14.0.1"; + release_version = "14.0.6"; candidate = ""; # empty or "rcN" dash-candidate = lib.optionalString (candidate != "") "-${candidate}"; rev = ""; # When using a Git commit @@ -30,7 +30,7 @@ let owner = "llvm"; repo = "llvm-project"; rev = if rev != "" then rev else "llvmorg-${version}"; - sha256 = "14wgrjwj02ivlwb1zgidacspkkcfpsqjmgd7r838qmwpk56yxl9f"; + sha256 = "sha256-vffu4HilvYwtzwgq+NlS26m65DGbp6OSSne2aje1yJE="; }; llvm_meta = { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix index c3f3c94f43..395f2b22b9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -95,6 +95,20 @@ in stdenv.mkDerivation (rec { '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' # Seems to require certain floating point hardware (NEON?) rm test/ExecutionEngine/frem.ll + '' + optionalString stdenv.hostPlatform.isRiscV '' + rm test/ExecutionEngine/frem.ll + rm test/ExecutionEngine/mov64zext32.ll + rm test/ExecutionEngine/test-interp-vec-arithm_float.ll + rm test/ExecutionEngine/test-interp-vec-arithm_int.ll + rm test/ExecutionEngine/test-interp-vec-logical.ll + rm test/ExecutionEngine/test-interp-vec-setcond-fp.ll + rm test/ExecutionEngine/test-interp-vec-setcond-int.ll + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "CrashRecoveryTest.cpp" "" + rm unittests/Support/CrashRecoveryTest.cpp + substituteInPlace unittests/ExecutionEngine/Orc/CMakeLists.txt \ + --replace "OrcCAPITest.cpp" "" + rm unittests/ExecutionEngine/Orc/OrcCAPITest.cpp '' + '' patchShebangs test/BugPoint/compile-custom.ll.py ''; @@ -203,12 +217,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix index 253aaade69..cf668cd566 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/llvm/default.nix @@ -222,12 +222,6 @@ stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix index 622b90e58e..61f9234274 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/llvm/default.nix @@ -215,12 +215,6 @@ stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix index 01784baca8..b324e1a0e4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/llvm/default.nix @@ -234,12 +234,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${v}.dylib '') versionSuffixes} '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix index 01a052d404..efd1707eb3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/llvm/default.nix @@ -226,12 +226,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix index b197e9ab8b..1dd1455ed6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/llvm/default.nix @@ -241,12 +241,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 59ca5348fe..cc1a8dc048 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { "-DCOMPILER_RT_BUILD_PROFILE=OFF" "-DCOMPILER_RT_BUILD_MEMPROF=OFF" "-DCOMPILER_RT_BUILD_ORC=OFF" # may be possible to build with musl if necessary - ] ++ lib.optionals ((useLLVM || bareMetal) && !haveLibc) [ + ] ++ lib.optionals ((useLLVM && !haveLibc) || bareMetal) [ "-DCMAKE_C_COMPILER_WORKS=ON" "-DCMAKE_CXX_COMPILER_WORKS=ON" "-DCOMPILER_RT_BAREMETAL_BUILD=ON" diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix index 02ec0f3ab1..d2059cc66b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -200,12 +200,6 @@ in stdenv.mkDerivation (rec { ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString enableSharedLibraries '' - mkdir -p $dev/lib - mv $lib/lib/*.a $dev/lib - sed -i -E "s|$lib/lib/(.*)\.a|$dev/lib/\1\.a|" \ - "$dev/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" - '' + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native ''; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix index 45acc7f1ce..1bd6431961 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix @@ -41,6 +41,7 @@ let ./currency-date-range-jdk10.patch ./increase-javadoc-heap-jdk13.patch ./ignore-LegalNoticeFilePlugin.patch + ./fix-library-path-jdk17.patch # -Wformat etc. are stricter in newer gccs, per # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677 diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch b/third_party/nixpkgs/pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch new file mode 100644 index 0000000000..4c38aca2b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/fix-library-path-jdk17.patch @@ -0,0 +1,60 @@ +--- a/src/hotspot/os/linux/os_linux.cpp ++++ b/src/hotspot/os/linux/os_linux.cpp +@@ -412,18 +412,8 @@ void os::init_system_properties_values() { + // 1: ... + // ... + // 7: The default directories, normally /lib and /usr/lib. +-#ifndef OVERRIDE_LIBPATH +- #if defined(_LP64) +- #define DEFAULT_LIBPATH "/usr/lib64:/lib64:/lib:/usr/lib" +- #else +- #define DEFAULT_LIBPATH "/lib:/usr/lib" +- #endif +-#else +- #define DEFAULT_LIBPATH OVERRIDE_LIBPATH +-#endif + + // Base path of extensions installed on the system. +-#define SYS_EXT_DIR "/usr/java/packages" + #define EXTENSIONS_DIR "/lib/ext" + + // Buffer that fits several sprintfs. +@@ -431,7 +421,7 @@ void os::init_system_properties_values() { + // by the nulls included by the sizeof operator. + const size_t bufsize = + MAX2((size_t)MAXPATHLEN, // For dll_dir & friends. +- (size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(SYS_EXT_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir ++ (size_t)MAXPATHLEN + sizeof(EXTENSIONS_DIR) + sizeof(EXTENSIONS_DIR)); // extensions dir + char *buf = NEW_C_HEAP_ARRAY(char, bufsize, mtInternal); + + // sysclasspath, java_home, dll_dir +@@ -478,26 +468,22 @@ void os::init_system_properties_values() { + // should always exist (until the legacy problem cited above is + // addressed). + const char *v = ::getenv("LD_LIBRARY_PATH"); +- const char *v_colon = ":"; +- if (v == NULL) { v = ""; v_colon = ""; } ++ if (v == NULL) { v = ""; } + // That's +1 for the colon and +1 for the trailing '\0'. + char *ld_library_path = NEW_C_HEAP_ARRAY(char, +- strlen(v) + 1 + +- sizeof(SYS_EXT_DIR) + sizeof("/lib/") + sizeof(DEFAULT_LIBPATH) + 1, ++ strlen(v) + 1, + mtInternal); +- sprintf(ld_library_path, "%s%s" SYS_EXT_DIR "/lib:" DEFAULT_LIBPATH, v, v_colon); ++ sprintf(ld_library_path, "%s", v); + Arguments::set_library_path(ld_library_path); + FREE_C_HEAP_ARRAY(char, ld_library_path); + } + + // Extensions directories. +- sprintf(buf, "%s" EXTENSIONS_DIR ":" SYS_EXT_DIR EXTENSIONS_DIR, Arguments::get_java_home()); ++ sprintf(buf, "%s" EXTENSIONS_DIR, Arguments::get_java_home()); + Arguments::set_ext_dirs(buf); + + FREE_C_HEAP_ARRAY(char, buf); + +-#undef DEFAULT_LIBPATH +-#undef SYS_EXT_DIR + #undef EXTENSIONS_DIR + } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk14-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk14-linux.nix deleted file mode 100644 index 6604ebbef8..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/oraclejdk/jdk14-linux.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv -, requireFile -, xorg -, zlib -, freetype -, alsa-lib -, setJavaClassPath -}: - -let result = stdenv.mkDerivation rec { - pname = "oraclejdk"; - version = "14.0.2"; - - src = requireFile { - name = "jdk-${version}_linux-x64_bin.tar.gz"; - url = "https://www.oracle.com/java/technologies/javase-jdk14-downloads.html"; - sha256 = "cb811a86926cc0f529d16bec7bd2e25fb73e75125bbd1775cdb9a96998593dde"; - }; - - installPhase = '' - mv ../$sourceRoot $out - - mkdir -p $out/nix-support - printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs - - # Set JAVA_HOME automatically. - cat <> $out/nix-support/setup-hook - if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi - EOF - ''; - - postFixup = '' - rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}" - - for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true - patchelf --set-rpath "$rpath" "$f" || true - done - - for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do - if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi - done - ''; - - passthru.jre = result; - passthru.home = result; - - dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10 - - meta = with lib; { - license = licenses.unfree; - platforms = [ "x86_64-linux" ]; - }; -}; in result diff --git a/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix b/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix index cc99aa078f..ad075b5adb 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix @@ -1,14 +1,15 @@ { lib, callPackage, stdenv, makeWrapper, fetchurl, ocaml, findlib, dune_2 +, ncurses , fix, menhir, menhirLib, menhirSdk, merlin-extend, ppxlib, utop, cppo, ppx_derivers }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - sha256 = "sha256:0yc94m3ddk599crg33yxvkphxpy54kmdsl599c320wvn055p4y4l"; + sha256 = "sha256-v827CfYrTBCPJubcOAQxYT5N5LBl348UNk7+Ss6o5BQ="; }; nativeBuildInputs = [ @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { ocaml ppxlib utop - ]; + ] ++ lib.optional (lib.versionOlder ocaml.version "4.07") ncurses; propagatedBuildInputs = [ menhirLib diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_61.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_62.nix similarity index 56% rename from third_party/nixpkgs/pkgs/development/compilers/rust/1_61.nix rename to third_party/nixpkgs/pkgs/development/compilers/rust/1_62.nix index 7726c2db10..6a68c0e14d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_61.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_62.nix @@ -20,8 +20,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.61.0"; - rustcSha256 = "1vfs05hkf9ilk19b2vahqn8l6k17pl9nc1ky9kgspaascx8l62xd"; + rustcVersion = "1.62.1"; + rustcSha256 = "sha256-cqy+b/zZT1mDgqdDCw2F7o9nnm0LJ/P1Zu0cFsl4Ez8="; llvmSharedForBuild = pkgsBuildBuild.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; llvmSharedForHost = pkgsBuildHost.llvmPackages_14.libllvm.override { enableSharedLibraries = true; }; @@ -37,25 +37,25 @@ import ./default.nix { # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.60.0"; + bootstrapVersion = "1.61.0"; # fetch hashes by running `print-hashes.sh ${bootstrapVersion}` bootstrapHashes = { - i686-unknown-linux-gnu = "2a635269dc9ad8f7bbdf168cdf120e1ec803d36adc832c0804f38e0acc3e2357"; - x86_64-unknown-linux-gnu = "b8a4c3959367d053825e31f90a5eb86418eb0d80cacda52bfa80b078e18150d5"; - x86_64-unknown-linux-musl = "f0feefcb1985c5c894ad9b0f44e6f09900b31c0eb5f49827da9f37d332a63894"; - arm-unknown-linux-gnueabihf = "161b2b97d4512080350cc6656b0765ebae870335e86c2896bed08b32c66fbdf4"; - armv7-unknown-linux-gnueabihf = "f2d76e9458949675bab8fcae44f600d30d91f62bf93c127b6b1fe3130e67d5d9"; - aarch64-unknown-linux-gnu = "99c419c2f35d4324446481c39402c7baecd7a8baed7edca9f8d6bbd33c05550c"; - aarch64-unknown-linux-musl = "fe7e9bad8beea84973f7ffa39879929de4ac8afad872650fb0af6b068f05faa6"; - x86_64-apple-darwin = "0b10dc45cddc4d2355e38cac86d71a504327cb41d41d702d4050b9847ad4258c"; - aarch64-apple-darwin = "b532672c278c25683ca63d78e82bae829eea1a32308e844954fb66cfe34ad222"; - powerpc64le-unknown-linux-gnu = "80125e90285b214c2b1f56ab86a09c8509aa17aec9d7127960a86a7008e8f7de"; - riscv64gc-unknown-linux-gnu = "9cc7c6804bcbbecb9c35232035fc488dbcc8487606cc6be3da553cc446bf0fcd"; - mips64el-unknown-linux-gnuabi64 = "d413681c22511259f7cd15414a00050cf151d46ac0f9282e765faeb86688deac"; + i686-unknown-linux-gnu = "b15eb0ad44b7253e0b5b1a8cd285feb10e9fb0402840dba9a13112c3349a4b39"; + x86_64-unknown-linux-gnu = "066b324239d30787ce64142d7e04912f2e1850c07db3b2354d8654e02ff8b23a"; + x86_64-unknown-linux-musl = "0904f6b769ae28c259e0e25a41e99290a4ae2a36bca63ae153790b2ebbc427bf"; + arm-unknown-linux-gnueabihf = "cc32705cd1b583aaac74e6663f71392131dc0355a0f484cb56f0378b71ea7ebc"; + armv7-unknown-linux-gnueabihf = "2782ec75ea4abb402513e2e57becc6c14e67b492d57228cddedef6db0853b165"; + aarch64-unknown-linux-gnu = "261cd47bc3c98c9f97b601d1ad2a7d9b33c9ea63c9a351119c2f6d4e82f5d436"; + aarch64-unknown-linux-musl = "feb79985cb161a10b252236852df8db3bf3593c78905b84c7e94cd4454327e47"; + x86_64-apple-darwin = "d851f1a473926a5d8f111ed08002047a5dc4ad944a5b7f8d5d2f1f266b51e66a"; + aarch64-apple-darwin = "2dbafd13d007543aada47179fa273f9a3865f27e0a07bd69be61801232a0819e"; + powerpc64le-unknown-linux-gnu = "6d5cd579b68a2adc20384406c69a92beaaf4941056e126ff0ed1ec2f3a4e721f"; + riscv64gc-unknown-linux-gnu = "3d0f3b1a8522e09fffdf920a061794ac3107410eb1fe8f5d62a7aae3c6dcb81e"; + mips64el-unknown-linux-gnuabi64 = "6ed5b6492e68f45488108abd06dbcd4b89c46cdbd4715331bb11e88f18500815"; }; - selectRustPackage = pkgs: pkgs.rust_1_61; + selectRustPackage = pkgs: pkgs.rust_1_62; rustcPatches = [ ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix index 3a774754a6..05fa6b3908 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix @@ -40,6 +40,13 @@ stdenv.mkDerivation rec { url = "https://bugs.launchpad.net/sbcl/+bug/1980570/+attachment/5600916/+files/0001-src-runtime-fix-fno-common-build-on-darwin.patch"; sha256 = "0avpwgjdaxxdpq8pfvv9darfn4ql5dgqq7zaf3nmxnvhh86ngzij"; }) + ] ++ lib.optionals (lib.versionAtLeast version "2.1.10" && lib.versionOlder version "2.2.0") [ + # Fix -fno-common on arm64 + (fetchpatch { + name = "arm64-fno-common.patch"; + url = "https://github.com/sbcl/sbcl/commit/ac3739eae36de92feffef5bb9b4b4bd93f6c4942.patch"; + sha256 = "1kxg0ng7d465rk5v4biikrzaps41x4n1v4ygnb5qh4f5jzkbms8y"; + }) ] ++ lib.optionals (version == "2.2.6") [ # Take contrib blocklist into account for doc generation. This fixes sbcl # build on aarch64, because the docs Makefile tries to require sb-simd, @@ -102,6 +109,14 @@ stdenv.mkDerivation rec { optional (!threadSupport) "sb-thread" ++ optionals disableImmobileSpace [ "immobile-space" "immobile-code" "compact-instance-header" ]; + NIX_CFLAGS_COMPILE = lib.optional (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 + # Should be fixed past 2.1.10 release. + "-fcommon" + ]; + buildPhase = '' runHook preBuild diff --git a/third_party/nixpkgs/pkgs/development/compilers/seexpr/default.nix b/third_party/nixpkgs/pkgs/development/compilers/seexpr/default.nix index f13ec5174d..b07a915993 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/seexpr/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/seexpr/default.nix @@ -22,7 +22,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-r6mgyb/FGz4KYZOgLDgmIqjO+PSmneD3KUWjymZXtEk="; }; - cmakeFlags = [ "-DENABLE_SSE4=OFF" ]; + cmakeFlags = [ + "-DENABLE_SSE4=OFF" + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; nativeBuildInputs = [ cmake ]; buildInputs = [ libGLU libpng zlib qt4 python3Packages.pyqt4 python3Packages.boost bison flex ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix index 6594872a25..d00a354be1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -90,12 +90,6 @@ let doCheck = false; checkPhase = '' - while IFS= read -r -d ''' dir - do - LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$(pwd)/$dir - export LD_LIBRARY_PATH - done < <(find . -type d -print0) - pushd .. # IPC tests need aleth avaliable, so we disable it sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh diff --git a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix index b0ba8508fc..ace6c77377 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { "-DLLVM_DIR=${llvm_11.dev}" "-DBUILD_SHARED_LIBS=YES" "-DLLVM_SPIRV_BUILD_EXTERNAL=YES" + # RPATH of binary /nix/store/.../bin/llvm-spirv contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; # FIXME: CMake tries to run "/llvm-lit" which of course doesn't exist diff --git a/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix index ced8312dbf..97a86a3fa7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/tinycc/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchFromRepoOrCz +, copyPkgconfigItems +, makePkgconfigItem , perl , texinfo , which @@ -8,20 +10,41 @@ stdenv.mkDerivation rec { pname = "tcc"; - version = "0.9.27+date=2022-01-11"; + version = "unstable-2022-07-15"; src = fetchFromRepoOrCz { repo = "tinycc"; - rev = "4e0e9b8f210d69893b306d6b24d2dd615a22f246"; - hash = "sha256-0BJ5wXsgDLBIvcbq+rL9UQC4NjLHCI9r6sUWF98APPg="; + rev = "af1abf1f45d45b34f0b02437f559f4dfdba7d23c"; + hash = "sha256-jY0P2GErmo//YBaz6u4/jj/voOE3C2JaIDRmo0orXN8="; }; nativeBuildInputs = [ + copyPkgconfigItems perl texinfo which ]; + pkgconfigItems = [ + (makePkgconfigItem rec { + name = "libtcc"; + inherit version; + cflags = [ "-I${variables.includedir}" ]; + libs = [ + "-L${variables.libdir}" + "-Wl,--rpath ${variables.libdir}" + "-ltcc" + "-ldl" + ]; + variables = rec { + prefix = "${placeholder "out"}"; + includedir = "${prefix}/include"; + libdir = "${prefix}/lib"; + }; + description = "Tiny C compiler backend"; + }) + ]; + postPatch = '' patchShebangs texi2pod.pl ''; @@ -43,24 +66,12 @@ stdenv.mkDerivation rec { configureFlagsArray+=("--elfinterp=$(< $NIX_CC/nix-support/dynamic-linker)") ''; - postFixup = '' - cat >libtcc.pc < - run "ghc" ghcArgs + CompileGhc -> do -+ ghc <- fromMaybe "ghc" <$> (lookupEnv "NIX_GHC") ++ ghc <- fromMaybe "ghc" <$> (lookupEnv "XMONAD_GHC") + run ghc ghcArgs CompileStackGhc stackYaml -> run "stack" ["build", "--silent", "--stack-yaml", stackYaml] .&&. diff --git a/third_party/nixpkgs/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch b/third_party/nixpkgs/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch index 7726f17b41..fc46fa0f0f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch +++ b/third_party/nixpkgs/pkgs/development/interpreters/acl2/0001-Fix-some-paths-for-Nix-build.patch @@ -1,22 +1,19 @@ -From d0136f350b82ae845d56029db43d153c91d5e494 Mon Sep 17 00:00:00 2001 +From aed1c4b0be7576d20eed81070da2c6f92573df18 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sat, 30 May 2020 21:27:47 -0700 Subject: [PATCH] Fix some paths for Nix build --- - books/build/features.sh | 1 + - .../ipasir/load-ipasir-sharedlib-raw.lsp | 6 +-- - books/projects/smtlink/config.lisp | 2 +- - books/projects/smtlink/examples/examples.lisp | 4 +- - books/projects/smtlink/smtlink-config | 2 +- - .../cl+ssl-20200610-git/src/reload.lisp | 53 +------------------ - 6 files changed, 8 insertions(+), 60 deletions(-) + books/build/features.sh | 1 + + books/centaur/ipasir/load-ipasir-sharedlib-raw.lsp | 6 +----- + .../bundle/software/cl+ssl-20220707-git/src/reload.lisp | 3 +++ + 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/books/build/features.sh b/books/build/features.sh -index d45a7aa61..27256b7cd 100755 +index feb5b2b59c..4b654e08bc 100755 --- a/books/build/features.sh +++ b/books/build/features.sh -@@ -122,6 +122,7 @@ EOF +@@ -125,6 +125,7 @@ EOF fi echo "Determining whether an ipasir shared library is installed" 1>&2 @@ -25,7 +22,7 @@ index d45a7aa61..27256b7cd 100755 cat >> Makefile-features < " {send "quit\r"} + timeout { exit 1 } + } + expect { + "\[DEBUG\] OK: Done OK." {} + "\[DEBUG\] FAILED: Debug failure." { exit 1 } + timeout { exit 1 } + } + exit 0 + EOD + ''; + + installPhase = "install -D kerf $out/bin/kerf"; + + meta = with lib; { + description = "Columnar tick database and time-series language"; + longDescription = '' + Kerf is a columnar tick database and small programming + language that is a superset of JSON and SQL. It can be + used for local analytics, timeseries, logfile processing, + and more. + ''; + license = with licenses; [ bsd2 ]; + homepage = "https://github.com/kevinlawler/kerf1"; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; + + # aarch64-linux seems hopeless, with over 2,000 warnings + # generated? + broken = (stdenv.isLinux && stdenv.isAarch64); + }; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix index a160ee039f..97e444ded9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/default.nix @@ -17,6 +17,13 @@ rec { extraPrefix = "src/"; excludes = [ "src/testes/*" ]; }) + (fetchpatch { + name = "CVE-2022-33099.patch"; + url = "https://github.com/lua/lua/commit/42d40581dd919fb134c07027ca1ce0844c670daf.patch"; + sha256 = "sha256-qj1Dq1ojVoknALSa67jhgH3G3Kk4GtJP6ROFElVF+D0="; + stripLen = 1; + extraPrefix = "src/"; + }) ]; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix index 425060e240..e68240bb04 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/lunatic/default.nix @@ -1,26 +1,27 @@ -{ lib, rustPlatform, fetchFromGitHub, cmake, stdenv }: +{ lib, rustPlatform, fetchFromGitHub, cmake, stdenv, Security }: rustPlatform.buildRustPackage rec { pname = "lunatic"; - version = "0.7.5"; + version = "0.10.0"; src = fetchFromGitHub { owner = "lunatic-solutions"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HqDrGoyYzdx8OTanlRd95L1wAtFeew7Xs2rZ7nK2Zus="; + sha256 = "sha256-MfN4NZIkzQji+bIfpgDdVyGXiD291ULGT2JslSevr/w="; }; - cargoSha256 = "sha256-t3EwVYrKx7dvUcSp0B1iUAklg7WdQDld/T0O1HgHw54="; + cargoSha256 = "sha256-Qpu6FKIrDZyEbcv/uRjInz6lmMeTSZvY/JGLJe+My+U="; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional stdenv.isDarwin Security; + meta = with lib; { description = "An Erlang inspired runtime for WebAssembly"; homepage = "https://lunatic.solutions"; changelog = "https://github.com/lunatic-solutions/lunatic/blob/v${version}/RELEASES.md"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix index 3c85b67a94..52be0a4120 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/micropython/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "micropython"; - version = "1.18"; + version = "1.19.1"; src = fetchFromGitHub { - owner = "micropython"; - repo = "micropython"; - rev = "v${version}"; - sha256 = "sha256-roskIDyY3ehasOm8Yn4braLNZtaeuItb9ZOUgF4CXww="; + owner = "micropython"; + repo = "micropython"; + rev = "v${version}"; + sha256 = "sha256-BoX3Z3Zr/AQqkgRrq+UVgdoDqNESDTNsY9AtrElpzfA="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix index 7a097391ba..01b7fd5410 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/nickel/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "0.1.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "tweag"; repo = pname; rev = "refs/tags/${version}"; # because pure ${version} doesn't work - hash = "sha256-St8oK9vP2cAhsNindkebtAMeRPwYggP9E4CciSZc7oA="; + hash = "sha256-Sf0UJAfUtP7oU31VkVqCtdRmfjaHV34gYeUPNsTmQvo="; }; - cargoSha256 = "sha256-VsyK/api8acIpADpXQ8RdbRLiZwHFSDH0vwQrZQ8zp4="; + cargoSha256 = "sha256-oY4PYMZBN5+nsARHV+A5D7a6fUt9UMHBn83ONgaQp8E="; meta = with lib; { homepage = "https://nickel-lang.org/"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix index 193eabe6c0..5e346788ee 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.21"; - hash = "sha256-HLd2LR/+zOruuvufbiQTLKI/sUQ8tWMND8z1PwTPoSY="; + version = "8.0.22"; + hash = "sha256-40KRjT7NQi8QAy3wrD/7Dhf1aPrWz44jK296ah/cPJw="; }); in diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix index e56ff13864..37e471601d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.8"; - hash = "sha256-uIFaWgJDFFPUJh41mL0fKFFuTANU8yjBKJDyV4cOTAE="; + version = "8.1.9"; + hash = "sha256-nrsOLlcdtv1ZMEKNyy0Z7T4FAzjsHxNHwoLK6S/Ahv8="; }); in diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix index fd7e684113..25446f5fca 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -68,7 +68,7 @@ let executable = libPrefix; pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; - inherit hasDistutilsCxxPatch; + inherit hasDistutilsCxxPatch pythonAttr; pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix index a52935c69d..dca7d9bb0d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix @@ -91,7 +91,7 @@ let executable = libPrefix; pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; - inherit hasDistutilsCxxPatch; + inherit hasDistutilsCxxPatch pythonAttr; pythonOnBuildForBuild = override pkgsBuildBuild.${pythonAttr}; pythonOnBuildForHost = override pkgsBuildHost.${pythonAttr}; pythonOnBuildForTarget = override pkgsBuildTarget.${pythonAttr}; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix index 5593158e7f..49f7061df3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/default.nix @@ -19,9 +19,14 @@ with pkgs; , pythonOnBuildForTarget , pythonOnHostForHost , pythonOnTargetForTarget + , pythonAttr ? null , self # is pythonOnHostForTarget }: let pythonPackages = callPackage + # Function that when called + # - imports python-packages.nix + # - adds spliced package sets to the package set + # - applies overrides from `packageOverrides` and `pythonPackagesOverlays`. ({ pkgs, stdenv, python, overrides }: let pythonPackagesFun = import ../../../top-level/python-packages.nix { inherit stdenv pkgs lib; @@ -74,7 +79,7 @@ with pkgs; extra = _: {}; optionalExtensions = cond: as: if cond then as else []; python2Extension = import ../../../top-level/python2-packages.nix; - extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]); + extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ pkgs.pythonPackagesExtensions ++ [ overrides ]); aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super); in lib.makeScopeWithSplicing pkgs.splicePackages @@ -117,6 +122,8 @@ with pkgs; tests = callPackage ./tests.nix { python = self; }; + + inherit pythonAttr; }; sources = { @@ -199,9 +206,9 @@ in { major = "3"; minor = "11"; patch = "0"; - suffix = "b4"; + suffix = "rc1"; }; - sha256 = "sha256-HZO2EWB5A+CAQXwalWf1+79RJMxchvSvu6HI/TTF9vs="; + sha256 = "sha256-U6U3fDeoosbaB1sU651jN0V59/PHGPog8KH7sOlKkis="; inherit (darwin) configd; inherit passthruFun; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh index 0140958b23..92cc9e52ed 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/sphinx-hook.sh @@ -53,5 +53,5 @@ installSphinxPhase() { runHook postInstallSphinx } -preBuildPhases+=" buildSphinxPhase" +preDistPhases+=" buildSphinxPhase" postPhases+=" installSphinxPhase" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix index 668a4e24b3..e8c7d3ba65 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/pypy/default.nix @@ -30,6 +30,7 @@ let executable = "pypy${if isPy3k then "3" else ""}"; sitePackages = "site-packages"; hasDistutilsCxxPatch = false; + inherit pythonAttr; pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix index 49dfe0e464..037c8f87b8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/python/tests.nix @@ -11,6 +11,7 @@ , substituteAll , lib , callPackage +, pkgs }: let @@ -133,6 +134,17 @@ let # test-overrideScope = let # myPackages = python.pkgs.overrideScope extension; # in assert myPackages.foobar == myPackages.numpy; myPackages.python.withPackages(ps: with ps; [ foobar ]); + } // lib.optionalAttrs (python ? pythonAttr) { + # Test applying overrides using pythonPackagesOverlays. + test-pythonPackagesExtensions = let + pkgs_ = pkgs.extend(final: prev: { + pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ + (python-final: python-prev: { + foo = python-prev.setuptools; + }) + ]; + }); + in pkgs_.${python.pythonAttr}.pkgs.foo; }; condaTests = let diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/102.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/102.nix new file mode 100644 index 0000000000..ef89d1ca0a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/102.nix @@ -0,0 +1,4 @@ +import ./common.nix { + version = "102.1.0"; + hash = "sha512-JQW4fOQRVEVWjra32K9BZ4vXh/0H8/eenwoi2QzfdSrl1DcYVs+cVuLZ2n1bfDk53CqrV1P8wBc5jn1lJg9vAw=="; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix index 0ce007057a..05124a417f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix @@ -1,139 +1,4 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, autoconf213 -, pkg-config -, perl -, python39 -, zip -, buildPackages -, which -, readline -, zlib -, icu67 -, cargo -, rustc -, rust-cbindgen -, yasm -, nspr -}: - -stdenv.mkDerivation rec { - pname = "spidermonkey"; +import ./common.nix { version = "78.15.0"; - - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "0l91cxdc5v9fps79ckb1kid4gw6v5qng1jd9zvaacwaiv628shx4"; - }; - - patches = [ - # Fix build failure on armv7l using Debian patch - # Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 - (fetchpatch { - url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch"; - sha256 = "02b7zwm6vxmk61aj79a6m32s1k5sr0hwm3q1j4v6np9jfyd10g1j"; - }) - - # Remove this when updating to 79 - The patches are already applied upstream - # https://bugzilla.mozilla.org/show_bug.cgi?id=1318905 - - # Combination of 3 changesets, modified to apply on 78: - # - https://hg.mozilla.org/mozilla-central/rev/06d7e1b6b7e7 - # - https://hg.mozilla.org/mozilla-central/rev/ec48f15d085c - # - https://hg.mozilla.org/mozilla-central/rev/6803dda74d33 - ./add-riscv64-support.patch - ]; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; # Configure script only understands --includedir - - nativeBuildInputs = [ - autoconf213 - cargo - rustc.llvmPackages.llvm # for llvm-objdump - perl - pkg-config - python39 - rust-cbindgen - rustc - which - yasm # to buid icu? seems weird - zip - ]; - - buildInputs = [ - icu67 - nspr - readline - zlib - ]; - - preConfigure = '' - export CXXFLAGS="-fpermissive" - export LIBXUL_DIST=$out - export PYTHON="${buildPackages.python3.interpreter}" - - # We can't build in js/src/, so create a build dir - mkdir obj - cd obj/ - configureScript=../js/src/configure - ''; - - configureFlags = [ - "--with-system-zlib" - "--with-system-nspr" - "--with-system-icu" - "--with-intl-api" - "--enable-readline" - "--enable-shared-js" - "--disable-jemalloc" - # Fedora and Arch disable optimize, but it doesn't seme to be necessary - # It turns on -O3 which some gcc version had a problem with: - # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e - "--enable-optimize" - "--enable-release" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # Spidermonkey seems to use different host/build terminology for cross - # compilation here. - "--host=${stdenv.buildPlatform.config}" - "--target=${stdenv.hostPlatform.config}" - ]; - - # mkDerivation by default appends --build/--host to configureFlags when cross compiling - # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list - configurePlatforms = [ ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - # 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) "-mabi=lp64d"; - - # Remove unnecessary static lib - preFixup = '' - moveToOutput bin/js78-config "$dev" - rm $out/lib/libjs_static.ajs - ln -s $out/bin/js78 $out/bin/js - ''; - - enableParallelBuilding = true; - - postPatch = '' - # This patch is a manually applied fix of - # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 - # Once that bug is fixed, this can be removed. - # This is needed in, for example, `zeroad`. - substituteInPlace js/public/StructuredClone.h \ - --replace "class SharedArrayRawBufferRefs {" \ - "class JS_PUBLIC_API SharedArrayRawBufferRefs {" - ''; - - meta = with lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://spidermonkey.dev/"; - license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. - maintainers = with maintainers; [ abbradar lostnet ]; - platforms = platforms.linux; - }; + hash = "sha512-rD3nNbJGzk8OFhnNJmQyH/o3QkDOaEPnhdeaNQ3DDJZ5lrvMXjswHLPYIsqYHL6hFnWPxBIvFzjXXd/RFltjeA==="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix index 125c60f237..ca771fa75f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/91.nix @@ -1,125 +1,4 @@ -{ lib -, stdenv -, fetchurl - -# build time -, buildPackages -, cargo -, m4 -, perl -, pkg-config -, python3 -, rust-cbindgen -, rustc -, which -, zip - -# runtime -, icu -, nspr -, readline -, zlib -}: - -stdenv.mkDerivation rec { - pname = "spidermonkey"; - version = "91.11.0"; - - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha512 = "bff3a399c03bd1cdaaec0b6963b1558aa35b6338b6c02042ffd65fec0aedd344d01718692e881332f5f352c32da15ba09a20a09ee072200b47ae840bc0585a96"; - }; - - outputs = [ "out" "dev" ]; - setOutputFlags = false; # Configure script only understands --includedir - - nativeBuildInputs = [ - cargo - m4 - perl - pkg-config - python3 - rust-cbindgen - rustc - rustc.llvmPackages.llvm # for llvm-objdump - which - zip - ]; - - buildInputs = [ - icu - nspr - readline - zlib - ]; - - preConfigure = '' - export LIBXUL_DIST=$out - export PYTHON="${buildPackages.python3.interpreter}" - export M4=m4 - export AWK=awk - export AC_MACRODIR=$PWD/build/autoconf/ - - pushd js/src - sh ../../build/autoconf/autoconf.sh --localdir=$PWD configure.in > configure - chmod +x configure - popd - # We can't build in js/src/, so create a build dir - mkdir obj - cd obj/ - configureScript=../js/src/configure - ''; - - configureFlags = [ - "--with-intl-api" - "--with-system-icu" - "--with-system-nspr" - "--with-system-zlib" - "--enable-optimize" - "--enable-readline" - "--enable-release" - "--enable-shared-js" - "--disable-debug" - "--disable-jemalloc" - "--disable-strip" - "--disable-tests" - ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - # Spidermonkey seems to use different host/build terminology for cross - # compilation here. - "--host=${stdenv.buildPlatform.config}" - "--target=${stdenv.hostPlatform.config}" - ]; - - # mkDerivation by default appends --build/--host to configureFlags when cross compiling - # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list - configurePlatforms = [ ]; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - - # Remove unnecessary static lib - preFixup = '' - moveToOutput bin/js91-config "$dev" - rm $out/lib/libjs_static.ajs - ln -s $out/bin/js91 $out/bin/js - ''; - - enableParallelBuilding = true; - - postPatch = '' - # This patch is a manually applied fix of - # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 - # Once that bug is fixed, this can be removed. - # This is needed in, for example, `zeroad`. - substituteInPlace js/public/StructuredClone.h \ - --replace "class SharedArrayRawBufferRefs {" \ - "class JS_PUBLIC_API SharedArrayRawBufferRefs {" - ''; - - meta = with lib; { - description = "Mozilla's JavaScript engine written in C/C++"; - homepage = "https://spidermonkey.dev/"; - license = licenses.mpl20; - maintainers = with maintainers; [ lostnet ]; - platforms = platforms.linux; - }; +import ./common.nix { + version = "91.12.0"; + hash = "sha512-Mj+3UkiLRYcrQPCw7h2MHf+haHTb/yr94ZpUKGyCTvSBdyM+Ap+ur6WUYYTnHDHGvFun7BelceIa9k/F9zNAQg=="; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch new file mode 100644 index 0000000000..29966d9086 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch @@ -0,0 +1,40 @@ +From a26bb162d9403138d64b84e8fa4f0471084c45b2 Mon Sep 17 00:00:00 2001 +From: "Kirill A. Korinsky" +Date: Fri, 8 Jul 2022 21:21:25 +0200 +Subject: [PATCH] Allow system's nspr and icu on bootstrapped sysroot + +This patch partially reverts https://github.com/mozilla/gecko-dev/commit/9aa3587bbf0416dd2eb5b614f7b301c71c64286b +--- + build/moz.configure/nspr.configure | 2 +- + js/moz.configure | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/moz.configure/nspr.configure b/build/moz.configure/nspr.configure +index 06f03d9bc72d..9687c84a7290 100644 +--- a/build/moz.configure/nspr.configure ++++ b/build/moz.configure/nspr.configure +@@ -19,7 +19,7 @@ def enable_nspr_build(enable): + return enable + + +-system_lib_option("--with-system-nspr", help="Use system NSPR") ++option("--with-system-nspr", help="Use system NSPR") + + + @depends(enable_nspr_build, "--with-system-nspr", js_standalone) +diff --git a/js/moz.configure b/js/moz.configure +index b7ba9790425d..5ff5cb2da266 100644 +--- a/js/moz.configure ++++ b/js/moz.configure +@@ -1129,7 +1129,7 @@ set_define( + + # ECMAScript Internationalization API Support (uses ICU) + # ====================================================== +-system_lib_option("--with-system-icu", help="Use system ICU") ++option("--with-system-icu", help="Use system ICU") + + system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 71.1", when="--with-system-icu") + +-- +2.37.0 + diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config.patch b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config.patch new file mode 100644 index 0000000000..c6e43b60aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/always-check-for-pkg-config.patch @@ -0,0 +1,23 @@ +From 9d3f6e9ff5e66af90a5d187d902f7893fb91c24b Mon Sep 17 00:00:00 2001 +From: "Kirill A. Korinsky" +Date: Fri, 1 Jul 2022 12:23:37 +0200 +Subject: [PATCH] Always check for pkg-config + +--- + build/moz.configure/pkg.configure | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/build/moz.configure/pkg.configure b/build/moz.configure/pkg.configure +index 6b460ae174eed..0056ecd7ae2d8 100644 +--- a/build/moz.configure/pkg.configure ++++ b/build/moz.configure/pkg.configure +@@ -15,8 +15,7 @@ pkg_config = check_prog( + pkg_config, + bootstrap=depends(when=target_sysroot.bootstrapped)(lambda: "pkgconf"), + allow_missing=True, +- when=compile_environment +- & depends(target.os)(lambda os: os not in ("WINNT", "OSX", "Android")), ++ when=compile_environment, + ) + + diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix new file mode 100644 index 0000000000..8e2b1234fd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/common.nix @@ -0,0 +1,199 @@ +{ version, hash }: + +{ callPackage +, lib +, stdenv +, fetchurl +, fetchpatch + +# build time +, buildPackages +, cargo +, m4 +, perl +, pkg-config +, python3 +, python39 +, rustc +, which +, zip +, autoconf213 +, yasm +, xcbuild + +# runtime +, icu +, icu67 +, nspr +, readline +, zlib +, libobjc +, libiconv +}: + +stdenv.mkDerivation (finalAttrs: rec { + pname = "spidermonkey"; + inherit version; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; + inherit hash; + }; + + patches = lib.optional (lib.versionOlder version "91") [ + # Fix build failure on armv7l using Debian patch + # Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1526653 + (fetchpatch { + url = "https://salsa.debian.org/mozilla-team/firefox/commit/fd6847c9416f9eebde636e21d794d25d1be8791d.patch"; + hash = "sha512-K8U3Qyo7g4si2r/8kJdXyRoTrDHAY48x/YJ7YL+YBwlpfNQcHxX+EZvhRzW8FHYW+f7kOnJu9QykhE8PhSQ9zQ=="; + }) + + # Remove this when updating to 79 - The patches are already applied upstream + # https://bugzilla.mozilla.org/show_bug.cgi?id=1318905 + + # Combination of 3 changesets, modified to apply on 78: + # - https://hg.mozilla.org/mozilla-central/rev/06d7e1b6b7e7 + # - https://hg.mozilla.org/mozilla-central/rev/ec48f15d085c + # - https://hg.mozilla.org/mozilla-central/rev/6803dda74d33 + ./add-riscv64-support.patch + ] ++ lib.optionals (lib.versionAtLeast version "102") [ + # 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="; + }) + ]; + + nativeBuildInputs = [ + cargo + m4 + perl + pkg-config + # 78 requires python up to 3.9 + (if lib.versionOlder version "91" then python39 else python3) + rustc + rustc.llvmPackages.llvm # for llvm-objdump + which + zip + ] ++ lib.optionals (lib.versionOlder version "91") [ + autoconf213 + yasm # to buid icu? seems weird + ] ++ lib.optionals stdenv.isDarwin [ + xcbuild + ]; + + buildInputs = [ + (if lib.versionOlder version "91" then icu67 else icu) + nspr + readline + zlib + ] ++ lib.optionals stdenv.isDarwin [ + libobjc + libiconv + ]; + + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + + setOutputFlags = false; # Configure script only understands --includedir + + configureFlags = [ + "--with-intl-api" + "--with-system-icu" + "--with-system-nspr" + "--with-system-zlib" + # Fedora and Arch disable optimize, but it doesn't seme to be necessary + # It turns on -O3 which some gcc version had a problem with: + # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e + "--enable-optimize" + "--enable-readline" + "--enable-release" + "--enable-shared-js" + ] ++ lib.optionals (lib.versionAtLeast version "91") [ + "--disable-debug" + ] ++ [ + "--disable-jemalloc" + "--disable-strip" + "--disable-tests" + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Spidermonkey seems to use different host/build terminology for cross + # compilation here. + "--host=${stdenv.buildPlatform.config}" + "--target=${stdenv.hostPlatform.config}" + ]; + + # mkDerivation by default appends --build/--host to configureFlags when cross compiling + # These defaults are bogus for Spidermonkey - avoid passing them by providing an empty list + configurePlatforms = [ ]; + + enableParallelBuilding = true; + + # 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"; + + postPatch = lib.optionalString (lib.versionOlder version "102") '' + # This patch is a manually applied fix of + # https://bugzilla.mozilla.org/show_bug.cgi?id=1644600 + # Once that bug is fixed, this can be removed. + # This is needed in, for example, `zeroad`. + substituteInPlace js/public/StructuredClone.h \ + --replace "class SharedArrayRawBufferRefs {" \ + "class JS_PUBLIC_API SharedArrayRawBufferRefs {" + ''; + + preConfigure = lib.optionalString (lib.versionOlder version "91") '' + export CXXFLAGS="-fpermissive" + '' + '' + export LIBXUL_DIST=$out + export PYTHON="${buildPackages.python3.interpreter}" + '' + lib.optionalString (lib.versionAtLeast version "91") '' + export M4=m4 + export AWK=awk + export AS=$CC + export AC_MACRODIR=$PWD/build/autoconf/ + + pushd js/src + sh ../../build/autoconf/autoconf.sh --localdir=$PWD configure.in > configure + chmod +x configure + popd + '' + '' + # We can't build in js/src/, so create a build dir + mkdir obj + cd obj/ + configureScript=../js/src/configure + ''; + + # Remove unnecessary static lib + preFixup = '' + moveToOutput bin/js${lib.versions.major version}-config "$dev" + rm $out/lib/libjs_static.ajs + ln -s $out/bin/js${lib.versions.major version} $out/bin/js + ''; + + passthru.tests.run = callPackage ./test.nix { + spidermonkey = finalAttrs.finalPackage; + }; + + meta = with lib; { + description = "Mozilla's JavaScript engine written in C/C++"; + homepage = "https://spidermonkey.dev/"; + license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78. + maintainers = with maintainers; [ abbradar lostnet catap ]; + platforms = platforms.unix; + }; +}) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/test.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/test.nix new file mode 100644 index 0000000000..c3ef92bebf --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/test.nix @@ -0,0 +1,10 @@ +{ runCommand, spidermonkey }: + +runCommand "spidermonkey-test-run" { + nativeBuildInputs = [ + spidermonkey + ]; +} '' + diff -U3 --color=auto <(js <(echo "console.log('Hello, world\!')")) <(echo 'Hello, world!') + touch $out +'' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix index 9ca0e52627..b0ab011d38 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmer/default.nix @@ -9,17 +9,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmer"; - version = "2.1.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "wasmerio"; repo = pname; rev = version; - sha256 = "sha256-uD+JH42AxXxLMLqBurNDfYc7tLlBlEmaLB5rbip+/D4="; + sha256 = "sha256-25wWgMNybbsEf/1xmm+8BPcjx8CSW9ZBzxGKT/DbBXw="; fetchSubmodules = true; }; - cargoSha256 = "sha256-eiX5p2qWUZgoHzoHYXDsp9N6foiX3JovKO6MpoJOXFo="; + cargoSha256 = "sha256-tswsbijNN5UcSZovVmy66yehcEOpQDGMdRgR/1mkuE8="; nativeBuildInputs = [ cmake pkg-config ]; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { ]; # Can't use test-jit: - # error: Package `wasmer-workspace v2.1.1 (/build/source)` does not have the feature `test-jit` + # error: Package `wasmer-workspace v2.3.0 (/build/source)` does not have the feature `test-jit` checkFeatures = [ "test-cranelift" ]; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix index 508dc2be60..9851da2a3c 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/wasmtime/default.nix @@ -2,21 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.38.0"; + version = "0.39.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-q+6w22MbI3HRpmkybZXXWbkK7jbd6lyxodC3EpSovRI="; + sha256 = "sha256-cU03wm1+V++mV7j7VyMtjAYrPldzTysNzpJ8m0q4Rx8="; fetchSubmodules = true; }; - cargoSha256 = "sha256-uuhGb0/RDz1/3O8WYiyGIUQFh0WZWJgujqtvH+hgbdA="; + cargoSha256 = "sha256-DnThste0SbBdpGAUYhmwbdQFNEB3LozyDf0X8r2A90Q="; doCheck = true; 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" diff --git a/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix index 02d3dbeb9f..9266ec0122 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/yabasic/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yabasic"; - version = "2.90.1"; + version = "2.90.2"; src = fetchurl { url = "http://www.yabasic.de/download/${pname}-${version}.tar.gz"; - hash = "sha256-9LqiwS3Udql3YZoufo3spVpE46me3McI8L08TpNJpJo="; + hash = "sha256-ff5j0cJ1i2HWIsYjwzx5FFtZfchWsGRF2AZtbDXrNJw="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix index f70e674eda..e43fbeea5d 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/zuo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zuo"; - version = "unstable-2022-04-23"; + version = "unstable-2022-07-25"; src = fetchFromGitHub { owner = "racket"; repo = "zuo"; - rev = "2f3e23bd374f9a6504de6000989ebf2adf67c80c"; - sha256 = "sha256-TxX3iinfL1hXFlQlGQ7x52O6zvYoJYXrMfEfSL4Axig="; + rev = "18778d759e7af1d9c4b6ce7649a3aa4a49a2aa7f"; + sha256 = "sha256-Y5+C1UdaeweYaGqomC1dFmTF8qGDquuP42Bn6QbZ9nk="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix b/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix index 2f2a0905d5..76fe582248 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/CGAL/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cgal"; - version = "5.4"; + version = "5.5"; src = fetchFromGitHub { owner = "CGAL"; repo = "releases"; rev = "CGAL-${version}"; - sha256 = "sha256-flrVWsvGAdGVCZ1Ygy9z30w6aU8WAzpMLv+JbP2CKjE="; + sha256 = "sha256-C576lYTQd6mgJPBqFRN3Ty6WYeXcXlDZ5sRtDwOuKSo="; }; # note: optional component libCGAL_ImageIO would need zlib and opengl; diff --git a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix index 15289570d4..f73c5746cb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/SDL2/default.nix @@ -29,7 +29,7 @@ , libxkbcommon , dbusSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , dbus -, udevSupport ? false +, udevSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid , udev , ibusSupport ? false , ibus diff --git a/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix index 921e90e302..fdb309c634 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "a52dec"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" + # Define inline as __attribute__ ((__always_inline__)) + "ac_cv_c_inline=yes" ]; makeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix index efe9640af6..4bd7a67871 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/accountsservice/default.nix @@ -10,6 +10,7 @@ , systemd , coreutils , meson +, mesonEmulatorHook , dbus , ninja , python3 @@ -47,7 +48,6 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - dbus gettext gobject-introspection meson @@ -55,9 +55,14 @@ stdenv.mkDerivation rec { pkg-config python3 vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + # meson.build:88:2: ERROR: Can not run test applications in this cross environment. + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection + dbus glib polkit systemd diff --git a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix index f8496499ba..dd76917625 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aravis/default.nix @@ -29,13 +29,13 @@ assert enableViewer -> wrapGAppsHook != null; stdenv.mkDerivation rec { pname = "aravis"; - version = "0.8.21"; + version = "0.8.22"; src = fetchFromGitHub { owner = "AravisProject"; repo = pname; rev = version; - sha256 = "sha256-z4fuo8tVyHf2Bw73ZfAEpAYmzbr9UIzEWPC5f95wnD8="; + sha256 = "sha256-S9DmXjywxNr5Rpx605zip76vGKBSrUwyerqXlBm05VI="; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix new file mode 100644 index 0000000000..ac195e909c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "argparse"; + version = "2.6"; + + src = fetchFromGitHub { + owner = "p-ranav"; + repo = "argparse"; + rev = "v${version}"; + sha256 = "sha256-imLDuVbzkiE5hcQVarZGeNzNZE0/8LHMQqAiUYzPVks="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Argument Parser for Modern C++"; + homepage = "https://github.com/p-ranav/argparse"; + maintainers = with maintainers; [ _2gn ]; + platforms = platforms.unix; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 43fa2027cc..6277ec4f87 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "11.2.2"; + version = "11.2.3"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-1AHZmkImwoxb+9nUMB8LM/4sgAyoZavgDNnFk+OTpic="; + sha256 = "sha256-TC6XzmBwf8HzSPRPevDLbSRm0KrQ0OpL9dXcGA5sukE="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arpa2common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arpa2common/default.nix index 7fcb2a945e..0ada354ce1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arpa2common/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arpa2common/default.nix @@ -6,6 +6,7 @@ , arpa2cm , doxygen , e2fsprogs +, graphviz , lmdb , openssl , pkg-config @@ -14,19 +15,20 @@ stdenv.mkDerivation rec { pname = "arpa2common"; - version = "2.2.14"; + version = "2.2.18"; src = fetchFromGitLab { owner = "arpa2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LWsWoHRdLWRSF9JaEwrw+CXm5Azgh7zNeq0a8Z/hijQ="; + sha256 = "sha256-UpAVyDXCe07ZwjD307t6G9f/Nny4QYXxGxft1KsiYYg="; }; nativeBuildInputs = [ cmake arpa2cm doxygen + graphviz pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix index a69d161c92..d3b736fbe0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-cpp/default.nix @@ -18,7 +18,6 @@ , google-cloud-cpp , grpc , gtest -, jemalloc , libbacktrace , lz4 , minio @@ -56,55 +55,58 @@ let arrow-testing = fetchFromGitHub { owner = "apache"; repo = "arrow-testing"; - rev = "634739c664433cec366b4b9a81d1e1044a8c5eda"; - hash = "sha256-r1WVgJJsI7v485L6Qb+5i7kFO4Tvxyk1T0JBb4og6pg="; + rev = "5bab2f264a23f5af68f69ea93d24ef1e8e77fc88"; + hash = "sha256-Pxx8ohUpXb5u1995IvXmxQMqWiDJ+7LAll/AjQP7ph8="; }; parquet-testing = fetchFromGitHub { owner = "apache"; repo = "parquet-testing"; - rev = "acd375eb86a81cd856476fca0f52ba6036a067ff"; - hash = "sha256-z/kmi+4dBO/dsVkJA4NgUoxl0pXi8RWIGvI8MGu/gcc="; + rev = "aafd3fc9df431c2625a514fb46626e5614f1d199"; + hash = "sha256-cO5t/mgsbBhbSefx8EMGTyxmgTjhZ8mFujkFQ3p/JS0="; }; in stdenv.mkDerivation rec { pname = "arrow-cpp"; - version = "8.0.0"; + version = "9.0.0"; src = fetchurl { url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz"; - hash = "sha256-rZoFcFEXyYnBFrrprHBJL+AVBQ4bgPsOOP3ktdhjqqM="; + hash = "sha256-qaAz8KNJAomZj0WGgNGVec8HkRcXumWv3my4AHD3qbU="; }; sourceRoot = "apache-arrow-${version}/cpp"; # versions are all taken from - # https://github.com/apache/arrow/blob/apache-arrow-8.0.0/cpp/thirdparty/versions.txt + # https://github.com/apache/arrow/blob/apache-arrow-${version}/cpp/thirdparty/versions.txt + # jemalloc: arrow uses a custom prefix to prevent default allocator symbol + # collisions as well as custom build flags ${if enableJemalloc then "ARROW_JEMALLOC_URL" else null} = fetchurl { - url = "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2"; - hash = "sha256-NDMOXOJ2CZ4uiVDZM121qHVomkxqVnUe87HYxTf4h/Y="; + url = "https://github.com/jemalloc/jemalloc/releases/download/5.3.0/jemalloc-5.3.0.tar.bz2"; + hash = "sha256-LbgtHnEZ3z5xt2QCGbbf6EeJvAU3mDw7esT3GJrs/qo="; }; + # mimalloc: arrow uses custom build flags for mimalloc ARROW_MIMALLOC_URL = fetchFromGitHub { owner = "microsoft"; repo = "mimalloc"; - rev = "v1.7.3"; - hash = "sha256-Ca877VitpWyKmZNHavqgewk/P+tyd2xHDNVqveKh87M="; + rev = "v2.0.6"; + hash = "sha256-u2ITXABBN/dwU+mCIbL3tN1f4c17aBuSdNTV+Adtohc="; }; ARROW_XSIMD_URL = fetchFromGitHub { owner = "xtensor-stack"; repo = "xsimd"; - rev = "7d1778c3b38d63db7cec7145d939f40bc5d859d1"; - hash = "sha256-89AysBUVnTdWyMPazeJegnQ6WEH90Ns7qQInZLMSXY4="; + rev = "8.1.0"; + hash = "sha256-Aqs6XJkGjAjGAp0PprabSM4m+32M/UXpSHppCHdzaZk="; }; ARROW_SUBSTRAIT_URL = fetchFromGitHub { owner = "substrait-io"; repo = "substrait"; - rev = "e1b4c04a1b518912f4c4065b16a1b2c0ac8e14cf"; - hash = "sha256-56FSjDngsROSHLjMv+OYAIYqphEu3GzgIMHbgh/ZQw0="; + rev = "v0.6.0"; + hash = "sha256-hxCBomL4Qg9cHLRg9ZiO9k+JVOZXn6f4ikPtK+V9tno="; }; patches = [ @@ -159,7 +161,6 @@ stdenv.mkDerivation rec { ''; cmakeFlags = [ - "-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON" "-DARROW_BUILD_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_BUILD_STATIC=${if enableShared then "OFF" else "ON"}" "-DARROW_BUILD_TESTS=ON" @@ -168,7 +169,7 @@ stdenv.mkDerivation rec { "-DARROW_EXTRA_ERROR_CONTEXT=ON" "-DARROW_VERBOSE_THIRDPARTY_BUILD=ON" "-DARROW_DEPENDENCY_SOURCE=SYSTEM" - "-DThrift_SOURCE=AUTO" # search for Thrift using pkg-config (ThriftConfig.cmake requires OpenSSL and libevent) + "-Dxsimd_SOURCE=AUTO" "-DARROW_DEPENDENCY_USE_SHARED=${if enableShared then "ON" else "OFF"}" "-DARROW_COMPUTE=ON" "-DARROW_CSV=ON" @@ -204,7 +205,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (!enableShared) [ "-DARROW_TEST_LINKAGE=static" ] ++ lib.optionals stdenv.isDarwin [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests "-DCMAKE_INSTALL_RPATH=@loader_path/../lib" # needed for tools executables ] ++ lib.optional (!stdenv.isx86_64) "-DARROW_USE_SIMD=OFF" ++ lib.optional enableS3 "-DAWSSDK_CORE_HEADER_FILE=${aws-sdk-cpp}/include/aws/core/Aws.h"; @@ -230,6 +230,7 @@ stdenv.mkDerivation rec { ]; in lib.optionalString doInstallCheck "-${builtins.concatStringsSep ":" filteredTests}"; + __darwinAllowLocalNetworking = true; installCheckInputs = [ perl which sqlite ] ++ lib.optional enableS3 minio; installCheckPhase = let @@ -251,7 +252,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cross-language development platform for in-memory data"; - homepage = "https://arrow.apache.org/"; + homepage = "https://arrow.apache.org/docs/cpp/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ tobim veprbl cpcloud ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/arrow-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arrow-glib/default.nix new file mode 100644 index 0000000000..9c396f89d1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/arrow-glib/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, arrow-cpp +, fetchurl +, glib +, gobject-introspection +, lib +, meson +, ninja +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "arrow-glib"; + inherit (arrow-cpp) src version; + sourceRoot = "apache-arrow-${version}/c_glib"; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + arrow-cpp + glib + gobject-introspection + ]; + + meta = with lib; { + inherit (arrow-cpp.meta) license platforms; + description = "GLib bindings for Apache Arrow"; + homepage = "https://arrow.apache.org/docs/c_glib/"; + maintainers = with maintainers; [ amarshall ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/atk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/atk/default.nix index ce3352b575..268bf43eb3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/atk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/atk/default.nix @@ -39,15 +39,13 @@ stdenv.mkDerivation rec { fixDarwinDylibNames ]; + buildInputs = [ gobject-introspection ]; + propagatedBuildInputs = [ # Required by atk.pc glib ]; - mesonFlags = [ - "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - ]; - doCheck = true; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix b/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix index 6b22c34e0c..f034216197 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/atkmm/2.36.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atkmm"; - version = "2.36.1"; + version = "2.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-4RMkv+0bbjMKAtslzswUXcoD+w3/R/BxDIXjF2h9pFg="; + sha256 = "sha256-b2LdmfdGmF5XNgWTdXfM/JRDaPYGpxykY0LXDhza4Hk="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix index 7e3cecf12a..d26611f450 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/atkmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atkmm"; - version = "2.28.2"; + version = "2.28.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oLtJdlzszCk6ssZzW6EAQxgH04T/oUwuvTDgeZP9L6Q="; + sha256 = "sha256-fCCItIapCb6NorGDBOVsX5CITRNDyNpzZ+pc0yWLmWk="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix index cb34f24ced..65e4d0fb15 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libkeyfinder/default.nix @@ -11,9 +11,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-7w/Wc9ncLinbnM2q3yv5DBtFoJFAM2e9xAUTsqvE9mg="; }; - # needed for finding libkeyfinder.so to link it into keyfinder-tests executable - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ fftw ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libspecbleach/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libspecbleach/default.nix index f9f147ab11..b1065561e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/libspecbleach/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libspecbleach/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libspecbleach"; - version = "0.1.2"; + version = "0.1.6"; src = fetchFromGitHub { owner = "lucianodato"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WmUl8rA/+V+hv7FPG/5Or6aAQVqt1rIJtdb53KhSmuo="; + sha256 = "sha256-Tw5nrGVAeoiMH00efJwcU+QLmKDZZTXHQPSV9x789TM="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix index dc01027c46..dccb738a30 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix @@ -14,10 +14,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD - ''; meta = with lib; { description = "P25 Phase 1 and ProVoice vocoder"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index 3a1118c0d8..3d5d973eec 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "zita-alsa-pcmi"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-vYyfNg37VB+2DkinE7rx4i1BssdMGaD+ny005y9Q8cU="; + sha256 = "sha256-zyAKaO22She1e/+zPjiwSHeCctGLVYnT0vWgHODzSwc="; }; buildInputs = [ alsa-lib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix index b1d83e7e3d..02ed9af632 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "avro-c"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; - sha256 = "sha256-BlJZClStjkqliiuf8fTOcaZKQbCgXEUp0cUYxh52BkM="; + sha256 = "sha256-EliMTjED5/RKHgWrWD8d0Era9qEKov1z4cz1kEVTX5I="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix index 5b85907501..2c70c3e8ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-auth/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix index 1b8f7e73e8..b20371f5dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-common/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ] ++ lib.optionals stdenv.hostPlatform.isRiscV [ "-DCMAKE_C_FLAGS=-fasynchronous-unwind-tables" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix index 9d885278ff..5d13c0653b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-compression/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix index 0eee407f98..86ab4f4230 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-http/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix index 11ba67fe6f..6700b4e6a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-mqtt/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix index 398a36019f..881bec9c28 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-s3/default.nix @@ -38,7 +38,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix index 6fb04fbb3a..919b3229d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-c-sdkutils/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix index 201837eb53..28bb15f2a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_DEPS=OFF" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix index 8bf009ddac..889c03676c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -85,7 +85,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_DEPS=OFF" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ] ++ lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-DENABLE_TESTING=OFF" diff --git a/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix index d5057a6148..1e74ddfc72 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boehm-gc/default.nix @@ -1,19 +1,23 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , autoreconfHook -, enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG) +# doc: https://github.com/ivmai/bdwgc/blob/v8.0.6/doc/README.macros (LARGE_CONFIG) +, enableLargeConfig ? false +, enableMmap ? true , nixVersions }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "boehm-gc"; version = "8.0.6"; src = fetchurl { urls = [ - "https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz" - "https://www.hboehm.info/gc/gc_source/gc-${version}.tar.gz" + "https://www.hboehm.info/gc/gc_source/gc-${finalAttrs.version}.tar.gz" + "https://github.com/ivmai/bdwgc/releases/download/v${finalAttrs.version}/gc-${finalAttrs.version}.tar.gz" ]; - sha256 = "3b4914abc9fa76593596773e4da671d7ed4d5390e3d46fbf2e5f155e121bea11"; + sha256 = "sha256-O0kUq8n6dlk1lnc+TaZx1+1NU5Dj1G+/Ll8VXhIb6hE="; }; outputs = [ "out" "dev" "doc" ]; @@ -22,22 +26,24 @@ stdenv.mkDerivation rec { # boehm-gc whitelists GCC threading models patches = lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch; - configureFlags = - [ "--enable-cplusplus" "--with-libatomic-ops=none" ] - ++ lib.optional enableLargeConfig "--enable-large-config"; + configureFlags = [ + "--enable-cplusplus" + "--with-libatomic-ops=none" + ] + ++ lib.optional enableMmap "--enable-mmap" + ++ lib.optional enableLargeConfig "--enable-large-config"; - nativeBuildInputs = - lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; - doCheck = true; # not cross; + doCheck = true; enableParallelBuilding = true; passthru.tests = nixVersions; - meta = { + meta = with lib; { + homepage = "https://hboehm.info/gc/"; description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++"; - longDescription = '' The Boehm-Demers-Weiser conservative garbage collector can be used as a garbage collecting replacement for C malloc or C++ new. It allows you @@ -54,13 +60,10 @@ stdenv.mkDerivation rec { Alternatively, the garbage collector may be used as a leak detector for C or C++ programs, though that is not its primary goal. ''; - - homepage = "https://hboehm.info/gc/"; - # non-copyleft, X11-style license + changelog = "https://github.com/ivmai/bdwgc/blob/v${finalAttrs.version}/ChangeLog"; license = "https://hboehm.info/gc/license.txt"; - - maintainers = [ ]; - platforms = lib.platforms.all; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix index 113c4a27b9..6987b6c35f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/botan/2.0.nix @@ -1,19 +1,10 @@ { callPackage, fetchpatch, ... } @ args: callPackage ./generic.nix (args // { - baseVersion = "2.18"; - revision = "1"; - sha256 = "0adf53drhk1hlpfih0175c9081bqpclw6p2afn51cmx849ib9izq"; + baseVersion = "2.19"; + revision = "2"; + sha256 = "sha256-OvXxdhXGtc2Lgy0mn7bLTVTsZPnrCd2/Gt1Qk5QbTXU="; postPatch = '' sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt ''; - extraPatches = [ - (fetchpatch { - name = "CVE-2021-40529.patch"; - url = "https://github.com/randombit/botan/commit/9a23e4e3bc3966340531f2ff608fa9d33b5185a2.patch"; - sha256 = "1ax1n2l9zh0hk35vkkywgkhzpdk76xb9apz2wm3h9kjvjs9acr3y"; - # our source tarball doesn't include the tests - excludes = [ "src/tests/*" ]; - }) - ]; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix index 1384bdee9a..3e5884c6c9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, openssl, boost +{ lib, stdenv, fetchurl, python3, bzip2, zlib, gmp, boost # Passed by version specific builders , baseVersion, revision, sha256 , sourceExtension ? "tar.xz" @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { patches = extraPatches; inherit postPatch; - buildInputs = [ python3 bzip2 zlib gmp openssl boost ] + buildInputs = [ python3 bzip2 zlib gmp boost ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; configurePhase = '' - python configure.py --prefix=$out --with-bzip2 --with-zlib ${if openssl != null then "--with-openssl" else ""} ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } + python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${if stdenv.cc.isClang then " --cc=clang" else "" } ''; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/c-ares/default.nix b/third_party/nixpkgs/pkgs/development/libraries/c-ares/default.nix index b133f9867d..a5a41813bc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/c-ares/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/c-ares/default.nix @@ -25,13 +25,17 @@ stdenv.mkDerivation rec { }; # Adapted from running a cmake build - passthru.cmake-config = writeTextDir "c-ares-config.cmake" + passthru.cmake-config = let + extension = if stdenv.hostPlatform.isStatic then ".a" else stdenv.hostPlatform.extensions.sharedLibrary; + buildType = if stdenv.hostPlatform.isStatic then "STATIC" else "SHARED"; + buildTypeLower = if stdenv.hostPlatform.isStatic then "static" else "shared"; + in writeTextDir "c-ares-config.cmake" '' set(c-ares_INCLUDE_DIR "${self}/include") set(c-ares_LIBRARY c-ares::cares) - add_library(c-ares::cares SHARED IMPORTED) + add_library(c-ares::cares ${buildType} IMPORTED) set_target_properties(c-ares::cares PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${self}/include" @@ -39,12 +43,12 @@ stdenv.mkDerivation rec { ) set_property(TARGET c-ares::cares APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) set_target_properties(c-ares::cares PROPERTIES - IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${stdenv.targetPlatform.extensions.sharedLibrary}" - IMPORTED_SONAME_RELEASE "libcares${stdenv.targetPlatform.extensions.sharedLibrary}" + IMPORTED_LOCATION_RELEASE "${self}/lib/libcares${extension}" + IMPORTED_SONAME_RELEASE "libcares${extension}" ) - add_library(c-ares::cares_shared INTERFACE IMPORTED) - set_target_properties(c-ares::cares_shared PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") - set(c-ares_SHARED_LIBRARY c-ares::cares_shared) + add_library(c-ares::cares_${buildTypeLower} INTERFACE IMPORTED) + set_target_properties(c-ares::cares_${buildTypeLower} PROPERTIES INTERFACE_LINK_LIBRARIES "c-ares::cares") + set(c-ares_${buildType}_LIBRARY c-ares::cares_${buildTypeLower}) ''; }; in self diff --git a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix index 045595a84f..8640fb6b5c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/caf/default.nix @@ -21,10 +21,6 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - preCheck = '' - export LD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io - export DYLD_LIBRARY_PATH=$PWD/libcaf_core:$PWD/libcaf_io - ''; meta = with lib; { description = "An open source implementation of the actor model in C++"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix index 8f65bd6c5c..9a18d173f1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cairo/default.nix @@ -52,9 +52,16 @@ in stdenv.mkDerivation rec { url = "https://github.com/freedesktop/cairo/commit/78266cc8c0f7a595cfe8f3b694bfb9bcc3700b38.patch"; sha256 = "048nzfz7rkgqb9xs0dfs56qdw7ckkxr87nbj3p0qziqdq4nb6wki"; }) - ] ++ optionals stdenv.hostPlatform.isDarwin [ + # Workaround https://gitlab.freedesktop.org/cairo/cairo/-/issues/121 ./skip-configure-stderr-check.patch + + # Fixes cairo crash on macOS Big Sur + # Upstream PR: https://gitlab.freedesktop.org/cairo/cairo/-/issues/420 + (fetchpatch { + url = "https://gitlab.freedesktop.org/cairo/cairo/-/commit/e22d7212acb454daccc088619ee147af03883974.diff"; + sha256 = "sha256-8G98nsPz3MLEWPDX9F0jKgXC4hC4NNdFQLSpmW3ay2s="; + }) ]; outputs = [ "out" "dev" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix b/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix index aaf8c5d5d0..9c2de74bea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catch2/3.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - hash = "sha256-GcMkAgSfQnWs8wQeQD4ZMxJZED8V7FWBU04qMCutlPo="; + hash = "sha256-bp/KLTr754txVUTAauJFrsxGKgZicUEe40CZBDkxRwk="; }; nativeBuildInputs = [ @@ -23,6 +23,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCATCH_DEVELOPMENT_BUILD=ON" "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}" + ] ++ lib.optionals (stdenv.isDarwin && doCheck) [ + # test has a faulty path normalization technique that won't work in + # our darwin build environment https://github.com/catchorg/Catch2/issues/1691 + "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix index d13305d10b..ece7ab2f69 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cdo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, curl, hdf5, netcdf +{ lib, stdenv, fetchurl, curl, hdf5, netcdf, eccodes , # build, install and link to a CDI library [default=no] enable_cdi_lib ? false , # build a completely statically linked CDO binary @@ -9,22 +9,24 @@ stdenv.mkDerivation rec { pname = "cdo"; - version = "1.9.10"; + version = "2.0.5"; # Dependencies buildInputs = [ curl netcdf hdf5 ]; src = fetchurl { - url = "https://code.mpimet.mpg.de/attachments/download/24638/${pname}-${version}.tar.gz"; - sha256 = "sha256-zDnIm7tIHXs5RaBsVqhJIEcjX0asNjxPDZgPzN3mZ34="; + url = "https://code.mpimet.mpg.de/attachments/download/26823/${pname}-${version}.tar.gz"; + sha256 = "sha256-7e678cOxofDGQtrmvIx2JODFS6vkYQZNxcfaykpbDc4="; }; - # Configure phase configureFlags = [ - "--with-netcdf=${netcdf}" "--with-hdf5=${hdf5}"] - ++ lib.optional (enable_cdi_lib) "--enable-cdi-lib" - ++ lib.optional (enable_all_static) "--enable-all-static" - ++ lib.optional (enable_cxx) "--enable-cxx"; + "--with-netcdf=${netcdf}" + "--with-hdf5=${hdf5}" + "--with-eccodes=${eccodes}" + ] + ++ lib.optional enable_cdi_lib "--enable-cdi-lib" + ++ lib.optional enable_all_static "--enable-all-static" + ++ lib.optional enable_cxx "--enable-cxx"; meta = with lib; { description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix index 599ac2b2e7..ecfdda3192 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cmark-gfm/default.nix +++ b/third_party/nixpkgs/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.3"; + version = "0.29.0.gfm.4"; src = fetchFromGitHub { owner = "github"; repo = "cmark-gfm"; rev = version; - sha256 = "sha256-V3XegSjqKLCMpfnoYHr9/r5fSC2CC7A2jXkAcHUt7eA="; + sha256 = "sha256-touFLrxVQvX75JXYLADq84yIuQ1kl43fVUvZ4qGYoMM="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix index e360279c6a..303965b34b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/codec2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "codec2"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "drowe67"; repo = "codec2"; rev = "v${version}"; - hash = "sha256-2/Ef5cEe7Kr3a/D8u4BgvTQM6M6vglXsF+ccstFHDUw="; + hash = "sha256-Q5p6NicwmHBR7drX8Tdgf6Mruqssg9qzMC9sG9DlMbQ="; }; nativeBuildInputs = [ cmake ]; @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { sed -r -i 's/(\<_Complex)(\s+)(float|double)/\3\2\1/' $out/include/$pname/freedv_api.h ''; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/freedv_rx contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Speech codec designed for communications quality speech at low data rates"; homepage = "https://www.rowetel.com/codec2.html"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix index bfa8aef2dd..40712e8bed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/coeurl/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "coeurl"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitLab { domain = "nheko.im"; owner = "nheko-reborn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IIIl+/5Omv0lYTNAjeA63ofJlBmNe3+yTOxDsvL+ak0="; + sha256 = "sha256-+FIxi019+jnjpo4NhBQ4tb3ObLrEStMN5YD+MrTLa2E="; }; nativeBuildInputs = [ ninja pkg-config meson ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix index 3fe78e6d02..7675ddae37 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix @@ -1,29 +1,40 @@ -{ fetchFromGitHub, lib, stdenv, boost, cmake, libX11, libGL, libGLU }: +{ lib +, stdenv +, fetchFromGitHub +, boost +, cmake +, libGL +, libGLU +, libX11 +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "coin"; - version = "2020-12-07-unstable"; + version = "unstable-2022-07-27"; src = fetchFromGitHub { owner = "coin3d"; repo = "coin"; - # rev = "Coin-${version}"; - rev = "d5539998aff272b349590fe74d068659682ecd0d"; - sha256 = "11jaz8p9nn8jpd6dsgwgkldwr7z829gyf64g014qyyh8l6p7jzzd"; + rev = "4c67945a58d2a6e5adb4d2332ab08007769130ef"; + hash = "sha256-lXS7GxtoPsZe2SJfr0uY99Q0ZtYG0KFlauY1PBuFleo="; }; - postPatch = '' - sed -i /cpack.d/d CMakeLists.txt - ''; - nativeBuildInputs = [ cmake ]; - buildInputs = [ boost libX11 libGL libGLU ]; + + buildInputs = [ + boost + libGL + libGLU + libX11 + ]; + + cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ]; meta = with lib; { homepage = "https://github.com/coin3d/coin"; - license = licenses.bsd3; description = "High-level, retained-mode toolkit for effective 3D graphics development"; + license = licenses.bsd3; maintainers = with maintainers; [ gebner viric ]; platforms = platforms.linux; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix index 6085a3c849..1effce9155 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-netlib/default.nix @@ -19,11 +19,6 @@ stdenv.mkDerivation rec { "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" ]; - # The test driver binary lacks an RPath to the library's libs - preCheck = '' - export LD_LIBRARY_PATH=$PWD/libs/network/src - ''; - # Most tests make network GET requests to various websites doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix index 6362eb952a..6740f45872 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.17.0"; + version = "5.18.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1NjdVflLapuNeYKgRgO7zJxJN1rXjGjQO1m+xUfTeEI="; + sha256 = "sha256-i/ihEPJHyWzRywzpXhYpauA8lL51yjoiWod8Nc/6gV0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix index bfd7bee94b..8790840c4c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/crc32c/default.nix @@ -28,9 +28,8 @@ stdenv.mkDerivation rec { "-DCRC32C_BUILD_TESTS=1" "-DCRC32C_BUILD_BENCHMARKS=0" "-DCRC32C_USE_GLOG=0" + "-DINSTALL_GTEST=0" "-DBUILD_SHARED_LIBS=${if staticOnly then "0" else "1"}" - ] ++ lib.optionals stdenv.isDarwin [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; doCheck = false; @@ -44,20 +43,7 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - postInstallCheck = '' - # without removing these libraries, dependents will look for - # libgtest/libgmock etc here, which can result in link time errors - rm $out/lib/libg* - ''; - postFixup = '' - # dependents shouldn't be able to find gtest libraries as dependencies of - # this package - rm -r $out/lib/pkgconfig - - # remove GTest cmake config files - rm -r $out/lib/cmake/GTest - # fix bogus include paths for f in $(find $out/lib/cmake -name '*.cmake'); do substituteInPlace "$f" --replace "\''${_IMPORT_PREFIX}/$out/include" "\''${_IMPORT_PREFIX}/include" diff --git a/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix b/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix index a1e7137d92..723865ab11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/criterion/default.nix @@ -27,9 +27,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCTESTS=ON" ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - ''; checkTarget = "criterion_tests test"; outputs = [ "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix new file mode 100644 index 0000000000..09d0706452 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libuuid }: + +stdenv.mkDerivation rec { + pname = "crossguid"; + version = "unstable-2019-05-29"; + + src = fetchFromGitHub { + owner = "graeme-hill"; + repo = pname; + rev = "ca1bf4b810e2d188d04cb6286f957008ee1b7681"; + hash = "sha256-37tKPDo4lukl/aaDWWSQYfsBNEnDjE7t6OnEZjBhcvQ="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional stdenv.isLinux libuuid; + + meta = with lib; { + description = "Lightweight cross platform C++ GUID/UUID library"; + license = licenses.mit; + homepage = "https://github.com/graeme-hill/crossguid"; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/ctpp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctpp2/default.nix index 626606d052..c8bc708a2a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ctpp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ctpp2/default.nix @@ -16,6 +16,11 @@ stdenv.mkDerivation rec { sed -ie 's//\n#include /' src/CTPP2FileSourceLoader.cpp ''; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/ctpp2json contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + doCheck = false; # fails meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix deleted file mode 100644 index d7fe4e9280..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/cutelyst/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, wrapQtAppsHook -, qtbase, libuuid, libcap, uwsgi, grantlee, pcre -}: - -stdenv.mkDerivation rec { - pname = "cutelyst"; - version = "2.14.2"; - - src = fetchFromGitHub { - owner = "cutelyst"; - repo = "cutelyst"; - rev = "v${version}"; - sha256 = "sha256-JUffOeUTeaZvEssP5hfSGipeRuQ7FzLF4bOizCFhe5o="; - }; - - nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; - buildInputs = [ - qtbase - grantlee - ] ++ lib.optionals stdenv.isLinux [ - libuuid - libcap - uwsgi - pcre - ]; - - cmakeFlags = [ - "-DPLUGIN_UWSGI=${if stdenv.isLinux then "ON" else "OFF"}" # Missing uwsgi symbols on Darwin - "-DPLUGIN_STATICCOMPRESSED=ON" - "-DPLUGIN_CSRFPROTECTION=ON" - "-DPLUGIN_VIEW_GRANTLEE=ON" - ]; - - preBuild = lib.optionalString stdenv.isLinux '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/Cutelyst:`pwd`/EventLoopEPoll" - ''; - - postBuild = lib.optionalString stdenv.isLinux '' - unset LD_LIBRARY_PATH - ''; - - meta = with lib; { - description = "C++ Web Framework built on top of Qt"; - homepage = "https://cutelyst.org/"; - license = licenses.lgpl21Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxx-rs/Cargo.lock b/third_party/nixpkgs/pkgs/development/libraries/cxx-rs/Cargo.lock new file mode 100644 index 0000000000..6714e2f8a4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/cxx-rs/Cargo.lock @@ -0,0 +1,445 @@ +# 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 = "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.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +dependencies = [ + "jobserver", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "clang-ast" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c380e0de48337007dfc91b09eb75f567f5f08209437857fbaabbaf2e77e830" +dependencies = [ + "serde", +] + +[[package]] +name = "clap" +version = "3.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54635806b078b7925d6e36810b1755f2a4b5b4d57560432c1ecf60bcbe10602b" +dependencies = [ + "bitflags", + "clap_lex", + "indexmap", + "strsim", + "textwrap", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "cxx" +version = "1.0.72" +dependencies = [ + "cc", + "cxx-build", + "cxx-gen", + "cxx-test-suite", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", + "rustversion", + "trybuild", +] + +[[package]] +name = "cxx-build" +version = "1.0.72" +dependencies = [ + "cc", + "codespan-reporting", + "cxx-gen", + "once_cell", + "pkg-config", + "proc-macro2", + "quote", + "scratch", + "syn", +] + +[[package]] +name = "cxx-gen" +version = "0.7.72" +dependencies = [ + "codespan-reporting", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "cxx-test-suite" +version = "0.0.0" +dependencies = [ + "cxx", + "cxx-build", + "cxxbridge-flags", +] + +[[package]] +name = "cxxbridge-cmd" +version = "1.0.72" +dependencies = [ + "clap", + "codespan-reporting", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.72" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.72" +dependencies = [ + "clang-ast", + "cxx", + "flate2", + "memmap", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn", +] + +[[package]] +name = "demo" +version = "0.0.0" +dependencies = [ + "cxx", + "cxx-build", +] + +[[package]] +name = "dissimilar" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c97b9233581d84b8e1e689cdd3a47b6f69770084fc246e86a7f78b0d9c1d4a5" + +[[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 = "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 = "indexmap" +version = "1.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] + +[[package]] +name = "itoa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" + +[[package]] +name = "jobserver" +version = "0.1.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +dependencies = [ + "libc", +] + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "link-cplusplus" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cae2cd7ba2f3f63938b9c724475dfb7b9861b545a90324476324ed21dbc8c8" +dependencies = [ + "cc", +] + +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "miniz_oxide" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +dependencies = [ + "adler", +] + +[[package]] +name = "once_cell" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "os_str_bytes" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "proc-macro2" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rustversion" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" + +[[package]] +name = "ryu" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" + +[[package]] +name = "scratch" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96311ef4a16462c757bb6a39152c40f58f31cd2602a40fceb937e2bc34e6cbab" + +[[package]] +name = "serde" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" + +[[package]] +name = "toml" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +dependencies = [ + "serde", +] + +[[package]] +name = "trybuild" +version = "1.0.63" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "764b9e244b482a9b81bde596aa37aa6f1347bf8007adab25e59f901b32b4e0a0" +dependencies = [ + "dissimilar", + "glob", + "once_cell", + "serde", + "serde_derive", + "serde_json", + "termcolor", + "toml", +] + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/third_party/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix new file mode 100644 index 0000000000..4294cdd646 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/cxx-rs/default.nix @@ -0,0 +1,54 @@ +{ cxx-rs, fetchFromGitHub, lib, rustPlatform, testers }: + +rustPlatform.buildRustPackage rec { + pname = "cxx-rs"; + version = "1.0.72"; + + src = fetchFromGitHub { + owner = "dtolnay"; + repo = "cxx"; + rev = version; + sha256 = "sha256-+OumeLSgz8kLQKhEc3icCk1q+X+S7Xt+XtAlkx8iguU="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + cargoBuildFlags = [ + "--workspace" + "--exclude=demo" + ]; + + postBuild = '' + cargo doc --release + ''; + + cargoTestFlags = [ "--workspace" ]; + + outputs = [ "out" "doc" "dev" ]; + + postInstall = '' + mkdir -p $doc + cp -r ./target/doc/* $doc + + mkdir -p $dev/include/rust + install -D -m 0644 ./include/cxx.h $dev/include/rust + ''; + + passthru.tests.version = testers.testVersion { + package = cxx-rs; + command = "cxxbridge --version"; + }; + + meta = with lib; { + description = "Safe FFI between Rust and C++"; + homepage = "https://github.com/dtolnay/cxx"; + license = licenses.mit; + maintainers = with maintainers; [ centromere ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix index 4fae1db9ba..2e37e073fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/docopt_cpp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { "@CMAKE_INSTALL_LIBDIR@" ''; - checkPhase = "LD_LIBRARY_PATH=$(pwd) python ./run_tests"; + checkPhase = "python ./run_tests"; meta = with lib; { description = "C++11 port of docopt"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix index 2a71b82af3..b3bde19fed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/elpa/default.nix @@ -18,13 +18,13 @@ assert blas.isILP64 == scalapack.isILP64; stdenv.mkDerivation rec { pname = "elpa"; - version = "2021.11.002"; + version = "2022.05.001"; passthru = { inherit (blas) isILP64; }; src = fetchurl { url = "https://elpa.mpcdf.mpg.de/software/tarball-archive/Releases/${version}/elpa-${version}.tar.gz"; - sha256 = "sha256-V28cru14g7gTlmQP2g9QQYOGbPbL1Lxx0Tg7oiCPH5c="; + sha256 = "sha256-IH5vJtZTL7cDc6/D7z04JVITr2He9lnCXa06MOT8o4s="; }; patches = [ @@ -48,6 +48,8 @@ stdenv.mkDerivation rec { preConfigure = '' export FC="mpifort" export CC="mpicc" + export CXX="mpicxx" + export CPP="cpp" # These need to be set for configure to succeed export FCFLAGS="${lib.optionalString stdenv.hostPlatform.isx86_64 "-msse3 " diff --git a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix index 7a79e597be..6fc48c2d4e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { patchShebangs ../test/ mkdir ../test/tmp - ${lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) '' + ${lib.optionalString stdenv.hostPlatform.isAarch '' # Fix tests on arm # https://github.com/Exiv2/exiv2/issues/933 rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py @@ -87,6 +87,8 @@ stdenv.mkDerivation rec { substituteInPlace ../tests/bash_tests/testcases.py \ --replace "def io_test(self):" "def io_disabled(self):" ''} + '' + lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + export LC_ALL=C ''; # With CMake we have to enable samples or there won't be @@ -116,10 +118,10 @@ stdenv.mkDerivation rec { disallowedReferences = [ stdenv.cc.cc ]; meta = with lib; { - homepage = "https://www.exiv2.org/"; + homepage = "https://exiv2.org"; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; license = licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with maintainers; [ wegank ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcppt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcppt/default.nix index f9259e23c2..1a82a9289a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcppt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcppt/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { buildInputs = [ boost catch2 ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix index 0270855ae5..1bc3d49bea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix @@ -49,8 +49,11 @@ , 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 @@ -258,6 +261,10 @@ stdenv.mkDerivation rec { --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 substituteInPlace doc/filters.texi \ --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 + '' + + # ffmpeg 5.1 https://trac.ffmpeg.org/ticket/9841 + '' + substituteInPlace tests/Makefile --replace 'include $(SRC_PATH)/tests/fate/imf.mak' "" ''; configurePlatforms = []; @@ -327,6 +334,8 @@ stdenv.mkDerivation rec { #(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") @@ -447,6 +456,7 @@ stdenv.mkDerivation rec { ++ 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 libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix index 516c7546f5..9e7dcfd751 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/4.nix @@ -6,8 +6,8 @@ }@args: callPackage ./generic.nix (rec { - version = "4.4.1"; + version = "4.4.2"; branch = version; - sha256 = "0hmck0placn12kd9l0wam70mrpgfs2nlfmi8krd135gdql5g5jcg"; + sha256 = "sha256-+YpIJSDEdQdSGpB5FNqp77wThOBZG1r8PaGKqJfeKUg="; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix index b5dff5a282..faec9f125d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/5.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (rec { - version = "5.0.1"; + version = "5.1"; branch = version; - sha256 = "sha256-KN8z1AChwcGyDQepkZeAmjuI73ZfXwfcH/Bn+sZMWdY="; + sha256 = "sha256-MrVvsBzpDUUpWK4l6RyVZKv0ntVFPBJ77CPGPlMKqPo="; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix index 4eb614d6e6..855586649b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix @@ -238,8 +238,8 @@ stdenv.mkDerivation rec { a corporation. ''; license = licenses.gpl3; + maintainers = with maintainers; [ ]; platforms = platforms.all; - maintainers = with maintainers; [ codyopel ]; inherit branch knownVulnerabilities; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix index a6eefe77c4..42e7c665f2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix @@ -1,35 +1,31 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake +, python3 }: stdenv.mkDerivation rec { pname = "flatbuffers"; - version = "2.0.0"; + version = "2.0.6"; src = fetchFromGitHub { owner = "google"; repo = "flatbuffers"; rev = "v${version}"; - sha256 = "1zbf6bdpps8369r1ql00irxrp58jnalycc8jcapb8iqg654vlfz8"; + sha256 = "sha256-0bJ0n/5yzj6lHXLKJzHUS0Bnlmys+X7pY/3LGapVh6k="; }; - patches = [ - # Pull patch pending upstream inclustion for gcc-12 support: - # https://github.com/google/flatbuffers/pull/6946 - (fetchpatch { - name = "gcc-12.patch"; - url = "https://github.com/google/flatbuffers/commit/17d9f0c4cf47a9575b4f43a2ac33eb35ba7f9e3e.patch"; - sha256 = "0sksk47hi7camja9ppnjr88jfdgj0nxqxy8976qs1nx73zkgbpf9"; - }) - ]; + nativeBuildInputs = [ cmake python3 ]; - nativeBuildInputs = [ cmake ]; + postPatch = '' + # Fix default value of "test_data_path" to make tests work + substituteInPlace tests/test.cpp --replace '"tests/";' '"../tests/";' + ''; cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" + "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF" ]; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fltk/common.nix b/third_party/nixpkgs/pkgs/development/libraries/fltk/common.nix index 6d0f90956b..426a85e6a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fltk/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fltk/common.nix @@ -147,6 +147,9 @@ stdenv.mkDerivation rec { "-DOPTION_INSTALL_HTML_DOCUMENTATION=${onOff withDocs}" "-DOPTION_INSTALL_PDF_DOCUMENTATION=OFF" "-DOPTION_INCLUDE_DRIVER_DOCUMENTATION=${onOff withDocs}" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; preBuild = lib.optionalString (withCairo && withShared && stdenv.hostPlatform.isDarwin) '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix index 3fee016175..bec7860223 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fmt/default.nix @@ -23,7 +23,6 @@ let cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if enableShared then "ON" else "OFF"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests ]; doCheck = true; @@ -49,7 +48,7 @@ in }; fmt_8 = generic { - version = "8.0.1"; - sha256 = "1mnvxqsan034d2jiqnw2yvkljl7lwvhakmj5bscwp1fpkn655bbw"; + version = "8.1.1"; + sha256 = "sha256-leb2800CwdZMJRWF5b1Y9ocK0jXpOX/nwo95icDf308="; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix index a8cf6cec57..e11d00fb19 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "folly"; - version = "2022.07.04.00"; + version = "2022.08.08.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-TUtqwFBxYMnjXpygwXYWK7FNvTPL4a7T+rn1TMtUIPc="; + sha256 = "sha256-shgqM7hUz0uHOtaXSSdnsQW0eUvCUAo3mtq0EISeQgU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix index 7fb93a61a0..ac7e4f4255 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/galario/default.nix @@ -53,6 +53,11 @@ stdenv.mkDerivation rec { ${if enablePython then "sed -i -e 's|^#!.*|#!${stdenv.shell}|' python/py.test.sh" else ""} ''; + cmakeFlags = lib.optionals enablePython [ + # RPATH of binary /nix/store/.../lib/python3.10/site-packages/galario/double/libcommon.so contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + doCheck = true; postInstall = lib.optionalString (stdenv.isDarwin && enablePython) '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix index cbed6a62a3..ff8ace9613 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -16,22 +16,18 @@ , libjpeg , libpng , gnome +, gobject-introspection +, buildPackages , doCheck ? false , makeWrapper , lib -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) -, gobject-introspection }: -let - withGtkDoc = stdenv.buildPlatform == stdenv.hostPlatform; -in stdenv.mkDerivation rec { pname = "gdk-pixbuf"; version = "2.42.8"; - outputs = [ "out" "dev" "man" ] - ++ lib.optional withGtkDoc "devdoc" + outputs = [ "out" "dev" "man" "devdoc" ] ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) "installedTests"; src = fetchurl { @@ -60,6 +56,7 @@ stdenv.mkDerivation rec { makeWrapper glib gi-docgen + gobject-introspection # for man pages libxslt @@ -67,10 +64,10 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames - ] ++ lib.optionals withIntrospection [ - gobject-introspection ]; + buildInputs = [ gobject-introspection ]; + propagatedBuildInputs = [ glib libtiff @@ -79,9 +76,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString withGtkDoc}" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgio_sniffing=false" + "-Dgtk_doc=true" ]; postPatch = '' @@ -89,10 +85,13 @@ stdenv.mkDerivation rec { patchShebangs build-aux substituteInPlace tests/meson.build --subst-var-by installedtestsprefix "$installedTests" - ''; - preInstall = '' - PATH=$PATH:$out/bin # for install script + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + substituteInPlace docs/meson.build \ + --replace "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \ + --replace "'gi-docgen', req" "'gi-docgen', native:true, req" ''; postInstall = @@ -108,9 +107,9 @@ stdenv.mkDerivation rec { 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 - '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + '' + '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ - $dev/bin/gdk-pixbuf-query-loaders --update-cache + ${stdenv.hostPlatform.emulator buildPackages} $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; # The fixDarwinDylibNames hook doesn't patch binaries. @@ -120,7 +119,7 @@ stdenv.mkDerivation rec { done ''; - postFixup = lib.optionalString withGtkDoc '' + postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix index df1b86fd1b..fb50c2c8fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gegl/default.nix @@ -36,14 +36,14 @@ stdenv.mkDerivation rec { pname = "gegl"; - version = "0.4.36"; + version = "0.4.38"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "https://download.gimp.org/pub/gegl/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-b9WKDNzHcCJYra7/tXOjiSKK6PDv9HV479ojCbYbLKY="; + sha256 = "sha256-5KM8hDClBC+6hDm1lTSOcYcPDZX7+IX/VT+QIMG+11A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix index 39156c9594..d7b417ac09 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geoclue/default.nix @@ -4,6 +4,7 @@ , fetchpatch , intltool , meson +, mesonEmulatorHook , ninja , pkg-config , gtk-doc @@ -74,6 +75,8 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_412 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ @@ -81,6 +84,7 @@ stdenv.mkDerivation rec { json-glib libsoup avahi + gobject-introspection ] ++ lib.optionals withDemoAgent [ libnotify gdk-pixbuf ] ++ lib.optionals (!stdenv.isDarwin) [ @@ -113,7 +117,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; + broken = stdenv.isDarwin && withDemoAgent; description = "Geolocation framework and some data providers"; homepage = "https://gitlab.freedesktop.org/geoclue/geoclue/wikis/home"; maintainers = with maintainers; [ raskin ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix index 3467416520..b55b5c1922 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geocode-glib/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; license = licenses.lgpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix index 32b3155b8c..cfcccc5718 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/geos/default.nix @@ -6,21 +6,13 @@ stdenv.mkDerivation rec { pname = "geos"; - version = "3.10.2"; + version = "3.11.0"; src = fetchurl { url = "https://download.osgeo.org/geos/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ULvFmaw4a0wrOWLcxBHwBAph8gSq7066ciXs3Qz0VxU="; + sha256 = "sha256-eauMq/SqhgTRYVV7UuPk2EV1rNwNCMsJqz96rvpNhYo="; }; - patches = [ - # Fix paths with absolute CMAKE_INSTALL_*DIR - (fetchpatch { - url = "https://github.com/libgeos/geos/commit/11faa4db672ed61d64fd8a6f1a59114f5b5f2406.patch"; - hash = "sha256-oAArwGq91Z93C6hBPQD0AlY8Q4Nnn6tA40HUPoZ5ftc="; - }) - ]; - nativeBuildInputs = [ cmake ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix new file mode 100644 index 0000000000..b79c83cbf1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, python3, cmake, libglvnd, libGLU }: + +stdenv.mkDerivation rec { + pname = "gl3w"; + version = "unstable-2022-03-24"; + + src = fetchFromGitHub { + owner = "skaslev"; + repo = pname; + rev = "5f8d7fd191ba22ff2b60c1106d7135bb9a335533"; + hash = "sha256-qV/PZmaP5iCHhIzTA2bE4d1RMB6LzRbTsB5gWVvi9bU="; + }; + + nativeBuildInputs = [ python3 cmake ]; + # gl3w installs a CMake config that when included expects to be able to + # build and link against both of these libraries + # (the gl3w generated C file gets compiled into the downstream target) + propagatedBuildInputs = [ libglvnd libGLU ]; + + dontUseCmakeBuildDir = true; + + # These files must be copied rather than linked since they are considered + # outputs for the custom command, and CMake expects to be able to touch them + preConfigure = '' + mkdir -p include/{GL,KHR} + cp ${libglvnd.dev}/include/GL/glcorearb.h include/GL/glcorearb.h + cp ${libglvnd.dev}/include/KHR/khrplatform.h include/KHR/khrplatform.h + ''; + + meta = with lib; { + description = "Simple OpenGL core profile loading"; + homepage = "https://github.com/skaslev/gl3w"; + license = licenses.unlicense; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch b/third_party/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch index 45bad2867e..b2c998aabb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch @@ -1,6 +1,6 @@ -From f81744bae4442345ff6f40d80fdb8adaba8b330f Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Fri, 27 Aug 2021 17:19:27 +0200 +From faeeb0f353f5540da2015a41cb60fe43d199a1ac Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer +Date: Fri, 22 Jul 2022 22:11:07 -0700 Subject: [PATCH] Revert "Remove all usage of @BASH@ or ${BASH} in installed files, and hardcode /bin/bash instead" @@ -8,6 +8,8 @@ We need the ability to override to use `/bin/sh` here to avoid having some bootstrap tools in a final build product. This reverts commit 5188a9d0265cc6f7235a8af1d31ab02e4a24853d. + +Co-authored-by: Maximilian Bosch --- debug/Makefile | 5 +++-- debug/xtrace.sh | 2 +- @@ -20,10 +22,10 @@ This reverts commit 5188a9d0265cc6f7235a8af1d31ab02e4a24853d. 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/debug/Makefile b/debug/Makefile -index 6893111cbf..3f66666c6c 100644 +index 96029f32ee..cbbdeda277 100644 --- a/debug/Makefile +++ b/debug/Makefile -@@ -216,7 +216,8 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o +@@ -238,7 +238,8 @@ $(objpfx)pcprofiledump: $(objpfx)pcprofiledump.o $(objpfx)xtrace: xtrace.sh rm -f $@.new @@ -35,20 +37,20 @@ index 6893111cbf..3f66666c6c 100644 -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|' $^ > $@.new \ && rm -f $@ && mv $@.new $@ && chmod +x $@ diff --git a/debug/xtrace.sh b/debug/xtrace.sh -index 9697fbe0b4..279fe59ac6 100755 +index 8c56e01449..c760391a33 100755 --- a/debug/xtrace.sh +++ b/debug/xtrace.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 1999-2021 Free Software Foundation, Inc. + # Copyright (C) 1999-2022 Free Software Foundation, Inc. # This file is part of the GNU C Library. - # Contributed by Ulrich Drepper , 1999. + diff --git a/elf/Makefile b/elf/Makefile -index d05f410592..9264409fdd 100644 +index 3536b6af5e..83521d9dbc 100644 --- a/elf/Makefile +++ b/elf/Makefile -@@ -144,7 +144,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ +@@ -256,7 +256,8 @@ $(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \ $(common-objpfx)libc_nonshared.a $(objpfx)sotruss: sotruss.sh $(common-objpfx)config.make @@ -58,7 +60,7 @@ index d05f410592..9264409fdd 100644 -e 's%@TEXTDOMAINDIR@%$(localedir)%g' \ -e 's%@PREFIX@%$(prefix)%g' \ -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ -@@ -659,6 +660,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ +@@ -1363,6 +1364,7 @@ ldd-rewrite = -e 's%@RTLD@%$(rtlddir)/$(rtld-installed-name)%g' \ -e 's%@VERSION@%$(version)%g' \ -e 's|@PKGVERSION@|$(PKGVERSION)|g' \ -e 's|@REPORT_BUGS_TO@|$(REPORT_BUGS_TO)|g' \ @@ -67,30 +69,30 @@ index d05f410592..9264409fdd 100644 ifeq ($(ldd-rewrite-script),no) diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in -index ba736464ac..57442bc3f2 100644 +index 3253b32ef8..127eb59206 100644 --- a/elf/ldd.bash.in +++ b/elf/ldd.bash.in @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 1996-2021 Free Software Foundation, Inc. + # Copyright (C) 1996-2022 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/elf/sotruss.sh b/elf/sotruss.sh -index 003cf4d825..fd4da80244 100755 +index 22327eac5c..7d15bf4fc8 100755 --- a/elf/sotruss.sh +++ b/elf/sotruss.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 2011-2021 Free Software Foundation, Inc. + # Copyright (C) 2011-2022 Free Software Foundation, Inc. # This file is part of the GNU C Library. diff --git a/malloc/Makefile b/malloc/Makefile -index 9b70831d38..90ecadff6c 100644 +index 2329cf718a..5d7de4bee7 100644 --- a/malloc/Makefile +++ b/malloc/Makefile -@@ -271,8 +271,9 @@ $(objpfx)mtrace: mtrace.pl +@@ -307,8 +307,9 @@ $(objpfx)mtrace: mtrace.pl $(objpfx)memusage: memusage.sh rm -f $@.new @@ -103,21 +105,21 @@ index 9b70831d38..90ecadff6c 100644 && rm -f $@ && mv $@.new $@ && chmod +x $@ diff --git a/malloc/memusage.sh b/malloc/memusage.sh -index 0645f09911..c1cd4e23b7 100755 +index f447160b7d..faa4936639 100755 --- a/malloc/memusage.sh +++ b/malloc/memusage.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#! @BASH@ - # Copyright (C) 1999-2021 Free Software Foundation, Inc. + # Copyright (C) 1999-2022 Free Software Foundation, Inc. # This file is part of the GNU C Library. - # Contributed by Ulrich Drepper , 1999. + diff --git a/timezone/Makefile b/timezone/Makefile -index c624a189b3..395abfeebd 100644 +index a789c22d26..d65bdf2391 100644 --- a/timezone/Makefile +++ b/timezone/Makefile -@@ -123,7 +123,8 @@ $(testdata)/XT%: testdata/XT% - cp $< $@ +@@ -130,7 +130,8 @@ $(testdata)/XT5: testdata/gen-XT5.sh + mv $@.tmp $@ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make - sed -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \ @@ -127,5 +129,5 @@ index c624a189b3..395abfeebd 100644 -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \ -- -2.31.1 +2.37.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.34-master.patch.gz b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.34-master.patch.gz deleted file mode 100644 index b7aa7518c3..0000000000 Binary files a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.34-master.patch.gz and /dev/null differ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz new file mode 100644 index 0000000000..24939e1c08 Binary files /dev/null and b/third_party/nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz differ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix index 2fc89a968f..6ed0a4d4da 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glibc/common.nix @@ -43,9 +43,9 @@ } @ args: let - version = "2.34"; - patchSuffix = "-210"; - sha256 = "sha256-RNJqH+ILiFOkj0cOrQHkJ56GmsFJsZXdpORKGV2YGrI="; + version = "2.35"; + patchSuffix = "-163"; + sha256 = "sha256-USNzL2tnzNMZMF79OZlx1YWSEivMKmUYob0lEN0M9S4="; in assert withLinuxHeaders -> linuxHeaders != null; @@ -62,14 +62,14 @@ stdenv.mkDerivation ({ patches = [ /* No tarballs for stable upstream branch, only https://sourceware.org/git/glibc.git and using git would complicate bootstrapping. - $ git fetch --all -p && git checkout origin/release/2.34/master && git describe - glibc-2.34-210-ge123f08ad5 - $ git show --minimal --reverse glibc-2.34.. | gzip -9n --rsyncable - > 2.34-master.patch.gz + $ git fetch --all -p && git checkout origin/release/2.35/master && git describe + glibc-2.35-210-ge123f08ad5 + $ git show --minimal --reverse glibc-2.35.. | gzip -9n --rsyncable - > 2.35-master.patch.gz To compare the archive contents zdiff can be used. - $ zdiff -u 2.34-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.34-master.patch.gz + $ zdiff -u 2.35-master.patch.gz ../nixpkgs/pkgs/development/libraries/glibc/2.35-master.patch.gz */ - ./2.34-master.patch.gz + ./2.35-master.patch.gz /* Allow NixOS and Nix to handle the locale-archive. */ ./nix-locale-archive.patch @@ -115,33 +115,12 @@ stdenv.mkDerivation ({ sha256 = "091bk3kyrx1gc380gryrxjzgcmh1ajcj8s2rjhp2d2yzd5mpd5ps"; }) - /* Provide utf-8 locales by default, so we can use it in stdenv without depending on our large locale-archive. */ - (fetchurl { - url = "https://salsa.debian.org/glibc-team/glibc/raw/49767c9f7de4828220b691b29de0baf60d8a54ec/debian/patches/localedata/locale-C.diff"; - sha256 = "0irj60hs2i91ilwg5w7sqrxb695c93xg0ik7yhhq9irprd7fidn4"; - }) - ./fix-x64-abi.patch /* https://github.com/NixOS/nixpkgs/pull/137601 */ ./nix-nss-open-files.patch ./0001-Revert-Remove-all-usage-of-BASH-or-BASH-in-installed.patch - - /* Fix segfault in getpwuid when stat fails - https://sourceware.org/bugzilla/show_bug.cgi?id=28752 */ - (fetchurl { - url = "https://patchwork.sourceware.org/project/glibc/patch/20220314175316.3239120-2-sam@gentoo.org/raw/"; - sha256 = "sq0BoPqXHQ69Vq4zJobCspe4XRfnAiuac/wqzVQJESc="; - }) - - /* Patch pending upstream inclusion to fix string.h syntax for older gcc. - Needed to unbreak gnat bootstrap against old gcc in nixpkgs: - https://patchwork.sourceware.org/project/glibc/patch/20220520150609.346566-1-slyfox@gentoo.org/ */ - (fetchurl { - url = "https://patchwork.sourceware.org/project/glibc/patch/20220520150609.346566-1-slyfox@gentoo.org/raw/"; - sha256 = "x3/eO1EHJXBIrH2WXHRRD1swtWv+btFVjvMt5tj/wDA="; - }) ] ++ lib.optional stdenv.hostPlatform.isMusl ./fix-rpc-types-musl-conflicts.patch ++ lib.optional stdenv.buildPlatform.isDarwin ./darwin-cross-build.patch; @@ -178,7 +157,7 @@ stdenv.mkDerivation ({ [ "-C" "--enable-add-ons" "--sysconfdir=/etc" - "--enable-stackguard-randomization" + "--enable-stack-protector=strong" "--enable-bind-now" (lib.withFeatureAs withLinuxHeaders "headers" "${linuxHeaders}/include") (lib.enableFeature profilingLibraries "profile") @@ -188,6 +167,9 @@ stdenv.mkDerivation ({ # and on aarch64 with binutils 2.30 or later. # https://sourceware.org/glibc/wiki/PortStatus "--enable-static-pie" + ] ++ lib.optionals stdenv.hostPlatform.isx86 [ + # Enable Intel Control-flow Enforcement Technology (CET) support + "--enable-cet" ] ++ lib.optionals withLinuxHeaders [ "--enable-kernel=3.2.0" # can't get below with glibc >= 2.26 ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix index 98ae294c48..f49c8b9829 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/glog/default.nix @@ -17,9 +17,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - # Mak CMake place RPATHs such that tests will find the built libraries. - # See https://github.com/NixOS/nixpkgs/pull/144561#discussion_r742468811 and https://github.com/NixOS/nixpkgs/pull/108496 - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; # TODO: Re-enable Darwin tests once we're on a release that has https://github.com/google/glog/issues/709#issuecomment-960381653 fixed diff --git a/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix b/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix index aee2dec5a9..4ec99d2e18 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix @@ -2,12 +2,12 @@ , vala }: stdenv.mkDerivation rec { - version = "3.2.11"; + version = "3.2.12"; pname = "gmime"; src = fetchurl { # https://github.com/jstedfast/gmime/releases url = "https://github.com/jstedfast/gmime/releases/download/${version}/gmime-${version}.tar.xz"; - sha256 = "5e023855a215b427645b400f5e55cf19cfd229f971317007e03e7bae72569bf8"; + sha256 = "sha256-OPm3aBgjQsSExBIobbjVgRaX/4FiQ3wFea3w0G4icFs="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix index c806636ff8..157d7fa840 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnome-desktop/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-2lBBC48Z/X53WwDR/g26Z/xeEVHe0pkVjcJd2tw/qKk="; }; - patches = [ + patches = lib.optionals stdenv.isLinux [ (substituteAll { src = ./bubblewrap-paths.patch; bubblewrap_bin = "${bubblewrap}/bin/bwrap"; @@ -58,14 +58,15 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - bubblewrap xkeyboard_config libxkbcommon # for xkbregistry isocodes - wayland gtk3 gtk4 glib + ] ++ lib.optionals stdenv.isLinux [ + bubblewrap + wayland libseccomp systemd ]; @@ -79,6 +80,9 @@ stdenv.mkDerivation rec { "-Ddesktop_docs=false" "-Ddate_in_gnome_version=false" "-Dgnome_distributor=NixOS" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dsystemd=disabled" + "-Dudev=disabled" ]; separateDebugInfo = stdenv.isLinux; @@ -93,7 +97,7 @@ stdenv.mkDerivation rec { description = "Library with common API for various GNOME modules"; homepage = "https://gitlab.gnome.org/GNOME/gnome-desktop"; license = with licenses; [ gpl2Plus lgpl2Plus ]; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix index f6c6aca19a..21e818de86 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { homepage = "https://gnutls.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ eelco fpletz ]; + maintainers = with maintainers; [ vcunat ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix index 82be84e1f1..bb07d8c792 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/default.nix @@ -27,7 +27,7 @@ # it may be worth thinking about using multiple derivation outputs # In that case its about 6MB which could be separated -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gobject-introspection"; version = "1.72.0"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { outputBin = "dev"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz"; sha256 = "Av6OWQhh2I+DBg3TnNpcyqYLLaHSHQ+VSZMBsYa+qrw="; }; @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_45 python3 - setupHook # move .gir files + finalAttrs.setupHook # move .gir files ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ gobject-introspection-unwrapped ]; buildInputs = [ @@ -90,7 +90,13 @@ stdenv.mkDerivation rec { "-Dcairo=disabled" "-Dgtk_doc=${lib.boolToString (stdenv.hostPlatform == stdenv.buildPlatform)}" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - "-Dgi_cross_ldd_wrapper=${buildPackages.prelink}/bin/prelink-rtld" + "-Dgi_cross_ldd_wrapper=${substituteAll { + name = "g-ir-scanner-lddwrapper"; + isExecutable = true; + src = ./wrappers/g-ir-scanner-lddwrapper.sh; + inherit (buildPackages) bash; + buildobjdump = "${buildPackages.stdenv.cc.bintools}/bin/objdump"; + }}" "-Dgi_cross_use_prebuilt_gi=true" "-Dgi_cross_binary_wrapper=${stdenv.hostPlatform.emulator buildPackages}" ]; @@ -105,6 +111,10 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cp -r ${buildPackages.gobject-introspection-unwrapped.devdoc} $devdoc + # these are uncompiled c and header files which aren't installed when cross-compiling because + # code that installs them is in tests/meson.build which is only run when not cross-compiling + # pygobject3 needs them + cp -r ${buildPackages.gobject-introspection-unwrapped.dev}/share/gobject-introspection-1.0/tests $dev/share/gobject-introspection-1.0/tests ''; preCheck = '' @@ -124,7 +134,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "gobject-introspection"; versionPolicy = "odd-unstable"; }; }; @@ -144,4 +154,4 @@ stdenv.mkDerivation rec { automatically provide bindings to call into the C library. ''; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/setup-hook.sh index 6bee47aeb0..50571a8f91 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -10,7 +10,7 @@ make_gobject_introspection_find_gir_files() { fi } -addEnvHooks "$hostOffset" make_gobject_introspection_find_gir_files +addEnvHooks "$targetOffset" make_gobject_introspection_find_gir_files giDiscoverSelf() { if [ -d "$prefix/lib/girepository-1.0" ]; then diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrapper.nix b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrapper.nix index 44d31540e6..4b3fa1a198 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrapper.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrapper.nix @@ -1,29 +1,57 @@ { lib , stdenv , buildPackages -, gobject-introspection-unwrapped , targetPackages -}: +, gobject-introspection-unwrapped +, ... +}@_args: # to build, run # `nix build ".#pkgsCross.aarch64-multiplatform.buildPackages.gobject-introspection"` -gobject-introspection-unwrapped.overrideAttrs (_previousAttrs: { + +let + # ensure that `.override` works when gobject-introspection == gobject-introspection-wrapped + args = builtins.removeAttrs _args [ "buildPackages" "targetPackages" "gobject-introspection-unwrapped" ]; + # passing this stdenv to `targetPackages...` breaks due to splicing not working in `.override`` + argsForTarget = builtins.removeAttrs args [ "stdenv" ]; +in + +(gobject-introspection-unwrapped.override args).overrideAttrs (previousAttrs: { pname = "gobject-introspection-wrapped"; - postFixup = '' + postFixup = (previousAttrs.postFixup or "") + '' mv $dev/bin/g-ir-compiler $dev/bin/.g-ir-compiler-wrapped mv $dev/bin/g-ir-scanner $dev/bin/.g-ir-scanner-wrapped ( - export bash="${buildPackages.bash}/bin/bash" + export bash="${buildPackages.bash}" export emulator=${lib.escapeShellArg (stdenv.targetPlatform.emulator buildPackages)} - export buildprelink="${buildPackages.prelink}/bin/prelink-rtld" + export buildobjdump="${buildPackages.stdenv.cc.bintools}/bin/objdump" - export targetgir="${lib.getDev targetPackages.gobject-introspection-unwrapped}" + export targetgir="${lib.getDev (targetPackages.gobject-introspection-unwrapped.override argsForTarget)}" substituteAll "${./wrappers/g-ir-compiler.sh}" "$dev/bin/g-ir-compiler" substituteAll "${./wrappers/g-ir-scanner.sh}" "$dev/bin/g-ir-scanner" + substituteAll "${./wrappers/g-ir-scanner-lddwrapper.sh}" "$dev/bin/g-ir-scanner-lddwrapper" chmod +x "$dev/bin/g-ir-compiler" chmod +x "$dev/bin/g-ir-scanner" + chmod +x "$dev/bin/g-ir-scanner-lddwrapper" ) + '' + # when cross-compiling and using the wrapper then when a package looks up the g_ir_X + # variable with pkg-config they'll get the host version which can't be run + # override the variable to use the absolute path to g_ir_X in PATH which can be run + + '' + cat >> $dev/nix-support/setup-hook <<-'EOF' + override-pkg-config-gir-variables() { + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER="$(type -p g-ir-scanner)" + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER="$(type -p g-ir-compiler)" + PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE="$(type -p g-ir-generate)" + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_SCANNER + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_COMPILER + export PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_G_IR_GENERATE + } + + preConfigureHooks+=(override-pkg-config-gir-variables) + EOF ''; }) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh index fde3dcfe0c..69642831c8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-compiler.sh @@ -1,4 +1,4 @@ -#! @bash@ +#! @bash@/bin/bash # shellcheck shell=bash exec @emulator@ @targetgir@/bin/g-ir-compiler "$@" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh new file mode 100644 index 0000000000..1bf9c3659d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner-lddwrapper.sh @@ -0,0 +1,4 @@ +#! @bash@/bin/bash +# shellcheck shell=bash + +exec @buildobjdump@ -p "$@" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh index 0825f10e16..6a222191c7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/gobject-introspection/wrappers/g-ir-scanner.sh @@ -1,7 +1,7 @@ -#! @bash@ +#! @bash@/bin/bash # shellcheck shell=bash exec @dev@/bin/.g-ir-scanner-wrapped \ --use-binary-wrapper=@emulator@ \ - --use-ldd-wrapper=@buildprelink@ \ + --use-ldd-wrapper=@dev@/bin/g-ir-scanner-lddwrapper \ "$@" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix index 0ed2dea0c4..c1dd608f80 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gperftools/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # tcmalloc uses libunwind in a way that works correctly only on non-ARM linux - buildInputs = lib.optional (stdenv.isLinux && !(stdenv.isAarch64 || stdenv.isAarch32)) libunwind; + buildInputs = lib.optional (stdenv.isLinux && !stdenv.hostPlatform.isAarch) libunwind; # Disable general dynamic TLS on AArch to support dlopen()'ing the library: # https://bugzilla.redhat.com/show_bug.cgi?id=1483558 - configureFlags = lib.optional (stdenv.isAarch32 || stdenv.isAarch64) + configureFlags = lib.optional stdenv.hostPlatform.isAarch "--disable-general-dynamic-tls"; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix index 0144cec39e..55f1fb2790 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -16,11 +16,12 @@ # tests , python3 +, arrow-cpp }: stdenv.mkDerivation rec { pname = "grpc"; - version = "1.46.3"; # N.B: if you change this, please update: + version = "1.48.0"; # N.B: if you change this, please update: # pythonPackages.grpcio-tools # pythonPackages.grpcio-status @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "sha256-RiXtKlRtlbqwrSxI904dgSu3da0A6Fwk+/hWHIG7A5E="; + hash = "sha256-cR+K3po/9XpYWe+sRXGwzvNAPChrWzYu5D4ygBTKKIQ="; fetchSubmodules = true; }; @@ -61,7 +62,6 @@ stdenv.mkDerivation rec { "-DgRPC_PROTOBUF_PROVIDER=package" "-DgRPC_ABSL_PROVIDER=package" "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-D_gRPC_PROTOBUF_PROTOC_EXECUTABLE=${buildPackages.protobuf}/bin/protoc" ] ++ lib.optionals ((stdenv.hostPlatform.useLLVM or false) && lib.versionOlder stdenv.cc.cc.version "11.0") [ @@ -93,6 +93,7 @@ stdenv.mkDerivation rec { passthru.tests = { inherit (python3.pkgs) grpcio-status grpcio-tools; + inherit arrow-cpp; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix index 28bcbe9a74..6d940362a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix @@ -121,11 +121,9 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection gst-plugins-base orc - # gobject-introspection has to be in both nativeBuildInputs and - # buildInputs. The build tries to link against libgirepository-1.0.so - gobject-introspection json-glib ldacbt libass @@ -294,8 +292,6 @@ stdenv.mkDerivation rec { # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`, # but its meson build system does not declare the dependency. "-Dapplemedia=disabled" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" ] ++ (if enableGplPlugins then [ "-Dgpl=enabled" ] else [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix index 599e6586ea..c9e9c7f324 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix @@ -18,6 +18,7 @@ , libvisual , tremor # provides 'virbisidec' , libGL +, gobject-introspection , enableX11 ? stdenv.isLinux , libXv , libXext @@ -36,8 +37,6 @@ , enableCdparanoia ? (!stdenv.isDarwin) , cdparanoia , glib -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform -, gobject-introspection }: stdenv.mkDerivation rec { @@ -52,6 +51,9 @@ stdenv.mkDerivation rec { }; strictDeps = true; + depsBuildBuild = [ + pkg-config + ]; nativeBuildInputs = [ meson ninja @@ -63,11 +65,11 @@ stdenv.mkDerivation rec { gstreamer # docs # TODO add hotdoc here - ] ++ lib.optionals withIntrospection [ gobject-introspection ] ++ lib.optional enableWayland wayland; buildInputs = [ + gobject-introspection orc libtheora libintl @@ -91,8 +93,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals enableWayland [ wayland wayland-protocols - ] ++ lib.optionals withIntrospection [ - gobject-introspection ] ++ lib.optional enableCocoa Cocoa ++ lib.optional enableCdparanoia cdparanoia; @@ -106,7 +106,6 @@ stdenv.mkDerivation rec { "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "-Dtests=disabled" ] diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix index c5f836f26a..662c3281b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix @@ -16,7 +16,6 @@ , bash-completion , lib , CoreServices -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform , gobject-introspection }: @@ -38,6 +37,10 @@ stdenv.mkDerivation rec { sha256 = "0cghi6n4nhdbajz3wqcgbh5xm94myvnqgsi9g2bz9n1s9904l2fy"; }; + depsBuildBuild = [ + pkg-config + ]; + strictDeps = true; nativeBuildInputs = [ meson @@ -50,23 +53,21 @@ stdenv.mkDerivation rec { makeWrapper glib bash-completion + gobject-introspection # documentation # TODO add hotdoc here ] ++ lib.optionals stdenv.isLinux [ libcap # for setcap binary - ] ++ lib.optionals withIntrospection [ - gobject-introspection ]; buildInputs = [ bash-completion + gobject-introspection ] ++ lib.optionals stdenv.isLinux [ libcap libunwind elfutils - ] ++ lib.optionals withIntrospection [ - gobject-introspection ] ++ lib.optionals stdenv.isDarwin [ CoreServices ]; @@ -79,7 +80,6 @@ stdenv.mkDerivation rec { "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" ] ++ lib.optionals stdenv.isDarwin [ # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. "-Dlibunwind=disabled" diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix index 31c25648cc..acb12b7834 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { # "devdoc" # disabled until `hotdoc` is packaged in nixpkgs ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -40,6 +44,7 @@ stdenv.mkDerivation rec { cairo python3 json-glib + gobject-introspection ]; propagatedBuildInputs = [ @@ -49,8 +54,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix index 50acba29d6..9d6f3c0f48 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { buildInputs = [ bash-completion libxml2 + gobject-introspection ]; propagatedBuildInputs = [ @@ -55,8 +56,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 679560e8ee..8fe79bb7b8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -41,13 +41,12 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base gst-plugins-bad + gobject-introspection ]; mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddoc=disabled" # `hotdoc` not packaged in nixpkgs as of writing - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dintrospection=disabled" ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix index 59bfb44927..049d202a71 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtest/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "gtest"; - version = "1.11.0"; + version = "1.12.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "googletest"; rev = "release-${version}"; - hash = "sha256-SjlJxushfry13RGA7BCjYC9oZqV4z6x8dOiHfl/wpF0="; + hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch b/third_party/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch index c05e3a9326..573884fdcb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/gtest/fix-cmake-config-includedir.patch @@ -1,30 +1,34 @@ +diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt +index 5c1f0daf..ed8aae58 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt -@@ -106,10 +106,10 @@ - if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") +@@ -108,10 +108,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + string(REPLACE ";" "$" dirs "${gmock_build_include_dirs}") target_include_directories(gmock SYSTEM INTERFACE - "$" + "$" - "$/${CMAKE_INSTALL_INCLUDEDIR}>") + "$") target_include_directories(gmock_main SYSTEM INTERFACE - "$" + "$" - "$/${CMAKE_INSTALL_INCLUDEDIR}>") + "$") endif() ######################################################################## +diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt +index aa00a5f3..50434fed 100644 --- a/googletest/CMakeLists.txt +++ b/googletest/CMakeLists.txt -@@ -126,10 +126,10 @@ - if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") +@@ -134,10 +134,10 @@ if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11") + string(REPLACE ";" "$" dirs "${gtest_build_include_dirs}") target_include_directories(gtest SYSTEM INTERFACE - "$" + "$" - "$/${CMAKE_INSTALL_INCLUDEDIR}>") + "$") target_include_directories(gtest_main SYSTEM INTERFACE - "$" + "$" - "$/${CMAKE_INSTALL_INCLUDEDIR}>") + "$") endif() - target_link_libraries(gtest_main PUBLIC gtest) - + if(CMAKE_SYSTEM_NAME MATCHES "QNX") + target_link_libraries(gtest PUBLIC regex) diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix index f3f3f0c108..c06aa94699 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix @@ -110,6 +110,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection libxkbcommon (libepoxy.override { inherit x11Support; }) isocodes @@ -158,7 +159,6 @@ stdenv.mkDerivation rec { "-Dbroadway_backend=${lib.boolToString broadwaySupport}" "-Dx11_backend=${lib.boolToString x11Support}" "-Dquartz_backend=${lib.boolToString (stdenv.isDarwin && !x11Support)}" - "-Dintrospection=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" ]; doCheck = false; # needs X11 diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index b7ba05bb79..8c67ef0a15 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -30,11 +30,10 @@ }: let - version = "3.3.2"; + version = "5.0.1"; inherit (lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; - isNativeCompilation = stdenv.buildPlatform == stdenv.hostPlatform; in stdenv.mkDerivation { @@ -45,7 +44,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "sha256-UbYqV7Ch9ugTIwSsCpjnS8H7tcv4P3OVpFDFDZtQCk0="; + sha256 = "sha256-01hpSTesPpUO2T9v1sq3VvCSFEOMyaxbHhX0vS1ms/k="; }; postPatch = '' @@ -70,7 +69,10 @@ stdenv.mkDerivation { (mesonFeatureFlag "coretext" withCoreText) (mesonFeatureFlag "graphite" withGraphite2) (mesonFeatureFlag "icu" withIcu) - (mesonFeatureFlag "introspection" isNativeCompilation) + ]; + + depsBuildBuild = [ + pkg-config ]; nativeBuildInputs = [ @@ -85,9 +87,8 @@ stdenv.mkDerivation { docbook_xml_dtd_43 ]; - buildInputs = [ glib freetype ] - ++ lib.optionals withCoreText [ ApplicationServices CoreText ] - ++ lib.optionals isNativeCompilation [ gobject-introspection ]; + buildInputs = [ glib freetype gobject-introspection ] + ++ lib.optionals withCoreText [ ApplicationServices CoreText ]; propagatedBuildInputs = optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix index 5eb6ceb204..8d219b82e4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix @@ -12,13 +12,13 @@ assert mpiSupport -> mpi != null; stdenv.mkDerivation rec { pname = "highfive${lib.optionalString mpiSupport "-mpi"}"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "BlueBrain"; repo = "HighFive"; rev = "v${version}"; - sha256 = "qaIThJGdoLgs82h+W4BKQEu1yy1bB8bZFiuxI7IxInw="; + sha256 = "sha256-P60S3UR8wC3BHxRiqFdSjn6Akvykud40g5yEko5dIjw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix index 1544bb946e..308120f194 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/hwloc/default.nix @@ -8,11 +8,11 @@ with lib; stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.7.1"; + version = "2.8.0"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-DU4dNsOnLF1hkBv9R3M39aTH4Kl12lcWUjfQDjXvUo0="; + sha256 = "sha256-NIpy/NSMMqgj7h2hSa6ZIgPnrQM1SeZK7W6m7rAfQsE="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix index b598d846f9..e36793debd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/igraph/default.nix @@ -87,13 +87,6 @@ stdenv.mkDerivation rec { doCheck = true; - # needed to find libigraph, and liblas on darwin - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [ blas ]}:$PWD/src" - '' else '' - export LD_LIBRARY_PATH="$PWD/src" - ''; - postInstall = '' mkdir -p "$out/share" cp -r doc "$out/share" diff --git a/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix index 62f750db62..8a5191aa5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imgui/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imgui"; - version = "1.87"; + version = "1.88"; src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; rev = "v${version}"; - sha256 = "sha256-H5rqXZFw+2PfVMsYvAK+K+pxxI8HnUC0GlPhooWgEYM="; + sha256 = "sha256-scG47rRE2qZuYYkgDiA3xnxn/9kQlZLRMb/4UjoknI0="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/imlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imlib/default.nix index 4bc06a97a7..dc26eaf100 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imlib/default.nix @@ -1,13 +1,23 @@ -{ lib, stdenv, fetchurl, fetchpatch -, libX11, libXext, xorgproto, libjpeg, giflib, libtiff, libpng +{ lib +, stdenv +, fetchurl +, fetchpatch +, giflib +, libX11 +, libXext +, libjpeg +, libpng +, libtiff +, xorgproto }: stdenv.mkDerivation rec { pname = "imlib"; version = "1.9.15"; + src = fetchurl { - url = "https://tarballs.nixos.org/imlib-${version}.tar.gz"; - sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; + url = "https://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/${pname}-${version}.tar.gz"; + hash = "sha256-o4mQb38hgK7w4czb5lEoIH3VkuyAbIQWYP2S+7bv8j0="; }; patches = [ @@ -34,7 +44,15 @@ stdenv.mkDerivation rec { "--x-libraries=${libX11.out}/lib" ]; - buildInputs = [ libjpeg libXext libX11 xorgproto libtiff giflib libpng ]; + buildInputs = [ + libjpeg + libXext + libX11 + xorgproto + libtiff + giflib + libpng + ]; meta = with lib; { description = "An image loading and rendering library for X11"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix index 2790eaf460..a5dc57c8ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.8.1"; + version = "1.9.1"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.xz"; - hash = "sha256-Ui4ecOZbwO3f4gdhfRXJo5VmKnwJBmHaqiwpT7fZ/ao="; + hash = "sha256-SiJAOL//vl1NJQxE4F9O5a4k3P74OVsWd8cVxY92TUM="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index c16d3afded..d3b2cf3992 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.1.5"; + version = "22.1.7"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-A7XZXkYBsFa8NMQA7EBnvEReSTorAGgoow08bMZ+WkQ="; + sha256 = "sha256-HRN4SSjP8h8nnCisysDM9V17012ECLz2GgdUok1AV24="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index a386f4d878..5296b5ffa3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "22.4.3"; + version = "22.5.0"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "sha256-NcbtgJjDAHRv7Qs6fPRwScMBPLXci6e2oLxm8DC2nnw="; + sha256 = "sha256-8E3MN4a+k8YA+uuUPApYFvT82bgJHE1cnPyuAO6R1tA="; }; patches = [ @@ -31,6 +31,12 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/multimedia-team/intel-media-driver-non-free/-/raw/master/debian/patches/0002-Remove-settings-based-on-ARCH.patch"; sha256 = "sha256-f4M0CPtAVf5l2ZwfgTaoPw7sPuAP/Uxhm5JSHEGhKT0="; }) + # fix compilation on i686-linux + (fetchpatch { + url = "https://github.com/intel/media-driver/commit/5ee502b84eb70f0d677a3b49d624c356b3f0c2b1.patch"; + revert = true; + sha256 = "sha256-yRS10BKD5IkW8U0PxmyB7ryQiLwrqeetm0NivnoM224="; + }) ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix index 31f25ec10d..a8591f40ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.3.0"; + version = "22.5.1"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-6/MOjISfLsrsocdeFC148hRwl2os5dvJV1eYq/jIMr4="; + sha256 = "sha256-HTCqJG//byTTlTRdE8IyFGuUaLiNVDfl9swbH6d5gCk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix index e40f2c84b2..e7537404f0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/irrlichtmt/default.nix @@ -16,13 +16,13 @@ }: stdenv.mkDerivation rec { pname = "irrlichtmt"; - version = "1.9.0mt4"; + version = "1.9.0mt5"; src = fetchFromGitHub { owner = "minetest"; repo = "irrlicht"; rev = version; - sha256 = "sha256-YlXn9LrfGkjdb8+zQGDgrInolUYj9nVSF2AXWFpEEkw="; + sha256 = "sha256-ocsO4nKab2YxHY1qqZbF4OErpBKmG4V+psgC40APs8s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index 0f07c472c3..1f422d9d63 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -8,15 +8,19 @@ nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.0.1-7"; + version = "5.1-1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-jMd7tEEfiHqTp4q8c6EvbjL0KyJ6ucj4ZNrKOJLJ1Mc="; + sha256 = "sha256-R3+SJ2RNaRRK6+N9eGOf/0qUgaXkT/cswkxf+7W2+Fo="; }; + configureFlags = old.configureFlags ++ [ + "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067 + ]; + postPatch = '' for file in $(cat debian/patches/series); do patch -p1 < debian/patches/$file diff --git a/third_party/nixpkgs/pkgs/development/libraries/jose/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jose/default.nix index 808dcaeed3..08fc7e6dc9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jose/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jose/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "C-language implementation of Javascript Object Signing and Encryption"; homepage = "https://github.com/latchset/jose"; - maintainers = with lib.maintainers; [ fpletz ]; + maintainers = with lib.maintainers; [ ]; license = lib.licenses.asl20; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix index e041908f3f..1f8f4fd1ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -6,10 +6,10 @@ , ninja , pkg-config , gettext -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform , gobject-introspection -, fixDarwinDylibNames , gi-docgen +, libxslt +, fixDarwinDylibNames , gnome }: @@ -17,8 +17,7 @@ stdenv.mkDerivation rec { pname = "json-glib"; version = "1.6.6"; - outputs = [ "out" "dev" ] - ++ lib.optional withIntrospection "devdoc"; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; @@ -37,22 +36,28 @@ stdenv.mkDerivation rec { pkg-config gettext glib - ] ++ lib.optional stdenv.hostPlatform.isDarwin [ - fixDarwinDylibNames - ] ++ lib.optionals withIntrospection [ + libxslt gobject-introspection gi-docgen + ] ++ lib.optional stdenv.hostPlatform.isDarwin [ + fixDarwinDylibNames ]; + buildInputs = [ gobject-introspection ]; + propagatedBuildInputs = [ glib ]; - mesonFlags = lib.optionals (!withIntrospection) [ - "-Dintrospection=disabled" - # gi-docgen relies on introspection data - "-Dgtk_doc=disabled" - ]; + + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + postPatch = '' + substituteInPlace doc/meson.build \ + --replace "'gi-docgen', ver" "'gi-docgen', native:true, ver" \ + --replace "'gi-docgen', req" "'gi-docgen', native:true, req" + ''; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index 77d49c7000..d9cf9a6c43 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -43,14 +43,6 @@ stdenv.mkDerivation rec { sed -i 's/#define JSONCPP_USING_SECURE_MEMORY 0/#define JSONCPP_USING_SECURE_MEMORY 1/' include/json/version.h ''; - # Hack to be able to run the test, broken because we use - # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preBuild = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$PWD/lib''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" - '' else '' - export LD_LIBRARY_PATH="$PWD/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - nativeBuildInputs = [ cmake python3 validatePkgConfig ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix index bbb11522de..7397824f9a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds , openssl, openldap, libedit, keyutils +, nixosTests # Extra Arguments , type ? "" @@ -16,56 +17,62 @@ let libOnly = type == "lib"; in -with lib; stdenv.mkDerivation rec { pname = "${type}krb5"; - version = "1.19.3"; + version = "1.20"; src = fetchurl { - url = "https://kerberos.org/dist/krb5/${versions.majorMinor version}/krb5-${version}.tar.gz"; - sha256 = "1l6wp58zav37g03n2ig5qr0pslz38gh5cxgigbmxkjfxrxilil2n"; + url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz"; + sha256 = "sha256-fgIr3TyFGDAXP5+qoAaiMKDg/a1MlT6Fv/S/DaA24S8"; }; outputs = [ "out" "dev" ]; - configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] + configureFlags = [ "--localstatedir=/var/lib" ] # krb5's ./configure does not allow passing --enable-shared and --enable-static at the same time. # See https://bbs.archlinux.org/viewtopic.php?pid=1576737#p1576737 - ++ optional staticOnly [ "--enable-static" "--disable-shared" ] - ++ optional stdenv.isFreeBSD ''WARN_CFLAGS=""'' - ++ optionals (stdenv.buildPlatform != stdenv.hostPlatform) + ++ lib.optional staticOnly [ "--enable-static" "--disable-shared" ] + ++ lib.optional stdenv.isFreeBSD ''WARN_CFLAGS=""'' + ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "krb5_cv_attr_constructor_destructor=yes,yes" "ac_cv_func_regcomp=yes" "ac_cv_printf_positional=yes" ]; nativeBuildInputs = [ pkg-config perl ] - ++ optional (!libOnly) bison + ++ lib.optional (!libOnly) bison # Provides the mig command used by the build scripts - ++ optional stdenv.isDarwin bootstrap_cmds; + ++ lib.optional stdenv.isDarwin bootstrap_cmds; buildInputs = [ openssl ] - ++ optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] - ++ optionals (!libOnly) [ openldap libedit ]; + ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "bionic" && !(stdenv.hostPlatform.useLLVM or false)) [ keyutils ] + ++ lib.optionals (!libOnly) [ openldap libedit ]; - preConfigure = "cd ./src"; + sourceRoot = "krb5-${version}/src"; + + libFolders = [ "util" "include" "lib" "build-tools" ]; + + buildPhase = lib.optionalString libOnly '' + runHook preBuild - buildPhase = optionalString libOnly '' MAKE="make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES" - (cd util; $MAKE) - (cd include; $MAKE) - (cd lib; $MAKE) - (cd build-tools; $MAKE) + for folder in $libFolders; do + $MAKE -C $folder + done + + runHook postBuild ''; - installPhase = optionalString libOnly '' + installPhase = lib.optionalString libOnly '' + runHook preInstall + mkdir -p "$out"/{bin,sbin,lib/pkgconfig,share/{et,man/man1}} \ "$dev"/include/{gssapi,gssrpc,kadm5,krb5} - (cd util; $MAKE install) - (cd include; $MAKE install) - (cd lib; $MAKE install) - (cd build-tools; $MAKE install) - ${postInstall} + for folder in $libFolders; do + $MAKE -C $folder install + done + + runHook postInstall ''; # not via outputBin, due to reference from libkrb5.so @@ -76,12 +83,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = false; # fails with "No suitable file for testing purposes" - meta = { + meta = with lib; { description = "MIT Kerberos 5"; homepage = "http://web.mit.edu/kerberos/"; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; }; - passthru.implementation = "krb5"; + passthru = { + implementation = "krb5"; + tests = { inherit (nixosTests) kerberos; }; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix index 8110919435..b4ebf5708d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kpmcore/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "kpmcore"; # NOTE: When changing this version, also change the version of `partition-manager`. - version = "22.04.0"; + version = "22.04.3"; src = fetchurl { url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-sO8WUJL6072H1ghMZd7j0xNMwEn4bJF5PXMhfEb2jbs="; + hash = "sha256-LmKglUgXhLOBLSpzfXvK/UXFqY3L+p/EoHbZTSKlGhM="; }; nativeBuildInputs = [ extra-cmake-modules ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix index ec79f8cf60..674defc42e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lame/default.nix @@ -11,10 +11,6 @@ , debugSupport ? false # Debugging (disables optimizations) }: -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with lib; stdenv.mkDerivation rec { pname = "lame"; @@ -37,16 +33,16 @@ stdenv.mkDerivation rec { ++ optional sndfileFileIOSupport libsndfile; configureFlags = [ - (mkFlag nasmSupport "nasm") - (mkFlag cpmlSupport "cpml") - #(mkFlag efenceSupport "efence") + (enableFeature nasmSupport "nasm") + (enableFeature cpmlSupport "cpml") + #(enableFeature efenceSupport "efence") (if sndfileFileIOSupport then "--with-fileio=sndfile" else "--with-fileio=lame") - (mkFlag analyzerHooksSupport "analyzer-hooks") - (mkFlag decoderSupport "decoder") - (mkFlag frontendSupport "frontend") - (mkFlag frontendSupport "dynamic-frontends") - #(mkFlag mp3xSupport "mp3x") - (mkFlag mp3rtpSupport "mp3rtp") + (enableFeature analyzerHooksSupport "analyzer-hooks") + (enableFeature decoderSupport "decoder") + (enableFeature frontendSupport "frontend") + (enableFeature frontendSupport "dynamic-frontends") + #(enableFeature mp3xSupport "mp3x") + (enableFeature mp3rtpSupport "mp3rtp") (if debugSupport then "--enable-debug=alot" else "") ]; @@ -60,7 +56,7 @@ stdenv.mkDerivation rec { description = "A high quality MPEG Audio Layer III (MP3) encoder"; homepage = "http://lame.sourceforge.net"; license = licenses.lgpl2; - maintainers = with maintainers; [ codyopel fpletz ]; + maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix index a6f75413c9..8cac5df55e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/leveldb/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { # NOTE: disabling tests due to gtest issue cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DLEVELDB_BUILD_TESTS=OFF" "-DLEVELDB_BUILD_BENCHMARKS=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix index 755ed6b814..72d21ed0d2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lib2geom/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "lib2geom"; - version = "1.1"; + version = "1.2"; outputs = [ "out" "dev" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "inkscape"; repo = "lib2geom"; rev = "refs/tags/${version}"; - sha256 = "sha256-u9pbpwVzAXzrM2/tQnd1B6Jo9Fzg6UZBr9AtUsNMfQ0="; + sha256 = "sha256-SNo5YT7o29zdxkHLuy9MT88qBg/U1Wwa3BWShF5ACTc="; }; nativeBuildInputs = [ @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests "-D2GEOM_BUILD_SHARED=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix index ef2daeb707..a9185f0b4f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libadwaita/default.nix @@ -1,10 +1,7 @@ { lib , stdenv , fetchFromGitLab -, docbook-xsl-nons , gi-docgen -, gtk-doc -, libxml2 , meson , ninja , pkg-config @@ -17,11 +14,13 @@ , gnome , gsettings-desktop-schemas , xvfb-run +, AppKit +, Foundation }: stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.1.3"; + version = "1.1.4"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,14 +30,11 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-Mjv4Z9YaIT9atD8ekepBAA1ZV30kWnMnV8+kOuGULnw="; + hash = "sha256-xxnLgPKPOND/ITvDC6SOD2GlkzlIX3BzBbt6p2AEjgY="; }; nativeBuildInputs = [ - docbook-xsl-nons gi-docgen - gtk-doc - libxml2 # for xmllint meson ninja pkg-config @@ -48,11 +44,16 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgtk_doc=true" + ] ++ lib.optionals (!doCheck) [ + "-Dtests=false" ]; buildInputs = [ fribidi gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Foundation ]; propagatedBuildInputs = [ @@ -61,10 +62,15 @@ stdenv.mkDerivation rec { checkInputs = [ gnome.adwaita-icon-theme + ] ++ lib.optionals (!stdenv.isDarwin) [ xvfb-run ]; - doCheck = true; + # Tests had to be disabled on Darwin because they fail with the same error as https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=264947 on Hydra: + # + # In file included from ../tests/test-style-manager.c:10: + # ../src/adw-settings-private.h:16:10: fatal error: 'adw-enums-private.h' file not found + doCheck = !stdenv.isDarwin; checkPhase = '' runHook preCheck @@ -81,14 +87,15 @@ stdenv.mkDerivation rec { # Tests need a cache directory "HOME=$TMPDIR" ) - env "''${testEnvironment[@]}" xvfb-run \ + env "''${testEnvironment[@]}" ${lib.optionalString (!stdenv.isDarwin) "xvfb-run"} \ meson test --print-errorlogs runHook postCheck ''; - postInstall = '' - mv $out/share/{doc,gtk-doc} + postFixup = '' + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; passthru = { @@ -102,6 +109,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/libadwaita"; license = licenses.lgpl21Plus; maintainers = teams.gnome.members ++ (with maintainers; [ dotlambda ]); - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix index 704dcd2c73..15e0396142 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix @@ -8,10 +8,6 @@ assert fontconfigSupport -> fontconfig != null; -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - with lib; stdenv.mkDerivation rec { pname = "libass"; @@ -23,9 +19,9 @@ stdenv.mkDerivation rec { }; configureFlags = [ - (mkFlag fontconfigSupport "fontconfig") - (mkFlag rasterizerSupport "rasterizer") - (mkFlag largeTilesSupport "large-tiles") + (enableFeature fontconfigSupport "fontconfig") + (enableFeature rasterizerSupport "rasterizer") + (enableFeature largeTilesSupport "large-tiles") ]; nativeBuildInputs = [ pkg-config yasm ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch index f491867ac5..c52c64f35a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin.patch @@ -1,8 +1,8 @@ -diff --git c/configure.ac w/configure.ac -index 09cb310..30c0e2a 100644 ---- c/configure.ac -+++ w/configure.ac -@@ -110,7 +110,7 @@ AS_CASE([$host_os], +diff --git a/configure.ac b/configure.ac +index 5b6d22b..98c449b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -145,7 +145,7 @@ AS_CASE([$host_os], AM_CONDITIONAL([OS_WINDOWS], [test "x$is_windows" = "xyes"]) # Checks for header files. @@ -11,20 +11,51 @@ index 09cb310..30c0e2a 100644 # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE -@@ -210,7 +210,8 @@ AC_LINK_IFELSE( +@@ -245,7 +245,9 @@ AC_LINK_IFELSE( AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge \ getauxval getentropy getexecname getline \ - pstat_getproc sysconf]) + pstat_getproc sysconf \ -+ strlcpy strlcat strnstr strmode fpurge]) ++ strlcpy strlcat strnstr strmode fpurge \ ++ user_from_uid group_from_gid]) AM_CONDITIONAL([HAVE_GETENTROPY], [test "x$ac_cv_func_getentropy" = "xtrue"]) - AC_SUBST([LIBBSD_LIBS]) -diff --git c/include/bsd/string.h w/include/bsd/string.h + AC_SUBST([MD5_LIBS]) +diff --git a/include/bsd/grp.h b/include/bsd/grp.h +index b2705e5..c9423a2 100644 +--- a/include/bsd/grp.h ++++ b/include/bsd/grp.h +@@ -44,8 +44,10 @@ + __BEGIN_DECLS + int + gid_from_group(const char *, gid_t *); ++#if !HAVE_GROUP_FROM_GID + const char * + group_from_gid(gid_t, int); ++#endif + __END_DECLS + + #endif +diff --git a/include/bsd/pwd.h b/include/bsd/pwd.h +index 798af4b..6ae5244 100644 +--- a/include/bsd/pwd.h ++++ b/include/bsd/pwd.h +@@ -44,8 +44,10 @@ + __BEGIN_DECLS + int + uid_from_user(const char *, uid_t *); ++#if !HAVE_USER_FROM_UID + const char * + user_from_uid(uid_t, int); ++#endif + __END_DECLS + + #endif +diff --git a/include/bsd/string.h b/include/bsd/string.h index f987fee..a1e17ed 100644 ---- c/include/bsd/string.h -+++ w/include/bsd/string.h +--- a/include/bsd/string.h ++++ b/include/bsd/string.h @@ -41,10 +41,21 @@ #include @@ -47,10 +78,10 @@ index f987fee..a1e17ed 100644 #if !defined(__GLIBC__) || \ (defined(__GLIBC__) && (!__GLIBC_PREREQ(2, 25) || !defined(_GNU_SOURCE))) -diff --git c/src/fpurge.c w/src/fpurge.c -index 462535a..a8941db 100644 ---- c/src/fpurge.c -+++ w/src/fpurge.c +diff --git a/src/fpurge.c b/src/fpurge.c +index 350f364..ff7f01e 100644 +--- a/src/fpurge.c ++++ b/src/fpurge.c @@ -26,9 +26,10 @@ #include @@ -100,10 +131,10 @@ index 462535a..a8941db 100644 #else #error "Function fpurge() needs to be ported." #endif -diff --git c/src/funopen.c w/src/funopen.c +diff --git a/src/funopen.c b/src/funopen.c index 1e6f43a..3a3af6a 100644 ---- c/src/funopen.c -+++ w/src/funopen.c +--- a/src/funopen.c ++++ b/src/funopen.c @@ -143,6 +143,7 @@ funopen(const void *cookie, * they will not add the needed support to implement it. Just ignore this * interface there, as it has never been provided anyway. @@ -112,31 +143,32 @@ index 1e6f43a..3a3af6a 100644 #else #error "Function funopen() needs to be ported or disabled." #endif -diff --git c/src/local-link.h w/src/local-link.h -index 0d4351a..fc520af 100644 ---- c/src/local-link.h -+++ w/src/local-link.h -@@ -27,6 +27,11 @@ - #ifndef LIBBSD_LOCAL_LINK_H - #define LIBBSD_LOCAL_LINK_H +diff --git a/src/local-link.h b/src/local-link.h +index 6782d9a..fb76098 100644 +--- a/src/local-link.h ++++ b/src/local-link.h +@@ -29,6 +29,12 @@ + + #include +#ifdef __MACH__ +#define libbsd_link_warning(symbol, msg) +#define libbsd_symver_default(alias, symbol, version) +#define libbsd_symver_variant(alias, symbol, version) ++#define libbsd_symver_weak(alias, symbol, version) +#else #define libbsd_link_warning(symbol, msg) \ static const char libbsd_emit_link_warning_##symbol[] \ - __attribute__((__used__,__section__(".gnu.warning." #symbol))) = msg; -@@ -45,3 +50,4 @@ + __attribute__((__used__,__section__(".gnu.warning." #symbol))) = msg +@@ -68,3 +74,4 @@ #endif #endif +#endif -diff --git c/src/nlist.c w/src/nlist.c -index d22fa19..f41333f 100644 ---- c/src/nlist.c -+++ w/src/nlist.c +diff --git a/src/nlist.c b/src/nlist.c +index 1cb9d18..b476f1e 100644 +--- a/src/nlist.c ++++ b/src/nlist.c @@ -41,6 +41,7 @@ #include #include @@ -144,16 +176,46 @@ index d22fa19..f41333f 100644 +#if !HAVE_NLIST_H #include "local-elf.h" - #ifndef SIZE_T_MAX -@@ -282,3 +283,4 @@ nlist(const char *name, struct nlist *list) + /* Note: This function is used by libkvm0, so we need to export it. +@@ -277,3 +278,4 @@ nlist(const char *name, struct nlist *list) (void)close(fd); return (n); } +#endif -diff --git c/src/readpassphrase.c w/src/readpassphrase.c +diff --git a/src/pwcache.c b/src/pwcache.c +index d54daa0..74fde9f 100644 +--- a/src/pwcache.c ++++ b/src/pwcache.c +@@ -191,6 +191,7 @@ grptb_start(void) + return 0; + } + ++#if !HAVE_USER_FROM_UID + /* + * user_from_uid() + * caches the name (if any) for the uid. If noname clear, we always +@@ -251,7 +252,9 @@ user_from_uid(uid_t uid, int noname) + } + return ptr->name; + } ++#endif + ++#if !HAVE_USER_FROM_UID + /* + * group_from_gid() + * caches the name (if any) for the gid. If noname clear, we always +@@ -312,6 +315,7 @@ group_from_gid(gid_t gid, int noname) + } + return ptr->name; + } ++#endif + + /* + * uid_from_user() +diff --git a/src/readpassphrase.c b/src/readpassphrase.c index f9f6195..2bc5fb4 100644 ---- c/src/readpassphrase.c -+++ w/src/readpassphrase.c +--- a/src/readpassphrase.c ++++ b/src/readpassphrase.c @@ -36,6 +36,14 @@ #define TCSASOFT 0 #endif @@ -169,10 +231,10 @@ index f9f6195..2bc5fb4 100644 static volatile sig_atomic_t signo[_NSIG]; static void handler(int); -diff --git c/src/setproctitle.c w/src/setproctitle.c -index ff32aa3..51ed833 100644 ---- c/src/setproctitle.c -+++ w/src/setproctitle.c +diff --git a/src/setproctitle.c b/src/setproctitle.c +index d3e1087..0e5f64c 100644 +--- a/src/setproctitle.c ++++ b/src/setproctitle.c @@ -33,6 +33,10 @@ #include #include "local-link.h" @@ -184,7 +246,7 @@ index ff32aa3..51ed833 100644 static struct { /* Original value. */ const char *arg0; -@@ -287,7 +291,8 @@ libbsd_symver_default(setproctitle, setproctitle_impl, LIBBSD_0.5); +@@ -291,7 +295,8 @@ libbsd_symver_default(setproctitle, setproctitle_impl, LIBBSD_0.5); * in 0.5, make the implementation available in the old version as an alias * for code linking against that version, and change the default to use the * new version, so that new code depends on the implemented version. */ @@ -194,10 +256,10 @@ index ff32aa3..51ed833 100644 extern __typeof__(setproctitle_impl) setproctitle_stub __attribute__((__alias__("setproctitle_impl"))); -diff --git c/src/strlcat.c w/src/strlcat.c +diff --git a/src/strlcat.c b/src/strlcat.c index 14c53a1..5961c17 100644 ---- c/src/strlcat.c -+++ w/src/strlcat.c +--- a/src/strlcat.c ++++ b/src/strlcat.c @@ -26,6 +26,7 @@ * Returns strlen(src) + MIN(dsize, strlen(initial dst)). * If retval >= dsize, truncation occurred. @@ -211,10 +273,10 @@ index 14c53a1..5961c17 100644 return(dlen + (src - osrc)); /* count does not include NUL */ } +#endif -diff --git c/src/strlcpy.c w/src/strlcpy.c +diff --git a/src/strlcpy.c b/src/strlcpy.c index e9a7fe4..5137acb 100644 ---- c/src/strlcpy.c -+++ w/src/strlcpy.c +--- a/src/strlcpy.c ++++ b/src/strlcpy.c @@ -24,6 +24,7 @@ * chars will be copied. Always NUL terminates (unless dsize == 0). * Returns strlen(src); if retval >= dsize, truncation occurred. @@ -228,10 +290,10 @@ index e9a7fe4..5137acb 100644 return(src - osrc - 1); /* count does not include NUL */ } +#endif -diff --git c/src/strmode.c w/src/strmode.c +diff --git a/src/strmode.c b/src/strmode.c index e6afde5..da680c9 100644 ---- c/src/strmode.c -+++ w/src/strmode.c +--- a/src/strmode.c ++++ b/src/strmode.c @@ -32,6 +32,7 @@ #include #include diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix index 37acf1fc8f..3841c205b7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcamera/default.nix @@ -10,6 +10,7 @@ , openssl , libdrm , libevent +, libyaml , lttng-ust , gst_all_1 , gtest @@ -22,12 +23,12 @@ stdenv.mkDerivation { pname = "libcamera"; - version = "unstable-2022-01-03"; + version = "unstable-2022-07-15"; src = fetchgit { url = "https://git.libcamera.org/libcamera/libcamera.git"; - rev = "1db1e31e664c1f613dc964d8519fe75d67b154b6"; - hash = "sha256-pXYPIU9xDWA870Gp1Jgizi5xnUHRvTqEq/ofFXdVZdg="; + rev = "e9b6b362820338d0546563444e7b1767f5c7044c"; + hash = "sha256-geqFcMBHcVe7dPdVOal8V2pVItYUdoC+5isISqRG4Wc="; }; postPatch = '' @@ -55,6 +56,9 @@ stdenv.mkDerivation { # lttng tracing lttng-ust + # yamlparser + libyaml + gtest ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix index 94976c1be4..6fb8caa474 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcdada/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libcdada"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "msune"; repo = "libcdada"; rev = "v${version}"; - sha256 = "0vcsf3s4fbw2w33jjc8b509kc0xb6ld58l8wfxgqwjqx5icfg1ps"; + sha256 = "sha256-vUasCukDRZYB67eu87ckEZG9i6rsNf0aKY2kZsVezRE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcef/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcef/default.nix index 87471114a8..96f53a33b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcef/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcef/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - cmakeFlags = "-DPROJECT_ARCH=${platformInfo.projectArch}"; + cmakeFlags = [ "-DPROJECT_ARCH=${platformInfo.projectArch}" ]; makeFlags = [ "libcef_dll_wrapper" ]; dontStrip = true; dontPatchELF = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix new file mode 100644 index 0000000000..22c23f45af --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libcifpp/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, boost, cmake, }: + +stdenv.mkDerivation rec { + pname = "libcifpp"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "PDB-REDO"; + repo = pname; + rev = "v${version}"; + sha256 = "1hzi6fgbsmy8h8nfwkyfds9jz13nqw72h0x81jqw5516kkvar5iw"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ boost ]; + + meta = with lib; { + description = "Manipulate mmCIF and PDB files"; + homepage = "https://github.com/PDB-REDO/libcifpp"; + license = licenses.bsd2; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix index 7f4c53071d..22ef87e43d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdazzle/default.nix @@ -40,8 +40,9 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_43 dbus - xvfb-run glib + ] ++ lib.optionals stdenv.isLinux [ + xvfb-run ]; buildInputs = [ @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { "-Denable_gtk_doc=true" ]; - doCheck = true; + doCheck = stdenv.isLinux; checkPhase = '' xvfb-run -s '-screen 0 800x600x24' dbus-run-session \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdecor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdecor/default.nix index 25abfc34b3..34b4e021b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdecor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdecor/default.nix @@ -7,6 +7,7 @@ , wayland , wayland-protocols , wayland-scanner +, egl-wayland , cairo , dbus , pango @@ -37,6 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland wayland-protocols + egl-wayland cairo dbus pango diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix index c99e96863d..7d34388aea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdigidocpp/default.nix @@ -2,26 +2,14 @@ , xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: stdenv.mkDerivation rec { - version = "3.14.8"; + version = "3.14.10"; pname = "libdigidocpp"; src = fetchurl { url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - sha256 = "sha256-U5i5IAyJF4359q6M6mQemEuG7+inPYIXqLy8GHv4dkg="; + hash = "sha256-n/+R4ho1Qcft3YSKE12oxZjbFHAsUDwoLFNuk5GXf5c="; }; - patches = [ - (fetchpatch { - # fix runtime crashes when signing with OpenSSL>1.1.1l - # https://github.com/open-eid/libdigidocpp/issues/474 asks for a new release - url = "https://github.com/open-eid/libdigidocpp/commit/42a8cfd834c10bdd206fe784a13217df222b1c8e.patch"; - sha256 = "sha256-o3ZT0dXhIu79C5ZR+2HPdLMZ3YwPG1v3vly5bseuxtU="; - excludes = [ - ".github/workflows/build.yml" # failed hunk - ]; - }) - ]; - nativeBuildInputs = [ cmake pkg-config xxd ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix index 90963cf516..ec12f1031c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.111"; + version = "2.4.112"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1adjg96mz0ghjzsgp9hrdr622shrvqmjcz5sxksfcka2fx7idmqs"; + sha256 = "1zr0hi7k5s7my4q9hyj6ryzg89zyjx24zbqfv3c5rcq9pl87gc00"; }; outputs = [ "out" "dev" "bin" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "-Dnm-path=${stdenv.cc.targetPrefix}nm" "-Dinstall-test-programs=true" "-Domap=true" - ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ + ] ++ lib.optionals stdenv.hostPlatform.isAarch [ "-Dtegra=true" "-Detnaviv=true" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix index 24ded54d8e..bd5edec68a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libevent/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, findutils, fixDarwinDylibNames -, sslSupport? true, openssl +, sslSupport ? true, openssl +, fetchpatch }: -assert sslSupport -> openssl != null; - stdenv.mkDerivation rec { pname = "libevent"; version = "2.1.12"; @@ -13,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "1fq30imk8zd26x8066di3kpc5zyfc5z6frr3zll685zcx4dxxrlj"; }; + patches = [ + # Don't define BIO_get_init() for LibreSSL 3.5+ + (fetchpatch { + url = "https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9.patch"; + sha256 = "sha256-VPJqJUAovw6V92jpqIXkIR1xYGbxIWxaHr8cePWI2SU="; + }) + ]; + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 ''; @@ -27,14 +34,10 @@ stdenv.mkDerivation rec { ++ lib.optional sslSupport "openssl" ; - nativeBuildInputs = [] - ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames - ; + nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; - buildInputs = [] - ++ lib.optional sslSupport openssl - ++ lib.optional stdenv.isCygwin findutils - ; + buildInputs = lib.optional sslSupport openssl + ++ lib.optional stdenv.isCygwin findutils; doCheck = false; # needs the net diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix index 38c88fe70f..baa33a51ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfabric/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.14.0"; + version = "1.15.1"; enableParallelBuilding = true; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MmvJV3Pne+bJtC91rdpNMZovoqMgm3gHFJwGH3tchgI="; + sha256 = "sha256-uL3L9k9yqdZXQmR1zi8OEIGLAZ8cf7EBnlDhetaMA08="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index fec50849aa..16c09b65ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.37.2"; + version = "0.38.1"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-5RFA7mNka6kq5Blpwfv/JZRtxFJBDTxNr5HNeSv+4tU="; + hash = "sha256-1AGotagKfBexo2DdnMy23Fb9jTlEE6n7K2uxvF2Y/Uw="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix index e5a3b79ba7..2cd6c55fdb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgbinder/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libgbinder"; - version = "1.1.19"; + version = "1.1.25"; src = fetchFromGitHub { owner = "mer-hybris"; repo = pname; rev = version; - sha256 = "sha256-HTmNoTGyFtOXRy7Y/ZnEgTa2GW6/+TeZxZo7c7ksNtc="; + sha256 = "sha256-yr9FJd1+yJdP3vXHbuaaL5UmXGnKxR319LzXs76LBwk="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix index 2cd1be1fff..917fc831ab 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgit2-glib/default.nix @@ -1,15 +1,56 @@ -{ lib, stdenv, fetchurl, gnome, meson, ninja, pkg-config, vala, libssh2 -, gtk-doc, gobject-introspection, libgit2, glib, python3 }: +{ stdenv +, lib +, fetchurl +, gnome +, meson +, ninja +, pkg-config +, vala +, libssh2 +, gtk-doc +, gobject-introspection +, gi-docgen +, libgit2 +, glib +, python3 +}: stdenv.mkDerivation rec { pname = "libgit2-glib"; - version = "1.0.0.1"; + version = "1.1.0"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "RgpdaTaVDKCNLYUYv8kMErsYfPbmdN5xX3BV/FgQK1c="; + sha256 = "w43XV12vgUHh5CIzOldfr2XzySEMCOg+mBuI3UG/HvM="; }; + nativeBuildInputs = [ + meson + ninja + pkg-config + vala + gtk-doc + gobject-introspection + gi-docgen + ]; + + propagatedBuildInputs = [ + # Required by libgit2-glib-1.0.pc + libgit2 + glib + ]; + + buildInputs = [ + libssh2 + python3.pkgs.pygobject3 # this should really be a propagated input of python output + ]; + + mesonFlags = [ + "-Dgtk_doc=true" + ]; + postPatch = '' for f in meson_vapi_link.py meson_python_compile.py; do chmod +x $f @@ -24,24 +65,10 @@ stdenv.mkDerivation rec { }; }; - nativeBuildInputs = [ - meson ninja pkg-config vala gtk-doc gobject-introspection - ]; - - propagatedBuildInputs = [ - # Required by libgit2-glib-1.0.pc - libgit2 glib - ]; - - buildInputs = [ - libssh2 - python3.pkgs.pygobject3 # this should really be a propagated input of python output - ]; - meta = with lib; { description = "A glib wrapper library around the libgit2 git access library"; homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; - license = licenses.lgpl21; + license = licenses.lgpl21Plus; maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix index 5305b49225..cdb539272e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgphoto2/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libgphoto2"; - version = "2.5.29"; + version = "2.5.30"; src = fetchFromGitHub { owner = "gphoto"; repo = "libgphoto2"; rev = "libgphoto2-${builtins.replaceStrings [ "." ] [ "_" ] version}-release"; - sha256 = "sha256-Js5gbD57lhtqBX6joGMiLKUwkPDaSclnTrwBR87AliQ="; + sha256 = "sha256-4UwD283mKhZwC7setBU0BLRLsyfjD/6m/InSedrqgAU="; }; depsBuildBuild = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix index 6a63947c8a..799e1d0f84 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgudev/default.nix @@ -7,8 +7,8 @@ , glib , gnome , vala -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) , gobject-introspection +, fetchpatch }: stdenv.mkDerivation rec { @@ -22,6 +22,25 @@ stdenv.mkDerivation rec { sha256 = "1al6nr492nzbm8ql02xhzwci2kwb1advnkaky3j9636jf08v41hd"; }; + patches = [ + # https://gitlab.gnome.org/GNOME/libgudev/-/merge_requests/27 + (fetchpatch { + name = "gir-dep"; + url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/6bdde16a0cfde462502fce1d9a7eb6ec33f388bb.diff"; + sha256 = "sha256-bDtLUxOLEgyJURshqEQC4YCBTUVzQQP4qoWL786b3Z8="; + }) + (fetchpatch { + name = "vapi-dep"; + url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/d1f6457910842ba869c9871e7a2131fbe0d6b6be.diff"; + sha256 = "sha256-/PY8ziZST/vQvksJm69a3O6/YesknIxCDvj0z40piik="; + }) + (fetchpatch { + name = "gtk-doc-dep"; + url = "https://gitlab.gnome.org/GNOME/libgudev/-/commit/34336cbadbcaac8b9b029f730eed0bdf4c633617.diff"; + sha256 = "sha256-Bk05xe69LGqWH1uhLMZhwbVMSsCTyBrrOvqWic2TTd4="; + }) + ]; + strictDeps = true; depsBuildBuild = [ pkg-config ]; @@ -32,11 +51,11 @@ stdenv.mkDerivation rec { ninja vala glib # for glib-mkenums needed during the build - ] ++ lib.optionals withIntrospection [ gobject-introspection ]; buildInputs = [ + gobject-introspection udev glib ]; @@ -44,9 +63,6 @@ stdenv.mkDerivation rec { mesonFlags = [ # There's a dependency cycle with umockdev and the tests fail to LD_PRELOAD anyway "-Dtests=disabled" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - "-Dvapi=disabled" ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix index d65ead7862..e2da1a30ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libguestfs/default.nix @@ -1,37 +1,94 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper -, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre2, augeas, libxml2 -, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db -, gmp, readline, file, numactl, libapparmor, jansson -, getopt, perlPackages, ocamlPackages +{ lib +, stdenv +, fetchurl +, pkg-config +, autoreconfHook +, makeWrapper +, ncurses +, cpio +, gperf +, cdrkit +, flex +, bison +, qemu +, pcre2 +, augeas +, libxml2 +, acl +, libcap +, libcap_ng +, libconfig +, systemd +, fuse +, yajl +, libvirt +, hivex +, db +, gmp +, readline +, file +, numactl +, libapparmor +, jansson +, getopt +, perlPackages +, ocamlPackages , libtirpc , appliance ? null -, javaSupport ? false, jdk ? null }: +, javaSupport ? false +, jdk +}: assert appliance == null || lib.isDerivation appliance; -assert javaSupport -> jdk != null; stdenv.mkDerivation rec { pname = "libguestfs"; - version = "1.48.0"; + version = "1.48.4"; src = fetchurl { url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - sha256 = "sha256-FoH93t/PSEym3uxUIwMwoy3vvTDCqx+BeI4lLLXQSCk="; + sha256 = "sha256-ncIrbFpF8ZwsupEaN7Oo2G9idEUhsQ61PD05B+UIAxI="; }; strictDeps = true; nativeBuildInputs = [ - autoreconfHook bison cdrkit cpio flex getopt gperf makeWrapper pkg-config qemu - ] ++ (with perlPackages; [ perl libintl-perl GetoptLong SysVirt ]) - ++ (with ocamlPackages; [ ocaml findlib ]); + autoreconfHook + bison + cdrkit + cpio + flex + getopt + gperf + makeWrapper + pkg-config + qemu + ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ]) + ++ (with ocamlPackages; [ ocaml findlib ]); buildInputs = [ - ncurses jansson - pcre2 augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex db - numactl libapparmor perlPackages.ModuleBuild + ncurses + jansson + pcre2 + augeas + libxml2 + acl + libcap + libcap_ng + libconfig + systemd + fuse + yajl + libvirt + gmp + readline + file + hivex + db + numactl + libapparmor + perlPackages.ModuleBuild libtirpc ] ++ (with ocamlPackages; [ ocamlbuild ocaml_libvirt gettext-stub ounit ]) - ++ lib.optional javaSupport jdk; + ++ lib.optional javaSupport jdk; prePatch = '' # build-time scripts @@ -54,10 +111,14 @@ stdenv.mkDerivation rec { patches = [ ./libguestfs-syms.patch ]; + + createFindlibDestdir = true; + installFlags = [ "REALLY_INSTALL=yes" ]; enableParallelBuilding = true; postInstall = '' + mv "$out/lib/ocaml/guestfs" "$OCAMLFIND_DESTDIR/guestfs" for bin in $out/bin/*; do wrapProgram "$bin" \ --prefix PATH : "$out/bin:${hivex}/bin:${qemu}/bin" \ @@ -95,7 +156,7 @@ stdenv.mkDerivation rec { description = "Tools for accessing and modifying virtual machine disk images"; license = with licenses; [ gpl2Plus lgpl21Plus ]; homepage = "https://libguestfs.org/"; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline ]; platforms = platforms.linux; # this is to avoid "output size exceeded" hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix index e4a527ba48..cae2095f8e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgweather/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/LibGWeather"; license = licenses.gpl2Plus; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix index 48e611a348..3fef461874 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -13,7 +13,6 @@ , python3 , tzdata , fixDarwinDylibNames -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform , gobject-introspection , vala }: @@ -37,6 +36,8 @@ stdenv.mkDerivation rec { ninja perl pkg-config + gobject-introspection + vala # Docs building fails: # https://github.com/NixOS/nixpkgs/pull/67204 # previously with https://github.com/NixOS/nixpkgs/pull/61657#issuecomment-495579489 @@ -44,15 +45,12 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # provides ical-glib-src-generator that runs during build libical - ] ++ lib.optionals withIntrospection [ - gobject-introspection - vala ] ++ lib.optionals stdenv.isDarwin [ fixDarwinDylibNames ]; installCheckInputs = [ # running libical-glib tests - (python3.withPackages (pkgs: with pkgs; [ + (python3.pythonForBuild.withPackages (pkgs: with pkgs; [ pygobject3 ])) ]; @@ -61,14 +59,13 @@ stdenv.mkDerivation rec { glib libxml2 icu - ] ++ lib.optionals withIntrospection [ gobject-introspection ]; cmakeFlags = [ "-DENABLE_GTK_DOC=False" - "-DGOBJECT_INTROSPECTION=${if withIntrospection then "True" else "False"}" - "-DICAL_GLIB_VAPI=${if withIntrospection then "True" else "False"}" + "-DGOBJECT_INTROSPECTION=True" + "-DICAL_GLIB_VAPI=True" ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "-DIMPORT_ICAL_GLIB_SRC_GENERATOR=${lib.getDev buildPackages.libical}/lib/cmake/LibIcal/IcalGlibSrcGenerator.cmake" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinfinity/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinfinity/default.nix index 4b379660a8..f9963ce3e6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinfinity/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinfinity/default.nix @@ -9,8 +9,6 @@ assert avahiSupport -> avahi != null; assert gtkWidgets -> gtk3 != null; let - mkFlag = flag: feature: (if flag then "--with-" else "--without-") + feature; - self = stdenv.mkDerivation rec { pname = "libinfinity"; version = "0.7.2"; @@ -29,13 +27,13 @@ let propagatedBuildInputs = [ gnutls ]; configureFlags = [ - "--enable-gtk-doc" - "--enable-introspection" - (mkFlag gtkWidgets "inftextgtk") - (mkFlag gtkWidgets "infgtk") - "--with-infinoted" - "--with-libdaemon" - (mkFlag avahiSupport "avahi") + (lib.enableFeature true "gtk-doc") + (lib.enableFeature true "introspection") + (lib.withFeature gtkWidgets "inftextgtk") + (lib.withFeature gtkWidgets "infgtk") + (lib.withFeature true "infinoted") + (lib.withFeature true "libdaemon") + (lib.withFeature avahiSupport "avahi") ]; passthru = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix index 38deb7fbcc..0092a8fdc6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -32,7 +32,7 @@ let env = python3.withPackages (pp: with pp; [ sphinx recommonmark - sphinx_rtd_theme + sphinx-rtd-theme ]); in # Expose only the sphinx-build binary to avoid contaminating diff --git a/third_party/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix index 540d6d01a4..6bf670a403 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libiptcdata/default.nix @@ -1,18 +1,42 @@ -{lib, stdenv, fetchurl}: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, libiconv +, libintl +}: stdenv.mkDerivation rec { pname = "libiptcdata"; - version = "1.0.4"; + version = "1.0.5"; - src = fetchurl { - url = "mirror://sourceforge/libiptcdata/${pname}-${version}.tar.gz"; - sha256 = "03pfvkmmx762iydq0q207x2028d275pbdysfsgpmrr0ywy63pxkr"; + src = fetchFromGitHub { + owner = "ianw"; + repo = pname; + rev = "release_${builtins.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-ZjokepDAHiSEwXrkvM9qUAPcpIiRQoOsv7REle7roPU="; }; - meta = { + postPatch = '' + # gtk-doc doesn't build without network access + sed -i '/GTK_DOC_CHECK/d;/docs/d' configure.ac + sed -i 's/docs//' Makefile.am + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; + + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + libintl + ]; + + meta = with lib; { description = "Library for reading and writing the IPTC metadata in images and other files"; - homepage = "http://libiptcdata.sourceforge.net/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + homepage = "https://github.com/ianw/libiptcdata"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ wegank ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix index 067eba793f..7dfb66dced 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libite"; - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "troglobit"; repo = "libite"; rev = "v${version}"; - sha256 = "sha256-G9X0ZMyasS9praogWnLDU1LeTvK4fYPgJ89o2y3AIJI="; + sha256 = "sha256-iviHxGXYUMjTgafkG4aqeHd9cnHA2VNhYG2eUta9R0Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix index 352c810e81..be0a4fb915 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix @@ -129,16 +129,6 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isi686; - # The test driver runs a test `LibraryCLinkageTest` which without - # LD_LIBRARY_PATH setting errors with: - # /build/source/build/tools/tests/libjxl_test: error while loading shared libraries: libjxl.so.0 - # The required file is in the build directory (`$PWD`). - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD - '' else '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD - ''; - meta = with lib; { homepage = "https://github.com/libjxl/libjxl"; description = "JPEG XL image format reference implementation."; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix index 645b521b81..2320aa78bb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmanette/default.nix @@ -2,6 +2,7 @@ , fetchurl , ninja , meson +, mesonEmulatorHook , pkg-config , vala , gobject-introspection @@ -34,9 +35,12 @@ stdenv.mkDerivation rec { gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection glib libgudev libevdev diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix index 5a57dfb578..eb32fca716 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmbim/default.nix @@ -11,15 +11,15 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.26.2"; + version = "1.26.4"; + + outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "sha256-EMd79bXrjJK6gOm1GZI62biYNivI4ZKOK8mhfuumSa8="; + sha256 = "sha256-9ojOxMRYahdXX14ydEjOYvIADvagfJ5FiYc9SmhWitk="; }; - outputs = [ "out" "dev" "man" ]; - configureFlags = [ "--with-udev-base-dir=${placeholder "out"}/lib/udev" (lib.enableFeature withIntrospection "introspection") diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix index 3a0ced3d98..38f27ab23f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { - version = "22.03"; + version = "22.06"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "sha256-/FC6u2KOnPumVSiNrgbVw0Kw1+aUGjLWT7uxEySMgLk="; + sha256 = "sha256-snmoTy87s1NmTE59X+7brJix/Q1NQTGrczF1Qff+wvY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix index 2440082cce..f1f6dc1b37 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libminc/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; checkPhase = '' - export LD_LIBRARY_PATH="$(pwd)" # see #22060 ctest -j1 -E 'ezminc_rw_test' --output-on-failure # -j1: see https://github.com/BIC-MNI/libminc/issues/110 # ezminc_rw_test: can't find libminc_io.so.5.2.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmtp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmtp/default.nix index c3c9c20e86..e0c3e195b2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmtp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmtp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "libmtp"; - version = "1.1.19"; + version = "1.1.20"; src = fetchFromGitHub { owner = "libmtp"; repo = "libmtp"; rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}"; - sha256 = "sha256-o8JKoKVNpU/nHTDnKJpa8FlXt37fZnTf45WBTCxLyTs="; + sha256 = "sha256-/tyCoEW/rCLfZH2HhA3Nxuij9d/ZJgsfyP4fLlfyNRA="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix index ba21e2206a..9ff3ee15a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnbd/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.12.2"; + version = "1.14.0"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; - hash = "sha256-57veJapt72LkP02wO4c1nDdHmnodqfT+rKPNDeTGQPM="; + hash = "sha256-fwVAMqZGX1HZMA/81qb67K5gwSqtcT1HnLBLdqDr4Cc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnfs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnfs/default.nix index dd442b2cd4..cbfc06bc81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnfs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libnfs"; - version = "5.0.1"; + version = "5.0.2"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libnfs"; rev = "libnfs-${version}"; - sha256 = "sha256-5jyY7hqEhBPiQ8pNd+mRTEc4brht4ID7PoV7O2RFNQA="; + sha256 = "sha256-rdxi5bPXHTICZQIj/CmHgZ/V70svnITJj/OSF4mmC3o="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix index 5cf79781a7..f1034781fb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libnotify/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "libnotify"; - version = "0.7.12"; + version = "0.8.1"; outputs = [ "out" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "dEsrN1CBNfgmG3Vanevm4JrdQhrcdb3pMPbhmLcKtG4="; + sha256 = "0DPm1NbMv0akNsMWKKS2YbNtyh9dQXT+AXPidPTmJVc="; }; mesonFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix index 894aee90ff..7564e87cdc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libosinfo/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://libosinfo.org/"; changelog = "https://gitlab.com/libosinfo/libosinfo/-/blob/v${version}/NEWS"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 807b69f17f..73d97a4765 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { "-Dvulkan-registry=${vulkan-headers}/share/vulkan/registry/vk.xml" "-Ddemos=false" # Don't build and install the demo programs "-Dd3d11=disabled" # Disable the Direct3D 11 based renderer + ] ++ lib.optionals stdenv.isDarwin [ + "-Dunwind=disabled" # libplacebo doesn’t build with `darwin.libunwind` ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix index 2af3b3f3bc..d391797659 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplctag/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libplctag"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "libplctag"; repo = "libplctag"; rev = "v${version}"; - sha256 = "sha256-Xzdljx08aXwD6pE1f/3YBAjvrSzvs2fcXmmLH04GFyg="; + sha256 = "sha256-ZD7mf6O1iBGmZ2bRWfnM0WPuP1itIi9TxZ5rK4uvBTw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix index 31fb5cb05b..01c3e3e87e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpointmatcher/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - export LD_LIBRARY_PATH=$PWD ./utest/utest --path ../examples/data/ ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix index cb0da5c560..29080f119c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libportal/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , meson , ninja , pkg-config @@ -29,6 +30,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-wDDE43UC6FBgPYLS+WWExeheURCH/3fCKu5oJg7GM+A="; }; + patches = [ + (fetchpatch { + name = "fix-build-on-darwin.patch"; + url = "https://github.com/flatpak/libportal/pull/106/commits/73f63ee57669c4fa604a7772484cd235d4fb612c.patch"; + sha256 = "sha256-c9WUQPhn4IA3X1ie7SwnxuZXdvpPkpGdU4xgDwKN/L0="; + }) + ]; + nativeBuildInputs = [ meson ninja @@ -65,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/flatpak/libportal"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix index f6bf1e8166..62ddcd6739 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libproxy/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub +, fetchpatch , pkg-config , cmake , zlib , dbus , networkmanager -, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform spidermonkey_78 -, spidermonkey_78 +, enableJavaScript ? stdenv.isDarwin || lib.meta.availableOn stdenv.hostPlatform duktape +, duktape , pcre , gsettings-desktop-schemas , glib @@ -19,15 +21,23 @@ stdenv.mkDerivation rec { pname = "libproxy"; - version = "0.4.17"; + version = "0.4.18"; src = fetchFromGitHub { owner = "libproxy"; repo = "libproxy"; rev = version; - sha256 = "0v8q4ln0pd5231kidpi8wpwh0chcjwcmawcki53czlpdrc09z96r"; + hash = "sha256-pqj1LwRdOK2CUu3hYIsogQIXxWzShDuKEbDTbtWkgnQ="; }; + patches = lib.optionals stdenv.isDarwin [ + # https://github.com/libproxy/libproxy/pull/189 + (fetchpatch { + url = "https://github.com/libproxy/libproxy/commit/4331b9db427ce2c25ff5eeb597bec4bc35ed1a0b.patch"; + sha256 = "sha256-uTh3rYVvEke1iWVHsT3Zj2H1F+gyLrffcmyt0JEKaCA="; + }) + ]; + outputs = [ "out" "dev" "py3" ]; nativeBuildInputs = [ @@ -41,7 +51,7 @@ stdenv.mkDerivation rec { python3 zlib ] ++ lib.optionals enableJavaScript [ - (if stdenv.hostPlatform.isDarwin then JavaScriptCore else spidermonkey_78) + (if stdenv.hostPlatform.isDarwin then JavaScriptCore else duktape) ] ++ (if stdenv.hostPlatform.isDarwin then [ SystemConfiguration CoreFoundation diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpulsar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpulsar/default.nix index 9abe322412..3ad5c16d35 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpulsar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpulsar/default.nix @@ -51,10 +51,10 @@ let in stdenv.mkDerivation rec { pname = "libpulsar"; - version = "2.9.1"; + version = "2.10.1"; src = fetchurl { - hash = "sha512-NKHiL7D/Lmnn6ICpQyUmmQYQETz4nZPJU9/4LMRDUQ3Pck6qDh+t6CRk+b9UQ2Vb0jvPIGTjEsSp2nC7TJk3ug=="; + hash = "sha256-qMj76jnxRH68DE6JkZjQrLSNzgXGnO7HjPjlaFavaUY="; url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix index fb2d4aa69c..b261967f5c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqmi/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.30.4"; + version = "1.30.8"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "sha256-ANfaMKT40RhfN8uiic+vHfzQSljy921qz99bhTEtbtY="; + sha256 = "sha256-hiSCzp460L1l0mQzTuMRzblLnfKGO1txNjCbQbisGZA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix index aefc61f1cc..6e01cda916 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqrtr-glib/default.nix @@ -1,6 +1,9 @@ { lib , stdenv -, fetchurl +, fetchFromGitLab +, meson +, mesonEmulatorHook +, ninja , pkg-config , gobject-introspection , gtk-doc @@ -11,13 +14,16 @@ stdenv.mkDerivation rec { pname = "libqrtr-glib"; - version = "1.0.0"; + version = "1.2.2"; outputs = [ "out" "dev" "devdoc" ]; - src = fetchurl { - url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "MNh5sq3m+PRh3vOmd3VdtcAji6v2iNXIPAOz5qvjXO4="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mobile-broadband"; + repo = "libqrtr-glib"; + rev = version; + sha256 = "kHLrOXN6wgBrHqipo2KfAM5YejS0/bp7ziBSpt0s1i0="; }; strictDeps = true; @@ -27,21 +33,22 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ + meson + ninja pkg-config gobject-introspection gtk-doc docbook-xsl-nons docbook_xml_dtd_43 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection glib ]; - configureFlags = lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ - "--enable-gtk-doc" - ]; - meta = with lib; { homepage = "https://gitlab.freedesktop.org/mobile-broadband/libqrtr-glib"; description = "Qualcomm IPC Router protocol helper library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix index 090291a120..c2d91b1d5b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqtav/default.nix @@ -52,6 +52,11 @@ mkDerivation rec { # the other libraries as `libGL` is part of our `buildInputs`. NIX_CFLAGS_LINK = "-Wl,-rpath,${libGL}/lib"; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + preFixup = '' mkdir -p "$out/bin" cp -a "./bin/"* "$out/bin" diff --git a/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix b/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix index 6565581468..b085e08080 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix @@ -1,26 +1,45 @@ -{ lib, stdenv, fetchurl, libxml2, libxslt }: +{ lib +, stdenv +, libxml2 +, libxslt +, pkg-config +, cmake +, fetchFromGitHub +, perl +, bison +, flex +, fetchpatch +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { pname = "raptor2"; - version = "2.0.15"; + version = "unstable-2022-06-06"; - src = fetchurl { - url = "http://download.librdf.org/source/${pname}-${version}.tar.gz"; - sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed"; + src = fetchFromGitHub { + owner = "dajobe"; + repo = "raptor"; + rev = "3cca62a33da68143b687c9e486eefc7c7cbb4586"; + sha256 = "sha256-h03IyFH1GHPqajfHBBTb19lCEu+VXzQLGC1wiEGVvgY="; }; + cmakeFlags = [ + # Build defaults to static libraries. + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + ]; + patches = [ - (fetchurl { - name = "CVE-2017-18926.patch"; - url = "https://github.com/dajobe/raptor/commit/590681e546cd9aa18d57dc2ea1858cb734a3863f.patch"; - sha256 = "1qlpb5rm3j2yi0x6zgdi5apymg5zlvwq3g1zl417gkjrlvxmndgp"; + # https://github.com/dajobe/raptor/pull/52 + (fetchpatch { + name = "fix-cmake-generated-pc-file"; + url = "https://github.com/dajobe/raptor/commit/fa1ef9a27d8762f5588ac2e92554a188e73dee9f.diff"; + sha256 = "sha256-zXIbrYGgC9oTpiD0WUikT4vRdc9b6bsyfnDkwUSlqao="; }) ]; + nativeBuildInputs = [ pkg-config cmake perl bison flex ]; buildInputs = [ libxml2 libxslt ]; - postInstall = "rm -rvf $out/share/gtk-doc"; - meta = { description = "The RDF Parser Toolkit"; homepage = "https://librdf.org/raptor"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix index 5b1673ae37..135969210d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/librealsense/default.nix @@ -8,8 +8,14 @@ , ninja , pkg-config , gcc +, mesa +, gtk3 +, glfw +, libGLU +, curl , cudaSupport ? config.cudaSupport or false, cudaPackages ? {} , enablePython ? false, pythonPackages ? null +, enableGUI ? false, }: assert cudaSupport -> (cudaPackages?cudatoolkit && cudaPackages.cudatoolkit != null); @@ -32,7 +38,8 @@ stdenv.mkDerivation rec { libusb1 gcc.cc.lib ] ++ lib.optional cudaSupport cudaPackages.cudatoolkit - ++ lib.optionals enablePython (with pythonPackages; [python pybind11 ]); + ++ lib.optionals enablePython (with pythonPackages; [ python pybind11 ]) + ++ lib.optionals enableGUI [ mesa gtk3 glfw libGLU curl ]; patches = [ # fix build on aarch64-darwin @@ -53,8 +60,9 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_EXAMPLES=ON" - "-DBUILD_GRAPHICAL_EXAMPLES=OFF" - "-DBUILD_GLSL_EXTENSIONS=OFF" + "-DBUILD_GRAPHICAL_EXAMPLES=${lib.boolToString enableGUI}" + "-DBUILD_GLSL_EXTENSIONS=${lib.boolToString enableGUI}" + "-DCHECK_FOR_UPDATES=OFF" # activated by BUILD_GRAPHICAL_EXAMPLES, will make it download and compile libcurl ] ++ lib.optionals enablePython [ "-DBUILD_PYTHON_BINDINGS:bool=true" "-DXXNIX_PYTHON_SITEPACKAGES=${placeholder "out"}/${pythonPackages.python.sitePackages}" @@ -72,7 +80,7 @@ stdenv.mkDerivation rec { description = "A cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)"; homepage = "https://github.com/IntelRealSense/librealsense"; license = licenses.asl20; - maintainers = with maintainers; [ brian-dawn ]; + maintainers = with maintainers; [ brian-dawn pbsds ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix index b04012cec2..24a34a92f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsecret/default.nix @@ -31,6 +31,10 @@ stdenv.mkDerivation rec { sha256 = "P7PONA/NfbVNh8iT5pv8Kx9uTUsnkGX/5m2snw/RK00="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -48,6 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt + gobject-introspection ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix index 67797100aa..7267b7d99b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, pkg-config -, zlib, lzma, bzip2, zchunk, zstd +, zlib, xz, bzip2, zchunk, zstd , expat, rpm, db }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ninja pkg-config ]; - buildInputs = [ zlib lzma bzip2 zchunk zstd expat rpm db ]; + buildInputs = [ zlib xz bzip2 zchunk zstd expat rpm db ]; meta = with lib; { description = "A free package dependency solver"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix index 83fb0c4a02..9976f4109f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsoup/default.nix @@ -8,16 +8,13 @@ , pkg-config , gnome , libsysprof-capture +, gobject-introspection +, vala +, libpsl +, brotli , gnomeSupport ? true , sqlite , glib-networking -, gobject-introspection -, withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform -, vala -, withVala ? stdenv.buildPlatform == stdenv.hostPlatform -, libpsl -, python3 -, brotli }: stdenv.mkDerivation rec { @@ -31,19 +28,21 @@ stdenv.mkDerivation rec { sha256 = "sha256-8KQnZW5f4Z4d9xwQfojfobLmc8JcVHt4I7YBi0DQEVk="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja pkg-config glib - ] ++ lib.optionals withIntrospection [ gobject-introspection - ] ++ lib.optionals withVala [ vala ]; buildInputs = [ - python3 + gobject-introspection sqlite libpsl glib.out @@ -60,8 +59,6 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dtls_check=false" # glib-networking is a runtime dependency, not a compile-time dependency "-Dgssapi=disabled" - "-Dvapi=${if withVala then "enabled" else "disabled"}" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" "-Dgnome=${lib.boolToString gnomeSupport}" "-Dntlm=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ @@ -73,6 +70,12 @@ stdenv.mkDerivation rec { doCheck = false; # ERROR:../tests/socket-test.c:37:do_unconnected_socket_test: assertion failed (res == SOUP_STATUS_OK): (2 == 200) postPatch = '' + # fixes finding vapigen when cross-compiling + # the commit is in 3.0.6 + # https://gitlab.gnome.org/GNOME/libsoup/-/commit/5280e936d0a76f94dbc5d8489cfbdc0a06343f65 + substituteInPlace meson.build \ + --replace "required: vapi_opt)" "required: vapi_opt, native: false)" + patchShebangs libsoup/ ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspiro/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspiro/default.nix index 03bfe14d3b..e45a208224 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspiro/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspiro/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libspiro"; - version = "20200505"; + version = "20220722"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw"; + sha256 = "sha256-qNff53wyf8YhFVOn169K7smCXrSxdiZWxWOU8VTcjSI="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libssh2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libssh2/default.nix index d6817550fe..1b5d65335b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libssh2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libssh2/default.nix @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; + patches = [ + # https://github.com/libssh2/libssh2/pull/700 + # openssl: add support for LibreSSL 3.5.x + ./openssl_add_support_for_libressl_3_5.patch + ]; + buildInputs = [ openssl zlib ] ++ lib.optional stdenv.hostPlatform.isMinGW windows.mingw_w64; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch b/third_party/nixpkgs/pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch new file mode 100644 index 0000000000..d72a67a634 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libssh2/openssl_add_support_for_libressl_3_5.patch @@ -0,0 +1,26 @@ +From f0681a4573d7c7f7484d3157ddff7063a200295b Mon Sep 17 00:00:00 2001 +From: Viktor Szakats +Date: Thu, 19 May 2022 13:25:06 +0000 +Subject: [PATCH] openssl: add support for LibreSSL 3.5.x + +LibreSSL 3.5.0 made more structures opaque, so let's enable existing +support for that when building against these LibreSSL versions. + +Ref: https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-3.5.0-relnotes.txt +--- + src/openssl.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/openssl.h b/src/openssl.h +index 658b040..1733b9e 100644 +--- a/src/openssl.h ++++ b/src/openssl.h +@@ -58,7 +58,8 @@ + #include + + #if OPENSSL_VERSION_NUMBER >= 0x10100000L && \ +- !defined(LIBRESSL_VERSION_NUMBER) ++ !defined(LIBRESSL_VERSION_NUMBER) || \ ++ LIBRESSL_VERSION_NUMBER >= 0x3050000fL + # define HAVE_OPAQUE_STRUCTS 1 + #endif diff --git a/third_party/nixpkgs/pkgs/development/libraries/libstrophe/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libstrophe/default.nix index cddc563ccf..49779f8250 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libstrophe/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libstrophe/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "libstrophe"; - version = "0.12.0"; + version = "0.12.2"; src = fetchFromGitHub { owner = "strophe"; repo = pname; rev = version; - sha256 = "sha256-YJ8A97ECc3VxdGfhUu0YYijAamnrHCO6kr7TAIan96o="; + sha256 = "sha256-jT4VIqqUldCj3Rsb5MC74WXYQyTqOZxzFADf47TBV8c="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsurvive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsurvive/default.nix index ddcbcb8222..02c4ddffd7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsurvive/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsurvive/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libsurvive"; - version = "1.0"; + version = "1.01"; src = fetchFromGitHub { owner = "cntools"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; # Fixes 'Unknown CMake command "cnkalman_generate_code"' fetchSubmodules = true; - sha256 = "sha256-I8Wx9avfMyDic+Bk/1IjzZiiHj+l3XqpRwxYbWlsG/Q="; + sha256 = "sha256-NcxdTKra+YkLt/iu9+1QCeQZLV3/qlhma2Ns/+ZYVsk="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtiff/aarch64-darwin.nix b/third_party/nixpkgs/pkgs/development/libraries/libtiff/aarch64-darwin.nix index 5de481066f..521db8ff79 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtiff/aarch64-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtiff/aarch64-darwin.nix @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; }; - cmakeFlags = lib.optional stdenv.isDarwin "-DCMAKE_SKIP_BUILD_RPATH=OFF"; - # FreeImage needs this patch patches = [ ./headers-cmake.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix index b7e02a62fa..b96c02a35b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtins/default.nix @@ -30,10 +30,6 @@ stdenv.mkDerivation rec { ]; doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD${placeholder "out"}/lib - ''; checkTarget = "tests test"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 8ecd27a043..412446f215 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "2.0.6"; + version = "2.0.7"; # Make sure we override python, so the correct version is chosen boostPython = boost.override { enablePython = true; inherit python; }; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "v${version}"; - sha256 = "sha256-SQ9yRuINxYJH0LIC3XK7Ssl/TO+DUxIRtdXz684bm8w="; + sha256 = "sha256-ikDtx1BIikVEL5jf37byNbuS+ft1lDtHUlFqegndapw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix index 8bf2e2acff..6b39995f39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix @@ -13,10 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests - ]; - doCheck = !stdenv.isi686; # tests fail on i686 meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix index 92b8a99c72..a350cd378b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkg-config, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.44.1"; + version = "1.44.2"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-12uveSEavRxQW4xVrB4Rkkj+eHZ71Qy8dRG+95ldz50="; + sha256 = "sha256-K6v+00basjI32ON27ZjC5spQi/zWCcslDwQwyosq2iY="; }; postPatch = let diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix index 037318353c..ad4083bf6f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libva" + lib.optionalString minimal "-minimal"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva"; rev = version; - sha256 = "0q395lg6gp05mwf04zbrwgj6q9073lahh3wrcfa2i8ll60cfq9fg"; + sha256 = "sha256-NJA2FTPrhLj9+vmkBy+GcTiH57gBEQnYhZzYk3sEOBo="; }; outputs = [ "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix index 357d205279..ce060c66a3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-WuNJCFBbXbLSftL+L15ruq9PxM1XhIfYpP/IccB+aBs="; + sha256 = "sha256-oElqJqOa/Q+2NE6gZS2tJnFJfalP6HsuUduk8cbuy84="; }; nativeBuildInputs = [ meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libversion/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libversion/default.nix index 98ad4ef7fe..c8af82d049 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libversion/default.nix @@ -13,13 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = lib.optional stdenv.isDarwin [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # needed for tests - ]; - - preCheck = '' - export LD_LIBRARY_PATH=/build/source/build/libversion/''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH - ''; doCheck = true; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix index f86edf1bfb..b7efdf2cf7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt-glib/default.nix @@ -45,8 +45,9 @@ stdenv.mkDerivation rec { gobject-introspection ]; - buildInputs = [ + buildInputs = (lib.optionals stdenv.isLinux [ libcap_ng + ]) ++ [ libvirt libxml2 gobject-introspection @@ -66,6 +67,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://libvirt.org/"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix index 8c37a9dcf4..0142ac4505 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/default.nix @@ -135,9 +135,13 @@ stdenv.mkDerivation rec { sed -i '0,/qemuxml2argvtest/{/qemuxml2argvtest/d;}' tests/meson.build '' + optionalString isDarwin '' sed -i '/qemucapabilitiestest/d' tests/meson.build + sed -i '/vircryptotest/d' tests/meson.build + '' + 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 ''; - nativeBuildInputs = [ meson @@ -222,7 +226,7 @@ stdenv.mkDerivation rec { --replace "ggrep" "grep" substituteInPlace src/util/virpolkit.h \ - --replace '"/usr/bin/pkttyagent"' '"${polkit.bin}/bin/pkttyagent"' + --replace '"/usr/bin/pkttyagent"' '"${if isLinux then polkit.bin else "/usr"}/bin/pkttyagent"' patchShebangs . '' @@ -268,7 +272,7 @@ stdenv.mkDerivation rec { (feat "numactl" isLinux) (feat "numad" isLinux) (feat "pciaccess" isLinux) - (feat "polkit" true) + (feat "polkit" isLinux) (feat "readline" true) (feat "secdriver_apparmor" isLinux) (feat "tests" true) diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvisio2svg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvisio2svg/default.nix index 0525ba80b4..b2a68ed586 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvisio2svg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvisio2svg/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libxml2 freetype librevenge libvisio libwmf libemf2svg ]; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = with lib; { description = "Library and tools to convert Microsoft Visio documents (VSS and VSD) to SVG"; homepage = "https://github.com/kakwa/libvisio2svg"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix index a46ccdf785..24092d3286 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwacom/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libwacom"; - version = "2.2.0"; + version = "2.4.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "sha256-SqKXxmyP31kb6ikMQRqPaKNIpeLcMLLEGInCGIx5jWM="; + sha256 = "sha256-9uhnO+MqB7tAnSXjBcJWCzHGiz9izun4nVjFb17G8Gg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix index da75d3a915..65dcd3587a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -5,64 +5,75 @@ , jpegSupport ? true, libjpeg # JPEG image format , tiffSupport ? true, libtiff # TIFF image format , gifSupport ? true, giflib # GIF image format -#, wicSupport ? true # Windows Imaging Component , alignedSupport ? false # Force aligned memory operations , swap16bitcspSupport ? false # Byte swap for 16bit color spaces , experimentalSupport ? false # Experimental code , libwebpmuxSupport ? true # Build libwebpmux , libwebpdemuxSupport ? true # Build libwebpdemux , libwebpdecoderSupport ? true # Build libwebpdecoder + +# for passthru.tests +, freeimage +, gd +, graphicsmagick +, haskellPackages +, imagemagick +, imlib2 +, libjxl +, opencv +, python3 +, vips }: -let - mkFlag = optSet: flag: if optSet then "--enable-${flag}" else "--disable-${flag}"; -in - -with lib; stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - hash = "sha256-KrvB5d3KNmujbfekWaevz2JZrWtK3PjEG9NEzRBYIDw="; + hash = "sha256-WF2HZPS7mbotk+d1oLM/JC5l/FWfkrk+T3Z6EW9oYEI="; }; prePatch = "patchShebangs ."; configureFlags = [ - (mkFlag threadingSupport "threading") - (mkFlag openglSupport "gl") - (mkFlag pngSupport "png") - (mkFlag jpegSupport "jpeg") - (mkFlag tiffSupport "tiff") - (mkFlag gifSupport "gif") - #(mkFlag (wicSupport && stdenv.isCygwin) "wic") - (mkFlag alignedSupport "aligned") - (mkFlag swap16bitcspSupport "swap-16bit-csp") - (mkFlag experimentalSupport "experimental") - (mkFlag libwebpmuxSupport "libwebpmux") - (mkFlag libwebpdemuxSupport "libwebpdemux") - (mkFlag libwebpdecoderSupport "libwebpdecoder") + (lib.enableFeature threadingSupport "threading") + (lib.enableFeature openglSupport "gl") + (lib.enableFeature pngSupport "png") + (lib.enableFeature jpegSupport "jpeg") + (lib.enableFeature tiffSupport "tiff") + (lib.enableFeature gifSupport "gif") + (lib.enableFeature alignedSupport "aligned") + (lib.enableFeature swap16bitcspSupport "swap-16bit-csp") + (lib.enableFeature experimentalSupport "experimental") + (lib.enableFeature libwebpmuxSupport "libwebpmux") + (lib.enableFeature libwebpdemuxSupport "libwebpdemux") + (lib.enableFeature libwebpdecoderSupport "libwebpdecoder") ]; nativeBuildInputs = [ autoreconfHook libtool ]; buildInputs = [ ] - ++ optionals openglSupport [ freeglut libGL libGLU ] - ++ optional pngSupport libpng - ++ optional jpegSupport libjpeg - ++ optional tiffSupport libtiff - ++ optional gifSupport giflib; + ++ lib.optionals openglSupport [ freeglut libGL libGLU ] + ++ lib.optionals pngSupport [ libpng ] + ++ lib.optionals jpegSupport [ libjpeg ] + ++ lib.optionals tiffSupport [ libtiff ] + ++ lib.optionals gifSupport [ giflib ]; enableParallelBuilding = true; - meta = { + passthru.tests = { + inherit freeimage gd graphicsmagick imagemagick imlib2 libjxl opencv vips; + inherit (python3.pkgs) pillow imread; + haskell-webp = haskellPackages.webp; + }; + + meta = with lib; { description = "Tools and library for the WebP image format"; homepage = "https://developers.google.com/speed/webp/"; license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ codyopel ]; + maintainers = with maintainers; [ ajs124 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwhereami/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwhereami/default.nix index d0dd593a03..11950c6348 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwhereami/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwhereami/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { description = "Library to report hypervisor information from inside a VM"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; - platforms = with platforms; [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; # fails on aarch64 + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; # fails on aarch64 }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix index 18134f18d9..1e0b6ac789 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwpe/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libwpe"; - version = "1.12.0"; + version = "1.12.2"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-6O7KIoprTDYpTPtj99O6mtpHpDCQSlqXOzyZyWpEwYw="; + sha256 = "sha256-SsT9CotWK3Ib/9D0aunwbCtaMRRAdYGXi+h1qdZRZCo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix b/third_party/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix index df6a57d2d7..736b408323 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwpe/fdo.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "wpebackend-fdo"; - version = "1.12.0"; + version = "1.12.1"; src = fetchurl { url = "https://wpewebkit.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-YjnJwVUjQQeY1mMV3mtJFxKrMACboYDz4N0HbZsAdKw="; + sha256 = "sha256-RaqDPETsKS8x+pQ7AbjMdeVOtiOte6amb8LxGP5p5ik="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix index f28420229a..8fa003ed77 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxc"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitLab { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "113sk7hxjpfbz3nrgjsc7bi6zrlwb3qq5s6h0zh37hz9bd1brq54"; + sha256 = "sha256-PuLpwhyyht+kkPUTrJTH+VTY5WuOhi2mIUDrFqubF+w="; }; nativeBuildInputs = [ perl cmake gfortran ]; @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_FORTRAN=ON" "-DBUILD_SHARED_LIBS=ON" - # needed for tests to link - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # Force compilation of higher derivatives "-DDISABLE_VXC=0" "-DDISABLE_FXC=0" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix index f0b4d0baf4..c4571feb81 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix @@ -94,8 +94,10 @@ stdenv.mkDerivation rec { doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && - !stdenv.isDarwin && stdenv.hostPlatform.libc != "musl"; + preCheck = lib.optional stdenv.isDarwin '' + export DYLD_LIBRARY_PATH="$PWD/.libs:$DYLD_LIBRARY_PATH" + ''; preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11") '' MACOSX_DEPLOYMENT_TARGET=10.16 diff --git a/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix index 3fcf03945b..1b538c880a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lief/default.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation rec { pname = "lief"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "lief-project"; repo = "LIEF"; rev = version; - sha256 = "sha256-ONU/geAkqVf8SDIi9dUvHxbJkmykHMCe2UVgUyRk0gg="; + sha256 = "sha256-IQqPwTNFHLOr8iwg8IhXpuiyg2rIdFuVDzwT39eA6/c="; }; outputs = [ "out" "py" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix index f212adb03b..6b5f6410d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/live555/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "live555"; - version = "2022.06.16"; + version = "2022.07.14"; 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-84OUQw++RNqH3sAY4S6yXRJXZY+5T0VdTIUqELuVdV0="; + sha256 = "sha256-VrWkBmLdP0MYfiFit3Mtkv7Ti8dWPmrndrbKo+BpRCA="; }; nativeBuildInputs = lib.optional stdenv.isDarwin darwin.cctools; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix index 4e5a5fdbcd..65e35217f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { checkPhase = '' ( cd unittest - LD_LIBRARY_PATH="$(cd ../src; pwd)" TZ=PST8PDT ./unittestcpp ../../unittest/data + TZ=PST8PDT ./unittestcpp ../../unittest/data ) ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix index 1805de0264..c92c712e15 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/matio/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { description = "A C library for reading and writing Matlab MAT files"; homepage = "http://matio.sourceforge.net/"; license = licenses.bsd2; - maintainers = [ maintainers.vbgl ]; + maintainers = [ ]; mainProgram = "matdump"; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix index 8bba8f0efe..4fa4a5c450 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mbedtls/default.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; platforms = platforms.all; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index 0e10135d3d..d2c3128004 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -35,7 +35,7 @@ let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule # 22.1 on darwin won't build: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6519 - version = if stdenv.isDarwin then "22.0.4" else "22.1.1"; + version = if stdenv.isDarwin then "22.0.4" else "22.1.4"; branch = versions.major version; self = stdenv.mkDerivation { @@ -50,7 +50,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; sha256 = { - "22.1.1" = "1w8fpki67238l4yc92hsnsh4402py9zspirbmirxp577zxjhi526"; + "22.1.4" = "0xhbcjqy3g5dfxhr4flmqncmsjnwljfqm9idx92jm43jifz8q3b7"; "22.0.4" = "1m0y8wgy48hmcidsr7sbk5hcw3v0qr8359fd2x34fvl2z9c1z5y7"; }.${version}; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix index 11a63a3cd5..9cf5da3e39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mlt/qt-5.nix @@ -60,6 +60,11 @@ mkDerivation rec { outputs = [ "out" "dev" ]; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + qtWrapperArgs = [ "--prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1" "--prefix LADSPA_PATH : ${ladspaPlugins}/lib/ladspa" diff --git a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix index 619ed721df..81b84e1a11 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mtxclient/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "sha256-iGw+qdw7heL5q7G0dwtl4PX2UA0Kka0FUmH610dM/00="; + sha256 = "sha256-SQoPeUdDNQU4qYDd8udQnIJ6PrZFtEOmf9uqnw1+fz4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix index 8c0f213b82..0b07fab866 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ncnn/default.nix @@ -11,18 +11,17 @@ stdenv.mkDerivation rec { pname = "ncnn"; - version = "20220216"; + version = "20220729"; src = fetchFromGitHub { owner = "Tencent"; repo = pname; rev = version; - sha256 = "sha256-QHLD5NQZA7WR4mRQ0NIaXuAu59IV4SjXHOOlar5aOew="; + sha256 = "sha256-hZVeW3svuVpwQhQz67uqTPZ7B9pisLCwHhXB2zMLygo="; }; patches = [ ./cmakelists.patch - ./gpu-include.patch ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncnn/gpu-include.patch b/third_party/nixpkgs/pkgs/development/libraries/ncnn/gpu-include.patch deleted file mode 100644 index 8f751c7699..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/ncnn/gpu-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gpu.cpp b/src/gpu.cpp -index 51cd7f95..bf7ed828 100644 ---- a/src/gpu.cpp -+++ b/src/gpu.cpp -@@ -21,7 +21,7 @@ - #include - - #include "glslang/SPIRV/GlslangToSpv.h" --#include "glslang/glslang/Public/ShaderLang.h" -+#include "glslang/Public/ShaderLang.h" - - #include "command.h" - #include "layer.h" diff --git a/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix index 1521c1a638..5250dcddf8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/neon/default.nix @@ -35,6 +35,10 @@ stdenv.mkDerivation rec { (lib.withFeature sslSupport "ssl") ]; + preConfigure = '' + export PKG_CONFIG="$(command -v "$PKG_CONFIG")" + ''; + passthru = {inherit compressionSupport sslSupport;}; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/nettle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nettle/default.nix index 0e3c18c0ac..ed4948cd7f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nettle/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl }: callPackage ./generic.nix rec { - version = "3.7.3"; + version = "3.8"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "1w5wwc3q0r97d2ifhx77cw7y8s20bm8x52is9j93p2h47yq5w7v6"; + hash = "sha256-dXbGhIHBmPZEsIwWDRpIULqUSeMIBpRVtSEzGfI06OY="; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix index e0392901ec..41bf84c5b6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp3/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nghttp3"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EEwo4KIBNVb/O1htUN8GkuiU/P3r/DyEn6L9l1r1I6E="; + sha256 = "sha256-q9rXvMeCXhyytiaGekRlowCYKzvq8aktfN0lk+VPG78="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix index 02812e0043..90372cc97a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ngtcp2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ngtcp2"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "ngtcp2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1cbbH411kn2OnxLWXQvmae0JW4HzXnEHYnucQEVAslk="; + sha256 = "sha256-REAN5TW0miWXI3HFxtW3znTKTrhsBbNqu1VfjC2w0no="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix index 9fec80aa56..f3c5ac668c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nspr/default.nix @@ -3,6 +3,7 @@ , fetchurl , CoreServices , buildPackages +, nixosTests }: stdenv.mkDerivation rec { @@ -44,6 +45,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) firefox firefox-esr-91 firefox-esr-102; + }; + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Reference/NSPR_functions"; description = "Netscape Portable Runtime, a platform-neutral API for system-level and libc-like functions"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix index 9a3d7bdfe2..febc242338 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix @@ -15,6 +15,7 @@ , # allow FIPS mode. Note that this makes the output non-reproducible. # https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Tech_Notes/nss_tech_note6 enableFIPS ? false +, nixosTests }: let @@ -186,6 +187,12 @@ stdenv.mkDerivation rec { passthru.updateScript = ./update.sh; + passthru.tests = lib.optionalAttrs (lib.versionOlder version "3.69") { + inherit (nixosTests) firefox-esr-91; + } // lib.optionalAttrs (lib.versionAtLeast version "3.69") { + inherit (nixosTests) firefox firefox-esr-102; + }; + meta = with lib; { homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"; description = "A set of libraries for development of security-enabled client and server applications"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix index 40f88afed2..4a793bd7ce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/latest.nix +++ b/third_party/nixpkgs/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.80"; - hash = "sha256-wL8f0sfimmsCswliK6r8RD7skMiTS7FV2ku5iYh4S2o="; + version = "3.81"; + hash = "sha256-qL9fO7YXBo1X57FfPZ1SjxCa8NV98uqrBRm2Qj7czKY="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix b/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix index b9095f2148..2c5d0e2a3d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/odpic/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, fixDarwinDylibNames, oracle-instantclient, libaio }: let - version = "4.3.0"; + version = "4.4.1"; libPath = lib.makeLibraryPath [ oracle-instantclient.lib ]; in stdenv.mkDerivation { @@ -13,7 +13,7 @@ in stdenv.mkDerivation { owner = "oracle"; repo = "odpi"; rev = "v${version}"; - sha256 = "sha256-oL2yehjP8JJxU19VY4e/ueh2xjo1yp4X7FGslqCXO8A="; + sha256 = "sha256-tc6N19jSLkuOvTe5f/pBAd1FvpnOjsa4V9CgygUvpZo="; }; nativeBuildInputs = lib.optional stdenv.isDarwin fixDarwinDylibNames; diff --git a/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix index c8981c54c1..b7a75ad6d1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/okapi/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "okapi"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/trinsic-id/okapi/releases/download/v${version}/okapi-vendor-${version}.tar.gz"; - sha256 = "sha256-wNruDPjYHDJtpzQIly4da9rQg1ftdCVxRNNLkFsbKXs="; + sha256 = "sha256-wszpCzh1VhqBlox7ywWi6WKUmxQUTsf5N5IiJumlEbM="; }; cargoVendorDir = "vendor"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix index 42f05a6561..a4c4bb0572 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/oneDNN/default.nix @@ -21,12 +21,6 @@ stdenv.mkDerivation rec { # Tests fail on some Hydra builders, because they do not support SSE4.2. doCheck = false; - # The test driver doesn't add an RPath to the build libdir - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src - ''; - # The cmake install gets tripped up and installs a nix tree into $out, in # addition to the correct install; clean it up. postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix index 23812229a9..368b1b911e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openal-soft/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "openal-soft"; - version = "1.22.0"; + version = "1.22.2"; src = fetchFromGitHub { owner = "kcat"; repo = "openal-soft"; rev = version; - sha256 = "sha256-Y2KhPkwtG6tBzUhSqwV2DVnOjZwxPihidLKahjaIvyU="; + sha256 = "sha256-MVM0qCZDWcO7/Hnco+0dBqzBLcWD279xjx0slxxlc4w="; }; # this will make it find its own data files (e.g. HRTF profiles) diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix index a660008841..81ab688b64 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencolorio/default.nix @@ -1,40 +1,56 @@ -{ - stdenv, lib, fetchFromGitHub, - cmake, expat, libyamlcpp, ilmbase, pystring, # Base dependencies - - glew, freeglut, # Only required on Linux - Carbon, GLUT, Cocoa, # Only required on Darwin - - pythonBindings ? true, # Python bindings - python3Packages, - - buildApps ? true, # Utility applications - lcms2, openimageio2, openexr, +{ stdenv +, lib +, fetchFromGitHub +, cmake +, expat +, libyamlcpp +, ilmbase +, pystring +, imath +# Only required on Linux +, glew +, freeglut +# Only required on Darwin +, Carbon +, GLUT +, Cocoa +# Python bindings +, pythonBindings ? true # Python bindings +, python3Packages +# Build apps +, buildApps ? true # Utility applications +, lcms2 +, openimageio2 +, openexr }: -with lib; - stdenv.mkDerivation rec { pname = "opencolorio"; - version = "2.0.2"; + version = "2.1.2"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "OpenColorIO"; rev = "v${version}"; - sha256 = "sha256-Yr7yypXxf3ZvQVsDxVuKTN/DGPaLkIWli26RRoEDMdA="; + sha256 = "sha256-e1PpWjjfSjtgN9Rs/+lsA45Z9S4y4T6nqrJ02DZ4vjs="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ expat libyamlcpp ilmbase pystring ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] + buildInputs = [ + expat + libyamlcpp + ilmbase + pystring + imath + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ glew freeglut ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Carbon GLUT Cocoa ] ++ lib.optionals pythonBindings [ python3Packages.python python3Packages.pybind11 ] ++ lib.optionals buildApps [ lcms2 openimageio2 openexr ]; - cmakeFlags = [ "-DOCIO_INSTALL_EXT_PACKAGES=NONE" ] - ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" - ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; + cmakeFlags = [ + "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + ] ++ lib.optional (!pythonBindings) "-DOCIO_BUILD_PYTHON=OFF" + ++ lib.optional (!buildApps) "-DOCIO_BUILD_APPS=OFF"; # TODO Investigate this: Python and GPU tests fail to load libOpenColorIO.so.2.0 # doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix index c84740ebcd..ce7f982233 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencv/4.x.nix @@ -13,6 +13,7 @@ , protobuf , config , ocl-icd +, buildPackages , enableJPEG ? true , libjpeg @@ -25,6 +26,8 @@ , enableEXR ? !stdenv.isDarwin , openexr , ilmbase +, enableJPEG2000 ? true +, openjpeg , enableEigen ? true , eigen , enableOpenblas ? true @@ -255,6 +258,7 @@ stdenv.mkDerivation { ++ lib.optional enableTIFF libtiff ++ lib.optional enableWebP libwebp ++ lib.optionals enableEXR [ openexr ilmbase ] + ++ lib.optional enableJPEG2000 openjpeg ++ lib.optional enableFfmpeg ffmpeg ++ lib.optionals (enableFfmpeg && stdenv.isDarwin) [ VideoDecodeAcceleration bzip2 ] @@ -291,17 +295,23 @@ stdenv.mkDerivation { "-DOPENCV_GENERATE_PKGCONFIG=ON" "-DWITH_OPENMP=ON" "-DBUILD_PROTOBUF=OFF" + "-DProtobuf_PROTOC_EXECUTABLE=${lib.getExe buildPackages.protobuf}" "-DPROTOBUF_UPDATE_FILES=ON" "-DOPENCV_ENABLE_NONFREE=${printEnabled enableUnfree}" "-DBUILD_TESTS=OFF" "-DBUILD_PERF_TESTS=OFF" "-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 + "-DOPENCV_ENABLE_PKG_CONFIG=ON" (opencvFlag "IPP" enableIpp) (opencvFlag "TIFF" enableTIFF) (opencvFlag "WEBP" enableWebP) (opencvFlag "JPEG" enableJPEG) (opencvFlag "PNG" enablePNG) (opencvFlag "OPENEXR" enableEXR) + (opencvFlag "OPENJPEG" enableJPEG2000) + "-DWITH_JASPER=OFF" # OpenCV falls back to a vendored copy of Jasper when OpenJPEG is disabled (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) (opencvFlag "TBB" enableTbb) diff --git a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix index c588685eb9..218059ab1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opendht/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "opendht"; - version = "2.4.0"; + version = "2.4.9"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; - rev = version; - sha256 = "sha256-vfMzUzTfz8G+E4W/1pX5v2P0RntgSTR61urmxtsrOWM="; + rev = "v${version}"; + sha256 = "sha256-S/eJrSueJOv3+cUyzcCE3l287l0ihvzOZHB6ZCHtHpQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix index 3cfe173875..17d4382d0b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix @@ -9,24 +9,16 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.1.3"; - - outputs = [ "bin" "dev" "out" "doc" ]; + version = "3.1.5"; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "sha256-Bi6yTcZBWTsWWMm3A7FVYblvSXKLSkHmhGvpNYGiOzE="; + sha256 = "sha256-mmzrMCYyAAa1z8fLZVbaTL1TZzdRaRTLgK+wzPuH4tg="; }; - patches = [ - (fetchpatch { - name = "CVE-2021-45942.patch"; - url = "https://github.com/AcademySoftwareFoundation/openexr/commit/11cad77da87c4fa2aab7d58dd5339e254db7937e.patch"; - sha256 = "1qa8662ga5i0lyfi9mkj9s9bygdg7h1i6ahki28c664kxrlsakch"; - }) - ]; + outputs = [ "bin" "dev" "out" "doc" ]; # tests are determined to use /var/tmp on unix postPatch = '' @@ -35,14 +27,20 @@ stdenv.mkDerivation rec { done ''; - nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ imath zlib ]; + nativeBuildInputs = [ + cmake + ]; + + propagatedBuildInputs = [ + imath + zlib + ]; doCheck = true; meta = with lib; { description = "A high dynamic-range (HDR) image file format"; - homepage = "https://www.openexr.com/"; + homepage = "https://www.openexr.com"; license = licenses.bsd3; maintainers = with maintainers; [ paperdigits ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openhmd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openhmd/default.nix index a692dcb5e4..ce0630bee6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openhmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openhmd/default.nix @@ -37,6 +37,9 @@ stdenv.mkDerivation rec { "-DOPENHMD_EXAMPLE_SIMPLE=${examplesOnOff}" "-DOPENHMD_EXAMPLE_SDL=${examplesOnOff}" "-DOpenGL_GL_PREFERENCE=GLVND" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; postInstall = lib.optionalString withExamples '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix index 551a0827ee..f357b8d4b7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix @@ -15,46 +15,13 @@ stdenv.mkDerivation rec { pname = "openldap"; - version = "2.6.2"; + version = "2.6.3"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz"; - hash = "sha256-gdCTRSMutiSG7PWsrNLFbAxFtKbIwGZhLn9CGiOhz4c"; + hash = "sha256-0qKh1x3z13OWscFq11AuZ030RuBgcrDlpOlBw9BsDUY="; }; - patches = [ - # ITS#9840 - ldif-filter: fix parallel build failure - (fetchpatch { - url = "https://github.com/openldap/openldap/commit/7d977f51e6dfa570a471d163b9e8255bdd3dc12f.patch"; - hash = "sha256:1vid6pj2gmqywbghnd380x19ml241ldc1fyslb6br6q27zpgbdlp"; - }) - # ITS#9840 - libraries/Makefile.in: ignore the mkdir errors - (fetchpatch { - url = "https://github.com/openldap/openldap/commit/71f24015c312171c00ce94c9ff9b9c6664bdca8d.patch"; - hash = "sha256:1a81vv6nkhgiadnj4g1wyzgzdp2zd151h0vkwvv9gzmqvhwcnc04"; - }) - # ITS#7165 back-mdb: check for stale readers on - (fetchpatch { - url = "https://github.com/openldap/openldap/commit/7e7f01c301db454e8c507999c77b55a1d97efc21.patch"; - hash = "sha256:1fc2yck2gn3zlpfqjdn56ar206npi8cmb8yg5ny4lww0ygmyzdfz"; - }) - # ITS#9858 back-mdb: delay indexer task startup - (fetchpatch { - url = "https://github.com/openldap/openldap/commit/ac061c684cc79d64ab4089fe3020921a0064a307.patch"; - hash = "sha256:01f0y50zlcj6n5mfkmb0di4p5vrlgn31zccx4a9k5m8vzxaqmw9d"; - }) - # ITS#9858 back-mdb: fix index reconfig - (fetchpatch { - url = "https://github.com/openldap/openldap/commit/c43c7a937cfb3a781f99b458b7ad71eb564a2bc2.patch"; - hash = "sha256:02yh0c8cyx14iir5qhfam5shrg5d3115s2nv0pmqdj6najrqc5mm"; - }) - # ITS#9157: check for NULL ld - (fetchpatch { - url = "https://github.com/openldap/openldap/commit/6675535cd6ad01f9519ecd5d75061a74bdf095c7.patch"; - hash = "sha256:0dali5ifcwba8400s065f0fizl9h44i0mzb06qgxhygff6yfrgif"; - }) - ]; - # TODO: separate "out" and "bin" outputs = [ "out" @@ -93,18 +60,18 @@ stdenv.mkDerivation rec { "ac_cv_func_memcmp_working=yes" ] ++ lib.optional stdenv.isFreeBSD "--with-pic"; - makeFlags = [ + NIX_CFLAGS_COMPILE = [ "-DLDAPI_SOCK=\"/run/openldap/ldapi\"" ]; + + makeFlags= [ "CC=${stdenv.cc.targetPrefix}cc" "STRIP=" # Disable install stripping as it breaks cross-compiling. We strip binaries anyway in fixupPhase. + "STRIP_OPTS=" "prefix=${placeholder "out"}" - "sysconfdir=${placeholder "out"}/etc" + "sysconfdir=/etc" "systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" # contrib modules require these "moduledir=${placeholder "out"}/lib/modules" "mandir=${placeholder "out"}/share/man" - ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ - # Can be unconditional, doing it like this to prevent a mass rebuild. - "STRIP_OPTS=" ]; extraContribModules = [ @@ -134,6 +101,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=${placeholder "out"}" + "sysconfdir=${placeholder "out"}/etc" "moduledir=${placeholder "out"}/lib/modules" "INSTALL=install" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch b/third_party/nixpkgs/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch deleted file mode 100644 index e144a71888..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 4d8a88c134df634ba610ff8db1eb8478ac5fd345 Mon Sep 17 00:00:00 2001 -From: Xi Ruoyao -Date: Wed, 22 Jun 2022 18:07:05 +0800 -Subject: [PATCH] rsa: fix bn_reduce_once_in_place call for - rsaz_mod_exp_avx512_x2 - -bn_reduce_once_in_place expects the number of BN_ULONG, but factor_size -is moduli bit size. - -Fixes #18625. - -Signed-off-by: Xi Ruoyao - -Reviewed-by: Tomas Mraz -Reviewed-by: Paul Dale -(Merged from https://github.com/openssl/openssl/pull/18626) ---- - crypto/bn/rsaz_exp_x2.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/crypto/bn/rsaz_exp_x2.c b/crypto/bn/rsaz_exp_x2.c -index 6b04486e3f56..f979cebd6fb7 100644 ---- a/crypto/bn/rsaz_exp_x2.c -+++ b/crypto/bn/rsaz_exp_x2.c -@@ -257,6 +257,9 @@ int ossl_rsaz_mod_exp_avx512_x2(BN_ULONG *res1, - from_words52(res1, factor_size, rr1_red); - from_words52(res2, factor_size, rr2_red); - -+ /* bn_reduce_once_in_place expects number of BN_ULONG, not bit size */ -+ factor_size /= sizeof(BN_ULONG) * 8; -+ - bn_reduce_once_in_place(res1, /*carry=*/0, m1, storage, factor_size); - bn_reduce_once_in_place(res2, /*carry=*/0, m2, storage, factor_size); - diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index db6e0101fe..0b4050c76c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -44,9 +44,23 @@ let substituteInPlace crypto/async/arch/async_posix.h \ --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' + '' + # Move ENGINESDIR into OPENSSLDIR for static builds, in order to move + # it to the separate etc output. + + lib.optionalString static '' + substituteInPlace Configurations/unix-Makefile.tmpl \ + --replace 'ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}' \ + 'ENGINESDIR=$(OPENSSLDIR)/engines-{- $sover_dirname -}' ''; - outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional withDocs "doc"; + outputs = [ "bin" "dev" "out" "man" ] + ++ lib.optional withDocs "doc" + # Separate output for the runtime dependencies of the static build. + # Specifically, move OPENSSLDIR into this output, as its path will be + # compiled into 'libcrypto.a'. This makes it a runtime dependency of + # any package that statically links openssl, so we want to keep that + # output minimal. + ++ lib.optional static "etc"; setOutputFlags = false; separateDebugInfo = !stdenv.hostPlatform.isDarwin && @@ -102,7 +116,14 @@ let configureFlags = [ "shared" # "shared" builds both shared and static libraries "--libdir=lib" - "--openssldir=etc/ssl" + (if !static then + "--openssldir=etc/ssl" + else + # Move OPENSSLDIR to the 'etc' output for static builds. Prepend '/.' + # to the path to make it appear absolute before variable expansion, + # else the 'prefix' would be prepended to it. + "--openssldir=/.$(etc)/etc/ssl" + ) ] ++ lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" @@ -140,6 +161,9 @@ let if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then rm "$out/lib/"*.a fi + + # 'etc' is a separate output on static builds only. + etc=$out '') + lib.optionalString (!stdenv.hostPlatform.isWindows) # Fix bin/c_rehash's perl interpreter line # @@ -161,14 +185,15 @@ let mv $out/include $dev/ # remove dependency on Perl at runtime - rm -r $out/etc/ssl/misc + rm -r $etc/etc/ssl/misc - rmdir $out/etc/ssl/{certs,private} + rmdir $etc/etc/ssl/{certs,private} ''; postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) '' - # Check to make sure the main output doesn't depend on perl - if grep -r '${buildPackages.perl}' $out; then + # Check to make sure the main output and the static runtime dependencies + # don't depend on perl + if grep -r '${buildPackages.perl}' $out $etc; then echo "Found an erroneous dependency on perl ^^^" >&2 exit 1 fi @@ -186,8 +211,8 @@ in { openssl_1_1 = common rec { - version = "1.1.1p"; - sha256 = "sha256-v2G2Kqpmx8djmUKpTeTJroKAwI8X1OrC5EZE2fyKzm8="; + version = "1.1.1q"; + sha256 = "sha256-15Oc5hQCnN/wtsIPDi5XAxWKSJpyslB7i9Ub+Mj9EMo="; patches = [ ./1.1/nix-ssl-cert-file.patch @@ -201,8 +226,8 @@ in { }; openssl_3 = common { - version = "3.0.4"; - sha256 = "sha256-KDGEPppmigq0eOcCCtY9LWXlH3KXdHLcc+/O+6/AwA8="; + version = "3.0.5"; + sha256 = "sha256-qn2Nm+9xrWUlxVuhHl9Dl4ic5Jwsk0nc6m0+TwsCSno="; patches = [ ./3.0/nix-ssl-cert-file.patch @@ -210,10 +235,6 @@ in { # This patch disables build-time detection. ./3.0/openssl-disable-kernel-detection.patch - # https://guidovranken.com/2022/06/27/notes-on-openssl-remote-memory-corruption/ - # https://github.com/openssl/openssl/commit/4d8a88c134df634ba610ff8db1eb8478ac5fd345.patch - 3.0/rsa-fix-bn_reduce_once_in_place-call-for-rsaz_mod_exp_avx512_x2.patch - (if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) diff --git a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index c83b4c2f19..51f86ef386 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.22"; + version = "1.0.24"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-YaK7scnfXkxhRe/PKZukqHD9X70X0/QUDL0znTPbIBE="; + sha256 = "sha256-levPWBSwfw1N2tcBqQXtXznA7dzQRqVf/Rp2owGUamE="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix b/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix index 2c43cfb4cc..abe45b6337 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/orcania/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, cmake, check, subunit }: stdenv.mkDerivation rec { pname = "orcania"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lrc4VEqmCp/P/h0+5/ix6tx4pjfkLy9BLBZtKYLlyGI="; + sha256 = "sha256-QAq/6MGVj+iBHLElHuqokF1v3LU1TZ9hVVJE1s3y6f0="; }; nativeBuildInputs = [ cmake ]; @@ -18,11 +18,6 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" - ''; - meta = with lib; { description = "Potluck with different functions for different purposes that can be shared among C programs"; homepage = "https://github.com/babelouest/orcania"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix index 13dd24b548..6ce22a8c1c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pango/default.nix @@ -16,26 +16,21 @@ , ninja , glib , python3 -, x11Support? !stdenv.isDarwin, libXft -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) , gobject-introspection -, withDocs ? (stdenv.buildPlatform == stdenv.hostPlatform) +, x11Support? !stdenv.isDarwin, libXft }: stdenv.mkDerivation rec { pname = "pango"; - version = "1.50.7"; + version = "1.50.8"; - outputs = [ "bin" "out" "dev" ] - ++ lib.optionals withDocs [ "devdoc" ]; + outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "BHfzaaPUxpXfcpmmmJ3ABHVqf03ifuysQFxnkLfjrTM="; + sha256 = "z2JvWd0UbAIxdMQDSSDpZn8dJawsFWlRbWMTbDESVfo="; }; - strictDeps = !withIntrospection; - depsBuildBuild = [ pkg-config ]; @@ -44,9 +39,7 @@ stdenv.mkDerivation rec { meson ninja glib # for glib-mkenum pkg-config - ] ++ lib.optionals withIntrospection [ gobject-introspection - ] ++ lib.optionals withDocs [ gi-docgen python3 ]; @@ -54,6 +47,7 @@ stdenv.mkDerivation rec { buildInputs = [ fribidi libthai + gobject-introspection ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Carbon @@ -71,8 +65,7 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dgtk_doc=${lib.boolToString withDocs}" - "-Dintrospection=${if withIntrospection then "enabled" else "disabled"}" + "-Dgtk_doc=true" ] ++ lib.optionals (!x11Support) [ "-Dxft=disabled" # only works with x11 ]; @@ -82,9 +75,20 @@ stdenv.mkDerivation rec { fontDirectories = [ freefont_ttf ]; }; + # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake) + # it should be a build-time dep for build + # TODO: send upstream + postPatch = '' + substituteInPlace meson.build \ + --replace "dependency('gi-docgen', ver" "dependency('gi-docgen', native:true, ver" + + substituteInPlace docs/meson.build \ + --replace "'gi-docgen', req" "'gi-docgen', native:true, req" + ''; + doCheck = false; # test-font: FAIL - postFixup = lib.optionalString withDocs '' + postFixup = '' # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. moveToOutput "share/doc" "$devdoc" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix index 331284021e..468da57b1a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pangolin/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pangolin"; - version = "0.6"; + version = "0.8"; src = fetchFromGitHub { owner = "stevenlovegrove"; repo = "Pangolin"; rev = "v${version}"; - sha256 = "0abjajxj7lc2yajshimar4w8kf8115prsjnhy83s6jc7cbz63wj8"; + sha256 = "sha256-X8TZWJOQOCItYt/F8E5ahiaPJXoppu9qBlEqfHP0vRc="; }; nativeBuildInputs = [ cmake pkg-config doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix index 5f09860cb3..ae139639c7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pc-ble-driver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchpatch, fetchFromGitHub , cmake, git , asio, catch2, spdlog , IOKit, udev @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1609x17sbfi668jfwyvnfk9z29w6cgzvgv67xcpvpx5jv0czpcdj"; }; + patches = [ + # Fix build with GCC 11 + (fetchpatch { + url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch"; + sha256 = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g="; + }) + ]; + cmakeFlags = [ "-DNRF_BLE_DRIVER_VERSION=${version}" ]; @@ -35,6 +43,5 @@ stdenv.mkDerivation rec { homepage = "https://github.com/NordicSemiconductor/pc-ble-driver"; license = licenses.unfreeRedistributable; platforms = platforms.unix; - maintainers = with maintainers; [ jschievink ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix index 2cfd0ab58b..7730b30b39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pcaudiolib/default.nix @@ -1,33 +1,53 @@ -{ config, stdenv, lib, fetchFromGitHub -, autoconf, automake, which, libtool, pkg-config -, portaudio, alsa-lib -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio }: +{ config +, lib +, stdenv +, fetchFromGitHub +, alsa-lib +, autoconf +, automake +, libpulseaudio +, libtool +, pkg-config +, portaudio +, which +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pcaudiolib"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "espeak-ng"; - repo = "pcaudiolib"; - rev = version; - sha256 = "0c55hlqqh0m7bcb3nlgv1s4a22s5bgczr1cakjh3767rjb10khi0"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + hash = "sha256-ZG/HBk5DHaZP/H3M01vDr3M2nP9awwsPuKpwtalz3EE="; }; - nativeBuildInputs = [ autoconf automake which libtool pkg-config ]; + nativeBuildInputs = [ + autoconf + automake + libtool + pkg-config + which + ]; - buildInputs = [ portaudio ] - ++ lib.optionals stdenv.isLinux [ alsa-lib ] - ++ lib.optionals pulseaudioSupport [ libpulseaudio ]; + buildInputs = [ + portaudio + ] + ++ lib.optional stdenv.isLinux alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio; - preConfigure = "./autogen.sh"; + preConfigure = '' + ./autogen.sh + ''; meta = with lib; { - broken = stdenv.isDarwin; - description = "Provides a C API to different audio devices"; homepage = "https://github.com/espeak-ng/pcaudiolib"; - license = licenses.gpl3; + description = "Provides a C API to different audio devices"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ aske ]; - platforms = platforms.all; + platforms = platforms.unix; + badPlatforms = platforms.darwin; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix new file mode 100644 index 0000000000..6f648463c8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/clhep/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchurl +, cmake +}: + +stdenv.mkDerivation rec { + pname = "clhep"; + version = "2.4.5.3"; + + src = fetchurl { + url = "https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-${version}.tgz"; + hash = "sha256-RfY+6wl/Av5nuGp9rb8Q1Am0AcKKGj4XLbNiUsMJfBM="; + }; + + prePatch = '' + cd CLHEP + ''; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "clhep_ensure_out_of_source_build()" "" + ''; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Set of HEP-specific foundation and utility classes such as random generators, physics vectors, geometry and linear algebra"; + homepage = "https://cern.ch/clhep"; + license = with licenses; [ gpl3Only lgpl3Only ]; + maintainers = with maintainers; [ veprbl ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix index 7bb28825d2..5310ffc279 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/fastjet-contrib/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fastjet-contrib"; - version = "1.048"; + version = "1.049"; src = fetchurl { url = "https://fastjet.hepforge.org/contrib/downloads/fjcontrib-${version}.tar.gz"; - sha256 = "sha256-+ZidO2rrIoSLz5EJXDBgfwJ9PvJ3pPD3BKjw/C52aYE="; + sha256 = "sha256-ri7WIGvGJ4tl6ZpPeN8O6ykR8wGij7V7UMVzwNWGmYc="; }; buildInputs = [ fastjet ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix index 3a23d25d87..1bed1362ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/geant4/default.nix @@ -10,7 +10,7 @@ # Standard build environment with cmake. , lib, stdenv, fetchurl, fetchpatch, cmake -, clhep ? null # not packaged currently +, clhep , expat , xercesc , zlib @@ -47,12 +47,12 @@ in lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt" stdenv.mkDerivation rec { - version = "11.0.0"; + version = "11.0.2"; pname = "geant4"; src = fetchurl{ url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz"; - sha256 = "sha256-PMin350/8ceiGmLS6zoQvhX2uxWNOTI78yEzScnvdbk="; + hash = "sha256-/AONuDcxL3Tj+O/RC108qHqZnUg9TYlZxguKdJIh7GE="; }; cmakeFlags = [ @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}" "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}" "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}" - "-DGEANT4_USE_SYSTEM_CLHEP=${if clhep != null then "ON" else "OFF"}" + "-DGEANT4_USE_SYSTEM_CLHEP=ON" "-DGEANT4_USE_SYSTEM_EXPAT=ON" "-DGEANT4_USE_SYSTEM_ZLIB=ON" "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}" @@ -88,11 +88,11 @@ stdenv.mkDerivation rec { ]; dontWrapQtApps = true; # no binaries - buildInputs = [ libGLU xlibsWrapper libXmu ] + buildInputs = [ clhep libGLU xlibsWrapper libXmu ] ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ] ++ lib.optionals enablePython [ boost_python python3 ]; - propagatedBuildInputs = [ clhep expat xercesc zlib libGL ] + propagatedBuildInputs = [ expat xercesc zlib libGL ] ++ lib.optionals enableXM [ motif ] ++ lib.optionals enableQt [ qtbase ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix index 1c3bfaa206..569f8d80e5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/herwig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "herwig"; - version = "7.2.2"; + version = "7.2.3"; src = fetchurl { url = "https://www.hepforge.org/archive/herwig/Herwig-${version}.tar.bz2"; - sha256 = "10y3fb33zsinr0z3hzap9rsbcqhy1yjqnv4b4vz21g7mdlw6pq2k"; + hash = "sha256-VZmJk3mwGwnjMaJCbXjTm39uwSbbJUPp00Cu/mqlD4Q="; }; nativeBuildInputs = [ autoconf automake libtool gfortran ]; @@ -17,6 +17,10 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs ./ + + # Fix failing "make install" being unable to find HwEvtGenInterface.so + substituteInPlace src/defaults/decayers.in.in \ + --replace "read EvtGenDecayer.in" "" ''; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix index ed92889b5b..adef606be5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/thepeg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "thepeg"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "https://www.hepforge.org/archive/thepeg/ThePEG-${version}.tar.bz2"; - sha256 = "0gif4vb9lw2px2qdywqm7x0frbv0h5gq9lq36c50f2hv77a5bgwp"; + hash = "sha256-8hRzGXp2H8MpF7CKjSTSv6+T/1fzRB/WBdqZrJ3l1Qs="; }; buildInputs = [ boost fastjet gsl hepmc2 lhapdf rivet zlib ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix index db7c18a334..5424ad7378 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "yoda"; - version = "1.9.5"; + version = "1.9.6"; src = fetchurl { url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2"; - hash = "sha256-WRkaDpr6jbU/+qIHn4Uy5bE94b5iJwPW9wYNNhBSi2s="; + hash = "sha256-IVI/ova2yPM0iVnzqUhzSpMMollR08kZC0Qk4Tc18qQ="; }; nativeBuildInputs = with python.pkgs; [ cython makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index c60787d5b6..991ac1ad59 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -2,7 +2,6 @@ , lib , buildPackages , fetchFromGitLab -, fetchpatch , removeReferencesTo , python3 , meson @@ -70,7 +69,7 @@ let self = stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.52"; + version = "0.3.56"; outputs = [ "out" @@ -88,7 +87,7 @@ let owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "sha256-JWmO36+OF2O9sLB+Z0znwm3TH+O+pEv3cXnuwP6Wy1E="; + sha256 = "sha256-wbHHr7BW8Gdj9D1IjzOuD6VuXApJ5E0Zde2iKWImzxg="; }; patches = [ @@ -104,12 +103,6 @@ let ./0090-pipewire-config-template-paths.patch # Place SPA data files in lib output to avoid dependency cycles ./0095-spa-data-dir.patch - # Remove 44.1KHz from allowed rates (multiple regressions reported) - # To be removed when 0.3.53 is released - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/16a7c274989f47b0c0d8ba192a30316b545bd26a.patch"; - sha256 = "sha256-VZ7ChjcR/PGfmH2DmLxfIhd3mj9668l9zLO4k2KBoqg="; - }) ]; nativeBuildInputs = [ @@ -157,6 +150,7 @@ let "-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Dpipewire_pulse_prefix=${placeholder "pulse"}" "-Dlibjack-path=${placeholder "jack"}/lib" + "-Dlibv4l2-path=${placeholder "out"}/lib" "-Dlibcamera=${mesonEnableFeature libcameraSupport}" "-Droc=${mesonEnableFeature rocSupport}" "-Dlibpulse=${mesonEnableFeature pulseTunnelSupport}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix index 14b75f770a..8769587605 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/wireplumber.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals (enableDocs || enableGI) [ doxygen (python3.withPackages (ps: with ps; - lib.optionals enableDocs [ sphinx sphinx_rtd_theme breathe ] ++ + lib.optionals enableDocs [ sphinx sphinx-rtd-theme breathe ] ++ lib.optionals enableGI [ lxml ] )) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pixman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pixman/default.nix index be41526c4f..ffdaeaef03 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pixman/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pixman/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { configureFlags = lib.optional stdenv.isAarch32 "--disable-arm-iwmmxt"; + preConfigure = '' + # https://gitlab.freedesktop.org/pixman/pixman/-/issues/62 + export OMP_NUM_THREADS=$((NIX_BUILD_CORES > 184 ? 184 : NIX_BUILD_CORES)) + ''; + doCheck = true; postInstall = glib.flattenInclude; diff --git a/third_party/nixpkgs/pkgs/development/libraries/platform-folders/default.nix b/third_party/nixpkgs/pkgs/development/libraries/platform-folders/default.nix new file mode 100644 index 0000000000..8ed0c7a744 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/platform-folders/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "platform-folders"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "sago007"; + repo = "PlatformFolders"; + rev = version; + hash = "sha256-ruhAP9kjwm6pIFJ5a6oy6VE5W39bWQO3qSrT5IUtiwA="; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" + ]; + + 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"; + license = licenses.mit; + maintainers = with maintainers; [ lilyinstarlight ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/plplot/default.nix b/third_party/nixpkgs/pkgs/development/libraries/plplot/default.nix index dca1248b8b..f3a703ce18 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/plplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/plplot/default.nix @@ -33,7 +33,9 @@ in stdenv.mkDerivation rec { ; }; - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DBUILD_TEST=ON" ]; + cmakeFlags = [ + "-DBUILD_TEST=ON" + ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix index 9c49f89c2c..78daac0ba1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix @@ -6,13 +6,14 @@ , expat , pam , meson +, mesonEmulatorHook , ninja , perl , rsync , python3 , fetchpatch , gettext -, spidermonkey_78 +, duktape , gobject-introspection , libxslt , docbook-xsl-nons @@ -23,10 +24,6 @@ , useSystemd ? stdenv.isLinux , systemd , elogind -# needed until gobject-introspection does cross-compile (https://github.com/NixOS/nixpkgs/pull/88222) -, withIntrospection ? (stdenv.buildPlatform == stdenv.hostPlatform) -# cross build fails on polkit-1-scan (https://github.com/NixOS/nixpkgs/pull/152704) -, withGtkDoc ? (stdenv.buildPlatform == stdenv.hostPlatform) # A few tests currently fail on musl (polkitunixusertest, polkitunixgrouptest, polkitidentitytest segfault). # Not yet investigated; it may be due to the "Make netgroup support optional" # patch not updating the tests correctly yet, or doing something wrong, @@ -40,7 +37,7 @@ let in stdenv.mkDerivation rec { pname = "polkit"; - version = "0.120"; + version = "121"; outputs = [ "bin" "dev" "out" ]; # small man pages in $bin @@ -50,7 +47,7 @@ stdenv.mkDerivation rec { owner = "polkit"; repo = "polkit"; rev = version; - sha256 = "oEaRf1g13zKMD+cP1iwIA6jaCDwvNfGy2i8xY8vuVSo="; + sha256 = "Lj7KSGILc6CBsNqPO0G0PNt6ClikbRG45E8FZbb46yY="; }; patches = [ @@ -60,23 +57,6 @@ stdenv.mkDerivation rec { url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/7ba07551dfcd4ef9a87b8f0d9eb8b91fabcb41b3.patch"; sha256 = "ebbLILncq1hAZTBMsLm+vDGw6j0iQ0crGyhzyLZQgKA="; }) - # pkexec: local privilege escalation (CVE-2021-4034) - (fetchpatch { - url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a2bf5c9c83b6ae46cbd5c779d3055bff81ded683.patch"; - sha256 = "162jkpg2myq0rb0s5k3nfr4pqwv9im13jf6vzj8p5l39nazg5i4s"; - }) - # File descriptor leak allows an unprivileged user to cause a crash (CVE-2021-4115) - (fetchpatch { - name = "CVE-2021-4115.patch"; - url = "https://src.fedoraproject.org/rpms/polkit/raw/0a203bd46a1e2ec8cc4b3626840e2ea9d0d13a9a/f/CVE-2021-4115.patch"; - sha256 = "sha256-BivHVVpYB4Ies1YbBDyKwUmNlqq2D1MpMipH9/dZM54="; - }) - # Fix build with meson 0.61 - # https://gitlab.freedesktop.org/polkit/polkit/-/merge_requests/99 - (fetchpatch { - url = "https://gitlab.freedesktop.org/polkit/polkit/-/commit/a96c5119f726225f8d79b222c85d71a9f0e32419.patch"; - sha256 = "sha256-/hm/m22dKA50sDmw4L1VAlgvCm8CuIyNjHxF/2YgMKo="; - }) ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Make netgroup support optional (musl does not have it) # Upstream MR: https://gitlab.freedesktop.org/polkit/polkit/merge_requests/10 @@ -88,6 +68,10 @@ stdenv.mkDerivation rec { }) ]; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ glib gtk-doc @@ -97,7 +81,8 @@ stdenv.mkDerivation rec { ninja perl rsync - (python3.withPackages (pp: with pp; [ + gobject-introspection + (python3.pythonForBuild.withPackages (pp: with pp; [ dbus-python (python-dbusmock.overridePythonAttrs (attrs: { # Avoid dependency cycle. @@ -109,17 +94,19 @@ stdenv.mkDerivation rec { libxslt docbook-xsl-nons docbook_xml_dtd_412 + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection expat pam - spidermonkey_78 + dbus + duktape ] ++ lib.optionals stdenv.isLinux [ # On Linux, fall back to elogind when systemd support is off. (if useSystemd then systemd else elogind) - ] ++ lib.optionals withIntrospection [ - gobject-introspection ]; propagatedBuildInputs = [ @@ -136,9 +123,7 @@ stdenv.mkDerivation rec { "-Dsystemdsystemunitdir=${placeholder "out"}/etc/systemd/system" "-Dpolkitd_user=polkituser" #TODO? config.ids.uids.polkituser "-Dos_type=redhat" # only affects PAM includes - "-Dintrospection=${lib.boolToString withIntrospection}" "-Dtests=${lib.boolToString doCheck}" - "-Dgtk_doc=${lib.boolToString withGtkDoc}" "-Dman=true" ] ++ lib.optionals stdenv.isLinux [ "-Dsession_tracking=${if useSystemd then "libsystemd-login" else "libelogind"}" diff --git a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix index 17a1717812..8d2e91513f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/poppler/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "poppler-${suffix}"; - version = "22.06.0"; # beware: updates often break cups-filters build, check texlive and scribus too! + version = "22.08.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"; - sha256 = "sha256-oPmqo5GLrXgQOfwwemNWUqFNGzkc1Vm2bt7Evtujxdc="; + sha256 = "sha256-tJMyhyFALyXLdSP5zcL318WfRa2Zm951xjyQYE2w8gs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix b/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix index 25cd5179f7..95c02febda 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/proj/7.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://proj4.org"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ vbgl dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix index a5a19dc9db..68b47e2a2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/proj/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://proj.org/"; license = licenses.mit; platforms = platforms.unix; - maintainers = with maintainers; [ vbgl dotlambda ]; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ptex/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ptex/default.nix index 5d40ff183e..a5827fe188 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ptex/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ptex/default.nix @@ -1,27 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, zlib, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, zlib, cmake }: stdenv.mkDerivation rec { pname = "ptex"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "wdas"; repo = "ptex"; rev = "v${version}"; - sha256 = "sha256-TuwgZJHvQUqBEFeZYvzpi+tmXB97SkOairYnuUahtSA="; + sha256 = "sha256-PR1ld9rXmL6BK4llznAsD5PNvi3anFMz2i9NDsG95DQ="; }; outputs = [ "bin" "dev" "out" "lib" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib pkg-config ]; - - # Can be removed in the next release - # https://github.com/wdas/ptex/pull/42 - patchPhase = '' - echo v${version} >version - ''; + buildInputs = [ zlib ]; meta = with lib; { description = "Per-Face Texture Mapping for Production Rendering"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix index c976db8822..73d890e03a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix @@ -22,14 +22,6 @@ stdenv.mkDerivation rec { checkInputs = [ check ]; - # Hack to be able to run the test, broken because we use - # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" - '' else '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - preConfigure = '' # Enable long long support (required for filezilla) sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp diff --git a/third_party/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix index cd19705f1e..856f2f88e8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qrcodegen/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "qrcodegen"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "nayuki"; repo = "QR-Code-generator"; rev = "v${version}"; - sha256 = "sha256-WH6O3YE/+NNznzl52TXZYL+6O25GmKSnaFqDDhRl4As="; + sha256 = "sha256-aci5SFBRNRrSub4XVJ2luHNZ2pAUegjgQ6pD9kpkaTY="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix index da54865a18..5d7b720294 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix @@ -164,7 +164,7 @@ let inherit bison cups harfbuzz libGL; withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; inherit debug developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth + inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; inherit (darwin) libobjc; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix index 59b04b6a52..32630810b4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.14/default.nix @@ -162,7 +162,7 @@ let inherit bison cups harfbuzz libGL; withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; inherit debug developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth + inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; inherit (darwin) libobjc; }; @@ -178,6 +178,7 @@ let qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; + qtlottie = callPackage ../modules/qtlottie.nix {}; qtmacextras = callPackage ../modules/qtmacextras.nix {}; qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; @@ -222,7 +223,7 @@ let qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtwebview qtx11extras qtxmlpatterns + qtwebview qtx11extras qtxmlpatterns qtlottie ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix index 02b1b0db99..e3f94ba8ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix @@ -43,6 +43,8 @@ let # Patch framework detection to support X.framework/X.tbd, # extending the current support for X.framework/X. ./qtbase.patch.d/0012-qtbase-tbd-frameworks.patch + + ./qtbase.patch.d/0014-aarch64-darwin.patch ] ++ [ ./qtbase.patch.d/0003-qtbase-mkspecs.patch ./qtbase.patch.d/0004-qtbase-replace-libdir.patch @@ -119,7 +121,7 @@ let inherit bison cups harfbuzz libGL; withGtk3 = !stdenv.isDarwin; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; - inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth + inherit (darwin.apple_sdk.frameworks) AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL MetalKit IOKit; inherit (darwin) libobjc; }; @@ -135,6 +137,7 @@ let qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; + qtlottie = callPackage ../modules/qtlottie.nix {}; qtmacextras = callPackage ../modules/qtmacextras.nix {}; qtmultimedia = callPackage ../modules/qtmultimedia.nix { inherit gstreamer gst-plugins-base; @@ -180,7 +183,7 @@ let qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets - qtwebview qtx11extras qtxmlpatterns + qtwebview qtx11extras qtxmlpatterns qtlottie ] ++ lib.optional (!stdenv.isDarwin) qtwayland ++ lib.optional (stdenv.isDarwin) qtmacextras); diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch index 3a2900abdd..b509137536 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -30,7 +30,54 @@ diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/defaul index 92a9112bca..b80ec1e801 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf -@@ -68,212 +68,6 @@ qt { +@@ -1,9 +1,5 @@ + load(default_post) + +-# Recompute SDK version in case the user set it explicitly +-sdk_version = $$QMAKE_MAC_SDK_VERSION +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- + contains(TEMPLATE, .*app) { + !macx-xcode:if(isEmpty(BUILDS)|build_pass) { + # Detect changes to the platform SDK +@@ -16,36 +12,6 @@ contains(TEMPLATE, .*app) { + QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) + } + +- # Detect incompatible SDK versions +- +- isEmpty(QT_MAC_SDK_VERSION_MIN): \ +- QT_MAC_SDK_VERSION_MIN = $$QT_MAC_SDK_VERSION +- +- !versionAtLeast(QMAKE_MAC_SDK_VERSION, $$QT_MAC_SDK_VERSION_MIN): \ +- warning("Qt requires at least version $$QT_MAC_SDK_VERSION_MIN of the platform SDK," \ +- "you're building against version $${QMAKE_MAC_SDK_VERSION}. Please upgrade.") +- +- !isEmpty(QT_MAC_SDK_VERSION_MAX) { +- # For Qt developers only +- !isEmpty($$list($$(QT_MAC_SDK_NO_VERSION_CHECK))): \ +- CONFIG += sdk_no_version_check +- +- QMAKE_MAC_SDK_MAJOR_VERSION = $$replace(QMAKE_MAC_SDK_VERSION, "(\\d+)(\\.\\d+)(\\.\\d+)?", \\1) +- +- !sdk_no_version_check:!versionAtMost(QMAKE_MAC_SDK_MAJOR_VERSION, $$QT_MAC_SDK_VERSION_MAX) { +- warning("Qt has only been tested with version $$QT_MAC_SDK_VERSION_MAX"\ +- "of the platform SDK, you're using $${QMAKE_MAC_SDK_MAJOR_MINOR_VERSION}.") +- warning("This is an unsupported configuration. You may experience build issues," \ +- "and by using") +- warning("the $$QMAKE_MAC_SDK_VERSION SDK you are opting in to new features" \ +- "that Qt has not been prepared for.") +- +- warning("Please downgrade the SDK you use to build your app to version" \ +- "$$QT_MAC_SDK_VERSION_MAX, or configure") +- warning("with CONFIG+=sdk_no_version_check when running qmake" \ +- "to silence this warning.") +- } +- } + } + + !no_objective_c:CONFIG += objective_c +@@ -73,212 +39,6 @@ qt { } } @@ -308,35 +355,6 @@ index e3534561a5..3b01424e67 100644 -xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP -xcode_copy_phase_strip_setting.value = NO -QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk ---- a/mkspecs/features/mac/sdk.mk -+++ b/mkspecs/features/mac/sdk.mk -@@ -1,25 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build. Please wipe the build directory completely,) -- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) -- $(error ^) -- endif -- endif --endif diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf deleted file mode 100644 index 3a9c2778bb..0000000000 @@ -404,6 +422,14 @@ index 3a9c2778bb..0000000000 - $$tool = $$sysrooted $$member(value, 1, -1) - cache($$tool_variable, set stash, $$tool) -} --- -2.25.4 - +diff --git a/mkspecs/features/mac/toolchain.prf b/mkspecs/features/mac/toolchain.prf +deleted file mode 100644 +index df191eb13c..0000000000 +--- a/mkspecs/features/mac/toolchain.prf ++++ /dev/null +@@ -1,5 +0,0 @@ +-# Ensure that we process sdk.prf first, as it will update QMAKE_CXX, +-# which the default path determination uses. +-sdk: load(sdk) +- +-load(toolchain) diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch new file mode 100644 index 0000000000..8ef1b08a5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0014-aarch64-darwin.patch @@ -0,0 +1,287 @@ +From abc52460201bc5c7603505bb187138b0c59291aa Mon Sep 17 00:00:00 2001 +From: Mushroom +Date: Sun, 20 Dec 2020 00:11:41 +0000 +Subject: [PATCH] [QtBase] Split macOS platforms by architecture + +Currently macOS only has one platform, which forces the default arch to +x86_64. This patch splits the platforms by architecture, and defaults to +the same as the host. + +This stops M1-based macs from compiling x64 binaries by default, +instead making them compile native binaries. + +[ChangeLog][QtBase][Platform Specific Changes][OS X] Split macOS +platforms so it doesn't default to the x64 architecture every time + +Change-Id: I34891b107bb24f68371df1c8f087eb0ad5b5dd95 +--- + configure | 9 +++- + .../clang-macx-desktop.conf} | 8 ++-- + mkspecs/common/macx.conf | 1 - + .../Info.plist.app | 0 + .../Info.plist.dSYM.in | 0 + .../Info.plist.disable_highdpi | 0 + .../Info.plist.lib | 0 + mkspecs/macx-clang-arm64/qmake.conf | 7 ++++ + .../qplatformdefs.h | 0 + mkspecs/macx-clang-x64/Info.plist.app | 24 +++++++++++ + mkspecs/macx-clang-x64/Info.plist.dSYM.in | 18 ++++++++ + .../macx-clang-x64/Info.plist.disable_highdpi | 8 ++++ + mkspecs/macx-clang-x64/Info.plist.lib | 20 +++++++++ + mkspecs/macx-clang-x64/qmake.conf | 7 ++++ + mkspecs/macx-clang-x64/qplatformdefs.h | 41 +++++++++++++++++++ + 15 files changed, 137 insertions(+), 6 deletions(-) + rename mkspecs/{macx-clang/qmake.conf => common/clang-macx-desktop.conf} (83%) + rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.app (100%) + rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.dSYM.in (100%) + rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.disable_highdpi (100%) + rename mkspecs/{macx-clang => macx-clang-arm64}/Info.plist.lib (100%) + create mode 100644 mkspecs/macx-clang-arm64/qmake.conf + rename mkspecs/{macx-clang => macx-clang-arm64}/qplatformdefs.h (100%) + create mode 100644 mkspecs/macx-clang-x64/Info.plist.app + create mode 100644 mkspecs/macx-clang-x64/Info.plist.dSYM.in + create mode 100644 mkspecs/macx-clang-x64/Info.plist.disable_highdpi + create mode 100644 mkspecs/macx-clang-x64/Info.plist.lib + create mode 100644 mkspecs/macx-clang-x64/qmake.conf + create mode 100644 mkspecs/macx-clang-x64/qplatformdefs.h + +diff --git a/configure b/configure +index b6c9b462f24..a86f2ceaa5b 100755 +--- a/configure ++++ b/configure +@@ -556,7 +556,14 @@ PLATFORM_NOTES= + if [ -z "$PLATFORM" ]; then + case "$UNAME_SYSTEM:$UNAME_RELEASE" in + Darwin:*) +- PLATFORM=macx-clang ++ case "$UNAME_MACHINE" in ++ arm64) ++ PLATFORM=macx-clang-arm64 ++ ;; ++ *) ++ PLATFORM=macx-clang-x64 ++ ;; ++ esac + ;; + AIX:*) + #PLATFORM=aix-g++ +diff --git a/mkspecs/macx-clang/qmake.conf b/mkspecs/common/clang-macx-desktop.conf +similarity index 83% +rename from mkspecs/macx-clang/qmake.conf +rename to mkspecs/common/clang-macx-desktop.conf +index 0cf1f31b60d..042319a2aa3 100644 +--- a/mkspecs/macx-clang/qmake.conf ++++ b/mkspecs/common/clang-macx-desktop.conf +@@ -24,9 +24,9 @@ QMAKE_LIBS_X11 = -lX11 -lXext -lm + QMAKE_LIBDIR_X11 = /opt/X11/lib + QMAKE_INCDIR_X11 = /opt/X11/include + +-include(../common/macx.conf) +-include(../common/gcc-base-mac.conf) +-include(../common/clang.conf) +-include(../common/clang-mac.conf) ++include(macx.conf) ++include(gcc-base-mac.conf) ++include(clang.conf) ++include(clang-mac.conf) + + load(qt_config) +diff --git a/mkspecs/common/macx.conf b/mkspecs/common/macx.conf +index d16b77acb8e..4ba0a8eaa36 100644 +--- a/mkspecs/common/macx.conf ++++ b/mkspecs/common/macx.conf +@@ -6,7 +6,6 @@ QMAKE_PLATFORM += macos osx macx + QMAKE_MAC_SDK = macosx + + QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13 +-QMAKE_APPLE_DEVICE_ARCHS = x86_64 + + # Should be 10.15, but as long as the CI builds with + # older SDKs we have to keep this. +diff --git a/mkspecs/macx-clang/Info.plist.app b/mkspecs/macx-clang-arm64/Info.plist.app +similarity index 100% +rename from mkspecs/macx-clang/Info.plist.app +rename to mkspecs/macx-clang-arm64/Info.plist.app +diff --git a/mkspecs/macx-clang/Info.plist.dSYM.in b/mkspecs/macx-clang-arm64/Info.plist.dSYM.in +similarity index 100% +rename from mkspecs/macx-clang/Info.plist.dSYM.in +rename to mkspecs/macx-clang-arm64/Info.plist.dSYM.in +diff --git a/mkspecs/macx-clang/Info.plist.disable_highdpi b/mkspecs/macx-clang-arm64/Info.plist.disable_highdpi +similarity index 100% +rename from mkspecs/macx-clang/Info.plist.disable_highdpi +rename to mkspecs/macx-clang-arm64/Info.plist.disable_highdpi +diff --git a/mkspecs/macx-clang/Info.plist.lib b/mkspecs/macx-clang-arm64/Info.plist.lib +similarity index 100% +rename from mkspecs/macx-clang/Info.plist.lib +rename to mkspecs/macx-clang-arm64/Info.plist.lib +diff --git a/mkspecs/macx-clang-arm64/qmake.conf b/mkspecs/macx-clang-arm64/qmake.conf +new file mode 100644 +index 00000000000..0cc2361e696 +--- /dev/null ++++ b/mkspecs/macx-clang-arm64/qmake.conf +@@ -0,0 +1,7 @@ ++# ++# qmake configuration for Clang on OS X (arm64) ++# ++ ++QMAKE_APPLE_DEVICE_ARCHS=arm64 ++ ++include(../common/clang-macx-desktop.conf) +diff --git a/mkspecs/macx-clang/qplatformdefs.h b/mkspecs/macx-clang-arm64/qplatformdefs.h +similarity index 100% +rename from mkspecs/macx-clang/qplatformdefs.h +rename to mkspecs/macx-clang-arm64/qplatformdefs.h +diff --git a/mkspecs/macx-clang-x64/Info.plist.app b/mkspecs/macx-clang-x64/Info.plist.app +new file mode 100644 +index 00000000000..fa592af0897 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/Info.plist.app +@@ -0,0 +1,24 @@ ++ ++ ++ ++ ++ CFBundleExecutable ++ ${EXECUTABLE_NAME} ++ CFBundleIconFile ++ ${ASSETCATALOG_COMPILER_APPICON_NAME} ++ CFBundleIdentifier ++ ${PRODUCT_BUNDLE_IDENTIFIER} ++ CFBundlePackageType ++ APPL ++ CFBundleSignature ++ ${QMAKE_PKGINFO_TYPEINFO} ++ LSMinimumSystemVersion ++ ${MACOSX_DEPLOYMENT_TARGET} ++ NOTE ++ This file was generated by Qt/QMake. ++ NSPrincipalClass ++ NSApplication ++ NSSupportsAutomaticGraphicsSwitching ++ ++ ++ +diff --git a/mkspecs/macx-clang-x64/Info.plist.dSYM.in b/mkspecs/macx-clang-x64/Info.plist.dSYM.in +new file mode 100644 +index 00000000000..a8c8d0d4fb5 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/Info.plist.dSYM.in +@@ -0,0 +1,18 @@ ++ ++ ++ ++ ++ CFBundleIdentifier ++ com.apple.xcode.dsym.$${BUNDLEIDENTIFIER} ++ CFBundlePackageType ++ dSYM ++ CFBundleSignature ++ ???? ++!!IF !isEmpty(VERSION) ++ CFBundleShortVersionString ++ $${VER_MAJ}.$${VER_MIN} ++ CFBundleVersion ++ $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} ++!!ENDIF ++ ++ +diff --git a/mkspecs/macx-clang-x64/Info.plist.disable_highdpi b/mkspecs/macx-clang-x64/Info.plist.disable_highdpi +new file mode 100644 +index 00000000000..a9b89888ad4 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/Info.plist.disable_highdpi +@@ -0,0 +1,8 @@ ++ ++ ++ ++ ++ NSHighResolutionCapable ++ NO ++ ++ +diff --git a/mkspecs/macx-clang-x64/Info.plist.lib b/mkspecs/macx-clang-x64/Info.plist.lib +new file mode 100644 +index 00000000000..34752ec40d9 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/Info.plist.lib +@@ -0,0 +1,20 @@ ++ ++ ++ ++ ++ CFBundleExecutable ++ ${EXECUTABLE_NAME} ++ CFBundleIdentifier ++ ${PRODUCT_BUNDLE_IDENTIFIER} ++ CFBundlePackageType ++ FMWK ++ CFBundleShortVersionString ++ ${QMAKE_SHORT_VERSION} ++ CFBundleSignature ++ ${QMAKE_PKGINFO_TYPEINFO} ++ CFBundleVersion ++ ${QMAKE_FULL_VERSION} ++ NOTE ++ Please, do NOT change this file -- It was generated by Qt/QMake. ++ ++ +diff --git a/mkspecs/macx-clang-x64/qmake.conf b/mkspecs/macx-clang-x64/qmake.conf +new file mode 100644 +index 00000000000..1ac373b53b4 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/qmake.conf +@@ -0,0 +1,7 @@ ++# ++# qmake configuration for Clang on OS X (arm64) ++# ++ ++QMAKE_APPLE_DEVICE_ARCHS=x86_64 ++ ++include(../common/clang-macx-desktop.conf) +diff --git a/mkspecs/macx-clang-x64/qplatformdefs.h b/mkspecs/macx-clang-x64/qplatformdefs.h +new file mode 100644 +index 00000000000..063491dd900 +--- /dev/null ++++ b/mkspecs/macx-clang-x64/qplatformdefs.h +@@ -0,0 +1,41 @@ ++/**************************************************************************** ++** ++** Copyright (C) 2016 The Qt Company Ltd. ++** Contact: https://www.qt.io/licensing/ ++** ++** This file is part of the qmake spec of the Qt Toolkit. ++** ++** $QT_BEGIN_LICENSE:LGPL$ ++** Commercial License Usage ++** Licensees holding valid commercial Qt licenses may use this file in ++** accordance with the commercial license agreement provided with the ++** Software or, alternatively, in accordance with the terms contained in ++** a written agreement between you and The Qt Company. For licensing terms ++** and conditions see https://www.qt.io/terms-conditions. For further ++** information use the contact form at https://www.qt.io/contact-us. ++** ++** GNU Lesser General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU Lesser ++** General Public License version 3 as published by the Free Software ++** Foundation and appearing in the file LICENSE.LGPL3 included in the ++** packaging of this file. Please review the following information to ++** ensure the GNU Lesser General Public License version 3 requirements ++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ++** ++** GNU General Public License Usage ++** Alternatively, this file may be used under the terms of the GNU ++** General Public License version 2.0 or (at your option) the GNU General ++** Public license version 3 or any later version approved by the KDE Free ++** Qt Foundation. The licenses are as published by the Free Software ++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++** included in the packaging of this file. Please review the following ++** information to ensure the GNU General Public License requirements will ++** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++** https://www.gnu.org/licenses/gpl-3.0.html. ++** ++** $QT_END_LICENSE$ ++** ++****************************************************************************/ ++ ++#include "../common/mac/qplatformdefs.h" ++ diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch index 7b568a9194..ee9b80ca6e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/macos-sdk-10.12/0004-Revert-QCocoaDrag-avoid-using-the-deprecated-API-if-.patch @@ -175,14 +175,16 @@ index 978d73f7d9..463e3c5579 100644 QPoint windowPoint = QPointF::fromCGPoint([self convertPoint:sender.draggingLocation fromView:nil]).toPoint(); qCDebug(lcQpaMouse) << QEvent::DragLeave << self << "at" << windowPoint; -@@ -294,10 +290,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin +@@ -294,12 +294,7 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin if (!target) return; - QCocoaDrag* nativeDrag = QCocoaIntegration::instance()->drag(); - Q_ASSERT(nativeDrag); - nativeDrag->exitDragLoop(); -- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation)); +- // for internal drag'n'drop, don't override the action the drop event accepted +- if (!nativeDrag->currentDrag()) +- nativeDrag->setAcceptedAction(qt_mac_mapNSDragOperation(operation)); + QCocoaIntegration::instance()->drag(); // Qt starts drag-and-drop on a mouse button press event. Cococa in diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json index b772331fc3..37685b07d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs-generated.json @@ -1,118 +1,118 @@ { "qt3d": { "url": "https://invent.kde.org/qt/qt/qt3d.git", - "rev": "6d926ec2739f2289c6b0bbfbc325700046e1ceee", - "sha256": "1w2m1rm6mhj9qbanak36rqvc30x495zvj7mh2syy1yd29by0g5i8" + "rev": "3cc801c4ae41ff3f155258c4bf7e21bb5b3f6a3d", + "sha256": "0ia17cn59100n4qkxc1bdn36knqpdqy1dx06la4qlhvm6hzb7wpj" }, "qtactiveqt": { "url": "https://invent.kde.org/qt/qt/qtactiveqt.git", - "rev": "2c53a16f431bbb950bfca8ac32ddabf217a0bf04", - "sha256": "0llk76lf0mh4mzj7pwd8cs55wpmfq8v1bsdzvizb1sx0vfbjh8g6" + "rev": "a4211b21b09a1b98020522bc058e0ee2d6ed2e1d", + "sha256": "1gdnqhx75iwja50nhvdb8fxbdcpw18pc6xpd105kj4j62f73j1hq" }, "qtandroidextras": { "url": "https://invent.kde.org/qt/qt/qtandroidextras.git", - "rev": "1939eada1cdf00052bba32657d9d975c1e255128", - "sha256": "130a1yda2m7pa10as3rccz84m3617422n6s51pdn4kp8p8rk7cs6" + "rev": "45ce7b075b5dd19744b9446aa9e8ceb1d099d8b9", + "sha256": "15b7258mjdxbqpgr9bjhysagznnx97l2948c15xjpb77sc8l0wlh" }, "qtbase": { "url": "https://invent.kde.org/qt/qt/qtbase.git", - "rev": "ee7a89b2c4750bc3cabe4aeb466645d6ac2a872b", - "sha256": "10aj4nxfpx34k0if2kl5sxfjpk3sb1r9z7p6haypjpw60cssjbsl" + "rev": "aa0c6db334cf6f0887f42cbd82e4af258126bdc5", + "sha256": "0gxlqkag06fd7jbk7kjcjxxa3wxm27fa9vdd4hzq5gkq5y1hslaw" }, "qtcharts": { "url": "https://invent.kde.org/qt/qt/qtcharts.git", - "rev": "f13988aa1ad9de5d92e7b0ba4d0d947dd019d759", - "sha256": "1l7zmdkakc7bc9c10nzijg86ps9f3jpi1nblkfxr6521g0xjrmb8" + "rev": "9a569795f0c3f41ec093e4aa5842a463e2755edb", + "sha256": "12w48q59xcr0l1s941pnsp5s8xk5knis9c1cry6kvybiq51hl77n" }, "qtconnectivity": { "url": "https://invent.kde.org/qt/qt/qtconnectivity.git", - "rev": "aa2def2bdb76f8fd2454dc4515883fd7b5ddb521", - "sha256": "1fy4anhj432fz05kinb67v8ckdp9h7150fhy4dm6hgbjq6y7j16g" + "rev": "42c25efeaa409f711af1bd9a8144b445741ee114", + "sha256": "0bj28j5ksr95bj9vmqcahvx3a5bc8kd9kkd6q8nsg7ak0bm0cm2p" }, "qtdatavis3d": { "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git", - "rev": "19af9584f7b80928ee49950c573c770af68c9519", - "sha256": "0xya1m2csb42yisl90s9822p9q92n7ags909nlbapfsb49qwsqnj" + "rev": "a32c95d27224c6c9e41d6080ea54bc937c5d1455", + "sha256": "105cdvz8y48lhyn1s5w8ckcd0vk2gq7aqnmndiq45k1c8nikn2ry" }, "qtdeclarative": { "url": "https://invent.kde.org/qt/qt/qtdeclarative.git", - "rev": "02105099301450c890e1caba977ef44efdc43da7", - "sha256": "0wk8a9fbjwrqwb4gj5s78ipg1svdrhz80cykjd6qgkd26dh1p4kn" + "rev": "c47f3d7b227c9bc86ca1702ae3291a62c2116cfa", + "sha256": "0izk3zxbf1h1k88qvq8p6yaza9pkm19w4f491mbazs87qwfh3dni" }, "qtdoc": { "url": "https://invent.kde.org/qt/qt/qtdoc.git", - "rev": "ed002122ce74b3505ba55262ddbc842a810e8159", - "sha256": "03hb1jgx49rh5gldxq7d85s1ny0yl64nylw7d61dvsgbs422fqn9" + "rev": "a2a7f0f219ccedf1ecb2bc06760ef5439262aacd", + "sha256": "1s2jbwq83zfqg7d0mq4v60nvpg4zfa47xqgh7sglgk1s922jyj76" }, "qtgamepad": { "url": "https://invent.kde.org/qt/qt/qtgamepad.git", - "rev": "6b7a6303439f83147680723f4d8142d676cdb928", - "sha256": "1h9yb0asprynnb2qyjbmyglrkk9f9v19g6zzpk0gmixrp0h8gk46" + "rev": "5107ddf28177112cdbf505f92bb4191a91e6521a", + "sha256": "1fyyyljhl8h4rgik3i8gi2xg5r05xd2vf4qgn4ybf3yafjsra9am" }, "qtgraphicaleffects": { "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git", - "rev": "379577925766385991f413a2b0d0d46831381ffa", - "sha256": "0x11n2fym765z3gyb4xnfl7v6zrip1wjkkl6nx1bxaya173fvdw8" + "rev": "c25898224cd957491d10dbe48f2f0be66f2955de", + "sha256": "1cr3hykl79yr7x06hjfx9g6nq2wmb3q5hszby83hbzpf166h8zjf" }, "qtimageformats": { "url": "https://invent.kde.org/qt/qt/qtimageformats.git", - "rev": "90038c936763645610fe1e5f05cfc025e4d98631", - "sha256": "1yqfz58p7s92jr8d4lk4n0dv6ij8fslh4sxdz0azd0p6077rim77" + "rev": "0ee52083683c9fcd996118ef62d9e60b5431a520", + "sha256": "0ainvxp2sw13dx44j8waa89bni8ylxkykr6mwncsspi7da9dqxq2" }, "qtlocation": { "url": "https://invent.kde.org/qt/qt/qtlocation.git", - "rev": "e07f35879536640ad784e71e5261c5a597d504f5", - "sha256": "1yhwaz2wyq2hx9bqrcimabj9jbv2kr9h0czxxryh5b9b6aim6ncw" + "rev": "73db91329ae48f685fa3fdae1c3c63b0976dc751", + "sha256": "0l8amd9fsn8agxgvxmij59i12504bmzbvyc1rz6nqhcpib4z5w7l" }, "qtlottie": { "url": "https://invent.kde.org/qt/qt/qtlottie.git", - "rev": "fca3f80f0ce389271e5bd9af864ce56a313d359a", - "sha256": "1xgykaw8qjnaip6h9jx0nfadc9amb6aclk758vm5pp43dvs5j96r" + "rev": "4b3d1e824fdde2c835041464a9f85feaed0b313d", + "sha256": "02g7znswwki86723d3p23n0hwdi6brch9whx526l92sfx308z380" }, "qtmacextras": { "url": "https://invent.kde.org/qt/qt/qtmacextras.git", - "rev": "80bc8d86508579c7a57110c09a44e33f9d8bc0e5", - "sha256": "1n9qixhgz66frsp56cr7zzaxcns3ijip46pa9zcz3m0f438n08z7" + "rev": "166cb4d6166cab60a66a074c848f6ed725e6755c", + "sha256": "09f34v5x4z3y58z6b4hriqclrf9mjncxyl4h9ph0cicam66575ms" }, "qtmultimedia": { "url": "https://invent.kde.org/qt/qt/qtmultimedia.git", - "rev": "fa6c3d653682f9fd331d859c7196a291a8a4d8d5", - "sha256": "0x4112b93dryfgy6w49z3jqd8xi8pvc3xqfn2j0n0qhdp4vvz5sl" + "rev": "16d9ea642bf7b9592a6c53321cc7ee9d9a3ed03f", + "sha256": "1xi2shsg0apk7rk7ccrbnjsg9j6p8svgs1pbml48ci57i36dgzfv" }, "qtnetworkauth": { "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git", - "rev": "958db00a2064f77b354b573102ca2c2b2e07529c", - "sha256": "0idaysqpwrghih7ijrm9hagj9jw3fy9nw539fr4d9rmcggnkkzn2" + "rev": "9e698881cb07ebf04319f5cfa7b065c8bc2c1afb", + "sha256": "0207z0mv6nfgw7vhh43sx7r8z4cmvilh31x1x24d7nxj9rggnm1b" }, "qtpurchasing": { "url": "https://invent.kde.org/qt/qt/qtpurchasing.git", - "rev": "255b9e16f286003bbfaff9d48e4548fb0cb3b398", - "sha256": "1cki7n62wqm3xxn36mka0y67ngn7jvjkrvr08vsassbjb7kfsmxp" + "rev": "87021fd1e50f0aa3589a2412cfa665a6d27cc740", + "sha256": "184mpjc0vnrmxl7z0x2c1xj2adrdx12l5swpzh51q1wb45j1lvna" }, "qtquick3d": { "url": "https://invent.kde.org/qt/qt/qtquick3d.git", - "rev": "1ede2ac20170357b3e8d7d9810e5474e08170827", - "sha256": "1sxlyv1y6aanln7cv1m8fgjkp72lgx2k4q8a23m79g7xryl0xx2a" + "rev": "1a8736a5834492aa8b7fc2dbc59a1eb4420a7330", + "sha256": "1byn9g46jd4krij0h1x7lfn7ac5v4rican0lppngm065is4c6c7p" }, "qtquickcontrols": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git", - "rev": "d054de15b3c9ead0f96655ddfb1a6381ed7a0e2b", - "sha256": "0inym59pnr6pk9y4im2fsq1hzs8b4rwqs3x6cgc61z3kqyv74cb6" + "rev": "4fb4e5942bfa1f92f1c759f182aa504ad52e8e3b", + "sha256": "1qkamv5p97p0lp7968cdjz4ah8mfqmrq23dikqvkwnirl3bffd83" }, "qtquickcontrols2": { "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git", - "rev": "26bd7f5414dc592ab5277e2bb4ad0199faa889de", - "sha256": "0d53d1fqcc7ccd9ljr3q1qxd7k7kkn6msqa81592pg6b4ridzdsq" + "rev": "59cc1cc5b3719713598a1f426d82a9d895b5dccb", + "sha256": "0i1k520080h0q85hifs5axnn4dysmvwhrsm0kxq28qgdpqjzkli6" }, "qtquicktimeline": { "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git", - "rev": "98b1ff53458887061b4bcc183efcce899f432394", - "sha256": "1q4d88cym0c5vmw40qjp968x5sp7dx4mq6cr1r6px9i0ifvimdrg" + "rev": "2da3c0efd5016bdba26b80789773238c2886fdf6", + "sha256": "0lmyw4cxgj5kcisd2pbcpl1zynj2rfa3nsfl1n2mcz6ca650ibys" }, "qtremoteobjects": { "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git", - "rev": "581475dfeb44c8b51c0be86e0f2f57df7d117a80", - "sha256": "1zbxl5jk7x8qklrnbbaikymyviigqdq7vf0wc8gzls4126vcx146" + "rev": "89407ff20e4f76314887e2f3625f5126910031ac", + "sha256": "1qimf60hz1962l5wpdh33y6xz3h8zcnf5yj5b1i0gfyzg0c2ki5n" }, "qtscript": { "url": "https://invent.kde.org/qt/qt/qtscript.git", @@ -121,87 +121,87 @@ }, "qtscxml": { "url": "https://invent.kde.org/qt/qt/qtscxml.git", - "rev": "50d2da3965ed8e85f3f5f5760393c42b12d34a9f", - "sha256": "148qdyw084agpp4n31cfcgk39ppwf9ndifnvihd94c6ksf1ax3ks" + "rev": "bb5d10f926c51aa462a56ffb331afd4f9607855c", + "sha256": "0wkwkzfv5hxkhrpmy0knlxf9c7qkals5s9c0bw71k9dz8n24d7j8" }, "qtsensors": { "url": "https://invent.kde.org/qt/qt/qtsensors.git", - "rev": "975ba788d3d0ee87aa08bb5301cd33dcbf00521b", - "sha256": "13x0d0ky5dybp1lq39yy82xg7hxdvmksam8r85gqargsi0zr5s8x" + "rev": "bce4b6231229e953c3961f3d9858e58555a55d56", + "sha256": "15b2scai53d10c8bv6kv4k9lc3z9bixr4364yw2pkm71mwir90ga" }, "qtserialbus": { "url": "https://invent.kde.org/qt/qt/qtserialbus.git", - "rev": "22b3cad193232ab379a0c9e16989a7db1fdc9234", - "sha256": "1j084szvdmfxbc9n37phxsd7k4vxd073vwy1hcnjhmpyg9hwrw81" + "rev": "b6e22f07fb529736c9362d81de7f5c632bd1f439", + "sha256": "039kd0yk1am9s1yr39p7gwirjl3126arqf9r01xn5kcs4viizh1k" }, "qtserialport": { "url": "https://invent.kde.org/qt/qt/qtserialport.git", - "rev": "f95e2411d7c978def87846ea7cedf3dc5fd7c8b8", - "sha256": "0x7ly67gddmz0hqls9109bk4rgaa97ksyv24qk4brrhzkpr7q9cx" + "rev": "112fcd80658a52e6a2822ec79a7d724d0ad003cf", + "sha256": "1px0mm301401ha0qx5blhmcmbb17bd71q1smcdlxnl8a704n4nry" }, "qtspeech": { "url": "https://invent.kde.org/qt/qt/qtspeech.git", - "rev": "08b27c29aadc0cc0303cca97c9a3baa2a690dfe4", - "sha256": "0lm6i85d7zav43lsrxnhdqcq68np32s3widla8z6c208q1pf3qs6" + "rev": "e76b23ad707077647cdb4282cf35a71776efa0f0", + "sha256": "0lnvbcx5rflx50wpbhxy7f15ax7cs4l7h44i8y9bb04njqswh0pa" }, "qtsvg": { "url": "https://invent.kde.org/qt/qt/qtsvg.git", - "rev": "2f42157cabbd1db6249ccb1d14e6eede80451e0c", - "sha256": "1ldizgybl4fp95xlzf103hqmsqdmr3jbx048jyxcb5gjd3pbwh7p" + "rev": "68de925ddc20dfb8900be4fa47fa5a5916836cc8", + "sha256": "0b0d70w2ycxac81dqd1yhswcn37055ra3jfqn5srk8wsbdhpjl1c" }, "qttools": { "url": "https://invent.kde.org/qt/qt/qttools.git", - "rev": "a3e5b2eb8ef5982bc1fffb390ebcd141be1deee4", - "sha256": "1x7vzqvc80k0fanvahibmglcv4za07hfiamp26wkhmk0g634ms2q" + "rev": "672ba9d902be3634a9fef80be65227aece9e0aed", + "sha256": "05rzr6hlipzcm0vs9k721y25hzhv916hv48gr0pbrfzljyvp2yhx" }, "qttranslations": { "url": "https://invent.kde.org/qt/qt/qttranslations.git", - "rev": "a6d5e7f84a57394db4c8b069f81c56cfeb802e19", - "sha256": "06r2jb2fsdr5fvxs748war0lr4mm3l3d3b37xc4n73y294vwrmn7" + "rev": "0e92fc4f19928387c341533ef3d259efaa752c0f", + "sha256": "0vwkf72gpn42g54lhcbgaxbx9awpzi4a0602yhssad0v3a6zrl11" }, "qtvirtualkeyboard": { "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git", - "rev": "bb40dee811333929dd467a480dce24ab7af84ef9", - "sha256": "0w6li1qwm2x4plzixd1dv6s1jvcmyrbaw328sri2cmiswajhywdw" + "rev": "766c1b7acbdc9ff4e35f6eb341fd446b1c20b811", + "sha256": "0bdg98h5z0lwl61860iam6ixcvgis996qj8as739wn9y6k2sv904" }, "qtwayland": { "url": "https://invent.kde.org/qt/qt/qtwayland.git", - "rev": "118674630cdb5933e66a8b4415afe7c716ad4662", - "sha256": "1zvx11z0cfv2avj211zsh79806m6mdkk3kczwhcd98k1qs9r9d3p" + "rev": "64fa557eb30fc1219bec50a45107ea1a983411ed", + "sha256": "14p20mv2dwc3i0qhssl7sqa0bnk14mg0kaq7ai65fqkx5b8qn5xr" }, "qtwebchannel": { "url": "https://invent.kde.org/qt/qt/qtwebchannel.git", - "rev": "611016a49f3a9ba7b58bef29bc295323e06373ae", - "sha256": "0mggqa8kixknbm1p5i5lkrmkj1na3b2xflj011dkjbj8wb78i42n" + "rev": "da9b7b0e059447dceb828bc02d40e30d26b012f2", + "sha256": "0kyzzz17d7s9ln6j4ply6hl3y8wky5wslpabbmwsy2952g1y3l99" }, "qtwebglplugin": { "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git", - "rev": "4318ad91c2a8bea3a0aaaa64aaf49d3b997e50a1", - "sha256": "0p1y0b8zsm7rrkhhylndp282ghgki2cjrgc4n5zhjn732ahxg515" + "rev": "8feafc4b8e9af78175e2814523ef4f11e445fc93", + "sha256": "0ck9091bhgvhnwilfjrk9pjlf184bmhia9b92av0sg0m7yrg5wqd" }, "qtwebsockets": { "url": "https://invent.kde.org/qt/qt/qtwebsockets.git", - "rev": "7196d2cc34adf9f45b50a9488f4ff95b36092993", - "sha256": "1a7n5i4s6nsb19z4r3m3w7gadjpp0irm77ysk61axqjda4ypi7fw" + "rev": "e5be9ba432929049da8f4788400c170bf71672da", + "sha256": "1jq11rhd0k880gabh839gs474psfc0j20sy65l1l7w1cffwi1zk2" }, "qtwebview": { "url": "https://invent.kde.org/qt/qt/qtwebview.git", - "rev": "ec4de0cec2299f4ae0228ea2c71011e0520ca40e", - "sha256": "1na9xv2q4wwy10bcr7684i59d9a20n6s91m12n49yjgrhpn4f4jv" + "rev": "429096eb954672d3727a3e8cc83832bc79cf7967", + "sha256": "0c0q3dcxz00y8wml141xk3lx91mzg4mg5qlka2k1j49cn1az6lx3" }, "qtwinextras": { "url": "https://invent.kde.org/qt/qt/qtwinextras.git", - "rev": "051202df9c553d7c0a384f07bd67fde98f3b02c4", - "sha256": "0d8y4x41slqjr3nflb14ah1wl2hrlir7331ch9k1qfrk3798a760" + "rev": "b41efc2b32a19da9fe369e243dcf3a2a31f7cde6", + "sha256": "1prsv3z51sbq9q8v1xj4v312hai6ampdcfnik28rdh7c9mpnq99m" }, "qtx11extras": { "url": "https://invent.kde.org/qt/qt/qtx11extras.git", - "rev": "f628d7a60e45d90a439cb0a393a6229ac6892be5", - "sha256": "04rp8arml19b03iybd7sa78dsdv7386m9ymmgqciwl13dhwjssra" + "rev": "0dfaf36ec6f642a0fd583ce1cc33a31eb6b3328e", + "sha256": "13fzpipgvlxs9qw128hpnaxr8j4xi8v2fmyy39y1ghf66sfln1zn" }, "qtxmlpatterns": { "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git", - "rev": "af4958af9d628d6124e64abd9743abce42f15a6f", - "sha256": "0vs9j2i1dnlivcrzz175zz66ql1m8mrdqkglvyqjqv6cb7mpskrq" + "rev": "a8edba5ad50d669aead4ddb769f171cba892d676", + "sha256": "1342b7qljjqpiq3xjwy0vblq8wqcqyp9s3751ja40n7ishhxd2yj" } } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix index 7cba1ae63f..5ca0338161 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -1,7 +1,7 @@ { lib, fetchgit, fetchFromGitHub }: let - version = "5.15.3"; + version = "5.15.5"; overrides = { qtscript.version = "5.15.4"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix index ba5f959ea4..2dd9edcf5d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -4,7 +4,7 @@ , coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3 , which # darwin support -, libiconv, libobjc, xcbuild, AGL, AppKit, ApplicationServices, Carbon, Cocoa, CoreAudio, CoreBluetooth +, libiconv, libobjc, xcbuild, AGL, AppKit, ApplicationServices, AVFoundation, Carbon, Cocoa, CoreAudio, CoreBluetooth , CoreLocation, CoreServices, DiskArbitration, Foundation, OpenGL, MetalKit, IOKit , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite @@ -52,7 +52,7 @@ stdenv.mkDerivation { ] ++ ( if stdenv.isDarwin then [ # TODO: move to buildInputs, this should not be propagated. - AGL AppKit ApplicationServices Carbon Cocoa CoreAudio CoreBluetooth + AGL AppKit ApplicationServices AVFoundation Carbon Cocoa CoreAudio CoreBluetooth CoreLocation CoreServices DiskArbitration Foundation OpenGL libobjc libiconv MetalKit IOKit ] else [ @@ -195,7 +195,10 @@ stdenv.mkDerivation { # ignore "is only available on macOS 10.12.2 or newer" in obj-c code "-Wno-error=unguarded-availability" ] - ++ lib.optionals withGtk3 [ + ++ lib.optionals ((compareVersion "5.15.0" >= 0) && stdenv.isDarwin) [ + # .moc/moc_qprintdialog.cpp:96:31: error: no member named '_q_togglePageSetCombo' in 'QPrintDialogPrivate' + "-DQ_OS_MAC" + ] ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"'' ] @@ -281,7 +284,6 @@ stdenv.mkDerivation { ] ++ lib.optional (compareVersion "5.15.0" < 0) "-v" ++ ( if stdenv.isDarwin then [ - "-platform macx-clang" "-no-fontconfig" "-qt-freetype" "-qt-libpng" @@ -374,7 +376,7 @@ stdenv.mkDerivation { # error: unknown target CPU 'armv8.3-a+crypto+sha2+aes+crc+fp16+lse+simd+ras+rdm+rcpc' # note: valid target CPU values are: nocona, core2, penryn, ..., znver1, znver2, x86-64 # it seems the qmake/cmake passes x86_64 as preferred architecture somewhere - broken = stdenv.isDarwin && stdenv.isAarch64; + broken = stdenv.isDarwin && stdenv.isAarch64 && (compareVersion "5.15.3" < 0); }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix new file mode 100644 index 0000000000..d94c289953 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtlottie.nix @@ -0,0 +1,9 @@ +{ qtModule +, qtbase +, qtdeclarative +}: + +qtModule { + pname = "qtlottie"; + qtInputs = [ qtbase qtdeclarative ]; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix index d7bbabf5e6..b80e93622d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem +{ lib, stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem , libX11, libXext, qttools, wrapQtAppsHook , gitUpdater }: stdenv.mkDerivation rec { pname = "qtstyleplugin-kvantum"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "tsujan"; repo = "Kvantum"; rev = "V${version}"; - sha256 = "hY8QQVcP3E+GAdLOqtVbqCWBcxS2M6sMOr/vr+DryyQ="; + sha256 = "chdtcx73mfr/b1P3yVevx0m7HkMFzEYG7YLuhSyG7rk="; }; nativeBuildInputs = [ @@ -24,6 +24,15 @@ stdenv.mkDerivation rec { sourceRoot = "source/Kvantum"; + patches = [ + (fetchpatch { + # add xdg dirs support + url = "https://github.com/tsujan/Kvantum/commit/01989083f9ee75a013c2654e760efd0a1dea4a68.patch"; + hash = "sha256-HPx+p4Iek/Me78olty1fA0dUNceK7bwOlTYIcQu8ycc="; + stripLen = 1; + }) + ]; + postPatch = '' # Fix plugin dir substituteInPlace style/style.pro \ @@ -42,6 +51,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; broken = lib.versionOlder qtbase.version "5.14"; - maintainers = [ maintainers.bugworm ]; + maintainers = [ maintainers.romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index 6d6b413957..cce0afc55e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ArPTWUQV9h+AK/m4oUIXsGWFO6Fj9IIOKSXCdWGztNM="; + sha256 = "sha256-RjVmrdUHDBelwagWD5Mx+S3tdFO7I0+8RmFR7hwoe8o="; }; buildInputs = [ qtbase cpp-utilities ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/quickder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quickder/default.nix index 80eb64a577..68da796aa0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quickder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quickder/default.nix @@ -1,50 +1,57 @@ -{ lib, stdenv, fetchFromGitHub, python3Packages, hexio -, cmake, bash, arpa2cm, git, asn2quickder }: +{ lib +, stdenv +, fetchFromGitLab +, python3 +, cmake +, doxygen +, graphviz +, quickmem +, arpa2common +, arpa2cm +, ensureNewerSourcesForZipFilesHook +}: stdenv.mkDerivation rec { pname = "quickder"; - version = "1.3.0"; + version = "1.7.1"; - src = fetchFromGitHub { - sha256 = "15lxv8vcjnsjxg7ywcac5p6mj5vf5pxq1219yap653ci4f1liqfr"; - rev = "version-${version}"; - owner = "vanrein"; + src = fetchFromGitLab { + owner = "arpa2"; repo = "quick-der"; + rev = "v${version}"; + sha256 = "sha256-f+ph5PL+uWRkswpOLDwZFWjh938wxoJ6xocJZ2WZLEk="; }; - nativeBuildInputs = [ cmake ]; - - buildInputs = with python3Packages; [ - arpa2cm - asn1ate - hexio - pyparsing - python - six - asn1ate - asn2quickder + nativeBuildInputs = [ + cmake + doxygen + graphviz + ensureNewerSourcesForZipFilesHook ]; + buildInputs = [ + arpa2cm + arpa2common + (python3.withPackages (ps: with ps; [ + asn1ate + colored + pyparsing + setuptools + six + ])) + quickmem + ]; + + postPatch = '' - substituteInPlace ./CMakeLists.txt \ - --replace "get_version_from_git" "set (Quick-DER_VERSION 1.2) #" - substituteInPlace ./CMakeLists.txt \ - --replace \$\{ARPA2CM_TOOLCHAIN_DIR} "$out/share/ARPA2CM/toolchain/" - patchShebangs python/scripts/ + substituteInPlace setup.py --replace 'pyparsing==' 'pyparsing>=' ''; - cmakeFlags = [ - "-DNO_TESTING=ON" - "-DARPA2CM_TOOLCHAIN_DIR=$out/share/ARPA2CM/toolchain/" - ]; - - preConfigure = '' - export PREFIX=$out - ''; + doCheck = true; meta = with lib; { description = "Quick (and Easy) DER, a Library for parsing ASN.1"; - homepage = "https://github.com/vanrein/quick-der"; + homepage = "https://gitlab.com/arpa2/quick-der/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/quickmem/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quickmem/default.nix new file mode 100644 index 0000000000..60ea330dc0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/quickmem/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, doxygen +, graphviz +, arpa2common +, arpa2cm +}: + +stdenv.mkDerivation rec { + pname = "quickmem"; + version = "0.3.0"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "Quick-MEM"; + rev = "v${version}"; + sha256 = "sha256-cqg8QN4/I+zql7lVDDAgFA05Dmg4ylBTvPSPP7WATdc="; + }; + + nativeBuildInputs = [ + cmake + doxygen + graphviz + ]; + + buildInputs = [ + arpa2cm + arpa2common + ]; + + doCheck = true; + + meta = with lib; { + description = "Memory pooling for ARPA2 projects"; + homepage = "https://gitlab.com/arpa2/Quick-MEM/"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ leungbk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix index 4614c14981..72da2a34e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/raft-canonical/default.nix @@ -16,6 +16,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Ignore broken test, likely not causing huge breakage + # (https://github.com/canonical/raft/issues/292) + postPatch = '' + substituteInPlace test/integration/test_uv_tcp_connect.c --replace \ + "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, 0, NULL)" \ + "TEST(tcp_connect, closeDuringHandshake, setUp, tearDownDeps, MUNIT_TEST_OPTION_TODO, NULL)" + ''; + preConfigure = '' substituteInPlace configure --replace /usr/bin/ " " ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 36b6c5b9ba..3e3ab72d27 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.0.4"; + version = "1.1.1"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-ocR88dgRo7dF7scATv8kPYmcK3R6a8DcoJfNHq1hZnM="; + hash = "sha256-ogj8eFkiDtjFcBb3Yip909gKBIeALsoH3LnRIjQmLMA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix index 49cbc7ab76..ac2d7e0b5f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DGTEST_SOURCE_DIR=${gtest.dev}/include" + ] ++ lib.optionals (!doCheck) [ + "-DRAPIDJSON_BUILD_TESTS=OFF" ]; checkInputs = [ @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { runHook postCheck ''; - doCheck = true; + doCheck = !stdenv.hostPlatform.isStatic; meta = with lib; { description = "Fast JSON parser/generator for C++ with both SAX/DOM style API"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix index 38a5194b1b..2e163a79d5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix @@ -36,12 +36,12 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs runtests"; doCheck = true; - checkTarget = "test"; + checkTarget = if stdenv.hostPlatform.isStatic then "static-test" else "test"; installTargets = lib.optionals stdenv.hostPlatform.isStatic [ "static-install" ]; doInstallCheck = true; - installCheckTarget = "testinstall"; + installCheckTarget = if stdenv.hostPlatform.isStatic then "static-testinstall" else "testinstall"; passthru = { updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix index a39a9b185d..7d3d7d4867 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/redis-plus-plus/default.nix @@ -8,13 +8,13 @@ assert enableShared || enableStatic; stdenv.mkDerivation rec { pname = "redis-plus-plus"; - version = "1.3.3"; + version = "1.3.5"; src = fetchFromGitHub { owner = "sewenew"; repo = "redis-plus-plus"; rev = version; - sha256 = "sha256-k4q5YbbbKKHXcL0nndzJPshzXS20ARz4Tdy5cBg7kMc="; + sha256 = "sha256-5tjadh3Ku7lrJn4tbi8TjTH6N0+QB2ER9xuO51cK/LU="; }; nativeBuildInputs = [ cmake ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/sewenew/redis-plus-plus"; description = "Redis client written in C++"; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wheelsandmetal ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix index 1954bb45f3..632ec0696e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/restinio/default.nix @@ -2,16 +2,18 @@ let pname = "restinio"; - version = "0.6.14"; + version = "0.6.16"; in fetchzip { name = "${pname}-${version}"; - url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}-full.tar.bz2"; - sha256 = "sha256-v/t3Lo1D6rHMx3GywPpEhOnHrT7JVC8n++YxpMTRfDM="; + url = "https://github.com/Stiffstream/restinio/releases/download/v.${version}/${pname}-${version}.tar.bz2"; + hash = "sha256-tl9HUsT9mCupuwp6T4dbPdYOQy3vYyctuwFQPfR8m0Y="; + stripRoot = false; postFetch = '' - mkdir -p $out/include/restinio - tar -xjf $downloadedFile --strip-components=3 -C $out/include/restinio --wildcards "*/dev/restinio" + mkdir -p $out/include + mv $out/restinio-*/dev/restinio $out/include + rm -r $out/restinio-* ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 19f755ca05..0de5fdf1b7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "7.3.1"; + version = "7.4.4"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5fh8hH6f0Mv9XQAoHYIiY019qkC5PuLS2qlE+ladWWM="; + sha256 = "sha256-34pAAqUhHQiH0YuRl6a0zdn8p6hSAIJnZXIErm3SYFE="; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix index 918626d04c..3d3193f7e1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror ] ++ lib.optionals stdenv.hostPlatform.isMips64 [ # See https://github.com/aws/s2n-tls/issues/1592 and https://github.com/aws/s2n-tls/pull/1609 diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix index d1eb096e08..102cae24ad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-core/default.nix @@ -12,10 +12,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/bpp-core/bpp-core-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix index 8ff6ad433f..c11b49aa57 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-phyl/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ bpp-core bpp-seq ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix index af5d1d00d4..4b9a62eb76 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-popgen/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ bpp-core bpp-seq ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix index ef3f3d5756..7981fb28ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/bpp-seq/default.nix @@ -15,10 +15,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ bpp-core ]; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/src - ''; - postFixup = '' substituteInPlace $out/lib/cmake/${pname}/${pname}-targets.cmake \ --replace 'set(_IMPORT_PREFIX' '#set(_IMPORT_PREFIX' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix index 15465c501b..84762414fe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/biology/elastix/default.nix @@ -24,10 +24,6 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; # usual dynamic linker issues - preCheck = " - export LD_LIBRARY_PATH=$(pwd)/bin - "; - meta = with lib; { homepage = "https://elastix.lumc.nl"; description = "Image registration toolkit based on ITK"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix index 0856168092..0534c7b46b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/xcfun/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "A library of exchange-correlation functionals with arbitrary-order derivatives"; homepage = "https://github.com/dftlibs/xcfun"; license = licenses.mpl20; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.sheepforce ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix index 88336f21ed..2413a0a25c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/arpack/default.nix @@ -36,11 +36,7 @@ stdenv.mkDerivation rec { "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}" ]; - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib:${blas}/lib:${lapack}/lib - '' else '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib - '' + '' + preCheck = '' # Prevent tests from using all cores export OMP_NUM_THREADS=2 ''; @@ -49,6 +45,10 @@ stdenv.mkDerivation rec { install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib ''; + # disable stackprotector on aarch64-darwin for now + # https://github.com/NixOS/nixpkgs/issues/127608 + hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; + meta = { homepage = "https://github.com/opencollab/arpack-ng"; description = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix index 870568c9ac..142641398f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/brial/default.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation rec { - version = "1.2.10"; + version = "1.2.11"; pname = "brial"; src = fetchFromGitHub { owner = "BRiAl"; repo = "BRiAl"; rev = version; - sha256 = "1qg6ssp87rb8p37kahxmm88fbxqg6r540cky5v7wq7l19n2b1bss"; + sha256 = "sha256-GkaeBggOCiIWNBZoIaCvAcqGDRc/whTOqPZbGpAxWIk="; }; # FIXME package boost-test and enable checks diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix index f1bdfb9836..265e09f436 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/cudnn/extension.nix @@ -85,7 +85,7 @@ final: prev: let rec { fileVersion = "10.2"; fullVersion = "8.3.2.44"; - hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo="; + 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" ]; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix new file mode 100644 index 0000000000..f2d5e29f6a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix @@ -0,0 +1,123 @@ +{ lib +, config +, fetchFromGitHub +, stdenv +, cmake +, cudaPackages +, cudaSupport ? config.cudaSupport or false +, cudaCapabilities ? [ "60" "70" "80" "86" ] +, pythonSupport ? true +, pythonPackages +, blas +, swig +, addOpenGLRunpath +, optLevel ? let + optLevels = + lib.optional stdenv.hostPlatform.avx2Support "avx2" + ++ lib.optional stdenv.hostPlatform.sse4_1Support "sse4" + ++ [ "generic" ]; + in + # Choose the maximum available optimization level + builtins.head optLevels +, faiss # To run demos in the tests +, runCommand +}: + +let + pname = "faiss"; + version = "1.7.2"; + inherit (cudaPackages) cudatoolkit; +in +stdenv.mkDerivation { + inherit pname version; + + outputs = [ "out" "demos" ]; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Tklf5AaqJbOs9qtBZVcxXPLAp+K54EViZLSOvEhmswg="; + }; + + buildInputs = [ + blas + swig + ] ++ lib.optionals pythonSupport [ + pythonPackages.setuptools + pythonPackages.pip + pythonPackages.wheel + ]; + + propagatedBuildInputs = lib.optionals pythonSupport [ + pythonPackages.numpy + ]; + + nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [ + cudatoolkit + addOpenGLRunpath + ] ++ lib.optional pythonSupport [ + pythonPackages.python + ]; + + passthru.extra-requires.all = [ + pythonPackages.numpy + ]; + + cmakeFlags = [ + "-DFAISS_ENABLE_GPU=${if cudaSupport then "ON" else "OFF"}" + "-DFAISS_ENABLE_PYTHON=${if pythonSupport then "ON" else "OFF"}" + "-DFAISS_OPT_LEVEL=${optLevel}" + ] ++ lib.optionals cudaSupport [ + "-DCMAKE_CUDA_ARCHITECTURES=${lib.concatStringsSep ";" cudaCapabilities}" + ]; + + + # pip wheel->pip install commands copied over from opencv4 + + buildPhase = '' + make -j faiss + make demo_ivfpq_indexing + '' + lib.optionalString pythonSupport '' + make -j swigfaiss + (cd faiss/python && + python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .) + ''; + + installPhase = '' + make install + mkdir -p $demos/bin + cp ./demos/demo_ivfpq_indexing $demos/bin/ + '' + lib.optionalString pythonSupport '' + mkdir -p $out/${pythonPackages.python.sitePackages} + (cd faiss/python && python -m pip install dist/*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache) + ''; + + fixupPhase = lib.optionalString (pythonSupport && cudaSupport) '' + addOpenGLRunpath $out/${pythonPackages.python.sitePackages}/faiss/*.so + addOpenGLRunpath $demos/bin/* + ''; + + passthru = { + inherit cudaSupport cudaPackages pythonSupport; + + tests = { + runDemos = runCommand "${pname}-run-demos" + { buildInputs = [ faiss.demos ]; } + # There are more demos, we run just the one that documentation mentions + '' + demo_ivfpq_indexing && touch $out + ''; + } // lib.optionalAttrs pythonSupport { + pytest = pythonPackages.callPackage ./tests.nix { }; + }; + }; + + meta = with lib; { + description = "A library for efficient similarity search and clustering of dense vectors by Facebook Research"; + homepage = "https://github.com/facebookresearch/faiss"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ SomeoneSerge ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix new file mode 100644 index 0000000000..fcf57a8bc9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, faiss +, scipy +, pytestCheckHook +}: + +assert faiss.pythonSupport; + +buildPythonPackage { + pname = "faiss-pytest-suite"; + inherit (faiss) version; + + src = "${faiss.src}/tests"; + + dontBuild = true; + dontInstall = true; + + # Tests that need GPUs and would fail in the sandbox + disabledTestPaths = lib.optionals faiss.cudaSupport [ + "test_contrib.py" + ]; + + checkInputs = [ + faiss + pytestCheckHook + scipy + ] ++ + faiss.extra-requires.all; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix index b2acbe761b..c3ff2aeebf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix @@ -39,8 +39,6 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/itpp - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/itpp ./gtests/itpp_gtests ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix index 41deec25d4..cd221e86b1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/metis/default.nix @@ -9,7 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1cjxgh41r8k6j029yxs8msp3z6lcnpm16g5pvckk35kc7zhfpykn"; }; - cmakeFlags = [ "-DGKLIB_PATH=../GKlib" ]; + cmakeFlags = [ + "-DGKLIB_PATH=../GKlib" + # remove once updated past https://github.com/KarypisLab/METIS/commit/521a2c360dc21ace5c4feb6dc0b7992433e3cb0f + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; nativeBuildInputs = [ unzip cmake ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index 048f26bc7d..e847d1decd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -18,11 +18,11 @@ assert petsc-withp4est -> p4est.mpiSupport; stdenv.mkDerivation rec { pname = "petsc"; - version = "3.17.0"; + version = "3.17.4"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "sha256-ltWspoThzhQliRpiDSeHc8JWEcsUQWWpOxdTEjjqr4o="; + sha256 = "sha256-mcEnSGcio//ZWiaLTOsJdsvyF5JsaBqWMb1yRuq4yyo="; }; mpiSupport = !withp4est || p4est.mpiSupport; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix index 7620844f8d..ebf167de8d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/scalapack/default.nix @@ -67,8 +67,6 @@ stdenv.mkDerivation rec { # Run single threaded export OMP_NUM_THREADS=1 - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index eea7c146ca..3baa53458d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "6.2.5"; + version = "7.1.2"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "sha256-N4yFlTxV+lVz70PSHPuWEEFLp0dpsImXYDLUYEo2JQI="; + sha256 = "sha256-fz8e2//bJB9SANEw29VrUeaqvmh/aSu6+ZnkMb6C40k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix new file mode 100644 index 0000000000..8e9f64885b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorrt/extension.nix @@ -0,0 +1,63 @@ +final: prev: let + + inherit (final) callPackage; + inherit (prev) cudatoolkit cudaVersion lib pkgs; + + ### TensorRT + + buildTensorRTPackage = args: + callPackage ./generic.nix { } args; + + toUnderscore = str: lib.replaceStrings ["."] ["_"] str; + + majorMinorPatch = str: lib.concatStringsSep "." (lib.take 3 (lib.splitVersion str)); + + tensorRTPackages = 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) tensorRTVersions); + # Compute versioned attribute name to be used in this package set + computeName = version: "tensorrt_${toUnderscore version}"; + # Add all supported builds as attributes + allBuilds = mapAttrs' (version: file: nameValuePair (computeName version) (buildTensorRTPackage (removeAttrs file ["fileVersionCuda"]))) supportedVersions; + # Set the default attributes, e.g. tensorrt = tensorrt_8_4; + defaultBuild = { "tensorrt" = allBuilds.${computeName tensorRTDefaultVersion}; }; + in allBuilds // defaultBuild; + + tensorRTVersions = { + "8.4.0" = [ + rec { + fileVersionCuda = "11.6"; + fileVersionCudnn = "8.3"; + fullVersion = "8.4.0.6"; + sha256 = "sha256-DNgHHXF/G4cK2nnOWImrPXAkOcNW6Wy+8j0LRpAH/LQ="; + tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz"; + supportedCudaVersions = [ "11.0" "11.1" "11.2" "11.3" "11.4" "11.5" "11.6" ]; + } + rec { + fileVersionCuda = "10.2"; + fileVersionCudnn = "8.3"; + fullVersion = "8.4.0.6"; + sha256 = "sha256-aCzH0ZI6BrJ0v+e5Bnm7b8mNltA7NNuIa8qRKzAQv+I="; + tarball = "TensorRT-${fullVersion}.Linux.x86_64-gnu.cuda-${fileVersionCuda}.cudnn${fileVersionCudnn}.tar.gz"; + supportedCudaVersions = [ "10.2" ]; + } + ]; + }; + + # Default attributes + tensorRTDefaultVersion = { + "10.2" = "8.4.0"; + "11.0" = "8.4.0"; + "11.1" = "8.4.0"; + "11.2" = "8.4.0"; + "11.3" = "8.4.0"; + "11.4" = "8.4.0"; + "11.5" = "8.4.0"; + "11.6" = "8.4.0"; + }.${cudaVersion}; + +in tensorRTPackages diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorrt/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorrt/generic.nix new file mode 100644 index 0000000000..3447087051 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/tensorrt/generic.nix @@ -0,0 +1,90 @@ +{ lib +, stdenv +, requireFile +, autoPatchelfHook +, autoAddOpenGLRunpathHook +, cudaVersion +, cudatoolkit +, cudnn +}: + +{ fullVersion +, fileVersionCudnn +, tarball +, sha256 +, supportedCudaVersions ? [ ] +}: + +assert lib.assertMsg (lib.strings.versionAtLeast cudnn.version fileVersionCudnn) + "This version of TensorRT requires at least cuDNN ${fileVersionCudnn} (current version is ${cudnn.version})"; + +stdenv.mkDerivation rec { + pname = "cudatoolkit-${cudatoolkit.majorVersion}-tensorrt"; + version = fullVersion; + src = requireFile rec { + name = tarball; + inherit sha256; + message = '' + To use the TensorRT derivation, you must join the NVIDIA Developer Program and + download the ${version} Linux x86_64 TAR package for CUDA ${cudaVersion} from + ${meta.homepage}. + + Once you have downloaded the file, add it to the store with the following + command, and try building this derivation again. + + $ nix-store --add-fixed sha256 ${name} + ''; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ + autoPatchelfHook + autoAddOpenGLRunpathHook + ]; + + # Used by autoPatchelfHook + buildInputs = [ + cudatoolkit.cc.cc.lib # libstdc++ + cudatoolkit + cudnn + ]; + + sourceRoot = "TensorRT-${version}"; + + installPhase = '' + install --directory "$dev" "$out" + mv include "$dev" + mv targets/x86_64-linux-gnu/lib "$out" + install -D --target-directory="$out/bin" targets/x86_64-linux-gnu/bin/trtexec + ''; + + # Tell autoPatchelf about runtime dependencies. + # (postFixup phase is run before autoPatchelfHook.) + postFixup = + let + mostOfVersion = builtins.concatStringsSep "." + (lib.take 3 (lib.versions.splitVersion version)); + in + '' + echo 'Patching RPATH of libnvinfer libs' + patchelf --debug --add-needed libnvinfer.so \ + "$out/lib/libnvinfer.so.${mostOfVersion}" \ + "$out/lib/libnvinfer_plugin.so.${mostOfVersion}" \ + "$out/lib/libnvinfer_builder_resource.so.${mostOfVersion}" + ''; + + 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 = "TensorRT: a high-performance deep learning interface"; + homepage = "https://developer.nvidia.com/tensorrt"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aidalgol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix index 1c29b85beb..a52751af71 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sentry-native/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.4.15"; + version = "0.4.18"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-XHJa4erDxSFiy0u8S9ODQlMNDb1wrz+d1PzWeq5BZLY="; + sha256 = "sha256-2WNmpx6ReVmsRvKHAaZznGuugvmLxK25P1WdmorNj/g="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index 9255889c69..a29706aefc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix @@ -35,11 +35,6 @@ stdenv.mkDerivation rec { sed -e '/freetype freetype.c/d' -i ../tests/examples/CMakeLists.txt ''; - preCheck = '' - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src/ - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src/ - ''; - doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix index 56b76ba887..d8934a1ebf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simdjson/default.nix @@ -2,20 +2,20 @@ stdenv.mkDerivation rec { pname = "simdjson"; - version = "1.0.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "simdjson"; repo = "simdjson"; rev = "v${version}"; - sha256 = "sha256-WuqBR1/Iqly+Y8kJxTuZLTVkR3ltXdyr+/6J3zhBNkQ="; + sha256 = "sha256-PU6yTA2FXHcuSwr6oIU+cP7uYxkgggnj3FV2LbkS69w="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DSIMDJSON_JUST_LIBRARY=ON" - ] ++ lib.optional stdenv.hostPlatform.isStatic "-DSIMDJSON_BUILD_STATIC=ON"; + "-DSIMDJSON_DEVELOPER_MODE=OFF" + ] ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; meta = with lib; { homepage = "https://simdjson.org/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix index 9573afda0b..71a3b7ffee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/simpleitk/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "simpleitk"; - version = "2.1.1"; + version = "2.1.1.2"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "SimpleITK"; repo = "SimpleITK"; rev = "v${version}"; - sha256 = "0ShUo9UVkliROIIR5bJtqlzESByfq9SQ1+Hy/40vJ50="; + sha256 = "sha256-sokJXOz6p+0eTeps5Tt24pjB3u+L1s6mDlaWN7K9m3g="; }; nativeBuildInputs = [ cmake swig4 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/snappy/default.nix b/third_party/nixpkgs/pkgs/development/libraries/snappy/default.nix index 797db5b69b..7d70c500df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/snappy/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/snappy/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DSNAPPY_BUILD_TESTS=OFF" "-DSNAPPY_BUILD_BENCHMARKS=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix index 39b2d7fd8f..83442035d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix @@ -4,13 +4,13 @@ with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "5.5.1"; + version = "5.7.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "sha256-w78YO5EQWtEiySOm9NpPbaMChbJppNBoZNOBs9fibbM="; + sha256 = "sha256-mS685NOB6IN3a5tE3yr+VUq55Ouc5af9aJ2wTfGsAlo="; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix index 5a21af12e3..9c61ef7062 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spdlog/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 }: +{ lib, stdenv, fetchFromGitHub, cmake, fmt_8 +, staticBuild ? stdenv.hostPlatform.isStatic +}: let generic = { version, sha256 }: @@ -18,8 +20,8 @@ let propagatedBuildInputs = lib.optional (lib.versionAtLeast version "1.3") fmt_8; cmakeFlags = [ - "-DSPDLOG_BUILD_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DSPDLOG_BUILD_STATIC=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}" + "-DSPDLOG_BUILD_SHARED=${if staticBuild then "OFF" else "ON"}" + "-DSPDLOG_BUILD_STATIC=${if staticBuild then "ON" else "OFF"}" "-DSPDLOG_BUILD_EXAMPLE=OFF" "-DSPDLOG_BUILD_BENCH=OFF" "-DSPDLOG_BUILD_TESTS=ON" @@ -36,11 +38,6 @@ let ''; doCheck = true; - preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH="$(pwd)''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" - '' else '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; meta = with lib; { description = "Very fast, header only, C++ logging library"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix index db5db61c6e..7a647084f9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spice-gtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , acl , cyrus_sasl @@ -33,7 +34,7 @@ , vala , wayland-protocols , zlib -, withPolkit ? true +, withPolkit ? stdenv.isLinux }: # If this package is built with polkit support (withPolkit=true), @@ -59,13 +60,13 @@ stdenv.mkDerivation rec { pname = "spice-gtk"; - version = "0.40"; + version = "0.41"; outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "https://www.spice-space.org/download/gtk/${pname}-${version}.tar.xz"; - sha256 = "sha256-I/X/f6gLdWR85zzaXq+LMi80Mtu7f286g5Y0YYrbztM="; + sha256 = "sha256-2Pi1y+qRhHAu64zCdqZ9cqzbbjbnxzNJ+4RF5byglp8="; }; postPatch = '' @@ -95,7 +96,8 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good ]; buildInputs = [ @@ -104,8 +106,6 @@ stdenv.mkDerivation rec { gtk3 json-glib libcacard - libcap_ng - libdrm libjpeg_turbo libopus libusb1 @@ -115,9 +115,15 @@ stdenv.mkDerivation rec { pixman spice-protocol usbredir - wayland-protocols zlib - ] ++ lib.optionals withPolkit [ polkit acl ] ; + ] ++ lib.optionals withPolkit [ + polkit + acl + ] ++ lib.optionals stdenv.isLinux [ + libcap_ng + libdrm + wayland-protocols + ]; PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; @@ -126,6 +132,8 @@ stdenv.mkDerivation rec { "-Dusb-ids-path=${hwdata}/share/hwdata/usb.ids" ] ++ lib.optionals (!withPolkit) [ "-Dpolkit=disabled" + ] ++ lib.optionals (!stdenv.isLinux) [ + "-Dlibcap-ng=disabled" ]; meta = with lib; { @@ -140,6 +148,6 @@ stdenv.mkDerivation rec { homepage = "https://www.spice-space.org/"; license = licenses.lgpl21; maintainers = [ maintainers.xeji ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix index 77ce108e26..0c90d2a706 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "sqlite${optionalString interactive "-interactive"}"; - version = "3.39.0"; + version = "3.39.2"; # nixpkgs-update: no auto update # NB! Make sure to update ./tools.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2022/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "sha256-6QvK723VgT/N7k6Gf2tl88m/0K7A8QF/nzu84eTtCeI="; + sha256 = "sha256-hSvophg6F7pHzuC7/3QAt6pa/9KDvzvu/DT80IiiOd4="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix index e3aaf44995..1d559dcb38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix @@ -4,12 +4,12 @@ let archiveVersion = import ./archive-version.nix lib; mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec { inherit pname; - version = "3.39.0"; + version = "3.39.2"; # nixpkgs-update: no auto update src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2022/sqlite-src-${archiveVersion version}.zip"; - sha256 = "sha256-s1hfN90Qbbs9RsjBei0nX5pLh9+MRQm9LWpbQAMkJuY="; + sha256 = "sha256-6TPXcAD0Xz+8hgXwBQWGowE1Bajem0QDK9AO1y8VhvA="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix index 22a97d890e..fee0cb4216 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenv, fetchFromGitHub, copyPkgconfigItems, makePkgconfigItem }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "stb"; version = "unstable-2021-09-10"; @@ -11,11 +11,28 @@ stdenv.mkDerivation { sha256 = "0qq35cd747lll4s7bmnxb3pqvyp2hgcr9kyf758fax9lx76iwjhr"; }; + nativeBuildInputs = [ copyPkgconfigItems ]; + + pkgconfigItems = [ + (makePkgconfigItem rec { + name = "stb"; + version = "1"; + cflags = [ "-I${variables.includedir}/stb" ]; + variables = rec { + prefix = "${placeholder "out"}"; + includedir = "${prefix}/include"; + }; + inherit (meta) description; + }) + ]; + dontBuild = true; installPhase = '' + runHook preInstall mkdir -p $out/include/stb cp *.h $out/include/stb/ + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix index ed2819e88c..64746d8457 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation rec { pname = "tachyon"; - version = "0.99.4"; + version = "0.99.5"; src = fetchurl { url = "http://jedi.ks.uiuc.edu/~johns/tachyon/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-vJvDHhLDp5rpH9KhXUtQaqfjyai0e3NMKOEkbhYuaA0="; + sha256 = "sha256-CSA8ECMRFJ9d9cw2dAn5bHJXQmZtGcJNtbqZTVqBpvU="; }; buildInputs = lib.optionals stdenv.isDarwin [ Carbon diff --git a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix index 1d739810e9..4617614b25 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tbb/default.nix @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { url = "https://github.com/oneapi-src/oneTBB/pull/833/commits/c18342ba667d1f33f5e9a773aa86b091a9694b97.patch"; sha256 = "ZUExE3nsW80Z5GPWZnDNuDiHHaD1EF7qNl/G5M+Wcxg="; }) + + # Fixes build for aarch64-darwin + (fetchurl { + name = "aarch64-darwin.patch"; + url = "https://github.com/oneapi-src/oneTBB/pull/258/commits/86f6dcdc17a8f5ef2382faaef860cfa5243984fe.patch"; + sha256 = "sha256-JXqrFPCb3q1vfxk752tQu7HhApCB4YH2LoVnGRwmspk="; + }) ]; nativeBuildInputs = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/termcolor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/termcolor/default.nix index 3d94583412..fbae29f4ca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/termcolor/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/termcolor/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "termcolor"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "ikalnytskyi"; repo = "termcolor"; rev = "v${version}"; - sha256 = "sha256-W0hB+lFJ2sm7DsbOzITOtjJuntSM55BfwUunOOS4RcA="; + sha256 = "sha256-2RXQ8sn2VNhQ2WZfwCCeQuM6x6C+sLA6ulAaFtaDMZw="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix index cd127b4b0e..a4ae0a99f9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -66,6 +66,11 @@ stdenv.mkDerivation rec { url = "https://github.com/apache/thrift/commit/54765854873e19b8ba50a0ec8080dd92d8323851.diff"; sha256 = "wnG2MjY0DtAhVcEdcxu77tDa4T9Xm2pMYZU2wXLx2OA="; }) + (fetchpatch { + name = "setuptools-gte-62.1.0.patch"; + url = "https://github.com/apache/thrift/pull/2635/commits/c41ad9d5119e9bdae1746167e77e224f390f2c42.patch"; + hash = "sha256-FkErrg/6vXTomS4AsCsld7t+Iccc55ZiDaNjJ3W1km0="; + }) ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix index 1e2eea7ac8..c576405bb3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tinyxml-2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple, small, efficient, C++ XML parser"; - homepage = "http://www.grinninglizard.com/tinyxml2/index.html"; + homepage = "https://www.grinninglizard.com/tinyxml2/index.html"; platforms = lib.platforms.unix; license = lib.licenses.zlib; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix index ab7808b474..fc90c6e304 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tkrzw/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "tkrzw"; - version = "1.0.21"; + version = "1.0.24"; # TODO: defeat multi-output reference cycles src = fetchurl { url = "https://dbmx.net/tkrzw/pkg/tkrzw-${version}.tar.gz"; - hash = "sha256-1g3sIRXxYtD8XGVNpbn4HLTCi+xl2yfJklbUouMQcHs="; + hash = "sha256-G7SVKgU4b8I5iwAlGHL/w8z0fhI+Awe3V6aqFsOnUrA="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix index ed957f9577..e5cdad0aae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tllist/default.nix @@ -5,16 +5,16 @@ , ninja }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "tllist"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "tllist"; - rev = version; - sha256 = "wJEW7haQBtCR2rffKOFyqH3aq0eBr6H8T6gnBs2bNRg="; + rev = finalAttrs.version; + hash = "sha256-4WW0jGavdFO3LX9wtMPzz3Z1APCPgUQOktpmwAM0SQw="; }; nativeBuildInputs = [ meson ninja ]; @@ -38,9 +38,8 @@ stdenv.mkDerivation rec { primitive data types are supported as well as aggregated ones such as structs, enums and unions. ''; - license = licenses.mit; maintainers = with maintainers; [ fionera AndersonTorres ]; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix index 835f38ff50..e8d6ed82ed 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tracker/default.nix @@ -25,27 +25,28 @@ , json-glib , systemd , dbus +, writeText }: stdenv.mkDerivation rec { pname = "tracker"; - version = "3.3.1"; + version = "3.3.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "Wtb1vJd4Hr9V7NaUfNSuf/QZJRZYDRC9g4Dx3UcZbtI="; + sha256 = "DtK5iRiVbW8WQpxgfdihTIT02gpIlw/S64yTq6PPmRM="; }; - patches = [ - ./fix-test-order.patch - ]; - postPatch = '' patchShebangs utils/data-generators/cc/generate ''; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ meson ninja @@ -58,13 +59,11 @@ stdenv.mkDerivation rec { gobject-introspection docbook-xsl-nons docbook_xml_dtd_45 - python3 # for data-generators - systemd # used for checks to install systemd user service - dbus # used for checks and pkg-config to install dbus service/s - ] ++ checkInputs; # gi is in the main meson.build and checked regardless of - # whether tests are enabled + (python3.pythonForBuild.withPackages (p: [ p.pygobject3 ])) + ]; buildInputs = [ + gobject-introspection glib libxml2 sqlite @@ -74,29 +73,47 @@ stdenv.mkDerivation rec { libuuid json-glib libstemmer - ]; - - checkInputs = with python3.pkgs; [ - pygobject3 + dbus + ] ++ lib.optionals stdenv.isLinux [ + systemd ]; mesonFlags = [ "-Ddocs=true" + ] ++ ( + let + # https://gitlab.gnome.org/GNOME/tracker/-/blob/master/meson.build#L159 + crossFile = writeText "cross-file.conf" '' + [properties] + sqlite3_has_fts5 = '${lib.boolToString (lib.hasInfix "-DSQLITE_ENABLE_FTS3" sqlite.NIX_CFLAGS_COMPILE)}' + ''; + in + [ + "--cross-file=${crossFile}" + ] + ) ++ lib.optionals (!stdenv.isLinux) [ + "-Dsystemd_user_services=false" ]; doCheck = true; - preCheck = '' - # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file - export HOME=$(mktemp -d) + preCheck = + let + linuxDot0 = lib.optionalString stdenv.isLinux ".0"; + darwinDot0 = lib.optionalString stdenv.isDarwin ".0"; + extension = stdenv.hostPlatform.extensions.sharedLibrary; + in + '' + # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file + export HOME=$(mktemp -d) - # Our gobject-introspection patches make the shared library paths absolute - # in the GIR files. When running functional tests, the library is not yet installed, - # though, so we need to replace the absolute path with a local one during build. - # We are using a symlink that will be overridden during installation. - mkdir -p $out/lib - ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0.so $out/lib/libtracker-sparql-3.0.so.0 - ''; + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running functional tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/src/libtracker-sparql/libtracker-sparql-3.0${darwinDot0}${extension} $out/lib/libtracker-sparql-3.0${darwinDot0}${extension}${linuxDot0} + ''; checkPhase = '' runHook preCheck @@ -126,6 +143,6 @@ stdenv.mkDerivation rec { description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/tracker/fix-test-order.patch b/third_party/nixpkgs/pkgs/development/libraries/tracker/fix-test-order.patch deleted file mode 100644 index baa15b18ab..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/tracker/fix-test-order.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/tests/libtracker-data/algebra/filter-scope-1.rq b/tests/libtracker-data/algebra/filter-scope-1.rq -index 7ee5a24ad..a8cd89ca9 100644 ---- a/tests/libtracker-data/algebra/filter-scope-1.rq -+++ b/tests/libtracker-data/algebra/filter-scope-1.rq -@@ -7,3 +7,4 @@ SELECT ?v ?w ?v2 - OPTIONAL { :x :p ?v2 FILTER(?v = 1) } - } - } -+ORDER BY ?v ?w ?v2 diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix index 0dc79d47dd..4c17288685 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "ucx"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "08ajhbhzwkfzhkhswk56zx17q18ii67dg1ca1f5grl9qjgj3mmyw"; + sha256 = "sha256-DWiOmqxBAAH8DE7H0teoKyp+m3wYEo652ac7ey43Erg="; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix index fc0b4a42b5..da0554d49e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/udns/default.nix @@ -16,7 +16,20 @@ stdenv.mkDerivation rec { sha256 = "0447fv1hmb44nnchdn6p5pd9b44x8p5jn0ahw6crwbqsg7f0hl8i"; }; + # 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 ""; + installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/include mkdir -p $out/lib @@ -30,6 +43,7 @@ stdenv.mkDerivation rec { ln -rs $out/lib/libudns.so.0 $out/lib/libudns.so cp dnsget.1 rblcheck.1 $out/share/man/man1 cp udns.3 $out/share/man/man3 + runHook postInstall ''; # keep man3 @@ -40,7 +54,7 @@ stdenv.mkDerivation rec { description = "Async-capable DNS stub resolver library"; license = licenses.lgpl21Plus; maintainers = [ maintainers.womfoo ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix index a389d204a8..1d34c21d38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix @@ -8,6 +8,7 @@ , libgudev , libpcap , meson +, mesonEmulatorHook , ninja , pkg-config , python3 @@ -19,13 +20,13 @@ stdenv.mkDerivation rec { pname = "umockdev"; - version = "0.17.9"; + version = "0.17.13"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://github.com/martinpitt/umockdev/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-FEmWjJVmKKckC30zULGI/mZ3VNtirnweZq2gKh/Y5VE="; + sha256 = "sha256-bG6/bmIJtqSXRuDZGkSNAntUJxurgu1woTLs8pTKE88="; }; patches = [ @@ -42,9 +43,12 @@ stdenv.mkDerivation rec { ninja pkg-config vala + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; buildInputs = [ + gobject-introspection glib systemd libgudev diff --git a/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix b/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix index 60f532b977..797c32cb6d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/usbredir/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://www.spice-space.org/usbredir.html"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix index ec8dab3f90..7e3471eefa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/utf8proc/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DUTF8PROC_ENABLE_TESTING=ON" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/uthenticode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uthenticode/default.nix index c342ee4d70..06579c2d47 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uthenticode/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uthenticode/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uthenticode"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "trailofbits"; repo = "uthenticode"; rev = "v${version}"; - hash = "sha256-H4fAHZM+vYaUkXZE4f7r2bxw9dno7O+lYrqQ9/6YPWA="; + hash = "sha256-MEpbvt03L501BP42j6S7rXE9j1d8j6D2Y5kgPNlbHzc="; }; cmakeFlags = [ "-DBUILD_TESTS=1" "-DUSE_EXTERNAL_GTEST=1" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix index 8734308af9..342bb32e56 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vte/default.nix @@ -78,6 +78,9 @@ stdenv.mkDerivation rec { mesonFlags = lib.optionals (!systemdSupport) [ "-D_systemd=false" + ] ++ lib.optionals stdenv.isDarwin [ + # -Bsymbolic-functions is not supported on darwin + "-D_b_symbolic_functions=false" ]; postPatch = '' @@ -98,7 +101,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix index eb58e0d54f..43c6ded8a5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/vtk/generic.nix @@ -53,10 +53,6 @@ in stdenv.mkDerivation rec { patches = map fetchpatch patchesToFetch; - preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/lib"; - ''; - dontWrapQtApps = true; # Shared libraries don't work, because of rpath troubles with the current diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch b/third_party/nixpkgs/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch deleted file mode 100644 index f6745e6f94..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/0001-add-placeholder-for-nm.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 378623b0e39b12bb04d3a3a1e08e64b31bd7d99d Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Fri, 27 Nov 2020 10:22:20 +0100 -Subject: [PATCH] add placeholder for @nm@ - ---- - egl/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/egl/meson.build b/egl/meson.build -index dee9b1d..e477546 100644 ---- a/egl/meson.build -+++ b/egl/meson.build -@@ -11,7 +11,7 @@ wayland_egl = library( - - executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c') - --nm_path = find_program('nm').path() -+nm_path = find_program('@nm@').path() - - test( - 'wayland-egl symbols check', --- -2.29.2 - diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/add-placeholder-for-nm.patch b/third_party/nixpkgs/pkgs/development/libraries/wayland/add-placeholder-for-nm.patch new file mode 100644 index 0000000000..dbc63028b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/add-placeholder-for-nm.patch @@ -0,0 +1,13 @@ +diff --git a/egl/meson.build b/egl/meson.build +index b3cbdf3..cdc15ca 100644 +--- a/egl/meson.build ++++ b/egl/meson.build +@@ -11,7 +11,7 @@ wayland_egl = library( + + executable('wayland-egl-abi-check', 'wayland-egl-abi-check.c') + +-nm_path = find_program('nm').full_path() ++nm_path = find_program('@nm@').full_path() + + test( + 'wayland-egl symbols check', diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix index ee897d6414..ac434b795a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , substituteAll , meson , pkg-config @@ -30,16 +29,16 @@ let in stdenv.mkDerivation rec { pname = "wayland"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "09c7rpbwavjg4y16mrfa57gk5ix6rnzpvlnv1wp7fnbh9hak985q"; + url = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; + sha256 = "1b0ixya9bfw5c9jx8mzlr7yqnlyvd3jv5z8wln9scdv8q5zlvikd"; }; patches = [ (substituteAll { - src = ./0001-add-placeholder-for-nm.patch; + src = ./add-placeholder-for-nm.patch; nm = "${stdenv.cc.targetPrefix}nm"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix index 61696d232f..5fca71ebf0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "wayland-protocols"; - version = "1.25"; + version = "1.26"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; src = fetchurl { url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0q0laxdvf8p8b7ks2cbpqf6q0rwrjycqrp8pf8rxm86hk5qhzzzi"; + sha256 = "04vgllmpmrv14x3x64ns01vgwx4hriljayjkz9idgbv83i63hly5"; }; postPatch = lib.optionalString doCheck '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix index 4ffbf24ad2..77cd8985c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.36.4"; + version = "2.36.6"; outputs = [ "out" "dev" ]; @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-tr6+H4WkedlowZ5EpHBGIu+M72FjatGyQGt30Wri4qg="; + sha256 = "sha256-EZO8ghlGM2d28N+l4NylZR8eVxV+2hLaRyHSRB8kpho="; }; patches = lib.optionals stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix index b6064c42b5..69fc38c9a7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wiredtiger/default.nix @@ -7,13 +7,6 @@ with lib; let - mkFlag = trueStr: falseStr: cond: name: val: "--" - + (if cond then trueStr else falseStr) - + name - + optionalString (val != null && cond != false) "=${val}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optLz4 = shouldUsePkg lz4; @@ -39,19 +32,19 @@ stdenv.mkDerivation rec { buildInputs = [ optLz4 optSnappy optZlib optBzip2 optDb optGperftools optLeveldb ]; configureFlags = [ - (mkWith false "attach" null) - (mkWith true "builtins" "") - (mkEnable (optBzip2 != null) "bzip2" null) - (mkEnable false "diagnostic" null) - (mkEnable false "java" null) - (mkEnable (optLeveldb != null) "leveldb" null) - (mkEnable false "python" null) - (mkEnable (optSnappy != null) "snappy" null) - (mkEnable (optLz4 != null) "lz4" null) - (mkEnable (optGperftools != null) "tcmalloc" null) - (mkEnable (optZlib != null) "zlib" null) - (mkWith (optDb != null) "berkeleydb" optDb) - (mkWith false "helium" null) + (withFeature false "attach") + (withFeatureAs true "builtins" "") + (enableFeature (optBzip2 != null) "bzip2") + (enableFeature false "diagnostic") + (enableFeature false "java") + (enableFeature (optLeveldb != null) "leveldb") + (enableFeature false "python") + (enableFeature (optSnappy != null) "snappy") + (enableFeature (optLz4 != null) "lz4") + (enableFeature (optGperftools != null) "tcmalloc") + (enableFeature (optZlib != null) "zlib") + (withFeatureAs (optDb != null) "berkeleydb" optDb) + (withFeature false "helium") ]; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix index 0ae563f8b1..02e7e1d800 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "5.3.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "sha256-KteArWAgDohlqEYaNfzLPuBn6uy5ABA8vV/LRCVIPGA="; + sha256 = "sha256-5a83Mi+S+mASdZ6O2+0I+qulsF6yNUe80a3qZvWmXHw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix index dc2b1c40c6..df248f6b4d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { preConfigure = lib.optionalString (stdenv.buildPlatform.isx86_64 || stdenv.hostPlatform.isi686) '' # `AS' is set to the binutils assembler, but we need nasm unset AS - '' + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) '' + '' + lib.optionalString stdenv.hostPlatform.isAarch '' export AS=$CC ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix index c8706c737b..329fe71e19 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.14.4"; + version = "1.14.6"; outputs = [ "out" "installedTests" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "///X0inMi9Znuhjn9n0HlVLa5/kFWpKorKS8RY9WeYM="; + sha256 = "sha256-MD1zjKDWwvVTui0nYPgvVjX48DaHWcP7Q10vDrNKYz0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 187e6900aa..e4c0e57e76 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -4,11 +4,11 @@ lib.fix (self: stdenv.mkDerivation rec { pname = "xmlsec"; - version = "1.2.33"; + version = "1.2.34"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "sha256-JgQdNaIKJF7Vovue4HXxCCVmTSdCIMtRkDQPqHpNCTE="; + sha256 = "sha256-Us7UlD81vX0IGKOCmMFSjKSsilRED9cRNKB9LRNwomI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix b/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix index 9dd5548230..9ab0f5db74 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/yder/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.15"; + version = "1.4.17"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "sha256-hPAL1UngodNbQCCdKulaF5faI0JOjmWdz3q8oyPH7C4="; + sha256 = "sha256-4o1sKxlWeAgZZm01sPV2yIR3xXZwzPJwqcGCkz6+Cfc="; }; patches = [ @@ -39,11 +39,6 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH="$(pwd)''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export DYLD_FALLBACK_LIBRARY_PATH="$(pwd):$DYLD_FALLBACK_LIBRARY_PATH" - ''; - meta = with lib; { description = "Logging library for C applications"; homepage = "https://github.com/babelouest/yder"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch b/third_party/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch index 61a67c5897..f68ce2a021 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/yder/fix-pkgconfig.patch @@ -1,9 +1,13 @@ ---- i/libyder.pc.in -+++ w/libyder.pc.in +--- a/libyder.pc.in ++++ b/libyder.pc.in @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ +-libdir=@PKGCONFIG_TARGET_LIBDIR@ +-includedir=@PKGCONFIG_TARGET_INCLUDES@ +libdir=@CMAKE_INSTALL_LIBDIR@ -+includedir=@CMAKE_INSTALL_INCLUDEDIR@ ++includedir=@CMAKE_INSTALL_LIBDIR@ + + Name: @PROJECT_NAME@ + Description: @PROJECT_DESCRIPTION@ + diff --git a/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix index 50b23a1d99..815326e538 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zchunk"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "zchunk"; repo = pname; rev = version; - hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4="; + hash = "sha256-/gtkw020pybUDUeYydXgJ4PLvdOqZ0RbrLOfNMDaCmA="; }; # unbreak on darwin by finding argp-standalone, based on the patch from diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix index b60168a6f5..4eef03c4a6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix @@ -54,6 +54,9 @@ in stdenv.mkDerivation rec { # these tests require network access so we need to skip them. brokenTests = map escapeRegex [ "Ice/udp" "Glacier2" "IceGrid/simple" "IceStorm" "IceDiscovery/simple" + + # FIXME: certificate expired, remove for next release? + "IceSSL/configuration" ]; # matches CONFIGS flag in makeFlagsArray configFlag = optionalString cpp11 "--config=cpp11-shared"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix index e74bb9ddc3..528d545c37 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zxcvbn-c/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zxcvbn-c"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "tsyrogit"; repo = "zxcvbn-c"; rev = "v${version}"; - sha256 = "12ksdnpxlqlmg9zhyyk3bspcf0sfj5zk735vr4ry635qi7gzcaas"; + sha256 = "sha256-RKqbv0iGkjS7Y7KikqglZ+AK1oiw4G1mB2Zg87tOlbI="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix index 514ebe9975..126ef2bc69 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zxing-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "zxing-cpp"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "nu-book"; repo = pname; rev = "v${version}"; - hash = "sha256-M565VNKhSmYFmCMEI9UFuHWNZWeHrf9qzZkMAw9LUr4="; + hash = "sha256-MTu8tvJXpo6+Z0aSIZ27nmerNtNBOwnL/jDkGedIiM8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix index 22570d3fbb..e20f45df46 100644 --- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix @@ -1161,6 +1161,40 @@ buildLuarocksPackage { }; }) {}; +lua-protobuf = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "lua-protobuf"; + version = "0.4.0-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/lua-protobuf-0.4.0-1.rockspec"; + sha256 = "053r6z37847wm1xaxv5rwplmdqkp507qawgd382z0l7m05f06ls9"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/starwing/lua-protobuf.git", + "rev": "832facd266366cd86ee9bf41d35327255d0033f2", + "date": "2022-07-27T14:34:12+08:00", + "path": "/nix/store/g68x4cbi6ssd5zak14r5cbi7k88d3ml9-lua-protobuf", + "sha256": "0ynfq0va4w8zlr67ld6v9nmi5mnvchfygd8h5jbwk2vzlj9hg2yw", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/starwing/lua-protobuf"; + description = "protobuf data support for Lua"; + maintainers = with lib.maintainers; [ lockejan ]; + license.fullName = "MIT"; + }; +}) {}; + lua-resty-http = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, lua }: @@ -1323,6 +1357,37 @@ buildLuarocksPackage { }; }) {}; +lua-subprocess = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "subprocess"; + version = "scm-1"; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/0x0ade/lua-subprocess.git", + "rev": "bfa8e97da774141f301cfd1106dca53a30a4de54", + "date": "2021-01-09T22:31:54+01:00", + "path": "/nix/store/3lr7n1k85kbf718wxr51xd40i8dfs5qd-lua-subprocess", + "sha256": "0p91hda0b0hpgdbff5drcyygaizq086gw8vnvzn0y0fg3mc9if70", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/xlq/lua-subprocess"; + description = "A Lua module written in C that allows you to create child processes and communicate with them."; + maintainers = with lib.maintainers; [ scoder12 ]; + license.fullName = "MIT"; + }; +}) {}; + lua-term = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchurl}: buildLuarocksPackage { @@ -2138,6 +2203,32 @@ buildLuarocksPackage { }; }) {}; +luaunit = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchurl, lua +}: +buildLuarocksPackage { + pname = "luaunit"; + version = "3.4-1"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/luaunit-3.4-1.rockspec"; + sha256 = "111435fa8p2819vcvg76qmknj0wqk01gy9d1nh55c36616xnj54n"; + }).outPath; + src = fetchurl { + url = "https://github.com/bluebird75/luaunit/releases/download/LUAUNIT_V3_4/rock-luaunit-3.4.zip"; + sha256 = "1v8nkiwz2nr242h5cl4af6vmn5gxmn94skps1qhb55ak60j20nvr"; + }; + + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua lua ]; + + meta = { + 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 }: @@ -2546,6 +2637,39 @@ buildLuarocksPackage { }; }) {}; +serpent = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast +, fetchgit, lua +}: +buildLuarocksPackage { + pname = "serpent"; + version = "0.30-2"; + knownRockspec = (fetchurl { + url = "mirror://luarocks/serpent-0.30-2.rockspec"; + sha256 = "0v83lr9ars1n0djbh7np8jjqdhhaw0pdy2nkcqzqrhv27rzv494n"; + }).outPath; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/pkulchenko/serpent", + "rev": "d78683597606c6e13a1fed039bc91d86eb8f600f", + "date": "2017-09-01T21:35:14-07:00", + "path": "/nix/store/z6df44n3p07n4bia7s514vgngbkbpnap-serpent", + "sha256": "0q80yfrgqgr01qprf0hrp284ngb7fbcq1v9rbzmdkhbm9lpgy8v8", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; + + disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.5"); + propagatedBuildInputs = [ lua ]; + + meta = { + homepage = "https://github.com/pkulchenko/serpent"; + description = "Lua serializer and pretty printer"; + license.fullName = "MIT"; + }; +}) {}; + sqlite = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast , fetchgit, luv }: diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix b/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix new file mode 100644 index 0000000000..6605202f6b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lua-modules/nfd/default.nix @@ -0,0 +1,41 @@ +{ fetchFromGitHub, buildLuarocksPackage, lua, maintainers, pkg-config +, substituteAll, zenity }: + +buildLuarocksPackage { + pname = "nfd"; + version = "scm-1"; + + src = fetchFromGitHub { + owner = "Vexatos"; + repo = "nativefiledialog"; + rev = "2f74a5758e8df9b27158d444953697bc13fe90d8"; + sha256 = "1f52mb0s9zrpsqjp10bx92wzqmy1lq7fg1fk1nd6xmv57kc3b1qv"; + fetchSubmodules = true; + }; + + # use zenity because default gtk impl just crashes + patches = [ + (substituteAll { + src = ./zenity.patch; + inherit zenity; + }) + ]; + rockspecDir = "lua"; + + extraVariables.LUA_LIBDIR = "${lua}/lib"; + nativeBuildInputs = [ pkg-config ]; + + fixupPhase = '' + find $out -name nfd_zenity.so -execdir mv {} nfd.so \; + ''; + + disabled = with lua; (luaversion != "5.1"); + + meta = { + description = + "A tiny, neat lua library that portably invokes native file open and save dialogs."; + homepage = "https://github.com/Alloyed/nativefiledialog/tree/master/lua"; + license.fullName = "zlib"; + maintainers = [ maintainers.scoder12 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/nfd/zenity.patch b/third_party/nixpkgs/pkgs/development/lua-modules/nfd/zenity.patch new file mode 100644 index 0000000000..59a91e0e54 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/lua-modules/nfd/zenity.patch @@ -0,0 +1,47 @@ +diff --git a/lua/Makefile.linux b/lua/Makefile.linux +index 9f5aa68..77660d4 100644 +--- a/lua/Makefile.linux ++++ b/lua/Makefile.linux +@@ -37,5 +37,5 @@ nfd_zenity.o: src/nfd_zenity.c + clean: + rm nfd_common.o nfd_gtk.o nfd_wrap_lua.o nfd.so + +-install: nfd.so +- cp nfd.so $(INST_LIBDIR) ++install: ++ cp nfd*.so $(INST_LIBDIR) +diff --git a/lua/nfd-scm-1.rockspec b/lua/nfd-scm-1.rockspec +index 503399d..2d0a7da 100644 +--- a/lua/nfd-scm-1.rockspec ++++ b/lua/nfd-scm-1.rockspec +@@ -17,9 +17,6 @@ supported_platforms = { "linux", "macosx", "windows" } + external_dependencies = { + platforms = { + linux = { +- gtk3 = { +- library = "gtk-3", +- } + } + } + } +@@ -28,6 +25,7 @@ build = { + linux = { + type = "make", + makefile = "lua/Makefile.linux", ++ build_target = "nfd_zenity.so", + build_variables = { + CFLAGS="$(CFLAGS)", + LIBFLAG="$(LIBFLAG)", +diff --git a/src/nfd_zenity.c b/src/nfd_zenity.c +index 43ccc6d..3fcdea0 100644 +--- a/src/nfd_zenity.c ++++ b/src/nfd_zenity.c +@@ -109,6 +109,8 @@ ZenityCommon(char** command, + command[i] = tmp; + } + ++ // caller always sets command[0] to "zenity" ++ command[0] = strdup("@zenity@/bin/zenity"); + AddFiltersToCommandArgs(command, commandLen, filterList); + + int byteCount = 0; diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/README.md b/third_party/nixpkgs/pkgs/development/misc/resholve/README.md index 1ea8843c01..28fbfbb707 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/README.md +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/README.md @@ -53,13 +53,13 @@ Here's a simple example of how `resholve.mkDerivation` is already used in nixpkg resholve.mkDerivation rec { pname = "dgoss"; - version = "0.3.16"; + version = "0.3.18"; src = fetchFromGitHub { owner = "aelsabbahy"; repo = "goss"; rev = "v${version}"; - sha256 = "1m5w5vwmc9knvaihk61848rlq7qgdyylzpcwi64z84rkw8qdnj6p"; + sha256 = "01ssc7rnnwpyhjv96qy8drsskghbfpyxpsahk8s62lh8pxygynhv"; }; dontConfigure = true; @@ -75,8 +75,8 @@ resholve.mkDerivation rec { scripts = [ "bin/dgoss" ]; interpreter = "${bash}/bin/bash"; inputs = [ coreutils which ]; - fake = { - external = [ "docker" ]; + keep = { + "$CONTAINER_RUNTIME" = true; }; }; }; @@ -279,7 +279,7 @@ execer = [ ]; # --wrapper '${gnugrep}/bin/egrep:${gnugrep}/bin/grep' -execer = [ +wrapper = [ /* This is the same verdict binlore will come up with. It's a no-op just to demo diff --git a/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix b/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix index ee69f6c21b..fa3b9c80e3 100644 --- a/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix +++ b/third_party/nixpkgs/pkgs/development/misc/resholve/source.nix @@ -3,7 +3,7 @@ }: rec { - version = "0.8.0"; + version = "0.8.1"; 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-oWS4ZBPjgH2UvYmvHVVRcyl15r3VS964BmB89y9DGo8="; + hash = "sha256-EVrv4Lj9GQa3g18BRQjC0wCxzsfsn4Ka1iq5Ouu1cII="; }; } diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index c6d838544e..217922886d 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -222,6 +222,12 @@ rec { '') plugins} ''; + # Function that automatically links the default NDK plugin. + linkNdkPlugin = {name, plugin, check}: + lib.optionalString check '' + ln -s ${plugin}/libexec/android-sdk/${name} ${name} + ''; + # Function that automatically links a plugin for which only one version exists linkPlugin = {name, plugin, check ? true}: lib.optionalString check '' @@ -259,7 +265,7 @@ rec { ${linkPlatformPlugins { name = "sources"; plugins = sources; check = includeSources; }} ${linkPlugins { name = "cmake"; plugins = cmake; }} ${linkNdkPlugins { name = "ndk-bundle"; rootName = "ndk"; plugins = ndk-bundles; }} - ${linkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} + ${linkNdkPlugin { name = "ndk-bundle"; plugin = ndk-bundle; check = includeNDK; }} ${lib.optionalString includeSystemImages '' mkdir -p system-images diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 5d0e2c2b17..0f3e7e4faa 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -23,7 +23,7 @@ deployAndroidPackage { # to still support the old standalone toolchains builds. if [ -d $out/libexec/android-sdk/ndk ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then ln -sf $out/libexec/android-sdk/ndk/${package.revision} $out/libexec/android-sdk/ndk-bundle - else + elif [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then echo "The ndk-bundle layout has changed. The nix expressions have to be updated!" exit 1 fi diff --git a/third_party/nixpkgs/pkgs/development/nim-packages/flatty/default.nix b/third_party/nixpkgs/pkgs/development/nim-packages/flatty/default.nix index 5e542d22e4..31abbfbdd2 100644 --- a/third_party/nixpkgs/pkgs/development/nim-packages/flatty/default.nix +++ b/third_party/nixpkgs/pkgs/development/nim-packages/flatty/default.nix @@ -2,13 +2,13 @@ buildNimPackage rec { pname = "flatty"; - version = "0.2.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "treeform"; repo = pname; rev = version; - hash = "sha256-1tPLtnlGtE4SF5/ti/2svvYHpEy/0Za5N4YAOHFOyjA="; + hash = "sha256-ZmhjehmEJHm5qNlsGQvyYLajUdwhWt1+AtRppRrNtgA="; }; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix b/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix index 8004f2025a..3e6cd708dc 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/main-programs.nix @@ -5,7 +5,7 @@ "@antfu/ni" = "ni"; "@electron-forge/cli" = "electron-forge"; "@squoosh/cli" = "squoosh-cli"; - "@webassemblyjs/cli" = "wasm2wast"; + "@webassemblyjs/cli-1.11.1" = "wasm2wast"; coffee-script = "coffee"; typescript = "tsc"; vue-cli = "vue"; @@ -28,10 +28,10 @@ "@tailwindcss/language-server" = "tailwindcss-language-server"; "@uppy/companion" = "companion"; "@vue/cli" = "vue"; - "@webassemblyjs/repl" = "wasm"; + "@webassemblyjs/repl-1.11.1" = "wasm"; "@webassemblyjs/wasm-strip" = "wasm-strip"; - "@webassemblyjs/wasm-text-gen" = "wasmgen"; - "@webassemblyjs/wast-refmt" = "wast-refmt"; + "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen"; + "@webassemblyjs/wast-refmt-1.11.1" = "wast-refmt"; aws-cdk = "cdk"; balanceofsatoshis = "bos"; carbon-now-cli = "carbon-now"; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 0be9b1a27f..61fbfa7be2 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -21,11 +21,11 @@ , "@tailwindcss/typography" , "@uppy/companion" , "@vue/cli" -, "@webassemblyjs/cli" -, "@webassemblyjs/repl" +, {"@webassemblyjs/cli": "1.11.1"} +, {"@webassemblyjs/repl": "1.11.1"} , "@webassemblyjs/wasm-strip" -, "@webassemblyjs/wasm-text-gen" -, "@webassemblyjs/wast-refmt" +, {"@webassemblyjs/wasm-text-gen": "1.11.1"} +, {"@webassemblyjs/wast-refmt": "1.11.1"} , "alex" , "alloy" , "antennas" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 28c3b39118..b59709a385 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -58,15 +58,6 @@ let sha512 = "K7EO1cd89xNdwctQaR2bY9aQFDArSIrYGSWSDCnqG7RKIZ1J+XASkKVylW9NCIeVcguD6Qemxai8ZFCWg9lLFg=="; }; }; - "@alexbosworth/fiat-1.0.2" = { - name = "_at_alexbosworth_slash_fiat"; - packageName = "@alexbosworth/fiat"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@alexbosworth/fiat/-/fiat-1.0.2.tgz"; - sha512 = "gouPoWdQ6NyIqsISkx526taLlnPB13SPJji4qRZ+MWf8Z60Bn6lF0xmoIEn+hpkTrSH+k9P9HvC2ENqfhq1YdQ=="; - }; - }; "@alexbosworth/fiat-1.0.3" = { name = "_at_alexbosworth_slash_fiat"; packageName = "@alexbosworth/fiat"; @@ -121,94 +112,94 @@ let sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; }; - "@angular-devkit/architect-0.1400.2" = { + "@angular-devkit/architect-0.1401.1" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1400.2"; + version = "0.1401.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1400.2.tgz"; - sha512 = "L+QIaN17M2APAJ4v3eVOSohqhnqTloDjT4omdaPA9XZpob+WQ6+ALCvMuEczCRrGBskXiOsBgXeyMjGBtq1+pw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1401.1.tgz"; + sha512 = "HIFrIwbjfXCOjbGlMpHzG3oQG0nM1opaFSeKi+JjzTIb0jWq2s8sJfn4tGOZEJU8aKtDpNYMcW+N3F0grZdR8w=="; }; }; - "@angular-devkit/core-13.3.5" = { + "@angular-devkit/core-14.0.5" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "13.3.5"; + version = "14.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-13.3.5.tgz"; - sha512 = "w7vzK4VoYP9rLgxJ2SwEfrkpKybdD+QgQZlsDBzT0C6Ebp7b4gkNcNVFo8EiZvfDl6Yplw2IAP7g7fs3STn0hQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-14.0.5.tgz"; + sha512 = "/CUGi6QLwh79FvsOY7M+1LQL3asZsbQW/WBd5f1iu5y7TLNqCwo+wOb0ZXLDNPw45vYBxFajtt3ob3U7qx3jNg=="; }; }; - "@angular-devkit/core-14.0.2" = { + "@angular-devkit/core-14.1.1" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "14.0.2"; + version = "14.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-14.0.2.tgz"; - sha512 = "lT875LhgO+23HvjUmuCZomH/0ivetzo8xsaT+7YM8SeUpmjsNTpTA/xNAQ4uD4JGscsJeCKsGT/zJIwPAAe6vQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-14.1.1.tgz"; + sha512 = "i5SiU/9xqKbhi5A2kq7ME5KWNXtVIlSLZ/HslGjsolZ4CO0LiZanywcE/HGL7681RVaWVeeSndmKQtqY3mPuNQ=="; }; }; - "@angular-devkit/schematics-13.3.5" = { + "@angular-devkit/schematics-14.0.5" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "13.3.5"; + version = "14.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-13.3.5.tgz"; - sha512 = "0N/kL/Vfx0yVAEwa3HYxNx9wYb+G9r1JrLjJQQzDp+z9LtcojNf7j3oey6NXrDUs1WjVZOa/AIdRl3/DuaoG5w=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-14.0.5.tgz"; + sha512 = "sufxITBkn2MvgEREt9JQ3QCKHS+sue1WsVzLE+TWqG5MC/RPk0f9tQ5VoHk6ZTzDKUvOtSoc7G+n0RscQsyp5g=="; }; }; - "@angular-devkit/schematics-14.0.2" = { + "@angular-devkit/schematics-14.1.1" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "14.0.2"; + version = "14.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-14.0.2.tgz"; - sha512 = "NCAYwvQBL71MbAzeF8XOM9LXYfZbUK7THYCW8UteKDY4Df6EdVOGhBdWY2LstAkZeVCaQWSJU7FcVRS9Ulvg0A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-14.1.1.tgz"; + sha512 = "9ymklxBm6ZxB4dvfsowyHQRx+DE7lQShDDMnwT2mPtH7SwbaLEUz02aL4W5BsuR6U1W+M181pZ4Igb3oq0AEoA=="; }; }; - "@angular-devkit/schematics-cli-13.3.5" = { + "@angular-devkit/schematics-cli-14.0.5" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "13.3.5"; + version = "14.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-13.3.5.tgz"; - sha512 = "ARX20ebtfwzef8GdXIcB6uv0sjTsaEniZyXBFchEKD6kR5EYZVaBL+ZVUbmsU1d0XY///WzW7pqwCyu5H1u+vw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-14.0.5.tgz"; + sha512 = "S+u0KjglyI3jEZWwIuBvFjEwY3Zk5lCWfhet+95sFKJEjEYgF4Fuk8Mau/9cr55hIcpZqTQUvyxnS/VDoj4WLg=="; }; }; - "@antora/asciidoc-loader-3.0.1" = { + "@antora/asciidoc-loader-3.0.3" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.0.1.tgz"; - sha512 = "tWMCLn2TFdEi4OcC8rQrMUW+NTRBmXW6MV5Z0wM/A0I9f8aMyhWHeOi8Bym/l/VumOfup24fjRtgv3XRNCHHlA=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-3.0.3.tgz"; + sha512 = "pr6fyYCkvaSlfh6zW9kBFdzCAZnHIo3JZmEa6r6amrCz5SVV+DYjThnC5pn0V1AqHCL4ZGoRxb+7YlT4093jDg=="; }; }; - "@antora/content-aggregator-3.0.1" = { + "@antora/content-aggregator-3.0.3" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.0.1.tgz"; - sha512 = "SVF8ewmuezlWk9Xx0A+8WAvGmbx32wzuBQCcUSSk1d4dMjTjVD3C9QEgEWVrchKs18IZObSQ6hP7l1lQPSg/Fw=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-3.0.3.tgz"; + sha512 = "j1XBDoN58o/FmxTvauw5ndtrScOq2uozkgDMpigdFoplGL79HKwHQcxCMSLOaatJNb1Y9xtfH22ZfqRPb7SCbw=="; }; }; - "@antora/content-classifier-3.0.1" = { + "@antora/content-classifier-3.0.3" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.0.1.tgz"; - sha512 = "Ns7b71Y5ML8zbOEu5mVU6Neg9ETu4jILPKh30loQRAddLe9MPM05lnGv1asfc0r10H/Gw8aXtvPQV/0w0yrFgw=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-3.0.3.tgz"; + sha512 = "F7lerJl1ijb6ZDqErHRNgT71Q4aQff4syIqYI248yAxuyfS+EnIQHJlT6lvomXO7AFnAKWjFqqtTI7rfW6LdLA=="; }; }; - "@antora/document-converter-3.0.1" = { + "@antora/document-converter-3.0.3" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.0.1.tgz"; - sha512 = "mVc5vH6MlCfoSLsJPN0+OfWp6XEakAYWfsHDXYXgufTSkHk01l0WzFxkBxp5pbsqW0ZitA38w7tsd0M4JyY//g=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-3.0.3.tgz"; + sha512 = "U/+ygiqLFWCEM5CYCaY5oFQyKM0dfJpKM9gLzWjP33tqGvzqcDe2Jqtr4UUh+U81BHM6ffC+TAEkMyLpunCecw=="; }; }; "@antora/expand-path-helper-2.0.0" = { @@ -220,94 +211,94 @@ let sha512 = "CSMBGC+tI21VS2kGW3PV7T2kQTM5eT3f2GTPVLttwaNYbNxDve08en/huzszHJfxo11CcEs26Ostr0F2c1QqeA=="; }; }; - "@antora/file-publisher-3.0.1" = { + "@antora/file-publisher-3.0.3" = { name = "_at_antora_slash_file-publisher"; packageName = "@antora/file-publisher"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/file-publisher/-/file-publisher-3.0.1.tgz"; - sha512 = "mHrFDSSBwQvWKeGDSCD7VotGq149dgc+n6e0u0auKbYr6KNcbCHpVEN/Qlv36JHW4AwBMQQs/hZxBfq/S5nzgw=="; + url = "https://registry.npmjs.org/@antora/file-publisher/-/file-publisher-3.0.3.tgz"; + sha512 = "EB15WaWYjTNDbc5Vff+jK1Lt8YqbQXOnt5c57TslFnIJylyTU9dd/BRaMw8jVMP60FKaLgQ0OSo3X2tjJQy9Ww=="; }; }; - "@antora/logger-3.0.1" = { + "@antora/logger-3.0.3" = { name = "_at_antora_slash_logger"; packageName = "@antora/logger"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/logger/-/logger-3.0.1.tgz"; - sha512 = "JZqpUnzAvO7gFJ83u4pob+i2WHtMPAAactIlLGhjQD9kyObw5C1ubmldE4qeop0389c18x+2/eYlFHF9/d602w=="; + url = "https://registry.npmjs.org/@antora/logger/-/logger-3.0.3.tgz"; + sha512 = "68oZfE1C02HJ8lEoBX0P0n3F5UYhOtKBJlRq0AXzWAORyUXCe25KmWjYKpneEqypCms8n7L/6e7nwATEY6hZIQ=="; }; }; - "@antora/navigation-builder-3.0.1" = { + "@antora/navigation-builder-3.0.3" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.0.1.tgz"; - sha512 = "o9DBSXWLifGb5CsKHB1ZDP5GgS412eY6XD16RP4nK0uGoW2NQjcDMYzt1m6IgD/XWVXMIbwfJa1JunlCM02upQ=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-3.0.3.tgz"; + sha512 = "HMXjD3EKnze5bbLRFtJPwGYIVJpqTOpt01BCDKMmDUnm53uGgHXy3Ca4vtZBYAwhIfxsMKLxBtObSDO4d0RqHQ=="; }; }; - "@antora/page-composer-3.0.1" = { + "@antora/page-composer-3.0.3" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.0.1.tgz"; - sha512 = "a0ShNaAKlB4Fpsw7xeoE0/+kYah07p+VQXmZpjDhsu4CaHv4D2ufVgBSTjvK2zzXJwa+dwUNyrLpupE+usa3bw=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-3.0.3.tgz"; + sha512 = "2zJEQjFrAbOqkVt2qDVyTnw6d/bZrp/yHUmqwUoN7wqG7uPkd/Q0+/Fdfj7loQ4qtKtw9Qy3xtva04vavlkxmw=="; }; }; - "@antora/playbook-builder-3.0.1" = { + "@antora/playbook-builder-3.0.3" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.0.1.tgz"; - sha512 = "+L5aCHPf9AJ4BGYlWio2WmpoLZz9Ju6lkT+Ept8R0GjkdhIte01czQ9dXAXcSNNFtC9C82as3WqNJWHPfO+icw=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-3.0.3.tgz"; + sha512 = "LTXYCSlLfzEPSkI7dXv5vSHnGx+fvY8uu1v/p3fNgqDOtLonJUfibMtLwE93AuHTkCNJeO5MmGzp8RURmGgYlw=="; }; }; - "@antora/redirect-producer-3.0.1" = { + "@antora/redirect-producer-3.0.3" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.0.1.tgz"; - sha512 = "NA5J4nzX1EUQyA3R79fYidG1XieEqZnDegaMDuQC9T7eBSA4B7AMKtPPnvWs2botzi+cK+Y0Eazg/ynOiWW+LA=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-3.0.3.tgz"; + sha512 = "xugXc8t4WCdqLRovnFj1Kfzk/MVTGM/pYaveICh4Xnx37anOlYfgE4/mrUN9OXopXZ1hno3Tgajd4xar9ENELA=="; }; }; - "@antora/site-generator-3.0.1" = { + "@antora/site-generator-3.0.3" = { name = "_at_antora_slash_site-generator"; packageName = "@antora/site-generator"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator/-/site-generator-3.0.1.tgz"; - sha512 = "/fCgSYrW+Wh7rd6vB8YPQWPMgkwF17rYOmHWuU+xYcjQOwB1UQgTNuD2vXXgaQNEBkzAOTGhWQW4pWU2Mp4qZA=="; + url = "https://registry.npmjs.org/@antora/site-generator/-/site-generator-3.0.3.tgz"; + sha512 = "yFnx2Vskq2inOZR0he8cu49b8UPfrv6FKB7uBvID5NbKxTO0XV51TemOxdnD/jePpFbpAOPp9PhCQl6Tb4R46g=="; }; }; - "@antora/site-mapper-3.0.1" = { + "@antora/site-mapper-3.0.3" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.0.1.tgz"; - sha512 = "XtBj5vHDiKBZ6P4z6RGWSFpRa/HYcTafZpG46ykI2xWtq18Q8PyFHx5VMQXeClQVy8WbwBIa/ITKAP7MCLLRww=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-3.0.3.tgz"; + sha512 = "h/qazt3LpB2PauYPudFpedGf4jk+Yj9FqKqiy05YH0ah660r+L3IDlZS3WT9UpKWdsYotobhVU6IRgCzlorRjg=="; }; }; - "@antora/site-publisher-3.0.1" = { + "@antora/site-publisher-3.0.3" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.0.1.tgz"; - sha512 = "oxG7+58J5oYmKTpHW98B61yf82kjltAxr5TQSe8LcZrI/jHFqFpNKwieDHKoTUVdes4xge0hHc3+IJatHWIoeQ=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-3.0.3.tgz"; + sha512 = "bxtTzrZ1DeleGl9uJ/T+DFosr1moHOsg0j37hzkoc4f6/jaPj6O1z9by2i7rE3tdvtaxXe0o7hBiZ4qM+f37Kg=="; }; }; - "@antora/ui-loader-3.0.1" = { + "@antora/ui-loader-3.0.3" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.0.1.tgz"; - sha512 = "grtqiB3DiO8mJLWP3/Pu0c7Zu6rF2nkaNBX5NXFoyy7KZ+FJke20WVjuPDzyu7l6mOpjz3kHDXS8xskQ8pvu7g=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-3.0.3.tgz"; + sha512 = "uoSoi4HcEVu+5M94+QE0fGOECtEj3GjeEIIsdSVOp1UZeI1urn3M7YHxQ/MBhXKwihMZjmajvrRL0XKnRp0IFw=="; }; }; "@antora/user-require-helper-2.0.0" = { @@ -328,13 +319,85 @@ let sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w=="; }; }; - "@apollo/protobufjs-1.2.2" = { + "@apollo/protobufjs-1.2.4" = { name = "_at_apollo_slash_protobufjs"; packageName = "@apollo/protobufjs"; - version = "1.2.2"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.2.tgz"; - sha512 = "vF+zxhPiLtkwxONs6YanSt1EpwpGilThpneExUN5K3tCymuxNnVq2yojTvnpRjv2QfsEIt/n7ozPIIzBLwGIDQ=="; + url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.4.tgz"; + sha512 = "npVJ9NVU/pynj+SCU+fambvTneJDyCnif738DnZ7pCxdDtzeEz7WkpSIq5wNUmWm5Td55N+S2xfqZ+WP4hDLng=="; + }; + }; + "@apollo/utils.dropunuseddefinitions-1.1.0" = { + name = "_at_apollo_slash_utils.dropunuseddefinitions"; + packageName = "@apollo/utils.dropunuseddefinitions"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/utils.dropunuseddefinitions/-/utils.dropunuseddefinitions-1.1.0.tgz"; + sha512 = "jU1XjMr6ec9pPoL+BFWzEPW7VHHulVdGKMkPAMiCigpVIT11VmCbnij0bWob8uS3ODJ65tZLYKAh/55vLw2rbg=="; + }; + }; + "@apollo/utils.keyvaluecache-1.0.1" = { + name = "_at_apollo_slash_utils.keyvaluecache"; + packageName = "@apollo/utils.keyvaluecache"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/utils.keyvaluecache/-/utils.keyvaluecache-1.0.1.tgz"; + sha512 = "nLgYLomqjVimEzQ4cdvVQkcryi970NDvcRVPfd0OPeXhBfda38WjBq+WhQFk+czSHrmrSp34YHBxpat0EtiowA=="; + }; + }; + "@apollo/utils.logger-1.0.0" = { + name = "_at_apollo_slash_utils.logger"; + packageName = "@apollo/utils.logger"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/utils.logger/-/utils.logger-1.0.0.tgz"; + sha512 = "dx9XrjyisD2pOa+KsB5RcDbWIAdgC91gJfeyLCgy0ctJMjQe7yZK5kdWaWlaOoCeX0z6YI9iYlg7vMPyMpQF3Q=="; + }; + }; + "@apollo/utils.printwithreducedwhitespace-1.1.0" = { + name = "_at_apollo_slash_utils.printwithreducedwhitespace"; + packageName = "@apollo/utils.printwithreducedwhitespace"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/utils.printwithreducedwhitespace/-/utils.printwithreducedwhitespace-1.1.0.tgz"; + sha512 = "GfFSkAv3n1toDZ4V6u2d7L4xMwLA+lv+6hqXicMN9KELSJ9yy9RzuEXaX73c/Ry+GzRsBy/fdSUGayGqdHfT2Q=="; + }; + }; + "@apollo/utils.removealiases-1.0.0" = { + name = "_at_apollo_slash_utils.removealiases"; + packageName = "@apollo/utils.removealiases"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/utils.removealiases/-/utils.removealiases-1.0.0.tgz"; + sha512 = "6cM8sEOJW2LaGjL/0vHV0GtRaSekrPQR4DiywaApQlL9EdROASZU5PsQibe2MWeZCOhNrPRuHh4wDMwPsWTn8A=="; + }; + }; + "@apollo/utils.sortast-1.1.0" = { + name = "_at_apollo_slash_utils.sortast"; + packageName = "@apollo/utils.sortast"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/utils.sortast/-/utils.sortast-1.1.0.tgz"; + sha512 = "VPlTsmUnOwzPK5yGZENN069y6uUHgeiSlpEhRnLFYwYNoJHsuJq2vXVwIaSmts015WTPa2fpz1inkLYByeuRQA=="; + }; + }; + "@apollo/utils.stripsensitiveliterals-1.2.0" = { + name = "_at_apollo_slash_utils.stripsensitiveliterals"; + packageName = "@apollo/utils.stripsensitiveliterals"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/utils.stripsensitiveliterals/-/utils.stripsensitiveliterals-1.2.0.tgz"; + sha512 = "E41rDUzkz/cdikM5147d8nfCFVKovXxKBcjvLEQ7bjZm/cg9zEcXvS6vFY8ugTubI3fn6zoqo0CyU8zT+BGP9w=="; + }; + }; + "@apollo/utils.usagereporting-1.0.0" = { + name = "_at_apollo_slash_utils.usagereporting"; + packageName = "@apollo/utils.usagereporting"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@apollo/utils.usagereporting/-/utils.usagereporting-1.0.0.tgz"; + sha512 = "5PL7hJMkTPmdo3oxPtigRrIyPxDk/ddrUryHPDaezL1lSFExpNzsDd2f1j0XJoHOg350GRd3LyD64caLA2PU1w=="; }; }; "@apollographql/apollo-tools-0.5.4" = { @@ -346,22 +409,13 @@ let sha512 = "shM3q7rUbNyXVVRkQJQseXv6bnYM3BUma/eZhwXR4xsuM+bqWnJKvW7SAfRjP7LuSCocrexa5AXhjjawNHrIlw=="; }; }; - "@apollographql/graphql-playground-html-1.6.27" = { + "@apollographql/graphql-playground-html-1.6.29" = { name = "_at_apollographql_slash_graphql-playground-html"; packageName = "@apollographql/graphql-playground-html"; - version = "1.6.27"; + version = "1.6.29"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz"; - sha512 = "tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw=="; - }; - }; - "@apollographql/graphql-upload-8-fork-8.1.3" = { - name = "_at_apollographql_slash_graphql-upload-8-fork"; - packageName = "@apollographql/graphql-upload-8-fork"; - version = "8.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.3.tgz"; - sha512 = "ssOPUT7euLqDXcdVv3Qs4LoL4BPtfermW1IOouaqEmj36TpHYDmYDIbKoSQxikd9vtMumFnP87OybH7sC9fJ6g=="; + url = "https://registry.npmjs.org/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz"; + sha512 = "xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA=="; }; }; "@ardatan/aggregate-error-0.0.6" = { @@ -373,6 +427,15 @@ let sha512 = "vyrkEHG1jrukmzTPtyWB4NLPauUw5bQeg4uhn8f+1SSynmrOcyvlb1GKQjjgoBzElLdfXCRYX8UnBlhklOHYRQ=="; }; }; + "@ardatan/sync-fetch-0.0.1" = { + name = "_at_ardatan_slash_sync-fetch"; + packageName = "@ardatan/sync-fetch"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ardatan/sync-fetch/-/sync-fetch-0.0.1.tgz"; + sha512 = "xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA=="; + }; + }; "@asciidoctor/core-2.2.6" = { name = "_at_asciidoctor_slash_core"; packageName = "@asciidoctor/core"; @@ -382,24 +445,6 @@ let sha512 = "TmB2K5UfpDpSbCNBBntXzKHcAk2EA3/P68jmWvmJvglVUdkO9V6kTAuXVe12+h6C4GK0ndwuCrHHtEVcL5t6pQ=="; }; }; - "@astrojs/svelte-language-integration-0.1.6" = { - name = "_at_astrojs_slash_svelte-language-integration"; - packageName = "@astrojs/svelte-language-integration"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/svelte-language-integration/-/svelte-language-integration-0.1.6.tgz"; - sha512 = "nqczE674kz7GheKSWQwTOL6+NGHghc4INQox048UyHJRaIKHEbCPyFLDBDVY7QJH0jug1komCJ8OZXUn6Z3eLA=="; - }; - }; - "@astrojs/vue-language-integration-0.1.1" = { - name = "_at_astrojs_slash_vue-language-integration"; - packageName = "@astrojs/vue-language-integration"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/vue-language-integration/-/vue-language-integration-0.1.1.tgz"; - sha512 = "MPnZO41txVXkZWgN6UtI8ysFViBiCurRchsE/eZ2KFyQLQwB0rOk+FN7aeIIKOigV+Kosbwai50beuztkI4v/A=="; - }; - }; "@aws-crypto/crc32-2.0.0" = { name = "_at_aws-crypto_slash_crc32"; packageName = "@aws-crypto/crc32"; @@ -472,13 +517,13 @@ let sha512 = "JJmFFwvbm08lULw4Nm5QOLg8+lAQeC8aCXK5xrtxntYzYXCGfHwUJ4Is3770Q7HmICsXthGQ+ZsDL7C2uH3yBQ=="; }; }; - "@aws-sdk/abort-controller-3.110.0" = { + "@aws-sdk/abort-controller-3.127.0" = { name = "_at_aws-sdk_slash_abort-controller"; packageName = "@aws-sdk/abort-controller"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.110.0.tgz"; - sha512 = "zok/WEVuK7Jh6V9YeA56pNZtxUASon9LTkS7vE65A4UFmNkPGNBCNgoiBcbhWfxwrZ8wtXcQk6rtUut39831mA=="; + url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.127.0.tgz"; + sha512 = "G77FLYcl9egUoD3ZmR6TX94NMqBMeT53hBGrEE3uVUJV1CwfGKfaF007mPpRZnIB3avnJBQGEK6MrwlCfv2qAw=="; }; }; "@aws-sdk/chunked-blob-reader-3.55.0" = { @@ -499,193 +544,193 @@ let sha512 = "Ybn3vDZ3CqGyprL2qdF6QZqoqlx8lA3qOJepobjuKKDRw+KgGxjUY4NvWe0R2MdRoduyaDj6uvhIay0S1MOSJQ=="; }; }; - "@aws-sdk/client-s3-3.113.0" = { + "@aws-sdk/client-s3-3.142.0" = { name = "_at_aws-sdk_slash_client-s3"; packageName = "@aws-sdk/client-s3"; - version = "3.113.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.113.0.tgz"; - sha512 = "QHynLFWwhQFB2bULxMOlnIYzKPmE6ky5yRo0NPGklz4bnWc8RY/vSvlaii4JBxPee9TGxNM1/NCF0oMLUdXK3Q=="; + url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.142.0.tgz"; + sha512 = "hCGhaxEpbbpwy++CltjMoDgt6814kdq+c6fkvh2UwLg6ojx9Z/Z2DMZcIuvpVNr2DFm6xevXzEHrx9i7lOd5Rw=="; }; }; - "@aws-sdk/client-sso-3.112.0" = { + "@aws-sdk/client-sso-3.142.0" = { name = "_at_aws-sdk_slash_client-sso"; packageName = "@aws-sdk/client-sso"; - version = "3.112.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.112.0.tgz"; - sha512 = "FwFmiapxuVQiyMdDaBvCpajnJkVWEUHBdO+7rIpzgKHkODEPou5/AwboaGRPEFYULOyYeI0HiDFzpK0G6de+7Q=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.142.0.tgz"; + sha512 = "Pewcpxq+wqcbB3t3s6KImBUUf+qqBNqMfd2wgQ3PdpYBjlNzrWYLHAnIT1vhIFjOGJXDi/qwF8FX7qbWNUB7Lg=="; }; }; - "@aws-sdk/client-sts-3.112.0" = { + "@aws-sdk/client-sts-3.142.0" = { name = "_at_aws-sdk_slash_client-sts"; packageName = "@aws-sdk/client-sts"; - version = "3.112.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.112.0.tgz"; - sha512 = "hSApRO2wg3jk9VRGM6SCZO3aFP7DKVSUqs6FrvlXlj+JU88ZKObjrGE61cCzXoD89Dh+b9t8A2T6W51Nzriaxw=="; + url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.142.0.tgz"; + sha512 = "rOa1MTI1h3kTjlHkItAlXGHefM5sjsfw3muhNEhzrZBuhpOrLU8apbiG2rcJqB8m0prMoY39PuG+WquxN4ap6g=="; }; }; - "@aws-sdk/config-resolver-3.110.0" = { + "@aws-sdk/config-resolver-3.130.0" = { name = "_at_aws-sdk_slash_config-resolver"; packageName = "@aws-sdk/config-resolver"; - version = "3.110.0"; + version = "3.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.110.0.tgz"; - sha512 = "7VvtKy4CL63BAktQ2vgsjhWDSXpkXO5YdiI56LQnHztrvSuJBBaxJ7R1p/k0b2tEUhYKUziAIW8EKE/7EGPR4g=="; + url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.130.0.tgz"; + sha512 = "7dkCHHI9kRcHW6YNr9/2Ub6XkvU9Fu6H/BnlKbaKlDR8jq7QpaFhPhctOVi5D/NDpxJgALifexFne0dvo3piTw=="; }; }; - "@aws-sdk/credential-provider-env-3.110.0" = { + "@aws-sdk/credential-provider-env-3.127.0" = { name = "_at_aws-sdk_slash_credential-provider-env"; packageName = "@aws-sdk/credential-provider-env"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.110.0.tgz"; - sha512 = "oFU3IYk/Bl5tdsz1qigtm3I25a9cvXPqlE8VjYjxVDdLujF5zd/4HLbhP4GQWhpEwZmM1ijcSNfLcyywVevTZg=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.127.0.tgz"; + sha512 = "Ig7XhUikRBlnRTYT5JBGzWfYZp68X5vkFVIFCmsHHt/qVy0Nz9raZpmDHicdS1u67yxDkWgCPn/bNevWnM0GFg=="; }; }; - "@aws-sdk/credential-provider-imds-3.110.0" = { + "@aws-sdk/credential-provider-imds-3.127.0" = { name = "_at_aws-sdk_slash_credential-provider-imds"; packageName = "@aws-sdk/credential-provider-imds"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.110.0.tgz"; - sha512 = "atl+7/dAB+8fG9XI2fYyCgXKYDbOzot65VAwis+14bOEUCVp7PCJifBEZ/L8GEq564p+Fa2p1IpV0wuQXxqFUQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.127.0.tgz"; + sha512 = "I6KlIBBzmJn/U1KikiC50PK3SspT9G5lkVLBaW5a6YfOcijqVTXfAN3kYzqhfeS0j4IgfJEwKVsjsZfmprJO5A=="; }; }; - "@aws-sdk/credential-provider-ini-3.112.0" = { + "@aws-sdk/credential-provider-ini-3.142.0" = { name = "_at_aws-sdk_slash_credential-provider-ini"; packageName = "@aws-sdk/credential-provider-ini"; - version = "3.112.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.112.0.tgz"; - sha512 = "ebgZ6/jZdTGHQ3zfq/ccmS+7YmLk6yUWHDmh69VK+B1Dd+S1jFwbD9EQ+pYWCp/gEl9F620NSwb6KghRylPWEQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.142.0.tgz"; + sha512 = "joMJTxUTNmxURnVmmd7XhtwOwijMjh7z09V8o2EHQMk+ak+rhaRgqb2kTA2nO0J3SRxdO5z5SKkyQgW0d1fY9g=="; }; }; - "@aws-sdk/credential-provider-node-3.112.0" = { + "@aws-sdk/credential-provider-node-3.142.0" = { name = "_at_aws-sdk_slash_credential-provider-node"; packageName = "@aws-sdk/credential-provider-node"; - version = "3.112.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.112.0.tgz"; - sha512 = "7txS7P3BAaU4cksFw/PnoVskVvO8h/TPvOl/BxFtCiUdwA6FRltLvBeMlN08fwUoqgM6z06q8areBdeDqCHOSw=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.142.0.tgz"; + sha512 = "JkhCKNkEhCS2vgD/qg5hJPatupNLObqts9FXiDia5CF6w8YcHLH+mWSvhUMCUGkunAOvFHDkQL1uPXfoQuJvPg=="; }; }; - "@aws-sdk/credential-provider-process-3.110.0" = { + "@aws-sdk/credential-provider-process-3.127.0" = { name = "_at_aws-sdk_slash_credential-provider-process"; packageName = "@aws-sdk/credential-provider-process"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.110.0.tgz"; - sha512 = "JJcZePvRTfQHYj/+EEY13yItnZH/e8exlARFUjN0L13UrgHpOJtDQBa+YBHXo6MbTFQh+re25z2kzc+zOYSMNQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.127.0.tgz"; + sha512 = "6v0m2lqkO9J5fNlTl+HjriQNIdfg8mjVST544+5y9EnC/FVmTnIz64vfHveWdNkP/fehFx7wTimNENtoSqCn3A=="; }; }; - "@aws-sdk/credential-provider-sso-3.112.0" = { + "@aws-sdk/credential-provider-sso-3.142.0" = { name = "_at_aws-sdk_slash_credential-provider-sso"; packageName = "@aws-sdk/credential-provider-sso"; - version = "3.112.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.112.0.tgz"; - sha512 = "b6rOrSXbNK3fGyPvNpyF5zdktmAoNOqHCTmFSUcxRxOipyRGb5JACsbjWthIQkpWkpNCT8GFNLEg9spXPFIdLA=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.142.0.tgz"; + sha512 = "jJvp/A5xrikaeL0DhjhQTvUc0+eF0hN5Nbo+nxpnUOiOOkyqs329g65NI1TmLp/OzDcqQ/8p5vj2+7ufTGEOXQ=="; }; }; - "@aws-sdk/credential-provider-web-identity-3.110.0" = { + "@aws-sdk/credential-provider-web-identity-3.127.0" = { name = "_at_aws-sdk_slash_credential-provider-web-identity"; packageName = "@aws-sdk/credential-provider-web-identity"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.110.0.tgz"; - sha512 = "e4e5u7v3fsUFZsMcFMhMy1NdJBQpunYcLwpYlszm3OEICwTTekQ+hVvnVRd134doHvzepE4yp9sAop0Cj+IRVQ=="; + url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.127.0.tgz"; + sha512 = "85ahDZnLYB3dqkW+cQ0bWt+NVqOoxomTrJoq3IC2q6muebeFrJ0pyf0JEW/RNRzBiUvvsZujzGdWifzWyQKfVg=="; }; }; - "@aws-sdk/eventstream-marshaller-3.110.0" = { - name = "_at_aws-sdk_slash_eventstream-marshaller"; - packageName = "@aws-sdk/eventstream-marshaller"; - version = "3.110.0"; + "@aws-sdk/eventstream-codec-3.127.0" = { + name = "_at_aws-sdk_slash_eventstream-codec"; + packageName = "@aws-sdk/eventstream-codec"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-marshaller/-/eventstream-marshaller-3.110.0.tgz"; - sha512 = "ZVJI2iCmjxigtLKfc9v48NHY34Qos5l9wgxzB1lU+RwaBppbmjogvIpPlKewEuAFsLTrErUK4ONBWGGsvLYlBQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.127.0.tgz"; + sha512 = "+Tlujx3VkB4DK8tYzG0rwxIE0ee6hWItQgSEREEmi5CwHQFw7VpRLYAShYabEx9wIJmRFObWzhlKxWNRi+TfaA=="; }; }; - "@aws-sdk/eventstream-serde-browser-3.110.0" = { + "@aws-sdk/eventstream-serde-browser-3.127.0" = { name = "_at_aws-sdk_slash_eventstream-serde-browser"; packageName = "@aws-sdk/eventstream-serde-browser"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.110.0.tgz"; - sha512 = "zeZpKO9Ccsg6seB9oYf9rEQkYfM4nWnyQJtfGvpj/BlkJ7i3UhpbVca8q6aC61WLb3fcO/JROqNfDK1Vis8RgA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.127.0.tgz"; + sha512 = "d1rTK4ljEp3Y/BQ78/AJ7eqgGyI6TE0bxNosCmXWcUBv00Tr5cerPqPe7Zvw8XwIMPX5y8cjtd1/cOtB2ePaBw=="; }; }; - "@aws-sdk/eventstream-serde-config-resolver-3.110.0" = { + "@aws-sdk/eventstream-serde-config-resolver-3.127.0" = { name = "_at_aws-sdk_slash_eventstream-serde-config-resolver"; packageName = "@aws-sdk/eventstream-serde-config-resolver"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.110.0.tgz"; - sha512 = "0kyKUU5/46OGe6rgIqbNRJEQhNYwxLdgcJXlBl6q6CdgyQApz6jsAgG0C5xhSLSi4iJijDRriJTowAhkq4AlWQ=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.127.0.tgz"; + sha512 = "dYvLfQYcKLOFtZVgwLwKDCykAxNkDyDLQRWytJK9DHCyjRig66IKi1codts9vOy4j0CeYwnXWs5WDavrUaE05g=="; }; }; - "@aws-sdk/eventstream-serde-node-3.110.0" = { + "@aws-sdk/eventstream-serde-node-3.127.0" = { name = "_at_aws-sdk_slash_eventstream-serde-node"; packageName = "@aws-sdk/eventstream-serde-node"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.110.0.tgz"; - sha512 = "Bd7d57BANdy1RBnZ6EBxEaDzC4DidR40EMEk08Ho3+md6CW/vmW63n9wAhKjdoq9a+Hp6aDWP4huVKhyT/d6PA=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.127.0.tgz"; + sha512 = "Ie59jZYAIw3Kt6GePvEilp1k3JoYEQpY3WIyVZltm3dkVf0GmzhCZrPROH9vgF3qApzu1aGOWDV2wX91poXF8A=="; }; }; - "@aws-sdk/eventstream-serde-universal-3.110.0" = { + "@aws-sdk/eventstream-serde-universal-3.127.0" = { name = "_at_aws-sdk_slash_eventstream-serde-universal"; packageName = "@aws-sdk/eventstream-serde-universal"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.110.0.tgz"; - sha512 = "VjzOxDaHCzPlZs+9UqqQABP47gCWf97kqwhuoPUsCzV8leEHnLfAX3BvIZ58kNr4Fycua5AgK7Ww6uFfXVeW8w=="; + url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.127.0.tgz"; + sha512 = "cJLSTtYDGTevknMTykzHpcDNRbD6yGve8FBUKSAczuNVjXZOedj0GbHJqkASuLj0ZnojbKBdCx4uu1XGyvubng=="; }; }; - "@aws-sdk/fetch-http-handler-3.110.0" = { + "@aws-sdk/fetch-http-handler-3.131.0" = { name = "_at_aws-sdk_slash_fetch-http-handler"; packageName = "@aws-sdk/fetch-http-handler"; - version = "3.110.0"; + version = "3.131.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.110.0.tgz"; - sha512 = "vk+K4GeCZL2J2rtvKO+T0Q7i3MDpEGZBMg5K2tj9sMcEQwty0BF0aFnP7Eu2l4/Zif2z1mWuUFM2WcZI6DVnbw=="; + url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.131.0.tgz"; + sha512 = "eNxmPZQX2IUeBGWHNC7eNTekWn9VIPLYEMKJbKYUBJryxuTJ7TtLeyEK5oakUjMwP1AUvWT+CV7C+8L7uG1omQ=="; }; }; - "@aws-sdk/hash-blob-browser-3.110.0" = { + "@aws-sdk/hash-blob-browser-3.127.0" = { name = "_at_aws-sdk_slash_hash-blob-browser"; packageName = "@aws-sdk/hash-blob-browser"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.110.0.tgz"; - sha512 = "NkTosjlYwP2dcBXY6yzhNafAK+W2nceheffvWdyGA29+E9YdRjDminXvKc/WAkZUMOW0CaCbD90otOiimAAYyQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.127.0.tgz"; + sha512 = "XH9s2w6GXCtDI+3/y+sDAzMWJRTvhRXJJtI1fVDsCiyq96SYUTNKLLaUSuR01uawEBiRDBqGDDPMT8qJPDXc/w=="; }; }; - "@aws-sdk/hash-node-3.110.0" = { + "@aws-sdk/hash-node-3.127.0" = { name = "_at_aws-sdk_slash_hash-node"; packageName = "@aws-sdk/hash-node"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.110.0.tgz"; - sha512 = "wakl+kP2O8wTGYiQ3InZy+CVfGrIpFfq9fo4zif9PZac0BbUbguUU1dkY34uZiaf+4o2/9MoDYrHU2HYeXKxWw=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.127.0.tgz"; + sha512 = "wx7DKlXdKebH4JcMsOevdsm2oDNMVm36kuMm0XWRIrFWQ/oq7OquDpEMJzWvGqWF/IfFUpb7FhAWZZpALwlcwA=="; }; }; - "@aws-sdk/hash-stream-node-3.110.0" = { + "@aws-sdk/hash-stream-node-3.127.0" = { name = "_at_aws-sdk_slash_hash-stream-node"; packageName = "@aws-sdk/hash-stream-node"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.110.0.tgz"; - sha512 = "srlStn+dCnBlQy4oWBz3oFS8vT5Xgxhra91rt9U+vHruCyQ0L1es0J87X4uwy2HRlnIw3daPtVLtxekahEXzKQ=="; + url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.127.0.tgz"; + sha512 = "ZCNqi+FJViYFCo8JfSx+YK0Hd/SC555gHqBe24GVBMCDqJ8UFIled7tF+GOQ8wTcKjxuwp/0EXDTXoaAb0K89g=="; }; }; - "@aws-sdk/invalid-dependency-3.110.0" = { + "@aws-sdk/invalid-dependency-3.127.0" = { name = "_at_aws-sdk_slash_invalid-dependency"; packageName = "@aws-sdk/invalid-dependency"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.110.0.tgz"; - sha512 = "O8J1InmtJkoiUMbQDtxBfOzgigBp9iSVsNXQrhs2qHh3826cJOfE7NGT3u+NMw73Pk5j2cfmOh1+7k/76IqxOg=="; + url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.127.0.tgz"; + sha512 = "bxvmtmJ6gIRfOHvh1jAPZBH2mzppEblPjEOFo4mOzXz4U3qPIxeuukCjboMnGK9QEpV2wObWcYYld0vxoRrfiA=="; }; }; "@aws-sdk/is-array-buffer-3.55.0" = { @@ -697,283 +742,283 @@ let sha512 = "NbiPHVYuPxdqdFd6FxzzN3H1BQn/iWA3ri3Ry7AyLeP/tGs1yzEWMwf8BN8TSMALI0GXT6Sh0GDWy3Ok5xB6DA=="; }; }; - "@aws-sdk/md5-js-3.110.0" = { + "@aws-sdk/md5-js-3.127.0" = { name = "_at_aws-sdk_slash_md5-js"; packageName = "@aws-sdk/md5-js"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.110.0.tgz"; - sha512 = "66gV6CH8O7ymTZMIbGjdUI71K7ErDfudhtN/ULb97kD2TYX4NlFtxNZxx3+iZH1G0H636lWm9hJcU5ELG9B+bw=="; + url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.127.0.tgz"; + sha512 = "9FzD++p2bvfZ56hbDxvGcLlA9JIMt9uZB/m4NEvbuvrpx1qnUpFv6HqthhGaVuhctkK25hONT5ZpOYHSisATrA=="; }; }; - "@aws-sdk/middleware-bucket-endpoint-3.110.0" = { + "@aws-sdk/middleware-bucket-endpoint-3.127.0" = { name = "_at_aws-sdk_slash_middleware-bucket-endpoint"; packageName = "@aws-sdk/middleware-bucket-endpoint"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.110.0.tgz"; - sha512 = "l1q0KzMRFyGSSc7LZGEh2xhCha1933C8uJE5g23b7dZdklEU5I62l4daELo+TBANcxFzDiRXd6g5mly/T+ZTSg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.127.0.tgz"; + sha512 = "wJpXxWceBDhWktoxrRb4s6tMx0dWsEGYIaV0KkQPGhTPk2KMUgwa4xApfCXXVfYcE3THk486OKwHhPrR5jpe+g=="; }; }; - "@aws-sdk/middleware-content-length-3.110.0" = { + "@aws-sdk/middleware-content-length-3.127.0" = { name = "_at_aws-sdk_slash_middleware-content-length"; packageName = "@aws-sdk/middleware-content-length"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.110.0.tgz"; - sha512 = "hKU+zdqfAJQg22LXMVu/z35nNIHrVAKpVKPe9+WYVdL/Z7JKUPK7QymqKGOyDuDbzW6OxyulC1zKGEX12zGmdA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.127.0.tgz"; + sha512 = "AFmMaIEW3Rzg0TaKB9l/RENLowd7ZEEOpm0trYw1CgUUORWW/ydCsDT7pekPlC25CPbhUmWXCSA4xPFSYOVnDw=="; }; }; - "@aws-sdk/middleware-expect-continue-3.113.0" = { + "@aws-sdk/middleware-expect-continue-3.127.0" = { name = "_at_aws-sdk_slash_middleware-expect-continue"; packageName = "@aws-sdk/middleware-expect-continue"; - version = "3.113.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.113.0.tgz"; - sha512 = "LLtSunCYVWeAhRP+6enn0kYF119WooV6gepMGOWeRCpKXO2iyi8YOx2Mtgc3T8ybiAG/dVlmZoX47Y1HINcuqg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.127.0.tgz"; + sha512 = "+X7mdgFqt9UqUDeGuMt+afR8CBX9nMecTxEIilAKdVOLx+fuXzHnC2mpddKMtiE9IGKMU4BI1Ahf7t32Odhs1Q=="; }; }; - "@aws-sdk/middleware-flexible-checksums-3.110.0" = { + "@aws-sdk/middleware-flexible-checksums-3.127.0" = { name = "_at_aws-sdk_slash_middleware-flexible-checksums"; packageName = "@aws-sdk/middleware-flexible-checksums"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.110.0.tgz"; - sha512 = "Z/v1Da+e1McxrVr1s4jUykp2EXsOHpTxZ4M0X8vNkXCIVSuaMp4UI0P+LQawbDA+j3FaecqqBfWMZ2sHQ8bpoA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.127.0.tgz"; + sha512 = "sXkAwhE9dikO72sEJ7DrUCo5mawauAxICCqipCCSGp0geSkptvtZHhySgJNMVSbUJQmu5bcS+zsFpFVwuJvGxg=="; }; }; - "@aws-sdk/middleware-host-header-3.110.0" = { + "@aws-sdk/middleware-host-header-3.127.0" = { name = "_at_aws-sdk_slash_middleware-host-header"; packageName = "@aws-sdk/middleware-host-header"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.110.0.tgz"; - sha512 = "/Cknn1vL2LTlclI0MX2RzmtdPlCJ5palCRXxm/mod1oHwg4oNTKRlUX3LUD+L8g7JuJ4h053Ch9KS/A0vanE5Q=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.127.0.tgz"; + sha512 = "e2gTLJb5lYP9lRV7hN3rKY2l4jv8OygOoHElZJ3Z8KPZskjHelYPcQ8XbdfhSXXxC3vc/0QqN0ResFt3W3Pplg=="; }; }; - "@aws-sdk/middleware-location-constraint-3.110.0" = { + "@aws-sdk/middleware-location-constraint-3.127.0" = { name = "_at_aws-sdk_slash_middleware-location-constraint"; packageName = "@aws-sdk/middleware-location-constraint"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.110.0.tgz"; - sha512 = "8ZSo9sqrTMcSp0xEJQ3ypmQpeSMQl1NXXv72khJPweZqDoO0eAbfytwyH4JH4sP0VwVVmuDHdwPXyDZX7I0iQg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.127.0.tgz"; + sha512 = "UtPmbOKEVu+Ue7CwICFSOOOSePV8Piydco/v2IpdRkMO0e4bqQ3Tn0XprBlWWfSW4QCtAPzydrArLsUdk636GA=="; }; }; - "@aws-sdk/middleware-logger-3.110.0" = { + "@aws-sdk/middleware-logger-3.127.0" = { name = "_at_aws-sdk_slash_middleware-logger"; packageName = "@aws-sdk/middleware-logger"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.110.0.tgz"; - sha512 = "+pz+a+8dfTnzLj79nHrv3aONMp/N36/erMd+7JXeR84QEosVLrFBUwKA8x5x6O3s1iBbQzRKMYEIuja9xn1BPA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.127.0.tgz"; + sha512 = "jMNLcZB/ECA7OfkNBLNeAlrLRehyfnUeNQJHW3kcxs9h1+6VxaF6wY+WKozszLI7/3OBzQrFHBQCfRZV7ykSLg=="; }; }; - "@aws-sdk/middleware-recursion-detection-3.110.0" = { + "@aws-sdk/middleware-recursion-detection-3.127.0" = { name = "_at_aws-sdk_slash_middleware-recursion-detection"; packageName = "@aws-sdk/middleware-recursion-detection"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.110.0.tgz"; - sha512 = "Wav782zd7bcd1e6txRob76CDOdVOaUQ8HXoywiIm/uFrEEUZvhs2mgnXjVUVCMBUehdNgnL99z420aS13JeL/Q=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.127.0.tgz"; + sha512 = "tB6WX+Z1kUKTnn5h38XFrTCzoqPKjUZLUjN4Wb27/cbeSiTSKGAZcCXHOJm36Ukorl5arlybQTqGe689EU00Hw=="; }; }; - "@aws-sdk/middleware-retry-3.110.0" = { + "@aws-sdk/middleware-retry-3.127.0" = { name = "_at_aws-sdk_slash_middleware-retry"; packageName = "@aws-sdk/middleware-retry"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.110.0.tgz"; - sha512 = "lwLAQQveCiUqymQvVYjCee6QOXw3Zqbc9yq+pxYdXbs1Cv1XMA6PeJeUU5r5KEVuSceBLyyrnl6E0R1l1om1MQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.127.0.tgz"; + sha512 = "ZSvg/AyGUacWnf3i8ZbyImtiCH+NyafF8uV7bITP7JkwPrG+VdNocJZOr88GRM0c1A0jfkOf7+oq+fInPwwiNA=="; }; }; - "@aws-sdk/middleware-sdk-s3-3.110.0" = { + "@aws-sdk/middleware-sdk-s3-3.127.0" = { name = "_at_aws-sdk_slash_middleware-sdk-s3"; packageName = "@aws-sdk/middleware-sdk-s3"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.110.0.tgz"; - sha512 = "/PpZU11dkGldD6yeAccPxFd5nzofLOA3+j25RdIwz2jlJMLl9TeznYRtFH5JhHonP3lsK+IPEnFPwuL6gkBxIQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.127.0.tgz"; + sha512 = "q1mkEN7kYYdQ3LOHIhaT56omYe8DCubyiCKOXuEo5ZiIkE5iq06K/BxWxj3f8bFZxSX80Ma1m8XA5jcOEMphSA=="; }; }; - "@aws-sdk/middleware-sdk-sts-3.110.0" = { + "@aws-sdk/middleware-sdk-sts-3.130.0" = { name = "_at_aws-sdk_slash_middleware-sdk-sts"; packageName = "@aws-sdk/middleware-sdk-sts"; - version = "3.110.0"; + version = "3.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.110.0.tgz"; - sha512 = "EjY/YFdlr5jECde6qIrTIyGBbn/34CKcQGKvmvRd31+3qaClIJLAwNuHfcVzWvCUGbAslsfvdbOpLju33pSQRA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.130.0.tgz"; + sha512 = "FDfs7+ohbhEK3eH3Dshr6JDiL8P72bp3ffeNpPBXuURFqwt4pCmjHuX3SqQR0JIJ2cl3aIdxc17rKaZJfOjtPw=="; }; }; - "@aws-sdk/middleware-serde-3.110.0" = { + "@aws-sdk/middleware-serde-3.127.0" = { name = "_at_aws-sdk_slash_middleware-serde"; packageName = "@aws-sdk/middleware-serde"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.110.0.tgz"; - sha512 = "brVupxgEAmcZ9cZvdHEH8zncjvGKIiud8pOe4fiimp5NpHmjBLew4jUbnOKNZNAjaidcKUtz//cxtutD6yXEww=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.127.0.tgz"; + sha512 = "xmWMYV/t9M+b9yHjqaD1noDNJJViI2QwOH7TQZ9VbbrvdVtDrFuS9Sf9He80TBCJqeHShwQN9783W1I3Pu/8kw=="; }; }; - "@aws-sdk/middleware-signing-3.110.0" = { + "@aws-sdk/middleware-signing-3.130.0" = { name = "_at_aws-sdk_slash_middleware-signing"; packageName = "@aws-sdk/middleware-signing"; - version = "3.110.0"; + version = "3.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.110.0.tgz"; - sha512 = "y6ZKrGYfgDlFMzWhZmoq5J1UctBgZOUvMmnU9sSeZ020IlEPiOxFMvR0Zu6TcYThp8uy3P0wyjQtGYeTl9Z/kA=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.130.0.tgz"; + sha512 = "JePq5XLR9TfRN3RQ0d7Za/bEW5D3xgtD1FNAwHeenWALeozMuQgRPjM5RroCnL/5jY3wuvCZI7cSXeqhawWqmA=="; }; }; - "@aws-sdk/middleware-ssec-3.110.0" = { + "@aws-sdk/middleware-ssec-3.127.0" = { name = "_at_aws-sdk_slash_middleware-ssec"; packageName = "@aws-sdk/middleware-ssec"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.110.0.tgz"; - sha512 = "Zrm+h+C+MXv2Q+mh8O/zwK2hUYM4kq4I1vx72RPpvyfIk4/F5ZzeA3LSVluISyAW+iNqS8XFvGFrzl2gB8zWsg=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.127.0.tgz"; + sha512 = "R5A13EvdYPdYD2Tq9eW5jqIdscyZlQykQXFEolBD2oi4pew7TZpc/5aazZC0zo9YKJ29qiUR1P4NvjcFJ7zFBg=="; }; }; - "@aws-sdk/middleware-stack-3.110.0" = { + "@aws-sdk/middleware-stack-3.127.0" = { name = "_at_aws-sdk_slash_middleware-stack"; packageName = "@aws-sdk/middleware-stack"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.110.0.tgz"; - sha512 = "iaLHw6ctOuGa9UxNueU01Xes+15dR+mqioRpUOUZ9Zx+vhXVpD7C8lnNqhRnYeFXs10/rNIzASgsIrAHTlnlIQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.127.0.tgz"; + sha512 = "S1IoUE5o1vCmjsF5nIE8zlItNOM1UE+lhmZeigF7knXJ9+a6ewMB6POAj/s4eoi0wcn0eSnAGsqJCWMSUjOPLA=="; }; }; - "@aws-sdk/middleware-user-agent-3.110.0" = { + "@aws-sdk/middleware-user-agent-3.127.0" = { name = "_at_aws-sdk_slash_middleware-user-agent"; packageName = "@aws-sdk/middleware-user-agent"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.110.0.tgz"; - sha512 = "Y6FgiZr99DilYq6AjeaaWcNwVlSQpNGKrILzvV4Tmz03OaBIspe4KL+8EZ2YA/sAu5Lpw80vItdezqDOwGAlnQ=="; + url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.127.0.tgz"; + sha512 = "CHxgswoOzdkOEoIq7Oyob3Sx/4FYUv6BhUesAX7MNshaDDsTQPbSWjw5bqZDiL/gO+X/34fvqCVVpVD2GvxW/g=="; }; }; - "@aws-sdk/node-config-provider-3.110.0" = { + "@aws-sdk/node-config-provider-3.127.0" = { name = "_at_aws-sdk_slash_node-config-provider"; packageName = "@aws-sdk/node-config-provider"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.110.0.tgz"; - sha512 = "46p4dCPGYctuybTQTwLpjenA1QFHeyJw/OyggGbtUJUy+833+ldnAwcPVML2aXJKUKv3APGI8vq1kaloyNku3Q=="; + url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.127.0.tgz"; + sha512 = "bAHkASMhLZHT1yv2TX6OJGFV9Lc3t1gKfTMEKdXM2O2YhGfSx9A/qLeJm79oDfnILWQtSS2NicxlRDI2lYGf4g=="; }; }; - "@aws-sdk/node-http-handler-3.110.0" = { + "@aws-sdk/node-http-handler-3.127.0" = { name = "_at_aws-sdk_slash_node-http-handler"; packageName = "@aws-sdk/node-http-handler"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.110.0.tgz"; - sha512 = "/rP+hY516DpP8fZhwFW5xM/ElH0w6lxw/15VvZCoY5EnOLAF5XIsJdzscWPSEW2FHCylBM4SNrKhGar14BDXhA=="; + url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.127.0.tgz"; + sha512 = "pyMKvheK8eDwWLgYIRsWy8wiyhsbYYcqkZQs3Eh6upI4E8iCY7eMmhWvHYCibvsO+UjsOwa4cAMOfwnv/Z9s8A=="; }; }; - "@aws-sdk/property-provider-3.110.0" = { + "@aws-sdk/property-provider-3.127.0" = { name = "_at_aws-sdk_slash_property-provider"; packageName = "@aws-sdk/property-provider"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.110.0.tgz"; - sha512 = "7NkpmYeOkK3mhWBNU+/zSDqwzeaSPH1qrq4L//WV7WS/weYyE/jusQeZoOxVsuZQnQEXHt5O2hKVeUwShl12xA=="; + url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.127.0.tgz"; + sha512 = "JxenxlTEkWfLrtJqIjaXaJzAVQbbscoCb5bNjmdud07ESLVfWRKJx2nAJdecHKYp2M5NQyqBuFhQ1ELSFYQKCA=="; }; }; - "@aws-sdk/protocol-http-3.110.0" = { + "@aws-sdk/protocol-http-3.127.0" = { name = "_at_aws-sdk_slash_protocol-http"; packageName = "@aws-sdk/protocol-http"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.110.0.tgz"; - sha512 = "qdi2gCbJiyPyLn+afebPNp/5nVCRh1X7t7IRIFl3FHVEC+o54u/ojay/MLZ4M/+X9Fa4Zxsb0Wpp3T0xAHVDBg=="; + url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.127.0.tgz"; + sha512 = "UG83PVuKX40wilG2uRU0Fvz4OY8Bt+bSPOG776DFjwIXYzK7BwpJm9H2XI2HLhS5WxrJHhwrLBRgW6UiykMnFw=="; }; }; - "@aws-sdk/querystring-builder-3.110.0" = { + "@aws-sdk/querystring-builder-3.127.0" = { name = "_at_aws-sdk_slash_querystring-builder"; packageName = "@aws-sdk/querystring-builder"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.110.0.tgz"; - sha512 = "7V3CDXj519izmbBn9ZE68ymASwGriA+Aq+cb/yHSVtffnvXjPtvONNw7G/5iVblisGLSCUe2hSvpYtcaXozbHw=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.127.0.tgz"; + sha512 = "tsoyp4lLPsASPDYWsezGAHD8VJsZbjUNATNAzTCFdH6p+4SKBK83Q5kfXCzxt13M+l3oKbxxIWLvS0kVQFyltQ=="; }; }; - "@aws-sdk/querystring-parser-3.110.0" = { + "@aws-sdk/querystring-parser-3.127.0" = { name = "_at_aws-sdk_slash_querystring-parser"; packageName = "@aws-sdk/querystring-parser"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.110.0.tgz"; - sha512 = "//pJHH7hrhdDMZGBPKXKymmC/tJM7gFT0w/qbu/yd3Wm4W2fMB+8gkmj6EZctx7jrsWlfRQuvFejKqEfapur/g=="; + url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.127.0.tgz"; + sha512 = "Vn/Dv+PqUSepp/DzLqq0LJJD8HdPefJCnLbO5WcHCARHSGlyGlZUFEM45k/oEHpTvgMXj/ORaP3A+tLwLu0AmA=="; }; }; - "@aws-sdk/s3-request-presigner-3.113.0" = { + "@aws-sdk/s3-request-presigner-3.142.0" = { name = "_at_aws-sdk_slash_s3-request-presigner"; packageName = "@aws-sdk/s3-request-presigner"; - version = "3.113.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.113.0.tgz"; - sha512 = "ysA+an9LiIRXIUEKsU4OXQ8SNXFnh8pJxaUs5N/TwcamwsUBqNkEtvyNZbUrhnKXxxqBv6/yc5Lvmlho2uebgg=="; + url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.142.0.tgz"; + sha512 = "kHpiQHUwXDLmCi1n73+JBTDg90zOot+5jFEblc6WMyssG4tWmGIE65oyO2DYoP4Q5et1RGuhFRvQzXIrRiy5Aw=="; }; }; - "@aws-sdk/service-error-classification-3.110.0" = { + "@aws-sdk/service-error-classification-3.127.0" = { name = "_at_aws-sdk_slash_service-error-classification"; packageName = "@aws-sdk/service-error-classification"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.110.0.tgz"; - sha512 = "ccgCE0pU/4RmXR6CP3fLAdhPAve7bK/yXBbGzpSHGAQOXqNxYzOsAvQ30Jg6X+qjLHsI/HR2pLIE65z4k6tynw=="; + url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.127.0.tgz"; + sha512 = "wjZY9rnlA8SPrICUumTYicEKtK4/yKB62iadUk66hxe8MrH8JhuHH2NqIad0Pt/bK/YtNVhd3yb4pRapOeY5qQ=="; }; }; - "@aws-sdk/shared-ini-file-loader-3.110.0" = { + "@aws-sdk/shared-ini-file-loader-3.127.0" = { name = "_at_aws-sdk_slash_shared-ini-file-loader"; packageName = "@aws-sdk/shared-ini-file-loader"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.110.0.tgz"; - sha512 = "E1ERoqEoG206XNBYWCKLgHkzCbTxdpDEGbsLET2DnvjFsT0s9p2dPvVux3bYl7JVAhyGduE+qcqWk7MzhFCBNQ=="; + url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.127.0.tgz"; + sha512 = "S3Nn4KRTqoJsB/TbRZSWBBUrkckNMR0Juqz7bOB+wupVvddKP6IcpspSC/GX9zgJjVMV8iGisZ6AUsYsC5r+cA=="; }; }; - "@aws-sdk/signature-v4-3.110.0" = { + "@aws-sdk/signature-v4-3.130.0" = { name = "_at_aws-sdk_slash_signature-v4"; packageName = "@aws-sdk/signature-v4"; - version = "3.110.0"; + version = "3.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.110.0.tgz"; - sha512 = "utxxdllOnmQDhbpipnFAbuQ4c2pwefZ+2hi48jKvQRULQ2PO4nxLmdZm6B0FXaTijbKsyO7GrMik+EZ6mi3ARQ=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.130.0.tgz"; + sha512 = "g5G1a1NHL2uOoFfC2zQdZcj+wbjgBQPkx6xGdtqNKf9v2kS0n6ap5JUGEaqWE02lUlmWHsoMsS73hXtzwXaBRQ=="; }; }; - "@aws-sdk/signature-v4-multi-region-3.110.0" = { + "@aws-sdk/signature-v4-multi-region-3.130.0" = { name = "_at_aws-sdk_slash_signature-v4-multi-region"; packageName = "@aws-sdk/signature-v4-multi-region"; - version = "3.110.0"; + version = "3.130.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.110.0.tgz"; - sha512 = "D5nlq6em9fU9EMmpjQtLItr2d6MmfM9yofOaeNQcgY8wFJEOCc2ADccq8dCO0F4twakAvjuUIkBAWMBviiuC7Q=="; + url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.130.0.tgz"; + sha512 = "ZRRoPRoCVdkGDtjuog81pqHsSLfnXK6ELrWm4Dq8xdcHQGbEDNdYmeXARXG9yPAO42x9yIJXHNutMz5Y/P64cw=="; }; }; - "@aws-sdk/smithy-client-3.110.0" = { + "@aws-sdk/smithy-client-3.142.0" = { name = "_at_aws-sdk_slash_smithy-client"; packageName = "@aws-sdk/smithy-client"; - version = "3.110.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.110.0.tgz"; - sha512 = "gNLYrmdAe/1hVF2Nv2LF4OkL1A0a1o708pEMZHzql9xP164omRDaLrGDhz9tH7tsJEgLz+Bf4E8nTuISeDwvGg=="; + url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.142.0.tgz"; + sha512 = "G38YWTfSFZb5cOH6IwLct530Uy8pnmJvJFeC1pd1nkKD4PRZb+bI2w4xXSX+znYdLA71RYK620OtVKJlB44PtA=="; }; }; - "@aws-sdk/types-3.110.0" = { + "@aws-sdk/types-3.127.0" = { name = "_at_aws-sdk_slash_types"; packageName = "@aws-sdk/types"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.110.0.tgz"; - sha512 = "dLVoqODU3laaqNFPyN1QLtlQnwX4gNPMXptEBIt/iJpuZf66IYJe6WCzVZGt4Zfa1CnUmrlA428AzdcA/KCr2A=="; + url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.127.0.tgz"; + sha512 = "e0wtx2IkOl7rwfKfLH5pPTzQ+d45V7b1WrjeL0WDI8kOu6w+sXmhNxI6uM2kf0k4NiTLN84lW290AEWupey9Og=="; }; }; - "@aws-sdk/url-parser-3.110.0" = { + "@aws-sdk/url-parser-3.127.0" = { name = "_at_aws-sdk_slash_url-parser"; packageName = "@aws-sdk/url-parser"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.110.0.tgz"; - sha512 = "tILFB8/Q73yzgO0dErJNnELmmBszd0E6FucwAnG3hfDefjqCBe09Q/1yhu2aARXyRmZa4AKp0sWcdwIWHc8dnA=="; + url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.127.0.tgz"; + sha512 = "njZ7zn41JHRpNfr3BCesVXCLZE0zcWSfEdtRV0ICw0cU1FgYcKELSuY9+gLUB4ci6uc7gq7mPE8+w30FcM4QeA=="; }; }; "@aws-sdk/util-arn-parser-3.55.0" = { @@ -1039,40 +1084,40 @@ let sha512 = "GrAZl/aBv0A28LkyNyq8SPJ5fmViCwz80fWLMeWx/6q5AbivuILogjlWwEZSvZ9zrlHOcFC0+AnCa5pQrjaslw=="; }; }; - "@aws-sdk/util-create-request-3.110.0" = { + "@aws-sdk/util-create-request-3.142.0" = { name = "_at_aws-sdk_slash_util-create-request"; packageName = "@aws-sdk/util-create-request"; - version = "3.110.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.110.0.tgz"; - sha512 = "8u+6WjzVNUdG4181y/zafIlGJ80qdSIKo09utlY7kvSZhYeufjkgMLhJtthb9uEEmXNn/UlKGJNRbGChjSL4Xw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.142.0.tgz"; + sha512 = "NP7v7Cf251Irbwa25aFcUCSaL7/JbxdlgVDyXtXlAQ6j+USIz0MczdHKnX5bRgnnloCJv7I4f935ZApLIVLh5w=="; }; }; - "@aws-sdk/util-defaults-mode-browser-3.110.0" = { + "@aws-sdk/util-defaults-mode-browser-3.142.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-browser"; packageName = "@aws-sdk/util-defaults-mode-browser"; - version = "3.110.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.110.0.tgz"; - sha512 = "Y2dcOOD20S3bv/IjUqpdKIiDt6995SXNG5Pu/LeSdXNyLCOIm9rX4gHTxl9fC1KK5M/gR9fGJ362f67WwqEEqw=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.142.0.tgz"; + sha512 = "vVB/CrodMmIfv4v54MyBlKO0sQSI/+Mvs4g5gMyVjmT4a+1gnktJQ9R6ZHQ2/ErGewcra6eH9MU5T0r1kYe0+w=="; }; }; - "@aws-sdk/util-defaults-mode-node-3.110.0" = { + "@aws-sdk/util-defaults-mode-node-3.142.0" = { name = "_at_aws-sdk_slash_util-defaults-mode-node"; packageName = "@aws-sdk/util-defaults-mode-node"; - version = "3.110.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.110.0.tgz"; - sha512 = "Cr3Z5nyrw1KowjbW76xp8hkT/zJtYjAVZ9PS4l84KxIicbVvDOBpxG3yNddkuQcavmlH6G4wH9uM5DcnpKDncg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.142.0.tgz"; + sha512 = "13d5RZLO13EDwll3COUq3D4KVsqM63kdf+YjG5mzXR1eXo6GVjghfQfiy0MYM6YbAjTfJxZQkc0nFgWLU8jdyg=="; }; }; - "@aws-sdk/util-format-url-3.110.0" = { + "@aws-sdk/util-format-url-3.127.0" = { name = "_at_aws-sdk_slash_util-format-url"; packageName = "@aws-sdk/util-format-url"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.110.0.tgz"; - sha512 = "NES/Kf92stj6bMl3WyaKFlA5yKbYlb357buoXKv51MnjcLL6NAgIWm0lMQv6UgzLVTxKdbw4BxErpSiKM+10Xg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.127.0.tgz"; + sha512 = "leZeq6vxm6MSpu9Ruc5WKr7pzJ8kVXNJVerB4ixEk5KtFPPrJDw7MoEtnbnhVzhraLUnqHqYvrb6OlmkkISR+Q=="; }; }; "@aws-sdk/util-hex-encoding-3.109.0" = { @@ -1093,31 +1138,31 @@ let sha512 = "0sPmK2JaJE2BbTcnvybzob/VrFKCXKfN4CUKcvn0yGg/me7Bz+vtzQRB3Xp+YSx+7OtWxzv63wsvHoAnXvgxgg=="; }; }; - "@aws-sdk/util-middleware-3.110.0" = { + "@aws-sdk/util-middleware-3.127.0" = { name = "_at_aws-sdk_slash_util-middleware"; packageName = "@aws-sdk/util-middleware"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.110.0.tgz"; - sha512 = "PTVWrI5fA9d5hHJs6RzX2dIS2jRQ3uW073Fm0BePpQeDdZrEk+S5KNwRhUtpN6sdSV45vm6S9rrjZUG51qwGmA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.127.0.tgz"; + sha512 = "EwAPPed9TNqh+Wov2VStLn2NuJ/Wyt7IkZCbCsBuSNp3BFZ1V4gfwTjqtKCtB2LQgQ48MTgWgNCvrH0zjCSPGg=="; }; }; - "@aws-sdk/util-stream-browser-3.110.0" = { + "@aws-sdk/util-stream-browser-3.131.0" = { name = "_at_aws-sdk_slash_util-stream-browser"; packageName = "@aws-sdk/util-stream-browser"; - version = "3.110.0"; + version = "3.131.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.110.0.tgz"; - sha512 = "kAMrHtgrhr6ODRnzt/V+LSDVDvejcbdUp19n4My2vrPwKw3lM65vT+FAPIlGeDQBtOOhmlTbrYM3G3KKnlnHyg=="; + url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.131.0.tgz"; + sha512 = "1YFbBPDu+elIgp8z1woUfT7zM+2PAvgJiw6ljDBuAlJzsP5xMhwk0X9e+8aQ+Qe4XftA0e7y/PH0gqvjNgCx2A=="; }; }; - "@aws-sdk/util-stream-node-3.110.0" = { + "@aws-sdk/util-stream-node-3.129.0" = { name = "_at_aws-sdk_slash_util-stream-node"; packageName = "@aws-sdk/util-stream-node"; - version = "3.110.0"; + version = "3.129.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.110.0.tgz"; - sha512 = "jgkO7aLRpE3EUqU5XUdo0FmlyBVCFHKyHd/jdEN8h9+XMa44rl2QMdOSFQtwaNI4NC8J+OC66u2dQ+8QQnOLig=="; + url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.129.0.tgz"; + sha512 = "1iWqsWvVXyP4JLPPPs8tBZKyzs7D5e7KctXuCtIjI+cnGOCeVLL+X4L/7KDZfV7sI2D6vONtIoTnUjMl5V/kEg=="; }; }; "@aws-sdk/util-uri-escape-3.55.0" = { @@ -1129,22 +1174,22 @@ let sha512 = "mmdDLUpFCN2nkfwlLdOM54lTD528GiGSPN1qb8XtGLgZsJUmg3uJSFIN2lPeSbEwJB3NFjVas/rnQC48i7mV8w=="; }; }; - "@aws-sdk/util-user-agent-browser-3.110.0" = { + "@aws-sdk/util-user-agent-browser-3.127.0" = { name = "_at_aws-sdk_slash_util-user-agent-browser"; packageName = "@aws-sdk/util-user-agent-browser"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.110.0.tgz"; - sha512 = "rNdhmHDMV5dNJctqlBWimkZLJRB+x03DB+61pm+SKSFk6gPIVIvc1WNXqDFphkiswT4vA13ZUkGHzt+N4+noQQ=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.127.0.tgz"; + sha512 = "uO2oHmJswuYKJS+GiMdYI8izhpC9M7/jFFvnAmLlTEVwpEi1VX9KePAOF+u5AaBC2kzITo/7dg141XfRHZloIQ=="; }; }; - "@aws-sdk/util-user-agent-node-3.110.0" = { + "@aws-sdk/util-user-agent-node-3.127.0" = { name = "_at_aws-sdk_slash_util-user-agent-node"; packageName = "@aws-sdk/util-user-agent-node"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.110.0.tgz"; - sha512 = "OQ915TPCCBwZWz5Np8zkNWn7U6KvrTZfFoCOy/VIemK3dUqmnBZ7HqGpuZx8SwJ2R9JE1x+j0niYSJ5fWJZZKA=="; + url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.127.0.tgz"; + sha512 = "3P/M4ZDD2qMeeoCk7TE/Mw7cG5IjB87F6BP8nI8/oHuaz7j6fsI7D49SNpyjl8JApRynZ122Ad6hwQwRj3isYw=="; }; }; "@aws-sdk/util-utf8-browser-3.109.0" = { @@ -1165,22 +1210,22 @@ let sha512 = "Ti/ZBdvz2eSTElsucjzNmzpyg2MwfD1rXmxD0hZuIF8bPON/0+sZYnWd5CbDw9kgmhy28dmKue086tbZ1G0iLQ=="; }; }; - "@aws-sdk/util-waiter-3.110.0" = { + "@aws-sdk/util-waiter-3.127.0" = { name = "_at_aws-sdk_slash_util-waiter"; packageName = "@aws-sdk/util-waiter"; - version = "3.110.0"; + version = "3.127.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.110.0.tgz"; - sha512 = "8dE6W6XYfjk1gx/aeb8NeLfMMLkLFhlV1lmKpFSBJhY8msajU8aQahTuykq5JW8QT/wCGbqbu7dH35SdX7kO+A=="; + url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.127.0.tgz"; + sha512 = "E5qrRpBJS8dmClqSDW1pWVMKzCG/mxabG6jVUtlW/WLHnl/znxGaOQc6tnnwKik0nEq/4DpT9fEfPUz9JiLrkw=="; }; }; - "@aws-sdk/xml-builder-3.109.0" = { + "@aws-sdk/xml-builder-3.142.0" = { name = "_at_aws-sdk_slash_xml-builder"; packageName = "@aws-sdk/xml-builder"; - version = "3.109.0"; + version = "3.142.0"; src = fetchurl { - url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.109.0.tgz"; - sha512 = "+aAXynnrqya1Eukz4Gxch4xIXCZolIMWGD4Ll/Q5yXT5uAjGh2HQWd9J0LWE+gYChpWetZbAVYZ3cEJ6F+SpZA=="; + url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.142.0.tgz"; + sha512 = "e8rFjm5y9ngFc/cPwWMNn/CmMMrLx98CajWew9q7OzP6OOXQJ0H6TaRps2uQPM5XUv3/Ab5YQCV3NiaLJLqqNg=="; }; }; "@azu/format-text-1.0.1" = { @@ -1201,13 +1246,13 @@ let sha512 = "L7iaxNrk0OLsH7kw3yx3KVQTKhc2zeW0D9SLrRCqbTZi3XtvSVmmjqO73kR4EnWbTRZ18mwdAikbFYJ0coZ55Q=="; }; }; - "@babel/cli-7.17.10" = { + "@babel/cli-7.18.10" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.17.10"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.10.tgz"; - sha512 = "OygVO1M2J4yPMNOW9pb+I6kFGpQK77HmG44Oz3hg8xQIl5L/2zq+ZohwAdSaqYgVwM0SfmPHZHphH4wR8qzVYw=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.18.10.tgz"; + sha512 = "dLvWH+ZDFAkd2jPBSghrsFBuXrREvFwjpDycXbmUoeochqKYe4zNSLEJYErpLg8dvxvZYe79/MkN461XCwpnGw=="; }; }; "@babel/code-frame-7.10.4" = { @@ -1228,31 +1273,31 @@ let sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/code-frame-7.16.7" = { + "@babel/code-frame-7.18.6" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; - sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.18.5" = { + "@babel/compat-data-7.18.8" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.18.5"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.5.tgz"; - sha512 = "BxhE40PVCBxVEJsSBhB6UWyAuqJRxGsAw8BdHMJ3AKGydcwuWW4kOO3HmqBQAdcq/OP+/DlTVxLvsCzRTnZuGg=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"; + sha512 = "HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="; }; }; - "@babel/core-7.18.5" = { + "@babel/core-7.18.10" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.18.5"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz"; - sha512 = "MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz"; + sha512 = "JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw=="; }; }; "@babel/core-7.9.0" = { @@ -1264,6 +1309,15 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; + "@babel/generator-7.18.10" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.18.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.10.tgz"; + sha512 = "0+sW7e3HjQbiHbj1NeU/vN8ornohYlacAfZIaXhdoGweQqgcNy69COVciYYqEXJ/v+9OBA7Frxm4CVAuNqKeNA=="; + }; + }; "@babel/generator-7.18.2" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -1273,418 +1327,427 @@ let sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; }; }; - "@babel/helper-annotate-as-pure-7.16.7" = { + "@babel/helper-annotate-as-pure-7.18.6" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; - sha512 = "s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; + sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.18.9" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.16.7"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz"; - sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"; + sha512 = "yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw=="; }; }; - "@babel/helper-compilation-targets-7.18.2" = { + "@babel/helper-compilation-targets-7.18.9" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz"; - sha512 = "s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz"; + sha512 = "tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg=="; }; }; - "@babel/helper-create-class-features-plugin-7.18.0" = { + "@babel/helper-create-class-features-plugin-7.18.9" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz"; - sha512 = "Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz"; + sha512 = "WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.17.12" = { + "@babel/helper-create-regexp-features-plugin-7.18.6" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz"; - sha512 = "b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"; + sha512 = "7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="; }; }; - "@babel/helper-define-polyfill-provider-0.3.1" = { + "@babel/helper-define-polyfill-provider-0.3.2" = { name = "_at_babel_slash_helper-define-polyfill-provider"; packageName = "@babel/helper-define-polyfill-provider"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"; - sha512 = "J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA=="; + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz"; + sha512 = "r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg=="; }; }; - "@babel/helper-environment-visitor-7.18.2" = { + "@babel/helper-environment-visitor-7.18.9" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz"; - sha512 = "14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; + sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; }; }; - "@babel/helper-explode-assignable-expression-7.16.7" = { + "@babel/helper-explode-assignable-expression-7.18.6" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"; - sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"; + sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; }; }; - "@babel/helper-function-name-7.17.9" = { + "@babel/helper-function-name-7.18.9" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.17.9"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"; - sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz"; + sha512 = "fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A=="; }; }; - "@babel/helper-hoist-variables-7.16.7" = { + "@babel/helper-hoist-variables-7.18.6" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; - sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; + sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.17.7" = { + "@babel/helper-member-expression-to-functions-7.18.9" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.17.7"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz"; - sha512 = "thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; + sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; }; }; - "@babel/helper-module-imports-7.16.7" = { + "@babel/helper-module-imports-7.18.6" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; - sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; + sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.18.0" = { + "@babel/helper-module-transforms-7.18.9" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz"; - sha512 = "kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz"; + sha512 = "KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g=="; }; }; - "@babel/helper-optimise-call-expression-7.16.7" = { + "@babel/helper-optimise-call-expression-7.18.6" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; - sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; + sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; }; - "@babel/helper-plugin-utils-7.17.12" = { + "@babel/helper-plugin-utils-7.18.9" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz"; - sha512 = "JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz"; + sha512 = "aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="; }; }; - "@babel/helper-remap-async-to-generator-7.16.8" = { + "@babel/helper-remap-async-to-generator-7.18.9" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.8"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"; - sha512 = "fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"; + sha512 = "dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA=="; }; }; - "@babel/helper-replace-supers-7.18.2" = { + "@babel/helper-replace-supers-7.18.9" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz"; - sha512 = "XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; + sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; }; }; - "@babel/helper-simple-access-7.18.2" = { + "@babel/helper-simple-access-7.18.6" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz"; - sha512 = "7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; + sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { + "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.16.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"; - sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz"; + sha512 = "imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw=="; }; }; - "@babel/helper-split-export-declaration-7.16.7" = { + "@babel/helper-split-export-declaration-7.18.6" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; - sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; + sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-validator-identifier-7.16.7" = { + "@babel/helper-string-parser-7.18.10" = { + name = "_at_babel_slash_helper-string-parser"; + packageName = "@babel/helper-string-parser"; + version = "7.18.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"; + sha512 = "XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw=="; + }; + }; + "@babel/helper-validator-identifier-7.18.6" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; - sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; + sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; }; }; - "@babel/helper-validator-option-7.16.7" = { + "@babel/helper-validator-option-7.18.6" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; - sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; + sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; }; - "@babel/helper-wrap-function-7.16.8" = { + "@babel/helper-wrap-function-7.18.10" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.16.8"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"; - sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.10.tgz"; + sha512 = "95NLBP59VWdfK2lyLKe6eTMq9xg+yWKzxzxbJ1wcYNi1Auz200+83fMDADjRxBvc2QQor5zja2yTQzXGhk2GtQ=="; }; }; - "@babel/helpers-7.18.2" = { + "@babel/helpers-7.18.9" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz"; - sha512 = "j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz"; + sha512 = "Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ=="; }; }; - "@babel/highlight-7.17.12" = { + "@babel/highlight-7.18.6" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz"; - sha512 = "7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/node-7.18.5" = { + "@babel/node-7.18.10" = { name = "_at_babel_slash_node"; packageName = "@babel/node"; - version = "7.18.5"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/node/-/node-7.18.5.tgz"; - sha512 = "zv94ESipS2/YKAOJ+/WAfVEzsl9M8UmPZ7Hwx5qVPgytdrgwUPxfi700iR9KO/w5ZhIHyFyvoZtCTSEcQJF8vQ=="; + url = "https://registry.npmjs.org/@babel/node/-/node-7.18.10.tgz"; + sha512 = "VbqzK6QXfQVi4Bpk6J7XqHXKFNbG2j3rdIdx68+/14GDU7jXDOSyUU/cwqCM1fDwCdxp37pNV/ToSCXsNChcyA=="; }; }; - "@babel/parser-7.17.10" = { + "@babel/parser-7.18.10" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.17.10"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.10.tgz"; - sha512 = "n2Q6i+fnJqzOaq2VkdXxy2TCPCWQZHiCo0XqmrCvDWcZQKRyZzYi4Z0yxlBuN0w+r2ZHmre+Q087DSrw3pbJDQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.10.tgz"; + sha512 = "TYk3OA0HKL6qNryUayb5UUEhM/rkOQozIBEA5ITXh5DWrSp0TlUQXMyZmnWxG/DizSWBeeQ0Zbc5z8UGaaqoeg=="; }; }; - "@babel/parser-7.18.5" = { + "@babel/parser-7.18.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.5"; + version = "7.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz"; - sha512 = "YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz"; + sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz"; - sha512 = "xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"; + sha512 = "Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz"; - sha512 = "/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz"; + sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.17.12" = { + "@babel/plugin-proposal-async-generator-functions-7.18.10" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.17.12"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz"; - sha512 = "RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz"; + sha512 = "1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew=="; }; }; - "@babel/plugin-proposal-class-properties-7.17.12" = { + "@babel/plugin-proposal-class-properties-7.18.6" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz"; - sha512 = "U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"; + sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-class-static-block-7.18.0" = { + "@babel/plugin-proposal-class-static-block-7.18.6" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz"; - sha512 = "t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"; + sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.16.7" = { + "@babel/plugin-proposal-dynamic-import-7.18.6" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"; - sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"; + sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; }; }; - "@babel/plugin-proposal-export-default-from-7.17.12" = { + "@babel/plugin-proposal-export-default-from-7.18.10" = { name = "_at_babel_slash_plugin-proposal-export-default-from"; packageName = "@babel/plugin-proposal-export-default-from"; - version = "7.17.12"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.17.12.tgz"; - sha512 = "LpsTRw725eBAXXKUOnJJct+SEaOzwR78zahcLuripD2+dKc2Sj+8Q2DzA+GC/jOpOu/KlDXuxrzG214o1zTauQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-default-from/-/plugin-proposal-export-default-from-7.18.10.tgz"; + sha512 = "5H2N3R2aQFxkV4PIBUR/i7PUSwgTZjouJKzI8eKswfIjT0PhvzkPn0t0wIS5zn6maQuvtT0t1oHtMUz61LOuow=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.17.12" = { + "@babel/plugin-proposal-export-namespace-from-7.18.9" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz"; - sha512 = "j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"; + sha512 = "k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA=="; }; }; - "@babel/plugin-proposal-json-strings-7.17.12" = { + "@babel/plugin-proposal-json-strings-7.18.6" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz"; - sha512 = "rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"; + sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.17.12" = { + "@babel/plugin-proposal-logical-assignment-operators-7.18.9" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz"; - sha512 = "EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz"; + sha512 = "128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz"; - sha512 = "ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"; + sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.16.7" = { + "@babel/plugin-proposal-numeric-separator-7.18.6" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz"; - sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; + sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.18.0" = { + "@babel/plugin-proposal-object-rest-spread-7.18.9" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz"; - sha512 = "nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; + sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { + "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"; - sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"; + sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.17.12" = { + "@babel/plugin-proposal-optional-chaining-7.18.9" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz"; - sha512 = "7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz"; + sha512 = "v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w=="; }; }; - "@babel/plugin-proposal-private-methods-7.17.12" = { + "@babel/plugin-proposal-private-methods-7.18.6" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz"; - sha512 = "SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"; + sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.17.12" = { + "@babel/plugin-proposal-private-property-in-object-7.18.6" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz"; - sha512 = "/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"; + sha512 = "9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.17.12" = { + "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz"; - sha512 = "Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"; + sha512 = "2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -1723,13 +1786,13 @@ let sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; }; }; - "@babel/plugin-syntax-export-default-from-7.16.7" = { + "@babel/plugin-syntax-export-default-from-7.18.6" = { name = "_at_babel_slash_plugin-syntax-export-default-from"; packageName = "@babel/plugin-syntax-export-default-from"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.16.7.tgz"; - sha512 = "4C3E4NsrLOgftKaTYTULhHsuQrGv3FHrBzOMDiS7UYKIpgGBkAdawg4h+EI8zPeK9M0fiIIh72hIwsI24K7MbA=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-export-default-from/-/plugin-syntax-export-default-from-7.18.6.tgz"; + sha512 = "Kr//z3ujSVNx6E9z9ih5xXXMqK07VVTuqPmqGe6Mss/zW5XPeLZeSDZoP9ab/hT4wPKqAgjl2PnhPrcpk8Seew=="; }; }; "@babel/plugin-syntax-export-namespace-from-7.8.3" = { @@ -1741,22 +1804,22 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-flow-7.17.12" = { + "@babel/plugin-syntax-flow-7.18.6" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.17.12.tgz"; - sha512 = "B8QIgBvkIG6G2jgsOHQUist7Sm0EBLDCx8sen072IwqNuzMegZNXrYnSv77cYzA8mLDZAfQYqsLIhimiP1s2HQ=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.18.6.tgz"; + sha512 = "LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A=="; }; }; - "@babel/plugin-syntax-import-assertions-7.17.12" = { + "@babel/plugin-syntax-import-assertions-7.18.6" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz"; - sha512 = "n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"; + sha512 = "/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ=="; }; }; "@babel/plugin-syntax-json-strings-7.8.3" = { @@ -1768,13 +1831,13 @@ let sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; }; }; - "@babel/plugin-syntax-jsx-7.17.12" = { + "@babel/plugin-syntax-jsx-7.18.6" = { name = "_at_babel_slash_plugin-syntax-jsx"; packageName = "@babel/plugin-syntax-jsx"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz"; - sha512 = "spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz"; + sha512 = "6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q=="; }; }; "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { @@ -1849,364 +1912,364 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.17.12" = { + "@babel/plugin-syntax-typescript-7.18.6" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz"; - sha512 = "TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz"; + sha512 = "mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA=="; }; }; - "@babel/plugin-transform-arrow-functions-7.17.12" = { + "@babel/plugin-transform-arrow-functions-7.18.6" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz"; - sha512 = "PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"; + sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.17.12" = { + "@babel/plugin-transform-async-to-generator-7.18.6" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz"; - sha512 = "J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"; + sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.16.7" = { + "@babel/plugin-transform-block-scoped-functions-7.18.6" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"; - sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; + sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.18.4" = { + "@babel/plugin-transform-block-scoping-7.18.9" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.18.4"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz"; - sha512 = "+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; + sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; }; }; - "@babel/plugin-transform-classes-7.18.4" = { + "@babel/plugin-transform-classes-7.18.9" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.18.4"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz"; - sha512 = "e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz"; + sha512 = "EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g=="; }; }; - "@babel/plugin-transform-computed-properties-7.17.12" = { + "@babel/plugin-transform-computed-properties-7.18.9" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz"; - sha512 = "a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz"; + sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.18.0" = { + "@babel/plugin-transform-destructuring-7.18.9" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz"; - sha512 = "Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz"; + sha512 = "p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA=="; }; }; - "@babel/plugin-transform-dotall-regex-7.16.7" = { + "@babel/plugin-transform-dotall-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"; - sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; + sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.17.12" = { + "@babel/plugin-transform-duplicate-keys-7.18.9" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz"; - sha512 = "EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"; + sha512 = "d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.16.7" = { + "@babel/plugin-transform-exponentiation-operator-7.18.6" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"; - sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; + sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; }; }; - "@babel/plugin-transform-flow-strip-types-7.17.12" = { + "@babel/plugin-transform-flow-strip-types-7.18.9" = { name = "_at_babel_slash_plugin-transform-flow-strip-types"; packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.17.12.tgz"; - sha512 = "g8cSNt+cHCpG/uunPQELdq/TeV3eg1OLJYwxypwHtAWo9+nErH3lQx9CSO2uI9lF74A0mR0t4KoMjs1snSgnTw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.18.9.tgz"; + sha512 = "+G6rp2zRuOAInY5wcggsx4+QVao1qPM0osC9fTUVlAV3zOrzTCnrMAFVnR6+a3T8wz1wFIH7KhYMcMB3u1n80A=="; }; }; - "@babel/plugin-transform-for-of-7.18.1" = { + "@babel/plugin-transform-for-of-7.18.8" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.18.1"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz"; - sha512 = "+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; + sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; }; }; - "@babel/plugin-transform-function-name-7.16.7" = { + "@babel/plugin-transform-function-name-7.18.9" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.16.7"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"; - sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"; + sha512 = "WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ=="; }; }; - "@babel/plugin-transform-literals-7.17.12" = { + "@babel/plugin-transform-literals-7.18.9" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz"; - sha512 = "8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"; + sha512 = "IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.16.7" = { + "@babel/plugin-transform-member-expression-literals-7.18.6" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"; - sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; + sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; }; }; - "@babel/plugin-transform-modules-amd-7.18.0" = { + "@babel/plugin-transform-modules-amd-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz"; - sha512 = "h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; + sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.18.2" = { + "@babel/plugin-transform-modules-commonjs-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz"; - sha512 = "f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; + sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.18.5" = { + "@babel/plugin-transform-modules-systemjs-7.18.9" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.18.5"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.5.tgz"; - sha512 = "SEewrhPpcqMF1V7DhnEbhVJLrC+nnYfe1E0piZMZXBpxi9WvZqWGwpsk7JYP7wPWeqaBh4gyKlBhHJu3uz5g4Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz"; + sha512 = "zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A=="; }; }; - "@babel/plugin-transform-modules-umd-7.18.0" = { + "@babel/plugin-transform-modules-umd-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz"; - sha512 = "d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; + sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.17.12" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz"; - sha512 = "vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz"; + sha512 = "UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg=="; }; }; - "@babel/plugin-transform-new-target-7.18.5" = { + "@babel/plugin-transform-new-target-7.18.6" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.18.5"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.5.tgz"; - sha512 = "TuRL5uGW4KXU6OsRj+mLp9BM7pO8e7SGNTEokQRRxHFkXYMFiy2jlKSZPFtI/mKORDzciH+hneskcSOp0gU8hg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; + sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; }; }; - "@babel/plugin-transform-object-super-7.16.7" = { + "@babel/plugin-transform-object-super-7.18.6" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"; - sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; + sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.17.12" = { + "@babel/plugin-transform-parameters-7.18.8" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.17.12"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz"; - sha512 = "6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; + sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; }; }; - "@babel/plugin-transform-property-literals-7.16.7" = { + "@babel/plugin-transform-property-literals-7.18.6" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"; - sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; + sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; }; }; - "@babel/plugin-transform-react-display-name-7.16.7" = { + "@babel/plugin-transform-react-display-name-7.18.6" = { name = "_at_babel_slash_plugin-transform-react-display-name"; packageName = "@babel/plugin-transform-react-display-name"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.16.7.tgz"; - sha512 = "qgIg8BcZgd0G/Cz916D5+9kqX0c7nPZyXaP8R2tLNN5tkyIZdG5fEwBrxwplzSnjC1jvQmyMNVwUCZPcbGY7Pg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz"; + sha512 = "TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA=="; }; }; - "@babel/plugin-transform-react-jsx-7.17.12" = { + "@babel/plugin-transform-react-jsx-7.18.10" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.17.12"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz"; - sha512 = "Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.18.10.tgz"; + sha512 = "gCy7Iikrpu3IZjYZolFE4M1Sm+nrh1/6za2Ewj77Z+XirT4TsbJcvOFOyF+fRPwU6AKKK136CZxx6L8AbSFG6A=="; }; }; - "@babel/plugin-transform-react-jsx-development-7.16.7" = { + "@babel/plugin-transform-react-jsx-development-7.18.6" = { name = "_at_babel_slash_plugin-transform-react-jsx-development"; packageName = "@babel/plugin-transform-react-jsx-development"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.16.7.tgz"; - sha512 = "RMvQWvpla+xy6MlBpPlrKZCMRs2AGiHOGHY3xRwl0pEeim348dDyxeH4xBsMPbIMhujeq7ihE702eM2Ew0Wo+A=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz"; + sha512 = "SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA=="; }; }; - "@babel/plugin-transform-react-pure-annotations-7.18.0" = { + "@babel/plugin-transform-react-pure-annotations-7.18.6" = { name = "_at_babel_slash_plugin-transform-react-pure-annotations"; packageName = "@babel/plugin-transform-react-pure-annotations"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.0.tgz"; - sha512 = "6+0IK6ouvqDn9bmEG7mEyF/pwlJXVj5lwydybpyyH3D0A7Hftk+NCTdYjnLNZksn261xaOV5ksmp20pQEmc2RQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz"; + sha512 = "I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ=="; }; }; - "@babel/plugin-transform-regenerator-7.18.0" = { + "@babel/plugin-transform-regenerator-7.18.6" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz"; - sha512 = "C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"; + sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="; }; }; - "@babel/plugin-transform-reserved-words-7.17.12" = { + "@babel/plugin-transform-reserved-words-7.18.6" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz"; - sha512 = "1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; + sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; }; }; - "@babel/plugin-transform-runtime-7.18.5" = { + "@babel/plugin-transform-runtime-7.18.10" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.18.5"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.5.tgz"; - sha512 = "Q17hHxXr2fplrE+5BSC1j1Fo5cOA8YeP8XW3/1paI8MzF/faZGh0MaH1KC4jLAvqLPamQWHB5/B7KqSLY1kuHA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz"; + sha512 = "q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.7" = { + "@babel/plugin-transform-shorthand-properties-7.18.6" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; - sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; + sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; }; }; - "@babel/plugin-transform-spread-7.17.12" = { + "@babel/plugin-transform-spread-7.18.9" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz"; - sha512 = "9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz"; + sha512 = "39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA=="; }; }; - "@babel/plugin-transform-sticky-regex-7.16.7" = { + "@babel/plugin-transform-sticky-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"; - sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; + sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; }; }; - "@babel/plugin-transform-template-literals-7.18.2" = { + "@babel/plugin-transform-template-literals-7.18.9" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz"; - sha512 = "/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"; + sha512 = "S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.17.12" = { + "@babel/plugin-transform-typeof-symbol-7.18.9" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz"; - sha512 = "Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"; + sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-typescript-7.18.4" = { + "@babel/plugin-transform-typescript-7.18.10" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.18.4"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz"; - sha512 = "l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.10.tgz"; + sha512 = "j2HQCJuMbi88QftIb5zlRu3c7PU+sXNnscqsrjqegoGiCgXR569pEdben9vly5QHKL2ilYkfnSwu64zsZo/VYQ=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.16.7" = { + "@babel/plugin-transform-unicode-escapes-7.18.10" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.16.7"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz"; - sha512 = "TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"; + sha512 = "kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ=="; }; }; - "@babel/plugin-transform-unicode-regex-7.16.7" = { + "@babel/plugin-transform-unicode-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"; - sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; + sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; }; }; "@babel/polyfill-7.12.1" = { @@ -2218,22 +2281,22 @@ let sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g=="; }; }; - "@babel/preset-env-7.18.2" = { + "@babel/preset-env-7.18.10" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.18.2"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz"; - sha512 = "PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.10.tgz"; + sha512 = "wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA=="; }; }; - "@babel/preset-flow-7.17.12" = { + "@babel/preset-flow-7.18.6" = { name = "_at_babel_slash_preset-flow"; packageName = "@babel/preset-flow"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.17.12.tgz"; - sha512 = "7QDz7k4uiaBdu7N89VKjUn807pJRXmdirQu0KyR9LXnQrr5Jt41eIMKTS7ljej+H29erwmMrwq9Io9mJHLI3Lw=="; + url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.18.6.tgz"; + sha512 = "E7BDhL64W6OUqpuyHnSroLnqyRTcG6ZdOBl1OKI/QK/HJfplqK/S3sq1Cckx7oTodJ5yOXyfw7rEADJ6UjoQDQ=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -2245,13 +2308,13 @@ let sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; }; }; - "@babel/preset-react-7.17.12" = { + "@babel/preset-react-7.18.6" = { name = "_at_babel_slash_preset-react"; packageName = "@babel/preset-react"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.17.12.tgz"; - sha512 = "h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA=="; + url = "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.18.6.tgz"; + sha512 = "zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg=="; }; }; "@babel/preset-stage-0-7.8.3" = { @@ -2263,31 +2326,40 @@ let sha512 = "+l6FlG1j73t4wh78W41StbcCz0/9a1/y+vxfnjtHl060kSmcgMfGzK9MEkLvrCOXfhp9RCX+d88sm6rOqxEIEQ=="; }; }; - "@babel/preset-typescript-7.17.12" = { + "@babel/preset-typescript-7.18.6" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz"; - sha512 = "S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz"; + sha512 = "s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ=="; }; }; - "@babel/register-7.17.7" = { + "@babel/register-7.18.9" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.17.7"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.17.7.tgz"; - sha512 = "fg56SwvXRifootQEDQAu1mKdjh5uthPzdO0N6t358FktfL4XjAVXuH58ULoiW8mesxiOgNIrxiImqEwv0+hRRA=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.18.9.tgz"; + sha512 = "ZlbnXDcNYHMR25ITwwNKT88JiaukkdVj/nG7r3wnuXkOTHc60Uy05PwMCPre0hSkY68E6zK3xz+vUJSP2jWmcw=="; }; }; - "@babel/runtime-7.18.3" = { + "@babel/runtime-7.18.6" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.18.3"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz"; - sha512 = "38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.6.tgz"; + sha512 = "t9wi7/AW6XtKahAe20Yw0/mMljKq0B1r2fPdvaAdV/KPDZewFXdaaa6K7lxmZBZ8FBNpCiAT6iHPmd6QO9bKfQ=="; + }; + }; + "@babel/runtime-7.18.9" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.18.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz"; + sha512 = "lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw=="; }; }; "@babel/runtime-7.9.0" = { @@ -2299,40 +2371,40 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.18.3" = { + "@babel/runtime-corejs3-7.18.9" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.18.3"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.3.tgz"; - sha512 = "l4ddFwrc9rnR+EJsHsh+TJ4A35YqQz/UqcjtlX2ov53hlJYG5CxtQmNZxyajwDVmCxwy++rtvGU5HazCK4W41Q=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.18.9.tgz"; + sha512 = "qZEWeccZCrHA2Au4/X05QW5CMdm4VjUDCrGq5gf1ZDcM4hRqreKrtwAn7yci9zfgAS9apvnsFXiGBHBAxZdK9A=="; }; }; - "@babel/template-7.16.7" = { + "@babel/template-7.18.10" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.16.7"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"; - sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"; + sha512 = "TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA=="; }; }; - "@babel/traverse-7.18.5" = { + "@babel/traverse-7.18.10" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.18.5"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz"; - sha512 = "aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.10.tgz"; + sha512 = "J7ycxg0/K9XCtLyHf0cz2DqDihonJeIo+z+HEdRe9YuT8TY4A66i+Ab2/xZCEW7Ro60bPCBBfqqboHSamoV3+g=="; }; }; - "@babel/types-7.17.10" = { + "@babel/types-7.18.10" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.17.10"; + version = "7.18.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.17.10.tgz"; - sha512 = "9O26jG0mBYfGkUYCYZRnBwbVLd1UZOICEr2Em6InB6jVfsAv1GKgwXHmrSg+WFWDmeKTA6vyTZiN8tCSM5Oo3A=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz"; + sha512 = "MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ=="; }; }; "@babel/types-7.18.4" = { @@ -2344,31 +2416,31 @@ let sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; }; }; - "@blueprintjs/colors-4.1.3" = { + "@blueprintjs/colors-4.1.4" = { name = "_at_blueprintjs_slash_colors"; packageName = "@blueprintjs/colors"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.1.3.tgz"; - sha512 = "ANRQZT5h9+zC8B/y0S9B+SqEpicL0XRT4drAhiPFHBrOStRZWzOh3bPrwNSPqr7tdShxYtMyxbH+fkHMetZaxg=="; + url = "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.1.4.tgz"; + sha512 = "jggWTpazxg6ifWnaAiug9REsWUeMtkkuaWOFg5CjAiH6YtvMPU4ykWmQc9NnKAkabpKoXfZuR1V1KPAz79iYXQ=="; }; }; - "@blueprintjs/core-4.5.1" = { + "@blueprintjs/core-4.7.0" = { name = "_at_blueprintjs_slash_core"; packageName = "@blueprintjs/core"; - version = "4.5.1"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/core/-/core-4.5.1.tgz"; - sha512 = "CrMkeuvVo+GD/hv6T9W6GNWvTJ7TGpzs2r3v0zO1lMfAYj4v2gaisSXQQ2HziT7zO/kYDyu9aRpbGv0KSvryQA=="; + url = "https://registry.npmjs.org/@blueprintjs/core/-/core-4.7.0.tgz"; + sha512 = "13JaVk2Ds5cC6IRC332MZ/3dLDDmQ8op7aHCC9VMZP9Xlq4GcglP+QJfJrHk+q3JLFYWmH0Zoa8CdnQGQbCd0Q=="; }; }; - "@blueprintjs/icons-4.3.0" = { + "@blueprintjs/icons-4.4.0" = { name = "_at_blueprintjs_slash_icons"; packageName = "@blueprintjs/icons"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.3.0.tgz"; - sha512 = "uLEdVUkWe0E2Bzfh2mqW2/3DRCqFo/vsSBYXrqOzFPiBsxCnu8ySEPInJWU+OHHPA/zM1hYMfrvKjfyaIIgbew=="; + url = "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.4.0.tgz"; + sha512 = "cZmqXnQ+wMJ48c4J+JHqQ6ZGhCgUzWQnYy0FjgXqBSUeR5iERRVrUC24pDead3ASfENRttEqigFukhP3px3bnQ=="; }; }; "@bmewburn/js-beautify-1.13.0" = { @@ -2425,40 +2497,31 @@ let sha512 = "GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg=="; }; }; - "@braintree/sanitize-url-6.0.0" = { - name = "_at_braintree_slash_sanitize-url"; - packageName = "@braintree/sanitize-url"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-6.0.0.tgz"; - sha512 = "mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w=="; - }; - }; - "@cdktf/hcl2cdk-0.11.2" = { + "@cdktf/hcl2cdk-0.12.0" = { name = "_at_cdktf_slash_hcl2cdk"; packageName = "@cdktf/hcl2cdk"; - version = "0.11.2"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.11.2.tgz"; - sha512 = "dRSSABg/Re9eDzU9yei+0zvQ6Wk7qbh/4vuj+zWj2KWiemA/JlWx/CULwEvxUTMLaOdP9QA03UfM0JTD31VhHg=="; + url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.12.0.tgz"; + sha512 = "Zxsq7Bvx38L7J/XM0OEjY3/SjHfvkPr4WuEslZ5f2iDLhFl7tTglFbMz8ISUlOlEiToVGyB7VV+o6t3rc4LH6w=="; }; }; - "@cdktf/hcl2json-0.11.2" = { + "@cdktf/hcl2json-0.12.0" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.11.2"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.11.2.tgz"; - sha512 = "lVoypkmz4DrYqdy+CnmT/xVvOIphQrasgdzuBkdyLbb01FioOdV82uHlo7xRQxO1NJcsreq0CRYo6Rg33AA4uw=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.12.0.tgz"; + sha512 = "VgO+bPaXK483pAov7msfWeY5AagW509W+PlpCKI0U0om7ZjMm24VvNrq2LOE19TKGlM6/0PQKobQ0Gty8mNz8g=="; }; }; - "@cdktf/provider-generator-0.11.2" = { + "@cdktf/provider-generator-0.12.0" = { name = "_at_cdktf_slash_provider-generator"; packageName = "@cdktf/provider-generator"; - version = "0.11.2"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.11.2.tgz"; - sha512 = "YexyETsRZJnNYqAAV/orM5Va+bmW7QCaoxV4X4yxv8EXlbp/SW1DB7m3Jz3NkfbzuA2EEbomzVCPOmCCDOgEBA=="; + url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.12.0.tgz"; + sha512 = "Vo1O6cXgmMQHuohI3vaVc+cLoH5aU7+Udc/pOq+u7xWpHgjWNz2mH9OcdIodq3Hu2VYimRT8Sh8IWBA9g0fGBA=="; }; }; "@chemzqm/neovim-5.7.9" = { @@ -2488,13 +2551,13 @@ let sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; }; }; - "@commitlint/config-validator-17.0.0" = { + "@commitlint/config-validator-17.0.3" = { name = "_at_commitlint_slash_config-validator"; packageName = "@commitlint/config-validator"; - version = "17.0.0"; + version = "17.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.0.0.tgz"; - sha512 = "78IQjoZWR4kDHp/U5y17euEWzswJpPkA9TDL5F6oZZZaLIEreWzrDZD5PWtM8MsSRl/K2LDU/UrzYju2bKLMpA=="; + url = "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-17.0.3.tgz"; + sha512 = "3tLRPQJKapksGE7Kee9axv+9z5I2GDHitDH4q63q7NmNA0wkB+DAorJ0RHz2/K00Zb1/MVdHzhCga34FJvDihQ=="; }; }; "@commitlint/ensure-17.0.0" = { @@ -2524,31 +2587,31 @@ let sha512 = "MZzJv7rBp/r6ZQJDEodoZvdRM0vXu1PfQvMTNWFb8jFraxnISMTnPBWMMjr2G/puoMashwaNM//fl7j8gGV5lA=="; }; }; - "@commitlint/is-ignored-17.0.0" = { + "@commitlint/is-ignored-17.0.3" = { name = "_at_commitlint_slash_is-ignored"; packageName = "@commitlint/is-ignored"; - version = "17.0.0"; + version = "17.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.0.0.tgz"; - sha512 = "UmacD0XM/wWykgdXn5CEWVS4XGuqzU+ZGvM2hwv85+SXGnIOaG88XHrt81u37ZeVt1riWW+YdOxcJW6+nd5v5w=="; + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-17.0.3.tgz"; + sha512 = "/wgCXAvPtFTQZxsVxj7owLeRf5wwzcXLaYmrZPR4a87iD4sCvUIRl1/ogYrtOyUmHwWfQsvjqIB4mWE/SqWSnA=="; }; }; - "@commitlint/lint-17.0.0" = { + "@commitlint/lint-17.0.3" = { name = "_at_commitlint_slash_lint"; packageName = "@commitlint/lint"; - version = "17.0.0"; + version = "17.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/lint/-/lint-17.0.0.tgz"; - sha512 = "5FL7VLvGJQby24q0pd4UdM8FNFcL+ER1T/UBf8A9KRL5+QXV1Rkl6Zhcl7+SGpGlVo6Yo0pm6aLW716LVKWLGg=="; + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-17.0.3.tgz"; + sha512 = "2o1fk7JUdxBUgszyt41sHC/8Nd5PXNpkmuOo9jvGIjDHzOwXyV0PSdbEVTH3xGz9NEmjohFHr5l+N+T9fcxong=="; }; }; - "@commitlint/load-17.0.0" = { + "@commitlint/load-17.0.3" = { name = "_at_commitlint_slash_load"; packageName = "@commitlint/load"; - version = "17.0.0"; + version = "17.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/load/-/load-17.0.0.tgz"; - sha512 = "XaiHF4yWQOPAI0O6wXvk+NYLtJn/Xb7jgZEeKd4C1ZWd7vR7u8z5h0PkWxSr0uLZGQsElGxv3fiZ32C5+q6M8w=="; + url = "https://registry.npmjs.org/@commitlint/load/-/load-17.0.3.tgz"; + sha512 = "3Dhvr7GcKbKa/ey4QJ5MZH3+J7QFlARohUow6hftQyNjzoXXROm+RwpBes4dDFrXG1xDw9QPXA7uzrOShCd4bw=="; }; }; "@commitlint/message-17.0.0" = { @@ -2578,13 +2641,13 @@ let sha512 = "zkuOdZayKX3J6F6mPnVMzohK3OBrsEdOByIqp4zQjA9VLw1hMsDEFQ18rKgUc2adkZar+4S01QrFreDCfZgbxA=="; }; }; - "@commitlint/resolve-extends-17.0.0" = { + "@commitlint/resolve-extends-17.0.3" = { name = "_at_commitlint_slash_resolve-extends"; packageName = "@commitlint/resolve-extends"; - version = "17.0.0"; + version = "17.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.0.0.tgz"; - sha512 = "wi60WiJmwaQ7lzMXK8Vbc18Hq9tE2j/6iv2AFfPUGV7fvfY6Sf1iNKuUHirSqR0fquUyufIXe4y/K9A6LVIIvw=="; + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-17.0.3.tgz"; + sha512 = "H/RFMvrcBeJCMdnVC4i8I94108UDccIHrTke2tyQEg9nXQnR5/Hd6MhyNWkREvcrxh9Y+33JLb+PiPiaBxCtBA=="; }; }; "@commitlint/rules-17.0.0" = { @@ -2632,49 +2695,58 @@ let sha512 = "5wNXodStZRIRYu5u5kXWtI4XIIEPhRrqSRza+A41mN/K6PA7i9aHdU08qIV+4DW4CDWOlwiQz1YUMeU1QlSBQA=="; }; }; - "@cronvel/get-pixels-3.4.0" = { + "@cronvel/get-pixels-3.4.1" = { name = "_at_cronvel_slash_get-pixels"; packageName = "@cronvel/get-pixels"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cronvel/get-pixels/-/get-pixels-3.4.0.tgz"; - sha512 = "do5jDoX9oCR/dGHE4POVQ3PYDCmQ2Fow4CA72UL4WoE8zUImA/0lChczjfl+ucNjE4sXFWUnzoO6j4WzrUvLnw=="; + url = "https://registry.npmjs.org/@cronvel/get-pixels/-/get-pixels-3.4.1.tgz"; + sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g=="; }; }; - "@cspell/cspell-bundled-dicts-6.1.2" = { + "@cspell/cspell-bundled-dicts-6.5.0" = { name = "_at_cspell_slash_cspell-bundled-dicts"; packageName = "@cspell/cspell-bundled-dicts"; - version = "6.1.2"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.1.2.tgz"; - sha512 = "vMS15jKPNH93Fv0bu/lrTSmXKt6hDCEEwOIyajO84cJMuKRVuR9Vw0ZtkFsVAwHyTNZ8mGxposQ20TbAL/SUlw=="; + url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-6.5.0.tgz"; + sha512 = "rY1d9zNlMlhoOzN/S22zO6Z5171lAg0OX5ZtYepgyurnrrf6VL3tb31PD7pTC4N2aqCGXzk5DJql//vreg5buw=="; }; }; - "@cspell/cspell-pipe-6.1.2" = { + "@cspell/cspell-pipe-6.4.2" = { name = "_at_cspell_slash_cspell-pipe"; packageName = "@cspell/cspell-pipe"; - version = "6.1.2"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.1.2.tgz"; - sha512 = "QPbRsumSbu2h6Sdls2bv6FeLFBvs+XSSOmBwVXTaRu6Vl0hEi3P69BiHIWTYQqWTe2NYZnW8lpXUh5/J8/nolw=="; + url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-6.4.2.tgz"; + sha512 = "GlKhGXpWcD01fda+PouAOat8ey+HOOiqb5oFyFOcZBV6Dv2nXl4fKt+RgLvX1XrlJ0GL+BRKWUokwJ/xt38eIQ=="; }; }; - "@cspell/cspell-types-6.1.2" = { + "@cspell/cspell-service-bus-6.5.0" = { + name = "_at_cspell_slash_cspell-service-bus"; + packageName = "@cspell/cspell-service-bus"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-6.5.0.tgz"; + sha512 = "ZcQ3IZ/GHusKtHYn1BYKMauF/GhDby2uBsPfjCMwhvtSHaJy34tWS8i0xh8+awX2nKYGcyEm3Nsh5dazof3EzA=="; + }; + }; + "@cspell/cspell-types-6.5.0" = { name = "_at_cspell_slash_cspell-types"; packageName = "@cspell/cspell-types"; - version = "6.1.2"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.1.2.tgz"; - sha512 = "EENGQ469e3mTpSWfMF/GS29eOAAONiavdVF/uiV8kcxf8SqfkMJvVjFZ1w0KgC80pnCVUzRzMBO4HKmXPj6Ncg=="; + url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-6.5.0.tgz"; + sha512 = "vm+HlY+prf9G4s926QS3rZlajtBBnV+lDsjf4v7+7vYmRzic8KATGsUR2zrfTP0H9rH9eeQqd2rPoHhn2iiAlQ=="; }; }; - "@cspell/dict-ada-2.0.0" = { + "@cspell/dict-ada-2.0.1" = { name = "_at_cspell_slash_dict-ada"; packageName = "@cspell/dict-ada"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-2.0.0.tgz"; - sha512 = "4gfJEYXVwz6IN2LBaT6QoUV4pqaR35i0z0u9O684vLuVczvNJIHa4vNaSEFBr9d6xxncUyqstgP9P73ajJjh9A=="; + url = "https://registry.npmjs.org/@cspell/dict-ada/-/dict-ada-2.0.1.tgz"; + sha512 = "vopTJ1oHrrFYV5GU55Sr+AzItR78Uj5YbCaspYABmYKlq4NRrcUAUsr4bWgymDcspMIHO7e7IFcj48OKs1fndA=="; }; }; "@cspell/dict-aws-2.0.0" = { @@ -2686,31 +2758,31 @@ let sha512 = "NKz7pDZ7pwj/b33i3f4WLpC1rOOUMmENwYgftxU+giU2YBeKM2wZbMTSEIzsrel56r0UlQYmdIVlP/B4nnVaoQ=="; }; }; - "@cspell/dict-bash-2.0.3" = { + "@cspell/dict-bash-2.0.4" = { name = "_at_cspell_slash_dict-bash"; packageName = "@cspell/dict-bash"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-2.0.3.tgz"; - sha512 = "iw78lmxm49q2LhHTQCSu9zs85E8Sm6ui82OvxajU9rdhckFzZoj/KCQi9P0gFuL+w3WmQObHqdH2/sxK4oi2wA=="; + url = "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-2.0.4.tgz"; + sha512 = "uK/ehmp5LYrmRH2Gv3nbvdPswpkybJUn34WYKLpeuYHQktmi+pOI1A9uPdBPnSbMDffSvwQlQohIyKawz+X8Ag=="; }; }; - "@cspell/dict-companies-2.0.6" = { + "@cspell/dict-companies-2.0.10" = { name = "_at_cspell_slash_dict-companies"; packageName = "@cspell/dict-companies"; - version = "2.0.6"; + version = "2.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-2.0.6.tgz"; - sha512 = "S1U+ZqvwDwiMYEFPKNxRmH0z7YlmOj93xadga4U0LMa3S4ORSf192uMB0w0AFBwXUPnXHM5uqIGP0LTt0b4Ygg=="; + url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-2.0.10.tgz"; + sha512 = "OpxrvsU/yUqopmhy3b+JKtLDyJ32CksP+o1K+hZuN/wHm3JwlYWglxyNasXLx5Frh9FLxf4V2mr59WRcvmzgBA=="; }; }; - "@cspell/dict-cpp-3.1.0" = { + "@cspell/dict-cpp-3.2.1" = { name = "_at_cspell_slash_dict-cpp"; packageName = "@cspell/dict-cpp"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-3.1.0.tgz"; - sha512 = "lav99zUQ+iPq6dkQRnTN0+KE9th0UG6Nwl34afyEGJ8CN5Dcq/RJjCVvOkLw6vPvs505xrvQcZW1huftQK8WVg=="; + url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-3.2.1.tgz"; + sha512 = "XcmzrKIghqFfrYLLaHtWKOp9rupiuGdc5ODONk+emsq0W5CIc3Abn27IQHwUzxzF+Cm5IfKAIJ5Kpe6hkzm0HQ=="; }; }; "@cspell/dict-cryptocurrencies-2.0.0" = { @@ -2794,22 +2866,22 @@ let sha512 = "tKSSUf9BJEV+GJQAYGw5e+ouhEe2ZXE620S7BLKe3ZmpnjlNG9JqlnaBhkIMxKnNFkLY2BP/EARzw31AZnOv4g=="; }; }; - "@cspell/dict-en_us-2.2.6" = { + "@cspell/dict-en_us-2.3.0" = { name = "_at_cspell_slash_dict-en_us"; packageName = "@cspell/dict-en_us"; - version = "2.2.6"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-2.2.6.tgz"; - sha512 = "TJ4edLus8TV6Tr7ceOxHG5ZV2MhKJioteNT9jhdcSTdySsfQJjDAx6AIGiVVeRu5s9yR61oL5In7UyMCA80RWQ=="; + url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-2.3.0.tgz"; + sha512 = "wEGqVZ4uXxq9/mTemgN9B2MIqlcaLGPnvCBdqT5vPWxqxJjkGJmCkRCx9DYHHp2Cfd+VHc9zW6Xad59kORBS9g=="; }; }; - "@cspell/dict-filetypes-2.0.2" = { + "@cspell/dict-filetypes-2.1.1" = { name = "_at_cspell_slash_dict-filetypes"; packageName = "@cspell/dict-filetypes"; - version = "2.0.2"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-2.0.2.tgz"; - sha512 = "do7/Iwxjx+FHybe6UTocsWNRF1ar4cwhQoV2K2YzYTm73CoU5LMEwi2LY0Mwp/mn90TKbpPPQGCJ0sRpvaZ4AA=="; + url = "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-2.1.1.tgz"; + sha512 = "Oo0/mUbFHzsaATqRLdkV1RMoYns3aGzeKFIpVJg415GYtJ8EABXtEArYTXeMwlboyGTPvEk+PR2hBSTSfQTqmg=="; }; }; "@cspell/dict-fonts-2.0.1" = { @@ -2848,13 +2920,13 @@ let sha512 = "0KNfXTbxHW2l8iVjxeOf+KFv9Qrw3z5cyKnkuYJWlBTSB5KcUBfeKCb4fsds26VdANqiy6U91b4gDx5kNEmBjQ=="; }; }; - "@cspell/dict-haskell-2.0.0" = { + "@cspell/dict-haskell-2.0.1" = { name = "_at_cspell_slash_dict-haskell"; packageName = "@cspell/dict-haskell"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-2.0.0.tgz"; - sha512 = "cjX1Br+gSWqtcmJD/IMHz1UoP3pUaKIIKy/JfhEs7ANtRt6hhfEKe9dl2kQzDkkKt4pXol+YgdYxL/sVc/nLgQ=="; + url = "https://registry.npmjs.org/@cspell/dict-haskell/-/dict-haskell-2.0.1.tgz"; + sha512 = "ooA23qIG7InOOxlLm67CNH5O2J85QsPHEAzEU9KEqVfYG5ovFs5tx6n9pHekDVk3MpQULpqfNUYDR0KigPLg5g=="; }; }; "@cspell/dict-html-3.0.2" = { @@ -2875,22 +2947,22 @@ let sha512 = "04K7cPTcbYXmHICfiob4gZA1yaj4hpfM+Nl5WIJ1EAZsSGHdqmGEF28GuCjyQ8ZeKiJAsPt/vXuLBbjxkHqZyQ=="; }; }; - "@cspell/dict-java-3.0.3" = { + "@cspell/dict-java-3.0.7" = { name = "_at_cspell_slash_dict-java"; packageName = "@cspell/dict-java"; - version = "3.0.3"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-3.0.3.tgz"; - sha512 = "aARF22BmO03YgV0robADNVf32KnvF/wMMoByYQk4IaQWh8kJ1s///S44aY/4n/Cg2tX/1kNa60VMkdCNFD7FPw=="; + url = "https://registry.npmjs.org/@cspell/dict-java/-/dict-java-3.0.7.tgz"; + sha512 = "IL7ubsRvKX6dZSx++TplJCfhiS7kkEGpbTPG0gMEP50DTNAVM4icZS8zmer2UBCU5PTwF85abJjdX7mRADWKVg=="; }; }; - "@cspell/dict-latex-2.0.6" = { + "@cspell/dict-latex-2.0.9" = { name = "_at_cspell_slash_dict-latex"; packageName = "@cspell/dict-latex"; - version = "2.0.6"; + version = "2.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-2.0.6.tgz"; - sha512 = "DCe/YlUMnY+/BaaHLIs2LYPgpWF4to5V9lggEkJy4CsHyD0WPqV4JpoaOMrcsK/jbUrD39T91NruwlcPJoo7xQ=="; + url = "https://registry.npmjs.org/@cspell/dict-latex/-/dict-latex-2.0.9.tgz"; + sha512 = "d1kTK6dJb5z6UcfASQWjqQlsjZvnoVOvMWxYtLpGksYf6gM4IgqoPVNMLYYK6xBS4T/uAnLIj975A6YuAeyZpg=="; }; }; "@cspell/dict-lorem-ipsum-2.0.0" = { @@ -2920,13 +2992,13 @@ let sha512 = "sK2cpuV0EAc43Amd5xeQXkI9MeRTECMw+yjap06gKSModbgI7BqJUHeKZed+0Hii+LpaJ4TYpLGiRVsO+qSk0w=="; }; }; - "@cspell/dict-npm-3.0.1" = { + "@cspell/dict-npm-3.1.1" = { name = "_at_cspell_slash_dict-npm"; packageName = "@cspell/dict-npm"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-3.0.1.tgz"; - sha512 = "ZfuzFwE03WwyShwvQfXhhKIrFxgAkOtA/N1KdEwfP//nVDgysJfGueBhJJfI6vjUSr1IA+u5DXrSV0nowLAEhg=="; + url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-3.1.1.tgz"; + sha512 = "pUQeJ8sS4qxal0avM4Ta0EZy8DV5bF8y5o2UEYrgQMDOtsmSZg3ZRPTbtRs/4j2UTPkPwYrECzOm7yXuTwT4EA=="; }; }; "@cspell/dict-php-2.0.0" = { @@ -2974,13 +3046,13 @@ let sha512 = "u2qeXd4cx/TvTVcmkvA+sK6f4K1uMAMO6QPMSr1pSvqGElPRP1mIBXmuiSuBzLO3LbsJuUEHw5Cp3/bxIB6rNA=="; }; }; - "@cspell/dict-ruby-2.0.1" = { + "@cspell/dict-ruby-2.0.2" = { name = "_at_cspell_slash_dict-ruby"; packageName = "@cspell/dict-ruby"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.1.tgz"; - sha512 = "qGqhYfFeoBOashv/l0Kj5o4ilyvfq0s+t+r32juPOkOnbHz+hzxnJo2tMMg/L/UdjVV7Y8ovg4LDBC/seVrMYQ=="; + url = "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-2.0.2.tgz"; + sha512 = "vVnUpSmGDbPjs7MHq741DsLHhQcoA4CnUCM9wsTorQ9AQRDAkDTbK/LcY8nM19MoXCb3eF8PFku5Jq+gqH0u7w=="; }; }; "@cspell/dict-rust-2.0.1" = { @@ -3001,13 +3073,22 @@ let sha512 = "MUwA2YKpqaQOSR4V1/CVGRNk8Ii5kf6I8Ch+4/BhRZRQXuwWbi21rDRYWPqdQWps7VNzAbbMA+PQDWsD5YY38g=="; }; }; - "@cspell/dict-software-terms-2.1.8" = { + "@cspell/dict-software-terms-2.2.2" = { name = "_at_cspell_slash_dict-software-terms"; packageName = "@cspell/dict-software-terms"; - version = "2.1.8"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.1.8.tgz"; - sha512 = "D9ECefkdbr5B0yLimy7nmEBl3AHPsweMG1wHatlCIT9uFwwqaq5e+ngbYrntEhMa6afkYY+LGOLbZ1L1dfpLVg=="; + url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-2.2.2.tgz"; + sha512 = "s6l3lzKhxXWfu8QsSt1qoUK2l6iGbFKJd0T8XRYfsKnX6fVCUmHNueGWQ6TFCRXDRvHiwGB+UpPicyHPtSJJ5A=="; + }; + }; + "@cspell/dict-sql-1.0.4" = { + name = "_at_cspell_slash_dict-sql"; + packageName = "@cspell/dict-sql"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@cspell/dict-sql/-/dict-sql-1.0.4.tgz"; + sha512 = "+9nMcwsCzdYH0tyv2LeuVvQ+DdecS2C1N+hw6sl0FTHWI5GwULHAGW840RBwcKw0s+dl7sc0WpZhS1EW7b0pXg=="; }; }; "@cspell/dict-swift-1.0.3" = { @@ -3019,13 +3100,13 @@ let sha512 = "yOBLSaRD0AnkkkndJ8PuB82Evp6lA2xItf2AWsnPfCCgxp5Ojk6uUBC/WQBSkzkCAOGbXyHsu9D97tsOx2c6cw=="; }; }; - "@cspell/dict-typescript-2.0.0" = { + "@cspell/dict-typescript-2.0.1" = { name = "_at_cspell_slash_dict-typescript"; packageName = "@cspell/dict-typescript"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-2.0.0.tgz"; - sha512 = "WFBahxsnD2y4Os14tE5Zxh31Ggn4DzGOAu3UoxYl1lLLxaszx4RH7LmAeFuznySboiaBeRBbpfJOjQA796O6VQ=="; + url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-2.0.1.tgz"; + sha512 = "YXH6nEH4thcD7lNffdNsKgDDZA5JVX4aKCuNIGE7qWSS9kBVgIvSU9/WH64R59rEzAPe1VwXwXyoZ7y4fAufww=="; }; }; "@cspell/dict-vue-2.0.2" = { @@ -3064,13 +3145,13 @@ let sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw=="; }; }; - "@csstools/selector-specificity-2.0.1" = { + "@csstools/selector-specificity-2.0.2" = { name = "_at_csstools_slash_selector-specificity"; packageName = "@csstools/selector-specificity"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.1.tgz"; - sha512 = "aG20vknL4/YjQF9BSV7ts4EWm/yrjagAN7OWBNmlbEOUiu0llj4OGrFoOKK3g2vey4/p2omKCoHrWtPxSwV3HA=="; + url = "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz"; + sha512 = "IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg=="; }; }; "@cycle/dom-18.3.0" = { @@ -3190,166 +3271,193 @@ let sha512 = "dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw=="; }; }; - "@electron-forge/async-ora-6.0.0-beta.64" = { + "@edge-runtime/format-1.1.0-beta.25" = { + name = "_at_edge-runtime_slash_format"; + packageName = "@edge-runtime/format"; + version = "1.1.0-beta.25"; + src = fetchurl { + url = "https://registry.npmjs.org/@edge-runtime/format/-/format-1.1.0-beta.25.tgz"; + sha512 = "7fzTXgfVzcWs6T8ePVyogbVU67TbXpDHhgop9yP9stsRlejJjD2bDm/jDwX9XAfQdET5gVaKDiYc0wkp9E4gig=="; + }; + }; + "@edge-runtime/primitives-1.1.0-beta.25" = { + name = "_at_edge-runtime_slash_primitives"; + packageName = "@edge-runtime/primitives"; + version = "1.1.0-beta.25"; + src = fetchurl { + url = "https://registry.npmjs.org/@edge-runtime/primitives/-/primitives-1.1.0-beta.25.tgz"; + sha512 = "+lKore2sAuGD2AMa2GZviLMHKfFmw5k2BzhvyatKPuJ/frIFpb1OdluxGHfqmVBtNIJwnn7IJoJd9jm8r/6Flg=="; + }; + }; + "@edge-runtime/vm-1.1.0-beta.23" = { + name = "_at_edge-runtime_slash_vm"; + packageName = "@edge-runtime/vm"; + version = "1.1.0-beta.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@edge-runtime/vm/-/vm-1.1.0-beta.23.tgz"; + sha512 = "XBp3rCuX4scJVOo2KconAotL5XGX3zdd8IkfDNr5VVSQ/B6HkiTNuf+EvzSQTpplF+fiyLTpfcP9EbNLibwLTA=="; + }; + }; + "@electron-forge/async-ora-6.0.0-beta.65" = { name = "_at_electron-forge_slash_async-ora"; packageName = "@electron-forge/async-ora"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.64.tgz"; - sha512 = "27ACgh9VhM+ahqTNIFeCfKuSoZxM/8dQp99ZMAgMFzcniKkNCXLxsbGF/7esu++zarDqhSUOhf70Z2bffgjX2w=="; + url = "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.65.tgz"; + sha512 = "CREk/7XQsg26q2l5s/oFG6GcomzKzWnpaeCKgRCWfdMleKvOubeDd/OA68LkzhLixMWYGbXCWLbHUhGTdGzcWA=="; }; }; - "@electron-forge/core-6.0.0-beta.64" = { + "@electron-forge/core-6.0.0-beta.65" = { name = "_at_electron-forge_slash_core"; packageName = "@electron-forge/core"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.64.tgz"; - sha512 = "FKms2M5+qMh7sfS9MTNUY9dHj7XRE8WJgKqwOQMYP7H4KPGlL2cRYkItmq5bNCu7sYbZOqgHruuDmAnap0B5Pw=="; + url = "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.65.tgz"; + sha512 = "3gkoHYzOsEGOEakIkldpCSKExUYhXnUwqPlyg+Na3WvI40NWqh8wjfb92t5FsOb3Wrf9SkV5/DrF51S9E+108w=="; }; }; - "@electron-forge/installer-base-6.0.0-beta.64" = { + "@electron-forge/installer-base-6.0.0-beta.65" = { name = "_at_electron-forge_slash_installer-base"; packageName = "@electron-forge/installer-base"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.64.tgz"; - sha512 = "SDyVrVmXOD8iHv57gf5SmJQNmBKg1AdoZh4tQm3lSl39XcYwSScm8O54WDi8mV1Q+K8bk/Zsi7bX34XFeQFr6g=="; + url = "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.65.tgz"; + sha512 = "4rhLKsaLP/w29iTEp/MI7lA/V/dh43BuJ/55N1KTRBONiOalUCu5So/rJBkpBxKOOCtwEZeXJy+rP35MuXekZQ=="; }; }; - "@electron-forge/installer-darwin-6.0.0-beta.64" = { + "@electron-forge/installer-darwin-6.0.0-beta.65" = { name = "_at_electron-forge_slash_installer-darwin"; packageName = "@electron-forge/installer-darwin"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.64.tgz"; - sha512 = "dKHifmeQ++y/ZzxwT+QXWkFiP53j+ZCxel6VA6aj9PMhL2tE7jSeyqwqav+vU6RiFztlfMYBAUoXwBQlYMhnCg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.65.tgz"; + sha512 = "K1d6ReXF4BXTzH3+tVhyb6Mu9uVn2vn3YbtE0KJ8ppXAwbWLRM2Z0njO0LxjVv2NLfmBtPm9msP2NDozIHDJVg=="; }; }; - "@electron-forge/installer-deb-6.0.0-beta.64" = { + "@electron-forge/installer-deb-6.0.0-beta.65" = { name = "_at_electron-forge_slash_installer-deb"; packageName = "@electron-forge/installer-deb"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.64.tgz"; - sha512 = "WB0rIF7GjPf7b1py9GFQGVpWQVTjWS3gffLeQ6TlazHZhufJu68nCe+hiHYVmknQDGrpe6zgT/jedTckXOUqjw=="; + url = "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.65.tgz"; + sha512 = "3nxAQF36E0Af65pdXm95NL7tR1ZOJAHUAIIvDKAFbGSNSDVHuDLC6jGnEYJoSIpI7Acyd2+8IB7Cjy+TK75POg=="; }; }; - "@electron-forge/installer-dmg-6.0.0-beta.64" = { + "@electron-forge/installer-dmg-6.0.0-beta.65" = { name = "_at_electron-forge_slash_installer-dmg"; packageName = "@electron-forge/installer-dmg"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.64.tgz"; - sha512 = "HccPl7jkFR0I5xFMYZFuxOPmptF+j38WAV+Uev3K2iAgZD8bwdVojecswM2V85lvxkAKdAVVpU+317KWxGEoWQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.65.tgz"; + sha512 = "bZT01W8kEcdSZ4V+z8/vJ7s71sOO5SsDwD/zTXBxTBFJKS436R3VWR0gBYkAOpm3spQrTE0o0ESEeRQzqmDisA=="; }; }; - "@electron-forge/installer-exe-6.0.0-beta.64" = { + "@electron-forge/installer-exe-6.0.0-beta.65" = { name = "_at_electron-forge_slash_installer-exe"; packageName = "@electron-forge/installer-exe"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.64.tgz"; - sha512 = "6EWXEmodkYuz2Nc9VouhRI4tqqwMaLz/Z86OM8f6fJHPE7iFDR7EvQE0lHfan8D/zoBRRIxOLofu+u6AT+wlPg=="; + url = "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.65.tgz"; + sha512 = "8+9F6KP6MTr/s1Vsn7GhAqtzLsDZgL1MXmn30rVbHXyQLtN8QNDzUa0j35EQ3xq9tG2H4kNdpTw6TS4dZs088Q=="; }; }; - "@electron-forge/installer-linux-6.0.0-beta.64" = { + "@electron-forge/installer-linux-6.0.0-beta.65" = { name = "_at_electron-forge_slash_installer-linux"; packageName = "@electron-forge/installer-linux"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.64.tgz"; - sha512 = "CKToVN9TuYF/nhfXyTn3hYYD6BrG3T0e+lcxqwHOm7OJ98b08f5ZzvdktHv4brIaD9mUgSHnQ5z4YdguFRvo/Q=="; + url = "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.65.tgz"; + sha512 = "+IASLZEoxUxFgb9MKLOhzgw8Z+pXvON1hwDaIUll/ekDxzrafCgJHGabEPqFX3qVZX+UmYEtYBUtQ9cs0XqBPQ=="; }; }; - "@electron-forge/installer-rpm-6.0.0-beta.64" = { + "@electron-forge/installer-rpm-6.0.0-beta.65" = { name = "_at_electron-forge_slash_installer-rpm"; packageName = "@electron-forge/installer-rpm"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.64.tgz"; - sha512 = "0w0Q8MbNefjDGVaGMlk1OPMWYe+Ct/XiOXaWX3jF+fgkaKUzXbkN91gBhIKXBkLlxWqQI+5BlLTh+CjRyBZV5g=="; + url = "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.65.tgz"; + sha512 = "t+X+HTwncRPE3CEpXIzITQjCB1atlxZmHMpaFG81dsIJG2KyL66qXP4b97W9/pATQ1qvYmp3uCg9dHMn/D2eug=="; }; }; - "@electron-forge/installer-zip-6.0.0-beta.64" = { + "@electron-forge/installer-zip-6.0.0-beta.65" = { name = "_at_electron-forge_slash_installer-zip"; packageName = "@electron-forge/installer-zip"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.64.tgz"; - sha512 = "qA5+pe1c2znrKyTjcYZ+6yL56a31sQexH19ik+wigIor2d0nevGo6hZgNl0YOyOfrt/M8lyGTDksWFAGuNyxNQ=="; + url = "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.65.tgz"; + sha512 = "NYO5hkODEOxePH/26/lpJzYW+KYyY10HlN8a9BEbVRkyweKlp8KxFMZ3M5TL8f+7EFUtV/pOWCL8hOM8WLK6Sw=="; }; }; - "@electron-forge/maker-base-6.0.0-beta.64" = { + "@electron-forge/maker-base-6.0.0-beta.65" = { name = "_at_electron-forge_slash_maker-base"; packageName = "@electron-forge/maker-base"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.64.tgz"; - sha512 = "jQbZgnsTpDK60KXhJWiDhmo7aHsBMnfZIpbr4w9QhjPPbQKUqcUo6Geg2OFbX+9HTGOz1jUC4jDbVPvR+zmzuQ=="; + url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.65.tgz"; + sha512 = "EhDjppd/qdsIDAr6stjAi+OOmhxPidCswPb02Jte6+yh0Wjk5q5vaYS4B6tzlBkZKYvEAiGLYh4tQ/31dxpTHA=="; }; }; - "@electron-forge/plugin-base-6.0.0-beta.64" = { + "@electron-forge/plugin-base-6.0.0-beta.65" = { name = "_at_electron-forge_slash_plugin-base"; packageName = "@electron-forge/plugin-base"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.64.tgz"; - sha512 = "398mJ50B61BwiwehKrRQfRoB/A2+Nd/SzHYzuQxio4gIWOg5aJXCi6kZGGpRNpQ+UYx+v7rP/WxWQedA7U/Urw=="; + url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.65.tgz"; + sha512 = "R46e1LiJVUKR3rXZxghBrOI6vVzoF1NNNr0hexroBCqE8fsP3WdbAvIR3TCpBDbLlknzvlEiNcHNDUgyMfce4A=="; }; }; - "@electron-forge/publisher-base-6.0.0-beta.64" = { + "@electron-forge/publisher-base-6.0.0-beta.65" = { name = "_at_electron-forge_slash_publisher-base"; packageName = "@electron-forge/publisher-base"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.64.tgz"; - sha512 = "OIEThucgKKUmXIF8Gb7xAPl0Hlpsnf37e1DsvpRC3gP3kClPFwitx2u5PNCIg1HwQ75UoViGeFcwjjs9VZPkIg=="; + url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.65.tgz"; + sha512 = "tXIKS8/kK+Bh18BVdVeT6QaR/EJrlWQnOPVZrT0/CjfqEBMfuf5zYiwcqgakbV2WOFvH2oljprmduyqFvnrwow=="; }; }; - "@electron-forge/shared-types-6.0.0-beta.64" = { + "@electron-forge/shared-types-6.0.0-beta.65" = { name = "_at_electron-forge_slash_shared-types"; packageName = "@electron-forge/shared-types"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.64.tgz"; - sha512 = "E+uIpZsKPku4QHWzBGNm5RkcOyLXn98qHvJevziKnUOfRSe2y66XFpHyu9FmBnEYYoyGDvBktV70yK6gsjdigQ=="; + url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.65.tgz"; + sha512 = "ApxdJgz84l122rmjr8hxDSXIt6gePT54fMXUzxWPIJgPlMR2/dzvmVEWq13UmVD1q0jduQ2lXLNB37EuqsATOQ=="; }; }; - "@electron-forge/template-base-6.0.0-beta.64" = { + "@electron-forge/template-base-6.0.0-beta.65" = { name = "_at_electron-forge_slash_template-base"; packageName = "@electron-forge/template-base"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.64.tgz"; - sha512 = "mdYHCk6H7L+hdSPnh6kdg6nBC7QnQZuySwi7z/Hv3APCfPZMLVLcVkWQNCYyl+5ysyhzjPGtdm7MSV8kJ5ZMtA=="; + url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.65.tgz"; + sha512 = "7opxEC2C4WCv2/AtY1JwgdG4LWZTyIUtG+U/aEm2aspSobPTPVjqJX873sqNuC4Fa99d7qsW7YfjlXQaqwTOEA=="; }; }; - "@electron-forge/template-typescript-6.0.0-beta.64" = { + "@electron-forge/template-typescript-6.0.0-beta.65" = { name = "_at_electron-forge_slash_template-typescript"; packageName = "@electron-forge/template-typescript"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.64.tgz"; - sha512 = "gu63ehKG4q92UQhDMAMt/e73moav1fLyKVNwQakcxrD/D2klprKXf2qa6lMBsxaZFnAZ5b249R6WZWmXnk6r6A=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.65.tgz"; + sha512 = "P+LvcYu9zwT9cFm7uopZCrMKQDRyblDPkLg9y9jRCXbmjP1qybfpB5TsAdK2i0jF1b9iJI+lqdXSoZYDeBIlnA=="; }; }; - "@electron-forge/template-typescript-webpack-6.0.0-beta.64" = { + "@electron-forge/template-typescript-webpack-6.0.0-beta.65" = { name = "_at_electron-forge_slash_template-typescript-webpack"; packageName = "@electron-forge/template-typescript-webpack"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.64.tgz"; - sha512 = "oFLC88qXhFXvD1H9CthtMIPE2CKoXPNiR0LRDieL/vNvnRb0UKaqay/o3df2rJp31h5CEY63BrHC9nnQ8i+ZCw=="; + url = "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.65.tgz"; + sha512 = "3yx5ESBvRtd8QI2DopgSvz7pIiLzsrpsbzyuZP8dDUHI8uJxReS0WgjfBJ59wbzUfAcU8zho2216i06jtp4DoQ=="; }; }; - "@electron-forge/template-webpack-6.0.0-beta.64" = { + "@electron-forge/template-webpack-6.0.0-beta.65" = { name = "_at_electron-forge_slash_template-webpack"; packageName = "@electron-forge/template-webpack"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.64.tgz"; - sha512 = "hExHBXIoH7cRSW0f2jUjlKtEdkUqZEutr12GphB3MoMWWlef8SOZ9eDfpvJkEHbPJQmKNdkJjtboakK6DAucFg=="; + url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.65.tgz"; + sha512 = "yvDcs2JRc1218oi8mfhS0mNCbeUYuHkA8YD6Bh85syq3iGi6NDAg7+c/oCY9JOXDaiwoCu5ZiL0gd8QEhVoTSw=="; }; }; "@electron/get-1.14.1" = { @@ -3406,22 +3514,22 @@ let sha512 = "8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA=="; }; }; - "@emotion/is-prop-valid-1.1.3" = { + "@emotion/is-prop-valid-1.2.0" = { name = "_at_emotion_slash_is-prop-valid"; packageName = "@emotion/is-prop-valid"; - version = "1.1.3"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.1.3.tgz"; - sha512 = "RFg04p6C+1uO19uG8N+vqanzKqiM9eeV1LDOG3bmkYmuOj7NbKNlFC/4EZq5gnwAIlcC/jOT24f8Td0iax2SXA=="; + url = "https://registry.npmjs.org/@emotion/is-prop-valid/-/is-prop-valid-1.2.0.tgz"; + sha512 = "3aDpDprjM0AwaxGE09bOPkNxHpBd+kA6jty3RnaEXdweX1DF1U3VQpPYb0g1IStAuK7SVQ1cy+bNBBKp4W3Fjg=="; }; }; - "@emotion/memoize-0.7.5" = { + "@emotion/memoize-0.8.0" = { name = "_at_emotion_slash_memoize"; packageName = "@emotion/memoize"; - version = "0.7.5"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.7.5.tgz"; - sha512 = "igX9a37DR2ZPGYtV6suZ6whr8pTFtyHL3K/oLUotxpSVO2ASaprmAe2Dkq7tBo7CRY7MMDrAa9nuQP9/YG8FxQ=="; + url = "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.8.0.tgz"; + sha512 = "G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="; }; }; "@emotion/stylis-0.8.5" = { @@ -3442,15 +3550,6 @@ let sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; }; - "@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" = { - name = "_at_endemolshinegroup_slash_cosmiconfig-typescript-loader"; - packageName = "@endemolshinegroup/cosmiconfig-typescript-loader"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz"; - sha512 = "QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA=="; - }; - }; "@eslint/eslintrc-0.4.3" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; @@ -3469,13 +3568,13 @@ let sha512 = "UWW0TMTmk2d7hLcWD1/e2g5HDM/HQ3csaLSqXCfqwh4uNDuNqlaKWXmEsL4Cs41Z0KnILNvwbHAah3C2yt06kw=="; }; }; - "@exodus/schemasafe-1.0.0-rc.6" = { + "@exodus/schemasafe-1.0.0-rc.7" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; - version = "1.0.0-rc.6"; + version = "1.0.0-rc.7"; src = fetchurl { - url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.6.tgz"; - sha512 = "dDnQizD94EdBwEj/fh3zPRa/HWCS9O5au2PuHhZBbuM3xWHxuaKzPBOEWze7Nn0xW68MIpZ7Xdyn1CoCpjKCuQ=="; + url = "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.0.0-rc.7.tgz"; + sha512 = "+1mBLsa+vvlV0lwEAP1hwgmOPkjMnoJ8hyCMfCCJga0sVDwDzrPJjnxZwdDaUmOh/vbFHQGBTk+FxsVjoI/CjQ=="; }; }; "@expo/apple-utils-0.0.0-alpha.31" = { @@ -3523,22 +3622,13 @@ let sha512 = "/QGhhLWyaGautgEyU50UJr5YqKJix5t77ePTwreOVAhmZH+ff3nrrtYTTnccx+qF08ZNQmfAyYMCD3rQfzpiJA=="; }; }; - "@expo/dev-server-0.1.113" = { + "@expo/dev-server-0.1.115" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.113"; + version = "0.1.115"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.113.tgz"; - sha512 = "PT3HT+3h4ZS1bw6Zz8fqjNeryKOWe1FqGdnz4RSASxZGCzib6VHLfLbJeYHkq7t+ashSXRoAw3XW/9yVdbUqLA=="; - }; - }; - "@expo/dev-tools-0.13.158" = { - name = "_at_expo_slash_dev-tools"; - packageName = "@expo/dev-tools"; - version = "0.13.158"; - src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.158.tgz"; - sha512 = "wPvY0+6jJRbJQ7DqlFMn4FuiYbY/kTDFfZ2Z7G4cM3flcTQCJRC+j0HWykDCPzuCEXjxrdXJAOrXVr49olamog=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.115.tgz"; + sha512 = "kqr71GAXzBVmjT+qSmqckBKY6Y9lFf4Oy1S4aVygx72CNgyzVTw4CPqT5RsNhcvQEEdACgarczDbPnNkmrm7GQ=="; }; }; "@expo/devcert-1.0.0" = { @@ -3550,13 +3640,22 @@ let sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; - "@expo/image-utils-0.3.20" = { + "@expo/image-utils-0.3.21" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.20"; + version = "0.3.21"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.20.tgz"; - sha512 = "NgF/80XENyCS+amwC0P6uk1fauEtUq7gijD19jvl2xknJaADq8M2dMCRHwWMVOXosr2v46f3Z++G/NjmyOVS7A=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.21.tgz"; + sha512 = "Ha7pNcpl52RJIeYz3gR1ajOgPPl7WLZWiLqtLi94s9J0a7FvmNBMqd/VKrfHNj8QmtZxXcmXr7y7tPhZbVFg7w=="; + }; + }; + "@expo/image-utils-0.3.22" = { + name = "_at_expo_slash_image-utils"; + packageName = "@expo/image-utils"; + version = "0.3.22"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.22.tgz"; + sha512 = "uzq+RERAtkWypOFOLssFnXXqEqKjNj9eXN7e97d/EXUAojNcLDoXc0sL+F5B1I4qtlsnhX01kcpoIBBZD8wZNQ=="; }; }; "@expo/json-file-8.2.36" = { @@ -3586,13 +3685,13 @@ let sha512 = "FQinlwHrTlJbntp8a7NAlCKedVXe06Va/0DSLXRO8lZVtgbEMrYYSUZWQNcOlNtc58c2elNph6z9dMOYwSo3JQ=="; }; }; - "@expo/package-manager-0.0.55" = { + "@expo/package-manager-0.0.56" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.55"; + version = "0.0.56"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.55.tgz"; - sha512 = "GWfC+s7XT+sydlGVkHRURWi+Wk9LWdgGBKpk3jqjQi5+jy6kjlY3VqoZbhtXw55oSi/3P2FAO9ifscwut56cvg=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.56.tgz"; + sha512 = "PGk34uz4XDyhoNIlPh2D+BDsiXYuW2jXavTiax8d32uvHlRO6FN0cAsqlWD6fx3H2hRn8cU/leTuc4M7pYovCQ=="; }; }; "@expo/plist-0.0.18" = { @@ -3604,13 +3703,13 @@ let sha512 = "+48gRqUiz65R21CZ/IXa7RNBXgAI/uPSdvJqoN9x1hfL44DNbUoWHgHiEXTx7XelcATpDwNTz6sHLfy0iNqf+w=="; }; }; - "@expo/prebuild-config-4.0.2" = { + "@expo/prebuild-config-4.0.3" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-4.0.2.tgz"; - sha512 = "+AQ/EVgcySl3cvYMmZLaEyGkxvQnO+UFU2mshmUoUh5lTIFTNKl1aVo0UmYW2/JehmKu6bxOrr/lL5byHv+fcQ=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-4.0.3.tgz"; + sha512 = "ZRMn0a9Wo/coKXLMvizUytqtG5pniUHaBMSS28yFTcGVvyDJh2nFVkBf9po52mSkbm9rGp/Pev6GAf57m6S2BA=="; }; }; "@expo/rudder-sdk-node-1.1.1" = { @@ -3622,13 +3721,13 @@ let sha512 = "uy/hS/awclDJ1S88w9UGpc6Nm9XnNUjzOAAib1A3PVAnGQIwebg8DpFqOthFBTlZxeuV/BKbZ5jmTbtNZkp1WQ=="; }; }; - "@expo/schemer-1.4.2" = { + "@expo/schemer-1.4.3" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.4.2"; + version = "1.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.4.2.tgz"; - sha512 = "Kq6oMV+IdBjM22naGfaN8aEup95wx5MNeVvThIjUMAQrrNSAkxi86YbLAHl3/VUN56gX0sxUZNnSa17k/9V/pg=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.4.3.tgz"; + sha512 = "upaic2flgWfJLE70ZIBZFG9Vh0ilgVn50DZIJ8+EY0xugl2hB5FXYxTlCtQkJXjou78ADC6fKqJsm1drMxpy3A=="; }; }; "@expo/sdk-runtime-versions-1.0.0" = { @@ -3649,22 +3748,22 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.16.24" = { + "@expo/webpack-config-0.17.0" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.16.24"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.16.24.tgz"; - sha512 = "Nml2uvNOpFKEyYvFrn1bTVXZWKcBGWO+duk+CuVT3WUG0istmPbP7qeneqzQ51oTbvbmxl8hUQ6EqEFFyubF/g=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.17.0.tgz"; + sha512 = "qRBBcuMsWVQD3tiNlPkaX/KMOUxIq9bGCFwK4gW9Yw2WC2mrQHb3wVIsnVPRgHtnD29FFgRG8GypeKKT6cAkBQ=="; }; }; - "@expo/xcpretty-4.1.3" = { + "@expo/xcpretty-4.2.2" = { name = "_at_expo_slash_xcpretty"; packageName = "@expo/xcpretty"; - version = "4.1.3"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-4.1.3.tgz"; - sha512 = "testj0jpEe1IwRfnmQ3shizTXOY6IGcuMJg1vtmXy2bC9sPTLK1wjliRJp2xCJGcp1ZbEA1/eptzX+6MDnYjrA=="; + url = "https://registry.npmjs.org/@expo/xcpretty/-/xcpretty-4.2.2.tgz"; + sha512 = "Lke/geldJqUV0Dfxg5/QIOugOzdqZ/rQ9yHKSgGbjZtG1uiSqWyFwWvXmrdd3/sIdX33eykGvIcf+OrvvcXVUw=="; }; }; "@fast-csv/format-4.3.5" = { @@ -3712,22 +3811,22 @@ let sha512 = "na1+hTRDg2xHSu3Vrr8ITrQpoFChOCSpqTYjLvdRD081p8o61hk9DeaXkUWr8E+2TZ06BXi2t0VyL4wfrYLU8Q=="; }; }; - "@fluentui/font-icons-mdl2-8.4.1" = { + "@fluentui/font-icons-mdl2-8.4.5" = { name = "_at_fluentui_slash_font-icons-mdl2"; packageName = "@fluentui/font-icons-mdl2"; - version = "8.4.1"; + version = "8.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.4.1.tgz"; - sha512 = "nKVb7Jd52EQYASNHNtOVXT01SIzB4MoCPdKxXkwU1rvLe5u6RzAd4UHxjes09/KuvKrIG/Ixo0nv5mb+6NN2sw=="; + url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.4.5.tgz"; + sha512 = "KQq5NHixzLITw8TqB/EyYhQDcojbHCxPC/7anH5o+iAjQPYKLcrYYCDYt8gN+TStW7ER3qClxwPa1RkNP7dy+g=="; }; }; - "@fluentui/foundation-legacy-8.2.8" = { + "@fluentui/foundation-legacy-8.2.12" = { name = "_at_fluentui_slash_foundation-legacy"; packageName = "@fluentui/foundation-legacy"; - version = "8.2.8"; + version = "8.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.8.tgz"; - sha512 = "9K99k/Cexcn6+U5bbJe8sojd3U6/WID7zmqyDhlVfQDL5napa4Myv9049ToUQ6IUnDJSTZOnuHrWMoK5maUOdw=="; + url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.2.12.tgz"; + sha512 = "+Skk1End6MeM733QmYeLM9iwABRVFPS5PUzNprpPmPniRoIn2hOHrD38APCucK+lRjhyIROcyLUxw36NqW8vkA=="; }; }; "@fluentui/keyboard-key-0.4.1" = { @@ -3748,40 +3847,40 @@ let sha512 = "ax8izl48JJuymEuvJzvNH22GHmpPEWLP+h4doyFZ/9IhR9AEycNc2rGBthZ5FiuktnFgusNag1AHr/WCj5pttw=="; }; }; - "@fluentui/react-8.77.0" = { + "@fluentui/react-8.86.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "8.77.0"; + version = "8.86.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-8.77.0.tgz"; - sha512 = "0Eu6eIOSS9Bpq2yySYZIJUNQWJefOKGOajupKSaKn2Qa0XNReW9HEyn6B0v80tVgPCg6wzqfr1CAPnszoLAHxA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-8.86.3.tgz"; + sha512 = "8vmEkysUt0CMLgMbE/JWijgZF+CGJJd2BlbjEwG6Z9x2J+nyqtE2Z86fKyC5/gnqy5aJ79bT6SxjmWyY1syyig=="; }; }; - "@fluentui/react-focus-8.7.0" = { + "@fluentui/react-focus-8.7.6" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "8.7.0"; + version = "8.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.7.0.tgz"; - sha512 = "HuV3zcoe5FRDXCDqVzqj+6mhWzz19hQA4MgQQ42x/0bCdjWMN7fFMuU78cwhxenjG/vWlNgO2Yo+eEZ8j8/CEA=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.7.6.tgz"; + sha512 = "87d9z7Mpvyl4jG8tV39XlC2XCVIJHuRJdFGvBSfkT9StR4GAYeD7Dk+Ok8+QhNZf2FSwDmJbgLh892wxSnXjIA=="; }; }; - "@fluentui/react-hooks-8.6.0" = { + "@fluentui/react-hooks-8.6.4" = { name = "_at_fluentui_slash_react-hooks"; packageName = "@fluentui/react-hooks"; - version = "8.6.0"; + version = "8.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.0.tgz"; - sha512 = "mo5dqMDcXoY+Utnq65WzDKdHT8zgLxR4ZEwen884dyisN7g/+wjfy4JZmhi8Cm9gnD7anNJvSKP9pPJGwCt26Q=="; + url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.6.4.tgz"; + sha512 = "ZpiaAv08YtFkz7JklbBRSu3vgH7ZJJY705R5c3zxbKeuBGu4DMCjiilURQ8wagX4mjFCWtzWJXo6HZELsLKTpg=="; }; }; - "@fluentui/react-portal-compat-context-9.0.0-rc.2" = { + "@fluentui/react-portal-compat-context-9.0.1" = { name = "_at_fluentui_slash_react-portal-compat-context"; packageName = "@fluentui/react-portal-compat-context"; - version = "9.0.0-rc.2"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-portal-compat-context/-/react-portal-compat-context-9.0.0-rc.2.tgz"; - sha512 = "AAWLmggcbPIfldF3ZeSHpA9J2Z9C0Eano+8hCgKrKJ1b2uGZUzFMqOOgRAKrNwR8Ke4DXXIBlpy/6xbH1OkF8w=="; + url = "https://registry.npmjs.org/@fluentui/react-portal-compat-context/-/react-portal-compat-context-9.0.1.tgz"; + sha512 = "KhOcXy2tvzNoAqFowkaRGFiLuRuPjzn6i1W30iMkhgsSVKxa/9jxso86Z8R0eZwA+16RNO/Ia2nX1gqfUac9mw=="; }; }; "@fluentui/react-window-provider-2.2.1" = { @@ -3802,31 +3901,31 @@ let sha512 = "SZMP2P7RSUuVHYWIBcnlxYruvchlnoqensCvoaGeiH0FisO7etwJdFwKNegV7WEA9uS5ZOK3qVmyvD71DxaSng=="; }; }; - "@fluentui/style-utilities-8.7.0" = { + "@fluentui/style-utilities-8.7.4" = { name = "_at_fluentui_slash_style-utilities"; packageName = "@fluentui/style-utilities"; - version = "8.7.0"; + version = "8.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.7.0.tgz"; - sha512 = "coba9Xj85nlAtToSCV0dD5sHq4BSQk/pUD9y4ZfNhm7vAlju5caQFhpwCs+qsZQ2OIkkpeF2YzJ/SHjNrMECqw=="; + url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.7.4.tgz"; + sha512 = "2JhRJ1ftgrdh5h4vowK3KxGmCQphRQmHzfpOK6hHdePexVUN3iaudQZLaWFQryeDdaxlNgxiIgc0dWE9Q30SAw=="; }; }; - "@fluentui/theme-2.6.6" = { + "@fluentui/theme-2.6.9" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "2.6.6"; + version = "2.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.6.tgz"; - sha512 = "VP2PFZf4eKrXVlCJGHskW7B/oXBLtiEFm3ismRhhWgJCPeekYnHj6Q7wlr4oiEeIJ3TOGySHhdC7d54Zc6dAeA=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.6.9.tgz"; + sha512 = "XM1kDLvbSQdoM9MPBLbUp6t+KMrs8VlUrC0ryQBxVOMIbSbpNKm6W5MsxT/lYFQhJAHk0JziojRAR9WLzUiWvA=="; }; }; - "@fluentui/utilities-8.8.3" = { + "@fluentui/utilities-8.10.1" = { name = "_at_fluentui_slash_utilities"; packageName = "@fluentui/utilities"; - version = "8.8.3"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.8.3.tgz"; - sha512 = "ZehG5uy/9v5h/Q4CC9yJ5xEC0jqUJlDYen8Op7ki2vunvE+GTdNP9lkTUk2H7/cVKmSgEHsaMr37ZYc2V1N5vw=="; + url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.10.1.tgz"; + sha512 = "ga2XTNljIXBKoWrwAdf4bdCVB+Yvtx/fvrmucmhSf4eskXYCn6x2s21OswVkVfTt5r5pK6uiMHhHCnheLoiEyw=="; }; }; "@forge/api-2.7.0" = { @@ -3856,22 +3955,22 @@ let sha512 = "+GFtFqBhFzwKaKmeEfw1jWQgZJNX4q11CCx1fSPFJB49Fdjb7k3lx74jAyzHlX0UWnm6DMK+/cYT7j5t6G9LfA=="; }; }; - "@forge/bundler-3.0.8" = { + "@forge/bundler-3.0.10" = { name = "_at_forge_slash_bundler"; packageName = "@forge/bundler"; - version = "3.0.8"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/bundler/-/bundler-3.0.8.tgz"; - sha512 = "s9BKPoEcWBubf4XIueCHBansfL8mRB1FsdJA+BcFnDF0OrTUyFnzx1IelSEDT3XTWbrAkwNDMJS0Ng+EF5semQ=="; + url = "https://registry.npmjs.org/@forge/bundler/-/bundler-3.0.10.tgz"; + sha512 = "dRGYLc97gorhvml8J5emfSNDfyJeEffglc4wFkukmGsHCCfkRgCn4isYHPy3OjvW7UnELItpUEV1DEx5HiTl8g=="; }; }; - "@forge/cli-shared-2.5.1" = { + "@forge/cli-shared-2.6.1" = { name = "_at_forge_slash_cli-shared"; packageName = "@forge/cli-shared"; - version = "2.5.1"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-2.5.1.tgz"; - sha512 = "sUS6WO61TK1a5Y5/NlB47fOEXjkYvDASJbsYIq85PY7RzTrbrf9XozeOui8nhBuJaEy3/KOJTG7sSZ9RexKPmA=="; + url = "https://registry.npmjs.org/@forge/cli-shared/-/cli-shared-2.6.1.tgz"; + sha512 = "qU5OiBSuSF9OY5DgawtyhlChpA84DmtlJ1EgCaChzVv8yW6FcqmD/103hTNx/dHkEc1rHBpaAxOJEUrNZVtFsw=="; }; }; "@forge/csp-1.11.0" = { @@ -3883,22 +3982,22 @@ let sha512 = "VJsDidMQ0W6vCbVuNgvI6yyGQvwhwjT8w8MhcaaFWXvHbQG+ARGZf73ZK4CJM2XB/MjXfHElvTukgbh7mXqJeA=="; }; }; - "@forge/lint-3.1.2" = { + "@forge/lint-3.2.1" = { name = "_at_forge_slash_lint"; packageName = "@forge/lint"; - version = "3.1.2"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/lint/-/lint-3.1.2.tgz"; - sha512 = "fYj+U0ZRvy8liRkybk5pR3pUopRs3khvU9vmpvguwfo9KzxiNOxL2M1DfuDQmHjAeSjjqmfspMJDsdoq8Q4ynw=="; + url = "https://registry.npmjs.org/@forge/lint/-/lint-3.2.1.tgz"; + sha512 = "6CUG9sGJOm0lNh1jGPfrjLDIAuet0m9MZT66MQuP5xGBUtrM5flvEngadUfPFtVUv0eJvRRmfFVw3sXNJvDAqA=="; }; }; - "@forge/manifest-3.8.1" = { + "@forge/manifest-3.10.0" = { name = "_at_forge_slash_manifest"; packageName = "@forge/manifest"; - version = "3.8.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/manifest/-/manifest-3.8.1.tgz"; - sha512 = "kXqooktuU5tmIyQJ42XoQs74CnSrOdN2IYRbOpnHY+iMwPBjmXbpz7VCFc2VWApbaCDM1K+gch4qHaLPPvGuDw=="; + url = "https://registry.npmjs.org/@forge/manifest/-/manifest-3.10.0.tgz"; + sha512 = "18jt36VF5IqS6EesHzJOtMfEyAK9LOG/EY5mK3zWlp6iL3bQfvABWOK6Ob79ZmcJZGQrdmZ93RR/XY66hByA4A=="; }; }; "@forge/storage-1.3.0" = { @@ -3928,31 +4027,31 @@ let sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; }; - "@gitbeaker/core-35.6.0" = { + "@gitbeaker/core-35.7.0" = { name = "_at_gitbeaker_slash_core"; packageName = "@gitbeaker/core"; - version = "35.6.0"; + version = "35.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/core/-/core-35.6.0.tgz"; - sha512 = "ZhaDUs/4BxHODfjRkVmwkWxZVaFIpYduxaj28+J+4FH9X93WZp0IsyT4szcFM7FwAbRW2+ZvGeEfw4NQwgB/RA=="; + url = "https://registry.npmjs.org/@gitbeaker/core/-/core-35.7.0.tgz"; + sha512 = "1N9QcHElYa1NuLhX9mJJ6tnL7wbCsK8Naj2kLXwNC4qyEcDhMiJDnI3YoqNIXSzPTufoNUAbgIsc/h/JmO17/A=="; }; }; - "@gitbeaker/node-35.6.0" = { + "@gitbeaker/node-35.7.0" = { name = "_at_gitbeaker_slash_node"; packageName = "@gitbeaker/node"; - version = "35.6.0"; + version = "35.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/node/-/node-35.6.0.tgz"; - sha512 = "cJBxZdh8elrdLA8V4yEdISGinycESNaIO8JEIyAhemsovqv29XCJ40A9TBA4RlKNjkKVyVSN23BvcZimgqZSzA=="; + url = "https://registry.npmjs.org/@gitbeaker/node/-/node-35.7.0.tgz"; + sha512 = "zh215EUloAxj2gwTHevBVypEiiwQR0WsFLGPWJwY+yUFJVQRcya+3mcsDbxgCLAk00wwhrTVYyNppvmoYbEZNg=="; }; }; - "@gitbeaker/requester-utils-35.6.0" = { + "@gitbeaker/requester-utils-35.7.0" = { name = "_at_gitbeaker_slash_requester-utils"; packageName = "@gitbeaker/requester-utils"; - version = "35.6.0"; + version = "35.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-35.6.0.tgz"; - sha512 = "5IVzv1gO626qaC7CEV7LUG68IHgEjWovIHXQsbI9MraxhrI9eSV5/l/81Povv7tJlni7u8OnARPU7bmxlXlx7g=="; + url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-35.7.0.tgz"; + sha512 = "SDYKhL+XUrslpVwUumkCf4I4Ubf+lvzdghCYPwBt/og5kZIorFVbHCxRmtr5bO+iC9nrVNfg24sdoe51vDGn1w=="; }; }; "@google-cloud/paginator-4.0.0" = { @@ -3964,22 +4063,22 @@ let sha512 = "wNmCZl+2G2DmgT/VlF+AROf80SoaC/CwS8trwmjNaq26VRNK8yPbU5F/Vy+R9oDAGKWQU2k8+Op5H4kFJVXFaQ=="; }; }; - "@google-cloud/precise-date-2.0.4" = { + "@google-cloud/precise-date-3.0.0" = { name = "_at_google-cloud_slash_precise-date"; packageName = "@google-cloud/precise-date"; - version = "2.0.4"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/precise-date/-/precise-date-2.0.4.tgz"; - sha512 = "nOB+mZdevI/1Si0QAfxWfzzIqFdc7wrO+DYePFvgbOoMtvX+XfFTINNt7e9Zg66AbDbWCPRnikU+6f5LTm9Wyg=="; + url = "https://registry.npmjs.org/@google-cloud/precise-date/-/precise-date-3.0.0.tgz"; + sha512 = "bc+R9MgVTo/I6/+zZOAej7EpFlQMhzd6gJwJesEetpnJwW1MsxbkB82CQMrCc516CgZ8ypC020Xs+ylBTm9pRA=="; }; }; - "@google-cloud/projectify-2.1.1" = { + "@google-cloud/projectify-3.0.0" = { name = "_at_google-cloud_slash_projectify"; packageName = "@google-cloud/projectify"; - version = "2.1.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-2.1.1.tgz"; - sha512 = "+rssMZHnlh0twl122gXY4/aCrk0G1acBqkHFfYddtsqpYXGxA29nj9V5V9SfC+GyOG00l650f6lG9KL+EpFEWQ=="; + url = "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-3.0.0.tgz"; + sha512 = "HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA=="; }; }; "@google-cloud/promisify-2.0.4" = { @@ -3991,22 +4090,22 @@ let sha512 = "j8yRSSqswWi1QqUGKVEKOG03Q7qOoZP6/h2zN2YO+F5h2+DHU0bSrHCK9Y7lo2DI9fBd8qGAw795sf+3Jva4yA=="; }; }; - "@google-cloud/pubsub-3.0.1" = { + "@google-cloud/pubsub-3.1.0" = { name = "_at_google-cloud_slash_pubsub"; packageName = "@google-cloud/pubsub"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.0.1.tgz"; - sha512 = "dznNbRd/Y8J0C0xvdvCPi3B1msK/dj/Nya+NQZ2doUOLT6eoa261tBwk9umOQs5L5GKcdlqQKbBjrNjDYVbzQA=="; + url = "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-3.1.0.tgz"; + sha512 = "SNrLRkZDrIxLwUYZ+PN1XZWzGdQOqCwPkFX2+bVUG5M66VmK+uCfQ5oMBDZ4pm1PZGOYaKMxINtpRNmMsBtejg=="; }; }; - "@grammyjs/types-2.8.0" = { + "@grammyjs/types-2.8.2" = { name = "_at_grammyjs_slash_types"; packageName = "@grammyjs/types"; - version = "2.8.0"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.8.0.tgz"; - sha512 = "su7pK6oP5co+fqopY79zV2KIlWUN6baT/RW1kGLUfMB0b8pdkeKbGtAjxZ/ccxfXVPsqIn+53ERARLT65g+6xw=="; + url = "https://registry.npmjs.org/@grammyjs/types/-/types-2.8.2.tgz"; + sha512 = "RNYVxg5+yOOeDN9PY05KGEA/82vNXd7QMQPtEMCT8neg1jl7Keg/cbUElHOU8zYQUvVChu3uYSkfkviLAxvDSg=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -4036,13 +4135,13 @@ let sha512 = "IuR2SB2MnC2ztA/XeTMTfWcA0Wy7ZH5u+nDkDNLAdX+AaSyDnsQS35sCmHqG0VOGTl7rzoyBWLCKGwSJplgtwg=="; }; }; - "@graphql-tools/batch-execute-8.4.10" = { + "@graphql-tools/batch-execute-8.5.1" = { name = "_at_graphql-tools_slash_batch-execute"; packageName = "@graphql-tools/batch-execute"; - version = "8.4.10"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.4.10.tgz"; - sha512 = "rugHElhKYZgb6w3mBuNdgjMIo0LW5QbwIwJ1bc9VKWh51dCQmNwJS1Nx8qFWUjhmjVJWbvKWqYb6Z7wTGnOc3g=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-8.5.1.tgz"; + sha512 = "hRVDduX0UDEneVyEWtc2nu5H2PxpfSfM/riUlgZvo/a/nG475uyehxR5cFGvTEPEQUKY3vGIlqvtRigzqTfCew=="; }; }; "@graphql-tools/delegate-7.1.5" = { @@ -4054,13 +4153,13 @@ let sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g=="; }; }; - "@graphql-tools/delegate-8.7.11" = { + "@graphql-tools/delegate-8.8.1" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "8.7.11"; + version = "8.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.7.11.tgz"; - sha512 = "Rm9ThQHPOz/78OsoB8pZF+8YJm7cHsFMbGa67Q2hLmEAf2xLmNKvsfKfnxYuLnfmpdRxdSmab/ecHZ0qW/DS5w=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-8.8.1.tgz"; + sha512 = "NDcg3GEQmdEHlnF7QS8b4lM1PSF+DKeFcIlLEfZFBvVq84791UtJcDj8734sIHLukmyuAxXMfA1qLd2l4lZqzA=="; }; }; "@graphql-tools/graphql-file-loader-6.2.7" = { @@ -4072,22 +4171,22 @@ let sha512 = "5k2SNz0W87tDcymhEMZMkd6/vs6QawDyjQXWtqkuLTBF3vxjxPD1I4dwHoxgWPIjjANhXybvulD7E+St/7s9TQ=="; }; }; - "@graphql-tools/graphql-file-loader-7.3.15" = { + "@graphql-tools/graphql-file-loader-7.5.0" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "7.3.15"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.3.15.tgz"; - sha512 = "Sw9XadW3bxH3ACNXE8Tsjh+BVedRCJTuRn3NfO//zOYQZiC3HDTzq9MvnW1a00SmPCXg47rxQpq9L3bdLX0Ohg=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-7.5.0.tgz"; + sha512 = "X3wcC+ZljbXTwdTTSp3oUHJd66mFLDKI750uhB0HidBxE6+wyw7fhmJVJiYROXPswaGliuabpo0JEyLj7hhWKA=="; }; }; - "@graphql-tools/import-6.6.17" = { + "@graphql-tools/import-6.7.1" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.6.17"; + version = "6.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.6.17.tgz"; - sha512 = "rnKT2ZaFM+IbSFE0iOGG5sqdaDDv/XHHH43VIpV4ozryKoK9re3qrhEgfDOHaW47zMLGKrHLPCC/QGf0IpJquw=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.7.1.tgz"; + sha512 = "StLosFVhdw+eZkL+v9dBabszxCAZtEYW4Oy1+750fDkH39GrmzOB8mWiYna7rm9+GMisC9atJtXuAfMF02Aoag=="; }; }; "@graphql-tools/json-file-loader-6.2.6" = { @@ -4099,13 +4198,13 @@ let sha512 = "CnfwBSY5926zyb6fkDBHnlTblHnHI4hoBALFYXnrg0Ev4yWU8B04DZl/pBRUc459VNgO2x8/mxGIZj2hPJG1EA=="; }; }; - "@graphql-tools/json-file-loader-7.3.15" = { + "@graphql-tools/json-file-loader-7.4.1" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "7.3.15"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.3.15.tgz"; - sha512 = "aPxIWBahYVPAVeGxzAsoEsLm+KVfxPcx/wIUZZX8+02YYmuICNT0TeSAk6Q6iuKMJCS7gtU5eYVdEM7qzC2EfA=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-7.4.1.tgz"; + sha512 = "+QaeRyJcvUXUNEoIaecYrABunqk8/opFbpdHPAijJyVHvlsYfqXR12/501g+/QZzGHKYnyi+Q3lsZbBboj5LBg=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -4117,13 +4216,13 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/load-7.5.14" = { + "@graphql-tools/load-7.7.1" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "7.5.14"; + version = "7.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.5.14.tgz"; - sha512 = "K7H4tKKGFliRyjbG92KCuv2fS2pHlRxkcNcDtuEQlA8dhthS9qGB14Ld4eHDuRq1RvHTS6mye5NE1alyY44K9g=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-7.7.1.tgz"; + sha512 = "rJ2WUV41wwAkMnBgtcBym3TKVbPgz7z9tBCjOmbNVLy5bB9StVPdo2Uci0D5xYSgLV9XIt+zdyAnYGptioJeWg=="; }; }; "@graphql-tools/merge-6.2.17" = { @@ -4135,13 +4234,22 @@ let sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow=="; }; }; - "@graphql-tools/merge-8.2.14" = { + "@graphql-tools/merge-8.3.1" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "8.2.14"; + version = "8.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.2.14.tgz"; - sha512 = "od6lTF732nwPX91G79eiJf+dyRBHxCaKe7QL4IYeH4d1k+NYqx/ihYpFJNjDaqxmpHH92Hr+TxsP9SYRK3/QKg=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-8.3.1.tgz"; + sha512 = "BMm99mqdNZbEYeTPK3it9r9S6rsZsQKtlqJsSBknAclXq2pGEfOxjcIZi+kBSkHZKPKCRrYDd5vY0+rUmIHVLg=="; + }; + }; + "@graphql-tools/mock-8.7.1" = { + name = "_at_graphql-tools_slash_mock"; + packageName = "@graphql-tools/mock"; + version = "8.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.7.1.tgz"; + sha512 = "k85qWloFnxw1AAu7P153y1y+9GEbiQ4T17uay2o2QZKtjxPkBADkX0sKYsI7oj+ip+l/D4an3FfsbWATGxzT8w=="; }; }; "@graphql-tools/schema-7.1.5" = { @@ -4153,13 +4261,13 @@ let sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA=="; }; }; - "@graphql-tools/schema-8.3.14" = { + "@graphql-tools/schema-8.5.1" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "8.3.14"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.3.14.tgz"; - sha512 = "ntA4pKwyyPHFFKcIw17FfqGZAiTNZl0tHieQpPIkN5fPc4oHcXOfaj1vBjtIC/Qn6H7XBBu3l2kMA8FpobdxTQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.5.1.tgz"; + sha512 = "0Esilsh0P/qYcB5DKQpiKeQs/jevzIadNTaT0jeWklPMwNbT7yMX4EqZany7mbeRRlSRwMzNzL5olyFdffHBZg=="; }; }; "@graphql-tools/url-loader-6.10.1" = { @@ -4171,13 +4279,13 @@ let sha512 = "DSDrbhQIv7fheQ60pfDpGD256ixUQIR6Hhf9Z5bRjVkXOCvO5XrkwoWLiU7iHL81GB1r0Ba31bf+sl+D4nyyfw=="; }; }; - "@graphql-tools/url-loader-7.9.25" = { + "@graphql-tools/url-loader-7.13.3" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "7.9.25"; + version = "7.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.9.25.tgz"; - sha512 = "l1C4xym79RbZk3Fe4P2JeNxDogQWPOETZrb+jCHniQ7GT7bjpM20ZcS9oqSNgMyPKQE4vGjV3zRph8vItRQgOg=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-7.13.3.tgz"; + sha512 = "92z2HJd+Ae2wlZH0kFb20aSxX8CkJDcYyUtbtBNSadu5rKzkiYQPlihfRJFJs4zmDdV+DSmmGvQtDuAKLV+iNg=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -4207,13 +4315,13 @@ let sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ=="; }; }; - "@graphql-tools/utils-8.6.13" = { + "@graphql-tools/utils-8.9.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "8.6.13"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.6.13.tgz"; - sha512 = "FiVqrQzj4cgz0HcZ3CxUs8NtBGPZFpmsVyIgwmL6YCwIhjJQnT72h8G3/vk5zVfjfesht85YGp0inWWuoCKWzg=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.9.0.tgz"; + sha512 = "pjJIWH0XOVnYGXCqej8g/u/tsfV4LvLlj0eATKQu5zwnxd/TiTHq7Cg313qUPTFFHZ3PP5wJ15chYVtLDwaymg=="; }; }; "@graphql-tools/wrap-7.0.8" = { @@ -4225,13 +4333,13 @@ let sha512 = "1NDUymworsOlb53Qfh7fonDi2STvqCtbeE68ntKY9K/Ju/be2ZNxrFSbrBHwnxWcN9PjISNnLcAyJ1L5tCUyhg=="; }; }; - "@graphql-tools/wrap-8.4.20" = { + "@graphql-tools/wrap-8.5.1" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "8.4.20"; + version = "8.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.4.20.tgz"; - sha512 = "qzlrOg9ddaA+30OdG8NU/zDPV2sbJ4Rvool+Zf0nLVRqkAUP/1uxXTQBLgEJKO1xxTlhJ+27FCJ42lG6JG9ZrA=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-8.5.1.tgz"; + sha512 = "KpVVfha2wLSpE08YLX0jeo5nXPfDLASlxOqMlvfa/B4X8SOVmuLyN1L5YZ132tPLDF93uflwlHFnUO5ahpRNlA=="; }; }; "@grpc/grpc-js-1.6.7" = { @@ -4243,6 +4351,15 @@ let sha512 = "eBM03pu9hd3VqDQG+kHahiG1x80RGkkqqRb1Pchcwqej/KkAH95gAvKs6laqaHCycYaPK+TKuNQnOz9UXYA8qw=="; }; }; + "@grpc/grpc-js-1.6.8" = { + name = "_at_grpc_slash_grpc-js"; + packageName = "@grpc/grpc-js"; + version = "1.6.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.6.8.tgz"; + sha512 = "Nt5tufF/O5Q310kP0cDzxznWMZW58GCTZhUUiAQ9B0K0ANKNQ4Lj/K9XK0vZg+UBKq5/7z7+8mXHHfrcwoeFJQ=="; + }; + }; "@grpc/proto-loader-0.6.12" = { name = "_at_grpc_slash_proto-loader"; packageName = "@grpc/proto-loader"; @@ -4261,6 +4378,15 @@ let sha512 = "FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g=="; }; }; + "@grpc/proto-loader-0.7.0" = { + name = "_at_grpc_slash_proto-loader"; + packageName = "@grpc/proto-loader"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.0.tgz"; + sha512 = "SGPZtVmqOvNfPFOA/nNPn+0Weqa5wubBgQ56+JgTbeLY2VezwtMjwPPFzh0kvQccwWT3a2TXT0ZGK/pJoOTk1A=="; + }; + }; "@gulp-sourcemaps/identity-map-2.0.1" = { name = "_at_gulp-sourcemaps_slash_identity-map"; packageName = "@gulp-sourcemaps/identity-map"; @@ -4369,6 +4495,15 @@ let sha512 = "n4q9ARKco2hpCLsuVaW6Az3cDVaua7B3DSONHkc49WtEzgY/btvcDG5Zr1P6PZDv0sQ7oPnAi9Y+W2DI++MgcQ=="; }; }; + "@humanwhocodes/config-array-0.10.4" = { + name = "_at_humanwhocodes_slash_config-array"; + packageName = "@humanwhocodes/config-array"; + version = "0.10.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz"; + sha512 = "mXAIHxZT3Vcpg83opl1wGlVZ9xydbfZO3r5YfRSH6Gpp2J/PfdBP0wbDa2sO6/qRbcalpoevVyW6A/fI6LfeMw=="; + }; + }; "@humanwhocodes/config-array-0.5.0" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; @@ -4387,6 +4522,15 @@ let sha512 = "ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw=="; }; }; + "@humanwhocodes/gitignore-to-minimatch-1.0.2" = { + name = "_at_humanwhocodes_slash_gitignore-to-minimatch"; + packageName = "@humanwhocodes/gitignore-to-minimatch"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz"; + sha512 = "rSqmMJDdLFUsyxR6FMtD00nfQKKLFb1kv+qBbOVKqErvloEIJLo5bDTJTQNTYgeyp78JsA7u/NPi5jT1GR/MuA=="; + }; + }; "@humanwhocodes/object-schema-1.2.1" = { name = "_at_humanwhocodes_slash_object-schema"; packageName = "@humanwhocodes/object-schema"; @@ -4729,31 +4873,31 @@ let sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; }; }; - "@jridgewell/gen-mapping-0.3.1" = { + "@jridgewell/gen-mapping-0.3.2" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; - sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; }; }; - "@jridgewell/resolve-uri-3.0.7" = { + "@jridgewell/resolve-uri-3.1.0" = { name = "_at_jridgewell_slash_resolve-uri"; packageName = "@jridgewell/resolve-uri"; - version = "3.0.7"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz"; - sha512 = "8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA=="; + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; + sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; }; }; - "@jridgewell/set-array-1.1.1" = { + "@jridgewell/set-array-1.1.2" = { name = "_at_jridgewell_slash_set-array"; packageName = "@jridgewell/set-array"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz"; - sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; + sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; }; }; "@jridgewell/source-map-0.3.2" = { @@ -4765,22 +4909,22 @@ let sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; }; }; - "@jridgewell/sourcemap-codec-1.4.13" = { + "@jridgewell/sourcemap-codec-1.4.14" = { name = "_at_jridgewell_slash_sourcemap-codec"; packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.13"; + version = "1.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"; - sha512 = "GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="; + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; + sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; }; }; - "@jridgewell/trace-mapping-0.3.13" = { + "@jridgewell/trace-mapping-0.3.14" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.13"; + version = "0.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"; - sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz"; + sha512 = "bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ=="; }; }; "@jridgewell/trace-mapping-0.3.9" = { @@ -4801,22 +4945,22 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/check-node-1.61.0" = { + "@jsii/check-node-1.63.2" = { name = "_at_jsii_slash_check-node"; packageName = "@jsii/check-node"; - version = "1.61.0"; + version = "1.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.61.0.tgz"; - sha512 = "U6b2iNZZweV2qRvidCCZIOLFpTe6Kc8eZc9v8CbUtK2btChNYiWTkms4VUOcONIYT5uPfNlZpHZiqTr+Oqxmkg=="; + url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.63.2.tgz"; + sha512 = "vTj8ZCXIUG0ciq0VX+yhWSyCNsFos9TJlQamZPSVATS23cfCav7HGyxA7bydeNML3sfN0MzFQ0OKYyjAMeFw5A=="; }; }; - "@jsii/spec-1.61.0" = { + "@jsii/spec-1.63.2" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.61.0"; + version = "1.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.61.0.tgz"; - sha512 = "pv1jAZY+gez62BCiHwfdCnjl2reye88QOKsD5IlCf7XbmvyQ4xFXVV2EnFzv4HUUtr+yuBj/tZz0HjOFsEBUQw=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.63.2.tgz"; + sha512 = "zIFZDG/qtQJWa2I7W1cUXExeshr4WSSuMNHWGkJzIn4hFtYv4eQG7cP3gF2ToqAwS2WgsX7fQ7dDrLg0Pzfc2A=="; }; }; "@juggle/resize-observer-3.3.1" = { @@ -4873,13 +5017,13 @@ let sha512 = "4w+P0VkbjzEXC7kv8T1GJ/9AVaP9I6uasMZ/JcdwZBS3qwvKo5A5z9uGhP5c7TvItzcmPb44b5Mw2kT+WjUuAA=="; }; }; - "@ledgerhq/devices-6.27.1" = { + "@ledgerhq/devices-7.0.0" = { name = "_at_ledgerhq_slash_devices"; packageName = "@ledgerhq/devices"; - version = "6.27.1"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-6.27.1.tgz"; - sha512 = "jX++oy89jtv7Dp2X6gwt3MMkoajel80JFWcdc0HCouwDsV1mVJ3SQdwl/bQU0zd8HI6KebvUP95QTwbQLLK/RQ=="; + url = "https://registry.npmjs.org/@ledgerhq/devices/-/devices-7.0.0.tgz"; + sha512 = "vq4B33WdU0dRAJIRFWZMj6w1W1yw1i4mekCmhk7N9wPaFrtGWZ2iI9WDihsNOBooCWKQe8Jsb9eD8RVThbSlFQ=="; }; }; "@ledgerhq/errors-5.50.0" = { @@ -4891,13 +5035,13 @@ let sha512 = "gu6aJ/BHuRlpU7kgVpy2vcYk6atjB4iauP2ymF7Gk0ez0Y/6VSMVSJvubeEQN+IV60+OBK0JgeIZG7OiHaw8ow=="; }; }; - "@ledgerhq/errors-6.10.0" = { + "@ledgerhq/errors-6.10.1" = { name = "_at_ledgerhq_slash_errors"; packageName = "@ledgerhq/errors"; - version = "6.10.0"; + version = "6.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.10.0.tgz"; - sha512 = "fQFnl2VIXh9Yd41lGjReCeK+Q2hwxQJvLZfqHnKqWapTz68NHOv5QcI0OHuZVNEbv0xhgdLhi5b65kgYeQSUVg=="; + url = "https://registry.npmjs.org/@ledgerhq/errors/-/errors-6.10.1.tgz"; + sha512 = "92d1zRQleR1AQ4CAXgWgDtKUms+8EwShLVUcajI+BLWvgJ1Vclmq6PsBIDEQbsm+riVu/Ji3LcHdmgFgmi0VGw=="; }; }; "@ledgerhq/hw-transport-5.51.1" = { @@ -4909,31 +5053,31 @@ let sha512 = "6wDYdbWrw9VwHIcoDnqWBaDFyviyjZWv6H9vz9Vyhe4Qd7TIFmbTl/eWs6hZvtZBza9K8y7zD8ChHwRI4s9tSw=="; }; }; - "@ledgerhq/hw-transport-6.27.1" = { + "@ledgerhq/hw-transport-6.27.2" = { name = "_at_ledgerhq_slash_hw-transport"; packageName = "@ledgerhq/hw-transport"; - version = "6.27.1"; + version = "6.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.27.1.tgz"; - sha512 = "hnE4/Fq1YzQI4PA1W0H8tCkI99R3UWDb3pJeZd6/Xs4Qw/q1uiQO+vNLC6KIPPhK0IajUfuI/P2jk0qWcMsuAQ=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport/-/hw-transport-6.27.2.tgz"; + sha512 = "GF4pmK78rEKhZfbmunwQ131c+0MGa6L5IoYlwgFcg6CaFpUjjPiTCKUFsm4flsE0Z0Ltn9QuKoe+xEHULo7rGA=="; }; }; - "@ledgerhq/hw-transport-node-hid-6.27.1" = { + "@ledgerhq/hw-transport-node-hid-6.27.2" = { name = "_at_ledgerhq_slash_hw-transport-node-hid"; packageName = "@ledgerhq/hw-transport-node-hid"; - version = "6.27.1"; + version = "6.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.1.tgz"; - sha512 = "H3kGFU6lDAZM7ef17nVGTCpgwPzDcbO8dwqvGoIDTopvlNgNqmzw95GT3aCosJMp04C9yYGyMPSF5UFjRX8ckg=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid/-/hw-transport-node-hid-6.27.2.tgz"; + sha512 = "N2tyGLLZqgNrWA1xc9fbdFc7c7pr3dpbsMwC6LW0ilHiGWXzC6XSPSJZARO1j0G4LQIqBq7rAuNzlr4u1p4jkw=="; }; }; - "@ledgerhq/hw-transport-node-hid-noevents-6.27.1" = { + "@ledgerhq/hw-transport-node-hid-noevents-6.27.2" = { name = "_at_ledgerhq_slash_hw-transport-node-hid-noevents"; packageName = "@ledgerhq/hw-transport-node-hid-noevents"; - version = "6.27.1"; + version = "6.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.1.tgz"; - sha512 = "nsPo491bslP7QySXIB2asILxws7+t2V/0F4Hjc3IBEkHexH3iS+TmeegE5A72vDXhXKI4wskJ8Pp8Odcz9TN1A=="; + url = "https://registry.npmjs.org/@ledgerhq/hw-transport-node-hid-noevents/-/hw-transport-node-hid-noevents-6.27.2.tgz"; + sha512 = "/f0rAREa6CNq88y9NMTVVTHx3FHkmnbILhd4gDWcm7OC36mg7bLN9edbq8a4zNRdMvBKX+/Lg1hMgLdqEJagBw=="; }; }; "@ledgerhq/hw-transport-u2f-5.36.0-deprecated" = { @@ -4990,544 +5134,544 @@ let sha512 = "Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A=="; }; }; - "@lerna/add-5.1.4" = { + "@lerna/add-5.3.0" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-5.1.4.tgz"; - sha512 = "kysQaV0+6aFtT0rkbaeuP6qb0vYDwo7TiC+Og4STyXxv2mHXi3F8r6Z9xXNUn8LPi29gaCmB8DLmbEGlTBM4xg=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-5.3.0.tgz"; + sha512 = "MxwTO2UBxZwwuquKbBqdYa56YTqg6Lfz1MZsRQxO7F2cb2NN8NEYTcGOli/71Ee/2AoX4R4xIFTh3TnaflQ25A=="; }; }; - "@lerna/bootstrap-5.1.4" = { + "@lerna/bootstrap-5.3.0" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-5.1.4.tgz"; - sha512 = "uCP0WdxGCGAGkwcuhv2nLqLByq9WJ5yr+93A8T15xZJfQsXLtYjjlivIe35MjS77eR+krwl5uY6WmGPJ33+afg=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-5.3.0.tgz"; + sha512 = "iHVjt6YOQKLY0j+ex13a6ZxjIQ1TSSXqbl6z1hVjBFaDyCh7pra/tgj0LohZDVCaouLwRKucceQfTGrb+cfo7A=="; }; }; - "@lerna/changed-5.1.4" = { + "@lerna/changed-5.3.0" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-5.1.4.tgz"; - sha512 = "XwA3+pw5keO2CyjobLN8dU7mvGbzB3FD+LtLPI/zk7UbNIbl7V6uaIkoPJIdTWwP1e6S1BnGCVsAMtwQ980gTA=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-5.3.0.tgz"; + sha512 = "i6ZfBDBZCpnPaSWTuNGTrnExkHNMC+/cSUuS9njaqe+tXgqE95Ja3cMxWZth9Q1uasjcEBHPU2jG0VKrU37rpA=="; }; }; - "@lerna/check-working-tree-5.1.4" = { + "@lerna/check-working-tree-5.3.0" = { name = "_at_lerna_slash_check-working-tree"; packageName = "@lerna/check-working-tree"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-5.1.4.tgz"; - sha512 = "yFkRmZd25viwxyyOHZd3g7k2Od2Mk0Sf15fol3h/a7P0rUMf6UaMoGo2qlyo+DS51sz+eNalMmFKLpRrDXcSSw=="; + url = "https://registry.npmjs.org/@lerna/check-working-tree/-/check-working-tree-5.3.0.tgz"; + sha512 = "qo6jUGWXKLVL1nU8aEECqwrGRjs9o1l1hXdD2juA4Fvzsam1cFVHJwsmw3hAXGhEPD0oalg/XR62H9rZSCLOvQ=="; }; }; - "@lerna/child-process-5.1.4" = { + "@lerna/child-process-5.3.0" = { name = "_at_lerna_slash_child-process"; packageName = "@lerna/child-process"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-5.1.4.tgz"; - sha512 = "F7xP+bEdkE3JTyKz0t33QA5v2meXZrQQ0JmHa7/AlEg6D2r7gQ8UHSHuSUiNfX4drjpePe/9XaZylj01KLcx/w=="; + url = "https://registry.npmjs.org/@lerna/child-process/-/child-process-5.3.0.tgz"; + sha512 = "4uXPNIptrgQQQVHVVAXBD8F7IqSvZL3Og0G0DHiWKH+dsSyMIUtaIGJt7sifVoL7nzex4AqEiPq/AubpmG5g4Q=="; }; }; - "@lerna/clean-5.1.4" = { + "@lerna/clean-5.3.0" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-5.1.4.tgz"; - sha512 = "4Du/r8iYSYFpo1t5J1BYivmj84n9mGebt89isVsyqMmrCqd5B2ix/Z8PYPQFMwm7k9YYbV+sZGSpRvtXkn8kIw=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-5.3.0.tgz"; + sha512 = "Jn+Dr7A69dch8m1dLe7l/SDVQVQT2j7zdy2gaZVEmJIgEEaXmEbfJ2t2n06vRXtckI9B85M5mubT1U3Y7KuNuA=="; }; }; - "@lerna/cli-5.1.4" = { + "@lerna/cli-5.3.0" = { name = "_at_lerna_slash_cli"; packageName = "@lerna/cli"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/cli/-/cli-5.1.4.tgz"; - sha512 = "ckLSNJBY4iVmu6nBhHb8UchpWGm49z9pjsAEJQ4F/VNkT6zKsmOCfv2ahkvudQ77gc0K/dH+MTvoOHsH85bpow=="; + url = "https://registry.npmjs.org/@lerna/cli/-/cli-5.3.0.tgz"; + sha512 = "P7F3Xs98pXMEGZX+mnFfsd6gU03x8UrwQ3mElvQBICl4Ew9z6rS8NGUd3JOPFzm4/vSTjYTnPyPdWBjj6/f6sw=="; }; }; - "@lerna/collect-uncommitted-5.1.4" = { + "@lerna/collect-uncommitted-5.3.0" = { name = "_at_lerna_slash_collect-uncommitted"; packageName = "@lerna/collect-uncommitted"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-5.1.4.tgz"; - sha512 = "CI9PXYQuewqA4ZBMRycDUSVRJmAxUeP8HEZ3aKNvAwlLxLlGCueh8qOHXZHxgkmF6eQtcEjblsReiDt8bFJZpA=="; + url = "https://registry.npmjs.org/@lerna/collect-uncommitted/-/collect-uncommitted-5.3.0.tgz"; + sha512 = "Ll/mU9Nes0NQoa0pSv2TR2PTCkIomBGuDWH48OF2sKKu69NuLjrD2L0udS5nJYig9HxFewtm4QTiUdYPxfJXkQ=="; }; }; - "@lerna/collect-updates-5.1.4" = { + "@lerna/collect-updates-5.3.0" = { name = "_at_lerna_slash_collect-updates"; packageName = "@lerna/collect-updates"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-5.1.4.tgz"; - sha512 = "P1zlaZ0QkKIjbU3o7hjd4zcxzti1ndS4+eQNmlxZP3IcmlJ4+Ne+VxGeaACsjzPPBqSBWX1xcyMFLALH/Jo2CA=="; + url = "https://registry.npmjs.org/@lerna/collect-updates/-/collect-updates-5.3.0.tgz"; + sha512 = "fzJo/rmdXKWKYt+9IXjtenIZtSr3blMH8GEqoVKpSZ7TJGpxcFNmMe6foa60BgaTnDmmg1y7Qu6JbQJ3Ra5c5w=="; }; }; - "@lerna/command-5.1.4" = { + "@lerna/command-5.3.0" = { name = "_at_lerna_slash_command"; packageName = "@lerna/command"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/command/-/command-5.1.4.tgz"; - sha512 = "S/3oIagN9/ntuGtljSxHu4liB9e9YFWsq/xZOR8YoqROJENv5G5zyAmHjXq90AR/tGmLvufzFliBfEIG9CywFA=="; + url = "https://registry.npmjs.org/@lerna/command/-/command-5.3.0.tgz"; + sha512 = "UNQQ4EGTumqLhOuDPcRA4LpdS9pcTYKSdh/8MdKPeyIRN70vCTwdeTrxqaaKsn3Jo7ycvyUQT5yfrUFmCClfoA=="; }; }; - "@lerna/conventional-commits-5.1.4" = { + "@lerna/conventional-commits-5.3.0" = { name = "_at_lerna_slash_conventional-commits"; packageName = "@lerna/conventional-commits"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-5.1.4.tgz"; - sha512 = "0v0exYOH9cJTNpKggqAw7vHVLlPjqO6Y20PUg44F3GOEjd54VIGDqu+MkVhflqvUftzZjmcUHDUGHVP+8dFBNw=="; + url = "https://registry.npmjs.org/@lerna/conventional-commits/-/conventional-commits-5.3.0.tgz"; + sha512 = "9uoQ2E1J7pL0fml5PNO7FydnBNeqrNOQa53Ca1Klf5t/x4vIn51ocOZNm/YbRAc/affnrxxp+gR2/SWlN0yKqQ=="; }; }; - "@lerna/create-5.1.4" = { + "@lerna/create-5.3.0" = { name = "_at_lerna_slash_create"; packageName = "@lerna/create"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create/-/create-5.1.4.tgz"; - sha512 = "UPR5EnFg0WzXiRIKl+MGHH3hBB6s1xkLDJNLGzac5Ztry/ibLDhl47wYoYcToiQ3/y3/3751WLJErF+A52mCyw=="; + url = "https://registry.npmjs.org/@lerna/create/-/create-5.3.0.tgz"; + sha512 = "DotTReCc3+Q9rpMA8RKAGemUK7JXT7skbxHvpqpPj7ryNkIv/dNAFC2EHglcpt9Rmyo6YbSP2zk0gfDbdiIcVA=="; }; }; - "@lerna/create-symlink-5.1.4" = { + "@lerna/create-symlink-5.3.0" = { name = "_at_lerna_slash_create-symlink"; packageName = "@lerna/create-symlink"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-5.1.4.tgz"; - sha512 = "VTTuCgM5gXk0frAFxfVQqfX9QxXKz6TKpKsHcC39BAR3aiSUW8vqRImbLvaFtKpnEMW0HshDfuzp6rRkaiyWYw=="; + url = "https://registry.npmjs.org/@lerna/create-symlink/-/create-symlink-5.3.0.tgz"; + sha512 = "xIoC9m4J/u4NV/8ms4P2fiimaYgialqJvNamvMDRmgE1c3BLDSGk2nE4nVI2W5LxjgJdMTiIH9v1QpTUC9Fv+Q=="; }; }; - "@lerna/describe-ref-5.1.4" = { + "@lerna/describe-ref-5.3.0" = { name = "_at_lerna_slash_describe-ref"; packageName = "@lerna/describe-ref"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-5.1.4.tgz"; - sha512 = "ztLWLIyrHPxVhs8yfVpCDIw2st5c246KfoTqjEX8N6s8v0dLs3vfCKCM70ej6lBNkwqBXSilgHrd3AkGq3kq6Q=="; + url = "https://registry.npmjs.org/@lerna/describe-ref/-/describe-ref-5.3.0.tgz"; + sha512 = "R+CtJcOuAF3kJ6GNQnGC3STEi+5OtpNVz2n17sAs/xqJnq79tPdzEhT+pMxB2eSEkQYlSr+cCKMpF0m/mtIPQA=="; }; }; - "@lerna/diff-5.1.4" = { + "@lerna/diff-5.3.0" = { name = "_at_lerna_slash_diff"; packageName = "@lerna/diff"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/diff/-/diff-5.1.4.tgz"; - sha512 = "o5chvMHcKQS4zkdGX7LCaMgNn0flrG9OEiGt8DCIzRUa6aWJAlE2oZyOj+VsiUxzaZJxm2oV+GkISQYRJPlPug=="; + url = "https://registry.npmjs.org/@lerna/diff/-/diff-5.3.0.tgz"; + sha512 = "i6f99dtO90u1QIJEfVtKE831m4gnMHBwY+4D84GY2SJMno8uI7ZyxMRZQh1nAFtvlNozO2MgzLr1OHtNMZOIgQ=="; }; }; - "@lerna/exec-5.1.4" = { + "@lerna/exec-5.3.0" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-5.1.4.tgz"; - sha512 = "6vn1UCxJZTTt90WlWItI05yj4xaNOShgIl5Yi9mx1Ex6nVS32mmTOqHI/+Cn4M+P0C4u1hFymd2aIEfWnmdUsA=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-5.3.0.tgz"; + sha512 = "kI/IuF1hbT+pEMZc3v4+w8BLckUIi45ipzOP0bWvXNgSKKuADAU3HLv+ifRXEjob5906C+Zc7K2IVoVS6r1TDg=="; }; }; - "@lerna/filter-options-5.1.4" = { + "@lerna/filter-options-5.3.0" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-5.1.4.tgz"; - sha512 = "a6hLVZOb7awjI9Tk5hx90BB6GZz59npBRQN0kSG6drV1H+vi+wU7ee6OZ5EMHQgnzdZ6OjZQRHlWCCTXyNdKgQ=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-5.3.0.tgz"; + sha512 = "ddgy0oDisTKIhCJ4WY5CeEhTsyrbW+zeBvZ7rVaG0oQXjSSYBried4TXRvgy67fampfHoPX+eQq5l1SYTRFPlw=="; }; }; - "@lerna/filter-packages-5.1.4" = { + "@lerna/filter-packages-5.3.0" = { name = "_at_lerna_slash_filter-packages"; packageName = "@lerna/filter-packages"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-5.1.4.tgz"; - sha512 = "a+ThrgYyGrTfBZUMfi/WvcqX3Ce6JaMZjTYoNAmKpHYNZFRqdmgOT1fFLLF+/y62XGqCf0wo50xRYNg0hIAf3Q=="; + url = "https://registry.npmjs.org/@lerna/filter-packages/-/filter-packages-5.3.0.tgz"; + sha512 = "5/2V50sQB2+JNwuCHP/UPm3y8PN2JWVY9CbNLtF3K5bymNsCkQh2KHEL9wlWZ4yfr/2ufpy4XFPaFUHNoUOGnQ=="; }; }; - "@lerna/get-npm-exec-opts-5.1.4" = { + "@lerna/get-npm-exec-opts-5.3.0" = { name = "_at_lerna_slash_get-npm-exec-opts"; packageName = "@lerna/get-npm-exec-opts"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.1.4.tgz"; - sha512 = "A+cNgTWWQOcNGWz9wj40/NWK46v8TtTAmXuEPfzDruv6VdmXEVIuq7SCeUPj9+aRxMQXVCil0/Vyo2z6R9TDLw=="; + url = "https://registry.npmjs.org/@lerna/get-npm-exec-opts/-/get-npm-exec-opts-5.3.0.tgz"; + sha512 = "cYBypDo8C7f4MvVvap2nYgtk8MXAADrYU1VdECSJ3Stbe4p2vBGt8bM9xkS2uPfQFMK3YSy3YPkSZcSjVXyoGw=="; }; }; - "@lerna/get-packed-5.1.4" = { + "@lerna/get-packed-5.3.0" = { name = "_at_lerna_slash_get-packed"; packageName = "@lerna/get-packed"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-5.1.4.tgz"; - sha512 = "JD9U4Sp7Dpt3nUdXAo5f9SIXK2QsBaguChCZ8VTAl3eb7j0o7nrHYoh1eAa8rDT2L9+AxcUFDMi/wDdCotlJmA=="; + url = "https://registry.npmjs.org/@lerna/get-packed/-/get-packed-5.3.0.tgz"; + sha512 = "kD12w7Ko5TThuOuPF2HBLyuPsHK3oyyWyzleGBqR4DqxMtbMRgimyTQnr5o58XBOwUPCFsv1EZiqeGk+3HTGEA=="; }; }; - "@lerna/github-client-5.1.4" = { + "@lerna/github-client-5.3.0" = { name = "_at_lerna_slash_github-client"; packageName = "@lerna/github-client"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-5.1.4.tgz"; - sha512 = "VAaH9ycnGVsaGWM5uRKvd0oXlOERHOEOwxXLaCnR1mA7k5490B5jTlwhSWYdA4s40CF9AOdIVNgBhP+T7MlcPw=="; + url = "https://registry.npmjs.org/@lerna/github-client/-/github-client-5.3.0.tgz"; + sha512 = "UqAclsWDMthmbv3Z8QE1K7D/4e93ytg31mc+nEj+UdU+xJQ0L1ypl8zWAmGNs1sFkQntIiTIB4W5zgHet5mmZw=="; }; }; - "@lerna/gitlab-client-5.1.4" = { + "@lerna/gitlab-client-5.3.0" = { name = "_at_lerna_slash_gitlab-client"; packageName = "@lerna/gitlab-client"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-5.1.4.tgz"; - sha512 = "F0Pa6Cv6TE0gbhuHR2gVVwdzstqePMZhTNcVY5So3YJrb1ppuUH/4cVXhRcEOj16QuWJ6yysxb7mj8tY4Zv0Bw=="; + url = "https://registry.npmjs.org/@lerna/gitlab-client/-/gitlab-client-5.3.0.tgz"; + sha512 = "otwbiaGDgvn5MGF1ypsCO48inMpdcxuiDlbxrKD6glPUwNHiGV+PU8LLCCDKimwjjQhl88ySLpL1oTm4jnZ1Aw=="; }; }; - "@lerna/global-options-5.1.4" = { + "@lerna/global-options-5.3.0" = { name = "_at_lerna_slash_global-options"; packageName = "@lerna/global-options"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-5.1.4.tgz"; - sha512 = "gs6y97tomIuyYdDr9uKQ5B5AR9m6wVft6lrxWlGlLo0prz39tx7fJ9wT2IpJ9iALCadkQW6g7XFtddwfm5VRhg=="; + url = "https://registry.npmjs.org/@lerna/global-options/-/global-options-5.3.0.tgz"; + sha512 = "iEoFrDSU+KtfcB+lHW5grjg3VkEqzZNTUnWnE1FCBBwj9tSLOHjgKGtWWjIQtBUJ+qcLBbusap9Stqzr7UPYpQ=="; }; }; - "@lerna/has-npm-version-5.1.4" = { + "@lerna/has-npm-version-5.3.0" = { name = "_at_lerna_slash_has-npm-version"; packageName = "@lerna/has-npm-version"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-5.1.4.tgz"; - sha512 = "U81b1nvqwF8PGyHib8/AWeGbaNipGdqXZsRO5g3ob9A5X57GXJ86cQVLejLi+znY4SmQcHladC4TotJkpNF1Ag=="; + url = "https://registry.npmjs.org/@lerna/has-npm-version/-/has-npm-version-5.3.0.tgz"; + sha512 = "A/bK8e+QP/VMqZkq1wZbyOzMz/AY92tAVsBOQ5Yw2zqshdMVj99st3YHLOqJf/HTEzQo27GGI/ajmcltHS2l6A=="; }; }; - "@lerna/import-5.1.4" = { + "@lerna/import-5.3.0" = { name = "_at_lerna_slash_import"; packageName = "@lerna/import"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/import/-/import-5.1.4.tgz"; - sha512 = "Kswe1NKJDUDlO/gbkFcurzaYlaj/fXlapHTaih9LmQDiVPOE9GphD5qnABCV0c4CqeSnCzRujT5BUjjL5z7viA=="; + url = "https://registry.npmjs.org/@lerna/import/-/import-5.3.0.tgz"; + sha512 = "KjVT9oFNSp1JLdrS1LSXjDcLiu2TMSfy6tpmhF9Zxo7oKB21SgWmXVV9rcWDueW2RIxNXDeVUG0NVNj2BRGeEQ=="; }; }; - "@lerna/info-5.1.4" = { + "@lerna/info-5.3.0" = { name = "_at_lerna_slash_info"; packageName = "@lerna/info"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/info/-/info-5.1.4.tgz"; - sha512 = "9OMdNtmDMKLwfX+aZk9nHLfksYXuU7IcIiVJ9dR7gYx1PoKjXvTpd/+hd7t/tmElM21kmPVxQBu02L3KmXw+hQ=="; + url = "https://registry.npmjs.org/@lerna/info/-/info-5.3.0.tgz"; + sha512 = "pyeZSM/PIpBHCXdHPrbh6sPZlngXUxhTVFb0VaIjQ5Ms585xi15s1UQDO3FvzqdyMyalx0QGzCJbNx5XeoCejg=="; }; }; - "@lerna/init-5.1.4" = { + "@lerna/init-5.3.0" = { name = "_at_lerna_slash_init"; packageName = "@lerna/init"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/init/-/init-5.1.4.tgz"; - sha512 = "OdI5iWYT1JcB6f5mjmCjgpkOrpDdSSDzmSi34kp/NP1FkbskDoMffVBTQiV8/h6zAg3jk1+aLQYLMuR5E6nIwA=="; + url = "https://registry.npmjs.org/@lerna/init/-/init-5.3.0.tgz"; + sha512 = "y46lzEtgMdEseTJGQQqYZOjqqd7iN+e14vFh/9q5h62V4Y8nlUJRzovVo8JSeaGwKLB0B3dq3BuUn0PNywMhpA=="; }; }; - "@lerna/link-5.1.4" = { + "@lerna/link-5.3.0" = { name = "_at_lerna_slash_link"; packageName = "@lerna/link"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/link/-/link-5.1.4.tgz"; - sha512 = "j73MW+vam6e8XdwyQGeHR9X7TUmgvLG0wV1vDLjSyrhk/Q5oFo0RTRgfDJqR4tCtRnv0vujvw5oDXfSbBmg67g=="; + url = "https://registry.npmjs.org/@lerna/link/-/link-5.3.0.tgz"; + sha512 = "+QBwnGg3S8Zk8M8G5CA4kmGq92rkEMbmWJXaxie3jQayp+GXgSlLs6R4jwSOZlztY6xR3WawMI9sHJ0Vdu+g7w=="; }; }; - "@lerna/list-5.1.4" = { + "@lerna/list-5.3.0" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-5.1.4.tgz"; - sha512 = "D7FAUik18s5FtHnBoPzodR8LUvH5b0a/ziV8ICaKWZ98H4w9qpNsQtBe0O+7DwUuqLKYpycst5tY5WVGnNwuNA=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-5.3.0.tgz"; + sha512 = "5RJvle3m4l2H0UmKNlwS8h2OIlNGsNTKPC4DYrJYt0+fhgzf5SEV1QKw+fuUqe3F8MziIkSGQB52HsjwPE6AWQ=="; }; }; - "@lerna/listable-5.1.4" = { + "@lerna/listable-5.3.0" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-5.1.4.tgz"; - sha512 = "grGLrffBNX38l5mzZgkv4xE9UcAAKBi1s+LgloI3rusgTdE/B8gvCOYMqLf9V08iojs7Ke2xPf0whJmbEeK/qA=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-5.3.0.tgz"; + sha512 = "RdmeV9mDeuBOgVOlF/KNH/qttyiYwHbeqHiMAw9s9AfMo/Fz3iDZaTGZuruMm84TZSkKxI7m5mjTlC0djsyKog=="; }; }; - "@lerna/log-packed-5.1.4" = { + "@lerna/log-packed-5.3.0" = { name = "_at_lerna_slash_log-packed"; packageName = "@lerna/log-packed"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-5.1.4.tgz"; - sha512 = "qJlWMVjc/uM1I7AWqrOPeBLVZy9YExi/QqUyvmkb8mmsPXnW7rxIJQdYgRifS5aFNTbX/MtG8Q65Rr4syiVnSA=="; + url = "https://registry.npmjs.org/@lerna/log-packed/-/log-packed-5.3.0.tgz"; + sha512 = "tDuOot3vSOUSP7fNNej8UM0fah5oy8mKXe026grt4J0OP4L3rhSWxhfrDBQ3Ylh2dAjgHzscUf/vpnNC9HnhOQ=="; }; }; - "@lerna/npm-conf-5.1.4" = { + "@lerna/npm-conf-5.3.0" = { name = "_at_lerna_slash_npm-conf"; packageName = "@lerna/npm-conf"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-5.1.4.tgz"; - sha512 = "kNbw2jO0HD9P4+nS8RIFub549BiQYG/sdFUuNWu7cCjErB+g/5ayfE6Mn5HyiRPMYXVw73iR8IzvkCCDWEOB7Q=="; + url = "https://registry.npmjs.org/@lerna/npm-conf/-/npm-conf-5.3.0.tgz"; + sha512 = "ejlypb90tvIsKUCb0fcOKt7wcPEjLdVK2zfbNs0M+UlRDLyRVOHUVdelJ15cRDNjQHzhBo2HBUKn5Fmm/2pcmg=="; }; }; - "@lerna/npm-dist-tag-5.1.4" = { + "@lerna/npm-dist-tag-5.3.0" = { name = "_at_lerna_slash_npm-dist-tag"; packageName = "@lerna/npm-dist-tag"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-5.1.4.tgz"; - sha512 = "9q5N3iy8KGFBsyRBmNEftj8ACeCXNh2JUBqk/wYGiB0WH0oVf0UY/uo6VUy8dZjyJ9Q0eZa1ONtFHIg3QrzGDA=="; + url = "https://registry.npmjs.org/@lerna/npm-dist-tag/-/npm-dist-tag-5.3.0.tgz"; + sha512 = "OPahPk9QLXQXFgtrWm22NNxajVYKavCyTh8ijMwXTGXXbMJAw+PVjokfrUuEtg7FQi+kfJSrYAcJAxxfQq2eiA=="; }; }; - "@lerna/npm-install-5.1.4" = { + "@lerna/npm-install-5.3.0" = { name = "_at_lerna_slash_npm-install"; packageName = "@lerna/npm-install"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-5.1.4.tgz"; - sha512 = "DbbUK2Zy7ZBpkHimlFKf7XbGzBsoPfqzf0i9hIYBHmND9YWSgIgVFJcyRH7E6UKpr4wRChW4h6xEV81jKykB7w=="; + url = "https://registry.npmjs.org/@lerna/npm-install/-/npm-install-5.3.0.tgz"; + sha512 = "scbWo8nW+P9KfitWG3y7Ep97dOs64ECfz9xfqtjagEXKYBPxG3skvwwljkfNnuxrCNs71JVD+imvcewHzih28g=="; }; }; - "@lerna/npm-publish-5.1.4" = { + "@lerna/npm-publish-5.3.0" = { name = "_at_lerna_slash_npm-publish"; packageName = "@lerna/npm-publish"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-5.1.4.tgz"; - sha512 = "MXtd2cFN+oJMxj9m1fXYAo+KE2BzO84Ukt3uAhQb1cXU01ZCwqGl/lQRWw5vI88emrKs0akx3d6E77PFpX9rpw=="; + url = "https://registry.npmjs.org/@lerna/npm-publish/-/npm-publish-5.3.0.tgz"; + sha512 = "n+ocN1Dxrs6AmrSNqZl57cwhP4/VjQXdEI+QYauNnErNjMQW8Wt+tNaTlVAhZ1DnorwAo86o2uzFF/BgdUqh9A=="; }; }; - "@lerna/npm-run-script-5.1.4" = { + "@lerna/npm-run-script-5.3.0" = { name = "_at_lerna_slash_npm-run-script"; packageName = "@lerna/npm-run-script"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-5.1.4.tgz"; - sha512 = "vw2G69lFmFzdX553GidE66QgCZ3cGyxoOvnpCdvZ1n9AS5ZwZSiL8Ms6N3Vj+AOhESFZmFZkzIVhtpX5/xNzLg=="; + url = "https://registry.npmjs.org/@lerna/npm-run-script/-/npm-run-script-5.3.0.tgz"; + sha512 = "2cLR1YdzeMjaMKgDuwHE+iZgVPt+Ttzb3/wFtp7Mw9TlKmNIdbHdrnfl12ABz5knPC+62CCNjB/gznfLndPp2w=="; }; }; - "@lerna/otplease-5.1.4" = { + "@lerna/otplease-5.3.0" = { name = "_at_lerna_slash_otplease"; packageName = "@lerna/otplease"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-5.1.4.tgz"; - sha512 = "t3qKC55D7rCacNTsqQwn25XxDRQXgRHYWS0gqn2ch+dTwXOI61Uto9okVhgn2ZfZVydJ3sjnktOsPeSXhQRQew=="; + url = "https://registry.npmjs.org/@lerna/otplease/-/otplease-5.3.0.tgz"; + sha512 = "Xpju2VC5TiycmBP/mdp9hRstkH2MLm8/7o2NotVTCJwASWdKphRMqezhh5BX0E9i6VyrjzmTqSYEh9FNZZ9MwQ=="; }; }; - "@lerna/output-5.1.4" = { + "@lerna/output-5.3.0" = { name = "_at_lerna_slash_output"; packageName = "@lerna/output"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/output/-/output-5.1.4.tgz"; - sha512 = "E9nLEcV5GJbTKJd/d+cvU54CIzQqoU2rJAeXeyHTufbjgCTPk4I8uDNHmG7uJ+aPrif6PPBt1IIw+w5UnStfdw=="; + url = "https://registry.npmjs.org/@lerna/output/-/output-5.3.0.tgz"; + sha512 = "fISmHDu/9PKInFmT5NXsbh8cR6aE6SUXWrteXJ6PBYK30s0f/pVcfswb9VccX0Yea8HmqMQgCHWUWifkZeXiRA=="; }; }; - "@lerna/pack-directory-5.1.4" = { + "@lerna/pack-directory-5.3.0" = { name = "_at_lerna_slash_pack-directory"; packageName = "@lerna/pack-directory"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-5.1.4.tgz"; - sha512 = "TsltQrbwC/bPwQbL5i7WCMNM4Chl8+iqzawRZbILfjYpt3UK9xSV2tWfc9QtbmRBETvcFz/UMKQQDz+LMWN9jw=="; + url = "https://registry.npmjs.org/@lerna/pack-directory/-/pack-directory-5.3.0.tgz"; + sha512 = "dTGMUB6/GjExhmLZ8yeFaRKJuSm6M/IsfxSJdL4gFPLigUIAS4XhzXS3KnL0+Ef1ue1yaTlAE9c/czfkE0pc/w=="; }; }; - "@lerna/package-5.1.4" = { + "@lerna/package-5.3.0" = { name = "_at_lerna_slash_package"; packageName = "@lerna/package"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package/-/package-5.1.4.tgz"; - sha512 = "L0zsxslJZ+swkG/KLU3TQHmWPR0hf0eLIdOROyA9Nxvuo8C/702ddYZcuEYcz9t/jOuSgSB2s90iK2oTIncNbw=="; + url = "https://registry.npmjs.org/@lerna/package/-/package-5.3.0.tgz"; + sha512 = "hsB03miiaNdvZ/UGzl0sVqxVat5x33EG9JiYgIoFqzroQPrG+WShmX3ctuO06TY1pxb4iNuHLPIbQomHEzzj8w=="; }; }; - "@lerna/package-graph-5.1.4" = { + "@lerna/package-graph-5.3.0" = { name = "_at_lerna_slash_package-graph"; packageName = "@lerna/package-graph"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-5.1.4.tgz"; - sha512 = "dP1gLcrqou5/8zef7u5ne4GTslNXULjpi3dDiljohKNR4XelsC4lkkF9m1Uzn9E1nAphHRhWXrRq40kqxmdYXg=="; + url = "https://registry.npmjs.org/@lerna/package-graph/-/package-graph-5.3.0.tgz"; + sha512 = "UEHY7l/yknwFvQgo0RifyY+B5QdzuFutLZYSN1BMmyWttOZD9rkM263qnLNGTZ2BUE4dXDwwwOHuhLvi+xDRsA=="; }; }; - "@lerna/prerelease-id-from-version-5.1.4" = { + "@lerna/prerelease-id-from-version-5.3.0" = { name = "_at_lerna_slash_prerelease-id-from-version"; packageName = "@lerna/prerelease-id-from-version"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.1.4.tgz"; - sha512 = "kDcXKKFD6Ww/FinLEvsY1P3aIiuVLyonkttvfKJTJvm3ymz7/fBKz8GotFXuONVC1xSIK9Nrk3jGYs6ZGoha+w=="; + url = "https://registry.npmjs.org/@lerna/prerelease-id-from-version/-/prerelease-id-from-version-5.3.0.tgz"; + sha512 = "o1wsLns6hFTsmk4iqTRJNWLnFzlBBwgu17hp8T2iU4U7LUlDT2ZSKV3smGAU6GfrwX3MAp4LZ5syxgjFjrUOnw=="; }; }; - "@lerna/profiler-5.1.4" = { + "@lerna/profiler-5.3.0" = { name = "_at_lerna_slash_profiler"; packageName = "@lerna/profiler"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-5.1.4.tgz"; - sha512 = "JLkS90+CSmi85v3SlJc5Wjk73MHmIviqtL3fM/Z6clBLbsRPkbBBfSwXKp7O281knF6E2UNTrWOtEG7b6wG3TQ=="; + url = "https://registry.npmjs.org/@lerna/profiler/-/profiler-5.3.0.tgz"; + sha512 = "LEZYca29EPgZR0q5E+7CJkn25Cw3OxNMQJU/CVn/HGeoWYWOpoDxujrZBl8is2bw06LHXvRbVXEUATLc+ACbqQ=="; }; }; - "@lerna/project-5.1.4" = { + "@lerna/project-5.3.0" = { name = "_at_lerna_slash_project"; packageName = "@lerna/project"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/project/-/project-5.1.4.tgz"; - sha512 = "k0z3w45t746uAUkN+jY/jF+/BqHodGFYaUfM0DTDOGUWC8tXzxuqk3bchShp6Wct2gwNQWbtWHl50Jhhw5PC5g=="; + url = "https://registry.npmjs.org/@lerna/project/-/project-5.3.0.tgz"; + sha512 = "InhIo9uwT1yod72ai5SKseJSUk8KkqG6COmwp1/45vibbawb7ZLbokpns7n46A0NdGNlmwJolamybYOuyumejw=="; }; }; - "@lerna/prompt-5.1.4" = { + "@lerna/prompt-5.3.0" = { name = "_at_lerna_slash_prompt"; packageName = "@lerna/prompt"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-5.1.4.tgz"; - sha512 = "AiE8NIzh+x2+F0t96M+rfwLtKzBNXjQEWXtBfEcA1eRqanMWUr6ejfmdkoEzXVrMzyY/ugPdWQYbGCI00iF7Tg=="; + url = "https://registry.npmjs.org/@lerna/prompt/-/prompt-5.3.0.tgz"; + sha512 = "4bIusBdjpw665CJtFsVsaB55hLHnmKnrcOaRjna6N/MdJDl8Th6X4EM4rrfXTX/uUNR3XcV91lYqcLuLmrpm5w=="; }; }; - "@lerna/publish-5.1.4" = { + "@lerna/publish-5.3.0" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-5.1.4.tgz"; - sha512 = "hbFAwOlyUR4AUBd7qTQXXVKgaxTS4Mz4Kkjxz8g7jtqo+T0KvU3JbfwDqxOiCwcDk+qkrBbkwbvc27jcObSwkw=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-5.3.0.tgz"; + sha512 = "T8T1BQdI+NnlVARKwIXzILknEuiQlZToBsDpuX06M7+45t/pp9Z+u6pVt3rrqwiUPZ/dpoZzYKI31YdNJtGMcQ=="; }; }; - "@lerna/pulse-till-done-5.1.4" = { + "@lerna/pulse-till-done-5.3.0" = { name = "_at_lerna_slash_pulse-till-done"; packageName = "@lerna/pulse-till-done"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-5.1.4.tgz"; - sha512 = "zFPzv6cY0OcqtcR91ueZqd+ulTLE4vPk9l6iPAfefgqh6w0E6hSmG6J9RmYE3gaMHSFJdvYHb/yyTPLF32J9lg=="; + url = "https://registry.npmjs.org/@lerna/pulse-till-done/-/pulse-till-done-5.3.0.tgz"; + sha512 = "yNvSuPLT1ZTtD2LMVOmiDhw4+9qkyf6xCpfxiUp4cGEN+qIuazWB5JicKLE49o27DBdaG8Ao4lAlb16x/gNrwQ=="; }; }; - "@lerna/query-graph-5.1.4" = { + "@lerna/query-graph-5.3.0" = { name = "_at_lerna_slash_query-graph"; packageName = "@lerna/query-graph"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-5.1.4.tgz"; - sha512 = "G8DYNqp5ISbbMjEJhGst1GHk59zO18IG9oaVSK14M7iF3qCLtg0iJ1Do4LDNpda3EF8PrLOx2mrNM5MBcGMjEg=="; + url = "https://registry.npmjs.org/@lerna/query-graph/-/query-graph-5.3.0.tgz"; + sha512 = "t99lNj97/Vilp5Js1Be7MoyaZ5U0fbOFh0E7lnTfSLvZhTkPMK6xLvAx2M3NQqhwYCQjTFDuf9ozQ3HQtYZAmA=="; }; }; - "@lerna/resolve-symlink-5.1.4" = { + "@lerna/resolve-symlink-5.3.0" = { name = "_at_lerna_slash_resolve-symlink"; packageName = "@lerna/resolve-symlink"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-5.1.4.tgz"; - sha512 = "hpnaX5tznAtbQXlyc92kJiywdTnnbCf6wihSZwDiVnVgXuHJ3LvmjN677h9A0jobY6KdTT+wIoAHpJuZHj60vQ=="; + url = "https://registry.npmjs.org/@lerna/resolve-symlink/-/resolve-symlink-5.3.0.tgz"; + sha512 = "zKI7rV5FzzlMBfi6kjDS0ulzcdDTORvdOJ/+CHU5C2h+v+P64Nk2VhZZNCCBDoO/l4GRhgehZOB70GIamO1TSw=="; }; }; - "@lerna/rimraf-dir-5.1.4" = { + "@lerna/rimraf-dir-5.3.0" = { name = "_at_lerna_slash_rimraf-dir"; packageName = "@lerna/rimraf-dir"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-5.1.4.tgz"; - sha512 = "WvHm4gE1/HWbI4gCjJw3clPT+FRq2Ob9I9EDbfw4c307MNT4kW4bJU2mt0nyv/uwYhUkTG+GQVrlt+Dtcif77g=="; + url = "https://registry.npmjs.org/@lerna/rimraf-dir/-/rimraf-dir-5.3.0.tgz"; + sha512 = "/QJebh0tSY3LjgEyOo+6NH/b7ZNw9IpjqiDtvnLixjtdfkgli1OKOoZTa4KrO0mJoqMRq4yAa98cjpIzyKqCqw=="; }; }; - "@lerna/run-5.1.4" = { + "@lerna/run-5.3.0" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-5.1.4.tgz"; - sha512 = "iaTioOF66z02Y9ml/Ba0ePpXOwZ+BkODcNXrJbyW8WhraL0fSjyno0FspO1Eu0nG4JMtgCsoEzHNphsk7Wg+7A=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-5.3.0.tgz"; + sha512 = "KwoKTj1w71OmUHONNYhZME+tr5lk9Q4f+3LUr2WtWZRuOAGO5ZCRrcZc+N4Ib7zno89Ub6Ovz51fcjwltLh72w=="; }; }; - "@lerna/run-lifecycle-5.1.4" = { + "@lerna/run-lifecycle-5.3.0" = { name = "_at_lerna_slash_run-lifecycle"; packageName = "@lerna/run-lifecycle"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-5.1.4.tgz"; - sha512 = "ubmqi1ixebBHSTYS0oK8MoqBoJE7UDrXWTWsv84UrXiPutTffLR8ZQJKlMEcetQVzX9qbjpKbzc+jQWXPWid2A=="; + url = "https://registry.npmjs.org/@lerna/run-lifecycle/-/run-lifecycle-5.3.0.tgz"; + sha512 = "EuBCGwm2PLgkebfyqo3yNkwfSb1EzHeo3lA8t4yld6LXWkgUPBFhc7RwRc6TsQOpjpfFvDSGoI282R01o0jPVQ=="; }; }; - "@lerna/run-topologically-5.1.4" = { + "@lerna/run-topologically-5.3.0" = { name = "_at_lerna_slash_run-topologically"; packageName = "@lerna/run-topologically"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-5.1.4.tgz"; - sha512 = "MckWfLu/xuRtaThdUgrJC2naumv2LOIiMoJfxCdYpiCrIgq5YrwqOxjQ0awHqQhkvFZ5G91ucBcBEIMsOou1iw=="; + url = "https://registry.npmjs.org/@lerna/run-topologically/-/run-topologically-5.3.0.tgz"; + sha512 = "WiFF2EiwLjAguKs0lEmcukTL7WhuWFwxNprrGWFxEkBhlGdMFk18n8BaZN8FO26xqzztzuPzSx1re/f/dEEAPg=="; }; }; - "@lerna/symlink-binary-5.1.4" = { + "@lerna/symlink-binary-5.3.0" = { name = "_at_lerna_slash_symlink-binary"; packageName = "@lerna/symlink-binary"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-5.1.4.tgz"; - sha512 = "SNjHxCNTCD0Xfj3CNBTG+3ut4aDAVaq+SrB2ckFNmZ5Z9yFdnX6aP+PBzLD/0q5hj18lGlaJ8iZjD/ubbrgFCA=="; + url = "https://registry.npmjs.org/@lerna/symlink-binary/-/symlink-binary-5.3.0.tgz"; + sha512 = "dIATASuGS6y512AGjacOoTpkFDPsKlhggjzL3KLdSNmxV3288nUqaFBuA7rTnnMNnBQ7jVuE1JKJupZnzPN0cA=="; }; }; - "@lerna/symlink-dependencies-5.1.4" = { + "@lerna/symlink-dependencies-5.3.0" = { name = "_at_lerna_slash_symlink-dependencies"; packageName = "@lerna/symlink-dependencies"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-5.1.4.tgz"; - sha512 = "SuzylyNs1R5bVRqSCwfbQLdDP83RX8ncQxOy2SSSrScwkzdBCDqDPh4haeADsq2+RoOQBItn1PDfzUCNAWomDA=="; + url = "https://registry.npmjs.org/@lerna/symlink-dependencies/-/symlink-dependencies-5.3.0.tgz"; + sha512 = "qkq4YT/Bdrb3W22ve+d2Gy3hRTrtT/zBhjKTCukEpYsFJLwSjZ4z5vbv6J15/j6PN1Km9oTRp6vBYmdjAuARQQ=="; }; }; - "@lerna/temp-write-5.1.4" = { + "@lerna/temp-write-5.3.0" = { name = "_at_lerna_slash_temp-write"; packageName = "@lerna/temp-write"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-5.1.4.tgz"; - sha512 = "f+6+ud87pyitM9zAq7GBhB7uoHTcgLJvR3YGv5sNja4jIl3+zdKPDcyxzVyQb38knuRSkGM8NjYOWi4zwcMaGw=="; + url = "https://registry.npmjs.org/@lerna/temp-write/-/temp-write-5.3.0.tgz"; + sha512 = "AhC5Q+tV0yebEc1P2jsB4apQzztW8dgdLLc1G1Pkt46l5vezRGhZmsj+iUyCsVjpdUSO/UcAq1DbI2Xzhf5arg=="; }; }; - "@lerna/timer-5.1.4" = { + "@lerna/timer-5.3.0" = { name = "_at_lerna_slash_timer"; packageName = "@lerna/timer"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/timer/-/timer-5.1.4.tgz"; - sha512 = "fhQtqkLxNexPWzhI1WAxZnHIBM8VhChvUJu503u1Rmp2JxhXbTE4Txnu1gPvqlDjdoE6ck0vN5icmfMVRwKc8g=="; + url = "https://registry.npmjs.org/@lerna/timer/-/timer-5.3.0.tgz"; + sha512 = "IeDjj1gJtbUPKl2ebpiml9u4k2kRqYF1Dbs6JuWpeC7lGxAx3JcUmkNH2RQ1BYTxk5xc9FKlgNMrZQwhq2K1Ow=="; }; }; - "@lerna/validation-error-5.1.4" = { + "@lerna/validation-error-5.3.0" = { name = "_at_lerna_slash_validation-error"; packageName = "@lerna/validation-error"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-5.1.4.tgz"; - sha512 = "wys9Fv/bUy7sYXOK9t+V3XSyEHK5tUXwY22nfIDYu416WcSkkE4DI8Q2nTv4nYYOmG2Y7IOhaSenbsPLQ0VqtQ=="; + url = "https://registry.npmjs.org/@lerna/validation-error/-/validation-error-5.3.0.tgz"; + sha512 = "GVvnTxx+CNFjXCiJahAu2c/pP2R3DhGuQp4CJUyKegnzGaWK0h5PhlwRL7/LbDMPLh2zLobPOVr9kTOjwv76Nw=="; }; }; - "@lerna/version-5.1.4" = { + "@lerna/version-5.3.0" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-5.1.4.tgz"; - sha512 = "cYgm1SNdiK129JoWI8WMwjsxaIyeAC1gCaToWk36Tw+BCF3PbkdoTKdneDmJ+7qbX1QrzxsgHTcjwIt4lZPEqQ=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-5.3.0.tgz"; + sha512 = "QOQSAdpeP66oQQ20nNZ4NhJS5NtZZDGyz36kP/4BeqjGK6QgtrEmto4+vmWj49w3VJUIXnrqAKHiPkhFUmJm5Q=="; }; }; - "@lerna/write-log-file-5.1.4" = { + "@lerna/write-log-file-5.3.0" = { name = "_at_lerna_slash_write-log-file"; packageName = "@lerna/write-log-file"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-5.1.4.tgz"; - sha512 = "ISJbkjaSKhJ4d7V90RFvuwDQFq9ZH/KN475KFJr+TBFZTwMiXuBahlq+j8/a+nItejNnuPD4/xlWuzCOuGJORQ=="; + url = "https://registry.npmjs.org/@lerna/write-log-file/-/write-log-file-5.3.0.tgz"; + sha512 = "cmrNAI5+9auUJSuTVrUzt2nb/KX6htgjdw7gGPMI1Tm6cdBIbs67R6LedZ8yvYOLGsXB2Se93vxv5fTgEHWfCw=="; }; }; "@lezer/common-0.15.12" = { @@ -5575,6 +5719,15 @@ let sha512 = "+F8ioQIUN68B4UFiIBYu0QQvgb9FmlKw2ctQMSBfW2QBrZIxz9vD9jCGqTCPqZBRbPHAS/vG1zSXnKqnS2ch/A=="; }; }; + "@lmdb/lmdb-darwin-arm64-2.5.3" = { + name = "_at_lmdb_slash_lmdb-darwin-arm64"; + packageName = "@lmdb/lmdb-darwin-arm64"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-2.5.3.tgz"; + sha512 = "RXwGZ/0eCqtCY8FLTM/koR60w+MXyvBUpToXiIyjOcBnC81tAlTUHrRUavCEWPI9zc9VgvpK3+cbumPyR8BSuA=="; + }; + }; "@lmdb/lmdb-darwin-x64-2.5.2" = { name = "_at_lmdb_slash_lmdb-darwin-x64"; packageName = "@lmdb/lmdb-darwin-x64"; @@ -5584,6 +5737,15 @@ let sha512 = "KvPH56KRLLx4KSfKBx0m1r7GGGUMXm0jrKmNE7plbHlesZMuPJICtn07HYgQhj1LNsK7Yqwuvnqh1QxhJnF1EA=="; }; }; + "@lmdb/lmdb-darwin-x64-2.5.3" = { + name = "_at_lmdb_slash_lmdb-darwin-x64"; + packageName = "@lmdb/lmdb-darwin-x64"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-2.5.3.tgz"; + sha512 = "337dNzh5yCdNCTk8kPfoU7jR3otibSlPDGW0vKZT97rKnQMb9tNdto3RtWoGPsQ8hKmlRZpojOJtmwjncq1MoA=="; + }; + }; "@lmdb/lmdb-linux-arm-2.5.2" = { name = "_at_lmdb_slash_lmdb-linux-arm"; packageName = "@lmdb/lmdb-linux-arm"; @@ -5593,6 +5755,15 @@ let sha512 = "5kQAP21hAkfW5Bl+e0P57dV4dGYnkNIpR7f/GAh6QHlgXx+vp/teVj4PGRZaKAvt0GX6++N6hF8NnGElLDuIDw=="; }; }; + "@lmdb/lmdb-linux-arm-2.5.3" = { + name = "_at_lmdb_slash_lmdb-linux-arm"; + packageName = "@lmdb/lmdb-linux-arm"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-2.5.3.tgz"; + sha512 = "mU2HFJDGwECkoD9dHQEfeTG5mp8hNS2BCfwoiOpVPMeapjYpQz9Uw3FkUjRZ4dGHWKbin40oWHuL0bk2bCx+Sg=="; + }; + }; "@lmdb/lmdb-linux-arm64-2.5.2" = { name = "_at_lmdb_slash_lmdb-linux-arm64"; packageName = "@lmdb/lmdb-linux-arm64"; @@ -5602,6 +5773,15 @@ let sha512 = "aLl89VHL/wjhievEOlPocoefUyWdvzVrcQ/MHQYZm2JfV1jUsrbr/ZfkPPUFvZBf+VSE+Q0clWs9l29PCX1hTQ=="; }; }; + "@lmdb/lmdb-linux-arm64-2.5.3" = { + name = "_at_lmdb_slash_lmdb-linux-arm64"; + packageName = "@lmdb/lmdb-linux-arm64"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-2.5.3.tgz"; + sha512 = "VJw60Mdgb4n+L0fO1PqfB0C7TyEQolJAC8qpqvG3JoQwvyOv6LH7Ib/WE3wxEW9nuHmVz9jkK7lk5HfWWgoO1Q=="; + }; + }; "@lmdb/lmdb-linux-x64-2.5.2" = { name = "_at_lmdb_slash_lmdb-linux-x64"; packageName = "@lmdb/lmdb-linux-x64"; @@ -5611,6 +5791,15 @@ let sha512 = "xUdUfwDJLGjOUPH3BuPBt0NlIrR7f/QHKgu3GZIXswMMIihAekj2i97oI0iWG5Bok/b+OBjHPfa8IU9velnP/Q=="; }; }; + "@lmdb/lmdb-linux-x64-2.5.3" = { + name = "_at_lmdb_slash_lmdb-linux-x64"; + packageName = "@lmdb/lmdb-linux-x64"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-2.5.3.tgz"; + sha512 = "qaReO5aV8griBDsBr8uBF/faO3ieGjY1RY4p8JvTL6Mu1ylLrTVvOONqKFlNaCwrmUjWw5jnf7VafxDAeQHTow=="; + }; + }; "@lmdb/lmdb-win32-x64-2.5.2" = { name = "_at_lmdb_slash_lmdb-win32-x64"; packageName = "@lmdb/lmdb-win32-x64"; @@ -5620,6 +5809,15 @@ let sha512 = "zrBczSbXKxEyK2ijtbRdICDygRqWSRPpZMN5dD1T8VMEW5RIhIbwFWw2phDRXuBQdVDpSjalCIUMWMV2h3JaZA=="; }; }; + "@lmdb/lmdb-win32-x64-2.5.3" = { + name = "_at_lmdb_slash_lmdb-win32-x64"; + packageName = "@lmdb/lmdb-win32-x64"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-2.5.3.tgz"; + sha512 = "cK+Elf3RjEzrm3SerAhrFWL5oQAsZSJ/LmjL1joIpTfEP1etJJ9CTRvdaV6XLYAxaEkfdhk/9hOvHLbR9yIhCA=="; + }; + }; "@malept/cross-spawn-promise-1.1.1" = { name = "_at_malept_slash_cross-spawn-promise"; packageName = "@malept/cross-spawn-promise"; @@ -5791,13 +5989,13 @@ let sha512 = "ES5rj6J39FUkHe/b3C9SJs8bqIungYhuU7rBINTBaHOv/Ce4RCb3Gw08CZVl32W33UEkgRkzyWaIedV4at+QHg=="; }; }; - "@mdn/browser-compat-data-5.1.1" = { + "@mdn/browser-compat-data-5.1.2" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.1.1.tgz"; - sha512 = "odIvtuAoXePQL4UcPrhy3MSXMvz2vefTe5uQQoLzKHQ6+f6vAhVlZEbs92d6cz8oSjylF+KL3Z/G2eLCMFl7qw=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-5.1.2.tgz"; + sha512 = "X7lnoos6vF+llTjMDhP8HQJy2nL4RNf1LRejfNKOJLKrZ55A4p2z1WdhPY/NCieqiLH6gwlzDSVpmPYSPLd+bg=="; }; }; "@medable/mdctl-api-1.0.66" = { @@ -5962,13 +6160,13 @@ let sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA=="; }; }; - "@microsoft/load-themed-styles-1.10.270" = { + "@microsoft/load-themed-styles-1.10.285" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.270"; + version = "1.10.285"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.270.tgz"; - sha512 = "HvzX1iTkQgpTl+BucTrfszOWJEQ1K1DD8Ibr1sDpS/jtFVhppuL+56mGW4tYlx5+XgN3j8FN8j/XnA0tHCK+Tw=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.285.tgz"; + sha512 = "Z+PdkIt+FGDL3IdnOEz3/77YBaDV51Oll3aSE/WITKWUUDrorIDTGZzqAk1sx/fdnlKo+f2wCFxXrWkq9MN0YQ=="; }; }; "@mischnic/json-sourcemap-0.1.0" = { @@ -6025,76 +6223,76 @@ let sha512 = "rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-arm64-2.0.2" = { + "@msgpackr-extract/msgpackr-extract-darwin-arm64-2.1.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-arm64"; packageName = "@msgpackr-extract/msgpackr-extract-darwin-arm64"; - version = "2.0.2"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.0.2.tgz"; - sha512 = "FMX5i7a+ojIguHpWbzh5MCsCouJkwf4z4ejdUY/fsgB9Vkdak4ZnoIEskOyOUMMB4lctiZFGszFQJXUeFL8tRg=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.1.2.tgz"; + sha512 = "TyVLn3S/+ikMDsh0gbKv2YydKClN8HaJDDpONlaZR+LVJmsxLFUgA+O7zu59h9+f9gX1aj/ahw9wqa6rosmrYQ=="; }; }; - "@msgpackr-extract/msgpackr-extract-darwin-x64-2.0.2" = { + "@msgpackr-extract/msgpackr-extract-darwin-x64-2.1.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-darwin-x64"; packageName = "@msgpackr-extract/msgpackr-extract-darwin-x64"; - version = "2.0.2"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.0.2.tgz"; - sha512 = "DznYtF3lHuZDSRaIOYeif4JgO0NtO2Xf8DsngAugMx/bUdTFbg86jDTmkVJBNmV+cxszz6OjGvinnS8AbJ342g=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.1.2.tgz"; + sha512 = "YPXtcVkhmVNoMGlqp81ZHW4dMxK09msWgnxtsDpSiZwTzUBG2N+No2bsr7WMtBKCVJMSD6mbAl7YhKUqkp/Few=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-arm-2.0.2" = { + "@msgpackr-extract/msgpackr-extract-linux-arm-2.1.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm"; packageName = "@msgpackr-extract/msgpackr-extract-linux-arm"; - version = "2.0.2"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.0.2.tgz"; - sha512 = "Gy9+c3Wj+rUlD3YvCZTi92gs+cRX7ZQogtwq0IhRenloTTlsbpezNgk6OCkt59V4ATEWSic9rbU92H/l7XsRvA=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.1.2.tgz"; + sha512 = "42R4MAFeIeNn+L98qwxAt360bwzX2Kf0ZQkBBucJ2Ircza3asoY4CDbgiu9VWklq8gWJVSJSJBwDI+c/THiWkA=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-arm64-2.0.2" = { + "@msgpackr-extract/msgpackr-extract-linux-arm64-2.1.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-arm64"; packageName = "@msgpackr-extract/msgpackr-extract-linux-arm64"; - version = "2.0.2"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.0.2.tgz"; - sha512 = "b0jMEo566YdM2K+BurSed7bswjo3a6bcdw5ETqoIfSuxKuRLPfAiOjVbZyZBgx3J/TAM/QrvEQ/VN89A0ZAxSg=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.1.2.tgz"; + sha512 = "vHZ2JiOWF2+DN9lzltGbhtQNzDo8fKFGrf37UJrgqxU0yvtERrzUugnfnX1wmVfFhSsF8OxrfqiNOUc5hko1Zg=="; }; }; - "@msgpackr-extract/msgpackr-extract-linux-x64-2.0.2" = { + "@msgpackr-extract/msgpackr-extract-linux-x64-2.1.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-linux-x64"; packageName = "@msgpackr-extract/msgpackr-extract-linux-x64"; - version = "2.0.2"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.0.2.tgz"; - sha512 = "zrBHaePwcv4cQXxzYgNj0+A8I1uVN97E7/3LmkRocYZ+rMwUsnPpp4RuTAHSRoKlTQV3nSdCQW4Qdt4MXw/iHw=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.1.2.tgz"; + sha512 = "RjRoRxg7Q3kPAdUSC5EUUPlwfMkIVhmaRTIe+cqHbKrGZ4M6TyCA/b5qMaukQ/1CHWrqYY2FbKOAU8Hg0pQFzg=="; }; }; - "@msgpackr-extract/msgpackr-extract-win32-x64-2.0.2" = { + "@msgpackr-extract/msgpackr-extract-win32-x64-2.1.2" = { name = "_at_msgpackr-extract_slash_msgpackr-extract-win32-x64"; packageName = "@msgpackr-extract/msgpackr-extract-win32-x64"; - version = "2.0.2"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.0.2.tgz"; - sha512 = "fpnI00dt+yO1cKx9qBXelKhPBdEgvc8ZPav1+0r09j0woYQU2N79w/jcGawSY5UGlgQ3vjaJsFHnGbGvvqdLzg=="; + url = "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.1.2.tgz"; + sha512 = "rIZVR48zA8hGkHIK7ED6+ZiXsjRCcAVBJbm8o89OKAMTmEAQ2QvoOxoiu3w2isAaWwzgtQIOFIqHwvZDyLKCvw=="; }; }; - "@n1ru4l/graphql-live-query-0.9.0" = { + "@n1ru4l/graphql-live-query-0.10.0" = { name = "_at_n1ru4l_slash_graphql-live-query"; packageName = "@n1ru4l/graphql-live-query"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@n1ru4l/graphql-live-query/-/graphql-live-query-0.9.0.tgz"; - sha512 = "BTpWy1e+FxN82RnLz4x1+JcEewVdfmUhV1C6/XYD5AjS7PQp9QFF7K8bCD6gzPTr2l+prvqOyVueQhFJxB1vfg=="; + url = "https://registry.npmjs.org/@n1ru4l/graphql-live-query/-/graphql-live-query-0.10.0.tgz"; + sha512 = "qZ7OHH/NB0NcG/Xa7irzgjE63UH0CkofZT0Bw4Ko6iRFagPRHBM8RgFXwTt/6JbFGIEUS4STRtaFoc/Eq/ZtzQ=="; }; }; - "@nestjs/schematics-8.0.11" = { + "@nestjs/schematics-9.0.1" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "8.0.11"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.11.tgz"; - sha512 = "W/WzaxgH5aE01AiIErE9QrQJ73VR/M/8p8pq0LZmjmNcjZqU5kQyOWUxZg13WYfSpJdOa62t6TZRtFDmgZPoIg=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-9.0.1.tgz"; + sha512 = "QU7GbnQvADFXdumcdADmv4vil3bhnYl2IFHWKieRt0MgIhghgBxIB7kDKWhswcuZ0kZztVbyYjo9aCrlf62fcw=="; }; }; "@netflix/nerror-1.1.3" = { @@ -6115,58 +6313,58 @@ let sha512 = "fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw=="; }; }; - "@node-red/editor-api-2.2.2" = { + "@node-red/editor-api-3.0.1" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "2.2.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-2.2.2.tgz"; - sha512 = "5PUXtMCjsKevCiz8OjHqAckctOv/zzPcssH4yzTxMYEN4JtTng5lFfZzTFWZC/UnCGQMgwe/0e4iGHbMbN1pqg=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-3.0.1.tgz"; + sha512 = "ttPj4MT3pndNebsACP6IddcvaChb8uBoXgrgno9eW3nhzVRDh5VuDJqu9F6MGCWWvhCOSkQ5zFLULDsPtnrTkA=="; }; }; - "@node-red/editor-client-2.2.2" = { + "@node-red/editor-client-3.0.1" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "2.2.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-2.2.2.tgz"; - sha512 = "DivbfvVfoh4sRKHmOGucE9kV8MWwGczbxsJfaEVedCtVt9ZDX40N61+FzPVlf2FGDi8q21cIRV7klV1GWhDFxw=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-3.0.1.tgz"; + sha512 = "WGDXG1L9pAK7kQBBS1JQq8qf9y/CWi7BGMJtx36HTOxjNv6eP485IdqrqY6M79EsCjWBbvrRiQiw7pSctPJdfg=="; }; }; - "@node-red/nodes-2.2.2" = { + "@node-red/nodes-3.0.1" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "2.2.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-2.2.2.tgz"; - sha512 = "RJ8yR90e/tF0KIiS7ZDe8+q0Zk9uJQZDNUcheEeJKWXfIf3WcMo+5KhQ5HJfy8UedmPXzNLRX75FuTXwcd+NKA=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-3.0.1.tgz"; + sha512 = "7SDneuvBNLeAmTQbwZuZOAWb/cMQWRJPW67gduWWR3BosipLdnfwofjALkkf67A0sJxr2FuxEOV+d2zM4PBpKA=="; }; }; - "@node-red/registry-2.2.2" = { + "@node-red/registry-3.0.1" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "2.2.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-2.2.2.tgz"; - sha512 = "zszKLaR2XpBE4wG4o8cwe+dtOvqlG/Cl0iRXg1wpJ9zC96WIPRq+UqAkVkZm6uRuNhW5ZjKk8f77Wh1+v6QBAw=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-3.0.1.tgz"; + sha512 = "aT1rA98DUIQJ9G47KyyhKxKq/GgWRRCbRsw1GiwRqG7Rc08W+w1nqDwkW2eS9+gngiHT0DAbY/Bbm2vaKIWSlg=="; }; }; - "@node-red/runtime-2.2.2" = { + "@node-red/runtime-3.0.1" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "2.2.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-2.2.2.tgz"; - sha512 = "PW+HGDmY7Q5nXx+zPVpbFaFpn59EyPLb2QYYL1T5MarCQpUfIaL44NMhSG//n0+vkGZBLi9T6ltapWgEYW4x9g=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-3.0.1.tgz"; + sha512 = "FGJ4COtyBHT8yNadA0wytIpe5eY1zsUYHlqTnj2Dd1zOsg+uMJgMTgnD1AkuWFFRtYwD9Rr7BeuOUYyMQJNQEA=="; }; }; - "@node-red/util-2.2.2" = { + "@node-red/util-3.0.1" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "2.2.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-2.2.2.tgz"; - sha512 = "tUGLGj3fTgOjWwhp9uK6M+LUb3rxIrU61DbA0fVpANCEeqk5UNJpje4vOag9dWmJS7hn/ONcDK7dslHLyOQUIQ=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-3.0.1.tgz"; + sha512 = "ToLLZcDeW7gED0uayAC20xyw3w3jsnkSEUGMU3YvovWPmu+zGilhZkVtXwmth6e6YqsyCTbgFvzIZ2eyTlvg8w=="; }; }; "@node-rs/crc32-1.5.1" = { @@ -6340,31 +6538,22 @@ let sha512 = "yMRgZVDpwWjplorzt9SFSaakWx6QIK248Nw4ZFgkrAy/GvJaFRaSZzE6nD7JBK5r8g/+PTxFq5Wj/sfciE7x+A=="; }; }; - "@npmcli/arborist-5.2.0" = { + "@npmcli/arborist-5.3.0" = { name = "_at_npmcli_slash_arborist"; packageName = "@npmcli/arborist"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-5.2.0.tgz"; - sha512 = "zWV7scFGL0SmpvfQyIWnMFbU/0YgtMNyvJiJwR98kyjUSntJGWFFR0O600d5W+TrDcTg0GyDbY+HdzGEg+GXLg=="; + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-5.3.0.tgz"; + sha512 = "+rZ9zgL1lnbl8Xbb1NQdMjveOMwj4lIYfcDtyJHHi5x4X8jtR6m8SXooJMZy5vmFVZ8w7A2Bnd/oX9eTuU8w5A=="; }; }; - "@npmcli/ci-detect-1.4.0" = { - name = "_at_npmcli_slash_ci-detect"; - packageName = "@npmcli/ci-detect"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/ci-detect/-/ci-detect-1.4.0.tgz"; - sha512 = "3BGrt6FLjqM6br5AhWRKTr3u5GIVkjRYeAFrMp3HjnfICrg4xOrVRwFavKT6tsp++bq5dluL5t8ME/Nha/6c1Q=="; - }; - }; - "@npmcli/config-4.1.0" = { + "@npmcli/config-4.2.0" = { name = "_at_npmcli_slash_config"; packageName = "@npmcli/config"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/config/-/config-4.1.0.tgz"; - sha512 = "cPQmIQ2Q0vuOfrenrA3isikdMFMAHgzlXV+EmvZ8f2JeJsU5xTU2bG7ipXECiMvPF9nM+QDnMLuIg8QLw9H4xg=="; + url = "https://registry.npmjs.org/@npmcli/config/-/config-4.2.0.tgz"; + sha512 = "imWNz5dNWb2u+y41jyxL2WB389tkhu3a01Rchn16O/ur6GrnKySgOqdNG3N/9Z+mqxdISMEGKXI/POCauzz0dA=="; }; }; "@npmcli/fs-1.1.1" = { @@ -6376,13 +6565,13 @@ let sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ=="; }; }; - "@npmcli/fs-2.1.0" = { + "@npmcli/fs-2.1.1" = { name = "_at_npmcli_slash_fs"; packageName = "@npmcli/fs"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.0.tgz"; - sha512 = "DmfBvNXGaetMxj9LTp8NAN9vEidXURrf5ZTslQzEAi/6GbW+4yjaLFQc6Tue5cpZ9Frlk4OBo/Snf1Bh/S7qTQ=="; + url = "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.1.tgz"; + sha512 = "1Q0uzx6c/NVNGszePbr5Gc2riSU1zLpNlo/1YWntH+eaPmMgBssAW0qXofCVkpdj3ce4swZtlDYQu+NKiYcptg=="; }; }; "@npmcli/git-2.1.0" = { @@ -6412,13 +6601,13 @@ let sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; - "@npmcli/map-workspaces-2.0.3" = { + "@npmcli/map-workspaces-2.0.4" = { name = "_at_npmcli_slash_map-workspaces"; packageName = "@npmcli/map-workspaces"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.3.tgz"; - sha512 = "X6suAun5QyupNM8iHkNPh0AHdRC2rb1W+MTdMvvA/2ixgmqZwlq5cGUBgmKHUHT2LgrkKJMAXbfAoTxOigpK8Q=="; + url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-2.0.4.tgz"; + sha512 = "bMo0aAfwhVwqoVM5UzX1DJnlvVvzDCHae821jv48L1EsrYwfOZChlqWYXEtto/+BkBXetPbEWgau++/brh4oVg=="; }; }; "@npmcli/metavuln-calculator-2.0.0" = { @@ -6430,13 +6619,13 @@ let sha512 = "VVW+JhWCKRwCTE+0xvD6p3uV4WpqocNYYtzyvenqL/u1Q3Xx6fGTJ+6UoIoii07fbuEO9U3IIyuGY0CYHDv1sg=="; }; }; - "@npmcli/metavuln-calculator-3.1.0" = { + "@npmcli/metavuln-calculator-3.1.1" = { name = "_at_npmcli_slash_metavuln-calculator"; packageName = "@npmcli/metavuln-calculator"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.0.tgz"; - sha512 = "Q5fbQqGDlYqk7kWrbg6E2j/mtqQjZop0ZE6735wYA1tYNHguIDjAuWs+kFb5rJCkLIlXllfapvsyotYKiZOTBA=="; + url = "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-3.1.1.tgz"; + sha512 = "n69ygIaqAedecLeVH3KnO39M6ZHiJ2dEv5A7DGvcqCB8q17BGUgW8QaanIkbWUo2aYGZqJaOORTLAlIvKjNDKA=="; }; }; "@npmcli/move-file-1.1.2" = { @@ -6538,13 +6727,31 @@ let sha512 = "fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig=="; }; }; - "@npmcli/run-script-3.0.3" = { + "@npmcli/run-script-4.2.0" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "3.0.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-3.0.3.tgz"; - sha512 = "ZXL6qgC5NjwfZJ2nET+ZSLEz/PJgJ/5CU90C2S66dZY4Jw73DasS4ZCXuy/KHWYP0imjJ4VtA+Gebb5BxxKp9Q=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-4.2.0.tgz"; + sha512 = "e/QgLg7j2wSJp1/7JRl0GC8c7PMX+uYlA/1Tb+IDOLdSM4T7K1VQ9mm9IGU3WRtY5vEIObpqCLb3aCNCug18DA=="; + }; + }; + "@nrwl/cli-14.5.2" = { + name = "_at_nrwl_slash_cli"; + packageName = "@nrwl/cli"; + version = "14.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/cli/-/cli-14.5.2.tgz"; + sha512 = "uriSxM33IpiBpW9kHEW3gw5OjPaQe3jHdWUMOT88TrqTlf449qe01Sys8+H2YgJMIcLTFYX0fP4V1K9jqKKZCg=="; + }; + }; + "@nrwl/tao-14.5.2" = { + name = "_at_nrwl_slash_tao"; + packageName = "@nrwl/tao"; + version = "14.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@nrwl/tao/-/tao-14.5.2.tgz"; + sha512 = "SEx3SM7xQiB8mOQ/gCt7lFJKRrkq3rBX6FiV3bl+dQtuKK2zKQbyikY9r+MCZCQNqZAud3HJ2xCyKZBhK8htQg=="; }; }; "@oclif/command-1.8.0" = { @@ -6691,6 +6898,15 @@ let sha512 = "r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="; }; }; + "@octokit/auth-token-3.0.0" = { + name = "_at_octokit_slash_auth-token"; + packageName = "@octokit/auth-token"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.0.tgz"; + sha512 = "MDNFUBcJIptB9At7HiV7VCvU3NcL4GnfCQaP8C5lrxWrRPMJBnemYtehaKSOlaM7AYxeRyj9etenu8LVpSpVaQ=="; + }; + }; "@octokit/core-3.6.0" = { name = "_at_octokit_slash_core"; packageName = "@octokit/core"; @@ -6700,6 +6916,15 @@ let sha512 = "7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q=="; }; }; + "@octokit/core-4.0.4" = { + name = "_at_octokit_slash_core"; + packageName = "@octokit/core"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/core/-/core-4.0.4.tgz"; + sha512 = "sUpR/hc4Gc7K34o60bWC7WUH6Q7T6ftZ2dUmepSyJr9PRF76/qqkWjE2SOEzCqLA5W83SaISymwKtxks+96hPQ=="; + }; + }; "@octokit/endpoint-6.0.12" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; @@ -6709,6 +6934,15 @@ let sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; }; }; + "@octokit/endpoint-7.0.0" = { + name = "_at_octokit_slash_endpoint"; + packageName = "@octokit/endpoint"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.0.tgz"; + sha512 = "Kz/mIkOTjs9rV50hf/JK9pIDl4aGwAtT8pry6Rpy+hVXkAPhXanNQRxMoq6AeRgDCZR6t/A1zKniY2V1YhrzlQ=="; + }; + }; "@octokit/graphql-4.8.0" = { name = "_at_octokit_slash_graphql"; packageName = "@octokit/graphql"; @@ -6718,13 +6952,22 @@ let sha512 = "0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg=="; }; }; - "@octokit/openapi-types-12.4.0" = { + "@octokit/graphql-5.0.0" = { + name = "_at_octokit_slash_graphql"; + packageName = "@octokit/graphql"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.0.tgz"; + sha512 = "1ZZ8tX4lUEcLPvHagfIVu5S2xpHYXAmgN0+95eAOPoaVPzCfUXJtA5vASafcpWcO86ze0Pzn30TAx72aB2aguQ=="; + }; + }; + "@octokit/openapi-types-12.11.0" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "12.4.0"; + version = "12.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.4.0.tgz"; - sha512 = "Npcb7Pv30b33U04jvcD7l75yLU0mxhuX2Xqrn51YyZ5WTkF04bpbxLaZ6GcaTqu03WZQHoO/Gbfp95NGRueDUA=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz"; + sha512 = "VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -6736,13 +6979,22 @@ let sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw=="; }; }; - "@octokit/plugin-paginate-rest-2.19.0" = { + "@octokit/plugin-paginate-rest-2.21.3" = { name = "_at_octokit_slash_plugin-paginate-rest"; packageName = "@octokit/plugin-paginate-rest"; - version = "2.19.0"; + version = "2.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.19.0.tgz"; - sha512 = "hQ4Qysg2hNmEMuZeJkvyzM4eSZiTifOKqYAMsW8FnxFKowhuwWICSgBQ9Gn9GpUmgKB7qaf1hFvMjYaTAg5jQA=="; + url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz"; + sha512 = "aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw=="; + }; + }; + "@octokit/plugin-paginate-rest-3.1.0" = { + name = "_at_octokit_slash_plugin-paginate-rest"; + packageName = "@octokit/plugin-paginate-rest"; + version = "3.1.0"; + src = fetchurl { + 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" = { @@ -6754,13 +7006,22 @@ let sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.15.0" = { + "@octokit/plugin-rest-endpoint-methods-5.16.2" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.15.0"; + version = "5.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.15.0.tgz"; - sha512 = "Gsw9+Xm56jVhfbJoy4pt6eOOyf8/3K6CAnx1Sl7U2GhZWcg8MR6YgXWnpfdF69S2ViMXLA7nfvTDAsZpFlkLRw=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz"; + sha512 = "8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw=="; + }; + }; + "@octokit/plugin-rest-endpoint-methods-6.2.0" = { + name = "_at_octokit_slash_plugin-rest-endpoint-methods"; + packageName = "@octokit/plugin-rest-endpoint-methods"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-6.2.0.tgz"; + sha512 = "PZ+yfkbZAuRUtqu6Y191/V3eM0KBPx+Yq7nh+ONPdpm3EX4pd5UnK2y2XgO/0AtNum5a4aJCDjqsDuUZ2hWRXw=="; }; }; "@octokit/plugin-retry-3.0.9" = { @@ -6790,6 +7051,15 @@ let sha512 = "bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A=="; }; }; + "@octokit/request-6.2.0" = { + name = "_at_octokit_slash_request"; + packageName = "@octokit/request"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/request/-/request-6.2.0.tgz"; + sha512 = "7IAmHnaezZrgUqtRShMlByJK33MT9ZDnMRgZjnRrRV9a/jzzFwKGz0vxhFU6i7VMLraYcQ1qmcAOin37Kryq+Q=="; + }; + }; "@octokit/request-error-2.1.0" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; @@ -6799,6 +7069,15 @@ let sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; + "@octokit/request-error-3.0.0" = { + name = "_at_octokit_slash_request-error"; + packageName = "@octokit/request-error"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.0.tgz"; + sha512 = "WBtpzm9lR8z4IHIMtOqr6XwfkGvMOOILNLxsWvDwtzm/n7f5AWuqJTXQXdDtOvPfTDrH4TPhEvW2qMlR4JFA2w=="; + }; + }; "@octokit/rest-18.12.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; @@ -6808,13 +7087,22 @@ let sha512 = "gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q=="; }; }; - "@octokit/types-6.37.0" = { + "@octokit/rest-19.0.3" = { + name = "_at_octokit_slash_rest"; + packageName = "@octokit/rest"; + version = "19.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/rest/-/rest-19.0.3.tgz"; + sha512 = "5arkTsnnRT7/sbI4fqgSJ35KiFaN7zQm0uQiQtivNQLI8RQx8EHwJCajcTUwmaCMNDg7tdCvqAnc7uvHHPxrtQ=="; + }; + }; + "@octokit/types-6.41.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.37.0"; + version = "6.41.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.37.0.tgz"; - sha512 = "BXWQhFKRkjX4dVW5L2oYa0hzWOAqsEsujXsQLSdepPoDZfYdubrD1KDGpyNldGXtR8QM/WezDcxcIN1UKJMGPA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz"; + sha512 = "eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg=="; }; }; "@opencensus/core-0.0.8" = { @@ -6880,481 +7168,481 @@ let sha512 = "wU5J8rUoo32oSef/rFpOT1HIjLjAv3qIDHkw1QIhODV3OpAVHi5oVzlouozg9obUmZKtbZ0qUe/m7FP0y0yBzA=="; }; }; - "@ot-builder/bin-composite-types-1.5.2" = { + "@ot-builder/bin-composite-types-1.5.4" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.2.tgz"; - sha512 = "l3mLi4cZ1GrEHT9xSgYIPgJXRiMGubtOPL9QJ0ZMm24Ss1TlNXiIW4AOfp/+8H0NOv7JVrb06toWf4tEb4B1+g=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.5.4.tgz"; + sha512 = "BGa0e3eN9ZLfwcJWcD/htPjbBadTYse42aLItPbpVhIc2HEClFFmrtwVR1AyYIHX08Iru9P6ExK2c5JcOtAxFw=="; }; }; - "@ot-builder/bin-util-1.5.2" = { + "@ot-builder/bin-util-1.5.4" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.2.tgz"; - sha512 = "OMchvRddJ0ZnYw09OdFLu29YrHTXFbAxcxErHy4s3UujqZhpUzTY3o+brLnKLh60oXQdOHTT+wJDy+D89DWOYw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.5.4.tgz"; + sha512 = "VSMqaiNu1tbdyXFJObLuhLjfwp4CgrwHBG8y2EyoG6ipyxon345tvtsSdyW71N/t2nfS4IZHxxNmgoiEyTGjew=="; }; }; - "@ot-builder/cli-help-shower-1.5.2" = { + "@ot-builder/cli-help-shower-1.5.4" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.2.tgz"; - sha512 = "opcpqXh5RxHc/lB/mIxIA8amPugXgJHym5q3Jb3uZT1DOhhORRAs0NAgNAswKHHPvTyOUIu3mYYuV2KA093K4A=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.5.4.tgz"; + sha512 = "dgDXk5A2W+BXdscJ9V//X/oRCesFj5X8elv0Ks3hyGsb+HEnVmmpGqYD+yNvsh7DCB+VabHTRI9HIhjx52DYeA=="; }; }; - "@ot-builder/cli-proc-1.5.2" = { + "@ot-builder/cli-proc-1.5.4" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.2.tgz"; - sha512 = "bPg6dpEmeTsTaU7Az6G2fLgk7jBP8gQ/WaX0at1w4poOGUSo/UTFZ9EDmh0Y6gxLo9Mf45gbeA9vUmXiUczi/g=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.5.4.tgz"; + sha512 = "9IhKDfSat06iroaGHQG8x4cpzoctoBwKu3AA6xUE5PEEb7xImcGaZ0hDaNEZGJd/yYEvatBbytzI5NAJfdvSjA=="; }; }; - "@ot-builder/cli-shared-1.5.2" = { + "@ot-builder/cli-shared-1.5.4" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.2.tgz"; - sha512 = "rTDHUqNGiEyAW0sRQ6etO3prUuNOr/00n9mpwnmENnisA/RwyY0BW+z5zGc8iD2tJunU6/LibOBubppV6PNTGQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.5.4.tgz"; + sha512 = "QALOu8sjBrVhA7rrHNX3CgQTMUokC0GHnOTMcyqep1ogLOAKPvmmM0vmqPHVrolWLoEVgKI1bs3nFfZmtZC/cA=="; }; }; - "@ot-builder/common-impl-1.5.2" = { + "@ot-builder/common-impl-1.5.4" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.2.tgz"; - sha512 = "3cXrL176gm4PF/VYsc0A0VMvdddXTqjsPAMqSrYnp79lStGy17TxZmvE4odRAq8XeKNuiQcdVmHR9M2nVgiKUA=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.5.4.tgz"; + sha512 = "B6j9Fv9iXGSim7dNlZkfD5gWJ+VK57wmlb9SwNlxTI8M0JBfTaWVkajyEz+GPn4BEvVOBJ95PFnecO43K552aA=="; }; }; - "@ot-builder/errors-1.5.2" = { + "@ot-builder/errors-1.5.4" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.2.tgz"; - sha512 = "wy5c3sE/bpBXWpqFy5yVVNZvBHRSOmTn5anCF+Gq/OjMwPM3vASHo8RccFqQf7AhOFgMWDLYglFniihXloft+w=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.5.4.tgz"; + sha512 = "2xo+cpRrK93JLyfxORekkpslavILzX7c+AOlf754otRN8UK0rfVSNcFUifN7BobpHCaHuBgJtbYiq+zBnjMbew=="; }; }; - "@ot-builder/io-bin-cff-1.5.2" = { + "@ot-builder/io-bin-cff-1.5.4" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.2.tgz"; - sha512 = "/BhWleYozRBHSy3nvLKZ19jPcl786LCaiu2oTih5xUCVx17unfLtmEfb8bzgZBMDSB7xvVJ24A/OnZS89Y9heA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.5.4.tgz"; + sha512 = "CuEbsQwDoKF2/tonyy6J+cEtY8yzPZ7aCl/+Y5X+ZdYN9BmYZ64V1W1Qyc6wEwik78fDdgzsBni15YsUCTvGnA=="; }; }; - "@ot-builder/io-bin-encoding-1.5.2" = { + "@ot-builder/io-bin-encoding-1.5.4" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.2.tgz"; - sha512 = "CA1wbilkUIHoq9RJkiadPb3qvh4b6k101U5oA9ACgMgq+EqOEl0Me+HFeyoR5AJfVVzkyxfzTYOq8oiGvCYFrA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.5.4.tgz"; + sha512 = "5O5E7941ScCmzoxtyK/KT1D3Wl3vHUWZY784no97e6udCndngPuvVI1UZck2lmLrrrn/EvNU0eJCHN7neHsSXw=="; }; }; - "@ot-builder/io-bin-ext-private-1.5.2" = { + "@ot-builder/io-bin-ext-private-1.5.4" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.2.tgz"; - sha512 = "41nZQB8WiKlTnOzwFdPH+zbSrRGA1YLyuZlXJSqZH8+0Va8q6zXqWhoqLAh1f5gS7j/iB76rltZWZLg3LFfqHg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.5.4.tgz"; + sha512 = "r0NEJHb+3XduOnjr9qOuTkUiOM+eJVSGZ1pvPumQXDlMJlz+VQsHop7MD1pSCKS/modXN1hKBo6BBki3gty7/A=="; }; }; - "@ot-builder/io-bin-font-1.5.2" = { + "@ot-builder/io-bin-font-1.5.4" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.2.tgz"; - sha512 = "4+bYorR+h5ilJoJtAdPwm38T0Qcv82/3+dwHWJFUYRtuSYiDToZSZEEaFgzuRtby8ye/s35oQ+D0WWlmJSYayQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.5.4.tgz"; + sha512 = "rcJ9qe0S4dBWMRXYh3Gi9lqgiW1qWCmNOAyjEoNYOcAUoXFasRuP+JNMu3sUM/Yi8eOGtkrnU2nq+T392/4nZA=="; }; }; - "@ot-builder/io-bin-glyph-store-1.5.2" = { + "@ot-builder/io-bin-glyph-store-1.5.4" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.2.tgz"; - sha512 = "3u6bu3IlAmKNxXZJfb96gIKPNMnrk4DW4RQ0sJH56bQSXFv8/zYW27jqs2T6BIFJ8WYshM/bTMjWDrnctdgbNQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.5.4.tgz"; + sha512 = "/lv2HLCSOlpPKctycCz+PAoUL8jZ2Ysk7XD9g2oi/eu7N5Tc9OKMQ38Xb9uR8AVSWUKb/COUcflCg3PCgwaQJA=="; }; }; - "@ot-builder/io-bin-layout-1.5.2" = { + "@ot-builder/io-bin-layout-1.5.4" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.2.tgz"; - sha512 = "cVEgqOMI9wzD6qMP9+iUnJX/QBJ14x4BpG/wmIS6R8de3JJXld+OqHFDTHJJr/Y0czUajZkjFIIYeToR1t/nAA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.5.4.tgz"; + sha512 = "5KJb4MTnpxbr9W9hCJWzYRw3OM9f6x5TeZPZMHDS1XL9L0dvq2+SxGBWjB5BgpLMpJ6mlY1LRj9FmNiFXL/CJQ=="; }; }; - "@ot-builder/io-bin-metadata-1.5.2" = { + "@ot-builder/io-bin-metadata-1.5.4" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.2.tgz"; - sha512 = "UGZu77heEHq4KIEb0C/fkhkewDHv2gkGWqPNXNOPvg7OSR/7A45Ooun8a9vilHaxEJAcUaoLYRWWVFWiVRnDBQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.5.4.tgz"; + sha512 = "hjg8S/Xn8Vj9wUfksGehqjFkqXfJV6OSZGg7cmJrTwhCQEIwOnD9rtzlAKhPKjrPp2eEC2hlKIzdowWsSQS0nw=="; }; }; - "@ot-builder/io-bin-metric-1.5.2" = { + "@ot-builder/io-bin-metric-1.5.4" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.2.tgz"; - sha512 = "lHQXURP0fs7hENvGV5tw90Z85spfmjkS1KMTmBlSPqjig1vG0zoHmPFQhbv7urAVJkUu4oeUxfHdQ8hQH+xnOg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.5.4.tgz"; + sha512 = "KEoSB0AswO8pfFT0rSiXUJak3K1g66ZGI50jf9GKOvK9V6nG9apOqAPwIc6ZnMAXfl9Air62dgrvF6QbL7iO+Q=="; }; }; - "@ot-builder/io-bin-name-1.5.2" = { + "@ot-builder/io-bin-name-1.5.4" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.2.tgz"; - sha512 = "+Yxp5fTmGuP2XtHRrbcHWPTFqlrA5uPz1+xInlVJQKsIwrC4tVrshsWYwhGE99hkAli+JdyTsIoSmOKP7Jv96w=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.5.4.tgz"; + sha512 = "pZ0TXgyr4kVMcbyVo9qjn3Epx//ykoUInZHmE3R2f6/u3NjXBvCmLM+WrbKf7fc+oBX2nkWacgkRrMf4L03P/w=="; }; }; - "@ot-builder/io-bin-sfnt-1.5.2" = { + "@ot-builder/io-bin-sfnt-1.5.4" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.2.tgz"; - sha512 = "rC260d+vf9eugGh71ReudGyBEHsInsICADk1JOzy9HbJ7LrSgQO8chO3EKbfP4MfelYg+uSgsFm5fQCBzuB8wg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.5.4.tgz"; + sha512 = "PbWoy8aqphUpU50hgsyB/wjscrR/OjN+P68O7fTXc/DsdyZUJP4ncetor1dOfAJf1zEOBr33VFc8rABDrFhPvw=="; }; }; - "@ot-builder/io-bin-ttf-1.5.2" = { + "@ot-builder/io-bin-ttf-1.5.4" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.2.tgz"; - sha512 = "w6L8FjwUQ28+Fd6FJJHEL20YoWbiK5Anh1+YjrbDsLOtmWFvF0hC0+3wi/FbVbiSx6ho91RZDAFc4t2k1bJo2A=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.5.4.tgz"; + sha512 = "HSTw8DXhqfBWWfk9yToKHMUwSZZv3AAxt0LIaYHSo3Lr4HG2tqgTtpk62gc6hyiMR0d1U4JdYA5mbYPnSWMMdw=="; }; }; - "@ot-builder/io-bin-vtt-private-1.5.2" = { + "@ot-builder/io-bin-vtt-private-1.5.4" = { name = "_at_ot-builder_slash_io-bin-vtt-private"; packageName = "@ot-builder/io-bin-vtt-private"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.2.tgz"; - sha512 = "pCKjYtMquIviJfxohvkJhkHIj1uF/i54qkAqgnwyBMF1CIwvn8hBAcbulxwH9m1Sr+h06mfRQARgbI/B9bnxhQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-vtt-private/-/io-bin-vtt-private-1.5.4.tgz"; + sha512 = "OllpfHLq63mBNxdHRuZu3UztPcBEFfA67W5S/lCQZhyay0VcMbNc/7jcRdyZXmgjkZNO+Szg82msZxookW/OBg=="; }; }; - "@ot-builder/ot-1.5.2" = { + "@ot-builder/ot-1.5.4" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.2.tgz"; - sha512 = "Ll+N/oE2048VMca6aEXxxPInh8SKyWDyELkQy6C9+d2spN6gxNR4S9y40KI49bcCosvHn6ej94nu7erIF4Xd3A=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.5.4.tgz"; + sha512 = "x/92wj1hk0MG8rmuUFwmyV5YJYEUJ6HiAgR8FPS2hQK2Ut7do5z0Ttc/eog3qBiVjnPS3Dzh1C6qLLSY3RR+mQ=="; }; }; - "@ot-builder/ot-encoding-1.5.2" = { + "@ot-builder/ot-encoding-1.5.4" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.2.tgz"; - sha512 = "XghLV1nRzE1VMPMJKzwaYWPUMb/xKFXcOPxdVdXK9tnipzJ/gwxsVc9yzcxshZNwC+JwPozupUGxLWrdBfv+CA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.5.4.tgz"; + sha512 = "XbEuxSkNKd8eguFv1Qut175Xl14Gja035Aci4Vw3979AtuT2QO7wDrjLhlfbn7Xob98dXcE180r7Zpc86iP53g=="; }; }; - "@ot-builder/ot-ext-private-1.5.2" = { + "@ot-builder/ot-ext-private-1.5.4" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.2.tgz"; - sha512 = "A918OM2jHz6tVLNAfTO4KXbUqILbgy76EAmCMKQ4GConkGD39cM4xZ3FI9w3gph7kyvfDFhICXLYST0hK9snNg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.5.4.tgz"; + sha512 = "L2L2dPhMxaqEhuDW8tMaLJnR/BAnOWvqJE16Kkm8BwLxCbVuUlznvbfLaKOQj0UmTAXhLNkOLz2ZXJ7UGBCJ7g=="; }; }; - "@ot-builder/ot-glyphs-1.5.2" = { + "@ot-builder/ot-glyphs-1.5.4" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.2.tgz"; - sha512 = "yL1/T48XXujdMs1xqD1yPEgdrCGaDROm2eChJ5dqYnrEbm7Xeif5qT/2AkPRse9sjDAxBypfEw5+/yuEreRcjA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.5.4.tgz"; + sha512 = "mH0i6sVOseqiz84RTMZqNxFcOT+dSfShHAc4Sx9gAfelFyIWcYI8djdhWeSsdDu1n9G2mGZSpbPAH+6+ZA+7+Q=="; }; }; - "@ot-builder/ot-layout-1.5.2" = { + "@ot-builder/ot-layout-1.5.4" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.2.tgz"; - sha512 = "7uTXlHzTa1FzsN2HZOMb6IHY07ICk2D+tr5w3Ex5hYwqRcJrEcPzrfEvleXbMB2bQ1dexiDljWuTf9iVcuX1eA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.5.4.tgz"; + sha512 = "XgmO0vQ0MRg3KD/T11q0KQGgUiUAjod8J6LoMMkHs0/CevP4gjJr7xf21Sy1+cjxYQ1ltY9W4u2lcTgxAmS59w=="; }; }; - "@ot-builder/ot-metadata-1.5.2" = { + "@ot-builder/ot-metadata-1.5.4" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.2.tgz"; - sha512 = "yqNRfUZDytD2LMIVxAKpKrTXhXyi495LDOSFhgWtfY5bQp9RehwgwzAU+hRG0ILQx9PWGwGjNiqRv8LfjaYOwA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.5.4.tgz"; + sha512 = "KegFbpqN9DBx5IgYtMnhxpjg5s1YqNK+y6lZs7lutLLY8Y8wHddhcPcaISho7/yqS0/rCy3NiYwDZd3hJF3n2g=="; }; }; - "@ot-builder/ot-name-1.5.2" = { + "@ot-builder/ot-name-1.5.4" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.2.tgz"; - sha512 = "ZyA0jQvpWp0nT9kEYxtsRyetVxdQxbatM1vHm+TMsnhw7S7wU8OhXkF1TzOuhSaWWqDZfz5edPkF3vonXwJRSw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.5.4.tgz"; + sha512 = "qLq/atnsaBqZegvwJiTzhGxO6gVrQaohwT9V+gvNmnN/cd2V/+V+kNCOoyJM+mIphnijEAmXG5E4dqSzs+gvwA=="; }; }; - "@ot-builder/ot-sfnt-1.5.2" = { + "@ot-builder/ot-sfnt-1.5.4" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.2.tgz"; - sha512 = "BATyuGX8xUMz99Yu4pexm63nTa5jsW7XD2tO+eVbjSZsbURD2D1XL6h2MsVtPIcUYGCB8eLBpFRvh+fJlR2bLA=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.5.4.tgz"; + sha512 = "VFRA5rh23YAxckk+N1oBkt68Z2VYhZqMCh36nNBbw6C2I4P4Cqzj9I6EBncqJ+mzXnxYULx/lz+HzpHAqKMN+Q=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.5.2" = { + "@ot-builder/ot-standard-glyph-namer-1.5.4" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.2.tgz"; - sha512 = "cCQ0ln4Mq2wiTSKIwiqLIpJVk/6IADpJayncA/vdljKrCKLUVYscS6I1bw3de8bvutc6BdCy9xYshmdsFoIJNQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.5.4.tgz"; + sha512 = "TIOS1RlJKgRhuvFF8XX7Rr3nPvhw15yXJC5iVyuBJgJcoiQOQHg3gKAL0rHDXEHLU6nISL2q5iE8IJiahpP+UA=="; }; }; - "@ot-builder/ot-vtt-private-1.5.2" = { + "@ot-builder/ot-vtt-private-1.5.4" = { name = "_at_ot-builder_slash_ot-vtt-private"; packageName = "@ot-builder/ot-vtt-private"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.2.tgz"; - sha512 = "QIKNssMPTiJKm+r1pbJBxNO36k78D0/BWgq68k9DFH5tfiZnRy6MesczOBIlW9RmRFeFy640yx8tPNGvNYgG8w=="; + url = "https://registry.npmjs.org/@ot-builder/ot-vtt-private/-/ot-vtt-private-1.5.4.tgz"; + sha512 = "GTDN4M2MBudjSUuCSw9FVQUmOSZG5OGU2XIPBHFmUi0VwX/DNML3BwaQT7CpFh0MJHsGko+1PZOYlgENjO+tWA=="; }; }; - "@ot-builder/prelude-1.5.2" = { + "@ot-builder/prelude-1.5.4" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.2.tgz"; - sha512 = "58r3rUfAIo0Irq6XcDn8u9F+YJ5NBwEa5mLrFg0dk7EcbEe5/rErGfeBjzP1uqUoN/zRu1q9zHXB+CU54XrJ/g=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.5.4.tgz"; + sha512 = "A0US/TENKS5VjW6haBkMRn7VNl0NS9h9Lok4H1/s0fMdB/o5e8mOueTHCfke6wmzdPB+pQIvCvA/JYS0QBNboQ=="; }; }; - "@ot-builder/primitive-1.5.2" = { + "@ot-builder/primitive-1.5.4" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.2.tgz"; - sha512 = "zSf7O/qc+mrXHNnTrm3n8l02NRfmI3povgOScOE0N9cQ/FoePksiKgk9OWHOg7wQOGcAee7sBWK+ROkRJBLE0g=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.5.4.tgz"; + sha512 = "aXr4ZjbqVwpmv7Yg/MXy+6TuNUqjAchtQ4Z9P3wmWRv90cY7J0wUJi6W1XLKICCYlB3PffS5fto0qi2uMu84sg=="; }; }; - "@ot-builder/rectify-1.5.2" = { + "@ot-builder/rectify-1.5.4" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.2.tgz"; - sha512 = "8yKJUzb6PkKS7rRUNVpkk9QJBKRdo6aYAQiPbgn2NpyZXAls3TIbqY0+RYwaTbrIF6PC1P/ZH+jJduDEFEiRIw=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.5.4.tgz"; + sha512 = "mv1AvjDYgV9HHbMJGS2zSGBW6ngeXLxjx4fUX3csN8I+8j8X7ghcpQ0Bnk/AnR+GjEpQfSRZ4pNWoVcsGD1pSw=="; }; }; - "@ot-builder/stat-glyphs-1.5.2" = { + "@ot-builder/stat-glyphs-1.5.4" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.2.tgz"; - sha512 = "sJCvYKR03PeZmdPN+Id6rS4R564wJJ3SlH5+5mGwwBiUBl+A8SnYKt/ono42KerI8KA4ZpZWszr81jsO0Da1MA=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.5.4.tgz"; + sha512 = "bX9p/wrqKk/XQpYBwzru67XHjFYgAHsAemtgVCKSEOx795yMFJCJ/G6Nlic/4Hoia17feDcf0jy1bVrL2NkJww=="; }; }; - "@ot-builder/trace-1.5.2" = { + "@ot-builder/trace-1.5.4" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.2.tgz"; - sha512 = "H9Us+DO5I25dkSCdtGRaVTejvU1/kecXKx24dCnFM1QDslmKvFGNBuYxR2B3Oxo5Jfn2uO8jqqcAtS0mV8etdg=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.5.4.tgz"; + sha512 = "5gwLOL311REuWB+2iCNLCPAqc9SBtWHTJATy3S2Dp0SVB8h+yn+pEkW/QxGdXNyM233JKTSuHElN+fN5/8abKw=="; }; }; - "@ot-builder/var-store-1.5.2" = { + "@ot-builder/var-store-1.5.4" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.2.tgz"; - sha512 = "HNmjiVhdU9epqApbvqr46puJe6N7+R0sMbYs+9UrIf4x+csM97T/Z2o3bKi17Jkn18023UYhCMLP3fxCZQqLbw=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.5.4.tgz"; + sha512 = "0RL9S+OCfeQrh1eC1yh8BaQiyvdLmbCN7uBaFS5KrUz2V2XO5kQCwzz6NERETWXmieUfzFbfqyFKcBIinLTz0A=="; }; }; - "@ot-builder/variance-1.5.2" = { + "@ot-builder/variance-1.5.4" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.2.tgz"; - sha512 = "xrgAFbPWSS1uKYtPqUTfahc2Ga1kc3tKIzVg9Kp2cFF8atTeinsZ2aWLtnBT2nzf0Z1z/PyWrT08w5bGvL/01A=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.5.4.tgz"; + sha512 = "t/DabVMo+uzZgf3ZQCy5++ZVvqTgpKU+5bG/nXWSkmX8vfJz4onJh4ded9kgjcb+nmbT0j3avS91lVPq5g6hWQ=="; }; }; - "@parcel/bundler-default-2.6.1" = { + "@parcel/bundler-default-2.7.0" = { name = "_at_parcel_slash_bundler-default"; packageName = "@parcel/bundler-default"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.6.1.tgz"; - sha512 = "hCaLnvanoQcWp+09WGdo3q1/qrqLuwgoWf3wU5IrQgx77JqnASBTn0/qkEes5vNH0VbHDWmwtPSoECPLWxNS/A=="; + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.7.0.tgz"; + sha512 = "PU5MtWWhc+dYI9x8mguYnm9yiG6TkI7niRpxgJgtqAyGHuEyNXVBQQ0X+qyOF4D9LdankBf8uNN18g31IET2Zg=="; }; }; - "@parcel/cache-2.6.1" = { + "@parcel/cache-2.7.0" = { name = "_at_parcel_slash_cache"; packageName = "@parcel/cache"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.6.1.tgz"; - sha512 = "FjG9DDLUCxlnS32cF7riga8gwMKbwxKnVIUsKZU5K9I+Sd5HtKRqn8H3e7dksCiVCPqZR3jItnr7FH9bEniWJA=="; + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.7.0.tgz"; + sha512 = "JlXNoZXcWzLKdDlfeF3dIj5Vtel5T9vtdBN72PJ+cjC4qNHk4Uwvc5sfOBELuibGN0bVu2bwY9nUgSwCiB1iIA=="; }; }; - "@parcel/codeframe-2.6.1" = { + "@parcel/codeframe-2.7.0" = { name = "_at_parcel_slash_codeframe"; packageName = "@parcel/codeframe"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.6.1.tgz"; - sha512 = "6GR9w9cccxCMbDqXNfEGwFjju+Ks3mMDaiLuLXIITkuEYgxdbXrpNlcpD0tJiSJn3cyo8gieUYFF4wlJyuS/gQ=="; + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.7.0.tgz"; + sha512 = "UTKx0jejJmmO1dwTHSJuRgrO8N6PMlkxRT6sew8N6NC3Bgv6pu0EbO+RtlWt/jCvzcdLOPdIoTzj4MMZvgcMYg=="; }; }; - "@parcel/compressor-raw-2.6.1" = { + "@parcel/compressor-raw-2.7.0" = { name = "_at_parcel_slash_compressor-raw"; packageName = "@parcel/compressor-raw"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.6.1.tgz"; - sha512 = "UbA1xndQHZVWXdkVN/3PH0libsB6M1urEvTOrtxXiZS4bVGqj/UwoZ47OZA92ls0q35Qa0tWjQ6zBmlrgRWCsg=="; + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.7.0.tgz"; + sha512 = "SCXwnOOQT6EmpusBsYWNQ/RFri+2JnKuE0gMSf2dROl2xbererX45FYzeDplWALCKAdjMNDpFwU+FyMYoVZSCQ=="; }; }; - "@parcel/config-default-2.6.1" = { + "@parcel/config-default-2.7.0" = { name = "_at_parcel_slash_config-default"; packageName = "@parcel/config-default"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.6.1.tgz"; - sha512 = "upW4K2fdljpcHhmniEGVdBjqonFUqfONMWnxrS3WEikcuCwr2/IVLD61w0MPLEeu8Xbr2anHJwh2/kl7DiWDZQ=="; + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.7.0.tgz"; + sha512 = "ZzsLr97AYrz8c9k6qn3DlqPzifi3vbP7q3ynUrAFxmt0L4+K0H9N508ZkORYmCgaFjLIQ8Y3eWpwCJ0AewPNIg=="; }; }; - "@parcel/core-2.6.1" = { + "@parcel/core-2.7.0" = { name = "_at_parcel_slash_core"; packageName = "@parcel/core"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/core/-/core-2.6.1.tgz"; - sha512 = "FcinQQEtqqb0cSj4JPD8vx/qMkz1rWdbxtdEPG0W1cA2I5qcVPMgkHsVFrDnWQlQIquwu98um8zg1MrN1KrRew=="; + url = "https://registry.npmjs.org/@parcel/core/-/core-2.7.0.tgz"; + sha512 = "7yKZUdh314Q/kU/9+27ZYTfcnXS6VYHuG+iiUlIohnvUUybxLqVJhdMU9Q+z2QcPka1IdJWz4K4Xx0y6/4goyg=="; }; }; - "@parcel/css-1.10.1" = { + "@parcel/css-1.12.2" = { name = "_at_parcel_slash_css"; packageName = "@parcel/css"; - version = "1.10.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css/-/css-1.10.1.tgz"; - sha512 = "qnoQM4qH6ytYE3RK8PzMoI8dGPmJv/fNFkeC8Ku0A08GbG/ssir2TCQCarcKFVNgvtfDZ0AX3+vjSkYEAfzhJA=="; + url = "https://registry.npmjs.org/@parcel/css/-/css-1.12.2.tgz"; + sha512 = "Sa0PvZu5u877CupQA8IjEATqjJFynBfA7LxbcyutFe2LDCRSqB5Bm08jKFScyaz56qjZNIxZxXk2SApNkOvoAA=="; }; }; - "@parcel/css-darwin-arm64-1.10.1" = { + "@parcel/css-darwin-arm64-1.12.2" = { name = "_at_parcel_slash_css-darwin-arm64"; packageName = "@parcel/css-darwin-arm64"; - version = "1.10.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.10.1.tgz"; - sha512 = "0ukr4/hSrM24ef8bcZ5b/o8iJrPVAxXOKCPGpmKFd+R/31SYjvFfMJzS2XAYUy0W0FunMW2fte3iTPNMDigyww=="; + url = "https://registry.npmjs.org/@parcel/css-darwin-arm64/-/css-darwin-arm64-1.12.2.tgz"; + sha512 = "6VvsoYSltBiUh/uyfPzQ+I3DiTFN7tmRv6zm1LH98J7GGCDDhbYEtbQjjCs15ex6fVn1ORZK0JO+mMlsg1JwTA=="; }; }; - "@parcel/css-darwin-x64-1.10.1" = { + "@parcel/css-darwin-x64-1.12.2" = { name = "_at_parcel_slash_css-darwin-x64"; packageName = "@parcel/css-darwin-x64"; - version = "1.10.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-darwin-x64/-/css-darwin-x64-1.10.1.tgz"; - sha512 = "PFMPptY+OswU68XgBO2RlL6JckeWz/a36r7ys6LMPrNonIOWGce155lwnylBK1Pnx1DRQAN8jWaolo+OkD9RRQ=="; + url = "https://registry.npmjs.org/@parcel/css-darwin-x64/-/css-darwin-x64-1.12.2.tgz"; + sha512 = "3J0/LrDvt5vevOisnrE0q5mEcuiAY+K7OZwIv84SAnrbjlL5sshmIaaNzL869kb4thza+RClEj0mS5XTm1IUEw=="; }; }; - "@parcel/css-linux-arm-gnueabihf-1.10.1" = { + "@parcel/css-linux-arm-gnueabihf-1.12.2" = { name = "_at_parcel_slash_css-linux-arm-gnueabihf"; packageName = "@parcel/css-linux-arm-gnueabihf"; - version = "1.10.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.10.1.tgz"; - sha512 = "QICiX10CDudilEV+DUBKbbJb7ckSuj2hyI3NyzphRqkxBE7t4Hb04x6RPKITEJwHgvqUQ3OUPWyvtalVAi36Ww=="; + url = "https://registry.npmjs.org/@parcel/css-linux-arm-gnueabihf/-/css-linux-arm-gnueabihf-1.12.2.tgz"; + sha512 = "OsX7I3dhBvnxEbAH++08RFe7yhjRp33ulzrCvJTMOP9YkxEEJ8qId3sNzJBHIVQzHyTlPTnBRHbSDhU3TFe/eQ=="; }; }; - "@parcel/css-linux-arm64-gnu-1.10.1" = { + "@parcel/css-linux-arm64-gnu-1.12.2" = { name = "_at_parcel_slash_css-linux-arm64-gnu"; packageName = "@parcel/css-linux-arm64-gnu"; - version = "1.10.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.10.1.tgz"; - sha512 = "dHaQiBXlrDPdqE8O1qnlYqp1N9la1jgcYgIUCtm4NkNltzLVbbSFXyeG7OXeT6njP6ltMb4mmEFL18I2Wr3l3A=="; + url = "https://registry.npmjs.org/@parcel/css-linux-arm64-gnu/-/css-linux-arm64-gnu-1.12.2.tgz"; + sha512 = "R1Kqw+1Rsru9Q4+qvUEC6B8P21bpqhuF9rv8GmBmmnF1i2hMZ1JiY+uh/ej8IaRV0O3fAHeQGIyGBWx6qWDpcw=="; }; }; - "@parcel/css-linux-arm64-musl-1.10.1" = { + "@parcel/css-linux-arm64-musl-1.12.2" = { name = "_at_parcel_slash_css-linux-arm64-musl"; packageName = "@parcel/css-linux-arm64-musl"; - version = "1.10.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.10.1.tgz"; - sha512 = "inBbDCGhJaZcNCb588wQz5tYpGbnz8W/g9aFOH6X3nSBNToknOHplBHjOMLOB7vBxAykNjbywaNtE5H9qoY0/A=="; + url = "https://registry.npmjs.org/@parcel/css-linux-arm64-musl/-/css-linux-arm64-musl-1.12.2.tgz"; + sha512 = "nwixgM4SEgPUQata9aAiJW0A5Q9ms+xim1tXT1i+91kOei4Fu2Wr2OuofMk+mlhbgmGKCTcu4gzMPReGxUhuRA=="; }; }; - "@parcel/css-linux-x64-gnu-1.10.1" = { + "@parcel/css-linux-x64-gnu-1.12.2" = { name = "_at_parcel_slash_css-linux-x64-gnu"; packageName = "@parcel/css-linux-x64-gnu"; - version = "1.10.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.10.1.tgz"; - sha512 = "gBaHgMXom1lCGu/ummD1wqknxF9ZKFBUlxQ/0DtCdOtZlRBEKeWtoskK9tgH4YMnwTpMIagCwWB4UbP/9Yzz6A=="; + url = "https://registry.npmjs.org/@parcel/css-linux-x64-gnu/-/css-linux-x64-gnu-1.12.2.tgz"; + sha512 = "cJYVMHnQSGhDwQByyvjFZppjMBNlgxXl/R4cX5DwrQE0QZmK/42BYnMp92rvoprEG6LRyRoiGtCjyfYTPWajog=="; }; }; - "@parcel/css-linux-x64-musl-1.10.1" = { + "@parcel/css-linux-x64-musl-1.12.2" = { name = "_at_parcel_slash_css-linux-x64-musl"; packageName = "@parcel/css-linux-x64-musl"; - version = "1.10.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.10.1.tgz"; - sha512 = "arjLARo/3l0uwPf5qYxCkrS0FTE8n6JH/S1/7DitvhG22fsZdJTGPwe4MYLTIn4s3QXLOVVRrkPDZlUPM1yjFA=="; + url = "https://registry.npmjs.org/@parcel/css-linux-x64-musl/-/css-linux-x64-musl-1.12.2.tgz"; + sha512 = "u9zdO/d831/74Tf+TdPUfaIuB9v6FD4Xz8UdWUDOXgQqaOlnJ9fAsAM39EkoWlMxPPljY3f4ay6irSe1a4XgSA=="; }; }; - "@parcel/css-win32-x64-msvc-1.10.1" = { + "@parcel/css-win32-x64-msvc-1.12.2" = { name = "_at_parcel_slash_css-win32-x64-msvc"; packageName = "@parcel/css-win32-x64-msvc"; - version = "1.10.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.10.1.tgz"; - sha512 = "f/jkhL2uOZCHJg3/IGcuieZ4TTwkxExLd7SWVuiqJZI2nwOy/gLHTZJz3yzu/D1aLOe0M9/glgzUKRtK0DrUNA=="; + url = "https://registry.npmjs.org/@parcel/css-win32-x64-msvc/-/css-win32-x64-msvc-1.12.2.tgz"; + sha512 = "kCAKr3vKqvPUv9oXBG3pGZQz5il3sEk35dpmTXFa/7eDNKR5XyLpiJs8JwWJTFfuUqroymDSXA1bCcjvNEYcAg=="; }; }; - "@parcel/diagnostic-2.6.1" = { + "@parcel/diagnostic-2.7.0" = { name = "_at_parcel_slash_diagnostic"; packageName = "@parcel/diagnostic"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.6.1.tgz"; - sha512 = "7lbmRCHEeS8uzO+BzfTtiJMfeOKf5HOTaVE+kzTkfqHT/H3ChD1rNQQdxTjE+TvX2k7lLdEE6Qstj7OmrE/xQg=="; + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.7.0.tgz"; + sha512 = "pdq/cTwVoL0n8yuDCRXFRSQHVWdmmIXPt3R3iT4KtYDYvOrMT2dLPT79IMqQkhYPANW8GuL15n/WxRngfRdkug=="; }; }; - "@parcel/events-2.6.1" = { + "@parcel/events-2.7.0" = { name = "_at_parcel_slash_events"; packageName = "@parcel/events"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/events/-/events-2.6.1.tgz"; - sha512 = "x0PkTFm2wm1hIfwD/p0jNuCUM0t2NwzUxdZrTHm9ncqrYbO2tpG0N5jkTC9V9fu7j639vGVA7uOHYFgExTKUbQ=="; + url = "https://registry.npmjs.org/@parcel/events/-/events-2.7.0.tgz"; + sha512 = "kQDwMKgZ1U4M/G17qeDYF6bW5kybluN6ajYPc7mZcrWg+trEI/oXi81GMFaMX0BSUhwhbiN5+/Vb2wiG/Sn6ig=="; }; }; "@parcel/fs-1.11.0" = { @@ -7366,40 +7654,40 @@ let sha512 = "86RyEqULbbVoeo8OLcv+LQ1Vq2PKBAvWTU9fCgALxuCTbbs5Ppcvll4Vr+Ko1AnmMzja/k++SzNAwJfeQXVlpA=="; }; }; - "@parcel/fs-2.6.1" = { + "@parcel/fs-2.7.0" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.6.1.tgz"; - sha512 = "+kI2IPdZ5WH94+9LMCO/INnJUcbPcfVim97ORMjfe3mOYEPEQYqzM5g8SLjqiW/H5OIVapdIYoHWBEBpo3itdA=="; + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.7.0.tgz"; + sha512 = "PU5fo4Hh8y03LZgemgVREttc0wyHQUNmsJCybxTB7EjJie2CqJRumo+DFppArlvdchLwJdc9em03yQV/GNWrEg=="; }; }; - "@parcel/fs-search-2.6.1" = { + "@parcel/fs-search-2.7.0" = { name = "_at_parcel_slash_fs-search"; packageName = "@parcel/fs-search"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.6.1.tgz"; - sha512 = "vfbknvzUjy1PQuCfjfbCQUIQXCUb+n+sd5CZHOODvE4PewvspW/YmKJpYluDr0S4mOa1GX7cHJCL675DALW5yQ=="; + url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.7.0.tgz"; + sha512 = "K1Hv25bnRpwQVA15RvcRuB8ZhfclnCHA8N8L6w7Ul1ncSJDxCIkIAc5hAubYNNYW3kWjCC2SOaEgFKnbvMllEQ=="; }; }; - "@parcel/graph-2.6.1" = { + "@parcel/graph-2.7.0" = { name = "_at_parcel_slash_graph"; packageName = "@parcel/graph"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.6.1.tgz"; - sha512 = "tzv9P3hyS9SZiwmE6KB1ZFhXV3/vjFNZV7+XGbf1opI3oTwawBb+XaH4k7InPyVYZTo1QrlauhoP+EQZFyzPEQ=="; + url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.7.0.tgz"; + sha512 = "Q6E94GS6q45PtsZh+m+gvFRp/N1Qopxhu2sxjcWsGs5iBd6IWn2oYLWOH5iVzEjWuYpW2HkB08lH6J50O63uOA=="; }; }; - "@parcel/hash-2.6.1" = { + "@parcel/hash-2.7.0" = { name = "_at_parcel_slash_hash"; packageName = "@parcel/hash"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.6.1.tgz"; - sha512 = "5gve/OKOXzYADfCJ+atpR6L13n4clexazkNRcsm6LZtE2Gm84Nx81gdb8z08EJrZALC62f9J2FOmQxm6ZHrTSQ=="; + url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.7.0.tgz"; + sha512 = "k6bSKnIlPJMPU3yjQzfgfvF9zuJZGOAlJgzpL4BbWvdbE8BTdjzLcFn0Ujrtud94EgIkiXd22sC2HpCUWoHGdA=="; }; }; "@parcel/logger-1.11.1" = { @@ -7411,328 +7699,328 @@ let sha512 = "9NF3M6UVeP2udOBDILuoEHd8VrF4vQqoWHEafymO1pfSoOMfxrSJZw1MfyAAIUN/IFp9qjcpDCUbDZB+ioVevA=="; }; }; - "@parcel/logger-2.6.1" = { + "@parcel/logger-2.7.0" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.6.1.tgz"; - sha512 = "AnKAVS/QRi1ee+Q1MxL+oUZT7dBZ36VUtevmXMSaaoN3W1KwYjM4Brq3zdiTZRfa7Akpdu6Ca1QVK5hGpvXKSg=="; + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.7.0.tgz"; + sha512 = "qjMY/bYo38+o+OiIrTRldU9CwL1E7J72t+xkTP8QIcUxLWz5LYR0YbynZUVulmBSfqsykjjxCy4a+8siVr+lPw=="; }; }; - "@parcel/markdown-ansi-2.6.1" = { + "@parcel/markdown-ansi-2.7.0" = { name = "_at_parcel_slash_markdown-ansi"; packageName = "@parcel/markdown-ansi"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.6.1.tgz"; - sha512 = "p4dDINi+UeEUQfkA70R9gNJIuSnMuljSUfHf7erTU8vSqRD1tQpnmH7GfzzQLHYwHk8UYICGU8C6z7EtPH92Ng=="; + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.7.0.tgz"; + sha512 = "ipOX0D6FVZFEXeb/z8MnTMq2RQEIuaILY90olVIuHEFLHHfOPEn+RK3u13HA1ChF5/9E3cMD79tu6x9JL9Kqag=="; }; }; - "@parcel/namer-default-2.6.1" = { + "@parcel/namer-default-2.7.0" = { name = "_at_parcel_slash_namer-default"; packageName = "@parcel/namer-default"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.6.1.tgz"; - sha512 = "J7KajS6s0GvpZ0YIN8t/Z4Go/E7tS136bKyvSdWhVOUosmt2pW1L20lq9KfPVYDvWQNu12jqJbAHQFsqOLyllw=="; + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.7.0.tgz"; + sha512 = "lIKMdsmi//7fepecNDYmJYzBlL91HifPsX03lJCdu1dC6q5fBs+gG0XjKKG7yPnSCw1qH/4m7drzt9+dRZYAHQ=="; }; }; - "@parcel/node-resolver-core-2.6.1" = { + "@parcel/node-resolver-core-2.7.0" = { name = "_at_parcel_slash_node-resolver-core"; packageName = "@parcel/node-resolver-core"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.6.1.tgz"; - sha512 = "LaLiJkgr5Cq9ue5wxsFR97S3R+IOGkmvivNsdc4Y9Gdj9WO1nMTaNMBlw+AIjtbzdbw0MUvKQik2tR4AmfBcLw=="; + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.7.0.tgz"; + sha512 = "5UJQHalqMxdhJIs2hhqQzFfQpF7+NAowsRq064lYtiRvcD8wMr3OOQ9wd1iazGpFSl4JKdT7BwDU9/miDJmanQ=="; }; }; - "@parcel/optimizer-css-2.6.1" = { + "@parcel/optimizer-css-2.7.0" = { name = "_at_parcel_slash_optimizer-css"; packageName = "@parcel/optimizer-css"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.6.1.tgz"; - sha512 = "VNdATqH068XCbzaOBbgdZOBJAMomkXOqcmxXOmQkHqTKqBO11xXLIESP+PQwTXoxy7If+2ufxOPCHTI20691Jg=="; + url = "https://registry.npmjs.org/@parcel/optimizer-css/-/optimizer-css-2.7.0.tgz"; + sha512 = "IfnOMACqhcAclKyOW9X9JpsknB6OShk9OVvb8EvbDTKHJhQHNNmzE88OkSI/pS3ZVZP9Zj+nWcVHguV+kvDeiQ=="; }; }; - "@parcel/optimizer-htmlnano-2.6.1" = { + "@parcel/optimizer-htmlnano-2.7.0" = { name = "_at_parcel_slash_optimizer-htmlnano"; packageName = "@parcel/optimizer-htmlnano"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.6.1.tgz"; - sha512 = "m+S3lvmSPEnPaUZzM2J/Lk8APYvMXXiJiz9UdjGa6yeW8yfR5TBPKoNPdO3XgAt13YGiNFhi/QasqsvE18iX+A=="; + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.7.0.tgz"; + sha512 = "5QrGdWS5Hi4VXE3nQNrGqugmSXt68YIsWwKRAdarOxzyULSJS3gbCiQOXqIPRJobfZjnSIcdtkyxSiCUe1inIA=="; }; }; - "@parcel/optimizer-image-2.6.1" = { + "@parcel/optimizer-image-2.7.0" = { name = "_at_parcel_slash_optimizer-image"; packageName = "@parcel/optimizer-image"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.6.1.tgz"; - sha512 = "xZ8+dygBgHQyOsMv7O1YzNGO1MKFNiE+72gN9LhjG7ld6bSix4he1af0ac7p9bpTv1cNfx/eTY604u+gv8XPqg=="; + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.7.0.tgz"; + sha512 = "EnaXz5UjR67FUu0BEcqZTT9LsbB/iFAkkghCotbnbOuC5QQsloq6tw54TKU3y+R3qsjgUoMtGxPcGfVoXxZXYw=="; }; }; - "@parcel/optimizer-svgo-2.6.1" = { + "@parcel/optimizer-svgo-2.7.0" = { name = "_at_parcel_slash_optimizer-svgo"; packageName = "@parcel/optimizer-svgo"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.6.1.tgz"; - sha512 = "oyEs/8JzMJnAmJYZsWeEpC3jgyDwxA9KAnntG/41n6WDX6KDdDhY5p8B+jEvt/WQu5MQXcvIoWnMWv0W6brq+Q=="; + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.7.0.tgz"; + sha512 = "IO1JV4NpfP3V7FrhsqCcV8pDQIHraFi1/ZvEJyssITxjH49Im/txKlwMiQuZZryAPn8Xb8g395Muawuk6AK6sg=="; }; }; - "@parcel/optimizer-terser-2.6.1" = { + "@parcel/optimizer-terser-2.7.0" = { name = "_at_parcel_slash_optimizer-terser"; packageName = "@parcel/optimizer-terser"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.6.1.tgz"; - sha512 = "h/bRdIU7Rh5MEhdX9cIGgqnu4+BpVBjRwDMqRvNirkAY6fZTLXgVb6ZxJq2jx8G4+j3sGzUmP1WaIPHeC0YJcg=="; + url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.7.0.tgz"; + sha512 = "07VZjIO8xsl2/WmS/qHI8lI/cpu47iS9eRpqwfZEEsdk1cfz50jhWkmFudHBxiHGMfcZ//1+DdaPg9RDBWZtZA=="; }; }; - "@parcel/package-manager-2.6.1" = { + "@parcel/package-manager-2.7.0" = { name = "_at_parcel_slash_package-manager"; packageName = "@parcel/package-manager"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.6.1.tgz"; - sha512 = "lC+e0l+rB2QYBtXetAdDSqcidni0V1eYEAYXv4+sLnAMwyCeH3x4Ctivj/w0ILzuAFnS5ow9V91boM6DQegqHQ=="; + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.7.0.tgz"; + sha512 = "wmfSX1mRrTi8MeA4KrnPk/x7zGUsILCQmTo6lA4gygzAxDbM1pGuyFN8/Kt0y0SFO2lbljARtD/4an5qdotH+Q=="; }; }; - "@parcel/packager-css-2.6.1" = { + "@parcel/packager-css-2.7.0" = { name = "_at_parcel_slash_packager-css"; packageName = "@parcel/packager-css"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.6.1.tgz"; - sha512 = "wUGzbH8u9FyybaiCbDYdWkyrObh994PzYzj0m6rwRz+g8HNDSvzHafOnms3e/IzhtchavVwq4yvhl4xyA2WYLQ=="; + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.7.0.tgz"; + sha512 = "44nzZwu+ssGuiFmYM6cf/Y4iChiUZ4DUzzpegnGlhXtKJKe4NHntxThJynuRZWKN2AAf48avApDpimg2jW0KDw=="; }; }; - "@parcel/packager-html-2.6.1" = { + "@parcel/packager-html-2.7.0" = { name = "_at_parcel_slash_packager-html"; packageName = "@parcel/packager-html"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.6.1.tgz"; - sha512 = "AzlhBG00yVvAO+3jeky5z09GLxvb9YPV+VjlExQd7OpVHlCXU7m6JafxdtesUzb63gSOsu00Hms6iNN2USv2Gg=="; + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.7.0.tgz"; + sha512 = "Zgqd7sdcY/UnR370GR0q2ilmEohUDXsO8A1F28QCJzIsR1iCB6KRUT74+pawfQ1IhXZLaaFLLYe0UWcfm0JeXg=="; }; }; - "@parcel/packager-js-2.6.1" = { + "@parcel/packager-js-2.7.0" = { name = "_at_parcel_slash_packager-js"; packageName = "@parcel/packager-js"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.6.1.tgz"; - sha512 = "NW2fag24sGrLwBohwk/QwqC+TYvUbh1qEWzOHQ6s1nW+12eKm+kFpSUiK3WTHhMOZoyqH/DNCdsvvHTtCXFgCA=="; + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.7.0.tgz"; + sha512 = "wTRdM81PgRVDzWGXdWmqLwguWnTYWzhEDdjXpW2n8uMOu/CjHhMtogk65aaYk3GOnq6OBL/NsrmBiV/zKPj1vA=="; }; }; - "@parcel/packager-raw-2.6.1" = { + "@parcel/packager-raw-2.7.0" = { name = "_at_parcel_slash_packager-raw"; packageName = "@parcel/packager-raw"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.6.1.tgz"; - sha512 = "v7C9Jlp1ybUs9qbYZWIdzmdXKOZ5q5e05/YxE205UQgHy7cbuTD9ZY4xiuHAsP9qA8oBY4nD5kYyWuNSU92WWA=="; + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.7.0.tgz"; + sha512 = "jg2Zp8dI5VpIQlaeahXDCfrPN9m/DKht1NkR9P2CylMAwqCcc1Xc1RRiF0wfwcPZpPMpq1265n+4qnB7rjGBlA=="; }; }; - "@parcel/packager-svg-2.6.1" = { + "@parcel/packager-svg-2.7.0" = { name = "_at_parcel_slash_packager-svg"; packageName = "@parcel/packager-svg"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.6.1.tgz"; - sha512 = "ziAVCkDI7HjdXbQy3NfinRbw/nsZ8COn2oPFfukx1H3DmNhGeur3TYYLhiN0PZB45j8w9rSWoUEgDWXRqSMN4w=="; + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.7.0.tgz"; + sha512 = "EmJg3HpD6/xxKBjir/CdCKJZwI24iVfBuxRS9LUp3xHAIebOzVh1z6IN+i2Di5+NyRwfOFaLliL4uMa1zwbyCA=="; }; }; - "@parcel/plugin-2.6.1" = { + "@parcel/plugin-2.7.0" = { name = "_at_parcel_slash_plugin"; packageName = "@parcel/plugin"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.6.1.tgz"; - sha512 = "0QVS7mhrS9gGHtaT0KpPes2CCCAyPvvI2oZLq+NX3z7Qa73kj3Ct5QL2JuRywnefDVnkY79256oTdsq/nJrnXg=="; + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.7.0.tgz"; + sha512 = "qqgx+nnMn6/0lRc4lKbLGmhNtBiT93S2gFNB4Eb4Pfz/SxVYoW+fmml+KdfOSiZffWOAH5L6NwhyD7N8aSikzw=="; }; }; - "@parcel/reporter-cli-2.6.1" = { + "@parcel/reporter-cli-2.7.0" = { name = "_at_parcel_slash_reporter-cli"; packageName = "@parcel/reporter-cli"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.6.1.tgz"; - sha512 = "VpVIUXReEvNko1DP+75++YQMhKLKjtyu7OziDR3AMPcRFnSbygttonK0TYg88gZ0QtHF3lNkFvn4LMECVAL5PQ=="; + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.7.0.tgz"; + sha512 = "80gEODg8cnAmnxGVuaSVDo8JJ54P9AA2bHwSs1cIkHWlJ3BjDQb83H31bBHncJ5Kn5kQ/j+7WjlqHpTCiOR9PA=="; }; }; - "@parcel/reporter-dev-server-2.6.1" = { + "@parcel/reporter-dev-server-2.7.0" = { name = "_at_parcel_slash_reporter-dev-server"; packageName = "@parcel/reporter-dev-server"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.6.1.tgz"; - sha512 = "JerLdJZdYJEchJ7lbBS79lJJHxEG2qDBmSQ5LUuX94/YNo1pQEOAQtc2Ogv98ZSjOdp8xaNYCKYKXIVd2d4gYA=="; + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.7.0.tgz"; + sha512 = "ySuou5addK8fGue8aXzo536BaEjMujDrEc1xkp4TasInXHVcA98b+SYX5NAZTGob5CxKvZQ5ylhg77zW30B+iA=="; }; }; - "@parcel/resolver-default-2.6.1" = { + "@parcel/resolver-default-2.7.0" = { name = "_at_parcel_slash_resolver-default"; packageName = "@parcel/resolver-default"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.6.1.tgz"; - sha512 = "C9kEwzluijSqdD7hXmFTRfOBNjxxrMepT5M3ZpgvtPABhZyR3epkOugD1p54ChHr3vsrfWJIjRZLi7JoI8o/VA=="; + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.7.0.tgz"; + sha512 = "v8TvWsbLK7/q7n4gv6OrYNbW18xUx4zKbVMGZb1u4yMhzEH4HFr1D9OeoTq3jk+ximAigds8B6triQbL5exF7A=="; }; }; - "@parcel/runtime-browser-hmr-2.6.1" = { + "@parcel/runtime-browser-hmr-2.7.0" = { name = "_at_parcel_slash_runtime-browser-hmr"; packageName = "@parcel/runtime-browser-hmr"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.6.1.tgz"; - sha512 = "TJzONMgyU6mZ8faI8viuPzVfpPJLtesioCqDpV9/8f27JXBCL/3mRWVzoD0CJ5u94xmF0R1ErySJX5odDD++lQ=="; + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.7.0.tgz"; + sha512 = "PLbMLdclQeYsi2LkilZVGFV1n3y55G1jaBvby4ekedUZjMw3SWdMY2tDxgSDdFWfLCnYHJXdGUQSzGGi1kPzjA=="; }; }; - "@parcel/runtime-js-2.6.1" = { + "@parcel/runtime-js-2.7.0" = { name = "_at_parcel_slash_runtime-js"; packageName = "@parcel/runtime-js"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.6.1.tgz"; - sha512 = "nZkSD2QR677GYS+wIS2vuqCVqIMc91+8KidkwPqrzodGVzAS1QF4SD5Fy4sB2sqGJU9yRpxIB6q8figM0uZ1SQ=="; + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.7.0.tgz"; + sha512 = "9/YUZTBNrSN2H6rbz/o1EOM0O7I3ZR/x9IDzxjJBD6Mi+0uCgCD02aedare/SNr1qgnbZZWmhpOzC+YgREcfLA=="; }; }; - "@parcel/runtime-react-refresh-2.6.1" = { + "@parcel/runtime-react-refresh-2.7.0" = { name = "_at_parcel_slash_runtime-react-refresh"; packageName = "@parcel/runtime-react-refresh"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.6.1.tgz"; - sha512 = "+ZrWKChGqsJ3xtUTd/fIeEMruSLvIMpmgujAjo6cFCzG3cOcpRcLa7mpWDydicUaWsiIx7lL5LIWu5bCS9G+DQ=="; + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.7.0.tgz"; + sha512 = "vDKO0rWqRzEpmvoZ4kkYUiSsTxT5NnH904BFPFxKI0wJCl6yEmPuEifmATo73OuYhP6jIP3Qfl1R4TtiDFPJ1Q=="; }; }; - "@parcel/runtime-service-worker-2.6.1" = { + "@parcel/runtime-service-worker-2.7.0" = { name = "_at_parcel_slash_runtime-service-worker"; packageName = "@parcel/runtime-service-worker"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.6.1.tgz"; - sha512 = "v9VbhZEEtxG3gdp4BF4JX5ji9O87RS+4HxxY2w1LHKz+t3t1ODWG5WVfIQmKD/wBwFYwQWaI6qAVXuIY26SfjQ=="; + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.7.0.tgz"; + sha512 = "uD2pAV0yV6+e7JaWH4KVPbG+zRCrxr/OACyS9tIh+Q/R1vRmh8zGM3yhdrcoiZ7tFOnM72vd6xY11eTrUsSVig=="; }; }; - "@parcel/source-map-2.0.5" = { + "@parcel/source-map-2.1.0" = { name = "_at_parcel_slash_source-map"; packageName = "@parcel/source-map"; - version = "2.0.5"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.0.5.tgz"; - sha512 = "DRVlCFKLpqBSIbMxUoVlHgfiv12HTW/U7nnhzw52YgzDVXUX9OA41dXS1PU0pJ1si+D1k8msATUC+AoldN43mg=="; + url = "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.1.0.tgz"; + sha512 = "E7UOEIof2o89LrKk1agSLmwakjigmEdDp1ZaEdsLVEvq63R/bul4Ij5CT+0ZDcijGpl5tnTbQADY9EyYGtjYgQ=="; }; }; - "@parcel/transformer-babel-2.6.1" = { + "@parcel/transformer-babel-2.7.0" = { name = "_at_parcel_slash_transformer-babel"; packageName = "@parcel/transformer-babel"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.6.1.tgz"; - sha512 = "VEB62Okq7epZmmGMBro3B7LoCfLKY3HqVGWXbY3kJ+R36+2UImMyG7eGVPGf3FCJY9Jt3McGfCUKdDR4en2rFg=="; + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.7.0.tgz"; + sha512 = "7iklDXXnKH1530+QbI+e4kIJ+Q1puA1ulRS10db3aUJMj5GnvXGDFwhSZ7+T1ps66QHO7cVO29VlbqiRDarH1Q=="; }; }; - "@parcel/transformer-css-2.6.1" = { + "@parcel/transformer-css-2.7.0" = { name = "_at_parcel_slash_transformer-css"; packageName = "@parcel/transformer-css"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.6.1.tgz"; - sha512 = "trVn7+Mx9/XNr9+eXumMuDbNRfkCmrplGQ6nlf6ZeuSs7ayNFDVuudsnC7SN1Yn+YpyWjgOD17RmlS581ZKTAw=="; + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.7.0.tgz"; + sha512 = "J4EpWK9spQpXyNCmKK8Xnane0xW/1B/EAmfp7Fiv7g+5yUjY4ODf4KUugvE+Eb2gekPkhOKNHermO2KrX0/PFA=="; }; }; - "@parcel/transformer-html-2.6.1" = { + "@parcel/transformer-html-2.7.0" = { name = "_at_parcel_slash_transformer-html"; packageName = "@parcel/transformer-html"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.6.1.tgz"; - sha512 = "GpHXG8v1U0heCbNVQ8gmnJJqAkceKROvj7BreR7UokXP+Frr+ydKKumbVLK7kjwwlagy85VMnIMaFG8/zZ4lqA=="; + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.7.0.tgz"; + sha512 = "wYJl5rn81W+Rlk9oQwDJcjoVsWVDKyeri84FzmlGXOsg0EYgnqOiG+3MDM8GeZjfuGe5fuoum4eqZeS0WdUHXw=="; }; }; - "@parcel/transformer-image-2.6.1" = { + "@parcel/transformer-image-2.7.0" = { name = "_at_parcel_slash_transformer-image"; packageName = "@parcel/transformer-image"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.6.1.tgz"; - sha512 = "s+ht/DD2pzCx0yq4L6rNHu8oxTQ6Xx8PKcxZxlEsaW2xyDWJ0nvhLE0p296Xa+A4Vw31DENIe1Wq1PQ2C6UrTA=="; + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.7.0.tgz"; + sha512 = "mhi9/R5/ULhCkL2COVIKhNFoLDiZwQgprdaTJr5fnODggVxEX5o7ebFV6KNLMTEkwZUJWoB1hL0ziI0++DtoFA=="; }; }; - "@parcel/transformer-js-2.6.1" = { + "@parcel/transformer-js-2.7.0" = { name = "_at_parcel_slash_transformer-js"; packageName = "@parcel/transformer-js"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.6.1.tgz"; - sha512 = "jtf154aL7OCbsgi0A4Bk/2oYfdNIFRILho7UXIQ0qszkCj0IDO67bzUF1Q4JuAFS9vyqulyId6HYFqCkmOlv3A=="; + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.7.0.tgz"; + sha512 = "mzerR+D4rDomUSIk5RSTa2w+DXBdXUeQrpDO74WCDdpDi1lIl8ppFpqtmU7O6y6p8QsgkmS9b0g/vhcry6CJTA=="; }; }; - "@parcel/transformer-json-2.6.1" = { + "@parcel/transformer-json-2.7.0" = { name = "_at_parcel_slash_transformer-json"; packageName = "@parcel/transformer-json"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.6.1.tgz"; - sha512 = "GPI+mUiLm/B8eR7zXWIV252TQarN6Qv3S0wnJhs30gA8EI8/MkFkEgJFoKAKP7saV/r2gnONEZlovQvTuF0oqw=="; + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.7.0.tgz"; + sha512 = "RQjuxBpYOch+kr4a0zi77KJtOLTPYRM7iq4NN80zKnA0r0dwDUCxZBtaj2l0O0o3R4MMJnm+ncP+cB7XR7dZYA=="; }; }; - "@parcel/transformer-postcss-2.6.1" = { + "@parcel/transformer-postcss-2.7.0" = { name = "_at_parcel_slash_transformer-postcss"; packageName = "@parcel/transformer-postcss"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.6.1.tgz"; - sha512 = "NeZDXa9PkvHgwNWWtxaJWgGu7oq+jReCd1L/uXQRcNys2feUApdlQuKIjea1uL1UK6ydsS2kzmv/HqGWK3nGxA=="; + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.7.0.tgz"; + sha512 = "b6RskXBWf0MjpC9qjR2dQ1ZdRnlOiKYseG5CEovWCqM218RtdydFKz7jS+5Gxkb6qBtOG7zGPONXdPe+gTILcA=="; }; }; - "@parcel/transformer-posthtml-2.6.1" = { + "@parcel/transformer-posthtml-2.7.0" = { name = "_at_parcel_slash_transformer-posthtml"; packageName = "@parcel/transformer-posthtml"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.6.1.tgz"; - sha512 = "XzfQf193m0RrlTzKDpqWWnS3ONn9xD9C8pKGvWapmrfFIMSwiOTY3EHUD8P3kCeon2CyddfshU1Y6yPkVdreww=="; + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.7.0.tgz"; + sha512 = "cP8YOiSynWJ1ycmBlhnnHeuQb2cwmklZ+BNyLUktj5p78kDy2de7VjX+dRNRHoW4H9OgEcSF4UEfDVVz5RYIhw=="; }; }; - "@parcel/transformer-raw-2.6.1" = { + "@parcel/transformer-raw-2.7.0" = { name = "_at_parcel_slash_transformer-raw"; packageName = "@parcel/transformer-raw"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.6.1.tgz"; - sha512 = "gkuUksA8TDjaSlU9I2MFH4R3WfHXBOHLZlZ+juPK2rlLhhe8A/mvwOuWreNyjQTnKt6QXkdIkvgc9gTlsSHnXQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.7.0.tgz"; + sha512 = "sDnItWCFSDez0izK1i5cgv+kXzZTbcJh4rNpVIgmE1kBLvAz608sqgcCkavb2wVJIvLesxYM+5G4p1CwkDlZ1g=="; }; }; - "@parcel/transformer-react-refresh-wrap-2.6.1" = { + "@parcel/transformer-react-refresh-wrap-2.7.0" = { name = "_at_parcel_slash_transformer-react-refresh-wrap"; packageName = "@parcel/transformer-react-refresh-wrap"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.6.1.tgz"; - sha512 = "EZg2OKsurEmvcCkbroL2v6sBk7X790BK7nlrCHug9EX8aatiwvabxBPlx9aRUwUEjqRBosmS+fmU1exKpqBZxA=="; + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.7.0.tgz"; + sha512 = "1vRmIJzyBA1nIiXTAU6tZExq2FvJj/2F0ft6KDw8GYPv0KjmdiPo/PmaZ7JeSVOM6SdXQIQCbTmp1vkMP7DtkA=="; }; }; - "@parcel/transformer-svg-2.6.1" = { + "@parcel/transformer-svg-2.7.0" = { name = "_at_parcel_slash_transformer-svg"; packageName = "@parcel/transformer-svg"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.6.1.tgz"; - sha512 = "k9ccxU4eLMrmKDTdXbabq6C/TsF+bOSrWQYOC8QK+VPSF91S47vhVqLTiFeguB8bJGeLgd4uGS+YgdOLGjAJcw=="; + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.7.0.tgz"; + sha512 = "ioER37zceuuE+K6ZrnjCyMUWEnv+63hIAFResc1OXxRhyt+7kzMz9ZqK0Mt6QMLwl1dxhkLmrU41n9IxzKZuSQ=="; }; }; - "@parcel/types-2.6.1" = { + "@parcel/types-2.7.0" = { name = "_at_parcel_slash_types"; packageName = "@parcel/types"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/types/-/types-2.6.1.tgz"; - sha512 = "IXt0MiBmg95SKOAyvRNjcNlJvWUMtvCw6ea7+h1mWStm4gcJBoaznbgLJsG2C17AJ2F8CNR/5jZKlM9SDzTayg=="; + url = "https://registry.npmjs.org/@parcel/types/-/types-2.7.0.tgz"; + sha512 = "+dhXVUnseTCpJvBTGMp0V6X13z6O/A/+CUtwEpMGZ8XSmZ4Gk44GvaTiBOp0bJpWG4fvCKp+UmC8PYbrDiiziw=="; }; }; "@parcel/utils-1.11.0" = { @@ -7744,13 +8032,13 @@ let sha512 = "cA3p4jTlaMeOtAKR/6AadanOPvKeg8VwgnHhOyfi0yClD0TZS/hi9xu12w4EzA/8NtHu0g6o4RDfcNjqN8l1AQ=="; }; }; - "@parcel/utils-2.6.1" = { + "@parcel/utils-2.7.0" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.6.1.tgz"; - sha512 = "jMoNNBVGGs1IeNZnGGJv3R2otmf39X/0OerpuI27Ut4iCt79y6TVMFdoB7eG2aEYFdL6cD7xNfieQvX+6nrjoQ=="; + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.7.0.tgz"; + sha512 = "jNZ5bIGg1r1RDRKi562o4kuVwnz+XJ2Ie3b0Zwrqwvgfj6AbRFIKzDd+h85dWWmcDYzKUbHp11u6VJl1u8Vapg=="; }; }; "@parcel/watcher-1.12.1" = { @@ -7762,6 +8050,15 @@ let sha512 = "od+uCtCxC/KoNQAIE1vWx1YTyKYY+7CTrxBJPRh3cDWw/C0tCtlBMVlrbplscGoEpt6B27KhJDCv82PBxOERNA=="; }; }; + "@parcel/watcher-2.0.4" = { + name = "_at_parcel_slash_watcher"; + packageName = "@parcel/watcher"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz"; + sha512 = "cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg=="; + }; + }; "@parcel/watcher-2.0.5" = { name = "_at_parcel_slash_watcher"; packageName = "@parcel/watcher"; @@ -7780,22 +8077,22 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; - "@parcel/workers-2.6.1" = { + "@parcel/workers-2.7.0" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.6.1.tgz"; - sha512 = "KIXu5HAmnEDIDwwJDnLzlr0avsewux3rWHe/nN43ERgj2j5j1nVqIulE7tX+XKAM3AHTFKWHJi5RLX4Htl2wwg=="; + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.7.0.tgz"; + sha512 = "99VfaOX+89+RaoTSyH9ZQtkMBFZBFMvJmVJ/GeJT6QCd2wtKBStTHlaSnQOkLD/iRjJCNwV2xpZmm8YkTwV+hg=="; }; }; - "@peculiar/asn1-schema-2.1.9" = { + "@peculiar/asn1-schema-2.2.0" = { name = "_at_peculiar_slash_asn1-schema"; packageName = "@peculiar/asn1-schema"; - version = "2.1.9"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.1.9.tgz"; - sha512 = "Ipio+pXGpL/Vb0qB4GnOgFMgc1RAhKHOVy24rQYLvmOAVp9z/aFb+VdIiQH09NjgvGVmaWOUqSWd9vRHk3xbrg=="; + url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.2.0.tgz"; + sha512 = "1ENEJNY7Lwlua/1wvzpYP194WtjQBfFxvde2FlzfBFh/ln6wvChrtxlORhbKEnYswzn6fOC4c7HdC5izLPMTJg=="; }; }; "@peculiar/json-schema-1.1.12" = { @@ -7852,31 +8149,49 @@ let sha512 = "SXsM27SGH3yTWKc2fKR4SYNxsmnvuBQ9dd6QHtEWmiZ/VqaOYPAIlS8+vMcn27YLtAEBGvNRSh3TPNvtjZgfqA=="; }; }; - "@primer/octicons-17.0.0" = { + "@pnpm/network.ca-file-1.0.1" = { + name = "_at_pnpm_slash_network.ca-file"; + packageName = "@pnpm/network.ca-file"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.1.tgz"; + sha512 = "gkINruT2KUhZLTaiHxwCOh1O4NVnFT0wLjWFBHmTz9vpKag/C/noIMJXBxFe4F0mYpUVX2puLwAieLYFg2NvoA=="; + }; + }; + "@pnpm/npm-conf-1.0.5" = { + name = "_at_pnpm_slash_npm-conf"; + packageName = "@pnpm/npm-conf"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-1.0.5.tgz"; + sha512 = "hD8ml183638O3R6/Txrh0L8VzGOrFXgRtRDG4qQC4tONdZ5Z1M+tlUUDUvrjYdmK6G+JTBTeaCLMna11cXzi8A=="; + }; + }; + "@primer/octicons-17.3.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; - version = "17.0.0"; + version = "17.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@primer/octicons/-/octicons-17.0.0.tgz"; - sha512 = "DiIjtous4XPuR2deTctD3/RVZy/vRzVYBgYYvHV313MmTfkbVP60qLH5txrT3/bYNvnb0poNDelLS6U0kqlvHA=="; + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-17.3.0.tgz"; + sha512 = "4zPwwloYWdR6RznMafV7Fsw3n2CeDPp/+qEIQbaX/tBbPY1KmU0OAXmhRfhD5AzgB5kdV1aQ7KnQr1GeQXl9Dg=="; }; }; - "@prisma/engines-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" = { + "@prisma/engines-4.1.1" = { name = "_at_prisma_slash_engines"; packageName = "@prisma/engines"; - version = "3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/engines/-/engines-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e.tgz"; - sha512 = "NHlojO1DFTsSi3FtEleL9QWXeSF/UjhCW0fgpi7bumnNZ4wj/eQ+BJJ5n2pgoOliTOGv9nX2qXvmHap7rJMNmg=="; + url = "https://registry.npmjs.org/@prisma/engines/-/engines-4.1.1.tgz"; + sha512 = "DCw8L/SS0IXqmj5IW/fMxOXiifnsfjBzDfRhf0j3NFWqvMCh9OtfjmXQZxVgI2mwvJLc/5jzXhkiWT39qS09dA=="; }; }; - "@prisma/prisma-fmt-wasm-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372" = { + "@prisma/prisma-fmt-wasm-4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8" = { name = "_at_prisma_slash_prisma-fmt-wasm"; packageName = "@prisma/prisma-fmt-wasm"; - version = "3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372"; + version = "4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372.tgz"; - sha512 = "WZPmtF1rejy5aWyldms+zwP2IvI/g/j09fOD9+PnJJYAzgOXqGcp9lp0StTWZI0mZ1xNMlF5EIbcQHTWxGDYnw=="; + url = "https://registry.npmjs.org/@prisma/prisma-fmt-wasm/-/prisma-fmt-wasm-4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8.tgz"; + sha512 = "FMluV86ivbESe7I7cw/e3ee/iU2z0zbV5z9ELNRoNBG/H3FUaMN1ZtVa4RwbY8EgfatfF+6TQamsU1DmNp5i4w=="; }; }; "@protobufjs/aspromise-1.1.2" = { @@ -8023,40 +8338,13 @@ let sha512 = "y9qNj0//tZtWB2jfXNK3BX18BSBp9zNR7KE7lMysVHwbZtY392OJCjm6Rb/h4UHH2r1AqjNEHFD6bRn+DqU9Mw=="; }; }; - "@redocly/openapi-core-1.0.0-beta.102" = { + "@redocly/openapi-core-1.0.0-beta.105" = { name = "_at_redocly_slash_openapi-core"; packageName = "@redocly/openapi-core"; - version = "1.0.0-beta.102"; + version = "1.0.0-beta.105"; src = fetchurl { - url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.102.tgz"; - sha512 = "3Fr3fg+9VEF4+4uoyvOOk+9ipmX2GYhlb18uZbpC4v3cUgGpkTRGZM2Qetfah7Tgx2LgqLuw8A1icDD6Zed2Gw=="; - }; - }; - "@remix-run/node-1.4.3" = { - name = "_at_remix-run_slash_node"; - packageName = "@remix-run/node"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/node/-/node-1.4.3.tgz"; - sha512 = "2x3BQ2qrA1v4Viu+GYMNMxxflnT5QcyOsPNCNvLjLm4o1pODHxYmp+2TEcZRgDqSTXgA7PNYlsEgG0BN/T33QA=="; - }; - }; - "@remix-run/server-runtime-1.4.3" = { - name = "_at_remix-run_slash_server-runtime"; - packageName = "@remix-run/server-runtime"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-1.4.3.tgz"; - sha512 = "NgzoEAlIuZWv53oZRgxGz+jqkEtAa+veAuxlp5/UcZ/VhygpYIcfKwdx4eCOqJOi1TqILNWrh3cedEVvV0jccQ=="; - }; - }; - "@remix-run/vercel-1.4.3" = { - name = "_at_remix-run_slash_vercel"; - packageName = "@remix-run/vercel"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@remix-run/vercel/-/vercel-1.4.3.tgz"; - sha512 = "ZNDmn/j8mU0rK+6VdMqZmWx50thlXtioNLJ0U6qic3hSFFr4vO1weRTUwRIFE3Gm3AxmmvcLxx581W2aTnReVQ=="; + url = "https://registry.npmjs.org/@redocly/openapi-core/-/openapi-core-1.0.0-beta.105.tgz"; + sha512 = "8uYDMcqBOPhFgjRlg5uetW/E2uTVVRpk+YsJhaH78ZNuzBkQP5Waw5s8P8ym6myvHs5me8l5AdniY/ePLMT5xg=="; }; }; "@request/api-0.6.0" = { @@ -8104,13 +8392,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-14.0.2" = { + "@schematics/angular-14.1.1" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "14.0.2"; + version = "14.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-14.0.2.tgz"; - sha512 = "DmLD0s4zUGuX+hjkIkW/aZi+JZZFZfhBxhumG9nftWPYT9/AjX3C2YZCarRWJ83jy/K3N9y4cnva0NVqKxTa3A=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-14.1.1.tgz"; + sha512 = "oSRDDhzg/27RKrQRoz09yELyBtsAFYfR1f+uq41FcmHZFfwOA5mQaqN2CQ1gUFygUZfZgOWSc+wma3ACIrwbHA=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -8212,13 +8500,13 @@ let sha512 = "DAa5Z0JAZc6UfrTZLYwqoZxgAponZpFwaqd7WzzMA+loMCkYWyJNwxrAmV6cr2UUJpkko4toPZuJ3vM9Ie+NDA=="; }; }; - "@serverless/utils-6.6.0" = { + "@serverless/utils-6.7.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "6.6.0"; + version = "6.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.6.0.tgz"; - sha512 = "+zw5m41L44psgKh9Snj0tVaXKI2mg/MW2l7VlySjAEK5jqLKHNmFMw0n2oD75nbaJvr2xYhc05wmeFdLqVF6Sw=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-6.7.0.tgz"; + sha512 = "aUjkkOTJ5wH7f3raSIDeTCR4JsAbd9p5Pjs7yW3sVOmu0qiTPHZOr1x1TIkb3WDHiAoQQY8zGhfzW7zLTcAA3Q=="; }; }; "@sideway/address-4.1.4" = { @@ -8311,6 +8599,15 @@ let sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw=="; }; }; + "@sindresorhus/is-5.3.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-5.3.0.tgz"; + sha512 = "CX6t4SYQ37lzxicAqsBtxA3OseeoVrh9cSJ5PFYam0GksYlupRfy1A+Q4aYD3zvcfECLc0zO2u+ZnR2UYKvCrw=="; + }; + }; "@sindresorhus/jimp-0.3.0" = { name = "_at_sindresorhus_slash_jimp"; packageName = "@sindresorhus/jimp"; @@ -8518,13 +8815,13 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; - "@swc/helpers-0.4.2" = { + "@swc/helpers-0.4.3" = { name = "_at_swc_slash_helpers"; packageName = "@swc/helpers"; - version = "0.4.2"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.2.tgz"; - sha512 = "556Az0VX7WR6UdoTn4htt/l3zPQ7bsQWK+HqdG4swV7beUCxo/BqmvbOpUkTIm/9ih86LIf1qsUnywNL3obGHw=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.4.3.tgz"; + sha512 = "6JrF+fdUK2zbGpJIlN7G3v966PQjyx/dPt1T9km2wj+EUBqgrxCk3uX4Kct16MIm9gGxfKRcfax2hVf5jvlTzA=="; }; }; "@szmarczak/http-timer-1.1.2" = { @@ -8545,6 +8842,15 @@ let sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; + "@szmarczak/http-timer-5.0.1" = { + name = "_at_szmarczak_slash_http-timer"; + packageName = "@szmarczak/http-timer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz"; + sha512 = "+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw=="; + }; + }; "@taplo/lsp-0.2.4" = { name = "_at_taplo_slash_lsp"; packageName = "@taplo/lsp"; @@ -8554,13 +8860,13 @@ let sha512 = "/FcGQVvXAslhiC9aMG5gxKXJctg8N7XLZrP+wYrFTFccWEPZd/Xon5y7jUXpKOVSOFEA1MOKZKbPuK4ET5/T8Q=="; }; }; - "@textlint/ast-node-types-12.1.1" = { + "@textlint/ast-node-types-12.2.1" = { name = "_at_textlint_slash_ast-node-types"; packageName = "@textlint/ast-node-types"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.1.1.tgz"; - sha512 = "5/XK9S1177UYetOY6407o1RDuNVndaYfuzsZwhmo52V367s4ZuUD2064WhbmCd6TPyKD4dVr2zoWjfNDfzUZQg=="; + url = "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-12.2.1.tgz"; + sha512 = "NXYza6aG1+LdZ4g83gjRhDht+gdrTjJYkdcQhpvzNCtTar/sVpaykkauRcAKLhkIWrQpfb311pfMlU6qNDW76Q=="; }; }; "@textlint/ast-node-types-4.4.3" = { @@ -8572,130 +8878,130 @@ let sha512 = "qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A=="; }; }; - "@textlint/ast-tester-12.1.1" = { + "@textlint/ast-tester-12.2.1" = { name = "_at_textlint_slash_ast-tester"; packageName = "@textlint/ast-tester"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.1.1.tgz"; - sha512 = "lPbpp9qZ/Me852OzWWOSwqbYa9clziRRRfX6qeRqJOuuc8qNOzvP2vC7quvQPSNcGpnDse2bNwePgxtWhWb5fQ=="; + url = "https://registry.npmjs.org/@textlint/ast-tester/-/ast-tester-12.2.1.tgz"; + sha512 = "QGg7wxFLpsEAb7uxYPAO6F/QxDoX50wQ8aQ378RbpcQK57J9r9TQfV5Sieuta5dJORUrrMIuIrP4qU7P+1YyUw=="; }; }; - "@textlint/ast-traverse-12.1.1" = { + "@textlint/ast-traverse-12.2.1" = { name = "_at_textlint_slash_ast-traverse"; packageName = "@textlint/ast-traverse"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.1.1.tgz"; - sha512 = "/hiESq9fwR+4X4U7VfkjhUtuIRuJwnJZpgA+WiSpIwK4Ps60WhB1VBxecyxgNmj3s3EsJn95nCCJntgpa3qQcA=="; + url = "https://registry.npmjs.org/@textlint/ast-traverse/-/ast-traverse-12.2.1.tgz"; + sha512 = "uwppnDZRmRhH8R4WrkKAvwAbKcYux2yG/XqKlADuFd2T4hSMTlZOBLxDvXohLKY617HHM32/G99HJlmFFvP4GA=="; }; }; - "@textlint/feature-flag-12.1.1" = { + "@textlint/feature-flag-12.2.1" = { name = "_at_textlint_slash_feature-flag"; packageName = "@textlint/feature-flag"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.1.1.tgz"; - sha512 = "NykyIJ7UCs3R1tjThAS6upScmZdia0N/prOT7j1HpMbn1QK61Kqz7M3KZb0T/nhko6jwfN0d3aNP3oMCb4Vyxg=="; + url = "https://registry.npmjs.org/@textlint/feature-flag/-/feature-flag-12.2.1.tgz"; + sha512 = "Vwn1VKaqNvhMteXNdvk+5duGzlG0MwSjkufU3AVaBQsS4SH4dchSvULpKc+r4BOTSzybNappN0APEcMjOx0Lxg=="; }; }; - "@textlint/fixer-formatter-12.1.1" = { + "@textlint/fixer-formatter-12.2.1" = { name = "_at_textlint_slash_fixer-formatter"; packageName = "@textlint/fixer-formatter"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.1.1.tgz"; - sha512 = "9+f3WG1raKqY+ynS1JS/ESLNgUaKK1gIgK9ENESvrJA0zfg5I774LjjJ65catrorTdv+HHDG40aiD67Pmxdk9A=="; + url = "https://registry.npmjs.org/@textlint/fixer-formatter/-/fixer-formatter-12.2.1.tgz"; + sha512 = "Y4FT2zVyYCxZCJ19tdfhBKr/FtCDP03iW+gfF6zHAjQaNPEGUU7ZfVUBJVVYBWOuHT/Zk22kcJZVFSINacPybQ=="; }; }; - "@textlint/kernel-12.1.1" = { + "@textlint/kernel-12.2.1" = { name = "_at_textlint_slash_kernel"; packageName = "@textlint/kernel"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.1.1.tgz"; - sha512 = "5f/miUMLBLUhBy0sJeLVs+34O3GaYyG7hAuTQG9p0ERUnXdJIGtoYU5O0Sfm+xWXPUOeQadK6E7IR+7fsX4Hhw=="; + url = "https://registry.npmjs.org/@textlint/kernel/-/kernel-12.2.1.tgz"; + sha512 = "imKBeglOKVwsVmrCDzIHf8uiYXtEy0VFyPPb7GYiLhA2pImh59QOtuoPiMT0h8ctV5Aa2konOQVV6jM+JJ9xkQ=="; }; }; - "@textlint/linter-formatter-12.1.1" = { + "@textlint/linter-formatter-12.2.1" = { name = "_at_textlint_slash_linter-formatter"; packageName = "@textlint/linter-formatter"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.1.1.tgz"; - sha512 = "yE4g+OA+jVqEpF5NayuFoH4l3vvXPT3+gGD9TYhkjBUGmIZ0n4sMzOtmb9R+McujvENwk+7jTZ0pfHtZtpVSHQ=="; + url = "https://registry.npmjs.org/@textlint/linter-formatter/-/linter-formatter-12.2.1.tgz"; + sha512 = "xfVRM+DRrJzBswzrYpmNDJDfapYyogOGlwOXb9Omc7/MvipVreG0WvtgSgxchJ+1nPJwsOPES8PAgQYcPR20+Q=="; }; }; - "@textlint/markdown-to-ast-12.1.1" = { + "@textlint/markdown-to-ast-12.2.1" = { name = "_at_textlint_slash_markdown-to-ast"; packageName = "@textlint/markdown-to-ast"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.1.1.tgz"; - sha512 = "TmqFyNqi68YpkqKabrkMlPzeSJMfY/+Wsv1/r43uDFgSYyM9GiD0eIpP12uKyL8xLW+rgfbqXxeFwSo26Conqw=="; + url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-12.2.1.tgz"; + sha512 = "p+LlVcrgHnSNEWWflYU412uu+v4Cejs6hmI4SgZCheNg4u7Ik78aKgpe4jT5BhjLSBZ/KP6IrJxtCUOoJIUWmQ=="; }; }; - "@textlint/module-interop-12.1.1" = { + "@textlint/module-interop-12.2.1" = { name = "_at_textlint_slash_module-interop"; packageName = "@textlint/module-interop"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.1.1.tgz"; - sha512 = "SiF2NVMFny7OdZ3I+qclJXkuPLOylJVd+v3mPGF8Ri5yuDgOKrbqNyHFzz/Sn2AS0ZsIf04/pGNBQhB+fJOBRQ=="; + url = "https://registry.npmjs.org/@textlint/module-interop/-/module-interop-12.2.1.tgz"; + sha512 = "/SixwKngWuTvVl9AArK4FEWGrNAwD7/ABvLCy/pdFprljnUa87P5JvSi7/v1PjpAXcnMQ2r04wDJjegs9oblBA=="; }; }; - "@textlint/source-code-fixer-12.1.1" = { + "@textlint/source-code-fixer-12.2.1" = { name = "_at_textlint_slash_source-code-fixer"; packageName = "@textlint/source-code-fixer"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.1.1.tgz"; - sha512 = "+p7NE5W2Ie+a5dSXGG0onDrqQM9Quj9t9zQruqxN3Qm7F8JD3qBTx9XNZkzQKlnGtrN4x6FUp5wwH/X4BhHh1A=="; + url = "https://registry.npmjs.org/@textlint/source-code-fixer/-/source-code-fixer-12.2.1.tgz"; + sha512 = "yNkWcTxCcoz24b64rGUVDr2MzQdv3I1o2o7HuphCmGlAQztVzMGvY/GNzqUWW42+k8S0zRq3Saxz1XoMUvR5UA=="; }; }; - "@textlint/text-to-ast-12.1.1" = { + "@textlint/text-to-ast-12.2.1" = { name = "_at_textlint_slash_text-to-ast"; packageName = "@textlint/text-to-ast"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.1.1.tgz"; - sha512 = "L+Wf6omQ9u/A+H8kr8Dv1bKQ7j5TeBJX7ShdZz+z0T3oOPDrpCHID6N/NbzuM+a1Q9s9UAG5gkqiROHNjXqUug=="; + url = "https://registry.npmjs.org/@textlint/text-to-ast/-/text-to-ast-12.2.1.tgz"; + sha512 = "NcuFa8iQglIMBQ1OaR1IYAIYJfBcTACVD0YtPGrdN0gkqC8TEfP5xIldiSxhkWiLPr3TQ4Mg7d6Ev5RH67n7pA=="; }; }; - "@textlint/textlint-plugin-markdown-12.1.1" = { + "@textlint/textlint-plugin-markdown-12.2.1" = { name = "_at_textlint_slash_textlint-plugin-markdown"; packageName = "@textlint/textlint-plugin-markdown"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.1.1.tgz"; - sha512 = "gzQ205ClqECTblIdkpFkWL6M4nxr5oMON/jU6xbRdZ/Shy+OHLY7fP3R2L2RmAmMSE7C6ZWK5Lk7k9XaaUpgVA=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-markdown/-/textlint-plugin-markdown-12.2.1.tgz"; + sha512 = "BAjkVPMO5fzf6n5M5SwgHNyTwByE86BmjaNpBDhKNcSBctUnfX7nLCvQY8mGMkvefHufyi3oWIqDcZoZQn0PYQ=="; }; }; - "@textlint/textlint-plugin-text-12.1.1" = { + "@textlint/textlint-plugin-text-12.2.1" = { name = "_at_textlint_slash_textlint-plugin-text"; packageName = "@textlint/textlint-plugin-text"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.1.1.tgz"; - sha512 = "U3WFM2fPy0ifC9lVW0GXjF5h1Dquit3rLO6UisC9UF75Ic6JjelcypjHwpp1trx0/t5FXp+94R5uJEpM360A0g=="; + url = "https://registry.npmjs.org/@textlint/textlint-plugin-text/-/textlint-plugin-text-12.2.1.tgz"; + sha512 = "8Dt1Sn9AdqvweVxCLvlj1IC+pDxPRpdgERY6FzD6kLNpMAyl7luVWtpql19CvTYlxhPUHRxsETDBkRCQFClXsw=="; }; }; - "@textlint/types-12.1.1" = { + "@textlint/types-12.2.1" = { name = "_at_textlint_slash_types"; packageName = "@textlint/types"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/types/-/types-12.1.1.tgz"; - sha512 = "s0TjnEwEwp3fa8yEhEH8w/lFpih15wtQy2CYaKx0eMScl1bSh+0e8WhiGZaTiiJXAGwNCw6erxB0reBScdU/hA=="; + url = "https://registry.npmjs.org/@textlint/types/-/types-12.2.1.tgz"; + sha512 = "nOQ3udAz9ulDZgETFY3vr3R+ubL2cevPLA3GmDs29ErvIHfK3pD+PpyO/OsS7HZKXolmpuMonVA9+J9Jybf3/Q=="; }; }; - "@textlint/utils-12.1.1" = { + "@textlint/utils-12.2.1" = { name = "_at_textlint_slash_utils"; packageName = "@textlint/utils"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.1.1.tgz"; - sha512 = "ENAm6ro+OAh6XZZSeZIJQCrY07IHWB7DGM6SwtKEfxcA9joF1uS/sLPqKmcW9fyvLvMnloVUsfVlaoNsLJXDKA=="; + url = "https://registry.npmjs.org/@textlint/utils/-/utils-12.2.1.tgz"; + sha512 = "e4jDM6bMZddFi48e5CzbvnG9ombeK2ZkjLnCaSWalJI3NTlCDm/ZDqfaqac/YPFbzoRQMqNkaoTW/9GZVjr6Hg=="; }; }; "@tokenizer/token-0.1.1" = { @@ -8761,6 +9067,15 @@ let sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; }; }; + "@ts-morph/common-0.11.1" = { + name = "_at_ts-morph_slash_common"; + packageName = "@ts-morph/common"; + version = "0.11.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@ts-morph/common/-/common-0.11.1.tgz"; + sha512 = "7hWZS0NRpEsNV8vWJzg7FEz6V8MaLNeJOmwmghqUXTpzk16V1LLZhdo+4QvE/+zv4cVci0OviuJFnqhEfoV3+g=="; + }; + }; "@tsconfig/node10-1.0.9" = { name = "_at_tsconfig_slash_node10"; packageName = "@tsconfig/node10"; @@ -8869,15 +9184,6 @@ let sha512 = "QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA=="; }; }; - "@types/body-parser-1.19.0" = { - name = "_at_types_slash_body-parser"; - packageName = "@types/body-parser"; - version = "1.19.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz"; - sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; - }; - }; "@types/body-parser-1.19.1" = { name = "_at_types_slash_body-parser"; packageName = "@types/body-parser"; @@ -8905,15 +9211,6 @@ let sha512 = "p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw=="; }; }; - "@types/busboy-0.3.2" = { - name = "_at_types_slash_busboy"; - packageName = "@types/busboy"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/busboy/-/busboy-0.3.2.tgz"; - sha512 = "iEvdm9Z9KdSs/ozuh1Z7ZsXrOl8F4M/CLMXPZHr3QuJ4d6Bjn+HBMC5EMKpwpAo8oi8iK9GZfFoHaIMrrZgwVw=="; - }; - }; "@types/cacheable-request-6.0.2" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -8995,15 +9292,6 @@ let sha512 = "h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw=="; }; }; - "@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"; @@ -9022,24 +9310,6 @@ let sha512 = "t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog=="; }; }; - "@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.10" = { - name = "_at_types_slash_cors"; - packageName = "@types/cors"; - version = "2.8.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz"; - sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; - }; - }; "@types/cors-2.8.12" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; @@ -9121,22 +9391,22 @@ let sha512 = "VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng=="; }; }; - "@types/eslint-8.4.3" = { + "@types/eslint-8.4.5" = { name = "_at_types_slash_eslint"; packageName = "@types/eslint"; - version = "8.4.3"; + version = "8.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.3.tgz"; - sha512 = "YP1S7YJRMPs+7KZKDb9G63n8YejIwW9BALq7a5j2+H4yl6iOv9CB29edho+cuFRrvmJbbaH2yiVChKLJVysDGw=="; + url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz"; + sha512 = "dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ=="; }; }; - "@types/eslint-scope-3.7.3" = { + "@types/eslint-scope-3.7.4" = { name = "_at_types_slash_eslint-scope"; packageName = "@types/eslint-scope"; - version = "3.7.3"; + version = "3.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.3.tgz"; - sha512 = "PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g=="; + url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"; + sha512 = "9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA=="; }; }; "@types/estree-0.0.50" = { @@ -9157,6 +9427,15 @@ let sha512 = "CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ=="; }; }; + "@types/estree-1.0.0" = { + name = "_at_types_slash_estree"; + packageName = "@types/estree"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz"; + sha512 = "WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ=="; + }; + }; "@types/estree-jsx-0.0.1" = { name = "_at_types_slash_estree-jsx"; packageName = "@types/estree-jsx"; @@ -9166,6 +9445,15 @@ let sha512 = "gcLAYiMfQklDCPjQegGn0TBAn9it05ISEsEhlKQUddIk7o2XDokOcTN7HBO8tznM0D9dGezvHEfRZBfZf6me0A=="; }; }; + "@types/estree-jsx-1.0.0" = { + name = "_at_types_slash_estree-jsx"; + packageName = "@types/estree-jsx"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/estree-jsx/-/estree-jsx-1.0.0.tgz"; + sha512 = "3qvGd0z8F2ENTGr/GG1yViqfiKmRfrXVx5sJyHGFu3z7m5g5utCQtGp/g29JnjflhtQJBv1WDQukHiT58xPcYQ=="; + }; + }; "@types/expect-1.20.4" = { name = "_at_types_slash_expect"; packageName = "@types/expect"; @@ -9193,6 +9481,15 @@ let sha512 = "uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q=="; }; }; + "@types/express-serve-static-core-4.17.30" = { + name = "_at_types_slash_express-serve-static-core"; + packageName = "@types/express-serve-static-core"; + version = "4.17.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz"; + sha512 = "gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ=="; + }; + }; "@types/file-type-10.9.1" = { name = "_at_types_slash_file-type"; packageName = "@types/file-type"; @@ -9202,15 +9499,6 @@ let sha512 = "oq0fy8Jqj19HofanFsZ56o5anMDUQtFO9B3wfLqM9o42RyCe1WT+wRbSvRbL2l8ARZXNaJturHk0b442+0yi+g=="; }; }; - "@types/fs-capacitor-2.0.0" = { - name = "_at_types_slash_fs-capacitor"; - packageName = "@types/fs-capacitor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz"; - sha512 = "FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ=="; - }; - }; "@types/fs-extra-9.0.13" = { name = "_at_types_slash_fs-extra"; packageName = "@types/fs-extra"; @@ -9220,13 +9508,13 @@ let sha512 = "nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA=="; }; }; - "@types/geojson-7946.0.8" = { + "@types/geojson-7946.0.10" = { name = "_at_types_slash_geojson"; packageName = "@types/geojson"; - version = "7946.0.8"; + version = "7946.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz"; - sha512 = "1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA=="; + url = "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz"; + sha512 = "Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="; }; }; "@types/get-stdin-5.0.1" = { @@ -9274,15 +9562,6 @@ let sha512 = "h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w=="; }; }; - "@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-cache-semantics-4.0.1" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; @@ -9292,15 +9571,6 @@ let sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; }; - "@types/http-errors-1.8.2" = { - name = "_at_types_slash_http-errors"; - packageName = "@types/http-errors"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-1.8.2.tgz"; - sha512 = "EqX+YQxINb+MeXaIqYDASb6U6FCHbWjkj4a1CKDBks3d/QiB2+PqBLyO72vLDgAO1wUI4O+9gweRcQK11bTL/w=="; - }; - }; "@types/http-proxy-1.17.9" = { name = "_at_types_slash_http-proxy"; packageName = "@types/http-proxy"; @@ -9463,15 +9733,6 @@ let sha512 = "dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="; }; }; - "@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/keyv-3.1.4" = { name = "_at_types_slash_keyv"; packageName = "@types/keyv"; @@ -9481,24 +9742,6 @@ let sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/koa-2.13.4" = { - name = "_at_types_slash_koa"; - packageName = "@types/koa"; - version = "2.13.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.13.4.tgz"; - sha512 = "dfHYMfU+z/vKtQB7NUrthdAEiSvnLebvBjwHtfFmpZmB7em2N3WVQdHgnFq+xvyVgxW5jKDmjWfLD3lw4g4uTw=="; - }; - }; - "@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/linkify-it-3.0.2" = { name = "_at_types_slash_linkify-it"; packageName = "@types/linkify-it"; @@ -9580,13 +9823,13 @@ let sha512 = "eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA=="; }; }; - "@types/mime-1.3.2" = { + "@types/mime-3.0.0" = { name = "_at_types_slash_mime"; packageName = "@types/mime"; - version = "1.3.2"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.2.tgz"; - sha512 = "YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw=="; + url = "https://registry.npmjs.org/@types/mime/-/mime-3.0.0.tgz"; + sha512 = "fccbsHKqFDXClBZTDLA43zl0+TbxyIwyzIzwwhvoJvhNjOErCdeX2xJbURimv2EbSVUGav001PaCJg4mZxMl4w=="; }; }; "@types/mime-types-2.1.1" = { @@ -9733,13 +9976,13 @@ let sha512 = "USUftMYpmuMzeWobskoPfzDi+vkpe0dvcOBRNOscFrGxVp4jomnRxWuVohgqBow2xyIPC0S3gjxV/5079jhmDg=="; }; }; - "@types/node-14.18.21" = { + "@types/node-14.18.23" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.18.21"; + version = "14.18.23"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.18.21.tgz"; - sha512 = "x5W9s+8P4XteaxT/jKF0PSb7XEvo5VmqEWgsMlyeY4ZlLK8I6aH6g5TPPyDlLAep+GYf4kefb7HFyc7PAO3m+Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.23.tgz"; + sha512 = "MhbCWN18R4GhO8ewQWAFK4TGQdBpXWByukz7cWyJmXhvRuCIaM/oWytGPqVmDzgEnnaIc9ss6HbU5mUi+vyZPA=="; }; }; "@types/node-15.14.9" = { @@ -9751,13 +9994,13 @@ let sha512 = "qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A=="; }; }; - "@types/node-16.11.41" = { + "@types/node-16.11.47" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.41"; + version = "16.11.47"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.41.tgz"; - sha512 = "mqoYK2TnVjdkGk8qXAVGc/x9nSaTpSrFaGFm43BUH3IdoBV0nta6hYaGmdOvIMlbHJbUEVen3gvwpwovAZKNdQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.47.tgz"; + sha512 = "fpP+jk2zJ4VW66+wAMFoBJlx1bxmBKx4DUFf68UHgdGCOuyUTDlLWqsaNPJh7xhNDykyJ9eIzAygilP/4WoN8g=="; }; }; "@types/node-16.11.6" = { @@ -9805,13 +10048,13 @@ let sha512 = "w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw=="; }; }; - "@types/node-18.0.0" = { + "@types/node-18.6.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "18.0.0"; + version = "18.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-18.0.0.tgz"; - sha512 = "cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.6.3.tgz"; + sha512 = "6qKpDtoaYLM+5+AFChLhHermMQxc3TOEFIDzrZLPRGHPrLEwqFkkT5Kx3ju05g6X7uDPazz3jHbKPX0KzCjntg=="; }; }; "@types/node-6.14.13" = { @@ -9832,15 +10075,6 @@ let sha512 = "tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw=="; }; }; - "@types/node-9.6.61" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "9.6.61"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.61.tgz"; - sha512 = "/aKAdg5c8n468cYLy2eQrcR5k6chlbNwZNGUj3TboyPa2hcO2QAJcfymlqPzMiRj8B6nYKXjzQz36minFE0RwQ=="; - }; - }; "@types/node-fetch-2.6.2" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; @@ -9967,13 +10201,13 @@ let sha512 = "+TRLFmHLnpoV0uw4O/PzqMbPT6bhQM0q2KO0l+R7M3sHYRndPpNL6kv8p7Ee9ZxgQ6noYB18/t+heQi7eijOHA=="; }; }; - "@types/react-17.0.47" = { + "@types/react-17.0.48" = { name = "_at_types_slash_react"; packageName = "@types/react"; - version = "17.0.47"; + version = "17.0.48"; src = fetchurl { - url = "https://registry.npmjs.org/@types/react/-/react-17.0.47.tgz"; - sha512 = "mk0BL8zBinf2ozNr3qPnlu1oyVTYq+4V7WA76RgxUAtf0Em/Wbid38KN6n4abEkvO4xMTBWmnP1FtQzgkEiJoA=="; + url = "https://registry.npmjs.org/@types/react/-/react-17.0.48.tgz"; + sha512 = "zJ6IYlJ8cYYxiJfUaZOQee4lh99mFihBoqkOSEGV+dFi9leROW6+PgstzQ+w3gWTnUfskALtQPGHK6dYmPj+2A=="; }; }; "@types/react-dom-17.0.17" = { @@ -10075,13 +10309,13 @@ let sha512 = "d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg=="; }; }; - "@types/serve-static-1.13.10" = { + "@types/serve-static-1.15.0" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.10"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.10.tgz"; - sha512 = "nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"; + sha512 = "z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg=="; }; }; "@types/sizzle-2.3.3" = { @@ -10309,13 +10543,13 @@ let sha512 = "ZfJck4M7nrGasfs4A4YbUoxis3Vu24cETw3DERsNYtDZmYSYtk6ljKexKFKhImO/ZmY6ZMsmegu2FPkXoUFImA=="; }; }; - "@types/vscode-1.68.0" = { + "@types/vscode-1.69.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.68.0"; + version = "1.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.68.0.tgz"; - sha512 = "duBwEK5ta/eBBMJMQ7ECMEsMvlE3XJdRGh3xoS1uOO4jl2Z4LPBl5vx8WvBP10ERAgDRmIt/FaSD4RHyBGbChw=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.69.0.tgz"; + sha512 = "RlzDAnGqUoo9wS6d4tthNyAdZLxOIddLiX3djMoWk29jFfSA1yJbIwr0epBYqqYarWB6s2Z+4VaZCQ80Jaa3kA=="; }; }; "@types/webidl-conversions-6.1.1" = { @@ -10372,13 +10606,13 @@ let sha512 = "B5m9aq7cbbD/5/jThEr33nUY8WEfVi6A2YKCTOvw5Ldy7mtsOkqRvGjnzy6g7iMMDsgu7xREuCzqATLDLQVKcQ=="; }; }; - "@types/whatwg-url-8.2.1" = { + "@types/whatwg-url-8.2.2" = { name = "_at_types_slash_whatwg-url"; packageName = "@types/whatwg-url"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.1.tgz"; - sha512 = "2YubE1sjj5ifxievI5Ge1sckb9k/Er66HyR2c+3+I6VDUUg1TLPdYYTEbQ+DjRkS4nTxMJhgWfSfMRD2sl2EYQ=="; + url = "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-8.2.2.tgz"; + sha512 = "FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA=="; }; }; "@types/which-2.0.1" = { @@ -10399,15 +10633,6 @@ let sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; }; }; - "@types/ws-7.4.7" = { - name = "_at_types_slash_ws"; - packageName = "@types/ws"; - version = "7.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-7.4.7.tgz"; - sha512 = "JQbbmxZTZehdc2iszGKs5oC3NFnjeay7mtAWrdt7qNtAVK0g19muApzAy4bm9byz79xa2ZnO/BOBC2R8RC5Lww=="; - }; - }; "@types/ws-8.5.3" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; @@ -10453,15 +10678,6 @@ let sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; }; }; - "@types/yauzl-2.9.2" = { - name = "_at_types_slash_yauzl"; - packageName = "@types/yauzl"; - version = "2.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz"; - sha512 = "8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA=="; - }; - }; "@types/yoga-layout-1.9.2" = { name = "_at_types_slash_yoga-layout"; packageName = "@types/yoga-layout"; @@ -10480,13 +10696,13 @@ let sha512 = "aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg=="; }; }; - "@typescript-eslint/eslint-plugin-5.29.0" = { + "@typescript-eslint/eslint-plugin-5.32.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.29.0"; + version = "5.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz"; - sha512 = "kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.32.0.tgz"; + sha512 = "CHLuz5Uz7bHP2WgVlvoZGhf0BvFakBJKAD/43Ty0emn4wXWv5k01ND0C0fHcl/Im8Td2y/7h44E9pca9qAu2ew=="; }; }; "@typescript-eslint/experimental-utils-4.33.0" = { @@ -10507,13 +10723,13 @@ let sha512 = "ZohdsbXadjGBSK0/r+d87X0SBmKzOq4/S5nzK6SBgJspFo9/CUDJ7hjayuze+JK7CZQLDMroqytp7pOcFKTxZA=="; }; }; - "@typescript-eslint/parser-5.29.0" = { + "@typescript-eslint/parser-5.32.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.29.0"; + version = "5.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz"; - sha512 = "ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.32.0.tgz"; + sha512 = "IxRtsehdGV9GFQ35IGm5oKKR2OGcazUoiNBxhRV160iF9FoyuXxjY+rIqs1gfnd+4eL98OjeGnMpE7RF/NBb3A=="; }; }; "@typescript-eslint/scope-manager-4.33.0" = { @@ -10525,22 +10741,22 @@ let sha512 = "5IfJHpgTsTZuONKbODctL4kKuQje/bzBRkwHE8UOZ4f89Zeddg+EGZs8PD8NcN4LdM3ygHWYB3ukPAYjvl/qbQ=="; }; }; - "@typescript-eslint/scope-manager-5.29.0" = { + "@typescript-eslint/scope-manager-5.32.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.29.0"; + version = "5.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz"; - sha512 = "etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.32.0.tgz"; + sha512 = "KyAE+tUON0D7tNz92p1uetRqVJiiAkeluvwvZOqBmW9z2XApmk5WSMV9FrzOroAcVxJZB3GfUwVKr98Dr/OjOg=="; }; }; - "@typescript-eslint/type-utils-5.29.0" = { + "@typescript-eslint/type-utils-5.32.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.29.0"; + version = "5.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz"; - sha512 = "JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.32.0.tgz"; + sha512 = "0gSsIhFDduBz3QcHJIp3qRCvVYbqzHg8D6bHFsDMrm0rURYDj+skBK2zmYebdCp+4nrd9VWd13egvhYFJj/wZg=="; }; }; "@typescript-eslint/types-3.10.1" = { @@ -10561,13 +10777,13 @@ let sha512 = "zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ=="; }; }; - "@typescript-eslint/types-5.29.0" = { + "@typescript-eslint/types-5.32.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.29.0"; + version = "5.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz"; - sha512 = "X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.32.0.tgz"; + sha512 = "EBUKs68DOcT/EjGfzywp+f8wG9Zw6gj6BjWu7KV/IYllqKJFPlZlLSYw/PTvVyiRw50t6wVbgv4p9uE2h6sZrQ=="; }; }; "@typescript-eslint/typescript-estree-3.10.1" = { @@ -10588,22 +10804,22 @@ let sha512 = "rkWRY1MPFzjwnEVHsxGemDzqqddw2QbTJlICPD9p9I9LfsO8fdmfQPOX3uKfUaGRDFJbfrtm/sXhVXN4E+bzCA=="; }; }; - "@typescript-eslint/typescript-estree-5.29.0" = { + "@typescript-eslint/typescript-estree-5.32.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.29.0"; + version = "5.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz"; - sha512 = "mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.32.0.tgz"; + sha512 = "ZVAUkvPk3ITGtCLU5J4atCw9RTxK+SRc6hXqLtllC2sGSeMFWN+YwbiJR9CFrSFJ3w4SJfcWtDwNb/DmUIHdhg=="; }; }; - "@typescript-eslint/utils-5.29.0" = { + "@typescript-eslint/utils-5.32.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.29.0"; + version = "5.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz"; - sha512 = "3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.32.0.tgz"; + sha512 = "W7lYIAI5Zlc5K082dGR27Fczjb3Q57ECcXefKU/f0ajM5ToM0P+N9NmJWip8GmGu/g6QISNT+K6KYB+iSHjXCQ=="; }; }; "@typescript-eslint/visitor-keys-3.10.1" = { @@ -10624,13 +10840,13 @@ let sha512 = "uqi/2aSz9g2ftcHWf8uLPJA70rUv6yuMW5Bohw+bwcuzaxQIHaKFZCKGoGXIrc9vkTJ3+0txM73K0Hq3d5wgIg=="; }; }; - "@typescript-eslint/visitor-keys-5.29.0" = { + "@typescript-eslint/visitor-keys-5.32.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.29.0"; + version = "5.32.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz"; - sha512 = "Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.32.0.tgz"; + sha512 = "S54xOHZgfThiZ38/ZGTgB2rqx51CMJ5MCfVT2IplK4Q7hgzGfe0nLzLCcenDnc/cSjP568hdeKfeDcBgqNHD/g=="; }; }; "@ungap/promise-all-settled-1.1.2" = { @@ -10642,13 +10858,13 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; - "@unicode/unicode-14.0.0-1.2.2" = { + "@unicode/unicode-14.0.0-1.3.0" = { name = "_at_unicode_slash_unicode-14.0.0"; packageName = "@unicode/unicode-14.0.0"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@unicode/unicode-14.0.0/-/unicode-14.0.0-1.2.2.tgz"; - sha512 = "NMs5JhYXGojBQJNJ7DumqktgRqs95Qt1cj6JMPz8lKBfHYRTRn7Am4CdyX/hS1zTn1lKwsWXBpMP9Hp0nelINg=="; + url = "https://registry.npmjs.org/@unicode/unicode-14.0.0/-/unicode-14.0.0-1.3.0.tgz"; + sha512 = "hZi0iPeyg9cuy+NBTYVLTTBNe2aAiJvnD6S0tednypIevWqp4+osyan1xtDENKRINpzBolmm5Wl344yYN4MxuQ=="; }; }; "@uphold/request-logger-2.0.0" = { @@ -10660,49 +10876,58 @@ let sha512 = "UvGS+v87C7VTtQDcFHDLfvfl1zaZaLSwSmAnV35Ne7CzAVvotmZqt9lAIoNpMpaoRpdjVIcnUDwPSeIeA//EoQ=="; }; }; - "@vercel/build-utils-4.1.0" = { + "@vercel/build-utils-5.0.8" = { name = "_at_vercel_slash_build-utils"; packageName = "@vercel/build-utils"; - version = "4.1.0"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-4.1.0.tgz"; - sha512 = "Dma7JbyHlZ1X/mJG2odK499xJuf5KJULzSAj+RNflBNe2S13IwJw3pw/LCLrP3dMxSbFrU4/ysCiTX9BTmzjHw=="; + url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-5.0.8.tgz"; + sha512 = "tEztOwICqI4ME+xmooOmWumJfaOXHb097Te8Y7bfYsh5YfNbO3XYpvgXT0HuOo6pnrMjgm5OIPyhT3DoSkfrrA=="; }; }; - "@vercel/go-2.0.1" = { + "@vercel/go-2.0.12" = { name = "_at_vercel_slash_go"; packageName = "@vercel/go"; - version = "2.0.1"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/go/-/go-2.0.1.tgz"; - sha512 = "cmCoiLu+Z0zRaH8/79d0gN940q6ojnEm/pE4rAfvLMvjDE+K/ltimE1ZgM6KupAb7z1knYud1T+fLJ4CSmGXig=="; + url = "https://registry.npmjs.org/@vercel/go/-/go-2.0.12.tgz"; + sha512 = "Ificp8qFKJqojvZBsptWN0GhcbARAaW4GshJHXJtxgPNxh6nfpN0dzid9FUSkhKVhNYlSbERnKalTGXJ5mAGKQ=="; }; }; - "@vercel/next-3.0.1" = { + "@vercel/hydrogen-0.0.9" = { + name = "_at_vercel_slash_hydrogen"; + packageName = "@vercel/hydrogen"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-0.0.9.tgz"; + sha512 = "9IhMBIMD0yzH9kcUYeKWKuyBi+GXZTfiruCXPFOBSTxyDaAtrUoKPDjL0t8xH0ZOv/LVsv1m3M43CkuvIxOG3w=="; + }; + }; + "@vercel/next-3.1.12" = { name = "_at_vercel_slash_next"; packageName = "@vercel/next"; - version = "3.0.1"; + version = "3.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/next/-/next-3.0.1.tgz"; - sha512 = "A4JGh2gj//Yn2E8IfhaDwJ5n5zwQ6QtqeUn2o9KlrSr3gJJ3dv3fafsDgSW3wHMs/p/ifVEdB034XBofGSe4xA=="; + url = "https://registry.npmjs.org/@vercel/next/-/next-3.1.12.tgz"; + sha512 = "p7dsJv3EMqW+uiePqp8vVbA917uR6zaH5YcwrofzesWUMvTJBtBINFxLv3C/R/FoodJmx8NrQJfEuaHyFTvGKQ=="; }; }; - "@vercel/nft-0.19.1" = { + "@vercel/nft-0.21.0" = { name = "_at_vercel_slash_nft"; packageName = "@vercel/nft"; - version = "0.19.1"; + version = "0.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.19.1.tgz"; - sha512 = "klR5oN7S3WJsZz0r6Xsq7o8YlFEyU3/00VmlpZzIPVFzKfbcEjXo/sVR5lQBUqNKuOzhcbxaFtzW9aOyHjmPYA=="; + url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.21.0.tgz"; + sha512 = "hFCAETfI5cG8l5iAiLhMC2bReC5K7SIybzrxGorv+eGspIbIFsVw7Vg85GovXm/LxA08pIDrAlrhR6GN36XB/Q=="; }; }; - "@vercel/node-2.1.0" = { + "@vercel/node-2.5.3" = { name = "_at_vercel_slash_node"; packageName = "@vercel/node"; - version = "2.1.0"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/node/-/node-2.1.0.tgz"; - sha512 = "CqZo0gQj6BAxad358KFTIkcwdd+Onp7O4Nnj2QzdaUOcrMmgUEV7XR8LIrCz0knVawl2DZMDXdLjdknW4e8rQw=="; + url = "https://registry.npmjs.org/@vercel/node/-/node-2.5.3.tgz"; + sha512 = "Y+ilGSzKZMif+4uLbS/WS45m0YQIvLEj/LZOrYBhXKMFb6u03eWqi2stu1WNg3DiGCyLz4ctLy59hc8hbk88dw=="; }; }; "@vercel/node-bridge-3.0.0" = { @@ -10714,58 +10939,67 @@ let sha512 = "TNQK6cufwrhd8ASDk5YHHenH8Xhp9sY8xUjOTKnQQI37KLk+Sw2HlHhT5rzUFN23ahosUlkY8InwtYUmSNb9kw=="; }; }; - "@vercel/python-3.0.1" = { + "@vercel/python-3.1.4" = { name = "_at_vercel_slash_python"; packageName = "@vercel/python"; - version = "3.0.1"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/python/-/python-3.0.1.tgz"; - sha512 = "+AGxY78UITOoqudbgMLOP4MFO6+IlQK+NKa51msi59P+PnpDFpVXGdooscliGRDO4QoRq70+ZUdkv10RYv0Gmg=="; + url = "https://registry.npmjs.org/@vercel/python/-/python-3.1.4.tgz"; + sha512 = "u4T+oNK4VSFl1fmCbGTx02JUFVjGA7vM/iQHkMbwMkuGGAg4iXdI4q1IZrJDgn/EwoZst8pUJvh55klBrqInWg=="; }; }; - "@vercel/redwood-1.0.1" = { + "@vercel/redwood-1.0.13" = { name = "_at_vercel_slash_redwood"; packageName = "@vercel/redwood"; - version = "1.0.1"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.1.tgz"; - sha512 = "23EIaukLbicVB4XOtqogXsqiAkvtitYbYGdjAIKyOFYyrjPpX5hLNBsM0pSPDhZDgCdrs4TzEkNOIk4TwpkGyg=="; + url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-1.0.13.tgz"; + sha512 = "K3qQFj3gNuISu8Jp/m2vAOa24M7oHiy9lMqN5Fr/IVPSKIRoEXESGw9PGRFzRMyZ1qr5PgB6HpRrJzU+NdjCHw=="; }; }; - "@vercel/remix-1.0.1" = { + "@vercel/remix-1.0.14" = { name = "_at_vercel_slash_remix"; packageName = "@vercel/remix"; - version = "1.0.1"; + version = "1.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.0.1.tgz"; - sha512 = "pmVJcaQWufX3aeWvyH2pE9Ry0OLLCmtDMWO6YJSQbiq29F9+pq88xENcL1wRWCShLFFrmRb1tKOCCAV0bgiVUg=="; + url = "https://registry.npmjs.org/@vercel/remix/-/remix-1.0.14.tgz"; + sha512 = "l/nqIGymeTI3S6Oi8f5nSyaTdWENVaoEmWX9k6uPhEj0saADtxFQ/eZHCMUcxGo2iyO7L2+IK/hT3wPtbpUb2Q=="; }; }; - "@vercel/routing-utils-1.13.4" = { + "@vercel/routing-utils-2.0.0" = { name = "_at_vercel_slash_routing-utils"; packageName = "@vercel/routing-utils"; - version = "1.13.4"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/routing-utils/-/routing-utils-1.13.4.tgz"; - sha512 = "ifrNFfIjGF8pSHOXB6BPUWLhG6/ZjRIdSUMrFLhBzrPj4yHelafqNSVTN70V1VHFNrr3OJscimc9EdwzOtiHzQ=="; + url = "https://registry.npmjs.org/@vercel/routing-utils/-/routing-utils-2.0.0.tgz"; + sha512 = "laDhH96e+IzU6GnufS5QZ3YvfqA4h5bw8j+k7+t7wPzRjtDhHDfbI45MypVWbVul7BhEZTaHztnzR0zo/YiFMw=="; }; }; - "@vercel/ruby-1.3.9" = { + "@vercel/ruby-1.3.20" = { name = "_at_vercel_slash_ruby"; packageName = "@vercel/ruby"; - version = "1.3.9"; + version = "1.3.20"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.9.tgz"; - sha512 = "WjZRHBMlVAtEfgEh9ReLCJ3hbB6o+zqER0XNhxGwYzlphwCGRBhKHOdNB5eK49QMrafesHenKkDV4Asbd4TCsg=="; + url = "https://registry.npmjs.org/@vercel/ruby/-/ruby-1.3.20.tgz"; + sha512 = "8ubXYs1TaBJHIESNB9UPifScyk1DXxl7d6gaDnbQ/57iqG330ZUrHZef+3tpM7ZRd8linWIlPjJlkQ6jb3cRMQ=="; }; }; - "@vercel/static-build-1.0.1" = { + "@vercel/static-build-1.0.13" = { name = "_at_vercel_slash_static-build"; packageName = "@vercel/static-build"; - version = "1.0.1"; + version = "1.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.0.1.tgz"; - sha512 = "6Gbtbdabse+9rvGKjK6G9mmRVw4hIzSTeEXRaGEvW2f2hRD6jAzw3RLMA66R+olaxzsqz404oUL0WgILMd67nQ=="; + url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-1.0.13.tgz"; + sha512 = "Xa+9ZbQfLYjlCKYFqFk/VjcKe6LE0cMy7tiOBOXBJqWbT28ESC4jtokM+OnXbcl+CN6M8CPPPhdyA0Y5x4UZFw=="; + }; + }; + "@vercel/static-config-2.0.1" = { + name = "_at_vercel_slash_static-config"; + packageName = "@vercel/static-config"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@vercel/static-config/-/static-config-2.0.1.tgz"; + sha512 = "J3l3H0iE6FC0KHIlkY1Em291uwWmW22QIN8Cb8nLo9P5BW6a3r0kypmk86UGEWhfWxzt4Hnmb+6JEwkVNnv8/Q=="; }; }; "@vscode/emmet-helper-2.8.4" = { @@ -10777,22 +11011,22 @@ let sha512 = "lUki5QLS47bz/U8IlG9VQ+1lfxMtxMZENmU5nu4Z71eOD5j9FK0SmYGL5NiVJg9WBWeAU0VxRADMY2Qpq7BfVg=="; }; }; - "@vscode/test-electron-2.1.4" = { + "@vscode/test-electron-2.1.5" = { name = "_at_vscode_slash_test-electron"; packageName = "@vscode/test-electron"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.1.4.tgz"; - sha512 = "tHHAWNVwl8C7nyezHAHdNPWkksdXWvmae6bt4k1tJ9hvMm6QIIk95Mkutl82XHcD60mdP46EHDGU+xFsAvygOQ=="; + url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.1.5.tgz"; + sha512 = "O/ioqFpV+RvKbRykX2ItYPnbcZ4Hk5V0rY4uhQjQTLhGL9WZUvS7exzuYQCCI+ilSqJpctvxq2llTfGXf9UnnA=="; }; }; - "@vue/cli-overlay-4.5.18" = { + "@vue/cli-overlay-4.5.19" = { name = "_at_vue_slash_cli-overlay"; packageName = "@vue/cli-overlay"; - version = "4.5.18"; + version = "4.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.5.18.tgz"; - sha512 = "PZW6WRbmWx/I+PaP7PdjZGscvtUiIq/pRU38p3GLKMl53InBer12549CEAhPicAF5c38gBzGu/ifoPSvlPSZyg=="; + url = "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-4.5.19.tgz"; + sha512 = "GdxvNSmOw7NHIazCO8gTK+xZbaOmScTtxj6eHVeMbYpDYVPJ+th3VMLWNpw/b6uOjwzzcyKlA5dRQ1DAb+gF/g=="; }; }; "@vue/cli-plugin-eslint-4.5.12" = { @@ -10804,13 +11038,13 @@ let sha512 = "nbjGJkWxo/xdD32DwvnEAUwkWYsObpqNk9NuU7T62ehdzHPzz58o3j03YZ7a7T7Le8bYyOWMYsdNfz63F+XiZQ=="; }; }; - "@vue/cli-plugin-router-4.5.18" = { + "@vue/cli-plugin-router-4.5.19" = { name = "_at_vue_slash_cli-plugin-router"; packageName = "@vue/cli-plugin-router"; - version = "4.5.18"; + version = "4.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.18.tgz"; - sha512 = "J2SJpi7OKy6NE5yUz7eubTnzc+k2LHEcI+c0W8i4UoUumIVSkAgvKWZPFqoy/QIqnQpwW/75CUjpLGf6Fht2wQ=="; + url = "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-4.5.19.tgz"; + sha512 = "3icGzH1IbVYmMMsOwYa0lal/gtvZLebFXdE5hcQJo2mnTwngXGMTyYAzL56EgHBPjbMmRpyj6Iw9k4aVInVX6A=="; }; }; "@vue/cli-plugin-typescript-4.5.13" = { @@ -10840,49 +11074,49 @@ let sha512 = "CKAZN4iokMMsaUyJRU22oUAz3oS/X9sVBSKAF2/shFBV5xh3jqAlKl8OXZYz4cXGFLA6djNuYrniuLAo7Ku97A=="; }; }; - "@vue/cli-shared-utils-4.5.18" = { + "@vue/cli-shared-utils-4.5.19" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.18"; + version = "4.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.18.tgz"; - sha512 = "rYX8watG/+SFmkedXMZ3hJP+26/bz80f9zG9dMUfBMqTAqIDGICDtuP4H4QXZL3PCKI/HWFCMhRWf2wO4eGEPg=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.19.tgz"; + sha512 = "JYpdsrC/d9elerKxbEUtmSSU6QRM60rirVubOewECHkBHj+tLNznWq/EhCjswywtePyLaMUK25eTqnTSZlEE+g=="; }; }; - "@vue/cli-shared-utils-5.0.6" = { + "@vue/cli-shared-utils-5.0.8" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "5.0.6"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.6.tgz"; - sha512 = "5HmlRtMByOCFO0P3mMUx8dVruTRhZ3pqQ0f1cCH9TmAoDjetmD/Ib7yx/5KxTHV8QY3xZJxYvgAmOU5C49K5xA=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz"; + sha512 = "uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ=="; }; }; - "@vue/cli-ui-5.0.6" = { + "@vue/cli-ui-5.0.8" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "5.0.6"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-5.0.6.tgz"; - sha512 = "FiqRfA0zy53OikLRW9cz00+DXhRjaRRAoRSa5TPBJt8ZwYNdBOwKMw3jssKCrl97Ye4lK5/qE0Y3UGb+gDIHUw=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-5.0.8.tgz"; + sha512 = "1eyL1h1T3LVejYplDqERO8TK03sjR3QTOTHa01ABreCdqFTZItiUVud34uEcuoZ6Gi69xdl+LSx6Hvo4t9tfrA=="; }; }; - "@vue/cli-ui-addon-webpack-5.0.6" = { + "@vue/cli-ui-addon-webpack-5.0.8" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "5.0.6"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-5.0.6.tgz"; - sha512 = "rkVVTlzo2vqQJZCfcF9LVM1m1KU6p4HAJ0D/1I786uusOp45pfIptymCBqIgp8w7CzjlEkaRs8TgGrjMk3L6PQ=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-5.0.8.tgz"; + sha512 = "sg+3a9vHGzpFRrv7MVZRQ9oDztFN9Mvx0MleidKyPIAWMSOskSQT8zTngy8bEyXjXwNv6mCn2jvUR/tgbldyow=="; }; }; - "@vue/cli-ui-addon-widgets-5.0.6" = { + "@vue/cli-ui-addon-widgets-5.0.8" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "5.0.6"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-5.0.6.tgz"; - sha512 = "ZhRO1RIA/oNeEJfrLWcwX2pXvc3ohMtDeLHkxDFKDtqafgwrww9wr+Gdg4ZLFY6ldmfurU9/vHPmowTBHx2O+Q=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-5.0.8.tgz"; + sha512 = "jNYQ+3z7HDZ3IR3Z3Dlo3yOPbHexpygkn2IJ7sjA62oGolnNWeF7kvpLwni18l8N5InhS66m9w31an1Fs5pCZA=="; }; }; "@vue/compiler-core-3.2.37" = { @@ -10903,22 +11137,13 @@ let sha512 = "yxJLH167fucHKxaqXpYk7x8z7mMEnXOw3G2q62FTkmsvNxu4FQSu5+3UMb+L7fjKa26DEzhrmCxAgFLLIzVfqQ=="; }; }; - "@vue/compiler-sfc-3.2.37" = { + "@vue/compiler-sfc-2.7.8" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.2.37"; + version = "2.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.37.tgz"; - sha512 = "+7i/2+9LYlpqDv+KTtWhOZH+pa8/HnX/905MdVmAcI/mPQOBwkHHIzrsEsucyOIZQYMkXUiTkmZq5am/NyXKkg=="; - }; - }; - "@vue/compiler-ssr-3.2.37" = { - name = "_at_vue_slash_compiler-ssr"; - packageName = "@vue/compiler-ssr"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.37.tgz"; - sha512 = "7mQJD7HdXxQjktmsWp/J67lThEIcxLemz1Vb5I6rYJHR5vI+lON3nPGOH3ubmbvYGt8xEUaAr1j7/tIFWiEOqw=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.8.tgz"; + sha512 = "2DK4YWKfgLnW9VDR9gnju1gcYRk3flKj8UNsms7fsRmFcg35slVTZEkqwBtX+wJBXaamFfn6NxSsZh3h12Ix/Q=="; }; }; "@vue/component-compiler-utils-3.3.0" = { @@ -10957,33 +11182,6 @@ let sha512 = "LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ=="; }; }; - "@vue/reactivity-3.2.37" = { - name = "_at_vue_slash_reactivity"; - packageName = "@vue/reactivity"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.37.tgz"; - sha512 = "/7WRafBOshOc6m3F7plwzPeCu/RCVv9uMpOwa/5PiY1Zz+WLVRWiy0MYKwmg19KBdGtFWsmZ4cD+LOdVPcs52A=="; - }; - }; - "@vue/reactivity-transform-3.2.37" = { - name = "_at_vue_slash_reactivity-transform"; - packageName = "@vue/reactivity-transform"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.37.tgz"; - sha512 = "IWopkKEb+8qpu/1eMKVeXrK0NLw9HicGviJzhJDEyfxTR9e1WtpnnbYkJWurX6WwoFP0sz10xQg8yL8lgskAZg=="; - }; - }; - "@vue/runtime-core-3.2.37" = { - name = "_at_vue_slash_runtime-core"; - packageName = "@vue/runtime-core"; - version = "3.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.37.tgz"; - sha512 = "JPcd9kFyEdXLl/i0ClS7lwgcs0QpUAWj+SKX2ZC3ANKi1U4DOtiEr6cRqFXsPwY5u1L9fAjkinIdB8Rz3FoYNQ=="; - }; - }; "@vue/shared-3.2.37" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; @@ -11002,33 +11200,6 @@ let sha512 = "Iu8Tbg3f+emIIMmI2ycSI8QcEuAUgPTgHwesDU1eKMLE4YC/c/sFbGc70QgMq31ijRftV0R7vCm9co6rldCeOA=="; }; }; - "@web-std/blob-3.0.4" = { - name = "_at_web-std_slash_blob"; - packageName = "@web-std/blob"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@web-std/blob/-/blob-3.0.4.tgz"; - sha512 = "+dibyiw+uHYK4dX5cJ7HA+gtDAaUUe6JsOryp2ZpAC7h4ICsh49E34JwHoEKPlPvP0llCrNzz45vvD+xX5QDBg=="; - }; - }; - "@web-std/file-3.0.2" = { - name = "_at_web-std_slash_file"; - packageName = "@web-std/file"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@web-std/file/-/file-3.0.2.tgz"; - sha512 = "pIH0uuZsmY8YFvSHP1NsBIiMT/1ce0suPrX74fEeO3Wbr1+rW0fUGEe4d0R99iLwXtyCwyserqCFI4BJkJlkRA=="; - }; - }; - "@web-std/stream-1.0.0" = { - name = "_at_web-std_slash_stream"; - packageName = "@web-std/stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@web-std/stream/-/stream-1.0.0.tgz"; - sha512 = "jyIbdVl+0ZJyKGTV0Ohb9E6UnxP+t7ZzX4Do3AHjZKxUXKMs9EmqnBDQgHF7bEw0EzbQygOjtt/7gvtmi//iCQ=="; - }; - }; "@webassemblyjs/ast-1.11.1" = { name = "_at_webassemblyjs_slash_ast"; packageName = "@webassemblyjs/ast"; @@ -11560,13 +11731,13 @@ let sha512 = "GWZQKroPES4z91Ijx6zsOsb7+USOxjy66s8AoTWg0HiBBdfnbtf9aeh3Uav0MgYn4BL8Q7tVSUpd0gGpngKGEQ=="; }; }; - "@wry/equality-0.1.11" = { - name = "_at_wry_slash_equality"; - packageName = "@wry/equality"; - version = "0.1.11"; + "@whatwg-node/fetch-0.2.7" = { + name = "_at_whatwg-node_slash_fetch"; + packageName = "@whatwg-node/fetch"; + version = "0.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/@wry/equality/-/equality-0.1.11.tgz"; - sha512 = "mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA=="; + url = "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.2.7.tgz"; + sha512 = "AYU3W9q6qIkSlJOLAjBdOeMuWZwaPy7eeDhl2uG0udMRwO6+CVfAa/hG/kMX1Zp0wH2plhOm4eJrWtuf4f2+2A=="; }; }; "@xmldom/xmldom-0.7.5" = { @@ -11875,6 +12046,15 @@ let sha512 = "GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="; }; }; + "@zeit/schemas-2.21.0" = { + name = "_at_zeit_slash_schemas"; + packageName = "@zeit/schemas"; + version = "2.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@zeit/schemas/-/schemas-2.21.0.tgz"; + sha512 = "/J4WBTpWtQ4itN1rb3ao8LfClmVcmz2pO6oYb7Qd4h7VSqUhIbJIvrykz9Ew1WMg6eFWsKdsMHc5uPbFxqlCpg=="; + }; + }; "@zeit/schemas-2.6.0" = { name = "_at_zeit_slash_schemas"; packageName = "@zeit/schemas"; @@ -11884,15 +12064,6 @@ let sha512 = "uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg=="; }; }; - "@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" = { name = "CSSselect"; packageName = "CSSselect"; @@ -12127,15 +12298,6 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.7.0" = { - name = "acorn"; - packageName = "acorn"; - version = "8.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; - sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; - }; - }; "acorn-8.7.1" = { name = "acorn"; packageName = "acorn"; @@ -12145,6 +12307,15 @@ let sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; }; }; + "acorn-8.8.0" = { + name = "acorn"; + packageName = "acorn"; + version = "8.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"; + sha512 = "QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w=="; + }; + }; "acorn-globals-1.0.9" = { name = "acorn-globals"; packageName = "acorn-globals"; @@ -12298,13 +12469,13 @@ let sha512 = "qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ=="; }; }; - "addons-linter-5.9.0" = { + "addons-linter-5.10.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "5.9.0"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.9.0.tgz"; - sha512 = "ACvBvkO8WtupOT42S3ln801/Ek7X1Yss59aYlI5JPc+dEBfEyEtkUa23UEQmALqdDEoHk0i+3NkKHdiXbhqp/g=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-5.10.0.tgz"; + sha512 = "RiW9A0Z5HOzghN+BxmModDZ1V6B+1NFWZ+aU/vXefUtrNrJF6oWUnmeCLl1QzDaRcYVGDNDX9DheLfb23/Dzdg=="; }; }; "addons-moz-compare-1.2.0" = { @@ -12316,13 +12487,13 @@ let sha512 = "COG8qk2/dubPqabfcoJW4E7pm2EQDI43iMrHnhlobvq/uRMEzx/PYJ1KaUZ97Vgg44R3QdRG5CvDsTRbMUHcDw=="; }; }; - "addons-scanner-utils-7.0.0" = { + "addons-scanner-utils-7.1.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-7.0.0.tgz"; - sha512 = "5j/qMzL13uGSiaFKvUNiMwyWMYD2YtEeY477q7Ahan3c90wLCwXIGCdpCfstgT3hpl44r+d6lqTIo2j2FW6uJQ=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-7.1.0.tgz"; + sha512 = "I6uQtJg3sbNtbGOsR2GmTtegCegYTXFRTnnvukEcX0jWidI4enyENyCV1MNkoLSw5xbgKIM/bFuSm4IPFlDYrg=="; }; }; "addr-to-ip-port-1.5.4" = { @@ -12523,15 +12694,6 @@ let sha512 = "LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg=="; }; }; - "ajv-8.10.0" = { - name = "ajv"; - packageName = "ajv"; - version = "8.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz"; - sha512 = "bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw=="; - }; - }; "ajv-8.11.0" = { name = "ajv"; packageName = "ajv"; @@ -12541,13 +12703,13 @@ let sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; - "ajv-8.9.0" = { + "ajv-8.6.3" = { name = "ajv"; packageName = "ajv"; - version = "8.9.0"; + version = "8.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; - sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz"; + sha512 = "SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw=="; }; }; "ajv-errors-1.0.1" = { @@ -13126,139 +13288,76 @@ let sha512 = "JtHjzZmJxtzfTSjsCyHgPR155HBe5WGyUyHTaEkfy46qhwCFKx1Epm6nAxgUG3WfUZP1dWhGqj9Z2NOBeZ+uBw=="; }; }; - "apollo-cache-control-0.14.0" = { - name = "apollo-cache-control"; - packageName = "apollo-cache-control"; - version = "0.14.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.14.0.tgz"; - sha512 = "qN4BCq90egQrgNnTRMUHikLZZAprf3gbm8rC5Vwmc6ZdLolQ7bFsa769Hqi6Tq/lS31KLsXBLTOsRbfPHph12w=="; - }; - }; - "apollo-datasource-0.9.0" = { + "apollo-datasource-3.3.2" = { name = "apollo-datasource"; packageName = "apollo-datasource"; - version = "0.9.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-0.9.0.tgz"; - sha512 = "y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA=="; + url = "https://registry.npmjs.org/apollo-datasource/-/apollo-datasource-3.3.2.tgz"; + sha512 = "L5TiS8E2Hn/Yz7SSnWIVbZw0ZfEIXZCa5VUiVxD9P53JvSrf4aStvsFDlGWPvpIdCR+aly2CfoB79B9/JjKFqg=="; }; }; - "apollo-graphql-0.9.7" = { - name = "apollo-graphql"; - packageName = "apollo-graphql"; - version = "0.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.9.7.tgz"; - sha512 = "bezL9ItUWUGHTm1bI/XzIgiiZbhXpsC7uxk4UxFPmcVJwJsDc3ayZ99oXxAaK+3Rbg/IoqrHckA6CwmkCsbaSA=="; - }; - }; - "apollo-link-1.2.1" = { - name = "apollo-link"; - packageName = "apollo-link"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.1.tgz"; - sha512 = "6Ghf+j3cQLCIvjXd2dJrLw+16HZbWbwmB1qlTc41BviB2hv+rK1nJr17Y9dWK0UD4p3i9Hfddx3tthpMKrueHg=="; - }; - }; - "apollo-link-1.2.14" = { - name = "apollo-link"; - packageName = "apollo-link"; - version = "1.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.14.tgz"; - sha512 = "p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg=="; - }; - }; - "apollo-reporting-protobuf-0.8.0" = { + "apollo-reporting-protobuf-3.3.2" = { name = "apollo-reporting-protobuf"; packageName = "apollo-reporting-protobuf"; - version = "0.8.0"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.8.0.tgz"; - sha512 = "B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg=="; + url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.3.2.tgz"; + sha512 = "j1tx9tmkVdsLt1UPzBrvz90PdjAeKW157WxGn+aXlnnGfVjZLIRXX3x5t1NWtXvB7rVaAsLLILLtDHW382TSoQ=="; }; }; - "apollo-server-caching-0.7.0" = { - name = "apollo-server-caching"; - packageName = "apollo-server-caching"; - version = "0.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-caching/-/apollo-server-caching-0.7.0.tgz"; - sha512 = "MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw=="; - }; - }; - "apollo-server-core-2.25.4" = { + "apollo-server-core-3.10.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.25.4"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.25.4.tgz"; - sha512 = "1u3BnFKbCt6F9SPM7ZoWmtHK6ubme56H8hV5Mjv3KbfSairU76SU79IhO05BEJE57S6N+ddb1rm3Uk93X6YeGw=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.10.0.tgz"; + sha512 = "ln5drIk3oW/ycYhcYL9TvM7vRf7OZwJrgHWlnjnMakozBQIBSumdMi4pN001DhU9mVBWTfnmBv3CdcxJdGXIvA=="; }; }; - "apollo-server-env-3.1.0" = { + "apollo-server-env-4.2.1" = { name = "apollo-server-env"; packageName = "apollo-server-env"; - version = "3.1.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-3.1.0.tgz"; - sha512 = "iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ=="; + url = "https://registry.npmjs.org/apollo-server-env/-/apollo-server-env-4.2.1.tgz"; + sha512 = "vm/7c7ld+zFMxibzqZ7SSa5tBENc4B0uye9LTfjJwGoQFY5xsUPH5FpO5j0bMUDZ8YYNbrF9SNtzc5Cngcr90g=="; }; }; - "apollo-server-errors-2.5.0" = { + "apollo-server-errors-3.3.1" = { name = "apollo-server-errors"; packageName = "apollo-server-errors"; - version = "2.5.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz"; - sha512 = "lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA=="; + url = "https://registry.npmjs.org/apollo-server-errors/-/apollo-server-errors-3.3.1.tgz"; + sha512 = "xnZJ5QWs6FixHICXHxUfm+ZWqqxrNuPlQ+kj5m6RtEgIpekOPssH/SD9gf2B4HuWV0QozorrygwZnux8POvyPA=="; }; }; - "apollo-server-express-2.25.4" = { + "apollo-server-express-3.10.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.25.4"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.25.4.tgz"; - sha512 = "1Yd9DscLlCP5BhfAkNxg+aGcaTKnL36FyezdL7Iqc+KelON5PAyX8qpAChKL8Z3L2YHJzIk/Haf4dFJLKUjx9w=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.10.0.tgz"; + sha512 = "ww3tZq9I/x3Oxtux8xlHAZcSB0NNQ17lRlY6yCLk1F+jCzdcjuj0x8XNg0GdTrMowt5v43o786bU9VYKD5OVnA=="; }; }; - "apollo-server-plugin-base-0.13.0" = { + "apollo-server-plugin-base-3.6.2" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.13.0"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.13.0.tgz"; - sha512 = "L3TMmq2YE6BU6I4Tmgygmd0W55L+6XfD9137k+cWEBFu50vRY4Re+d+fL5WuPkk5xSPKd/PIaqzidu5V/zz8Kg=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-3.6.2.tgz"; + sha512 = "erWXjLOO1u7fxQkbxJ2cwSO7p0tYzNied91I1SJ9tikXZ/2eZUyDyvrpI+4g70kOdEi+AmJ5Fo8ahEXKJ75zdg=="; }; }; - "apollo-server-types-0.9.0" = { + "apollo-server-types-3.6.2" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.9.0"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.9.0.tgz"; - sha512 = "qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg=="; - }; - }; - "apollo-tracing-0.15.0" = { - name = "apollo-tracing"; - packageName = "apollo-tracing"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.15.0.tgz"; - sha512 = "UP0fztFvaZPHDhIB/J+qGuy6hWO4If069MGC98qVs0I8FICIGu4/8ykpX3X3K6RtaQ56EDAWKykCxFv4ScxMeA=="; - }; - }; - "apollo-utilities-1.3.4" = { - name = "apollo-utilities"; - packageName = "apollo-utilities"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/apollo-utilities/-/apollo-utilities-1.3.4.tgz"; - sha512 = "pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-3.6.2.tgz"; + sha512 = "9Z54S7NB+qW1VV+kmiqwU2Q6jxWfX89HlSGCGOo3zrkrperh85LrzABgN9S92+qyeHYd72noMDg2aI039sF3dg=="; }; }; "app-path-2.2.0" = { @@ -13468,13 +13567,13 @@ let sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw=="; }; }; - "are-we-there-yet-3.0.0" = { + "are-we-there-yet-3.0.1" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz"; - sha512 = "0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw=="; + url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"; + sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg=="; }; }; "arg-2.0.0" = { @@ -14080,13 +14179,13 @@ let sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; }; }; - "asar-3.1.0" = { + "asar-3.2.0" = { name = "asar"; packageName = "asar"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-3.1.0.tgz"; - sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; + url = "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz"; + sha512 = "COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg=="; }; }; "ascii-table-0.0.9" = { @@ -14494,13 +14593,13 @@ let sha512 = "gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw=="; }; }; - "async-lock-1.3.1" = { + "async-lock-1.3.2" = { name = "async-lock"; packageName = "async-lock"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/async-lock/-/async-lock-1.3.1.tgz"; - sha512 = "zK7xap9UnttfbE23JmcrNIyueAn6jWshihJqA33U/hEnKprF/lVGBDsBv/bqLm2YMMl1DnpHhUY044eA0t1TUw=="; + url = "https://registry.npmjs.org/async-lock/-/async-lock-1.3.2.tgz"; + sha512 = "phnXdS3RP7PPcmP6NWWzWMU0sLTeyvtZCxBPpZdkYE3seGLKSQZs9FrmVO/qwypq98FUtWWUEYxziLkdGk5nnA=="; }; }; "async-mutex-0.1.4" = { @@ -14539,6 +14638,15 @@ let sha512 = "iitlc2murdQ3/A5Re3CcplQBEf7vOmFrFQ6RFn3+/+zZUyIHYkZnnEziMSa6YIb2Bs2EJEPZWReTxjHqvQbDbw=="; }; }; + "async-sema-3.1.1" = { + name = "async-sema"; + packageName = "async-sema"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-sema/-/async-sema-3.1.1.tgz"; + sha512 = "tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg=="; + }; + }; "async-settle-1.0.0" = { name = "async-settle"; packageName = "async-settle"; @@ -14773,13 +14881,13 @@ let sha512 = "545VawhsCQ7yEx9jZKV0hTTW3FS/waycISWMvnNwqRfpU9o4FQ4DSu3je7ekn5yFKM+91dxJC+IfJgtIV8WaUw=="; }; }; - "aws-sdk-2.1158.0" = { + "aws-sdk-2.1188.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.1158.0"; + version = "2.1188.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1158.0.tgz"; - sha512 = "uHYzZMGE+b50sWXaLhga4aD1SpB3+DEZclAkg9aYz2pDZlSDTOMh3uJ/ufsMBs7VcDKGS7mQRibCmCbwRGTIlg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1188.0.tgz"; + sha512 = "4KXwjRjbCzU1luTOeH+ded92H51I4UuHaZzx2EI+JA0II1+q48heTxFlFd7yp7jGz9UwjPb6k12Jv1W3r0JWxA=="; }; }; "aws-sign2-0.6.0" = { @@ -14854,13 +14962,13 @@ let sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; }; }; - "axios-0.27.0" = { + "axios-0.27.2" = { name = "axios"; packageName = "axios"; - version = "0.27.0"; + version = "0.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.27.0.tgz"; - sha512 = "XV/WrPxXfzgZ8j4lcB5i6LyaXmi90yetmV/Fem0kmglGx+mpY06CiweL3YxU6wOTNLmqLUePW4G8h45nGZ/+pA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; + sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; "axios-cookiejar-support-0.5.1" = { @@ -14890,22 +14998,22 @@ let sha512 = "4TVv2X7oNStT0vLaEfExmy3J4/CzfuXolEcQl/BRUmvGySqKStTG2O55/hUQ0kM7UJlZBLgniM0SBq4d/WkKow=="; }; }; - "azure-devops-node-api-11.1.1" = { + "azure-devops-node-api-11.2.0" = { name = "azure-devops-node-api"; packageName = "azure-devops-node-api"; - version = "11.1.1"; + version = "11.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.1.1.tgz"; - sha512 = "XDG91XzLZ15reP12s3jFkKS8oiagSICjnLwxEYieme4+4h3ZveFOFRA4iYIG40RyHXsiI0mefFYYMFIJbMpWcg=="; + url = "https://registry.npmjs.org/azure-devops-node-api/-/azure-devops-node-api-11.2.0.tgz"; + sha512 = "XdiGPhrpaT5J8wdERRKs5g8E0Zy1pvOYTli7z9E8nmOn3YGp4FhtjhrOyFmX/8veWCwdI69mCHKJw6l+4J/bHA=="; }; }; - "b4a-1.5.3" = { + "b4a-1.6.0" = { name = "b4a"; packageName = "b4a"; - version = "1.5.3"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/b4a/-/b4a-1.5.3.tgz"; - sha512 = "1aCQIzQJK7G0z1Una75tWMlwVAR8o+QHoAlnWc5XAxRVBESY9WsitfBgM5nPyDBP5HrhPU1Np4Pq2Y7CJQ+tVw=="; + url = "https://registry.npmjs.org/b4a/-/b4a-1.6.0.tgz"; + sha512 = "fsTxXxj1081Yq5MOQ06gZ5+e2QcSyP2U6NofdOWyq+lrNI4IjkZ+fLVmoQ6uUCiNg1NWePMMVq93vOTdbJmErw=="; }; }; "babel-code-frame-6.26.0" = { @@ -14971,31 +15079,31 @@ let sha512 = "SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg=="; }; }; - "babel-plugin-polyfill-corejs2-0.3.1" = { + "babel-plugin-polyfill-corejs2-0.3.2" = { name = "babel-plugin-polyfill-corejs2"; packageName = "babel-plugin-polyfill-corejs2"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz"; - sha512 = "v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz"; + sha512 = "LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q=="; }; }; - "babel-plugin-polyfill-corejs3-0.5.2" = { + "babel-plugin-polyfill-corejs3-0.5.3" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz"; - sha512 = "G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz"; + sha512 = "zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw=="; }; }; - "babel-plugin-polyfill-regenerator-0.3.1" = { + "babel-plugin-polyfill-regenerator-0.4.0" = { name = "babel-plugin-polyfill-regenerator"; packageName = "babel-plugin-polyfill-regenerator"; - version = "0.3.1"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz"; - sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz"; + sha512 = "RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw=="; }; }; "babel-plugin-styled-components-2.0.7" = { @@ -15448,13 +15556,13 @@ let sha512 = "uBWc/w3AqjAfo6/+ODoRSoY/w/C7UaU/9AYcXjxgObTyUf3lvV5jCuAU/dSZyWysDyWBQkPzllOd7KZkwJHnwg=="; }; }; - "bdb-1.3.0" = { + "bdb-1.4.0" = { name = "bdb"; packageName = "bdb"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/bdb/-/bdb-1.3.0.tgz"; - sha512 = "oJnWnHOTcnJhazwpEzQvPFtSR1IdHtS3PczuLY3klgZTTtRUbARX7tdphQS8iNUUwEVMfuO93eHDWwTICoeJlg=="; + url = "https://registry.npmjs.org/bdb/-/bdb-1.4.0.tgz"; + sha512 = "NjsvznNQSW419u/VlitEioAglJd44n6MrOI+6Rf9JqlyF6DQytBh8bwCT3axUw095aUlGtvoscJG3C56pIPQ7Q=="; }; }; "bdns-0.1.5" = { @@ -15934,6 +16042,15 @@ let sha512 = "x/7D4jDj/MMkmO6t3p2CSDXTqpwZ/jRsRiJDmaiXabrR9XRo7jwby8HRn7EyK1h24rKFFI7vI0ay4czl6bDOZQ=="; }; }; + "bitcoinjs-lib-6.0.2" = { + name = "bitcoinjs-lib"; + packageName = "bitcoinjs-lib"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-6.0.2.tgz"; + sha512 = "I994pGt9cL5s5OA6mkv1e8IuYcsKN2ORXnWbkqAXLNGvEnOHBhKBSvCjFl7YC2uVoJnfr/iwq7JMrq575SYO5w=="; + }; + }; "bitfield-0.1.0" = { name = "bitfield"; packageName = "bitfield"; @@ -16141,15 +16258,6 @@ let sha512 = "BoCcDt8zBGShn6DawAGQw37s9SSs+fEjiZWDzyB+841PbOogcR2X7LGlM4sR3Zsiq/zoyl8MFWDfN6oDSlveBQ=="; }; }; - "blob-0.0.4" = { - name = "blob"; - packageName = "blob"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz"; - sha512 = "YRc9zvVz4wNaxcXmiSgb9LAg7YYwqQ2xd0Sj6osfA7k/PKmIGVlnOYs3wOFdkRC9/JpQu8sGt/zHgJV7xzerfg=="; - }; - }; "blob-0.0.5" = { name = "blob"; packageName = "blob"; @@ -16159,15 +16267,6 @@ let sha512 = "gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="; }; }; - "blob-stream-0.1.3" = { - name = "blob-stream"; - packageName = "blob-stream"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/blob-stream/-/blob-stream-0.1.3.tgz"; - sha512 = "xXwyhgVmPsFVFFvtM5P0syI17/oae+MIjLn5jGhuD86mmSJ61EWMWmbPrV/0+bdcH9jQ2CzIhmTQKNUJL7IPog=="; - }; - }; "blob-to-buffer-1.2.9" = { name = "blob-to-buffer"; packageName = "blob-to-buffer"; @@ -16402,15 +16501,6 @@ let sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; }; }; - "body-parser-1.19.1" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.1.tgz"; - sha512 = "8ljfQi5eBk8EJfECMrgqNGWPEY5jWP+1IzkzkGdFFEwFQZZyaZ21UqdaHktgiMlH0xLHqIFtE/u2OYE5dOtViA=="; - }; - }; "body-parser-1.19.2" = { name = "body-parser"; packageName = "body-parser"; @@ -16537,13 +16627,13 @@ let sha512 = "yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA=="; }; }; - "bootstrap-5.1.3" = { + "bootstrap-5.2.0" = { name = "bootstrap"; packageName = "bootstrap"; - version = "5.1.3"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/bootstrap/-/bootstrap-5.1.3.tgz"; - sha512 = "fcQztozJ8jToQWXxVuEyXWW+dSo8AiXWKwiSSrKWsRB/Qt+Ewwza+JWoLKiTuQLaEPhdNAJ7+Dosc9DOIqNy7Q=="; + url = "https://registry.npmjs.org/bootstrap/-/bootstrap-5.2.0.tgz"; + sha512 = "qlnS9GL6YZE6Wnef46GxGv1UpGGzAwO0aPL1yOjzDIJpeApeMvqV24iL+pjr2kU4dduoBA9fINKWKgMToobx9A=="; }; }; "bootstrap-vue-helper-json-1.1.1" = { @@ -16672,6 +16762,15 @@ let sha512 = "9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ=="; }; }; + "boxen-7.0.0" = { + name = "boxen"; + packageName = "boxen"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/boxen/-/boxen-7.0.0.tgz"; + sha512 = "j//dBVuyacJbvW+tvZ9HuH03fZ46QcaKvvhZickZqtB271DxJ7SNRSNxrV/dZX0085m7hISRZWbzWlJvx/rHSg=="; + }; + }; "bplist-creator-0.0.6" = { name = "bplist-creator"; packageName = "bplist-creator"; @@ -16681,13 +16780,13 @@ let sha512 = "qu/aUehciaUyo6O+VFJdb4UXoHr0Mcu2ZBxeTU/HKtl2z/jyBWSK/3+6r/OrehwJ8nG6T1HrFSEO/Uovbr87Pg=="; }; }; - "bplist-creator-0.1.0" = { + "bplist-creator-0.1.1" = { name = "bplist-creator"; packageName = "bplist-creator"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz"; - sha512 = "sXaHZicyEEmY86WyueLTQesbeoH/mquvarJaQNbjuOQO+7gbFcDEWqKmcWA4cOTLzFlfgvkiVxolk1k5bBIpmg=="; + url = "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.1.tgz"; + sha512 = "Ese7052fdWrxp/vqSJkydgx/1MdBnNOCV2XVfbmdGWD2H6EYza+Q4pyYSuVSnCUD22hfI/BFI4jHaC3NLXLlJQ=="; }; }; "bplist-parser-0.1.1" = { @@ -16708,15 +16807,6 @@ let sha512 = "z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw=="; }; }; - "bplist-parser-0.3.1" = { - name = "bplist-parser"; - packageName = "bplist-parser"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.3.1.tgz"; - sha512 = "PyJxiNtA5T2PlLIeBot4lbp7rj4OadzjnMZD/G5zuBNt8ei/yCU7+wW0h2bag9vr8c+/WuRWmSxbqAl9hL1rBA=="; - }; - }; "bplist-parser-0.3.2" = { name = "bplist-parser"; packageName = "bplist-parser"; @@ -17005,13 +17095,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.20.4" = { + "browserslist-4.21.3" = { name = "browserslist"; packageName = "browserslist"; - version = "4.20.4"; + version = "4.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.4.tgz"; - sha512 = "ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz"; + sha512 = "898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ=="; }; }; "brq-0.1.8" = { @@ -17104,13 +17194,13 @@ let sha512 = "66UkjoB9f7lhT+WKgYq8MQa6nkr96mlX64JYMlIsXe/X4VeqNwvsx7UOE3ZqD6lkwg8GvBhapRTWj0qWO3Pw8w=="; }; }; - "bson-4.6.4" = { + "bson-4.6.5" = { name = "bson"; packageName = "bson"; - version = "4.6.4"; + version = "4.6.5"; src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-4.6.4.tgz"; - sha512 = "TdQ3FzguAu5HKPPlr0kYQCyrYUYh8tFM+CMTpxjNzVzxeiJY00Rtuj3LXLHSgiGvmaWlZ8PE+4KyM2thqE38pQ=="; + url = "https://registry.npmjs.org/bson/-/bson-4.6.5.tgz"; + sha512 = "uqrgcjyOaZsHfz7ea8zLRCLe1u+QGUSzMZmvXqO24CDW7DWoW1qiN9folSwa7hSneTSgM2ykDIzF5kcQQ8cwNw=="; }; }; "btc-rpc-client-git+https://github.com/btc21/btc-rpc-client" = { @@ -17708,15 +17798,6 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; - "bytes-3.1.1" = { - name = "bytes"; - packageName = "bytes"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz"; - sha512 = "dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg=="; - }; - }; "bytes-3.1.2" = { name = "bytes"; packageName = "bytes"; @@ -17816,6 +17897,15 @@ let sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA=="; }; }; + "cacheable-lookup-6.0.4" = { + name = "cacheable-lookup"; + packageName = "cacheable-lookup"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.0.4.tgz"; + sha512 = "mbcDEZCkv2CZF4G01kr8eBd/5agkt9oCqz75tJMSIsquvRZ2sL6Hi5zGVKi/0OSC9oO1GHfJ2AV0ZIOY9vye0A=="; + }; + }; "cacheable-request-2.1.4" = { name = "cacheable-request"; packageName = "cacheable-request"; @@ -17888,13 +17978,13 @@ let sha512 = "wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw=="; }; }; - "caller-1.0.1" = { + "caller-1.1.0" = { name = "caller"; packageName = "caller"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/caller/-/caller-1.0.1.tgz"; - sha512 = "tfj+ErW/0SbOyfoXriRtdjCMTwrZAvLXj2jHqlh8YCcgoZVzUI22E/JJLxbiuZqDs0Ke7BuRrHTVuxm3EwYbJQ=="; + url = "https://registry.npmjs.org/caller/-/caller-1.1.0.tgz"; + sha512 = "n+21IZC3j06YpCWaxmUy5AnVqhmCIM2bQtqQyy00HJlmStRt6kwDX5F9Z97pqwAB+G/tgSz6q/kUBbNyQzIubw=="; }; }; "caller-callsite-2.0.0" = { @@ -18140,22 +18230,22 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001358" = { + "caniuse-lite-1.0.30001373" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001358"; + version = "1.0.30001373"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz"; - sha512 = "hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001373.tgz"; + sha512 = "pJYArGHrPp3TUqQzFYRmP/lwJlj8RCbVe3Gd3eJQkAV8SAC6b19XS9BjMvRdvaS8RMkaTN8ZhoHP6S1y8zzwEQ=="; }; }; - "canvas-2.9.1" = { + "canvas-2.9.3" = { name = "canvas"; packageName = "canvas"; - version = "2.9.1"; + version = "2.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/canvas/-/canvas-2.9.1.tgz"; - sha512 = "vSQti1uG/2gjv3x6QLOZw7TctfufaerTWbVe+NSduHxxLGB+qf3kFgQ6n66DSnuoINtVUjrLLIK2R+lxrBG07A=="; + url = "https://registry.npmjs.org/canvas/-/canvas-2.9.3.tgz"; + sha512 = "WOUM7ghii5TV2rbhaZkh1youv/vW1/Canev6Yx6BG2W+1S07w8jKZqKkPnbiPpQEDsnJdN8ouDd7OvQEGXDcUw=="; }; }; "canvg-3.0.7" = { @@ -18302,31 +18392,31 @@ let sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg=="; }; }; - "cdk8s-2.3.32" = { + "cdk8s-2.3.74" = { name = "cdk8s"; packageName = "cdk8s"; - version = "2.3.32"; + version = "2.3.74"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.3.32.tgz"; - sha512 = "tFBIna07+zHTkMIGchDGA0jlo7PQllhETM3fmAf7iXK5d2jWOjX8UFMPxBWNJh3anxtvxnAR0Oa6o/J3kP3XQw=="; + url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.3.74.tgz"; + sha512 = "mlODV+rIIoxuywZYsxtPbpi8xzCEQ6v4nJkGIsSzMYiv0tXGuPCkzn309I8Q3vFH18VRxXPLrKkXcXnSe0+OEw=="; }; }; - "cdk8s-plus-22-2.0.0-rc.25" = { + "cdk8s-plus-22-2.0.0-rc.72" = { name = "cdk8s-plus-22"; packageName = "cdk8s-plus-22"; - version = "2.0.0-rc.25"; + version = "2.0.0-rc.72"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.25.tgz"; - sha512 = "s+Fv9wBp0ABVh51vbXokJs4ATB6I4vaoLbSEGreZwNFjJPrK59ZRbUlxjJHkDovk8v4ij+EcaQJ6eMj/T+7EhA=="; + url = "https://registry.npmjs.org/cdk8s-plus-22/-/cdk8s-plus-22-2.0.0-rc.72.tgz"; + sha512 = "CErc8EcrOpqVyBkylUNDLjLjCHFKbzZC4ow10IYvVBkp7mtGtx04A8TOk9O3ZbsAuBiADhcsltwxH6E4a13F6A=="; }; }; - "cdktf-0.11.2" = { + "cdktf-0.12.0" = { name = "cdktf"; packageName = "cdktf"; - version = "0.11.2"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.11.2.tgz"; - sha512 = "XNuC1w1rz/u7v57cACJeB26Ep10eZ3/Eo0h5VV39uojpN24S2sQMWWi2rjaWD2gHPjP6T+EodBnI+oxq8cWRpw=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.12.0.tgz"; + sha512 = "xxI8Ish+80+/Aue9CyHMABiTJqI51ge7SGzcRDP/ytr1hDjWY/48zo4qd+CqgkFb1ZC73a848A9oH15xaIQ/mA=="; }; }; "center-align-0.1.3" = { @@ -18473,6 +18563,15 @@ let sha512 = "Fo07WOYGqMfCWHOzSXOt2CxDbC6skS/jO9ynEcmpANMoPrD+W1r1K6Vx7iNm+AQmETU1Xr2t+n8nzkV9t6xh3w=="; }; }; + "chalk-template-0.4.0" = { + name = "chalk-template"; + packageName = "chalk-template"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk-template/-/chalk-template-0.4.0.tgz"; + sha512 = "/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg=="; + }; + }; "chance-1.0.18" = { name = "chance"; packageName = "chance"; @@ -18500,13 +18599,13 @@ let sha512 = "iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw=="; }; }; - "character-entities-2.0.1" = { + "character-entities-2.0.2" = { name = "character-entities"; packageName = "character-entities"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/character-entities/-/character-entities-2.0.1.tgz"; - sha512 = "OzmutCf2Kmc+6DrFrrPS8/tDh2+DpnrfzdICHWhcVC9eOd0N1PXmQEE1a8iM4IziIAG+8tmTq3K+oo0ubH6RRQ=="; + url = "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz"; + sha512 = "shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ=="; }; }; "character-entities-html4-1.1.4" = { @@ -18626,13 +18725,13 @@ let sha512 = "6dVyOOYjpfFcL1Y4qChrAoQLRHvj2ziyhcm0QJlhOcAhykL/k1kTUPbeo+87MNRTRdk2OIIsIXbuF3x2wi5EXg=="; }; }; - "chart.js-3.8.0" = { + "chart.js-3.9.1" = { name = "chart.js"; packageName = "chart.js"; - version = "3.8.0"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/chart.js/-/chart.js-3.8.0.tgz"; - sha512 = "cr8xhrXjLIXVLOBZPkBZVF6NDeiVIrPLHcMhnON7UufudL+CNeRrD+wpYanswlm8NpudMdrt3CHoLMQMxJhHRg=="; + url = "https://registry.npmjs.org/chart.js/-/chart.js-3.9.1.tgz"; + sha512 = "Ro2JbLmvg83gXF5F4sniaQ+lTbSv18E+TIf2cOeiH1Iqd2PGFOtem+DUufMZsCJwFE7ywPOpfXFBwRTGq7dh6w=="; }; }; "charwise-3.0.1" = { @@ -18716,13 +18815,13 @@ let sha512 = "g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw=="; }; }; - "cheerio-1.0.0-rc.11" = { + "cheerio-1.0.0-rc.12" = { name = "cheerio"; packageName = "cheerio"; - version = "1.0.0-rc.11"; + version = "1.0.0-rc.12"; src = fetchurl { - url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.11.tgz"; - sha512 = "bQwNaDIBKID5ts/DsdhxrjqFXYfLw4ste+wMKqWA8DyKcS4qwsPP4Bk8ZNaTJjvpiX/qW3BT4sU7d6Bh5i+dag=="; + url = "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz"; + sha512 = "VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q=="; }; }; "cheerio-1.0.0-rc.3" = { @@ -18995,15 +19094,6 @@ let sha512 = "xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg=="; }; }; - "cint-8.2.1" = { - name = "cint"; - packageName = "cint"; - version = "8.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cint/-/cint-8.2.1.tgz"; - sha512 = "gyWqJHXgDFPNx7PEyFJotutav+al92TTC3dWlMFyTETlOyKBQMZb7Cetqmj3GlrnSILHwSJRwf4mIGzc7C5lXw=="; - }; - }; "cipher-base-1.0.4" = { name = "cipher-base"; packageName = "cipher-base"; @@ -19121,13 +19211,13 @@ let sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A=="; }; }; - "clean-css-5.3.0" = { + "clean-css-5.3.1" = { name = "clean-css"; packageName = "clean-css"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz"; - sha512 = "YYuuxv4H/iNb1Z/5IbMRoxgrzjWGhOEFfd+groZ5dMCVkpENiMZmwspdrzBo9286JjM1gZJPAyL7ZIdzuvu2AQ=="; + url = "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz"; + sha512 = "lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg=="; }; }; "clean-git-ref-2.0.1" = { @@ -19211,13 +19301,31 @@ let sha512 = "y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw=="; }; }; - "cli-color-2.0.2" = { + "cli-boxes-3.0.0" = { + name = "cli-boxes"; + packageName = "cli-boxes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz"; + sha512 = "/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g=="; + }; + }; + "cli-color-2.0.1" = { name = "cli-color"; packageName = "cli-color"; - version = "2.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-color/-/cli-color-2.0.2.tgz"; - sha512 = "g4JYjrTW9MGtCziFNjkqp3IMpGhnJyeB0lOtRPjQkYhXzKYr6tYnXKyEVnMzITxhpbahsEW9KsxOYIDKwcsIBw=="; + url = "https://registry.npmjs.org/cli-color/-/cli-color-2.0.1.tgz"; + sha512 = "eBbxZF6fqPUNnf7CLAFOersUnyYzv83tHFLSlts+OAHsNendaqv2tHCq+/MO+b3Y+9JeoUlIvobyxG/Z8GNeOg=="; + }; + }; + "cli-color-2.0.3" = { + name = "cli-color"; + packageName = "cli-color"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-color/-/cli-color-2.0.3.tgz"; + sha512 = "OkoZnxyC4ERN3zLzZaY9Emb7f/MhBOIpePv0Ycok0fJYT+Ouo00UBEIwsVsr0yoow++n5YWlSUgST9GKhNHiRQ=="; }; }; "cli-cursor-1.0.2" = { @@ -19274,13 +19382,13 @@ let sha512 = "+3MlQHdTSiT7e3Uxco/FL1MjuIYLmvDEhCAekRLCrGimHGfAR1LbJwCrKGceVp95a4oDFVB9CtLWiw2MT8NDXw=="; }; }; - "cli-progress-3.11.1" = { + "cli-progress-3.11.2" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.11.1"; + version = "3.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.11.1.tgz"; - sha512 = "TTMA2LHrYaZeNMcgZGO10oYqj9hvd03pltNtVbu4ddeyDTHlYV7gWxsFiuvaQlgwMBFCv1TukcjiODWFlb16tQ=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.11.2.tgz"; + sha512 = "lCPoS6ncgX4+rJu5bS3F/iCz17kZ9MPZ6dpuTtI0KXKABkhyXIdYB3Inby1OpaGti3YlI3EeEkM9AuWpelJrVA=="; }; }; "cli-progress-footer-2.3.2" = { @@ -19319,6 +19427,15 @@ let sha512 = "x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g=="; }; }; + "cli-spinners-2.7.0" = { + name = "cli-spinners"; + packageName = "cli-spinners"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz"; + sha512 = "qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="; + }; + }; "cli-sprintf-format-1.1.1" = { name = "cli-sprintf-format"; packageName = "cli-sprintf-format"; @@ -19445,6 +19562,15 @@ let sha512 = "FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="; }; }; + "cli-width-4.0.0" = { + name = "cli-width"; + packageName = "cli-width"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-width/-/cli-width-4.0.0.tgz"; + sha512 = "ZksGS2xpa/bYkNzN3BAw1wEjsLV/ZKOf/CCrJ/QOBsxx6fOARIkwTutxp1XIOIohi6HKmOFjMoK/XaqDVUpEEw=="; + }; + }; "cliclopts-1.1.1" = { name = "cliclopts"; packageName = "cliclopts"; @@ -19679,6 +19805,15 @@ let sha512 = "yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q=="; }; }; + "clone-response-1.0.3" = { + name = "clone-response"; + packageName = "clone-response"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz"; + sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; + }; + }; "clone-stats-0.0.1" = { name = "clone-stats"; packageName = "clone-stats"; @@ -19715,13 +19850,13 @@ let sha512 = "J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw=="; }; }; - "clsx-1.1.1" = { + "clsx-1.2.1" = { name = "clsx"; packageName = "clsx"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/clsx/-/clsx-1.1.1.tgz"; - sha512 = "6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="; + url = "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz"; + sha512 = "EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg=="; }; }; "clubhouse-lib-0.10.0" = { @@ -19742,15 +19877,6 @@ let sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw=="; }; }; - "cmd-shim-4.1.0" = { - name = "cmd-shim"; - packageName = "cmd-shim"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-4.1.0.tgz"; - sha512 = "lb9L7EM4I/ZRVuljLPEtUJOP+xiQVknZ4ZMpMgEp4JzNldPb27HU03hi6K1/6CoIuit/Zm/LQXySErFeXxDprw=="; - }; - }; "cmd-shim-5.0.0" = { name = "cmd-shim"; packageName = "cmd-shim"; @@ -19841,6 +19967,15 @@ let sha512 = "tge3BeOtehBouqo8sdrjRuQxsAWuwUxWJN1pTttZ8HpV+fe2fxmBE9lqrzzOlRIysBvgsZr7D0FdNfrwRwpK8A=="; }; }; + "code-block-writer-10.1.1" = { + name = "code-block-writer"; + packageName = "code-block-writer"; + version = "10.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/code-block-writer/-/code-block-writer-10.1.1.tgz"; + sha512 = "67ueh2IRGst/51p0n6FvPrnRjAGHY5F8xdjkgrYE7DDzpJe6qA07RYQ9VcoUeo5ATOjSOiWpSL3SWBRRbempMw=="; + }; + }; "code-excerpt-3.0.0" = { name = "code-excerpt"; packageName = "code-excerpt"; @@ -19877,22 +20012,13 @@ let sha512 = "+xi2ENsvchtUNa8oBUU58gHgmyN6BEEeZ8NIEgeQ0XnC+AoyihivgZYe+OOiNi+fLy/NUowugwV5gP8XWYDm0Q=="; }; }; - "codemaker-0.22.0" = { + "codemaker-1.63.2" = { name = "codemaker"; packageName = "codemaker"; - version = "0.22.0"; + version = "1.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-0.22.0.tgz"; - sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; - }; - }; - "codemaker-1.61.0" = { - name = "codemaker"; - packageName = "codemaker"; - version = "1.61.0"; - src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.61.0.tgz"; - sha512 = "do01ygDHvcw0ZqV4isyzwMMJmAO+LtqROLC3dlp6XJk7XdTaZHoyMXRLoDdB50o4QLmGf2NZEVZmbKEOOXNYRw=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.63.2.tgz"; + sha512 = "cb0fQK8kHE7NVl4V98evbDhEwXsObujJLVGbQJXJ1W9O2c6DTKzJ0hct+NnQqAEaAgll9qUJbWxTsIlSoqLOsQ=="; }; }; "codepage-1.4.0" = { @@ -20417,13 +20543,13 @@ let sha512 = "JJfP2saEKbQqvW+FI93OYUB4ByV5cizMpFMiiJI8xDbBvQvSkIk0VvQdn1CZ8mqAO8Loq2h0gYTYtDFUZUeERw=="; }; }; - "commander-9.3.0" = { + "commander-9.4.0" = { name = "commander"; packageName = "commander"; - version = "9.3.0"; + version = "9.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz"; - sha512 = "hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw=="; + url = "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz"; + sha512 = "sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="; }; }; "commandpost-1.4.0" = { @@ -20723,6 +20849,15 @@ let sha512 = "o9Fv1Mv+6A0JpoayQ8JleNp3hhkbOJP/Re/Q+QqxMPHPkABVsRjQGWZn9A5GcqLiTNC6d89p2PB5ZhHVDSMwyg=="; }; }; + "conf-10.2.0" = { + name = "conf"; + packageName = "conf"; + version = "10.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/conf/-/conf-10.2.0.tgz"; + sha512 = "8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg=="; + }; + }; "conf-6.2.4" = { name = "conf"; packageName = "conf"; @@ -20804,6 +20939,15 @@ let sha512 = "aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA=="; }; }; + "configstore-6.0.0" = { + name = "configstore"; + packageName = "configstore"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/configstore/-/configstore-6.0.0.tgz"; + sha512 = "cD31W1v3GqUlQvbBCGcXmd2Nj9SvLDOP1oQ0YFuLETufzSPaKp11rYBsSOm7rCsW3OnIRAFM3OxRhceaXNYHkA=="; + }; + }; "connect-1.9.2" = { name = "connect"; packageName = "connect"; @@ -20867,6 +21011,15 @@ let sha512 = "e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg=="; }; }; + "connect-history-api-fallback-2.0.0" = { + name = "connect-history-api-fallback"; + packageName = "connect-history-api-fallback"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz"; + sha512 = "U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA=="; + }; + }; "connect-multiparty-2.2.0" = { name = "connect-multiparty"; packageName = "connect-multiparty"; @@ -20975,13 +21128,13 @@ let sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; }; - "constructs-10.1.42" = { + "constructs-10.1.66" = { name = "constructs"; packageName = "constructs"; - version = "10.1.42"; + version = "10.1.66"; src = fetchurl { - url = "https://registry.npmjs.org/constructs/-/constructs-10.1.42.tgz"; - sha512 = "5AELa/PFtZG+WTjn9HoXhqsDZYV6l3J7Li9xw6vREYVMasF8cnVbTZvA4crP1gIyKtBAxAlnZCmzmCbicnH6eg=="; + url = "https://registry.npmjs.org/constructs/-/constructs-10.1.66.tgz"; + sha512 = "7HVFV3mQumsQrKEFpRDPWsjlPjKZpkvYwIOWEX1tNAUP4bW6Q/AJak5SEgqVHnO4xhT/XekXZa2m9kXv00A7Ng=="; }; }; "consume-http-header-1.0.0" = { @@ -21444,15 +21597,6 @@ let sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; - "cookie-signature-1.2.0" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.0.tgz"; - sha512 = "R0BOPfLGTitaKhgKROKZQN6iyq2iDQcH1DOF8nJoaWapguX5bC2w+Q/I9NmmM5lfcvEarnLZr+cCvmEYYSXvYA=="; - }; - }; "cookiejar-2.0.6" = { name = "cookiejar"; packageName = "cookiejar"; @@ -21615,31 +21759,31 @@ let sha512 = "UoGQ/cfzGYIuiq6Z7vWL1HfkE9U9IZ4Ub+0XSiJTCzvbZzgPA69oDF2f+lgJ6dFFLEdjW5O6svvoKzXX23xFkA=="; }; }; - "core-js-3.23.2" = { + "core-js-3.24.1" = { name = "core-js"; packageName = "core-js"; - version = "3.23.2"; + version = "3.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.23.2.tgz"; - sha512 = "ELJOWxNrJfOH/WK4VJ3Qd+fOqZuOuDNDJz0xG6Bt4mGg2eO/UT9CljCrbqDGovjLKUrGajEEBcoTOc0w+yBYeQ=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz"; + sha512 = "0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="; }; }; - "core-js-compat-3.23.2" = { + "core-js-compat-3.24.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.23.2"; + version = "3.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.23.2.tgz"; - sha512 = "lrgZvxFwbQp9v7E8mX0rJ+JX7Bvh4eGULZXA1IAyjlsnWvCdw6TF8Tg6xtaSUSJMrSrMaLdpmk+V54LM1dvfOA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.24.1.tgz"; + sha512 = "XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw=="; }; }; - "core-js-pure-3.23.2" = { + "core-js-pure-3.24.1" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.23.2"; + version = "3.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.23.2.tgz"; - sha512 = "t6u7H4Ff/yZNk+zqTr74UjCcZ3k8ApBryeLLV4rYQd9aF3gqmjjGjjR44ENfeBMH8VVvSynIjAJ0mUuFhzQtrA=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.24.1.tgz"; + sha512 = "r1nJk41QLLPyozHUUPmILCEMtMw24NG4oWK6RbsDdjzQgg9ZvrUsPBj1MnG0wXXp1DCDU6j+wUvEmBSrtRbLXg=="; }; }; "core-util-is-1.0.2" = { @@ -21759,13 +21903,22 @@ let sha512 = "H/2gurFWVi7xXvCyvsWRLCMekl4tITJcX0QEsDMpzxtuxDyM59xLatYNg4s/k9AA/HdtCYfj2su8mgA0GSDLDA=="; }; }; - "cosmiconfig-typescript-loader-2.0.1" = { + "cosmiconfig-typescript-loader-2.0.2" = { name = "cosmiconfig-typescript-loader"; packageName = "cosmiconfig-typescript-loader"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-2.0.1.tgz"; - sha512 = "B9s6sX/omXq7I6gC6+YgLmrBFMJhPWew7ty/X5Tuwtd2zOSgWaUdXjkuVwbe3qqcdETo60+1nSVMekq//LIXVA=="; + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-2.0.2.tgz"; + sha512 = "KmE+bMjWMXJbkWCeY4FJX/npHuZPNr9XF9q9CIQ/bpFwi1qHfCmSiKarrCcRa0LO4fWjk93pVoeRtJAkTGcYNw=="; + }; + }; + "cosmiconfig-typescript-loader-3.1.1" = { + name = "cosmiconfig-typescript-loader"; + packageName = "cosmiconfig-typescript-loader"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.1.1.tgz"; + sha512 = "SR5/NciF0vyYqcGsmB9WJ4QOKkcSSSzcBPLrnT6094BYahMy0eImWvlH3zoEOYqpF2zgiyAKHtWTXTo+fqgxPg=="; }; }; "count-trailing-zeros-1.0.1" = { @@ -21885,13 +22038,13 @@ let sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw=="; }; }; - "create-gatsby-2.17.0" = { + "create-gatsby-2.20.0" = { name = "create-gatsby"; packageName = "create-gatsby"; - version = "2.17.0"; + version = "2.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.17.0.tgz"; - sha512 = "RrMAHZL7J5Ew/laz83g+UNQ2RnXszGuub3sG7DQkG0tK5mS9TqTW+FIYyzHCLhdJkr81qC/HRDFsJv0fuYISwg=="; + url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-2.20.0.tgz"; + sha512 = "gMQRMpOleM9XB7VLRhto+5KTniWLXPUZWyh/cHcD94w8VmC/kR3oGKWLY2cPZ5N9uNQS3/eVcG0L2LOSIVKZ9A=="; }; }; "create-graphback-1.0.1" = { @@ -21939,13 +22092,13 @@ let sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ=="; }; }; - "create-torrent-5.0.2" = { + "create-torrent-5.0.4" = { name = "create-torrent"; packageName = "create-torrent"; - version = "5.0.2"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.2.tgz"; - sha512 = "tNelixVeEkjiyeAuCW7uWFl1ARA+YapyZvdSWw6U3AXe/VXpxR4ihFNfjOzmvc5TBqK5EkGdsoKXAEKfQ8xlmQ=="; + url = "https://registry.npmjs.org/create-torrent/-/create-torrent-5.0.4.tgz"; + sha512 = "59brGxFHoWWXzpFKAwD/vB/BYTALDuf+1Wmajxq2ZYnllJtg8SwfcmP7PHCKas5mDTZLD4om1cneC1YMZFuPUA=="; }; }; "cron-parser-2.18.0" = { @@ -22074,15 +22227,6 @@ let sha512 = "mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw=="; }; }; - "cross-undici-fetch-0.4.7" = { - name = "cross-undici-fetch"; - packageName = "cross-undici-fetch"; - version = "0.4.7"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-undici-fetch/-/cross-undici-fetch-0.4.7.tgz"; - sha512 = "e5KZdjHigxFECfw1B7cjmXLm3yT8eiffSJYUSyIWxy6c+f/MGiJsV1NHegZvG23ZgQ0o8rNaZxbtu5NdF5FmwQ=="; - }; - }; "crossroads-0.12.2" = { name = "crossroads"; packageName = "crossroads"; @@ -22155,49 +22299,67 @@ let sha512 = "v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA=="; }; }; - "cspell-gitignore-6.1.2" = { + "crypto-random-string-4.0.0" = { + name = "crypto-random-string"; + packageName = "crypto-random-string"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz"; + sha512 = "x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA=="; + }; + }; + "cspell-gitignore-6.5.0" = { name = "cspell-gitignore"; packageName = "cspell-gitignore"; - version = "6.1.2"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.1.2.tgz"; - sha512 = "9P4ltD5DF/Dogz/+IgW8BZjqvgbOghg2OKk165+ilKgoQc73zHQy8bZRdJsDo2NBevmT8Z9RswEN37pQvzmMqQ=="; + url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-6.5.0.tgz"; + sha512 = "mk8yQjUAVHcaEc5wgdoZlI8gD4ApcAqpf+uoV9MsNgCuvoaWi6HLBxkoWCUbPmUBvvhaSBJRPlUIX+LvvN/0BA=="; }; }; - "cspell-glob-6.1.2" = { + "cspell-glob-6.4.2" = { name = "cspell-glob"; packageName = "cspell-glob"; - version = "6.1.2"; + version = "6.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.1.2.tgz"; - sha512 = "+EN4DEyK8ohwZLShPw9vhU6114fnGYi8q4IQAGc5qCCcnMTgb1H3N840YyG+EuP0Q1o3TwMYMA+B+tw4w+yQSg=="; + url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-6.4.2.tgz"; + sha512 = "kVMim9Dry55rH00eYEieNv4/e5gHfDwUiyF+hjSCu2j/+oT+w+muF8YiJCA9YPNYfd7TByphE/G2ezhLs2Hv8w=="; }; }; - "cspell-io-6.1.2" = { + "cspell-grammar-6.5.0" = { + name = "cspell-grammar"; + packageName = "cspell-grammar"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-6.5.0.tgz"; + sha512 = "wq6xtSL+C4JY+pMavUBDZhpKIWLW8pPgoR520r87qei14dgEbfpZuujqqWoHUV565sc0Zh7alOVYoQk+QKqvrQ=="; + }; + }; + "cspell-io-6.5.0" = { name = "cspell-io"; packageName = "cspell-io"; - version = "6.1.2"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.1.2.tgz"; - sha512 = "WVRKjOzB3BgwJPk4hWH19jiqXzbtWGzJ1yNLaB2r3KYCDh+FYT4jVaHb5DWERASahvukb05go7G623FuYeoY3Q=="; + url = "https://registry.npmjs.org/cspell-io/-/cspell-io-6.5.0.tgz"; + sha512 = "Vm/Ra3bIDGL6P4CUeTwlQtpyep/rEli8W//tMxo+8Or5ya9hZBFZOa0//QlZSyUU7UjzrG83lPaZrs4XVsVZFw=="; }; }; - "cspell-lib-6.1.2" = { + "cspell-lib-6.5.0" = { name = "cspell-lib"; packageName = "cspell-lib"; - version = "6.1.2"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.1.2.tgz"; - sha512 = "oJVAvxnP6jsiglLIdFy9agO5vfArTQdLweRjkR8SbVPoYQ8vyDfrbQT9J+K+ekKpCvpzKKzjleOJHHwJFeltGQ=="; + url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-6.5.0.tgz"; + sha512 = "sSjTy+N9w5Hhn9czg26WuPLEKeVcv7NIHDTVQEK4JHBqB6y+I6NhrJZ3Zr3WA7ME2/1U6FyZzumNLru6PDPk6w=="; }; }; - "cspell-trie-lib-6.1.2" = { + "cspell-trie-lib-6.5.0" = { name = "cspell-trie-lib"; packageName = "cspell-trie-lib"; - version = "6.1.2"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.1.2.tgz"; - sha512 = "VQasYB6WYQZz71Uo0Z4K/i6qOZpBqOh0SbKQr6n0lkejnmoAv324SKJqKyXyizWCQQvWDq+ax18bW+KBFNBzxQ=="; + url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-6.5.0.tgz"; + sha512 = "bXc/YpbHA/xbtRJV7ocNyo3RFSAOLaz3iR+8KyWFNrIQqGOuaCslHkpRfkdZPOBYiOE8z3tjVoVQkrUYUuYWcQ=="; }; }; "csrf-3.1.0" = { @@ -22641,13 +22803,13 @@ let sha512 = "byxnDBxM1AVF3YfmsK7Smop9/usNz7gAZYSo9eYp61TGcNXraJby1rAiLyJSt1/8Iho2qaxZOtZCOvQMXogPtg=="; }; }; - "csv-parse-5.2.0" = { + "csv-parse-5.3.0" = { name = "csv-parse"; packageName = "csv-parse"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.2.0.tgz"; - sha512 = "ZuLjTp3Qx2gycoB7FKS9q11KgDL3f0wQszTlNOajS3fHa0jypN/zgjmkam+rczX5dXw5z7+KrDW2hWkM4542Ug=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-5.3.0.tgz"; + sha512 = "UXJCGwvJ2fep39purtAn27OUYmxB1JQto+zhZ4QlJpzsirtSFbzLvip1aIgziqNdZp/TptvsKEV5BZSxe10/DQ=="; }; }; "csv-stream-0.2.0" = { @@ -22803,13 +22965,13 @@ let sha512 = "4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw=="; }; }; - "d3-7.4.4" = { + "d3-7.6.1" = { name = "d3"; packageName = "d3"; - version = "7.4.4"; + version = "7.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/d3/-/d3-7.4.4.tgz"; - sha512 = "97FE+MYdAlV3R9P74+R3Uar7wUKkIFu89UWMjEaDhiJ9VxKvqaMxauImy8PC2DdBkdM2BxJOIoLxPrcZUyrKoQ=="; + url = "https://registry.npmjs.org/d3/-/d3-7.6.1.tgz"; + sha512 = "txMTdIHFbcpLx+8a0IFhZsbp+PfBBPt8yfbmukZTQFroKuFqIwqswF0qE5JXWefylaAVpSXFoKm3yP+jpNLFLw=="; }; }; "d3-array-1.2.4" = { @@ -22830,13 +22992,13 @@ let sha512 = "33qQ+ZoZlli19IFiQx4QEpf2CBEayMRzhlisJHSCsSUbDXv6ZishqS1x7uFVClKG4Wr7rZVHvaAttoLow6GqdQ=="; }; }; - "d3-array-3.1.6" = { + "d3-array-3.2.0" = { name = "d3-array"; packageName = "d3-array"; - version = "3.1.6"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-array/-/d3-array-3.1.6.tgz"; - sha512 = "DCbBBNuKOeiR9h04ySRBMW52TFVc91O9wJziuyXw6Ztmy8D3oZbmCkOO3UHKC7ceNJsN2Mavo9+vwV8EAEUXzA=="; + url = "https://registry.npmjs.org/d3-array/-/d3-array-3.2.0.tgz"; + sha512 = "3yXFQo0oG3QCxbF06rMPFyGRMGJNS7NvsV1+2joOjbBE+9xvWQ8+GcMJAjRCzw06zQ3/arXeJgbPYcjUCuC+3g=="; }; }; "d3-axis-1.0.12" = { @@ -22938,13 +23100,13 @@ let sha512 = "hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg=="; }; }; - "d3-contour-3.0.1" = { + "d3-contour-4.0.0" = { name = "d3-contour"; packageName = "d3-contour"; - version = "3.0.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/d3-contour/-/d3-contour-3.0.1.tgz"; - sha512 = "0Oc4D0KyhwhM7ZL0RMnfGycLN7hxHB8CMmwZ3+H26PWAG0ozNuYG5hXSDNgmP1SgJkQMrlG6cP20HoaSbvcJTQ=="; + url = "https://registry.npmjs.org/d3-contour/-/d3-contour-4.0.0.tgz"; + sha512 = "7aQo0QHUTu/Ko3cP9YK9yUTxtoDEiDGwnBHyLxG5M4vqlBkO/uixMRele3nfsfj6UXOcuReVpVXzAboGraYIJw=="; }; }; "d3-delaunay-6.0.2" = { @@ -23730,13 +23892,13 @@ let sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; }; }; - "date-fns-2.28.0" = { + "date-fns-2.29.1" = { name = "date-fns"; packageName = "date-fns"; - version = "2.28.0"; + version = "2.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/date-fns/-/date-fns-2.28.0.tgz"; - sha512 = "8d35hViGYx/QH0icHYCeLmsLmMUheMmTyV9Fcm6gvNwdw31yXXH+O85sOBJ+OLnLQMKZowvpKb6FgMIQjcpvQw=="; + url = "https://registry.npmjs.org/date-fns/-/date-fns-2.29.1.tgz"; + sha512 = "dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw=="; }; }; "date-format-1.2.0" = { @@ -23766,13 +23928,13 @@ let sha512 = "eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w=="; }; }; - "date-format-4.0.11" = { + "date-format-4.0.13" = { name = "date-format"; packageName = "date-format"; - version = "4.0.11"; + version = "4.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/date-format/-/date-format-4.0.11.tgz"; - sha512 = "VS20KRyorrbMCQmpdl2hg5KaOUsda1RbnsJg461FfrcyCUg+pkd0b40BSW4niQyTheww4DBXQnS7HwSrKkipLw=="; + url = "https://registry.npmjs.org/date-format/-/date-format-4.0.13.tgz"; + sha512 = "bnYCwf8Emc3pTD8pXnre+wfnjGtfi5ncMDKy7+cWZXbmRAsdWkOQHrfC1yz/KiwP5thDp2kCHWYWKBX4HP1hoQ=="; }; }; "date-now-0.1.4" = { @@ -23811,13 +23973,13 @@ let sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA=="; }; }; - "dayjs-1.11.3" = { + "dayjs-1.11.4" = { name = "dayjs"; packageName = "dayjs"; - version = "1.11.3"; + version = "1.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz"; - sha512 = "xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.4.tgz"; + sha512 = "Zj/lPM5hOvQ1Bf7uAvewDaUcsJoI6JmNqmHhHl3nyumwe0XHwt8sWdOVAPACJzCebL8gQCi+K49w7iKWnGwX9g=="; }; }; "dayjs-1.8.36" = { @@ -23847,13 +24009,13 @@ let sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ=="; }; }; - "deasync-0.1.26" = { + "deasync-0.1.27" = { name = "deasync"; packageName = "deasync"; - version = "0.1.26"; + version = "0.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.26.tgz"; - sha512 = "YKw0BmJSWxkjtQsbgn6Q9CHSWB7DKMen8vKrgyC006zy0UZ6nWyGidB0IzZgqkVRkOglAeUaFtiRTeLyel72bg=="; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.27.tgz"; + sha512 = "aCt6M9Ilkvs8TKIchmibUpNe/QSp9UNQL6YkvVraAce/SFFZCvYw3lQevl6MlUDn8Xr4QD4wYTerWH22yn+ODQ=="; }; }; "debounce-1.2.1" = { @@ -24702,6 +24864,15 @@ let sha512 = "tfiWc6BQLXNLpNiR5iGd0Ocu3P3VpxfzFiqubLgMfhfOw9WyvgJBd46CClNn9k3qfbjvT//0cf7AlYRX/OslMQ=="; }; }; + "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=="; + }; + }; "dep-graph-1.1.0" = { name = "dep-graph"; packageName = "dep-graph"; @@ -24756,15 +24927,6 @@ let sha512 = "JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg=="; }; }; - "deprecated-decorator-0.1.6" = { - name = "deprecated-decorator"; - packageName = "deprecated-decorator"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz"; - sha512 = "MHidOOnCHGlZDKsI21+mbIIhf4Fff+hhCTB7gtVg4uoIqjcrTZc5v6M+GS2zVI0sV7PqK415rb8XaOSQsQkHOw=="; - }; - }; "deprecation-2.3.1" = { name = "deprecation"; packageName = "deprecation"; @@ -24783,13 +24945,13 @@ let sha512 = "1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw=="; }; }; - "dequal-2.0.2" = { + "dequal-2.0.3" = { name = "dequal"; packageName = "dequal"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/dequal/-/dequal-2.0.2.tgz"; - sha512 = "q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug=="; + url = "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz"; + sha512 = "0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA=="; }; }; "deref-0.6.4" = { @@ -24963,13 +25125,13 @@ let sha512 = "LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A=="; }; }; - "devtools-protocol-0.0.1001819" = { + "devtools-protocol-0.0.1019158" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.1001819"; + version = "0.0.1019158"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1001819.tgz"; - sha512 = "G6OsIFnv/rDyxSqBa2lDLR6thp9oJioLsb2Gl+LbQlyoA9/OBAkrTU9jiCcQ8Pnh7z4d6slDiLaogR5hzgJLmQ=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1019158.tgz"; + sha512 = "wvq+KscQ7/6spEV7czhnZc9RM/woz1AY+/Vpd8/h2HFMwJSdTliu7f/yr1A6vDdJfKICZsShqsYpEQbdhg8AFQ=="; }; }; "devtools-protocol-0.0.901419" = { @@ -25134,13 +25296,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.4.17" = { + "diff2html-3.4.18" = { name = "diff2html"; packageName = "diff2html"; - version = "3.4.17"; + version = "3.4.18"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.17.tgz"; - sha512 = "B/H+iLRHTsRl2Ffs/7tYJ0Rg4uisXe83inIdNE8trXY83Wn7OCTslJNP7fyaUpSsLbRIzPSNgT7LqFNiIQlDyg=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.4.18.tgz"; + sha512 = "eZP1vKjCNMPFpCoY0+ATZYTgdUUriUTLxRLjjAx6qPje7orIirtTkW3ghVcz3dIBjcum47AGIHBHpLhdrdS7aw=="; }; }; "diff3-0.0.3" = { @@ -25701,6 +25863,15 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; + "dompurify-2.3.10" = { + name = "dompurify"; + packageName = "dompurify"; + version = "2.3.10"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.10.tgz"; + sha512 = "o7Fg/AgC7p/XpKjf/+RC3Ok6k4St5F7Q6q6+Nnm3p2zGWioAY6dh0CbbuwOhH2UcSzKsdniE/YnE2/92JcsA+g=="; + }; + }; "dompurify-2.3.5" = { name = "dompurify"; packageName = "dompurify"; @@ -25710,15 +25881,6 @@ let sha512 = "kD+f8qEaa42+mjdOpKeztu9Mfx5bv9gVLO6K9jRx4uGvh6Wv06Srn4jr1wPNY2OOUGGSKHNFN+A8MA3v0E0QAQ=="; }; }; - "dompurify-2.3.8" = { - name = "dompurify"; - packageName = "dompurify"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.3.8.tgz"; - sha512 = "eVhaWoVibIzqdGYjwsBWodIQIaXFSB+cKDf4cfxLMsK0xiud6SE+/WCVx/Xw/UwQsa4cS3T2eITcdtmTg2UKcw=="; - }; - }; "domutils-1.4.3" = { name = "domutils"; packageName = "domutils"; @@ -26034,13 +26196,13 @@ let sha512 = "asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA=="; }; }; - "duplexer3-0.1.4" = { + "duplexer3-0.1.5" = { name = "duplexer3"; packageName = "duplexer3"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; - sha512 = "CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA=="; + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz"; + sha512 = "1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="; }; }; "duplexify-3.7.1" = { @@ -26097,13 +26259,13 @@ let sha512 = "vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA=="; }; }; - "earcut-2.2.3" = { + "earcut-2.2.4" = { name = "earcut"; packageName = "earcut"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/earcut/-/earcut-2.2.3.tgz"; - sha512 = "iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug=="; + url = "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz"; + sha512 = "/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ=="; }; }; "eastasianwidth-0.2.0" = { @@ -26187,6 +26349,15 @@ let sha512 = "hDZWhCHZ1wu4P2g2RVsM2MjDmmJzhvcsXr5qHUSBJZXvuhJSunhbVsWoBXdIe0/yTa3RV4UaWpOmFmrVsKr0wA=="; }; }; + "edge-runtime-1.1.0-beta.23" = { + name = "edge-runtime"; + packageName = "edge-runtime"; + version = "1.1.0-beta.23"; + src = fetchurl { + url = "https://registry.npmjs.org/edge-runtime/-/edge-runtime-1.1.0-beta.23.tgz"; + sha512 = "A7dO/Y+4UJnaxFcdz6pepL+0GcvvViWvf201oFQXepgdSxPDKiqxaayCag0eiirQ6OfF+cSTmPD3xrfEoAIjiQ=="; + }; + }; "editor-1.0.0" = { name = "editor"; packageName = "editor"; @@ -26259,13 +26430,13 @@ let sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; }; - "electron-18.3.4" = { + "electron-18.3.7" = { name = "electron"; packageName = "electron"; - version = "18.3.4"; + version = "18.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/electron/-/electron-18.3.4.tgz"; - sha512 = "MIxQnaQR7NzWZOuAhRbJAf+pPyoXXGNge9E6pz7nGLXE/DxeN6BUbKb0iWVCCMkxIpqdIhXdc5sViUCX74dvsw=="; + url = "https://registry.npmjs.org/electron/-/electron-18.3.7.tgz"; + sha512 = "SDvX0VYejR1xw9PrJyvnyiDcuIhdzFVaA1NaRN2LEWXr5R6mEFl8NVTM+i5dtxMm2SHP/FPnkvmsWZs6MHijqg=="; }; }; "electron-notarize-1.2.1" = { @@ -26295,22 +26466,22 @@ let sha512 = "9/fqF64GACZsLYLuFJ8vCqItMXbvsD0NMDLNfFmAv9mSqkqKWSZb5V3VE9CxT6CeXwZ6wN3YowEQuqBNyShEVg=="; }; }; - "electron-rebuild-3.2.7" = { + "electron-rebuild-3.2.9" = { name = "electron-rebuild"; packageName = "electron-rebuild"; - version = "3.2.7"; + version = "3.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-3.2.7.tgz"; - sha512 = "WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw=="; + url = "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-3.2.9.tgz"; + sha512 = "FkEZNFViUem3P0RLYbZkUjC8LUFIK+wKq09GHoOITSJjfDAVQv964hwaNseTTWt58sITQX3/5fHNYcTefqaCWw=="; }; }; - "electron-to-chromium-1.4.164" = { + "electron-to-chromium-1.4.211" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.164"; + version = "1.4.211"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.164.tgz"; - sha512 = "K7iy5y6XyP9Pzh3uaDti0KC4JUNT6T1tLG5RTOmesqq2YgAJpYYYJ32m+anvZYjCV35llPTEh87kvEV/uSsiyQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.211.tgz"; + sha512 = "BZSbMpyFQU0KBJ1JG26XGeFI3i4op+qOYGxftmZXFZoHkhLgsSv4DHDJfl8ogII3hIuzGt51PaZ195OVu0yJ9A=="; }; }; "electrum-client-git+https://github.com/janoside/electrum-client" = { @@ -26621,13 +26792,13 @@ let sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg=="; }; }; - "engine.io-3.5.0" = { + "engine.io-3.6.0" = { name = "engine.io"; packageName = "engine.io"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.5.0.tgz"; - sha512 = "21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.6.0.tgz"; + sha512 = "Kc8fo5bbg8F4a2f3HPHTEpGyq/IRIQpyeHu3H1ThR14XDD7VrLcsGBo16HUpahgp8YkHJDaU5gNxJZbuGcuueg=="; }; }; "engine.io-6.0.1" = { @@ -26765,13 +26936,13 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.9.3" = { + "enhanced-resolve-5.10.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.9.3"; + version = "5.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz"; - sha512 = "Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz"; + sha512 = "T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ=="; }; }; "enquirer-2.3.6" = { @@ -26855,13 +27026,13 @@ let sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; }; }; - "entities-4.3.0" = { + "entities-4.3.1" = { name = "entities"; packageName = "entities"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-4.3.0.tgz"; - sha512 = "/iP1rZrSEJ0DTlPiX+jbzlA3eVkY/e8L8SozroF395fIqE3TYF/Nz7YOMAawta+vLmyJ/hkGNNPcSbMADCCXbg=="; + url = "https://registry.npmjs.org/entities/-/entities-4.3.1.tgz"; + sha512 = "o4q/dYJlmyjP2zfnaWDUC6A3BQFmVTX+tZPezK7k0GLSU9QYCauscf5Y+qcEPzKL+EixVouYDgLQK5H9GrLpkg=="; }; }; "env-editor-0.4.2" = { @@ -27062,13 +27233,22 @@ let sha512 = "QQ6yXmQM/cfWYj9/DM3hPRcHBZdWCoJU+35CoaMqw53sH2uqr29EZ0ne1PF/3LIG/cmawn1SbCPqcZE+siHmwg=="; }; }; - "es5-ext-0.10.61" = { + "es5-ext-0.10.53" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.61"; + version = "0.10.53"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz"; - sha512 = "yFhIqQAzu2Ca2I4SE2Au3rxVfmohU9Y7wqGR+s7+H7krk26NXhIRAZDgqd6xqjCEFUomDEA3/Bo/7fKmIkW1kA=="; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"; + sha512 = "Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q=="; + }; + }; + "es5-ext-0.10.62" = { + name = "es5-ext"; + packageName = "es5-ext"; + version = "0.10.62"; + src = fetchurl { + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz"; + sha512 = "BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA=="; }; }; "es6-error-4.1.1" = { @@ -27197,6 +27377,195 @@ let sha512 = "w/XuoBCSwepyiZtIRsKsetiLDUVGPVw1E/R3VTFSecIy8UR7Cq3SOtwKHJMFoVqqVG36aGkzh4e8BvpO1Fdc7g=="; }; }; + "esbuild-0.14.47" = { + name = "esbuild"; + packageName = "esbuild"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.14.47.tgz"; + sha512 = "wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA=="; + }; + }; + "esbuild-android-64-0.14.47" = { + name = "esbuild-android-64"; + packageName = "esbuild-android-64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.47.tgz"; + sha512 = "R13Bd9+tqLVFndncMHssZrPWe6/0Kpv2/dt4aA69soX4PRxlzsVpCvoJeFE8sOEoeVEiBkI0myjlkDodXlHa0g=="; + }; + }; + "esbuild-android-arm64-0.14.47" = { + name = "esbuild-android-arm64"; + packageName = "esbuild-android-arm64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.47.tgz"; + sha512 = "OkwOjj7ts4lBp/TL6hdd8HftIzOy/pdtbrNA4+0oVWgGG64HrdVzAF5gxtJufAPOsEjkyh1oIYvKAUinKKQRSQ=="; + }; + }; + "esbuild-darwin-64-0.14.47" = { + name = "esbuild-darwin-64"; + packageName = "esbuild-darwin-64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.47.tgz"; + sha512 = "R6oaW0y5/u6Eccti/TS6c/2c1xYTb1izwK3gajJwi4vIfNs1s8B1dQzI1UiC9T61YovOQVuePDcfqHLT3mUZJA=="; + }; + }; + "esbuild-darwin-arm64-0.14.47" = { + name = "esbuild-darwin-arm64"; + packageName = "esbuild-darwin-arm64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.47.tgz"; + sha512 = "seCmearlQyvdvM/noz1L9+qblC5vcBrhUaOoLEDDoLInF/VQ9IkobGiLlyTPYP5dW1YD4LXhtBgOyevoIHGGnw=="; + }; + }; + "esbuild-freebsd-64-0.14.47" = { + name = "esbuild-freebsd-64"; + packageName = "esbuild-freebsd-64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.47.tgz"; + sha512 = "ZH8K2Q8/Ux5kXXvQMDsJcxvkIwut69KVrYQhza/ptkW50DC089bCVrJZZ3sKzIoOx+YPTrmsZvqeZERjyYrlvQ=="; + }; + }; + "esbuild-freebsd-arm64-0.14.47" = { + name = "esbuild-freebsd-arm64"; + packageName = "esbuild-freebsd-arm64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.47.tgz"; + sha512 = "ZJMQAJQsIOhn3XTm7MPQfCzEu5b9STNC+s90zMWe2afy9EwnHV7Ov7ohEMv2lyWlc2pjqLW8QJnz2r0KZmeAEQ=="; + }; + }; + "esbuild-linux-32-0.14.47" = { + name = "esbuild-linux-32"; + packageName = "esbuild-linux-32"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.47.tgz"; + sha512 = "FxZOCKoEDPRYvq300lsWCTv1kcHgiiZfNrPtEhFAiqD7QZaXrad8LxyJ8fXGcWzIFzRiYZVtB3ttvITBvAFhKw=="; + }; + }; + "esbuild-linux-64-0.14.47" = { + name = "esbuild-linux-64"; + packageName = "esbuild-linux-64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.47.tgz"; + sha512 = "nFNOk9vWVfvWYF9YNYksZptgQAdstnDCMtR6m42l5Wfugbzu11VpMCY9XrD4yFxvPo9zmzcoUL/88y0lfJZJJw=="; + }; + }; + "esbuild-linux-arm-0.14.47" = { + name = "esbuild-linux-arm"; + packageName = "esbuild-linux-arm"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.47.tgz"; + sha512 = "ZGE1Bqg/gPRXrBpgpvH81tQHpiaGxa8c9Rx/XOylkIl2ypLuOcawXEAo8ls+5DFCcRGt/o3sV+PzpAFZobOsmA=="; + }; + }; + "esbuild-linux-arm64-0.14.47" = { + name = "esbuild-linux-arm64"; + packageName = "esbuild-linux-arm64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.47.tgz"; + sha512 = "ywfme6HVrhWcevzmsufjd4iT3PxTfCX9HOdxA7Hd+/ZM23Y9nXeb+vG6AyA6jgq/JovkcqRHcL9XwRNpWG6XRw=="; + }; + }; + "esbuild-linux-mips64le-0.14.47" = { + name = "esbuild-linux-mips64le"; + packageName = "esbuild-linux-mips64le"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.47.tgz"; + sha512 = "mg3D8YndZ1LvUiEdDYR3OsmeyAew4MA/dvaEJxvyygahWmpv1SlEEnhEZlhPokjsUMfRagzsEF/d/2XF+kTQGg=="; + }; + }; + "esbuild-linux-ppc64le-0.14.47" = { + name = "esbuild-linux-ppc64le"; + packageName = "esbuild-linux-ppc64le"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.47.tgz"; + sha512 = "WER+f3+szmnZiWoK6AsrTKGoJoErG2LlauSmk73LEZFQ/iWC+KhhDsOkn1xBUpzXWsxN9THmQFltLoaFEH8F8w=="; + }; + }; + "esbuild-linux-riscv64-0.14.47" = { + name = "esbuild-linux-riscv64"; + packageName = "esbuild-linux-riscv64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.47.tgz"; + sha512 = "1fI6bP3A3rvI9BsaaXbMoaOjLE3lVkJtLxsgLHqlBhLlBVY7UqffWBvkrX/9zfPhhVMd9ZRFiaqXnB1T7BsL2g=="; + }; + }; + "esbuild-linux-s390x-0.14.47" = { + name = "esbuild-linux-s390x"; + packageName = "esbuild-linux-s390x"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.47.tgz"; + sha512 = "eZrWzy0xFAhki1CWRGnhsHVz7IlSKX6yT2tj2Eg8lhAwlRE5E96Hsb0M1mPSE1dHGpt1QVwwVivXIAacF/G6mw=="; + }; + }; + "esbuild-netbsd-64-0.14.47" = { + name = "esbuild-netbsd-64"; + packageName = "esbuild-netbsd-64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.47.tgz"; + sha512 = "Qjdjr+KQQVH5Q2Q1r6HBYswFTToPpss3gqCiSw2Fpq/ua8+eXSQyAMG+UvULPqXceOwpnPo4smyZyHdlkcPppQ=="; + }; + }; + "esbuild-openbsd-64-0.14.47" = { + name = "esbuild-openbsd-64"; + packageName = "esbuild-openbsd-64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.47.tgz"; + sha512 = "QpgN8ofL7B9z8g5zZqJE+eFvD1LehRlxr25PBkjyyasakm4599iroUpaj96rdqRlO2ShuyqwJdr+oNqWwTUmQw=="; + }; + }; + "esbuild-sunos-64-0.14.47" = { + name = "esbuild-sunos-64"; + packageName = "esbuild-sunos-64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.47.tgz"; + sha512 = "uOeSgLUwukLioAJOiGYm3kNl+1wJjgJA8R671GYgcPgCx7QR73zfvYqXFFcIO93/nBdIbt5hd8RItqbbf3HtAQ=="; + }; + }; + "esbuild-windows-32-0.14.47" = { + name = "esbuild-windows-32"; + packageName = "esbuild-windows-32"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.47.tgz"; + sha512 = "H0fWsLTp2WBfKLBgwYT4OTfFly4Im/8B5f3ojDv1Kx//kiubVY0IQunP2Koc/fr/0wI7hj3IiBDbSrmKlrNgLQ=="; + }; + }; + "esbuild-windows-64-0.14.47" = { + name = "esbuild-windows-64"; + packageName = "esbuild-windows-64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.47.tgz"; + sha512 = "/Pk5jIEH34T68r8PweKRi77W49KwanZ8X6lr3vDAtOlH5EumPE4pBHqkCUdELanvsT14yMXLQ/C/8XPi1pAtkQ=="; + }; + }; + "esbuild-windows-arm64-0.14.47" = { + name = "esbuild-windows-arm64"; + packageName = "esbuild-windows-arm64"; + version = "0.14.47"; + src = fetchurl { + url = "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.47.tgz"; + sha512 = "HFSW2lnp62fl86/qPQlqw6asIwCnEsEoNIL1h2uVMgakddf+vUuMcCbtUY1i8sst7KkgHrVKCJQB33YhhOweCQ=="; + }; + }; "esc-exit-3.0.0" = { name = "esc-exit"; packageName = "esc-exit"; @@ -27233,6 +27602,15 @@ let sha512 = "w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw=="; }; }; + "escape-goat-4.0.0" = { + name = "escape-goat"; + packageName = "escape-goat"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz"; + sha512 = "2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg=="; + }; + }; "escape-html-1.0.3" = { name = "escape-html"; packageName = "escape-html"; @@ -27404,6 +27782,15 @@ let sha512 = "As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA=="; }; }; + "eslint-8.21.0" = { + name = "eslint"; + packageName = "eslint"; + version = "8.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz"; + sha512 = "/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA=="; + }; + }; "eslint-config-prettier-6.15.0" = { name = "eslint-config-prettier"; packageName = "eslint-config-prettier"; @@ -27647,6 +28034,15 @@ let sha512 = "D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA=="; }; }; + "espree-9.3.3" = { + name = "espree"; + packageName = "espree"; + version = "9.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz"; + sha512 = "ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng=="; + }; + }; "esprima-1.1.1" = { name = "esprima"; packageName = "esprima"; @@ -27818,13 +28214,13 @@ let sha512 = "rxZj1GkQhY4x1j/CSnybK9cGuMFQYFPLq0iNyopqf14aOVLFtMv7Esika+ObJWPWiOHuMOAHz3YkWoLYYRnzWQ=="; }; }; - "estree-util-visit-1.1.0" = { + "estree-util-visit-1.2.0" = { name = "estree-util-visit"; packageName = "estree-util-visit"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-1.1.0.tgz"; - sha512 = "3lXJ4Us9j8TUif9cWcQy81t9p5OLasnDuuhrFiqb+XstmKC1d1LmrQWYsY49/9URcfHE64mPypDBaNK9NwWDPQ=="; + url = "https://registry.npmjs.org/estree-util-visit/-/estree-util-visit-1.2.0.tgz"; + sha512 = "wdsoqhWueuJKsh5hqLw3j8lwFqNStm92VcwtAOAny8g/KS/l5Y8RISjR4k5W6skCj3Nirag/WUCMS0Nfy3sgsg=="; }; }; "estree-walker-0.6.1" = { @@ -27989,6 +28385,15 @@ let sha512 = "vyibDcu5JL20Me1fP734QBH/kenBGLZap2n0+XXM7mvuUPzJ20Ydqj1aKcIeMdri1p+PU+4yAKugjN8KCVst+g=="; }; }; + "event-target-polyfill-0.0.3" = { + name = "event-target-polyfill"; + packageName = "event-target-polyfill"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/event-target-polyfill/-/event-target-polyfill-0.0.3.tgz"; + sha512 = "ZMc6UuvmbinrCk4RzGyVmRyIsAyxMRlp4CqSrcQRO8Dy0A9ldbiRy5kdtBj4OtP7EClGdqGfIqo9JmOClMsGLQ=="; + }; + }; "event-target-shim-5.0.1" = { name = "event-target-shim"; packageName = "event-target-shim"; @@ -28034,6 +28439,15 @@ let sha512 = "bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw=="; }; }; + "eventemitter2-6.4.7" = { + name = "eventemitter2"; + packageName = "eventemitter2"; + version = "6.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz"; + sha512 = "tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg=="; + }; + }; "eventemitter3-1.2.0" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -28304,6 +28718,15 @@ let sha512 = "MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg=="; }; }; + "exit-hook-2.2.1" = { + name = "exit-hook"; + packageName = "exit-hook"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/exit-hook/-/exit-hook-2.2.1.tgz"; + sha512 = "eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw=="; + }; + }; "exit-on-epipe-1.0.1" = { name = "exit-on-epipe"; packageName = "exit-on-epipe"; @@ -28376,13 +28799,13 @@ let sha512 = "S8qfaXCv//7tQWV9M+JKx3CF7ypYhDdSUbkUQdaVO/r8D76/aRTArY/aRw1yEfaAOzyK8C8diDToV1itl51DfQ=="; }; }; - "expo-pwa-0.0.119" = { + "expo-pwa-0.0.122" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.119"; + version = "0.0.122"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.119.tgz"; - sha512 = "TGoZ+IFp5+wPlHESuBXc8VsLNnk41FDe1e+nENcM3Exty4uD/galsAG3RLrt2RSxBw3bDLtSNJOD0ZhmYLg6QQ=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.122.tgz"; + sha512 = "E2DVR/1SWFXqLLT9XNKnSVoHbZLGhpkx7PigaqfcI/t1hF+A6zAopwDfKmpFGymuSVqlwEJMTr/PYRdhUY55/g=="; }; }; "exponential-backoff-3.1.0" = { @@ -28439,15 +28862,6 @@ let sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; }; }; - "express-4.17.2" = { - name = "express"; - packageName = "express"; - version = "4.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.17.2.tgz"; - sha512 = "oxlxJxcQlYwqPWKVJJtvQiwHgosH/LrLSPA+H4UxpyvSS6jC5aH+5MoHFM+KABgTOt0APue4w66Ha8jCUo9QGg=="; - }; - }; "express-4.17.3" = { name = "express"; packageName = "express"; @@ -28556,15 +28970,6 @@ let sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; }; }; - "express-session-1.17.2" = { - name = "express-session"; - packageName = "express-session"; - version = "1.17.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.17.2.tgz"; - sha512 = "mPcYcLA0lvh7D4Oqr5aNJFMtBMKPLl++OKKxkHzZ0U0oDq1rpKBnkR5f5vCHR26VeArlTOEF9td4x5IjICksRQ=="; - }; - }; "express-session-1.17.3" = { name = "express-session"; packageName = "express-session"; @@ -28916,6 +29321,15 @@ let sha512 = "t8HYqkuE3YEqNcyWlAfh55479aTxO+GpYwvQvJppYqyBfSmRdNIhzY2m09FKN/MENTzq4wH6heHOIvsPyMAwvQ=="; }; }; + "fast-blob-stream-1.1.1" = { + name = "fast-blob-stream"; + packageName = "fast-blob-stream"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-blob-stream/-/fast-blob-stream-1.1.1.tgz"; + sha512 = "wdRazMMeM2pl8hq1lFG8fzix8p1VLAJunTTE2RADiFBwbUfZwybUm6IwPrmMS7qTthiayr166NoXeqWe3hfR5w=="; + }; + }; "fast-csv-4.3.6" = { name = "fast-csv"; packageName = "fast-csv"; @@ -28997,6 +29411,15 @@ let sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; }; }; + "fast-glob-3.2.7" = { + name = "fast-glob"; + packageName = "fast-glob"; + version = "3.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; + sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; + }; + }; "fast-json-parse-1.0.3" = { name = "fast-json-parse"; packageName = "fast-json-parse"; @@ -29078,6 +29501,15 @@ let sha512 = "2HxzrqJhmMoxVzARjYFvkzkL2dCBB8sogU5sD8gqcZWv5UCivK9/cXM9KIPDRwU+eD3mbRDN/GhW8bO/4dtMfg=="; }; }; + "fast-readable-async-iterator-1.1.1" = { + name = "fast-readable-async-iterator"; + packageName = "fast-readable-async-iterator"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-readable-async-iterator/-/fast-readable-async-iterator-1.1.1.tgz"; + sha512 = "xEHkLUEmStETI+15zhglJLO9TjXxNkkp2ldEfYVZdcqxFhM172EfGl1irI6mVlTxXspYKH1/kjevnt/XSsPeFA=="; + }; + }; "fast-redact-3.1.1" = { name = "fast-redact"; packageName = "fast-redact"; @@ -29150,13 +29582,13 @@ let sha512 = "FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg=="; }; }; - "fastest-levenshtein-1.0.12" = { + "fastest-levenshtein-1.0.16" = { name = "fastest-levenshtein"; packageName = "fastest-levenshtein"; - version = "1.0.12"; + version = "1.0.16"; src = fetchurl { - url = "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; - sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; + url = "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"; + sha512 = "eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg=="; }; }; "fastintcompression-0.0.4" = { @@ -29294,13 +29726,13 @@ let sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; }; }; - "fetch-blob-3.1.5" = { + "fetch-blob-3.2.0" = { name = "fetch-blob"; packageName = "fetch-blob"; - version = "3.1.5"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.1.5.tgz"; - sha512 = "N64ZpKqoLejlrwkIAnb9iLSA3Vx/kjgzpcDhygcqJ2KKjky8nCgUQ+dzXtbrLaWZGZNmNfQTsiQ0weZ1svglHg=="; + url = "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz"; + sha512 = "7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ=="; }; }; "fetch-cookie-0.11.0" = { @@ -29402,6 +29834,15 @@ let sha512 = "yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg=="; }; }; + "figures-4.0.1" = { + name = "figures"; + packageName = "figures"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/figures/-/figures-4.0.1.tgz"; + sha512 = "rElJwkA/xS04Vfg+CaZodpso7VqBknOYbzi6I76hI4X80RUjkSxO2oAyPmGbuXUppywjqndOrQDl817hDnI++w=="; + }; + }; "file-entry-cache-2.0.0" = { name = "file-entry-cache"; packageName = "file-entry-cache"; @@ -29528,6 +29969,15 @@ let sha512 = "uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A=="; }; }; + "file-type-16.5.4" = { + name = "file-type"; + packageName = "file-type"; + version = "16.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/file-type/-/file-type-16.5.4.tgz"; + sha512 = "/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw=="; + }; + }; "file-type-3.9.0" = { name = "file-type"; packageName = "file-type"; @@ -29681,15 +30131,6 @@ let sha512 = "pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ=="; }; }; - "filestream-5.0.0" = { - name = "filestream"; - packageName = "filestream"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/filestream/-/filestream-5.0.0.tgz"; - sha512 = "5H3RqSaJp12THfZiNWodYM7TiKfQvrpX+EIOrB1XvCceTys4yvfEIl8wDp+/yI8qj6Bxym8m0NYWwVXDAet/+A=="; - }; - }; "filesystem-constants-1.0.0" = { name = "filesystem-constants"; packageName = "filesystem-constants"; @@ -30086,13 +30527,13 @@ let sha512 = "r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA=="; }; }; - "flatted-3.2.5" = { + "flatted-3.2.6" = { name = "flatted"; packageName = "flatted"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz"; + sha512 = "0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="; }; }; "flatten-0.0.1" = { @@ -30113,13 +30554,13 @@ let sha512 = "d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA=="; }; }; - "flow-parser-0.180.1" = { + "flow-parser-0.184.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.180.1"; + version = "0.184.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.180.1.tgz"; - sha512 = "+zhnnWjpNomIrI/FL8inDMOQP3hniNxZlROBlaerzM+PqszgqaC2724kvU8ThkNWDMmgC5N8M1HemMPc3h4IBA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.184.0.tgz"; + sha512 = "+RAHizWmCnfnAWX1yD3fSdWRYCMhGiiqZSbHNU38MQxYc8XdTBoFB3ZpL1MEPG6yy/Yb3hg9w9eIf0DNlU8epQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -30482,6 +30923,15 @@ let sha512 = "qfqtYan3rxrnCk1VYaA4H+Ms9xdpPqvLZa6xmMgFvhO32x7/3J/ExcTd6qpxM0vH2GdMI+poehyBZvqfMTto8A=="; }; }; + "form-data-encoder-2.0.1" = { + name = "form-data-encoder"; + packageName = "form-data-encoder"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-2.0.1.tgz"; + sha512 = "Oy+P9w5mnO4TWXVgUiQvggNKPI9/ummcSt5usuIV6HkaLKigwzPpoenhEqmGmx3zHqm6ZLJ+CR/99N8JLinaEw=="; + }; + }; "form-urlencoded-4.5.1" = { name = "form-urlencoded"; packageName = "form-urlencoded"; @@ -30581,13 +31031,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.12.1" = { + "fp-ts-2.12.2" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.12.1"; + version = "2.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.12.1.tgz"; - sha512 = "oxvgqUYR6O9VkKXrxkJ0NOyU0FrE705MeqgBUMEPWyTu6Pwn768cJbHChw2XOBlgFLKfIHxjr2OOBFpv2mUGZw=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.12.2.tgz"; + sha512 = "v8J7ud+nTkP5Zz17GhpCsY19wiRbB9miuj61nBcCJyDpu52zs9Z4O7OLDfYoKFQMJ9EsSZA7W1vRgC1d3jy5qw=="; }; }; "fraction.js-4.2.0" = { @@ -30680,15 +31130,6 @@ let sha512 = "OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g=="; }; }; - "fs-capacitor-2.0.4" = { - name = "fs-capacitor"; - packageName = "fs-capacitor"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-capacitor/-/fs-capacitor-2.0.4.tgz"; - sha512 = "8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA=="; - }; - }; "fs-chunk-store-1.7.0" = { name = "fs-chunk-store"; packageName = "fs-chunk-store"; @@ -30752,15 +31193,6 @@ let sha512 = "5rU898vl/Z948L+kkJedbmo/iltzmiF5bn/eEk0j/SgrPpI+Ydau9xlJPicV7Av2CHYBGz5LAlwTnBU80j1zPQ=="; }; }; - "fs-extra-10.0.0" = { - name = "fs-extra"; - packageName = "fs-extra"; - version = "10.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz"; - sha512 = "C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ=="; - }; - }; "fs-extra-10.1.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -30932,15 +31364,6 @@ let sha512 = "Ig401VXtyrWrz23k9KxAx9OrnL8AHSLNhQ8YJH2wSYuH0ZUfxwBeY6zXkd/oOyVRFTlpEu/0n5gHeuZt7aqbkw=="; }; }; - "fs.notify-0.0.4" = { - name = "fs.notify"; - packageName = "fs.notify"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz"; - sha512 = "xnulkRf31FQwC8NsU5DEYqMTeM3jZpYsTC2hHQcHlkXTubxQHDVWkau13U/oFmFXieCkai2oKTa1MhckXk2fRQ=="; - }; - }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -31139,22 +31562,22 @@ let sha512 = "w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w=="; }; }; - "gatsby-core-utils-3.17.0" = { + "gatsby-core-utils-3.20.0" = { name = "gatsby-core-utils"; packageName = "gatsby-core-utils"; - version = "3.17.0"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.17.0.tgz"; - sha512 = "1e0YaqTAEpSSBkpWkY703lu+Bl76ASXUvUcpnNO3CavCYZsRQxAXtMXIKIEvhm1z6zWJmY9HILo6/DjP+PHeyw=="; + url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-3.20.0.tgz"; + sha512 = "D3DIulUFoPvexwsGYFkfESL1Dd3qsxBfj8OBi8vsd6BuXrA6MbLtX3j5+BLVxfKkN2wF7XN6b3/DH+JGNuhh2A=="; }; }; - "gatsby-telemetry-3.17.0" = { + "gatsby-telemetry-3.20.0" = { name = "gatsby-telemetry"; packageName = "gatsby-telemetry"; - version = "3.17.0"; + version = "3.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.17.0.tgz"; - sha512 = "1N4uKj2Yj7AykLmwjsdOmNirf3UmP8CBXjj/LmWf5cLDVbdPqkirAlyD6uTeEliG5UFHPTlBsRi26v558mFYJQ=="; + url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-3.20.0.tgz"; + sha512 = "tHQITCmO8gHYbvb7OeMhyOHiCITK0mNI7d0v/UGaXbR0ALO/hsOT29TkMDEeaHtnTZ5kTY/4hLq/3P0X4qrJiQ=="; }; }; "gauge-1.2.7" = { @@ -31211,13 +31634,13 @@ let sha512 = "gSaYYIO1Y3wUtdfHmjDUZ8LWaxJQpiavzbF5Kq53akSzvmVg0RfyOcFDbO1KJ/KCGRFz2qG+lS81F0nkr7cRJA=="; }; }; - "gaxios-5.0.0" = { + "gaxios-5.0.1" = { name = "gaxios"; packageName = "gaxios"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/gaxios/-/gaxios-5.0.0.tgz"; - sha512 = "VD/yc5ln6XU8Ch1hyYY6kRMBE0Yc2np3fPyeJeYHhrPs1i8rgnsApPMWyrugkl7LLoSqpOJVBWlQIa87OAvt8Q=="; + url = "https://registry.npmjs.org/gaxios/-/gaxios-5.0.1.tgz"; + sha512 = "keK47BGKHyyOVQxgcUaSaFvr3ehZYAlvhvpHXy0YB2itzZef+GqZR8TBsfVRWghdwlKrYsn+8L8i3eblF7Oviw=="; }; }; "gaze-1.1.3" = { @@ -31751,13 +32174,22 @@ let sha512 = "YUvVDg/vX3d0syBsk/CKUTib0srcQME0JyHkL5BaYdwLsiCslPWmDSi8PUMo9pXYjrryMcmsCoCgsTpSCJEQaA=="; }; }; - "git-url-parse-11.6.0" = { + "git-up-6.0.0" = { + name = "git-up"; + packageName = "git-up"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/git-up/-/git-up-6.0.0.tgz"; + sha512 = "6RUFSNd1c/D0xtGnyWN2sxza2bZtZ/EmI9448n6rCZruFwV/ezeEn2fJP7XnUQGwf0RAtd/mmUCbtH6JPYA2SA=="; + }; + }; + "git-url-parse-12.0.0" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.6.0"; + version = "12.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.6.0.tgz"; - sha512 = "WWUxvJs5HsyHL6L08wOusa/IXYtMuCAhrMmnTjQPpBU0TTHyDhnOATNH3xNQz7YOQUsqIIPTGr4xiVti1Hsk5g=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-12.0.0.tgz"; + sha512 = "I6LMWsxV87vysX1WfsoglXsXg6GjQRKq7+Dgiseo+h0skmp5Hp2rzmcEIRQot9CPA+uzU7x1x7jZdqvTFGnB+Q=="; }; }; "gitconfiglocal-1.0.0" = { @@ -31886,6 +32318,15 @@ let sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; + "glob-7.1.4" = { + name = "glob"; + packageName = "glob"; + version = "7.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz"; + sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; + }; + }; "glob-7.1.6" = { name = "glob"; packageName = "glob"; @@ -32202,13 +32643,13 @@ let sha512 = "BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg=="; }; }; - "globals-13.15.0" = { + "globals-13.17.0" = { name = "globals"; packageName = "globals"; - version = "13.15.0"; + version = "13.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; - sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; + url = "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"; + sha512 = "1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw=="; }; }; "globals-9.18.0" = { @@ -32256,24 +32697,6 @@ let sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; - "globby-12.1.0" = { - name = "globby"; - packageName = "globby"; - version = "12.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-12.1.0.tgz"; - sha512 = "YULDaNwsoUZkRy9TWSY/M7Obh0abamTKoKzTfOI3uU+hfpX2FZqOq8LFDxsjYheF1RH7ITdArgbQnsNBFgcdBA=="; - }; - }; - "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.2" = { name = "globby"; packageName = "globby"; @@ -32400,22 +32823,22 @@ let sha512 = "5Rk7iLNDFhFeBYc3s8l1CqzbEBcdhwR193RlD4vSNFajIcINKI8W8P0JLmBpwymHqqWbX34pJDQu39cSy/6RsA=="; }; }; - "google-auth-library-8.0.2" = { + "google-auth-library-8.1.1" = { name = "google-auth-library"; packageName = "google-auth-library"; - version = "8.0.2"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.0.2.tgz"; - sha512 = "HoG+nWFAThLovKpvcbYzxgn+nBJPTfAwtq0GxPN821nOO+21+8oP7MoEHfd1sbDulUFFGfcjJr2CnJ4YssHcyg=="; + url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-8.1.1.tgz"; + sha512 = "eG3pCfrLgVJe19KhAeZwW0m1LplNEo0FX1GboWf3hu18zD2jq8TUH2K8900AB2YRAuJ7A+1aSXDp1BODjwwRzg=="; }; }; - "google-gax-3.1.1" = { + "google-gax-3.1.4" = { name = "google-gax"; packageName = "google-gax"; - version = "3.1.1"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-3.1.1.tgz"; - sha512 = "lLiv6s3Ax5i0Iqy/crHrIZuaU1AYZvTj/F8DCcdJvmDWDsFSVSh+KkCEkKGd7PHck3dVB58NnbC4FIiRpTq4WQ=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-3.1.4.tgz"; + sha512 = "+EOIVCSpFVabuqSBQHEy5kE8rGapc5sS47wbShJLzRnxIBWXs9+2vCnnmBP3pPZSsRQU08rp5C26j7spk+liUQ=="; }; }; "google-p12-pem-3.1.4" = { @@ -32427,6 +32850,15 @@ let sha512 = "HHuHmkLgwjdmVRngf5+gSmpkyaRI6QmOg77J8tkNBHhNEI62sGHyw4/+UkgyZEI7h84NbWprXDJ+sa3xOYFvTg=="; }; }; + "google-p12-pem-4.0.0" = { + name = "google-p12-pem"; + packageName = "google-p12-pem"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-4.0.0.tgz"; + sha512 = "lRTMn5ElBdDixv4a86bixejPSRk1boRtUowNepeKEVvYiFlkLuAJUVpEz6PfObDHYEKnZWq/9a2zC98xu62A9w=="; + }; + }; "googleapis-76.0.0" = { name = "googleapis"; packageName = "googleapis"; @@ -32508,6 +32940,15 @@ let sha512 = "o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ=="; }; }; + "got-12.3.0" = { + name = "got"; + packageName = "got"; + version = "12.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-12.3.0.tgz"; + sha512 = "7uK06aluHF0UibYFBX3lFUZ2FG/W0KS4O4EqAIrbWIdbPxIT33r6ZJy7Zy+pdh0CP/ZbF3zBa7Fd9dCn7vGPBg=="; + }; + }; "got-3.3.1" = { name = "got"; packageName = "got"; @@ -32589,13 +33030,22 @@ let sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="; }; }; - "grammy-1.8.3" = { + "grammy-1.9.0" = { name = "grammy"; packageName = "grammy"; - version = "1.8.3"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/grammy/-/grammy-1.8.3.tgz"; - sha512 = "3esAETA0HXR9wb8x65uYeAt1AbCQsJC5l6iuxSRXZR2cSxEf+61vIbJ5qUvw7TfMkgPuH71Gi7AHSFGZ+F1eqQ=="; + url = "https://registry.npmjs.org/grammy/-/grammy-1.9.0.tgz"; + sha512 = "aIUONCSbUtHVw+YuVB0kQEgoKXbYspihk2a0xFeWa7hk76PbRSBP/n3q3gHq+O4MHy6DsIjP3WrezsA1qyuQ4w=="; + }; + }; + "grammy-1.9.2" = { + name = "grammy"; + packageName = "grammy"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/grammy/-/grammy-1.9.2.tgz"; + sha512 = "3u73ov2dJZeUiWKN/N7jgF3XtMFCOcBYsRB+/YjOGVPnk2CDo8n7VLnhH+jznhrqJEgeRB/CqKsP+PIPOUpizA=="; }; }; "grant-4.7.0" = { @@ -32661,15 +33111,6 @@ let sha512 = "x7uDjyz8Jx+QPbpCFCMQ8lltnQa4p4vSYHx6ADe8rVYRTdsyhCJbvSty5DAsLVmU6cGakl+r8HQYolKHxk/tiw=="; }; }; - "graphql-0.13.2" = { - name = "graphql"; - packageName = "graphql"; - version = "0.13.2"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-0.13.2.tgz"; - sha512 = "QZ5BL8ZO/B20VA8APauGBg3GyEgZ19eduvpLWoq5x7gMmWnHoy8rlQWPLmWgFvo1yNgjSEFMesmS4R6pPr7xog=="; - }; - }; "graphql-14.7.0" = { name = "graphql"; packageName = "graphql"; @@ -32715,31 +33156,13 @@ let sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g=="; }; }; - "graphql-config-4.3.1" = { + "graphql-config-4.3.3" = { name = "graphql-config"; packageName = "graphql-config"; - version = "4.3.1"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.3.1.tgz"; - sha512 = "czBWzJSGaLJfOHBLuUTZVRTjfgohPfvlaeN1B5nXBVptFARpiFuS7iI4FnRhCGwm6qt1h2j1g05nkg0OIGA6bg=="; - }; - }; - "graphql-executor-0.0.23" = { - name = "graphql-executor"; - packageName = "graphql-executor"; - version = "0.0.23"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-executor/-/graphql-executor-0.0.23.tgz"; - sha512 = "3Ivlyfjaw3BWmGtUSnMpP/a4dcXCp0mJtj0PiPG14OKUizaMKlSEX+LX2Qed0LrxwniIwvU6B4w/koVjEPyWJg=="; - }; - }; - "graphql-extensions-0.15.0" = { - name = "graphql-extensions"; - packageName = "graphql-extensions"; - version = "0.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.15.0.tgz"; - sha512 = "bVddVO8YFJPwuACn+3pgmrEg6I8iBuYLuwvxiE+lcQQ7POotVZxm2rgGw0PvVYmWWf3DT7nTVDZ5ROh/ALp8mA=="; + url = "https://registry.npmjs.org/graphql-config/-/graphql-config-4.3.3.tgz"; + sha512 = "ju2LAbOk6GLp+8JY7mh3CrEe0iEj2AdImNKv58G0DyISBo72kDEJYNJ07hKmkHdIzhDsSHiVzaCVIyBU2LCUug=="; }; }; "graphql-language-service-5.0.6" = { @@ -32769,13 +33192,13 @@ let sha512 = "duDE+0aeKLFVrb9Kf28U84ZEHhHcvTjWIT6dJbIAQJWBaDoht0D4BK9EIhd94I3DtKRc1JCJb2+70y1lvP/hiA=="; }; }; - "graphql-language-service-server-2.7.27" = { + "graphql-language-service-server-2.8.0" = { name = "graphql-language-service-server"; packageName = "graphql-language-service-server"; - version = "2.7.27"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.7.27.tgz"; - sha512 = "ogHYC4xrOx6cTmJ7M0e/JbNljjP5kRGzof8aIzGrnOxPA53qG9XqUJEu8kKiEhiVh+AkUt2/mpr733xJcjP5kw=="; + url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.8.0.tgz"; + sha512 = "2f+LpDbQsqyycYgC8aWMZwHda3j6gvCiCzaJL1eSwrcSBY7mCCR6aa8fBYlp0hZm7lpOxVrCxdA4KtjK0SpKKw=="; }; }; "graphql-language-service-types-1.8.7" = { @@ -32832,24 +33255,6 @@ let sha512 = "FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg=="; }; }; - "graphql-tools-3.0.0" = { - name = "graphql-tools"; - packageName = "graphql-tools"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-3.0.0.tgz"; - sha512 = "orcLQm0pc6dcIvFyAudgmno/akZy07bbMalTv5dj6B8uW2ZPmwIANr7pDEJoiumb67h2kZjsU9yvgTwmF0kMPQ=="; - }; - }; - "graphql-tools-4.0.8" = { - name = "graphql-tools"; - packageName = "graphql-tools"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.8.tgz"; - sha512 = "MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg=="; - }; - }; "graphql-type-json-0.3.2" = { name = "graphql-type-json"; packageName = "graphql-type-json"; @@ -32868,13 +33273,13 @@ let sha512 = "sHkK9+lUm20/BGawNEWNtVAeJzhZeBg21VmvmLoT5NdGVeZWv5PdIhkcayQIAgjSyyQ17WMKmbDijIPG2On+Ag=="; }; }; - "graphql-ws-5.9.0" = { + "graphql-ws-5.9.1" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "5.9.0"; + version = "5.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.9.0.tgz"; - sha512 = "CXv0l0nI1bgChwl4Rm+BqNOAKwL/C9T2N8RfmTkhQ38YLFdUXCi2WNW4oFp8BJP+t75nCLzjHHgR04sP1oF02w=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.9.1.tgz"; + sha512 = "mL/SWGBwIT9Meq0NlfS55yXXTOeWPMbK7bZBEZhFu46bcGk1coTx2Sdtzxdk+9yHWngD+Fk1PZDWaAutQa9tpw=="; }; }; "gray-matter-4.0.3" = { @@ -32958,6 +33363,15 @@ let sha512 = "gkvEKREW7dXWF8NV8pVrKfW7WqReAmjjkMBh6lNCCGOM4ucS0r0YyXXl0r/9Yj8wcW/32ISkfc8h5mPTDbtifQ=="; }; }; + "gtoken-6.1.0" = { + name = "gtoken"; + packageName = "gtoken"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gtoken/-/gtoken-6.1.0.tgz"; + sha512 = "WPZcFw34wh2LUvbCUWI70GDhOlO7qHpSvFHFqq7d3Wvsf8dIJedE0lnUdOmsKuC0NgflKmF0LxIF38vsGeHHiQ=="; + }; + }; "guard-timeout-2.0.0" = { name = "guard-timeout"; packageName = "guard-timeout"; @@ -33408,6 +33822,15 @@ let sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; }; }; + "has-yarn-3.0.0" = { + name = "has-yarn"; + packageName = "has-yarn"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-yarn/-/has-yarn-3.0.0.tgz"; + sha512 = "IrsVwUHhEULx3R8f/aA8AHuEzAorplsab/v8HBzEiIukwq5i/EC+xmOW+HfP1OaDP+2JkgT1yILHN2O3UFIbcA=="; + }; + }; "hasbin-1.2.3" = { name = "hasbin"; packageName = "hasbin"; @@ -33939,15 +34362,6 @@ let sha512 = "+ADn1uO85HwKnhziJlTm4cvrwFv60TlFqyos75ikfE9kq4RNrLcf+uVmEePT/4d/gh9TxKmwTfpVN9fpKyJKJA=="; }; }; - "history-5.3.0" = { - name = "history"; - packageName = "history"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/history/-/history-5.3.0.tgz"; - sha512 = "ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ=="; - }; - }; "hls.js-1.1.2" = { name = "hls.js"; packageName = "hls.js"; @@ -34110,6 +34524,15 @@ let sha512 = "ePqFXHtSQWAFXYmj+JtOTHr84iNrII4/QRlAAPPE+zqnKy4xJo7Ie1Y4kC7AdB+LxLxSTTzBMASsEcy0q8YyvQ=="; }; }; + "hpagent-1.0.0" = { + name = "hpagent"; + packageName = "hpagent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hpagent/-/hpagent-1.0.0.tgz"; + sha512 = "SCleE2Uc1bM752ymxg8QXYGW0TWtAV4ZW3TqH1aOnyi6T6YW2xadCcclm5qeVjvMvfQ2RKNtZxO7uVb9CTPt1A=="; + }; + }; "hrpc-2.2.0" = { name = "hrpc"; packageName = "hrpc"; @@ -34524,13 +34947,13 @@ let sha512 = "u8u5ZaG0Tr/VvHlucK2ufMuOp4/5bvwgneXle+y228K5rMbJOlVjThONcaAw3ikAy8b2OO9RfEucdMHFz3UWMA=="; }; }; - "http-parser-js-0.5.6" = { + "http-parser-js-0.5.8" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.5.6"; + version = "0.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz"; - sha512 = "vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA=="; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"; + sha512 = "SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="; }; }; "http-proxy-1.18.1" = { @@ -34659,6 +35082,15 @@ let sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="; }; }; + "http2-wrapper-2.1.11" = { + name = "http2-wrapper"; + packageName = "http2-wrapper"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.1.11.tgz"; + sha512 = "aNAk5JzLturWEUiuhAN73Jcbq96R7rTitAoXV54FYMatvihnpD2+6PUgU4ce3D/m5VDbw+F5CsyKSF176ptitQ=="; + }; + }; "http_ece-1.1.0" = { name = "http_ece"; packageName = "http_ece"; @@ -35019,13 +35451,13 @@ let sha512 = "FYz4wlXgkQwIPqhzC5TdNMLSE5+GS1IIDJZY/1ZiEPCT2S3COUVZeT5OW4BmW4r5LHLQuOosSwsvnroG9GR59Q=="; }; }; - "i18next-21.6.11" = { + "i18next-21.8.14" = { name = "i18next"; packageName = "i18next"; - version = "21.6.11"; + version = "21.8.14"; src = fetchurl { - url = "https://registry.npmjs.org/i18next/-/i18next-21.6.11.tgz"; - sha512 = "tJ2+o0lVO+fhi8bPkCpBAeY1SgkqmQm5NzgPWCQssBrywJw98/o+Kombhty5nxQOpHtvMmsxcOopczUiH6bJxQ=="; + url = "https://registry.npmjs.org/i18next/-/i18next-21.8.14.tgz"; + sha512 = "4Yi+DtexvMm/Yw3Q9fllzY12SgLk+Mcmar+rCAccsOPul/2UmnBzoHbTGn/L48IPkFcmrNaH7xTLboBWIbH6pw=="; }; }; "iconv-lite-0.4.19" = { @@ -35235,6 +35667,15 @@ let sha512 = "VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ=="; }; }; + "image-size-1.0.2" = { + name = "image-size"; + packageName = "image-size"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/image-size/-/image-size-1.0.2.tgz"; + sha512 = "xfOoWjceHntRb3qFCrh5ZFORYH8XCdYpASltMhZ/Q0KZiOwjdE/Yl2QCiWdwD+lygV5bMCvauzgu5PxBX/Yerg=="; + }; + }; "image-type-3.1.0" = { name = "image-type"; packageName = "image-type"; @@ -35676,6 +36117,15 @@ let sha512 = "u1uGAtEFu3VA6HNl/yUWw57jmKEMx8SKOxHhxjGnOFUiIlFnohKDFg4ZrPpv9wWqk44nDxGJAtqjdQFm+9XXQA=="; }; }; + "init-package-json-3.0.2" = { + name = "init-package-json"; + packageName = "init-package-json"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/init-package-json/-/init-package-json-3.0.2.tgz"; + sha512 = "YhlQPEjNFqlGdzrBfDNRLhvoSgX7iQRgSxgsNknRQ9ITXFT7UMfVMWhBTOh2Y+25lRnGrv5Xz8yZwQ3ACR6T3A=="; + }; + }; "ink-2.7.1" = { name = "ink"; packageName = "ink"; @@ -35829,15 +36279,6 @@ let sha512 = "ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA=="; }; }; - "inquirer-8.2.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-8.2.0.tgz"; - sha512 = "0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ=="; - }; - }; "inquirer-8.2.4" = { name = "inquirer"; packageName = "inquirer"; @@ -35847,6 +36288,15 @@ let sha512 = "nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg=="; }; }; + "inquirer-9.0.2" = { + name = "inquirer"; + packageName = "inquirer"; + version = "9.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/inquirer/-/inquirer-9.0.2.tgz"; + sha512 = "AqmDHmz3bIe573OiM4svTZzajBzff1xpuzYAimW8gjzW5ncuPllWB8t/GKl+NSuKRJaKyIF2bU2RCx8H1dwqyQ=="; + }; + }; "inquirer-autocomplete-prompt-1.4.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; @@ -36189,13 +36639,22 @@ let sha512 = "2kpjok/83zOTnb4tbV+RbJz7LuGVzj/GZ+jwsC7FxMqwLAf4Sf6OESNM3uuamX9oeFRo44Vip3wn1aX+9D2m8w=="; }; }; - "io-ts-2.2.16" = { + "invoices-2.1.0" = { + name = "invoices"; + packageName = "invoices"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invoices/-/invoices-2.1.0.tgz"; + sha512 = "BHuiGsGVwp1gPzbVYZ3EyPQcD+0+4ZC8ykSzSXiKYytNUxW7Ro6f8iVCVpRindhmn7QCZSjRcfSdlJSykr6U+A=="; + }; + }; + "io-ts-2.2.17" = { name = "io-ts"; packageName = "io-ts"; - version = "2.2.16"; + version = "2.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/io-ts/-/io-ts-2.2.16.tgz"; - sha512 = "y5TTSa6VP6le0hhmIyN0dqEXkrZeJLeC5KApJq6VLci3UEKF80lZ+KuoUs02RhBxNWlrqSNxzfI7otLX1Euv8Q=="; + url = "https://registry.npmjs.org/io-ts/-/io-ts-2.2.17.tgz"; + sha512 = "RkQY06h6rRyADVEI46OCAUYTP2p18Vdtz9Movi19Mmj7SJ1NhN/yGyW7CxlcBVxh95WKg2YSbTmcUPqqeLuhXw=="; }; }; "iota-array-1.0.0" = { @@ -36216,6 +36675,15 @@ let sha512 = "PuExPYUiu6qMBQb4l06ecm6T6ujzhmh+MeJcW9wa89PoAz5pvd4zPgN5WJV104mb6S2T1AwNIAaB70JNrLQWhg=="; }; }; + "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=="; + }; + }; "ip-address-6.1.0" = { name = "ip-address"; packageName = "ip-address"; @@ -36639,6 +37107,15 @@ let sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; }; + "is-ci-3.0.1" = { + name = "is-ci"; + packageName = "is-ci"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz"; + sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; + }; + }; "is-color-stop-1.1.0" = { name = "is-color-stop"; packageName = "is-color-stop"; @@ -37206,6 +37683,15 @@ let sha512 = "WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA=="; }; }; + "is-npm-6.0.0" = { + name = "is-npm"; + packageName = "is-npm"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-npm/-/is-npm-6.0.0.tgz"; + sha512 = "JEjxbSmtPSt1c8XTkVrlujcXdKV1/tvuQ7GwKcAlyiVLeYFQ2VHat8xfrDJsIkhCdF/tZ7CiIR3sy141c6+gPQ=="; + }; + }; "is-number-2.1.0" = { name = "is-number"; packageName = "is-number"; @@ -37440,6 +37926,15 @@ let sha512 = "vjc0SSRNZ32s9SbZBzGaiP6YVB+xglLShhgZD/FHMZUXBvQWaV9CtzgeVhjccFJrI6RAMV+LX7NYxueW/A8W5A=="; }; }; + "is-port-reachable-4.0.0" = { + name = "is-port-reachable"; + packageName = "is-port-reachable"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-port-reachable/-/is-port-reachable-4.0.0.tgz"; + sha512 = "9UoipoxYmSk6Xy7QFgRv2HDyaysmgSG75TFQs6S+3pDM7ZhKTF/bskZV+0UlABHzKjNVhPjYCLfeZUEg1wXxig=="; + }; + }; "is-posix-bracket-0.1.1" = { name = "is-posix-bracket"; packageName = "is-posix-bracket"; @@ -37647,13 +38142,13 @@ let sha512 = "sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA=="; }; }; - "is-ssh-1.3.3" = { + "is-ssh-1.4.0" = { name = "is-ssh"; packageName = "is-ssh"; - version = "1.3.3"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.3.tgz"; - sha512 = "NKzJmQzJfEEma3w5cJNcUMxoXfDjz0Zj0eyCalHn2E6VOwlzjZo0yuO2fcBSf8zhFuVCL/82/r5gRcoi6aEPVQ=="; + url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.4.0.tgz"; + sha512 = "x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ=="; }; }; "is-stream-1.1.0" = { @@ -37935,6 +38430,15 @@ let sha512 = "VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw=="; }; }; + "is-yarn-global-0.4.0" = { + name = "is-yarn-global"; + packageName = "is-yarn-global"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.4.0.tgz"; + sha512 = "HneQBCrXGBy15QnaDfcn6OLoU8AQPAa0Qn0IeJR/QCo4E8dNZaGGwxpCwWyEBQC5QvFonP8d6t60iGpAHVAfNA=="; + }; + }; "is2-0.0.9" = { name = "is2"; packageName = "is2"; @@ -38106,6 +38610,15 @@ let sha512 = "BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w=="; }; }; + "isomorphic-ws-5.0.0" = { + name = "isomorphic-ws"; + packageName = "isomorphic-ws"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz"; + sha512 = "muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw=="; + }; + }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -38151,15 +38664,6 @@ let sha512 = "Cu/kb+4HiNSejAPhSaN1VukdNTTi/r4/e+yykqjlG/IW+1gZH5b4+Bq3whDX4tvbYugta3r8KTMUiqT3fIGxuQ=="; }; }; - "iterall-1.2.2" = { - name = "iterall"; - packageName = "iterall"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz"; - sha512 = "yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA=="; - }; - }; "iterall-1.3.0" = { name = "iterall"; packageName = "iterall"; @@ -38449,22 +38953,22 @@ let sha512 = "JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="; }; }; - "jquery-ui-1.13.1" = { + "jquery-ui-1.13.2" = { name = "jquery-ui"; packageName = "jquery-ui"; - version = "1.13.1"; + version = "1.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.1.tgz"; - sha512 = "2VlU59N5P4HaumDK1Z3XEVjSvegFbEOQRgpHUBaB2Ak98Axl3hFhJ6RFcNQNuk9SfL6WxIbuLst8dW/U56NSiA=="; + url = "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.2.tgz"; + sha512 = "wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q=="; }; }; - "jquery.terminal-2.33.3" = { + "jquery.terminal-2.34.0" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.33.3"; + version = "2.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.33.3.tgz"; - sha512 = "FlqCWmMaygQZ1BbX3TswsMWH1Zh11o0s9brGG3Kwsc+Hav4KxrHyiZF7QJ2kE48DqTxb6fpdRn9g7olqp1XosQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.34.0.tgz"; + sha512 = "sU22Qzb+tkOSwQiHc2fvhgrYE69/0DzGgMgmOgCHMEpTh3MpXENv2j8RWhXd8K+xZG/+Cltst4joGt4MsyT+7g=="; }; }; "js-base64-2.6.3" = { @@ -38710,13 +39214,13 @@ let sha512 = "SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g=="; }; }; - "jsdoc-3.6.10" = { + "jsdoc-3.6.11" = { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.10"; + version = "3.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.10.tgz"; - sha512 = "IdQ8ppSo5LKZ9o3M+LKIIK8i00DIe5msDvG3G81Km+1dhy0XrOWD0Ji8H61ElgyEj/O9KRLokgKbAM9XX9CJAg=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.11.tgz"; + sha512 = "8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg=="; }; }; "jsdom-14.1.0" = { @@ -38791,49 +39295,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.61.0" = { + "jsii-1.63.2" = { name = "jsii"; packageName = "jsii"; - version = "1.61.0"; + version = "1.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.61.0.tgz"; - sha512 = "haGNRe3k0bhTqUKjMQ/ZBq9H3BR7gB88+wSdvCzQ9IIN6XJNeTB9SvB5ry9XIwn6qk8THF7LXtaLga9Nzz+gFA=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.63.2.tgz"; + sha512 = "KHnsuTm4ErLiB4JNvPi/TzJuIXeqkMim95Qs9KG5M8tfDd/GHlsotwxNx9qfG2R7DdAWrH0MG+kd1wKIAl+GFw=="; }; }; - "jsii-pacmak-1.61.0" = { + "jsii-pacmak-1.63.2" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.61.0"; + version = "1.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.61.0.tgz"; - sha512 = "XFrUx19TZcP+NBO29P5Q/fegRURXs4UaH8l2+/OITn1PXGOhEq/eCA6TDpdrLXtyt6ebkrLemsrDd0ZW4d0Qvg=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.63.2.tgz"; + sha512 = "pIHkmLXlLqaTdKW7ALzRrBXRkQayA5kQ8rAvbXu50C1UDPV0CIZuXftC1BeHgRqfQNmGluX0PsTcF0jF2zyfBw=="; }; }; - "jsii-reflect-1.61.0" = { + "jsii-reflect-1.63.2" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.61.0"; + version = "1.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.61.0.tgz"; - sha512 = "nqBylNBqJJoTJR9TpywW5i55zaOWlNxJTHSWyVYJnrp5ZuYI2R0+nMUxux1hT0Zbd77KbRHXeSByW1aQ6Mfi/A=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.63.2.tgz"; + sha512 = "eawNN/ySYVznYY2ZJYe5FNcSly12KgC8/MBDl4qln3daag3Ts/d7ocfbS9sjFayn4AhBojq1h1DDs8sjoG38Kg=="; }; }; - "jsii-rosetta-1.61.0" = { + "jsii-rosetta-1.63.2" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.61.0"; + version = "1.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.61.0.tgz"; - sha512 = "n8y3er0nOchLo17Wh0/yVmCDGNuwlhccp/Liwvl0ewf0hYMC5vICjWTIdCetsRoQQIOuc4pOmMNomldTTlPUUw=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.63.2.tgz"; + sha512 = "cBl8uAtNYuWqrwGue2Sr7cdgPhWx/QiAAE70lDec0OtBSNdGq0MUA04GD1/peQw4LPhE+1ikdeyspJYJaTtQgg=="; }; }; - "jsii-srcmak-0.1.595" = { + "jsii-srcmak-0.1.637" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.595"; + version = "0.1.637"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.595.tgz"; - sha512 = "iGxXjTZtW1GzSwG3VjEqa0upXloywbdIPPoUuIQSvFa+U3AWedCX1wkhHovAQ6ETRkS7dGJQ7t0l3eRc2Tm+xg=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.637.tgz"; + sha512 = "KcCBjFEHu7MZQasQH81ULcLrUd9QsbdtOYRyotmY1Jx4xUsh1hB33kDJuqHnMDwdjR9KYr1mwg7CQaIqka29Sw=="; }; }; "json-bigint-1.0.0" = { @@ -38935,13 +39439,13 @@ let sha512 = "tFH40YQ+lG7mgYYM1kGZOhQngO4SbOEHZJlA4W+NtetWZ20EUU3BPU+30uWRKumuAJoSo5eqrsXD2h72ioS8ew=="; }; }; - "json-ptr-3.1.0" = { + "json-ptr-3.1.1" = { name = "json-ptr"; packageName = "json-ptr"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/json-ptr/-/json-ptr-3.1.0.tgz"; - sha512 = "KMsG905wFbHHTnvd66MHCNo0E43UPalKt2zQUbBtWrDYKk/3vE/4u8lfWDdIyPEoMXxOFJO1lsBs6xPBXKxeVw=="; + url = "https://registry.npmjs.org/json-ptr/-/json-ptr-3.1.1.tgz"; + sha512 = "SiSJQ805W1sDUCD1+/t1/1BIrveq2Fe9HJqENxZmMCILmrPI7WhS/pePpIOx85v6/H2z1Vy7AI08GV2TzfXocg=="; }; }; "json-refs-2.1.7" = { @@ -39025,6 +39529,15 @@ let sha512 = "qcP2lmGy+JUoQJ4DOQeLaZDqH9qSkeGCK3suKWxJXS82dg728Mn3j97azDMaOUmJAN4uCq91LdPx4K7E8F1a7Q=="; }; }; + "json-schema-to-ts-1.6.4" = { + name = "json-schema-to-ts"; + packageName = "json-schema-to-ts"; + version = "1.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-to-ts/-/json-schema-to-ts-1.6.4.tgz"; + sha512 = "pR4yQ9DHz6itqswtHCm26mw45FSNfQ9rEQjosaZErhn5J3J2sIViQiz8rDaezjKAhFGpmsoczYVBgGHzFw/stA=="; + }; + }; "json-schema-to-typescript-9.1.1" = { name = "json-schema-to-typescript"; packageName = "json-schema-to-typescript"; @@ -39142,13 +39655,13 @@ let sha512 = "YRZbUnyaJZLZUJSRi2G/MqahCyRv9n/ds+4oIetjDF3jWQA7AG7iSeKTiZiCNqtMZM7HDyt0e/W6lEnoGEmMGA=="; }; }; - "json2jsii-0.3.45" = { + "json2jsii-0.3.86" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.3.45"; + version = "0.3.86"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.45.tgz"; - sha512 = "bpxMmmikd3LzjZ0NG2kv0ie6q+gn5B6NpGYJNMgy3g+ny4p3d8YgYeav5oSdSsZd3dOk1qIPmpjI04/9Dx+neQ=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.3.86.tgz"; + sha512 = "x+ZVcvJoYJKkFTzBBposg27YNXQT3fIlF37TPkT4Mhxu1kxzjyo+sJVHOm8Hd77+vP/kMQeAQlElB60LnCUezg=="; }; }; "json3-3.2.6" = { @@ -39241,6 +39754,15 @@ let sha512 = "fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="; }; }; + "jsonc-parser-3.1.0" = { + name = "jsonc-parser"; + packageName = "jsonc-parser"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz"; + sha512 = "DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg=="; + }; + }; "jsonfile-1.0.1" = { name = "jsonfile"; packageName = "jsonfile"; @@ -39358,13 +39880,13 @@ let sha512 = "e0Jtg4KAzDJKKwzbLaUtinCn0RZseWBVRTRGihSpvFlM3wTR7ExSp+PTdeTsDrLNJUe7L7JYJe8mblHX5SCT6A=="; }; }; - "jsonpointer-5.0.0" = { + "jsonpointer-5.0.1" = { name = "jsonpointer"; packageName = "jsonpointer"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.0.tgz"; - sha512 = "PNYZIdMjVIvVgDSYKTT63Y+KZ6IZvGRNNWcxwD+GNnUz1MKPfv30J8ueCjdwcN0nDx2SlshgyB7Oy0epAzVRRg=="; + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz"; + sha512 = "p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ=="; }; }; "jsonrpc2-ws-1.0.0-beta9" = { @@ -39484,13 +40006,13 @@ let sha512 = "E9uALZSe3M3jiq9Mza+wTlT44Yyh/s3D5XWUeJgH3vyzB05KFQz8Tv2I9do3BbRY/S5SDxFMkxB6fCGj+MA2rg=="; }; }; - "jszip-3.10.0" = { + "jszip-3.10.1" = { name = "jszip"; packageName = "jszip"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.10.0.tgz"; - sha512 = "LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz"; + sha512 = "xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g=="; }; }; "junk-3.1.0" = { @@ -39799,13 +40321,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.3.1" = { + "keyv-4.3.3" = { name = "keyv"; packageName = "keyv"; - version = "4.3.1"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.3.1.tgz"; - sha512 = "nwP7AQOxFzELXsNq3zCx/oh81zu4DHWwCE6W9RaeHb7OHO0JpmKS8n801ovVQC7PTsZDWtPA5j1QY+/WWtARYg=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.3.3.tgz"; + sha512 = "AcysI17RvakTh8ir03+a3zJr5r0ovnAH/XTXei/4HIv3bL2K/jzvgivLK9UuI/JbU1aJjM3NSAnVvVVd3n+4DQ=="; }; }; "khroma-1.4.1" = { @@ -39817,15 +40339,6 @@ let sha512 = "+GmxKvmiRuCcUYDgR7g5Ngo0JEDeOsGdNONdU2zsiBQaK4z19Y2NvXqfEDE0ZiIrg45GTZyAnPLVsLZZACYm3Q=="; }; }; - "khroma-2.0.0" = { - name = "khroma"; - packageName = "khroma"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/khroma/-/khroma-2.0.0.tgz"; - sha512 = "2J8rDNlQWbtiNYThZRvmMv5yt44ZakX+Tz5ZIp/mN1pt4snn+m030Va5Z4v8xA0cQFDXBwO/8i42xL4QPsVk3g=="; - }; - }; "killable-1.0.1" = { name = "killable"; packageName = "killable"; @@ -39889,13 +40402,13 @@ let sha512 = "TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw=="; }; }; - "klaw-4.0.1" = { + "klaw-3.0.0" = { name = "klaw"; packageName = "klaw"; - version = "4.0.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/klaw/-/klaw-4.0.1.tgz"; - sha512 = "pgsE40/SvC7st04AHiISNewaIMUbY5V/K8b21ekiPiFoYs/EYSdsGa+FJArB1d441uq4Q8zZyIxvAzkGNlBdRw=="; + url = "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz"; + sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g=="; }; }; "klaw-sync-6.0.0" = { @@ -39916,13 +40429,13 @@ let sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; }; - "kleur-4.1.4" = { + "kleur-4.1.5" = { name = "kleur"; packageName = "kleur"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/kleur/-/kleur-4.1.4.tgz"; - sha512 = "8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA=="; + url = "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz"; + sha512 = "o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ=="; }; }; "klona-2.0.5" = { @@ -40177,13 +40690,13 @@ let sha512 = "weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA=="; }; }; - "latest-version-6.0.0" = { + "latest-version-7.0.0" = { name = "latest-version"; packageName = "latest-version"; - version = "6.0.0"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/latest-version/-/latest-version-6.0.0.tgz"; - sha512 = "zfTuGx4PwpoSJ1mABs58AkM6qMzu49LZ7LT5JHprKvpGpQ+cYtfSibi3tLLrH4z7UylYU42rfBdwN8YgqbTljA=="; + url = "https://registry.npmjs.org/latest-version/-/latest-version-7.0.0.tgz"; + sha512 = "KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg=="; }; }; "launch-editor-2.4.0" = { @@ -40591,13 +41104,13 @@ let sha512 = "DbiwHL8454goYRp5Xn9vUA5XU6x8rNh8BmZ7ywSTUhVBIiDS7ev/FT6+AwU2/ZKW2jEOC7WKhpkJfExaQwosRA=="; }; }; - "libnpmaccess-4.0.3" = { + "libnpmaccess-6.0.3" = { name = "libnpmaccess"; packageName = "libnpmaccess"; - version = "4.0.3"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.3.tgz"; - sha512 = "sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ=="; + url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-6.0.3.tgz"; + sha512 = "4tkfUZprwvih2VUZYMozL7EMKgQ5q9VW2NtRyxWtQWlkLTAWHRklcAvBN49CVqEkhUw7vTX2fNgB5LzgUucgYg=="; }; }; "libnpmconfig-1.2.1" = { @@ -40609,13 +41122,13 @@ let sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; }; }; - "libnpmpublish-4.0.2" = { + "libnpmpublish-6.0.4" = { name = "libnpmpublish"; packageName = "libnpmpublish"; - version = "4.0.2"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.2.tgz"; - sha512 = "+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw=="; + url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-6.0.4.tgz"; + sha512 = "lvAEYW8mB8QblL6Q/PI/wMzKNvIrF7Kpujf/4fGS/32a2i3jzUXi04TNyIBcK6dQJ34IgywfaKGh+Jq4HYPFmg=="; }; }; "libsodium-0.7.10" = { @@ -40717,13 +41230,13 @@ let sha512 = "ghban3KbqkbzahwIp4NAtuhc8xIurVcCXAd7tV6qGkFYKZAy9loIvFrhZqoWF4A4jnaKbRnJPCaxzJ8JwPl3EA=="; }; }; - "lilconfig-2.0.5" = { + "lilconfig-2.0.6" = { name = "lilconfig"; packageName = "lilconfig"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz"; - sha512 = "xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg=="; + url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"; + sha512 = "9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg=="; }; }; "limit-spawn-0.0.3" = { @@ -40825,6 +41338,15 @@ let sha512 = "ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ=="; }; }; + "linkify-it-4.0.1" = { + name = "linkify-it"; + packageName = "linkify-it"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz"; + sha512 = "C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw=="; + }; + }; "listenercount-1.0.1" = { name = "listenercount"; packageName = "listenercount"; @@ -40888,13 +41410,13 @@ let sha512 = "q7Z71n3i4X0R9xthAryBdNGVGAO2R5X+/xXpmKeuPMrteg+W2U8VusTKV3YiJbXZwKsOlFlHe+go6uSNjfxrZw=="; }; }; - "livereload-js-3.4.0" = { + "livereload-js-3.4.1" = { name = "livereload-js"; packageName = "livereload-js"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/livereload-js/-/livereload-js-3.4.0.tgz"; - sha512 = "F/pz9ZZP+R+arY94cECTZco7PXgBXyL+KVWUPZq8AQE9TOu14GV6fYeKOviv02JCvFa4Oi3Rs1hYEpfeajc+ow=="; + url = "https://registry.npmjs.org/livereload-js/-/livereload-js-3.4.1.tgz"; + sha512 = "5MP0uUeVCec89ZbNOT/i97Mc+q3SxXmiUGhRFOTmhrGPn//uWVQdCvcLJDy64MSBR5MidFdOR7B9viumoavy6g=="; }; }; "lmdb-2.5.2" = { @@ -40906,6 +41428,15 @@ let sha512 = "V5V5Xa2Hp9i2XsbDALkBTeHXnBXh/lEmk9p22zdr7jtuOIY9TGhjK6vAvTpOOx9IKU4hJkRWZxn/HsvR1ELLtA=="; }; }; + "lmdb-2.5.3" = { + name = "lmdb"; + packageName = "lmdb"; + version = "2.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lmdb/-/lmdb-2.5.3.tgz"; + sha512 = "iBA0cb13CobBSoGJLfZgnrykLlfJipDAnvtf+YwIqqzBEsTeQYsXrHaSBkaHd5wCWeabwrNvhjZoFMUrlo+eLw=="; + }; + }; "ln-accounting-5.0.7" = { name = "ln-accounting"; packageName = "ln-accounting"; @@ -40942,6 +41473,15 @@ let sha512 = "Ulk35FIMF1E+iKgImlYVESWlf9eznhd/ZYw6qycQlcjp686QccKi6Otng8H49JSfc1/kj/ObOuFipP9mtil3Wg=="; }; }; + "ln-service-53.17.4" = { + name = "ln-service"; + packageName = "ln-service"; + version = "53.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-service/-/ln-service-53.17.4.tgz"; + sha512 = "/lyDSuovNrBub1oGLhWGWsre1q9YHRVroMyZ5wybcXhBTFgB/m1gEc7HK8VPzwtLVptd9OkRFwgCZSms0e4p4Q=="; + }; + }; "ln-sync-3.12.1" = { name = "ln-sync"; packageName = "ln-sync"; @@ -40969,13 +41509,22 @@ let sha512 = "f5s60wyijcp67gN86VuVSax1xtoc7djwiDLYWIsJPU7uro4F3n8sU76HI1xZxwNL8Q7mMbWEMm/SIeA7ds9yEw=="; }; }; - "ln-telegram-3.22.2" = { + "ln-sync-3.13.1" = { + name = "ln-sync"; + packageName = "ln-sync"; + version = "3.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ln-sync/-/ln-sync-3.13.1.tgz"; + sha512 = "pI3+sRUw9AwGZjinh4smev47EcQpbB9JrhdZsx5C7ES05TzLBA70f7ZQqVXr3U93BYqy+NyOTMoe+OQXGnUe7A=="; + }; + }; + "ln-telegram-3.22.3" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.22.2"; + version = "3.22.3"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.22.2.tgz"; - sha512 = "Vqnx7Pmgbn6ENX5b13P7pK02k29LcFFyOznFsbbI9WFjfmVHskJ6ymIuA7GX+oEy6XgyMA9/nDYh1BQhnPNcgA=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.22.3.tgz"; + sha512 = "3BUj+0awy2CiV3W/8yYjZLYukiMLMIfR7PiYVkCRxiphEe8y6ki2xkBSzyR70NTgBogI6Flp6e6dagXLf/Laog=="; }; }; "load-bmfont-1.4.1" = { @@ -42049,15 +42598,6 @@ let sha512 = "sTebg2a1PoicYEZXD5PBdQcTlIJ6hUslrlWr7iV0O7n+i4596s2NQ9I5CaZ5FbXSfya/9WQsrYLANUJv9paYVA=="; }; }; - "lodash.isobject-3.0.2" = { - name = "lodash.isobject"; - packageName = "lodash.isobject"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz"; - sha512 = "3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA=="; - }; - }; "lodash.isplainobject-4.0.6" = { name = "lodash.isplainobject"; packageName = "lodash.isplainobject"; @@ -42544,31 +43084,22 @@ let sha512 = "Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw=="; }; }; - "log4js-6.5.2" = { + "log4js-6.6.1" = { name = "log4js"; packageName = "log4js"; - version = "6.5.2"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/log4js/-/log4js-6.5.2.tgz"; - sha512 = "DXtpNtt+KDOMT7RHUDIur/WsSA3rntlUh9Zg4XCdV42wUuMmbFkl38+LZ92Z5QvQA7mD5kAVkLiBSEH/tvUB8A=="; + url = "https://registry.npmjs.org/log4js/-/log4js-6.6.1.tgz"; + sha512 = "J8VYFH2UQq/xucdNu71io4Fo+purYYudyErgBbswWKO0MC6QVOERRomt5su/z6d3RJSmLyTGmXl3Q/XjKCf+/A=="; }; }; - "logform-2.4.0" = { + "logform-2.4.2" = { name = "logform"; packageName = "logform"; - version = "2.4.0"; + version = "2.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.4.0.tgz"; - sha512 = "CPSJw4ftjf517EhXZGGvTHHkYobo7ZCc0kvwUoOYcjfR2UVrI66RHj8MCrfAdEitdmFqbu2BYdYs8FHHZSb6iw=="; - }; - }; - "logform-2.4.1" = { - name = "logform"; - packageName = "logform"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.4.1.tgz"; - sha512 = "7XB/tqc3VRbri9pRjU6E97mQ8vC27ivJ3lct4jhyT+n0JNDd4YKldFl0D75NqDp46hk8RC7Ma1Vjv/UPf67S+A=="; + url = "https://registry.npmjs.org/logform/-/logform-2.4.2.tgz"; + sha512 = "W4c9himeAwXEdZ05dQNerhFz2XG80P9Oj0loPUMV23VC2it0orMHQhJm4hdnnor3rd1HsGf6a2lPwBM1zeXHGw=="; }; }; "logidrom-0.3.1" = { @@ -42643,6 +43174,15 @@ let sha512 = "XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="; }; }; + "long-5.2.0" = { + name = "long"; + packageName = "long"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/long/-/long-5.2.0.tgz"; + sha512 = "9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="; + }; + }; "long-timeout-0.1.1" = { name = "long-timeout"; packageName = "long-timeout"; @@ -42832,6 +43372,15 @@ let sha512 = "tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="; }; }; + "lowercase-keys-3.0.0" = { + name = "lowercase-keys"; + packageName = "lowercase-keys"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz"; + sha512 = "ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ=="; + }; + }; "lowlight-1.9.2" = { name = "lowlight"; packageName = "lowlight"; @@ -42913,13 +43462,13 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lru-cache-7.10.1" = { + "lru-cache-7.13.2" = { name = "lru-cache"; packageName = "lru-cache"; - version = "7.10.1"; + version = "7.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.10.1.tgz"; - sha512 = "BQuhQxPuRl79J5zSXRP+uNzPOyZw2oFI9JLRQ80XswSvg21KMKNtQza9eF42rfI/3Z40RvzBdXgziEkudzjo8A=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-7.13.2.tgz"; + sha512 = "VJL3nIpA79TodY/ctmZEfhASgqekbT574/c4j3jn4bKXbSCnTTCH/KltZyvL2GlV+tGSMtsWyem8DCX7qKTMBA=="; }; }; "lru-queue-0.1.0" = { @@ -43085,15 +43634,6 @@ let sha512 = "oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w=="; }; }; - "magic-string-0.25.7" = { - name = "magic-string"; - packageName = "magic-string"; - version = "0.25.7"; - src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"; - sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="; - }; - }; "magic-string-0.25.9" = { name = "magic-string"; packageName = "magic-string"; @@ -43112,6 +43652,15 @@ let sha512 = "ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg=="; }; }; + "magic-string-0.26.2" = { + name = "magic-string"; + packageName = "magic-string"; + version = "0.26.2"; + src = fetchurl { + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.26.2.tgz"; + sha512 = "NzzlXpclt5zAbmo6h6jNc8zl2gNRGHvmsZW4IvZhTC4W7k4OlLP+S5YLussa/r3ixNT66KOQfNORlXHSOy/X4A=="; + }; + }; "magicli-0.0.5" = { name = "magicli"; packageName = "magicli"; @@ -43202,22 +43751,13 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "make-fetch-happen-10.1.8" = { + "make-fetch-happen-10.2.0" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "10.1.8"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.1.8.tgz"; - sha512 = "0ASJbG12Au6+N5I84W+8FhGS6iM8MyzvZady+zaQAu+6IOaESFzCLLD0AR1sAFF3Jufi8bxm586ABN6hWd3k7g=="; - }; - }; - "make-fetch-happen-8.0.14" = { - name = "make-fetch-happen"; - packageName = "make-fetch-happen"; - version = "8.0.14"; - src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz"; - sha512 = "EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.0.tgz"; + sha512 = "OnEfCLofQVJ5zgKwGk55GaqosqKjaR6khQlJY3dBAA+hM25Bc5CmX5rKUfVut+rYA3uidA7zb7AvcglU87rPRg=="; }; }; "make-fetch-happen-9.1.0" = { @@ -43391,6 +43931,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-8.4.2" = { name = "markdown-it"; packageName = "markdown-it"; @@ -43490,13 +44039,13 @@ let sha512 = "HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A=="; }; }; - "markdown-it-multimd-table-4.1.3" = { + "markdown-it-multimd-table-4.2.0" = { name = "markdown-it-multimd-table"; packageName = "markdown-it-multimd-table"; - version = "4.1.3"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.1.3.tgz"; - sha512 = "cXvJ+l8dMRmUZLrn34W/8tfLYjC40R7S0wRwcb95emuvQ3uiWNf9vB/IyeRh6XqEq95eXh70+UDNZ29qcOI+Dg=="; + url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.2.0.tgz"; + sha512 = "wFpb8TSQ9josQrAlOg1toEAHHSGYQZ4krBKfpejPQ+lq3oudnxCNW4S6gYMcRbkrtrfX/ND2njr4belnKt3fBg=="; }; }; "markdown-it-sub-1.0.0" = { @@ -43580,13 +44129,13 @@ let sha512 = "y8j3a5/DkJCmS5x4dMCQL+OR0+2EAq3DOtio1COSHsmW2BGXnNCK3v12hJt1LrUz5iZH5g0LmuYOjDdI+czghA=="; }; }; - "markdownlint-0.25.1" = { + "markdownlint-0.26.1" = { name = "markdownlint"; packageName = "markdownlint"; - version = "0.25.1"; + version = "0.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint/-/markdownlint-0.25.1.tgz"; - sha512 = "AG7UkLzNa1fxiOv5B+owPsPhtM4D6DoODhsJgiaNg1xowXovrYgOnLqAgOOFQpWOlHFVQUzjMY5ypNNTeov92g=="; + url = "https://registry.npmjs.org/markdownlint/-/markdownlint-0.26.1.tgz"; + sha512 = "8sLz1ktz5s4E0IDum2H9aiWLQU7RA5Eket9HUW5IRwfFnW2RD2ZyqYePW+z71tMc7lrFZc1+yPmlN9lirbJnlg=="; }; }; "markdownlint-cli2-formatter-default-0.0.3" = { @@ -43598,13 +44147,13 @@ let sha512 = "QEAJitT5eqX1SNboOD+SO/LNBpu4P4je8JlR02ug2cLQAqmIhh8IJnSK7AcaHBHhNADqdGydnPpQOpsNcEEqCw=="; }; }; - "markdownlint-rule-helpers-0.16.0" = { + "markdownlint-rule-helpers-0.17.1" = { name = "markdownlint-rule-helpers"; packageName = "markdownlint-rule-helpers"; - version = "0.16.0"; + version = "0.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.16.0.tgz"; - sha512 = "oEacRUVeTJ5D5hW1UYd2qExYI0oELdYK72k1TKGvIeYJIbqQWAz476NAc7LNixSySUhcNl++d02DvX0ccDk9/w=="; + url = "https://registry.npmjs.org/markdownlint-rule-helpers/-/markdownlint-rule-helpers-0.17.1.tgz"; + sha512 = "Djc5IjJt7VA5sZRisISsJC/rQXR7hr8JS9u6Q9/ce3mjPZdzw535cFGG0U6Mag+ldRTRmRwCcTfivOh57KUP4w=="; }; }; "marked-0.3.19" = { @@ -43616,13 +44165,13 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; - "marked-4.0.17" = { + "marked-4.0.18" = { name = "marked"; packageName = "marked"; - version = "4.0.17"; + version = "4.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-4.0.17.tgz"; - sha512 = "Wfk0ATOK5iPxM4ptrORkFemqroz0ZDxp5MWfYA7H/F+wO17NRWV5Ypxi6p3g2Xmw2bKeiYOl6oVnLHKxBA0VhA=="; + url = "https://registry.npmjs.org/marked/-/marked-4.0.18.tgz"; + sha512 = "wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw=="; }; }; "marked-terminal-5.1.1" = { @@ -43634,13 +44183,13 @@ let sha512 = "+cKTOx9P4l7HwINYhzbrBSyzgxO2HaHKGZGuB1orZsMIgXYaJyfidT81VXRdpelW/PcHEWxywscePVgI/oUF6g=="; }; }; - "marky-1.2.4" = { + "marky-1.2.5" = { name = "marky"; packageName = "marky"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/marky/-/marky-1.2.4.tgz"; - sha512 = "zd2/GiSn6U3/jeFVZ0J9CA1LzQ8RfIVvXkb/U0swFHF/zT+dVohTAWjmo2DcIuofmIIIROlwTbd+shSeXmxr0w=="; + url = "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz"; + sha512 = "q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q=="; }; }; "mastodon-api-1.3.0" = { @@ -43823,13 +44372,13 @@ let sha512 = "9cKl33Y21lyckGzpSmEQnIDjEfeeWelN5s1kUW1LwdB0Fkuq2u+4GdqcGEygYxJE8GVqCl0741bYXHgamfWAZA=="; }; }; - "mdast-util-find-and-replace-2.2.0" = { + "mdast-util-find-and-replace-2.2.1" = { name = "mdast-util-find-and-replace"; packageName = "mdast-util-find-and-replace"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.0.tgz"; - sha512 = "bz8hUWkMX7UcasORORcyBEsTKJ+dBiFwRPrm43hHC9NMRylIMLbfO5rwfeCN+UtY4AAi7s8WqXftb9eX6ZsqCg=="; + url = "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-2.2.1.tgz"; + sha512 = "SobxkQXFAdd4b5WmEakmkVoh18icjQRxGy5OWTCzgsLRm1Fu/KCtwD1HIQSsmq5ZRjVH0Ehwg6/Fn3xIUk+nKw=="; }; }; "mdast-util-footnote-0.1.7" = { @@ -43994,13 +44543,13 @@ let sha512 = "leKb9uG7laXdyFlTleYV4ZEaCpsxeU1LlkkR/xp35pgKrfV1Y0fNCuOw9vaRc2a9YDpH22wd145Wt7UY5yzeZw=="; }; }; - "mdast-util-mdx-expression-1.2.1" = { + "mdast-util-mdx-expression-1.3.0" = { name = "mdast-util-mdx-expression"; packageName = "mdast-util-mdx-expression"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.2.1.tgz"; - sha512 = "BtQwyalaq6jRjx0pagtuAwGrmzL1yInrfA4EJv7GOoiPOUbR4gr6h65I+G3WTh1/Cag2Eda4ip400Ch6CFmWiA=="; + url = "https://registry.npmjs.org/mdast-util-mdx-expression/-/mdast-util-mdx-expression-1.3.0.tgz"; + sha512 = "9kTO13HaL/ChfzVCIEfDRdp1m5hsvsm6+R8yr67mH+KS2ikzZ0ISGLPTbTswOFpLLlgVHO9id3cul4ajutCvCA=="; }; }; "mdast-util-mdx-jsx-1.2.0" = { @@ -44012,13 +44561,13 @@ let sha512 = "5+ot/kfxYd3ChgEMwsMUO71oAfYjyRI3pADEK4I7xTmWLGQ8Y7ghm1CG36zUoUvDPxMlIYwQV/9DYHAUWdG4dA=="; }; }; - "mdast-util-mdxjs-esm-1.2.0" = { + "mdast-util-mdxjs-esm-1.3.0" = { name = "mdast-util-mdxjs-esm"; packageName = "mdast-util-mdxjs-esm"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.2.0.tgz"; - sha512 = "IPpX9GBzAIbIRCjbyeLDpMhACFb0wxTIujuR3YElB8LWbducUdMgRJuqs/Vg8xQ1bIAMm7lw8L+YNtua0xKXRw=="; + url = "https://registry.npmjs.org/mdast-util-mdxjs-esm/-/mdast-util-mdxjs-esm-1.3.0.tgz"; + sha512 = "7N5ihsOkAEGjFotIX9p/YPdl4TqUoMxL4ajNz7PbT89BqsdWJuBC9rvgt6wpbwTZqWWR0jKWqQbwsOWDBUZv4g=="; }; }; "mdast-util-to-markdown-0.6.5" = { @@ -44237,22 +44786,22 @@ let sha512 = "yiAivd4xFOH/WXlUi6v/nKopBh1QLzwjFi36NK88cGt/PRXI8WeBASqY+YSjIVWvQTx3hR8zHKDBMV6hWmglNA=="; }; }; - "mem-fs-editor-9.4.0" = { + "mem-fs-editor-9.5.0" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "9.4.0"; + version = "9.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.4.0.tgz"; - sha512 = "HSSOLSVRrsDdui9I6i96dDtG+oAez/4EB2g4cjSrNhgNQ3M+L57/+22NuPdORSoxvOHjIg/xeOE+C0wwF91D2g=="; + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-9.5.0.tgz"; + sha512 = "7p+bBDqsSisO20YIZf2ntYvST27fFJINn7CKE21XdPUQDcLV62b/yB5sTOooQeEoiZ3rldZQ+4RfONgL/gbRoA=="; }; }; - "memfs-3.4.6" = { + "memfs-3.4.7" = { name = "memfs"; packageName = "memfs"; - version = "3.4.6"; + version = "3.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/memfs/-/memfs-3.4.6.tgz"; - sha512 = "rH9mjopto6Wkr7RFuH9l9dk3qb2XGOcYKr7xMhaYqfzuJqOqhRrcFvfD7JMuPj6SLmPreh5+6eAuv36NFAU+Mw=="; + url = "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz"; + sha512 = "ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw=="; }; }; "memoize-one-5.2.1" = { @@ -44363,13 +44912,13 @@ let sha512 = "S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw=="; }; }; - "meow-10.1.2" = { + "meow-10.1.3" = { name = "meow"; packageName = "meow"; - version = "10.1.2"; + version = "10.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-10.1.2.tgz"; - sha512 = "zbuAlN+V/sXlbGchNS9WTWjUzeamwMt/BApKCJi7B0QyZstZaMx0n4Unll/fg0njGtMdC9UP5SAscvOCLYdM+Q=="; + url = "https://registry.npmjs.org/meow/-/meow-10.1.3.tgz"; + sha512 = "0WL7RMCPPdUTE00+GxJjL4d5Dm6eUbmAzxlzywJWiRUKCW093owmZ7/q74tH9VI91vxw9KJJNxAcvdpxb2G4iA=="; }; }; "meow-3.7.0" = { @@ -44507,15 +45056,6 @@ let sha512 = "ITSHjwVaby1Li738sxhF48sLTxcNyUAoWfoqyztL1f7J6JOLpHOuQPNLBb6lxGPUA0u7xP9IRULgvod0dKu35A=="; }; }; - "mermaid-9.1.2" = { - name = "mermaid"; - packageName = "mermaid"; - version = "9.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mermaid/-/mermaid-9.1.2.tgz"; - sha512 = "RVf3hBKqiMfyORHboCaEjOAK1TomLO50hYRPvlTrZCXlCniM5pRpe8UlkHBjjpaLtioZnbdYv/vEVj7iKnwkJQ=="; - }; - }; "meros-1.1.4" = { name = "meros"; packageName = "meros"; @@ -44957,13 +45497,13 @@ let sha512 = "U2s5YdnAYexjKDel31SVMPbfi+eF8y1U4pfiRW/Y8EFVCy/vgxk/2wWTxzcqE71LHtCuCzlBDRU2a5CQ5j+mQA=="; }; }; - "micromark-util-events-to-acorn-1.1.0" = { + "micromark-util-events-to-acorn-1.2.0" = { name = "micromark-util-events-to-acorn"; packageName = "micromark-util-events-to-acorn"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.1.0.tgz"; - sha512 = "hB8HzidNt/Us5q2BvqXj8eeEm0U9rRfnZxcA9T65JRUMAY4MbfJRAFm7m9fXMAdSHJiVPmajsp8/rp6/FlHL8A=="; + url = "https://registry.npmjs.org/micromark-util-events-to-acorn/-/micromark-util-events-to-acorn-1.2.0.tgz"; + sha512 = "WWp3bf7xT9MppNuw3yPjpnOxa8cj5ACivEzXJKu0WwnjBYfzaBvIAT9KfeyI0Qkll+bfQtfftSwdgTH6QhTOKw=="; }; }; "micromark-util-html-tag-name-1.1.0" = { @@ -45047,15 +45587,6 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "micromatch-4.0.4" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; - sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; - }; - }; "micromatch-4.0.5" = { name = "micromatch"; packageName = "micromatch"; @@ -45434,6 +45965,15 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; + "minimatch-3.0.5" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw=="; + }; + }; "minimatch-3.0.8" = { name = "minimatch"; packageName = "minimatch"; @@ -45569,13 +46109,13 @@ let sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ=="; }; }; - "minipass-3.3.3" = { + "minipass-3.3.5" = { name = "minipass"; packageName = "minipass"; - version = "3.3.3"; + version = "3.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.3.3.tgz"; - sha512 = "N0BOsdFAlNRfmwMhjAsLVWOk7Ljmeb39iqFlsV1At+jqRhSUP9yeof8FyJu4imaJiSUp8vQebWD/guZwGQC8iA=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.5.tgz"; + sha512 = "rQ/p+KfKBkeNwo04U15i+hOwoVBVmekmm/HcfTkTN2t9pbQKCMm4eN5gFeqgrrSp/kH/7BYYhTIHOxGqzbBPaA=="; }; }; "minipass-collect-1.0.2" = { @@ -45803,22 +46343,22 @@ let sha512 = "sdqtiFt3lkOaYvTXSRIUjkIdPTcxgv5+fgqYE/5qgwdw12cOrAuzzgzvVExIkH/ul1oeHN3bCLOWSG3XOqbKKw=="; }; }; - "mobx-6.6.0" = { + "mobx-6.6.1" = { name = "mobx"; packageName = "mobx"; - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.6.0.tgz"; - sha512 = "MNTKevLH/6DShLZcmSL351+JgiJPO56A4GUpoiDQ3/yZ0mAtclNLdHK9q4BcQhibx8/JSDupfTpbX2NZPemlRg=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.6.1.tgz"; + sha512 = "7su3UZv5JF+ohLr2opabjbUAERfXstMY+wiBtey8yNAPoB8H187RaQXuhFjNkH8aE4iHbDWnhDFZw0+5ic4nGQ=="; }; }; - "mobx-react-7.5.0" = { + "mobx-react-7.5.2" = { name = "mobx-react"; packageName = "mobx-react"; - version = "7.5.0"; + version = "7.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.5.0.tgz"; - sha512 = "riHu0XZJA6f64L1iXZoAaDjVt6suYoy8I2HIfuz2tX3O4FFaAe4lVA2CoObttmUQTTFPM7j3Df6T4re0cHkghQ=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-7.5.2.tgz"; + sha512 = "NP44ONwSqTy+3KlD7y9k7xbsuGD+8mgUj3IeI65SbxF1IOB42/j9TbosgUEDn//CCuU6OmQ7k9oiu9eSpRBHnw=="; }; }; "mobx-react-lite-3.4.0" = { @@ -45911,13 +46451,13 @@ let sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; - "moment-2.29.3" = { + "moment-2.29.4" = { name = "moment"; packageName = "moment"; - version = "2.29.3"; + version = "2.29.4"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz"; - sha512 = "c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"; + sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; }; "moment-2.7.0" = { @@ -45956,22 +46496,22 @@ let sha512 = "3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg=="; }; }; - "mongodb-4.7.0" = { + "mongodb-4.8.1" = { name = "mongodb"; packageName = "mongodb"; - version = "4.7.0"; + version = "4.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-4.7.0.tgz"; - sha512 = "HhVar6hsUeMAVlIbwQwWtV36iyjKd9qdhY+s4wcU8K6TOj4Q331iiMy+FoPuxEntDIijTYWivwFJkLv8q/ZgvA=="; + url = "https://registry.npmjs.org/mongodb/-/mongodb-4.8.1.tgz"; + sha512 = "/NyiM3Ox9AwP5zrfT9TXjRKDJbXlLaUDQ9Rg//2lbg8D2A8GXV0VidYYnA/gfdK6uwbnL4FnAflH7FbGw3TS7w=="; }; }; - "mongodb-connection-string-url-2.5.2" = { + "mongodb-connection-string-url-2.5.3" = { name = "mongodb-connection-string-url"; packageName = "mongodb-connection-string-url"; - version = "2.5.2"; + version = "2.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.2.tgz"; - sha512 = "tWDyIG8cQlI5k3skB6ywaEA5F9f5OntrKKsT/Lteub2zgwSUlhqEN2inGgBTm8bpYJf8QYBdA/5naz65XDpczA=="; + url = "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-2.5.3.tgz"; + sha512 = "f+/WsED+xF4B74l3k9V/XkTVj5/fxFH2o5ToKXd8Iyi5UhM+sO9u0Ape17Mvl/GkZaFtM0HQnzAG5OTmhKw+tQ=="; }; }; "moniker-0.1.2" = { @@ -46100,13 +46640,13 @@ let sha512 = "ZgX4b93cWk+EazOFRV4lekLqmc4rV7P+WMisG8N0F2M4/EiluPMNNWjuaurQfitak++AIc/ZVQ3IgM3cBcH7WA=="; }; }; - "mqtt-4.3.5" = { + "mqtt-4.3.7" = { name = "mqtt"; packageName = "mqtt"; - version = "4.3.5"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.5.tgz"; - sha512 = "l29WGHAc0EayK1cjb6moozc+rlgK6YRCPbP3zB1CrJw84Bjk4kG9EJCXojdn4r29lA80SCqxRKq1QJ87+Xevng=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.7.tgz"; + sha512 = "ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw=="; }; }; "mqtt-packet-6.10.0" = { @@ -46217,22 +46757,22 @@ let sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg=="; }; }; - "msgpackr-1.6.1" = { + "msgpackr-1.6.2" = { name = "msgpackr"; packageName = "msgpackr"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.6.1.tgz"; - sha512 = "Je+xBEfdjtvA4bKaOv8iRhjC8qX2oJwpYH4f7JrG4uMVJVmnmkAT4pjKdbztKprGj3iwjcxPzb5umVZ02Qq3tA=="; + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.6.2.tgz"; + sha512 = "bqSQ0DYJbXbrJcrZFmMygUZmqQiDfI2ewFVWcrZY12w5XHWtPuW4WppDT/e63Uu311ajwkRRXSoF0uILroBeTA=="; }; }; - "msgpackr-extract-2.0.2" = { + "msgpackr-extract-2.1.2" = { name = "msgpackr-extract"; packageName = "msgpackr-extract"; - version = "2.0.2"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.0.2.tgz"; - sha512 = "coskCeJG2KDny23zWeu+6tNy7BLnAiOGgiwzlgdm4oeSsTpqEJJPguHIuKZcCdB7tzhZbXNYSg6jZAXkZErkJA=="; + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-2.1.2.tgz"; + sha512 = "cmrmERQFb19NX2JABOGtrKdHMyI6RUyceaPBQ2iRz9GnDkjBWFjNJC0jyyoOfZl2U/LZE3tQCCQc4dlRyA8mcA=="; }; }; "multer-1.4.3" = { @@ -46253,6 +46793,15 @@ let sha512 = "2wY2+xD4udX612aMqMcB8Ws2Voq6NIUPEtD1be6m411T4uDH/VtL9i//xvcyFlTVfRdaBsk7hV5tgrGQqhuBiw=="; }; }; + "multer-1.4.5-lts.1" = { + name = "multer"; + packageName = "multer"; + version = "1.4.5-lts.1"; + src = fetchurl { + url = "https://registry.npmjs.org/multer/-/multer-1.4.5-lts.1.tgz"; + sha512 = "ywPWvcDMeH+z9gQq5qYHCCy+ethsk4goepZ45GLD63fOu0YcNecQxi64nDs3qluZB+murG3/D4dJ7+dGctcCQQ=="; + }; + }; "multi-progress-4.0.0" = { name = "multi-progress"; packageName = "multi-progress"; @@ -46874,13 +47423,13 @@ let sha512 = "p7KTHxU0CUrcOXe62Zfrb5Z13nLvPhSWR/so3kFulUQU0sgUll2Z0LwpsLN351eOOD+hRGu/F1g+6xDfPeD++Q=="; }; }; - "ncjsm-4.3.0" = { + "ncjsm-4.3.1" = { name = "ncjsm"; packageName = "ncjsm"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.3.0.tgz"; - sha512 = "oah6YGwb4Ern2alojiMFcjPhE4wvQBw1Ur/kUr2P0ovKdzaF5pCIsGjs0f2y+iZeej0/5Y6OOhQ8j30cTDMEGw=="; + url = "https://registry.npmjs.org/ncjsm/-/ncjsm-4.3.1.tgz"; + sha512 = "5hy/Mr7KKLS/AFyY4Be8q0aXz8wYd2PN3cSSMBeQHfcrK6Sbd0EGoQxiNrUoKMAYhl67v4A975f6Gy1oEqfJlA=="; }; }; "nconf-0.10.0" = { @@ -47262,6 +47811,15 @@ let sha512 = "+I10J3wKNoKddNxn0CNpoZ3eTZuqxjNM3b1GImVx22+ePI+Y15P8g/j3WsbP0fhzzrFzrtjOAoq5NCCucswXOQ=="; }; }; + "next-tick-1.0.0" = { + name = "next-tick"; + packageName = "next-tick"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"; + sha512 = "mc/caHeUcdjnC/boPWJefDr4KUIWQNv+tlnFnJd38QMou86QtxQzBJfxgGRzvx8jazYRqrVlaHarfO72uNxPOg=="; + }; + }; "next-tick-1.1.0" = { name = "next-tick"; packageName = "next-tick"; @@ -47406,13 +47964,13 @@ let sha512 = "/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w=="; }; }; - "node-abi-3.22.0" = { + "node-abi-3.24.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.22.0"; + version = "3.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.22.0.tgz"; - sha512 = "u4uAs/4Zzmp/jjsD9cyFYDXeISfUWaAVWshPmDZOFOv4Xl4SbzTXm53I04C2uRueYJ+0t5PEtLH/owbn2Npf/w=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.24.0.tgz"; + sha512 = "YPG3Co0luSu6GwOBsmIdGW6Wx0NyNDLg/hriIyDllVsNwnI6UeqaWShxC3lbH4LtEQUgoLP3XR1ndXiDAWvmRw=="; }; }; "node-abort-controller-3.0.1" = { @@ -47604,13 +48162,13 @@ let sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; - "node-fetch-3.2.6" = { + "node-fetch-3.2.8" = { name = "node-fetch"; packageName = "node-fetch"; - version = "3.2.6"; + version = "3.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.6.tgz"; - sha512 = "LAy/HZnLADOVkVPubaxHDft29booGglPFDr2Hw0J1AercRh01UiVFm++KMDnJeH9sHgNB4hsXPii7Sgym/sTbw=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-3.2.8.tgz"; + sha512 = "KtpD1YhGszhntMpBDyp5lyagk8KIMopC1LEb7cQUAh7zcosaX5uK8HnbNb2i3NTQK3sIawCItS0uFC3QzcLHdg=="; }; }; "node-fetch-h2-2.3.0" = { @@ -47703,13 +48261,13 @@ let sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w=="; }; }; - "node-gyp-9.0.0" = { + "node-gyp-9.1.0" = { name = "node-gyp"; packageName = "node-gyp"; - version = "9.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz"; - sha512 = "Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.1.0.tgz"; + sha512 = "HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g=="; }; }; "node-gyp-build-4.1.1" = { @@ -47721,22 +48279,13 @@ let sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ=="; }; }; - "node-gyp-build-4.4.0" = { + "node-gyp-build-4.5.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz"; - sha512 = "amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ=="; - }; - }; - "node-gyp-build-optional-packages-5.0.2" = { - name = "node-gyp-build-optional-packages"; - packageName = "node-gyp-build-optional-packages"; - version = "5.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.2.tgz"; - sha512 = "PiN4NWmlQPqvbEFcH/omQsswWQbe5Z9YK/zdB23irp5j2XibaA2IrGvpSWmVVG4qMZdmPdwPctSy4a86rOMn6g=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; + sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; }; }; "node-gyp-build-optional-packages-5.0.3" = { @@ -47856,15 +48405,6 @@ let sha512 = "TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q=="; }; }; - "node-pre-gyp-0.13.0" = { - name = "node-pre-gyp"; - packageName = "node-pre-gyp"; - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz"; - sha512 = "Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ=="; - }; - }; "node-pre-gyp-0.6.39" = { name = "node-pre-gyp"; packageName = "node-pre-gyp"; @@ -47883,13 +48423,13 @@ let sha512 = "SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA=="; }; }; - "node-red-admin-2.2.4" = { + "node-red-admin-3.0.0" = { name = "node-red-admin"; packageName = "node-red-admin"; - version = "2.2.4"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-2.2.4.tgz"; - sha512 = "DlJpMFopqBNj10k5rGGI9ZNBi+whAIS+IHrSZH1xllfuJKZxQBZgR+o+rJeufDyc0OBRgHRqmX776HrBrlDtMA=="; + url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-3.0.0.tgz"; + sha512 = "1J1tcV+zkCIy24n0rcJ/DSPSCziEgLGld+QBYk1rNESIo+gFyL5RMkCOcII2IrBTZF/kcDTElepMTCILXbMDfQ=="; }; }; "node-redis-pubsub-5.0.0" = { @@ -47910,13 +48450,13 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; - "node-releases-2.0.5" = { + "node-releases-2.0.6" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz"; - sha512 = "U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"; + sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; }; }; "node-rsa-1.1.1" = { @@ -48459,6 +48999,15 @@ let sha512 = "xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g=="; }; }; + "npm-package-arg-8.1.1" = { + name = "npm-package-arg"; + packageName = "npm-package-arg"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz"; + sha512 = "CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg=="; + }; + }; "npm-package-arg-8.1.5" = { name = "npm-package-arg"; packageName = "npm-package-arg"; @@ -48468,13 +49017,13 @@ let sha512 = "LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q=="; }; }; - "npm-package-arg-9.0.2" = { + "npm-package-arg-9.1.0" = { name = "npm-package-arg"; packageName = "npm-package-arg"; - version = "9.0.2"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.0.2.tgz"; - sha512 = "v/miORuX8cndiOheW8p2moNuPJ7QhcFh9WGlTorruG8hXSA23vMTEp5hTCmDxic0nD8KHhj/NQgFuySD3GYY3g=="; + url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.1.0.tgz"; + sha512 = "4J0GL+u2Nh6OnhvUKXRr2ZMG4lR8qtLp+kv7UiV00Y+nGiSxtttCyIRHCt5L5BNkXQld/RceYItau3MDOoGiBw=="; }; }; "npm-packlist-1.4.8" = { @@ -48504,13 +49053,13 @@ let sha512 = "L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ=="; }; }; - "npm-packlist-5.1.0" = { + "npm-packlist-5.1.1" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.0.tgz"; - sha512 = "a04sqF6FbkyOAFA19AA0e94gS7Et5T2/IMj3VOT9nOF2RaRdVPQ1Q17Fb/HaDRFs+gbC7HOmhVZ29adpWgmDZg=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz"; + sha512 = "UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw=="; }; }; "npm-pick-manifest-6.1.1" = { @@ -48567,22 +49116,13 @@ let sha512 = "Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA=="; }; }; - "npm-registry-fetch-13.1.1" = { + "npm-registry-fetch-13.3.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "13.1.1"; + version = "13.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.1.1.tgz"; - sha512 = "5p8rwe6wQPLJ8dMqeTnA57Dp9Ox6GH9H60xkyJup07FmVlu3Mk7pf/kIIpl9gaN5bM8NM+UUx3emUWvDNTt39w=="; - }; - }; - "npm-registry-fetch-9.0.0" = { - name = "npm-registry-fetch"; - packageName = "npm-registry-fetch"; - version = "9.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz"; - sha512 = "PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-13.3.0.tgz"; + sha512 = "10LJQ/1+VhKrZjIuY9I/+gQTvumqqlgnsCufoXETHAPFTS3+M+Z5CFhZRDHGavmJ6rOye3UvNga88vl8n1r6gg=="; }; }; "npm-registry-utilities-1.0.0" = { @@ -48711,15 +49251,6 @@ let sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w=="; }; }; - "nugget-2.0.2" = { - name = "nugget"; - packageName = "nugget"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/nugget/-/nugget-2.0.2.tgz"; - sha512 = "A8A8+PtlH937KWXJnfct6ubGPfgHOe3lwFkkmrT5xW8+aRBnDWqSiW5NRuiVuh/k/auLGsZdu+WrIU2epL/FHg=="; - }; - }; "null-loader-4.0.1" = { name = "null-loader"; packageName = "null-loader"; @@ -48819,13 +49350,22 @@ let sha512 = "3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ=="; }; }; - "nwsapi-2.2.0" = { + "nwsapi-2.2.1" = { name = "nwsapi"; packageName = "nwsapi"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"; - sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.1.tgz"; + sha512 = "JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg=="; + }; + }; + "nx-14.5.2" = { + name = "nx"; + packageName = "nx"; + version = "14.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/nx/-/nx-14.5.2.tgz"; + sha512 = "I6KWVMR5Ksj/HgderkcmJmyaqHdWblQeFUeVq9to263Wr3QCIRigbvdDI3rq3ZQCBMyhUSOVP9MFXROoRVtJXQ=="; }; }; "o3-1.0.3" = { @@ -48894,11 +49434,11 @@ let "oauth-https://github.com/ciaranj/node-oauth/tarball/master" = { name = "oauth"; packageName = "oauth"; - version = "0.9.15"; + version = "0.10.0"; src = fetchurl { - name = "oauth-0.9.15.tar.gz"; + name = "oauth-0.10.0.tar.gz"; url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/refs/heads/master"; - sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; + sha256 = "4b05b98a9e756a859411991488c1156a2e35c3fa1062c0ae43d3011cc143580c"; }; }; "oauth-sign-0.8.2" = { @@ -49063,15 +49603,6 @@ let sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="; }; }; - "object-path-0.11.8" = { - name = "object-path"; - packageName = "object-path"; - version = "0.11.8"; - src = fetchurl { - url = "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz"; - sha512 = "YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA=="; - }; - }; "object-sizeof-1.6.3" = { name = "object-sizeof"; packageName = "object-sizeof"; @@ -49306,13 +49837,13 @@ let sha512 = "dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg=="; }; }; - "on-exit-leak-free-1.0.0" = { + "on-exit-leak-free-2.1.0" = { name = "on-exit-leak-free"; packageName = "on-exit-leak-free"; - version = "1.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-1.0.0.tgz"; - sha512 = "Ve8ubhrXRdnuCJ5bQSQpP3uaV43K1PMcOfSRC1pqHgRZommXCgsXwh08jVC5NpjwScE23BPDwDvVg4cov3mwjw=="; + url = "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-2.1.0.tgz"; + sha512 = "VuCaZZAjReZ3vUwgOB8LxAosIurDiAW0s13rI1YwmaP++jvcxP77AWoQvenZebpCA2m8WC1/EosPYPMjnRAp/w=="; }; }; "on-finished-2.2.1" = { @@ -49459,13 +49990,13 @@ let sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA=="; }; }; - "oo-ascii-tree-1.61.0" = { + "oo-ascii-tree-1.63.2" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.61.0"; + version = "1.63.2"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.61.0.tgz"; - sha512 = "/7aCOm8qkHUdr4iy9qPs3ZbRoWN8FaShpII56LgSFy/YitvskT3SOx92KwcsE5Mipu/X43YcUYFWCS8nUlR3Xw=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.63.2.tgz"; + sha512 = "2bfZc5i6X1jt+ecaYdsr3Sl5LBnDhe32LXR6+UrHcqr3kG2JW4KIHpTP/Au6oksJnTXIgON1rJcbscVCVtR0cg=="; }; }; "open-0.0.2" = { @@ -49765,13 +50296,13 @@ let sha512 = "EFTQ61/OUVhCeq78Y3rBpdKSuvgb0lwkU8nN4QTdcv0afc5MT7e4IVuZwgkMsgE993dmhbIhkxHFP3iTVJXWmw=="; }; }; - "openpgp-5.3.0" = { + "openpgp-5.3.1" = { name = "openpgp"; packageName = "openpgp"; - version = "5.3.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/openpgp/-/openpgp-5.3.0.tgz"; - sha512 = "qjCj0vYpV3dmmkE+vURiJ5kVAJwrMk8BPukvpWJiHcTNWKwPVsRS810plIe4klIcHVf1ScgUQwqtBbv99ff+kQ=="; + url = "https://registry.npmjs.org/openpgp/-/openpgp-5.3.1.tgz"; + sha512 = "CxjY4gZ3D0pp6dJUmcM6EgjvDv0u+LsY+3ymULPZYRUPa0tmigDXHNUm5EX+omqmU401DTQNO6ud+QA6UpCdEA=="; }; }; "opentracing-0.14.7" = { @@ -49999,22 +50530,22 @@ let sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="; }; }; - "ora-6.1.0" = { + "ora-6.1.2" = { name = "ora"; packageName = "ora"; - version = "6.1.0"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-6.1.0.tgz"; - sha512 = "CxEP6845hLK+NHFWZ+LplGO4zfw4QSfxTlqMfvlJ988GoiUeZDMzCvqsZkFHv69sPICmJH1MDxZoQFOKXerAVw=="; + url = "https://registry.npmjs.org/ora/-/ora-6.1.2.tgz"; + sha512 = "EJQ3NiP5Xo94wJXIzAyOtSb0QEIAUu7m8t6UZ9krbz0vAJqr92JpcK/lEXg91q6B9pEGqrykkd2EQplnifDSBw=="; }; }; - "ordered-binary-1.2.5" = { + "ordered-binary-1.3.0" = { name = "ordered-binary"; packageName = "ordered-binary"; - version = "1.2.5"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.5.tgz"; - sha512 = "djRmZoEpOGvIRW7ufsCDHtvcUa18UC9TxnPbHhSVFZHsoyg0dtut1bWtBZ/fmxdPN62oWXrV6adM7NoWU+CneA=="; + url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.3.0.tgz"; + sha512 = "knIeYepTI6BDAzGxqFEDGtI/iGqs57H32CInAIxEvAHG46vk1Di0CEpyc1A7iY39B1mfik3g3KLYwOTNnnMHLA=="; }; }; "ordered-read-streams-1.0.1" = { @@ -50134,22 +50665,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.5.2" = { + "ot-builder-1.5.4" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.2.tgz"; - sha512 = "WAcfUKnBSM7Sf5wAbguIjtEffkca5hFCYTw2W84DcGid5SrSyxxOzWAXFRoxaPli8X9gmeTdx773nYqmnAjNgA=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.5.4.tgz"; + sha512 = "+GFI9JS6RfudrYmo+mlLd0irWFrtpeVq+Jrj+afvKp5f4Iubi1xArjxXcg/ItXFu3XGvvJZOdFpfnN+3KZQkuA=="; }; }; - "otb-ttc-bundle-1.5.2" = { + "otb-ttc-bundle-1.5.4" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.2.tgz"; - sha512 = "9h7WMtCauJeg74puwZF6W1ahyhewY/7shjsoiEqfLjX7dwCR/WgbIwx7DnpQ3acTwOzfsaBfgmq+XDMUz+TPrg=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.5.4.tgz"; + sha512 = "vDxDfZjMOOWTpwT9qW5pJSS2SM3uyPcOItQczSkEhCwMet0ch+LS2CkPQrdfvsDXAhiX3nCYgEHrsNanYvn9Pw=="; }; }; "ow-0.21.0" = { @@ -50215,6 +50746,15 @@ let sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; }; + "p-cancelable-3.0.0" = { + name = "p-cancelable"; + packageName = "p-cancelable"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz"; + sha512 = "mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw=="; + }; + }; "p-debounce-2.1.0" = { name = "p-debounce"; packageName = "p-debounce"; @@ -50746,6 +51286,15 @@ let sha512 = "CHJqc94AA8YfSLHGQT3DbvSIuE12NLFekpM4n7LRrAd3dOJtA911+4xe9q6nC3/jcKraq7nNS9VxgtT0KC+diA=="; }; }; + "package-json-8.1.0" = { + name = "package-json"; + packageName = "package-json"; + version = "8.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/package-json/-/package-json-8.1.0.tgz"; + sha512 = "hySwcV8RAWeAfPsXb9/HGSPn8lwDnv6fabH+obUZKX169QknRkRhPxd1yMubpKDskLFATkl3jHpNtVtDPFA0Wg=="; + }; + }; "package-json-versionify-1.0.4" = { name = "package-json-versionify"; packageName = "package-json-versionify"; @@ -50791,22 +51340,13 @@ let sha512 = "CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow=="; }; }; - "pacote-13.3.0" = { + "pacote-13.6.1" = { name = "pacote"; packageName = "pacote"; - version = "13.3.0"; + version = "13.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-13.3.0.tgz"; - sha512 = "auhJAUlfC2TALo6I0s1vFoPvVFgWGx+uz/PnIojTTgkGwlK3Np8sGJ0ghfFhiuzJXTZoTycMLk8uLskdntPbDw=="; - }; - }; - "pacote-13.6.0" = { - name = "pacote"; - packageName = "pacote"; - version = "13.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-13.6.0.tgz"; - sha512 = "zHmuCwG4+QKnj47LFlW3LmArwKoglx2k5xtADiMCivVWPgNRP5QyLDGOIjGjwOe61lhl1rO63m/VxT16pEHLWg=="; + url = "https://registry.npmjs.org/pacote/-/pacote-13.6.1.tgz"; + sha512 = "L+2BI1ougAPsFjXRyBhcKmfT016NscRFLv6Pz5EiNf1CCFJFU0pSKKQwsZTyAQB+sTuUL4TyFyp6J1Ork3dOqw=="; }; }; "pad-0.0.5" = { @@ -50827,15 +51367,6 @@ let sha512 = "8EKVBxCRSvLnsX1p2LlSFSH3c2/wuhY9/BXXWu8boL78FbVKqn2L5SpURt1x5iw6Gq8PTqJ7MdPoe5nCtX3I+g=="; }; }; - "paid-services-3.16.2" = { - name = "paid-services"; - packageName = "paid-services"; - version = "3.16.2"; - src = fetchurl { - url = "https://registry.npmjs.org/paid-services/-/paid-services-3.16.2.tgz"; - sha512 = "4KmT09JNTk9RMOXVZiaQCiiUbgf0ucmFqKzAV8H5iwOH2dRk8QWlmrWRmvZdwTbjjNePnhuy/QvJMXki9ox0sw=="; - }; - }; "paid-services-3.16.3" = { name = "paid-services"; packageName = "paid-services"; @@ -50845,6 +51376,15 @@ let sha512 = "LmthAiL2EP/iYorDmSZFpi8ocQmciYWAirzPYWGhIPOLs409btO2tfjM/fY839qFzxzHpONRVx8CwuyqKLtolg=="; }; }; + "paid-services-3.19.1" = { + name = "paid-services"; + packageName = "paid-services"; + version = "3.19.1"; + src = fetchurl { + url = "https://registry.npmjs.org/paid-services/-/paid-services-3.19.1.tgz"; + sha512 = "7RFUtAsvUXvN+sDDCANiZyzjpZQB5f9h15qJAsrn3Q7aAEQgfGnbH6bEaYzpNqWU4SrKuMx34BzdfAx9p6Ec5g=="; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -51187,6 +51727,15 @@ let sha512 = "Z2lWUis7jlmXC1jeOG9giRO2+FsuyNipeQ43HAjqAZjwSe3SEf+q/84FGPHoso3kyntbxa4c4i77t3m6fGf8cw=="; }; }; + "parse-path-5.0.0" = { + name = "parse-path"; + packageName = "parse-path"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-path/-/parse-path-5.0.0.tgz"; + sha512 = "qOpH55/+ZJ4jUu/oLO+ifUKjFPNZGfnPJtzvGzKN/4oLMil5m9OH4VpOj6++9/ytJcfks4kzH2hhi87GL/OU9A=="; + }; + }; "parse-png-2.1.0" = { name = "parse-png"; packageName = "parse-png"; @@ -51250,13 +51799,22 @@ let sha512 = "u2MgLOjZPDDer1oRg1c+H/+54iIQYY5TKgQ5G8KrGLT1Dcwdo7Lj+QfQR123+u8J0AMSFGbQUvsBlSB7uIJcCA=="; }; }; - "parse-url-6.0.0" = { + "parse-url-6.0.5" = { name = "parse-url"; packageName = "parse-url"; - version = "6.0.0"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/parse-url/-/parse-url-6.0.0.tgz"; - sha512 = "cYyojeX7yIIwuJzledIHeLUBVJ6COVLeT4eF+2P6aKVzwvgKQPndCBv3+yQ7pcWjqToYwaligxzSYNNmGoMAvw=="; + url = "https://registry.npmjs.org/parse-url/-/parse-url-6.0.5.tgz"; + sha512 = "e35AeLTSIlkw/5GFq70IN7po8fmDUjpDPY1rIK+VubRfsUvBonjQ+PBZG+vWMACnQSmNlvl524IucoDmcioMxA=="; + }; + }; + "parse-url-7.0.2" = { + name = "parse-url"; + packageName = "parse-url"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-url/-/parse-url-7.0.2.tgz"; + sha512 = "PqO4Z0eCiQ08Wj6QQmrmp5YTTxpYfONdOEamrtvK63AmzXpcavIVQubGHxOEwiIoDZFb8uDOoQFS0NCcjqIYQg=="; }; }; "parse5-1.5.1" = { @@ -51466,22 +52024,13 @@ let sha512 = "aqgxMQxuRz79M4LVo8fl3/bsh6Ozcb34G8MVDs7Oavy88ROLSVvTgYoWnX3TpxdQg66HiXvpb+lcuFPnDrmiOA=="; }; }; - "passport-0.5.2" = { + "passport-0.6.0" = { name = "passport"; packageName = "passport"; - version = "0.5.2"; + version = "0.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.5.2.tgz"; - sha512 = "w9n/Ot5I7orGD4y+7V3EFJCQEznE5RxHamUxcqLT2QoJY0f2JdN8GyHonYFvN0Vz+L6lUJfVhrk2aZz2LbuREw=="; - }; - }; - "passport-0.5.3" = { - name = "passport"; - packageName = "passport"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/passport/-/passport-0.5.3.tgz"; - sha512 = "gGc+70h4gGdBWNsR3FuV3byLDY6KBTJAIExGFXTpQaYfbbcHCBlRRKx7RBQSpqEqc5Hh2qVzRs7ssvSfOpkUEA=="; + url = "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz"; + sha512 = "0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug=="; }; }; "passport-http-bearer-1.0.1" = { @@ -52168,13 +52717,13 @@ let sha512 = "38tAwlJ7HevMENHD5FZE+yxSlAH5Wg3FoOjbB3MX2j3/kgpOEkmDHhTVKkecR57qxD5doHo2yi9nac94gqqbiQ=="; }; }; - "pino-8.0.0" = { + "pino-8.1.0" = { name = "pino"; packageName = "pino"; - version = "8.0.0"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-8.0.0.tgz"; - sha512 = "EvZh9ZUoLGkrhqhoF9UBxw2/ZiAhXHUKlGrI4WUT/wLu0sfu8Wr3NJaZ6lxcy/S51W0PMSon5KE7ujPAhc/G6g=="; + url = "https://registry.npmjs.org/pino/-/pino-8.1.0.tgz"; + sha512 = "53jlxs+02UNTtF1XwVWfa0dHipBiM5GK73XhkHn8M2hUl9y3L94dNwB8BwQhpd5WdHjBkyJiO7v0LRt4SGgsPg=="; }; }; "pino-abstract-transport-0.5.0" = { @@ -52186,6 +52735,15 @@ let sha512 = "+KAgmVeqXYbTtU2FScx1XS3kNyfZ5TrXY07V96QnUSFqo2gAqlvmaxH67Lj7SWazqsMabf+58ctdTcBgnOLUOQ=="; }; }; + "pino-abstract-transport-1.0.0" = { + name = "pino-abstract-transport"; + packageName = "pino-abstract-transport"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-1.0.0.tgz"; + sha512 = "c7vo5OpW4wIS42hUVcT5REsL8ZljsUfBjqV/e2sFxmFEFZiq1XLUp5EYLtuDH6PEHq9W1egWqRbnLUP5FuZmOA=="; + }; + }; "pino-pretty-7.3.0" = { name = "pino-pretty"; packageName = "pino-pretty"; @@ -52258,13 +52816,13 @@ let sha512 = "IWo0HwnxUEH9OtQ3qEZsKUbpdStRSomS18Gx4UV5JT1fj/E/opYGZMgpcdzC1+3ouBJECV1evzt0778S2RJ+/Q=="; }; }; - "pkg-5.7.0" = { + "pkg-5.8.0" = { name = "pkg"; packageName = "pkg"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pkg/-/pkg-5.7.0.tgz"; - sha512 = "PTiAjNq/CGAtK5qUBR6pjheqnipTFjeecgSgIKEcAOJA4GpmZeOZC8pMOoT0rfes5vHsmcFo7wbSRTAmXQurrg=="; + url = "https://registry.npmjs.org/pkg/-/pkg-5.8.0.tgz"; + sha512 = "8h9PUDYFi+LOMLbIyGRdP21g08mAtHidSpofSrf8LWhxUWGHymaRzcopEGiynB5EhQmZUKM6PQ9kCImV2TpdjQ=="; }; }; "pkg-conf-1.1.3" = { @@ -52312,13 +52870,13 @@ let sha512 = "NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA=="; }; }; - "pkg-fetch-3.4.1" = { + "pkg-fetch-3.4.2" = { name = "pkg-fetch"; packageName = "pkg-fetch"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.4.1.tgz"; - sha512 = "fS4cdayCa1r4jHkOKGPJKnS9PEs6OWZst+s+m0+CmhmPZObMnxoRnf9T9yUWl+lzM2b5aJF7cnQIySCT7Hq8Dg=="; + url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.4.2.tgz"; + sha512 = "0+uijmzYcnhC0hStDjm/cl2VYdrmVVBpe7Q8k9YBojxmR5tG8mvR9/nooQq3QSXiQqORDVOTY3XqMEqJVIzkHA=="; }; }; "pkg-up-2.0.0" = { @@ -52411,13 +52969,13 @@ let sha512 = "dL9Xc2Aj3YyBnwvCNuHmFl2LWvQacm/HEAsoVwLiuu0POboMChETt5wexpU1P6F6MnibIucXlVsMFFgNUT2IyA=="; }; }; - "plist-3.0.5" = { + "plist-3.0.6" = { name = "plist"; packageName = "plist"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz"; - sha512 = "83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA=="; + url = "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz"; + sha512 = "WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA=="; }; }; "plist-with-patches-0.5.1" = { @@ -52600,6 +53158,15 @@ let sha512 = "40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw=="; }; }; + "pngjs-6.0.0" = { + name = "pngjs"; + packageName = "pngjs"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz"; + sha512 = "TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg=="; + }; + }; "pnp-webpack-plugin-1.7.0" = { name = "pnp-webpack-plugin"; packageName = "pnp-webpack-plugin"; @@ -52843,6 +53410,15 @@ let sha512 = "6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg=="; }; }; + "postcss-load-config-4.0.1" = { + name = "postcss-load-config"; + packageName = "postcss-load-config"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz"; + sha512 = "vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA=="; + }; + }; "postcss-loader-3.0.0" = { name = "postcss-loader"; packageName = "postcss-loader"; @@ -54058,15 +54634,6 @@ let sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; }; - "progress-stream-1.2.0" = { - name = "progress-stream"; - packageName = "progress-stream"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz"; - sha512 = "MIBPjZz6oGNSw5rn2mSp+nP9FGoaVo6QsPyPVEaD4puilz5hZNa3kfnrlqRNYFsugslbU3An4mnkLLtZOaWvrA=="; - }; - }; "progress-stream-2.0.0" = { name = "progress-stream"; packageName = "progress-stream"; @@ -54319,6 +54886,15 @@ let sha512 = "NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q=="; }; }; + "prompts-ncu-2.5.1" = { + name = "prompts-ncu"; + packageName = "prompts-ncu"; + version = "2.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prompts-ncu/-/prompts-ncu-2.5.1.tgz"; + sha512 = "Hdd7GgV7b76Yh9FP9HL1D9xqtJCJdVPpiM2vDtuoc8W1KfweJe15gutFYmxkq83ViFaagFM8K0UcPCQ/tZq8bA=="; + }; + }; "promzard-0.3.0" = { name = "promzard"; packageName = "promzard"; @@ -54382,13 +54958,13 @@ let sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; }; }; - "proto3-json-serializer-1.0.2" = { + "proto3-json-serializer-1.0.3" = { name = "proto3-json-serializer"; packageName = "proto3-json-serializer"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-1.0.2.tgz"; - sha512 = "wHxf8jYZ/LUP3M7XmULDKnbxBn+Bvk6SM+tDCPVTp9vraIzUi9hHsOBb1n2Y0VV0ukx4zBN/2vzMQYs4KWwRpg=="; + url = "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-1.0.3.tgz"; + sha512 = "4Xo7uzbTfc8ur9R8VgI0pJpI6aHix76cc7DHJEfZKrZ6vOUbOddxBrsMzAGG2s6b3iHknl4Gn50dA2Y3AoCdow=="; }; }; "protobufjs-3.8.2" = { @@ -54418,6 +54994,24 @@ let sha512 = "xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg=="; }; }; + "protobufjs-7.0.0" = { + name = "protobufjs"; + packageName = "protobufjs"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.0.0.tgz"; + sha512 = "ffNIEm+quOcYtQvHdW406v1NQmZSuqVklxsXk076BtuFnlYZfigLU+JOMrTD8TUOyqHYbRI/fSVNvgd25YeN3w=="; + }; + }; + "protobufjs-cli-1.0.0" = { + name = "protobufjs-cli"; + packageName = "protobufjs-cli"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/protobufjs-cli/-/protobufjs-cli-1.0.0.tgz"; + sha512 = "7NZEBrFuuU2ZdzlhmAmvh8fdU7A4OFhzYX9AB7a5vXjopAeiks6ZgUSjOlOO7ItCDJQm3y9RWjk7spUbHc4X0w=="; + }; + }; "protocol-buffers-4.2.0" = { name = "protocol-buffers"; packageName = "protocol-buffers"; @@ -54427,13 +55021,13 @@ let sha512 = "hNp56d5uuREVde7UqP+dmBkwzxrhJwYU5nL/mdivyFfkRZdgAgojkyBeU3jKo7ZHrjdSx6Q1CwUmYJI6INt20g=="; }; }; - "protocol-buffers-encodings-1.1.1" = { + "protocol-buffers-encodings-1.2.0" = { name = "protocol-buffers-encodings"; packageName = "protocol-buffers-encodings"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.1.1.tgz"; - sha512 = "5aFshI9SbhtcMiDiZZu3g2tMlZeS5lhni//AGJ7V34PQLU5JA91Cva7TIs6inZhYikS3OpnUzAUuL6YtS0CyDA=="; + url = "https://registry.npmjs.org/protocol-buffers-encodings/-/protocol-buffers-encodings-1.2.0.tgz"; + sha512 = "daeNPuKh1NlLD1uDfbLpD+xyUTc07nEtfHwmBZmt/vH0B7VOM+JOCOpDcx9ZRpqHjAiIkGqyTDi+wfGSl17R9w=="; }; }; "protocol-buffers-schema-3.6.0" = { @@ -54454,6 +55048,15 @@ let sha512 = "IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg=="; }; }; + "protocols-2.0.1" = { + name = "protocols"; + packageName = "protocols"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/protocols/-/protocols-2.0.1.tgz"; + sha512 = "/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q=="; + }; + }; "proxy-addr-1.1.5" = { name = "proxy-addr"; packageName = "proxy-addr"; @@ -54580,6 +55183,24 @@ let sha512 = "z2ca00AMwZ6PfVETQNvXRumZdRwGuQzApIH/hKNp2o6Qo8N8TW7Ug2V+aSH2w/eC1b/bOOMZIE57V3jYN+kB4A=="; }; }; + "psbt-2.7.0" = { + name = "psbt"; + packageName = "psbt"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/psbt/-/psbt-2.7.0.tgz"; + sha512 = "8a+XPz7+GO8brUqqXhyVPV9tPEt3RovZg1amHx6Asbb5FLQUIWJnxBysQGxmI4myDaaxlwd10bk26M5MwpCVYQ=="; + }; + }; + "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=="; + }; + }; "pseudomap-1.0.2" = { name = "pseudomap"; packageName = "pseudomap"; @@ -54589,13 +55210,13 @@ let sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; }; }; - "psl-1.8.0" = { + "psl-1.9.0" = { name = "psl"; packageName = "psl"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; + sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; }; "pstree.remy-1.1.8" = { @@ -55462,6 +56083,15 @@ let sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; + "pupa-3.1.0" = { + name = "pupa"; + packageName = "pupa"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pupa/-/pupa-3.1.0.tgz"; + sha512 = "FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug=="; + }; + }; "puppeteer-1.20.0" = { name = "puppeteer"; packageName = "puppeteer"; @@ -55489,13 +56119,13 @@ let sha512 = "U1uufzBjz3+PkpCxFrWzh4OrMIdIb2ztzCu0YEPfRHjHswcSwHZswnK+WdsOQJsRV8WeTg3jLhJR4D867+fjsA=="; }; }; - "puppeteer-14.4.1" = { + "puppeteer-15.5.0" = { name = "puppeteer"; packageName = "puppeteer"; - version = "14.4.1"; + version = "15.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-14.4.1.tgz"; - sha512 = "+H0Gm84aXUvSLdSiDROtLlOofftClgw2TdceMvvCU9UvMryappoeS3+eOLfKvoy4sm8B8MWnYmPhWxVFudAOFQ=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-15.5.0.tgz"; + sha512 = "+vZPU8iBSdCx1Kn5hHas80fyo0TiVyMeqLGv/1dygX2HKhAZjO9YThadbRTCoTYq0yWw+w/CysldPsEekDtjDQ=="; }; }; "purest-3.1.0" = { @@ -55570,13 +56200,13 @@ let sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ=="; }; }; - "pyright-1.1.255" = { + "pyright-1.1.265" = { name = "pyright"; packageName = "pyright"; - version = "1.1.255"; + version = "1.1.265"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.255.tgz"; - sha512 = "pAec1Mqyq0l0+C6JH7o7Va0oWyZVACEFgP2cWD9DU/C1epoqZAt/PCRbae/7fFfn7ZGew5tiTMdtO/2RZO/cRg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.265.tgz"; + sha512 = "CHUV46qHE4AKjMXLzBGDvOO9pEDzpQKgnPx3vC/JVEfvvu/RRUGR27GSTDTVVRNXbTjmnWjhRKku1gPPNdDSyg=="; }; }; "q-0.9.7" = { @@ -55624,13 +56254,13 @@ let sha512 = "8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg=="; }; }; - "qrcode-1.5.0" = { + "qrcode-1.5.1" = { name = "qrcode"; packageName = "qrcode"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/qrcode/-/qrcode-1.5.0.tgz"; - sha512 = "9MgRpgVc+/+47dFvQeD6U2s0Z92EsKzcHogtum4QB+UNd025WOJSHvn/hjk9xmzj7Stj95CyUAs31mrjxliEsQ=="; + url = "https://registry.npmjs.org/qrcode/-/qrcode-1.5.1.tgz"; + sha512 = "nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg=="; }; }; "qrcode-terminal-0.11.0" = { @@ -55714,13 +56344,13 @@ let sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ=="; }; }; - "qs-6.10.5" = { + "qs-6.11.0" = { name = "qs"; packageName = "qs"; - version = "6.10.5"; + version = "6.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.10.5.tgz"; - sha512 = "O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ=="; + url = "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz"; + sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q=="; }; }; "qs-6.2.3" = { @@ -55795,15 +56425,6 @@ let sha512 = "EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw=="; }; }; - "qs-6.9.6" = { - name = "qs"; - packageName = "qs"; - version = "6.9.6"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.6.tgz"; - sha512 = "TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ=="; - }; - }; "qs-6.9.7" = { name = "qs"; packageName = "qs"; @@ -56254,13 +56875,13 @@ let sha512 = "PPYLwZ63lXi6Tv2EZ8w3M4FzC0rVqvxivaOVS8pXSp5FMIHFnvi4MWHL3UdFLhwSy50aNtJsgjY0mBC6oFL26Q=="; }; }; - "rate-limiter-flexible-2.3.7" = { + "rate-limiter-flexible-2.3.8" = { name = "rate-limiter-flexible"; packageName = "rate-limiter-flexible"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.7.tgz"; - sha512 = "dmc+J/IffVBvHlqq5/XClsdLdkOdQV/tjrz00cwneHUbEDYVrf4aUDAyR4Jybcf2+Vpn4NwoVrnnAyt/D0ciWw=="; + url = "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-2.3.8.tgz"; + sha512 = "ENCiteaxQKSFhTPxNq3Trb2dtyVoO2/PyewCicUoRi/ewmNyPdW6nowSYGUZhSE0r7udmf6FaU+tOUIOmVUKGg=="; }; }; "raven-js-3.27.2" = { @@ -56317,15 +56938,6 @@ let sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; }; }; - "raw-body-2.4.2" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz"; - sha512 = "RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ=="; - }; - }; "raw-body-2.4.3" = { name = "raw-body"; packageName = "raw-body"; @@ -56416,13 +57028,13 @@ let sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA=="; }; }; - "re-reselect-4.0.0" = { + "re-reselect-4.0.1" = { name = "re-reselect"; packageName = "re-reselect"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.0.tgz"; - sha512 = "wuygyq8TXUlSdVXv2kigXxQNOgdb9m7LbIjwfTNGSpaY1riLd5e+VeQjlQMyUtrk0oiyhi1AqIVynworl3qxHA=="; + url = "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.1.tgz"; + sha512 = "xVTNGQy/dAxOolunBLmVMGZ49VUUR1s8jZUiJQb+g1sI63GAv9+a5Jas9yHvdxeUgiZkU9r3gDExDorxHzOgRA=="; }; }; "re2-1.17.7" = { @@ -56470,13 +57082,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.24.7" = { + "react-devtools-core-4.25.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.24.7"; + version = "4.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.24.7.tgz"; - sha512 = "OFB1cp8bsh5Kc6oOJ3ZzH++zMBtydwD53yBYa50FKEGyOOdgdbJ4VsCsZhN/6F5T4gJfrZraU6EKda8P+tMLtg=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.25.0.tgz"; + sha512 = "iewRrnu0ZnmfL+jJayKphXj04CFh6i3ezVnpCtcnZbTPSQgN09XqHAzXbKbqNDl7aTg9QLNkQRP6M3DvdrinWA=="; }; }; "react-dom-17.0.2" = { @@ -56587,31 +57199,13 @@ let sha512 = "Gvzk7OZpiqKSkxsQvO/mbTN1poglhmAV7gR/DdIrRrSMXraRQQlfikRJOr3Nb9GTMPC5kof948Zy6jJZIFtDvQ=="; }; }; - "react-router-6.3.0" = { - name = "react-router"; - packageName = "react-router"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz"; - sha512 = "7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ=="; - }; - }; - "react-router-dom-6.3.0" = { - name = "react-router-dom"; - packageName = "react-router-dom"; - version = "6.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz"; - sha512 = "uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw=="; - }; - }; - "react-side-effect-2.1.1" = { + "react-side-effect-2.1.2" = { name = "react-side-effect"; packageName = "react-side-effect"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.1.tgz"; - sha512 = "2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ=="; + url = "https://registry.npmjs.org/react-side-effect/-/react-side-effect-2.1.2.tgz"; + sha512 = "PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw=="; }; }; "react-string-replace-1.1.0" = { @@ -56632,13 +57226,13 @@ let sha512 = "jx325RhRVnS9DdFbeF511z0T0WEqEoMl1uCE3LoZ6VaZZm7ytatxbum0B8bCTmaiV0KsU+4TtLGTGevCic7SWg=="; }; }; - "react-transition-group-4.4.2" = { + "react-transition-group-4.4.5" = { name = "react-transition-group"; packageName = "react-transition-group"; - version = "4.4.2"; + version = "4.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz"; - sha512 = "/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg=="; + url = "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz"; + sha512 = "pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g=="; }; }; "react-universal-component-4.5.0" = { @@ -56740,15 +57334,6 @@ let sha512 = "CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ=="; }; }; - "read-cmd-shim-2.0.0" = { - name = "read-cmd-shim"; - packageName = "read-cmd-shim"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-2.0.0.tgz"; - sha512 = "HJpV9bQpkl6KwjxlJcBoqu9Ba0PQg8TqSNIOrulGt54a0uup0HtevreFHzYzkm0lpnleRdNBzXznKrgxglEHQw=="; - }; - }; "read-cmd-shim-3.0.0" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -56785,15 +57370,6 @@ let sha512 = "3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w=="; }; }; - "read-package-json-3.0.1" = { - name = "read-package-json"; - packageName = "read-package-json"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-3.0.1.tgz"; - sha512 = "aLcPqxovhJTVJcsnROuuzQvv6oziQx4zd3JvG0vGCL5MjTONUc4uJ90zCBC6R7W7oUKBNoR/F8pkyfVwlbxqng=="; - }; - }; "read-package-json-4.1.2" = { name = "read-package-json"; packageName = "read-package-json"; @@ -57001,13 +57577,13 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "readable-stream-4.0.0" = { + "readable-stream-4.1.0" = { name = "readable-stream"; packageName = "readable-stream"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-4.0.0.tgz"; - sha512 = "Mf7ilWBP6AV3tF3MjtBrHMH3roso7wIrpgzCwt9ybvqiJQVWIEBMnp/W+S//yvYSsUUi2cJIwD7q7m57l0AqZw=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-4.1.0.tgz"; + sha512 = "sVisi3+P2lJ2t0BPbpK629j8wRW06yKGJUcaLAGXPAUhyUxVJm7VsCTit1PFgT4JHUDMrGNR+ZjSKpzGaRF3zw=="; }; }; "readable-web-to-node-stream-2.0.0" = { @@ -57028,13 +57604,13 @@ let sha512 = "ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw=="; }; }; - "readdir-glob-1.1.1" = { + "readdir-glob-1.1.2" = { name = "readdir-glob"; packageName = "readdir-glob"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.1.tgz"; - sha512 = "91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA=="; + url = "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.2.tgz"; + sha512 = "6RLVvwJtVwEDfPdn6X6Ille4/lxGl0ATOY4FN/B9nxQcgOazvvI0nodiD19ScKq0PvA/29VpaOQML36o5IzZWA=="; }; }; "readdir-scoped-modules-1.1.0" = { @@ -57298,13 +57874,13 @@ let sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A=="; }; }; - "redoc-2.0.0-rc.72" = { + "redoc-2.0.0-rc.74" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.72"; + version = "2.0.0-rc.74"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.72.tgz"; - sha512 = "IX/WvVh4N3zwo4sAjnQFz6ffIUd6G47hcflxPtrpxblJaeOy0MBSzzY8f179WjssWPYcSmmndP5v0hgEXFiimg=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.74.tgz"; + sha512 = "OeOWGcbmVdfVgN//7ispiRX0fhD7Gk3tWcERugyFfP8QX/1Pttw3jRYSXmiB0i+H48zFn20K1cMppBp/qzm5xQ=="; }; }; "reduce-component-1.0.1" = { @@ -57478,13 +58054,13 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-5.0.1" = { + "regexpu-core-5.1.0" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz"; - sha512 = "CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz"; + sha512 = "bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA=="; }; }; "register-protocol-win32-1.1.0" = { @@ -57523,6 +58099,15 @@ let sha512 = "PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="; }; }; + "registry-auth-token-5.0.1" = { + name = "registry-auth-token"; + packageName = "registry-auth-token"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.0.1.tgz"; + sha512 = "UfxVOj8seK1yaIOiieV4FIP01vfBDLsY0H9sQzi9EbbUdJiuuBjJgLa1DpImXMNPnVkBD4eVxTEXcrZA6kfpJA=="; + }; + }; "registry-url-3.1.0" = { name = "registry-url"; packageName = "registry-url"; @@ -57541,6 +58126,15 @@ let sha512 = "8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw=="; }; }; + "registry-url-6.0.1" = { + name = "registry-url"; + packageName = "registry-url"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz"; + sha512 = "+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q=="; + }; + }; "regjsgen-0.6.0" = { name = "regjsgen"; packageName = "regjsgen"; @@ -58702,15 +59296,6 @@ let sha512 = "LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="; }; }; - "resolve-1.22.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; - sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; - }; - }; "resolve-1.22.1" = { name = "resolve"; packageName = "resolve"; @@ -58882,13 +59467,13 @@ let sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; }; }; - "responselike-2.0.0" = { + "responselike-2.0.1" = { name = "responselike"; packageName = "responselike"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz"; - sha512 = "xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw=="; + url = "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz"; + sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; }; }; "restify-4.0.3" = { @@ -59089,15 +59674,6 @@ let sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; }; }; - "retry-0.6.1" = { - name = "retry"; - packageName = "retry"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz"; - sha512 = "txv1qsctZq8ei9J/uCXgaKKFPjlBB0H2hvtnzw9rjKWFNUFtKh59WprXxpAeAey3/QeWwHdxMFqStPaOAgy+dA=="; - }; - }; "retry-0.9.0" = { name = "retry"; packageName = "retry"; @@ -59467,13 +60043,13 @@ let sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; - "run-con-1.2.10" = { + "run-con-1.2.11" = { name = "run-con"; packageName = "run-con"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/run-con/-/run-con-1.2.10.tgz"; - sha512 = "n7PZpYmMM26ZO21dd8y3Yw1TRtGABjRtgPSgFS/nhzfvbJMXFtJhJVyEgayMiP+w/23craJjsnfDvx4W4ue/HQ=="; + url = "https://registry.npmjs.org/run-con/-/run-con-1.2.11.tgz"; + sha512 = "NEMGsUT+cglWkzEr4IFK21P4Jca45HqiAbIIZIBdX5+UZTB24Mb/21iNGgz9xZa8tL6vbW7CXmq7MFN42+VjNQ=="; }; }; "run-parallel-1.2.0" = { @@ -59611,13 +60187,13 @@ let sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; - "rxjs-7.5.5" = { + "rxjs-7.5.6" = { name = "rxjs"; packageName = "rxjs"; - version = "7.5.5"; + version = "7.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.5.tgz"; - sha512 = "sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz"; + sha512 = "dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw=="; }; }; "s3-stream-upload-2.0.2" = { @@ -59818,13 +60394,13 @@ let sha512 = "zmXn03k3hN0KaiVTjohgkg98C3UowhL1/VSGdj4/VAAiMKGQOE80PFPxFP2Kyq0OUskPKcY5lImkhBKEHlypJA=="; }; }; - "sass-1.52.3" = { + "sass-1.54.2" = { name = "sass"; packageName = "sass"; - version = "1.52.3"; + version = "1.54.2"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz"; - sha512 = "LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.54.2.tgz"; + sha512 = "wbVV26sejsCIbBScZZtNkvnrB/bVCQ8hSlZ01D9nzsVh9zLqCkWrlpvTb3YEb6xsuNi9cx75hncqwikHFSz7tw=="; }; }; "sass-loader-10.2.0" = { @@ -60034,13 +60610,13 @@ let sha512 = "AckIIV90rPDcBcglUwXPF3kg0P0qmPsPXAj6BBEENQE1p5yA1xfmDJzfi1Tappj37Pv2mVbKpL3Z1T+Nn7k1Qw=="; }; }; - "secure-json-parse-2.4.0" = { + "secure-json-parse-2.5.0" = { name = "secure-json-parse"; packageName = "secure-json-parse"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.4.0.tgz"; - sha512 = "Q5Z/97nbON5t/L/sH6mY2EacfjVGwrCcSi5D3btRO2GZ8pf1K1UN7Z9H5J57hjVU2Qzxr1xO+FmBhOvEkzCMmg=="; + url = "https://registry.npmjs.org/secure-json-parse/-/secure-json-parse-2.5.0.tgz"; + sha512 = "ZQruFgZnIWH+WyO9t5rWt4ZEGqCKPwhiw+YbzTwpmT9elgLrLcfuyUiSnwwjUiVy9r4VM3urtbNF1xmEh9IL2w=="; }; }; "secure-keys-1.0.0" = { @@ -60223,6 +60799,15 @@ let sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; }; + "semver-7.3.4" = { + name = "semver"; + packageName = "semver"; + version = "7.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz"; + sha512 = "tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw=="; + }; + }; "semver-7.3.5" = { name = "semver"; packageName = "semver"; @@ -60268,6 +60853,15 @@ let sha512 = "GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg=="; }; }; + "semver-diff-4.0.0" = { + name = "semver-diff"; + packageName = "semver-diff"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver-diff/-/semver-diff-4.0.0.tgz"; + sha512 = "0Ju4+6A8iOnpL/Thra7dZsSlOHYAHIeMxfhWQRI1/VLcT3WDBZKKtQt/QkBOsiIN9ZpuvHE6cGZ0x4glCMmfiA=="; + }; + }; "semver-greatest-satisfied-range-1.1.0" = { name = "semver-greatest-satisfied-range"; packageName = "semver-greatest-satisfied-range"; @@ -60376,15 +60970,6 @@ let sha512 = "8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg=="; }; }; - "sentence-splitter-2.3.2" = { - name = "sentence-splitter"; - packageName = "sentence-splitter"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sentence-splitter/-/sentence-splitter-2.3.2.tgz"; - sha512 = "QnpHNykm4nI4T6mT+NoVayh9Ixl5DohYCSVqMgPJsO2WejOcqaYTh4HQOkmzaDzXH3NO5pif4z/hpo2NGtgNlg=="; - }; - }; "sentence-splitter-3.2.2" = { name = "sentence-splitter"; packageName = "sentence-splitter"; @@ -60583,15 +61168,6 @@ let sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; - "set-cookie-parser-2.5.0" = { - name = "set-cookie-parser"; - packageName = "set-cookie-parser"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.5.0.tgz"; - sha512 = "cHMAtSXilfyBePduZEBVPTCftTQWz6ehWJD5YNUg4mqvRosrrjKbo4WS8JkB0/RxonMoohHm7cOGH60mDkRQ9w=="; - }; - }; "set-value-2.0.1" = { name = "set-value"; packageName = "set-value"; @@ -60961,13 +61537,13 @@ let sha512 = "xhdh7fHyMsr0m/w2kDfRJuBFRS96b9l8ZPNWGaQ+PMvnUnZ/Eh+gJJ9NsHBd7P9k0399WYlCLzsy18EaMfyadA=="; }; }; - "shush-1.0.1" = { + "shush-1.0.2" = { name = "shush"; packageName = "shush"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/shush/-/shush-1.0.1.tgz"; - sha512 = "baDDBPaPcFwVeQNfj1lYkE/NkqQr1WkXUlOePHnA5I8hw9Fz0Tu72ZC0XENeV4tM9tesaGA/Wi2mW07EOeKRuQ=="; + url = "https://registry.npmjs.org/shush/-/shush-1.0.2.tgz"; + sha512 = "dA7YOFK3a2Ra2SVOucZIDi6qjllTEw3ri7eexmyxyJCYFpYZe0Ja4ZWUqX0NG6DKkC2rw1FEtsrCakERwGQR2g=="; }; }; "side-channel-1.0.4" = { @@ -61096,13 +61672,13 @@ let sha512 = "z4qtrRuaAFJS4PUd0g+xy7aN4y+RvEt/QTJpR184lhJguBA1S/LsVlvE/CM95RsYMOFJG3NGGDjqFCzKU19S/A=="; }; }; - "simple-git-3.8.0" = { + "simple-git-3.11.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.8.0"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.8.0.tgz"; - sha512 = "nbR1PufcbvCaW90CiAXC1mM7OnEqLzjSOnySnq7Sd2kcVG6GxSa+DhxhFmCgxLv4kWCKmZagkCZSjfNAQTZwaw=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.11.0.tgz"; + sha512 = "XULamN/hxviH/ABjDbxJqUTpH59Pn3fHRtwZZZ6v7KWTLE3wKl6CLB0SPXFfzjalQ5hUp+R5DWX2X8rKm4crvw=="; }; }; "simple-handshake-3.0.0" = { @@ -61159,13 +61735,13 @@ let sha512 = "D1SaWpOW8afq1CZGWB8xTfrT3FekjQmPValrqncJMX7QFl8YwhrPTZvMCANLtgBwwdS+7zURyqxDDEmY558tTw=="; }; }; - "simple-plist-1.3.1" = { + "simple-plist-1.4.0" = { name = "simple-plist"; packageName = "simple-plist"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-plist/-/simple-plist-1.3.1.tgz"; - sha512 = "iMSw5i0XseMnrhtIzRb7XpQEXepa9xhWxGUojHBL43SIpQuDQkh3Wpy67ZbDzZVr6EKxvwVChnVpdl8hEVLDiw=="; + url = "https://registry.npmjs.org/simple-plist/-/simple-plist-1.4.0.tgz"; + sha512 = "Emr2CR0T6cfQlbXxk7KtpU183WpJXWdl9c7D8uTtduX7bzVO1A6yTO6BauGzbWQhdOfpggcc9s0PN8+JyG/2gQ=="; }; }; "simple-sha1-2.1.2" = { @@ -61195,6 +61771,15 @@ let sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; }; }; + "simple-update-notifier-1.0.7" = { + name = "simple-update-notifier"; + packageName = "simple-update-notifier"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz"; + sha512 = "BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew=="; + }; + }; "simple-websocket-4.3.1" = { name = "simple-websocket"; packageName = "simple-websocket"; @@ -61591,13 +62176,13 @@ let sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg=="; }; }; - "socket.io-2.4.1" = { + "socket.io-2.5.0" = { name = "socket.io"; packageName = "socket.io"; - version = "2.4.1"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-2.4.1.tgz"; - sha512 = "Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-2.5.0.tgz"; + sha512 = "gGunfS0od3VpwDBpGwVkzSZx6Aqo9uOcf1afJj2cKnKFAoyl16fvhpsUhmUFd4Ldbvl5JvRQed6eQw6oQp6n8w=="; }; }; "socket.io-4.3.1" = { @@ -61690,13 +62275,13 @@ let sha512 = "cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA=="; }; }; - "socket.io-client-2.4.0" = { + "socket.io-client-2.5.0" = { name = "socket.io-client"; packageName = "socket.io-client"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.4.0.tgz"; - sha512 = "M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ=="; + url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.5.0.tgz"; + sha512 = "lOO9clmdgssDykiOmVQQitwBAF3I6mYcQAo7hQ7AM6Ny5X7fp8hIJ3HcQs3Rjz4SoggoxA1OgrQyY8EgTbcPYw=="; }; }; "socket.io-client-4.3.2" = { @@ -61762,13 +62347,13 @@ let sha512 = "11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A=="; }; }; - "socket.io-parser-4.0.4" = { + "socket.io-parser-4.0.5" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz"; - sha512 = "t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g=="; + url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz"; + sha512 = "sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig=="; }; }; "socket.io-parser-4.1.2" = { @@ -61780,13 +62365,13 @@ let sha512 = "j3kk71QLJuyQ/hh5F/L2t1goqzdTL0gvDzuhTuNSwihfuFUrcSji0qFZmJJPtG6Rmug153eOPsUizeirf1IIog=="; }; }; - "socket.io-parser-4.2.0" = { + "socket.io-parser-4.2.1" = { name = "socket.io-parser"; packageName = "socket.io-parser"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.0.tgz"; - sha512 = "tLfmEwcEwnlQTxFB7jibL/q2+q8dlVQzj4JdRLJ/W/G1+Fu9VSxCx1Lo+n1HvXxKnM//dUuD0xgiA7tQf57Vng=="; + 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" = { @@ -61825,13 +62410,13 @@ let sha512 = "2g0tjOR+fRs0amxENLi/q5TiJTqY+WXFOzb5UwXndlK6TO3U/mirZznpx6w34HVMoc3g7cY24yC/ZMIYnDlfkw=="; }; }; - "socks-2.6.2" = { + "socks-2.7.0" = { name = "socks"; packageName = "socks"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz"; - sha512 = "zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA=="; + url = "https://registry.npmjs.org/socks/-/socks-2.7.0.tgz"; + sha512 = "scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA=="; }; }; "socks-proxy-agent-5.0.1" = { @@ -61987,13 +62572,13 @@ let sha512 = "zlOmAKFLJzTI+MbvmkWhnOOJ++NYo0Iy7F93ARNPmvZvpWG2l8Ff3uwM3CkpHqRw8v3pcRROScM5E+vbeTeOKw=="; }; }; - "sonic-boom-3.0.0" = { + "sonic-boom-3.2.0" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "3.0.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.0.0.tgz"; - sha512 = "p5DiZOZHbJ2ZO5MADczp5qrfOd3W5Vr2vHxfCpe7G4AzPwVOweIjbfgku8wSQUuk+Y5Yuo8W7JqRe6XKmKistg=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.2.0.tgz"; + sha512 = "SbbZ+Kqj/XIunvIAgUZRlqd6CGQYq71tRRbXR92Za8J/R3Yh4Av+TWENiSiEgnlwckYLyP0YZQWVfyNC0dzLaA=="; }; }; "sorcery-0.10.0" = { @@ -62680,6 +63265,15 @@ let sha512 = "rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw=="; }; }; + "sqlite3-5.0.11" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "5.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.11.tgz"; + sha512 = "4akFOr7u9lJEeAWLJxmwiV43DJcGV7w3ab7SjQFAFaTVyknY3rZjvXTKIVtWqUoY4xwhjwoHKYs2HDW2SoHVsA=="; + }; + }; "sqlite3-5.0.2" = { name = "sqlite3"; packageName = "sqlite3"; @@ -62689,15 +63283,6 @@ let sha512 = "1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA=="; }; }; - "sqlite3-5.0.8" = { - name = "sqlite3"; - packageName = "sqlite3"; - version = "5.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.8.tgz"; - sha512 = "f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ=="; - }; - }; "sqlite3-git+https://github.com/mapbox/node-sqlite3.git#918052b538b0effe6c4a44c74a16b2749c08a0d2" = { name = "sqlite3"; packageName = "sqlite3"; @@ -62753,13 +63338,13 @@ let sha512 = "8K3qi9fIr6PYQCWWPDTijDThZ89tYRkIKO7xpS/kM8dDuDfx4FsBoMsBkgl8VOV3TB24UnAF0IbcxRBNL5Pf4w=="; }; }; - "ssb-bfe-3.3.0" = { + "ssb-bfe-3.5.0" = { name = "ssb-bfe"; packageName = "ssb-bfe"; - version = "3.3.0"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.3.0.tgz"; - sha512 = "cFMNLHdUlvdIp0lUYlTkCBD6+fp/xwaWOxTTTu7QP+I6B4SRV50yWw/rgAIgw/afkUR0mmUysQ0SJ6cGnEV0QA=="; + url = "https://registry.npmjs.org/ssb-bfe/-/ssb-bfe-3.5.0.tgz"; + sha512 = "+ADruC6EESvo6HOb6c4jH9Ogz/ZI2+Zj7m6WVOmp2cEtdYpYbB4UcfuxXp82Gi653O+x8t0XGrfelAoRHtfnwQ=="; }; }; "ssb-bfe-spec-0.6.0" = { @@ -62906,13 +63491,13 @@ let sha512 = "FPeyYU/3LpxcagnbmVWE+Q/qzg6keqeOBPbD7sEH9UKixUASeufPKiORDgh8nVX7J9Z+0vUaHt/WG999kGjvVQ=="; }; }; - "ssb-keys-8.4.0" = { + "ssb-keys-8.4.1" = { name = "ssb-keys"; packageName = "ssb-keys"; - version = "8.4.0"; + version = "8.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-8.4.0.tgz"; - sha512 = "Jf7iCEwmQ1f1XGllv+di5NBIV3luzF9T3l1MtYoWp7Mveb5go6nb8qjWvn3sgQzh5zpIyQLi1cjTmqp2CxIeCA=="; + url = "https://registry.npmjs.org/ssb-keys/-/ssb-keys-8.4.1.tgz"; + sha512 = "1HnP80HaBoCawYOBYk6b91NWmrBULVDTbhfnuVfRmGUiT9vwlWKKvJmp2b7dthkHWpaQcI7Wu6+nGQK/YOFUJw=="; }; }; "ssb-links-3.0.10" = { @@ -63095,6 +63680,15 @@ let sha512 = "HkgRbZeFe3YhBLfv5C6AgJaz1ESlQ5MP7sAdRTpCYwU4wo0U+d/irvVUsnUimPq6FO/Zn6gmW8BiCk+JBv3rGw=="; }; }; + "ssb-uri2-2.0.2" = { + name = "ssb-uri2"; + packageName = "ssb-uri2"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ssb-uri2/-/ssb-uri2-2.0.2.tgz"; + sha512 = "epjRE0lNfpfTPh2HeGQrIObdMHs6CJwYqPHJ8lVkM8irdGomcp9hU5eNUVzOrwqfFMeW36trNIRtDHEcMtJZQA=="; + }; + }; "ssb-validate-4.1.4" = { name = "ssb-validate"; packageName = "ssb-validate"; @@ -63824,13 +64418,13 @@ let sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ=="; }; }; - "streamroller-3.1.1" = { + "streamroller-3.1.2" = { name = "streamroller"; packageName = "streamroller"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-3.1.1.tgz"; - sha512 = "iPhtd9unZ6zKdWgMeYGfSBuqCngyJy1B/GPi/lTpwGpa3bajuX30GjUVd0/Tn/Xhg0mr4DOSENozz9Y06qyonQ=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-3.1.2.tgz"; + sha512 = "wZswqzbgGGsXYIrBYhOE0yP+nQ6XRk7xDcYwuQAGTYXdyAUmvgVFE0YU1g5pvQT0m7GBaQfYcSnlHbapuK0H0A=="; }; }; "streamsearch-0.1.2" = { @@ -64481,6 +65075,15 @@ let sha512 = "LzWcbfMbAsEDTRmhjWIioe8GcDRl0fa35YMXFoJKDdiD/quGFmjJjdgPjFJJNwCMaLyQqFIDqCdHD2V4HfLgYA=="; }; }; + "strip-json-comments-5.0.0" = { + name = "strip-json-comments"; + packageName = "strip-json-comments"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-5.0.0.tgz"; + sha512 = "V1LGY4UUo0jgwC+ELQ2BNWfPa17TIuwBLg+j1AA/9RPzKINl1lhxVEu2r+ZTTO8aetIsUzE5Qj6LMSBkoGYKKw=="; + }; + }; "strip-outer-1.0.1" = { name = "strip-outer"; packageName = "strip-outer"; @@ -64670,6 +65273,15 @@ let sha512 = "cVqd/URpp7si1HWu5YqQ3vqQkjuolAwHypY1B4itPlS71/lsf6TQPZ2Y0ijT22EYVkvH5ove9JFJf4u7VGPuZw=="; }; }; + "subscriptions-transport-ws-0.11.0" = { + name = "subscriptions-transport-ws"; + packageName = "subscriptions-transport-ws"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz"; + sha512 = "8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ=="; + }; + }; "subscriptions-transport-ws-0.9.18" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; @@ -64688,22 +65300,13 @@ let sha512 = "dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw=="; }; }; - "subscriptions-transport-ws-0.9.8" = { - name = "subscriptions-transport-ws"; - packageName = "subscriptions-transport-ws"; - version = "0.9.8"; - src = fetchurl { - url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.8.tgz"; - sha512 = "scTO/WQOTkZp3fIhglMg8A+7D1+Ua1DJnSG0MRWx2s9kSdW1+D53YqJ81iqHw0YttVF6ZHcKqOhXwRzn+QsihQ=="; - }; - }; - "sucrase-3.21.0" = { + "sucrase-3.25.0" = { name = "sucrase"; packageName = "sucrase"; - version = "3.21.0"; + version = "3.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/sucrase/-/sucrase-3.21.0.tgz"; - sha512 = "FjAhMJjDcifARI7bZej0Bi1yekjWQHoEvWIXhLPwDhC6O4iZ5PtGb86WV56riW87hzpgB13wwBKO9vKAiWu5VQ=="; + url = "https://registry.npmjs.org/sucrase/-/sucrase-3.25.0.tgz"; + sha512 = "WxTtwEYXSmZArPGStGBicyRsg5TBEFhT5b7N+tF+zauImP0Acy+CoUK0/byJ8JNPK/5lbpWIVuFagI4+0l85QQ=="; }; }; "sudo-block-1.2.0" = { @@ -64958,13 +65561,13 @@ let sha512 = "ay4MPFjfiQzDsyTidljJLXQi22l2AwjcuamYnJWj/LdhaHdKmDJxRox52WXimdcLpMuLDtkQvv4+jEu+wu9eSw=="; }; }; - "svelte-3.48.0" = { + "svelte-3.49.0" = { name = "svelte"; packageName = "svelte"; - version = "3.48.0"; + version = "3.49.0"; src = fetchurl { - url = "https://registry.npmjs.org/svelte/-/svelte-3.48.0.tgz"; - sha512 = "fN2YRm/bGumvjUpu6yI3BpvZnpIm9I6A7HR4oUNYd7ggYyIwSA/BX7DJ+UXXffLp6XNcUijyLvttbPVCYa/3xQ=="; + url = "https://registry.npmjs.org/svelte/-/svelte-3.49.0.tgz"; + sha512 = "+lmjic1pApJWDfPCpUUTc1m8azDqYCG1JN9YEngrx/hUyIcFJo6VZhj0A1Ai0wqoHcEIuQy+e9tk+4uDgdtsFA=="; }; }; "svelte-preprocess-4.10.7" = { @@ -64976,13 +65579,13 @@ let sha512 = "sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw=="; }; }; - "svelte2tsx-0.5.10" = { + "svelte2tsx-0.5.13" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.5.10"; + version = "0.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.10.tgz"; - sha512 = "nokQ0HTTWMcNX6tLrDLiOmJCuqjKZU9nCZ6/mVuCL3nusXdbp+9nv69VG2pCy7uQC66kV4Ls+j0WfvvJuGVnkg=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.5.13.tgz"; + sha512 = "JAwln2Gd6gQk8q/Qz91rk8msSqe4M2ABrku8YeDMsFnrqjPTWLnHYvxlXLAlHE5el1Q8sfExTePHF3xAZPh/mw=="; }; }; "sver-compat-1.5.0" = { @@ -65138,13 +65741,13 @@ let sha512 = "8z18eX8G/jbTXYzyNIaobrnD7PSN7yU/YkSasMmajrXtw0FGS64XjrKn5v37d36qmU3o1xLeuYnktshRr7uIFw=="; }; }; - "swagger-ui-dist-4.12.0" = { + "swagger-ui-dist-4.13.2" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "4.12.0"; + version = "4.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.12.0.tgz"; - sha512 = "B0Iy2ueXtbByE6OOyHTi3lFQkpPi/L7kFOKFeKTr44za7dJIELa9kzaca6GkndCgpK1QTjArnoXG+aUy0XQp1w=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-4.13.2.tgz"; + sha512 = "jHL6UyIYpvEI7NsuWd0R3hJaPQTg6Oo4qSBo+oVfOEkv6rrQm/475RGSMmZgV6ajp+Sgrp9CqrDjQYAgQqiv1A=="; }; }; "swagger2openapi-7.0.8" = { @@ -65264,15 +65867,6 @@ let sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g=="; }; }; - "sync-fetch-0.4.1" = { - name = "sync-fetch"; - packageName = "sync-fetch"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.4.1.tgz"; - sha512 = "JDtyFEvnKUzt1CxRtzzsGgkBanEv8XRmLyJo0F0nGkpCR8EjYmpOJJXz8GA/SWtlPU0nAYh0+CNMNnFworGyOA=="; - }; - }; "syntax-error-1.4.0" = { name = "syntax-error"; packageName = "syntax-error"; @@ -65282,13 +65876,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-5.11.21" = { + "systeminformation-5.12.2" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.11.21"; + version = "5.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.11.21.tgz"; - sha512 = "aYuoelPUEItkeFi9d2EgGYZur6CgGaPAOUv9K5h1rJn5EyAYIXtonxJN3Dn58zQ3BFbj9FggaxaVBGg/pNRngA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.12.2.tgz"; + sha512 = "j0Ix2l69jcoEerA9jAAr6CYWGKFbn1mB6Uw7m8xnOXs6XGvMKA4etZpsqyWnr8H/8SvVePzTae3y5CC8q+mC5w=="; }; }; "sywac-1.3.0" = { @@ -65589,13 +66183,13 @@ let sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA=="; }; }; - "telegraf-3.39.0" = { + "telegraf-3.40.0" = { name = "telegraf"; packageName = "telegraf"; - version = "3.39.0"; + version = "3.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/telegraf/-/telegraf-3.39.0.tgz"; - sha512 = "6u5UyW2KpMS/hwC4DKLGlicK/rVSYCahPFgF14ioP6BzwcDwQlciHCB/oWguvxLJaYGrvY6crzLHfjupFTBPXw=="; + url = "https://registry.npmjs.org/telegraf/-/telegraf-3.40.0.tgz"; + sha512 = "wulVjRHrX2zQwbk1/jzg3Ll9Kr0xC7ofXsRPJgcV2yoCFx5oSU41ZaDKNRPsLhjXxW4s9iNM2S2N/ESyiZxTMQ=="; }; }; "temp-0.8.3" = { @@ -65769,22 +66363,22 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.8.0" = { + "terser-4.8.1" = { name = "terser"; packageName = "terser"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz"; - sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; + url = "https://registry.npmjs.org/terser/-/terser-4.8.1.tgz"; + sha512 = "4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw=="; }; }; - "terser-5.14.1" = { + "terser-5.14.2" = { name = "terser"; packageName = "terser"; - version = "5.14.1"; + version = "5.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz"; - sha512 = "+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ=="; + url = "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz"; + sha512 = "oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -65886,6 +66480,15 @@ let sha512 = "MeqZRHLuaGamUXGuVn2ivtU3LA3mLCCIO5kUGoohTCoGmCBg/+8yPhWVX9WSl9telvVd8erftjFk9Fwb2dD6rw=="; }; }; + "textlint-12.2.1" = { + name = "textlint"; + packageName = "textlint"; + version = "12.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint/-/textlint-12.2.1.tgz"; + sha512 = "e6xKNLbTt10KbnG0x3eVE7l8A7uOC9bj0Hc8cWk6VoLffjrdw4o8kJjWVIspNzfb0kUEs2dBKgXZo0ob4tMWAg=="; + }; + }; "textlint-rule-helper-1.2.0" = { name = "textlint-rule-helper"; packageName = "textlint-rule-helper"; @@ -65904,13 +66507,13 @@ let sha512 = "pdX3uNbFzQTgINamaBpEHRT/MgROHev5wCnQnUTXRLT5DaRjls0Rmpi5d1MPZG6HT5NKVL++Q2J0FUbh5shi3Q=="; }; }; - "textlint-util-to-string-2.1.1" = { - name = "textlint-util-to-string"; - packageName = "textlint-util-to-string"; - version = "2.1.1"; + "textlint-tester-12.2.1" = { + name = "textlint-tester"; + packageName = "textlint-tester"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-util-to-string/-/textlint-util-to-string-2.1.1.tgz"; - sha512 = "PW6rXqLNGL3xZ6d5/INrX+pt8qbffmeDPLcvkBOlfNpDRFhVvNNjFmZXH86ZQjrOz9t/nNZDBXqnzqJuioJbSQ=="; + url = "https://registry.npmjs.org/textlint-tester/-/textlint-tester-12.2.1.tgz"; + sha512 = "rrmNdOWoi1Zt7Hksm061mRwfn2LPi+ILKfz1wpUAP6636KrJD6LaCNCQfVgplH6I3ZIkbYGAbgynzoAVhdEKaQ=="; }; }; "textlint-util-to-string-3.1.1" = { @@ -66030,13 +66633,13 @@ let sha512 = "woZFt0cLFkPdhsa+IGpRo1jiSouaHxMIljzTgt30CMjBWoUYbbcHqnunW5Yv+BXko9H05MVIcxMipI3Jblallw=="; }; }; - "thread-stream-1.0.0" = { + "thread-stream-1.0.1" = { name = "thread-stream"; packageName = "thread-stream"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/thread-stream/-/thread-stream-1.0.0.tgz"; - sha512 = "2Sw29jWubQWOcVa7MhLHJ51wjksUD/GHN4Fy3hP9w9DYTujifoZGSKBl54CMLRXWoD5h2pD707kY3fAdzhcwAg=="; + url = "https://registry.npmjs.org/thread-stream/-/thread-stream-1.0.1.tgz"; + sha512 = "JuZyfzx81e5MBk8uIr8ZH76bXyjEQvbRDEkSdlV1JFBdq/rbby2RuvzBYlTBd/xCljxy6lPxrTLXzB9Jl1bNrw=="; }; }; "thriftrw-3.12.0" = { @@ -66066,15 +66669,6 @@ let sha512 = "VYINSQFQeFdmhCds0tTqvQmLmdAjzGX1D6GnRQa4zlq8OpTtWSMddNyRq8Z4Snw/d6QZrWt9cM/cH8xTiGUkYA=="; }; }; - "throttleit-0.0.2" = { - name = "throttleit"; - packageName = "throttleit"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz"; - sha512 = "HtlTFeyYs1elDM2txiIGsdXHaq8kffVaZH/QEBRbo95zQqzlsBx5ELKhkPOZVad9OK9oxzwx6UrQN8Vfh/+yag=="; - }; - }; "throttleit-1.0.0" = { name = "throttleit"; packageName = "throttleit"; @@ -66102,15 +66696,6 @@ let sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; }; }; - "through2-0.2.3" = { - name = "through2"; - packageName = "through2"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz"; - sha512 = "mLa8Bn2mZurjyomGKWRu3Bo2mvoQojFks9NvOK8H+k4kDJNkdEqG522KFZsEFBEl6rKkxTgFbE5+OPcgfvPEHA=="; - }; - }; "through2-0.4.2" = { name = "through2"; packageName = "through2"; @@ -66237,6 +66822,15 @@ let sha512 = "vGO99JkxvgX+u+LtOKQEpYf31Kj3i/GNwVstfnh4dyINakMgeZCpew1e3Aj+06hEslhtHEd52g7m5IV+o1K8Mw=="; }; }; + "time-span-4.0.0" = { + name = "time-span"; + packageName = "time-span"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/time-span/-/time-span-4.0.0.tgz"; + sha512 = "MyqZCTGLDZ77u4k+jqg4UlrzPTPZ49NDlaekU6uuFaJLzPIN1woaRXCbGeqOfxwc3Y37ZROGAJ614Rdv7Olt+g=="; + }; + }; "time-stamp-1.1.0" = { name = "time-stamp"; packageName = "time-stamp"; @@ -66741,22 +67335,22 @@ let sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q=="; }; }; - "token-types-4.2.0" = { + "token-types-4.2.1" = { name = "token-types"; packageName = "token-types"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/token-types/-/token-types-4.2.0.tgz"; - sha512 = "P0rrp4wUpefLncNamWIef62J0v0kQR/GfDVji9WKY7GDCWy5YbVSrKUTam07iWPZQGy0zWNOfstYTykMmPNR7w=="; + url = "https://registry.npmjs.org/token-types/-/token-types-4.2.1.tgz"; + sha512 = "6udB24Q737UD/SDsKAHI9FCRP7Bqc9D/MQUV02ORQg5iskjtLJlZJNdN4kKtcdtwCeWIwIHDGaUsTsCCAa8sFQ=="; }; }; - "too-hot-1.0.0" = { + "too-hot-1.0.1" = { name = "too-hot"; packageName = "too-hot"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/too-hot/-/too-hot-1.0.0.tgz"; - sha512 = "RqtHvVffaf+ORMlpFjEWh3czDy6Q5wFfdGq9JXVBXu2L8/ssjDTnong8f1+I2xWGlKslXUkHU7m1HBj6MyoLqw=="; + url = "https://registry.npmjs.org/too-hot/-/too-hot-1.0.1.tgz"; + sha512 = "ymyiJ8bM8e2wKfJpxbq4Fi7GwLy9w7P8PKHnsWlDgbRIampbMtjv8eFrvpMIC0bK5dKybYrYqvbLUVu5/sDQbw=="; }; }; "too-wordy-0.3.4" = { @@ -66804,13 +67398,13 @@ let sha512 = "bPTDIA7XEjRlw6vQyt7kM/h1mg1INBsibjbujISITonx4POENZgxfyCSEXZpDhbAkluSPH4HKRKs4/YTmNLC6w=="; }; }; - "torrent-discovery-9.4.12" = { + "torrent-discovery-9.4.13" = { name = "torrent-discovery"; packageName = "torrent-discovery"; - version = "9.4.12"; + version = "9.4.13"; src = fetchurl { - url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.12.tgz"; - sha512 = "Des49BZggopAXc/rF8+MqDd4NGe9iwT4g7LGzithHUYocTax5wFFnVXkUh6N5U9sGZN4RZ1dr7bVIkD3xCfxIA=="; + url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-9.4.13.tgz"; + sha512 = "HZD8nAxIejcGnzUyXRMhBnK0rYQCQ85vaaCzmzl2r3/vmj0M/b6JuO6yNhe1vyLOU3ZngzDYaHxCJjmAIa4wwg=="; }; }; "torrent-piece-1.1.2" = { @@ -67200,15 +67794,6 @@ let sha512 = "Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="; }; }; - "ts-invariant-0.4.4" = { - name = "ts-invariant"; - packageName = "ts-invariant"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.4.4.tgz"; - sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; - }; - }; "ts-loader-6.2.2" = { name = "ts-loader"; packageName = "ts-loader"; @@ -67236,13 +67821,13 @@ let sha512 = "QMTC4UFzHmu9wU2VHZEmWWE9cUajjfcdcws+Gh7FhiO+Dy0RnR1bNz0YCHqhI0yRowCE9arVnNxYHqELOy9Hjw=="; }; }; - "ts-loader-9.3.0" = { + "ts-loader-9.3.1" = { name = "ts-loader"; packageName = "ts-loader"; - version = "9.3.0"; + version = "9.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.3.0.tgz"; - sha512 = "2kLLAdAD+FCKijvGKi9sS0OzoqxLCF3CxHpok7rVgCZ5UldRzH0TkbwG9XECKjBzHsAewntC5oDaI/FwKzEUog=="; + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-9.3.1.tgz"; + sha512 = "OkyShkcZTsTwyS3Kt7a4rsT/t2qvEVQuKCTg4LJmpj9fhFR7ukGdZwV6Qq3tRUkqcXtfGpPR7+hFKHCG/0d3Lw=="; }; }; "ts-log-2.2.4" = { @@ -67254,6 +67839,15 @@ let sha512 = "DEQrfv6l7IvN2jlzc/VTdZJYsWUnQNCsueYjMkC/iXoEoi5fNan6MjeDqkvhfzbmHgdz9UxDUluX3V5HdjTydQ=="; }; }; + "ts-morph-12.0.0" = { + name = "ts-morph"; + packageName = "ts-morph"; + version = "12.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-morph/-/ts-morph-12.0.0.tgz"; + sha512 = "VHC8XgU2fFW7yO1f/b3mxKDje1vmyzFXHWzOYmKEkCEwcLjDtbdLgBQviqj4ZwP4MJkQtRo6Ha2I29lq/B+VxA=="; + }; + }; "ts-node-10.4.0" = { name = "ts-node"; packageName = "ts-node"; @@ -67263,13 +67857,13 @@ let sha512 = "g0FlPvvCXSIO1JDF6S232P5jPYqBkRL9qly81ZgAOSU7rwI0stphCgd2kLiCrU9DjQCrJMWEqcNSjQL02s6d8A=="; }; }; - "ts-node-10.8.1" = { + "ts-node-10.9.1" = { name = "ts-node"; packageName = "ts-node"; - version = "10.8.1"; + version = "10.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz"; - sha512 = "Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"; + sha512 = "NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw=="; }; }; "ts-node-8.9.1" = { @@ -67281,15 +67875,6 @@ let sha512 = "yrq6ODsxEFTLz0R3BX2myf0WBCSQh9A+py8PBo1dCzWIOcvisbyH6akNKqDHMgXePF2kir5mm5JXJTH3OUJYOQ=="; }; }; - "ts-node-9.1.1" = { - name = "ts-node"; - packageName = "ts-node"; - version = "9.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz"; - sha512 = "hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg=="; - }; - }; "ts-pnp-1.2.0" = { name = "ts-pnp"; packageName = "ts-pnp"; @@ -67299,6 +67884,15 @@ let sha512 = "csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw=="; }; }; + "ts-toolbelt-6.15.5" = { + name = "ts-toolbelt"; + packageName = "ts-toolbelt"; + version = "6.15.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-toolbelt/-/ts-toolbelt-6.15.5.tgz"; + sha512 = "FZIXf1ksVyLcfr7M317jbB67XFJhOO1YqdTcuGaq9q5jLUoTikukZ+98TPjKiP2jC5CgmYdWWYs0s2nLSU0/1A=="; + }; + }; "ts2gas-4.2.0" = { name = "ts2gas"; packageName = "ts2gas"; @@ -67641,13 +68235,13 @@ let sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; - "type-2.6.0" = { + "type-2.7.0" = { name = "type"; packageName = "type"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.6.0.tgz"; - sha512 = "eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ=="; + url = "https://registry.npmjs.org/type/-/type-2.7.0.tgz"; + sha512 = "NybX0NBIssNEj1efLf1mqKAtO4Q/Np5mqpa57be81ud7/tNHIXn48FDVXiyGMBF90FfXc5o7RPsuRQrPzgMOMA=="; }; }; "type-check-0.3.2" = { @@ -67812,13 +68406,13 @@ let sha512 = "lPfAm42MxE4/456+QyIaaVBAwgpJb6xZ8PRu09utnhPdWwcyj9vgy6Sq0Z5yNbJ21EdxB5dRU/Qg8bsyAMtlcw=="; }; }; - "type-fest-2.13.1" = { + "type-fest-2.18.0" = { name = "type-fest"; packageName = "type-fest"; - version = "2.13.1"; + version = "2.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-2.13.1.tgz"; - sha512 = "hXYyrPFwETT2swFLHeoKtJrvSF/ftG/sA15/8nGaLuaDGfVAaq8DYFpu4yOyV4tzp082WqnTEoMsm3flKMI2FQ=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-2.18.0.tgz"; + sha512 = "pRS+/yrW5TjPPHNOvxhbNZexr2bS63WjrMU8a+VzEBhUi9Tz1pZeD+vQz3ut0svZ46P+SRqMEPnJmk2XnvNzTw=="; }; }; "type-is-1.6.18" = { @@ -67947,15 +68541,6 @@ let sha512 = "0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg=="; }; }; - "typescript-3.9-3.9.10" = { - name = "typescript-3.9"; - packageName = "typescript-3.9"; - version = "3.9.10"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz"; - sha512 = "w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="; - }; - }; "typescript-3.9.10" = { name = "typescript"; packageName = "typescript"; @@ -68145,22 +68730,22 @@ let sha512 = "qLq/4y2pjcU3vhlhseXGGJ7VbFO4pBANu0kwl8VCa9KEI0V8VfZIx2Fy3w01iSTA/pGwKZSmu/+I4etLNDdt5w=="; }; }; - "uglify-js-3.15.1" = { + "uglify-js-3.16.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.15.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz"; - sha512 = "FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.2.tgz"; + sha512 = "AaQNokTNgExWrkEYA24BTNMSjyqEXPSfhqoS0AxmHkCJ4U+Dyy5AvbGV/sqxuxficEfGGoX3zWw9R7QpLFfEsg=="; }; }; - "uglify-js-3.16.1" = { + "uglify-js-3.16.3" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.16.1"; + version = "3.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.1.tgz"; - sha512 = "X5BGTIDH8U6IQ1TIRP62YC36k+ULAa1d59BxlWvPUJ1NkW5L3FwcGfEzuVvGmhJFBu0YJ5Ge25tmRISqCmLiRQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.3.tgz"; + sha512 = "uVbFqx9vvLhQg0iBaau9Z75AxWJ8tqM9AV890dIZCLApF4rTcyHwmAvLeEdYRs+BzYWu8Iw81F79ah0EfTXbaw=="; }; }; "uglify-js-3.4.10" = { @@ -68469,13 +69054,13 @@ let sha512 = "UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw=="; }; }; - "undici-5.5.1" = { + "undici-5.8.1" = { name = "undici"; packageName = "undici"; - version = "5.5.1"; + version = "5.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/undici/-/undici-5.5.1.tgz"; - sha512 = "MEvryPLf18HvlCbLSzCW0U00IMftKGI5udnjrQbC5D4P0Hodwffhv+iGfWuJwg16Y/TK11ZFK8i+BPVW2z/eAw=="; + url = "https://registry.npmjs.org/undici/-/undici-5.8.1.tgz"; + sha512 = "iDRmWX4Zar/4A/t+1LrKQRm102zw2l9Wgat3LtTlTn8ykvMZmAmpq9tjyHEigx18FsY7IfATvyN3xSw9BDz0eA=="; }; }; "unherit-1.1.3" = { @@ -68631,13 +69216,13 @@ let sha512 = "qiI0GaHi/50NVrChnmZOBeB0aNhHRMG6VnjKEAikaQD/I3gxjTsDp8gycCOUxyVCJrV/Rv3y6zEWMZczO+o3Lw=="; }; }; - "unified-engine-10.0.0" = { + "unified-engine-10.0.1" = { name = "unified-engine"; packageName = "unified-engine"; - version = "10.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-10.0.0.tgz"; - sha512 = "FW9CWaMe3ehIh74rrElNG7sidYHVYxfLIYM+R2FGo+garAAj9xybXpH5qbMN63mrvQldjm20ArFVcPKqs63ckw=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-10.0.1.tgz"; + sha512 = "lsj7VC8kNWhK87rGBhidklk4llgrEdJoOZHoQFbTZQ/fA22JqowUPM10bEf05eSZOR6UnUSrZ/mPWHrQsHGm7g=="; }; }; "unified-engine-6.0.1" = { @@ -68658,13 +69243,13 @@ let sha512 = "ZlMm62ejrf+tJHdyOjQfljszngQjRor95q2XZMGk6rpJUYi7ZIHY/EXEhOcj9PZkMKKdLIM+dqL4s0ceyk9wbA=="; }; }; - "unified-engine-9.1.0" = { + "unified-engine-9.1.1" = { name = "unified-engine"; packageName = "unified-engine"; - version = "9.1.0"; + version = "9.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-9.1.0.tgz"; - sha512 = "V3UAUsVSAPSNsAdGeYHjtM6FWKIXUt6fPZovbBI5L6WsQIRkRkuFfllquTGCvtu0RckrzdOC7jGaV/tKkokwDw=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-9.1.1.tgz"; + sha512 = "yfXfc9zkoCileXE2lyj58AKQr6JK2HeBE8PxEG1U+P6opNSN4lAPPXEyBxL+ITyOQo0ZRDQmXQD04RwdwMovVg=="; }; }; "unified-lint-rule-1.0.6" = { @@ -68784,6 +69369,15 @@ let sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; }; }; + "unique-string-3.0.0" = { + name = "unique-string"; + packageName = "unique-string"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz"; + sha512 = "VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ=="; + }; + }; "unist-util-filter-2.0.3" = { name = "unist-util-filter"; packageName = "unist-util-filter"; @@ -68856,13 +69450,13 @@ let sha512 = "fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw=="; }; }; - "unist-util-inspect-7.0.0" = { + "unist-util-inspect-7.0.1" = { name = "unist-util-inspect"; packageName = "unist-util-inspect"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-7.0.0.tgz"; - sha512 = "2Utgv78I7PUu461Y9cdo+IUiiKSKpDV5CE/XD6vTj849a3xlpDAScvSJ6cQmtFBGgAmCn2wR7jLuXhpg1XLlJw=="; + url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-7.0.1.tgz"; + sha512 = "gEPeSrsYXus8012VJ00p9uZC8D0iogtLLiHlBgvS61hU22KNKduQhMKezJm83viHlLf3TYS2y9SDEFglWPDMKw=="; }; }; "unist-util-is-2.1.3" = { @@ -69324,6 +69918,15 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; + "update-browserslist-db-1.0.5" = { + name = "update-browserslist-db"; + packageName = "update-browserslist-db"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz"; + sha512 = "dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q=="; + }; + }; "update-check-1.5.2" = { name = "update-check"; packageName = "update-check"; @@ -69342,6 +69945,15 @@ let sha512 = "6KLU4/dd0Tg/l0xwL+f9V7kEIPSL1vOIbnNnhSLiRDlj4AVG6Ks9Zoc9Jgt9kIgWFPZ/wp2AHgmG7xNf15TJOA=="; }; }; + "update-check-1.5.4" = { + name = "update-check"; + packageName = "update-check"; + version = "1.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/update-check/-/update-check-1.5.4.tgz"; + sha512 = "5YHsflzHP4t1G+8WGPlvKbJEbAJGCgw+Em+dGR1KmBUbr1J36SJBqlHLjR7oob7sco5hWHGQVcr9B2poIVDDTQ=="; + }; + }; "update-notifier-0.5.0" = { name = "update-notifier"; packageName = "update-notifier"; @@ -69396,6 +70008,15 @@ let sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw=="; }; }; + "update-notifier-6.0.2" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-6.0.2.tgz"; + sha512 = "EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og=="; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -69477,13 +70098,13 @@ let sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; }; }; - "urkel-0.7.0" = { + "urkel-1.0.2" = { name = "urkel"; packageName = "urkel"; - version = "0.7.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/urkel/-/urkel-0.7.0.tgz"; - sha512 = "7Z3Gor4DkKKi0Ehp6H9xehWXqyL12+PA4JM41dcVc1LWks4zI4PGWv6DWgxaLCC+otpEuGdq3Vh5ayD/Mvzfbg=="; + url = "https://registry.npmjs.org/urkel/-/urkel-1.0.2.tgz"; + sha512 = "Y5UXbgBr6pczrD08N0SYJkWjtdtTTpmZsOvuftdrEHLnTjuxwSNjKsXYLQkICTptvnHAJ2OjI6XdAxtYTyOHew=="; }; }; "url-0.10.3" = { @@ -69855,15 +70476,6 @@ let sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; }; }; - "util.promisify-1.1.1" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.1.1.tgz"; - sha512 = "/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw=="; - }; - }; "utila-0.4.0" = { name = "utila"; packageName = "utila"; @@ -70017,13 +70629,13 @@ let sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; - "uvu-0.5.3" = { + "uvu-0.5.6" = { name = "uvu"; packageName = "uvu"; - version = "0.5.3"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/uvu/-/uvu-0.5.3.tgz"; - sha512 = "brFwqA3FXzilmtnIyJ+CxdkInkY/i4ErvP7uV0DnUVxQcQ55reuHphorpF+tZoVHK2MniZ/VJzI7zJQoc9T9Yw=="; + url = "https://registry.npmjs.org/uvu/-/uvu-0.5.6.tgz"; + sha512 = "+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA=="; }; }; "uws-9.148.0" = { @@ -70584,13 +71196,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.6.0" = { + "verda-1.10.0" = { name = "verda"; packageName = "verda"; - version = "1.6.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.6.0.tgz"; - sha512 = "r7YP2FG7AbV/BjnvIqpHZRokkZlWzP6SCJNh0Oq9LsMzEBM9Vx3HqUz2gTV49LKY6/e7yCWAA/aDgWgFkKXdbA=="; + url = "https://registry.npmjs.org/verda/-/verda-1.10.0.tgz"; + sha512 = "euo21L72IMCzrQ9GrYGEI1kmQT6bgKcfJaa0zr4a+FpODsOrszDk55SYsvAqKUMzgXJHAGh4LvE9ytu45E79OA=="; }; }; "verror-1.1.0" = { @@ -70971,13 +71583,13 @@ let sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; }; }; - "vm2-3.9.9" = { + "vm2-3.9.10" = { name = "vm2"; packageName = "vm2"; - version = "3.9.9"; + version = "3.9.10"; src = fetchurl { - url = "https://registry.npmjs.org/vm2/-/vm2-3.9.9.tgz"; - sha512 = "xwTm7NLh/uOjARRBs8/95H0e8fT3Ukw5D/JJWhxMbhKzNh1Nu981jQKvkep9iKYNxzlVrdzD0mlBGkDKZWprlw=="; + url = "https://registry.npmjs.org/vm2/-/vm2-3.9.10.tgz"; + sha512 = "AuECTSvwu2OHLAZYhG716YzwodKCIJxB6u1zG7PgSQwIgAlEaoXH52bxdcvT8GkGjnYK7r7yWDW0m0sOsPuBjQ=="; }; }; "voc-1.2.0" = { @@ -71016,13 +71628,13 @@ let sha512 = "FS5ou3G+WRnPPr/tWVs8b/jVzeDacgZHy/y7/QQW7maSPFEAmRt2bFGUJtJVEUDLBqtDm/3VGMJ7D31cF2U1tw=="; }; }; - "vsce-2.9.2" = { + "vsce-2.10.0" = { name = "vsce"; packageName = "vsce"; - version = "2.9.2"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-2.9.2.tgz"; - sha512 = "xyLqL4U82BilUX1t6Ym2opQEa2tLGWYjbgB7+ETeNVXlIJz5sWBJjQJSYJVFOKJSpiOtQclolu88cj7oY6vvPQ=="; + url = "https://registry.npmjs.org/vsce/-/vsce-2.10.0.tgz"; + sha512 = "b+wB3XMapEi368g64klSM6uylllZdNutseqbNY+tUoHYSy6g2NwnlWuAGKDQTYc0IqfDUjUFRQBpPgA89Q+Fyw=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -71133,13 +71745,13 @@ let sha512 = "dbr10KHabB9EaK8lI0XZW7SqOsTfrNyT3Nuj0GoPi4LjGKUmMiLtsqzfedIzRTzqY+w0FiLdh0/kQrnQ0tLxrw=="; }; }; - "vscode-html-languageservice-5.0.0" = { + "vscode-html-languageservice-5.0.1" = { name = "vscode-html-languageservice"; packageName = "vscode-html-languageservice"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.0.tgz"; - sha512 = "KJG13z54aLszskp3ETf8b1EKDypr2Sf5RUsfR6OXmKqEl2ZUfyIxsWz4gbJWjPzoJZx/bGH0ZXVwxJ1rg8OKRQ=="; + url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.1.tgz"; + sha512 = "OYsyn5HGAhxs0OIG+M0jc34WnftLtD67Wg7+TfrYwvf0waOkkr13zUqtdrVm2JPNQ6fJx+qnuM+vTbq7o1dCdQ=="; }; }; "vscode-json-languageservice-3.11.0" = { @@ -71169,6 +71781,15 @@ let sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA=="; }; }; + "vscode-json-languageservice-5.1.0" = { + name = "vscode-json-languageservice"; + packageName = "vscode-json-languageservice"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.1.0.tgz"; + sha512 = "D5612D7h/Gh4A0JmdttPveWzT9dur21WXvBHWKPdOt0sLO6ILz8vN6+IzWnvwDOVAEFTpzIAMVMZwbKZkwGGiA=="; + }; + }; "vscode-jsonrpc-3.5.0" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; @@ -71241,13 +71862,13 @@ let sha512 = "JX/F31LEsims0dAlOTKFE4E+AJMiJvdRSRViifFJSqSN7EzeYyWlfuDchF7g91oRNPZOIWfibTkDf3/UMsQGzQ=="; }; }; - "vscode-jsonrpc-8.0.1" = { + "vscode-jsonrpc-8.0.2" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz"; - sha512 = "N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz"; + sha512 = "RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -71349,13 +71970,13 @@ let sha512 = "/65lxR/CuLJoOdzTjOTYUPWS7k5qzaWese4PObnWc6jwLryUrSa7DslYfaRXigh5/xr1nlaUZCcJwkpgM0wFvw=="; }; }; - "vscode-languageserver-8.0.1" = { + "vscode-languageserver-8.0.2" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.1.tgz"; - sha512 = "sn7SjBwWm3OlmLtgg7jbM0wBULppyL60rj8K5HF0ny/MzN+GzPBX1kCvYdybhl7UW63V5V5tRVnyB8iwC73lSQ=="; + url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.2.tgz"; + sha512 = "bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA=="; }; }; "vscode-languageserver-protocol-3.14.1" = { @@ -71412,13 +72033,13 @@ let sha512 = "LFZ6WMB3iPezQAU9OnGoERzcIVKhcs0OLfD/NHcqSj3g1wgxuLUL5kSlZbbjFySQCmhzm6b0yb3hjTSeBtq1+w=="; }; }; - "vscode-languageserver-protocol-3.17.1" = { + "vscode-languageserver-protocol-3.17.2" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.17.1"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz"; - sha512 = "BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz"; + sha512 = "8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg=="; }; }; "vscode-languageserver-protocol-3.5.1" = { @@ -71448,15 +72069,6 @@ let sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw=="; }; }; - "vscode-languageserver-textdocument-1.0.4" = { - name = "vscode-languageserver-textdocument"; - packageName = "vscode-languageserver-textdocument"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.4.tgz"; - sha512 = "/xhqXP/2A2RSs+J8JNXpiiNVvvNM0oTosNVmQnunlKvq9o4mupHOBAnnzH0lwIPKazXKvAKsVp1kr+H/K4lgoQ=="; - }; - }; "vscode-languageserver-textdocument-1.0.5" = { name = "vscode-languageserver-textdocument"; packageName = "vscode-languageserver-textdocument"; @@ -71538,13 +72150,13 @@ let sha512 = "9/PeDNPYduaoXRUzYpqmu4ZV9L01HGo0wH9FUt+sSHR7IXwA7xoXBfNUlv8gB9H0D2WwEmMomSy1NmhjKQyn3A=="; }; }; - "vscode-languageserver-types-3.17.1" = { + "vscode-languageserver-types-3.17.2" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.17.1"; + version = "3.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz"; - sha512 = "K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz"; + sha512 = "zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA=="; }; }; "vscode-languageserver-types-3.5.0" = { @@ -71556,6 +72168,15 @@ let sha512 = "D4rUfu/oKYdc9Tmec0nEfedj+uXO2tZHR+eoHs9rE9G/QpRyZaHuug8ZUNGTGdO+ALLGgenL6bRpY8y3J9acHg=="; }; }; + "vscode-markdown-languageservice-0.0.0-alpha.13" = { + name = "vscode-markdown-languageservice"; + packageName = "vscode-markdown-languageservice"; + version = "0.0.0-alpha.13"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.0.0-alpha.13.tgz"; + sha512 = "jgRVBQmdO0aC5Svap1RcAd3x2XOSNWla01GF/rzaVx9M5pEcel4SPz+2H9PYXul6jRKe1oKJF9OOciaiE7pSXQ=="; + }; + }; "vscode-nls-2.0.2" = { name = "vscode-nls"; packageName = "vscode-nls"; @@ -71664,6 +72285,15 @@ let sha512 = "x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="; }; }; + "vue-2.7.8" = { + name = "vue"; + packageName = "vue"; + version = "2.7.8"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-2.7.8.tgz"; + sha512 = "ncwlZx5qOcn754bCu5/tS/IWPhXHopfit79cx+uIlLMyt3vCMGcXai5yCG5y+I6cDmEj4ukRYyZail9FTQh7lQ=="; + }; + }; "vue-class-component-7.2.6" = { name = "vue-class-component"; packageName = "vue-class-component"; @@ -71727,13 +72357,13 @@ let sha512 = "BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog=="; }; }; - "vue-loader-15.9.8" = { + "vue-loader-15.10.0" = { name = "vue-loader"; packageName = "vue-loader"; - version = "15.9.8"; + version = "15.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.9.8.tgz"; - sha512 = "GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog=="; + url = "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz"; + sha512 = "VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg=="; }; }; "vue-loader-v16-16.8.3" = { @@ -72015,15 +72645,6 @@ 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"; @@ -72096,13 +72717,13 @@ let sha512 = "mpXlqIeEBE5Q71cnBnt8w6XKhIiKmllPECqsIFBtMvzcfCxA8+614iyMJXBCQo95Vs3y1zORLqiLJn25pYZ4Tw=="; }; }; - "web3-utils-1.7.3" = { + "web3-utils-1.7.5" = { name = "web3-utils"; packageName = "web3-utils"; - version = "1.7.3"; + version = "1.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.3.tgz"; - sha512 = "g6nQgvb/bUpVUIxJE+ezVN+rYwYmlFyMvMIRSuqpi1dk6ApDD00YNArrk7sPcZnjvxOJ76813Xs2vIN2rgh4lg=="; + url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.7.5.tgz"; + sha512 = "9AqNOziQky4wNQadEwEfHiBdOZqopIHzQQVzmvvv6fJwDSMhP+khqmAZC7YTiGjs0MboyZ8tWNivqSO1699XQw=="; }; }; "webassemblyjs-1.11.1" = { @@ -72204,15 +72825,6 @@ let sha512 = "6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q=="; }; }; - "webpack-5.72.1" = { - name = "webpack"; - packageName = "webpack"; - version = "5.72.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.72.1.tgz"; - sha512 = "dXG5zXCLspQR4krZVR6QgajnZOjW2K/djHvdcRaDQvsjV9z9vaW6+ja5dZOYbqBBjF6kGXka/2ZyxNdc+8Jung=="; - }; - }; "webpack-5.73.0" = { name = "webpack"; packageName = "webpack"; @@ -72222,6 +72834,15 @@ let sha512 = "svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA=="; }; }; + "webpack-5.74.0" = { + name = "webpack"; + packageName = "webpack"; + version = "5.74.0"; + src = fetchurl { + url = "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"; + sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; + }; + }; "webpack-bundle-analyzer-3.9.0" = { name = "webpack-bundle-analyzer"; packageName = "webpack-bundle-analyzer"; @@ -72411,13 +73032,13 @@ let sha512 = "7iZ+u28Ljw5hCnMiq0BCOeSYf0vCFQe/ORY0HgscTiKjQed8WqugpBUggJ2NTnB9fahn1kEnPRX2jf8Px5PhJw=="; }; }; - "webtorrent-1.8.22" = { + "webtorrent-1.8.26" = { name = "webtorrent"; packageName = "webtorrent"; - version = "1.8.22"; + version = "1.8.26"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.22.tgz"; - sha512 = "gJv4RBpas5L5KyDvhq4HpHgnwdwKQtqBEkDAgqGzSVqq74DY5/9yz3Y+YdnddmlDh3WKlInOXRfIYRR9ZyaRXg=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-1.8.26.tgz"; + sha512 = "1bbCIDtbk4OA7xXmT87t6jDhnng6RNC9d7HNpRyvxF0GQTrIz1fB3oDnNcbOim9Upjy1GDqxAOe0Mejmc86TUg=="; }; }; "webworkify-webpack-2.1.5" = { @@ -72681,6 +73302,15 @@ let sha512 = "NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg=="; }; }; + "widest-line-4.0.1" = { + name = "widest-line"; + packageName = "widest-line"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/widest-line/-/widest-line-4.0.1.tgz"; + sha512 = "o0cyEG0e8GPzT4iGHphIOh0cJOV8fivsXxddQasHPHfoZf1ZexrfeA21w2NaEN1RHE+fXlfISmOE8R9N3u3Qig=="; + }; + }; "wif-2.0.6" = { name = "wif"; packageName = "wif"; @@ -72870,15 +73500,6 @@ let sha512 = "CPXrr+LD3DBeCEAnhPYS7DYbdq8kwhnkrVY7Px0vEROil9iZWaz0VHZHg41pNcUJc+1/PDm2obR1Lb2QGto1ZQ=="; }; }; - "winston-2.4.5" = { - name = "winston"; - packageName = "winston"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-2.4.5.tgz"; - sha512 = "TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A=="; - }; - }; "winston-2.4.6" = { name = "winston"; packageName = "winston"; @@ -72906,15 +73527,6 @@ let sha512 = "tbRtVy+vsSSCLcZq/8nXZaOie/S2tPXPFt4be/Q3vI/WtYwm7rrwidxVw2GRa38FIXcJ1kUM6MOZ9Jmnk3F3UA=="; }; }; - "winston-3.6.0" = { - name = "winston"; - packageName = "winston"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.6.0.tgz"; - sha512 = "9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w=="; - }; - }; "winston-3.7.2" = { name = "winston"; packageName = "winston"; @@ -72924,6 +73536,15 @@ let sha512 = "QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng=="; }; }; + "winston-3.8.1" = { + name = "winston"; + packageName = "winston"; + version = "3.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-3.8.1.tgz"; + sha512 = "r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w=="; + }; + }; "winston-transport-4.5.0" = { name = "winston-transport"; packageName = "winston-transport"; @@ -73320,13 +73941,13 @@ let sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; }; }; - "ws-7.5.8" = { + "ws-7.5.9" = { name = "ws"; packageName = "ws"; - version = "7.5.8"; + version = "7.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.8.tgz"; - sha512 = "ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; + sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; "ws-8.2.3" = { @@ -73374,6 +73995,15 @@ let sha512 = "JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ=="; }; }; + "ws-8.8.1" = { + name = "ws"; + packageName = "ws"; + version = "8.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz"; + sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; + }; + }; "wtfnode-0.8.4" = { name = "wtfnode"; packageName = "wtfnode"; @@ -73464,6 +74094,15 @@ let sha512 = "PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q=="; }; }; + "xdg-basedir-5.1.0" = { + name = "xdg-basedir"; + packageName = "xdg-basedir"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz"; + sha512 = "GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ=="; + }; + }; "xdg-trashdir-3.1.0" = { name = "xdg-trashdir"; packageName = "xdg-trashdir"; @@ -73473,13 +74112,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.2.41" = { + "xdl-59.2.49" = { name = "xdl"; packageName = "xdl"; - version = "59.2.41"; + version = "59.2.49"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.2.41.tgz"; - sha512 = "tACOq+f2bis8OyEQFsf1b5TromvSwaPVfiX7XsdKF6BVyXhmFb5H7GByu+VQr8hDYR6oHWXSd6oHiYHDufMkJw=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.2.49.tgz"; + sha512 = "k2QTBnpD97Alm2VDZ9Y5b+t/9R75lc1JPfqXfC6f03wA5gntn62z9WUmio91KKIXif3X4+PweYq/hwy9z4eBTw=="; }; }; "xenvar-0.5.1" = { @@ -74140,33 +74779,6 @@ let sha512 = "c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ=="; }; }; - "yargs-17.2.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.2.1.tgz"; - sha512 = "XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q=="; - }; - }; - "yargs-17.3.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.3.1.tgz"; - sha512 = "WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA=="; - }; - }; - "yargs-17.4.1" = { - name = "yargs"; - packageName = "yargs"; - version = "17.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-17.4.1.tgz"; - sha512 = "WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g=="; - }; - }; "yargs-17.5.1" = { name = "yargs"; packageName = "yargs"; @@ -74311,6 +74923,15 @@ let sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; }; }; + "yargs-parser-21.1.0" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "21.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.0.tgz"; + sha512 = "xzm2t63xTV/f7+bGMSRzLhUNk1ajv/tDoaD5OeGyC3cFo2fl7My9Z4hS3q2VdQ7JaLvTxErO8Jp5pRIFGMD/zg=="; + }; + }; "yargs-parser-4.2.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -74437,22 +75058,22 @@ let sha512 = "9Ni+uXWeFix9+1t7s1q40zZdbcpdi/OwgD4N4cVaqI+bppPciOOXQ/RSggannwZu8m8zrSWELn6/93G7308jgg=="; }; }; - "yeoman-environment-3.9.1" = { + "yeoman-environment-3.10.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "3.9.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.9.1.tgz"; - sha512 = "IdRnbQt/DSOSnao0oD9c+or1X2UrL+fx9eC0O7Lq/MGZV68nhv9k77MqG+hEAySPSlyCpocVlhfQwV62hczk5Q=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.10.0.tgz"; + sha512 = "sYtSxBK9daq21QjoskJTHKLQ1xEsRPURkmFV/aM8HS8ZlQVzwx57Rz1zCs8EGPhK4vqsmTE8H92Gp1jg1fT3EA=="; }; }; - "yeoman-generator-5.6.1" = { + "yeoman-generator-5.7.0" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "5.6.1"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.6.1.tgz"; - sha512 = "XllgFvmDEwoPMq2rKtL4/N52WlINJW6a3I3XtlCrMb3/dqO5dW0nPNgR0L3IIUIdf9y1EHb1ZFMs2Qp3ZEEFxg=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-5.7.0.tgz"; + sha512 = "z9ZwgKoDOd+llPDCwn8Ax2l4In5FMhlslxdeByW4AMxhT+HbTExXKEAahsClHSbwZz1i5OzRwLwRIUdOJBr5Bw=="; }; }; "yesno-0.3.1" = { @@ -74554,15 +75175,6 @@ let sha512 = "PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ=="; }; }; - "zen-observable-ts-0.8.21" = { - name = "zen-observable-ts"; - packageName = "zen-observable-ts"; - version = "0.8.21"; - src = fetchurl { - url = "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz"; - sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; - }; - }; "zen-observable-ts-1.2.5" = { name = "zen-observable-ts"; packageName = "zen-observable-ts"; @@ -74668,25 +75280,25 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "14.0.2"; + version = "14.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-14.0.2.tgz"; - sha512 = "cCQr5KMLlr7JER8CtrYLBTQUT4g22CTh3f0D9cdSjpBOhmEq62ZXApbmHNgPoHrTNub+7+FwANleIuqyN7nojg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-14.1.1.tgz"; + sha512 = "Kzx+aUkAi8wx6m2e34Ekvyj9U46w7A3CHn6Zv+//TeplQitoMAzBOE8OiFVEcGJpi5gQ+NLDu0egfh2D+CC+ug=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1400.2" - sources."@angular-devkit/core-14.0.2" - sources."@angular-devkit/schematics-14.0.2" + sources."@angular-devkit/architect-0.1401.1" + sources."@angular-devkit/core-14.1.1" + sources."@angular-devkit/schematics-14.1.1" sources."@gar/promisify-1.1.3" - sources."@npmcli/fs-1.1.1" + sources."@npmcli/fs-2.1.1" sources."@npmcli/git-3.0.1" sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/move-file-1.1.2" + sources."@npmcli/move-file-2.0.0" sources."@npmcli/node-gyp-2.0.0" sources."@npmcli/promise-spawn-3.0.0" - sources."@npmcli/run-script-3.0.3" - sources."@schematics/angular-14.0.2" - sources."@tootallnate/once-1.1.2" + sources."@npmcli/run-script-4.2.0" + sources."@schematics/angular-14.1.1" + sources."@tootallnate/once-2.0.0" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" @@ -74694,12 +75306,12 @@ in sources."aggregate-error-3.1.0" sources."ajv-8.11.0" sources."ajv-formats-2.1.1" - sources."ansi-colors-4.1.1" + sources."ansi-colors-4.1.3" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.0" + sources."are-we-there-yet-3.0.1" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bl-4.1.0" @@ -74708,8 +75320,6 @@ in sources."builtins-5.0.1" (sources."cacache-16.1.1" // { dependencies = [ - sources."@npmcli/fs-2.1.0" - sources."@npmcli/move-file-2.0.0" sources."brace-expansion-2.0.1" sources."glob-8.0.3" sources."minimatch-5.1.0" @@ -74720,7 +75330,7 @@ in sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" @@ -74759,7 +75369,7 @@ in sources."has-unicode-2.0.1" sources."hosted-git-info-5.0.0" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" @@ -74778,11 +75388,11 @@ in sources."ini-3.0.0" (sources."inquirer-8.2.4" // { dependencies = [ - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."tslib-2.4.0" ]; }) - sources."ip-1.1.8" + sources."ip-2.0.0" sources."is-core-module-2.9.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" @@ -74793,24 +75403,18 @@ in sources."isexe-2.0.0" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" - sources."jsonc-parser-3.0.0" + sources."jsonc-parser-3.1.0" sources."jsonparse-1.3.1" sources."lodash-4.17.21" sources."log-symbols-4.1.0" - sources."lru-cache-7.10.1" - sources."magic-string-0.26.1" - (sources."make-fetch-happen-9.1.0" // { - dependencies = [ - sources."cacache-15.3.0" - sources."lru-cache-6.0.0" - sources."ssri-8.0.1" - ]; - }) + sources."lru-cache-7.13.2" + sources."magic-string-0.26.2" + sources."make-fetch-happen-10.2.0" sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" + sources."minipass-fetch-2.1.0" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -74820,14 +75424,14 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."negotiator-0.6.3" - sources."node-gyp-8.4.1" + sources."node-gyp-9.1.0" sources."nopt-5.0.0" sources."normalize-package-data-4.0.0" sources."npm-bundled-1.1.2" sources."npm-install-checks-5.0.0" sources."npm-normalize-package-bin-1.0.1" - sources."npm-package-arg-9.0.2" - (sources."npm-packlist-5.1.0" // { + sources."npm-package-arg-9.1.0" + (sources."npm-packlist-5.1.1" // { dependencies = [ sources."brace-expansion-2.0.1" sources."glob-8.0.3" @@ -74835,15 +75439,7 @@ in ]; }) sources."npm-pick-manifest-7.0.1" - (sources."npm-registry-fetch-13.1.1" // { - dependencies = [ - sources."@tootallnate/once-2.0.0" - sources."http-proxy-agent-5.0.0" - sources."make-fetch-happen-10.1.8" - sources."minipass-fetch-2.1.0" - sources."socks-proxy-agent-7.0.0" - ]; - }) + sources."npm-registry-fetch-13.3.0" sources."npmlog-6.0.2" sources."once-1.4.0" sources."onetime-5.1.2" @@ -74851,7 +75447,7 @@ in sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-map-4.0.0" - sources."pacote-13.3.0" + sources."pacote-13.6.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.7" sources."proc-log-2.0.1" @@ -74869,7 +75465,7 @@ in sources."readable-stream-3.6.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.0" + sources."resolve-1.22.1" sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."rimraf-3.0.2" @@ -74885,9 +75481,9 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" - sources."socks-proxy-agent-6.2.1" - sources."source-map-0.7.3" + sources."socks-2.7.0" + sources."socks-proxy-agent-7.0.0" + sources."source-map-0.7.4" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -74919,8 +75515,8 @@ in sources."wrappy-1.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.4.1" - sources."yargs-parser-21.0.1" + sources."yargs-17.5.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -74935,10 +75531,10 @@ in "@antfu/ni" = nodeEnv.buildNodePackage { name = "_at_antfu_slash_ni"; packageName = "@antfu/ni"; - version = "0.16.2"; + version = "0.17.2"; src = fetchurl { - url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.16.2.tgz"; - sha512 = "HZH4I07EYKU4KZLtUYm/zEmaDIhaq51H/qu45uH1AcUPWqMGbB7evE/TnSr0SGInEA+oQs4Is5Vn/PmQhfuU5w=="; + url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.17.2.tgz"; + sha512 = "uYsmcsQzylpMiRB4gJRwcEJMIrKyeHZO0CJct8MmqkT3B7HTFU6oSZhDB50E/XvQw7FW8oT/tKsq3NFplRgG2Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -74953,15 +75549,15 @@ in "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-3.0.1.tgz"; - sha512 = "6qIPh31Z9VznWMHTi2/40Yx3OcHTGcXf9FaPcWsK4TVjLZtGlfqWccwb4P9ZzQPr+CaFDQFPTB8xwnP7c9GxNw=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-3.0.3.tgz"; + sha512 = "tY+gGI23sUViRhXweIjTU/J51NclZ6TNbsbXMnDev1RsaEnIaWR0QOOej8Wf/asbcA5ZORkPqB1pPfUblEhODw=="; }; dependencies = [ sources."@antora/expand-path-helper-2.0.0" - sources."@antora/logger-3.0.1" - sources."@antora/playbook-builder-3.0.1" + sources."@antora/logger-3.0.3" + sources."@antora/playbook-builder-3.0.3" sources."@antora/user-require-helper-2.0.0" sources."@iarna/toml-2.2.5" sources."ansi-styles-3.2.1" @@ -75010,7 +75606,7 @@ in sources."rfdc-1.3.0" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" - sources."secure-json-parse-2.4.0" + sources."secure-json-parse-2.5.0" sources."sonic-boom-2.4.2" sources."split2-4.1.0" sources."stream-shift-1.0.1" @@ -75036,27 +75632,27 @@ in "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-3.0.1.tgz"; - sha512 = "ZuN2LQfgMgW7f+VwlNUC/6fr7MGgCMWnFTy3hA8naQcJpnjKQ2Suv0BO2RvTqkBPX/SzNlnowyHfkJkEUITr4A=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-3.0.3.tgz"; + sha512 = "SlCuWg3Dlf7Uk7YZ1yYwHh/Lb1Dom+cEzB7wpzZkmoSfcR9Rms751qS06sUINVPA4y04ka2ugjbXDCafPmAZcg=="; }; dependencies = [ - sources."@antora/asciidoc-loader-3.0.1" - sources."@antora/content-aggregator-3.0.1" - sources."@antora/content-classifier-3.0.1" - sources."@antora/document-converter-3.0.1" + sources."@antora/asciidoc-loader-3.0.3" + sources."@antora/content-aggregator-3.0.3" + sources."@antora/content-classifier-3.0.3" + sources."@antora/document-converter-3.0.3" sources."@antora/expand-path-helper-2.0.0" - sources."@antora/file-publisher-3.0.1" - sources."@antora/logger-3.0.1" - sources."@antora/navigation-builder-3.0.1" - sources."@antora/page-composer-3.0.1" - sources."@antora/playbook-builder-3.0.1" - sources."@antora/redirect-producer-3.0.1" - sources."@antora/site-generator-3.0.1" - sources."@antora/site-mapper-3.0.1" - sources."@antora/site-publisher-3.0.1" - sources."@antora/ui-loader-3.0.1" + sources."@antora/file-publisher-3.0.3" + sources."@antora/logger-3.0.3" + sources."@antora/navigation-builder-3.0.3" + sources."@antora/page-composer-3.0.3" + sources."@antora/playbook-builder-3.0.3" + sources."@antora/redirect-producer-3.0.3" + sources."@antora/site-generator-3.0.3" + sources."@antora/site-mapper-3.0.3" + sources."@antora/site-publisher-3.0.3" + sources."@antora/ui-loader-3.0.3" sources."@antora/user-require-helper-2.0.0" sources."@asciidoctor/core-2.2.6" sources."@iarna/toml-2.2.5" @@ -75069,7 +75665,7 @@ in ]; }) sources."asciidoctor-opal-runtime-0.3.3" - sources."async-lock-1.3.1" + sources."async-lock-1.3.2" sources."atomic-sleep-1.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" @@ -75216,7 +75812,7 @@ in sources."rfdc-1.3.0" sources."safe-buffer-5.1.2" sources."safe-stable-stringify-2.3.1" - sources."secure-json-parse-2.4.0" + sources."secure-json-parse-2.5.0" sources."sha.js-2.4.11" sources."should-proxy-1.0.4" sources."simple-concat-1.0.1" @@ -75245,7 +75841,7 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."type-fest-1.4.0" - sources."uglify-js-3.16.1" + sources."uglify-js-3.16.3" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."unxhr-1.0.1" @@ -75285,15 +75881,12 @@ in "@astrojs/language-server" = nodeEnv.buildNodePackage { name = "_at_astrojs_slash_language-server"; packageName = "@astrojs/language-server"; - version = "0.19.3"; + version = "0.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.19.3.tgz"; - sha512 = "oaGiJadSxzbnl60jA5OssenbTvefd1pc2Cx4eT0FbVI1XkjNM6KURLJilg0lzN12kQFphkg9TkSS6KzR4YnbGQ=="; + url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-0.20.3.tgz"; + sha512 = "MuzTsSpUjtmMXfrBThtZwgO39Jc+Bbl5hLevumkp01N/YCKE+Iipd3ELSdbk7+TPiuBV+/SKrVmaQPvJBnWPkA=="; }; dependencies = [ - sources."@astrojs/svelte-language-integration-0.1.6" - sources."@astrojs/vue-language-integration-0.1.1" - sources."@babel/parser-7.18.5" sources."@emmetio/abbreviation-2.2.3" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" @@ -75302,48 +75895,17 @@ in sources."vscode-uri-2.1.2" ]; }) - (sources."@vue/compiler-core-3.2.37" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."@vue/compiler-dom-3.2.37" - (sources."@vue/compiler-sfc-3.2.37" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."@vue/compiler-ssr-3.2.37" - sources."@vue/reactivity-3.2.37" - sources."@vue/reactivity-transform-3.2.37" - sources."@vue/runtime-core-3.2.37" - sources."@vue/shared-3.2.37" - sources."dedent-js-1.0.1" sources."emmet-2.3.6" - sources."estree-walker-2.0.2" sources."jsonc-parser-2.3.1" - sources."lodash-4.17.21" - sources."lower-case-2.0.2" - sources."magic-string-0.25.9" - sources."nanoid-3.3.4" - sources."no-case-3.0.4" - sources."pascal-case-3.1.2" - sources."picocolors-1.0.0" - sources."postcss-8.4.14" sources."source-map-0.7.4" - sources."source-map-js-1.0.2" - sources."sourcemap-codec-1.4.8" - sources."svelte-3.48.0" - sources."svelte2tsx-0.5.10" - sources."tslib-2.4.0" sources."typescript-4.6.4" sources."vscode-css-languageservice-6.0.1" - sources."vscode-html-languageservice-5.0.0" - sources."vscode-jsonrpc-8.0.1" - sources."vscode-languageserver-8.0.1" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-html-languageservice-5.0.1" + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-5.0.1" sources."vscode-uri-3.0.3" ]; @@ -75359,10 +75921,10 @@ in "@bitwarden/cli" = nodeEnv.buildNodePackage { name = "_at_bitwarden_slash_cli"; packageName = "@bitwarden/cli"; - version = "1.22.1"; + version = "2022.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-1.22.1.tgz"; - sha512 = "tjRig3vs+tS6zBXZPqei8EEzFLtGJAaqPz2GUIbZWCfKoPTUhDZFGjKVwUFaVbfadYBms4QW8NB/7FPtlBcVRw=="; + url = "https://registry.npmjs.org/@bitwarden/cli/-/cli-2022.6.2.tgz"; + sha512 = "ub3T4RTaTk6cUTbegQPNotSrdKhnx32byD9KYK8QJXEXSDrPWGALIdwen1uFj81711+6cFi75BS+6Yqk3ctS6w=="; }; dependencies = [ sources."@koa/multer-3.0.0" @@ -75370,7 +75932,7 @@ in sources."@tootallnate/once-1.1.2" sources."abab-2.0.6" sources."accepts-1.3.8" - sources."acorn-8.7.1" + sources."acorn-8.8.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -75493,7 +76055,7 @@ in ]; }) sources."json-stringify-safe-5.0.1" - sources."jszip-3.10.0" + sources."jszip-3.10.1" sources."keygrip-1.1.0" (sources."koa-2.13.4" // { dependencies = [ @@ -75528,8 +76090,8 @@ in sources."whatwg-url-5.0.0" ]; }) - sources."node-forge-0.10.0" - sources."nwsapi-2.2.0" + sources."node-forge-1.3.1" + sources."nwsapi-2.2.1" sources."object-assign-4.1.1" sources."object-inspect-1.12.2" sources."on-finished-2.4.1" @@ -75547,9 +76109,9 @@ in sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."proper-lockfile-4.1.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" - sources."qs-6.10.5" + sources."qs-6.11.0" (sources."raw-body-2.5.1" // { dependencies = [ sources."depd-2.0.0" @@ -75606,7 +76168,7 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.7.0" sources."word-wrap-1.2.3" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" @@ -75626,15 +76188,15 @@ in "@commitlint/cli" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_cli"; packageName = "@commitlint/cli"; - version = "17.0.2"; + version = "17.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.0.2.tgz"; - sha512 = "Axe89Js0YzGGd4gxo3JLlF7yIdjOVpG1LbOorGc6PfYF+drBh14PvarSDLzyd2TNqdylUCq9wb9/A88ZjIdyhA=="; + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-17.0.3.tgz"; + sha512 = "oAo2vi5d8QZnAbtU5+0cR2j+A7PO8zuccux65R/EycwvsZrDVyW518FFrnJK2UQxbRtHFFIG+NjQ6vOiJV0Q8A=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -75644,17 +76206,17 @@ in sources."supports-color-5.5.0" ]; }) - sources."@commitlint/config-validator-17.0.0" + sources."@commitlint/config-validator-17.0.3" sources."@commitlint/ensure-17.0.0" sources."@commitlint/execute-rule-17.0.0" sources."@commitlint/format-17.0.0" - sources."@commitlint/is-ignored-17.0.0" - sources."@commitlint/lint-17.0.0" - sources."@commitlint/load-17.0.0" + sources."@commitlint/is-ignored-17.0.3" + sources."@commitlint/lint-17.0.3" + sources."@commitlint/load-17.0.3" sources."@commitlint/message-17.0.0" sources."@commitlint/parse-17.0.0" sources."@commitlint/read-17.0.0" - sources."@commitlint/resolve-extends-17.0.0" + sources."@commitlint/resolve-extends-17.0.3" sources."@commitlint/rules-17.0.0" sources."@commitlint/to-lines-17.0.0" (sources."@commitlint/top-level-17.0.0" // { @@ -75667,21 +76229,21 @@ in }) sources."@commitlint/types-17.0.0" sources."@cspotcode/source-map-support-0.8.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/sourcemap-codec-1.4.13" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" 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.0.0" + sources."@types/node-18.6.3" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."JSONStream-1.3.5" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-walk-8.2.0" - sources."ajv-6.12.6" + sources."ajv-8.11.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."arg-4.1.3" @@ -75698,7 +76260,7 @@ in sources."conventional-changelog-angular-5.0.13" sources."conventional-commits-parser-3.2.4" sources."cosmiconfig-7.0.1" - sources."cosmiconfig-typescript-loader-2.0.1" + sources."cosmiconfig-typescript-loader-2.0.2" sources."create-require-1.1.1" sources."cross-spawn-7.0.3" sources."dargs-7.0.0" @@ -75716,7 +76278,6 @@ in sources."escape-string-regexp-1.0.5" sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" sources."find-up-4.1.0" sources."fs-extra-10.1.0" sources."function-bind-1.1.1" @@ -75748,7 +76309,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" sources."jsonfile-6.1.0" sources."jsonparse-1.3.1" sources."kind-of-6.0.3" @@ -75794,6 +76355,7 @@ in sources."readable-stream-3.6.0" sources."redent-3.0.0" sources."require-directory-2.1.1" + sources."require-from-string-2.0.2" sources."resolve-1.22.1" sources."resolve-from-5.0.0" sources."resolve-global-1.0.0" @@ -75818,7 +76380,7 @@ in sources."through-2.3.8" sources."through2-4.0.2" sources."trim-newlines-3.0.1" - sources."ts-node-10.8.1" + sources."ts-node-10.9.1" sources."type-fest-0.18.1" sources."typescript-4.7.4" sources."universalify-2.0.0" @@ -75833,7 +76395,7 @@ in sources."yaml-1.10.2" (sources."yargs-17.5.1" // { dependencies = [ - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; }) sources."yargs-parser-20.2.9" @@ -75853,10 +76415,10 @@ in "@commitlint/config-conventional" = nodeEnv.buildNodePackage { name = "_at_commitlint_slash_config-conventional"; packageName = "@commitlint/config-conventional"; - version = "17.0.2"; + version = "17.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.0.2.tgz"; - sha512 = "MfP0I/JbxKkzo+HXWB7B3WstGS4BiniotU3d3xQ9gK8cR0DbeZ4MuyGCWF65YDyrcDTS3WlrJ3ndSPA1pqhoPw=="; + url = "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-17.0.3.tgz"; + sha512 = "HCnzTm5ATwwwzNVq5Y57poS0a1oOOcd5pc1MmBpLbGmSysc4i7F/++JuwtdFPu16sgM3H9J/j2zznRLOSGVO2A=="; }; dependencies = [ sources."array-ify-1.0.0" @@ -75880,10 +76442,10 @@ in "@forge/cli" = nodeEnv.buildNodePackage { name = "_at_forge_slash_cli"; packageName = "@forge/cli"; - version = "4.4.1"; + version = "4.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@forge/cli/-/cli-4.4.1.tgz"; - sha512 = "AIlSXdRYv4TkAuQSABUQnTpUqWJ4OvHO0xI9+HMjMzrEWTDka8JjN2kr+qlxXqdthC222V38jxsJ0ejLvJraQg=="; + url = "https://registry.npmjs.org/@forge/cli/-/cli-4.5.1.tgz"; + sha512 = "Z6ic0gv0toD//dXHvmGXuRJHKlch8H/zC2NVTaw3M3+8c2OwhSMVjo96YrovLg86i4WuvlY29UzKcDxAnTBriw=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" @@ -75893,76 +76455,77 @@ in sources."js-yaml-4.1.0" ]; }) - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - sources."@babel/core-7.18.5" - (sources."@babel/generator-7.18.2" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + sources."@babel/core-7.18.10" + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-compilation-targets-7.18.2" - sources."@babel/helper-create-class-features-plugin-7.18.0" - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.17.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-replace-supers-7.18.2" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/plugin-proposal-class-properties-7.17.12" - sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-optional-chaining-7.17.12" - sources."@babel/plugin-syntax-jsx-7.17.12" + sources."@babel/helper-annotate-as-pure-7.18.6" + sources."@babel/helper-compilation-targets-7.18.9" + sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.18.9" + 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.18.9" + sources."@babel/helper-optimise-call-expression-7.18.6" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-replace-supers-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helpers-7.18.9" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/plugin-proposal-class-properties-7.18.6" + sources."@babel/plugin-proposal-numeric-separator-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-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.17.12" - sources."@babel/plugin-transform-react-jsx-7.17.12" - sources."@babel/plugin-transform-typescript-7.18.4" - sources."@babel/preset-typescript-7.17.12" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/plugin-syntax-typescript-7.18.6" + sources."@babel/plugin-transform-react-jsx-7.18.10" + sources."@babel/plugin-transform-typescript-7.18.10" + sources."@babel/preset-typescript-7.18.6" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" sources."@discoveryjs/json-ext-0.5.7" sources."@forge/api-2.7.0" sources."@forge/auth-0.0.1" sources."@forge/babel-plugin-transform-ui-1.1.0" - sources."@forge/bundler-3.0.8" - sources."@forge/cli-shared-2.5.1" + sources."@forge/bundler-3.0.10" + sources."@forge/cli-shared-2.6.1" sources."@forge/csp-1.11.0" - sources."@forge/lint-3.1.2" - sources."@forge/manifest-3.8.1" + sources."@forge/lint-3.2.1" + sources."@forge/manifest-3.10.0" sources."@forge/storage-1.3.0" sources."@forge/util-1.2.0" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.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.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" sources."@jsdevtools/ono-7.1.3" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/eslint-8.4.3" - sources."@types/eslint-scope-3.7.3" + sources."@types/eslint-8.4.5" + sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/node-fetch-2.6.2" sources."@typescript-eslint/types-3.10.1" (sources."@typescript-eslint/typescript-estree-3.10.1" // { @@ -75991,7 +76554,7 @@ in sources."@webpack-cli/serve-1.7.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-import-assertions-1.8.0" (sources."ajv-6.12.6" // { dependencies = [ @@ -76055,7 +76618,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" @@ -76070,7 +76633,7 @@ in }) sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" sources."case-1.6.3" sources."chainsaw-0.1.0" sources."chalk-2.4.2" @@ -76079,15 +76642,15 @@ in sources."chownr-1.1.4" sources."chrome-trace-event-1.0.3" sources."cipher-base-1.0.4" - sources."cli-color-2.0.2" + sources."cli-color-2.0.3" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-table3-0.6.2" sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-deep-4.0.1" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-2.0.19" @@ -76124,7 +76687,7 @@ in sources."css-select-1.2.0" sources."css-what-2.1.3" sources."d-1.0.1" - sources."dayjs-1.11.3" + sources."dayjs-1.11.4" sources."debounce-fn-3.0.1" sources."debug-4.3.4" sources."decompress-response-3.3.0" @@ -76153,8 +76716,8 @@ in sources."string_decoder-1.1.1" ]; }) - sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.164" + sources."duplexer3-0.1.5" + sources."electron-to-chromium-1.4.211" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -76164,7 +76727,7 @@ in sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.9.3" + sources."enhanced-resolve-5.10.0" sources."entities-1.1.2" sources."env-paths-2.2.1" sources."envinfo-7.8.1" @@ -76172,7 +76735,7 @@ in sources."es-module-lexer-0.9.3" sources."es-shim-unscopables-1.0.0" sources."es-to-primitive-1.2.1" - sources."es5-ext-0.10.61" + 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" @@ -76193,7 +76756,7 @@ in sources."expand-template-2.0.3" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.6.0" + sources."type-2.7.0" ]; }) (sources."external-editor-3.1.0" // { @@ -76204,13 +76767,13 @@ in sources."extract-files-9.0.0" sources."fast-deep-equal-2.0.1" sources."fast-json-stable-stringify-2.1.0" - sources."fastest-levenshtein-1.0.12" + sources."fastest-levenshtein-1.0.16" sources."figures-3.2.0" sources."fill-range-7.0.1" sources."find-cache-dir-3.3.2" sources."find-up-4.1.0" sources."form-data-3.0.1" - sources."fp-ts-2.12.1" + sources."fp-ts-2.12.2" sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" sources."fs-monkey-1.0.3" @@ -76280,7 +76843,7 @@ in }) sources."internal-slot-1.0.3" sources."interpret-2.2.0" - sources."io-ts-2.2.16" + sources."io-ts-2.2.17" sources."is-bigint-1.0.4" sources."is-boolean-object-1.1.2" sources."is-callable-1.2.4" @@ -76325,7 +76888,7 @@ in sources."json5-2.2.1" sources."jsonfile-4.0.0" sources."jsonify-0.0.0" - sources."jsonpointer-5.0.0" + sources."jsonpointer-5.0.1" sources."keytar-7.9.0" sources."keyv-3.1.0" sources."kind-of-6.0.3" @@ -76371,7 +76934,7 @@ in sources."lru-queue-0.1.0" sources."make-dir-3.1.0" sources."md5.js-1.3.5" - sources."memfs-3.4.6" + sources."memfs-3.4.7" sources."memoizee-0.4.15" sources."merge-stream-2.0.0" sources."micromatch-4.0.5" @@ -76396,7 +76959,7 @@ in sources."napi-build-utils-1.0.2" sources."neo-async-2.6.2" sources."next-tick-1.1.0" - (sources."node-abi-3.22.0" // { + (sources."node-abi-3.24.0" // { dependencies = [ sources."semver-7.3.7" ]; @@ -76409,7 +76972,7 @@ in ]; }) sources."node-machine-id-1.1.12" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."nth-check-1.0.2" @@ -76487,7 +77050,12 @@ in sources."inherits-2.0.4" ]; }) - sources."readdir-glob-1.1.1" + (sources."readdir-glob-1.1.2" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."minimatch-5.1.0" + ]; + }) sources."rechoir-0.7.1" (sources."recursive-readdir-2.2.2" // { dependencies = [ @@ -76559,7 +77127,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-5.14.1" // { + (sources."terser-5.14.2" // { dependencies = [ sources."commander-2.20.3" ]; @@ -76587,7 +77155,7 @@ in }) sources."traverse-0.3.9" sources."truncate-utf8-bytes-1.0.2" - (sources."ts-loader-9.3.0" // { + (sources."ts-loader-9.3.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -76619,6 +77187,7 @@ in sources."string_decoder-1.1.1" ]; }) + sources."update-browserslist-db-1.0.5" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -76643,7 +77212,7 @@ in sources."watchpack-2.4.0" sources."wcwidth-1.0.1" sources."webidl-conversions-4.0.2" - (sources."webpack-5.73.0" // { + (sources."webpack-5.74.0" // { dependencies = [ sources."schema-utils-3.1.1" ]; @@ -76691,9 +77260,9 @@ in sha512 = "csjufiygKXa845N04Mp8DWxHx2GiGp2RviuKAvvanC/+NoU4Fmxo9aLKATpC7XL5mNSYqy+VhTikFTZEP2u9Kg=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -76710,7 +77279,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."abort-controller-3.0.0" @@ -76742,11 +77311,11 @@ in sources."chokidar-3.5.3" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-truncate-2.1.0" sources."cli-width-3.0.0" sources."clone-1.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" @@ -76837,7 +77406,7 @@ in sources."jsonfile-6.1.0" sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."lines-and-columns-1.2.4" sources."locate-path-6.0.0" sources."lodash-4.17.21" @@ -76897,7 +77466,7 @@ in sources."picomatch-2.3.1" sources."prepend-http-3.0.1" sources."pump-3.0.0" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."querystringify-2.2.0" sources."quick-lru-5.1.1" (sources."read-pkg-6.0.0" // { @@ -76920,11 +77489,11 @@ in sources."replace-buffer-1.2.1" sources."requires-port-1.0.0" sources."resolve-alpn-1.2.1" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."restore-cursor-3.1.0" sources."router-ips-1.0.0" sources."run-async-2.4.1" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -76948,7 +77517,7 @@ in sources."tr46-0.0.3" (sources."ts2gas-4.2.0" // { dependencies = [ - sources."type-fest-2.13.1" + sources."type-fest-2.18.0" ]; }) sources."tslib-2.4.0" @@ -76997,10 +77566,10 @@ in sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" sources."@leichtgewicht/ip-codec-2.0.4" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-walk-8.2.0" (sources."ansi-diff-stream-1.2.1" // { dependencies = [ @@ -77014,7 +77583,7 @@ in sources."array-lru-1.1.1" sources."atomic-batcher-1.0.2" sources."await-lock-2.2.2" - sources."b4a-1.5.3" + sources."b4a-1.6.0" sources."base64-js-1.5.1" sources."binary-extensions-2.2.0" (sources."bitfield-rle-2.2.1" // { @@ -77190,7 +77759,7 @@ in sources."minimist-1.2.6" sources."mkdirp-1.0.4" sources."mkdirp-classic-0.5.3" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."mountable-hypertrie-2.8.0" sources."ms-2.0.0" sources."multicast-dns-7.2.5" @@ -77201,7 +77770,7 @@ in sources."nanoresource-1.3.0" sources."nanoresource-promise-1.2.2" sources."napi-macros-2.0.0" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" (sources."noise-peer-2.1.1" // { dependencies = [ sources."readable-stream-3.6.0" @@ -77222,7 +77791,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-string-1.2.2" sources."protocol-buffers-4.2.0" - sources."protocol-buffers-encodings-1.1.1" + sources."protocol-buffers-encodings-1.2.0" sources."protocol-buffers-schema-3.6.0" sources."prr-1.0.1" sources."pseudomap-1.0.2" @@ -77322,7 +77891,7 @@ in ]; }) sources."varint-5.0.0" - sources."vm2-3.9.9" + sources."vm2-3.9.10" sources."which-1.3.1" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -77352,13 +77921,13 @@ in "@medable/mdctl-cli" = nodeEnv.buildNodePackage { name = "_at_medable_slash_mdctl-cli"; packageName = "@medable/mdctl-cli"; - version = "1.0.64"; + version = "1.0.65"; src = fetchurl { - url = "https://registry.npmjs.org/@medable/mdctl-cli/-/mdctl-cli-1.0.64.tgz"; - sha512 = "hV1PG20mLFmYbSJvV+JIGVLUT3zzDt2snR9T7tKMBAVvGQBAfzodylbTZe+b20hNz3Max2Z4zsKVksRu71x1+A=="; + url = "https://registry.npmjs.org/@medable/mdctl-cli/-/mdctl-cli-1.0.65.tgz"; + sha512 = "tCI9Znr2FdQJREIvAFLpznskYOGigICd9wEA71Q7xHEka4RNlhKBZwzVCBH4NAPZoCLZbLYCDzW/7ursgi87Ew=="; }; dependencies = [ - sources."@babel/parser-7.18.5" + sources."@babel/parser-7.18.10" sources."@medable/mdctl-api-1.0.66" sources."@medable/mdctl-api-driver-1.0.66" sources."@medable/mdctl-axon-tools-1.0.66" @@ -77393,7 +77962,7 @@ in sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" sources."@types/minimatch-3.0.5" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/tough-cookie-2.3.8" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -77751,7 +78320,7 @@ in }) sources."js2xmlparser-4.0.2" sources."jsbn-0.1.1" - (sources."jsdoc-3.6.10" // { + (sources."jsdoc-3.6.11" // { dependencies = [ sources."mkdirp-1.0.4" sources."strip-json-comments-3.1.1" @@ -77777,7 +78346,7 @@ in sources."jws-3.2.2" sources."keytar-4.13.0" sources."kind-of-6.0.3" - sources."klaw-4.0.1" + sources."klaw-3.0.0" sources."lcid-2.0.0" sources."levn-0.3.0" sources."lie-3.0.4" @@ -77801,7 +78370,7 @@ in sources."map-visit-1.0.0" sources."markdown-it-12.3.2" sources."markdown-it-anchor-8.6.4" - sources."marked-4.0.17" + sources."marked-4.0.18" sources."md5.js-1.3.5" sources."mdurl-1.0.1" (sources."mem-4.3.0" // { @@ -77826,7 +78395,7 @@ in ]; }) sources."mkdirp-0.5.6" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."ms-2.1.2" sources."mute-stream-0.0.7" sources."nan-2.14.0" @@ -78014,7 +78583,7 @@ in sources."private-0.1.8" sources."process-nextick-args-2.0.1" sources."promise-nodify-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."q-1.5.1" @@ -78197,7 +78766,7 @@ in sources."tweetnacl-0.14.5" sources."type-check-0.3.2" sources."uc.micro-1.0.6" - sources."uglify-js-3.16.1" + sources."uglify-js-3.16.3" sources."underscore-1.13.4" sources."union-value-1.0.1" (sources."universal-url-2.0.0" // { @@ -78288,16 +78857,16 @@ in sources."@octokit/core-3.6.0" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-12.4.0" - sources."@octokit/plugin-paginate-rest-2.19.0" + sources."@octokit/openapi-types-12.11.0" + sources."@octokit/plugin-paginate-rest-2.21.3" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.15.0" + sources."@octokit/plugin-rest-endpoint-methods-5.16.2" sources."@octokit/plugin-retry-3.0.9" sources."@octokit/plugin-throttling-3.7.0" sources."@octokit/request-5.6.3" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.37.0" + sources."@octokit/types-6.41.0" sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" @@ -78314,7 +78883,7 @@ in sources."chalk-4.1.2" sources."child-process-promise-2.2.1" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -78384,25 +78953,25 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "8.2.6"; + version = "9.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-8.2.6.tgz"; - sha512 = "uvwKbUZJmgdJu1D24e+uUqHnwoB/0R9hLfUJjr5pTvLlP/RJugHAdJr7m1dQe92Xzdyi36kBN4Id3RXHgfz1UA=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-9.0.0.tgz"; + sha512 = "xT5uOoIEcaB/Fn6UeF7atfKqKiEEsTeRKPiM55p+e5H9WVw8FC2r4ceZgaINJbsw0QWskVj/ZQadMo6dA6hXxw=="; }; dependencies = [ - sources."@angular-devkit/core-13.3.5" - sources."@angular-devkit/schematics-13.3.5" - (sources."@angular-devkit/schematics-cli-13.3.5" // { + sources."@angular-devkit/core-14.0.5" + sources."@angular-devkit/schematics-14.0.5" + (sources."@angular-devkit/schematics-cli-14.0.5" // { dependencies = [ sources."chalk-4.1.2" - sources."inquirer-8.2.0" - sources."rxjs-7.5.5" + sources."inquirer-8.2.4" + sources."rxjs-7.5.6" sources."tslib-2.4.0" ]; }) - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -78412,19 +78981,19 @@ in sources."supports-color-5.5.0" ]; }) - sources."@jridgewell/gen-mapping-0.3.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" + sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" - sources."@nestjs/schematics-8.0.11" - sources."@types/eslint-8.4.3" - sources."@types/eslint-scope-3.7.3" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" + sources."@nestjs/schematics-9.0.1" + sources."@types/eslint-8.4.5" + sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" sources."@types/json5-0.0.29" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -78443,9 +79012,9 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-import-assertions-1.8.0" - sources."ajv-8.9.0" + sources."ajv-8.11.0" sources."ajv-formats-2.1.1" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -78459,17 +79028,17 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.3" sources."chrome-trace-event-1.0.3" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-table3-0.6.2" sources."cli-width-3.0.0" sources."clone-1.0.4" @@ -78481,10 +79050,10 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enhanced-resolve-5.9.3" + sources."enhanced-resolve-5.10.0" sources."error-ex-1.3.2" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" @@ -78564,8 +79133,8 @@ in }) sources."lru-cache-6.0.0" sources."macos-release-2.5.0" - sources."magic-string-0.25.7" - sources."memfs-3.4.6" + sources."magic-string-0.26.1" + sources."memfs-3.4.7" sources."merge-stream-2.0.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" @@ -78575,7 +79144,7 @@ in sources."mute-stream-0.0.8" sources."neo-async-2.6.2" sources."node-emoji-1.11.0" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" @@ -78639,7 +79208,7 @@ in sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-4.0.0" sources."tapable-2.2.1" - (sources."terser-5.14.1" // { + (sources."terser-5.14.2" // { dependencies = [ sources."commander-2.20.3" ]; @@ -78657,20 +79226,23 @@ in }) sources."tslib-1.14.1" sources."type-fest-0.21.3" - sources."typescript-4.6.4" + sources."typescript-4.7.4" sources."universalify-2.0.0" + sources."update-browserslist-db-1.0.5" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."watchpack-2.4.0" sources."wcwidth-1.0.1" - sources."webpack-5.72.1" + sources."webpack-5.73.0" sources."webpack-node-externals-3.0.0" sources."webpack-sources-3.2.3" sources."which-2.0.2" sources."windows-release-4.0.0" + sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."yallist-4.0.0" sources."yaml-1.10.2" + sources."yargs-parser-21.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -78699,7 +79271,7 @@ in sources."buffer-5.7.1" sources."chalk-4.1.2" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -78711,7 +79283,7 @@ in sources."is-interactive-1.0.0" sources."is-unicode-supported-0.1.0" sources."json5-2.2.1" - sources."kleur-4.1.4" + sources."kleur-4.1.5" sources."log-symbols-4.1.0" sources."mimic-fn-2.1.0" sources."onetime-5.1.2" @@ -78815,10 +79387,10 @@ in "@tailwindcss/typography" = nodeEnv.buildNodePackage { name = "_at_tailwindcss_slash_typography"; packageName = "@tailwindcss/typography"; - version = "0.5.2"; + version = "0.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.2.tgz"; - sha512 = "coq8DBABRPFcVhVIk6IbKyyHUt7YTEC/C992tatFB+yEx5WGBQrCgsSFjxHUr8AWXphWckadVJbominEduYBqw=="; + url = "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.4.tgz"; + sha512 = "QEdg40EmGvE7kKoDei8zr5sf4D1pIayHj4R31bH3lX8x2BtTiR+jNejYPOkhbmy3DXgkMF9jC8xqNiGFAuL9Sg=="; }; dependencies = [ sources."lodash.castarray-4.4.0" @@ -78838,10 +79410,10 @@ in "@uppy/companion" = nodeEnv.buildNodePackage { name = "_at_uppy_slash_companion"; packageName = "@uppy/companion"; - version = "3.6.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.6.0.tgz"; - sha512 = "7mb/ZoUUw10swgmHx2j2Lk1hZrrL5wm22uHBmCCkVMkEghjELRQYa8VDPCXE7ipmBrXBnDbkoVHxTEgZg6SXeg=="; + url = "https://registry.npmjs.org/@uppy/companion/-/companion-3.7.1.tgz"; + sha512 = "65SEw4rsjqE/9RFe5rMqjbO9Kcw+QCgPn7+FCQ5p4xHUzHFj0ZKKxvEow+ih9GAxZ+Fb0VHtbbYh9Pz9P3sLWw=="; }; dependencies = [ sources."@purest/config-1.0.1" @@ -78861,7 +79433,8 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1158.0" // { + sources."available-typed-arrays-1.0.5" + (sources."aws-sdk-2.1188.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -78869,7 +79442,11 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" - sources."basic-auth-2.0.1" + (sources."basic-auth-2.0.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."bcrypt-pbkdf-1.0.2" sources."bintrees-1.0.2" sources."body-parser-1.19.0" @@ -78890,7 +79467,11 @@ in sources."combined-stream-1.0.8" sources."common-tags-1.8.0" sources."connect-redis-4.0.3" - sources."content-disposition-0.5.3" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."content-type-1.0.4" sources."cookie-0.4.1" sources."cookie-parser-1.4.6" @@ -78915,6 +79496,8 @@ in sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" + sources."es-abstract-1.20.1" + sources."es-to-primitive-1.2.1" sources."escape-goat-3.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" @@ -78923,6 +79506,7 @@ in (sources."express-4.17.1" // { dependencies = [ sources."cookie-0.4.0" + sources."safe-buffer-5.1.2" ]; }) sources."express-interceptor-1.2.0" @@ -78944,34 +79528,59 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."finalhandler-1.1.2" + sources."for-each-0.3.3" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."function-bind-1.1.1" + sources."function.prototype.name-1.1.5" + sources."functions-have-names-1.2.3" sources."get-intrinsic-1.1.2" + sources."get-symbol-description-1.0.0" sources."getpass-0.1.7" sources."graceful-fs-4.2.10" (sources."grant-4.7.0" // { dependencies = [ - sources."qs-6.10.5" + sources."qs-6.11.0" ]; }) sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" + sources."has-bigints-1.0.2" sources."has-flag-3.0.0" sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" sources."helmet-4.6.0" - sources."http-errors-1.7.2" + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" - sources."inherits-2.0.3" + sources."inherits-2.0.4" + sources."internal-slot-1.0.3" sources."ipaddr.js-2.0.1" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.4" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" + sources."is-generator-function-1.0.10" sources."is-nan-1.3.2" + 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-typed-array-1.1.9" sources."is-typedarray-1.0.0" + sources."is-weakref-1.0.2" sources."isarray-1.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" @@ -79016,7 +79625,7 @@ in sources."mime-db-1.42.0" ]; }) - sources."moment-2.29.3" + sources."moment-2.29.4" sources."moment-timezone-0.5.34" (sources."morgan-1.10.0" // { dependencies = [ @@ -79031,6 +79640,7 @@ in sources."object-assign-4.1.1" sources."object-inspect-1.12.2" sources."object-keys-1.1.1" + sources."object.assign-4.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."parseurl-1.3.3" @@ -79043,7 +79653,7 @@ in sources."ipaddr.js-1.9.1" ]; }) - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-1.3.2" sources."purest-3.1.0" sources."qs-6.7.0" @@ -79057,6 +79667,7 @@ in sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" + sources."regexp.prototype.flags-1.4.3" (sources."request-2.88.2" // { dependencies = [ sources."oauth-sign-0.9.0" @@ -79072,7 +79683,7 @@ in }) sources."requires-port-1.0.0" sources."retry-0.10.1" - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."semver-6.3.0" @@ -79089,6 +79700,8 @@ in sources."sorted-array-functions-1.3.0" sources."sshpk-1.17.0" sources."statuses-1.5.0" + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" sources."supports-color-5.5.0" sources."tdigest-0.1.2" sources."toidentifier-1.0.0" @@ -79102,6 +79715,7 @@ in sources."tweetnacl-0.14.5" sources."type-is-1.6.18" sources."uid-safe-2.1.5" + sources."unbox-primitive-1.0.2" sources."unpipe-1.0.0" (sources."uri-js-4.4.1" // { dependencies = [ @@ -79111,11 +79725,14 @@ in sources."url-0.10.3" sources."url-parse-1.5.10" sources."url-value-parser-2.1.0" + sources."util-0.12.4" sources."utils-merge-1.0.1" sources."uuid-8.1.0" sources."validator-12.2.0" sources."vary-1.1.2" sources."verror-1.10.0" + sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.8" sources."ws-6.2.2" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -79133,68 +79750,80 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "5.0.6"; + version = "5.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-5.0.6.tgz"; - sha512 = "iWvWCupn/bM+qxjYUo2vYcMu2KUARfMSqA2Zl1wC6e+BsMu2Qr2GdV6dpaGwCJrsYPfdmc2zOXTwCdPLede2vQ=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-5.0.8.tgz"; + sha512 = "c/QKPdC09bYkW22m/boXkLaiz10z0Z2WHZO7zEeNdfSduqyWINZhKc6hVQU3Vk0NXW7BJAd7zWmcUrC8L9TuAA=="; }; dependencies = [ sources."@achrinza/node-ipc-9.2.5" sources."@akryum/winattr-3.0.0" sources."@ampproject/remapping-2.2.0" - (sources."@apollo/protobufjs-1.2.2" // { + (sources."@apollo/protobufjs-1.2.4" // { dependencies = [ sources."@types/node-10.17.60" ]; }) + sources."@apollo/utils.dropunuseddefinitions-1.1.0" + (sources."@apollo/utils.keyvaluecache-1.0.1" // { + dependencies = [ + sources."lru-cache-7.13.2" + ]; + }) + sources."@apollo/utils.logger-1.0.0" + sources."@apollo/utils.printwithreducedwhitespace-1.1.0" + sources."@apollo/utils.removealiases-1.0.0" + sources."@apollo/utils.sortast-1.1.0" + sources."@apollo/utils.stripsensitiveliterals-1.2.0" + sources."@apollo/utils.usagereporting-1.0.0" sources."@apollographql/apollo-tools-0.5.4" - sources."@apollographql/graphql-playground-html-1.6.27" - sources."@apollographql/graphql-upload-8-fork-8.1.3" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - (sources."@babel/core-7.18.5" // { + sources."@apollographql/graphql-playground-html-1.6.29" + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + (sources."@babel/core-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.2" // { + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.18.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.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.0" - sources."@babel/helper-create-regexp-features-plugin-7.17.12" - (sources."@babel/helper-define-polyfill-provider-0.3.1" // { + sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-regexp-features-plugin-7.18.6" + (sources."@babel/helper-define-polyfill-provider-0.3.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-explode-assignable-expression-7.16.7" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.17.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-remap-async-to-generator-7.16.8" - sources."@babel/helper-replace-supers-7.18.2" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.18.2" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-explode-assignable-expression-7.18.6" + sources."@babel/helper-function-name-7.18.9" + 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.18.9" + sources."@babel/helper-optimise-call-expression-7.18.6" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-remap-async-to-generator-7.18.9" + sources."@babel/helper-replace-supers-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helper-wrap-function-7.18.10" + sources."@babel/helpers-7.18.9" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -79204,31 +79833,31 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.18.5" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-async-generator-functions-7.17.12" - sources."@babel/plugin-proposal-class-properties-7.17.12" - sources."@babel/plugin-proposal-class-static-block-7.18.0" - sources."@babel/plugin-proposal-dynamic-import-7.16.7" - sources."@babel/plugin-proposal-export-namespace-from-7.17.12" - sources."@babel/plugin-proposal-json-strings-7.17.12" - sources."@babel/plugin-proposal-logical-assignment-operators-7.17.12" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" - sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.18.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" - sources."@babel/plugin-proposal-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-private-methods-7.17.12" - sources."@babel/plugin-proposal-private-property-in-object-7.17.12" - sources."@babel/plugin-proposal-unicode-property-regex-7.17.12" + sources."@babel/parser-7.18.10" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-async-generator-functions-7.18.10" + sources."@babel/plugin-proposal-class-properties-7.18.6" + sources."@babel/plugin-proposal-class-static-block-7.18.6" + sources."@babel/plugin-proposal-dynamic-import-7.18.6" + sources."@babel/plugin-proposal-export-namespace-from-7.18.9" + sources."@babel/plugin-proposal-json-strings-7.18.6" + sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" + sources."@babel/plugin-proposal-numeric-separator-7.18.6" + sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-private-methods-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.17.12" - sources."@babel/plugin-syntax-import-assertions-7.17.12" + sources."@babel/plugin-syntax-flow-7.18.6" + sources."@babel/plugin-syntax-import-assertions-7.18.6" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" @@ -79238,68 +79867,72 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.17.12" - sources."@babel/plugin-transform-arrow-functions-7.17.12" - sources."@babel/plugin-transform-async-to-generator-7.17.12" - sources."@babel/plugin-transform-block-scoped-functions-7.16.7" - sources."@babel/plugin-transform-block-scoping-7.18.4" - sources."@babel/plugin-transform-classes-7.18.4" - sources."@babel/plugin-transform-computed-properties-7.17.12" - sources."@babel/plugin-transform-destructuring-7.18.0" - sources."@babel/plugin-transform-dotall-regex-7.16.7" - sources."@babel/plugin-transform-duplicate-keys-7.17.12" - sources."@babel/plugin-transform-exponentiation-operator-7.16.7" - sources."@babel/plugin-transform-flow-strip-types-7.17.12" - sources."@babel/plugin-transform-for-of-7.18.1" - sources."@babel/plugin-transform-function-name-7.16.7" - sources."@babel/plugin-transform-literals-7.17.12" - sources."@babel/plugin-transform-member-expression-literals-7.16.7" - sources."@babel/plugin-transform-modules-amd-7.18.0" - sources."@babel/plugin-transform-modules-commonjs-7.18.2" - sources."@babel/plugin-transform-modules-systemjs-7.18.5" - sources."@babel/plugin-transform-modules-umd-7.18.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.12" - sources."@babel/plugin-transform-new-target-7.18.5" - sources."@babel/plugin-transform-object-super-7.16.7" - sources."@babel/plugin-transform-parameters-7.17.12" - sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-regenerator-7.18.0" - sources."@babel/plugin-transform-reserved-words-7.17.12" - sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/plugin-transform-spread-7.17.12" - sources."@babel/plugin-transform-sticky-regex-7.16.7" - sources."@babel/plugin-transform-template-literals-7.18.2" - sources."@babel/plugin-transform-typeof-symbol-7.17.12" - sources."@babel/plugin-transform-typescript-7.18.4" - sources."@babel/plugin-transform-unicode-escapes-7.16.7" - sources."@babel/plugin-transform-unicode-regex-7.16.7" - (sources."@babel/preset-env-7.18.2" // { + sources."@babel/plugin-syntax-typescript-7.18.6" + sources."@babel/plugin-transform-arrow-functions-7.18.6" + sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-block-scoped-functions-7.18.6" + sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-classes-7.18.9" + sources."@babel/plugin-transform-computed-properties-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.9" + 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.18.9" + sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-function-name-7.18.9" + sources."@babel/plugin-transform-literals-7.18.9" + sources."@babel/plugin-transform-member-expression-literals-7.18.6" + sources."@babel/plugin-transform-modules-amd-7.18.6" + sources."@babel/plugin-transform-modules-commonjs-7.18.6" + sources."@babel/plugin-transform-modules-systemjs-7.18.9" + sources."@babel/plugin-transform-modules-umd-7.18.6" + sources."@babel/plugin-transform-named-capturing-groups-regex-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.18.8" + sources."@babel/plugin-transform-property-literals-7.18.6" + sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-reserved-words-7.18.6" + sources."@babel/plugin-transform-shorthand-properties-7.18.6" + sources."@babel/plugin-transform-spread-7.18.9" + 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.18.10" + sources."@babel/plugin-transform-unicode-escapes-7.18.10" + sources."@babel/plugin-transform-unicode-regex-7.18.6" + (sources."@babel/preset-env-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/preset-flow-7.17.12" + sources."@babel/preset-flow-7.18.6" sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-7.17.12" - (sources."@babel/register-7.17.7" // { + sources."@babel/preset-typescript-7.18.6" + (sources."@babel/register-7.18.9" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.18.3" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/runtime-7.18.9" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" + sources."@graphql-tools/merge-8.3.1" + sources."@graphql-tools/mock-8.7.1" + sources."@graphql-tools/schema-8.5.1" + sources."@graphql-tools/utils-8.9.0" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@josephg/resolvable-1.0.1" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + 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.14" sources."@node-ipc/js-queue-2.0.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -79319,17 +79952,12 @@ in sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-0.7.0" sources."@types/accepts-1.3.5" - sources."@types/body-parser-1.19.0" + sources."@types/body-parser-1.19.2" sources."@types/connect-3.4.35" - sources."@types/content-disposition-0.5.5" - sources."@types/cookies-0.7.7" - sources."@types/cors-2.8.10" + sources."@types/cors-2.8.12" sources."@types/ejs-3.1.1" sources."@types/express-4.17.13" sources."@types/express-serve-static-core-4.17.29" - sources."@types/fs-capacitor-2.0.0" - sources."@types/http-assert-1.5.3" - sources."@types/http-errors-1.8.2" sources."@types/inquirer-8.2.1" (sources."@types/jscodeshift-0.7.2" // { dependencies = [ @@ -79337,34 +79965,26 @@ in sources."recast-0.17.2" ]; }) - sources."@types/keygrip-1.0.2" - sources."@types/koa-2.13.4" - sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.2" - sources."@types/mime-1.3.2" - sources."@types/node-18.0.0" + sources."@types/mime-3.0.0" + sources."@types/node-18.6.3" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/serve-static-1.13.10" + sources."@types/serve-static-1.15.0" sources."@types/through-0.0.30" - sources."@types/ws-7.4.7" - sources."@vue/cli-shared-utils-5.0.6" - (sources."@vue/cli-ui-5.0.6" // { + sources."@vue/cli-shared-utils-5.0.8" + (sources."@vue/cli-ui-5.0.8" // { dependencies = [ sources."clone-2.1.2" ]; }) - sources."@vue/cli-ui-addon-webpack-5.0.6" - sources."@vue/cli-ui-addon-widgets-5.0.6" + sources."@vue/cli-ui-addon-webpack-5.0.8" + sources."@vue/cli-ui-addon-widgets-5.0.8" sources."@vue/compiler-core-3.2.37" sources."@vue/compiler-dom-3.2.37" + sources."@vue/compiler-sfc-2.7.8" sources."@vue/shared-3.2.37" - (sources."@wry/equality-0.1.11" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) sources."accepts-1.3.8" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" @@ -79375,28 +79995,14 @@ in }) sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."apollo-cache-control-0.14.0" - sources."apollo-datasource-0.9.0" - sources."apollo-graphql-0.9.7" - (sources."apollo-link-1.2.14" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) - sources."apollo-reporting-protobuf-0.8.0" - sources."apollo-server-caching-0.7.0" - sources."apollo-server-core-2.25.4" - sources."apollo-server-env-3.1.0" - sources."apollo-server-errors-2.5.0" - sources."apollo-server-express-2.25.4" - sources."apollo-server-plugin-base-0.13.0" - sources."apollo-server-types-0.9.0" - sources."apollo-tracing-0.15.0" - (sources."apollo-utilities-1.3.4" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) + sources."apollo-datasource-3.3.2" + sources."apollo-reporting-protobuf-3.3.2" + sources."apollo-server-core-3.10.0" + sources."apollo-server-env-4.2.1" + sources."apollo-server-errors-3.3.1" + sources."apollo-server-express-3.10.0" + sources."apollo-server-plugin-base-3.6.2" + sources."apollo-server-types-3.6.2" (sources."archive-type-4.0.0" // { dependencies = [ sources."file-type-4.4.0" @@ -79409,7 +80015,6 @@ in sources."array-flatten-1.1.1" sources."array-union-2.1.0" sources."array-unique-0.3.2" - sources."array.prototype.reduce-1.0.4" sources."arrify-2.0.1" sources."assign-symbols-1.0.0" sources."ast-types-0.14.2" @@ -79419,13 +80024,13 @@ in sources."atob-2.1.2" sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" - (sources."babel-plugin-polyfill-corejs2-0.3.1" // { + (sources."babel-plugin-polyfill-corejs2-0.3.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.2" - sources."babel-plugin-polyfill-regenerator-0.3.1" + sources."babel-plugin-polyfill-corejs3-0.5.3" + sources."babel-plugin-polyfill-regenerator-0.4.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -79438,9 +80043,6 @@ in (sources."body-parser-1.20.0" // { dependencies = [ sources."debug-2.6.9" - sources."depd-2.0.0" - sources."http-errors-2.0.0" - sources."statuses-2.0.1" ]; }) (sources."boxen-5.1.2" // { @@ -79450,7 +80052,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -79458,7 +80060,6 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" sources."builtins-1.0.3" - sources."busboy-0.3.1" sources."bytes-3.1.2" sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { @@ -79469,7 +80070,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" sources."caw-2.0.1" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -79493,7 +80094,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" @@ -79522,12 +80123,11 @@ in sources."cookie-0.5.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.23.2" // { + (sources."core-js-compat-3.24.1" // { dependencies = [ sources."semver-7.0.0" ]; }) - sources."core-js-pure-3.23.2" sources."core-util-is-1.0.3" sources."cors-2.8.5" (sources."cross-spawn-6.0.5" // { @@ -79536,6 +80136,7 @@ in ]; }) sources."cssfilter-0.0.10" + sources."csstype-3.1.0" (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" @@ -79575,10 +80176,8 @@ in sources."define-lazy-prop-2.0.0" sources."define-properties-1.1.4" sources."define-property-2.0.2" - sources."depd-1.1.2" - sources."deprecated-decorator-0.1.6" + sources."depd-2.0.0" sources."destroy-1.2.0" - sources."dicer-0.3.0" sources."dir-glob-3.0.1" (sources."download-7.1.0" // { dependencies = [ @@ -79586,20 +80185,17 @@ in ]; }) sources."download-git-repo-3.0.2" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."easy-stack-1.0.1" sources."ee-first-1.1.1" sources."ejs-3.1.8" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."envinfo-7.8.1" sources."error-ex-1.3.2" - sources."es-abstract-1.20.1" - sources."es-array-method-boxes-properly-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" @@ -79632,9 +80228,6 @@ in (sources."express-4.18.1" // { dependencies = [ sources."debug-2.6.9" - sources."depd-2.0.0" - sources."http-errors-2.0.0" - sources."statuses-2.0.1" ]; }) sources."express-history-api-fallback-2.2.1" @@ -79670,7 +80263,6 @@ in (sources."finalhandler-1.2.0" // { dependencies = [ sources."debug-2.6.9" - sources."statuses-2.0.1" ]; }) (sources."find-cache-dir-2.1.0" // { @@ -79700,8 +80292,7 @@ in sources."which-2.0.2" ]; }) - sources."flow-parser-0.180.1" - sources."for-each-0.3.3" + sources."flow-parser-0.184.0" sources."for-in-1.0.2" sources."forwarded-0.2.0" sources."fragment-cache-0.2.1" @@ -79713,20 +80304,16 @@ in sources."string_decoder-1.1.1" ]; }) - sources."fs-capacitor-2.0.4" sources."fs-constants-1.0.0" sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" sources."fswin-2.17.1227" sources."function-bind-1.1.1" - sources."function.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.2" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" - sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."git-clone-0.1.0" sources."git-config-path-2.0.0" @@ -79746,24 +80333,16 @@ in }) sources."graceful-fs-4.2.10" sources."graphql-15.8.0" - sources."graphql-extensions-0.15.0" sources."graphql-subscriptions-1.2.1" sources."graphql-tag-2.12.6" - (sources."graphql-tools-4.0.8" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) sources."graphql-type-json-0.3.2" sources."growly-1.3.0" 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-symbol-support-x-1.4.2" sources."has-symbols-1.0.3" sources."has-to-string-tag-x-1.4.1" - sources."has-tostringtag-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -79777,7 +80356,7 @@ in }) sources."hosted-git-info-2.8.9" sources."http-cache-semantics-3.8.1" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" @@ -79789,18 +80368,13 @@ in sources."inherits-2.0.4" sources."ini-2.0.0" sources."inquirer-8.2.4" - sources."internal-slot-1.0.3" sources."into-stream-3.1.0" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.2.4" sources."is-core-module-2.9.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.5" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" sources."is-extendable-0.1.1" @@ -79809,21 +80383,14 @@ in sources."is-glob-4.0.3" sources."is-interactive-1.0.0" sources."is-natural-number-4.0.1" - sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" - sources."is-number-object-1.0.7" sources."is-object-1.0.2" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" - sources."is-regex-1.1.4" sources."is-retry-allowed-1.2.0" - sources."is-shared-array-buffer-1.0.2" sources."is-stream-1.1.0" - sources."is-string-1.0.7" - sources."is-symbol-1.0.4" sources."is-unicode-supported-0.1.0" - sources."is-weakref-1.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -79918,7 +80485,7 @@ in sources."which-2.0.2" ]; }) - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -79947,10 +80514,8 @@ in }) sources."object-inspect-1.12.2" sources."object-keys-1.1.1" - sources."object-path-0.11.8" sources."object-visit-1.0.1" sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.4" sources."object.pick-1.3.0" sources."on-finished-2.4.1" sources."once-1.4.0" @@ -80008,6 +80573,11 @@ in ]; }) sources."posix-character-classes-0.1.1" + (sources."postcss-8.4.14" // { + dependencies = [ + sources."nanoid-3.3.4" + ]; + }) sources."prepend-http-2.0.0" sources."prismjs-1.28.0" sources."private-0.1.8" @@ -80025,13 +80595,7 @@ 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" // { - dependencies = [ - sources."depd-2.0.0" - sources."http-errors-2.0.0" - sources."statuses-2.0.1" - ]; - }) + sources."raw-body-2.5.1" sources."read-pkg-5.2.0" sources."readable-stream-3.6.0" sources."recast-0.20.5" @@ -80040,8 +80604,7 @@ in sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" - sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.0.1" + sources."regexpu-core-5.1.0" sources."regjsgen-0.6.0" (sources."regjsparser-0.8.4" // { dependencies = [ @@ -80062,7 +80625,7 @@ in sources."rss-parser-3.12.0" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -80080,10 +80643,7 @@ in sources."ms-2.0.0" ]; }) - sources."depd-2.0.0" - sources."http-errors-2.0.0" sources."ms-2.1.3" - sources."statuses-2.0.1" ]; }) sources."serve-static-1.15.0" @@ -80136,6 +80696,7 @@ in sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" + sources."source-map-js-1.0.2" sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.21" sources."source-map-url-0.4.1" @@ -80162,20 +80723,17 @@ in sources."kind-of-5.1.0" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."steno-0.4.4" - sources."streamsearch-0.1.2" sources."strict-uri-encode-1.1.0" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."strip-dirs-2.1.0" sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" sources."strip-outer-1.0.1" - sources."subscriptions-transport-ws-0.9.19" + sources."subscriptions-transport-ws-0.11.0" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-observable-1.2.0" @@ -80222,17 +80780,11 @@ in sources."toidentifier-1.0.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" - (sources."ts-invariant-0.4.4" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) sources."tslib-2.4.0" sources."tunnel-agent-0.6.0" sources."type-fest-0.6.0" sources."type-is-1.6.18" sources."typescript-4.5.5" - sources."unbox-primitive-1.0.2" sources."unbzip2-stream-1.4.3" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" @@ -80251,18 +80803,19 @@ in sources."has-values-0.1.4" ]; }) + sources."update-browserslist-db-1.0.5" sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."util.promisify-1.1.1" sources."utils-merge-1.0.1" sources."uuid-8.3.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" + sources."value-or-promise-1.0.11" sources."vary-1.1.2" - sources."vue-2.6.14" + sources."vue-2.7.8" (sources."vue-codemod-0.0.5" // { dependencies = [ sources."inquirer-7.3.3" @@ -80272,14 +80825,14 @@ in }) sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" + sources."whatwg-mimetype-3.0.0" sources."whatwg-url-5.0.0" sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" (sources."xss-1.0.13" // { @@ -80301,12 +80854,6 @@ in sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" sources."yocto-queue-0.1.0" - sources."zen-observable-0.8.15" - (sources."zen-observable-ts-0.8.21" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) ]; buildInputs = globalBuildInputs; meta = { @@ -80318,7 +80865,7 @@ in bypassCache = true; reconstructLock = true; }; - "@webassemblyjs/cli" = nodeEnv.buildNodePackage { + "@webassemblyjs/cli-1.11.1" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_cli"; packageName = "@webassemblyjs/cli"; version = "1.11.1"; @@ -80357,7 +80904,7 @@ in bypassCache = true; reconstructLock = true; }; - "@webassemblyjs/repl" = nodeEnv.buildNodePackage { + "@webassemblyjs/repl-1.11.1" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_repl"; packageName = "@webassemblyjs/repl"; version = "1.11.1"; @@ -80433,7 +80980,7 @@ in bypassCache = true; reconstructLock = true; }; - "@webassemblyjs/wasm-text-gen" = nodeEnv.buildNodePackage { + "@webassemblyjs/wasm-text-gen-1.11.1" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wasm-text-gen"; packageName = "@webassemblyjs/wasm-text-gen"; version = "1.11.1"; @@ -80442,18 +80989,19 @@ in sha512 = "7SWOLN+1eZ5e9gohQPVdA8XQstGIYei/70T5kmLP6vC41zy8BBYNt35OgLZmbpg3iOQ1vWT17ZMhVikSJySSRg=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/generator-7.18.2" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/template-7.16.7" - sources."@babel/types-7.18.4" - sources."@jridgewell/gen-mapping-0.3.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + sources."@babel/code-frame-7.18.6" + sources."@babel/generator-7.18.10" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/template-7.18.10" + sources."@babel/types-7.18.10" + 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.14" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -80487,7 +81035,7 @@ in bypassCache = true; reconstructLock = true; }; - "@webassemblyjs/wast-refmt" = nodeEnv.buildNodePackage { + "@webassemblyjs/wast-refmt-1.11.1" = nodeEnv.buildNodePackage { name = "_at_webassemblyjs_slash_wast-refmt"; packageName = "@webassemblyjs/wast-refmt"; version = "1.11.1"; @@ -80526,16 +81074,16 @@ in sha512 = "yTKA5M514WOTpZZkK6pusBbtvVbNTavKS3nI4Z9ceH7RdNGII9S8p8mrcA38S8T0QGxp+EK3l/61XLBj0LTdhQ=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/acorn-4.0.6" sources."@types/concat-stream-2.0.0" sources."@types/debug-4.1.7" - sources."@types/estree-0.0.51" - sources."@types/estree-jsx-0.0.1" + sources."@types/estree-1.0.0" + sources."@types/estree-jsx-1.0.0" sources."@types/hast-2.3.4" sources."@types/is-empty-1.2.1" sources."@types/js-yaml-4.0.5" @@ -80548,7 +81096,7 @@ in sources."@types/parse5-6.0.3" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-jsx-5.3.2" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" @@ -80584,13 +81132,13 @@ in sources."camelcase-keys-7.0.2" sources."ccount-2.0.1" sources."chalk-2.4.2" - sources."character-entities-2.0.1" + sources."character-entities-2.0.2" sources."character-entities-html4-2.1.0" sources."character-entities-legacy-3.0.0" sources."character-reference-invalid-2.0.1" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."comma-separated-tokens-2.0.2" @@ -80617,11 +81165,11 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."dequal-2.0.2" + sources."dequal-2.0.3" sources."diff-5.1.0" sources."dot-prop-5.3.0" sources."duplexer-0.1.2" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -80629,7 +81177,7 @@ in sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."estree-util-is-identifier-name-2.0.1" - sources."estree-util-visit-1.1.0" + sources."estree-util-visit-1.2.0" sources."event-stream-3.1.7" sources."extend-3.0.2" sources."fault-2.0.1" @@ -80703,7 +81251,7 @@ in sources."json-parse-even-better-errors-2.3.1" sources."keyv-3.1.0" sources."kind-of-6.0.3" - sources."kleur-4.1.4" + sources."kleur-4.1.5" sources."latest-version-5.1.0" (sources."libnpmconfig-1.2.1" // { dependencies = [ @@ -80730,7 +81278,7 @@ in sources."map-stream-0.1.0" sources."markdown-table-3.0.2" sources."mdast-comment-marker-2.1.0" - (sources."mdast-util-find-and-replace-2.2.0" // { + (sources."mdast-util-find-and-replace-2.2.1" // { dependencies = [ sources."escape-string-regexp-5.0.0" ]; @@ -80744,13 +81292,17 @@ in sources."mdast-util-gfm-table-1.0.4" sources."mdast-util-gfm-task-list-item-1.0.1" sources."mdast-util-mdx-1.1.0" - sources."mdast-util-mdx-expression-1.2.1" - sources."mdast-util-mdx-jsx-1.2.0" - sources."mdast-util-mdxjs-esm-1.2.0" + sources."mdast-util-mdx-expression-1.3.0" + (sources."mdast-util-mdx-jsx-1.2.0" // { + dependencies = [ + sources."@types/estree-jsx-0.0.1" + ]; + }) + sources."mdast-util-mdxjs-esm-1.3.0" sources."mdast-util-to-markdown-1.3.0" sources."mdast-util-to-nlcst-5.2.1" sources."mdast-util-to-string-3.1.0" - sources."meow-10.1.2" + sources."meow-10.1.3" sources."micromark-3.0.10" sources."micromark-core-commonmark-1.0.6" sources."micromark-extension-frontmatter-1.0.0" @@ -80779,7 +81331,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.1.0" + sources."micromark-util-events-to-acorn-1.2.0" 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" @@ -80912,7 +81464,7 @@ in ]; }) sources."unified-diff-4.0.1" - (sources."unified-engine-9.1.0" // { + (sources."unified-engine-9.1.1" // { dependencies = [ sources."is-plain-obj-4.1.0" sources."lines-and-columns-2.0.3" @@ -80926,7 +81478,7 @@ in ]; }) sources."unique-string-2.0.0" - sources."unist-util-inspect-7.0.0" + sources."unist-util-inspect-7.0.1" sources."unist-util-is-5.1.1" sources."unist-util-modify-children-2.0.0" sources."unist-util-position-4.0.3" @@ -80948,7 +81500,7 @@ in }) sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" - sources."uvu-0.5.3" + sources."uvu-0.5.6" sources."validate-npm-package-license-3.0.4" sources."vfile-5.3.4" sources."vfile-find-up-6.0.0" @@ -81003,35 +81555,36 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - sources."@babel/core-7.18.5" - (sources."@babel/generator-7.18.2" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + sources."@babel/core-7.18.10" + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-compilation-targets-7.18.2" - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/helper-compilation-targets-7.18.9" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.18.9" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helpers-7.18.9" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + 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.14" sources."@xmldom/xmldom-0.8.2" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" @@ -81039,8 +81592,8 @@ in sources."async-3.2.4" sources."balanced-match-1.0.2" sources."brace-expansion-2.0.1" - sources."browserslist-4.20.4" - sources."caniuse-lite-1.0.30001358" + sources."browserslist-4.21.3" + sources."caniuse-lite-1.0.30001373" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -81050,7 +81603,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.4" sources."ejs-3.1.6" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -81108,7 +81661,7 @@ in }) sources."moment-2.29.1" sources."ms-2.1.2" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."node.extend-2.0.2" (sources."nomnom-1.8.1" // { dependencies = [ @@ -81131,6 +81684,7 @@ in sources."to-fast-properties-2.0.0" sources."underscore-1.6.0" sources."universalify-0.1.2" + sources."update-browserslist-db-1.0.5" sources."walk-sync-0.3.4" sources."which-1.3.1" sources."xml2js-0.2.8" @@ -81283,7 +81837,7 @@ in sources."path-is-absolute-1.0.1" sources."path-to-regexp-1.8.0" sources."performance-now-2.1.0" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."request-2.88.2" @@ -81327,7 +81881,7 @@ in }) sources."y18n-5.0.8" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" sources."ylru-1.3.2" ]; buildInputs = globalBuildInputs; @@ -81343,15 +81897,15 @@ in asar = nodeEnv.buildNodePackage { name = "asar"; packageName = "asar"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/asar/-/asar-3.1.0.tgz"; - sha512 = "vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ=="; + url = "https://registry.npmjs.org/asar/-/asar-3.2.0.tgz"; + sha512 = "COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg=="; }; dependencies = [ sources."@types/glob-7.2.0" sources."@types/minimatch-3.0.5" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -81429,21 +81983,22 @@ in autoprefixer = nodeEnv.buildNodePackage { name = "autoprefixer"; packageName = "autoprefixer"; - version = "10.4.7"; + version = "10.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.7.tgz"; - sha512 = "ypHju4Y2Oav95SipEcCcI5J7CGPuvz8oat7sUtYj3ClK44bldfvtvcxK6IEK++7rqB7YchDGzweZIBG+SD0ZAA=="; + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.8.tgz"; + sha512 = "75Jr6Q/XpTqEf6D2ltS5uMewJIx5irCU1oBYJrWjFenq/m12WRRrz6g15L1EIoYvPLXTbEry7rDOwrcYNj77xw=="; }; dependencies = [ - sources."browserslist-4.20.4" - sources."caniuse-lite-1.0.30001358" - sources."electron-to-chromium-1.4.164" + sources."browserslist-4.21.3" + sources."caniuse-lite-1.0.30001373" + sources."electron-to-chromium-1.4.211" sources."escalade-3.1.1" sources."fraction.js-4.2.0" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-range-0.1.2" sources."picocolors-1.0.0" sources."postcss-value-parser-4.2.0" + sources."update-browserslist-db-1.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -81465,14 +82020,15 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.1158.0" // { + sources."available-typed-arrays-1.0.5" + (sources."aws-sdk-2.1188.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -81490,13 +82046,14 @@ in sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."bytes-3.1.2" + sources."call-bind-1.0.2" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" sources."chownr-1.1.4" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" sources."clone-1.0.4" sources."color-convert-2.0.1" @@ -81510,6 +82067,7 @@ in sources."debug-4.3.4" sources."deep-is-0.1.4" sources."defaults-1.0.3" + sources."define-properties-1.1.4" sources."degenerator-2.2.0" sources."depd-2.0.0" sources."devtools-protocol-0.0.901419" @@ -81520,6 +82078,8 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" + sources."es-abstract-1.20.1" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."escodegen-1.14.3" sources."esprima-4.0.1" @@ -81533,6 +82093,7 @@ in sources."figures-3.2.0" sources."file-uri-to-path-2.0.0" sources."find-up-4.1.0" + sources."for-each-0.3.3" sources."fs-constants-1.0.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" @@ -81543,11 +82104,21 @@ in sources."string_decoder-0.10.31" ]; }) + 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.2" sources."get-stream-5.2.0" + sources."get-symbol-description-1.0.0" sources."get-uri-3.0.2" sources."glob-7.2.3" 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."htmlparser2-6.1.0" sources."http-errors-2.0.0" sources."http-proxy-agent-4.0.1" @@ -81558,10 +82129,25 @@ in sources."inherits-2.0.4" sources."ini-2.0.0" sources."inquirer-8.2.4" + sources."internal-slot-1.0.3" sources."ip-1.1.8" + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.4" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-fullwidth-code-point-3.0.0" + sources."is-generator-function-1.0.10" sources."is-interactive-1.0.0" + 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-typed-array-1.1.9" sources."is-unicode-supported-0.1.0" + sources."is-weakref-1.0.2" sources."isarray-1.0.0" sources."jmespath-0.16.0" sources."jsonfile-4.0.0" @@ -81579,6 +82165,9 @@ in sources."netmask-2.0.2" sources."node-fetch-2.6.1" sources."nth-check-2.1.1" + sources."object-inspect-1.12.2" + sources."object-keys-1.1.1" + sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" @@ -81610,21 +82199,29 @@ in sources."querystring-0.2.0" sources."raw-body-2.5.1" sources."readable-stream-3.6.0" + sources."regexp.prototype.flags-1.4.3" sources."restore-cursor-3.1.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."setprototypeof-1.2.0" + sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + (sources."socks-2.7.0" // { + dependencies = [ + sources."ip-2.0.0" + ]; + }) sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."statuses-2.0.1" sources."string-width-4.2.3" + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" @@ -81640,6 +82237,7 @@ in sources."tslib-2.4.0" sources."type-check-0.3.2" sources."type-fest-0.21.3" + sources."unbox-primitive-1.0.2" (sources."unbzip2-stream-1.3.3" // { dependencies = [ sources."buffer-5.7.1" @@ -81648,9 +82246,12 @@ in sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."url-0.10.3" + sources."util-0.12.4" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."wcwidth-1.0.1" + sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.8" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" @@ -81674,10 +82275,10 @@ in aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; - version = "2.28.1"; + version = "2.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.28.1.tgz"; - sha512 = "0Kklrj9HHg6HkYZQuTnJ+2+RLTqlVcxECUmlDudBxbPxJQcc5pEA9stfo8wwh1CtoWYuF4A4moP7B19Yvw4nJg=="; + url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.35.0.tgz"; + sha512 = "H8S/tEfnqeHq5aqKHXhZjSm3ck472Nwnw6CJYkzHg5tsV6KB5EludP18SYb1h9pu8ZGWmBQ8vJ82yK9XXxFQvw=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -81701,9 +82302,9 @@ in sha512 = "Jc5aV6fjaAnx5Rmgk26lSUAreSU4UAFrRdedTYK1x2yXB5348X5bHN7J0xUf70AUw5ujloYVkZPCw4mwuVXllg=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -81719,7 +82320,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/eslint-7.29.0" - sources."@types/estree-0.0.51" + sources."@types/estree-1.0.0" sources."@types/json-schema-7.0.11" sources."@types/mdast-3.0.10" sources."@types/minimist-1.2.2" @@ -81760,9 +82361,9 @@ in sources."character-reference-invalid-1.1.4" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."clone-1.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."co-3.1.0" sources."collapse-white-space-1.0.6" sources."color-convert-2.0.1" @@ -81786,7 +82387,7 @@ in ]; }) sources."dir-glob-3.0.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."emoji-regex-9.2.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -82113,10 +82714,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "12.13.2"; + version = "12.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.13.2.tgz"; - sha512 = "B0npHfggvMlrBadnd/FZSX+dOT/GsgoNkOzLQsmt5J/qJxg/tqE0Z0bUhTJkWmNCkfE7/1ZgacWvPUD1t6BRyw=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-12.16.3.tgz"; + sha512 = "bBflCYO0qYFiFcWnZ5CjcQq/Fyx9OEUwa8nKWVTmDyK9rDZOnSA39d5kukXcrmnyVoWP8xBtoJ5rdzpl4FolCA=="; }; dependencies = [ (sources."@alexbosworth/caporal-1.4.4" // { @@ -82142,7 +82743,7 @@ in }) sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@grammyjs/types-2.8.0" + sources."@grammyjs/types-2.8.2" sources."@grpc/grpc-js-1.6.7" sources."@grpc/proto-loader-0.6.13" sources."@handsontable/formulajs-2.0.2" @@ -82158,20 +82759,18 @@ 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."@types/body-parser-1.19.2" sources."@types/caseless-0.12.2" sources."@types/connect-3.4.35" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.29" + sources."@types/express-serve-static-core-4.17.30" sources."@types/long-4.0.2" - sources."@types/mime-1.3.2" - sources."@types/node-18.0.0" + sources."@types/mime-3.0.0" + sources."@types/node-18.6.3" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" sources."@types/request-2.48.8" - sources."@types/serve-static-1.13.10" + sources."@types/serve-static-1.15.0" sources."@types/tough-cookie-4.0.2" sources."@types/ws-8.5.3" sources."abort-controller-3.0.0" @@ -82184,7 +82783,6 @@ in }) sources."ajv-8.11.0" sources."ansi-0.3.1" - sources."ansi-align-3.0.1" sources."ansi-escapes-1.4.0" sources."ansi-regex-5.0.1" sources."ansi-styles-2.2.1" @@ -82205,8 +82803,8 @@ in sources."bip66-1.1.5" sources."bip68-1.0.4" sources."bitcoin-ops-1.4.1" - sources."bitcoinjs-lib-6.0.1" - (sources."bl-4.1.0" // { + sources."bitcoinjs-lib-6.0.2" + (sources."bl-5.0.0" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -82215,32 +82813,19 @@ in sources."bn.js-5.2.1" sources."body-parser-1.20.0" sources."bolt01-1.2.5" - sources."bolt03-1.2.14" + (sources."bolt03-1.2.14" // { + dependencies = [ + sources."bitcoinjs-lib-6.0.1" + ]; + }) sources."bolt07-1.8.2" sources."bolt09-0.2.3" - (sources."boxen-5.1.2" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."supports-color-7.2.0" - sources."type-fest-0.20.2" - ]; - }) sources."bs58-4.0.1" sources."bs58check-2.1.2" - sources."buffer-5.7.1" + sources."buffer-6.0.3" sources."buffer-from-1.1.2" sources."bytes-3.1.2" - (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."camelcase-6.3.0" sources."cbor-8.1.0" (sources."chalk-1.1.3" // { dependencies = [ @@ -82249,15 +82834,12 @@ in ]; }) sources."chardet-0.7.0" - sources."ci-info-2.0.0" sources."cipher-base-1.0.4" - sources."cli-boxes-2.2.1" sources."cli-cursor-1.0.2" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-width-2.2.1" sources."cliui-7.0.4" sources."clone-1.0.4" - sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."color-3.2.1" sources."color-convert-1.9.3" @@ -82269,7 +82851,6 @@ in sources."combined-stream-1.0.8" sources."commander-6.2.1" sources."concat-stream-1.6.2" - sources."configstore-5.0.1" (sources."content-disposition-0.5.4" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -82282,28 +82863,21 @@ in sources."cors-2.8.5" sources."create-hash-1.2.0" sources."crypto-js-4.1.1" - sources."crypto-random-string-2.0.0" - sources."csv-parse-5.2.0" + sources."csv-parse-5.3.0" sources."debug-2.6.9" - sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" sources."defaults-1.0.3" - sources."defer-to-connect-1.1.3" sources."define-property-1.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" - sources."dot-prop-5.3.0" - sources."duplexer3-0.1.4" + sources."eastasianwidth-0.2.0" sources."ecpair-2.0.1" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" - sources."end-of-stream-1.4.4" sources."escalade-3.1.1" - sources."escape-goat-2.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" @@ -82329,21 +82903,16 @@ in sources."gauge-1.2.7" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.2" - sources."get-stream-4.1.0" - (sources."global-dirs-3.0.0" // { - dependencies = [ - sources."ini-2.0.0" - ]; - }) (sources."goldengate-11.2.3" // { dependencies = [ + sources."bitcoinjs-lib-6.0.1" sources."colorette-2.0.17" + sources."ln-service-53.17.3" sources."ln-sync-3.12.2" + sources."psbt-2.6.0" ]; }) - sources."got-9.6.0" - sources."graceful-fs-4.2.10" - (sources."grammy-1.8.3" // { + (sources."grammy-1.9.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -82355,10 +82924,8 @@ in sources."ansi-regex-2.1.1" ]; }) - sources."has-flag-4.0.0" sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" - sources."has-yarn-2.1.0" (sources."hash-base-3.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -82366,99 +82933,99 @@ in ]; }) sources."hot-formula-parser-4.0.0" - sources."http-cache-semantics-4.1.0" sources."http-errors-2.0.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."import-lazy-4.0.0" - sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-3.0.0" - (sources."inquirer-8.2.4" // { + (sources."inquirer-9.0.2" // { dependencies = [ - sources."ansi-escapes-4.3.2" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."cli-cursor-3.1.0" - sources."cli-width-3.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."ansi-escapes-5.0.0" + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.1.0" + sources."chalk-5.0.1" + sources."cli-cursor-4.0.0" + sources."cli-width-4.0.0" + sources."emoji-regex-9.2.2" + sources."escape-string-regexp-5.0.0" sources."external-editor-3.1.0" - sources."figures-3.2.0" + sources."figures-4.0.1" sources."mute-stream-0.0.8" sources."onetime-5.1.2" - sources."restore-cursor-3.1.0" - sources."supports-color-7.2.0" + sources."restore-cursor-4.0.0" + sources."string-width-5.1.2" + sources."strip-ansi-7.0.1" sources."tmp-0.0.33" + sources."type-fest-1.4.0" + sources."wrap-ansi-8.0.1" ]; }) - (sources."invoices-2.0.6" // { + (sources."invoices-2.0.7" // { dependencies = [ - sources."bn.js-5.2.0" - sources."bolt07-1.8.1" + sources."bitcoinjs-lib-6.0.1" ]; }) - sources."ip-1.1.8" + sources."ip-2.0.0" sources."ipaddr.js-1.9.1" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.3.2" sources."is-buffer-1.1.6" - sources."is-ci-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-fullwidth-code-point-3.0.0" - sources."is-installed-globally-0.4.0" - sources."is-interactive-1.0.0" - sources."is-npm-5.0.0" + sources."is-interactive-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" sources."is-stream-2.0.1" - sources."is-typedarray-1.0.0" - sources."is-unicode-supported-0.1.0" - sources."is-yarn-global-0.3.0" + sources."is-unicode-supported-1.2.0" sources."isarray-1.0.0" - sources."json-buffer-3.0.0" sources."json-schema-traverse-1.0.0" sources."json2csv-5.0.7" sources."jsonparse-1.3.1" sources."jstat-1.9.5" - sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."kuler-2.0.0" - sources."latest-version-5.1.0" - (sources."lightning-5.16.0" // { + (sources."lightning-5.16.3" // { dependencies = [ - sources."@grpc/proto-loader-0.6.12" - sources."@types/node-17.0.33" - sources."async-3.2.3" - sources."asyncjs-util-1.2.9" - sources."bn.js-5.2.0" - sources."bolt07-1.8.1" - sources."psbt-2.0.1" - sources."type-fest-2.12.2" + sources."@types/node-17.0.41" + (sources."asyncjs-util-1.2.9" // { + dependencies = [ + sources."async-3.2.3" + ]; + }) + sources."bitcoinjs-lib-6.0.1" + sources."psbt-2.6.0" ]; }) (sources."ln-accounting-5.0.7" // { dependencies = [ sources."@grpc/proto-loader-0.6.12" - sources."@types/node-17.0.38" + sources."@types/node-17.0.33" sources."async-3.2.3" sources."asyncjs-util-1.2.9" + sources."bitcoinjs-lib-6.0.1" sources."bn.js-5.2.0" sources."bolt01-1.2.4" sources."bolt07-1.8.1" sources."colorette-2.0.16" sources."goldengate-11.2.2" + sources."invoices-2.0.6" + (sources."lightning-5.16.0" // { + dependencies = [ + sources."psbt-2.0.1" + ]; + }) (sources."ln-service-53.17.1" // { dependencies = [ + sources."@types/node-17.0.38" sources."bn.js-5.2.1" sources."lightning-5.16.1" sources."psbt-2.3.0" + sources."type-fest-2.13.0" sources."ws-8.7.0" ]; }) @@ -82474,104 +83041,30 @@ in sources."bn.js-5.2.1" ]; }) - sources."type-fest-2.13.0" + sources."type-fest-2.12.2" + sources."ws-8.6.0" ]; }) - (sources."ln-service-53.17.3" // { - dependencies = [ - sources."@types/node-17.0.41" - sources."async-3.2.3" - sources."asyncjs-util-1.2.9" - sources."invoices-2.0.7" - sources."lightning-5.16.3" - sources."type-fest-2.13.0" - sources."ws-8.8.0" - ]; - }) - (sources."ln-sync-3.13.0" // { + sources."ln-service-53.17.4" + sources."ln-sync-3.13.1" + (sources."ln-telegram-3.22.3" // { dependencies = [ + sources."bitcoinjs-lib-6.0.1" sources."colorette-2.0.17" - ]; - }) - (sources."ln-telegram-3.22.2" // { - dependencies = [ - (sources."@alexbosworth/fiat-1.0.2" // { + sources."debug-4.3.4" + sources."grammy-1.9.0" + (sources."ln-sync-3.13.0" // { dependencies = [ - sources."async-3.2.3" - sources."asyncjs-util-1.2.9" + sources."ln-service-53.17.3" ]; }) - sources."@grpc/proto-loader-0.6.12" - sources."@types/node-17.0.38" - sources."bn.js-5.2.0" - sources."colorette-2.0.16" - sources."invoices-2.0.7" - (sources."lightning-5.16.1" // { + sources."ms-2.1.2" + (sources."paid-services-3.16.3" // { dependencies = [ - sources."async-3.2.3" - sources."asyncjs-util-1.2.9" - (sources."bolt07-1.8.1" // { - dependencies = [ - sources."bn.js-5.2.0" - ]; - }) - (sources."invoices-2.0.6" // { - dependencies = [ - sources."bn.js-5.2.0" - ]; - }) + sources."ln-service-53.17.3" ]; }) - (sources."paid-services-3.16.2" // { - dependencies = [ - sources."@types/node-17.0.33" - (sources."asyncjs-util-1.2.9" // { - dependencies = [ - sources."async-3.2.3" - ]; - }) - (sources."goldengate-11.2.2" // { - dependencies = [ - sources."async-3.2.3" - (sources."bolt01-1.2.4" // { - dependencies = [ - sources."bn.js-5.2.0" - ]; - }) - (sources."bolt07-1.8.1" // { - dependencies = [ - sources."bn.js-5.2.0" - ]; - }) - (sources."invoices-2.0.6" // { - dependencies = [ - sources."bn.js-5.2.0" - ]; - }) - sources."ln-service-53.17.1" - sources."psbt-2.4.0" - ]; - }) - (sources."ln-sync-3.12.1" // { - dependencies = [ - sources."async-3.2.3" - sources."bolt07-1.8.1" - sources."invoices-2.0.6" - (sources."lightning-5.16.0" // { - dependencies = [ - sources."psbt-2.0.1" - ]; - }) - sources."ln-service-53.17.0" - sources."ws-8.6.0" - ]; - }) - sources."type-fest-2.12.2" - ]; - }) - sources."psbt-2.3.0" - sources."type-fest-2.13.0" - sources."ws-8.7.0" + sources."psbt-2.6.0" ]; }) sources."lodash-4.17.21" @@ -82583,30 +83076,19 @@ in sources."lodash.padstart-4.6.1" sources."lodash.truncate-4.4.2" sources."lodash.uniq-4.5.0" - (sources."log-symbols-4.1.0" // { + (sources."log-symbols-5.1.0" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."supports-color-7.2.0" + sources."chalk-5.0.1" ]; }) - (sources."logform-2.4.0" // { + (sources."logform-2.4.2" // { dependencies = [ sources."ms-2.1.3" ]; }) sources."long-4.0.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" sources."luxon-2.4.0" sources."macaroon-3.0.4" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) sources."md5.js-1.3.5" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -82616,10 +83098,9 @@ 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."minimist-1.2.6" sources."mkdirp-0.5.6" - sources."moment-2.29.3" + sources."moment-2.29.4" (sources."morgan-1.10.0" // { dependencies = [ sources."on-finished-2.3.0" @@ -82630,54 +83111,59 @@ in sources."negotiator-0.6.3" sources."node-fetch-2.6.7" sources."nofilter-3.1.0" - sources."normalize-url-4.5.1" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."object-inspect-1.12.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" - sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-1.1.0" - (sources."ora-5.4.1" // { + (sources."ora-6.1.2" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."cli-cursor-3.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."ansi-regex-6.0.1" + sources."chalk-5.0.1" + sources."cli-cursor-4.0.0" sources."onetime-5.1.2" - sources."restore-cursor-3.1.0" - sources."supports-color-7.2.0" + sources."restore-cursor-4.0.0" + sources."strip-ansi-7.0.1" ]; }) sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" - sources."p-cancelable-1.1.0" sources."p2tr-1.3.1" - (sources."package-json-6.5.0" // { + (sources."paid-services-3.19.1" // { dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."paid-services-3.16.3" // { - dependencies = [ - sources."invoices-2.0.7" + sources."bitcoinjs-lib-6.0.1" + sources."colorette-2.0.17" + sources."invoices-2.1.0" + (sources."ln-sync-3.13.0" // { + dependencies = [ + sources."invoices-2.0.7" + sources."ln-service-53.17.3" + sources."psbt-2.6.0" + ]; + }) + sources."psbt-2.7.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."prepend-http-2.0.0" (sources."probing-2.0.6" // { dependencies = [ sources."@grpc/proto-loader-0.6.12" sources."@types/node-17.0.38" sources."async-3.2.3" sources."asyncjs-util-1.2.9" + sources."bitcoinjs-lib-6.0.1" sources."bn.js-5.2.0" + (sources."invoices-2.0.6" // { + dependencies = [ + sources."bolt07-1.8.1" + ]; + }) (sources."lightning-5.16.1" // { dependencies = [ sources."bn.js-5.2.1" @@ -82698,49 +83184,32 @@ in sources."bn.js-5.2.1" ]; }) - sources."type-fest-2.13.0" sources."ws-8.7.0" ]; }) sources."process-nextick-args-2.0.1" sources."protobufjs-6.11.3" sources."proxy-addr-2.0.7" - sources."psbt-2.6.0" - sources."pump-3.0.0" + sources."psbt-2.7.1" sources."punycode-2.1.1" - sources."pupa-2.1.1" sources."pushdata-bitcoin-1.0.1" sources."qrcode-terminal-0.12.0" sources."qs-6.10.3" sources."randombytes-2.1.0" sources."range-parser-1.2.1" sources."raw-body-2.5.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) sources."readable-stream-2.3.7" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."responselike-1.0.2" sources."restore-cursor-1.0.1" sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.1.2" sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" sources."sanitize-filename-1.6.3" - sources."semver-7.3.7" - (sources."semver-diff-3.1.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" @@ -82761,7 +83230,7 @@ in ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + sources."socks-2.7.0" (sources."socks-proxy-agent-7.0.0" // { dependencies = [ sources."debug-4.3.4" @@ -82774,7 +83243,6 @@ in sources."string-width-4.2.3" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" - sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."table-6.8.0" (sources."tabtab-2.2.2" // { @@ -82791,7 +83259,6 @@ in sources."tiny-emitter-2.1.0" sources."tiny-secp256k1-2.2.1" sources."tmp-0.0.29" - sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.1" sources."tr46-0.0.3" sources."triple-beam-1.3.0" @@ -82799,26 +83266,13 @@ in sources."tslib-2.4.0" sources."tweetnacl-1.0.3" sources."tweetnacl-util-0.15.1" - sources."type-fest-0.21.3" + sources."type-fest-2.13.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" sources."uint8array-tools-0.0.7" - sources."unique-string-2.0.0" sources."unpipe-1.0.0" - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."import-lazy-2.1.0" - sources."supports-color-7.2.0" - ]; - }) sources."uri-js-4.4.1" - sources."url-parse-lax-3.0.0" sources."utf8-byte-length-1.0.4" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" @@ -82827,7 +83281,6 @@ in sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."widest-line-3.1.0" sources."wif-2.0.6" sources."window-size-1.1.1" (sources."winston-3.7.2" // { @@ -82847,12 +83300,8 @@ in sources."color-name-1.1.4" ]; }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."ws-8.6.0" - sources."xdg-basedir-4.0.0" + sources."ws-8.8.0" sources."y18n-5.0.8" - sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" ]; @@ -82869,10 +83318,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-3.0.4.tgz"; - sha512 = "LMaBSmXuPfPkMjOZzI9zEgiInEBE2Ok2p1/cnGOPW/sG07pVysweXkHaUy10dl+kof+x2kklZlAMMD5CluA5fQ=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-3.0.5.tgz"; + sha512 = "2rkjU29BL5ZjmLI6WZ/yiFO0duef0lOg0lnLqNGqt6xUDuxfgbRvV1JysLTOKWZt0yBL8W52V+2XisF1UnRcWA=="; }; dependencies = [ sources."ajv-6.12.6" @@ -82920,7 +83369,7 @@ in sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."performance-now-2.1.0" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."request-2.88.2" @@ -82938,11 +83387,11 @@ in sources."urijs-1.19.11" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."vscode-jsonrpc-8.0.1" + sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."web-tree-sitter-0.20.5" sources."wrappy-1.0.2" ]; @@ -83362,7 +83811,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."accepts-1.3.8" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -83520,12 +83969,12 @@ in sources."setprototypeof-1.2.0" (sources."socket.io-4.5.1" // { dependencies = [ - sources."socket.io-parser-4.0.4" + sources."socket.io-parser-4.0.5" ]; }) sources."socket.io-adapter-2.4.0" sources."socket.io-client-4.5.1" - sources."socket.io-parser-4.2.0" + sources."socket.io-parser-4.2.1" sources."statuses-1.3.1" sources."stream-throttle-0.1.3" (sources."string-width-4.2.3" // { @@ -83558,7 +84007,7 @@ in sources."y18n-5.0.8" (sources."yargs-17.5.1" // { dependencies = [ - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; }) sources."yargs-parser-20.2.9" @@ -83582,11 +84031,12 @@ in sha512 = "lGrnNrAGb+SjksV92nG2zvm0Mxt7q9bTMNIqQXGTf/AsdrxQDjV097izcRnrBoy41fRS1//J7TuNCH/oAsOteg=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/types-7.18.10" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.2" @@ -83634,7 +84084,7 @@ in sources."debug-2.6.9" ]; }) - sources."bootstrap-5.1.3" + sources."bootstrap-5.2.0" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."bs58-4.0.1" @@ -83649,7 +84099,7 @@ in sources."chalk-2.4.2" sources."character-parser-2.2.0" sources."charenc-0.0.2" - sources."chart.js-3.8.0" + sources."chart.js-3.9.1" sources."cipher-base-1.0.4" sources."cliui-6.0.0" sources."color-convert-1.9.3" @@ -83843,7 +84293,7 @@ in sources."minimist-1.2.6" sources."minimist-options-4.1.0" sources."mkdirp-0.5.6" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."moment-duration-format-2.3.2" (sources."morgan-1.10.0" // { dependencies = [ @@ -83881,7 +84331,7 @@ in sources."pngjs-5.0.0" sources."promise-7.3.1" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pug-3.0.2" sources."pug-attrs-3.0.0" sources."pug-code-gen-3.0.2" @@ -83896,7 +84346,7 @@ in sources."pug-walk-2.0.0" sources."punycode-2.1.1" sources."pushdata-bitcoin-1.0.1" - sources."qrcode-1.5.0" + sources."qrcode-1.5.1" sources."qs-6.10.3" sources."quick-lru-4.0.1" sources."random-bytes-1.0.0" @@ -84051,7 +84501,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -84113,7 +84563,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-9.3.0" + sources."commander-9.4.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -84294,11 +84744,11 @@ in sources."supports-color-0.2.0" ]; }) - sources."plist-3.0.5" + sources."plist-3.0.6" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" sources."protobufjs-6.11.3" - sources."psl-1.8.0" + sources."psl-1.9.0" (sources."pump-0.3.5" // { dependencies = [ sources."once-1.2.0" @@ -84442,7 +84892,7 @@ in sources."xmlbuilder-11.0.1" ]; }) - sources."xmlbuilder-9.0.7" + sources."xmlbuilder-15.1.1" sources."xspfr-0.3.1" sources."xtend-4.0.2" ]; @@ -84596,7 +85046,7 @@ in sources."dir-glob-2.0.0" sources."dom-walk-0.1.2" sources."dot-prop-4.2.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."elegant-spinner-1.0.1" sources."error-ex-1.3.2" sources."es6-promise-4.2.8" @@ -84849,9 +85299,9 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pixelmatch-4.0.2" - (sources."plist-3.0.5" // { + (sources."plist-3.0.6" // { dependencies = [ - sources."xmlbuilder-9.0.7" + sources."xmlbuilder-15.1.1" ]; }) sources."pngjs-3.4.0" @@ -85058,14 +85508,14 @@ in cdk8s-cli = nodeEnv.buildNodePackage { name = "cdk8s-cli"; packageName = "cdk8s-cli"; - version = "2.0.27"; + version = "2.0.73"; src = fetchurl { - url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.0.27.tgz"; - sha512 = "yHbf+UtmKrMBS8WoXvZ1uXXha+PV3tsahqTRNyf6rqnBy2pQQl2KZyPv9l7m71ukUG5KH2OhdJ7Kg1BJa0JixQ=="; + url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.0.73.tgz"; + sha512 = "BtXUCJaXegW6wodWd9MaAJUAWl6pmIFnYAFZgQ1YuX7EE9jC0phKCObdWBnl0iKJmLmsVbVDZu0yTmJcmHDFTg=="; }; dependencies = [ - sources."@jsii/check-node-1.61.0" - sources."@jsii/spec-1.61.0" + sources."@jsii/check-node-1.63.2" + sources."@jsii/spec-1.63.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -85078,12 +85528,12 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdk8s-2.3.32" - sources."cdk8s-plus-22-2.0.0-rc.25" + sources."cdk8s-2.3.74" + sources."cdk8s-plus-22-2.0.0-rc.72" sources."chalk-4.1.2" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.61.0" // { + (sources."codemaker-1.63.2" // { dependencies = [ sources."fs-extra-10.1.0" ]; @@ -85092,8 +85542,8 @@ in sources."color-name-1.1.4" sources."colors-1.4.0" sources."commonmark-0.30.0" - sources."constructs-10.1.42" - sources."date-format-4.0.11" + sources."constructs-10.1.66" + sources."date-format-4.0.13" sources."debug-4.3.4" sources."decamelize-5.0.1" sources."detect-indent-5.0.0" @@ -85108,7 +85558,7 @@ in sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" - sources."flatted-3.2.5" + sources."flatted-3.2.6" (sources."fs-extra-8.1.0" // { dependencies = [ sources."jsonfile-4.0.0" @@ -85123,42 +85573,41 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" - (sources."jsii-1.61.0" // { - dependencies = [ - sources."fs-extra-10.1.0" - sources."typescript-3.9-3.9.10" - sources."yargs-16.2.0" - ]; - }) - (sources."jsii-pacmak-1.61.0" // { + (sources."jsii-1.63.2" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.61.0" // { + (sources."jsii-pacmak-1.63.2" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.61.0" // { + (sources."jsii-reflect-1.63.2" // { dependencies = [ sources."fs-extra-10.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.595" // { + (sources."jsii-rosetta-1.63.2" // { + dependencies = [ + sources."fs-extra-10.1.0" + sources."yargs-16.2.0" + ]; + }) + (sources."jsii-srcmak-0.1.637" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.4.0" sources."json-schema-traverse-1.0.0" - sources."json2jsii-0.3.45" + sources."json2jsii-0.3.86" sources."jsonfile-6.1.0" sources."locate-path-5.0.0" - sources."log4js-6.5.2" + sources."log4js-6.6.1" sources."lower-case-2.0.2" sources."lru-cache-6.0.0" sources."mdurl-1.0.1" @@ -85168,7 +85617,7 @@ in sources."ms-2.1.2" sources."ncp-2.0.0" sources."no-case-3.0.4" - sources."oo-ascii-tree-1.61.0" + sources."oo-ascii-tree-1.63.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -85193,18 +85642,14 @@ in sources."sort-json-2.0.1" sources."spdx-license-list-6.6.0" sources."sscaff-1.2.274" - (sources."streamroller-3.1.1" // { - dependencies = [ - sources."fs-extra-10.1.0" - ]; - }) + sources."streamroller-3.1.2" 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."to-regex-range-5.0.1" sources."tslib-2.4.0" - sources."typescript-3.9-3.9.10" + sources."typescript-3.9.10" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."which-module-2.0.0" @@ -85238,33 +85683,29 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.11.2"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.11.2.tgz"; - sha512 = "p2VIfIxVqxWAMHhaqWsiEwJbE96bkHxaJzudlvj2aIC0TPz2PJfOWLLt2x1FQYsULzkG7U5M1WNCOeEeQTLJIQ=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.12.0.tgz"; + sha512 = "wtHAZDdzV5LE8RIAXHV6AVFV5hrP9Wk0HjgEMngWqeHYJqLhH8BBTxwziZxMFdT0JbCkDAg83RMSxyfRqRPqYQ=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/generator-7.18.2" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/template-7.16.7" - sources."@babel/types-7.18.4" - sources."@cdktf/hcl2cdk-0.11.2" - sources."@cdktf/hcl2json-0.11.2" - (sources."@cdktf/provider-generator-0.11.2" // { - dependencies = [ - sources."camelcase-5.3.1" - sources."codemaker-0.22.0" - ]; - }) - sources."@jridgewell/gen-mapping-0.3.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" - (sources."@jsii/check-node-1.61.0" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/generator-7.18.10" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/template-7.18.10" + sources."@babel/types-7.18.10" + sources."@cdktf/hcl2cdk-0.12.0" + sources."@cdktf/hcl2json-0.12.0" + sources."@cdktf/provider-generator-0.12.0" + 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.14" + (sources."@jsii/check-node-1.63.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -85274,7 +85715,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."@jsii/spec-1.61.0" + sources."@jsii/spec-1.63.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -85284,10 +85725,11 @@ in sources."@sentry/node-6.19.7" sources."@sentry/types-6.19.7" sources."@sentry/utils-6.19.7" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/node-fetch-2.6.2" sources."@types/yargs-17.0.10" sources."@types/yargs-parser-21.0.0" + sources."@types/yoga-layout-1.9.2" sources."@xmldom/xmldom-0.8.2" sources."agent-base-6.0.2" sources."ajv-8.11.0" @@ -85301,11 +85743,11 @@ in sources."braces-3.0.2" sources."camelcase-6.3.0" sources."case-1.6.3" - sources."cdktf-0.11.2" + sources."cdktf-0.12.0" sources."chalk-2.4.2" sources."cliui-6.0.0" sources."clone-2.1.2" - (sources."codemaker-1.61.0" // { + (sources."codemaker-1.63.2" // { dependencies = [ sources."decamelize-5.0.1" sources."fs-extra-10.1.0" @@ -85318,10 +85760,10 @@ in sources."combined-stream-1.0.8" sources."commonmark-0.30.0" sources."concat-map-0.0.1" - sources."constructs-10.1.42" + sources."constructs-10.1.66" sources."cookie-0.4.2" sources."cross-spawn-7.0.3" - sources."date-format-4.0.11" + sources."date-format-4.0.13" sources."debug-4.3.4" sources."decamelize-1.2.0" sources."delayed-stream-1.0.0" @@ -85338,12 +85780,12 @@ in sources."figures-3.2.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."form-data-3.0.1" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" - (sources."glob-7.2.0" // { + (sources."glob-7.2.3" // { dependencies = [ sources."minimatch-3.1.2" ]; @@ -85365,7 +85807,7 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - (sources."jsii-1.61.0" // { + (sources."jsii-1.63.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -85376,7 +85818,6 @@ in sources."has-flag-4.0.0" sources."jsonfile-6.1.0" sources."supports-color-7.2.0" - sources."typescript-3.9-3.9.10" sources."universalify-2.0.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" @@ -85384,7 +85825,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-pacmak-1.61.0" // { + (sources."jsii-pacmak-1.63.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -85400,7 +85841,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-reflect-1.61.0" // { + (sources."jsii-reflect-1.63.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -85418,7 +85859,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-rosetta-1.61.0" // { + (sources."jsii-rosetta-1.63.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."cliui-7.0.4" @@ -85433,7 +85874,7 @@ in sources."yargs-parser-20.2.9" ]; }) - (sources."jsii-srcmak-0.1.595" // { + (sources."jsii-srcmak-0.1.637" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -85445,7 +85886,7 @@ in sources."jsonfile-4.0.0" sources."locate-path-5.0.0" sources."lodash.isequal-4.5.0" - sources."log4js-6.5.2" + sources."log4js-6.6.1" sources."lru-cache-6.0.0" sources."lru_map-0.3.3" sources."mdurl-1.0.1" @@ -85465,7 +85906,7 @@ in sources."node-fetch-2.6.7" sources."obliterator-2.0.4" sources."once-1.4.0" - sources."oo-ascii-tree-1.61.0" + sources."oo-ascii-tree-1.63.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -85496,13 +85937,7 @@ in sources."shebang-regex-3.0.0" sources."sort-json-2.0.1" sources."spdx-license-list-6.6.0" - (sources."streamroller-3.1.1" // { - dependencies = [ - sources."fs-extra-10.1.0" - sources."jsonfile-6.1.0" - sources."universalify-2.0.0" - ]; - }) + sources."streamroller-3.1.2" sources."string-width-4.2.3" sources."string.prototype.repeat-0.2.0" sources."strip-ansi-6.0.1" @@ -85512,7 +85947,7 @@ in sources."tr46-0.0.3" sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" - sources."typescript-3.9-3.9.10" + sources."typescript-3.9.10" sources."universalify-0.1.2" sources."uri-js-4.4.1" sources."webidl-conversions-3.0.1" @@ -85540,7 +85975,7 @@ in sources."color-name-1.1.4" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; }) (sources."yargs-parser-18.1.3" // { @@ -85548,6 +85983,7 @@ in sources."camelcase-5.3.1" ]; }) + sources."yoga-layout-prebuilt-1.10.0" sources."zod-1.11.17" ]; buildInputs = globalBuildInputs; @@ -85563,10 +85999,10 @@ in clean-css-cli = nodeEnv.buildNodePackage { name = "clean-css-cli"; packageName = "clean-css-cli"; - version = "5.6.0"; + version = "5.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.0.tgz"; - sha512 = "68vorNEG808D1QzeerO9AlwQVTuaR8YSK4aqwIsjJq0wDSyPH11ApHY0O+EQrdEGUZcN+d72v+Nn/gpxjAFewQ=="; + url = "https://registry.npmjs.org/clean-css-cli/-/clean-css-cli-5.6.1.tgz"; + sha512 = "/StJu1YODZY6cOwkBx5FMhSoc9YmvEJXtwNN+udGg1GIKrr4PkdsCdUqC26GfdPdt5IuZnu+5y9/3mrdIJa40Q=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -85575,7 +86011,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."chokidar-3.5.3" - sources."clean-css-5.3.0" + sources."clean-css-5.3.1" sources."commander-7.2.0" sources."concat-map-0.0.1" sources."fill-range-7.0.1" @@ -85618,9 +86054,9 @@ in sha512 = "DbwDqv+O4AIbUqLmT3w7J/Fo8uT9bNmy7oRzykTUEIcrEL0DozGNOjxjiwwcKSLLf1fXKmjdLolui+OB3j1vYg=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."ansi-styles-3.2.1" @@ -85667,7 +86103,7 @@ in sources."locate-path-6.0.0" sources."lru-cache-6.0.0" sources."map-obj-4.3.0" - sources."meow-10.1.2" + sources."meow-10.1.3" sources."merge-stream-2.0.0" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" @@ -85779,10 +86215,10 @@ in coc-clangd = nodeEnv.buildNodePackage { name = "coc-clangd"; packageName = "coc-clangd"; - version = "0.22.0"; + version = "0.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.22.0.tgz"; - sha512 = "74LmEiI3uxTGhkJsZjQJpqZCbKf2qx6K3DpkA0zmdauAMo3Y1Spnth+RfeMVNKUkdxRKO6JLbCPc4iYOaYO/rA=="; + url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.23.0.tgz"; + sha512 = "beFU2td+ZLtieKXmNlFd23VQQW84xqijS0IlFR+NuqYOeCbblfSKdLc36BSjGk4FEL9Eh9tCppt1IHCo/1OrcA=="; }; buildInputs = globalBuildInputs; meta = { @@ -85861,7 +86297,7 @@ in sources."dockerfile-language-service-0.1.1" sources."dockerfile-utils-0.1.1" sources."tslib-2.4.0" - sources."vscode-jsonrpc-8.0.1" + sources."vscode-jsonrpc-8.0.2" (sources."vscode-languageserver-7.0.0" // { dependencies = [ sources."vscode-jsonrpc-6.0.0" @@ -85869,8 +86305,8 @@ in sources."vscode-languageserver-types-3.16.0" ]; }) - sources."vscode-languageserver-protocol-3.17.1" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-languageserver-types-3.17.2" ]; buildInputs = globalBuildInputs; meta = { @@ -85893,7 +86329,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.1" + sources."vscode-languageserver-types-3.17.2" ]; buildInputs = globalBuildInputs; meta = { @@ -85925,10 +86361,10 @@ in coc-explorer = nodeEnv.buildNodePackage { name = "coc-explorer"; packageName = "coc-explorer"; - version = "0.24.3"; + version = "0.24.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.24.3.tgz"; - sha512 = "VRj7DQXqlAyIMZPmF9XMqWw+PoXLcEMCIjFtBnEf9Zpca1eiXIfMPw7xASXaS60B3mqR9FwKB1QtYxSXraN8rQ=="; + url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.24.4.tgz"; + sha512 = "au+zPzOwAAY0lOOIUT9UZ+RNP1uCOqPuC88M1WTtehloJziXtxmw3PrjY+aPe4uGNUyyzvDWG90bKUE2lre87w=="; }; dependencies = [ sources."@sindresorhus/df-3.1.1" @@ -86024,10 +86460,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "2.4.10"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-2.4.10.tgz"; - sha512 = "DoG6YD+bsdaw6P7NUZh/ke7avLZy7OkBJccr6PTF5veAOO1v9mwee5P6Yu0DmGN7Yl91N8H0LVgmQ54nGzVOlA=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-2.5.0.tgz"; + sha512 = "1j7zB45gumew3vBI3MUvlHzXUnA3vIR6llAi3vdxEWLxmneLOsbeHorY95WEXmFgBLtWfdBRoeRRdF7JekUA0g=="; }; buildInputs = globalBuildInputs; meta = { @@ -86175,10 +86611,10 @@ in coc-json = nodeEnv.buildNodePackage { name = "coc-json"; packageName = "coc-json"; - version = "1.4.2"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-json/-/coc-json-1.4.2.tgz"; - sha512 = "o39cHt6BxsIEaAcd9bC8Smgej0mtYBWXG2vORGuBFFPylTqRzu96nUwlzVh+cPrPfpmrM5tv3LEtXo/urFNhSA=="; + url = "https://registry.npmjs.org/coc-json/-/coc-json-1.5.0.tgz"; + sha512 = "+WBEUb9hhxJtjlX3Kdc7ltQU4OXEPVmsMfD1m/zz5rFZtNoZfbjW/dGTm9wIPcdrw8jkWRX5ZyhYxdURJ6RixA=="; }; buildInputs = globalBuildInputs; meta = { @@ -86192,10 +86628,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.4.3.tgz"; - sha512 = "rxW5xMOWbMLxeIZZ02As6eHtQl10HIXIkmLUYY6xDIcoXKfI9+TCNNrgBRJjnPKW/fQxcje7Nqbx9viB0JDiGw=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.4.4.tgz"; + sha512 = "CBg8Spjj9GSqpusWblIWDIQqbpQec3+i5fhgapBq+VouoPDXZ8dW4r8UEmNS6czTrGIaoxruyhQ7o3nCGeDUZQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -86210,10 +86646,10 @@ in coc-markdownlint = nodeEnv.buildNodePackage { name = "coc-markdownlint"; packageName = "coc-markdownlint"; - version = "1.12.4"; + version = "1.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.12.4.tgz"; - sha512 = "b7gBEE0pHp6GnkQYMEsI1Xdn8tqP7QbRpVMuSQ3AJzj0PIflBbk8v1HnriBfDPJBqU+9OQZyU2cm2rmKBw/8yA=="; + url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.12.7.tgz"; + sha512 = "9xfE/HcVGsH3EdotpyuCNCHG5jpVvc++m488FLAQpi/JlNidgzXtQG5BpPy41cAaFMcy2e6xJ5VwHyJXBGg0rg=="; }; buildInputs = globalBuildInputs; meta = { @@ -86263,7 +86699,7 @@ in sources."which-1.3.1" ]; }) - sources."date-format-4.0.11" + sources."date-format-4.0.13" sources."debounce-1.2.1" sources."debug-4.3.4" sources."deep-extend-0.6.0" @@ -86276,10 +86712,10 @@ in sources."execa-1.0.0" sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."follow-redirects-1.15.1" - sources."fp-ts-2.12.1" - sources."fs-extra-10.1.0" + sources."fp-ts-2.12.2" + sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" (sources."fstream-1.0.12" // { @@ -86327,7 +86763,7 @@ in sources."isexe-2.0.0" sources."isuri-2.0.3" sources."jsonc-parser-2.3.1" - sources."jsonfile-6.1.0" + sources."jsonfile-4.0.0" sources."listenercount-1.0.1" (sources."locate-java-home-1.1.2" // { dependencies = [ @@ -86335,12 +86771,12 @@ in ]; }) sources."lodash-4.17.21" - sources."log4js-6.5.2" + sources."log4js-6.6.1" sources."lru-cache-6.0.0" sources."metals-languageclient-0.4.2" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" @@ -86386,7 +86822,7 @@ in sources."shell-quote-1.7.3" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."streamroller-3.1.1" + sources."streamroller-3.1.2" sources."string.prototype.trimend-1.0.5" sources."string.prototype.trimstart-1.0.5" (sources."string_decoder-1.1.1" // { @@ -86401,7 +86837,7 @@ in sources."traverse-0.3.9" sources."tslib-2.4.0" sources."unbox-primitive-1.0.2" - sources."universalify-2.0.0" + sources."universalify-0.1.2" sources."unzipper-0.10.11" sources."util-deprecate-1.0.2" sources."uuid-7.0.3" @@ -86412,7 +86848,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-2.1.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -86472,13 +86908,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.255"; + version = "1.1.265"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.255.tgz"; - sha512 = "EY0CD9B+niaca81hxiGG/Kvt3Z5zIB1Xs6QyUrbxpOmSDSk9F0HAzypgaK+B4NRLlxS0UtDwVZziCnK4ma1riw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.265.tgz"; + sha512 = "nFC61zn7rBhgNqM/PsBcfTz+Lsy3G+4iGL7pI7lSNXMQoZ2/JJ8L2CTMsnf2jw+0oAjFPp48HNZ3G+jWPlG11Q=="; }; dependencies = [ - sources."pyright-1.1.255" + sources."pyright-1.1.265" ]; buildInputs = globalBuildInputs; meta = { @@ -86517,10 +86953,10 @@ in sha512 = "SOsCwIuQeE4eiX/Scgs2nL1WnR0JwFZ2/Edh3dx5ijmZSlEPxdc0PnMUN0hT9y96jK5/ZHAByC3qEperpWqPUA=="; }; dependencies = [ - sources."vscode-jsonrpc-8.0.1" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" ]; buildInputs = globalBuildInputs; meta = { @@ -86552,10 +86988,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.64.0"; + version = "0.65.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.64.0.tgz"; - sha512 = "H7+gWEJgEa9HZq7l8sJuVL8KsfFQMk5IaOaBnJcv7IeJNAG7LxsD28HCxMRzJhVxYECU7NMOCgn4j5D0p1rE4A=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.65.3.tgz"; + sha512 = "uXpvXBQyS182KH8UBFvptolus+0BaLdl4iSmIifMy5IYNNnj7EJrBwQOz5kt/G1r8jAcYLVq0TVSkNHm8qoz3Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -86622,7 +87058,7 @@ in sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."performance-now-2.1.0" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."request-2.88.2" @@ -86641,11 +87077,11 @@ in sources."urijs-1.19.11" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."vscode-jsonrpc-8.0.1" + sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."web-tree-sitter-0.20.5" sources."wrappy-1.0.2" ]; @@ -86679,10 +87115,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "3.0.14"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.0.14.tgz"; - sha512 = "aYlupbhcFlm03c4yGE8cv1x+s8Ur9VluA050QLzvEynbjHnzOGYZS97qwqgvWVRH0hKsU1dl50CG3XlF4T9vaA=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.1.0.tgz"; + sha512 = "6O6ITjywn4NVwfvejju0+bAgCs57Fw3Okml51nMiHi9dyBR/8jZJjLx0Hq6HRcudydFd8P+13tEm9BLgb3WzBw=="; }; buildInputs = globalBuildInputs; meta = { @@ -86720,39 +87156,40 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - sources."@babel/core-7.18.5" - (sources."@babel/generator-7.18.2" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + sources."@babel/core-7.18.10" + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-compilation-targets-7.18.2" - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.18.2" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/helper-compilation-targets-7.18.9" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.18.9" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helpers-7.18.9" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.18.5" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/parser-7.18.10" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + 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.14" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -86782,11 +87219,11 @@ in ]; }) sources."braces-3.0.2" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -86823,7 +87260,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -86834,13 +87271,13 @@ in sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" sources."fast-glob-3.2.11" - sources."fastest-levenshtein-1.0.12" + sources."fastest-levenshtein-1.0.16" sources."fastq-1.13.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" @@ -86919,7 +87356,7 @@ in ]; }) sources."ms-2.1.2" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.7" @@ -87027,6 +87464,7 @@ in sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" + sources."update-browserslist-db-1.0.5" sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" @@ -87041,7 +87479,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-2.1.2" sources."which-1.3.1" sources."wrappy-1.0.2" @@ -87063,10 +87501,10 @@ in coc-sumneko-lua = nodeEnv.buildNodePackage { name = "coc-sumneko-lua"; packageName = "coc-sumneko-lua"; - version = "0.0.29"; + version = "0.0.31"; src = fetchurl { - url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.29.tgz"; - sha512 = "3Xy0czldGeMy2Ic4taPwI3myKU27SpywmSaFTa2UM6E3/F5DHb7fSBQ/mvk0c9/LweTgv3Pm/mBU83PKRSZDtA=="; + url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.31.tgz"; + sha512 = "8O9H8JxMFiLHNRDPEfQbw1an669wyXjjkO/xdNYN75wbabiphhvsDPQF6b99LzRYu50TqnqdIkJgcKU/kSPbCA=="; }; buildInputs = globalBuildInputs; meta = { @@ -87080,10 +87518,10 @@ in coc-sqlfluff = nodeEnv.buildNodePackage { name = "coc-sqlfluff"; packageName = "coc-sqlfluff"; - version = "0.9.0"; + version = "0.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-sqlfluff/-/coc-sqlfluff-0.9.0.tgz"; - sha512 = "Fzny9JBJw5zIK6GwSh1s3Q3t2ylt2dg9QYURhaGihm6gqmUdRMO0DokHLt10TFqe8tjFbOUIriEx7Qb6mASnfQ=="; + url = "https://registry.npmjs.org/coc-sqlfluff/-/coc-sqlfluff-0.10.1.tgz"; + sha512 = "pxsueyglm1R0I6eGvO/geN2rnJV6gCTCqUg8KZ+geyeWiFDLC2a9fnJTqG5XCsyTaRBIjrZBA6rqCZd1SulwxQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -87164,9 +87602,9 @@ in sha512 = "5Zxv2Adtb6Mlpv2YdKErhf8ntxiBl1UyrbEqo7gR9nFIAfi3o0Ue6TJTpZfOhQViFQxLjJAS65IQVRaNlbhkxw=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."balanced-match-1.0.2" @@ -87253,10 +87691,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.10.5"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.10.5.tgz"; - sha512 = "XU+kNQLtKpEcjnf5KYXO+FdLJPrMJXU+FzZrXhniN3Zatv3z58BZr07dY01sG3LGV2of/9o58EZNs7rdSst1Pg=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.11.1.tgz"; + sha512 = "ZzjLErb6RIBX1G00VPnHm5rqQHIxa5OfUFKcubirfjuz2cFhpBZ+TX3CKxIgs3C/LwHsQiOsuJ4ZedLb5b/uaQ=="; }; dependencies = [ sources."typescript-4.7.4" @@ -87299,8 +87737,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" @@ -87380,14 +87818,14 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.5" + sources."flatted-3.2.6" 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.2" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.15.0" + sources."globals-13.17.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.3" @@ -87551,10 +87989,10 @@ in coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; - version = "1.7.5"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.7.5.tgz"; - sha512 = "1wNDsQB4YwJJLJxzDOyqu2edjwf+KHGM0co63t3N6L6k+XBB4rOenfkN+HgnX0wfRglAmKbMnOKA677XycGReA=="; + url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.8.0.tgz"; + sha512 = "ttTi8SSoFPcKOWgY7H7E91zOYcycfsZdvA7jmZJOr+iWYGqR2LdvMvBpWpuV7oWSOF5a88zM/vb8P8aNefE04Q=="; }; dependencies = [ sources."prettier-2.0.5" @@ -87634,7 +88072,7 @@ in }) sources."download-5.0.3" sources."download-git-repo-1.1.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."end-of-stream-1.4.4" sources."escape-string-regexp-1.0.5" (sources."execa-1.0.0" // { @@ -87698,7 +88136,7 @@ in sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - sources."plist-3.0.5" + sources."plist-3.0.6" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" @@ -87745,7 +88183,7 @@ in sources."uuid-3.4.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."xmlbuilder-9.0.7" + sources."xmlbuilder-15.1.1" sources."xmlcreate-2.0.4" sources."xtend-4.0.2" sources."yauzl-2.10.0" @@ -87825,10 +88263,10 @@ in concurrently = nodeEnv.buildNodePackage { name = "concurrently"; packageName = "concurrently"; - version = "7.2.2"; + version = "7.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/concurrently/-/concurrently-7.2.2.tgz"; - sha512 = "DcQkI0ruil5BA/g7Xy3EWySGrFJovF5RYAYxwGvv9Jf9q9B1v3jPFP2tl6axExNf1qgF30kjoNYrangZ0ey4Aw=="; + url = "https://registry.npmjs.org/concurrently/-/concurrently-7.3.0.tgz"; + sha512 = "IiDwm+8DOcFEInca494A8V402tNTQlJaYq78RF2rijOrKEk/AOHTxhN4U1cp7GYKYX5Q6Ymh1dLTBlzIMN0ikA=="; }; dependencies = [ sources."ansi-regex-5.0.1" @@ -87841,7 +88279,7 @@ in sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."date-fns-2.28.0" + sources."date-fns-2.29.1" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."get-caller-file-2.0.5" @@ -87849,7 +88287,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."lodash-4.17.21" sources."require-directory-2.1.1" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."shell-quote-1.7.3" sources."spawn-command-0.0.2" sources."string-width-4.2.3" @@ -87860,7 +88298,7 @@ in sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -87901,7 +88339,7 @@ in sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."kuler-2.0.0" - sources."logform-2.4.1" + sources."logform-2.4.2" sources."ms-2.1.3" sources."one-time-1.0.0" sources."prom-client-14.0.1" @@ -87939,9 +88377,9 @@ in sha512 = "8grMV5Jo8S0kP3yoMeJxV2P5R6VJOqK72IiSV9t/4H5r/HiRqEBQ83bYGuz4Yzfdj4bjaAEhZN/FFbsFXr5bOA=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" sources."@hutson/parse-repository-url-3.0.2" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" @@ -88125,7 +88563,7 @@ in sources."through2-4.0.2" sources."trim-newlines-3.0.1" sources."type-fest-0.18.1" - sources."uglify-js-3.16.1" + sources."uglify-js-3.16.3" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" @@ -88255,7 +88693,7 @@ in sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -88268,7 +88706,7 @@ in ]; }) sources."concat-map-0.0.1" - (sources."conf-10.1.2" // { + (sources."conf-10.2.0" // { dependencies = [ sources."ajv-8.11.0" sources."dot-prop-6.0.1" @@ -88332,7 +88770,7 @@ in sources."detect-newline-3.1.0" sources."dir-glob-3.0.1" sources."dot-prop-5.3.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."editor-1.0.0" sources."ee-first-1.1.1" @@ -88464,7 +88902,7 @@ in sources."uuid-8.3.2" ]; }) - sources."ip-1.1.8" + sources."ip-2.0.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" sources."is-core-module-2.9.0" @@ -88529,7 +88967,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -88591,14 +89029,14 @@ in sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pkg-up-3.1.0" - sources."plist-3.0.5" + sources."plist-3.0.6" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."promzard-0.3.0" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" @@ -88670,7 +89108,7 @@ in sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + sources."socks-2.7.0" sources."socks-proxy-agent-6.2.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" @@ -88688,7 +89126,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.11.21" + sources."systeminformation-5.12.2" sources."tar-6.1.11" sources."through-2.3.8" sources."tmp-0.2.1" @@ -88756,7 +89194,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" - sources."xmlbuilder-9.0.7" + sources."xmlbuilder-15.1.1" sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; @@ -88777,9 +89215,9 @@ in sha512 = "JA6bth6/mxPCa19SrWkIuPEBrea8vO9g1v0qhmCLnAKOfTcsNk5/X3W1o9aZuOHgugRcxdyR67rO4Gw/DA+4Qg=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -88840,7 +89278,7 @@ in sources."lru-cache-6.0.0" sources."make-dir-3.1.0" sources."map-obj-4.3.0" - sources."meow-10.1.2" + sources."meow-10.1.3" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."min-indent-1.0.1" @@ -88918,7 +89356,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -88949,7 +89387,7 @@ in sources."debug-3.2.7" sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" - sources."es5-ext-0.10.61" + sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -88962,7 +89400,7 @@ in sources."event-emitter-0.3.5" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.6.0" + sources."type-2.7.0" ]; }) sources."extend-3.0.2" @@ -89015,7 +89453,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" @@ -89183,15 +89621,15 @@ in cspell = nodeEnv.buildNodePackage { name = "cspell"; packageName = "cspell"; - version = "6.1.2"; + version = "6.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/cspell/-/cspell-6.1.2.tgz"; - sha512 = "w4lGfzNl3m1dfagyZvr28V1nK/E+y8zoKVlE158JI/iVNGO/R2okrcNB1s+9xXSmYjJ8Xx6dhupO0XxKuagDSQ=="; + url = "https://registry.npmjs.org/cspell/-/cspell-6.5.0.tgz"; + sha512 = "xdEs8e4X2bPgrZBfM5L/0f7TRY7/3SnYwMlPOVvbswb+gJ+hUkZkxRmv8F+IMKW0tKWdoHZH6bCiYrmV0Y8Hdg=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -89201,14 +89639,15 @@ in sources."supports-color-5.5.0" ]; }) - sources."@cspell/cspell-bundled-dicts-6.1.2" - sources."@cspell/cspell-pipe-6.1.2" - sources."@cspell/cspell-types-6.1.2" - sources."@cspell/dict-ada-2.0.0" + sources."@cspell/cspell-bundled-dicts-6.5.0" + sources."@cspell/cspell-pipe-6.4.2" + sources."@cspell/cspell-service-bus-6.5.0" + sources."@cspell/cspell-types-6.5.0" + sources."@cspell/dict-ada-2.0.1" sources."@cspell/dict-aws-2.0.0" - sources."@cspell/dict-bash-2.0.3" - sources."@cspell/dict-companies-2.0.6" - sources."@cspell/dict-cpp-3.1.0" + sources."@cspell/dict-bash-2.0.4" + sources."@cspell/dict-companies-2.0.10" + sources."@cspell/dict-cpp-3.2.1" sources."@cspell/dict-cryptocurrencies-2.0.0" sources."@cspell/dict-csharp-3.0.1" sources."@cspell/dict-css-2.0.0" @@ -89218,37 +89657,41 @@ in sources."@cspell/dict-dotnet-2.0.1" sources."@cspell/dict-elixir-2.0.1" sources."@cspell/dict-en-gb-1.1.33" - sources."@cspell/dict-en_us-2.2.6" - sources."@cspell/dict-filetypes-2.0.2" + sources."@cspell/dict-en_us-2.3.0" + sources."@cspell/dict-filetypes-2.1.1" sources."@cspell/dict-fonts-2.0.1" sources."@cspell/dict-fullstack-2.0.6" sources."@cspell/dict-git-1.0.1" sources."@cspell/dict-golang-3.0.1" - sources."@cspell/dict-haskell-2.0.0" + sources."@cspell/dict-haskell-2.0.1" sources."@cspell/dict-html-3.0.2" sources."@cspell/dict-html-symbol-entities-3.0.0" - sources."@cspell/dict-java-3.0.3" - sources."@cspell/dict-latex-2.0.6" + sources."@cspell/dict-java-3.0.7" + sources."@cspell/dict-latex-2.0.9" sources."@cspell/dict-lorem-ipsum-2.0.0" sources."@cspell/dict-lua-2.0.0" sources."@cspell/dict-node-3.0.1" - sources."@cspell/dict-npm-3.0.1" + sources."@cspell/dict-npm-3.1.1" sources."@cspell/dict-php-2.0.0" sources."@cspell/dict-powershell-2.0.0" sources."@cspell/dict-public-licenses-1.0.5" sources."@cspell/dict-python-3.0.6" sources."@cspell/dict-r-1.0.3" - sources."@cspell/dict-ruby-2.0.1" + sources."@cspell/dict-ruby-2.0.2" sources."@cspell/dict-rust-2.0.1" sources."@cspell/dict-scala-2.0.0" - sources."@cspell/dict-software-terms-2.1.8" + sources."@cspell/dict-software-terms-2.2.2" + sources."@cspell/dict-sql-1.0.4" sources."@cspell/dict-swift-1.0.3" - sources."@cspell/dict-typescript-2.0.0" + sources."@cspell/dict-typescript-2.0.1" sources."@cspell/dict-vue-2.0.2" + sources."@types/node-18.6.3" + sources."@types/node-fetch-2.6.2" sources."@types/parse-json-4.0.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."array-timsort-1.0.3" + sources."asynckit-0.4.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -89257,18 +89700,21 @@ in sources."clear-module-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.3.0" + sources."combined-stream-1.0.8" + sources."commander-9.4.0" sources."comment-json-4.2.2" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."core-util-is-1.0.3" sources."cosmiconfig-7.0.1" sources."crypto-random-string-2.0.0" - sources."cspell-gitignore-6.1.2" - sources."cspell-glob-6.1.2" - sources."cspell-io-6.1.2" - sources."cspell-lib-6.1.2" - sources."cspell-trie-lib-6.1.2" + sources."cspell-gitignore-6.5.0" + sources."cspell-glob-6.4.2" + sources."cspell-grammar-6.5.0" + sources."cspell-io-6.5.0" + sources."cspell-lib-6.5.0" + sources."cspell-trie-lib-6.5.0" + sources."delayed-stream-1.0.0" sources."dot-prop-5.3.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" @@ -89279,7 +89725,8 @@ in sources."fill-range-7.0.1" sources."find-up-5.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.5" + sources."flatted-3.2.6" + sources."form-data-3.0.1" sources."fs-extra-10.1.0" sources."fs.realpath-1.0.0" sources."gensequence-3.1.1" @@ -89320,7 +89767,10 @@ in ]; }) sources."micromatch-4.0.5" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."minimatch-3.1.2" + sources."node-fetch-2.6.7" sources."once-1.4.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" @@ -89343,11 +89793,14 @@ in sources."strip-ansi-6.0.1" sources."supports-color-7.2.0" sources."to-regex-range-5.0.1" + 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.5" sources."vscode-uri-3.0.3" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" @@ -89438,7 +89891,7 @@ in sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."b4a-1.5.3" + sources."b4a-1.6.0" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -89562,7 +90015,7 @@ in sources."dns-packet-5.4.0" sources."dom-walk-0.1.2" sources."dot-prop-4.2.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.4" @@ -89745,7 +90198,7 @@ in sources."neat-input-1.11.1" sources."neat-log-3.1.0" sources."nets-3.2.0" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" sources."normalize-path-2.1.1" sources."npm-run-path-2.0.2" sources."oauth-sign-0.9.0" @@ -89783,13 +90236,13 @@ in sources."process-nextick-args-2.0.1" sources."progress-string-1.2.2" sources."prompt-1.3.0" - (sources."protocol-buffers-encodings-1.1.1" // { + (sources."protocol-buffers-encodings-1.2.0" // { dependencies = [ sources."varint-5.0.0" ]; }) sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.3" @@ -90033,65 +90486,66 @@ in src = ../../applications/networking/instant-messengers/deltachat-desktop; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - sources."@babel/core-7.18.5" - (sources."@babel/generator-7.18.2" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + sources."@babel/core-7.18.10" + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - sources."@babel/helper-compilation-targets-7.18.2" - sources."@babel/helper-create-class-features-plugin-7.18.0" - sources."@babel/helper-create-regexp-features-plugin-7.17.12" - sources."@babel/helper-define-polyfill-provider-0.3.1" - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-explode-assignable-expression-7.16.7" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.17.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-remap-async-to-generator-7.16.8" - sources."@babel/helper-replace-supers-7.18.2" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-async-generator-functions-7.17.12" - sources."@babel/plugin-proposal-class-properties-7.17.12" - sources."@babel/plugin-proposal-class-static-block-7.18.0" - sources."@babel/plugin-proposal-dynamic-import-7.16.7" - sources."@babel/plugin-proposal-export-namespace-from-7.17.12" - sources."@babel/plugin-proposal-json-strings-7.17.12" - sources."@babel/plugin-proposal-logical-assignment-operators-7.17.12" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" - sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.18.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" - sources."@babel/plugin-proposal-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-private-methods-7.17.12" - sources."@babel/plugin-proposal-private-property-in-object-7.17.12" - sources."@babel/plugin-proposal-unicode-property-regex-7.17.12" + 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.18.9" + sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-regexp-features-plugin-7.18.6" + sources."@babel/helper-define-polyfill-provider-0.3.2" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-explode-assignable-expression-7.18.6" + sources."@babel/helper-function-name-7.18.9" + 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.18.9" + sources."@babel/helper-optimise-call-expression-7.18.6" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-remap-async-to-generator-7.18.9" + sources."@babel/helper-replace-supers-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helper-wrap-function-7.18.10" + sources."@babel/helpers-7.18.9" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-async-generator-functions-7.18.10" + sources."@babel/plugin-proposal-class-properties-7.18.6" + sources."@babel/plugin-proposal-class-static-block-7.18.6" + sources."@babel/plugin-proposal-dynamic-import-7.18.6" + sources."@babel/plugin-proposal-export-namespace-from-7.18.9" + sources."@babel/plugin-proposal-json-strings-7.18.6" + sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" + sources."@babel/plugin-proposal-numeric-separator-7.18.6" + sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-private-methods-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.17.12" + sources."@babel/plugin-syntax-import-assertions-7.18.6" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.17.12" + 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" @@ -90100,61 +90554,61 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.17.12" - sources."@babel/plugin-transform-async-to-generator-7.17.12" - sources."@babel/plugin-transform-block-scoped-functions-7.16.7" - sources."@babel/plugin-transform-block-scoping-7.18.4" - sources."@babel/plugin-transform-classes-7.18.4" - sources."@babel/plugin-transform-computed-properties-7.17.12" - sources."@babel/plugin-transform-destructuring-7.18.0" - sources."@babel/plugin-transform-dotall-regex-7.16.7" - sources."@babel/plugin-transform-duplicate-keys-7.17.12" - sources."@babel/plugin-transform-exponentiation-operator-7.16.7" - sources."@babel/plugin-transform-for-of-7.18.1" - sources."@babel/plugin-transform-function-name-7.16.7" - sources."@babel/plugin-transform-literals-7.17.12" - sources."@babel/plugin-transform-member-expression-literals-7.16.7" - sources."@babel/plugin-transform-modules-amd-7.18.0" - sources."@babel/plugin-transform-modules-commonjs-7.18.2" - sources."@babel/plugin-transform-modules-systemjs-7.18.5" - sources."@babel/plugin-transform-modules-umd-7.18.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.12" - sources."@babel/plugin-transform-new-target-7.18.5" - sources."@babel/plugin-transform-object-super-7.16.7" - sources."@babel/plugin-transform-parameters-7.17.12" - sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-react-display-name-7.16.7" - sources."@babel/plugin-transform-react-jsx-7.17.12" - sources."@babel/plugin-transform-react-jsx-development-7.16.7" - sources."@babel/plugin-transform-react-pure-annotations-7.18.0" - sources."@babel/plugin-transform-regenerator-7.18.0" - sources."@babel/plugin-transform-reserved-words-7.17.12" - sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/plugin-transform-spread-7.17.12" - sources."@babel/plugin-transform-sticky-regex-7.16.7" - sources."@babel/plugin-transform-template-literals-7.18.2" - sources."@babel/plugin-transform-typeof-symbol-7.17.12" - sources."@babel/plugin-transform-unicode-escapes-7.16.7" - sources."@babel/plugin-transform-unicode-regex-7.16.7" - sources."@babel/preset-env-7.18.2" + sources."@babel/plugin-transform-arrow-functions-7.18.6" + sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-block-scoped-functions-7.18.6" + sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-classes-7.18.9" + sources."@babel/plugin-transform-computed-properties-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-dotall-regex-7.18.6" + sources."@babel/plugin-transform-duplicate-keys-7.18.9" + sources."@babel/plugin-transform-exponentiation-operator-7.18.6" + sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-function-name-7.18.9" + sources."@babel/plugin-transform-literals-7.18.9" + sources."@babel/plugin-transform-member-expression-literals-7.18.6" + sources."@babel/plugin-transform-modules-amd-7.18.6" + sources."@babel/plugin-transform-modules-commonjs-7.18.6" + sources."@babel/plugin-transform-modules-systemjs-7.18.9" + sources."@babel/plugin-transform-modules-umd-7.18.6" + sources."@babel/plugin-transform-named-capturing-groups-regex-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.18.8" + 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.18.10" + sources."@babel/plugin-transform-react-jsx-development-7.18.6" + sources."@babel/plugin-transform-react-pure-annotations-7.18.6" + sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-reserved-words-7.18.6" + sources."@babel/plugin-transform-shorthand-properties-7.18.6" + sources."@babel/plugin-transform-spread-7.18.9" + sources."@babel/plugin-transform-sticky-regex-7.18.6" + sources."@babel/plugin-transform-template-literals-7.18.9" + sources."@babel/plugin-transform-typeof-symbol-7.18.9" + sources."@babel/plugin-transform-unicode-escapes-7.18.10" + sources."@babel/plugin-transform-unicode-regex-7.18.6" + sources."@babel/preset-env-7.18.10" sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-react-7.17.12" - sources."@babel/runtime-7.18.3" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" - sources."@blueprintjs/colors-4.1.3" - sources."@blueprintjs/core-4.5.1" - sources."@blueprintjs/icons-4.3.0" + sources."@babel/preset-react-7.18.6" + sources."@babel/runtime-7.18.9" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" + sources."@blueprintjs/colors-4.1.4" + sources."@blueprintjs/core-4.7.0" + sources."@blueprintjs/icons-4.4.0" sources."@deltachat/message_parser_wasm-0.4.0" sources."@deltachat/react-qr-reader-4.0.0" sources."@electron/get-1.14.1" sources."@hypnosphi/create-react-context-0.3.1" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + 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.14" sources."@juggle/resize-observer-3.3.1" sources."@mapbox/extent-0.4.0" sources."@mapbox/geojson-coords-0.0.2" @@ -90174,14 +90628,14 @@ in sources."@types/debounce-1.2.1" sources."@types/dom4-2.0.2" sources."@types/emoji-mart-3.0.9" - sources."@types/geojson-7946.0.8" + sources."@types/geojson-7946.0.10" sources."@types/mapbox-gl-0.54.5" sources."@types/mime-types-2.1.1" sources."@types/minimist-1.2.2" - sources."@types/node-14.18.21" + sources."@types/node-14.18.23" sources."@types/prop-types-15.7.5" sources."@types/rc-1.2.1" - sources."@types/react-17.0.47" + sources."@types/react-17.0.48" sources."@types/react-dom-17.0.17" sources."@types/react-window-1.8.5" sources."@types/react-window-infinite-loader-1.0.6" @@ -90206,9 +90660,9 @@ in sources."async-each-1.0.3" sources."atob-2.1.2" sources."babel-plugin-dynamic-import-node-2.3.3" - sources."babel-plugin-polyfill-corejs2-0.3.1" - sources."babel-plugin-polyfill-corejs3-0.5.2" - sources."babel-plugin-polyfill-regenerator-0.3.1" + sources."babel-plugin-polyfill-corejs2-0.3.2" + sources."babel-plugin-polyfill-corejs3-0.5.3" + sources."babel-plugin-polyfill-regenerator-0.4.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" @@ -90222,7 +90676,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."cache-base-1.0.1" @@ -90234,7 +90688,7 @@ in }) sources."call-bind-1.0.2" sources."camel-case-4.1.2" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" sources."capital-case-1.0.4" sources."chalk-2.4.2" sources."change-case-4.1.2" @@ -90257,7 +90711,7 @@ in ]; }) sources."classnames-2.3.1" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -90267,7 +90721,7 @@ in sources."constant-case-3.0.4" sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" - (sources."core-js-compat-3.23.2" // { + (sources."core-js-compat-3.24.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -90289,14 +90743,14 @@ in sources."dom-helpers-5.2.1" sources."dom4-2.1.6" sources."dot-case-3.0.4" - sources."duplexer3-0.1.4" - sources."earcut-2.2.3" - (sources."electron-18.3.4" // { + sources."duplexer3-0.1.5" + sources."earcut-2.2.4" + (sources."electron-18.3.7" // { dependencies = [ - sources."@types/node-16.11.41" + sources."@types/node-16.11.47" ]; }) - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" sources."emoji-js-clean-4.0.0" sources."emoji-mart-3.0.1" sources."emoji-regex-9.2.2" @@ -90471,15 +90925,15 @@ in ]; }) sources."mkdirp-0.5.6" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."ms-2.1.2" sources."murmurhash-js-1.0.0" sources."nan-2.16.0" sources."nanomatch-1.2.13" sources."napi-macros-2.0.0" sources."no-case-3.0.4" - sources."node-gyp-build-4.4.0" - sources."node-releases-2.0.5" + sources."node-gyp-build-4.5.0" + sources."node-releases-2.0.6" sources."normalize-path-3.0.0" sources."normalize-url-4.5.1" sources."normalize.css-8.0.1" @@ -90537,7 +90991,7 @@ in sources."react-is-16.13.1" sources."react-popper-1.3.11" sources."react-string-replace-1.1.0" - sources."react-transition-group-4.4.2" + sources."react-transition-group-4.4.5" sources."react-virtualized-auto-sizer-1.0.6" sources."react-window-1.8.7" sources."react-window-infinite-loader-1.0.8" @@ -90550,7 +91004,7 @@ in sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.0.1" + sources."regexpu-core-5.1.0" sources."regjsgen-0.6.0" (sources."regjsparser-0.8.4" // { dependencies = [ @@ -90571,7 +91025,7 @@ in sources."rw-0.1.4" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" - (sources."sass-1.52.3" // { + (sources."sass-1.54.2" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -90696,6 +91150,7 @@ in ]; }) sources."upath-1.2.0" + sources."update-browserslist-db-1.0.5" sources."upper-case-2.0.2" sources."upper-case-first-2.0.2" sources."urix-0.1.0" @@ -90808,11 +91263,11 @@ in sources."tslib-1.14.1" sources."type-fest-0.16.0" sources."unique-string-2.0.0" - sources."vscode-jsonrpc-8.0.1" + sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-2.1.2" sources."wrappy-1.0.2" ]; @@ -90838,11 +91293,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.1" - sources."vscode-languageserver-8.0.1" - (sources."vscode-languageserver-protocol-3.17.1" // { + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-8.0.2" + (sources."vscode-languageserver-protocol-3.17.2" // { dependencies = [ - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" ]; }) sources."vscode-languageserver-textdocument-1.0.5" @@ -90861,15 +91316,15 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.84.1"; + version = "6.87.1"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.84.1.tgz"; - sha512 = "qgHJeGGNMJFwGMpidCOCKZsbq6bUth2cvns1QdrJnCIoojv5x0J4C6Xm5zh8sZCYr7y5nrwfgMUkrbMNLHdGwQ=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.87.1.tgz"; + sha512 = "9FZtfWyUl9Ro7o7MDWaJoYHed/WxrHfpA5ma7GhhtQPWdNWrrWXurm0WpXsoM/p99V9KsNEU5QUjVHcnmnDfCQ=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.21" + sources."@types/node-14.18.23" sources."JSONStream-1.3.5" sources."ajv-6.12.6" sources."asn1-0.2.6" @@ -90945,7 +91400,7 @@ in sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-1.3.2" sources."qs-6.5.3" sources."querystring-0.2.0" @@ -91006,30 +91461,30 @@ in "@electron-forge/cli" = nodeEnv.buildNodePackage { name = "_at_electron-forge_slash_cli"; packageName = "@electron-forge/cli"; - version = "6.0.0-beta.64"; + version = "6.0.0-beta.65"; src = fetchurl { - url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.64.tgz"; - sha512 = "EvI2Ie2ywj5lKZC3CttwRbraLBq84Gh2iwkrge5Q/T4wqvundTT1CyxNLUuSx+lsw3kE8Atmwefl5G6rf+E7Mg=="; + url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.65.tgz"; + sha512 = "PQ6axjSVl5AIYf1g1+Qn1QHbVyjp+fpTRzwMJ9bMM91cA7of2d92c4IF96Q6T9Zvn4aeAsxx/fvDLikobptucQ=="; }; dependencies = [ - sources."@electron-forge/async-ora-6.0.0-beta.64" - sources."@electron-forge/core-6.0.0-beta.64" - sources."@electron-forge/installer-base-6.0.0-beta.64" - sources."@electron-forge/installer-darwin-6.0.0-beta.64" - sources."@electron-forge/installer-deb-6.0.0-beta.64" - sources."@electron-forge/installer-dmg-6.0.0-beta.64" - sources."@electron-forge/installer-exe-6.0.0-beta.64" - sources."@electron-forge/installer-linux-6.0.0-beta.64" - sources."@electron-forge/installer-rpm-6.0.0-beta.64" - sources."@electron-forge/installer-zip-6.0.0-beta.64" - sources."@electron-forge/maker-base-6.0.0-beta.64" - sources."@electron-forge/plugin-base-6.0.0-beta.64" - sources."@electron-forge/publisher-base-6.0.0-beta.64" - sources."@electron-forge/shared-types-6.0.0-beta.64" - sources."@electron-forge/template-base-6.0.0-beta.64" - sources."@electron-forge/template-typescript-6.0.0-beta.64" - sources."@electron-forge/template-typescript-webpack-6.0.0-beta.64" - sources."@electron-forge/template-webpack-6.0.0-beta.64" + sources."@electron-forge/async-ora-6.0.0-beta.65" + sources."@electron-forge/core-6.0.0-beta.65" + sources."@electron-forge/installer-base-6.0.0-beta.65" + sources."@electron-forge/installer-darwin-6.0.0-beta.65" + sources."@electron-forge/installer-deb-6.0.0-beta.65" + sources."@electron-forge/installer-dmg-6.0.0-beta.65" + sources."@electron-forge/installer-exe-6.0.0-beta.65" + sources."@electron-forge/installer-linux-6.0.0-beta.65" + sources."@electron-forge/installer-rpm-6.0.0-beta.65" + sources."@electron-forge/installer-zip-6.0.0-beta.65" + sources."@electron-forge/maker-base-6.0.0-beta.65" + sources."@electron-forge/plugin-base-6.0.0-beta.65" + sources."@electron-forge/publisher-base-6.0.0-beta.65" + sources."@electron-forge/shared-types-6.0.0-beta.65" + sources."@electron-forge/template-base-6.0.0-beta.65" + sources."@electron-forge/template-typescript-6.0.0-beta.65" + sources."@electron-forge/template-typescript-webpack-6.0.0-beta.65" + sources."@electron-forge/template-webpack-6.0.0-beta.65" (sources."@electron/get-1.14.1" // { dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -91067,25 +91522,24 @@ 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" - sources."@npmcli/move-file-1.1.2" + sources."@npmcli/fs-2.1.1" + sources."@npmcli/move-file-2.0.0" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" - sources."@tootallnate/once-1.1.2" + sources."@tootallnate/once-2.0.0" sources."@types/cacheable-request-6.0.2" sources."@types/glob-7.2.0" sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.10.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" - sources."ajv-6.12.6" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -91094,22 +91548,16 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.0" - (sources."asar-3.1.0" // { + sources."are-we-there-yet-3.0.1" + (sources."asar-3.2.0" // { dependencies = [ sources."commander-5.1.0" ]; }) - sources."asn1-0.2.6" - sources."assert-plus-1.0.0" - sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."author-regex-1.0.0" - sources."aws-sign2-0.7.0" - sources."aws4-1.11.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" - sources."bcrypt-pbkdf-1.0.2" sources."bl-4.1.0" sources."bluebird-3.7.2" sources."boolean-3.2.0" @@ -91122,41 +91570,42 @@ in sources."buffer-equal-1.0.0" sources."buffer-fill-1.0.0" sources."buffer-from-1.1.2" - sources."cacache-15.3.0" + (sources."cacache-16.1.1" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."glob-8.0.3" + sources."minimatch-5.1.0" + ]; + }) sources."cacheable-lookup-5.0.4" sources."cacheable-request-7.0.2" - sources."caseless-0.12.0" sources."chalk-4.1.2" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."chromium-pickle-js-0.2.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" - sources."clone-response-1.0.2" - sources."code-point-at-1.1.0" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-support-1.1.3" sources."colors-1.0.3" - sources."combined-stream-1.0.8" sources."commander-4.1.1" sources."compare-version-0.1.2" sources."compress-brotli-1.3.8" sources."concat-map-0.0.1" sources."config-chain-1.1.13" sources."console-control-strings-1.1.0" - sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" (sources."cross-spawn-windows-exe-1.2.0" // { dependencies = [ sources."@malept/cross-spawn-promise-1.1.1" ]; }) - sources."dashdash-1.14.1" (sources."debug-4.3.4" // { dependencies = [ sources."ms-2.1.2" @@ -91170,15 +91619,10 @@ in sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" - (sources."define-properties-1.1.4" // { - dependencies = [ - sources."object-keys-1.1.1" - ]; - }) - sources."delayed-stream-1.0.0" + sources."define-properties-1.1.4" sources."delegates-1.0.0" sources."depd-1.1.2" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.1" sources."detect-node-2.1.0" (sources."dir-compare-2.4.0" // { dependencies = [ @@ -91186,8 +91630,7 @@ in sources."minimatch-3.0.4" ]; }) - sources."duplexer3-0.1.4" - sources."ecc-jsbn-0.1.2" + sources."duplexer3-0.1.5" (sources."electron-notarize-1.2.1" // { dependencies = [ sources."fs-extra-9.1.0" @@ -91203,7 +91646,7 @@ in sources."fs-extra-9.1.0" ]; }) - sources."electron-rebuild-3.2.7" + sources."electron-rebuild-3.2.9" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."encoding-0.1.13" @@ -91226,17 +91669,13 @@ in ]; }) sources."expand-tilde-2.0.2" - sources."extend-3.0.2" (sources."external-editor-3.1.0" // { dependencies = [ sources."iconv-lite-0.4.24" ]; }) sources."extract-zip-2.0.1" - sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.11" - sources."fast-json-stable-stringify-2.1.0" sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" @@ -91258,8 +91697,6 @@ in sources."universalify-0.1.2" ]; }) - sources."forever-agent-0.6.1" - sources."form-data-2.3.3" sources."fs-extra-10.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -91283,7 +91720,6 @@ in ]; }) sources."get-stream-5.2.0" - sources."getpass-0.1.7" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."global-agent-3.0.0" @@ -91298,8 +91734,6 @@ in sources."got-11.8.5" sources."graceful-fs-4.2.10" sources."graceful-readlink-1.0.1" - sources."har-schema-2.0.0" - sources."har-validator-5.1.5" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-property-descriptors-1.0.0" @@ -91308,8 +91742,7 @@ in sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.9" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" - sources."http-signature-1.2.0" + sources."http-proxy-agent-5.0.0" sources."http2-wrapper-1.0.3" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" @@ -91322,7 +91755,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."inquirer-8.2.4" - sources."ip-1.1.8" + sources."ip-2.0.0" sources."is-arrayish-0.2.1" sources."is-core-module-2.9.0" sources."is-docker-2.2.1" @@ -91333,32 +91766,25 @@ in sources."is-lambda-1.0.1" sources."is-number-7.0.0" sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" - sources."isarray-0.0.1" sources."isbinaryfile-3.0.3" sources."isexe-2.0.0" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" sources."json-buffer-3.0.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."jsprim-1.4.2" sources."junk-3.1.0" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."load-json-file-2.0.0" sources."locate-path-2.0.0" sources."lodash-4.17.21" sources."lodash.get-4.4.2" sources."log-symbols-4.1.0" sources."lowercase-keys-2.0.0" - sources."lru-cache-6.0.0" + sources."lru-cache-7.13.2" sources."lzma-native-8.0.6" - sources."make-fetch-happen-9.1.0" + sources."make-fetch-happen-10.2.0" sources."map-age-cleaner-0.1.3" (sources."matcher-3.0.0" // { dependencies = [ @@ -91368,15 +91794,13 @@ in sources."mem-4.3.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" + sources."minipass-fetch-2.1.0" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" @@ -91386,12 +91810,12 @@ in sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."nice-try-1.0.5" - sources."node-abi-3.22.0" + sources."node-abi-3.24.0" sources."node-addon-api-3.2.1" sources."node-api-version-0.1.4" sources."node-fetch-2.6.7" - sources."node-gyp-8.4.1" - sources."node-gyp-build-4.4.0" + sources."node-gyp-9.1.0" + sources."node-gyp-build-4.5.0" sources."nopt-5.0.0" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -91410,14 +91834,7 @@ in ]; }) sources."npmlog-6.0.2" - (sources."nugget-2.0.2" // { - dependencies = [ - sources."debug-2.6.9" - ]; - }) - sources."number-is-nan-1.0.1" - sources."oauth-sign-0.9.0" - sources."object-keys-0.4.0" + sources."object-keys-1.1.1" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.0" @@ -91441,7 +91858,6 @@ in sources."path-parse-1.0.7" sources."path-type-2.0.0" sources."pend-1.2.0" - sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."pify-2.3.0" (sources."pkg-dir-4.2.0" // { @@ -91454,19 +91870,14 @@ in sources."path-exists-4.0.0" ]; }) - sources."plist-3.0.5" + sources."plist-3.0.6" sources."prepend-http-2.0.0" - sources."pretty-bytes-4.0.2" sources."pretty-ms-7.0.1" sources."progress-2.0.3" - sources."progress-stream-1.2.0" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.8.0" sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."qs-6.5.3" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" sources."rcedit-3.0.1" @@ -91477,13 +91888,12 @@ in ]; }) sources."readable-stream-3.6.0" - sources."request-2.88.2" sources."require-directory-2.1.1" sources."resolve-1.22.1" sources."resolve-alpn-1.2.1" sources."resolve-dir-1.0.1" sources."resolve-package-1.0.1" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."reusify-1.0.4" @@ -91491,37 +91901,31 @@ in sources."roarr-2.15.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" - sources."semver-7.3.7" + (sources."semver-7.3.7" // { + dependencies = [ + sources."lru-cache-6.0.0" + ]; + }) sources."semver-compare-1.0.0" sources."serialize-error-7.0.1" sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - (sources."single-line-log-1.1.2" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) sources."smart-buffer-4.2.0" - sources."socks-2.6.2" - sources."socks-proxy-agent-6.2.1" + sources."socks-2.7.0" + sources."socks-proxy-agent-7.0.0" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" - sources."speedometer-0.1.4" sources."sprintf-js-1.1.2" - sources."sshpk-1.17.0" - sources."ssri-8.0.1" + sources."ssri-9.0.1" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -91533,39 +91937,22 @@ in sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" sources."tar-6.1.11" - sources."throttleit-0.0.2" sources."through-2.3.8" - (sources."through2-0.2.3" // { - dependencies = [ - sources."readable-stream-1.1.14" - sources."string_decoder-0.10.31" - ]; - }) sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" sources."tslib-2.4.0" sources."tunnel-0.0.6" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" sources."type-fest-0.13.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."universalify-2.0.0" - sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" sources."username-5.1.0" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - (sources."verror-1.10.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -91573,13 +91960,12 @@ in sources."wide-align-1.1.5" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."xmlbuilder-9.0.7" - sources."xtend-2.1.2" + sources."xmlbuilder-15.1.1" sources."y18n-5.0.8" sources."yallist-4.0.0" (sources."yargs-17.5.1" // { dependencies = [ - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; }) sources."yargs-parser-20.2.9" @@ -91634,51 +92020,52 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - (sources."@babel/core-7.18.5" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + (sources."@babel/core-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.2" // { + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.7" - (sources."@babel/helper-compilation-targets-7.18.2" // { + sources."@babel/helper-annotate-as-pure-7.18.6" + (sources."@babel/helper-compilation-targets-7.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/plugin-proposal-object-rest-spread-7.18.0" - sources."@babel/plugin-syntax-jsx-7.17.12" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.18.9" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.18.9" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helpers-7.18.9" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.18.0" - sources."@babel/plugin-transform-parameters-7.17.12" - sources."@babel/plugin-transform-react-jsx-7.17.12" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-parameters-7.18.8" + sources."@babel/plugin-transform-react-jsx-7.18.10" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + 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.14" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/yoga-layout-1.9.2" @@ -91697,13 +92084,13 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" 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.30001358" + sources."caniuse-lite-1.0.30001373" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -91732,7 +92119,7 @@ in ]; }) sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -91821,7 +92208,7 @@ in sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" @@ -91857,7 +92244,7 @@ in sources."punycode-2.1.1" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.24.7" + sources."react-devtools-core-4.25.0" sources."react-is-16.13.1" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { @@ -91913,6 +92300,7 @@ in sources."trim-newlines-3.0.1" sources."type-fest-0.12.0" sources."unicode-emoji-modifier-base-1.0.0" + sources."update-browserslist-db-1.0.5" sources."uri-js-4.4.1" sources."validate-npm-package-license-3.0.4" sources."which-1.3.1" @@ -91925,7 +92313,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."yallist-4.0.0" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.10.0" @@ -91964,8 +92352,8 @@ in src = ../../applications/video/epgstation; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -91997,19 +92385,19 @@ in }) sources."@fluentui/date-time-utilities-8.5.1" sources."@fluentui/dom-utilities-2.2.1" - sources."@fluentui/font-icons-mdl2-8.4.1" - sources."@fluentui/foundation-legacy-8.2.8" + sources."@fluentui/font-icons-mdl2-8.4.5" + sources."@fluentui/foundation-legacy-8.2.12" sources."@fluentui/keyboard-key-0.4.1" sources."@fluentui/merge-styles-8.5.2" - sources."@fluentui/react-8.77.0" - sources."@fluentui/react-focus-8.7.0" - sources."@fluentui/react-hooks-8.6.0" - sources."@fluentui/react-portal-compat-context-9.0.0-rc.2" + sources."@fluentui/react-8.86.3" + sources."@fluentui/react-focus-8.7.6" + sources."@fluentui/react-hooks-8.6.4" + sources."@fluentui/react-portal-compat-context-9.0.1" sources."@fluentui/react-window-provider-2.2.1" sources."@fluentui/set-version-8.2.1" - sources."@fluentui/style-utilities-8.7.0" - sources."@fluentui/theme-2.6.6" - sources."@fluentui/utilities-8.8.3" + sources."@fluentui/style-utilities-8.7.4" + sources."@fluentui/theme-2.6.9" + sources."@fluentui/utilities-8.10.1" (sources."@gulp-sourcemaps/identity-map-2.0.1" // { dependencies = [ sources."acorn-6.4.2" @@ -92031,7 +92419,7 @@ in ]; }) sources."@humanwhocodes/object-schema-1.2.1" - sources."@microsoft/load-themed-styles-1.10.270" + sources."@microsoft/load-themed-styles-1.10.285" sources."@node-rs/crc32-1.5.1" sources."@node-rs/crc32-android-arm-eabi-1.5.1" sources."@node-rs/crc32-android-arm64-1.5.1" @@ -92063,12 +92451,12 @@ in sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.29" + sources."@types/express-serve-static-core-4.17.30" sources."@types/file-type-10.9.1" sources."@types/js-yaml-4.0.4" sources."@types/json-schema-7.0.11" sources."@types/lodash-4.14.176" - sources."@types/mime-1.3.2" + sources."@types/mime-3.0.0" sources."@types/minimist-1.2.2" sources."@types/mkdirp-1.0.2" sources."@types/mongodb-4.0.6" @@ -92076,14 +92464,14 @@ in sources."@types/node-16.11.6" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/serve-static-1.13.10" + sources."@types/serve-static-1.15.0" sources."@types/socket.io-3.0.1" sources."@types/source-map-support-0.5.4" sources."@types/sqlite3-3.1.7" sources."@types/url-join-4.0.1" sources."@types/uuid-3.4.10" sources."@types/webidl-conversions-6.1.1" - sources."@types/whatwg-url-8.2.1" + sources."@types/whatwg-url-8.2.2" sources."@types/ws-6.0.4" (sources."@typescript-eslint/eslint-plugin-4.33.0" // { dependencies = [ @@ -92224,7 +92612,7 @@ in sources."body-parser-1.19.0" sources."brace-expansion-2.0.1" sources."braces-3.0.2" - sources."bson-4.6.4" + sources."bson-4.6.5" sources."buffer-5.7.1" sources."buffer-equal-1.0.0" sources."buffer-from-1.1.2" @@ -92304,7 +92692,7 @@ in }) sources."clone-2.1.2" sources."clone-buffer-1.0.0" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."clone-stats-1.0.0" (sources."cloneable-readable-1.1.3" // { dependencies = [ @@ -92391,7 +92779,7 @@ in }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."denque-2.0.1" + sources."denque-2.1.0" sources."depd-1.1.2" sources."destroy-1.0.4" sources."detect-file-1.0.0" @@ -92409,7 +92797,7 @@ in sources."diskusage-ng-1.0.2" sources."doctrine-3.0.0" sources."dotenv-8.6.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" (sources."duplexify-3.7.1" // { dependencies = [ sources."isarray-1.0.0" @@ -92432,10 +92820,10 @@ in ]; }) sources."engine.io-parser-5.0.4" - sources."enhanced-resolve-5.9.3" + sources."enhanced-resolve-5.10.0" sources."enquirer-2.3.6" sources."error-ex-1.3.2" - sources."es5-ext-0.10.61" + 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" @@ -92513,7 +92901,7 @@ in sources."express-openapi-9.3.0" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.6.0" + sources."type-2.7.0" ]; }) sources."extend-3.0.2" @@ -92561,7 +92949,7 @@ in (sources."flat-cache-3.0.4" // { dependencies = [ sources."brace-expansion-1.1.11" - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."glob-7.2.3" sources."minimatch-3.1.2" sources."rimraf-3.0.2" @@ -92620,7 +93008,7 @@ in sources."glob-watcher-5.0.5" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" - sources."globals-13.15.0" + sources."globals-13.17.0" sources."globby-11.1.0" sources."glogg-1.0.2" sources."got-9.6.0" @@ -92773,7 +93161,7 @@ in sources."interpret-1.4.0" sources."inversify-5.1.1" sources."invert-kv-1.0.0" - sources."ip-1.1.8" + sources."ip-2.0.0" sources."ip-num-1.4.0" sources."ipaddr.js-1.9.1" sources."is-absolute-1.0.0" @@ -92948,7 +93336,7 @@ in ]; }) sources."openapi-types-7.2.3" - sources."swagger-ui-dist-4.12.0" + sources."swagger-ui-dist-4.13.2" ]; }) (sources."mixin-deep-1.3.2" // { @@ -92957,8 +93345,8 @@ in ]; }) sources."mkdirp-1.0.4" - sources."mongodb-4.7.0" - sources."mongodb-connection-string-url-2.5.2" + sources."mongodb-4.8.1" + sources."mongodb-connection-string-url-2.5.3" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" @@ -93006,7 +93394,7 @@ in sources."tar-2.2.2" ]; }) - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."minimist-1.2.6" @@ -93161,7 +93549,7 @@ in sources."progress-2.0.3" sources."promise-queue-2.2.5" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" (sources."pumpify-1.5.1" // { dependencies = [ @@ -93312,13 +93700,13 @@ in ]; }) sources."socket.io-adapter-2.3.3" - (sources."socket.io-parser-4.0.4" // { + (sources."socket.io-parser-4.0.5" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."socks-2.6.2" + sources."socks-2.7.0" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.20" @@ -93423,14 +93811,14 @@ in sources."to-regex-range-5.0.1" sources."to-through-2.0.0" sources."toidentifier-1.0.0" - sources."token-types-4.2.0" + sources."token-types-4.2.1" sources."tough-cookie-2.5.0" sources."tr46-3.0.0" sources."ts-loader-9.2.6" sources."ts-log-2.2.4" (sources."ts-node-10.4.0" // { dependencies = [ - sources."acorn-8.7.1" + sources."acorn-8.8.0" ]; }) sources."tslib-2.4.0" @@ -93553,7 +93941,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; }) sources."yargs-parser-20.2.9" @@ -93578,9 +93966,9 @@ in src = ../../applications/video/epgstation/client; dependencies = [ sources."@achrinza/node-ipc-9.2.2" - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."acorn-7.4.1" @@ -93619,23 +94007,23 @@ in sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.29" + sources."@types/express-serve-static-core-4.17.30" sources."@types/glob-7.2.0" sources."@types/hls.js-0.13.3" sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" sources."@types/json-stable-stringify-1.0.33" sources."@types/lodash-4.14.178" - sources."@types/mime-1.3.2" + sources."@types/mime-3.0.0" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" - sources."@types/serve-static-1.13.10" + sources."@types/serve-static-1.15.0" sources."@types/smoothscroll-polyfill-0.3.1" sources."@types/socket.io-client-1.4.36" sources."@types/source-list-map-0.1.2" @@ -93664,7 +94052,7 @@ in sources."@typescript-eslint/types-4.33.0" sources."@typescript-eslint/typescript-estree-4.33.0" sources."@typescript-eslint/visitor-keys-4.33.0" - sources."@vue/cli-overlay-4.5.18" + sources."@vue/cli-overlay-4.5.19" (sources."@vue/cli-plugin-eslint-4.5.12" // { dependencies = [ sources."@nodelib/fs.stat-1.1.3" @@ -93700,7 +94088,7 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."@vue/cli-plugin-router-4.5.18" + sources."@vue/cli-plugin-router-4.5.19" (sources."@vue/cli-plugin-typescript-4.5.13" // { dependencies = [ sources."@nodelib/fs.stat-1.1.3" @@ -93751,7 +94139,7 @@ in sources."universalify-0.1.2" ]; }) - (sources."@vue/cli-shared-utils-4.5.18" // { + (sources."@vue/cli-shared-utils-4.5.19" // { dependencies = [ sources."lru-cache-5.1.1" sources."semver-6.3.0" @@ -93903,7 +94291,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -93945,7 +94333,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -93989,7 +94377,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" (sources."clipboardy-2.3.0" // { dependencies = [ @@ -94109,7 +94497,7 @@ in }) sources."cyclist-1.0.1" sources."dashdash-1.14.1" - sources."date-fns-2.28.0" + sources."date-fns-2.29.1" sources."de-indent-1.0.2" sources."debug-4.3.4" sources."decache-4.6.1" @@ -94186,7 +94574,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.164" + sources."electron-to-chromium-1.4.211" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -94360,7 +94748,7 @@ in sources."rimraf-3.0.2" ]; }) - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."flush-write-stream-1.1.1" sources."follow-redirects-1.15.1" sources."for-in-1.0.2" @@ -94412,7 +94800,7 @@ in sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" - (sources."globals-13.15.0" // { + (sources."globals-13.17.0" // { dependencies = [ sources."type-fest-0.20.2" ]; @@ -94487,7 +94875,7 @@ in }) sources."http-deceiver-1.2.7" sources."http-errors-2.0.0" - sources."http-parser-js-0.5.6" + sources."http-parser-js-0.5.8" sources."http-proxy-1.18.1" sources."http-proxy-middleware-1.3.1" sources."http-signature-1.2.0" @@ -94639,7 +95027,7 @@ in sources."md5.js-1.3.5" sources."mdn-data-2.0.4" sources."media-typer-0.3.0" - sources."memfs-3.4.6" + sources."memfs-3.4.7" sources."memory-fs-0.4.1" sources."merge-descriptors-1.0.1" (sources."merge-source-map-1.1.0" // { @@ -94670,7 +95058,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."mississippi-3.0.0" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -94698,7 +95086,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" (sources."normalize-package-data-2.5.0" // { dependencies = [ sources."semver-5.7.1" @@ -94939,7 +95327,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" (sources."public-encrypt-4.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -95215,7 +95603,7 @@ in ]; }) sources."tapable-1.1.3" - (sources."terser-4.8.0" // { + (sources."terser-4.8.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -95299,6 +95687,7 @@ in ]; }) sources."upath-1.2.0" + sources."update-browserslist-db-1.0.5" sources."upper-case-1.1.3" sources."uri-js-4.4.1" sources."urix-0.1.0" @@ -95340,7 +95729,7 @@ in ]; }) sources."vue-hot-reload-api-2.3.4" - (sources."vue-loader-15.9.8" // { + (sources."vue-loader-15.10.0" // { dependencies = [ sources."hash-sum-1.0.2" ]; @@ -95554,23 +95943,29 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "8.18.0"; + version = "8.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz"; - sha512 = "As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.21.0.tgz"; + sha512 = "/XJ1+Qurf1T9G2M5IHrsjp+xrGT73RZf23xA1z5wB1ZzzEAWSZKvRwhWxTFp1rvkvCfwcvAUNAP31bhKTTGfDA=="; }; dependencies = [ sources."@eslint/eslintrc-1.3.0" - sources."@humanwhocodes/config-array-0.9.5" + sources."@humanwhocodes/config-array-0.10.4" + sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/object-schema-1.2.1" - sources."acorn-8.7.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.0" 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-union-2.1.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."callsites-3.1.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" @@ -95579,6 +95974,7 @@ in sources."cross-spawn-7.0.3" sources."debug-4.3.4" sources."deep-is-0.1.4" + sources."dir-glob-3.0.1" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" sources."eslint-scope-7.1.1" @@ -95588,22 +95984,32 @@ in ]; }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.2" + sources."espree-9.3.3" sources."esquery-1.4.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" + (sources."fast-glob-3.2.11" // { + dependencies = [ + sources."glob-parent-5.1.2" + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.13.0" sources."file-entry-cache-6.0.1" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.15.0" + sources."globals-13.17.0" + sources."globby-11.1.0" + sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" sources."ignore-5.2.0" sources."import-fresh-3.3.0" @@ -95612,31 +96018,45 @@ in sources."inherits-2.0.4" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" + sources."is-number-7.0.0" 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."levn-0.4.1" + sources."locate-path-6.0.0" sources."lodash.merge-4.6.2" + sources."merge2-1.4.1" + sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."ms-2.1.2" sources."natural-compare-1.4.0" 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-type-4.0.0" + sources."picomatch-2.3.1" sources."prelude-ls-1.2.1" sources."punycode-2.1.1" + sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" sources."resolve-from-4.0.0" + sources."reusify-1.0.4" sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."slash-3.0.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" sources."text-table-0.2.0" + sources."to-regex-range-5.0.1" sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."uri-js-4.4.1" @@ -95644,6 +96064,7 @@ in sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -95665,16 +96086,22 @@ in }; dependencies = [ sources."@eslint/eslintrc-1.3.0" - sources."@humanwhocodes/config-array-0.9.5" + sources."@humanwhocodes/config-array-0.10.4" + sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/object-schema-1.2.1" - sources."acorn-8.7.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.0" 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-union-2.1.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."callsites-3.1.0" (sources."chalk-4.1.2" // { dependencies = [ @@ -95688,9 +96115,10 @@ in sources."cross-spawn-7.0.3" sources."debug-4.3.4" sources."deep-is-0.1.4" + sources."dir-glob-3.0.1" sources."doctrine-3.0.0" sources."escape-string-regexp-4.0.0" - sources."eslint-8.18.0" + sources."eslint-8.21.0" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -95698,22 +96126,32 @@ in ]; }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.2" + sources."espree-9.3.3" sources."esquery-1.4.0" sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."fast-deep-equal-3.1.3" + (sources."fast-glob-3.2.11" // { + dependencies = [ + sources."glob-parent-5.1.2" + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."fastq-1.13.0" sources."file-entry-cache-6.0.1" + sources."fill-range-7.0.1" + sources."find-up-5.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.2.3" sources."glob-parent-6.0.2" - sources."globals-13.15.0" + sources."globals-13.17.0" + sources."globby-11.1.0" + sources."grapheme-splitter-1.0.4" sources."has-flag-4.0.0" sources."ignore-5.2.0" sources."import-fresh-3.3.0" @@ -95722,32 +96160,46 @@ in sources."inherits-2.0.4" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" + sources."is-number-7.0.0" 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."levn-0.4.1" + sources."locate-path-6.0.0" sources."lodash.merge-4.6.2" + sources."merge2-1.4.1" + sources."micromatch-4.0.5" sources."minimatch-3.1.2" sources."ms-2.1.2" sources."nanolru-1.0.0" sources."natural-compare-1.4.0" 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-type-4.0.0" + sources."picomatch-2.3.1" sources."prelude-ls-1.2.1" sources."punycode-2.1.1" + sources."queue-microtask-1.2.3" sources."regexpp-3.2.0" sources."resolve-from-4.0.0" + sources."reusify-1.0.4" sources."rimraf-3.0.2" + sources."run-parallel-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."slash-3.0.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" sources."text-table-0.2.0" + sources."to-regex-range-5.0.1" sources."type-check-0.4.0" sources."type-fest-0.20.2" sources."uri-js-4.4.1" @@ -95755,6 +96207,7 @@ in sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -95786,10 +96239,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "5.4.11"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-5.4.11.tgz"; - sha512 = "AWx0Zr3YYnnAQkVLxL98zBgj7CLyiTlKtiRMeexYkW0o4O85udfokF4FSCDFWf7YHrGg17PfNGKzlNya0Ths7w=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-6.0.1.tgz"; + sha512 = "p9eQapTdhOg2JmTSY6RwX31LSyWjrQJrit+G44jSAlYI/3G8nJkIOdNDLWHPjA2USJPArAuPChFwn3uT0ggBzQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -95799,34 +96252,35 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.18.2" - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helpers-7.18.2" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/generator-7.18.10" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.18.9" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helpers-7.18.9" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.18.5" + sources."@babel/parser-7.18.10" sources."@babel/runtime-7.9.0" - (sources."@babel/template-7.16.7" // { + (sources."@babel/template-7.18.10" // { dependencies = [ - sources."@babel/code-frame-7.16.7" + sources."@babel/code-frame-7.18.6" ]; }) - (sources."@babel/traverse-7.18.5" // { + (sources."@babel/traverse-7.18.10" // { dependencies = [ - sources."@babel/code-frame-7.16.7" + sources."@babel/code-frame-7.18.6" ]; }) - sources."@babel/types-7.18.4" + sources."@babel/types-7.18.10" sources."@expo/apple-utils-0.0.0-alpha.31" sources."@expo/bunyan-4.0.0" sources."@expo/config-6.0.24" @@ -95836,8 +96290,7 @@ in ]; }) sources."@expo/config-types-45.0.0" - sources."@expo/dev-server-0.1.113" - sources."@expo/dev-tools-0.13.158" + sources."@expo/dev-server-0.1.115" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -95845,9 +96298,8 @@ in sources."sudo-prompt-8.2.5" ]; }) - (sources."@expo/image-utils-0.3.20" // { + (sources."@expo/image-utils-0.3.21" // { dependencies = [ - sources."mime-2.6.0" sources."temp-dir-1.0.0" sources."tempy-0.3.0" sources."type-fest-0.3.1" @@ -95856,7 +96308,7 @@ in sources."@expo/json-file-8.2.36" sources."@expo/metro-config-0.3.18" sources."@expo/osascript-2.0.33" - (sources."@expo/package-manager-0.0.55" // { + (sources."@expo/package-manager-0.0.56" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" @@ -95868,13 +96320,13 @@ in sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-4.0.2" + sources."@expo/prebuild-config-4.0.3" sources."@expo/rudder-sdk-node-1.1.1" - sources."@expo/schemer-1.4.2" + sources."@expo/schemer-1.4.3" sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/spawn-async-1.5.0" - sources."@expo/webpack-config-0.16.24" - (sources."@expo/xcpretty-4.1.3" // { + sources."@expo/webpack-config-0.17.0" + (sources."@expo/xcpretty-4.2.2" // { dependencies = [ sources."js-yaml-4.1.0" ]; @@ -95882,11 +96334,11 @@ in sources."@gar/promisify-1.1.3" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" - sources."@jridgewell/gen-mapping-0.3.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + 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.14" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -95916,7 +96368,7 @@ in sources."@types/json-schema-7.0.11" sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-9.6.61" + sources."@types/node-18.6.3" sources."@types/q-1.5.5" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.2" @@ -95955,7 +96407,6 @@ in sources."@webassemblyjs/wasm-parser-1.9.0" sources."@webassemblyjs/wast-parser-1.9.0" sources."@webassemblyjs/wast-printer-1.9.0" - sources."@wry/equality-0.1.11" sources."@xmldom/xmldom-0.7.5" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" @@ -95983,8 +96434,6 @@ in sources."ansi-styles-3.2.1" sources."any-promise-1.3.0" sources."anymatch-3.1.2" - sources."apollo-link-1.2.1" - sources."apollo-utilities-1.3.4" sources."application-config-path-0.1.0" sources."aproba-1.2.0" sources."argparse-2.0.1" @@ -96022,7 +96471,6 @@ in sources."schema-utils-2.7.1" ]; }) - sources."backo2-1.0.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -96030,7 +96478,6 @@ in ]; }) sources."base64-js-1.5.1" - sources."base64url-3.0.1" sources."batch-0.6.1" sources."better-opn-3.0.2" sources."big-integer-1.6.51" @@ -96056,7 +96503,7 @@ in sources."type-fest-0.20.2" ]; }) - sources."bplist-creator-0.1.0" + sources."bplist-creator-0.1.1" sources."bplist-parser-0.2.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -96072,11 +96519,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - (sources."browserslist-4.20.4" // { - dependencies = [ - sources."picocolors-1.0.0" - ]; - }) + sources."browserslist-4.21.3" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -96105,7 +96548,7 @@ in }) sources."camelcase-6.3.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -96155,7 +96598,7 @@ in }) sources."cli-boxes-2.2.1" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-table3-0.6.2" (sources."cliui-5.0.0" // { dependencies = [ @@ -96168,7 +96611,7 @@ in ]; }) sources."clone-1.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" (sources."coa-2.0.2" // { dependencies = [ sources."chalk-2.4.2" @@ -96313,7 +96756,6 @@ in }) sources."delayed-stream-1.0.0" sources."depd-1.1.2" - sources."deprecated-decorator-0.1.6" sources."des.js-1.0.1" sources."destroy-1.0.4" sources."detect-node-2.1.0" @@ -96354,10 +96796,10 @@ in }) sources."dot-prop-5.3.0" sources."duplexer-0.1.2" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."duplexify-3.7.1" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96392,7 +96834,7 @@ in }) sources."estraverse-4.3.0" sources."etag-1.8.1" - sources."eventemitter3-2.0.3" + sources."eventemitter3-4.0.7" sources."events-3.3.0" sources."eventsource-1.1.2" sources."evp_bytestokey-1.0.3" @@ -96429,9 +96871,13 @@ in sources."fs-extra-9.1.0" ]; }) - (sources."expo-pwa-0.0.119" // { + (sources."expo-pwa-0.0.122" // { dependencies = [ + sources."@expo/image-utils-0.3.22" sources."commander-2.20.0" + sources."temp-dir-1.0.0" + sources."tempy-0.3.0" + sources."type-fest-0.3.1" ]; }) (sources."express-4.16.4" // { @@ -96545,12 +96991,6 @@ in sources."globby-11.1.0" sources."got-11.8.5" sources."graceful-fs-4.2.10" - sources."graphql-0.13.2" - (sources."graphql-tools-3.0.0" // { - dependencies = [ - sources."uuid-3.4.0" - ]; - }) sources."gzip-size-5.1.1" sources."handle-thing-2.0.1" sources."has-1.0.3" @@ -96610,11 +97050,7 @@ in sources."inherits-2.0.3" ]; }) - (sources."http-proxy-1.18.1" // { - dependencies = [ - sources."eventemitter3-4.0.7" - ]; - }) + sources."http-proxy-1.18.1" (sources."http-proxy-middleware-0.19.1" // { dependencies = [ sources."braces-2.3.2" @@ -96633,7 +97069,7 @@ in sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."ignore-5.2.0" - sources."image-size-1.0.1" + sources."image-size-1.0.2" sources."immer-8.0.1" (sources."import-fresh-2.0.0" // { dependencies = [ @@ -96729,7 +97165,6 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - sources."iterall-1.2.2" (sources."jest-worker-26.6.2" // { dependencies = [ sources."has-flag-4.0.0" @@ -96759,7 +97194,7 @@ in sources."json5-1.0.1" sources."jsonfile-6.1.0" sources."keychain-1.3.0" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."killable-1.0.1" sources."kind-of-6.0.3" sources."kleur-3.0.3" @@ -96775,9 +97210,6 @@ in }) sources."locate-path-6.0.0" sources."lodash-4.17.21" - sources."lodash.assign-4.2.0" - sources."lodash.isobject-3.0.2" - sources."lodash.isstring-4.0.1" sources."lodash.memoize-4.1.2" sources."lodash.uniq-4.5.0" (sources."log-symbols-2.2.0" // { @@ -96818,7 +97250,7 @@ in sources."bn.js-4.12.0" ]; }) - sources."mime-1.4.1" + sources."mime-2.6.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-1.2.0" @@ -96880,7 +97312,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-path-3.0.0" sources."normalize-url-6.1.0" (sources."npm-package-arg-6.1.0" // { @@ -97034,7 +97466,7 @@ in sources."path-exists-3.0.0" ]; }) - sources."plist-3.0.5" + sources."plist-3.0.6" sources."pngjs-3.4.0" sources."pnp-webpack-plugin-1.7.0" (sources."portfinder-1.0.28" // { @@ -97270,7 +97702,7 @@ in }) sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."retry-0.12.0" @@ -97300,6 +97732,7 @@ in sources."debug-2.6.9" sources."http-errors-1.6.3" sources."inherits-2.0.3" + sources."mime-1.4.1" sources."ms-2.0.0" sources."setprototypeof-1.1.0" sources."statuses-1.4.0" @@ -97331,9 +97764,9 @@ in sources."shell-quote-1.7.2" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - (sources."simple-plist-1.3.1" // { + (sources."simple-plist-1.4.0" // { dependencies = [ - sources."bplist-parser-0.3.1" + sources."bplist-parser-0.3.2" ]; }) (sources."simple-swizzle-0.2.2" // { @@ -97447,8 +97880,7 @@ in sources."postcss-selector-parser-3.1.2" ]; }) - sources."subscriptions-transport-ws-0.9.8" - (sources."sucrase-3.21.0" // { + (sources."sucrase-3.25.0" // { dependencies = [ sources."commander-4.1.1" ]; @@ -97477,7 +97909,6 @@ in sources."nth-check-1.0.2" ]; }) - sources."symbol-observable-1.2.0" sources."tapable-1.1.3" (sources."tar-6.1.11" // { dependencies = [ @@ -97493,7 +97924,7 @@ in ]; }) sources."terminal-link-2.1.1" - (sources."terser-4.8.0" // { + (sources."terser-4.8.1" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.6.1" @@ -97541,7 +97972,6 @@ in sources."traverse-0.6.6" sources."tree-kill-1.2.2" sources."ts-interface-checker-0.1.13" - sources."ts-invariant-0.4.4" sources."ts-pnp-1.2.0" sources."tslib-1.14.1" sources."tty-browserify-0.0.0" @@ -97549,7 +97979,6 @@ in sources."type-fest-0.12.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."ultron-1.1.1" sources."unbox-primitive-1.0.2" sources."union-value-1.0.1" sources."uniq-1.0.1" @@ -97572,6 +98001,11 @@ in }) sources."untildify-3.0.3" sources."upath-1.2.0" + (sources."update-browserslist-db-1.0.5" // { + dependencies = [ + sources."picocolors-1.0.0" + ]; + }) sources."update-check-1.5.3" sources."uri-js-4.4.1" sources."urix-0.1.0" @@ -97650,11 +98084,7 @@ in sources."yallist-3.1.1" ]; }) - (sources."webpack-dev-middleware-3.7.3" // { - dependencies = [ - sources."mime-2.6.0" - ]; - }) + sources."webpack-dev-middleware-3.7.3" (sources."webpack-dev-server-3.11.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -97727,7 +98157,6 @@ in sources."supports-color-6.1.0" sources."to-regex-range-2.1.1" sources."toidentifier-1.0.1" - sources."ws-6.2.2" ]; }) (sources."webpack-log-2.0.0" // { @@ -97766,13 +98195,13 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-3.3.3" + sources."ws-6.2.2" (sources."xcode-3.0.1" // { dependencies = [ sources."uuid-7.0.3" ]; }) - (sources."xdl-59.2.41" // { + (sources."xdl-59.2.49" // { dependencies = [ sources."bplist-parser-0.3.2" sources."minimatch-3.0.4" @@ -97784,7 +98213,7 @@ in sources."xmlbuilder-11.0.1" ]; }) - sources."xmlbuilder-9.0.7" + sources."xmlbuilder-15.1.1" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -97808,8 +98237,6 @@ in ]; }) sources."yocto-queue-0.1.0" - sources."zen-observable-0.8.15" - sources."zen-observable-ts-0.8.21" ]; buildInputs = globalBuildInputs; meta = { @@ -97831,45 +98258,46 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - sources."@babel/core-7.18.5" - (sources."@babel/generator-7.18.2" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + sources."@babel/core-7.18.10" + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-compilation-targets-7.18.2" - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/plugin-proposal-object-rest-spread-7.18.0" - sources."@babel/plugin-syntax-jsx-7.17.12" + sources."@babel/helper-annotate-as-pure-7.18.6" + sources."@babel/helper-compilation-targets-7.18.9" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.18.9" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.18.9" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helpers-7.18.9" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-syntax-jsx-7.18.6" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.18.0" - sources."@babel/plugin-transform-parameters-7.17.12" - sources."@babel/plugin-transform-react-jsx-7.17.12" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-parameters-7.18.8" + sources."@babel/plugin-transform-react-jsx-7.18.10" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + 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.14" sources."@types/minimist-1.2.2" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/normalize-package-data-2.4.1" sources."@types/yauzl-2.10.0" sources."@types/yoga-layout-1.9.2" @@ -97888,7 +98316,7 @@ in sources."base64-js-1.5.1" sources."bl-4.1.0" sources."brace-expansion-1.1.11" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."caller-callsite-4.1.0" @@ -97896,13 +98324,13 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" sources."chalk-2.4.2" sources."chownr-1.1.4" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-truncate-2.1.0" sources."code-excerpt-3.0.0" sources."color-convert-1.9.3" @@ -97921,7 +98349,7 @@ in }) sources."delay-5.0.0" sources."devtools-protocol-0.0.981744" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -97988,7 +98416,7 @@ in sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."node-fetch-2.6.7" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" (sources."normalize-package-data-3.0.3" // { dependencies = [ sources."semver-7.3.7" @@ -98018,7 +98446,7 @@ in }) sources."quick-lru-4.0.1" sources."react-17.0.2" - sources."react-devtools-core-4.24.7" + sources."react-devtools-core-4.25.0" sources."react-reconciler-0.26.2" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -98078,6 +98506,7 @@ in sources."trim-newlines-3.0.1" sources."type-fest-0.12.0" sources."unbzip2-stream-1.4.3" + sources."update-browserslist-db-1.0.5" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."webidl-conversions-3.0.1" @@ -98091,7 +98520,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."yallist-4.0.0" sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" @@ -98214,7 +98643,7 @@ in sources."clean-stack-3.0.1" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-table-0.3.11" (sources."cli-ux-4.9.3" // { dependencies = [ @@ -98248,7 +98677,7 @@ in sources."semver-5.7.1" ]; }) - sources."csv-parse-5.2.0" + sources."csv-parse-5.3.0" sources."csv-stream-0.2.0" sources."dashdash-1.14.1" sources."debug-4.3.4" @@ -98259,7 +98688,7 @@ in sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" sources."dotenv-8.6.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" sources."escape-string-regexp-4.0.0" @@ -98369,7 +98798,7 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" (sources."netrc-parser-3.1.6" // { @@ -98404,12 +98833,12 @@ in sources."prepend-http-2.0.0" sources."prettier-2.7.1" sources."process-nextick-args-2.0.1" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."query-string-5.1.1" sources."queue-microtask-1.2.3" - sources."rate-limiter-flexible-2.3.7" + sources."rate-limiter-flexible-2.3.8" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -98424,7 +98853,7 @@ in sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.7" @@ -98498,10 +98927,10 @@ in firebase-tools = nodeEnv.buildNodePackage { name = "firebase-tools"; packageName = "firebase-tools"; - version = "11.1.0"; + version = "11.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.1.0.tgz"; - sha512 = "6nBFOiuxsKl8AbPnsiBck7HT682cHzMuoRrXzajuNWjwTYvh4oW25BF/iLGP7MAGzI4Xuo2NDXwjDLg6HIR78Q=="; + url = "https://registry.npmjs.org/firebase-tools/-/firebase-tools-11.4.2.tgz"; + sha512 = "qNFFDwyzRe8kwJwYIOjfV1OIa2+DbJ6jXfAXEhmEx2fgQZ0EwVjkJB5kWo+K4Mt+Qc0SItLyFvz8GSYWSg+mpQ=="; }; dependencies = [ (sources."@apidevtools/json-schema-ref-parser-9.0.9" // { @@ -98509,31 +98938,28 @@ in sources."js-yaml-4.1.0" ]; }) + sources."@babel/parser-7.18.10" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" sources."@gar/promisify-1.1.3" sources."@google-cloud/paginator-4.0.0" - sources."@google-cloud/precise-date-2.0.4" - sources."@google-cloud/projectify-2.1.1" + sources."@google-cloud/precise-date-3.0.0" + sources."@google-cloud/projectify-3.0.0" sources."@google-cloud/promisify-2.0.4" - (sources."@google-cloud/pubsub-3.0.1" // { + (sources."@google-cloud/pubsub-3.1.0" // { dependencies = [ - sources."google-auth-library-8.0.2" + sources."google-auth-library-8.1.1" ]; }) - sources."@grpc/grpc-js-1.6.7" - sources."@grpc/proto-loader-0.6.13" + sources."@grpc/grpc-js-1.6.8" + sources."@grpc/proto-loader-0.7.0" sources."@jsdevtools/ono-7.1.3" - (sources."@npmcli/fs-2.1.0" // { + (sources."@npmcli/fs-2.1.1" // { dependencies = [ sources."semver-7.3.7" ]; }) - (sources."@npmcli/move-file-2.0.0" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) + sources."@npmcli/move-file-2.0.0" sources."@opentelemetry/api-1.1.0" sources."@opentelemetry/semantic-conventions-1.3.1" sources."@protobufjs/aspromise-1.1.2" @@ -98551,12 +98977,16 @@ in sources."@tootallnate/once-1.1.2" sources."@types/duplexify-3.6.1" sources."@types/json-schema-7.0.11" + sources."@types/linkify-it-3.0.2" sources."@types/long-4.0.2" - sources."@types/node-18.0.0" + sources."@types/markdown-it-12.2.3" + sources."@types/mdurl-1.0.2" + sources."@types/node-18.6.3" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" sources."accepts-1.3.8" - sources."acorn-8.7.1" + sources."acorn-8.8.0" + sources."acorn-jsx-5.3.2" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" (sources."agentkeepalive-4.2.1" // { @@ -98587,7 +99017,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."are-we-there-yet-3.0.0" + sources."are-we-there-yet-3.0.1" sources."argparse-2.0.1" sources."array-flatten-1.1.1" sources."arrify-2.0.1" @@ -98613,7 +99043,7 @@ in sources."binary-0.3.0" sources."binary-extensions-2.2.0" sources."bl-4.1.0" - sources."bluebird-3.4.7" + sources."bluebird-3.7.2" (sources."body-parser-1.20.0" // { dependencies = [ sources."debug-2.6.9" @@ -98626,7 +99056,7 @@ in sources."type-fest-0.8.1" ]; }) - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" @@ -98636,11 +99066,9 @@ in sources."bytes-3.1.2" (sources."cacache-16.1.1" // { dependencies = [ - sources."brace-expansion-2.0.1" sources."glob-8.0.3" - sources."lru-cache-7.10.1" + sources."lru-cache-7.13.2" sources."minimatch-5.1.0" - sources."mkdirp-1.0.4" ]; }) (sources."cacheable-request-6.1.0" // { @@ -98654,6 +99082,7 @@ in sources."camelcase-5.3.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" + sources."catharsis-0.9.0" sources."chainsaw-0.1.0" sources."chalk-4.1.2" sources."chardet-0.7.0" @@ -98663,15 +99092,15 @@ in sources."cjson-0.3.3" sources."clean-stack-2.2.0" sources."cli-boxes-2.2.1" - sources."cli-color-2.0.2" + sources."cli-color-2.0.1" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-table-0.3.11" sources."cli-table3-0.6.2" sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" (sources."color-3.2.1" // { dependencies = [ sources."color-convert-1.9.3" @@ -98731,7 +99160,7 @@ in ]; }) sources."crypto-random-string-2.0.0" - sources."csv-parse-5.2.0" + sources."csv-parse-5.3.0" sources."d-1.0.1" sources."dashdash-1.14.1" sources."data-uri-to-buffer-3.0.1" @@ -98755,7 +99184,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."duplexify-4.1.2" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" @@ -98769,19 +99198,30 @@ in ]; }) sources."end-of-stream-1.4.4" + sources."entities-2.1.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."es5-ext-0.10.61" + (sources."es5-ext-0.10.53" // { + dependencies = [ + sources."next-tick-1.0.0" + ]; + }) sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."es6-weak-map-2.0.3" 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-1.14.3" + sources."escape-string-regexp-2.0.0" + (sources."escodegen-1.14.3" // { + dependencies = [ + sources."estraverse-4.3.0" + ]; + }) + sources."eslint-visitor-keys-3.3.0" + sources."espree-9.3.3" sources."esprima-4.0.1" - sources."estraverse-4.3.0" + sources."estraverse-5.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-emitter-0.3.5" @@ -98803,7 +99243,7 @@ in }) (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.6.0" + sources."type-2.7.0" ]; }) sources."extend-3.0.2" @@ -98823,7 +99263,11 @@ in ]; }) sources."fecha-4.2.3" - sources."figures-3.2.0" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) sources."file-uri-to-path-2.0.0" sources."filesize-6.4.0" sources."fill-range-7.0.1" @@ -98850,6 +99294,7 @@ in sources."fsevents-2.3.2" (sources."fstream-1.0.12" // { dependencies = [ + sources."mkdirp-0.5.6" sources."rimraf-2.7.1" ]; }) @@ -98862,7 +99307,7 @@ in }) sources."function-bind-1.1.1" sources."gauge-4.0.4" - sources."gaxios-5.0.0" + sources."gaxios-5.0.1" sources."gcp-metadata-5.0.0" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.2" @@ -98884,17 +99329,19 @@ in dependencies = [ sources."gaxios-4.3.3" sources."gcp-metadata-4.3.1" + sources."google-p12-pem-3.1.4" + sources."gtoken-5.3.2" ]; }) - (sources."google-gax-3.1.1" // { + (sources."google-gax-3.1.4" // { dependencies = [ - sources."google-auth-library-8.0.2" + sources."google-auth-library-8.1.1" ]; }) - sources."google-p12-pem-3.1.4" + sources."google-p12-pem-4.0.0" sources."got-9.6.0" sources."graceful-fs-4.2.10" - (sources."gtoken-5.3.2" // { + (sources."gtoken-6.1.0" // { dependencies = [ sources."gaxios-4.3.3" ]; @@ -98963,15 +99410,17 @@ in sources."argparse-1.0.10" ]; }) + sources."js2xmlparser-4.0.2" sources."jsbn-0.1.1" + sources."jsdoc-3.6.11" sources."json-bigint-1.0.0" sources."json-buffer-3.0.0" sources."json-parse-helpfulerror-1.0.3" - sources."json-ptr-3.1.0" + 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."jsonc-parser-3.0.0" + sources."jsonc-parser-3.1.0" sources."jsonfile-6.1.0" (sources."jsonwebtoken-8.5.1" // { dependencies = [ @@ -98983,6 +99432,7 @@ in 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" // { @@ -98996,6 +99446,7 @@ in sources."levn-0.3.0" sources."libsodium-0.7.10" sources."libsodium-wrappers-0.7.10" + sources."linkify-it-3.0.3" sources."listenercount-1.0.1" sources."lodash-4.17.21" sources."lodash._objecttypes-2.4.1" @@ -99014,7 +99465,7 @@ in sources."lodash.snakecase-4.1.1" sources."lodash.union-4.6.0" sources."log-symbols-4.1.0" - sources."logform-2.4.1" + sources."logform-2.4.2" sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -99024,15 +99475,17 @@ in sources."semver-6.3.0" ]; }) - (sources."make-fetch-happen-10.1.8" // { + (sources."make-fetch-happen-10.2.0" // { dependencies = [ sources."@tootallnate/once-2.0.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.10.1" + sources."lru-cache-7.13.2" sources."socks-proxy-agent-7.0.0" ]; }) - sources."marked-4.0.17" + sources."markdown-it-12.3.2" + sources."markdown-it-anchor-8.6.4" + sources."marked-4.0.18" (sources."marked-terminal-5.1.1" // { dependencies = [ sources."ansi-escapes-5.0.0" @@ -99040,6 +99493,7 @@ in sources."type-fest-1.4.0" ]; }) + sources."mdurl-1.0.1" sources."media-typer-0.3.0" sources."memoizee-0.4.15" sources."merge-descriptors-1.0.1" @@ -99049,16 +99503,20 @@ in sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" - sources."minimatch-3.1.2" + (sources."minimatch-3.1.2" // { + dependencies = [ + sources."brace-expansion-1.1.11" + ]; + }) sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-2.1.0" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" sources."minipass-sized-1.0.3" sources."minizlib-2.1.2" - sources."mkdirp-0.5.6" + sources."mkdirp-1.0.4" (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" @@ -99076,7 +99534,7 @@ in sources."node-emoji-1.11.0" sources."node-fetch-2.6.7" sources."node-forge-1.3.1" - (sources."node-gyp-9.0.0" // { + (sources."node-gyp-9.1.0" // { dependencies = [ sources."semver-7.3.7" sources."which-2.0.2" @@ -99120,6 +99578,7 @@ in dependencies = [ sources."async-2.6.4" sources."debug-3.2.7" + sources."mkdirp-0.5.6" ]; }) sources."prelude-ls-1.1.2" @@ -99133,8 +99592,19 @@ in sources."retry-0.12.0" ]; }) - sources."proto3-json-serializer-1.0.2" - sources."protobufjs-6.11.3" + sources."proto3-json-serializer-1.0.3" + (sources."protobufjs-7.0.0" // { + dependencies = [ + sources."long-5.2.0" + ]; + }) + (sources."protobufjs-cli-1.0.0" // { + dependencies = [ + sources."glob-8.0.3" + sources."minimatch-5.1.0" + sources."semver-7.3.7" + ]; + }) sources."proxy-addr-2.0.7" (sources."proxy-agent-5.0.0" // { dependencies = [ @@ -99143,17 +99613,25 @@ in ]; }) sources."proxy-from-env-1.1.0" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" sources."qs-6.10.3" sources."range-parser-1.2.1" sources."raw-body-2.5.1" - sources."rc-1.2.8" + (sources."rc-1.2.8" // { + dependencies = [ + sources."strip-json-comments-2.0.1" + ]; + }) sources."re2-1.17.7" sources."readable-stream-3.6.0" - sources."readdir-glob-1.1.1" + (sources."readdir-glob-1.1.2" // { + dependencies = [ + sources."minimatch-5.1.0" + ]; + }) sources."readdirp-3.6.0" sources."redeyed-2.1.1" sources."registry-auth-token-4.2.2" @@ -99167,6 +99645,7 @@ in }) sources."require-directory-2.1.1" sources."require-from-string-2.0.2" + sources."requizzle-0.2.3" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."retry-0.13.1" @@ -99180,7 +99659,7 @@ in ]; }) sources."run-async-2.4.1" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" @@ -99211,7 +99690,11 @@ in sources."signal-exit-3.0.7" sources."simple-swizzle-0.2.2" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + (sources."socks-2.7.0" // { + dependencies = [ + sources."ip-2.0.0" + ]; + }) sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" @@ -99231,13 +99714,14 @@ 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-3.1.1" (sources."superstatic-8.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."chalk-1.1.3" - sources."commander-9.3.0" + sources."commander-9.4.0" + sources."escape-string-regexp-1.0.5" sources."isarray-0.0.1" sources."path-to-regexp-1.8.0" sources."strip-ansi-3.0.1" @@ -99253,11 +99737,8 @@ in }) sources."supports-color-7.2.0" sources."supports-hyperlinks-2.2.0" - (sources."tar-6.1.11" // { - dependencies = [ - sources."mkdirp-1.0.4" - ]; - }) + sources."taffydb-2.6.2" + sources."tar-6.1.11" sources."tar-stream-2.2.0" (sources."tcp-port-used-1.0.2" // { dependencies = [ @@ -99285,6 +99766,9 @@ in sources."type-fest-0.21.3" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" + sources."uc.micro-1.0.6" + sources."uglify-js-3.16.3" + sources."underscore-1.13.4" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" @@ -99293,6 +99777,7 @@ in sources."unpipe-1.0.0" (sources."unzipper-0.10.11" // { dependencies = [ + sources."bluebird-3.4.7" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -99323,21 +99808,22 @@ in sources."core-util-is-1.0.2" ]; }) - sources."vm2-3.9.9" + sources."vm2-3.9.10" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" sources."wide-align-1.1.5" sources."widest-line-3.1.0" - sources."winston-3.7.2" + sources."winston-3.8.1" sources."winston-transport-4.5.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xdg-basedir-4.0.0" + sources."xmlcreate-2.0.4" sources."xregexp-2.0.0" sources."y18n-5.0.8" sources."yallist-4.0.0" @@ -99414,9 +99900,9 @@ in sha512 = "EkJbYwI1Wt3oujxNlFF0Mq3hqdkDtQz7cPhZnXzUxmNhaxVopDqiwnB3zZmVvt2t6uKvplh21kLTTJ11hWH+0w=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -99447,7 +99933,7 @@ in sources."chardet-0.7.0" sources."clean-stack-4.2.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-truncate-3.1.0" sources."cli-width-3.0.0" sources."clone-1.0.4" @@ -99520,7 +100006,7 @@ in sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" sources."map-obj-4.3.0" - (sources."meow-10.1.2" // { + (sources."meow-10.1.3" // { dependencies = [ sources."type-fest-1.4.0" ]; @@ -99572,7 +100058,7 @@ in sources."redent-4.0.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.7" @@ -99639,7 +100125,7 @@ in sources."@types/atob-2.1.2" sources."@types/bn.js-5.1.0" sources."@types/inquirer-6.5.0" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/pbkdf2-3.1.0" sources."@types/secp256k1-4.0.3" sources."@types/through-0.0.30" @@ -99661,7 +100147,7 @@ in sources."binary-search-tree-0.2.5" sources."blakejs-1.2.1" sources."bluebird-3.7.2" - sources."bn.js-4.12.0" + sources."bn.js-5.2.1" sources."brorand-1.1.0" sources."browserify-aes-1.2.0" sources."bs58-4.0.1" @@ -99688,17 +100174,17 @@ in sources."delayed-stream-1.0.0" sources."dotenv-8.6.0" sources."ecc-jsbn-0.1.2" - sources."elliptic-6.5.4" + (sources."elliptic-6.5.4" // { + dependencies = [ + sources."bn.js-4.12.0" + ]; + }) sources."emoji-regex-8.0.0" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."ethereum-bloom-filters-1.0.10" sources."ethereum-cryptography-0.1.3" - (sources."ethereumjs-util-7.1.5" // { - dependencies = [ - sources."bn.js-5.2.1" - ]; - }) + sources."ethereumjs-util-7.1.5" (sources."ethjs-unit-0.1.6" // { dependencies = [ sources."bn.js-4.11.6" @@ -99762,7 +100248,7 @@ in sources."nedb-1.8.0" sources."node-addon-api-2.0.2" sources."node-fetch-2.6.7" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" (sources."number-to-bn-1.7.0" // { dependencies = [ sources."bn.js-4.11.6" @@ -99778,7 +100264,7 @@ in sources."path-exists-4.0.0" sources."pbkdf2-3.1.2" sources."performance-now-2.1.0" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."querystring-0.2.1" @@ -99792,11 +100278,7 @@ in sources."require-main-filename-2.0.0" sources."restore-cursor-3.1.0" sources."ripemd160-2.0.2" - (sources."rlp-2.2.7" // { - dependencies = [ - sources."bn.js-5.2.1" - ]; - }) + sources."rlp-2.2.7" sources."run-async-2.4.1" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" @@ -99831,7 +100313,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."web3-utils-1.7.3" + sources."web3-utils-1.7.5" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-module-2.0.0" @@ -99918,7 +100400,7 @@ in }) sources."cache-base-1.0.1" sources."call-bind-1.0.2" - sources."caller-1.0.1" + sources."caller-1.1.0" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { dependencies = [ @@ -100093,7 +100575,7 @@ in sources."kind-of-6.0.3" sources."kuler-2.0.0" sources."lazy-1.0.11" - (sources."logform-2.4.1" // { + (sources."logform-2.4.2" // { dependencies = [ sources."ms-2.1.3" ]; @@ -100196,7 +100678,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."shush-1.0.1" + sources."shush-1.0.2" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."simple-swizzle-0.2.2" @@ -100297,7 +100779,7 @@ in sources."which-boxed-primitive-1.0.2" sources."which-collection-1.0.1" sources."which-typed-array-1.1.8" - (sources."winston-3.7.2" // { + (sources."winston-3.8.1" // { dependencies = [ sources."async-3.2.4" sources."readable-stream-3.6.0" @@ -100360,14 +100842,14 @@ in ganache = nodeEnv.buildNodePackage { name = "ganache"; packageName = "ganache"; - version = "7.3.1"; + version = "7.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/ganache/-/ganache-7.3.1.tgz"; - sha512 = "+IZPlCj1Tl019TIXgAAyDRLn0HDfx6Rg1TuiPPiNScVxRvz8EtQrlHc2yui8+oqjkZjYonW1Y5HvYSwifAQS6g=="; + url = "https://registry.npmjs.org/ganache/-/ganache-7.4.0.tgz"; + sha512 = "e1x0ZJsJ5zUP+hWtpSNv+FaavRdcrQhQwe+QZ4kVon5mDm6RgFpe3PzNDJXg82AeqqslohJeK9UinZbZzjewjQ=="; }; dependencies = [ sources."bufferutil-4.0.5" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" sources."utf-8-validate-5.0.7" ]; buildInputs = globalBuildInputs; @@ -100383,78 +100865,79 @@ in gatsby-cli = nodeEnv.buildNodePackage { name = "gatsby-cli"; packageName = "gatsby-cli"; - version = "4.17.0"; + version = "4.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.17.0.tgz"; - sha512 = "x1oxUVSWYEDxYl8sNTDTakMnCYKIbjwIAfGBhp1v3wK8WvqKz2+ICho6vvd2rXSkGGbwAg/gJ5g4/p78WOdRLw=="; + url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-4.20.0.tgz"; + sha512 = "PinzwqJOf27MGxhc8kqNplCYIYKpXF1dgYMXH0cEQVJVS9VsRKioW8bugvbxiTio9zqn58yyAUF41xVPnc3Yyg=="; }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - (sources."@babel/core-7.18.5" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + (sources."@babel/core-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.2" // { + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.7" - (sources."@babel/helper-compilation-targets-7.18.2" // { + sources."@babel/helper-annotate-as-pure-7.18.6" + (sources."@babel/helper-compilation-targets-7.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.0" - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.17.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-replace-supers-7.18.2" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.18.2" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.18.9" + 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.18.9" + sources."@babel/helper-optimise-call-expression-7.18.6" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-replace-supers-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helpers-7.18.9" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.18.5" - sources."@babel/plugin-syntax-typescript-7.17.12" - sources."@babel/plugin-transform-typescript-7.18.4" - sources."@babel/preset-typescript-7.17.12" - sources."@babel/runtime-7.18.3" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/parser-7.18.10" + sources."@babel/plugin-syntax-typescript-7.18.6" + sources."@babel/plugin-transform-typescript-7.18.10" + sources."@babel/preset-typescript-7.18.6" + sources."@babel/runtime-7.18.9" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" sources."@hapi/hoek-9.3.0" sources."@hapi/topo-5.1.0" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" - sources."@lmdb/lmdb-darwin-arm64-2.5.2" - sources."@lmdb/lmdb-darwin-x64-2.5.2" - sources."@lmdb/lmdb-linux-arm-2.5.2" - sources."@lmdb/lmdb-linux-arm64-2.5.2" - sources."@lmdb/lmdb-linux-x64-2.5.2" - sources."@lmdb/lmdb-win32-x64-2.5.2" - sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-2.0.2" - sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.0.2" - sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.0.2" - sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.0.2" - sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.0.2" - sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.0.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.14" + sources."@lmdb/lmdb-darwin-arm64-2.5.3" + sources."@lmdb/lmdb-darwin-x64-2.5.3" + sources."@lmdb/lmdb-linux-arm-2.5.3" + sources."@lmdb/lmdb-linux-arm64-2.5.3" + sources."@lmdb/lmdb-linux-x64-2.5.3" + sources."@lmdb/lmdb-win32-x64-2.5.3" + sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.1.2" sources."@sideway/address-4.1.4" sources."@sideway/formula-3.0.0" sources."@sideway/pinpoint-2.0.0" @@ -100468,7 +100951,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/node-fetch-2.6.2" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -100488,7 +100971,7 @@ in sources."boolbase-1.0.0" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.2" // { dependencies = [ @@ -100497,7 +100980,7 @@ in }) sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -100525,7 +101008,7 @@ in sources."wrap-ansi-6.2.0" ]; }) - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" @@ -100535,7 +101018,7 @@ in sources."configstore-5.0.1" sources."convert-hrtime-3.0.0" sources."convert-source-map-1.8.0" - sources."create-gatsby-2.17.0" + sources."create-gatsby-2.20.0" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" @@ -100561,8 +101044,8 @@ in sources."domhandler-4.3.1" sources."domutils-2.8.0" sources."dot-prop-5.3.0" - sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.4.164" + sources."duplexer3-0.1.5" + sources."electron-to-chromium-1.4.211" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-2.2.0" @@ -100589,7 +101072,7 @@ in }) sources."fastq-1.13.0" sources."figures-3.2.0" - sources."file-type-16.5.3" + sources."file-type-16.5.4" sources."filter-obj-1.1.0" sources."find-up-4.1.0" sources."form-data-3.0.1" @@ -100597,8 +101080,8 @@ in sources."fs-extra-10.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."gatsby-core-utils-3.17.0" - (sources."gatsby-telemetry-3.17.0" // { + sources."gatsby-core-utils-3.20.0" + (sources."gatsby-telemetry-3.20.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."boxen-4.2.0" @@ -100649,7 +101132,7 @@ in sources."is-npm-5.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" - sources."is-ssh-1.3.3" + sources."is-ssh-1.4.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" sources."is-valid-path-0.1.1" @@ -100662,10 +101145,10 @@ in sources."json-buffer-3.0.1" sources."json5-2.2.1" sources."jsonfile-6.1.0" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."kleur-3.0.3" sources."latest-version-5.1.0" - sources."lmdb-2.5.2" + sources."lmdb-2.5.3" sources."locate-path-5.0.0" sources."lock-1.1.0" sources."lodash-4.17.21" @@ -100685,19 +101168,15 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."ms-2.1.2" - sources."msgpackr-1.6.1" - (sources."msgpackr-extract-2.0.2" // { - dependencies = [ - sources."node-gyp-build-optional-packages-5.0.2" - ]; - }) + sources."msgpackr-1.6.2" + sources."msgpackr-extract-2.1.2" sources."mute-stream-0.0.8" sources."nice-try-1.0.5" sources."node-addon-api-4.3.0" sources."node-fetch-2.6.7" sources."node-gyp-build-optional-packages-5.0.3" sources."node-object-hash-2.3.10" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" sources."nth-check-2.1.1" @@ -100706,7 +101185,7 @@ in sources."onetime-5.1.2" sources."open-7.4.2" sources."opentracing-0.14.7" - sources."ordered-binary-1.2.5" + sources."ordered-binary-1.3.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-2.1.1" sources."p-finally-1.0.0" @@ -100735,8 +101214,16 @@ in sources."semver-6.3.0" ]; }) - sources."parse-path-4.0.4" - sources."parse-url-6.0.0" + (sources."parse-path-4.0.4" // { + dependencies = [ + sources."protocols-1.4.8" + ]; + }) + (sources."parse-url-6.0.5" // { + dependencies = [ + sources."protocols-1.4.8" + ]; + }) sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" @@ -100747,10 +101234,10 @@ in sources."progress-2.0.3" sources."prompts-2.4.2" sources."proper-lockfile-4.1.2" - sources."protocols-1.4.8" + sources."protocols-2.0.1" sources."pump-3.0.0" sources."pupa-2.1.1" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."query-string-6.14.1" sources."quick-lru-5.1.1" (sources."rc-1.2.8" // { @@ -100775,7 +101262,7 @@ in sources."resolve-alpn-1.2.1" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."restore-cursor-3.1.0" sources."retry-0.12.0" sources."reusify-1.0.4" @@ -100820,13 +101307,14 @@ in sources."tmp-0.2.1" sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" - sources."token-types-4.2.0" + sources."token-types-4.2.1" sources."tr46-0.0.3" sources."tslib-1.14.1" sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."universalify-2.0.0" + sources."update-browserslist-db-1.0.5" sources."update-notifier-5.1.0" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" @@ -100877,15 +101365,15 @@ in generator-code = nodeEnv.buildNodePackage { name = "generator-code"; packageName = "generator-code"; - version = "1.6.11"; + version = "1.6.13"; src = fetchurl { - url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.11.tgz"; - sha512 = "GogfUIZy1h9AHByAi9MRDXXfzN4qXCyKeLPWGDdGihOmij1NUy3FhIs95Kp6gn02FIdjLJhi/rElf2UsPF2DnA=="; + url = "https://registry.npmjs.org/generator-code/-/generator-code-1.6.13.tgz"; + sha512 = "kNZ6lVa292qu3IN3XtJuG2L1OAkHLVui/Ckew1noX/3/+TW3dq+vcxVLGjZ+weyTOesCtgZKNf6WD9qCaS8F/A=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -100899,14 +101387,14 @@ in sources."@octokit/core-3.6.0" sources."@octokit/endpoint-6.0.12" sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-12.4.0" - sources."@octokit/plugin-paginate-rest-2.19.0" + sources."@octokit/openapi-types-12.11.0" + sources."@octokit/plugin-paginate-rest-2.21.3" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.15.0" + sources."@octokit/plugin-rest-endpoint-methods-5.16.2" sources."@octokit/request-5.6.3" sources."@octokit/request-error-2.1.0" sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.37.0" + sources."@octokit/types-6.41.0" sources."@types/normalize-package-data-2.4.1" sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" @@ -100923,23 +101411,22 @@ in sources."dargs-7.0.0" sources."debug-4.3.4" sources."deprecation-2.3.1" - sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."execa-4.1.0" + sources."execa-5.1.1" sources."fast-plist-0.1.2" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stdin-4.0.1" - sources."get-stream-5.2.0" + sources."get-stream-6.0.1" sources."github-username-6.0.0" sources."glob-7.2.3" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-4.0.0" sources."hosted-git-info-2.8.9" - sources."human-signals-1.1.1" + sources."human-signals-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."interpret-1.4.0" @@ -100980,7 +101467,6 @@ in sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-parse-1.0.7" - sources."pump-3.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ sources."type-fest-0.6.0" @@ -101031,7 +101517,7 @@ in }) sources."wrappy-1.0.2" sources."yallist-4.0.0" - sources."yeoman-generator-5.6.1" + sources."yeoman-generator-5.7.0" (sources."yosay-2.0.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -101048,7 +101534,7 @@ in ]; buildInputs = globalBuildInputs; meta = { - description = "Yeoman generator for Visual Studio Code Extensions"; + description = "Yeoman generator for Visual Studio Code extensions."; homepage = "http://code.visualstudio.com"; license = "MIT"; }; @@ -101157,7 +101643,7 @@ in sources."is-property-1.0.2" sources."is-valid-domain-0.0.20" sources."json-buffer-2.0.11" - sources."jsonpointer-5.0.0" + sources."jsonpointer-5.0.1" sources."kvgraph-0.1.0" sources."kvset-1.0.0" sources."libsodium-0.7.10" @@ -101169,7 +101655,7 @@ in sources."mime-types-2.1.35" sources."minimist-1.2.6" sources."mkdirp-0.5.6" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" @@ -101178,7 +101664,7 @@ in sources."multiserver-scopes-2.0.0" sources."muxrpc-6.7.2" sources."nearley-2.20.1" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" sources."node-polyglot-1.0.0" sources."non-private-ip-2.2.0" sources."os-homedir-1.0.2" @@ -101240,7 +101726,11 @@ in sources."separator-escape-0.0.1" sources."sha.js-2.4.5" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + (sources."socks-2.7.0" // { + dependencies = [ + sources."ip-2.0.0" + ]; + }) sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -101257,7 +101747,7 @@ in dependencies = [ (sources."ssb-config-3.4.6" // { dependencies = [ - sources."ssb-keys-8.4.0" + sources."ssb-keys-8.4.1" ]; }) ]; @@ -101286,7 +101776,7 @@ in sources."ssb-pull-requests-1.0.0" sources."ssb-ref-2.16.0" sources."ssb-typescript-2.8.0" - sources."ssb-uri2-1.9.0" + sources."ssb-uri2-2.0.2" (sources."stream-to-pull-stream-1.7.3" // { dependencies = [ sources."looper-3.0.0" @@ -101297,7 +101787,7 @@ in sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-to-buffer-4.0.0" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; @@ -101331,22 +101821,22 @@ in "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; - version = "35.6.0"; + version = "35.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-35.6.0.tgz"; - sha512 = "MWt3cRIRbKGZj+ebwPp3W/hdIcyfKYfzt6bz/YSOcR4Z5swpMmZmGWoWiM9AERdZJYRxrImb9Id/lyyu8gtIiw=="; + url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-35.7.0.tgz"; + sha512 = "j6j/Mnc17h1XWH1PrjUhX5GxrZGwtqZkzn5Nxm164Al23HO5JfieWJ7Pbg2/fPIT1IRovEzeWA893dkuDxjQmg=="; }; dependencies = [ - sources."@gitbeaker/core-35.6.0" - sources."@gitbeaker/node-35.6.0" - sources."@gitbeaker/requester-utils-35.6.0" + sources."@gitbeaker/core-35.7.0" + sources."@gitbeaker/node-35.7.0" + sources."@gitbeaker/requester-utils-35.7.0" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/responselike-1.0.0" sources."ansi-regex-6.0.1" sources."ansi-styles-4.3.0" @@ -101359,9 +101849,9 @@ in sources."call-bind-1.0.2" sources."chalk-4.1.2" sources."cli-cursor-4.0.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."clone-1.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" @@ -101382,7 +101872,7 @@ in sources."function-bind-1.1.1" sources."get-intrinsic-1.1.2" sources."get-stream-5.2.0" - sources."got-11.8.3" + sources."got-11.8.5" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.3" @@ -101393,7 +101883,7 @@ in sources."is-interactive-2.0.0" sources."is-unicode-supported-1.2.0" sources."json-buffer-3.0.1" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."li-1.3.0" (sources."log-symbols-5.1.0" // { dependencies = [ @@ -101410,19 +101900,19 @@ in sources."object-inspect-1.12.2" sources."once-1.4.0" sources."onetime-5.1.2" - (sources."ora-6.1.0" // { + (sources."ora-6.1.2" // { dependencies = [ sources."chalk-5.0.1" ]; }) sources."p-cancelable-2.1.1" sources."pump-3.0.0" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."query-string-7.1.1" sources."quick-lru-5.1.1" sources."readable-stream-3.6.0" sources."resolve-alpn-1.2.1" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."restore-cursor-4.0.0" sources."safe-buffer-5.2.1" sources."side-channel-1.0.4" @@ -101451,15 +101941,15 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "5.0.1"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-5.0.1.tgz"; - sha512 = "+uivild4BxNtPJhPU/iArWJx2cEcOqzwNmzca567AAiWB8RhDxTeXwoTPxbg15P6W1ykyWnfGKKvvfSuUNL++Q=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-5.0.3.tgz"; + sha512 = "tXni37GZ1tx3iiv7QhPGQcEkaRop71tUU0e3g9JcGY9t6FroJACD/QMwaefOFj1FjzX/kKbVoKG6qsKL1c8b7g=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -101474,7 +101964,7 @@ in sources."@tootallnate/once-1.1.2" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."ajv-8.11.0" @@ -101509,10 +101999,10 @@ in sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" sources."clone-1.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."conf-10.1.2" @@ -101541,7 +102031,7 @@ in sources."degenerator-3.0.2" sources."depd-2.0.0" sources."dot-prop-6.0.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" @@ -101731,7 +102221,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.7" @@ -101745,7 +102235,11 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + (sources."socks-2.7.0" // { + dependencies = [ + sources."ip-2.0.0" + ]; + }) sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."spdx-correct-3.1.1" @@ -101779,7 +102273,7 @@ in sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - sources."vm2-3.9.9" + sources."vm2-3.9.10" sources."wcwidth-1.0.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" @@ -101853,7 +102347,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.1" + sources."cli-progress-3.11.2" sources."cliui-7.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -101901,7 +102395,7 @@ in sources."is2-2.0.7" sources."isarray-1.0.0" sources."isomorphic-fetch-3.0.0" - sources."kleur-4.1.4" + sources."kleur-4.1.5" sources."lodash-4.17.21" sources."lodash._arraycopy-3.0.0" sources."lodash._basevalues-3.0.0" @@ -101978,7 +102472,7 @@ in sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -102019,9 +102513,9 @@ in }; dependencies = [ sources."@ardatan/aggregate-error-0.0.6" - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -102031,7 +102525,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@exodus/schemasafe-1.0.0-rc.6" + sources."@exodus/schemasafe-1.0.0-rc.7" sources."@graphql-cli/common-4.1.0" sources."@graphql-cli/init-4.1.0" (sources."@graphql-tools/batch-execute-7.1.2" // { @@ -102062,9 +102556,9 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/import-6.6.17" // { + (sources."@graphql-tools/import-6.7.1" // { dependencies = [ - sources."@graphql-tools/utils-8.6.13" + sources."@graphql-tools/utils-8.9.0" sources."tslib-2.4.0" ]; }) @@ -102089,10 +102583,10 @@ in sources."tslib-2.3.1" ]; }) - (sources."@graphql-tools/schema-8.3.14" // { + (sources."@graphql-tools/schema-8.5.1" // { dependencies = [ - sources."@graphql-tools/merge-8.2.14" - sources."@graphql-tools/utils-8.6.13" + sources."@graphql-tools/merge-8.3.1" + sources."@graphql-tools/utils-8.9.0" sources."tslib-2.4.0" ]; }) @@ -102123,7 +102617,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.0.0" + sources."@types/node-18.6.3" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -102172,7 +102666,7 @@ in sources."chownr-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-2.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" (sources."cliui-7.0.4" // { dependencies = [ @@ -102181,7 +102675,7 @@ in ]; }) sources."clone-1.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" @@ -102212,7 +102706,7 @@ in sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."dir-glob-3.0.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -102400,7 +102894,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" @@ -102477,7 +102971,7 @@ in sources."picomatch-2.3.1" sources."pluralize-8.0.0" sources."prepend-http-2.0.0" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.3" @@ -102580,7 +103074,7 @@ in sources."yargs-parser-20.2.9" ]; }) - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -102595,49 +103089,62 @@ in graphql-language-service-cli = nodeEnv.buildNodePackage { name = "graphql-language-service-cli"; packageName = "graphql-language-service-cli"; - version = "3.2.28"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.2.28.tgz"; - sha512 = "ofp4GwXdMR/0VhcpCfNPmL3vAx2NAMP0qVh7t5InUnpwcLp8qoPD5oOCLAAPp4Jd+CUYXkfOjtCtvtEmFS5Abg=="; + url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.3.0.tgz"; + sha512 = "vSn7DfdOvwUxti5G6KN8EGoZccVIua6o4bXGgHQQo0pLuB4OTNwZLPdhq9dJUXA+0yKQLwehS8lwI4k6LbR+Tg=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" + sources."@ardatan/sync-fetch-0.0.1" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" sources."@babel/polyfill-7.12.1" - sources."@babel/types-7.18.4" - sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.4.10" - sources."@graphql-tools/delegate-8.7.11" - sources."@graphql-tools/graphql-file-loader-7.3.15" - sources."@graphql-tools/import-6.6.17" - sources."@graphql-tools/json-file-loader-7.3.15" - sources."@graphql-tools/load-7.5.14" - sources."@graphql-tools/merge-8.2.14" - sources."@graphql-tools/schema-8.3.14" - sources."@graphql-tools/url-loader-7.9.25" - sources."@graphql-tools/utils-8.6.13" - sources."@graphql-tools/wrap-8.4.20" + sources."@babel/types-7.18.10" + sources."@cspotcode/source-map-support-0.8.1" + sources."@graphql-tools/batch-execute-8.5.1" + sources."@graphql-tools/delegate-8.8.1" + sources."@graphql-tools/graphql-file-loader-7.5.0" + sources."@graphql-tools/import-6.7.1" + sources."@graphql-tools/json-file-loader-7.4.1" + sources."@graphql-tools/load-7.7.1" + sources."@graphql-tools/merge-8.3.1" + sources."@graphql-tools/schema-8.5.1" + sources."@graphql-tools/url-loader-7.13.3" + sources."@graphql-tools/utils-8.9.0" + sources."@graphql-tools/wrap-8.5.1" sources."@iarna/toml-2.2.5" - sources."@n1ru4l/graphql-live-query-0.9.0" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.9" + sources."@n1ru4l/graphql-live-query-0.10.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-18.0.0" + sources."@peculiar/asn1-schema-2.2.0" + sources."@peculiar/json-schema-1.1.12" + sources."@peculiar/webcrypto-1.4.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/node-18.6.3" sources."@types/parse-json-4.0.0" sources."@types/ws-8.5.3" + sources."@whatwg-node/fetch-0.2.7" sources."abort-controller-3.0.0" + sources."acorn-8.8.0" + sources."acorn-walk-8.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."arg-4.1.3" sources."array-union-2.1.0" + sources."asn1js-3.0.5" sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" sources."busboy-1.6.0" sources."callsites-3.1.0" sources."chalk-2.4.2" @@ -102648,8 +103155,8 @@ in sources."core-js-2.6.12" sources."cosmiconfig-7.0.1" sources."cosmiconfig-toml-loader-1.0.0" + sources."cosmiconfig-typescript-loader-3.1.1" sources."create-require-1.1.1" - sources."cross-undici-fetch-0.4.7" sources."dataloader-2.1.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" @@ -102659,6 +103166,7 @@ in sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" + sources."event-target-polyfill-0.0.3" sources."event-target-shim-5.0.1" sources."extract-files-11.0.0" sources."fast-glob-3.2.11" @@ -102679,13 +103187,11 @@ in }) sources."glob-parent-5.1.2" sources."globby-11.1.0" - sources."graphql-config-4.3.1" - sources."graphql-executor-0.0.23" + sources."graphql-config-4.3.3" sources."graphql-language-service-5.0.6" - sources."graphql-language-service-server-2.7.27" - sources."graphql-ws-5.9.0" + sources."graphql-language-service-server-2.8.0" + sources."graphql-ws-5.9.1" sources."has-flag-3.0.0" - sources."ieee754-1.2.1" sources."ignore-5.2.0" (sources."import-fresh-3.3.0" // { dependencies = [ @@ -102699,11 +103205,10 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."isomorphic-ws-4.0.1" + sources."isomorphic-ws-5.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" sources."lines-and-columns-1.2.4" - sources."lodash.get-4.4.2" sources."make-error-1.3.6" sources."merge2-1.4.1" sources."meros-1.2.0" @@ -102721,6 +103226,8 @@ in sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."picomatch-2.3.1" + sources."pvtsutils-1.3.2" + sources."pvutils-1.1.3" sources."queue-microtask-1.2.3" sources."regenerator-runtime-0.13.9" sources."remove-trailing-separator-1.1.0" @@ -102729,32 +103236,27 @@ in sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."slash-3.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" sources."streamsearch-1.1.0" sources."string-env-interpolation-1.0.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" sources."supports-color-5.5.0" - sources."sync-fetch-0.4.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" - sources."ts-node-9.1.1" + sources."ts-node-10.9.1" sources."tslib-2.4.0" - sources."undici-5.5.1" + sources."undici-5.8.1" sources."unixify-1.0.0" + sources."v8-compile-cache-lib-3.0.1" sources."value-or-promise-1.0.11" - sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageserver-6.1.1" - (sources."vscode-languageserver-protocol-3.17.1" // { - dependencies = [ - sources."vscode-jsonrpc-8.0.1" - ]; - }) - sources."vscode-languageserver-types-3.17.1" + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-3.0.3" sources."web-streams-polyfill-3.2.1" + sources."webcrypto-core-1.7.5" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" (sources."wrap-ansi-7.0.0" // { @@ -102765,7 +103267,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.8.0" + sources."ws-8.8.1" sources."y18n-5.0.8" sources."yaml-1.10.2" sources."yargs-16.2.0" @@ -102792,9 +103294,10 @@ in sha512 = "97Chda90OBIHCpH6iQHNYc9qTTADN0LOFbiMcRws3V5SottC/0yTDIQDgBzncZYVCkttyjAnT6YmVuNId7ymQA=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@ardatan/sync-fetch-0.0.1" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -102805,25 +103308,29 @@ in sources."supports-color-5.5.0" ]; }) - sources."@cronvel/get-pixels-3.4.0" - sources."@endemolshinegroup/cosmiconfig-typescript-loader-3.0.2" - sources."@graphql-tools/batch-execute-8.4.10" - sources."@graphql-tools/delegate-8.7.11" - sources."@graphql-tools/graphql-file-loader-7.3.15" - sources."@graphql-tools/import-6.6.17" - sources."@graphql-tools/json-file-loader-7.3.15" - sources."@graphql-tools/load-7.5.14" - sources."@graphql-tools/merge-8.2.14" - sources."@graphql-tools/schema-8.3.14" - (sources."@graphql-tools/url-loader-7.9.25" // { + sources."@cronvel/get-pixels-3.4.1" + sources."@cspotcode/source-map-support-0.8.1" + sources."@graphql-tools/batch-execute-8.5.1" + sources."@graphql-tools/delegate-8.8.1" + sources."@graphql-tools/graphql-file-loader-7.5.0" + sources."@graphql-tools/import-6.7.1" + sources."@graphql-tools/json-file-loader-7.4.1" + sources."@graphql-tools/load-7.7.1" + sources."@graphql-tools/merge-8.3.1" + sources."@graphql-tools/schema-8.5.1" + (sources."@graphql-tools/url-loader-7.13.3" // { dependencies = [ - sources."ws-8.8.0" + sources."isomorphic-ws-5.0.0" + sources."ws-8.8.1" ]; }) - sources."@graphql-tools/utils-8.6.13" - sources."@graphql-tools/wrap-8.4.20" + sources."@graphql-tools/utils-8.9.0" + sources."@graphql-tools/wrap-8.5.1" sources."@iarna/toml-2.2.5" - sources."@n1ru4l/graphql-live-query-0.9.0" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.9" + sources."@n1ru4l/graphql-live-query-0.10.0" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -102856,12 +103363,22 @@ in ]; }) sources."@oclif/screen-1.0.4" + sources."@peculiar/asn1-schema-2.2.0" + sources."@peculiar/json-schema-1.1.12" + sources."@peculiar/webcrypto-1.4.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/json-schema-7.0.9" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/parse-json-4.0.0" sources."@types/ws-8.5.3" + sources."@whatwg-node/fetch-0.2.7" sources."abort-controller-3.0.0" sources."accepts-1.3.8" + sources."acorn-8.8.0" + sources."acorn-walk-8.2.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -102869,10 +103386,10 @@ in sources."arg-4.1.3" sources."array-flatten-1.1.1" sources."array-union-2.1.0" + sources."asn1js-3.0.5" sources."async-limiter-1.0.1" sources."backo2-1.0.2" sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" (sources."body-parser-1.18.2" // { dependencies = [ sources."debug-2.6.9" @@ -102881,8 +103398,6 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" sources."busboy-1.6.0" sources."bytes-3.0.0" sources."callsites-3.1.0" @@ -102918,13 +103433,13 @@ in sources."cookie-signature-1.0.6" sources."cosmiconfig-7.0.1" sources."cosmiconfig-toml-loader-1.0.0" + sources."cosmiconfig-typescript-loader-3.1.1" sources."create-require-1.1.1" (sources."cross-spawn-6.0.5" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."cross-undici-fetch-0.4.7" sources."cwise-compiler-1.1.3" sources."dataloader-2.1.0" sources."debug-4.3.4" @@ -102941,6 +103456,7 @@ in sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."etag-1.8.1" + sources."event-target-polyfill-0.0.3" sources."event-target-shim-5.0.1" sources."eventemitter3-3.1.2" (sources."express-4.16.3" // { @@ -102973,8 +103489,7 @@ in sources."globby-11.1.0" sources."graceful-fs-4.2.10" sources."graphql-15.4.0" - sources."graphql-config-4.3.1" - sources."graphql-executor-0.0.23" + sources."graphql-config-4.3.3" (sources."graphql-language-service-interface-2.10.2" // { dependencies = [ sources."graphql-language-service-utils-2.7.1" @@ -102983,12 +103498,11 @@ in sources."graphql-language-service-parser-1.10.4" sources."graphql-language-service-types-1.8.7" sources."graphql-language-service-utils-2.5.1" - sources."graphql-ws-5.9.0" + sources."graphql-ws-5.9.1" sources."has-flag-4.0.0" sources."http-errors-1.6.3" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.19" - sources."ieee754-1.2.1" sources."ignore-5.2.0" (sources."import-fresh-3.3.0" // { dependencies = [ @@ -103019,7 +103533,6 @@ in sources."lines-and-columns-1.2.4" sources."lodash-4.17.21" sources."lodash._reinterpolate-3.0.0" - sources."lodash.get-4.4.2" sources."lodash.template-4.5.0" sources."lodash.templatesettings-4.2.0" sources."lru-cache-6.0.0" @@ -103057,8 +103570,10 @@ in sources."path-to-regexp-0.1.7" sources."path-type-4.0.0" sources."picomatch-2.3.1" - sources."pngjs-5.0.0" + sources."pngjs-6.0.0" sources."proxy-addr-2.0.7" + sources."pvtsutils-1.3.2" + sources."pvutils-1.1.3" sources."qs-6.5.1" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" @@ -103089,8 +103604,6 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."slash-3.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" sources."statuses-1.4.0" sources."streamsearch-1.1.0" sources."string-env-interpolation-1.0.1" @@ -103114,25 +103627,26 @@ in ]; }) sources."symbol-observable-1.2.0" - sources."sync-fetch-0.4.1" sources."terminal-kit-1.49.4" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tree-kit-0.7.4" sources."treeify-1.1.0" - sources."ts-node-9.1.1" + sources."ts-node-10.9.1" sources."tslib-2.4.0" sources."type-is-1.6.18" - sources."undici-5.5.1" + sources."undici-5.8.1" sources."uniq-1.0.1" sources."universalify-0.1.2" sources."unixify-1.0.0" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" + sources."v8-compile-cache-lib-3.0.1" sources."value-or-promise-1.0.11" sources."vary-1.1.2" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."web-streams-polyfill-3.2.1" + sources."webcrypto-core-1.7.5" sources."webidl-conversions-3.0.1" sources."whatwg-fetch-3.6.2" sources."whatwg-url-5.0.0" @@ -103423,7 +103937,7 @@ in sources."isarray-0.0.1" sources."lodash-4.17.21" sources."map-canvas-0.1.5" - sources."marked-4.0.17" + sources."marked-4.0.18" (sources."marked-terminal-5.1.1" // { dependencies = [ sources."chalk-5.0.1" @@ -103454,7 +103968,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.11.21" + sources."systeminformation-5.12.2" sources."term-canvas-0.0.5" sources."type-fest-1.4.0" sources."wordwrap-0.0.3" @@ -103595,7 +104109,7 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es5-ext-0.10.61" + 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" @@ -103620,7 +104134,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.6.0" + sources."type-2.7.0" ]; }) sources."extend-3.0.2" @@ -104016,7 +104530,7 @@ in ]; }) sources."error-ex-1.3.2" - sources."es5-ext-0.10.61" + sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" (sources."expand-brackets-2.1.4" // { @@ -104032,7 +104546,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.6.0" + sources."type-2.7.0" ]; }) sources."extend-3.0.2" @@ -104354,7 +104868,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.16.1" + sources."uglify-js-3.16.3" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -104383,7 +104897,7 @@ in sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.3.0" + sources."commander-9.4.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."glob-7.2.3" @@ -104451,7 +104965,7 @@ in sources."object-inspect-1.12.2" sources."opener-1.5.2" sources."portfinder-1.0.28" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."requires-port-1.0.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -104475,16 +104989,16 @@ in hsd = nodeEnv.buildNodePackage { name = "hsd"; packageName = "hsd"; - version = "3.0.1"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hsd/-/hsd-3.0.1.tgz"; - sha512 = "AI7ruyDhxyzKQzaDdEj0N2zjjYXjEPwQGlWQTootg85ByNKWQsAfZChvWqi2ek0FLPuNlM1toaDT+jcYi+UmqA=="; + url = "https://registry.npmjs.org/hsd/-/hsd-4.0.1.tgz"; + sha512 = "5kb4Cp3/XjrFLmUZxl0tQxqVfmFxfrfys1sT9jmUK/Aq/tw+6/GkRGJjgrdTuzRL48zLrczOwL7/Q2e3Ufg2vA=="; }; dependencies = [ sources."bcfg-0.1.7" sources."bcrypto-5.4.0" sources."bcurl-0.2.0" - sources."bdb-1.3.0" + sources."bdb-1.4.0" sources."bdns-0.1.5" sources."bevent-0.1.5" sources."bfile-0.2.2" @@ -104514,7 +105028,7 @@ in sources."mrmr-0.1.10" sources."n64-0.2.10" sources."unbound-0.4.3" - sources."urkel-0.7.0" + sources."urkel-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -104616,7 +105130,7 @@ in sources."npm-2.15.12" sources."once-1.4.0" sources."path-is-absolute-1.0.1" - sources."readable-stream-4.0.0" + sources."readable-stream-4.1.0" sources."sprintf-js-1.0.3" sources."tabula-1.10.0" sources."verror-1.10.1" @@ -104645,7 +105159,7 @@ in sources."@colors/colors-1.5.0" sources."@fast-csv/format-4.3.5" sources."@fast-csv/parse-4.3.6" - sources."@types/node-14.18.21" + sources."@types/node-14.18.23" sources."ajv-6.12.6" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -104654,7 +105168,8 @@ in sources."assert-plus-1.0.0" sources."async-2.6.4" sources."asynckit-0.4.0" - sources."aws-sdk-2.1158.0" + sources."available-typed-arrays-1.0.5" + sources."aws-sdk-2.1188.0" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."base64-js-1.5.1" @@ -104663,6 +105178,7 @@ in sources."boolbase-1.0.0" sources."buffer-4.9.2" sources."calfinated-1.4.1" + sources."call-bind-1.0.2" sources."caseless-0.12.0" sources."cheerio-0.22.0" sources."cliui-7.0.4" @@ -104677,6 +105193,7 @@ in sources."dashdash-1.14.1" sources."debug-4.3.4" sources."deep-is-0.1.4" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."dom-serializer-0.1.1" sources."domelementtype-1.3.1" @@ -104685,6 +105202,8 @@ in sources."ecc-jsbn-0.1.2" sources."emoji-regex-8.0.0" sources."entities-1.1.2" + sources."es-abstract-1.20.1" + sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escodegen-1.14.3" sources."esprima-4.0.1" @@ -104698,24 +105217,50 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" + sources."for-each-0.3.3" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."function-bind-1.1.1" + sources."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.2" + sources."get-symbol-description-1.0.0" sources."getpass-0.1.7" 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."htmlparser2-3.10.1" sources."http-signature-1.2.0" sources."ieee754-1.1.13" sources."inherits-2.0.4" + sources."internal-slot-1.0.3" (sources."ip-address-6.1.0" // { dependencies = [ sources."jsbn-1.1.0" sources."sprintf-js-1.1.2" ]; }) + sources."is-arguments-1.1.1" + sources."is-bigint-1.0.4" + sources."is-boolean-object-1.1.2" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-fullwidth-code-point-3.0.0" + sources."is-generator-function-1.0.10" + 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-typed-array-1.1.9" sources."is-typedarray-1.0.0" + sources."is-weakref-1.0.2" sources."isarray-1.0.0" sources."isstream-0.1.2" sources."jmespath-0.16.0" @@ -104756,18 +105301,21 @@ in sources."lodash.reject-4.6.0" sources."lodash.some-4.6.0" sources."lodash.uniq-4.5.0" - sources."marked-4.0.17" + sources."marked-4.0.18" sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."minimist-1.2.6" sources."mkdirp-0.5.6" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."moment-timezone-0.5.34" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."named-regexp-0.1.1" sources."nth-check-1.0.2" sources."oauth-sign-0.9.0" + sources."object-inspect-1.12.2" + sources."object-keys-1.1.1" + sources."object.assign-4.1.2" sources."optionator-0.8.3" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" @@ -104776,13 +105324,14 @@ in sources."async-3.2.3" ]; }) - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-1.3.2" sources."qs-6.5.3" sources."querystring-0.2.0" sources."read-1.0.7" sources."readable-stream-3.6.0" sources."recursive-readdir-sync-1.0.6" + sources."regexp.prototype.flags-1.4.3" (sources."request-2.88.2" // { dependencies = [ sources."uuid-3.4.0" @@ -104795,6 +105344,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.1" sources."semver-5.7.1" + sources."side-channel-1.0.4" sources."socks5-client-1.2.8" sources."socks5-http-client-1.0.4" sources."source-map-0.6.1" @@ -104803,6 +105353,8 @@ in sources."stack-trace-0.0.10" sources."static-eval-2.0.2" sources."string-width-4.2.3" + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" (sources."tough-cookie-2.5.0" // { @@ -104813,6 +105365,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" + sources."unbox-primitive-1.0.2" sources."underscore-1.12.1" (sources."uri-js-4.4.1" // { dependencies = [ @@ -104820,9 +105373,12 @@ in ]; }) sources."url-0.10.3" + sources."util-0.12.4" sources."util-deprecate-1.0.2" sources."uuid-8.0.0" sources."verror-1.10.1" + sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.8" (sources."winston-2.4.6" // { dependencies = [ sources."async-3.2.4" @@ -104863,7 +105419,7 @@ in sources."jp-kernel-2.0.0" sources."nan-2.14.2" sources."nel-1.3.0" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" sources."uuid-3.4.0" sources."zeromq-5.2.8" ]; @@ -105028,7 +105584,7 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."q-1.5.1" sources."qs-6.5.3" @@ -105129,7 +105685,7 @@ in sources."minimist-1.2.6" ]; }) - sources."moment-2.29.3" + sources."moment-2.29.4" sources."mv-2.1.1" sources."nan-2.16.0" sources."ncp-2.0.0" @@ -105229,7 +105785,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.33.3" + sources."jquery.terminal-2.34.0" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -105415,7 +105971,7 @@ in sources."proto-list-1.2.4" sources."protobufjs-6.10.3" sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."queue-microtask-1.2.3" @@ -105444,12 +106000,12 @@ in sources."verror-1.10.0" (sources."vscode-css-languageservice-5.4.2" // { dependencies = [ - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" ]; }) (sources."vscode-html-languageservice-4.2.5" // { dependencies = [ - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" ]; }) sources."vscode-jsonrpc-6.0.0" @@ -105690,7 +106246,7 @@ in sources."proxy-agent-4.0.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."raw-body-2.5.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" @@ -105716,7 +106272,11 @@ in ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + (sources."socks-2.7.0" // { + dependencies = [ + sources."ip-2.0.0" + ]; + }) sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."split2-3.2.2" @@ -105776,7 +106336,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -105790,55 +106350,55 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-https://github.com/be5invis/Iosevka/archive/v15.5.0.tar.gz" = nodeEnv.buildNodePackage { + "iosevka-https://github.com/be5invis/Iosevka/archive/v15.5.2.tar.gz" = nodeEnv.buildNodePackage { name = "iosevka"; packageName = "iosevka"; - version = "15.5.0"; + version = "15.5.2"; src = fetchurl { - name = "iosevka-15.5.0.tar.gz"; - url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v15.5.0"; - sha256 = "2ed250bb32837e87be0d4c6c17600d7e57b49223371c17e6764ee7ccc83f97a1"; + name = "iosevka-15.5.2.tar.gz"; + url = "https://codeload.github.com/be5invis/Iosevka/tar.gz/refs/tags/v15.5.2"; + sha256 = "41d5fea642aeff7555608f0e6286a9cc0ebd59bfaa49e278d3cfcd3caed29603"; }; dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.2" - sources."@ot-builder/bin-composite-types-1.5.2" - sources."@ot-builder/bin-util-1.5.2" - sources."@ot-builder/cli-help-shower-1.5.2" - sources."@ot-builder/cli-proc-1.5.2" - sources."@ot-builder/cli-shared-1.5.2" - sources."@ot-builder/common-impl-1.5.2" - sources."@ot-builder/errors-1.5.2" - sources."@ot-builder/io-bin-cff-1.5.2" - sources."@ot-builder/io-bin-encoding-1.5.2" - sources."@ot-builder/io-bin-ext-private-1.5.2" - sources."@ot-builder/io-bin-font-1.5.2" - sources."@ot-builder/io-bin-glyph-store-1.5.2" - sources."@ot-builder/io-bin-layout-1.5.2" - sources."@ot-builder/io-bin-metadata-1.5.2" - sources."@ot-builder/io-bin-metric-1.5.2" - sources."@ot-builder/io-bin-name-1.5.2" - sources."@ot-builder/io-bin-sfnt-1.5.2" - sources."@ot-builder/io-bin-ttf-1.5.2" - sources."@ot-builder/io-bin-vtt-private-1.5.2" - sources."@ot-builder/ot-1.5.2" - sources."@ot-builder/ot-encoding-1.5.2" - sources."@ot-builder/ot-ext-private-1.5.2" - sources."@ot-builder/ot-glyphs-1.5.2" - sources."@ot-builder/ot-layout-1.5.2" - sources."@ot-builder/ot-metadata-1.5.2" - sources."@ot-builder/ot-name-1.5.2" - sources."@ot-builder/ot-sfnt-1.5.2" - sources."@ot-builder/ot-standard-glyph-namer-1.5.2" - sources."@ot-builder/ot-vtt-private-1.5.2" - sources."@ot-builder/prelude-1.5.2" - sources."@ot-builder/primitive-1.5.2" - sources."@ot-builder/rectify-1.5.2" - sources."@ot-builder/stat-glyphs-1.5.2" - sources."@ot-builder/trace-1.5.2" - sources."@ot-builder/var-store-1.5.2" - sources."@ot-builder/variance-1.5.2" - sources."@unicode/unicode-14.0.0-1.2.2" + sources."@ot-builder/bin-composite-types-1.5.4" + sources."@ot-builder/bin-util-1.5.4" + sources."@ot-builder/cli-help-shower-1.5.4" + sources."@ot-builder/cli-proc-1.5.4" + sources."@ot-builder/cli-shared-1.5.4" + sources."@ot-builder/common-impl-1.5.4" + sources."@ot-builder/errors-1.5.4" + sources."@ot-builder/io-bin-cff-1.5.4" + sources."@ot-builder/io-bin-encoding-1.5.4" + sources."@ot-builder/io-bin-ext-private-1.5.4" + sources."@ot-builder/io-bin-font-1.5.4" + sources."@ot-builder/io-bin-glyph-store-1.5.4" + sources."@ot-builder/io-bin-layout-1.5.4" + sources."@ot-builder/io-bin-metadata-1.5.4" + sources."@ot-builder/io-bin-metric-1.5.4" + sources."@ot-builder/io-bin-name-1.5.4" + sources."@ot-builder/io-bin-sfnt-1.5.4" + sources."@ot-builder/io-bin-ttf-1.5.4" + sources."@ot-builder/io-bin-vtt-private-1.5.4" + sources."@ot-builder/ot-1.5.4" + sources."@ot-builder/ot-encoding-1.5.4" + sources."@ot-builder/ot-ext-private-1.5.4" + sources."@ot-builder/ot-glyphs-1.5.4" + sources."@ot-builder/ot-layout-1.5.4" + sources."@ot-builder/ot-metadata-1.5.4" + sources."@ot-builder/ot-name-1.5.4" + sources."@ot-builder/ot-sfnt-1.5.4" + sources."@ot-builder/ot-standard-glyph-namer-1.5.4" + sources."@ot-builder/ot-vtt-private-1.5.4" + sources."@ot-builder/prelude-1.5.4" + sources."@ot-builder/primitive-1.5.4" + sources."@ot-builder/rectify-1.5.4" + sources."@ot-builder/stat-glyphs-1.5.4" + sources."@ot-builder/trace-1.5.4" + sources."@ot-builder/var-store-1.5.4" + sources."@ot-builder/variance-1.5.4" + sources."@unicode/unicode-14.0.0-1.3.0" sources."@xmldom/xmldom-0.8.2" sources."aglfn-1.0.2" sources."amdefine-1.0.1" @@ -105899,8 +106459,8 @@ in sources."mimic-fn-2.1.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.5.2" - sources."otb-ttc-bundle-1.5.2" + sources."ot-builder-1.5.4" + sources."otb-ttc-bundle-1.5.4" sources."passerror-1.1.1" sources."patel-0.37.1" sources."patrisika-0.24.0" @@ -105933,10 +106493,10 @@ in sources."unicoderegexp-0.4.1" sources."universalify-2.0.0" sources."uuid-8.3.2" - (sources."verda-1.6.0" // { + (sources."verda-1.10.0" // { dependencies = [ sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; }) sources."wawoff2-2.0.1" @@ -106068,7 +106628,7 @@ in sources."vscode-languageserver-types-3.14.0" ]; }) - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-1.0.8" sources."wrappy-1.0.2" sources."xorshift-1.2.0" @@ -106133,74 +106693,74 @@ in sources."tslib-1.14.1" ]; }) - sources."@aws-sdk/abort-controller-3.110.0" + sources."@aws-sdk/abort-controller-3.127.0" sources."@aws-sdk/chunked-blob-reader-3.55.0" sources."@aws-sdk/chunked-blob-reader-native-3.109.0" - (sources."@aws-sdk/client-s3-3.113.0" // { + (sources."@aws-sdk/client-s3-3.142.0" // { dependencies = [ sources."fast-xml-parser-3.19.0" ]; }) - sources."@aws-sdk/client-sso-3.112.0" - (sources."@aws-sdk/client-sts-3.112.0" // { + sources."@aws-sdk/client-sso-3.142.0" + (sources."@aws-sdk/client-sts-3.142.0" // { dependencies = [ sources."fast-xml-parser-3.19.0" ]; }) - sources."@aws-sdk/config-resolver-3.110.0" - sources."@aws-sdk/credential-provider-env-3.110.0" - sources."@aws-sdk/credential-provider-imds-3.110.0" - sources."@aws-sdk/credential-provider-ini-3.112.0" - sources."@aws-sdk/credential-provider-node-3.112.0" - sources."@aws-sdk/credential-provider-process-3.110.0" - sources."@aws-sdk/credential-provider-sso-3.112.0" - sources."@aws-sdk/credential-provider-web-identity-3.110.0" - sources."@aws-sdk/eventstream-marshaller-3.110.0" - sources."@aws-sdk/eventstream-serde-browser-3.110.0" - sources."@aws-sdk/eventstream-serde-config-resolver-3.110.0" - sources."@aws-sdk/eventstream-serde-node-3.110.0" - sources."@aws-sdk/eventstream-serde-universal-3.110.0" - sources."@aws-sdk/fetch-http-handler-3.110.0" - sources."@aws-sdk/hash-blob-browser-3.110.0" - sources."@aws-sdk/hash-node-3.110.0" - sources."@aws-sdk/hash-stream-node-3.110.0" - sources."@aws-sdk/invalid-dependency-3.110.0" + sources."@aws-sdk/config-resolver-3.130.0" + sources."@aws-sdk/credential-provider-env-3.127.0" + sources."@aws-sdk/credential-provider-imds-3.127.0" + sources."@aws-sdk/credential-provider-ini-3.142.0" + sources."@aws-sdk/credential-provider-node-3.142.0" + sources."@aws-sdk/credential-provider-process-3.127.0" + sources."@aws-sdk/credential-provider-sso-3.142.0" + sources."@aws-sdk/credential-provider-web-identity-3.127.0" + sources."@aws-sdk/eventstream-codec-3.127.0" + sources."@aws-sdk/eventstream-serde-browser-3.127.0" + sources."@aws-sdk/eventstream-serde-config-resolver-3.127.0" + sources."@aws-sdk/eventstream-serde-node-3.127.0" + sources."@aws-sdk/eventstream-serde-universal-3.127.0" + sources."@aws-sdk/fetch-http-handler-3.131.0" + sources."@aws-sdk/hash-blob-browser-3.127.0" + sources."@aws-sdk/hash-node-3.127.0" + sources."@aws-sdk/hash-stream-node-3.127.0" + sources."@aws-sdk/invalid-dependency-3.127.0" sources."@aws-sdk/is-array-buffer-3.55.0" - sources."@aws-sdk/md5-js-3.110.0" - sources."@aws-sdk/middleware-bucket-endpoint-3.110.0" - sources."@aws-sdk/middleware-content-length-3.110.0" - sources."@aws-sdk/middleware-expect-continue-3.113.0" - sources."@aws-sdk/middleware-flexible-checksums-3.110.0" - sources."@aws-sdk/middleware-host-header-3.110.0" - sources."@aws-sdk/middleware-location-constraint-3.110.0" - sources."@aws-sdk/middleware-logger-3.110.0" - sources."@aws-sdk/middleware-recursion-detection-3.110.0" - (sources."@aws-sdk/middleware-retry-3.110.0" // { + sources."@aws-sdk/md5-js-3.127.0" + sources."@aws-sdk/middleware-bucket-endpoint-3.127.0" + sources."@aws-sdk/middleware-content-length-3.127.0" + sources."@aws-sdk/middleware-expect-continue-3.127.0" + sources."@aws-sdk/middleware-flexible-checksums-3.127.0" + sources."@aws-sdk/middleware-host-header-3.127.0" + sources."@aws-sdk/middleware-location-constraint-3.127.0" + sources."@aws-sdk/middleware-logger-3.127.0" + sources."@aws-sdk/middleware-recursion-detection-3.127.0" + (sources."@aws-sdk/middleware-retry-3.127.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."@aws-sdk/middleware-sdk-s3-3.110.0" - sources."@aws-sdk/middleware-sdk-sts-3.110.0" - sources."@aws-sdk/middleware-serde-3.110.0" - sources."@aws-sdk/middleware-signing-3.110.0" - sources."@aws-sdk/middleware-ssec-3.110.0" - sources."@aws-sdk/middleware-stack-3.110.0" - sources."@aws-sdk/middleware-user-agent-3.110.0" - sources."@aws-sdk/node-config-provider-3.110.0" - sources."@aws-sdk/node-http-handler-3.110.0" - sources."@aws-sdk/property-provider-3.110.0" - sources."@aws-sdk/protocol-http-3.110.0" - sources."@aws-sdk/querystring-builder-3.110.0" - sources."@aws-sdk/querystring-parser-3.110.0" - sources."@aws-sdk/s3-request-presigner-3.113.0" - sources."@aws-sdk/service-error-classification-3.110.0" - sources."@aws-sdk/shared-ini-file-loader-3.110.0" - sources."@aws-sdk/signature-v4-3.110.0" - sources."@aws-sdk/signature-v4-multi-region-3.110.0" - sources."@aws-sdk/smithy-client-3.110.0" - sources."@aws-sdk/types-3.110.0" - sources."@aws-sdk/url-parser-3.110.0" + sources."@aws-sdk/middleware-sdk-s3-3.127.0" + sources."@aws-sdk/middleware-sdk-sts-3.130.0" + sources."@aws-sdk/middleware-serde-3.127.0" + sources."@aws-sdk/middleware-signing-3.130.0" + sources."@aws-sdk/middleware-ssec-3.127.0" + sources."@aws-sdk/middleware-stack-3.127.0" + sources."@aws-sdk/middleware-user-agent-3.127.0" + sources."@aws-sdk/node-config-provider-3.127.0" + sources."@aws-sdk/node-http-handler-3.127.0" + sources."@aws-sdk/property-provider-3.127.0" + sources."@aws-sdk/protocol-http-3.127.0" + sources."@aws-sdk/querystring-builder-3.127.0" + sources."@aws-sdk/querystring-parser-3.127.0" + sources."@aws-sdk/s3-request-presigner-3.142.0" + sources."@aws-sdk/service-error-classification-3.127.0" + sources."@aws-sdk/shared-ini-file-loader-3.127.0" + sources."@aws-sdk/signature-v4-3.130.0" + sources."@aws-sdk/signature-v4-multi-region-3.130.0" + sources."@aws-sdk/smithy-client-3.142.0" + sources."@aws-sdk/types-3.127.0" + sources."@aws-sdk/url-parser-3.127.0" sources."@aws-sdk/util-arn-parser-3.55.0" sources."@aws-sdk/util-base64-browser-3.109.0" sources."@aws-sdk/util-base64-node-3.55.0" @@ -106208,24 +106768,24 @@ in sources."@aws-sdk/util-body-length-node-3.55.0" sources."@aws-sdk/util-buffer-from-3.55.0" sources."@aws-sdk/util-config-provider-3.109.0" - sources."@aws-sdk/util-create-request-3.110.0" - sources."@aws-sdk/util-defaults-mode-browser-3.110.0" - sources."@aws-sdk/util-defaults-mode-node-3.110.0" - sources."@aws-sdk/util-format-url-3.110.0" + sources."@aws-sdk/util-create-request-3.142.0" + sources."@aws-sdk/util-defaults-mode-browser-3.142.0" + sources."@aws-sdk/util-defaults-mode-node-3.142.0" + sources."@aws-sdk/util-format-url-3.127.0" sources."@aws-sdk/util-hex-encoding-3.109.0" sources."@aws-sdk/util-locate-window-3.55.0" - sources."@aws-sdk/util-middleware-3.110.0" - sources."@aws-sdk/util-stream-browser-3.110.0" - sources."@aws-sdk/util-stream-node-3.110.0" + sources."@aws-sdk/util-middleware-3.127.0" + sources."@aws-sdk/util-stream-browser-3.131.0" + sources."@aws-sdk/util-stream-node-3.129.0" sources."@aws-sdk/util-uri-escape-3.55.0" - sources."@aws-sdk/util-user-agent-browser-3.110.0" - sources."@aws-sdk/util-user-agent-node-3.110.0" + sources."@aws-sdk/util-user-agent-browser-3.127.0" + sources."@aws-sdk/util-user-agent-node-3.127.0" sources."@aws-sdk/util-utf8-browser-3.109.0" sources."@aws-sdk/util-utf8-node-3.109.0" - sources."@aws-sdk/util-waiter-3.110.0" - sources."@aws-sdk/xml-builder-3.109.0" + sources."@aws-sdk/util-waiter-3.127.0" + sources."@aws-sdk/xml-builder-3.142.0" sources."@braintree/sanitize-url-3.1.0" - sources."@cronvel/get-pixels-3.4.0" + sources."@cronvel/get-pixels-3.4.1" sources."@gar/promisify-1.1.3" sources."@joplin/fork-htmlparser2-4.1.40" sources."@joplin/fork-sax-1.2.44" @@ -106262,7 +106822,7 @@ in sources."fs-minipass-2.1.0" sources."gauge-3.0.2" sources."is-fullwidth-code-point-3.0.0" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."node-fetch-2.6.7" @@ -106332,7 +106892,8 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.1158.0" // { + sources."available-typed-arrays-1.0.5" + (sources."aws-sdk-2.1188.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-8.0.0" @@ -106364,13 +106925,14 @@ in dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."rimraf-3.0.2" sources."tar-6.1.11" ]; }) + sources."call-bind-1.0.2" sources."camel-case-3.0.0" sources."camelcase-4.1.0" sources."caseless-0.12.0" @@ -106409,14 +106971,14 @@ in ]; }) sources."cwise-compiler-1.1.3" - sources."d3-7.4.4" - sources."d3-array-3.1.6" + sources."d3-7.6.1" + sources."d3-array-3.2.0" 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-3.0.1" + sources."d3-contour-4.0.0" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" sources."d3-drag-3.0.0" @@ -106491,6 +107053,7 @@ in sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepmerge-2.2.1" + sources."define-properties-1.1.4" sources."delaunator-5.0.0" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" @@ -106531,6 +107094,8 @@ in sources."entities-2.2.0" sources."env-paths-2.2.1" sources."err-code-2.0.3" + sources."es-abstract-1.20.1" + sources."es-to-primitive-1.2.1" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" sources."escodegen-1.14.3" @@ -106551,6 +107116,7 @@ in sources."find-up-2.1.0" sources."follow-redirects-1.15.1" sources."font-awesome-filetypes-2.1.0" + sources."for-each-0.3.3" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" sources."forever-agent-0.6.1" @@ -106566,13 +107132,18 @@ in sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" + sources."function-bind-1.1.1" + sources."function.prototype.name-1.1.5" + sources."functions-have-names-1.2.3" (sources."gauge-2.7.4" // { dependencies = [ sources."strip-ansi-3.0.1" ]; }) + sources."get-intrinsic-1.1.2" sources."get-prototype-chain-1.0.1" sources."get-stdin-5.0.1" + sources."get-symbol-description-1.0.0" sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."glob-7.2.3" @@ -106582,8 +107153,13 @@ in sources."growly-1.3.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-ansi-2.0.0" + 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."has-unicode-2.0.1" sources."he-1.2.0" sources."highlight.js-11.1.0" @@ -106647,25 +107223,40 @@ in sources."split-skip-0.0.1" ]; }) + sources."internal-slot-1.0.3" sources."internmap-2.0.3" sources."iota-array-1.0.0" - sources."ip-1.1.8" + sources."ip-2.0.0" sources."ip-regex-2.1.0" sources."is-absolute-0.2.6" + sources."is-arguments-1.1.1" sources."is-arrayish-0.3.2" + sources."is-bigint-1.0.4" sources."is-binary-path-2.1.0" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" + sources."is-callable-1.2.4" + sources."is-date-object-1.0.5" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" + sources."is-generator-function-1.0.10" sources."is-glob-4.0.3" sources."is-lambda-1.0.1" + sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" + sources."is-number-object-1.0.7" + sources."is-regex-1.1.4" sources."is-relative-0.2.1" + sources."is-shared-array-buffer-1.0.2" sources."is-stream-1.1.0" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.9" sources."is-typedarray-1.0.0" sources."is-unc-path-0.1.2" sources."is-url-1.2.4" + sources."is-weakref-1.0.2" sources."is-windows-0.2.0" sources."is-wsl-2.2.0" (sources."is2-0.0.9" // { @@ -106722,7 +107313,7 @@ in }) (sources."make-fetch-happen-9.1.0" // { dependencies = [ - sources."minipass-3.3.3" + sources."minipass-3.3.5" ]; }) (sources."markdown-it-10.0.0" // { @@ -106740,7 +107331,7 @@ in sources."markdown-it-footnote-3.0.3" sources."markdown-it-ins-3.0.1" sources."markdown-it-mark-3.0.1" - sources."markdown-it-multimd-table-4.1.3" + sources."markdown-it-multimd-table-4.2.0" sources."markdown-it-sub-1.0.0" sources."markdown-it-sup-1.0.0" sources."markdown-it-toc-done-right-4.2.0" @@ -106761,34 +107352,34 @@ in }) (sources."minipass-collect-1.0.2" // { dependencies = [ - sources."minipass-3.3.3" + sources."minipass-3.3.5" ]; }) (sources."minipass-fetch-1.4.1" // { dependencies = [ - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" ]; }) (sources."minipass-flush-1.0.5" // { dependencies = [ - sources."minipass-3.3.3" + sources."minipass-3.3.5" ]; }) (sources."minipass-pipeline-1.2.4" // { dependencies = [ - sources."minipass-3.3.3" + sources."minipass-3.3.5" ]; }) (sources."minipass-sized-1.0.3" // { dependencies = [ - sources."minipass-3.3.3" + sources."minipass-3.3.5" ]; }) sources."minizlib-1.3.3" sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."moment-mini-2.24.0" sources."ms-2.1.2" sources."multiparty-4.2.3" @@ -106800,7 +107391,7 @@ in sources."negotiator-0.6.3" sources."nextgen-events-1.5.2" sources."no-case-2.3.2" - sources."node-abi-3.22.0" + sources."node-abi-3.24.0" sources."node-addon-api-4.3.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.11.0" @@ -106808,12 +107399,12 @@ in (sources."node-gyp-8.4.1" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."are-we-there-yet-3.0.0" + sources."are-we-there-yet-3.0.1" sources."chownr-2.0.0" sources."fs-minipass-2.1.0" sources."gauge-4.0.4" sources."is-fullwidth-code-point-3.0.0" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."npmlog-6.0.2" @@ -106835,15 +107426,18 @@ in sources."normalize-path-3.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" - sources."nwsapi-2.2.0" + sources."nwsapi-2.2.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" + sources."object-inspect-1.12.2" + sources."object-keys-1.1.1" (sources."object-to-arguments-0.0.8" // { dependencies = [ sources."inspect-parameters-declaration-0.0.10" sources."magicli-0.0.5" ]; }) + sources."object.assign-4.1.2" sources."omggif-1.0.10" sources."once-1.4.0" sources."open-7.4.2" @@ -106861,7 +107455,7 @@ in sources."pify-3.0.0" sources."pipe-functions-1.3.0" sources."pn-1.1.0" - sources."pngjs-5.0.0" + sources."pngjs-6.0.0" sources."prebuild-install-7.1.1" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" @@ -106873,7 +107467,7 @@ in ]; }) sources."proper-lockfile-2.0.1" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."q-1.1.2" @@ -106884,7 +107478,7 @@ in sources."queue-6.0.2" sources."random-bytes-1.0.0" sources."rc-1.2.8" - sources."re-reselect-4.0.0" + sources."re-reselect-4.0.1" sources."read-chunk-2.1.0" (sources."readable-stream-2.3.7" // { dependencies = [ @@ -106894,6 +107488,7 @@ in sources."readdirp-3.6.0" sources."reduce-flatten-1.0.1" sources."redux-3.7.2" + sources."regexp.prototype.flags-1.4.3" sources."relateurl-0.2.7" sources."relative-3.0.2" (sources."request-2.88.2" // { @@ -106945,6 +107540,7 @@ in ]; }) sources."shellwords-0.1.1" + sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."simple-concat-1.0.1" sources."simple-get-4.0.1" @@ -106955,7 +107551,7 @@ in ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + sources."socks-2.7.0" (sources."socks-proxy-agent-6.2.1" // { dependencies = [ sources."debug-4.3.4" @@ -106966,11 +107562,11 @@ in sources."source-map-url-0.4.1" sources."split-skip-0.0.2" sources."sprintf-js-1.1.2" - (sources."sqlite3-5.0.8" // { + (sources."sqlite3-5.0.11" // { dependencies = [ sources."chownr-2.0.0" sources."fs-minipass-2.1.0" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."tar-6.1.11" @@ -106979,7 +107575,7 @@ in sources."sshpk-1.17.0" (sources."ssri-8.0.1" // { dependencies = [ - sources."minipass-3.3.3" + sources."minipass-3.3.5" ]; }) sources."statuses-1.5.0" @@ -106993,6 +107589,8 @@ in sources."strip-ansi-3.0.1" ]; }) + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -107062,6 +107660,7 @@ in }) sources."uglifycss-0.0.29" sources."uid-safe-2.1.5" + sources."unbox-primitive-1.0.2" sources."unc-path-regex-0.1.2" sources."uniq-1.0.1" sources."unique-filename-1.1.1" @@ -107078,6 +107677,7 @@ in ]; }) sources."url-parse-1.5.10" + sources."util-0.12.4" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."valid-url-1.0.9" @@ -107089,6 +107689,8 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" sources."which-2.0.2" + sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.8" sources."wide-align-1.1.5" sources."word-wrap-1.2.3" sources."wordwrapjs-3.0.0" @@ -107099,7 +107701,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -107184,13 +107786,13 @@ in jsdoc = nodeEnv.buildNodePackage { name = "jsdoc"; packageName = "jsdoc"; - version = "3.6.10"; + version = "3.6.11"; src = fetchurl { - url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.10.tgz"; - sha512 = "IdQ8ppSo5LKZ9o3M+LKIIK8i00DIe5msDvG3G81Km+1dhy0XrOWD0Ji8H61ElgyEj/O9KRLokgKbAM9XX9CJAg=="; + url = "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.11.tgz"; + sha512 = "8UCU0TYeIYD9KeLzEcAu2q8N/mx9O3phAGl32nmHlE0LpaJL71mMkP4d+QE5zWfNt50qheHtOZ0qoxVrsX5TUg=="; }; dependencies = [ - sources."@babel/parser-7.18.5" + sources."@babel/parser-7.18.10" sources."@types/linkify-it-3.0.2" sources."@types/markdown-it-12.2.3" sources."@types/mdurl-1.0.2" @@ -107199,13 +107801,14 @@ in sources."catharsis-0.9.0" sources."entities-2.1.0" sources."escape-string-regexp-2.0.0" + sources."graceful-fs-4.2.10" sources."js2xmlparser-4.0.2" - sources."klaw-4.0.1" + sources."klaw-3.0.0" sources."linkify-it-3.0.3" sources."lodash-4.17.21" sources."markdown-it-12.3.2" sources."markdown-it-anchor-8.6.4" - sources."marked-4.0.17" + sources."marked-4.0.18" sources."mdurl-1.0.1" sources."mkdirp-1.0.4" sources."requizzle-0.2.3" @@ -107228,10 +107831,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.13.4"; + version = "2.13.5"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.13.4.tgz"; - sha512 = "HO3bosL84b2qWqI0q+kpT/OpRJwo0R4ivgmxaO848+bo10rc50SkPnrtwSFXttW0ym4np8jbJvLwk5NziB7jIw=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.13.5.tgz"; + sha512 = "dB2n1w3OaQ35PLcBGIWXlszjbPZwsgZoxsg6G8PtNf2cFMC1l0fObkYLUuXqTTdi6tKw4sAjfUseTdmDMHQRcg=="; }; dependencies = [ sources."balanced-match-1.0.2" @@ -107307,18 +107910,18 @@ in sha512 = "cVnggDrVkAAA3OvFfHpFEhOnmcsUpleEKq4d4O8sQWWSH40MBrWstKigVB1kGrgLWzuom+7rRdaCsnBD6VyObQ=="; }; dependencies = [ - sources."cli-color-2.0.2" + sources."cli-color-2.0.3" sources."d-1.0.1" sources."difflib-0.2.4" sources."dreamopt-0.8.0" - sources."es5-ext-0.10.61" + 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.6.0" // { dependencies = [ - sources."type-2.6.0" + sources."type-2.7.0" ]; }) sources."heap-0.2.7" @@ -107388,7 +107991,7 @@ in sources."once-1.4.0" sources."path-loader-1.0.12" sources."punycode-2.1.1" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."semver-7.3.7" @@ -107444,7 +108047,7 @@ in sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cliui-7.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."compressible-2.0.18" @@ -107472,7 +108075,7 @@ in sources."depd-2.0.0" sources."destroy-1.2.0" sources."dot-prop-5.3.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" @@ -107637,7 +108240,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -108022,7 +108625,7 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.10.3" (sources."randomatic-3.1.1" // { @@ -108312,7 +108915,7 @@ in sources."chardet-0.7.0" sources."clean-stack-3.0.1" sources."cli-cursor-3.1.0" - sources."cli-progress-3.11.1" + sources."cli-progress-3.11.2" (sources."cli-ux-5.6.7" // { dependencies = [ sources."supports-color-8.1.1" @@ -108345,7 +108948,7 @@ in sources."dotenv-8.6.0" sources."emoji-regex-8.0.0" sources."env-paths-2.2.1" - sources."es5-ext-0.10.61" + sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" sources."escape-string-regexp-4.0.0" @@ -108409,7 +109012,7 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."natural-orderby-2.0.3" @@ -108434,7 +109037,7 @@ in sources."picomatch-2.3.1" sources."pkg-up-3.1.0" sources."punycode-2.1.1" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."queue-microtask-1.2.3" sources."redeyed-2.1.1" sources."restore-cursor-3.1.0" @@ -108462,7 +109065,7 @@ in sources."tmp-0.0.33" sources."to-regex-range-5.0.1" sources."tslib-2.4.0" - sources."type-2.6.0" + sources."type-2.7.0" sources."type-fest-0.21.3" sources."typedarray-to-buffer-3.1.5" sources."universalify-0.1.2" @@ -108519,7 +109122,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."accepts-1.3.8" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -108543,7 +109146,7 @@ in sources."cookie-0.4.2" sources."cors-2.8.5" sources."custom-event-1.0.1" - sources."date-format-4.0.11" + sources."date-format-4.0.13" sources."debug-2.6.9" sources."depd-2.0.0" sources."destroy-1.2.0" @@ -108571,9 +109174,9 @@ in sources."statuses-1.5.0" ]; }) - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."follow-redirects-1.15.1" - sources."fs-extra-10.1.0" + sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" @@ -108595,9 +109198,9 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."isbinaryfile-4.0.10" - sources."jsonfile-6.1.0" + sources."jsonfile-4.0.0" sources."lodash-4.17.21" - (sources."log4js-6.5.2" // { + (sources."log4js-6.6.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -108639,7 +109242,7 @@ in ]; }) sources."socket.io-adapter-2.4.0" - (sources."socket.io-parser-4.0.4" // { + (sources."socket.io-parser-4.0.5" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -108647,7 +109250,7 @@ in }) sources."source-map-0.6.1" sources."statuses-2.0.1" - (sources."streamroller-3.1.1" // { + (sources."streamroller-3.1.2" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -108660,7 +109263,7 @@ in sources."toidentifier-1.0.1" sources."type-is-1.6.18" sources."ua-parser-js-0.7.31" - sources."universalify-2.0.0" + sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."utils-merge-1.0.1" sources."vary-1.1.2" @@ -108692,56 +109295,57 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/cli-7.17.10" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - (sources."@babel/core-7.18.5" // { + sources."@babel/cli-7.18.10" + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + (sources."@babel/core-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.2" // { + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.7" - (sources."@babel/helper-compilation-targets-7.18.2" // { + sources."@babel/helper-annotate-as-pure-7.18.6" + (sources."@babel/helper-compilation-targets-7.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.17.12" - sources."@babel/node-7.18.5" - sources."@babel/parser-7.18.5" - sources."@babel/plugin-syntax-jsx-7.17.12" - sources."@babel/plugin-transform-react-jsx-7.17.12" - sources."@babel/register-7.17.7" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.18.9" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.18.9" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helpers-7.18.9" + sources."@babel/highlight-7.18.6" + sources."@babel/node-7.18.10" + sources."@babel/parser-7.18.10" + sources."@babel/plugin-syntax-jsx-7.18.6" + sources."@babel/plugin-transform-react-jsx-7.18.10" + sources."@babel/register-7.18.9" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + 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.14" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."@openpgp/hkp-client-0.0.2" sources."@openpgp/wkd-client-0.0.3" - sources."@peculiar/asn1-schema-2.1.9" + sources."@peculiar/asn1-schema-2.2.0" sources."@peculiar/json-schema-1.1.12" sources."@peculiar/webcrypto-1.4.0" sources."@tootallnate/once-1.1.2" @@ -108774,7 +109378,7 @@ in sources."@xmpp/xml-0.13.1" sources."abab-2.0.6" sources."accepts-1.3.8" - sources."acorn-8.7.1" + sources."acorn-8.8.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -108818,12 +109422,12 @@ in sources."braces-3.0.2" sources."browser-or-node-1.3.0" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."bytes-3.1.2" sources."call-bind-1.0.2" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" sources."chalk-2.4.2" sources."chardet-1.4.0" sources."chownr-1.1.4" @@ -108852,7 +109456,7 @@ in sources."convert-source-map-1.8.0" sources."cookie-0.5.0" sources."cookie-signature-1.0.6" - sources."core-js-3.23.2" + sources."core-js-3.24.1" sources."core-util-is-1.0.3" sources."cors-2.8.5" sources."create-hash-1.2.0" @@ -108891,7 +109495,7 @@ in }) sources."dotenv-8.6.0" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -109029,7 +109633,7 @@ in sources."tr46-2.1.0" sources."webidl-conversions-6.1.0" sources."whatwg-url-8.7.0" - sources."ws-7.5.8" + sources."ws-7.5.9" ]; }) sources."jsesc-2.5.2" @@ -109069,10 +109673,10 @@ in sources."node-abi-2.30.1" sources."node-environment-flags-1.0.6" sources."node-fetch-2.6.7" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" - sources."nwsapi-2.2.0" + sources."nwsapi-2.2.1" sources."object-assign-4.1.1" sources."object-inspect-1.12.2" sources."object-keys-1.1.1" @@ -109080,7 +109684,7 @@ in sources."object.getownpropertydescriptors-2.1.4" sources."on-finished-2.4.1" sources."once-1.4.0" - sources."openpgp-5.3.0" + sources."openpgp-5.3.1" sources."optionator-0.8.3" sources."p-is-promise-3.0.0" sources."p-limit-2.3.0" @@ -109098,10 +109702,12 @@ in sources."picomatch-2.3.1" sources."pify-4.0.1" sources."pirates-4.0.5" - (sources."pkg-5.7.0" // { + (sources."pkg-5.8.0" // { dependencies = [ - sources."@babel/parser-7.17.10" - sources."@babel/types-7.17.10" + sources."@babel/generator-7.18.2" + sources."@babel/parser-7.18.4" + sources."@babel/types-7.18.4" + sources."@jridgewell/gen-mapping-0.3.2" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" @@ -109111,7 +109717,7 @@ in ]; }) sources."pkg-dir-3.0.0" - (sources."pkg-fetch-3.4.1" // { + (sources."pkg-fetch-3.4.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -109127,7 +109733,7 @@ in sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pvtsutils-1.3.2" @@ -109221,6 +109827,7 @@ in sources."unbox-primitive-1.0.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" + sources."update-browserslist-db-1.0.5" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."v8flags-3.2.0" @@ -109247,7 +109854,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-8.8.0" + sources."ws-8.8.1" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" @@ -109507,7 +110114,7 @@ in sources."minimatch-3.1.2" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."mute-stream-0.0.8" (sources."nconf-0.10.0" // { dependencies = [ @@ -109545,7 +110152,7 @@ in sources."pkginfo-0.4.1" sources."prelude-ls-1.1.2" sources."prompt-1.0.0" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.3" @@ -109755,7 +110362,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-1.0.4" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."mute-stream-0.0.8" (sources."nconf-0.11.4" // { dependencies = [ @@ -109785,7 +110392,7 @@ in sources."pkginfo-0.4.1" sources."prelude-ls-1.1.2" sources."prompt-1.0.0" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."read-1.0.7" @@ -109883,15 +110490,15 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "5.1.4"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-5.1.4.tgz"; - sha512 = "WwSbMslPxWSV7ARsGzkhJAFC1uQcuNGgiy2vZho4bpXVC+A7ZLXy8FngDbcAn7hCGC3ZDnl/4jdY6d84j63Y4g=="; + url = "https://registry.npmjs.org/lerna/-/lerna-5.3.0.tgz"; + sha512 = "0Y9xJqleVu0ExGmsw2WM/GkVmxOwtA7OLQFS5ERPKJfnsxH9roTX3a7NPaGQRI2E+tSJLJJGgNSf3WYEqinOqA=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -109904,176 +110511,153 @@ 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-5.1.4" - sources."@lerna/bootstrap-5.1.4" - sources."@lerna/changed-5.1.4" - sources."@lerna/check-working-tree-5.1.4" - sources."@lerna/child-process-5.1.4" - sources."@lerna/clean-5.1.4" - sources."@lerna/cli-5.1.4" - sources."@lerna/collect-uncommitted-5.1.4" - sources."@lerna/collect-updates-5.1.4" - sources."@lerna/command-5.1.4" - (sources."@lerna/conventional-commits-5.1.4" // { + sources."@lerna/add-5.3.0" + sources."@lerna/bootstrap-5.3.0" + sources."@lerna/changed-5.3.0" + sources."@lerna/check-working-tree-5.3.0" + sources."@lerna/child-process-5.3.0" + sources."@lerna/clean-5.3.0" + sources."@lerna/cli-5.3.0" + sources."@lerna/collect-uncommitted-5.3.0" + sources."@lerna/collect-updates-5.3.0" + sources."@lerna/command-5.3.0" + (sources."@lerna/conventional-commits-5.3.0" // { dependencies = [ sources."pify-5.0.0" ]; }) - (sources."@lerna/create-5.1.4" // { + (sources."@lerna/create-5.3.0" // { dependencies = [ + sources."builtins-5.0.1" sources."pify-5.0.0" + sources."validate-npm-package-name-4.0.0" sources."yargs-parser-20.2.4" ]; }) - sources."@lerna/create-symlink-5.1.4" - sources."@lerna/describe-ref-5.1.4" - sources."@lerna/diff-5.1.4" - sources."@lerna/exec-5.1.4" - sources."@lerna/filter-options-5.1.4" - sources."@lerna/filter-packages-5.1.4" - sources."@lerna/get-npm-exec-opts-5.1.4" - (sources."@lerna/get-packed-5.1.4" // { - dependencies = [ - sources."ssri-8.0.1" - ]; - }) - sources."@lerna/github-client-5.1.4" - sources."@lerna/gitlab-client-5.1.4" - sources."@lerna/global-options-5.1.4" - sources."@lerna/has-npm-version-5.1.4" - sources."@lerna/import-5.1.4" - sources."@lerna/info-5.1.4" - sources."@lerna/init-5.1.4" - sources."@lerna/link-5.1.4" - sources."@lerna/list-5.1.4" - sources."@lerna/listable-5.1.4" - sources."@lerna/log-packed-5.1.4" - (sources."@lerna/npm-conf-5.1.4" // { + sources."@lerna/create-symlink-5.3.0" + sources."@lerna/describe-ref-5.3.0" + sources."@lerna/diff-5.3.0" + sources."@lerna/exec-5.3.0" + sources."@lerna/filter-options-5.3.0" + sources."@lerna/filter-packages-5.3.0" + sources."@lerna/get-npm-exec-opts-5.3.0" + sources."@lerna/get-packed-5.3.0" + sources."@lerna/github-client-5.3.0" + sources."@lerna/gitlab-client-5.3.0" + sources."@lerna/global-options-5.3.0" + sources."@lerna/has-npm-version-5.3.0" + sources."@lerna/import-5.3.0" + sources."@lerna/info-5.3.0" + sources."@lerna/init-5.3.0" + sources."@lerna/link-5.3.0" + sources."@lerna/list-5.3.0" + sources."@lerna/listable-5.3.0" + sources."@lerna/log-packed-5.3.0" + (sources."@lerna/npm-conf-5.3.0" // { dependencies = [ sources."pify-5.0.0" ]; }) - (sources."@lerna/npm-dist-tag-5.1.4" // { + sources."@lerna/npm-dist-tag-5.3.0" + sources."@lerna/npm-install-5.3.0" + (sources."@lerna/npm-publish-5.3.0" // { dependencies = [ - sources."cacache-15.3.0" - sources."make-fetch-happen-8.0.14" - sources."npm-registry-fetch-9.0.0" - sources."socks-proxy-agent-5.0.1" - sources."ssri-8.0.1" - ]; - }) - sources."@lerna/npm-install-5.1.4" - (sources."@lerna/npm-publish-5.1.4" // { - dependencies = [ - sources."normalize-package-data-3.0.3" sources."pify-5.0.0" - sources."read-package-json-3.0.1" ]; }) - sources."@lerna/npm-run-script-5.1.4" - sources."@lerna/otplease-5.1.4" - sources."@lerna/output-5.1.4" - (sources."@lerna/pack-directory-5.1.4" // { - dependencies = [ - sources."ignore-walk-3.0.4" - sources."npm-packlist-2.2.2" - ]; - }) - sources."@lerna/package-5.1.4" - sources."@lerna/package-graph-5.1.4" - sources."@lerna/prerelease-id-from-version-5.1.4" - sources."@lerna/profiler-5.1.4" - sources."@lerna/project-5.1.4" - sources."@lerna/prompt-5.1.4" - (sources."@lerna/publish-5.1.4" // { - dependencies = [ - sources."cacache-15.3.0" - sources."make-fetch-happen-8.0.14" - sources."npm-registry-fetch-9.0.0" - sources."socks-proxy-agent-5.0.1" - sources."ssri-8.0.1" - ]; - }) - sources."@lerna/pulse-till-done-5.1.4" - sources."@lerna/query-graph-5.1.4" - sources."@lerna/resolve-symlink-5.1.4" - sources."@lerna/rimraf-dir-5.1.4" - sources."@lerna/run-5.1.4" - sources."@lerna/run-lifecycle-5.1.4" - sources."@lerna/run-topologically-5.1.4" - sources."@lerna/symlink-binary-5.1.4" - sources."@lerna/symlink-dependencies-5.1.4" - (sources."@lerna/temp-write-5.1.4" // { + sources."@lerna/npm-run-script-5.3.0" + sources."@lerna/otplease-5.3.0" + sources."@lerna/output-5.3.0" + sources."@lerna/pack-directory-5.3.0" + sources."@lerna/package-5.3.0" + sources."@lerna/package-graph-5.3.0" + sources."@lerna/prerelease-id-from-version-5.3.0" + sources."@lerna/profiler-5.3.0" + sources."@lerna/project-5.3.0" + sources."@lerna/prompt-5.3.0" + sources."@lerna/publish-5.3.0" + sources."@lerna/pulse-till-done-5.3.0" + sources."@lerna/query-graph-5.3.0" + sources."@lerna/resolve-symlink-5.3.0" + sources."@lerna/rimraf-dir-5.3.0" + sources."@lerna/run-5.3.0" + sources."@lerna/run-lifecycle-5.3.0" + sources."@lerna/run-topologically-5.3.0" + sources."@lerna/symlink-binary-5.3.0" + sources."@lerna/symlink-dependencies-5.3.0" + (sources."@lerna/temp-write-5.3.0" // { dependencies = [ sources."make-dir-3.1.0" sources."semver-6.3.0" ]; }) - sources."@lerna/timer-5.1.4" - sources."@lerna/validation-error-5.1.4" - sources."@lerna/version-5.1.4" - (sources."@lerna/write-log-file-5.1.4" // { + sources."@lerna/timer-5.3.0" + sources."@lerna/validation-error-5.3.0" + sources."@lerna/version-5.3.0" + (sources."@lerna/write-log-file-5.3.0" // { dependencies = [ - sources."write-file-atomic-3.0.3" + sources."write-file-atomic-4.0.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.2.0" // { + (sources."@npmcli/arborist-5.3.0" // { dependencies = [ - sources."@npmcli/move-file-2.0.0" sources."builtins-5.0.1" sources."hosted-git-info-5.0.0" - sources."lru-cache-7.10.1" - sources."npm-package-arg-9.0.2" + sources."lru-cache-7.13.2" + sources."npm-package-arg-9.1.0" sources."validate-npm-package-name-4.0.0" ]; }) - sources."@npmcli/ci-detect-1.4.0" - sources."@npmcli/fs-1.1.1" + sources."@npmcli/fs-2.1.1" (sources."@npmcli/git-3.0.1" // { dependencies = [ - sources."lru-cache-7.10.1" + sources."lru-cache-7.13.2" ]; }) sources."@npmcli/installed-package-contents-1.0.7" - (sources."@npmcli/map-workspaces-2.0.3" // { + (sources."@npmcli/map-workspaces-2.0.4" // { dependencies = [ sources."brace-expansion-2.0.1" sources."glob-8.0.3" sources."minimatch-5.1.0" ]; }) - sources."@npmcli/metavuln-calculator-3.1.0" - sources."@npmcli/move-file-1.1.2" + sources."@npmcli/metavuln-calculator-3.1.1" + sources."@npmcli/move-file-2.0.0" 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-3.0.3" - sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.6.0" - (sources."@octokit/endpoint-6.0.12" // { + sources."@npmcli/run-script-4.2.0" + sources."@nrwl/cli-14.5.2" + sources."@nrwl/tao-14.5.2" + sources."@octokit/auth-token-3.0.0" + sources."@octokit/core-4.0.4" + (sources."@octokit/endpoint-7.0.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-12.4.0" + sources."@octokit/graphql-5.0.0" + sources."@octokit/openapi-types-12.11.0" sources."@octokit/plugin-enterprise-rest-6.0.1" - sources."@octokit/plugin-paginate-rest-2.19.0" + sources."@octokit/plugin-paginate-rest-3.1.0" sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.15.0" - (sources."@octokit/request-5.6.3" // { + sources."@octokit/plugin-rest-endpoint-methods-6.2.0" + (sources."@octokit/request-6.2.0" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) - sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.37.0" - sources."@tootallnate/once-1.1.2" + sources."@octokit/request-error-3.0.0" + sources."@octokit/rest-19.0.3" + sources."@octokit/types-6.41.0" + sources."@parcel/watcher-2.0.4" + sources."@tootallnate/once-2.0.0" + sources."@types/json5-0.0.29" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" @@ -110084,6 +110668,7 @@ in sources."agent-base-6.0.2" sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" + sources."ansi-colors-4.1.3" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -110091,8 +110676,10 @@ in }) sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" + sources."anymatch-3.1.2" sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.0" + sources."are-we-there-yet-3.0.1" + sources."argparse-2.0.1" sources."array-differ-3.0.0" sources."array-ify-1.0.0" sources."array-union-2.1.0" @@ -110100,44 +110687,45 @@ in sources."asap-2.0.6" sources."at-least-node-1.0.0" sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" sources."before-after-hook-2.2.2" (sources."bin-links-3.0.1" // { dependencies = [ - sources."cmd-shim-5.0.0" - sources."read-cmd-shim-3.0.0" sources."write-file-atomic-4.0.1" ]; }) + sources."binary-extensions-2.2.0" + sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" + sources."buffer-5.7.1" sources."buffer-from-1.1.2" sources."builtins-1.0.3" sources."byte-size-7.0.1" (sources."cacache-16.1.1" // { dependencies = [ - sources."@npmcli/fs-2.1.0" - sources."@npmcli/move-file-2.0.0" sources."brace-expansion-2.0.1" sources."glob-8.0.3" - sources."lru-cache-7.10.1" + sources."lru-cache-7.13.2" sources."minimatch-5.1.0" ]; }) - sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."chalk-4.1.2" sources."chardet-0.7.0" + sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" + sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" sources."clone-deep-4.0.1" - sources."cmd-shim-4.1.0" + sources."cmd-shim-5.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-support-1.1.3" @@ -110155,6 +110743,7 @@ in 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" ]; }) @@ -110180,9 +110769,9 @@ in sources."map-obj-1.0.1" ]; }) - sources."decode-uri-component-0.2.0" sources."dedent-0.7.0" sources."defaults-1.0.3" + sources."define-lazy-prop-2.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" sources."deprecation-2.3.1" @@ -110190,9 +110779,12 @@ in sources."dezalgo-1.0.4" sources."dir-glob-3.0.1" sources."dot-prop-6.0.1" + sources."dotenv-10.0.0" sources."duplexer-0.1.2" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" + sources."end-of-stream-1.4.4" + sources."enquirer-2.3.6" sources."env-paths-2.2.1" sources."envinfo-7.8.1" sources."err-code-2.0.3" @@ -110210,17 +110802,19 @@ in sources."fastq-1.13.0" sources."figures-3.2.0" sources."fill-range-7.0.1" - sources."filter-obj-1.1.0" sources."find-up-4.1.0" + sources."flat-5.0.2" + sources."fs-constants-1.0.0" sources."fs-extra-9.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" + sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."gauge-4.0.4" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.2" (sources."get-pkg-repo-4.2.1" // { dependencies = [ + sources."hosted-git-info-4.1.0" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -110240,8 +110834,8 @@ in sources."semver-6.3.0" ]; }) - sources."git-up-4.0.5" - sources."git-url-parse-11.6.0" + sources."git-up-6.0.0" + sources."git-url-parse-12.0.0" sources."gitconfiglocal-1.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -110251,15 +110845,15 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" - sources."hosted-git-info-4.1.0" + sources."hosted-git-info-3.0.8" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" + sources."ieee754-1.2.1" sources."ignore-5.2.0" (sources."ignore-walk-5.0.1" // { dependencies = [ @@ -110279,52 +110873,69 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - (sources."init-package-json-2.0.5" // { + (sources."init-package-json-3.0.2" // { dependencies = [ - sources."normalize-package-data-3.0.3" - sources."read-package-json-4.1.2" + sources."builtins-5.0.1" + sources."hosted-git-info-5.0.0" + sources."lru-cache-7.13.2" + sources."npm-package-arg-9.1.0" + sources."validate-npm-package-name-4.0.0" ]; }) - sources."inquirer-7.3.3" - sources."ip-1.1.8" + sources."inquirer-8.2.4" + sources."ip-2.0.0" sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" sources."is-ci-2.0.0" sources."is-core-module-2.9.0" + sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" + sources."is-interactive-1.0.0" sources."is-lambda-1.0.1" 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-ssh-1.3.3" + sources."is-ssh-1.4.0" sources."is-stream-2.0.1" 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" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."js-tokens-4.0.0" + sources."js-yaml-4.1.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-stringify-nice-1.1.4" sources."json-stringify-safe-5.0.1" + sources."json5-1.0.1" + sources."jsonc-parser-3.0.0" sources."jsonfile-6.1.0" sources."jsonparse-1.3.1" sources."just-diff-5.0.3" sources."just-diff-apply-5.3.1" sources."kind-of-6.0.3" - (sources."libnpmaccess-4.0.3" // { + (sources."libnpmaccess-6.0.3" // { dependencies = [ - sources."npm-registry-fetch-11.0.0" + sources."builtins-5.0.1" + sources."hosted-git-info-5.0.0" + sources."lru-cache-7.13.2" + sources."npm-package-arg-9.1.0" + sources."validate-npm-package-name-4.0.0" ]; }) - (sources."libnpmpublish-4.0.2" // { + (sources."libnpmpublish-6.0.4" // { dependencies = [ - sources."normalize-package-data-3.0.3" - sources."npm-registry-fetch-11.0.0" - sources."ssri-8.0.1" + sources."builtins-5.0.1" + sources."hosted-git-info-5.0.0" + sources."lru-cache-7.13.2" + sources."npm-package-arg-9.1.0" + sources."validate-npm-package-name-4.0.0" ]; }) sources."lines-and-columns-1.2.4" @@ -110336,25 +110947,26 @@ in sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.ismatch-4.4.0" + sources."log-symbols-4.1.0" sources."lru-cache-6.0.0" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" ]; }) - (sources."make-fetch-happen-9.1.0" // { + (sources."make-fetch-happen-10.2.0" // { dependencies = [ - sources."cacache-15.3.0" - sources."ssri-8.0.1" + sources."lru-cache-7.13.2" ]; }) sources."map-obj-4.3.0" (sources."meow-8.1.2" // { dependencies = [ - sources."hosted-git-info-2.8.9" + sources."hosted-git-info-4.1.0" sources."normalize-package-data-3.0.3" (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" ]; @@ -110380,9 +110992,9 @@ in sources."arrify-1.0.1" ]; }) - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" + sources."minipass-fetch-2.1.0" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -110396,6 +111008,7 @@ in 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.7" // { dependencies = [ sources."tr46-0.0.3" @@ -110403,20 +111016,22 @@ in sources."whatwg-url-5.0.0" ]; }) - sources."node-gyp-8.4.1" + sources."node-gyp-9.1.0" + sources."node-gyp-build-4.5.0" sources."nopt-5.0.0" (sources."normalize-package-data-4.0.0" // { dependencies = [ sources."hosted-git-info-5.0.0" - sources."lru-cache-7.10.1" + sources."lru-cache-7.13.2" ]; }) + sources."normalize-path-3.0.0" sources."normalize-url-6.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.5" - (sources."npm-packlist-5.1.0" // { + sources."npm-package-arg-8.1.1" + (sources."npm-packlist-5.1.1" // { dependencies = [ sources."brace-expansion-2.0.1" sources."glob-8.0.3" @@ -110427,30 +111042,40 @@ in dependencies = [ sources."builtins-5.0.1" sources."hosted-git-info-5.0.0" - sources."lru-cache-7.10.1" - sources."npm-package-arg-9.0.2" + sources."lru-cache-7.13.2" + sources."npm-package-arg-9.1.0" sources."validate-npm-package-name-4.0.0" ]; }) - (sources."npm-registry-fetch-13.1.1" // { + (sources."npm-registry-fetch-13.3.0" // { dependencies = [ - sources."@tootallnate/once-2.0.0" sources."builtins-5.0.1" sources."hosted-git-info-5.0.0" - sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.10.1" - sources."make-fetch-happen-10.1.8" - sources."minipass-fetch-2.1.0" - sources."npm-package-arg-9.0.2" - sources."socks-proxy-agent-7.0.0" + sources."lru-cache-7.13.2" + sources."npm-package-arg-9.1.0" sources."validate-npm-package-name-4.0.0" ]; }) sources."npm-run-path-4.0.1" sources."npmlog-6.0.2" - sources."object-inspect-1.12.2" + (sources."nx-14.5.2" // { + dependencies = [ + sources."chalk-4.1.0" + sources."cli-spinners-2.6.1" + sources."fast-glob-3.2.7" + sources."fs-extra-10.1.0" + sources."glob-7.1.4" + sources."minimatch-3.0.5" + sources."semver-7.3.4" + sources."tmp-0.2.1" + sources."yargs-17.5.1" + sources."yargs-parser-21.0.1" + ]; + }) sources."once-1.4.0" sources."onetime-5.1.2" + sources."open-8.4.0" + sources."ora-5.4.1" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" sources."p-limit-2.3.0" @@ -110463,20 +111088,20 @@ in sources."p-timeout-3.2.0" sources."p-try-2.2.0" sources."p-waterfall-2.1.1" - (sources."pacote-13.6.0" // { + (sources."pacote-13.6.1" // { dependencies = [ sources."builtins-5.0.1" sources."hosted-git-info-5.0.0" - sources."lru-cache-7.10.1" - sources."npm-package-arg-9.0.2" + sources."lru-cache-7.13.2" + sources."npm-package-arg-9.1.0" sources."validate-npm-package-name-4.0.0" ]; }) sources."parent-module-1.0.1" sources."parse-conflict-json-2.0.2" sources."parse-json-5.2.0" - sources."parse-path-4.0.4" - sources."parse-url-6.0.0" + sources."parse-path-5.0.0" + sources."parse-url-7.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -110493,15 +111118,13 @@ in sources."promise-retry-2.0.1" sources."promzard-0.3.0" sources."proto-list-1.2.4" - sources."protocols-1.4.8" + sources."protocols-2.0.1" sources."punycode-2.1.1" sources."q-1.5.1" - sources."qs-6.10.5" - sources."query-string-6.14.1" sources."queue-microtask-1.2.3" sources."quick-lru-4.0.1" sources."read-1.0.7" - sources."read-cmd-shim-2.0.0" + sources."read-cmd-shim-3.0.0" (sources."read-package-json-5.0.1" // { dependencies = [ sources."brace-expansion-2.0.1" @@ -110534,6 +111157,7 @@ in }) sources."readable-stream-3.6.0" sources."readdir-scoped-modules-1.1.0" + sources."readdirp-3.6.0" sources."redent-3.0.0" sources."require-directory-2.1.1" sources."resolve-1.22.1" @@ -110545,7 +111169,7 @@ in sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" + sources."rxjs-7.5.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."semver-7.3.7" @@ -110553,12 +111177,11 @@ in sources."shallow-clone-3.0.1" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" - sources."socks-proxy-agent-6.2.1" + sources."socks-2.7.0" + sources."socks-proxy-agent-7.0.0" sources."sort-keys-2.0.0" sources."source-map-0.6.1" sources."spdx-correct-3.1.1" @@ -110566,10 +111189,8 @@ in sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.11" sources."split-1.0.1" - sources."split-on-first-1.1.0" sources."split2-3.2.2" sources."ssri-9.0.1" - sources."strict-uri-encode-2.0.0" sources."string-width-4.2.3" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" @@ -110580,6 +111201,7 @@ in sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.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" sources."through-2.3.8" @@ -110589,11 +111211,16 @@ in sources."tr46-2.1.0" sources."treeverse-2.0.0" sources."trim-newlines-3.0.1" - sources."tslib-1.14.1" + (sources."tsconfig-paths-3.14.1" // { + dependencies = [ + sources."strip-bom-3.0.0" + ]; + }) + sources."tslib-2.4.0" sources."type-fest-0.4.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."uglify-js-3.16.1" + sources."uglify-js-3.16.3" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."universal-user-agent-6.0.0" @@ -110601,6 +111228,7 @@ in sources."upath-2.0.1" sources."util-deprecate-1.0.2" 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."walk-up-path-1.0.0" @@ -110845,7 +111473,7 @@ in sources."statuses-2.0.1" ]; }) - sources."http-parser-js-0.5.6" + sources."http-parser-js-0.5.8" sources."inherits-2.0.4" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-1.0.1" @@ -111139,7 +111767,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.5.0" // { + (sources."engine.io-3.6.0" // { dependencies = [ sources."cookie-0.4.2" sources."debug-4.1.1" @@ -111339,7 +111967,7 @@ in sources."preserve-0.2.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.10.3" (sources."randomatic-3.1.1" // { @@ -111455,14 +112083,14 @@ in ]; }) sources."snapdragon-util-3.0.1" - (sources."socket.io-2.4.1" // { + (sources."socket.io-2.5.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" ]; }) sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.4.0" // { + (sources."socket.io-client-2.5.0" // { dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" @@ -111585,7 +112213,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.0.0" + sources."@types/node-18.6.3" sources."commander-2.20.3" sources."diff-3.5.0" sources."get-stdin-5.0.1" @@ -111725,7 +112353,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-0.5.6" - sources."moment-2.29.3" + sources."moment-2.29.4" (sources."mooremachine-2.3.0" // { dependencies = [ sources."assert-plus-0.2.0" @@ -111845,42 +112473,36 @@ in markdownlint-cli = nodeEnv.buildNodePackage { name = "markdownlint-cli"; packageName = "markdownlint-cli"; - version = "0.31.1"; + version = "0.32.1"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.31.1.tgz"; - sha512 = "keIOMwQn+Ch7MoBwA+TdkyVMuxAeZFEGmIIlvwgV0Z1TGS5MxPnRr29XCLhkNzCHU+uNKGjU+VEjLX+Z9kli6g=="; + url = "https://registry.npmjs.org/markdownlint-cli/-/markdownlint-cli-0.32.1.tgz"; + sha512 = "hVLQ+72b5esQd7I+IqzBEB4x/4C+wJaxS2M6nqaGoDwrtNY6gydGf5CIUJtQcXtqsM615++a8TZPsvEtH6H4gw=="; }; dependencies = [ sources."argparse-2.0.1" sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."commander-9.0.0" - sources."concat-map-0.0.1" + sources."brace-expansion-2.0.1" + sources."commander-9.4.0" sources."deep-extend-0.6.0" - sources."entities-2.1.0" + sources."entities-3.0.1" sources."fs.realpath-1.0.0" sources."get-stdin-9.0.0" - (sources."glob-7.2.3" // { - dependencies = [ - sources."minimatch-3.1.2" - ]; - }) + sources."glob-8.0.3" sources."ignore-5.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-2.0.0" + sources."ini-3.0.0" sources."js-yaml-4.1.0" - sources."jsonc-parser-3.0.0" - sources."linkify-it-3.0.3" - sources."markdown-it-12.3.2" - sources."markdownlint-0.25.1" - sources."markdownlint-rule-helpers-0.16.0" + sources."jsonc-parser-3.1.0" + sources."linkify-it-4.0.1" + sources."markdown-it-13.0.1" + sources."markdownlint-0.26.1" + sources."markdownlint-rule-helpers-0.17.1" sources."mdurl-1.0.1" - sources."minimatch-3.0.8" + sources."minimatch-5.1.0" sources."minimist-1.2.6" sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."run-con-1.2.10" + sources."run-con-1.2.11" sources."strip-json-comments-3.1.1" sources."uc.micro-1.0.6" sources."wrappy-1.0.2" @@ -111898,47 +112520,45 @@ in markdownlint-cli2 = nodeEnv.buildNodePackage { name = "markdownlint-cli2"; packageName = "markdownlint-cli2"; - version = "0.4.0"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.4.0.tgz"; - sha512 = "EcwP5tAbyzzL3ACI0L16LqbNctmh8wNX56T+aVvIxWyTAkwbYNx2V7IheRkXS3mE7R/pnaApZ/RSXcXuzRVPjg=="; + url = "https://registry.npmjs.org/markdownlint-cli2/-/markdownlint-cli2-0.5.0.tgz"; + sha512 = "lUirs0NEuIOIwfWCjVqBBKB5VXD+OceyviHuyjwOUAj/DWm5Pf8iJ23nMo/0ySH6svQJ9ddC+Dsq/X5Hd+yvnA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" sources."argparse-2.0.1" - sources."array-union-3.0.1" sources."braces-3.0.2" sources."dir-glob-3.0.1" - sources."entities-2.1.0" + sources."entities-3.0.1" sources."fast-glob-3.2.11" sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."glob-parent-5.1.2" - sources."globby-12.1.0" + sources."globby-13.1.2" sources."ignore-5.2.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."linkify-it-3.0.3" - sources."markdown-it-12.3.2" - sources."markdownlint-0.25.1" + sources."linkify-it-4.0.1" + sources."markdown-it-13.0.1" + sources."markdownlint-0.26.1" sources."markdownlint-cli2-formatter-default-0.0.3" - sources."markdownlint-rule-helpers-0.16.0" sources."mdurl-1.0.1" sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."path-type-4.0.0" sources."picomatch-2.3.1" sources."queue-microtask-1.2.3" sources."reusify-1.0.4" sources."run-parallel-1.2.0" sources."slash-4.0.0" - sources."strip-json-comments-4.0.0" + sources."strip-json-comments-5.0.0" sources."to-regex-range-5.0.1" sources."uc.micro-1.0.6" - sources."yaml-1.10.2" + sources."yaml-2.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -111963,7 +112583,7 @@ in sources."async-3.2.4" sources."boolbase-1.0.0" sources."chalk-4.1.2" - sources."cheerio-1.0.0-rc.11" + sources."cheerio-1.0.0-rc.12" sources."cheerio-select-2.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -111975,7 +112595,7 @@ in sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domutils-3.0.1" - sources."entities-4.3.0" + sources."entities-4.3.1" sources."has-flag-4.0.0" sources."html-link-extractor-1.0.5" sources."htmlparser2-8.0.1" @@ -111986,7 +112606,7 @@ in sources."link-check-5.1.0" sources."lodash-4.17.21" sources."markdown-link-extractor-3.0.2" - sources."marked-4.0.17" + sources."marked-4.0.18" sources."ms-2.1.3" sources."needle-3.1.0" sources."nth-check-2.1.1" @@ -111997,7 +112617,6 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."supports-color-7.2.0" - sources."tslib-2.4.0" ]; buildInputs = globalBuildInputs; meta = { @@ -112197,7 +112816,7 @@ in }) sources."ecc-jsbn-0.1.2" sources."entities-1.1.2" - sources."es5-ext-0.10.61" + sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" (sources."es6-set-0.1.5" // { @@ -112228,7 +112847,7 @@ in sources."exit-hook-1.1.1" (sources."ext-1.6.0" // { dependencies = [ - sources."type-2.6.0" + sources."type-2.7.0" ]; }) sources."extend-3.0.2" @@ -112292,7 +112911,7 @@ in sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."jsonify-0.0.0" - sources."jsonpointer-5.0.0" + sources."jsonpointer-5.0.1" sources."jsprim-1.4.2" sources."levn-0.3.0" sources."lodash-4.17.21" @@ -112343,7 +112962,7 @@ in sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."progress-1.1.8" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."readable-stream-2.3.7" @@ -112484,14 +113103,13 @@ in "@mermaid-js/mermaid-cli" = nodeEnv.buildNodePackage { name = "_at_mermaid-js_slash_mermaid-cli"; packageName = "@mermaid-js/mermaid-cli"; - version = "9.1.2"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-9.1.2.tgz"; - sha512 = "ZiCHQEXn8P4iQpCpobUZwofcncg3sE282cVb7+bY9JIDlOg+DF9B35cwPYbXnHX3gsmD0zybfYWmnaNmKLnemA=="; + url = "https://registry.npmjs.org/@mermaid-js/mermaid-cli/-/mermaid-cli-9.1.4.tgz"; + sha512 = "qof7CxgLijQmO6QjrjR0Kixst0MBQVORF9BGpRD+TVbJTQtxpiOTJlGpHPetWocgDhC1TzzGsJWZ1ZXVl2ysSQ=="; }; dependencies = [ - sources."@braintree/sanitize-url-6.0.0" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/yauzl-2.10.0" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -112505,87 +113123,11 @@ in sources."chownr-1.1.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-9.3.0" + sources."commander-9.4.0" sources."concat-map-0.0.1" sources."cross-fetch-3.1.5" - sources."d3-7.4.4" - sources."d3-array-3.1.6" - 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-3.0.1" - sources."d3-delaunay-6.0.2" - sources."d3-dispatch-3.0.1" - sources."d3-drag-3.0.0" - (sources."d3-dsv-3.0.1" // { - dependencies = [ - sources."commander-7.2.0" - ]; - }) - sources."d3-ease-3.0.1" - sources."d3-fetch-3.0.1" - sources."d3-force-3.0.0" - sources."d3-format-3.1.0" - sources."d3-geo-3.0.1" - sources."d3-hierarchy-3.1.2" - sources."d3-interpolate-3.0.1" - sources."d3-path-3.0.1" - sources."d3-polygon-3.0.1" - sources."d3-quadtree-3.0.1" - sources."d3-random-3.0.1" - sources."d3-scale-4.0.2" - sources."d3-scale-chromatic-3.0.0" - sources."d3-selection-3.0.0" - sources."d3-shape-3.1.0" - sources."d3-time-3.0.0" - sources."d3-time-format-4.1.0" - sources."d3-timer-3.0.1" - sources."d3-transition-3.0.1" - sources."d3-voronoi-1.1.4" - sources."d3-zoom-3.0.0" - sources."dagre-0.8.5" - (sources."dagre-d3-0.6.4" // { - dependencies = [ - sources."commander-2.20.3" - 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."debug-4.3.4" - sources."delaunator-5.0.0" - sources."devtools-protocol-0.0.1001819" - sources."dompurify-2.3.8" + sources."devtools-protocol-0.0.1019158" sources."end-of-stream-1.4.4" sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" @@ -112594,21 +113136,14 @@ in sources."fs.realpath-1.0.0" sources."get-stream-5.2.0" sources."glob-7.2.3" - sources."graphlib-2.1.8" sources."has-flag-4.0.0" sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.6.3" sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."internmap-2.0.3" - sources."khroma-2.0.0" sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."mermaid-9.1.2" sources."minimatch-3.1.2" sources."mkdirp-classic-0.5.3" - sources."moment-mini-2.24.0" sources."ms-2.1.2" sources."node-fetch-2.6.7" sources."once-1.4.0" @@ -112622,15 +113157,11 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-14.4.1" + sources."puppeteer-15.5.0" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" - sources."robust-predicates-3.0.1" - sources."rw-1.3.3" sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" sources."string_decoder-1.3.0" - sources."stylis-4.1.1" sources."supports-color-7.2.0" sources."tar-fs-2.1.1" sources."tar-stream-2.2.0" @@ -112641,7 +113172,7 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wrappy-1.0.2" - sources."ws-8.7.0" + sources."ws-8.8.0" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; @@ -112817,7 +113348,7 @@ in sources."once-1.4.0" sources."path-loader-1.0.12" sources."punycode-2.1.1" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."semver-7.3.7" @@ -112860,7 +113391,7 @@ in sources."chalk-4.1.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" sources."clone-1.0.4" sources."color-convert-2.0.1" @@ -112922,15 +113453,15 @@ in near-cli = nodeEnv.buildNodePackage { name = "near-cli"; packageName = "near-cli"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/near-cli/-/near-cli-3.3.1.tgz"; - sha512 = "wqZ9dDnKddIACj01+Oh3Obr1YF39olF/izj8aJGG+TikVTchnmhq21HPvkLphax+mJ2b/UVHKwa60UcAkg6OdA=="; + url = "https://registry.npmjs.org/near-cli/-/near-cli-3.4.0.tgz"; + sha512 = "twuq8IO4Ok68542ZlctQy/RRHYY/q6I1Dmub3tuVNUWkOmiViDDEmd1g5X3Lt/tuOkSQl/831o/k03p3MWkaXw=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -112943,11 +113474,11 @@ in sources."@jest/environment-27.5.1" sources."@jest/fake-timers-27.5.1" sources."@jest/types-27.5.1" - sources."@ledgerhq/devices-6.27.1" - sources."@ledgerhq/errors-6.10.0" - sources."@ledgerhq/hw-transport-6.27.1" - sources."@ledgerhq/hw-transport-node-hid-6.27.1" - sources."@ledgerhq/hw-transport-node-hid-noevents-6.27.1" + sources."@ledgerhq/devices-7.0.0" + sources."@ledgerhq/errors-6.10.1" + sources."@ledgerhq/hw-transport-6.27.2" + sources."@ledgerhq/hw-transport-node-hid-6.27.2" + sources."@ledgerhq/hw-transport-node-hid-noevents-6.27.2" (sources."@ledgerhq/hw-transport-u2f-5.36.0-deprecated" // { dependencies = [ sources."@ledgerhq/devices-5.51.1" @@ -112980,7 +113511,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.0.0" + sources."@types/node-18.6.3" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-21.0.0" @@ -113029,7 +113560,7 @@ in sources."cipher-base-1.0.4" sources."cli-boxes-2.2.1" sources."cliui-7.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -113050,7 +113581,7 @@ in sources."depd-2.0.0" sources."detect-libc-1.0.3" sources."dot-prop-5.3.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-polyfill-0.1.3" @@ -113159,7 +113690,7 @@ in }) sources."node-addon-api-3.2.1" sources."node-fetch-2.6.7" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" sources."node-hid-2.1.1" sources."normalize-url-4.5.1" sources."npmlog-4.1.2" @@ -113314,7 +113845,7 @@ in sources."is-arrayish-0.3.2" sources."is-stream-2.0.1" sources."kuler-2.0.0" - sources."logform-2.4.1" + sources."logform-2.4.2" sources."lru-cache-6.0.0" sources."ms-2.1.3" sources."one-time-1.0.0" @@ -113367,14 +113898,14 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "9.0.0"; + version = "9.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.0.0.tgz"; - sha512 = "Ma6p4s+XCTPxCuAMrOA/IJRmVy16R8Sdhtwl4PrCr7IBlj4cPawF0vg/l7nOT1jPbuNS7lIRJpBSvVsXwEZuzw=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-9.1.0.tgz"; + sha512 = "HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g=="; }; dependencies = [ sources."@gar/promisify-1.1.3" - sources."@npmcli/fs-2.1.0" + sources."@npmcli/fs-2.1.1" sources."@npmcli/move-file-2.0.0" sources."@tootallnate/once-2.0.0" sources."abbrev-1.1.1" @@ -113383,7 +113914,7 @@ in sources."aggregate-error-3.1.0" sources."ansi-regex-5.0.1" sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.0" + sources."are-we-there-yet-3.0.1" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" (sources."cacache-16.1.1" // { @@ -113421,14 +113952,14 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ip-1.1.8" + sources."ip-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-lambda-1.0.1" sources."isexe-2.0.0" - sources."lru-cache-7.10.1" - sources."make-fetch-happen-10.1.8" + sources."lru-cache-7.13.2" + sources."make-fetch-happen-10.2.0" sources."minimatch-3.1.2" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-2.1.0" sources."minipass-flush-1.0.5" @@ -113458,7 +113989,7 @@ in sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + sources."socks-2.7.0" sources."socks-proxy-agent-7.0.0" sources."ssri-9.0.1" sources."string-width-4.2.3" @@ -113486,10 +114017,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.4.0.tgz"; - sha512 = "amJnQCcgtRVw9SvoebO3BKGESClrfXGCUTX9hSn1OuGQTQBOZmVd0Z0OlecpuRksKvbsUqALE8jls/ErClAPuQ=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.5.0.tgz"; + sha512 = "2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg=="; }; buildInputs = globalBuildInputs; meta = { @@ -113906,43 +114437,37 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "2.2.2"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-2.2.2.tgz"; - sha512 = "DAx4v9/W2MEBb/tHNO94bmjeELdAg7CVZlPJX+UBH1RsmXB0q/3ZYW1Zi55NVMVN/0sBBO1g+dI/L0NWCG8s9A=="; + url = "https://registry.npmjs.org/node-red/-/node-red-3.0.1.tgz"; + sha512 = "zZP5yKDSTZMqxQgwxjme3shRuUsmEBYt/DIOK932oSv2pUByJ/23SJpaX9q4AUEecZDKoLlG/o7YBtfFTnoYJA=="; }; dependencies = [ - sources."@babel/runtime-7.18.3" + sources."@babel/runtime-7.18.9" sources."@mapbox/node-pre-gyp-1.0.9" - sources."@node-red/editor-api-2.2.2" - sources."@node-red/editor-client-2.2.2" - (sources."@node-red/nodes-2.2.2" // { + sources."@node-red/editor-api-3.0.1" + sources."@node-red/editor-client-3.0.1" + (sources."@node-red/nodes-3.0.1" // { dependencies = [ - sources."bytes-3.1.2" - sources."cookie-0.4.2" + sources."cookie-0.5.0" sources."iconv-lite-0.6.3" sources."media-typer-1.1.0" - (sources."raw-body-2.4.3" // { - dependencies = [ - sources."iconv-lite-0.4.24" - ]; - }) ]; }) - sources."@node-red/registry-2.2.2" - sources."@node-red/runtime-2.2.2" - sources."@node-red/util-2.2.2" + sources."@node-red/registry-3.0.1" + sources."@node-red/runtime-3.0.1" + sources."@node-red/util-3.0.1" sources."@sindresorhus/is-4.6.0" sources."@szmarczak/http-timer-4.0.6" sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" - sources."acorn-8.7.0" + sources."acorn-8.7.1" sources."acorn-walk-8.2.0" (sources."agent-base-6.0.2" // { dependencies = [ @@ -113950,7 +114475,7 @@ in sources."ms-2.1.2" ]; }) - sources."ajv-8.10.0" + sources."ajv-8.11.0" sources."ansi-colors-4.1.3" sources."ansi-regex-5.0.1" sources."append-field-1.0.0" @@ -113958,15 +114483,13 @@ in (sources."are-we-there-yet-2.0.0" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) - sources."argparse-1.0.10" + sources."argparse-2.0.1" sources."array-flatten-1.1.1" - sources."async-0.1.22" sources."async-mutex-0.3.2" sources."asynckit-0.4.0" - sources."axios-0.27.0" + sources."axios-0.27.2" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" (sources."basic-auth-2.0.1" // { @@ -113979,43 +114502,40 @@ in (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) - sources."body-parser-1.19.1" + sources."body-parser-1.20.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-5.7.1" sources."buffer-from-1.1.2" - sources."busboy-0.2.14" - sources."bytes-3.1.1" + sources."busboy-1.6.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."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" sources."chownr-2.0.0" sources."cli-table-0.3.11" sources."clone-2.1.2" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-support-1.1.3" sources."colors-1.0.3" sources."combined-stream-1.0.8" sources."commist-1.1.0" sources."compress-brotli-1.3.8" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."isarray-1.0.0" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" - ]; - }) + sources."concat-stream-1.6.2" sources."console-control-strings-1.1.0" sources."content-disposition-0.5.4" sources."content-type-1.0.4" - sources."cookie-0.4.1" - sources."cookie-parser-1.4.6" + sources."cookie-0.4.2" + (sources."cookie-parser-1.4.6" // { + dependencies = [ + sources."cookie-0.4.1" + ]; + }) sources."cookie-signature-1.0.6" sources."core-util-is-1.0.3" sources."cors-2.8.5" @@ -114032,10 +114552,9 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."denque-2.0.1" - sources."depd-1.1.2" - sources."destroy-1.0.4" + sources."depd-2.0.0" + sources."destroy-1.2.0" sources."detect-libc-2.0.1" - sources."dicer-0.2.5" sources."dom-serializer-1.4.1" sources."domelementtype-2.3.0" sources."domhandler-4.3.1" @@ -114043,7 +114562,6 @@ in (sources."duplexify-4.1.2" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) sources."ee-first-1.1.1" @@ -114053,53 +114571,54 @@ in sources."enquirer-2.3.6" sources."entities-2.2.0" sources."escape-html-1.0.3" - sources."esprima-4.0.1" sources."etag-1.8.1" - sources."express-4.17.2" - (sources."express-session-1.17.2" // { + (sources."express-4.18.1" // { dependencies = [ - sources."depd-2.0.0" + sources."cookie-0.5.0" ]; }) + sources."express-session-1.17.3" sources."fast-deep-equal-3.1.3" - sources."finalhandler-1.1.2" + sources."finalhandler-1.2.0" sources."follow-redirects-1.15.1" sources."form-data-4.0.0" sources."forwarded-0.2.0" sources."fresh-0.5.2" - (sources."fs-extra-10.0.0" // { + (sources."fs-extra-10.1.0" // { dependencies = [ sources."universalify-2.0.0" ]; }) sources."fs-minipass-2.1.0" - sources."fs.notify-0.0.4" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."gauge-3.0.2" + sources."get-intrinsic-1.1.2" sources."get-stream-5.2.0" sources."glob-7.2.3" - sources."got-11.8.3" + sources."got-11.8.5" sources."graceful-fs-4.2.10" + sources."has-1.0.3" + sources."has-symbols-1.0.3" sources."has-unicode-2.0.1" sources."hash-sum-2.0.0" (sources."help-me-3.0.0" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) - sources."hpagent-0.1.2" + sources."hpagent-1.0.0" sources."htmlparser2-6.1.0" sources."http-cache-semantics-4.1.0" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" sources."http2-wrapper-1.0.3" - (sources."https-proxy-agent-5.0.0" // { + (sources."https-proxy-agent-5.0.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."i18next-21.6.11" + sources."i18next-21.8.14" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."inflight-1.0.6" @@ -114107,9 +114626,9 @@ in sources."ipaddr.js-1.9.1" sources."is-fullwidth-code-point-3.0.0" sources."is-utf8-0.2.1" - sources."isarray-0.0.1" + sources."isarray-1.0.0" sources."js-sdsl-2.1.4" - sources."js-yaml-3.14.1" + sources."js-yaml-4.1.0" sources."json-buffer-3.0.1" sources."json-schema-traverse-1.0.0" sources."json-stringify-safe-5.0.1" @@ -114119,7 +114638,7 @@ in sources."universalify-2.0.0" ]; }) - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."leven-2.1.0" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-2.0.0" @@ -114144,7 +114663,7 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - (sources."minipass-3.3.3" // { + (sources."minipass-3.3.5" // { dependencies = [ sources."yallist-4.0.0" ]; @@ -114155,16 +114674,15 @@ in ]; }) sources."mkdirp-0.5.6" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."moment-timezone-0.5.34" - (sources."mqtt-4.3.5" // { + (sources."mqtt-4.3.7" // { dependencies = [ sources."concat-stream-2.0.0" sources."debug-4.3.4" sources."lru-cache-6.0.0" sources."ms-2.1.2" sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" sources."yallist-4.0.0" ]; }) @@ -114175,13 +114693,14 @@ in ]; }) sources."ms-2.0.0" - sources."multer-1.4.4" + sources."multer-1.4.5-lts.1" sources."mustache-4.2.0" sources."mute-stream-0.0.8" sources."negotiator-0.6.3" sources."node-addon-api-3.2.1" sources."node-fetch-2.6.7" - sources."node-red-admin-2.2.4" + sources."node-red-admin-3.0.0" + sources."node-watch-0.7.3" sources."nopt-5.0.0" sources."normalize-url-6.1.0" sources."npmlog-5.0.1" @@ -114194,14 +114713,15 @@ in }) sources."oauth2orize-1.11.1" sources."object-assign-4.1.1" - sources."on-finished-2.3.0" + sources."object-inspect-1.12.2" + sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" sources."p-cancelable-2.1.1" sources."parse5-6.0.1" sources."parse5-htmlparser2-tree-adapter-6.0.1" sources."parseurl-1.3.3" - sources."passport-0.5.2" + sources."passport-0.6.0" sources."passport-http-bearer-1.0.1" sources."passport-oauth2-client-password-0.1.2" sources."passport-strategy-1.0.0" @@ -114211,55 +114731,61 @@ in sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.9.6" + 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.4.2" + sources."raw-body-2.5.1" sources."read-1.0.7" - sources."readable-stream-1.1.14" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."regenerator-runtime-0.13.9" sources."reinterval-1.1.0" sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.1" - sources."responselike-2.0.0" - sources."retry-0.6.1" + sources."responselike-2.0.1" sources."rfdc-1.3.0" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - (sources."semver-7.3.5" // { + (sources."semver-7.3.7" // { dependencies = [ sources."lru-cache-6.0.0" sources."yallist-4.0.0" ]; }) - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ sources."mime-1.6.0" sources."ms-2.1.3" ]; }) - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" sources."set-blocking-2.0.0" sources."setprototypeof-1.2.0" + sources."side-channel-1.0.4" sources."signal-exit-3.0.7" (sources."split2-3.2.2" // { dependencies = [ sources."readable-stream-3.6.0" - sources."string_decoder-1.3.0" ]; }) - sources."sprintf-js-1.0.3" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."stream-shift-1.0.1" - sources."streamsearch-0.1.2" + sources."streamsearch-1.1.0" sources."string-width-4.2.3" - sources."string_decoder-0.10.31" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.1" (sources."tar-6.1.11" // { dependencies = [ @@ -114273,7 +114799,7 @@ in sources."tslib-2.4.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.15.1" + sources."uglify-js-3.16.2" sources."uid-safe-2.1.5" sources."uid2-0.0.4" sources."universalify-0.1.2" @@ -114383,7 +114909,7 @@ in sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-0.3.5" sources."ncp-0.4.2" @@ -114425,7 +114951,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" (sources."readable-stream-2.3.7" // { @@ -114502,149 +115028,47 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.16"; + version = "2.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.16.tgz"; - sha512 = "zsrcaOfTWRuUzBn3P44RDliLlp263Z/76FPoHFr3cFFkOz0lTPAcIw8dCzfdVIx/t3AtDYCZRCDkoCojJqaG3w=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.19.tgz"; + sha512 = "4pv1f2bMDj0Eeg/MhGqxrtveeQ5/G/UVe9iO6uTZzjnRluSA4PVWf8CW99LUPwGB3eNIA7zUFoP77YuI7hOc0A=="; }; dependencies = [ - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" sources."abbrev-1.1.1" - sources."ansi-align-3.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" - sources."boxen-5.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - (sources."cacheable-request-6.1.0" // { - dependencies = [ - sources."get-stream-5.2.0" - sources."lowercase-keys-2.0.0" - ]; - }) - sources."camelcase-6.3.0" - (sources."chalk-4.1.2" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) sources."chokidar-3.5.3" - sources."ci-info-2.0.0" - sources."cli-boxes-2.2.1" - sources."clone-response-1.0.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."configstore-5.0.1" - sources."crypto-random-string-2.0.0" sources."debug-3.2.7" - sources."decompress-response-3.3.0" - sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" - sources."dot-prop-5.3.0" - sources."duplexer3-0.1.4" - sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" - sources."escape-goat-2.1.1" sources."fill-range-7.0.1" sources."fsevents-2.3.2" - sources."get-stream-4.1.0" sources."glob-parent-5.1.2" - sources."global-dirs-3.0.0" - sources."got-9.6.0" - sources."graceful-fs-4.2.10" sources."has-flag-3.0.0" - sources."has-yarn-2.1.0" - sources."http-cache-semantics-4.1.0" sources."ignore-by-default-1.0.1" - sources."import-lazy-2.1.0" - sources."imurmurhash-0.1.4" - sources."ini-2.0.0" sources."is-binary-path-2.1.0" - sources."is-ci-2.0.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" - sources."is-installed-globally-0.4.0" - sources."is-npm-5.0.0" sources."is-number-7.0.0" - sources."is-obj-2.0.0" - sources."is-path-inside-3.0.3" - sources."is-typedarray-1.0.0" - sources."is-yarn-global-0.3.0" - sources."json-buffer-3.0.0" - sources."keyv-3.1.0" - sources."latest-version-5.1.0" - sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minimist-1.2.6" sources."ms-2.1.3" sources."nopt-1.0.10" sources."normalize-path-3.0.0" - sources."normalize-url-4.5.1" - sources."once-1.4.0" - sources."p-cancelable-1.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) sources."picomatch-2.3.1" - sources."prepend-http-2.0.0" sources."pstree.remy-1.1.8" - sources."pump-3.0.0" - sources."pupa-2.1.1" - (sources."rc-1.2.8" // { - dependencies = [ - sources."ini-1.3.8" - ]; - }) sources."readdirp-3.6.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" - sources."responselike-1.0.2" sources."semver-5.7.1" - (sources."semver-diff-3.1.1" // { + (sources."simple-update-notifier-1.0.7" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-7.0.0" ]; }) - sources."signal-exit-3.0.7" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."touch-3.1.0" - sources."type-fest-0.20.2" - sources."typedarray-to-buffer-3.1.5" sources."undefsafe-2.0.5" - sources."unique-string-2.0.0" - (sources."update-notifier-5.1.0" // { - dependencies = [ - sources."semver-7.3.7" - ]; - }) - sources."url-parse-lax-3.0.0" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."xdg-basedir-4.0.0" - sources."yallist-4.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -114659,15 +115083,15 @@ in np = nodeEnv.buildNodePackage { name = "np"; packageName = "np"; - version = "7.6.1"; + version = "7.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/np/-/np-7.6.1.tgz"; - sha512 = "EHr5PtMPzNmkM/trnWQWTKAogJnVP1RzTFfIyvPK2COvLN6Vqut4gFXuWNng15xuqnTgmUPzKYbpQAZsYR+Dkw=="; + url = "https://registry.npmjs.org/np/-/np-7.6.2.tgz"; + sha512 = "gExmKGKixh7ITc4Q+Lv7nfCby0CVKvzri9zN8970oKD8976T4L5dw8QWUtMcXcIjhFF6h5lbvztao/NurDbmxQ=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -114693,7 +115117,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/minimist-1.2.2" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -114741,7 +115165,7 @@ in ]; }) sources."cli-width-3.0.0" - (sources."clone-response-1.0.2" // { + (sources."clone-response-1.0.3" // { dependencies = [ sources."mimic-response-1.0.1" ]; @@ -114772,7 +115196,7 @@ in sources."del-6.1.1" sources."dir-glob-3.0.1" sources."dot-prop-6.0.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -114897,7 +115321,7 @@ in sources."js-tokens-4.0.0" sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."lines-and-columns-1.2.4" @@ -115102,7 +115526,7 @@ in ]; }) sources."resolve-from-4.0.0" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -115188,10 +115612,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "8.12.2"; + version = "8.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-8.12.2.tgz"; - sha512 = "TArexqro9wpl/6wz6t6YdYhOoiy/UArqiSsSsqI7fieEhQEswDQSJcgt/LuCDjl6mfCDi0So7S2UZ979qLYRPg=="; + url = "https://registry.npmjs.org/npm/-/npm-8.16.0.tgz"; + sha512 = "UfLT/hCbcpV9uiTEBthyrOlQxwk8LG5tAGn283g7f7pRx41KcwFiHV7HYgYm2y2GabfnPtf897ptrXRQwxJWzQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -115206,101 +115630,127 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "14.0.1"; + version = "16.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-14.0.1.tgz"; - sha512 = "CjHKxcJur/OiVc2GKBagUrzDsXL8JJC71rNVv2mC7eNA6w/ebe3POx9x46ay4p3woSxJOa7hYWNn1UwL7jgHug=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-16.0.5.tgz"; + sha512 = "0qK6NTmgbq8y39xm4y1tKW5ghEGtWWyiUzSPSQEaqb9elqOfZogV4GQVvBYw3xJlt6igJVXgBUyjNqtPv/j7Yw=="; }; dependencies = [ sources."@gar/promisify-1.1.3" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@npmcli/fs-1.1.1" + sources."@npmcli/fs-2.1.1" sources."@npmcli/git-3.0.1" sources."@npmcli/installed-package-contents-1.0.7" - sources."@npmcli/move-file-1.1.2" + sources."@npmcli/move-file-2.0.0" sources."@npmcli/node-gyp-2.0.0" sources."@npmcli/promise-spawn-3.0.0" - sources."@npmcli/run-script-3.0.3" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-1.1.2" + sources."@npmcli/run-script-4.2.0" + sources."@pnpm/network.ca-file-1.0.1" + sources."@pnpm/npm-conf-1.0.5" + sources."@sindresorhus/is-5.3.0" + sources."@szmarczak/http-timer-5.0.1" + sources."@tootallnate/once-2.0.0" + sources."@types/cacheable-request-6.0.2" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/json-buffer-3.0.0" + sources."@types/keyv-3.1.4" + sources."@types/node-18.6.3" + sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."agent-base-6.0.2" sources."agentkeepalive-4.2.1" sources."aggregate-error-3.1.0" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" + sources."ansi-styles-6.1.0" sources."aproba-2.0.0" - sources."are-we-there-yet-3.0.0" + sources."are-we-there-yet-3.0.1" sources."argparse-2.0.1" sources."array-union-2.1.0" sources."balanced-match-1.0.2" - sources."boxen-5.1.2" + (sources."boxen-7.0.0" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."emoji-regex-9.2.2" + sources."string-width-5.1.2" + sources."strip-ansi-7.0.1" + ]; + }) sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."buffer-from-1.1.2" sources."builtins-5.0.1" (sources."cacache-16.1.1" // { dependencies = [ - sources."@npmcli/fs-2.1.0" - sources."@npmcli/move-file-2.0.0" sources."glob-8.0.3" ]; }) - (sources."cacheable-request-6.1.0" // { + sources."cacheable-lookup-6.0.4" + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) - sources."camelcase-6.3.0" - sources."chalk-4.1.2" + sources."camelcase-7.0.0" + sources."chalk-5.0.1" sources."chownr-2.0.0" - sources."ci-info-2.0.0" - sources."cint-8.2.1" + sources."ci-info-3.3.2" sources."clean-stack-2.2.0" - sources."cli-boxes-2.2.1" + sources."cli-boxes-3.0.0" sources."cli-table-0.3.11" - sources."clone-response-1.0.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."clone-response-1.0.3" sources."color-support-1.1.3" sources."colors-1.0.3" - sources."commander-9.3.0" + sources."commander-9.4.0" + sources."compress-brotli-1.3.8" sources."concat-map-0.0.1" - sources."configstore-5.0.1" + (sources."config-chain-1.1.13" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) + sources."configstore-6.0.0" sources."console-control-strings-1.1.0" - sources."crypto-random-string-2.0.0" + (sources."crypto-random-string-4.0.0" // { + dependencies = [ + sources."type-fest-1.4.0" + ]; + }) sources."debug-4.3.4" - sources."decompress-response-3.3.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-extend-0.6.0" - sources."defer-to-connect-1.1.3" + sources."defer-to-connect-2.0.1" sources."delegates-1.0.0" sources."depd-1.1.2" sources."dir-glob-3.0.1" - sources."dot-prop-5.3.0" - sources."duplexer3-0.1.4" + sources."dot-prop-6.0.1" + sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.1" sources."err-code-2.0.3" - sources."escape-goat-2.1.1" + sources."escape-goat-4.0.0" sources."fast-glob-3.2.11" sources."fast-memoize-2.5.2" sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."find-up-5.0.0" + sources."form-data-encoder-2.0.1" sources."fp-and-or-0.1.3" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gauge-4.0.4" sources."get-stdin-8.0.0" - sources."get-stream-4.1.0" + sources."get-stream-6.0.1" (sources."glob-7.2.3" // { dependencies = [ sources."brace-expansion-1.1.11" @@ -115310,77 +115760,66 @@ in sources."glob-parent-5.1.2" sources."global-dirs-3.0.0" sources."globby-11.1.0" - sources."got-9.6.0" + sources."got-12.3.0" sources."graceful-fs-4.2.10" sources."has-1.0.3" - sources."has-flag-4.0.0" sources."has-unicode-2.0.1" - sources."has-yarn-2.1.0" + sources."has-yarn-3.0.0" sources."hosted-git-info-5.0.0" sources."http-cache-semantics-4.1.0" - sources."http-proxy-agent-4.0.1" + sources."http-proxy-agent-5.0.0" + sources."http2-wrapper-2.1.11" sources."https-proxy-agent-5.0.1" sources."humanize-ms-1.2.1" sources."iconv-lite-0.6.3" sources."ignore-5.2.0" sources."ignore-walk-5.0.1" - sources."import-lazy-2.1.0" + sources."import-lazy-4.0.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-2.0.0" - sources."ip-1.1.8" - sources."is-ci-2.0.0" + sources."ip-2.0.0" + sources."is-ci-3.0.1" sources."is-core-module-2.9.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-installed-globally-0.4.0" sources."is-lambda-1.0.1" - sources."is-npm-5.0.0" + sources."is-npm-6.0.0" sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-typedarray-1.0.0" - sources."is-yarn-global-0.3.0" + sources."is-yarn-global-0.4.0" sources."isexe-2.0.0" sources."jju-1.4.0" sources."js-yaml-4.1.0" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json-parse-even-better-errors-2.3.1" sources."json-parse-helpfulerror-1.0.3" sources."json5-2.2.1" sources."jsonlines-0.1.1" sources."jsonparse-1.3.1" - sources."keyv-3.1.0" - sources."kleur-3.0.3" - sources."latest-version-5.1.0" + sources."keyv-4.3.3" + sources."kleur-4.1.5" + sources."latest-version-7.0.0" sources."locate-path-6.0.0" sources."lodash-4.17.21" - sources."lowercase-keys-1.0.1" - sources."lru-cache-7.10.1" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."make-fetch-happen-9.1.0" // { - dependencies = [ - sources."cacache-15.3.0" - sources."lru-cache-6.0.0" - sources."ssri-8.0.1" - ]; - }) + sources."lowercase-keys-3.0.0" + sources."lru-cache-7.13.2" + sources."make-fetch-happen-10.2.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."mimic-response-1.0.1" sources."minimatch-5.1.0" sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.4.1" + sources."minipass-fetch-2.1.0" sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.4" @@ -115389,55 +115828,44 @@ in sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."negotiator-0.6.3" - sources."node-gyp-8.4.1" + sources."node-gyp-9.1.0" sources."nopt-5.0.0" sources."normalize-package-data-4.0.0" - sources."normalize-url-4.5.1" + sources."normalize-url-6.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-9.0.2" - (sources."npm-packlist-5.1.0" // { + sources."npm-package-arg-9.1.0" + (sources."npm-packlist-5.1.1" // { dependencies = [ sources."glob-8.0.3" ]; }) sources."npm-pick-manifest-7.0.1" - (sources."npm-registry-fetch-13.1.1" // { - dependencies = [ - sources."@tootallnate/once-2.0.0" - sources."http-proxy-agent-5.0.0" - sources."make-fetch-happen-10.1.8" - sources."minipass-fetch-2.1.0" - sources."socks-proxy-agent-7.0.0" - ]; - }) + sources."npm-registry-fetch-13.3.0" sources."npmlog-6.0.2" sources."once-1.4.0" - sources."p-cancelable-1.1.0" + sources."p-cancelable-3.0.0" sources."p-limit-3.1.0" sources."p-locate-5.0.0" sources."p-map-4.0.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."pacote-13.6.0" + sources."package-json-8.1.0" + sources."pacote-13.6.1" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."picomatch-2.3.1" - sources."prepend-http-2.0.0" sources."proc-log-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-2.0.1" - sources."prompts-2.4.2" + sources."prompts-ncu-2.5.1" + sources."proto-list-1.2.4" sources."pump-3.0.0" - sources."pupa-2.1.1" + sources."pupa-3.1.0" sources."queue-microtask-1.2.3" + sources."quick-lru-5.1.1" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" @@ -115451,11 +115879,16 @@ in }) sources."read-package-json-fast-2.0.3" sources."readable-stream-3.6.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" + sources."registry-auth-token-5.0.1" + sources."registry-url-6.0.1" sources."remote-git-tags-3.0.0" sources."require-from-string-2.0.2" - sources."responselike-1.0.2" + sources."resolve-alpn-1.2.1" + (sources."responselike-2.0.1" // { + dependencies = [ + sources."lowercase-keys-2.0.0" + ]; + }) sources."retry-0.12.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" @@ -115467,19 +115900,15 @@ in sources."lru-cache-6.0.0" ]; }) - (sources."semver-diff-3.1.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."semver-diff-4.0.0" sources."semver-utils-1.1.4" sources."set-blocking-2.0.0" sources."signal-exit-3.0.7" sources."sisteransi-1.0.5" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" - sources."socks-proxy-agent-6.2.1" + sources."socks-2.7.0" + sources."socks-proxy-agent-7.0.0" sources."source-map-0.6.1" sources."source-map-support-0.5.21" sources."spawn-please-1.0.0" @@ -115492,27 +115921,38 @@ in sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" - sources."supports-color-7.2.0" sources."tar-6.1.11" - sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" - sources."type-fest-0.20.2" + sources."type-fest-2.18.0" sources."typedarray-to-buffer-3.1.5" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" - sources."unique-string-2.0.0" - sources."update-notifier-5.1.0" - sources."url-parse-lax-3.0.0" + sources."unique-string-3.0.0" + sources."update-notifier-6.0.2" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-4.0.0" sources."which-2.0.2" sources."wide-align-1.1.5" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" + (sources."widest-line-4.0.1" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."emoji-regex-9.2.2" + sources."string-width-5.1.2" + sources."strip-ansi-7.0.1" + ]; + }) + (sources."wrap-ansi-8.0.1" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."emoji-regex-9.2.2" + sources."string-width-5.1.2" + sources."strip-ansi-7.0.1" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."xdg-basedir-4.0.0" + sources."xdg-basedir-5.1.0" sources."yallist-4.0.0" sources."yaml-2.1.1" sources."yocto-queue-0.1.0" @@ -115598,7 +116038,7 @@ in sources."only-0.0.2" sources."open-8.4.0" sources."performance-now-2.1.0" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."request-2.88.2" @@ -115650,7 +116090,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.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-1.0.3" sources."wrappy-1.0.2" ]; @@ -115674,79 +116114,80 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - (sources."@babel/core-7.18.5" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + (sources."@babel/core-7.18.10" // { dependencies = [ sources."json5-2.2.1" sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.2" // { + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.18.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.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.0" - sources."@babel/helper-create-regexp-features-plugin-7.17.12" - (sources."@babel/helper-define-polyfill-provider-0.3.1" // { + sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-regexp-features-plugin-7.18.6" + (sources."@babel/helper-define-polyfill-provider-0.3.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-explode-assignable-expression-7.16.7" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.17.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-remap-async-to-generator-7.16.8" - sources."@babel/helper-replace-supers-7.18.2" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-async-generator-functions-7.17.12" - sources."@babel/plugin-proposal-class-properties-7.17.12" - sources."@babel/plugin-proposal-class-static-block-7.18.0" - sources."@babel/plugin-proposal-dynamic-import-7.16.7" - sources."@babel/plugin-proposal-export-namespace-from-7.17.12" - sources."@babel/plugin-proposal-json-strings-7.17.12" - sources."@babel/plugin-proposal-logical-assignment-operators-7.17.12" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" - sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.18.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" - sources."@babel/plugin-proposal-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-private-methods-7.17.12" - sources."@babel/plugin-proposal-private-property-in-object-7.17.12" - sources."@babel/plugin-proposal-unicode-property-regex-7.17.12" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-explode-assignable-expression-7.18.6" + sources."@babel/helper-function-name-7.18.9" + 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.18.9" + sources."@babel/helper-optimise-call-expression-7.18.6" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-remap-async-to-generator-7.18.9" + sources."@babel/helper-replace-supers-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helper-wrap-function-7.18.10" + sources."@babel/helpers-7.18.9" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-async-generator-functions-7.18.10" + sources."@babel/plugin-proposal-class-properties-7.18.6" + sources."@babel/plugin-proposal-class-static-block-7.18.6" + sources."@babel/plugin-proposal-dynamic-import-7.18.6" + sources."@babel/plugin-proposal-export-namespace-from-7.18.9" + sources."@babel/plugin-proposal-json-strings-7.18.6" + sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" + sources."@babel/plugin-proposal-numeric-separator-7.18.6" + sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-private-methods-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-flow-7.17.12" - sources."@babel/plugin-syntax-import-assertions-7.17.12" + sources."@babel/plugin-syntax-flow-7.18.6" + sources."@babel/plugin-syntax-import-assertions-7.18.6" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.17.12" + 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" @@ -115755,61 +116196,61 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.17.12" - sources."@babel/plugin-transform-async-to-generator-7.17.12" - sources."@babel/plugin-transform-block-scoped-functions-7.16.7" - sources."@babel/plugin-transform-block-scoping-7.18.4" - sources."@babel/plugin-transform-classes-7.18.4" - sources."@babel/plugin-transform-computed-properties-7.17.12" - sources."@babel/plugin-transform-destructuring-7.18.0" - sources."@babel/plugin-transform-dotall-regex-7.16.7" - sources."@babel/plugin-transform-duplicate-keys-7.17.12" - sources."@babel/plugin-transform-exponentiation-operator-7.16.7" - sources."@babel/plugin-transform-flow-strip-types-7.17.12" - sources."@babel/plugin-transform-for-of-7.18.1" - sources."@babel/plugin-transform-function-name-7.16.7" - sources."@babel/plugin-transform-literals-7.17.12" - sources."@babel/plugin-transform-member-expression-literals-7.16.7" - sources."@babel/plugin-transform-modules-amd-7.18.0" - sources."@babel/plugin-transform-modules-commonjs-7.18.2" - sources."@babel/plugin-transform-modules-systemjs-7.18.5" - sources."@babel/plugin-transform-modules-umd-7.18.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.12" - sources."@babel/plugin-transform-new-target-7.18.5" - sources."@babel/plugin-transform-object-super-7.16.7" - sources."@babel/plugin-transform-parameters-7.17.12" - sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-react-jsx-7.17.12" - sources."@babel/plugin-transform-regenerator-7.18.0" - sources."@babel/plugin-transform-reserved-words-7.17.12" - sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/plugin-transform-spread-7.17.12" - sources."@babel/plugin-transform-sticky-regex-7.16.7" - sources."@babel/plugin-transform-template-literals-7.18.2" - sources."@babel/plugin-transform-typeof-symbol-7.17.12" - sources."@babel/plugin-transform-unicode-escapes-7.16.7" - sources."@babel/plugin-transform-unicode-regex-7.16.7" - (sources."@babel/preset-env-7.18.2" // { + sources."@babel/plugin-transform-arrow-functions-7.18.6" + sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-block-scoped-functions-7.18.6" + sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-classes-7.18.9" + sources."@babel/plugin-transform-computed-properties-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.9" + 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.18.9" + sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-function-name-7.18.9" + sources."@babel/plugin-transform-literals-7.18.9" + sources."@babel/plugin-transform-member-expression-literals-7.18.6" + sources."@babel/plugin-transform-modules-amd-7.18.6" + sources."@babel/plugin-transform-modules-commonjs-7.18.6" + sources."@babel/plugin-transform-modules-systemjs-7.18.9" + sources."@babel/plugin-transform-modules-umd-7.18.6" + sources."@babel/plugin-transform-named-capturing-groups-regex-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.18.8" + sources."@babel/plugin-transform-property-literals-7.18.6" + sources."@babel/plugin-transform-react-jsx-7.18.10" + sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-reserved-words-7.18.6" + sources."@babel/plugin-transform-shorthand-properties-7.18.6" + sources."@babel/plugin-transform-spread-7.18.9" + sources."@babel/plugin-transform-sticky-regex-7.18.6" + sources."@babel/plugin-transform-template-literals-7.18.9" + sources."@babel/plugin-transform-typeof-symbol-7.18.9" + sources."@babel/plugin-transform-unicode-escapes-7.18.10" + sources."@babel/plugin-transform-unicode-regex-7.18.6" + (sources."@babel/preset-env-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/runtime-7.18.3" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/runtime-7.18.9" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" sources."@iarna/toml-2.2.5" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.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.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -115864,13 +116305,13 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."babel-plugin-dynamic-import-node-2.3.3" - (sources."babel-plugin-polyfill-corejs2-0.3.1" // { + (sources."babel-plugin-polyfill-corejs2-0.3.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.2" - sources."babel-plugin-polyfill-regenerator-0.3.1" + sources."babel-plugin-polyfill-corejs3-0.5.3" + sources."babel-plugin-polyfill-regenerator-0.4.0" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -115914,7 +116355,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -115931,7 +116372,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -115957,7 +116398,7 @@ in sources."convert-source-map-1.8.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.23.2" // { + (sources."core-js-compat-3.24.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -116013,7 +116454,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."deasync-0.1.26" + sources."deasync-0.1.27" sources."debug-4.3.4" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.4" @@ -116068,7 +116509,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.164" + sources."electron-to-chromium-1.4.211" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -116178,10 +116619,10 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.9" // { dependencies = [ - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."posthtml-0.15.2" sources."posthtml-parser-0.7.2" - sources."terser-5.14.1" + sources."terser-5.14.2" ]; }) (sources."htmlparser2-6.1.0" // { @@ -116338,11 +116779,11 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" - sources."nwsapi-2.2.0" + sources."nwsapi-2.2.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-copy-0.1.0" @@ -116456,7 +116897,7 @@ in sources."prelude-ls-1.1.2" sources."process-0.11.10" sources."process-nextick-args-2.0.1" - sources."psl-1.8.0" + sources."psl-1.9.0" (sources."public-encrypt-4.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -116495,7 +116936,7 @@ in ]; }) sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.0.1" + sources."regexpu-core-5.1.0" sources."regjsgen-0.6.0" (sources."regjsparser-0.8.4" // { dependencies = [ @@ -116658,6 +117099,7 @@ in ]; }) sources."upath-1.2.0" + sources."update-browserslist-db-1.0.5" sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -116712,25 +117154,25 @@ in parcel = nodeEnv.buildNodePackage { name = "parcel"; packageName = "parcel"; - version = "2.6.1"; + version = "2.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/parcel/-/parcel-2.6.1.tgz"; - sha512 = "dqPG1u7NV/nlnoU6O9zO6sIFbna7b8IfmoNgMM0un2+EtOhNlz4bRp6U4AHosTulMUTKFmHpdXXG4dF9X0WQtw=="; + url = "https://registry.npmjs.org/parcel/-/parcel-2.7.0.tgz"; + sha512 = "pRYwnivwtNP0tip8xYSo4zCB0XhLt7/gJzP1p8OovCqkmFjG9VG+GW9TcAKqMIo0ovEa9tT+/s6gY1Qy+BONGQ=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@jridgewell/gen-mapping-0.3.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" + sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" sources."@lezer/common-0.15.12" sources."@lezer/lr-0.15.8" sources."@lmdb/lmdb-darwin-arm64-2.5.2" @@ -116740,100 +117182,100 @@ 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.0.2" - sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.0.2" - sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.0.2" - sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.0.2" - sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.0.2" - sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.0.2" - sources."@parcel/bundler-default-2.6.1" - sources."@parcel/cache-2.6.1" - sources."@parcel/codeframe-2.6.1" - sources."@parcel/compressor-raw-2.6.1" - sources."@parcel/config-default-2.6.1" - sources."@parcel/core-2.6.1" - sources."@parcel/css-1.10.1" - sources."@parcel/css-darwin-arm64-1.10.1" - sources."@parcel/css-darwin-x64-1.10.1" - sources."@parcel/css-linux-arm-gnueabihf-1.10.1" - sources."@parcel/css-linux-arm64-gnu-1.10.1" - sources."@parcel/css-linux-arm64-musl-1.10.1" - sources."@parcel/css-linux-x64-gnu-1.10.1" - sources."@parcel/css-linux-x64-musl-1.10.1" - sources."@parcel/css-win32-x64-msvc-1.10.1" - sources."@parcel/diagnostic-2.6.1" - sources."@parcel/events-2.6.1" - sources."@parcel/fs-2.6.1" - sources."@parcel/fs-search-2.6.1" - sources."@parcel/graph-2.6.1" - sources."@parcel/hash-2.6.1" - sources."@parcel/logger-2.6.1" - sources."@parcel/markdown-ansi-2.6.1" - sources."@parcel/namer-default-2.6.1" - sources."@parcel/node-resolver-core-2.6.1" - sources."@parcel/optimizer-css-2.6.1" - sources."@parcel/optimizer-htmlnano-2.6.1" - sources."@parcel/optimizer-image-2.6.1" - sources."@parcel/optimizer-svgo-2.6.1" - sources."@parcel/optimizer-terser-2.6.1" - sources."@parcel/package-manager-2.6.1" - sources."@parcel/packager-css-2.6.1" - sources."@parcel/packager-html-2.6.1" - sources."@parcel/packager-js-2.6.1" - sources."@parcel/packager-raw-2.6.1" - sources."@parcel/packager-svg-2.6.1" - sources."@parcel/plugin-2.6.1" - sources."@parcel/reporter-cli-2.6.1" - sources."@parcel/reporter-dev-server-2.6.1" - sources."@parcel/resolver-default-2.6.1" - sources."@parcel/runtime-browser-hmr-2.6.1" - sources."@parcel/runtime-js-2.6.1" - sources."@parcel/runtime-react-refresh-2.6.1" - sources."@parcel/runtime-service-worker-2.6.1" - sources."@parcel/source-map-2.0.5" - sources."@parcel/transformer-babel-2.6.1" - sources."@parcel/transformer-css-2.6.1" - (sources."@parcel/transformer-html-2.6.1" // { + sources."@msgpackr-extract/msgpackr-extract-darwin-arm64-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-darwin-x64-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-linux-arm-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-linux-arm64-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-linux-x64-2.1.2" + sources."@msgpackr-extract/msgpackr-extract-win32-x64-2.1.2" + sources."@parcel/bundler-default-2.7.0" + sources."@parcel/cache-2.7.0" + sources."@parcel/codeframe-2.7.0" + sources."@parcel/compressor-raw-2.7.0" + sources."@parcel/config-default-2.7.0" + sources."@parcel/core-2.7.0" + sources."@parcel/css-1.12.2" + sources."@parcel/css-darwin-arm64-1.12.2" + sources."@parcel/css-darwin-x64-1.12.2" + sources."@parcel/css-linux-arm-gnueabihf-1.12.2" + sources."@parcel/css-linux-arm64-gnu-1.12.2" + sources."@parcel/css-linux-arm64-musl-1.12.2" + sources."@parcel/css-linux-x64-gnu-1.12.2" + sources."@parcel/css-linux-x64-musl-1.12.2" + sources."@parcel/css-win32-x64-msvc-1.12.2" + sources."@parcel/diagnostic-2.7.0" + sources."@parcel/events-2.7.0" + sources."@parcel/fs-2.7.0" + sources."@parcel/fs-search-2.7.0" + sources."@parcel/graph-2.7.0" + sources."@parcel/hash-2.7.0" + sources."@parcel/logger-2.7.0" + sources."@parcel/markdown-ansi-2.7.0" + sources."@parcel/namer-default-2.7.0" + sources."@parcel/node-resolver-core-2.7.0" + sources."@parcel/optimizer-css-2.7.0" + sources."@parcel/optimizer-htmlnano-2.7.0" + sources."@parcel/optimizer-image-2.7.0" + sources."@parcel/optimizer-svgo-2.7.0" + sources."@parcel/optimizer-terser-2.7.0" + sources."@parcel/package-manager-2.7.0" + sources."@parcel/packager-css-2.7.0" + sources."@parcel/packager-html-2.7.0" + sources."@parcel/packager-js-2.7.0" + sources."@parcel/packager-raw-2.7.0" + sources."@parcel/packager-svg-2.7.0" + sources."@parcel/plugin-2.7.0" + sources."@parcel/reporter-cli-2.7.0" + sources."@parcel/reporter-dev-server-2.7.0" + sources."@parcel/resolver-default-2.7.0" + sources."@parcel/runtime-browser-hmr-2.7.0" + sources."@parcel/runtime-js-2.7.0" + sources."@parcel/runtime-react-refresh-2.7.0" + sources."@parcel/runtime-service-worker-2.7.0" + sources."@parcel/source-map-2.1.0" + sources."@parcel/transformer-babel-2.7.0" + sources."@parcel/transformer-css-2.7.0" + (sources."@parcel/transformer-html-2.7.0" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-image-2.6.1" - sources."@parcel/transformer-js-2.6.1" - sources."@parcel/transformer-json-2.6.1" - sources."@parcel/transformer-postcss-2.6.1" - (sources."@parcel/transformer-posthtml-2.6.1" // { + sources."@parcel/transformer-image-2.7.0" + sources."@parcel/transformer-js-2.7.0" + sources."@parcel/transformer-json-2.7.0" + sources."@parcel/transformer-postcss-2.7.0" + (sources."@parcel/transformer-posthtml-2.7.0" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/transformer-raw-2.6.1" - sources."@parcel/transformer-react-refresh-wrap-2.6.1" - (sources."@parcel/transformer-svg-2.6.1" // { + sources."@parcel/transformer-raw-2.7.0" + sources."@parcel/transformer-react-refresh-wrap-2.7.0" + (sources."@parcel/transformer-svg-2.7.0" // { dependencies = [ sources."posthtml-parser-0.10.2" ]; }) - sources."@parcel/types-2.6.1" - sources."@parcel/utils-2.6.1" + sources."@parcel/types-2.7.0" + sources."@parcel/utils-2.7.0" (sources."@parcel/watcher-2.0.5" // { dependencies = [ sources."node-addon-api-3.2.1" ]; }) - sources."@parcel/workers-2.6.1" - sources."@swc/helpers-0.4.2" + sources."@parcel/workers-2.7.0" + sources."@swc/helpers-0.4.3" sources."@trysound/sax-0.2.0" sources."@types/parse-json-4.0.0" sources."abortcontroller-polyfill-1.7.3" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."ansi-styles-3.2.1" sources."base-x-3.0.9" sources."boolbase-1.0.0" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-from-1.1.2" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" (sources."chalk-4.1.2" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -116864,13 +117306,13 @@ in sources."domutils-2.8.0" sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" sources."entities-3.0.1" sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."get-port-4.2.0" - sources."globals-13.15.0" + sources."globals-13.17.0" sources."has-flag-3.0.0" sources."htmlnano-2.0.2" sources."htmlparser2-7.2.0" @@ -116883,19 +117325,15 @@ in sources."lines-and-columns-1.2.4" sources."lmdb-2.5.2" sources."mdn-data-2.0.14" - sources."msgpackr-1.6.1" - (sources."msgpackr-extract-2.0.2" // { - dependencies = [ - sources."node-gyp-build-optional-packages-5.0.2" - ]; - }) + sources."msgpackr-1.6.2" + sources."msgpackr-extract-2.1.2" sources."node-addon-api-4.3.0" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" sources."node-gyp-build-optional-packages-5.0.3" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."nth-check-2.1.1" sources."nullthrows-1.1.1" - sources."ordered-binary-1.2.5" + sources."ordered-binary-1.3.0" sources."parent-module-1.0.1" sources."parse-json-5.2.0" sources."path-type-4.0.0" @@ -116916,7 +117354,7 @@ in sources."supports-color-5.5.0" sources."svgo-2.8.0" sources."term-size-2.2.1" - (sources."terser-5.14.1" // { + (sources."terser-5.14.2" // { dependencies = [ sources."commander-2.20.3" ]; @@ -116924,6 +117362,7 @@ in sources."timsort-0.3.0" sources."tslib-2.4.0" sources."type-fest-0.20.2" + sources."update-browserslist-db-1.0.5" sources."utility-types-3.10.0" sources."v8-compile-cache-2.3.0" sources."weak-lru-cache-1.2.2" @@ -117101,7 +117540,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-0.5.6" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."ms-2.0.0" sources."msgpack5-3.6.1" sources."mv-2.1.1" @@ -117131,7 +117570,7 @@ in sources."promise-8.1.0" sources."proxy-addr-2.0.7" sources."prr-1.0.1" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.10.3" sources."range-parser-1.2.1" @@ -117193,7 +117632,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.16.1" + sources."uglify-js-3.16.3" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.1" @@ -117728,7 +118167,7 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.5.0" // { + (sources."engine.io-3.6.0" // { dependencies = [ sources."cookie-0.4.2" sources."debug-4.1.1" @@ -117881,7 +118320,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.10.3" @@ -117931,14 +118370,14 @@ in sources."ws-2.3.1" ]; }) - (sources."socket.io-2.4.1" // { + (sources."socket.io-2.5.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.3" ]; }) sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.4.0" // { + (sources."socket.io-client-2.5.0" // { dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" @@ -118016,15 +118455,21 @@ in pkg = nodeEnv.buildNodePackage { name = "pkg"; packageName = "pkg"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/pkg/-/pkg-5.7.0.tgz"; - sha512 = "PTiAjNq/CGAtK5qUBR6pjheqnipTFjeecgSgIKEcAOJA4GpmZeOZC8pMOoT0rfes5vHsmcFo7wbSRTAmXQurrg=="; + url = "https://registry.npmjs.org/pkg/-/pkg-5.8.0.tgz"; + sha512 = "8h9PUDYFi+LOMLbIyGRdP21g08mAtHidSpofSrf8LWhxUWGHymaRzcopEGiynB5EhQmZUKM6PQ9kCImV2TpdjQ=="; }; dependencies = [ - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/parser-7.17.10" - sources."@babel/types-7.17.10" + sources."@babel/generator-7.18.2" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/parser-7.18.4" + sources."@babel/types-7.18.4" + 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.14" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -118054,20 +118499,14 @@ in sources."debug-4.3.4" sources."decompress-response-4.2.1" sources."deep-extend-0.6.0" - sources."deep-is-0.1.4" sources."delegates-1.0.0" sources."detect-libc-1.0.3" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" 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."expand-template-2.0.3" sources."fast-glob-3.2.11" - sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" sources."fill-range-7.0.1" sources."from2-2.3.0" @@ -118102,8 +118541,8 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."isarray-1.0.0" + sources."jsesc-2.5.2" sources."jsonfile-6.1.0" - sources."levn-0.3.0" sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.5" @@ -118127,14 +118566,12 @@ in sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."optionator-0.8.3" sources."p-is-promise-3.0.0" sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picomatch-2.3.1" - sources."pkg-fetch-3.4.1" + sources."pkg-fetch-3.4.2" sources."prebuild-install-6.1.4" - sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."pump-3.0.0" @@ -118152,7 +118589,6 @@ in sources."simple-concat-1.0.1" sources."simple-get-3.1.1" sources."slash-3.0.0" - sources."source-map-0.6.1" sources."stream-meter-1.0.4" sources."string-width-4.2.3" sources."string_decoder-1.1.1" @@ -118170,13 +118606,11 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" - sources."type-check-0.3.2" sources."universalify-2.0.0" sources."util-deprecate-1.0.2" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."wide-align-1.1.5" - sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."y18n-5.0.8" @@ -118222,7 +118656,7 @@ in (sources."@pm2/io-5.0.0" // { dependencies = [ sources."async-2.6.4" - sources."eventemitter2-6.4.5" + sources."eventemitter2-6.4.7" sources."semver-6.3.0" sources."tslib-1.9.3" ]; @@ -118230,12 +118664,12 @@ in (sources."@pm2/js-api-0.6.7" // { dependencies = [ sources."async-2.6.4" - sources."eventemitter2-6.4.5" + sources."eventemitter2-6.4.7" ]; }) sources."@pm2/pm2-version-check-1.0.4" sources."@tootallnate/once-1.1.2" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-walk-8.2.0" sources."agent-base-6.0.2" sources."amp-0.3.1" @@ -118390,7 +118824,11 @@ in sources."shimmer-1.2.1" sources."signal-exit-3.0.7" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + (sources."socks-2.7.0" // { + dependencies = [ + sources."ip-2.0.0" + ]; + }) sources."socks-proxy-agent-5.0.1" sources."source-map-0.6.1" sources."source-map-support-0.5.19" @@ -118399,7 +118837,7 @@ in sources."string_decoder-0.10.31" sources."supports-color-7.2.0" sources."supports-preserve-symlinks-flag-1.0.0" - sources."systeminformation-5.11.21" + sources."systeminformation-5.12.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" sources."tslib-2.4.0" @@ -118414,7 +118852,7 @@ in sources."async-2.6.4" ]; }) - sources."vm2-3.9.9" + sources."vm2-3.9.10" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-7.4.6" @@ -118435,10 +118873,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "7.3.0"; + version = "7.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-7.3.0.tgz"; - sha512 = "HOXT6V+AznAyjL2Ay3TuuJQucsEguUiKjqyQq4WPPwOpaaILhkKvu8Nn1/OQWGi9V6T7OciyrctAKeYyCha6Ow=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-7.9.1.tgz"; + sha512 = "5vyV+FwZj5y31UDDsiq9xcVzF+mvS+IPdgAgkZ9rVxYPNKCCVwVn5LsHh9jcfuApiKYVgpyisAMcuSDbe1/C0Q=="; }; buildInputs = globalBuildInputs; meta = { @@ -118504,10 +118942,10 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "9.1.0"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-9.1.0.tgz"; - sha512 = "zvDN2ADbWfza42sAnj+O2uUWyL0eRL1V+6giM2vi4SqTR3gTYy8XzcpfwccayF2szcUif0HMmXiEaDv9iEhcpw=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-10.0.0.tgz"; + sha512 = "Wjy/00wBBEgQqnSToznxLWDnATznokFGXsHtF/3G8glRZpz5KYlfHcBW/VMJmWAeF2x49zjgy4izjM3/Wx1dKA=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -118516,7 +118954,6 @@ in sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" - sources."array-union-3.0.1" sources."binary-extensions-2.2.0" sources."braces-3.0.2" sources."chokidar-3.5.3" @@ -118535,7 +118972,7 @@ in sources."get-caller-file-2.0.5" sources."get-stdin-9.0.0" sources."glob-parent-5.1.2" - sources."globby-12.2.0" + sources."globby-13.1.2" sources."graceful-fs-4.2.10" sources."ignore-5.2.0" sources."is-binary-path-2.1.0" @@ -118544,7 +118981,7 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."jsonfile-6.1.0" - sources."lilconfig-2.0.5" + sources."lilconfig-2.0.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."normalize-path-3.0.0" @@ -118552,7 +118989,7 @@ in sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-2.3.0" - sources."postcss-load-config-3.1.4" + sources."postcss-load-config-4.0.1" sources."postcss-reporter-7.0.5" sources."pretty-hrtime-1.0.3" sources."queue-microtask-1.2.3" @@ -118569,9 +119006,9 @@ in sources."universalify-2.0.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yaml-1.10.2" + sources."yaml-2.1.1" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -118611,7 +119048,7 @@ in sources."minimist-1.2.6" sources."mkdirp-classic-0.5.3" sources."napi-build-utils-1.0.2" - sources."node-abi-3.22.0" + sources."node-abi-3.24.0" sources."once-1.4.0" sources."pump-3.0.0" sources."rc-1.2.8" @@ -118717,13 +119154,13 @@ in prisma = nodeEnv.buildNodePackage { name = "prisma"; packageName = "prisma"; - version = "3.15.2"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/prisma/-/prisma-3.15.2.tgz"; - sha512 = "nMNSMZvtwrvoEQ/mui8L/aiCLZRCj5t6L3yujKpcDhIPk7garp8tL4nMx2+oYsN0FWBacevJhazfXAbV1kfBzA=="; + url = "https://registry.npmjs.org/prisma/-/prisma-4.1.1.tgz"; + sha512 = "yw50J8If2dKP4wYIi695zthsCASQFHiogGvUHHWd3falx/rpsD6Sb1LMLRV9nO3iGG3lozxNJ2PSINxK7xwdpg=="; }; dependencies = [ - sources."@prisma/engines-3.15.1-1.461d6a05159055555eb7dfb337c9fb271cbd4d7e" + sources."@prisma/engines-4.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -118738,21 +119175,21 @@ in "@prisma/language-server" = nodeEnv.buildNodePackage { name = "_at_prisma_slash_language-server"; packageName = "@prisma/language-server"; - version = "3.15.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-3.15.0.tgz"; - sha512 = "zTftMfWBTa2fA2PLUsAiWTML8RbhFceX2/xD02Rajv3zaslDDAmfoe/+KHJ7BUpcP9yACLENUJIEA43qeT9uHQ=="; + url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-4.1.0.tgz"; + sha512 = "T/YJw8BEAVi0dnhEw/gmQdwacFwr8rB7lDdqPbuIyWlu/0V9lYKZBvFfc4R+vBv/dQ4TJfuhUxwvduS8jFYaXA=="; }; dependencies = [ - sources."@prisma/prisma-fmt-wasm-3.15.0-29.b9297dc3a59307060c1c39d7e4f5765066f38372" + sources."@prisma/prisma-fmt-wasm-4.1.0-48.8d8414deb360336e4698a65aa45a1fbaf1ce13d8" sources."@types/js-levenshtein-1.1.1" sources."js-levenshtein-1.1.6" sources."klona-2.0.5" - sources."vscode-jsonrpc-8.0.1" - sources."vscode-languageserver-8.0.1" - sources."vscode-languageserver-protocol-3.17.1" - sources."vscode-languageserver-textdocument-1.0.4" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" + sources."vscode-languageserver-textdocument-1.0.5" + sources."vscode-languageserver-types-3.17.2" ]; buildInputs = globalBuildInputs; meta = { @@ -119095,11 +119532,11 @@ in sources."isexe-2.0.0" sources."shell-quote-1.7.3" sources."uuid-3.4.0" - sources."vscode-jsonrpc-8.0.1" - sources."vscode-languageserver-8.0.1" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-uri-2.1.2" sources."which-2.0.2" ]; @@ -119134,10 +119571,10 @@ in purs-tidy = nodeEnv.buildNodePackage { name = "purs-tidy"; packageName = "purs-tidy"; - version = "0.9.0"; + version = "0.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/purs-tidy/-/purs-tidy-0.9.0.tgz"; - sha512 = "7la7Jw5CyuMDXJMliGiK746xevUScDCTJ0eMvN/mV/NAQF2c9Cqa31QNx5O15ae2d7SuFDqEiVALFzHYD601Cg=="; + url = "https://registry.npmjs.org/purs-tidy/-/purs-tidy-0.9.1.tgz"; + sha512 = "Boppe+mRU5/ctLygT7glWfmNwklX1KvRLd2khIPm1HE1vL8q4BwuX6kIrM41f4Iv1ew9KsM76sCVer39lNbd1w=="; }; buildInputs = globalBuildInputs; meta = { @@ -119189,7 +119626,7 @@ in ]; }) sources."call-bind-1.0.2" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."colors-1.4.0" sources."commander-5.1.0" sources."compare-versions-4.1.3" @@ -119198,7 +119635,7 @@ in sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" sources."define-lazy-prop-2.0.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."end-of-stream-1.4.4" sources."follow-redirects-1.15.1" sources."fs-extra-10.1.0" @@ -119212,7 +119649,7 @@ in sources."http-cache-semantics-4.1.0" sources."https-proxy-agent-5.0.1" sources."ini-1.3.8" - sources."ip-1.1.8" + sources."ip-2.0.0" sources."is-docker-2.2.1" sources."is-wsl-2.2.0" sources."js-base64-3.7.2" @@ -119225,7 +119662,7 @@ in sources."lowercase-keys-1.0.1" sources."mimic-response-1.0.1" sources."minimist-1.2.6" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."ms-2.1.2" sources."node-abort-controller-3.0.1" sources."normalize-url-4.5.1" @@ -119242,7 +119679,7 @@ in sources."prepend-http-2.0.0" sources."prompts-2.4.2" sources."pump-3.0.0" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."rc-1.2.8" sources."readline-sync-1.4.10" sources."register-protocol-win32-1.1.0" @@ -119253,7 +119690,7 @@ in sources."side-channel-1.0.4" sources."sisteransi-1.0.5" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + sources."socks-2.7.0" sources."socks-proxy-agent-5.0.1" sources."strip-json-comments-2.0.1" sources."to-readable-stream-1.0.0" @@ -119275,10 +119712,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.255"; + version = "1.1.265"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.255.tgz"; - sha512 = "pAec1Mqyq0l0+C6JH7o7Va0oWyZVACEFgP2cWD9DU/C1epoqZAt/PCRbae/7fFfn7ZGew5tiTMdtO/2RZO/cRg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.265.tgz"; + sha512 = "CHUV46qHE4AKjMXLzBGDvOO9pEDzpQKgnPx3vC/JVEfvvu/RRUGR27GSTDTVVRNXbTjmnWjhRKku1gPPNdDSyg=="; }; buildInputs = globalBuildInputs; meta = { @@ -119388,7 +119825,7 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."nice-try-1.0.5" sources."node-fetch-2.6.7" sources."npm-run-path-2.0.2" @@ -119637,80 +120074,81 @@ in }; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/cli-7.17.10" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.18.5" - (sources."@babel/core-7.18.5" // { + sources."@babel/cli-7.18.10" + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + (sources."@babel/core-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.2" // { + (sources."@babel/generator-7.18.10" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.18.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.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.0" - sources."@babel/helper-create-regexp-features-plugin-7.17.12" - (sources."@babel/helper-define-polyfill-provider-0.3.1" // { + sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-regexp-features-plugin-7.18.6" + (sources."@babel/helper-define-polyfill-provider-0.3.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-explode-assignable-expression-7.16.7" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.17.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-remap-async-to-generator-7.16.8" - sources."@babel/helper-replace-supers-7.18.2" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-async-generator-functions-7.17.12" - sources."@babel/plugin-proposal-class-properties-7.17.12" - sources."@babel/plugin-proposal-class-static-block-7.18.0" - sources."@babel/plugin-proposal-dynamic-import-7.16.7" - sources."@babel/plugin-proposal-export-default-from-7.17.12" - sources."@babel/plugin-proposal-export-namespace-from-7.17.12" - sources."@babel/plugin-proposal-json-strings-7.17.12" - sources."@babel/plugin-proposal-logical-assignment-operators-7.17.12" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" - sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.18.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" - sources."@babel/plugin-proposal-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-private-methods-7.17.12" - sources."@babel/plugin-proposal-private-property-in-object-7.17.12" - sources."@babel/plugin-proposal-unicode-property-regex-7.17.12" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-explode-assignable-expression-7.18.6" + sources."@babel/helper-function-name-7.18.9" + 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.18.9" + sources."@babel/helper-optimise-call-expression-7.18.6" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-remap-async-to-generator-7.18.9" + sources."@babel/helper-replace-supers-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-string-parser-7.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helper-wrap-function-7.18.10" + sources."@babel/helpers-7.18.9" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-async-generator-functions-7.18.10" + sources."@babel/plugin-proposal-class-properties-7.18.6" + sources."@babel/plugin-proposal-class-static-block-7.18.6" + sources."@babel/plugin-proposal-dynamic-import-7.18.6" + sources."@babel/plugin-proposal-export-default-from-7.18.10" + sources."@babel/plugin-proposal-export-namespace-from-7.18.9" + sources."@babel/plugin-proposal-json-strings-7.18.6" + sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" + sources."@babel/plugin-proposal-numeric-separator-7.18.6" + sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-private-methods-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" sources."@babel/plugin-syntax-dynamic-import-7.8.3" - sources."@babel/plugin-syntax-export-default-from-7.16.7" + sources."@babel/plugin-syntax-export-default-from-7.18.6" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" - sources."@babel/plugin-syntax-import-assertions-7.17.12" + sources."@babel/plugin-syntax-import-assertions-7.18.6" sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.17.12" + 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" @@ -119719,71 +120157,71 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.17.12" - sources."@babel/plugin-transform-async-to-generator-7.17.12" - sources."@babel/plugin-transform-block-scoped-functions-7.16.7" - sources."@babel/plugin-transform-block-scoping-7.18.4" - sources."@babel/plugin-transform-classes-7.18.4" - sources."@babel/plugin-transform-computed-properties-7.17.12" - sources."@babel/plugin-transform-destructuring-7.18.0" - sources."@babel/plugin-transform-dotall-regex-7.16.7" - sources."@babel/plugin-transform-duplicate-keys-7.17.12" - sources."@babel/plugin-transform-exponentiation-operator-7.16.7" - sources."@babel/plugin-transform-for-of-7.18.1" - sources."@babel/plugin-transform-function-name-7.16.7" - sources."@babel/plugin-transform-literals-7.17.12" - sources."@babel/plugin-transform-member-expression-literals-7.16.7" - sources."@babel/plugin-transform-modules-amd-7.18.0" - sources."@babel/plugin-transform-modules-commonjs-7.18.2" - sources."@babel/plugin-transform-modules-systemjs-7.18.5" - sources."@babel/plugin-transform-modules-umd-7.18.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.12" - sources."@babel/plugin-transform-new-target-7.18.5" - sources."@babel/plugin-transform-object-super-7.16.7" - sources."@babel/plugin-transform-parameters-7.17.12" - sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-react-display-name-7.16.7" - sources."@babel/plugin-transform-react-jsx-7.17.12" - sources."@babel/plugin-transform-react-jsx-development-7.16.7" - sources."@babel/plugin-transform-react-pure-annotations-7.18.0" - sources."@babel/plugin-transform-regenerator-7.18.0" - sources."@babel/plugin-transform-reserved-words-7.17.12" - (sources."@babel/plugin-transform-runtime-7.18.5" // { + sources."@babel/plugin-transform-arrow-functions-7.18.6" + sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-block-scoped-functions-7.18.6" + sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-classes-7.18.9" + sources."@babel/plugin-transform-computed-properties-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-dotall-regex-7.18.6" + sources."@babel/plugin-transform-duplicate-keys-7.18.9" + sources."@babel/plugin-transform-exponentiation-operator-7.18.6" + sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-function-name-7.18.9" + sources."@babel/plugin-transform-literals-7.18.9" + sources."@babel/plugin-transform-member-expression-literals-7.18.6" + sources."@babel/plugin-transform-modules-amd-7.18.6" + sources."@babel/plugin-transform-modules-commonjs-7.18.6" + sources."@babel/plugin-transform-modules-systemjs-7.18.9" + sources."@babel/plugin-transform-modules-umd-7.18.6" + sources."@babel/plugin-transform-named-capturing-groups-regex-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.18.8" + 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.18.10" + sources."@babel/plugin-transform-react-jsx-development-7.18.6" + sources."@babel/plugin-transform-react-pure-annotations-7.18.6" + sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-reserved-words-7.18.6" + (sources."@babel/plugin-transform-runtime-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/plugin-transform-spread-7.17.12" - sources."@babel/plugin-transform-sticky-regex-7.16.7" - sources."@babel/plugin-transform-template-literals-7.18.2" - sources."@babel/plugin-transform-typeof-symbol-7.17.12" - sources."@babel/plugin-transform-unicode-escapes-7.16.7" - sources."@babel/plugin-transform-unicode-regex-7.16.7" - (sources."@babel/preset-env-7.18.2" // { + sources."@babel/plugin-transform-shorthand-properties-7.18.6" + sources."@babel/plugin-transform-spread-7.18.9" + sources."@babel/plugin-transform-sticky-regex-7.18.6" + sources."@babel/plugin-transform-template-literals-7.18.9" + sources."@babel/plugin-transform-typeof-symbol-7.18.9" + sources."@babel/plugin-transform-unicode-escapes-7.18.10" + sources."@babel/plugin-transform-unicode-regex-7.18.6" + (sources."@babel/preset-env-7.18.10" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-react-7.17.12" + sources."@babel/preset-react-7.18.6" sources."@babel/preset-stage-0-7.8.3" - sources."@babel/register-7.17.7" - sources."@babel/runtime-7.18.3" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/register-7.18.9" + sources."@babel/runtime-7.18.9" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" sources."@jridgewell/gen-mapping-0.1.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + 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.14" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.2.0" sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -119877,13 +120315,13 @@ in }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-macros-2.8.0" - (sources."babel-plugin-polyfill-corejs2-0.3.1" // { + (sources."babel-plugin-polyfill-corejs2-0.3.2" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.5.2" - sources."babel-plugin-polyfill-regenerator-0.3.1" + sources."babel-plugin-polyfill-corejs3-0.5.3" + sources."babel-plugin-polyfill-regenerator-0.4.0" sources."babel-plugin-transform-react-remove-prop-types-0.4.24" sources."babel-plugin-universal-import-4.0.2" (sources."babel-runtime-6.26.0" // { @@ -119942,7 +120380,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -119976,7 +120414,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -120056,7 +120494,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.23.2" // { + (sources."core-js-compat-3.24.1" // { dependencies = [ sources."semver-7.0.0" ]; @@ -120193,11 +120631,11 @@ in }) sources."download-git-repo-2.0.0" sources."duplexer-0.1.2" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -120207,7 +120645,7 @@ in sources."emojis-list-3.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.5.0" // { + (sources."engine.io-3.6.0" // { dependencies = [ sources."debug-4.1.1" ]; @@ -120440,7 +120878,7 @@ in sources."http-cache-semantics-3.8.1" sources."http-deceiver-1.2.7" sources."http-errors-2.0.0" - sources."http-parser-js-0.5.6" + sources."http-parser-js-0.5.8" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.19.1" sources."https-browserify-1.0.0" @@ -120638,7 +121076,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" (sources."normalize-url-2.0.1" // { @@ -120912,7 +121350,7 @@ in sources."react-helmet-6.1.0" sources."react-is-16.13.1" sources."react-lifecycles-compat-3.0.4" - sources."react-side-effect-2.1.1" + sources."react-side-effect-2.1.2" sources."react-universal-component-4.5.0" sources."readable-stream-2.3.7" sources."readdirp-3.6.0" @@ -120922,7 +121360,7 @@ in sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.0.1" + sources."regexpu-core-5.1.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" sources."regjsgen-0.6.0" @@ -121074,13 +121512,13 @@ in sources."kind-of-3.2.2" ]; }) - (sources."socket.io-2.4.1" // { + (sources."socket.io-2.5.0" // { dependencies = [ sources."debug-4.1.1" ]; }) sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.4.0" // { + (sources."socket.io-client-2.5.0" // { dependencies = [ sources."component-emitter-1.3.0" sources."debug-3.1.0" @@ -121185,7 +121623,7 @@ in }) sources."tar-stream-1.6.2" sources."term-size-1.2.0" - (sources."terser-4.8.0" // { + (sources."terser-4.8.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -121253,6 +121691,7 @@ in ]; }) sources."upath-1.2.0" + sources."update-browserslist-db-1.0.5" sources."update-check-1.5.2" sources."upper-case-1.1.3" sources."uri-js-4.4.1" @@ -121470,7 +121909,7 @@ in sources."@mozilla/readability-0.4.2" sources."@tootallnate/once-2.0.0" sources."abab-2.0.6" - sources."acorn-8.7.1" + sources."acorn-8.8.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -121502,7 +121941,7 @@ in sources."deep-is-0.1.4" sources."delayed-stream-1.0.0" sources."domexception-4.0.0" - sources."dompurify-2.3.8" + sources."dompurify-2.3.10" sources."emoji-regex-8.0.0" sources."escalade-3.1.1" sources."escodegen-2.0.0" @@ -121523,11 +121962,11 @@ in sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."ms-2.1.2" - sources."nwsapi-2.2.0" + sources."nwsapi-2.2.1" sources."optionator-0.8.3" sources."parse5-6.0.1" sources."prelude-ls-1.1.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."require-directory-2.1.1" sources."safer-buffer-2.1.2" @@ -121548,12 +121987,12 @@ in sources."whatwg-url-10.0.0" sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" - sources."ws-8.8.0" + sources."ws-8.8.1" sources."xml-name-validator-4.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -121568,41 +122007,42 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.13.16"; + version = "0.13.17"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.16.tgz"; - sha512 = "/rqkqJV1r5xgnEFh6cSmv+sZuo/TGCXKRBKZwoC0rLny5N6WGx9YykJhe1jSM4XRbK3VDfrQtOJmPCaI1ut6gg=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.17.tgz"; + sha512 = "9nlebYPiysVnuSJSoXAfEmwy8eHMsp14Rt4oRKqXaCz00O6chMnveZpzTB6APMVwA9gtNbiGO3Rbsm5PQQExzQ=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/generator-7.18.2" - sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/runtime-7.18.3" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" - sources."@emotion/is-prop-valid-1.1.3" - sources."@emotion/memoize-0.7.5" + sources."@babel/code-frame-7.18.6" + sources."@babel/generator-7.18.10" + sources."@babel/helper-annotate-as-pure-7.18.6" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-function-name-7.18.9" + 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.18.10" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.10" + sources."@babel/runtime-7.18.9" + sources."@babel/template-7.18.10" + sources."@babel/traverse-7.18.10" + sources."@babel/types-7.18.10" + sources."@emotion/is-prop-valid-1.2.0" + sources."@emotion/memoize-0.8.0" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" - sources."@exodus/schemasafe-1.0.0-rc.6" - sources."@jridgewell/gen-mapping-0.3.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + sources."@exodus/schemasafe-1.0.0-rc.7" + 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.14" sources."@redocly/ajv-8.6.4" - sources."@redocly/openapi-core-1.0.0-beta.102" + sources."@redocly/openapi-core-1.0.0-beta.105" sources."@types/json-schema-7.0.11" - sources."@types/node-14.18.21" + sources."@types/node-14.18.23" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" sources."anymatch-3.1.2" @@ -121651,7 +122091,7 @@ in sources."cipher-base-1.0.4" sources."classnames-2.3.1" sources."cliui-7.0.4" - sources."clsx-1.1.1" + sources."clsx-1.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colorette-1.4.0" @@ -121677,7 +122117,7 @@ in ]; }) sources."domain-browser-1.2.0" - sources."dompurify-2.3.8" + sources."dompurify-2.3.10" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -121735,7 +122175,7 @@ in sources."loose-envify-1.4.0" sources."lunr-2.3.9" sources."mark.js-8.11.1" - sources."marked-4.0.17" + sources."marked-4.0.18" sources."md5.js-1.3.5" (sources."miller-rabin-4.0.1" // { dependencies = [ @@ -121747,8 +122187,8 @@ in sources."minimatch-5.1.0" sources."minimist-1.2.6" sources."mkdirp-1.0.4" - sources."mobx-6.6.0" - sources."mobx-react-7.5.0" + sources."mobx-6.6.1" + sources."mobx-react-7.5.2" sources."mobx-react-lite-3.4.0" sources."ms-2.1.2" sources."neo-async-2.6.2" @@ -121801,7 +122241,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.72" // { + (sources."redoc-2.0.0-rc.74" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -121841,7 +122281,7 @@ in sources."to-regex-range-5.0.1" sources."tr46-0.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.16.1" + sources."uglify-js-3.16.3" (sources."uri-js-4.4.1" // { dependencies = [ sources."punycode-2.1.1" @@ -121875,7 +122315,7 @@ in sources."yaml-1.10.2" sources."yaml-ast-parser-0.0.43" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -122049,10 +122489,10 @@ in reveal-md = nodeEnv.buildNodePackage { name = "reveal-md"; packageName = "reveal-md"; - version = "5.3.3"; + version = "5.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.3.3.tgz"; - sha512 = "HWWVMB/utUAlPzR3cj1dFvcVhnAOEOocK5MpnAaOblYOpOL3LNbIyfLA/TxFKIkRdn0EJPwGdYC40dQbHooXgg=="; + url = "https://registry.npmjs.org/reveal-md/-/reveal-md-5.3.4.tgz"; + sha512 = "b0/HijfOPoypeHLD9hWKFTJREMDOUDvoPGftCrP0BU54R2vHL8sc+P0BaB/xRGOvFbyP/PyGCkwleiY0U8PMYg=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -122092,7 +122532,7 @@ in sources."chokidar-3.5.3" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-6.2.1" @@ -122113,7 +122553,7 @@ in sources."depd-2.0.0" sources."destroy-1.2.0" sources."dot-prop-5.3.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" @@ -122197,7 +122637,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."livereload-0.9.3" - sources."livereload-js-3.4.0" + sources."livereload-js-3.4.1" sources."lodash-4.17.21" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" @@ -122334,7 +122774,7 @@ in sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xdg-basedir-4.0.0" sources."yallist-4.0.0" sources."yaml-front-matter-4.1.1" @@ -122385,10 +122825,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.75.7"; + version = "2.77.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.75.7.tgz"; - sha512 = "VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.77.2.tgz"; + sha512 = "m/4YzYgLcpMQbxX3NmAqDvwLATZzxt8bIegO78FZLl+lAgKJBd1DRAOeEiZcKOIOPjxE6ewHWHNgGEalFXuz1g=="; }; dependencies = [ sources."fsevents-2.3.2" @@ -122411,7 +122851,8 @@ in dependencies = [ sources."@eslint/eslintrc-1.3.0" sources."@hpcc-js/wasm-1.12.8" - sources."@humanwhocodes/config-array-0.9.5" + sources."@humanwhocodes/config-array-0.10.4" + sources."@humanwhocodes/gitignore-to-minimatch-1.0.2" sources."@humanwhocodes/object-schema-1.2.1" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -122420,16 +122861,16 @@ in sources."@types/json-schema-7.0.11" sources."@types/node-14.17.34" sources."@types/vscode-1.66.0" - sources."@typescript-eslint/eslint-plugin-5.29.0" - sources."@typescript-eslint/parser-5.29.0" - sources."@typescript-eslint/scope-manager-5.29.0" - sources."@typescript-eslint/type-utils-5.29.0" - sources."@typescript-eslint/types-5.29.0" - sources."@typescript-eslint/typescript-estree-5.29.0" - sources."@typescript-eslint/utils-5.29.0" - sources."@typescript-eslint/visitor-keys-5.29.0" - sources."@vscode/test-electron-2.1.4" - sources."acorn-8.7.1" + sources."@typescript-eslint/eslint-plugin-5.32.0" + sources."@typescript-eslint/parser-5.32.0" + sources."@typescript-eslint/scope-manager-5.32.0" + sources."@typescript-eslint/type-utils-5.32.0" + sources."@typescript-eslint/types-5.32.0" + sources."@typescript-eslint/typescript-estree-5.32.0" + sources."@typescript-eslint/utils-5.32.0" + sources."@typescript-eslint/visitor-keys-5.32.0" + sources."@vscode/test-electron-2.1.5" + sources."acorn-8.8.0" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" sources."ajv-6.12.6" @@ -122437,7 +122878,7 @@ in sources."ansi-styles-4.3.0" sources."argparse-2.0.1" sources."array-union-2.1.0" - sources."azure-devops-node-api-11.1.1" + sources."azure-devops-node-api-11.2.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."big-integer-1.6.51" @@ -122459,7 +122900,7 @@ in sources."callsites-3.1.0" sources."chainsaw-0.1.0" sources."chalk-4.1.2" - sources."cheerio-1.0.0-rc.11" + sources."cheerio-1.0.0-rc.12" sources."cheerio-select-2.1.0" sources."chownr-1.1.4" sources."cliui-7.0.4" @@ -122473,13 +122914,13 @@ in sources."cross-spawn-7.0.3" sources."css-select-5.1.0" sources."css-what-6.1.0" - sources."d3-7.4.4" - sources."d3-array-3.1.6" + sources."d3-7.6.1" + sources."d3-array-3.2.0" sources."d3-axis-3.0.0" sources."d3-brush-3.0.0" sources."d3-chord-3.0.1" sources."d3-color-3.1.0" - sources."d3-contour-3.0.1" + sources."d3-contour-4.0.0" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" sources."d3-drag-3.0.0" @@ -122542,10 +122983,10 @@ in }) sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."entities-4.3.0" + sources."entities-4.3.1" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" - (sources."eslint-8.18.0" // { + (sources."eslint-8.21.0" // { dependencies = [ sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" @@ -122559,7 +123000,7 @@ in ]; }) sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.2" + sources."espree-9.3.3" (sources."esquery-1.4.0" // { dependencies = [ sources."estraverse-5.3.0" @@ -122581,8 +123022,9 @@ in sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" + sources."find-up-5.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" (sources."fstream-1.0.12" // { @@ -122597,9 +123039,10 @@ in sources."github-from-package-0.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.15.0" + sources."globals-13.17.0" sources."globby-11.1.0" sources."graceful-fs-4.2.10" + sources."grapheme-splitter-1.0.4" sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.3" @@ -122630,6 +123073,7 @@ in sources."levn-0.4.1" sources."linkify-it-3.0.3" sources."listenercount-1.0.1" + sources."locate-path-6.0.0" sources."lodash.merge-4.6.2" sources."lru-cache-6.0.0" (sources."markdown-it-12.3.2" // { @@ -122650,12 +123094,14 @@ in sources."mute-stream-0.0.8" sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" - sources."node-abi-3.22.0" + sources."node-abi-3.24.0" sources."node-addon-api-4.3.0" sources."nth-check-2.1.1" sources."object-inspect-1.12.2" 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."parse-semver-1.1.1" // { dependencies = [ @@ -122664,6 +123110,7 @@ in }) sources."parse5-7.0.0" sources."parse5-htmlparser2-tree-adapter-7.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."path-type-4.0.0" @@ -122675,7 +123122,7 @@ in sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."queue-microtask-1.2.3" (sources."rc-1.2.8" // { dependencies = [ @@ -122739,7 +123186,7 @@ in sources."url-join-4.0.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."vsce-2.9.2" // { + (sources."vsce-2.10.0" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -122765,9 +123212,10 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" sources."yauzl-2.10.0" sources."yazl-2.5.1" + sources."yocto-queue-0.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -122876,7 +123324,7 @@ in sources."object-inspect-1.12.2" (sources."openid-2.0.10" // { dependencies = [ - sources."qs-6.10.5" + sources."qs-6.11.0" ]; }) sources."pause-0.0.1" @@ -122906,10 +123354,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.52.3"; + version = "1.54.2"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.52.3.tgz"; - sha512 = "LNNPJ9lafx+j1ArtA7GyEJm9eawXN8KlA1+5dF6IZyoONg1Tyo/g+muOsENWJH/2Q1FHbbV4UwliU0cXMa/VIA=="; + url = "https://registry.npmjs.org/sass/-/sass-1.54.2.tgz"; + sha512 = "wbVV26sejsCIbBScZZtNkvnrB/bVCQ8hSlZ01D9nzsVh9zLqCkWrlpvTb3YEb6xsuNi9cx75hncqwikHFSz7tw=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -122965,113 +123413,120 @@ in serve = nodeEnv.buildNodePackage { name = "serve"; packageName = "serve"; - version = "13.0.2"; + version = "14.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/serve/-/serve-13.0.2.tgz"; - sha512 = "71R6fKvNgKrqARAag6lYJNnxDzpH7DCNrMuvPY5PLVaC2PDhJsGTj/34o4o4tPWhTuLgEXqvgnAWbATQ9zGZTQ=="; + url = "https://registry.npmjs.org/serve/-/serve-14.0.1.tgz"; + sha512 = "tNGwxl27FwA8TbmMQqN0jTaSx8/trL532qZsJHX1VdiEIjjtMJHCs7AFS6OvtC7cTHOvmjXqt5yczejU6CV2Xg=="; }; dependencies = [ - sources."@zeit/schemas-2.6.0" + sources."@zeit/schemas-2.21.0" sources."accepts-1.3.8" - sources."ajv-6.12.6" - sources."ansi-align-3.0.1" - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."arch-2.2.0" - sources."arg-2.0.0" - sources."balanced-match-1.0.2" - (sources."boxen-5.1.2" // { + sources."ajv-8.11.0" + (sources."ansi-align-3.0.1" // { dependencies = [ + sources."string-width-4.2.3" + ]; + }) + sources."ansi-regex-5.0.1" + sources."ansi-styles-6.1.0" + sources."arch-2.2.0" + sources."arg-5.0.2" + sources."balanced-match-1.0.2" + sources."boxen-7.0.0" + sources."brace-expansion-1.1.11" + sources."bytes-3.0.0" + sources."camelcase-7.0.0" + sources."chalk-5.0.1" + (sources."chalk-template-0.4.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" sources."chalk-4.1.2" ]; }) - sources."brace-expansion-1.1.11" - sources."bytes-3.0.0" - sources."camelcase-6.3.0" - (sources."chalk-2.4.1" // { - 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."cli-boxes-2.2.1" - sources."clipboardy-2.3.0" + sources."cli-boxes-3.0.0" + sources."clipboardy-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."compressible-2.0.18" - sources."compression-1.7.3" + sources."compression-1.7.4" sources."concat-map-0.0.1" sources."content-disposition-0.5.2" - sources."cross-spawn-6.0.5" + sources."cross-spawn-7.0.3" sources."debug-2.6.9" sources."deep-extend-0.6.0" + sources."eastasianwidth-0.2.0" sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" - sources."escape-string-regexp-1.0.5" - sources."execa-1.0.0" + sources."execa-5.1.1" sources."fast-deep-equal-3.1.3" - sources."fast-json-stable-stringify-2.1.0" (sources."fast-url-parser-1.1.3" // { dependencies = [ sources."punycode-1.4.1" ]; }) - sources."get-stream-4.1.0" + sources."get-stream-6.0.1" sources."has-flag-4.0.0" + sources."human-signals-2.1.0" sources."ini-1.3.8" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" - sources."is-stream-1.1.0" + sources."is-port-reachable-4.0.0" + sources."is-stream-2.0.1" sources."is-wsl-2.2.0" sources."isexe-2.0.0" - sources."json-schema-traverse-0.4.1" + sources."json-schema-traverse-1.0.0" + 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.0.4" sources."minimist-1.2.6" sources."ms-2.0.0" sources."negotiator-0.6.3" - sources."nice-try-1.0.5" - sources."npm-run-path-2.0.2" + sources."npm-run-path-4.0.1" sources."on-headers-1.0.2" - sources."once-1.4.0" - sources."p-finally-1.0.0" + sources."onetime-5.1.2" sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" + sources."path-key-3.1.1" sources."path-to-regexp-2.2.1" - sources."pump-3.0.0" sources."punycode-2.1.1" sources."range-parser-1.2.0" sources."rc-1.2.8" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" + sources."require-from-string-2.0.2" sources."safe-buffer-5.1.2" - sources."semver-5.7.1" (sources."serve-handler-6.1.3" // { dependencies = [ sources."mime-db-1.33.0" sources."mime-types-2.1.18" ]; }) - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."string-width-4.2.3" + (sources."string-width-5.1.2" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."emoji-regex-9.2.2" + sources."strip-ansi-7.0.1" + ]; + }) 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."supports-color-7.2.0" - sources."type-fest-0.20.2" - sources."update-check-1.5.2" + sources."type-fest-2.18.0" + sources."update-check-1.5.4" sources."uri-js-4.4.1" sources."vary-1.1.2" - sources."which-1.3.1" - sources."widest-line-3.1.0" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" + sources."which-2.0.2" + sources."widest-line-4.0.1" + (sources."wrap-ansi-8.0.1" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."strip-ansi-7.0.1" + ]; + }) ]; buildInputs = globalBuildInputs; meta = { @@ -123086,10 +123541,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "3.19.0"; + version = "3.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-3.19.0.tgz"; - sha512 = "XqbZ+UhxLjnwnzOEMkecJd68C3P9g9fQGwhHkuQelni3hIjmLlzkVBx6wlxrIBRgAXE9RAllwZvCsi2jZ9h2Ww=="; + url = "https://registry.npmjs.org/serverless/-/serverless-3.21.0.tgz"; + sha512 = "swDn12DWEN3jyb/DPrr+a5Gy+DcV+cI+Yuii+zjxGTPGrEDfLymPBEtx3e7YmxKWn174ekmRCfRNbbtffo3LcQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -123105,7 +123560,7 @@ in sources."js-yaml-3.14.1" ]; }) - (sources."@serverless/utils-6.6.0" // { + (sources."@serverless/utils-6.7.0" // { dependencies = [ sources."jwt-decode-3.1.2" ]; @@ -123118,7 +123573,7 @@ in sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" sources."@types/lodash-4.14.182" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/responselike-1.0.0" sources."adm-zip-0.5.9" sources."agent-base-6.0.2" @@ -123145,7 +123600,8 @@ in sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.1158.0" // { + sources."available-typed-arrays-1.0.5" + (sources."aws-sdk-2.1188.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -123191,10 +123647,10 @@ in sources."chokidar-3.5.3" sources."chownr-2.0.0" sources."ci-info-3.3.2" - sources."cli-color-2.0.2" + sources."cli-color-2.0.3" sources."cli-cursor-3.1.0" sources."cli-progress-footer-2.3.2" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" (sources."cli-sprintf-format-1.1.1" // { dependencies = [ sources."supports-color-6.1.0" @@ -123202,7 +123658,7 @@ in }) sources."cli-width-3.0.0" sources."clone-1.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" @@ -123238,7 +123694,7 @@ in sources."type-1.2.0" ]; }) - sources."dayjs-1.11.3" + sources."dayjs-1.11.4" sources."debug-4.3.4" (sources."decompress-4.2.1" // { dependencies = [ @@ -123280,6 +123736,7 @@ in sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" sources."deferred-0.7.11" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."dezalgo-1.0.3" sources."dir-glob-3.0.1" @@ -123288,7 +123745,9 @@ in sources."duration-0.2.2" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."es5-ext-0.10.61" + sources."es-abstract-1.20.1" + sources."es-to-primitive-1.2.1" + sources."es5-ext-0.10.62" sources."es6-iterator-2.0.3" (sources."es6-set-0.1.5" // { dependencies = [ @@ -123310,11 +123769,11 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.11" sources."fast-safe-stringify-2.1.1" - sources."fastest-levenshtein-1.0.12" + sources."fastest-levenshtein-1.0.16" sources."fastq-1.13.0" sources."fd-slicer-1.1.0" sources."figures-3.2.0" - sources."file-type-16.5.3" + sources."file-type-16.5.4" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.3.0" sources."filesize-8.0.7" @@ -123322,6 +123781,7 @@ in sources."find-requires-1.0.0" sources."flat-5.0.2" sources."follow-redirects-1.15.1" + sources."for-each-0.3.3" sources."form-data-4.0.0" (sources."formidable-2.0.1" // { dependencies = [ @@ -123335,9 +123795,12 @@ in sources."fs2-0.3.9" 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."get-intrinsic-1.1.2" sources."get-stdin-8.0.0" sources."get-stream-6.0.1" + sources."get-symbol-description-1.0.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."globby-11.1.0" @@ -123345,8 +123808,11 @@ in sources."graceful-fs-4.2.10" sources."graphlib-2.1.8" sources."has-1.0.3" + sources."has-bigints-1.0.2" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" sources."hexoid-1.0.0" sources."http-cache-semantics-4.1.0" sources."http2-wrapper-1.0.3" @@ -123359,18 +123825,33 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inquirer-8.2.4" + sources."internal-slot-1.0.3" + sources."is-arguments-1.1.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.4" + 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-generator-function-1.0.10" sources."is-glob-4.0.3" sources."is-interactive-1.0.0" sources."is-natural-number-4.0.1" + sources."is-negative-zero-2.0.2" sources."is-number-7.0.0" + sources."is-number-object-1.0.7" sources."is-plain-obj-1.1.0" sources."is-promise-2.2.2" + sources."is-regex-1.1.4" + sources."is-shared-array-buffer-1.0.2" sources."is-stream-1.1.0" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.9" 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" @@ -123391,9 +123872,9 @@ in }) sources."json-schema-traverse-1.0.0" sources."jsonfile-6.1.0" - sources."jszip-3.10.0" + sources."jszip-3.10.1" sources."jwt-decode-2.2.0" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."lazystream-1.0.1" sources."lie-3.3.0" sources."lodash-4.17.21" @@ -123423,13 +123904,13 @@ in sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."native-promise-only-0.8.1" - sources."ncjsm-4.3.0" + sources."ncjsm-4.3.1" sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-dir-0.1.17" @@ -123440,6 +123921,8 @@ in sources."object-assign-4.1.1" sources."object-hash-2.2.0" sources."object-inspect-1.12.2" + sources."object-keys-1.1.1" + sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-7.4.2" @@ -123466,7 +123949,7 @@ in sources."promise-queue-2.2.5" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."querystring-0.2.1" sources."queue-microtask-1.2.3" sources."quick-lru-5.1.1" @@ -123476,17 +123959,23 @@ in sources."readable-stream-3.6.0" ]; }) - sources."readdir-glob-1.1.1" + (sources."readdir-glob-1.1.2" // { + dependencies = [ + sources."brace-expansion-2.0.1" + sources."minimatch-5.1.0" + ]; + }) sources."readdirp-3.6.0" + sources."regexp.prototype.flags-1.4.3" sources."require-from-string-2.0.2" sources."resolve-alpn-1.2.1" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."restore-cursor-3.1.0" sources."reusify-1.0.4" sources."run-async-2.4.1" sources."run-parallel-1.2.0" sources."run-parallel-limit-1.1.0" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -123497,7 +123986,7 @@ in sources."shebang-regex-1.0.0" sources."side-channel-1.0.4" sources."signal-exit-3.0.7" - sources."simple-git-3.8.0" + sources."simple-git-3.11.0" sources."slash-3.0.0" sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" @@ -123510,6 +123999,8 @@ in sources."sprintf-kit-2.0.1" sources."stream-promise-3.2.0" sources."string-width-4.2.3" + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" sources."string_decoder-1.1.1" sources."strip-ansi-6.0.1" sources."strip-dirs-2.1.0" @@ -123537,13 +124028,14 @@ in sources."tmp-0.0.33" sources."to-buffer-1.1.1" sources."to-regex-range-5.0.1" - sources."token-types-4.2.0" + sources."token-types-4.2.1" sources."tr46-0.0.3" sources."traverse-0.6.6" sources."trim-repeated-1.0.0" sources."tslib-2.4.0" - sources."type-2.6.0" + sources."type-2.7.0" sources."type-fest-0.21.3" + sources."unbox-primitive-1.0.2" sources."unbzip2-stream-1.4.3" sources."uni-global-1.0.0" sources."universalify-2.0.0" @@ -123555,6 +124047,7 @@ in sources."querystring-0.2.0" ]; }) + sources."util-0.12.4" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."validate-npm-package-name-3.0.0" @@ -123562,10 +124055,12 @@ in sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" sources."which-1.3.1" + sources."which-boxed-primitive-1.0.2" + sources."which-typed-array-1.1.8" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" sources."write-file-atomic-4.0.1" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" sources."xtend-4.0.2" @@ -123737,7 +124232,7 @@ in sources."pause-stream-0.0.11" sources."performance-now-2.1.0" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.10.3" sources."range-parser-1.2.1" @@ -124224,10 +124719,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.954.0"; + version = "1.982.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.954.0.tgz"; - sha512 = "QkuoCjvLCIyf1PfAyzlL8rMo99mZ5Hq6I0afGAixICg3FM0phdnlZ7t/F4NtU5iZgMPKkutWbc2oK69lAyA6eA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.982.0.tgz"; + sha512 = "tba8xmMVq5difpLxrFgJuLTeOe9mAWwmAjRLqQxLytcp58vWUMFme4ZxDOybPVsGnk8vrY3pBiU6abOlwpZgaw=="; }; buildInputs = globalBuildInputs; meta = { @@ -124250,7 +124745,7 @@ in sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."accepts-1.3.8" sources."base64id-2.0.0" sources."component-emitter-1.3.0" @@ -124265,7 +124760,7 @@ in sources."negotiator-0.6.3" sources."object-assign-4.1.1" sources."socket.io-adapter-2.4.0" - sources."socket.io-parser-4.0.4" + sources."socket.io-parser-4.0.5" sources."vary-1.1.2" sources."ws-8.2.3" ]; @@ -124288,9 +124783,9 @@ in sha512 = "CIlLQsG8ffQ2B+2A/s3rXiaTXDWlEKBMya64ajzDcpDZ8bpB5dOyznWQJB+lyUn6/lJ8P+5xe4jKO60S6yLoMw=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -124314,7 +124809,7 @@ in sources."camelcase-keys-7.0.2" sources."chalk-4.1.2" sources."cli-cursor-4.0.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -124364,14 +124859,14 @@ in sources."log-update-5.0.1" sources."lru-cache-6.0.0" sources."map-obj-4.3.0" - sources."meow-10.1.2" + sources."meow-10.1.3" sources."mimic-fn-2.1.0" sources."min-indent-1.0.1" sources."minimist-options-4.1.0" sources."ms-2.0.0" sources."normalize-package-data-3.0.3" sources."onetime-5.1.2" - (sources."ora-6.1.0" // { + (sources."ora-6.1.2" // { dependencies = [ sources."chalk-5.0.1" ]; @@ -124444,10 +124939,10 @@ in sql-formatter = nodeEnv.buildNodePackage { name = "sql-formatter"; packageName = "sql-formatter"; - version = "7.0.2"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-7.0.2.tgz"; - sha512 = "l6JVgMKT3Nzq7Jtpf43QhL26QEM5ICDMN2ARnZz5Z2l1d6e2mT/nRWAZun9kSSkrHrOAsBn20vknWFWuOlz3ww=="; + url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-8.2.0.tgz"; + sha512 = "5hQOSOk8jfhPkNgUmpm+9Fn2aaLWcf4vKL/dIvUN5q9rsamKHSyN/gL79xpkETNOyL+Zv5BMQfA7z9Rmz/DJJg=="; }; dependencies = [ sources."argparse-2.0.1" @@ -124505,7 +125000,7 @@ in sources."atomic-file-rw-0.2.2" sources."attach-ware-1.1.1" sources."available-typed-arrays-1.0.5" - sources."b4a-1.5.3" + sources."b4a-1.6.0" sources."bail-1.0.5" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -124909,7 +125404,7 @@ in sources."next-tick-1.1.0" sources."nice-try-1.0.5" sources."node-bindgen-loader-1.0.1" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" sources."non-private-ip-2.2.0" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" @@ -125191,7 +125686,11 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.6.2" + (sources."socks-2.7.0" // { + dependencies = [ + sources."ip-2.0.0" + ]; + }) sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -125208,17 +125707,22 @@ in sources."split-string-3.1.0" (sources."ssb-bendy-butt-0.12.5" // { dependencies = [ - sources."ssb-keys-8.4.0" + (sources."ssb-keys-8.4.1" // { + dependencies = [ + sources."ssb-uri2-2.0.2" + ]; + }) + sources."ssb-uri2-1.9.0" ]; }) - sources."ssb-bfe-3.3.0" + sources."ssb-bfe-3.5.0" sources."ssb-bfe-spec-0.6.0" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" (sources."ssb-config-3.4.6" // { dependencies = [ - sources."ssb-keys-8.4.0" + sources."ssb-keys-8.4.1" ]; }) sources."ssb-db-19.2.0" @@ -125236,11 +125740,13 @@ in sources."mkdirp-1.0.4" sources."push-stream-11.0.1" sources."rimraf-3.0.2" - (sources."ssb-keys-8.4.0" // { + (sources."ssb-keys-8.4.1" // { dependencies = [ sources."mkdirp-0.5.6" + sources."ssb-uri2-2.0.2" ]; }) + sources."ssb-uri2-1.9.0" ]; }) sources."ssb-ebt-5.6.7" @@ -125278,10 +125784,10 @@ in sources."ssb-replicate-1.3.3" sources."ssb-typescript-2.8.0" sources."ssb-unix-socket-1.0.0" - sources."ssb-uri2-1.9.0" + sources."ssb-uri2-2.0.2" (sources."ssb-validate-4.1.4" // { dependencies = [ - sources."ssb-keys-8.4.0" + sources."ssb-keys-8.4.1" ]; }) sources."ssb-validate2-0.1.2" @@ -125339,7 +125845,7 @@ in }) sources."to-space-case-1.0.0" sources."to-vfile-1.0.0" - sources."too-hot-1.0.0" + sources."too-hot-1.0.1" sources."traverse-0.6.6" sources."trim-0.0.1" sources."trim-lines-1.1.3" @@ -125389,7 +125895,7 @@ in sources."word-wrap-1.2.3" sources."wrap-fn-0.1.5" sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xtend-4.0.2" sources."zerr-1.0.4" ]; @@ -125489,7 +125995,8 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.1158.0" // { + sources."available-typed-arrays-1.0.5" + (sources."aws-sdk-2.1188.0" // { dependencies = [ sources."uuid-8.0.0" ]; @@ -125555,29 +126062,26 @@ in (sources."compression-1.7.4" // { dependencies = [ sources."bytes-3.0.0" + sources."safe-buffer-5.1.2" ]; }) sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" ]; }) sources."config-1.31.0" sources."constantinople-3.1.2" - (sources."content-disposition-0.5.4" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) + sources."content-disposition-0.5.4" sources."content-type-1.0.4" sources."convert-to-ecmascript-compatible-varname-0.1.5" sources."cookie-0.4.0" (sources."cookie-session-2.0.0" // { dependencies = [ sources."debug-3.2.7" - sources."safe-buffer-5.2.1" ]; }) sources."cookie-signature-1.0.6" @@ -125611,6 +126115,7 @@ in }) sources."decamelize-1.2.0" sources."deep-extend-0.4.2" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" sources."depd-2.0.0" sources."deref-0.6.4" @@ -125630,7 +126135,7 @@ in sources."ejs-0.8.8" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.5.0" // { + (sources."engine.io-3.6.0" // { dependencies = [ sources."cookie-0.4.2" sources."debug-4.1.1" @@ -125646,6 +126151,8 @@ in }) sources."engine.io-parser-2.2.1" sources."error-ex-1.3.2" + sources."es-abstract-1.20.1" + sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esprima-2.0.0" @@ -125663,7 +126170,6 @@ in sources."cookie-0.5.0" sources."proxy-addr-2.0.7" sources."qs-6.10.3" - sources."safe-buffer-5.2.1" ]; }) (sources."express-validator-2.21.0" // { @@ -125683,6 +126189,7 @@ in sources."finalhandler-1.2.0" sources."find-up-3.0.0" sources."follow-redirects-1.15.1" + sources."for-each-0.3.3" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.6" @@ -125690,11 +126197,14 @@ in 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."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" sources."get-intrinsic-1.1.2" sources."get-stream-4.1.0" + sources."get-symbol-description-1.0.0" (sources."getpass-0.1.7" // { dependencies = [ sources."assert-plus-1.0.0" @@ -125712,12 +126222,14 @@ in sources."har-validator-2.0.6" sources."has-1.0.3" sources."has-ansi-2.0.0" + sources."has-bigints-1.0.2" (sources."has-binary2-1.0.3" // { dependencies = [ sources."isarray-2.0.1" ]; }) sources."has-cors-1.1.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" sources."has-tostringtag-1.0.0" sources."hawk-3.1.3" @@ -125744,25 +126256,39 @@ in sources."indexof-0.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."internal-slot-1.0.3" sources."invert-kv-2.0.0" sources."ipaddr.js-1.9.1" + sources."is-arguments-1.1.1" sources."is-arrayish-0.2.1" + sources."is-bigint-1.0.4" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" + sources."is-callable-1.2.4" sources."is-core-module-2.9.0" + sources."is-date-object-1.0.5" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" ]; }) sources."is-fullwidth-code-point-1.0.0" + sources."is-generator-function-1.0.10" sources."is-my-ip-valid-1.0.1" sources."is-my-json-valid-2.20.6" + sources."is-negative-zero-2.0.2" + sources."is-number-object-1.0.7" sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-regex-1.1.4" + sources."is-shared-array-buffer-1.0.2" sources."is-stream-1.1.0" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" + sources."is-typed-array-1.1.9" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" + sources."is-weakref-1.0.2" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -125785,7 +126311,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-1.0.1" - sources."jsonpointer-5.0.0" + sources."jsonpointer-5.0.1" sources."jspath-0.3.4" (sources."jsprim-1.4.2" // { dependencies = [ @@ -125860,7 +126386,7 @@ in sources."minimist-1.2.6" sources."minitouch-prebuilt-1.2.0" sources."mkdirp-0.5.6" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."ms-2.1.3" sources."multer-1.4.4" sources."mustache-2.3.2" @@ -125882,12 +126408,14 @@ in sources."object-assign-4.1.1" sources."object-hash-0.3.0" sources."object-inspect-1.12.2" + sources."object-keys-1.1.1" + sources."object.assign-4.1.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" (sources."openid-2.0.10" // { dependencies = [ - sources."qs-6.10.5" + sources."qs-6.11.0" ]; }) sources."options-0.0.6" @@ -125939,7 +126467,7 @@ in ]; }) sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pug-2.0.4" sources."pug-attrs-2.0.4" sources."pug-code-gen-2.0.3" @@ -125974,6 +126502,7 @@ in ]; }) sources."regenerator-runtime-0.11.1" + sources."regexp.prototype.flags-1.4.3" sources."repeat-string-1.6.1" (sources."request-2.88.2" // { dependencies = [ @@ -126006,7 +126535,7 @@ in sources."lodash-3.10.1" ]; }) - sources."safe-buffer-5.1.2" + sources."safe-buffer-5.2.1" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.1" @@ -126027,13 +126556,13 @@ in sources."signal-exit-3.0.7" sources."slash-1.0.0" sources."sntp-1.0.9" - (sources."socket.io-2.4.1" // { + (sources."socket.io-2.5.0" // { dependencies = [ sources."debug-4.1.1" ]; }) sources."socket.io-adapter-1.1.2" - (sources."socket.io-client-2.4.0" // { + (sources."socket.io-client-2.5.0" // { dependencies = [ sources."debug-3.1.0" sources."isarray-2.0.1" @@ -126080,6 +126609,8 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" sources."string_decoder-0.10.31" sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" @@ -126097,9 +126628,8 @@ in sources."lru-cache-6.0.0" sources."mime-2.6.0" sources."ms-2.1.2" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" sources."semver-7.3.7" sources."string_decoder-1.3.0" sources."yallist-4.0.0" @@ -126114,7 +126644,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.14.1" sources."lodash-3.10.1" - sources."qs-6.10.5" + sources."qs-6.11.0" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -126163,6 +126693,7 @@ in sources."uid-safe-2.1.5" sources."uid2-0.0.4" sources."ultron-1.0.2" + sources."unbox-primitive-1.0.2" sources."unpipe-1.0.0" (sources."uri-js-4.4.1" // { dependencies = [ @@ -126176,6 +126707,7 @@ in }) sources."url-join-1.1.0" sources."utf-8-validate-1.2.2" + sources."util-0.12.4" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -126195,7 +126727,9 @@ in }) sources."void-elements-2.0.1" sources."which-1.3.1" + sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" + sources."which-typed-array-1.1.8" sources."window-size-0.1.0" (sources."winston-2.4.6" // { dependencies = [ @@ -126212,6 +126746,7 @@ in sources."wrappy-1.0.2" (sources."ws-3.3.3" // { dependencies = [ + sources."safe-buffer-5.1.2" sources."ultron-1.1.1" ]; }) @@ -126285,10 +126820,10 @@ in sha512 = "RdAkJdPiLqHawCSnu21nE27MjNXaVd4WcOHA4vK5GtIGjScfhNnaOuWR2wWdfKFAvcWQPOYe311iveiVKSmwsA=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" - sources."@csstools/selector-specificity-2.0.1" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" + sources."@csstools/selector-specificity-2.0.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -126334,13 +126869,13 @@ in sources."execall-2.0.0" sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.11" - sources."fastest-levenshtein-1.0.12" + sources."fastest-levenshtein-1.0.16" sources."fastq-1.13.0" sources."file-entry-cache-6.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stdin-8.0.0" @@ -126587,7 +127122,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."progress-1.1.8" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."read-1.0.5" @@ -126632,19 +127167,19 @@ in svelte-check = nodeEnv.buildNodePackage { name = "svelte-check"; packageName = "svelte-check"; - version = "2.7.2"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.7.2.tgz"; - sha512 = "TuVX4YtXHbRM8sVuK5Jk+mKWdm3f0d6hvAC6qCTp8yUszGZewpEBCo2V5fRWZCiz+0J4OCiDHOS+DFMxv39rJA=="; + url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.8.0.tgz"; + sha512 = "HRL66BxffMAZusqe5I5k26mRWQ+BobGd9Rxm3onh7ZVu0nTk8YTKJ9vu3LVPjUGLU9IX7zS+jmwPVhJYdXJ8vg=="; }; dependencies = [ - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -126716,22 +127251,22 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.28"; + version = "0.14.31"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.28.tgz"; - sha512 = "6fFREzcT9Q+jBu+tuRdtx0CuaKDnZUnDrFf3CJRXwnAKCqcz9mIZlfKxgEkxd546RrOB241iLT0juRXiGjH6vg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.31.tgz"; + sha512 = "vLjCA331i/f9iwK01WuD1C6UGfVRYCM93uNOOK54AQ8cRdnhOOfC6ptAKqd+9KQ7yWuDnrUJONMch/tQ457yEQ=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.3" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/pug-2.0.6" sources."@types/sass-1.43.1" sources."anymatch-3.1.2" @@ -126788,9 +127323,9 @@ in sources."sorcery-0.10.0" sources."sourcemap-codec-1.4.8" sources."strip-indent-3.0.0" - sources."svelte-3.48.0" + sources."svelte-3.49.0" sources."svelte-preprocess-4.10.7" - sources."svelte2tsx-0.5.10" + sources."svelte2tsx-0.5.13" sources."to-regex-range-5.0.1" sources."tslib-2.4.0" sources."typescript-4.7.4" @@ -127010,7 +127545,7 @@ in }) sources."diff-1.4.0" sources."dot-prop-4.2.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."escape-html-1.0.3" @@ -127286,7 +127821,7 @@ in sources."lru-cache-6.0.0" sources."mime-2.6.0" sources."ms-2.1.2" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."readable-stream-3.6.0" sources."semver-7.3.7" sources."superagent-7.1.6" @@ -127468,7 +128003,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.16.1" + sources."uglify-js-3.16.3" sources."undefsafe-2.0.5" (sources."union-value-1.0.1" // { dependencies = [ @@ -127528,10 +128063,10 @@ in tailwindcss = nodeEnv.buildNodePackage { name = "tailwindcss"; packageName = "tailwindcss"; - version = "3.1.3"; + version = "3.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.3.tgz"; - sha512 = "PRJNYdSIthrb8hjmAyymEyEN8Yo61TMXpzyFUpxULeeyRn3Y3gpvuw6FlRTKrJvK7thSGKRnhT36VovVx4WeMA=="; + url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.1.7.tgz"; + sha512 = "r7mgumZ3k0InfVPpGWcX8X/Ut4xBfv+1O/+C73ar/m01LxGVzWvPxF/w6xIUPEztrCoz7axfx0SMdh8FH8ZvRQ=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -127572,7 +128107,7 @@ in sources."is-extglob-2.1.1" sources."is-glob-4.0.3" sources."is-number-7.0.0" - sources."lilconfig-2.0.5" + sources."lilconfig-2.0.6" sources."merge2-1.4.1" sources."micromatch-4.0.5" sources."minimist-1.2.6" @@ -127682,7 +128217,7 @@ in sources."mime-types-2.1.35" sources."minimist-1.2.6" sources."module-alias-2.2.2" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."ms-2.1.2" sources."node-fetch-2.6.7" sources."oauth-sign-0.9.0" @@ -127692,7 +128227,7 @@ in sources."path-exists-3.0.0" sources."performance-now-2.1.0" sources."prism-media-0.0.4" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."ramda-0.25.0" @@ -127713,7 +128248,7 @@ in }) sources."string-width-3.1.0" sources."strip-ansi-5.2.0" - sources."telegraf-3.39.0" + sources."telegraf-3.40.0" sources."tough-cookie-2.5.0" sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" @@ -127750,7 +128285,7 @@ in }; dependencies = [ sources."node-addon-api-4.3.0" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" sources."q-1.5.1" sources."usb-1.9.2" ]; @@ -127816,19 +128351,19 @@ in terser = nodeEnv.buildNodePackage { name = "terser"; packageName = "terser"; - version = "5.14.1"; + version = "5.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz"; - sha512 = "+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ=="; + url = "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz"; + sha512 = "oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA=="; }; dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" + sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" - sources."acorn-8.7.1" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" + sources."acorn-8.8.0" sources."buffer-from-1.1.2" sources."commander-2.20.3" sources."source-map-0.6.1" @@ -127847,29 +128382,29 @@ in textlint = nodeEnv.buildNodePackage { name = "textlint"; packageName = "textlint"; - version = "12.1.1"; + version = "12.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/textlint/-/textlint-12.1.1.tgz"; - sha512 = "AoE/pPL+6e/7hHOxwxL5oBTYIsG6gjrMP77VQZVYxXYfTDduwRlqhQUUrVd32DaLQTm7z3/lCnY46uFkmK06fA=="; + url = "https://registry.npmjs.org/textlint/-/textlint-12.2.1.tgz"; + sha512 = "e6xKNLbTt10KbnG0x3eVE7l8A7uOC9bj0Hc8cWk6VoLffjrdw4o8kJjWVIspNzfb0kUEs2dBKgXZo0ob4tMWAg=="; }; dependencies = [ sources."@azu/format-text-1.0.1" sources."@azu/style-format-1.0.0" - sources."@textlint/ast-node-types-12.1.1" - sources."@textlint/ast-tester-12.1.1" - sources."@textlint/ast-traverse-12.1.1" - sources."@textlint/feature-flag-12.1.1" - sources."@textlint/fixer-formatter-12.1.1" - sources."@textlint/kernel-12.1.1" - sources."@textlint/linter-formatter-12.1.1" - sources."@textlint/markdown-to-ast-12.1.1" - sources."@textlint/module-interop-12.1.1" - sources."@textlint/source-code-fixer-12.1.1" - sources."@textlint/text-to-ast-12.1.1" - sources."@textlint/textlint-plugin-markdown-12.1.1" - sources."@textlint/textlint-plugin-text-12.1.1" - sources."@textlint/types-12.1.1" - sources."@textlint/utils-12.1.1" + sources."@textlint/ast-node-types-12.2.1" + sources."@textlint/ast-tester-12.2.1" + sources."@textlint/ast-traverse-12.2.1" + sources."@textlint/feature-flag-12.2.1" + sources."@textlint/fixer-formatter-12.2.1" + sources."@textlint/kernel-12.2.1" + sources."@textlint/linter-formatter-12.2.1" + sources."@textlint/markdown-to-ast-12.2.1" + sources."@textlint/module-interop-12.2.1" + sources."@textlint/source-code-fixer-12.2.1" + sources."@textlint/text-to-ast-12.2.1" + sources."@textlint/textlint-plugin-markdown-12.2.1" + sources."@textlint/textlint-plugin-text-12.2.1" + sources."@textlint/types-12.2.1" + sources."@textlint/utils-12.2.1" sources."@types/mdast-3.0.10" sources."@types/unist-2.0.6" sources."ajv-8.11.0" @@ -128126,9 +128661,9 @@ in sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/hast-2.3.4" @@ -128177,7 +128712,7 @@ in sources."character-reference-invalid-1.1.4" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."collapse-white-space-1.0.6" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -128205,7 +128740,7 @@ in sources."defer-to-connect-1.1.3" sources."dot-prop-5.3.0" sources."duplexer-0.1.2" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" @@ -128564,29 +129099,269 @@ in textlint-rule-en-max-word-count = nodeEnv.buildNodePackage { name = "textlint-rule-en-max-word-count"; packageName = "textlint-rule-en-max-word-count"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-en-max-word-count/-/textlint-rule-en-max-word-count-1.1.0.tgz"; - sha512 = "nDm8b6cN+62P6mdJ81vHJ0K6UYu5oQkkiHhM9XicMRxBoAP6tml4BqeeRtq84UeBfXSf9QcRjI3D5ob1oN8iXA=="; + 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=="; }; 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.2.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.2.1" + ]; + }) + (sources."@textlint/ast-traverse-12.2.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.2.1" + ]; + }) + sources."@textlint/feature-flag-12.2.1" + sources."@textlint/fixer-formatter-12.2.1" + (sources."@textlint/kernel-12.2.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.2.1" + ]; + }) + sources."@textlint/linter-formatter-12.2.1" + (sources."@textlint/markdown-to-ast-12.2.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.2.1" + ]; + }) + sources."@textlint/module-interop-12.2.1" + sources."@textlint/source-code-fixer-12.2.1" + (sources."@textlint/text-to-ast-12.2.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.2.1" + ]; + }) + sources."@textlint/textlint-plugin-markdown-12.2.1" + sources."@textlint/textlint-plugin-text-12.2.1" + (sources."@textlint/types-12.2.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.2.1" + ]; + }) + sources."@textlint/utils-12.2.1" + sources."@types/mdast-3.0.10" + sources."@types/structured-source-3.0.0" + sources."@types/unist-2.0.6" + sources."ajv-8.11.0" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."argparse-1.0.10" + sources."astral-regex-2.0.0" + sources."bail-1.0.5" + sources."balanced-match-1.0.2" sources."boundary-1.0.1" + sources."brace-expansion-1.1.11" sources."buffer-from-1.1.2" - sources."concat-stream-1.6.2" - sources."core-util-is-1.0.3" + sources."call-bind-1.0.2" + 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.2" + 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."isarray-1.0.0" + 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.9.0" + sources."is-date-object-1.0.5" + sources."is-decimal-1.0.4" + sources."is-file-1.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."is-hexadecimal-1.0.4" + sources."is-plain-obj-2.1.0" + sources."is-regex-1.1.4" + sources."is-utf8-0.2.1" + sources."js-yaml-3.14.1" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-traverse-1.0.0" + sources."json5-2.2.1" + sources."levn-0.4.1" + sources."load-json-file-1.1.0" + sources."locate-path-2.0.0" + 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.6" + sources."mkdirp-0.5.6" + sources."ms-2.1.2" + sources."normalize-package-data-2.5.0" sources."object-assign-4.1.1" - sources."process-nextick-args-2.0.1" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."sentence-splitter-2.3.2" - sources."string_decoder-1.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.1.1" + sources."rc-config-loader-3.0.0" + 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."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.11" + 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."textlint-util-to-string-2.1.1" + sources."supports-color-7.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" + sources."table-6.8.0" + sources."text-table-0.2.0" + (sources."textlint-12.2.1" // { + dependencies = [ + sources."@textlint/ast-node-types-12.2.1" + ]; + }) + sources."textlint-tester-12.2.1" + (sources."textlint-util-to-string-3.1.1" // { + dependencies = [ + sources."unified-8.4.2" + ]; + }) + sources."traverse-0.6.6" + 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."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."xml-escape-1.1.0" + sources."xtend-4.0.2" + sources."zwitch-1.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -128787,10 +129562,10 @@ in textlint-rule-terminology = nodeEnv.buildNodePackage { name = "textlint-rule-terminology"; packageName = "textlint-rule-terminology"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-3.0.1.tgz"; - sha512 = "jk2SGGep+XBckhIm9u6CG7NeMZiosJRPfoh7ISlCZizj/JGNk/zheDYGVXwKbFu20SxsguyUIpTF1z/d1Q+NeQ=="; + url = "https://registry.npmjs.org/textlint-rule-terminology/-/textlint-rule-terminology-3.0.2.tgz"; + sha512 = "PgHg7wkf0gWbihSL+GZF+rG8GJX01azQXIUtWZ4UniDs5GwcwXpb98Dts8jrFQ+c9UeLb1u2HtBgjTmlWkWlQw=="; }; dependencies = [ sources."@types/unist-2.0.6" @@ -128926,7 +129701,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -128965,7 +129740,7 @@ in sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" sources."chownr-2.0.0" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-support-1.1.3" @@ -128978,7 +129753,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.23.2" + sources."core-js-3.24.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -129065,7 +129840,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-slot-1.0.3" - sources."ip-1.1.8" + sources."ip-2.0.0" sources."ipaddr.js-1.9.1" (sources."irc-framework-4.12.1" // { dependencies = [ @@ -129092,7 +129867,7 @@ in sources."json-buffer-3.0.1" sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."ldap-filter-0.3.3" sources."ldapjs-2.3.1" sources."linkify-it-3.0.3" @@ -129115,7 +129890,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.0.0" @@ -129162,7 +129937,7 @@ in sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."resolve-alpn-1.2.1" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -129185,13 +129960,13 @@ in ]; }) sources."socket.io-adapter-2.3.3" - (sources."socket.io-parser-4.0.4" // { + (sources."socket.io-parser-4.0.5" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."socks-2.6.2" + sources."socks-2.7.0" sources."sqlite3-git+https://github.com/mapbox/node-sqlite3.git#918052b538b0effe6c4a44c74a16b2749c08a0d2" sources."statuses-1.5.0" sources."stream-browserify-3.0.0" @@ -129208,7 +129983,7 @@ in sources."text-decoding-1.0.0" sources."tlds-1.228.0" sources."toidentifier-1.0.1" - sources."token-types-4.2.0" + sources."token-types-4.2.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" sources."tslib-2.4.0" @@ -129272,7 +130047,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -129311,7 +130086,7 @@ in sources."cheerio-1.0.0-rc.10" sources."cheerio-select-1.6.0" sources."chownr-2.0.0" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-support-1.1.3" @@ -129324,7 +130099,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.2" sources."cookie-signature-1.0.6" - sources."core-js-3.23.2" + sources."core-js-3.24.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."css-select-4.3.0" @@ -129411,7 +130186,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."internal-slot-1.0.3" - sources."ip-1.1.8" + sources."ip-2.0.0" sources."ipaddr.js-1.9.1" (sources."irc-framework-4.12.1" // { dependencies = [ @@ -129438,7 +130213,7 @@ in sources."json-buffer-3.0.1" sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."ldap-filter-0.3.3" sources."ldapjs-2.3.1" sources."linkify-it-3.0.3" @@ -129461,7 +130236,7 @@ in sources."minimalistic-assert-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.0.0" @@ -129508,7 +130283,7 @@ in sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."resolve-alpn-1.2.1" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -129531,13 +130306,13 @@ in ]; }) sources."socket.io-adapter-2.3.3" - (sources."socket.io-parser-4.0.4" // { + (sources."socket.io-parser-4.0.5" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."socks-2.6.2" + sources."socks-2.7.0" sources."sqlite3-git+https://github.com/mapbox/node-sqlite3.git#918052b538b0effe6c4a44c74a16b2749c08a0d2" sources."statuses-1.5.0" sources."stream-browserify-3.0.0" @@ -129555,7 +130330,7 @@ in sources."thelounge-4.3.1" sources."tlds-1.228.0" sources."toidentifier-1.0.1" - sources."token-types-4.2.0" + sources."token-types-4.2.1" sources."tr46-0.0.3" sources."trim-repeated-1.0.0" sources."tslib-2.4.0" @@ -129673,7 +130448,7 @@ in sources."chalk-2.4.2" sources."cheerio-0.22.0" sources."chownr-1.1.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -129692,7 +130467,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.23.2" + sources."core-js-3.24.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -129711,7 +130486,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" @@ -129906,10 +130681,10 @@ in sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" @@ -130019,7 +130794,7 @@ in sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.19.1" @@ -130285,7 +131060,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -130346,7 +131121,7 @@ in sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.3" sources."chownr-1.1.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -130366,7 +131141,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.23.2" + sources."core-js-3.24.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -130389,7 +131164,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" @@ -130500,7 +131275,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -130602,7 +131377,7 @@ in sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -130624,7 +131399,7 @@ in ]; }) sources."resolve-alpn-1.2.1" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -130720,7 +131495,7 @@ in sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -130752,7 +131527,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -130813,7 +131588,7 @@ in sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.3" sources."chownr-1.1.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -130833,7 +131608,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.23.2" + sources."core-js-3.24.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -130856,7 +131631,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.5.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."ee-first-1.1.1" @@ -130967,7 +131742,7 @@ in }) sources."jwa-2.0.0" sources."jws-4.0.0" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."ldap-filter-0.3.3" sources."ldapjs-2.1.1" sources."linkify-it-3.0.2" @@ -131069,7 +131844,7 @@ in sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" @@ -131091,7 +131866,7 @@ in ]; }) sources."resolve-alpn-1.2.1" - sources."responselike-2.0.0" + sources."responselike-2.0.1" sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -131187,7 +131962,7 @@ in sources."wide-align-1.1.5" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.4" @@ -131602,10 +132377,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.141.0"; + version = "0.143.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.141.0.tgz"; - sha512 = "JaSDAPWuk4RTzG5BYRQm8YZbERUxTfTDVouWgHMisS2to4E5fotMS9F2zPFNOIJyEFTTQDDKPpsgZVThKU3pXA=="; + url = "https://registry.npmjs.org/three/-/three-0.143.0.tgz"; + sha512 = "oKcAGYHhJ46TGEuHjodo2n6TY2R6lbvrkp+feKZxqsUL/WkH7GKKaeu6RHeyb2Xjfk2dPLRKLsOP0KM2VgT8Zg=="; }; buildInputs = globalBuildInputs; meta = { @@ -131620,10 +132395,10 @@ in tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; - version = "5.2.2"; + version = "5.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.2.2.tgz"; - sha512 = "xAY30p06CI6oFvebL/BnPtM9rbYRG14AVbpEfTvCHjpGutYsn6XBOogbhqnAxncmifFK3CaBGfiaqPNGi6rxGQ=="; + url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.2.3.tgz"; + sha512 = "kf09XBI0bswr27pM6WBj/Vek4ATle83HwAtg8rPqJ8cjcC2/xX2SLEamiT8q4AAexjDDlQA05IlcPhhGtF0j6A=="; }; buildInputs = globalBuildInputs; meta = { @@ -131638,24 +132413,20 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "6.0.2"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-6.0.2.tgz"; - sha512 = "fdgt7/4L2nh1tx3aViMmSO/yVBFsfgGBrhW68I67zavOm0QqdGDM3KHwGX/RFEvhvsvwzL/O/6qg5239OH2pPA=="; + url = "https://registry.npmjs.org/titanium/-/titanium-6.1.1.tgz"; + sha512 = "jz1pZ1jDB72H63SaHYUYLbiBBVmaGPIprSKQr2rbuoNPNasp9EerMouqSUiVdnvaKElpnW/sWiMmPs4XINmo0w=="; }; dependencies = [ - sources."@octokit/auth-token-2.5.0" - sources."@octokit/core-3.6.0" - sources."@octokit/endpoint-6.0.12" - sources."@octokit/graphql-4.8.0" - sources."@octokit/openapi-types-12.4.0" - sources."@octokit/plugin-paginate-rest-2.19.0" - sources."@octokit/plugin-request-log-1.0.4" - sources."@octokit/plugin-rest-endpoint-methods-5.15.0" - sources."@octokit/request-5.6.3" - sources."@octokit/request-error-2.1.0" - sources."@octokit/rest-18.12.0" - sources."@octokit/types-6.37.0" + sources."@sindresorhus/is-4.6.0" + sources."@szmarczak/http-timer-4.0.6" + sources."@types/cacheable-request-6.0.2" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/json-buffer-3.0.0" + sources."@types/keyv-3.1.4" + sources."@types/node-18.6.3" + sources."@types/responselike-1.0.0" sources."@xmldom/xmldom-0.8.2" sources."ajv-6.12.6" sources."asn1-0.2.6" @@ -131667,19 +132438,28 @@ in sources."aws4-1.11.0" sources."balanced-match-1.0.2" sources."bcrypt-pbkdf-1.0.2" - sources."before-after-hook-2.2.2" sources."brace-expansion-1.1.11" sources."buffer-crc32-0.2.13" + sources."cacheable-lookup-5.0.4" + sources."cacheable-request-7.0.2" sources."caseless-0.12.0" + sources."clone-response-1.0.3" sources."colors-1.4.0" sources."combined-stream-1.0.8" + sources."compress-brotli-1.3.8" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" sources."cycle-1.0.3" sources."dashdash-1.14.1" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) + sources."defer-to-connect-2.0.1" sources."delayed-stream-1.0.0" - sources."deprecation-2.3.1" sources."ecc-jsbn-0.1.2" + sources."end-of-stream-1.4.4" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."eyes-0.1.8" @@ -131695,46 +132475,58 @@ in sources."form-data-2.3.3" sources."fs-extra-9.1.0" sources."fs.realpath-1.0.0" + sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.2.3" + sources."got-11.8.5" 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-signature-1.2.0" + sources."http2-wrapper-1.0.3" sources."humanize-0.0.9" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-plain-object-5.0.0" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" + sources."json-buffer-3.0.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."jsprim-1.4.2" sources."keypress-0.2.1" + sources."keyv-4.3.3" + sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mime-db-1.52.0" sources."mime-types-2.1.35" + sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-0.5.6" sources."node-appc-1.1.5" - sources."node-fetch-2.6.7" + sources."normalize-url-6.1.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" + sources."p-cancelable-2.1.1" sources."path-is-absolute-1.0.1" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."psl-1.8.0" + sources."psl-1.9.0" + sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.3" + sources."quick-lru-5.1.1" (sources."request-2.88.2" // { dependencies = [ sources."uuid-3.4.0" ]; }) + sources."resolve-alpn-1.2.1" + sources."responselike-2.0.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -131743,20 +132535,20 @@ in sources."sshpk-1.17.0" sources."stack-trace-0.0.10" sources."temp-0.9.4" + (sources."tmp-0.2.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."tough-cookie-2.5.0" - sources."tr46-0.0.3" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."universal-user-agent-6.0.0" sources."universalify-2.0.0" sources."uri-js-4.4.1" sources."uuid-8.3.2" sources."verror-1.10.0" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - (sources."winston-2.4.5" // { + (sources."winston-2.4.6" // { dependencies = [ - sources."async-1.0.0" sources."colors-1.0.3" ]; }) @@ -131852,7 +132644,7 @@ in sources."minimatch-3.1.2" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" @@ -132028,21 +132820,21 @@ in ts-node = nodeEnv.buildNodePackage { name = "ts-node"; packageName = "ts-node"; - version = "10.8.1"; + version = "10.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-10.8.1.tgz"; - sha512 = "Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz"; + sha512 = "NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw=="; }; dependencies = [ sources."@cspotcode/source-map-support-0.8.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/sourcemap-codec-1.4.13" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/sourcemap-codec-1.4.14" sources."@jridgewell/trace-mapping-0.3.9" 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."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-walk-8.2.0" sources."arg-4.1.3" sources."create-require-1.1.1" @@ -132103,10 +132895,10 @@ in typescript-language-server = nodeEnv.buildNodePackage { name = "typescript-language-server"; packageName = "typescript-language-server"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.11.1.tgz"; - sha512 = "kcF4pbTHzYJWPj1RBRKZ1lrqjDGoy2sMevdNy+AakDur57JvTv8rlnN549rUJCoRR5th4LFhJ6zAo3zLFR1gNw=="; + url = "https://registry.npmjs.org/typescript-language-server/-/typescript-language-server-0.11.2.tgz"; + sha512 = "wEk2c2YkJenTb5ArWfSacgBiVKY2MBQUlayUyCX1QmBijuqh3PrNbIbrb6N3H8JLJVzgM9AL6Qjw+q6jDFzK0A=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -132118,7 +132910,7 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."clean-stack-2.2.0" - sources."commander-9.3.0" + sources."commander-9.4.0" sources."concat-map-0.0.1" sources."crypto-random-string-2.0.0" sources."del-6.1.1" @@ -132195,10 +132987,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.16.1"; + version = "3.16.3"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.1.tgz"; - sha512 = "X5BGTIDH8U6IQ1TIRP62YC36k+ULAa1d59BxlWvPUJ1NkW5L3FwcGfEzuVvGmhJFBu0YJ5Ge25tmRISqCmLiRQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.3.tgz"; + sha512 = "uVbFqx9vvLhQg0iBaau9Z75AxWJ8tqM9AV890dIZCLApF4rTcyHwmAvLeEdYRs+BzYWu8Iw81F79ah0EfTXbaw=="; }; buildInputs = globalBuildInputs; meta = { @@ -132231,17 +133023,19 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.20"; + version = "1.5.21"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.20.tgz"; - sha512 = "GB1sY6RhmBLh9pJY7kEJnX3y995xSaLeWcZwxYT6YJmmdlBmjC7TA5ilbrxxoZk8IpdO+lDuWEz3ANVwhc8zFQ=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.21.tgz"; + sha512 = "iwAchGIaKfHJmRnMIz45e/H5UjKDDeiHFmlIO2TIsXNkGRO0gLPjLEGbU6P4j9ukUL+WUdWut3Sw9VJmkQjjyA=="; }; dependencies = [ sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - sources."@primer/octicons-17.0.0" - sources."@sindresorhus/is-4.6.0" - sources."@szmarczak/http-timer-4.0.6" + sources."@pnpm/network.ca-file-1.0.1" + sources."@pnpm/npm-conf-1.0.5" + sources."@primer/octicons-17.3.0" + sources."@sindresorhus/is-5.3.0" + sources."@szmarczak/http-timer-5.0.1" sources."@types/cacheable-request-6.0.2" sources."@types/component-emitter-1.2.11" sources."@types/cookie-0.4.1" @@ -132249,7 +133043,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-16.11.41" + sources."@types/node-16.11.47" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."accepts-1.3.8" @@ -132266,15 +133060,21 @@ in sources."balanced-match-1.0.2" sources."base64id-2.0.0" sources."blueimp-md5-2.19.0" - sources."body-parser-1.19.2" + sources."body-parser-1.20.0" sources."bootstrap-3.4.1" sources."brace-expansion-1.1.11" sources."bytes-3.1.2" - sources."cacheable-lookup-5.0.4" - sources."cacheable-request-7.0.2" + sources."cacheable-lookup-6.0.4" + (sources."cacheable-request-7.0.2" // { + dependencies = [ + sources."get-stream-5.2.0" + sources."lowercase-keys-2.0.0" + ]; + }) + sources."call-bind-1.0.2" sources."cliui-7.0.4" sources."clone-2.1.2" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -132283,6 +133083,7 @@ in sources."component-emitter-1.3.0" sources."compress-brotli-1.3.8" sources."concat-map-0.0.1" + sources."config-chain-1.1.13" sources."content-disposition-0.5.4" sources."content-type-1.0.4" (sources."convert-source-map-1.8.0" // { @@ -132305,17 +133106,17 @@ in sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" - sources."depd-1.1.2" - sources."destroy-1.0.4" - sources."diff-5.0.0" - sources."diff2html-3.4.17" + sources."depd-2.0.0" + sources."destroy-1.2.0" + sources."diff-5.1.0" + sources."diff2html-3.4.18" sources."dnd-page-scroll-0.0.4" sources."ee-first-1.1.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-6.1.3" // { + (sources."engine.io-6.2.0" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -132327,28 +133128,33 @@ in sources."escape-html-1.0.3" sources."etag-1.8.1" sources."eve-0.5.4" - (sources."express-4.17.3" // { + (sources."express-4.18.1" // { dependencies = [ - sources."cookie-0.4.2" + sources."cookie-0.5.0" ]; }) (sources."express-session-1.17.3" // { dependencies = [ sources."cookie-0.4.2" - sources."depd-2.0.0" ]; }) sources."fecha-4.2.3" - sources."finalhandler-1.1.2" + sources."finalhandler-1.2.0" sources."fn.name-1.1.0" + sources."form-data-encoder-2.0.1" sources."forwarded-0.2.0" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" - sources."get-stream-5.2.0" + sources."get-intrinsic-1.1.2" + sources."get-stream-6.0.1" sources."getmac-5.20.0" sources."glob-7.2.3" - sources."got-11.8.5" + sources."got-12.3.0" + sources."graceful-fs-4.2.10" + sources."has-1.0.3" + sources."has-symbols-1.0.3" sources."hasher-1.2.0" (sources."hogan.js-3.0.2" // { dependencies = [ @@ -132356,8 +133162,8 @@ in ]; }) sources."http-cache-semantics-4.1.0" - sources."http-errors-1.8.1" - sources."http2-wrapper-1.0.3" + sources."http-errors-2.0.0" + sources."http2-wrapper-2.1.11" sources."iconv-lite-0.4.24" sources."ignore-5.2.0" sources."inflight-1.0.6" @@ -132372,20 +133178,20 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."jquery-3.6.0" - sources."jquery-ui-1.13.1" + sources."jquery-ui-1.13.2" sources."json-buffer-3.0.1" sources."just-detect-adblock-1.1.0" - sources."keyv-4.3.1" + sources."keyv-4.3.3" sources."knockout-3.5.1" sources."kuler-2.0.0" - sources."latest-version-6.0.0" + sources."latest-version-7.0.0" sources."lodash-4.17.21" - (sources."logform-2.4.1" // { + (sources."logform-2.4.2" // { dependencies = [ sources."ms-2.1.3" ]; }) - sources."lowercase-keys-2.0.0" + sources."lowercase-keys-3.0.0" sources."lru-cache-4.1.5" sources."media-typer-0.3.0" (sources."memorystore-1.6.7" // { @@ -132403,7 +133209,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-1.0.4" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."ms-2.0.0" sources."negotiator-0.6.3" sources."node-cache-5.1.2" @@ -132412,43 +133218,49 @@ in sources."normalize-url-6.1.0" sources."nprogress-0.2.0" sources."object-assign-4.1.1" - sources."on-finished-2.3.0" + sources."object-inspect-1.12.2" + sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" sources."open-8.4.0" - sources."p-cancelable-2.1.1" + sources."p-cancelable-3.0.0" sources."p-limit-4.0.0" - sources."package-json-7.0.0" + sources."package-json-8.1.0" sources."parse-json-2.2.0" sources."parseurl-1.3.3" - sources."passport-0.5.3" + sources."passport-0.6.0" sources."passport-local-1.0.0" sources."passport-strategy-1.0.0" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" sources."pause-0.0.1" sources."process-nextick-args-2.0.1" + sources."proto-list-1.2.4" sources."proxy-addr-2.0.7" sources."pseudomap-1.0.2" sources."pump-3.0.0" - sources."qs-6.9.7" + sources."qs-6.10.3" sources."quick-lru-5.1.1" sources."random-bytes-1.0.0" sources."range-parser-1.2.1" sources."raven-js-3.27.2" - sources."raw-body-2.4.3" + sources."raw-body-2.5.1" sources."rc-1.2.8" (sources."readable-stream-2.3.7" // { dependencies = [ sources."safe-buffer-5.1.2" ]; }) - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" + sources."registry-auth-token-5.0.1" + sources."registry-url-6.0.1" sources."require-directory-2.1.1" sources."resolve-alpn-1.2.1" - sources."responselike-2.0.0" + (sources."responselike-2.0.1" // { + dependencies = [ + sources."lowercase-keys-2.0.0" + ]; + }) sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" sources."safe-stable-stringify-2.3.1" @@ -132459,13 +133271,14 @@ in sources."yallist-4.0.0" ]; }) - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" ]; }) - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" sources."setprototypeof-1.2.0" + sources."side-channel-1.0.4" sources."signals-1.0.0" (sources."simple-swizzle-0.2.2" // { dependencies = [ @@ -132473,21 +133286,21 @@ in ]; }) sources."snapsvg-0.5.1" - (sources."socket.io-4.4.1" // { + (sources."socket.io-4.5.1" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."socket.io-adapter-2.3.3" - (sources."socket.io-parser-4.0.4" // { + sources."socket.io-adapter-2.4.0" + (sources."socket.io-parser-4.0.5" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."stack-trace-0.0.10" - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."string-width-4.2.3" (sources."string_decoder-1.1.1" // { dependencies = [ @@ -132520,7 +133333,7 @@ in sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."vary-1.1.2" - (sources."winston-3.6.0" // { + (sources."winston-3.8.1" // { dependencies = [ sources."readable-stream-3.6.0" ]; @@ -132536,8 +133349,8 @@ in sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-2.1.2" - sources."yargs-17.3.1" - sources."yargs-parser-21.0.1" + sources."yargs-17.5.1" + sources."yargs-parser-21.1.0" sources."yocto-queue-1.0.0" ]; buildInputs = globalBuildInputs; @@ -132553,23 +133366,23 @@ in unified-language-server = nodeEnv.buildNodePackage { name = "unified-language-server"; packageName = "unified-language-server"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-language-server/-/unified-language-server-3.0.0.tgz"; - sha512 = "FT0nnxQ5WHXKO0kDK8xtOStGatzO6sw1sAiM3P3HuI6UXFoqcuq78iTNM+0NQ3s7mfDIPUd2zHyOsBEloIhA6w=="; + url = "https://registry.npmjs.org/unified-language-server/-/unified-language-server-3.1.0.tgz"; + sha512 = "5+qWt66my+GdFZLK7Hgv3jpzzlQRsH3LgPlFL8BaApBq3KXSoNShVrPDtE2m8oyDKIfTKJZQ6Ai4Od25B7qQfw=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" - sources."@npmcli/config-4.1.0" - sources."@npmcli/map-workspaces-2.0.3" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" + sources."@npmcli/config-4.2.0" + sources."@npmcli/map-workspaces-2.0.4" sources."@npmcli/name-from-folder-1.0.1" 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-17.0.45" + sources."@types/node-18.6.3" sources."@types/supports-color-8.1.1" sources."@types/unist-2.0.6" sources."abbrev-1.1.1" @@ -132634,8 +133447,8 @@ in sources."to-vfile-7.2.3" sources."trough-2.1.0" sources."typedarray-0.0.6" - sources."unified-engine-10.0.0" - sources."unist-util-inspect-7.0.0" + sources."unified-engine-10.0.1" + sources."unist-util-inspect-7.0.1" sources."unist-util-stringify-position-3.0.2" sources."util-deprecate-1.0.2" sources."vfile-5.3.4" @@ -132647,11 +133460,11 @@ in }) sources."vfile-sort-3.0.0" sources."vfile-statistics-2.0.0" - sources."vscode-jsonrpc-8.0.1" - sources."vscode-languageserver-8.0.1" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."walk-up-path-1.0.0" sources."wrappy-1.0.2" sources."yallist-4.0.0" @@ -132687,7 +133500,7 @@ in sources."are-we-there-yet-2.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."canvas-2.9.1" + sources."canvas-2.9.3" sources."chownr-2.0.0" sources."cliui-7.0.4" sources."color-convert-2.0.1" @@ -132696,7 +133509,7 @@ in sources."commander-7.2.0" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."d3-array-3.1.6" + sources."d3-array-3.2.0" sources."d3-color-3.1.0" sources."d3-delaunay-6.0.2" sources."d3-dispatch-3.0.1" @@ -132741,7 +133554,7 @@ in }) sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" @@ -132817,7 +133630,7 @@ in sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -132832,10 +133645,10 @@ in vega-lite = nodeEnv.buildNodePackage { name = "vega-lite"; packageName = "vega-lite"; - version = "5.2.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.2.0.tgz"; - sha512 = "Yxcg8MvYfxHcG6BbkaKT0oVCIMIcE19UvqIsEwBmyd/7h2nzW7oRnID81T8UrY7hpDrIr6wa2JADOT2dhGNErw=="; + url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.4.0.tgz"; + sha512 = "e/P5iOtBE62WEWZhKP7sLcBd92YS9prfUQafelxoOeloooSSrkUwM/ZDmN5Q5ffByEZTiKfODtnwD6/xKDYUmw=="; }; dependencies = [ sources."@types/clone-2.1.1" @@ -132857,14 +133670,14 @@ in sources."require-directory-2.1.1" sources."string-width-4.2.3" sources."strip-ansi-6.0.1" - sources."tslib-2.3.1" + sources."tslib-2.4.0" sources."vega-event-selector-3.0.0" sources."vega-expression-5.0.0" sources."vega-util-1.17.0" sources."wrap-ansi-7.0.0" sources."y18n-5.0.8" - sources."yargs-17.2.1" - sources."yargs-parser-20.2.9" + sources."yargs-17.5.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -132879,287 +133692,223 @@ in vercel = nodeEnv.buildNodePackage { name = "vercel"; packageName = "vercel"; - version = "25.1.0"; + version = "27.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/vercel/-/vercel-25.1.0.tgz"; - sha512 = "uB/x9Gqljw1s2C5Kn/DCNCypbbaDYvPMuVqb0z73NqXNTDl220Q+F24DnKXp9bWmizbmDhRaEmlTRnxPI4pbBg=="; + url = "https://registry.npmjs.org/vercel/-/vercel-27.3.4.tgz"; + sha512 = "msxVZvE65RrlzKRqTVbTnb7QqielyVaPkZdLxAMkpnGsswZogp43XMj2OOIASQpak3unqxTh1uicUMtPqnZ9KQ=="; }; dependencies = [ - sources."@babel/runtime-7.18.3" + sources."@edge-runtime/format-1.1.0-beta.25" + sources."@edge-runtime/primitives-1.1.0-beta.25" + sources."@edge-runtime/vm-1.1.0-beta.23" (sources."@mapbox/node-pre-gyp-1.0.9" // { dependencies = [ sources."semver-7.3.7" ]; }) - sources."@remix-run/node-1.4.3" - (sources."@remix-run/server-runtime-1.4.3" // { - dependencies = [ - sources."source-map-0.7.4" - ]; - }) - sources."@remix-run/vercel-1.4.3" + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/busboy-0.3.2" - sources."@types/cookie-0.4.1" - sources."@types/node-18.0.0" - (sources."@types/node-fetch-2.6.2" // { + sources."@ts-morph/common-0.11.1" + sources."@types/json-schema-7.0.11" + sources."@types/node-18.6.3" + sources."@vercel/build-utils-5.0.8" + sources."@vercel/go-2.0.12" + sources."@vercel/hydrogen-0.0.9" + sources."@vercel/next-3.1.12" + sources."@vercel/nft-0.21.0" + sources."@vercel/node-2.5.3" + sources."@vercel/node-bridge-3.0.0" + sources."@vercel/python-3.1.4" + sources."@vercel/redwood-1.0.13" + sources."@vercel/remix-1.0.14" + (sources."@vercel/routing-utils-2.0.0" // { dependencies = [ - sources."form-data-3.0.1" + sources."ajv-6.12.6" + sources."json-schema-traverse-0.4.1" ]; }) - sources."@vercel/build-utils-4.1.0" - sources."@vercel/go-2.0.1" - sources."@vercel/next-3.0.1" - sources."@vercel/nft-0.19.1" - sources."@vercel/node-2.1.0" - sources."@vercel/node-bridge-3.0.0" - sources."@vercel/python-3.0.1" - sources."@vercel/redwood-1.0.1" - sources."@vercel/remix-1.0.1" - sources."@vercel/routing-utils-1.13.4" - sources."@vercel/ruby-1.3.9" - sources."@vercel/static-build-1.0.1" - sources."@web-std/blob-3.0.4" - sources."@web-std/file-3.0.2" - sources."@web-std/stream-1.0.0" - sources."@zxing/text-encoding-0.9.0" + sources."@vercel/ruby-1.3.20" + sources."@vercel/static-build-1.0.13" + sources."@vercel/static-config-2.0.1" sources."abbrev-1.1.1" - sources."abort-controller-3.0.0" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."agent-base-6.0.2" - sources."ajv-6.12.6" + sources."ajv-8.6.3" sources."ansi-align-3.0.1" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."aproba-2.0.0" sources."are-we-there-yet-2.0.0" sources."arg-4.1.3" - sources."asynckit-0.4.0" - sources."available-typed-arrays-1.0.5" + sources."async-sema-3.1.1" sources."balanced-match-1.0.2" sources."bindings-1.5.0" - sources."blob-0.0.4" - sources."blob-stream-0.1.3" sources."boxen-5.1.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."buffer-from-1.1.2" - sources."busboy-0.3.1" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) - sources."call-bind-1.0.2" sources."camelcase-6.3.0" sources."chalk-4.1.2" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" - sources."clone-response-1.0.2" - sources."code-point-at-1.1.0" + sources."clone-response-1.0.3" + sources."code-block-writer-10.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."color-support-1.1.3" - sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" - sources."cookie-0.4.2" - sources."cookie-signature-1.2.0" - sources."core-util-is-1.0.3" + sources."convert-hrtime-3.0.0" sources."crypto-random-string-2.0.0" sources."debug-4.3.4" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."define-properties-1.1.4" - sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."detect-libc-2.0.1" - sources."dicer-0.3.0" sources."diff-4.0.2" sources."dot-prop-5.3.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" + sources."edge-runtime-1.1.0-beta.23" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."es-abstract-1.20.1" - sources."es-to-primitive-1.2.1" + sources."esbuild-0.14.47" + sources."esbuild-android-64-0.14.47" + sources."esbuild-android-arm64-0.14.47" + sources."esbuild-darwin-64-0.14.47" + sources."esbuild-darwin-arm64-0.14.47" + sources."esbuild-freebsd-64-0.14.47" + sources."esbuild-freebsd-arm64-0.14.47" + sources."esbuild-linux-32-0.14.47" + sources."esbuild-linux-64-0.14.47" + sources."esbuild-linux-arm-0.14.47" + sources."esbuild-linux-arm64-0.14.47" + sources."esbuild-linux-mips64le-0.14.47" + sources."esbuild-linux-ppc64le-0.14.47" + sources."esbuild-linux-riscv64-0.14.47" + sources."esbuild-linux-s390x-0.14.47" + sources."esbuild-netbsd-64-0.14.47" + sources."esbuild-openbsd-64-0.14.47" + sources."esbuild-sunos-64-0.14.47" + sources."esbuild-windows-32-0.14.47" + sources."esbuild-windows-64-0.14.47" + sources."esbuild-windows-arm64-0.14.47" sources."escape-goat-2.1.1" sources."estree-walker-2.0.2" - sources."event-target-shim-5.0.1" + sources."exit-hook-2.2.1" sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.13.0" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."for-each-0.3.3" - sources."form-data-4.0.0" sources."fs-minipass-2.1.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."get-intrinsic-1.1.2" sources."get-stream-4.1.0" - sources."get-symbol-description-1.0.0" sources."glob-7.2.3" - (sources."global-dirs-3.0.0" // { - dependencies = [ - sources."ini-2.0.0" - ]; - }) + sources."glob-parent-5.1.2" + sources."global-dirs-3.0.0" sources."got-9.6.0" sources."graceful-fs-4.2.10" - sources."has-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."has-unicode-2.0.1" sources."has-yarn-2.1.0" - sources."history-5.3.0" sources."http-cache-semantics-4.1.0" + sources."http-status-1.5.2" sources."https-proxy-agent-5.0.1" - sources."iconv-lite-0.4.24" - sources."ignore-walk-3.0.4" sources."import-lazy-2.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.3" - sources."is-arguments-1.1.1" - sources."is-bigint-1.0.4" - sources."is-boolean-object-1.1.2" - sources."is-callable-1.2.4" + sources."ini-2.0.0" sources."is-ci-2.0.0" - sources."is-date-object-1.0.5" + 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-installed-globally-0.4.0" - sources."is-negative-zero-2.0.2" sources."is-npm-5.0.0" sources."is-number-7.0.0" - sources."is-number-object-1.0.7" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" - 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.9" sources."is-typedarray-1.0.0" - sources."is-weakref-1.0.2" sources."is-yarn-global-0.3.0" - sources."isarray-1.0.0" - sources."jsesc-3.0.2" sources."json-buffer-3.0.0" - sources."json-schema-traverse-0.4.1" + sources."json-schema-to-ts-1.6.4" + sources."json-schema-traverse-1.0.0" sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" sources."make-dir-3.1.0" sources."make-error-1.3.6" + sources."merge2-1.4.1" sources."micromatch-4.0.5" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" sources."mimic-response-1.0.1" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" + sources."mri-1.2.0" sources."ms-2.1.2" - (sources."needle-2.9.1" // { - dependencies = [ - sources."debug-3.2.7" - ]; - }) sources."node-fetch-2.6.7" - sources."node-gyp-build-4.4.0" - (sources."node-pre-gyp-0.13.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" - sources."chownr-1.1.4" - sources."detect-libc-1.0.3" - sources."fs-minipass-1.2.7" - sources."gauge-2.7.4" - sources."is-fullwidth-code-point-1.0.0" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" - sources."mkdirp-0.5.6" - sources."nopt-4.0.3" - sources."npmlog-4.1.2" - sources."readable-stream-2.3.7" - sources."rimraf-2.7.1" - sources."safe-buffer-5.1.2" - sources."semver-5.7.1" - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - (sources."tar-4.4.19" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."yallist-3.1.1" - ]; - }) + sources."node-gyp-build-4.5.0" sources."nopt-5.0.0" sources."normalize-url-4.5.1" - sources."npm-bundled-1.1.2" - sources."npm-normalize-package-bin-1.0.1" - sources."npm-packlist-1.4.8" sources."npmlog-5.0.1" - sources."number-is-nan-1.0.1" sources."object-assign-4.1.1" - sources."object-inspect-1.12.2" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { dependencies = [ sources."semver-6.3.0" ]; }) + sources."parse-ms-2.1.0" + sources."path-browserify-1.0.1" sources."path-is-absolute-1.0.1" sources."path-to-regexp-6.1.0" + sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."prepend-http-2.0.0" - sources."process-nextick-args-2.0.1" + sources."pretty-bytes-5.6.0" + sources."pretty-ms-7.0.1" sources."pump-3.0.0" sources."punycode-2.1.1" sources."pupa-2.1.1" - sources."rc-1.2.8" - sources."react-router-6.3.0" - sources."react-router-dom-6.3.0" + sources."queue-microtask-1.2.3" + (sources."rc-1.2.8" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) sources."readable-stream-3.6.0" - sources."regenerator-runtime-0.13.9" - sources."regexp.prototype.flags-1.4.3" sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" + sources."require-from-string-2.0.2" sources."resolve-from-5.0.0" sources."responselike-1.0.2" + sources."reusify-1.0.4" sources."rimraf-3.0.2" (sources."rollup-pluginutils-2.8.2" // { dependencies = [ sources."estree-walker-0.6.1" ]; }) + sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."sax-1.2.4" sources."semver-6.1.1" (sources."semver-diff-3.1.1" // { dependencies = [ @@ -133167,28 +133916,25 @@ in ]; }) sources."set-blocking-2.0.0" - sources."set-cookie-parser-2.5.0" - sources."side-channel-1.0.4" sources."signal-exit-3.0.7" sources."source-map-0.6.1" sources."source-map-support-0.5.21" - sources."streamsearch-0.1.2" sources."string-width-4.2.3" - sources."string.prototype.trimend-1.0.5" - sources."string.prototype.trimstart-1.0.5" sources."string_decoder-1.3.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."tar-6.1.11" + sources."time-span-4.0.0" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tr46-0.0.3" + sources."ts-morph-12.0.0" sources."ts-node-8.9.1" + sources."ts-toolbelt-6.15.5" sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" sources."typescript-4.3.4" - sources."unbox-primitive-1.0.2" sources."unique-string-2.0.0" (sources."update-notifier-5.1.0" // { dependencies = [ @@ -133197,14 +133943,9 @@ in }) sources."uri-js-4.4.1" sources."url-parse-lax-3.0.0" - sources."util-0.12.4" sources."util-deprecate-1.0.2" - sources."web-encoding-1.1.5" - sources."web-streams-polyfill-3.2.1" sources."webidl-conversions-3.0.1" sources."whatwg-url-5.0.0" - sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.8" sources."wide-align-1.1.5" sources."widest-line-3.1.0" sources."wrap-ansi-7.0.0" @@ -133245,15 +133986,15 @@ in vls = nodeEnv.buildNodePackage { name = "vls"; packageName = "vls"; - version = "0.7.6"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.7.6.tgz"; - sha512 = "UaE5peKpeT0dsTg4KAbxRVKLotD4i0DW3wb/srcJgNJmpBmTv2HAkE3hMR/naf1bMmUTpQyQPUaZOJE5ihBqlA=="; + url = "https://registry.npmjs.org/vls/-/vls-0.8.1.tgz"; + sha512 = "Oja3mdxnFxrnSWu3igDyq/vuaeLPd1tU+ZSgVNYvnXcAHwjw2El4iUxhSwJqf6synDl0P8cX41xbiutb0OUoHg=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."chalk-2.4.2" sources."escape-string-regexp-1.0.5" @@ -133333,14 +134074,14 @@ in sources."fast-levenshtein-2.0.6" sources."file-entry-cache-6.0.1" sources."flat-cache-3.0.4" - sources."flatted-3.2.5" + sources."flatted-3.2.6" 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.2" sources."glob-7.2.3" sources."glob-parent-5.1.2" - sources."globals-13.15.0" + sources."globals-13.17.0" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.3" @@ -133458,11 +134199,11 @@ in }; dependencies = [ sources."vscode-css-languageservice-3.0.13" - sources."vscode-jsonrpc-8.0.1" + sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-4.1.2" sources."vscode-uri-1.0.8" ]; @@ -133496,11 +134237,11 @@ in sources."vscode-nls-4.1.2" ]; }) - sources."vscode-jsonrpc-8.0.1" + sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-4.4.2" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-protocol-foldingprovider-2.0.1" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-3.2.5" sources."vscode-uri-1.0.8" ]; @@ -133529,7 +134270,7 @@ in sources."es6-promisify-5.0.0" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" - sources."jsonc-parser-3.0.0" + sources."jsonc-parser-3.1.0" sources."ms-2.0.0" sources."request-light-0.4.0" (sources."vscode-json-languageservice-4.2.1" // { @@ -133545,7 +134286,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-4.1.2" sources."vscode-uri-3.0.3" ]; @@ -133582,7 +134323,7 @@ in }) (sources."vscode-json-languageservice-3.11.0" // { dependencies = [ - sources."jsonc-parser-3.0.0" + sources."jsonc-parser-3.1.0" sources."vscode-nls-5.0.1" sources."vscode-uri-2.1.2" ]; @@ -133612,31 +134353,33 @@ in vscode-langservers-extracted = nodeEnv.buildNodePackage { name = "vscode-langservers-extracted"; packageName = "vscode-langservers-extracted"; - version = "4.2.1"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.2.1.tgz"; - sha512 = "Un7gzQgvACjGtsT0Yll5QqHgL65a4mTK5ChgMnO4dgTZ3tuwJCaP84oztBqvuFZzN9QxA3C07J4QEQvf1xjcgQ=="; + url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.4.0.tgz"; + sha512 = "sWXDFmAvXMUhF5E+6v4e77SwhVPSvdLxGGfkOz15LmAsfKoamKMnW7aARnu6mRWOzqz3hKJqVZN4hnCpdvtLKg=="; }; dependencies = [ - sources."core-js-3.23.2" - sources."jsonc-parser-3.0.0" + sources."core-js-3.24.1" + sources."jsonc-parser-3.1.0" + sources."picomatch-2.3.1" sources."regenerator-runtime-0.13.9" sources."request-light-0.5.8" sources."typescript-4.7.4" - sources."vscode-css-languageservice-5.4.2" - sources."vscode-html-languageservice-4.2.5" - sources."vscode-json-languageservice-4.2.1" - sources."vscode-jsonrpc-8.0.1" - sources."vscode-languageserver-8.0.1" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-css-languageservice-6.0.1" + sources."vscode-html-languageservice-5.0.1" + sources."vscode-json-languageservice-5.1.0" + sources."vscode-jsonrpc-8.0.2" + sources."vscode-languageserver-8.0.2" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" + sources."vscode-markdown-languageservice-0.0.0-alpha.13" sources."vscode-nls-5.0.1" sources."vscode-uri-3.0.3" ]; buildInputs = globalBuildInputs; meta = { - description = "HTML/CSS/JSON language servers extracted from [vscode](https://github.com/Microsoft/vscode)."; + description = "HTML/CSS/JSON/ESLint language servers extracted from [vscode](https://github.com/Microsoft/vscode)."; homepage = "https://github.com/hrsh7th/vscode-langservers-extracted#readme"; license = "MIT"; }; @@ -133651,19 +134394,19 @@ in src = ../../applications/editors/vscode/extensions/vscode-lldb/build-deps; dependencies = [ sources."@discoveryjs/json-ext-0.5.7" - sources."@jridgewell/gen-mapping-0.3.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" + sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" - sources."@types/eslint-8.4.3" - sources."@types/eslint-scope-3.7.3" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" + sources."@types/eslint-8.4.5" + sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" sources."@types/mocha-7.0.2" sources."@types/node-8.10.66" - sources."@types/vscode-1.68.0" + sources."@types/vscode-1.69.0" sources."@types/yauzl-2.10.0" sources."@ungap/promise-all-settled-1.1.2" sources."@webassemblyjs/ast-1.11.1" @@ -133686,7 +134429,7 @@ in sources."@webpack-cli/serve-1.7.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" @@ -133703,18 +134446,18 @@ in sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-stdout-1.3.1" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."camelcase-6.3.0" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" ]; }) - sources."cheerio-1.0.0-rc.11" + sources."cheerio-1.0.0-rc.12" sources."cheerio-select-2.1.0" sources."chokidar-3.5.1" sources."chrome-trace-event-1.0.3" @@ -133748,11 +134491,11 @@ in sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domutils-3.0.1" - sources."electron-to-chromium-1.4.164" + sources."electron-to-chromium-1.4.211" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" - sources."enhanced-resolve-5.9.3" - sources."entities-4.3.0" + sources."enhanced-resolve-5.10.0" + sources."entities-4.3.1" sources."envinfo-7.8.1" sources."errno-0.1.8" sources."es-module-lexer-0.9.3" @@ -133768,7 +134511,7 @@ in sources."events-3.3.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" - sources."fastest-levenshtein-1.0.12" + sources."fastest-levenshtein-1.0.16" sources."fd-slicer-1.1.0" sources."fill-range-7.0.1" sources."find-up-5.0.0" @@ -133844,7 +134587,7 @@ in sources."mute-stream-0.0.8" sources."nanoid-3.1.20" sources."neo-async-2.6.2" - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-path-3.0.0" sources."nth-check-2.1.1" sources."object-inspect-1.12.2" @@ -133876,7 +134619,7 @@ in sources."process-nextick-args-2.0.1" sources."prr-1.0.1" sources."punycode-2.1.1" - sources."qs-6.10.5" + sources."qs-6.11.0" sources."randombytes-2.1.0" sources."read-1.0.7" sources."readable-stream-1.0.34" @@ -133905,7 +134648,7 @@ in sources."supports-color-8.1.1" sources."supports-preserve-symlinks-flag-1.0.0" sources."tapable-2.2.1" - (sources."terser-5.14.1" // { + (sources."terser-5.14.2" // { dependencies = [ sources."commander-2.20.3" ]; @@ -133924,12 +134667,12 @@ in sources."tapable-1.1.3" ]; }) - sources."tslib-2.4.0" sources."tunnel-0.0.6" sources."typed-rest-client-1.8.9" sources."typescript-4.7.4" sources."uc.micro-1.0.6" sources."underscore-1.13.4" + sources."update-browserslist-db-1.0.5" sources."uri-js-4.4.1" sources."url-join-1.1.0" sources."util-deprecate-1.0.2" @@ -133947,7 +134690,7 @@ in sources."vscode-debugadapter-testsupport-1.51.0" sources."vscode-debugprotocol-1.51.0" sources."watchpack-2.4.0" - sources."webpack-5.73.0" + sources."webpack-5.74.0" (sources."webpack-cli-4.10.0" // { dependencies = [ sources."commander-7.2.0" @@ -134068,7 +134811,7 @@ in sources."delayed-stream-1.0.0" sources."download-5.0.3" sources."download-git-repo-1.1.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.4" sources."escape-string-regexp-1.0.5" @@ -134179,7 +134922,7 @@ in sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."read-metadata-1.0.0" @@ -134236,7 +134979,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.16.1" + sources."uglify-js-3.16.3" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unzip-response-2.0.1" @@ -134280,9 +135023,9 @@ in sha512 = "/dd2bJLxOmX8Ie0EPTlmU+F8cxAekn/1m8K9OAFoijm4fc8SdHznFUUEKuz2RMMhsaL5+rccj8xLFAJELYNbaA=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/highlight-7.17.12" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" sources."@emmetio/extract-abbreviation-0.1.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -134298,7 +135041,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.0.0" + sources."@types/node-18.6.3" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -134426,7 +135169,7 @@ in sources."cli-width-2.2.1" sources."cliui-4.1.0" sources."clone-1.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."co-4.6.0" sources."code-point-at-1.1.0" sources."collapse-white-space-1.0.6" @@ -134478,7 +135221,7 @@ in sources."dlv-1.1.3" sources."doctrine-3.0.0" sources."dot-prop-4.2.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."editorconfig-0.15.3" sources."element-helper-json-2.0.6" sources."emoji-regex-8.0.0" @@ -135160,11 +135903,11 @@ in ]; }) sources."vscode-emmet-helper-1.2.17" - sources."vscode-jsonrpc-8.0.1" + sources."vscode-jsonrpc-8.0.2" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.17.1" + sources."vscode-languageserver-protocol-3.17.2" sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-5.0.1" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" @@ -135224,13 +135967,13 @@ in sha512 = "slGcIXCA/j5d2uzQ7flA4/veF0P0eE+Om/Bw7uEO2LC9a3mVNdB+2bSR1CILMjvgyFy9Q9D6eseomQgp7UW5Dg=="; }; dependencies = [ - sources."@babel/runtime-corejs3-7.18.3" + sources."@babel/runtime-corejs3-7.18.9" sources."@mapbox/node-pre-gyp-1.0.9" 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.7.1" + sources."acorn-8.8.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -135249,7 +135992,7 @@ in sources."brace-expansion-1.1.11" sources."browser-process-hrtime-1.0.0" sources."btoa-1.2.1" - sources."canvas-2.9.1" + sources."canvas-2.9.3" sources."canvg-3.0.7" sources."chownr-2.0.0" sources."cliui-7.0.4" @@ -135259,7 +136002,7 @@ in sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" - sources."core-js-pure-3.23.2" + sources."core-js-pure-3.24.1" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { dependencies = [ @@ -135331,7 +136074,7 @@ in sources."mime-types-2.1.35" sources."mimic-response-2.1.0" sources."minimatch-3.1.2" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."ms-2.1.2" @@ -135339,7 +136082,7 @@ in sources."node-fetch-2.6.7" sources."nopt-5.0.0" sources."npmlog-5.0.1" - sources."nwsapi-2.2.0" + sources."nwsapi-2.2.1" sources."object-assign-4.1.1" sources."once-1.4.0" sources."onml-2.1.0" @@ -135348,7 +136091,7 @@ in sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" sources."prelude-ls-1.1.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."raf-3.4.1" sources."readable-stream-3.6.0" @@ -135395,13 +136138,13 @@ in sources."word-wrap-1.2.3" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -135416,15 +136159,15 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-7.1.0.tgz"; - sha512 = "wrEU9uIieKwkqQaa2NESuaypIvtJWEvMzPh3LSfI3C6R7DMMTmtxHchVLJnupeWjQ1FJzc3TszfcVRIwXk8DfQ=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-7.1.1.tgz"; + sha512 = "ehqPS8QHNKyAz6C1NBkDNbzWtuM9LfGMWF2WZx+9U1TCRdoLdZAqHhxF5hDwZFAPKkPW/iuQQ6r2qQiv7T3aYw=="; }; dependencies = [ - sources."@babel/code-frame-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.12" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -135435,7 +136178,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.18.3" + sources."@babel/runtime-7.18.6" sources."@devicefarmer/adbkit-3.2.3" sources."@devicefarmer/adbkit-logcat-2.1.2" sources."@devicefarmer/adbkit-monkey-1.2.1" @@ -135448,21 +136191,33 @@ in }) sources."@humanwhocodes/config-array-0.9.5" sources."@humanwhocodes/object-schema-1.2.1" - sources."@mdn/browser-compat-data-5.1.1" - sources."@sindresorhus/is-0.14.0" - sources."@szmarczak/http-timer-1.1.2" + sources."@mdn/browser-compat-data-5.1.2" + sources."@pnpm/network.ca-file-1.0.1" + sources."@pnpm/npm-conf-1.0.5" + sources."@sindresorhus/is-5.3.0" + sources."@szmarczak/http-timer-5.0.1" + sources."@types/cacheable-request-6.0.2" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/json-buffer-3.0.0" + sources."@types/keyv-3.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-18.0.0" - sources."@types/yauzl-2.9.2" - sources."acorn-8.7.1" + sources."@types/node-18.6.3" + sources."@types/responselike-1.0.0" + sources."@types/yauzl-2.10.0" + sources."abort-controller-3.0.0" + sources."acorn-8.8.0" sources."acorn-jsx-5.3.2" - sources."addons-linter-5.9.0" + sources."addons-linter-5.10.0" sources."addons-moz-compare-1.2.0" - sources."addons-scanner-utils-7.0.0" + sources."addons-scanner-utils-7.1.0" sources."adm-zip-0.5.9" sources."ajv-8.11.0" sources."ajv-merge-patch-5.0.1" - sources."ansi-align-3.0.1" + (sources."ansi-align-3.0.1" // { + dependencies = [ + sources."string-width-4.2.3" + ]; + }) sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."any-promise-1.3.0" @@ -135481,9 +136236,10 @@ in sources."bcrypt-pbkdf-1.0.2" sources."bluebird-3.7.2" sources."boolbase-1.0.0" - (sources."boxen-5.1.2" // { + (sources."boxen-7.0.0" // { dependencies = [ - sources."camelcase-6.3.0" + sources."chalk-5.0.1" + sources."type-fest-2.18.0" ]; }) sources."brace-expansion-1.1.11" @@ -135491,7 +136247,8 @@ in sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.2" sources."bunyan-1.8.15" - (sources."cacheable-request-6.1.0" // { + sources."cacheable-lookup-6.0.4" + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."lowercase-keys-2.0.0" ]; @@ -135500,46 +136257,64 @@ in sources."camelcase-7.0.0" sources."caseless-0.12.0" sources."chalk-4.1.2" - sources."cheerio-1.0.0-rc.11" + sources."cheerio-1.0.0-rc.12" sources."cheerio-select-2.1.0" sources."chrome-launcher-0.15.1" - sources."ci-info-2.0.0" - sources."cli-boxes-2.2.1" - sources."cliui-7.0.4" + sources."ci-info-3.3.2" + sources."cli-boxes-3.0.0" + (sources."cliui-7.0.4" // { + dependencies = [ + sources."string-width-4.2.3" + sources."wrap-ansi-7.0.0" + ]; + }) sources."clone-1.0.4" - sources."clone-response-1.0.2" + sources."clone-response-1.0.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."columnify-1.6.0" sources."combined-stream-1.0.8" - sources."commander-9.3.0" + sources."commander-9.4.0" sources."common-tags-1.8.2" + sources."compress-brotli-1.3.8" sources."concat-map-0.0.1" (sources."concat-stream-1.6.2" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) - sources."configstore-5.0.1" + (sources."config-chain-1.1.13" // { + dependencies = [ + sources."ini-1.3.8" + ]; + }) + sources."configstore-6.0.0" sources."core-js-3.22.8" sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" - sources."crypto-random-string-2.0.0" + (sources."crypto-random-string-4.0.0" // { + dependencies = [ + sources."type-fest-1.4.0" + ]; + }) sources."css-select-5.1.0" sources."css-what-6.1.0" sources."dashdash-1.14.1" sources."debounce-1.2.1" sources."debug-4.3.4" sources."decamelize-6.0.0" - sources."decompress-response-3.3.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deepcopy-2.1.0" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."defer-to-connect-1.1.3" + sources."defer-to-connect-2.0.1" sources."define-lazy-prop-2.0.0" sources."delayed-stream-1.0.0" sources."doctrine-3.0.0" @@ -135547,20 +136322,19 @@ in sources."domelementtype-2.3.0" sources."domhandler-5.0.3" sources."domutils-3.0.1" - sources."dot-prop-5.3.0" + sources."dot-prop-6.0.1" sources."dtrace-provider-0.8.8" - sources."duplexer3-0.1.4" - sources."duplexify-4.1.2" + sources."eastasianwidth-0.2.0" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."entities-4.3.0" + sources."entities-4.3.1" sources."error-ex-1.3.2" sources."es6-error-4.1.1" sources."es6-promisify-7.0.0" sources."escalade-3.1.1" - sources."escape-goat-2.1.1" + sources."escape-goat-4.0.0" sources."escape-string-regexp-4.0.0" (sources."eslint-8.18.0" // { dependencies = [ @@ -135583,6 +136357,7 @@ in sources."esrecurse-4.3.0" sources."estraverse-5.3.0" sources."esutils-2.0.3" + sources."event-target-shim-5.0.1" sources."execa-4.1.0" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -135604,10 +136379,11 @@ in }) sources."first-chunk-stream-3.0.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."fluent-syntax-0.13.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."form-data-encoder-2.0.1" (sources."fs-extra-10.1.0" // { dependencies = [ sources."universalify-2.0.0" @@ -135634,10 +136410,10 @@ in sources."glob-parent-6.0.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.0" - sources."globals-13.15.0" - (sources."got-9.6.0" // { + sources."globals-13.17.0" + (sources."got-12.3.0" // { dependencies = [ - sources."get-stream-4.1.0" + sources."get-stream-6.0.1" ]; }) sources."graceful-fs-4.2.10" @@ -135651,16 +136427,17 @@ in ]; }) sources."has-flag-4.0.0" - sources."has-yarn-2.1.0" + sources."has-yarn-3.0.0" sources."htmlparser2-8.0.1" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" + sources."http2-wrapper-2.1.11" sources."human-signals-1.1.1" sources."ignore-5.2.0" sources."image-size-1.0.1" sources."immediate-3.0.6" sources."import-fresh-3.3.0" - sources."import-lazy-2.1.0" + sources."import-lazy-4.0.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -135668,14 +136445,14 @@ in sources."invert-kv-3.0.1" sources."is-absolute-0.1.7" sources."is-arrayish-0.2.1" - sources."is-ci-2.0.0" + sources."is-ci-3.0.1" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.3" sources."is-installed-globally-0.4.0" sources."is-mergeable-object-1.1.1" - sources."is-npm-5.0.0" + sources."is-npm-6.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-relative-0.1.3" @@ -135683,7 +136460,7 @@ in sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-wsl-2.2.0" - sources."is-yarn-global-0.3.0" + sources."is-yarn-global-0.4.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -135691,7 +136468,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" sources."jsbn-0.1.1" - sources."json-buffer-3.0.0" + sources."json-buffer-3.0.1" sources."json-merge-patch-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.4.0" @@ -135709,17 +136486,16 @@ in ]; }) sources."jsprim-1.4.2" - (sources."jszip-3.10.0" // { + (sources."jszip-3.10.1" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" - sources."string_decoder-1.1.1" ]; }) sources."jwa-1.4.1" sources."jws-3.2.2" - sources."keyv-3.1.0" - sources."latest-version-5.1.0" + sources."keyv-4.3.3" + sources."latest-version-7.0.0" sources."lcid-3.1.1" sources."levn-0.4.1" sources."lie-3.3.0" @@ -135738,16 +136514,11 @@ in sources."lodash.isstring-4.0.1" sources."lodash.merge-4.6.2" sources."lodash.once-4.1.1" - sources."lowercase-keys-1.0.1" + sources."lowercase-keys-3.0.0" sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) sources."make-error-1.3.6" sources."map-age-cleaner-0.1.3" - sources."marky-1.2.4" + sources."marky-1.2.5" sources."mem-5.1.1" sources."merge-stream-2.0.0" sources."mime-db-1.52.0" @@ -135757,7 +136528,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-1.0.4" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."ms-2.1.2" sources."multimatch-6.0.0" (sources."mv-2.1.1" // { @@ -135774,26 +136545,22 @@ in sources."ncp-2.0.0" sources."node-forge-1.3.1" sources."node-notifier-10.0.1" - 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."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."on-exit-leak-free-1.0.0" + sources."on-exit-leak-free-2.1.0" sources."once-1.4.0" sources."onetime-5.1.2" sources."open-8.4.0" sources."optionator-0.9.1" sources."os-locale-5.0.0" sources."os-shim-0.1.3" - sources."p-cancelable-1.1.0" + sources."p-cancelable-3.0.0" sources."p-defer-1.0.0" sources."p-is-promise-2.1.0" - (sources."package-json-6.5.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."package-json-8.1.0" sources."pako-1.0.11" sources."parent-module-1.0.1" sources."parse-json-6.0.2" @@ -135804,34 +136571,35 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picocolors-1.0.0" - sources."pino-8.0.0" - sources."pino-abstract-transport-0.5.0" + sources."pino-8.1.0" + sources."pino-abstract-transport-1.0.0" sources."pino-std-serializers-5.6.0" sources."postcss-8.4.14" sources."prelude-ls-1.2.1" - sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."process-warning-2.0.0" sources."promise-toolbox-0.21.0" - sources."psl-1.8.0" + sources."proto-list-1.2.4" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."pupa-2.1.1" + sources."pupa-3.1.0" sources."qs-6.5.3" sources."queue-6.0.2" sources."quick-format-unescaped-4.0.4" + sources."quick-lru-5.1.1" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" sources."strip-json-comments-2.0.1" ]; }) - sources."readable-stream-3.6.0" + sources."readable-stream-4.1.0" sources."real-require-0.1.0" sources."regenerator-runtime-0.13.9" sources."regexpp-3.2.0" - sources."registry-auth-token-4.2.2" - sources."registry-url-5.1.0" + sources."registry-auth-token-5.0.1" + sources."registry-url-6.0.1" (sources."relaxed-json-1.0.3" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -135851,8 +136619,13 @@ in }) sources."require-directory-2.1.1" sources."require-from-string-2.0.2" + sources."resolve-alpn-1.2.1" sources."resolve-from-4.0.0" - sources."responselike-1.0.2" + (sources."responselike-2.0.1" // { + dependencies = [ + sources."lowercase-keys-2.0.0" + ]; + }) (sources."rimraf-3.0.2" // { dependencies = [ sources."glob-7.2.3" @@ -135864,11 +136637,7 @@ in sources."safer-buffer-2.1.2" sources."sax-1.2.4" sources."semver-7.3.7" - (sources."semver-diff-3.1.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) + sources."semver-diff-4.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" sources."shebang-command-2.0.0" @@ -135877,7 +136646,7 @@ in sources."shellwords-0.1.1" sources."sign-addon-5.0.0" sources."signal-exit-3.0.7" - sources."sonic-boom-3.0.0" + sources."sonic-boom-3.2.0" sources."source-map-0.6.1" sources."source-map-js-1.0.2" sources."source-map-support-0.5.21" @@ -135885,11 +136654,20 @@ in sources."split-1.0.1" sources."split2-4.1.0" sources."sshpk-1.17.0" - sources."stream-shift-1.0.1" sources."stream-to-array-2.3.0" sources."stream-to-promise-3.0.0" - sources."string-width-4.2.3" - sources."string_decoder-1.3.0" + (sources."string-width-5.1.2" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."emoji-regex-9.2.2" + sources."strip-ansi-7.0.1" + ]; + }) + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."strip-ansi-6.0.1" sources."strip-bom-5.0.0" sources."strip-bom-buf-2.0.0" @@ -135900,13 +136678,11 @@ in sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" - sources."thread-stream-1.0.0" + sources."thread-stream-1.0.1" sources."through-2.3.8" sources."tmp-0.2.1" - sources."to-readable-stream-1.0.0" sources."tosource-1.0.0" sources."tough-cookie-2.5.0" - sources."tslib-2.4.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.4.0" @@ -135914,12 +136690,15 @@ in sources."type-fest-0.20.2" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."unique-string-2.0.0" + sources."unique-string-3.0.0" sources."universalify-1.0.0" sources."upath-2.0.1" - sources."update-notifier-5.1.0" + (sources."update-notifier-6.0.2" // { + dependencies = [ + sources."chalk-5.0.1" + ]; + }) sources."uri-js-4.4.1" - sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."uuid-8.3.2" sources."v8-compile-cache-2.3.0" @@ -135932,20 +136711,30 @@ in sources."wcwidth-1.0.1" sources."when-3.7.7" sources."which-2.0.2" - sources."widest-line-3.1.0" + sources."widest-line-4.0.1" sources."winreg-0.0.12" sources."word-wrap-1.2.3" - sources."wrap-ansi-7.0.0" + (sources."wrap-ansi-8.0.1" // { + dependencies = [ + sources."ansi-regex-6.0.1" + sources."ansi-styles-6.1.0" + sources."strip-ansi-7.0.1" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."ws-8.8.0" - sources."xdg-basedir-4.0.0" + sources."xdg-basedir-5.1.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."y18n-5.0.8" sources."yallist-4.0.0" - sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + (sources."yargs-17.5.1" // { + dependencies = [ + sources."string-width-4.2.3" + ]; + }) + sources."yargs-parser-21.1.0" sources."yauzl-2.10.0" sources."zip-dir-2.0.0" ]; @@ -135962,23 +136751,23 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.73.0"; + version = "5.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz"; - sha512 = "svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"; + sha512 = "A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA=="; }; dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" + sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" sources."@jridgewell/source-map-0.3.2" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" - sources."@types/eslint-8.4.3" - sources."@types/eslint-scope-3.7.3" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" + sources."@types/eslint-8.4.5" + sources."@types/eslint-scope-3.7.4" sources."@types/estree-0.0.51" sources."@types/json-schema-7.0.11" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -135996,17 +136785,17 @@ in sources."@webassemblyjs/wast-printer-1.11.1" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.7.1" + sources."acorn-8.8.0" sources."acorn-import-assertions-1.8.0" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.20.4" + sources."browserslist-4.21.3" sources."buffer-from-1.1.2" - sources."caniuse-lite-1.0.30001358" + sources."caniuse-lite-1.0.30001373" sources."chrome-trace-event-1.0.3" sources."commander-2.20.3" - sources."electron-to-chromium-1.4.164" - sources."enhanced-resolve-5.9.3" + sources."electron-to-chromium-1.4.211" + sources."enhanced-resolve-5.10.0" sources."es-module-lexer-0.9.3" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -136030,7 +136819,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.5" + sources."node-releases-2.0.6" sources."picocolors-1.0.0" sources."punycode-2.1.1" sources."randombytes-2.1.0" @@ -136041,8 +136830,9 @@ in sources."source-map-support-0.5.21" sources."supports-color-8.1.1" sources."tapable-2.2.1" - sources."terser-5.14.1" + sources."terser-5.14.2" sources."terser-webpack-plugin-5.3.3" + sources."update-browserslist-db-1.0.5" sources."uri-js-4.4.1" sources."watchpack-2.4.0" sources."webpack-sources-3.2.3" @@ -136075,7 +136865,7 @@ in sources."commander-7.2.0" sources."cross-spawn-7.0.3" sources."envinfo-7.8.1" - sources."fastest-levenshtein-1.0.12" + sources."fastest-levenshtein-1.0.16" sources."find-up-4.1.0" sources."function-bind-1.1.1" sources."has-1.0.3" @@ -136119,10 +136909,10 @@ in webpack-dev-server = nodeEnv.buildNodePackage { name = "webpack-dev-server"; packageName = "webpack-dev-server"; - version = "4.9.2"; + version = "4.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.2.tgz"; - sha512 = "H95Ns95dP24ZsEzO6G9iT+PNw4Q7ltll1GfJHV4fKphuHWgKFzGHWi4alTlTnpk1SPPk41X+l2RB7rLfIhnB9Q=="; + url = "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.9.3.tgz"; + sha512 = "3qp/eoboZG5/6QgiZ3llN8TUzkSpYg1Ko9khWX1h40MIEUNS2mDoIa8aXsPfskER+GbTvs/IJZ1QTBBhhuetSw=="; }; dependencies = [ sources."@leichtgewicht/ip-codec-2.0.4" @@ -136131,16 +136921,16 @@ in sources."@types/connect-3.4.35" sources."@types/connect-history-api-fallback-1.3.5" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.29" + sources."@types/express-serve-static-core-4.17.30" sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" - sources."@types/mime-1.3.2" - sources."@types/node-18.0.0" + sources."@types/mime-3.0.0" + sources."@types/node-18.6.3" 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.13.10" + sources."@types/serve-static-1.15.0" sources."@types/sockjs-0.3.33" sources."@types/ws-8.5.3" sources."accepts-1.3.8" @@ -136168,7 +136958,7 @@ in sources."compressible-2.0.18" sources."compression-1.7.4" sources."concat-map-0.0.1" - sources."connect-history-api-fallback-1.6.0" + sources."connect-history-api-fallback-2.0.0" (sources."content-disposition-0.5.4" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -136226,7 +137016,7 @@ in sources."html-entities-2.3.3" sources."http-deceiver-1.2.7" sources."http-errors-2.0.0" - sources."http-parser-js-0.5.6" + sources."http-parser-js-0.5.8" sources."http-proxy-1.18.1" sources."http-proxy-middleware-2.0.6" sources."human-signals-2.1.0" @@ -136246,7 +137036,7 @@ in sources."isexe-2.0.0" sources."json-schema-traverse-1.0.0" sources."media-typer-0.3.0" - sources."memfs-3.4.6" + sources."memfs-3.4.7" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."methods-1.1.2" @@ -136353,7 +137143,7 @@ in sources."websocket-extensions-0.1.4" sources."which-2.0.2" sources."wrappy-1.0.2" - sources."ws-8.8.0" + sources."ws-8.8.1" ]; buildInputs = globalBuildInputs; meta = { @@ -136447,14 +137237,14 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.2" - sources."@types/node-18.0.0" + sources."@types/node-18.6.3" sources."@webtorrent/http-node-1.3.0" sources."addr-to-ip-port-1.5.4" sources."airplay-js-0.3.0" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" - sources."b4a-1.5.3" + sources."b4a-1.6.0" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bencode-2.0.3" @@ -136524,7 +137314,7 @@ in }) sources."chunk-store-stream-4.3.0" sources."cli-cursor-3.1.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-width-3.0.0" sources."cliui-7.0.4" sources."clone-1.0.4" @@ -136542,7 +137332,7 @@ in }) sources."core-util-is-1.0.3" sources."cpus-1.0.3" - sources."create-torrent-5.0.2" + sources."create-torrent-5.0.4" sources."debug-2.6.9" sources."decompress-response-3.3.0" sources."defaults-1.0.3" @@ -136569,9 +137359,10 @@ in sources."escape-string-regexp-1.0.5" sources."events-3.3.0" sources."external-editor-3.1.0" + sources."fast-blob-stream-1.1.1" sources."fast-fifo-1.1.0" + sources."fast-readable-async-iterator-1.1.1" sources."figures-3.2.0" - sources."filestream-5.0.0" sources."freelist-1.0.3" (sources."fs-chunk-store-2.0.5" // { dependencies = [ @@ -136600,7 +137391,6 @@ in sources."is-file-1.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" - sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."is-wsl-2.2.0" sources."isarray-1.0.0" @@ -136638,7 +137428,7 @@ in sources."minimatch-3.1.2" sources."minimist-1.2.6" sources."mkdirp-classic-0.5.3" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.3" sources."ms-2.0.0" @@ -136653,7 +137443,7 @@ in sources."netmask-2.0.2" sources."network-address-1.1.2" sources."next-event-1.0.0" - sources."node-gyp-build-4.4.0" + sources."node-gyp-build-4.5.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" sources."on-finished-2.4.1" @@ -136707,7 +137497,7 @@ in sources."run-parallel-limit-1.1.0" sources."run-series-1.1.9" sources."rusha-0.8.14" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.1.4" @@ -136730,7 +137520,11 @@ in ]; }) sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + (sources."socks-2.7.0" // { + dependencies = [ + sources."ip-2.0.0" + ]; + }) sources."speed-limiter-1.0.2" sources."speedometer-1.1.0" sources."split-1.0.1" @@ -136750,7 +137544,7 @@ in sources."timeout-refresh-1.0.3" sources."tmp-0.0.33" sources."to-arraybuffer-1.0.1" - (sources."torrent-discovery-9.4.12" // { + (sources."torrent-discovery-9.4.13" // { dependencies = [ sources."debug-4.3.4" sources."ms-2.1.2" @@ -136760,7 +137554,6 @@ in sources."tslib-2.4.0" sources."type-fest-0.21.3" sources."typedarray-0.0.6" - sources."typedarray-to-buffer-3.1.5" sources."uint64be-2.0.2" sources."unordered-array-remove-1.0.2" sources."unordered-set-2.0.1" @@ -136780,7 +137573,7 @@ in sources."videostream-3.2.2" sources."vlc-command-1.2.0" sources."wcwidth-1.0.1" - (sources."webtorrent-1.8.22" // { + (sources."webtorrent-1.8.26" // { dependencies = [ sources."debug-4.3.4" sources."decompress-response-6.0.0" @@ -136792,13 +137585,13 @@ in sources."winreg-1.2.4" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.8" + sources."ws-7.5.9" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" sources."y18n-5.0.8" sources."yargs-17.5.1" - sources."yargs-parser-21.0.1" + sources."yargs-parser-21.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -136876,14 +137669,20 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.8.0.tgz"; - sha512 = "Aclwmim+y1+02NYcAvvQB0d/qg2udHRnY0rZMeN24m2MSmbWFdffRWqmgSLieMimKHTCZ5hss4ZTvYNzLiiJtQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-1.9.0.tgz"; + sha512 = "hwBqXDDYv1i4IsSjSB8jPR9SKcddqHNeMdqNGm0TdbSuqtRvZ9lQet4HgxeCZd37u91Gak0KtZw51jTDdAqP6A=="; }; dependencies = [ - sources."jsonc-parser-3.0.0" + sources."ajv-8.11.0" + sources."fast-deep-equal-3.1.3" + sources."json-schema-traverse-1.0.0" + sources."jsonc-parser-3.1.0" + sources."punycode-2.1.1" sources."request-light-0.5.8" + sources."require-from-string-2.0.2" + sources."uri-js-4.4.1" sources."vscode-json-languageservice-4.1.8" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" @@ -136893,7 +137692,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.5" - sources."vscode-languageserver-types-3.17.1" + sources."vscode-languageserver-types-3.17.2" sources."vscode-nls-5.0.1" sources."vscode-uri-3.0.3" sources."yaml-2.0.0-11" @@ -136994,7 +137793,7 @@ in sha512 = "0V5CpR62BY1EOevIxXq5BL84YJeIunEzRsFlqb00tc7D77I51/0bvgdGRZhEwhNI2rFxKZ1i77eoisT56gfMTQ=="; }; dependencies = [ - sources."@babel/runtime-7.18.3" + sources."@babel/runtime-7.18.9" sources."@gar/promisify-1.1.3" sources."@isaacs/string-locale-compare-1.1.0" sources."@nodelib/fs.scandir-2.1.5" @@ -137019,7 +137818,7 @@ in ]; }) sources."@npmcli/installed-package-contents-1.0.7" - (sources."@npmcli/map-workspaces-2.0.3" // { + (sources."@npmcli/map-workspaces-2.0.4" // { dependencies = [ sources."minimatch-5.1.0" ]; @@ -137135,7 +137934,7 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" - sources."cli-spinners-2.6.1" + sources."cli-spinners-2.7.0" sources."cli-table-0.3.11" sources."cli-width-2.2.1" sources."clone-1.0.4" @@ -137160,7 +137959,7 @@ in sources."config-chain-1.1.13" sources."configstore-3.1.5" sources."console-control-strings-1.1.0" - sources."core-js-3.23.2" + sources."core-js-3.24.1" sources."core-util-is-1.0.3" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -137186,7 +137985,7 @@ in sources."dir-glob-3.0.1" sources."dot-prop-4.2.1" sources."downgrade-root-1.2.2" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."ejs-3.1.8" sources."emoji-regex-8.0.0" @@ -137313,7 +138112,7 @@ in sources."p-is-promise-1.1.0" ]; }) - sources."ip-1.1.8" + sources."ip-2.0.0" sources."ip-regex-2.1.0" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" @@ -137420,7 +138219,7 @@ in }) sources."mem-5.1.1" sources."mem-fs-2.2.1" - sources."mem-fs-editor-9.4.0" + sources."mem-fs-editor-9.5.0" (sources."meow-3.7.0" // { dependencies = [ sources."find-up-1.1.2" @@ -137441,7 +138240,7 @@ in ]; }) sources."minimist-1.2.6" - sources."minipass-3.3.3" + sources."minipass-3.3.5" sources."minipass-collect-1.0.2" sources."minipass-fetch-1.4.1" sources."minipass-flush-1.0.5" @@ -137463,7 +138262,7 @@ in (sources."node-gyp-8.4.1" // { dependencies = [ sources."ansi-regex-5.0.1" - sources."are-we-there-yet-3.0.0" + sources."are-we-there-yet-3.0.1" sources."env-paths-2.2.1" sources."gauge-4.0.4" sources."glob-7.2.3" @@ -137516,15 +138315,15 @@ in }) (sources."npm-registry-fetch-12.0.2" // { dependencies = [ - sources."@npmcli/fs-2.1.0" + sources."@npmcli/fs-2.1.1" sources."@npmcli/move-file-2.0.0" sources."@tootallnate/once-2.0.0" sources."cacache-16.1.1" sources."debug-4.3.4" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-5.0.0" - sources."lru-cache-7.10.1" - (sources."make-fetch-happen-10.1.8" // { + sources."lru-cache-7.13.2" + (sources."make-fetch-happen-10.2.0" // { dependencies = [ sources."minipass-fetch-2.1.0" ]; @@ -137647,7 +138446,7 @@ in sources."promise-retry-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.3" @@ -137733,7 +138532,7 @@ in sources."signal-exit-3.0.7" sources."slash-3.0.0" sources."smart-buffer-4.2.0" - sources."socks-2.6.2" + sources."socks-2.7.0" (sources."socks-proxy-agent-6.2.1" // { dependencies = [ sources."debug-4.3.4" @@ -137913,7 +138712,7 @@ in ]; }) sources."yeoman-doctor-5.0.0" - (sources."yeoman-environment-3.9.1" // { + (sources."yeoman-environment-3.10.0" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" @@ -137953,7 +138752,7 @@ in sources."path-key-3.1.1" sources."readable-stream-3.6.0" sources."restore-cursor-3.1.0" - sources."rxjs-7.5.5" + sources."rxjs-7.5.6" sources."semver-7.3.7" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -137998,10 +138797,10 @@ in zx = nodeEnv.buildNodePackage { name = "zx"; packageName = "zx"; - version = "7.0.1"; + version = "7.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/zx/-/zx-7.0.1.tgz"; - sha512 = "5jCux4+8EL7blqjQZDCV9KiV+TEY9Vn9dkddOYEqdrE79X0jsVDRMt0u2O6UsBkC8Da8flcr6Vx9EmcVX4S5vg=="; + url = "https://registry.npmjs.org/zx/-/zx-7.0.8.tgz"; + sha512 = "sNjfDHzskqrSkWNj0TVhaowVK5AbpvuyuO1RBU4+LrFcgYI5u9CtyWWgUBRtRZl3bgGEF31zByszoBmwS47d1w=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.5" @@ -138009,7 +138808,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@types/fs-extra-9.0.13" sources."@types/minimist-1.2.2" - sources."@types/node-17.0.45" + sources."@types/node-18.6.3" sources."@types/ps-tree-1.1.2" sources."@types/which-2.0.1" sources."braces-3.0.2" @@ -138020,7 +138819,7 @@ in sources."event-stream-3.3.4" sources."fast-glob-3.2.11" sources."fastq-1.13.0" - sources."fetch-blob-3.1.5" + sources."fetch-blob-3.2.0" sources."fill-range-7.0.1" sources."formdata-polyfill-4.0.10" sources."from-0.1.7" @@ -138039,7 +138838,7 @@ in sources."micromatch-4.0.5" sources."minimist-1.2.6" sources."node-domexception-1.0.0" - sources."node-fetch-3.2.6" + sources."node-fetch-3.2.8" sources."path-type-4.0.0" sources."pause-stream-0.0.11" sources."picomatch-2.3.1" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix index 9d3f74bae7..019d7815d8 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/overrides.nix @@ -85,6 +85,16 @@ final: prev: { meta = oldAttrs.meta // { platforms = lib.platforms.linux; }; }); + balanceofsatoshis = prev.balanceofsatoshis.override { + nativeBuildInputs = [ pkgs.installShellFiles ]; + postInstall = '' + installShellCompletion --cmd bos\ + --bash <($out/bin/bos completion bash)\ + --zsh <($out/bin/bos completion zsh)\ + --fish <($out/bin/bos completion fish) + ''; + }; + bitwarden-cli = prev."@bitwarden/cli".override { name = "bitwarden-cli"; }; @@ -350,7 +360,7 @@ final: prev: { src = fetchurl { url = "https://registry.npmjs.org/prisma/-/prisma-${version}.tgz"; - sha512 = "sha512-Dtsar03XpCBkcEb2ooGWO/WcgblDTLzGhPcustbehwlFXuTMliMDRzXsfygsgYwQoZnAUKRd1rhpvBNEUziOVw=="; + sha512 = "sha512-yw50J8If2dKP4wYIi695zthsCASQFHiogGvUHHWd3falx/rpsD6Sb1LMLRV9nO3iGG3lozxNJ2PSINxK7xwdpg=="; }; postInstall = with pkgs; '' wrapProgram "$out/bin/prisma" \ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix index b82ec73617..f60a2c24ef 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix @@ -6,9 +6,7 @@ buildDunePackage rec { pname = "biocaml"; version = "0.11.2"; - useDune2 = true; - - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.11"; src = fetchFromGitHub { owner = "biocaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix index 2ad452ff6e..dc980ce4ab 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix @@ -1,6 +1,4 @@ { lib -, fetchpatch -, fetchurl , buildDunePackage , ppx_sexp_conv , base @@ -57,13 +55,6 @@ buildDunePackage { core ]; - # Compatibility with core 0.15. No longer needed after updating cohttp to 5.0.0. - patches = fetchpatch { - url = "https://github.com/mirage/ocaml-cohttp/commit/5a7124478ed31c6b1fa6a9a50602c2ec839083b5.patch"; - sha256 = "0i99rl8604xqwb6d0yzk9ws4dflbn0j4hv2nba2qscbqrrn22rw3"; - }; - patchFlags = "-p1 -F3"; - meta = cohttp.meta // { description = "CoHTTP implementation for the Async concurrency library"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix index 29d7bbb26b..980984c6ec 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/data.nix @@ -1,15 +1,15 @@ { buildDunePackage, containers , dune-configurator -, gen, iter, qcheck +, gen, iter, qcheck-core }: buildDunePackage { pname = "containers-data"; - inherit (containers) src version doCheck useDune2; + inherit (containers) src version doCheck; buildInputs = [ dune-configurator ]; - checkInputs = [ gen iter qcheck ]; + checkInputs = [ gen iter qcheck-core ]; propagatedBuildInputs = [ containers ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix index 281fbfbfde..4b4cb19686 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/containers/default.nix @@ -1,26 +1,24 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml , dune-configurator , either, seq -, gen, iter, ounit, qcheck, uutf +, gen, iter, qcheck-core, uutf, yojson }: buildDunePackage rec { - version = "3.6.1"; + version = "3.9"; pname = "containers"; - useDune2 = true; - src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - sha256 = "sha256:1k8xrs3nki8g875sig9f5v6k4vwxrk5gn7ixrlkkys5ksbr4kis7"; + sha256 = "sha256-uQyKBSXgf3kGx5HvS2VQrrkh0WqNZfxr5j8tTRjeTX4="; }; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ either seq ]; - checkInputs = [ gen iter ounit qcheck uutf ]; + checkInputs = [ gen iter qcheck-core uutf yojson ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix index 3b133407c3..b9a81a6c9d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/elpi/default.nix @@ -2,15 +2,18 @@ , buildDunePackage, camlp5 , ocaml , menhir, menhirLib +, atdgen , stdlib-shims , re, perl, ncurses , ppxlib, ppx_deriving , ppxlib_0_15, ppx_deriving_0_15 , coqPackages -, version ? if lib.versionAtLeast ocaml.version "4.07" then "1.15.2" else "1.14.1" +, 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="; release."1.15.0".sha256 = "sha256:1ngdc41sgyzyz3i3lkzjhnj66gza5h912virkh077dyv17ysb6ar"; release."1.14.1".sha256 = "sha256-BZPVL8ymjrE9kVGyf6bpc+GA2spS5JBpkUtZi04nPis="; @@ -31,7 +34,8 @@ buildDunePackage rec { minimalOCamlVersion = "4.04"; buildInputs = [ perl ncurses ] - ++ optional (versionAtLeast version "1.15" || version == "dev") menhir; + ++ optional (versionAtLeast version "1.15" || version == "dev") menhir + ++ optional (versionAtLeast version "1.16" || version == "dev") atdgen; propagatedBuildInputs = [ re stdlib-shims ] ++ (if versionAtLeast version "1.15" || version == "dev" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix index 05b085f92a..9e4a9b24ce 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix @@ -1,15 +1,15 @@ -{ buildDunePackage, fetchpatch, faraday, core, async }: +{ buildDunePackage, lib, fetchpatch, faraday, core, async }: buildDunePackage rec { pname = "faraday-async"; - inherit (faraday) version src useDune2; + inherit (faraday) version src; - patches = fetchpatch { + patches = lib.optional (lib.versionAtLeast async.version "0.15") (fetchpatch { url = "https://github.com/inhabitedtype/faraday/commit/31c3fc7f91ecca0f1deea10b40fd5e33bcd35f75.patch"; sha256 = "05z5gk7hxq7qvwg6f73hdhfcnx19p1dq6wqh8prx667y8zsaq2zj"; - }; + }); - minimumOCamlVersion = "4.08"; + minimalOCamlVersion = "4.08"; propagatedBuildInputs = [ faraday core async ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix index e960167c86..1fdf788c36 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/fix/default.nix @@ -2,14 +2,14 @@ buildDunePackage rec { pname = "fix"; - version = "20211231"; + version = "20220121"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "fpottier"; repo = "fix"; rev = "${version}"; - sha256 = "sha256-T/tbiC95yzPb60AiEcvMRU47D8xUZNN5C4X33Y1VB9E="; + sha256 = "sha256-suWkZDLnXEO/4QCGmNuyLFOV0LJsFOMD13gxOcgu6JQ="; }; minimumOCamlVersion = "4.03"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index b9a19f1341..68c633b800 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -354,9 +354,9 @@ with self; ocaml-compiler-libs = janePackage { pname = "ocaml-compiler-libs"; - version = "0.12.3"; + version = "0.12.4"; minimumOCamlVersion = "4.04.1"; - hash = "00nrar7h2pyflbdiq6wwwrb4k5jh9iff0jllihzm6ms8d5pspsg5"; + hash = "sha256-W+KUguz55yYAriHRMcQy8gRPzh2TZSJnexG1JI8TLgI="; meta.description = "OCaml compiler libraries repackaged"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix index 8510b3a8c2..23ac7bf655 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -2,7 +2,6 @@ , fetchpatch , lib , openssl -, patdiff , zstd }: @@ -132,6 +131,7 @@ with self; async_smtp = janePackage { pname = "async_smtp"; hash = "1m00j7wcb0blipnc1m6by70gd96a1k621b4dgvgffp8as04a461r"; + minimumOCamlVersion = "4.12"; meta.description = "SMTP client and server"; propagatedBuildInputs = [ async_extra async_inotify async_sendfile async_shell async_ssl email_message resource_cache re2_stable sexp_macro ]; }; @@ -437,7 +437,8 @@ with self; ocaml_intrinsics = janePackage { pname = "ocaml_intrinsics"; minimumOCamlVersion = "4.08"; - hash = "1fdfl78b8br0j9w4046i0fmmaqn4cgl06q94rsniyagx9747pnsr"; + version = "0.15.2"; + hash = "sha256-f5zqrKaokj1aEvbu7lOuK0RoWSklFr6QFpV+oWbIX9U="; meta.description = "Intrinsics"; buildInputs = [ dune-configurator ]; doCheck = false; # test rules broken @@ -451,6 +452,15 @@ with self; propagatedBuildInputs = [ base sexplib0 ]; }; + patdiff = janePackage { + pname = "patdiff"; + hash = "0623a7n5r659rkxbp96g361mvxkcgc6x9lcbkm3glnppplk5kxr9"; + propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ]; + meta = { + description = "File Diff using the Patience Diff algorithm"; + }; + }; + patience_diff = janePackage { pname = "patience_diff"; hash = "17yrhn4qfi31m8g1ygb3m6i9z4fqd8f60fn6viazgx06s3x4xp3v"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix index 2c3c7c423a..4aaaf11450 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mariadb/default.nix @@ -1,26 +1,32 @@ -{ lib, fetchFromGitHub, buildOasisPackage +{ lib, fetchurl, stdenv +, ocaml, findlib, ocamlbuild , ctypes, mariadb, libmysqlclient }: -buildOasisPackage rec { - pname = "mariadb"; - version = "1.1.4"; +lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07") + "mariadb is not available for OCaml ${ocaml.version}" - minimumOCamlVersion = "4.07.0"; +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-mariadb"; + version = "1.1.6"; - src = fetchFromGitHub { - owner = "andrenth"; - repo = "ocaml-mariadb"; - rev = version; - sha256 = "1rxqvxr6sv4x2hsi05qm9jz0asaq969m71db4ckl672rcql1kwbr"; + src = fetchurl { + url = "https://github.com/andrenth/ocaml-mariadb/releases/download/${version}/ocaml-mariadb-${version}.tar.gz"; + sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM="; }; + nativeBuildInputs = [ ocaml findlib ocamlbuild ]; buildInputs = [ mariadb libmysqlclient ]; propagatedBuildInputs = [ ctypes ]; + strictDeps = true; + + preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs"; + meta = { description = "OCaml bindings for MariaDB"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcc32 ]; homepage = "https://github.com/andrenth/ocaml-mariadb"; + inherit (ocaml.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix index 58fcab5313..5fcf7cf511 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/default.nix @@ -2,15 +2,13 @@ buildDunePackage rec { pname = "metrics"; - version = "0.2.0"; + version = "0.4.0"; - useDune2 = true; - - minimumOCamlVersion = "4.04"; + minimalOCamlVersion = "4.04"; src = fetchurl { - url = "https://github.com/mirage/metrics/releases/download/${version}/metrics-${version}.tbz"; - sha256 = "0j215cji3n78lghzi9m6kgr3r1s91v681hfnn7cgybb31d7gjkqg"; + url = "https://github.com/mirage/metrics/releases/download/v${version}/metrics-${version}.tbz"; + sha256 = "sha256-kbh1WktQkDcXE8O1WRm+vtagVfSql8S5gr0bXn/jia8="; }; propagatedBuildInputs = [ fmt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix index 8394ec0c0f..cca344f991 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/influx.nix @@ -1,12 +1,12 @@ { buildDunePackage, metrics -, astring, duration, fmt, lwt +, duration, fmt, lwt }: buildDunePackage rec { pname = "metrics-influx"; - inherit (metrics) version useDune2 src; + inherit (metrics) version src; - propagatedBuildInputs = [ astring duration fmt lwt metrics ]; + propagatedBuildInputs = [ duration fmt lwt metrics ]; meta = metrics.meta // { description = "Influx reporter for the Metrics library"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix index 7085ff5814..088a4e586c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/lwt.nix @@ -1,11 +1,11 @@ -{ buildDunePackage, logs, ocaml_lwt, metrics }: +{ buildDunePackage, logs, lwt, metrics }: buildDunePackage { pname = "metrics-lwt"; - inherit (metrics) version useDune2 src; + inherit (metrics) version src; - propagatedBuildInputs = [ logs ocaml_lwt metrics ]; + propagatedBuildInputs = [ logs lwt metrics ]; meta = metrics.meta // { description = "Lwt backend for the Metrics library"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/mirage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/mirage.nix deleted file mode 100644 index 4a891505ac..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/mirage.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ buildDunePackage, metrics, metrics-influx -, cstruct, ipaddr, logs, lwt, mirage-clock, mirage-stack -}: - -buildDunePackage { - pname = "metrics-mirage"; - inherit (metrics) version useDune2 src; - - propagatedBuildInputs = [ cstruct ipaddr logs lwt metrics metrics-influx mirage-clock mirage-stack ]; - - meta = metrics.meta // { - description = "Mirage backend for the Metrics library"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/rusage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/rusage.nix new file mode 100644 index 0000000000..8e93823c21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/rusage.nix @@ -0,0 +1,18 @@ +{ lib, buildDunePackage, metrics +, fmt, logs +}: + +buildDunePackage { + pname = "metrics-rusage"; + inherit (metrics) src version; + + minimalOCamlVersion = "4.08"; + + propagatedBuildInputs = [ fmt logs metrics ]; + + doCheck = true; + + meta = metrics.meta // { + description = "Resource usage (getrusage) sources for the Metrics library"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix index 5a7bae1b29..2d1333f74a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/metrics/unix.nix @@ -1,12 +1,12 @@ -{ buildDunePackage, gnuplot, ocaml_lwt, metrics, metrics-lwt, mtime, uuidm }: +{ buildDunePackage, gnuplot, lwt, metrics, metrics-lwt, mtime, uuidm }: buildDunePackage rec { pname = "metrics-unix"; - inherit (metrics) version useDune2 src; + inherit (metrics) version src; - propagatedBuildInputs = [ gnuplot ocaml_lwt metrics mtime uuidm ]; + propagatedBuildInputs = [ gnuplot lwt metrics mtime uuidm ]; checkInputs = [ metrics-lwt ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix index 1f978a90df..023b327cc0 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/num/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, ocaml, findlib, withStatic ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (rec { version = "1.1"; pname = "ocaml${ocaml.version}-num"; src = fetchFromGitHub { @@ -28,4 +28,7 @@ stdenv.mkDerivation rec { inherit (ocaml.meta) platforms; inherit (src.meta) homepage; }; -} +} // (if lib.versions.majorMinor ocaml.version == "4.06" then { + NIX_CFLAGS_COMPILE = "-fcommon"; + } else {}) +) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc-parser/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc-parser/default.nix index 9e4e4bc8d1..5224f24179 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc-parser/default.nix @@ -1,11 +1,21 @@ -{ lib, fetchurl, buildDunePackage, astring, result , version ? "1.0.0" }: +{ lib, fetchurl, buildDunePackage, astring, result, camlp-streams, version ? "2.0.0" }: let param = { + "2.0.0" = { + sha256 = "sha256-QHkZ+7DrlXYdb8bsZ3dijZSqGQc0O9ymeLGIC6+zOSI="; + extraBuildInputs = [ camlp-streams ]; + }; + "1.0.1" = { + sha256 = "sha256-orvo5CAbYOmAurAeluQfK6CwW6P1C0T3WDfoovuQfSw="; + extraBuildInputs = [ camlp-streams ]; + }; "1.0.0" = { sha256 = "sha256-tqoI6nGp662bK+vE2h7aDXE882dObVfRBFnZNChueqE="; + extraBuildInputs = []; }; "0.9.0" = { sha256 = "sha256-3w2tG605v03mvmZsS2O5c71y66O3W+n3JjFxIbXwvXk="; + extraBuildInputs = []; }; }."${version}"; in @@ -23,7 +33,7 @@ buildDunePackage rec { useDune2 = true; - propagatedBuildInputs = [ astring result ]; + propagatedBuildInputs = [ astring result ] ++ param.extraBuildInputs; meta = { description = "Parser for Ocaml documentation comments"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix index 68c06cc4c6..3e25ba37fd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/odoc/default.nix @@ -1,25 +1,32 @@ { lib, fetchurl, buildDunePackage, ocaml , astring, cmdliner, cppo, fpath, result, tyxml -, markup, alcotest, yojson, sexplib, jq +, markup, yojson, sexplib0, jq +, odoc-parser, ppx_expect, bash, fmt }: buildDunePackage rec { pname = "odoc"; - version = "1.5.3"; - - minimumOCamlVersion = "4.02"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz"; - sha256 = "0idzidmz7y10xkwcf4aih0mdvkipxk1gzi4anhnbbi2q2s0nzdzj"; + sha256 = "sha256-9XTb0ozQ/DorlVJcS7ld320fZAi7T+EhV/pTeIT5h/0="; }; - useDune2 = true; + # dune 3 is required for tests to pass + duneVersion = if doCheck then "3" else "2"; - buildInputs = [ astring cmdliner cppo fpath result tyxml ]; + buildInputs = [ astring cmdliner cppo fpath result tyxml odoc-parser fmt ]; - checkInputs = [ alcotest markup yojson sexplib jq ]; - doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ markup yojson sexplib0 jq ppx_expect bash ]; + doCheck = lib.versionAtLeast ocaml.version "4.08"; + + preCheck = '' + # some run.t files check the content of patchShebangs-ed scripts, so patch + # them as well + find test \( -name '*.sh' -o -name 'run.t' \) -execdir sed 's@#!/bin/sh@#!${bash}/bin/sh@' -i '{}' \; + patchShebangs test + ''; meta = { description = "A documentation generator for OCaml"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix index cfb743cc98..0512e4a9e6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/omd/default.nix @@ -1,32 +1,21 @@ -{ stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild }: +{ lib, buildDunePackage, fetchurl }: -stdenv.mkDerivation rec { - pname = "ocaml${ocaml.version}-omd"; - version = "1.3.1"; +buildDunePackage rec { + pname = "omd"; + version = "1.3.2"; + + minimalOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/Chris00/omd/releases/download/${version}/omd-${version}.tar.gz"; - sha256 = "1sgdgzpx96br7npj8mh91cli5mqmzsjpngwm7x4212n3k1d0ivwa"; + url = "https://github.com/ocaml/omd/releases/download/${version}/omd-${version}.tbz"; + sha256 = "sha256-YCPhZCYx8I9njrVyWCCHnte7Wj/+53fN7evCjB+F+ts="; }; - nativeBuildInputs = [ ocaml findlib ocamlbuild ]; - - strictDeps = true; - - createFindlibDestdir = true; - - configurePhase = '' - runHook preConfigure - ocaml setup.ml -configure --prefix $out - runHook postConfigure - ''; - meta = { description = "Extensible Markdown library and tool in OCaml"; homepage = "https://github.com/ocaml/omd"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "omd"; - inherit (ocaml.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix index aebe6bd95a..4f1baec1e5 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/alcotest.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck-alcotest"; - inherit (qcheck-core) version useDune2 src; + inherit (qcheck-core) version src; propagatedBuildInputs = [ qcheck-core alcotest ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix index efa3f11967..6a2bba1acd 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/core.nix @@ -2,9 +2,7 @@ buildDunePackage rec { pname = "qcheck-core"; - version = "0.18"; - - useDune2 = true; + version = "0.19.1"; minimalOCamlVersion = "4.08"; @@ -12,7 +10,7 @@ buildDunePackage rec { owner = "c-cube"; repo = "qcheck"; rev = "v${version}"; - sha256 = "1s652hrj2sxqj30dfl300zjvvqk3r62a1bnzqw1hqyf6pi88qn8x"; + sha256 = "sha256-AZ1Ww6CWt3X1bXXcofMe14rTlMTC9hmohcKdZLUKEvE="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix index dc73f42a13..2a0e6c0ae4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/default.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck"; - inherit (qcheck-ounit) version useDune2 src; + inherit (qcheck-ounit) version src; propagatedBuildInputs = [ qcheck-ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix index 62b082f48f..06897987a9 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/qcheck/ounit.nix @@ -3,7 +3,7 @@ buildDunePackage { pname = "qcheck-ounit"; - inherit (qcheck-core) version useDune2 src; + inherit (qcheck-core) version src; propagatedBuildInputs = [ qcheck-core ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix index 04f181d759..6791c7d127 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,30 +1,39 @@ -{ lib, buildDunePackage, fetchFromGitHub, pkg-config, openssl -, dune-configurator }: +{ alcotest +, buildDunePackage +, dune-configurator +, fetchFromGitHub +, lib +, ocaml +, openssl +, pkg-config +}: buildDunePackage rec { pname = "ssl"; - version = "0.5.10"; + version = "0.5.11"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-ssl"; - rev = "v${version}"; - sha256 = "1rszqiqayh67xlwd5411k8vib47x9kapdr037z1majd2c14z3kcb"; + rev = version; + sha256 = "sha256-uFr+XSKDGMHaM2o5DODYmt7+LkhnDzzlVX//CtAXBm4="; }; - useDune2 = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dune-configurator ]; - propagatedBuildInputs = [openssl]; + propagatedBuildInputs = [ openssl ]; + + doCheck = lib.versionAtLeast ocaml.version "4.06"; + checkInputs = [ alcotest ]; + preCheck = '' + mkdir -p _build/default/tests/ + cp tests/digicert_certificate.pem _build/default/tests/ + ''; meta = { homepage = "http://savonet.rastageeks.org/"; description = "OCaml bindings for libssl "; license = "LGPL+link exception"; - maintainers = [ - lib.maintainers.maggesi - lib.maintainers.anmonteiro - lib.maintainers.dandellion - ]; + maintainers = with lib.maintainers; [ anmonteiro dandellion maggesi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix index ceac7a7c07..51d1b89f91 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/async.nix @@ -5,8 +5,7 @@ buildDunePackage rec { inherit (tls) src meta version; - minimumOCamlVersion = "4.08"; - useDune2 = true; + minimalOCamlVersion = "4.11"; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix index 7ab4ff13b4..c1c3594f44 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/ast/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "ast"; - version = "1.0.16"; - sha256 = "sha256-Rb2jS3gMRmHOd89lzYpQT7VlJtS0Vu3Ml9eRyG84ec4="; + version = "1.1.0"; + sha256 = "sha256-7j1PZ+JNguTTQIBqJAUgEuSVTSIxIpSTd2ZUJ0Q+bRM="; meta = with lib; { description = "Exposes the abstract syntax tree generated by PHP"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix index c153aa5314..6d4d5ddd12 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.3.7"; + version = "2.3.10"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-Py1GeH1RBw+SK/mRqggyRWb3JvGGB2wqXk6LAajqP9A="; + sha256 = "2AgnLyhPqOD4tHBwPhQ4rI82IDC7ydEuKVMCd9dnr/A="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix index f10b474f7b..9bdfaa3b4b 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix @@ -2,8 +2,8 @@ buildPecl { pname = "event"; - version = "3.0.6"; - sha256 = "sha256-BN43wydPQBCVla29YoPqKSVihSZCkLAIgDZb+CNQecw="; + version = "3.0.8"; + sha256 = "sha256-4+ke3T3BXglpuSVMw2Jq4Hgl45vybWG0mTX2b2A9e2s="; configureFlags = [ "--with-event-libevent-dir=${libevent.dev}" diff --git a/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix index 24be5b3a66..0d37ff63ea 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/grpc/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "grpc"; - version = "1.45.0"; - sha256 = "sha256-SPnECBZ80sXfXYiVJjGfOsSxZBBZnasO9pPu9Q5klIg"; + version = "1.48.0"; + sha256 = "sha256-S0zLSRNV+TjSjmOkdt+S1RCSY+pj/+4eAklhZGHiaWM="; doCheck = true; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix index bb6087631e..14a729188f 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/mongodb/default.nix @@ -14,8 +14,8 @@ buildPecl { pname = "mongodb"; - version = "1.13.0"; - sha256 = "sha256-IoZbYdJkyQyeqoXZTy9fV+VkFAyth8jCYB+jP4Dv4Ls="; + version = "1.14.0"; + sha256 = "sha256-VXdeaSB6f5xDxiiDIg87xgDT4/Zjr1AAC+cK0+5RgY4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix index 8f47a211e7..c8411a1e8e 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "pdo_sqlsrv"; - version = "5.10.0"; - sha256 = "sha256-BEa7i/8egvz9mT69dl0dxWcVo+dURT9Dzo6f6EdlESo="; + version = "5.10.1"; + sha256 = "sha256-x4VBlqI2vINQijRvjG7x35mbwh7rvYOL2wUTIV4GKK0="; internalDeps = [ php.extensions.pdo ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix index 6c5af7d5d2..8b9dbd1225 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phing/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phing"; - version = "2.17.2"; + version = "2.17.4"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://www.phing.info/get/phing-${version}.phar"; - sha256 = "sha256-KDqJdHIqgtar6ofNG4ENRlpRg9XYFeL5YS7Rclh1+PQ="; + sha256 = "sha256-3QZsl5QJkFX5Z4RovMtw2ELCp8Zl4xiZsIBikakJ474="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix index 9104c0a0c8..3fc48f1a79 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "php-cs-fixer"; - version = "3.8.0"; + version = "3.9.5"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "sha256-kOdJ2xuS095xVdPxoz4q/XM0BpyJEy6V/CtkuTN/Chk="; + sha256 = "sha256-uD8N/fJAb8lvsFvP/zuw9jwV8ng//xWE+oNuOZ553UU="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index 029bf14787..f164bae091 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "phpstan"; - version = "1.5.4"; + version = "1.8.2"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "sha256-6dXYrDpQ3E+z8mcZof7GSXOrUMoceuPTHO21Z8l4Wyw="; + sha256 = "sha256-NnbEN9dhPUBtgEiKj5mBtW9RnTE9jmx/ZqRdqmuyIog="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix index b24a8f025e..692fdac226 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/protobuf/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "protobuf"; - version = "3.19.4"; - sha256 = "sha256-ijo+UZz+Hh3F8FUJmcUIbKBLkv4t4CWIrbRUfUp7Zbo="; + version = "3.21.4"; + sha256 = "sha256-vhfoUu63KhndfQTiITtTnaqFVF9OWMCaLf/9PUioKkQ="; buildInputs = [ pcre2 ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix index 01f79c3639..e3f2914526 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psalm"; - version = "4.15.0"; + version = "4.25.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/v${version}/psalm.phar"; - sha256 = "jvUNnA5OTmw3h1O1Ur7pUojgU5IRgwq2U/JF/ByO0EA="; + sha256 = "sha256-bEv9YzBycN+fs3DeAU/QpuOvsmUFLgrltGEe2KuUM0c="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix index f1105dea91..b42375f74d 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/psysh/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, lib, php }: let pname = "psysh"; - version = "0.11.2"; + version = "0.11.8"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "sha256-u7VTlZw9k7VDWKGK/8fzFw0bjNu6DMGsoQnDedHgCWg="; + sha256 = "sha256-VK1e3qQGaN6Kc/5dUaGwrHAqk9yiJCwbW29x6i6nHQ4="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix index 04e6df329a..f07bc87dd3 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/rdkafka/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "rdkafka"; - version = "6.0.1"; - sha256 = "sha256-ikq+cB5ZPRBCwhB0YQT0sEsVrJjbYzGEju2RrK388ZI="; + version = "6.0.3"; + sha256 = "sha256-Euqrl21JaX4x8WOLR4ietexhrbdYcIlBESsVf47H3Ug="; buildInputs = [ rdkafka pcre2 ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix index b70b6c3f3d..6bbf7cc4f6 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/sqlsrv/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "sqlsrv"; - version = "5.10.0"; - sha256 = "sha256-drPwg6Go8QNYHCG6OkbWyiV76uZyjNFYpkpGq1miJrQ="; + version = "5.10.1"; + sha256 = "sha256-XNrttNiihjQ+azuZmS2fy0So+2ndAqpde8IOsupeWdI="; buildInputs = [ unixODBC diff --git a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix index fb69c18710..8572338336 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/swoole/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "swoole"; - version = "4.8.8"; - sha256 = "sha256-SnhDRC7/a7BTHn87c6YCz/R8jI6aES1ibSD6YAl6R+I="; + version = "4.8.11"; + sha256 = "sha256-MH3deQniTI7df2UNfK7v1qkP5JxyGw3j9adAeZBDD2c="; buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [ valgrind ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix index 3d896a4dc4..74a6d63aba 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/xdebug/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "xdebug"; - version = "3.1.4"; - sha256 = "sha256-QZWSb59sToAv90m7LKhaxQY2cZpy5TieNy4171I1Bfk="; + version = "3.1.5"; + sha256 = "sha256-VfbvOBJF2gebL8XOHPvLeWEZfQwOBPnZd2E8+aqWmnk="; doCheck = true; checkTarget = "test"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix index 16ef7a71d1..698a416545 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/JPype1/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "JPype1"; - version = "1.3.0"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "4fc27dba89750cb0c9d692466341ce60c0fe86a16051091cb5347a37cf884151"; + sha256 = "sha256-DF9mXuPm4xwn6dLUjdEr9OtP5oWII+ahEgGgNSdMz+E="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix index a74f9988ad..694f3138c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Mako/default.nix @@ -13,17 +13,19 @@ # tests , mock , pytestCheckHook +, lingua +, chameleon }: buildPythonPackage rec { pname = "Mako"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mnx+kiuH2zaGIQz0nV12cDOkHUAQsoTnR2gskr3dizk="; + sha256 = "sha256-8FSl/0dDSS8aqezEcXLLM7QrnZk8/8wUbJ3hfnF7Awc="; }; propagatedBuildInputs = [ @@ -37,8 +39,10 @@ buildPythonPackage rec { }; checkInputs = [ - pytestCheckHook + chameleon + lingua mock + pytestCheckHook ] ++ passthru.optional-dependencies.babel; disabledTests = lib.optionals isPyPy [ @@ -51,11 +55,6 @@ buildPythonPackage rec { "test_bytestring_passthru" ]; - disabledTestPaths = [ - # lingua dependency is not packaged - "test/ext/test_linguaplugin.py" - ]; - meta = with lib; { description = "Super-fast templating language"; homepage = "https://www.makotemplates.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix index 7b8ab874eb..7182222db5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.6.7"; + version = "0.6.9"; src = fetchPypi { inherit pname version; - sha256 = "ebc01bccc25dba68414ab55b482341f9ad2b197d7f49d5e724f339bbf63fb6db"; + sha256 = "sha256-QCdOiCmo21P9vjKPWAV6Wrfi664Hx3uJ8V44B2mLtbw="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix new file mode 100644 index 0000000000..58d07696de --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aardwolf/default.nix @@ -0,0 +1,57 @@ +{ lib +, arc4 +, asn1crypto +, asn1tools +, asysocks +, buildPythonPackage +, colorama +, fetchPypi +, minikerberos +, pillow +, pyperclip +, pythonOlder +, tqdm +, unicrypto +, winsspi +}: + +buildPythonPackage rec { + pname = "aardwolf"; + version = "0.0.8"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-plz1D+Lr5rV8iJo7IUmuXfjxLvVxX9lgyxyYXUlPH0k="; + }; + + propagatedBuildInputs = [ + arc4 + asn1crypto + asn1tools + asysocks + colorama + minikerberos + pillow + pyperclip + tqdm + unicrypto + winsspi + ]; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "aardwolf" + ]; + + meta = with lib; { + description = "Asynchronous RDP protocol implementation"; + homepage = "https://github.com/skelsec/aardwolf"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix index 60c3bcc4e9..402fab32f5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "ac511215c01ee9ae47b19716599e8ccfa746f2e18de72bdf641b79b22afa27ea"; + sha256 = "sha256-OqOfiYMpwhVv9SXfppznCeQtd6qxi/SRdxnW8mCqagg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix index e888d1241a..f81f382b95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/acoustics/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "acoustics"; - version = "0.2.4.post0"; + version = "0.2.6"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "a162625e5e70ed830fab8fab0ddcfe35333cb390cd24b0a827bcefc5bbcae97d"; + sha256 = "sha256-0CvMhCUc+i7dPiHH+IXdlj+OjFh/l1wvnU4dmxQrzFI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix new file mode 100644 index 0000000000..532fd301a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-nrfutil/default.nix @@ -0,0 +1,62 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, pythonOlder +, pyserial +, click +, ecdsa +, behave +, nose +}: + +buildPythonPackage rec { + pname = "adafruit-nrfutil"; + version = "0.5.3.post17"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "adafruit"; + repo = "Adafruit_nRF52_nrfutil"; + rev = version; + sha256 = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; + }; + + patches = [ + # Pull a patch which fixes the tests, but is not yet released in a new version: + # https://github.com/adafruit/Adafruit_nRF52_nrfutil/pull/38 + (fetchpatch { + name = "fix-tests.patch"; + url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/e5fbcc8ee5958041db38c04139ba686bf7d1b845.patch"; + sha256 = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; + }) + ]; + + propagatedBuildInputs = [ + pyserial + click + ecdsa + ]; + + checkInputs = [ + behave + nose + ]; + + preCheck = '' + mkdir test-reports + ''; + + pythonImportsCheck = [ + "nordicsemi" + ]; + + meta = with lib; { + homepage = "https://github.com/adafruit/Adafruit_nRF52_nrfutil"; + description = "Modified version of Nordic's nrfutil 0.5.x for use with the Adafruit Feather nRF52"; + license = licenses.bsd3; + maintainers = with maintainers; [ stargate01 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix index c5d1d1b9e8..69f87cc414 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.25.0"; + version = "3.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-8K8OKHxuPG5bibb49Epgv9lMuZ7Ipk9753sI22e6j24="; + hash = "sha256-Ez3VQO52GgPhTXr1xlxr4BvouI41PVzppkutiqVjrUI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix index f117167c8d..383a3fe782 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix @@ -50,13 +50,6 @@ buildPythonPackage rec { ++ passthru.optional-dependencies.async ++ passthru.optional-dependencies.usb; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # Tests are failing with Python 3.10 - # https://github.com/JeffLIrion/adb_shell/issues/198 - "TestAdbDeviceAsync" - "TestTcpTransportAsync" - ]; - pythonImportsCheck = [ "adb_shell" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix index d8a8cf5797..90c8645547 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/advantage-air/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "advantage-air"; - version = "0.3.1"; + version = "0.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "advantage_air"; inherit version; - hash = "sha256-C+cB6oHmbr9mHZKnbls42yenQy3+L8huLk9wKazIWfU="; + hash = "sha256-I9HMDLZX9xKDJuYSAweM2r4v3ZKevHTn5dHTYxN3EuE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix index 67b9ee40e2..5d91bc4de8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aesara/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "aesara"; - version = "2.7.7"; + version = "2.7.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "aesara-devs"; repo = "aesara"; rev = "refs/tags/rel-${version}"; - hash = "sha256-Dr4MPNtPGKmViVP2FSF8bvrQ68Dz/ASK/MTRCRUnFOE="; + hash = "sha256-s7qqFSY4teL2uiGg6CkpPtr7lNNAj61nCn83Zr7/JaQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix index 2ca94a2085..2959350325 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/afdko/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { "test_filename_without_dir" "test_overwrite" "test_options" - ] ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV) [ + ] ++ lib.optionals (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isRiscV) [ # unknown reason so far # https://github.com/adobe-type-tools/afdko/issues/1425 "test_spec" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix index 4df1dba8dd..323c0a2253 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/afsapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "afsapi"; - version = "0.2.6"; + version = "0.2.7"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "wlcrs"; repo = "python-afsapi"; rev = "refs/tags/${version}"; - hash = "sha256-SPHED/zbrjULtJFz1x+0kq+lDrLeuol+1rOH2/xWEnI="; + hash = "sha256-TTZk/8mfG5lBr8SyMbqSaYDskWKnUlMkAUp94DXPCKo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix index 4d970b1822..d02d71d866 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix @@ -15,10 +15,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; - disabledTests = [ - # See https://github.com/wireservice/agate-excel/issues/45 - "test_ambiguous_date" - ]; + pythonImportsCheck = [ "agate" ]; meta = with lib; { description = "Adds read support for excel files to agate"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index c2e741bef1..827f73f27e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -5,7 +5,7 @@ , agate , sqlalchemy , crate -, nose +, pytestCheckHook , geojson }: @@ -22,15 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ agate sqlalchemy ]; - # crate is broken in nixpkgs, with SQLAlchemy > 1.3 - # Skip tests for now as they rely on it. - doCheck = false; - - checkInputs = [ crate nose geojson ]; - - checkPhase = '' - nosetests - ''; + checkInputs = [ crate geojson pytestCheckHook ]; pythonImportsCheck = [ "agatesql" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 024fa0bed6..c56b09cb9b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.10"; + version = "9.2.13"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-l2rnCtzHeK9B/sb8EQUeTRiapE3Dzcysej1zqO0rrV0="; + hash = "sha256-fnCeNW0Rccu6e1WrmLeHgUnlxMHh9t1q10DtzyVymP8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix index 83019e202e..61b67cb32a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioairzone/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.4.6"; + version = "0.4.9"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-DDp9gtKavO3LCDnaZsYYLTWwoy0kQaTitJeALSPlXaQ="; + hash = "sha256-qG+EPZjH3I4TRGka7J21ukGpuJQfA/Nuy6DbIUnykcs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix index 52680d0963..01df805ab6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.25"; + version = "0.1.41"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-ruuiRhPPqsZxJgaKVtwQK8Zf7gG9r2NYnrBCosTtL/M="; + hash = "sha256-o9dwGBMDL8kweqts4t73vxXQrVxYn9dBJDudpQNkKdo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix new file mode 100644 index 0000000000..41e96f26cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix @@ -0,0 +1,53 @@ +{ lib +, aiohttp +, auth0-python +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pyjwt +, pytest-aiohttp +, pytestCheckHook +, python-dateutil +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiobiketrax"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "basilfx"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zaHetU0ZG3xkYrO6qA4o+NX8V5td/E08tPEohEwMjh0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + auth0-python + python-dateutil + pyjwt + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aiobiketrax" + ]; + + meta = with lib; { + description = "Library for interacting with the PowUnity BikeTrax GPS tracker"; + homepage = "https://github.com/basilfx/aiobiketrax"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioblescan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioblescan/default.nix new file mode 100644 index 0000000000..462a4088f6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioblescan/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioblescan"; + version = "0.2.13"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "frawau"; + repo = pname; + rev = version; + hash = "sha256-n1FiBsuVpVJrIq6+kuMNugpEaUOFQ/Gk/QU7Hry4YrU="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aioblescan" + ]; + + meta = with lib; { + description = "Library to listen for BLE advertized packets"; + homepage = "https://github.com/frawau/aioblescan"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix index 199495494a..81977915fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "2.3.0"; + version = "2.3.4"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/D09YGFBC8GU0J7FReMLRGnV90dw+TespfaqReYqG/4="; + sha256 = "sha256-ZVTr6ldk9m9L5USk/KoJU+6A5gDde9gYukiT1yvxK/s="; }; # relax version constraints: aiobotocore works with newer botocore versions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix new file mode 100644 index 0000000000..32a6152efc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioecowitt/default.nix @@ -0,0 +1,46 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, meteocalc +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioecowitt"; + version = "2022.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-GALBhapE31CM2mqBrgcdQf5SJV+edN3kj35r0cf7BcU="; + }; + + propagatedBuildInputs = [ + aiohttp + meteocalc + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aioecowitt" + ]; + + meta = with lib; { + description = "Wrapper for the EcoWitt protocol"; + homepage = "https://github.com/home-assistant-libs/aioecowitt"; + changelog = "https://github.com/home-assistant-libs/aioecowitt/releases/tag/${version}"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index da0e8021d5..8f0ef50e7f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -33,6 +33,10 @@ buildPythonPackage rec { trustme ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + disabledTests = lib.optionals stdenv.isDarwin [ # uses 127.0.0.2, which macos doesn't like "test_pasv_connection_pasv_forced_response_address" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix index 03dacdef89..38bd95989f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiogithubapi/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { # Upstream is releasing with the help of a CI to PyPI, GitHub releases # are not in their focus substituteInPlace pyproject.toml \ - --replace 'version="main",' 'version="${version}",' + --replace 'version = "0"' 'version = "${version}"' ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix index ed902288d0..511400ccfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioguardian/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "aioguardian"; - version = "2022.03.2"; + version = "2022.07.0"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = version; - sha256 = "sha256-eEvvcj8tHNErU6RrWar5mxG3xbQ5wCEEYJ95hXkdY54="; + rev = "refs/tags/${version}"; + sha256 = "sha256-87MumQ6MuhRRDHrcH1nmOPviKDaT4crYnq5Pd26qsLw="; }; format = "pyproject"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix index aa312fb7d0..604d1f37e2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohomekit/default.nix @@ -1,9 +1,13 @@ { lib , buildPythonPackage +, aiocoap +, bleak +, bleak-retry-connector , chacha20poly1305-reuseable , commentjson , cryptography , fetchFromGitHub +, orjson , poetry-core , pytest-aiohttp , pytestCheckHook @@ -13,16 +17,16 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "0.7.20"; + version = "1.2.9"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-g7N+CIBJCMnW4FjN502SahhSpPS1p7AXZvduteHu+Z4="; + hash = "sha256-9ejha07hYwB/BZ7hmJHhmLb313ZrTvEXBylswJMlBmU="; }; nativeBuildInputs = [ @@ -30,9 +34,13 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiocoap + bleak + bleak-retry-connector chacha20poly1305-reuseable commentjson cryptography + orjson zeroconf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 890a37e24d..3e3148fce7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -1,22 +1,53 @@ -{ lib, buildPythonPackage, fetchPypi, aiohttp, jinja2, pytest, pytest-aiohttp, pytest-cov }: +{ lib +, aiohttp +, buildPythonPackage +, fetchPypi +, jinja2 +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "aiohttp-jinja2"; version = "1.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "7c3ba5eac060b691f4e50534af2d79fca2a75712ebd2b25e6fcb1295859f910b"; + hash = "sha256-fDul6sBgtpH05QU0ry15/KKnVxLr0rJeb8sSlYWfkQs="; }; - propagatedBuildInputs = [ aiohttp jinja2 ]; + propagatedBuildInputs = [ + aiohttp + jinja2 + ]; - checkInputs = [ pytest pytest-aiohttp pytest-cov ]; + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; - checkPhase = '' - pytest -W ignore::DeprecationWarning + postPatch = '' + substituteInPlace setup.cfg \ + --replace " --cov=aiohttp_jinja2 --cov-report xml --cov-report html --cov-report term" "" ''; + pytestFlagsArray = [ + "-W" + "ignore::DeprecationWarning" + ]; + + pythonImportsCheck = [ + "aiohttp_jinja2" + ]; + + # Tests are outdated (1.5) + # pytest.PytestUnhandledCoroutineWarning: async def functions... + doCheck = false; + meta = with lib; { description = "Jinja2 support for aiohttp"; homepage = "https://github.com/aio-libs/aiohttp_jinja2"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix index 3cd0fe0984..f03ca026d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-retry/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiohttp-retry"; - version = "2.5.6"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "inyutin"; repo = "aiohttp_retry"; rev = "v${version}"; - hash = "sha256-jyt4YPn3gSgR1YfHYLs+5VCsjAk9Ij+2m5Kzy51CnLk="; + hash = "sha256-vMnk7OHXTgFLcnqauAPB/vxVt8bP1To6KTIgNv7Ek+Q="; }; propagatedBuildInputs = [ @@ -34,6 +34,10 @@ buildPythonPackage rec { "aiohttp_retry" ]; + pytestFlagsArray = [ + "--asyncio-mode=auto" + ]; + meta = with lib; { description = "Retry client for aiohttp"; homepage = "https://github.com/inyutin/aiohttp_retry"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix index 68a630a96e..62aeb1fd99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "aiolifx"; - version = "0.8.1"; + version = "0.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w6d2qpU8jPrE2Dtuq4825qOCU1SoIpkEjOEX+BYxhuU="; + hash = "sha256-k47cXi2CDtFIV3gzfdYU4i17ry0ABXcWK5CcWhwTdT0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix new file mode 100644 index 0000000000..dfa02c9794 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiomysensors/default.nix @@ -0,0 +1,64 @@ +{ lib +, aiofiles +, asyncio-mqtt +, awesomeversion +, buildPythonPackage +, click +, fetchFromGitHub +, marshmallow +, poetry-core +, pyserial-asyncio +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiomysensors"; + version = "0.3.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "MartinHjelmare"; + repo = pname; + rev = "v${version}"; + hash = "sha256-EGVoHEJrpGtp8OrhQhRZVaN1GhL4QCo/azp6pzgYYcs="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiofiles + asyncio-mqtt + awesomeversion + click + marshmallow + pyserial-asyncio + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=src --cov-report=term-missing:skip-covered" "" \ + --replace 'marshmallow = "^3.17"' 'marshmallow = "*"' + ''; + + pythonImportsCheck = [ + "aiomysensors" + ]; + + meta = with lib; { + description = "Library to connect to MySensors gateways"; + homepage = "https://github.com/MartinHjelmare/aiomysensors"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix new file mode 100644 index 0000000000..18b6ae78b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -0,0 +1,57 @@ +{ lib +, aiohttp +, aioresponses +, pydantic +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioopenexchangerates"; + version = "0.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "MartinHjelmare"; + repo = pname; + rev = "v${version}"; + hash = "sha256-qm9B4m5CLhfqnZj+sdHZ+iA0+YnDR9Dh3lCy/YADkEI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pydantic + ]; + + checkInputs = [ + aioresponses + pytest-aiohttp + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "aioopenexchangerates" + ]; + + meta = with lib; { + description = "Library for the Openexchangerates API"; + homepage = "https://github.com/MartinHjelmare/aioopenexchangerates"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix new file mode 100644 index 0000000000..83ed397e47 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiortm/default.nix @@ -0,0 +1,55 @@ +{ lib +, aiohttp +, buildPythonPackage +, click +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "aiortm"; + version = "0.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "MartinHjelmare"; + repo = pname; + rev = "v${version}"; + hash = "sha256-DTFynPFf0NUBieXDiMKhCNwBqx3s/xzggNmnz/IKjbU="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + click + yarl + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=aiortm --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "aiortm" + ]; + + meta = with lib; { + description = "Library for the Remember the Milk API"; + homepage = "https://github.com/MartinHjelmare/aiortm"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix index 6c6ba7e93e..a3dfa62705 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioshelly/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "2.0.0"; + version = "3.0.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = pname; - rev = version; - hash = "sha256-1bIlK/5UoGq6xTjcpkAkHPBlM+ifZhnbWzGbPRdFGkU="; + rev = "refs/tags/${version}"; + hash = "sha256-Id4qg7uSvpjXpEx0/EvSMvFxgkR78/NOoOmmwngj7Qw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix index d03cc22ab1..958467823d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioswitcher/default.nix @@ -41,6 +41,10 @@ buildPythonPackage rec { time-machine ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + disabledTests = [ # AssertionError: Expected <14:00> to be equal to <17:00>, but was not. "test_schedule_parser_with_a_weekly_recurring_enabled_schedule_data" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix index 7bbf740c78..624c86fb31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiosyncthing/default.nix @@ -34,6 +34,10 @@ buildPythonPackage rec { pytest-mock ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov=aiosyncthing --cov-report=html" "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix index 6b736b416e..d2f9ad9169 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiounittest/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiounittest"; - version = "1.4.1"; + version = "1.4.2"; disabled = isPy27; src = fetchFromGitHub { owner = "kwarunek"; repo = pname; - rev = version; - sha256 = "sha256-FixGF1JLJVqTgLaWugbeu8f+SDjpHSdSLoGklYBup4M="; + rev = "refs/tags/${version}"; + sha256 = "sha256-7lDOI1SHPpRZLTHRTmfbKlZH18T73poJdFyVmb+HKms="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix index ea8f4d4d13..aefe80a3b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.7.7"; + version = "1.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SWEkgXPq186KIe+z3jePE7g5jmYw+rDrJY3HSoryTFg="; + sha256 = "sha256-zQteRbFLcGQmuDPwY2m5ptXuA/gm7DI4cjzoyq9uX/o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix index e8e63f41b6..0e97eda470 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amazon-ion/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , jsonconversion , six , pytestCheckHook @@ -9,15 +9,18 @@ buildPythonPackage rec { pname = "amazon-ion"; - version = "0.9.1"; + version = "0.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "amazon.ion"; - inherit version; - hash = "sha256-Moq1e7LmI0L7DHg6UNYvseEDbqdL23aCwL38wDm3yCA="; + # test vectors require git submodule + src = fetchFromGitHub { + owner = "amzn"; + repo = "ion-python"; + rev = "v${version}"; + fetchSubmodules = true; + hash = "sha256-BLlKxm63KsmMFajS4uJne/LPNXboOfy4uVm8HqO9Wfo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix index 7458ca11e9..71c07c07cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/amqtt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "amqtt"; - version = "unstable-2022-01-11"; + version = "unstable-2022-05-29"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Yakifo"; repo = pname; - rev = "8961b8fff57007a5d9907b98bc555f0519974ce9"; - hash = "sha256-3uwz4RSoa6KRC8mlVfeIMLPH6F2kOJjQjjXCrnVX0Jo="; + rev = "09ac98d39a711dcff0d8f22686916e1c2495144b"; + hash = "sha256-8T1XhBSOiArlUQbQ41LsUogDgOurLhf+M8mjIrrAC4s="; }; nativeBuildInputs = [ @@ -48,14 +48,12 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'PyYAML = "^5.4.0"' 'PyYAML = "*"' - ''; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; disabledTestPaths = [ # Test are not ported from hbmqtt yet - "tests/test_cli.py" "tests/test_client.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index f98f3ef3f9..63165f6214 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.10"; + version = "9.2.13"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-GkNpcYY9BEdLlWWOZQt2Ahdp8474RGbvV4UWTdBTKjc="; + hash = "sha256-yEYqwyRJ/LN9q0f5vJIVMnVXQxRht73zDifWeevGc80="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/annoy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/annoy/default.nix index d5f24492c9..97841a6a62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/annoy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/annoy/default.nix @@ -3,23 +3,33 @@ , fetchPypi , h5py , nose +, pythonOlder }: buildPythonPackage rec { - version = "1.17.0"; pname = "annoy"; + version = "1.17.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "9891e264041d1dcf3af42f67fbb16cb273c5404bc8c869d0915a3087f71d58dd"; + hash = "sha256-vxd9vq+4H2OyrB4SRrHyairMguc7pGY4c00p2CWBIto="; }; - nativeBuildInputs = [ h5py ]; + nativeBuildInputs = [ + h5py + ]; checkInputs = [ nose ]; + pythonImportsCheck = [ + "annoy" + ]; + meta = with lib; { description = "Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk"; homepage = "https://github.com/spotify/annoy"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix index 1f45968974..6489832c43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansi2html/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "ansi2html"; - version = "1.7.0"; + version = "1.8.0"; format = "pyproject"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-aTFr6MaKyRxVgtOXwokOacmTzHzaUgYqx+Rfy2YNjtw="; + sha256 = "sha256-OLgqKYSCofomE/D5yb6z23Ko+DLurFjrLke/Ms039tU="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-doctor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-doctor/default.nix index b70521d3d7..67dc34f19b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-doctor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-doctor/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ansible-doctor"; - version = "1.4.0"; + version = "1.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; - rev = "v${version}"; - hash = "sha256-onRur31Sa95nsXUYFJdAHySm4nIXqP01nT70IFPwLCo="; + rev = "refs/tags/v${version}"; + hash = "sha256-kfBEV3PXU+C7FD9xiBMvdamb3b2KXp+Qi23/xUnoXHM="; }; nativeBuildInputs = [ @@ -57,7 +57,8 @@ buildPythonPackage rec { --replace 'anyconfig = "0.13.0"' 'anyconfig = "*"' \ --replace 'environs = "9.5.0"' 'environs = "*"' \ --replace 'jsonschema = "4.6.0"' 'jsonschema = "*"' \ - --replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"' + --replace '"ruamel.yaml" = "0.17.21"' '"ruamel.yaml" = "*"' \ + --replace 'python-json-logger = "2.0.2"' 'python-json-logger = "*"' ''; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-later/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-later/default.nix index 5e7f717634..9e0af254b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-later/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-later/default.nix @@ -1,4 +1,6 @@ { lib +, ansible +, ansible-core , anyconfig , appdirs , buildPythonPackage @@ -21,7 +23,7 @@ buildPythonPackage rec { pname = "ansible-later"; - version = "2.0.14"; + version = "2.0.16"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -30,14 +32,28 @@ buildPythonPackage rec { owner = "thegeeklab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iY+5p6LNrlCTGi61cm2DJdyt8SmAwYqKmXNXescjAVQ="; + hash = "sha256-AlLy8rqqNrJtoI01OHq8W1Oi8iN8RiBdtq2sZ7zlTyM="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'version = "0.0.0"' 'version = "${version}"' \ + --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" \ + --replace 'PyYAML = "6.0"' 'PyYAML = "*"' \ + --replace 'unidiff = "0.7.3"' 'unidiff = "*"' \ + --replace 'jsonschema = "' 'jsonschema = "^' \ + --replace 'python-json-logger = "' 'python-json-logger = "^' \ + --replace 'toolz = "0.11.2' 'toolz = "*' \ + --replace 'yamllint = "' 'yamllint = "^' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ + ansible + ansible-core anyconfig appdirs colorama @@ -57,15 +73,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'version = "0.0.0"' 'version = "${version}"' \ - --replace " --cov=ansiblelater --cov-report=xml:coverage.xml --cov-report=term --cov-append --no-cov-on-fail" "" \ - --replace 'PyYAML = "6.0"' 'PyYAML = "*"' \ - --replace 'unidiff = "0.7.3"' 'unidiff = "*"' \ - --replace 'jsonschema = "' 'jsonschema = "^' - ''; - postInstall = '' rm $out/lib/python*/site-packages/LICENSE ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix index ded3205f47..c261e5b163 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "ansible-runner"; - version = "2.1.3"; + version = "2.2.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-2m5dD+gGDL5LnY7QbDYiGdu4GYu0C49WU29GZY2bnBo="; + hash = "sha256-zZtssRdAEbTi4KWZPU0E2SjN5f4iqJk67UQ4STOHwYI="; }; nativeBuildInputs = [ @@ -53,6 +53,8 @@ buildPythonPackage rec { preCheck = '' export HOME=$(mktemp -d) export PATH="$PATH:$out/bin"; + # avoid coverage flags + rm pytest.ini ''; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix index 118e82fae1..2b01eff0b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.13.1"; + version = "2.13.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q9R4zv8aCrqV6UzquNyCD0B7zA8AM9xUaEDN3CmjaVg="; + sha256 = "sha256-t3nQ5VqXcXwO5ehrSGqmfAfCgJ70d74qyErQkajdLds="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix index 0a8ae13204..d2f7dba386 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.1.0"; + version = "6.2.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-keSyOUXxkKqhI8a6T4rMuOf4kFmRvTuxm4mvvcpFaCI="; + sha256 = "sha256-va8rL9km/xifveL+/nI0cz8yw2/EEwM/pdk5RfvcBqY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix index d0e8d4fab4..1ab91cacbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/antlr4-python3-runtime/default.nix @@ -1,11 +1,13 @@ -{ lib, buildPythonPackage, isPy3k, python -, antlr4 -}: +{ lib +, buildPythonPackage +, isPy3k +, python +, antlr4 }: buildPythonPackage rec { pname = "antlr4-python3-runtime"; inherit (antlr4.runtime.cpp) version src; - disabled = !isPy3k; + disabled = python.pythonOlder "3.6"; sourceRoot = "source/runtime/Python3"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix index b03b59d339..b34a711f6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anyascii/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "anyascii"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JPJ0Mftkxsk6MxJftm+MugB6UmK8H6q+r+2l9LtwtZM="; + sha256 = "sha256-3t9XcoIG4obJHu18dZUFpeRcjNATZ91Awvcki7FcEfY="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix index 49be7afaac..489e200afb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "anybadge"; - version = "1.9.0"; + version = "1.11.1"; format = "setuptools"; src = fetchFromGitHub { owner = "jongracecox"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9C1oPZcXjrGwvkx20E+xPGje+ATD9HwOCWWn/pg+98Q="; + sha256 = "sha256-6br4WUwE1ovAneYUeTHcUN3PH5Wm1rnLYCpXDUshk7Q="; }; # setup.py reads its version from the TRAVIS_TAG environment variable diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix index 9a3bb02a5c..d6257e537b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-airflow/default.nix @@ -65,13 +65,13 @@ , mkYarnPackage }: let - version = "2.2.4"; + version = "2.3.3"; airflow-src = fetchFromGitHub rec { owner = "apache"; repo = "airflow"; - rev = version; - sha256 = "sha256-JCcEgCq1sB8lBaeJy7QQbWU00sGAh5vUmJAptF8M9qo="; + rev = "refs/tags/${version}"; + sha256 = "sha256-N+6ljfSo6+UvSAnvDav6G0S49JZ1VJwxmaiKPV3/DjA="; }; # airflow bundles a web interface, which is built using webpack by an undocumented shell script in airflow's source tree. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix index 17e5389a5b..508d6670c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix @@ -37,8 +37,8 @@ , sqlalchemy , tenacity , typing-extensions -, scikit-learn -}: +, testcontainers +, scikit-learn }: buildPythonPackage rec { pname = "apache-beam"; @@ -55,7 +55,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "dill>=0.3.1.1,<0.3.2" "dill" \ - --replace "pyarrow>=0.15.1,<8.0.0" "pyarrow" + --replace "pyarrow>=0.15.1,<8.0.0" "pyarrow" \ + --replace "numpy>=1.14.3,<1.23.0" "numpy" \ + --replace "pymongo>=3.8.0,<4.0.0" "pymongo" ''; sourceRoot = "source/sdks/python"; @@ -90,6 +92,8 @@ buildPythonPackage rec { typing-extensions ]; + enableParallelBuilding = true; + pythonImportsCheck = [ "apache_beam" ]; @@ -107,6 +111,7 @@ buildPythonPackage rec { scikit-learn sqlalchemy tenacity + testcontainers ]; # Make sure we're running the tests for the actually installed @@ -122,8 +127,6 @@ buildPythonPackage rec { # container_init: Callable[[], Union[PostgresContainer, MySqlContainer]], # E NameError: name 'MySqlContainer' is not defined # - # Test relies on the testcontainers package, which is not currently (as of - # 2022-04-08) available in nixpkgs. "apache_beam/io/external/xlang_jdbcio_it_test.py" # These tests depend on the availability of specific servers backends. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix index 1b6528ab30..3179f9be6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix @@ -1,41 +1,47 @@ -{ lib, buildPythonPackage, fetchPypi -, pytest, setuptools-scm, isPy3k }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, hatch-vcs +, hatchling +, pytestCheckHook +}: buildPythonPackage rec { pname = "apipkg"; - version = "2.1.1"; + version = "3.0.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-zKNAIkFKE5duM6HjjWoJBWfve2jQNy+SPGmaj4wIivw="; + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = pname; + rev = "v${version}"; + hash = "sha256-gf84SzfuKLGYfI88IzPRJCqMZWwowUR10FgIbwXjwuY="; }; - nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest ]; + SETUPTOOLS_SCM_PRETEND_VERSION = version; - # Fix pytest 4 support. See: https://github.com/pytest-dev/apipkg/issues/14 - postPatch = '' - substituteInPlace "test_apipkg.py" \ - --replace "py.test.ensuretemp('test_apipkg')" "py.path.local('test_apipkg')" - ''; + nativeBuildInputs = [ + hatch-vcs + hatchling + ]; - # Failing tests on Python 3 - # https://github.com/pytest-dev/apipkg/issues/17 - checkPhase = let - disabledTests = lib.optionals isPy3k [ - "test_error_loading_one_element" - "test_aliasmodule_proxy_methods" - "test_eagerload_on_bython" - ]; - testExpression = lib.optionalString (disabledTests != []) - "-k 'not ${lib.concatStringsSep " and not " disabledTests}'"; - in '' - py.test ${testExpression} - ''; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "test_apipkg.py" + ]; + + pythonImportsCheck = [ + "apipkg" + ]; meta = with lib; { + changelog = "https://github.com/pytest-dev/apipkg/blob/main/CHANGELOG"; description = "Namespace control and lazy-import mechanism"; homepage = "https://github.com/pytest-dev/apipkg"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix index e4f1262a6c..b83b1b54bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/appnope/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "appnope"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit pname version; - sha256 = "dd83cd4b5b460958838f6eb3000c660b1f9caf2a5b1de4264e941512f603258a"; + sha256 = "sha256-Ar2RxN6Gn7seHFCq/ECYgnp6VKsvOdncumyVR+2SDiQ="; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix index 45354defe1..5c1b779b79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.9.9"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-a6PQ6DB+JkfDJA7BoNVXHzpFP5FD2Ug07LAmYLDo0kQ="; + hash = "sha256-llOQAzH4vR9O+pzaLCueJ7aar7Kt8UsrzmV5f3UzOss="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix index bbd39cf619..55b3cb1cca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix @@ -16,7 +16,7 @@ }: buildPythonPackage rec { - version = "5.3.0"; + version = "5.3.3"; pname = "approvaltests"; format = "setuptools"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - sha256 = "sha256-nKTMWdXnxAf+UBUHkx+LAY29A/QXH+AtPjC296aarjU="; + sha256 = "sha256-lFGwwe8L9hXlzaxcd9pxXin5/NPhCpvM4vFRbeQxZ9U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix index 1b67f4921e..c2c14fba37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apptools/default.nix @@ -26,11 +26,20 @@ buildPythonPackage rec { }; patches = [ + # python310: Fix tests + # https://github.com/enthought/apptools/issues/303 + (fetchpatch { + url = "https://github.com/enthought/apptools/commit/10fb73916124f7ae7edf6c6688a05ad95678488f.patch"; + sha256 = "sha256-izAcP5RWobLvnk2PQx31SX/TUGkw+prbYbjamYVmtjY="; + name = "fix_python310_tests.patch"; + }) + # python39: importlib_resources -> importlib.resources. This patch will be included # in the next release after 5.1.0. (fetchpatch { url = "https://github.com/enthought/apptools/commit/0ae4f52f19a8c0ca9d7926e17c7de949097f24b4.patch"; sha256 = "165aiwjisr5c3lasg7xblcha7y1y5bq23vi3g9gc80c24bzwcbsw"; + name = "fix_importlib-resources_naming.patch"; }) ]; @@ -52,14 +61,6 @@ buildPythonPackage rec { export HOME=$TMP ''; - disabledTestPaths = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/enthought/apptools/issues/303 - "apptools/io/h5/tests/test_dict_node.py" - "apptools/io/h5/tests/test_file.py" - "apptools/io/h5/tests/test_table_node.py" - ]; - - pythonImportsCheck = [ "apptools" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix index dda3fe6a68..e4b4a94bf8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apsw/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "apsw"; - version = "3.38.1-r1"; + version = "3.38.5-r1"; format = "setuptools"; disabled = isPyPy; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rogerbinns"; repo = "apsw"; - rev = version; - hash = "sha256-pbb6wCu1T1mPlgoydB1Y1AKv+kToGkdVUjiom2vTqf4="; + rev = "refs/tags/${version}"; + hash = "sha256-pPviSrONGgWZUREMENPt34bpHggR00Kl6DrB40JWm+w="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arc4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arc4/default.nix new file mode 100644 index 0000000000..755950f3a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/arc4/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "arc4"; + version = "0.2.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "manicmaniac"; + repo = pname; + rev = version; + hash = "sha256-1VgPYLyBQkxyuUO7KZv5sqYIEieV1RkBtlLVkLUUO4w="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "arc4" + ]; + + meta = with lib; { + description = "ARCFOUR (RC4) cipher implementation"; + homepage = "https://github.com/manicmaniac/arc4"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index f674cf567c..3c5bead9d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.10"; + version = "9.2.13"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-pd7QnJr+XXx+seGDlaLKBIew0Ldcnfsf7d1DgxZFREM="; + hash = "sha256-ili+jbrCKQCRD5eIWZBZqlX8wRaHiY6fC1QFEE2YOng="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asdf-standard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asdf-standard/default.nix index bc691fb020..170cefa42e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asdf-standard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf-standard/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "asdf-standard"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "asdf_standard"; inherit version; - hash = "sha256-Ic/AXdghVZtn37xU0DsrzArYtstcydFNdZH3OrNFFwA="; + hash = "sha256-r9j/mnDnsX9rzGTrkqVEhn1dT+HwB2cZFC/fYrls/UQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix index 616402aa71..6e857499f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asf-search/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "4.0.3"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-Af6Nyrl1mrYTG24/nIv+x5Znk20HOubjjPAUvbdnj+Y="; + hash = "sha256-Jynks+c8OV0t1GoKAk4vP9jYQ0PclJHl3x8q78au5gk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix index dc28b10d7b..6cde2e7550 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astroid/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.11.5"; # Check whether the version is compatible with pylint + version = "2.11.7"; # Check whether the version is compatible with pylint disabled = pythonOlder "3.6.2"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GKda3hNdOrsd11pi+6NpYodW4TAgSvqbv2hF4GaIvtM="; + sha256 = "sha256-HpniGxKf+daMh/sxP9T9UriYRrUFWqk7kDa8r+EqtVI="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix index 56d0cc766a..fbf40096da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/astropy/default.nix @@ -19,7 +19,7 @@ let pname = "astropy"; - version = "5.0.3"; + version = "5.1"; in buildPythonPackage { inherit pname version; @@ -29,7 +29,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-GxZOxV63HH8Pil8zVDOcWkLWEpg1ayFOT7n/JWqGgUc="; + sha256 = "sha256-HbGyx+3fx3PKZvozvQeyXVucO17uK5NODKJ3+lsbe34="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix index 7e6d0bc3fb..ce8572566e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/async-upnp-client/default.nix @@ -61,6 +61,11 @@ buildPythonPackage rec { "test_deferred_callback_url" ]; + disabledTestPaths = [ + # Tries to bind to multicast socket and fails to find proper interface + "tests/test_ssdp_listener.py" + ]; + pythonImportsCheck = [ "async_upnp_client" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index 7d28810380..0a3ef8f119 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.25.0"; + version = "0.26.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-Y/jmppczsoVJfChVRko03mV/LMzSWurutQcYcuk4JUA="; + hash = "sha256-d+aEok/uF7o+SHypgtAlntF7rhr2gAb0zyhLI7og6iw="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix index 1bb5096084..086bf0371a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.11.0"; + version = "2.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-WcNs53up3ajdV62HV3bnEF3bH6hRvAObs66t6sT2e1Y="; + sha256 = "sha256-J0EBMixLlBgjru2OGrbnvlGRaGxtstK9Na/rowUF54A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix index a607fe9658..4e91aafde6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncwhois/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "asyncwhois"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "v${version}"; - hash = "sha256-9tSGfF/Ezuya4pEyr1XolWXvSO/F/UrobRVlyHITNTU="; + hash = "sha256-TpUiUW9ntrpuT/rUhucedl+DM5X88Mislrd+3D5/TUE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix index 4eed27b3cf..d2f4cc0af8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atenpdu/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "atenpdu"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/duY1hS+RU/UAdcQoHF1+c99XaN74jj/0Hj/86U0kmo="; + sha256 = "sha256-vvq8InmJUgvm/PpvZutpsBR3Fj1gR+xrkgfEGlw04Ek="; }; propagatedBuildInputs = [ pysnmp ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix index 5335c044cd..dbf094d54b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/atomicwrites/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "atomicwrites"; - version = "1.4.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"; + sha256 = "sha256-gbLJBxpJNnp/dwFw5e7Iy2ZWfPu8jHPSDOXKSo1xzxE="; }; # Tests depend on pytest but atomicwrites is a dependency of pytest diff --git a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix index c6886dc8be..fe52973c2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix @@ -1,5 +1,8 @@ { lib +, aiohttp +, aioresponses , buildPythonPackage +, callee , fetchPypi , mock , pyjwt @@ -10,14 +13,14 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.22.0"; + version = "3.23.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-05yJbF6eXz+vJx+plY5gqzRRYL2SjDnF7gSfX6WIS4E="; + hash = "sha256-sXEWg6zrwMs8pCSloJtLL3o7ZAXTTiMXEgI7sDaogr4="; }; propagatedBuildInputs = [ @@ -26,12 +29,15 @@ buildPythonPackage rec { ]; checkInputs = [ + aiohttp + aioresponses + callee mock pytestCheckHook ]; disabledTests = [ - # tries to ping websites (e.g. google.com) + # Tries to ping websites (e.g. google.com) "can_timeout" "test_options_are_created_by_default" "test_options_are_used_and_override" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix index c55a6e4127..c023c8d692 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "0.15.5"; + version = "1.0.1"; pname = "authlib"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; - rev = "v${version}"; - sha256 = "1893mkzrlfxpxrgv10y134y8c3ni5hb0qvb0wsc76d2k4mci5j3n"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-2uzb3rhEDMgH2QZ0yUdI1c4qLJT5XIDmOV/1mV/5lnc="; }; propagatedBuildInputs = [ cryptography requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix index 10925ebac2..57e09385f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix @@ -48,14 +48,14 @@ buildPythonPackage rec { pname = "autobahn"; - version = "22.5.1"; + version = "22.6.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-NKpVabC0QZ+MJ3eSxgDcJRjEkwkox04iee+LiNi4o+o="; + sha256 = "sha256-+2PpRtXC3Q32gIUehOZWJKSUzofJmfKklE5PLYG/RJg="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix index bb7525d885..094015e56f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , attrs -, m2r , pytest-benchmark , pytestCheckHook , setuptools-scm @@ -19,8 +19,17 @@ let automat = buildPythonPackage rec { sha256 = "7979803c74610e11ef0c0d68a2942b152df52da55336e0c9d58daf1831cbdf33"; }; + patches = [ + # don't depend on m2r + (fetchpatch { + name = "dont-depend-on-m2r.patch"; + url = "https://github.com/glyph/automat/compare/v20.2.0..2562fa4ddeba5b5945d9482baa4c26a414f5e831.patch"; + includes = [ "setup.py" ]; + hash = "sha256-jlPLJMu1QbBpiVYHDiqPydrXjEoZgYZTVVGNxSA0NxY="; + }) + ]; + nativeBuildInputs = [ - m2r setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix index d69f009aaf..fd24227e03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/avro/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "avro"; - version = "1.11.0"; + version = "1.11.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1206365cc30ad561493f735329857dd078533459cee4e928aec2505f341ce445"; + sha256 = "sha256-8SNiPsxkjQ4gzhT47YUWIUDBPMSxCIZdGyUp+/oGwAg="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix index 9698b445eb..97bdc19a80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awkward/default.nix @@ -7,6 +7,7 @@ , pytestCheckHook , pyyaml , rapidjson +, setuptools }: buildPythonPackage rec { @@ -20,14 +21,21 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; buildInputs = [ pyyaml rapidjson ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ numpy setuptools ]; # https://github.com/scikit-hep/awkward/blob/main/requirements.txt dontUseCmakeConfigure = true; checkInputs = [ pytestCheckHook numba ]; - dontUseSetuptoolsCheck = true; + + disabledTests = [ + # incomatible with numpy 1.23 + "test_numpyarray" + ]; + disabledTestPaths = [ "tests-cuda" ]; + pythonImportsCheck = [ "awkward" ]; + meta = with lib; { description = "Manipulate JSON-like data with NumPy-like idioms"; homepage = "https://github.com/scikit-hep/awkward"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix index 1f0a38584d..edd0e94265 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.46.0"; + version = "1.47.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "aws"; repo = "serverless-application-model"; - rev = "v${version}"; - sha256 = "sha256-SLGxpRbTuK+Lxww45dfHIMwwxV5vhlnYyG4WqG45aNg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-FYEJ+mMxb8+OXUVeyLbAqOnujNi/wNhvAl4Lh4ZeE0I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix index 7a9722be28..fd8ed21cd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "b0cd972db218d4d8f7b53ad806fc6184626b924c4997ae58fc9f2a8cd1281568"; + sha256 = "sha256-mxSST9BijPkpNgVYZGVTVAA/CxrMPhw//eZAPQeZ3Xo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix index 13d57c6f85..ef179d27f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.13"; + version = "0.13.14"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4kCn5tydt56L22UvWQvhLcLVr31UH+oMfdjhtL9U/eI="; + hash = "sha256-K2x0Up3H6kIWcYeWvVegd1CkTjq8RoM0AOm0SX5u6wQ="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index bae168e26d..352fd019cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder , aiodns , aiohttp , flask @@ -11,30 +15,19 @@ , requests , six , trio -, typing-extensions -}: +, typing-extensions }: buildPythonPackage rec { - version = "1.24.0"; + version = "1.24.2"; pname = "azure-core"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-NFsbBB+q19AgWyDVaX8dDfNEMC56qoUBkFWA/4e9C+U="; + sha256 = "sha256-Dzog0kVlm/gfs2cAcKVBDI1KQymNWpgeYtzjkwAKkIQ="; }; - patches = [ - # FIXME: fixes tests with new versions of flask/werkzeug - # upstream PR: https://github.com/Azure/azure-sdk-for-python/pull/24450 - (fetchpatch { - url = "https://github.com/Azure/azure-sdk-for-python/commit/fb20b0b985f614bb7bcd84f3f5f6f3105de25fd9.patch"; - stripLen = 3; - sha256 = "sha256-Gt5T/UkQT1yml8bqYbeUpimfOPlmzpN1KKKUnbU9xJw="; - }) - ]; - propagatedBuildInputs = [ requests six @@ -83,6 +76,8 @@ buildPythonPackage rec { "tests/test_streaming.py" # testserver tests require being in a very specific working directory to make it work "tests/testserver_tests/" + # requires missing pytest plugin + "tests/async_tests/test_rest_asyncio_transport.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix index 45147a94b2..650b54c9dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.0"; pname = "azure-mgmt-appconfiguration"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "97e990ec6a5a3acafc7fc1add8ff1a160ebb2052792931352fd7cf1d90f1f956"; + sha256 = "sha256-6s3KfWOlzkoq7uxuDbFMYmW22rOYHtgQgYQ6RMFQiQ8="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 400ed795ae..6c0f36d92e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "azure-mgmt-compute"; - version = "27.1.0"; + version = "27.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-ixTWYs1hecmvuXrMbW1hXFsH9/nd7HjPUMSl3seXy7E="; + hash = "sha256-5caVUxZvt+7L/1LDfcD/SiUwvFVF1KXdS6mDIVrSKJ0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index aa9d27e680..0f8adb56ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-consumption"; - version = "9.0.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "76f9566390721226add96c9d3020ab986d3e5fd81e3143c098f57262c6ce4a51"; + sha256 = "sha256-BqCGQ2wXN/d6uGiU1R9Zc7bg+l7fVlWOTCllieurkTA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 36e77700b7..de3bca44c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "20.0.0"; + version = "20.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-dCPFy24cXij50OH8go2idgCEXakMZu8swT5UcpNIzmA="; + sha256 = "sha256-+XNJbI4LTxx8kcNr6dDlcaGujrqriKaEPb0deo6YbkM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix index 0a65dbfb7e..2a4b00432f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.3.1"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3ffb7352b39e5495dccc2d2b47254f4d82747aff4735e8bf3267c335b0c9bb40"; + sha256 = "sha256-yJ6/GMInvJih7sypVGC4p+IwWQ1FbI+pwtWs3GcPeAg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index f546f2e23e..d1a7178024 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -5,18 +5,20 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "6.4.0"; + version = "7.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b"; + hash = "sha256-NMwcqgvxwma+aXUhL8OQm+tpH+MCCjHMALf0Ii8bQlo="; }; propagatedBuildInputs = [ @@ -24,8 +26,6 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; # has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index 9f05ce07d7..c6907efc99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "2.6.0"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-mvZw+GOnOuDNDb4k8PY38IHBvSekYCDdIGUcGCJwWss="; + hash = "sha256-g7av5MFy4QNg+81PqDGznHXUZsHhnaauaJV/B6GMy4A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix index 40e5cbab3b..32e4bc0ebb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-extendedlocation"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e2388407dc27b93dec3314bfa64210d3514b98a4f961c410321fb4292b9b3e9a"; + sha256 = "sha256-jRo6EFP8Dg3i9U8HLfjED9QFfWbdg+X3o9PSf4eus9o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix index 005f5ca8f0..b00b496943 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.1.0"; pname = "azure-mgmt-imagebuilder"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "634e398de9a23e712aa27a4a59f9ea5d5091d1dfcfed5ac977230918872c4430"; + sha256 = "sha256-2EWfTsl5y3Sw4P8d5X7TKxYmO4PagUTNv/SFKdjY2Ss="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 200674d1a4..c0efa14178 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-keyvault"; - version = "10.0.0"; + version = "10.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-ALaVll2198a6DjOpzaHobE22N78Qe5koYYLxCtFiwaM="; + hash = "sha256-DpO+6FvsNwjjcz2ImhHpColHVNpPUMgCtEMrfUzfAaA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix index eb1bed0b54..57ccffcf99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "9.0.0"; + version = "10.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-TI7l8sSQ2QUgPqiE3Cu/F67Wna+KHbQS3fuIjOb95ZM="; + hash = "sha256-KKUeibEAUqKsjjjqpzYBFaQUGniY3rbe+lfCnL0+lpY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index 66818ce5b0..d2583b157f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "3.1.0"; + version = "4.0.1"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-ROcUAm0KgIjO2A2XBpS00IeEPgd8x4cjoMfn6X9C+Gw="; + hash = "sha256-rwUhKm9arvUW3EWAgv3+SdJYR54Hob2RmMDA6IjEpn4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix index d36a1b985c..45a57d1c68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-mgmt-msi"; - version = "6.0.1"; + version = "6.1.0"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-PPkQmUoBkJ8Su7h9G2/t8dVy/PT3uCYZjlf70fnY2vU="; + sha256 = "sha256-lS8da3Al1z1pMLDBf6ZtWc1UFUVgkN1qpKTxt4VXdlQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index f798ac2f8a..717637933e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "azure-mgmt-netapp"; - version = "8.0.0"; + version = "8.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-S0miYNV+mr3IiT5aLlDhiSpwpPMyWQ5m6/ZUrVfCNRM="; + hash = "sha256-Fdf9wzgeK5HY5d8HwFBokXB2ojHFNMVi9ne9ZQyVh5w="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix index 93cd52c63d..60f67855d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "20.0.0"; + version = "21.0.0"; pname = "azure-mgmt-network"; format = "setuptools"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-mnjPyCAJ+rlNgZ4umSYjfVVVg83EobZYY/zupyDjdoY="; + hash = "sha256-NwVC9ln7qXDJMwtCc9AyTOq7wnum3xv5DYAg8AmGR8g="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 29b0dd2eb1..4ad3f3bd25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a7d3137d5c460f50ac2d44061d60a70b4f2779d4ca844b77419b5725e65e09be"; + sha256 = "sha256-2DeOemVpkjeI/hUdG04IuHU2h3cmk3oG4kr1wIDvdbM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 28102aca73..51843b9ab4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -5,18 +5,20 @@ , msrestazure , azure-common , azure-mgmt-core -, azure-mgmt-nspkg -, isPy3k +, pythonOlder }: buildPythonPackage rec { pname = "azure-mgmt-servicebus"; - version = "7.1.0"; + version = "8.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d8ae7905fb7d3e24822daa20aa7bc5014f41aa18b48ea2d0161e997fc11a3d36"; + hash = "sha256-R8Narn7eC7j59tDjsgbk9lF0PcOgOwSnzoMp3Qu0rmg="; }; propagatedBuildInputs = [ @@ -24,11 +26,9 @@ buildPythonPackage rec { msrestazure azure-common azure-mgmt-core - ] ++ lib.optionals (!isPy3k) [ - azure-mgmt-nspkg ]; - # has no tests + # Module has no tests doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 8bc69d0c9b..417264a70f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,16 +7,16 @@ }: buildPythonPackage rec { - version = "20.0.0"; pname = "azure-mgmt-storage"; + version = "20.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-buR2tWIv9vWVTt7m6w2N1CezIXAihVrfHshjPKBM3uI="; + hash = "sha256-IU8/3oyR4n1T8uZUoo0VADrT9vFchDioIF8MiKSNlFE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index cd19e88e9b..ddaa89d916 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "6.1.0"; + version = "7.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c26635089276515b0488fcf014aab50a0446f54800c6e0e5583cc493ac8d738f"; + sha256 = "sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix index 2adc8b784f..5c3c8c8c68 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix @@ -4,6 +4,7 @@ , fetchPypi , importlib-metadata , logfury +, pyfakefs , pytestCheckHook , pytest-lazy-fixture , pytest-mock @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.14.1"; + version = "1.17.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fYOeyhKm9mRT61NcQVaXFKeRC8AS9lfIZMO/s6iFaeg="; + hash = "sha256-pyPjjdQ8wzvQitlchGlfNTPwqs0PH6xgplSPUWpjtwM="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ buildPythonPackage rec { pytestCheckHook pytest-lazy-fixture pytest-mock + pyfakefs ]; postPatch = '' @@ -51,6 +53,11 @@ buildPythonPackage rec { --replace 'arrow>=0.8.0,<1.0.0' 'arrow' ''; + disabledTestPaths = [ + # requires aws s3 auth + "test/integration/test_download.py" + ]; + disabledTests = [ # Test requires an API key "test_raw_api" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix index c7d1d5373f..9671b7b5a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/backoff/default.nix @@ -1,21 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, poetry, pytest-asyncio, }: +{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, poetry, pytest-asyncio, responses }: buildPythonPackage rec { pname = "backoff"; - version = "1.11.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "litl"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-eKd1g3UxXlpSlNlik80RKXRaw4mZyvAWl3i2GNuZ3hI="; }; format = "pyproject"; nativeBuildInputs = [ poetry ]; - checkInputs = [ pytestCheckHook pytest-asyncio ]; + checkInputs = [ pytestCheckHook pytest-asyncio responses ]; meta = with lib; { description = "Function decoration for backoff and retry"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix new file mode 100644 index 0000000000..ebdbbe4d15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonAtLeast +, basemap +, cython +, geos +, numpy +, matplotlib +, pyproj +, pyshp +, python +, setuptools +}: + +buildPythonPackage rec { + pname = "basemap-data"; + inherit (basemap) version src; + + sourceRoot = "source/packages/basemap_data"; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "mpl_toolkits.basemap_data" ]; + + meta = with lib; { + homepage = "https://matplotlib.org/basemap/"; + description = "Data assets for matplotlib basemap"; + license = with licenses; [ mit lgpl3Plus ]; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix index 6d8dd8a394..b0a1aac746 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix @@ -2,39 +2,66 @@ , buildPythonPackage , fetchFromGitHub , pythonAtLeast +, basemap-data +, cython +, geos , numpy , matplotlib , pillow -, setuptools , pyproj , pyshp -, six -, pkgs +, python +, setuptools }: buildPythonPackage rec { pname = "basemap"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; - rev = "v${version}"; - sha256 = "sha256-onNdOQL4i6GTcuCRel5yanJ2EQ5iYClp+imuBObXF2I="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ObRQ5GsYx3k7fLaaK5Z4Td54rW/Nnx5+2zm8KLCIZl8="; }; - propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ]; - buildInputs = [ setuptools pkgs.geos ]; + sourceRoot = "source/packages/basemap"; - # Standard configurePhase from `buildPythonPackage` seems to break the setup.py script - configurePhase = '' - export GEOS_DIR=${pkgs.geos} + postPatch = '' + substituteInPlace requirements.txt \ + --replace "numpy >= 1.21, < 1.23" "numpy >= 1.21, < 1.24" \ + --replace "pyshp >= 1.2, < 2.2" "pyshp >= 1.2, < 2.4" ''; - # The 'check' target is not supported by the `setup.py` script. - # TODO : do the post install checks (`cd examples && ${python.interpreter} run_all.py`) + nativeBuildInputs = [ + cython + geos + setuptools + ]; + + propagatedBuildInputs = [ + basemap-data + numpy + matplotlib + pillow # undocumented optional dependency + pyproj + pyshp + ]; + + # Standard configurePhase from `buildPythonPackage` seems to break the setup.py script + preBuild = '' + export GEOS_DIR=${geos} + ''; + + # test have various problems including requiring internet connection, permissions issues, problems with latest version of pillow doCheck = false; + checkPhase = '' + cd ../../examples + export HOME=$TEMPDIR + ${python.interpreter} run_all.py + ''; + meta = with lib; { homepage = "https://matplotlib.org/basemap/"; description = "Plot data on map projections with matplotlib"; @@ -43,8 +70,7 @@ buildPythonPackage rec { coastlines, lakes, rivers and political boundaries. See http://matplotlib.github.com/basemap/users/examples.html for examples of what it can do. ''; - license = with licenses; [ mit gpl2 ]; - broken = pythonAtLeast "3.9"; + maintainers = with maintainers; [ ]; + license = with licenses; [ mit lgpl21 ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix index 13fb25d037..592b5b22d4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "bcrypt"; - version = "3.2.0"; + version = "3.2.2"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"; + sha256 = "sha256-QzxBDCF3BXcF2iqfLNAd0VdJOyp6wUyFk6FrPatra/s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bech32/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bech32/default.nix new file mode 100644 index 0000000000..33b9044d75 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bech32/default.nix @@ -0,0 +1,22 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: +buildPythonPackage rec { + pname = "bech32"; + version = "1.2.0"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-fW24IUYDvXhx/PpsCCbvaLhbCr2Q+iHChanF4h0r2Jk="; + }; + + meta = with lib; { + homepage = "https://pypi.org/project/bech32/"; + license = with licenses; [ mit ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index f02dc42b5b..1c25c09980 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.31.1"; + version = "0.31.3"; format = "setuptools"; src = fetchFromGitHub { owner = "zigpy"; repo = "bellows"; rev = "refs/tags/${version}"; - sha256 = "sha256-kjZL6N1VF3Rc26eB5fU1UEs9BEr4sfV4Hto6QdwqeqY="; + sha256 = "sha256-h0hGTT8ipZZ3l/B6I/O74hFpRzaxj5vUBMbM/xX0dq4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix index 2c24578f45..d8bfe8e9a6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bibtexparser/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bibtexparser"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sciunto-org"; repo = "python-${pname}"; - rev = "v${version}"; - hash = "sha256-M9fDI28Yq0uUHPx51wiuRPmRTLkjVqj7ixapbSftnJc="; + rev = "refs/tags/v${version}"; + hash = "sha256-Z+opmknmgyFwvKJyvrv3MMpo23etZCn4bxGTpG5d/dY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index 05dd93ffa0..88a0a4adea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.9.3"; + version = "1.9.5"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ATJi4eCWV0i3Z8AsgV/DtiCn8Qzi2cMDtId5jXCoDL0="; + sha256 = "sha256-izjda65OYnwaPX30JqdCL5fFh5IW5eJeAIrP4l9I3kE="; }; # needs packages which are not available in nixpkgs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix index fe2cd731a1..617b87bc12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/biliass/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "biliass"; - version = "1.3.4"; + version = "1.3.5"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kktK+6rLwYhkG7LiTBlgBbiIN8apweg4l8pJSTjKQU4="; + sha256 = "sha256-kgoQUX2l5YENEozcnfluwvcAO1ZSxlfHPVIa9ABW6IU="; }; propagatedBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix index a2aaa1027c..303d334936 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "billiard"; - version = "3.6.4.0"; + version = "4.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0ismj2p8c66ykpss94rs0bfra5agxxmljz8r3gaq79r8valfb799"; + sha256 = "sha256-NE2aHX063fFx6yxZbJ6Y0e/4Gw4D8fk5iTmjUYyiY6k="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index 5f494308ec..a9ca9833a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.10.0"; + version = "0.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-R7QmxSUbVsvb+MRTYlihxuM05WLYASRSfUs09fl7l1k="; + hash = "sha256-RgF9uQREFOLvAUtoXixywSfQExu6W3qw0JCqVw9Nl9w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix index 932d887754..737dad3550 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bip_utils/default.nix @@ -8,15 +8,15 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "2.2.1"; + version = "2.5.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ebellocchia"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-p2JOZAJxQ/nPZ7vjnB24hA3kz3Io4D3HTP/8mqS/XCc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-lH8hd+JA1FhGH60MYIIuwHjr/4wFbYeuw/hd60kr1xc="; }; propagatedBuildInputs = [ ecdsa pysha3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix index e1129f4060..1e7f241446 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitlist/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "bitlist"; - version = "0.8.0"; - format = "setuptools"; + version = "1.0.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-43Oh1ERGsW12HOqpbIa7rzLKrP9tIjckZhHwZSmBypE="; + hash = "sha256-rpXQKkV2RUuYza+gfpGEH3kFJ+hjuNGKV2i46eXQUUI="; }; propagatedBuildInputs = [ @@ -33,8 +33,8 @@ buildPythonPackage rec { ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov=bitlist --cov-report term-missing" "" + substituteInPlace pyproject.toml \ + --replace "--doctest-modules --ignore=docs --cov=bitlist --cov-report term-missing" "" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix index 5867e695b8..4602e650b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitstruct/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.14.1"; + version = "8.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-04ExvUR7avW49GTEh4eXyHpdnaHJW5NX4HHEJP3l8FU="; + hash = "sha256-b6atv7jzuMtowhsTqmXSPrLDrDJBmrkm8/0f/3F6kSU="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix index fce105163a..06cefc9bbb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "bleach"; - version = "5.0.0"; + version = "5.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU="; + hash = "sha256-DQMlXEfrm9Lyaqm7fyEHcy5+j+GVyi9kcJ/POwpKCFw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix new file mode 100644 index 0000000000..f5352c5d2f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak-retry-connector/default.nix @@ -0,0 +1,55 @@ +{ lib +, async-timeout +, bleak +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, pytest-asyncio +}: + +buildPythonPackage rec { + pname = "bleak-retry-connector"; + version = "1.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ql7j+m8g7ZgkgqJGUVE903n1b73kqWDExgSbnDpKQwc="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + async-timeout + bleak + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=bleak_retry_connector --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "bleak_retry_connector" + ]; + + meta = with lib; { + description = "Connector for Bleak Clients that handles transient connection failures"; + homepage = "https://github.com/bluetooth-devices/bleak-retry-connector"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix index 2a40195531..bd66c47c6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleak/default.nix @@ -1,32 +1,46 @@ -{ lib, buildPythonPackage, isPy3k, fetchPypi -, bluez, dbus-next, pytestCheckHook, pytest-cov +{ lib +, bluez +, buildPythonPackage +, dbus-next +, fetchPypi +, pytestCheckHook +, pythonOlder +, typing-extensions }: buildPythonPackage rec { pname = "bleak"; - version = "0.14.3"; + version = "0.15.1"; + format = "setuptools"; - disabled = !isPy3k; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dg5bsegECH92JXa5uVY9Y7R9UhsWUpiOKMPLXmS2GZA="; + hash = "sha256-2MjYjeDyKhW9E1ugVsTlsvufFRGSg97yGx7X1DwA1ZA="; }; + propagatedBuildInputs = [ + dbus-next + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + ]; + postPatch = '' # bleak checks BlueZ's version with a call to `bluetoothctl --version` substituteInPlace bleak/backends/bluezdbus/__init__.py \ --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\" ''; - propagatedBuildInputs = [ dbus-next ]; - - checkInputs = [ pytestCheckHook pytest-cov ]; - - pythonImportsCheck = [ "bleak" ]; + pythonImportsCheck = [ + "bleak" + ]; meta = with lib; { - description = "Bluetooth Low Energy platform Agnostic Klient for Python"; + description = "Bluetooth Low Energy platform agnostic client"; homepage = "https://github.com/hbldh/bleak"; license = licenses.mit; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix index 6d7c79bf6a..5f695e0922 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blebox-uniapi/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "blebox-uniapi"; - version = "1.3.3"; + version = "2.0.2"; src = fetchFromGitHub { owner = "blebox"; repo = "blebox_uniapi"; - rev = "v${version}"; - sha256 = "0qvv2697yhqjmgvh37h8wgz3a77n61kqmxvsk4pf47wn43hks15c"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-0Yiooy7YSUFjqqcyH2fPQ6AWuR0EJxfRRZTw/6JGcMA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix index 53aaacbdf8..ceb6413da3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix @@ -1,19 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: buildPythonPackage rec { pname = "blinker"; - version = "1.4"; + version = "1.5"; src = fetchPypi { inherit pname version; - sha256 = "1dpq0vb01p36jjwbhhd08ylvrnyvcc82yxx3mwjx6awrycjyw6j7"; + sha256 = "sha256-kj5eL2nBVfLMQtr7vXDhbj/eJNLUqiq3L744YjiJJGI="; }; - checkInputs = [ nose ]; - - checkPhase = '' - nosetests - ''; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "blinker" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix index c56c377b29..236f481df2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blinkpy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.19.1"; + version = "0.19.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "fronzbot"; repo = "blinkpy"; rev = "refs/tags/v${version}"; - hash = "sha256-29wfdRbJ4U3ou/4jkpWBE2FrUuo09k4hTYLnIP1S3uU="; + hash = "sha256-depaXtbXo5F1JC3M24i6ynWhpm9x9O7UCjkoSzFaSZI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix index be41b2acb8..290e192841 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.7.7"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XUqB+UONt6GayOZK1BMx9lplnqjzuxiJqcIIjP2f4QQ="; + sha256 = "sha256-aZ4coUlnFjcLS5tSfFjYQr+JKGPY2UTNoy+HIO08tCk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix index 9f07fa764f..d4122dddc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blspy/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "blspy"; - version = "1.0.9"; + version = "1.0.13"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6keimQqwh37G9xc1Xyxlr+0n9Qgv87Np2D7Gzj6ik5Y="; + hash = "sha256-feuHVtBgjzGBjY1eSKh47feTT8prdkSwvs993lJSSiI="; }; patches = [ @@ -29,8 +29,8 @@ buildPythonPackage rec { relic_src = fetchFromGitHub { owner = "Chia-Network"; repo = "relic"; - rev = "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7"; # pinned by blspy - hash = "sha256-IfTD8DvTEXeLUoKe4Ejafb+PEJW5DV/VXRYuutwGQHU="; + rev = "215c69966cb78b255995f0ee9c86bbbb41c3c42b"; # pinned by blspy + hash = "sha256-wivK18Cp7BMZJvrYxJgSHInRZgFgsgSzd0YIy5IWoYA="; }; sodium_src = fetchFromGitHub { owner = "AmineKhaldi"; @@ -42,8 +42,8 @@ buildPythonPackage rec { catch2_src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; - rev = "v2.13.7"; # pinned by blspy - sha256 = "NhZ8Hh7dka7KggEKKZyEbIZahuuTYeCT7cYYSUvkPzI="; + rev = "v3.0.0-preview5"; # pinned by blspy + sha256 = "sha256-IQ1yGZo3nKHTqScUoq3i3Njxqvk7uW8hQ3GT0/SxGaw="; }; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch b/third_party/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch index 337c8df3c4..3184e3f0ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/blspy/dont_fetch_dependencies.patch @@ -21,7 +21,7 @@ index 6922167..23d8da6 100644 - set(RELIC_GIT_TAG "origin/main") -else () - # This is currently anchored to upstream aecdcae7956f542fbee2392c1f0feb0a8ac41dc5 -- set(RELIC_GIT_TAG "1d98e5abf3ca5b14fd729bd5bcced88ea70ecfd7") +- set(RELIC_GIT_TAG "215c69966cb78b255995f0ee9c86bbbb41c3c42b") -endif () - message(STATUS "Relic will be built from: ${RELIC_GIT_TAG}") @@ -57,7 +57,7 @@ index 449164a..15a955e 100644 FetchContent_Declare( Catch2 - GIT_REPOSITORY https://github.com/catchorg/Catch2.git -- GIT_TAG v2.13.7 +- GIT_TAG v3.0.0-preview5 + URL @catch2_src@ ) FetchContent_MakeAvailable(Catch2) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix new file mode 100644 index 0000000000..3de1597154 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-adapters/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry-core +, async-timeout +, dbus-next +, myst-parser +, pytestCheckHook +, sphinxHook +, sphinx-rtd-theme +}: + +buildPythonPackage rec { + pname = "bluetooth-adapters"; + version = "0.1.3"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-c96HgcmyiDwvcq8OsZ5s65VmAihz6KtCviP2h6Iu1Fo="; + }; + + postPatch = '' + # Drop pytest arguments (coverage, ...) + sed -i '/addopts/d' pyproject.toml + ''; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + myst-parser + poetry-core + sphinx-rtd-theme + sphinxHook + ]; + + propagatedBuildInputs = [ + async-timeout + dbus-next + ]; + + pythonImportsCheck = [ + "bluetooth_adapters" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + changelog = "https://github.com/bluetooth-devices/bluetooth-adapters/blob/main/CHANGELOG.md"; + description = "Tools to enumerate and find Bluetooth Adapters"; + homepage = "https://bluetooth-adapters.readthedocs.io/"; + license = licenses.asl20; + maintainers = teams.home-assistant.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix new file mode 100644 index 0000000000..72edd0e6ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bluetooth-sensor-state-data/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "bluetooth-sensor-state-data"; + version = "1.5.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Xr9MCTcEnO5bMk9AdBTwBCXwm33UUTP7FYZyjDYrMNA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + home-assistant-bluetooth + sensor-state-data + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=bluetooth_sensor_state_data --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "bluetooth_sensor_state_data" + ]; + + meta = with lib; { + description = "Models for storing and converting Bluetooth Sensor State Data"; + homepage = "https://github.com/bluetooth-devices/bluetooth-sensor-state-data"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix index 9017cbed0d..75ca944830 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bokeh/default.nix @@ -33,11 +33,11 @@ buildPythonPackage rec { pname = "bokeh"; # update together with panel which is not straightforward - version = "2.4.2"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "f0a4b53364ed3b7eb936c5cb1a4f4132369e394c7ae0a8ef420459410958033d"; + sha256 = "sha256-7zOAEWGvN5Zlq3o0aE8iCYYeOu/VyAOiH7u5nZSHSwM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix index f884e164d6..c5c2ecb68b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boltons/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "boltons"; - version = "20.2.1"; + version = "21.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "mahmoud"; repo = "boltons"; rev = version; - hash = "sha256-iCueZsi/gVbko7MW43vaUQMWRVI/YhmdfN29gD6AgG8="; + hash = "sha256-8HO7X2PQEbQIQsCa2cMHQI3rlofVT22GYrWNXY34MLk="; }; checkInputs = [ @@ -34,12 +34,6 @@ buildPythonPackage rec { }) ]; - disabledTests = [ - # This test is broken without this PR. Merged but not released - # https://github.com/mahmoud/boltons/pull/283 - "test_frozendict" - ]; - pythonImportsCheck = [ "boltons" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix index ad28d461fa..ae467123e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "boltztrap2"; - version = "22.4.1"; + version = "22.6.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "BoltzTraP2"; inherit version; - hash = "sha256-lGwKHWAslCmb9bVQELHD6kAay+dnieiNsSAfAyNFLPM="; + hash = "sha256-zEKRsNg5P+KKQCeB49TiiSXRmusvr1zwssHhppZdkfA="; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index d849d49b64..834df14102 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.21.30"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.24.42"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-8K+PTvX+Y1PHlM08zmJ9Rpphi1is58p1pjz9cZ32Fc4="; + sha256 = "sha256-3z1u8CMEvXw3EQkJNsCS1dtzXdoQneysHiNsPvf9t68="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index 6774189043..d7e5258976 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.24.33"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.27.42"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-6l/RgAggMKbDP6Gb8BHXKXDz7SPP/xtBQTBp4yV2gQM="; + sha256 = "sha256-OKGApmZsWpsGmnXsPPN0/ypkw+kMnySpFoWLzesERW0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix index 4251c88058..e82c5ce783 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "branca"; - version = "0.4.2"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "c111453617b17ab2bda60a4cd71787d6f2b59c85cdf71ab160a737606ac66c31"; + sha256 = "sha256-5vL366fdNozu+PY4Irhn9eEdTTq90Jmnh9ue0rcGWuE="; }; checkInputs = [ pytest selenium ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix index c577e6142f..955cd4951d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix @@ -20,9 +20,12 @@ , trfl , optax , pytestCheckHook -, dm-sonnet }: +, dm-sonnet +, rlax +, distrax +}: -buildPythonPackage rec { +let bsuite = buildPythonPackage rec { pname = "bsuite"; version = "0.3.5"; @@ -49,10 +52,12 @@ buildPythonPackage rec { ]; checkInputs = [ + distrax dm-haiku dm-sonnet optax pytestCheckHook + rlax tensorflow-probability trfl ]; @@ -61,15 +66,6 @@ buildPythonPackage rec { "bsuite" ]; - disabledTestPaths = [ - # Disabled because tests require module rlax but this results in infinite - # recursion error - "bsuite/baselines/jax/actor_critic/run_test.py" - "bsuite/baselines/jax/actor_critic_rnn/run_test.py" - "bsuite/baselines/jax/boot_dqn/run_test.py" - "bsuite/baselines/jax/dqn/run_test.py" - ]; - disabledTests = [ # Tests require network connection "test_run9" @@ -89,6 +85,13 @@ buildPythonPackage rec { "test_episode_truncation" ]; + # escape infinite recursion with rlax + doCheck = false; + + passthru.tests = { + check = bsuite.overridePythonAttrs (_: { doCheck = true; }); + }; + meta = with lib; { description = '' Core RL Behaviour Suite. A collection of reinforcement learning @@ -98,4 +101,4 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ onny ]; }; -} +}; in bsuite diff --git a/third_party/nixpkgs/pkgs/development/python-modules/callee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/callee/default.nix new file mode 100644 index 0000000000..1cf63455c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/callee/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "callee"; + version = "0.3.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "Xion"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-dsXMY3bW/70CmTfCuy5KjxPa+NLCzxzWv5e1aV2NEWE="; + }; + + pythonImportsCheck = [ + "callee" + ]; + + doCheck = false; # missing dependency + + checkInputs = [ + # taipan missing, unmaintained, not python3.10 compatible + pytestCheckHook + ]; + + meta = with lib; { + description = "Argument matchers for unittest.mock"; + homepage = "https://github.com/Xion/callee"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix index b30df5ec53..a15d2a5f11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/carbon/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "carbon"; - version = "1.1.8"; + version = "1.1.10"; src = fetchPypi { inherit pname version; - sha256 = "95918c4b14e1c525d9499554d5e03b349f87e0c2bc17ec5c64d18679a30b69f1"; + sha256 = "sha256-wTtbqRHMWBcM2iFN95yzwCf/BQ+EK0vp5MXT4mKX3lw="; }; # Carbon-s default installation is /opt/graphite. This env variable ensures diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix index e98ee9d4fe..2e027eaa99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, simpleeval +, pytestCheckHook , pythonOlder -, coveralls +, simpleeval , wcmatch }: buildPythonPackage rec { pname = "casbin"; - version = "1.16.9"; + version = "1.17.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - sha256 = "sha256-1xxjFNkCb50ndmXuRjt7svPOvSyzZbw+J49Zpyy1FUc="; + hash = "sha256-fBMhrA4zL4XPjQ63AGc5jf585ZpHTBumPievDNfCw7o="; }; propagatedBuildInputs = [ @@ -27,19 +27,15 @@ buildPythonPackage rec { ]; checkInputs = [ - coveralls + pytestCheckHook ]; - checkPhase = '' - coverage run -m unittest discover -s tests -t tests - ''; - pythonImportsCheck = [ "casbin" ]; meta = with lib; { - description = "An authorization library that supports access control models like ACL, RBAC, ABAC in Python"; + description = "Authorization library that supports access control models like ACL, RBAC and ABAC"; homepage = "https://github.com/casbin/pycasbin"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix index e47e77b9eb..43e4d0029a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "catalogue"; - version = "2.0.7"; + version = "2.0.8"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U10zrnnr0hyimFUdhdoYaui44d82sPsCRtp3QWPsLWs="; + sha256 = "sha256-syXHdlkgi/tq8bDZOxoapBEuG7KaTFztgWdYpyLw44g="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ @@ -29,11 +29,6 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - # https://github.com/explosion/catalogue/issues/27 - "test_entry_points" - ]; - pythonImportsCheck = [ "catalogue" ]; @@ -43,6 +38,6 @@ buildPythonPackage rec { homepage = "https://github.com/explosion/catalogue"; changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ onny ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix index 69a351e3c3..a6355e1988 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cattrs/default.nix @@ -2,10 +2,12 @@ , attrs , buildPythonPackage , fetchFromGitHub +, exceptiongroup , hypothesis , immutables , motor , msgpack +, orjson , poetry-core , pytest-xdist , pytestCheckHook @@ -18,7 +20,7 @@ buildPythonPackage rec { pname = "cattrs"; - version = "1.10.0"; + version = "22.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +29,7 @@ buildPythonPackage rec { owner = "python-attrs"; repo = pname; rev = "v${version}"; - hash = "sha256-VbfQMMDO03eeUHAACxoX6a3DKmzoF9EfLuTpvaY6bWs="; + hash = "sha256-C8uIsewpgJfB1yYckWTwF5K32+2AAOrxFKB9I18RENg="; }; nativeBuildInputs = [ @@ -36,6 +38,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ] ++ lib.optionals (pythonOlder "3.7") [ typing-extensions ]; @@ -45,6 +49,7 @@ buildPythonPackage rec { immutables motor msgpack + orjson pytest-xdist pytestCheckHook pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix index 1a04fce11d..67c3c58794 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery/default.nix @@ -10,6 +10,7 @@ , click-repl , dnspython , fetchPypi +, fetchpatch , kombu , moto , pymongo @@ -35,6 +36,19 @@ buildPythonPackage rec { hash = "sha256-+vvYKTTTD4oAT4Ho96Bi4xQToj1ES+juMyZVORWVjG0="; }; + patches = [ + (fetchpatch { + name = "billiard-4.0-comat.patch"; + url = "https://github.com/celery/celery/commit/b260860988469ef8ad74f2d4225839c2fa91d590.patch"; + hash = "sha256-NWB/UB0fE7A/vgMRYz6QGmqLmyN1ninAMyL4V2tpzto="; + }) + ]; + + postPatch = '' + substituteInPlace requirements/default.txt \ + --replace "billiard>=3.6.4.0,<4.0" "billiard>=3.6.4.0" + ''; + propagatedBuildInputs = [ billiard click diff --git a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix index 272be648d2..432958255d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.1.6"; + version = "2.1.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - hash = "sha256-jCQWjGx35erhkj1gjBjdGytvKNarrTODH6fJpFMQqLE="; + hash = "sha256-1GJef+6Aqah9W9yPwqD8QCh0sNn/X9UwlzmsCk51QMY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index 094729d704..53c7c397f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-KwjxLNbRL8aOMXmCOg9wwveRVZsSr+PlkJkFmY/yRBs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-DFdXDFSqqkm4r59Kmd1wxcg2YePP3dI9squiW+iSmaU="; }; sourceRoot = "source/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix index 22d2e87cd2..7691d9b7d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cffi/default.nix @@ -4,11 +4,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.15.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"; + sha256 = "sha256-1AC/uaN7E1ElPLQCZxzqfom97MKU6AFqcH9tHYrJNPk="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix index 1c5b96ea48..238f5e8363 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.58.2"; + version = "0.61.2"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; - rev = "v${version}"; - sha256 = "sha256-ArpvP4tbRf1fK8BPokRXqS3YyaFiOLBrR8uQHko5iKo="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-282h1fBWhAfwqCuP+dU3ajn0gQtmOcPNTMKZ0a2+vHU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix index 1585d6d5e8..55a316ceab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chainer/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "chainer"; - version = "7.8.1"; + version = "7.8.1.post1"; disabled = !isPy3k; # python2.7 abandoned upstream src = fetchFromGitHub { owner = "chainer"; repo = "chainer"; - rev = "v${version}"; - sha256 = "1n07zjzc4g92m1sbgxvnansl0z00y4jnhma2mw06vnahs7s9nrf6"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-epwnExmyCWmwaOz+mJnAl1peEeHLBdQGC62BlLfSTQQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/channels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/channels/default.nix index d027c19467..e4c8658f59 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/channels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/channels/default.nix @@ -32,6 +32,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + pythonImportsCheck = [ "channels" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix index 7753d6ccfd..b5cca5110e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chardet/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "chardet"; - version = "4.0.0"; + version = "5.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DW9ToV20Eg8rCMlPEefZPSyRHuEYtrMKBOw+6DEBefo="; + sha256 = "sha256-A2jfK/14tfwgVyu06bt/tT4sCU9grpmTM56GcdCvuKo="; }; checkInputs = [ @@ -21,6 +21,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # flaky; https://github.com/chardet/chardet/issues/256 + "test_detect_all_and_detect_one_should_agree" + ]; + pythonImportsCheck = [ "chardet" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix index d406ea15fb..9661700a28 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/charset-normalizer/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "charset-normalizer"; - version = "2.0.12"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -15,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Ousret"; repo = "charset_normalizer"; - rev = version; - hash = "sha256-d5vWnZtFR669l1Meg4ZSsYIyBlJZya7SpXJMx2AP8NU="; + rev = "refs/tags/${version}"; + hash = "sha256-ntNMHjkQJqzSElEeyFmPIjUh6ZxQkTktPipfPHiJ/Vc="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix index 30a620b5ad..4407392269 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "5.6.0"; + version = "5.9.0"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; - rev = "v${version}"; - sha256 = "sha256-mf4QASdvO7doV5pKAAEzaKJP66w29osBlbLrJuopUvA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-o14uP7czY4DDTFDabOk7aTF3mMPmBrPg1/fkoIUlab8="; }; sourceRoot = "source/packages/python/chart-studio"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix index 5535f577bc..da5870f7d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix @@ -6,7 +6,6 @@ , jaraco_text , more-itertools , portend -, pyopenssl , pypytools , pytest-mock , pytestCheckHook @@ -17,7 +16,6 @@ , setuptools-scm , setuptools-scm-git-archive , six -, trustme }: buildPythonPackage rec { @@ -45,14 +43,12 @@ buildPythonPackage rec { checkInputs = [ jaraco_text portend - pyopenssl pypytools pytest-mock pytestCheckHook requests requests-toolbelt requests-unixsocket - trustme ]; # Disable doctest plugin because times out @@ -79,6 +75,8 @@ buildPythonPackage rec { # avoid attempting to use 3 packages not available on nixpkgs # (jaraco.apt, jaraco.context, yg.lockfile) "cheroot/test/test_wsgi.py" + # requires pyopenssl + "cheroot/test/test_ssl.py" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index 6690a913be..bf963ce16a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -8,7 +8,6 @@ , objgraph , path , portend -, pyopenssl , pytest-forked , pytest-services , pytestCheckHook @@ -24,7 +23,7 @@ buildPythonPackage rec { pname = "cherrypy"; - version = "18.6.1"; + version = "18.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,9 +31,18 @@ buildPythonPackage rec { src = fetchPypi { pname = "CherryPy"; inherit version; - hash = "sha256-8z6HKG57PjCeBOciXY5JOC2dd3PmCSJB1/YTiTxWNJU="; + hash = "sha256-cpRS95jKdWOQBG7zGAQ8roZKRoFN6vPmvTTclZrxmN4="; }; + postPatch = '' + # Disable doctest plugin because times out + substituteInPlace pytest.ini \ + --replace "--doctest-modules" "-vvv" \ + --replace "-p pytest_cov" "" \ + --replace "--no-cov-on-fail" "" + sed -i "/--cov/d" pytest.ini + ''; + nativeBuildInputs = [ setuptools-scm ]; @@ -56,13 +64,6 @@ buildPythonPackage rec { requests-toolbelt ]; - preCheck = '' - # Disable doctest plugin because times out - substituteInPlace pytest.ini \ - --replace "--doctest-modules" "-vvv" - sed -i "/--cov/d" pytest.ini - ''; - pytestFlagsArray = [ "-W" "ignore::DeprecationWarning" @@ -74,6 +75,9 @@ buildPythonPackage rec { # daemonize and autoreload tests have issue with sockets within sandbox "daemonize" "Autoreload" + + "test_antistampede" + "test_file_stream" ] ++ lib.optionals stdenv.isDarwin [ "test_block" ]; @@ -92,7 +96,6 @@ buildPythonPackage rec { json = [ simplejson ]; memcached_session = [ python-memcached ]; routes_dispatcher = [ routes ]; - ssl = [ pyopenssl ]; # not packaged yet xcgi = [ /* flup */ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix index a06cb4ec84..98598e4acf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "chex"; - version = "0.1.2"; + version = "0.1.3"; format = "setuptools"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; - rev = "v${version}"; - hash = "sha256-NtZYOHByKBcKmhRaNULwaQqxfoPRmgbtJ3cFHNfy4E8="; + rev = "refs/tags/v${version}"; + hash = "sha256-oIdRh0WKzdvyCfcamKRDiMsV51b6rdmNYcELjDQKGX4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/Cargo.lock new file mode 100644 index 0000000000..96fc3236f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/Cargo.lock @@ -0,0 +1,732 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[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 = "bitvec" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bls12_381" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54757888b09a69be70b5ec303e382a74227392086ba808cb01eeca29233a2397" +dependencies = [ + "ff", + "group", + "pairing", + "rand_core", + "subtle", +] + +[[package]] +name = "bumpalo" +version = "3.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chia" +version = "0.1.5" +dependencies = [ + "clvmr", + "hex", + "num-traits", + "pyo3", + "serde", +] + +[[package]] +name = "chia_rs" +version = "0.1.5" +dependencies = [ + "chia", + "clvmr", + "hex", + "py_streamable", + "pyo3", + "serde", + "sha2", +] + +[[package]] +name = "chia_wasm" +version = "0.1.5" +dependencies = [ + "chia", + "wasm-bindgen", + "wasm-bindgen-test", +] + +[[package]] +name = "clvmr" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d18d68c7f9e8e08ea66a6673bec83100bd53103a9d504fe279147bd0a79b260c" +dependencies = [ + "bls12_381", + "hex", + "lazy_static", + "num-bigint", + "num-integer", + "num-traits", + "pyo3", + "sha2", + "wasm-bindgen", + "wasm-bindgen-test", +] + +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if", + "wasm-bindgen", +] + +[[package]] +name = "cpufeatures" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +dependencies = [ + "libc", +] + +[[package]] +name = "ctor" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array", +] + +[[package]] +name = "ff" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f" +dependencies = [ + "bitvec", + "rand_core", + "subtle", +] + +[[package]] +name = "funty" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e" + +[[package]] +name = "generic-array" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "ghost" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b93490550b1782c589a350f2211fff2e34682e25fed17ef53fc4fa8fe184975e" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "group" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" +dependencies = [ + "byteorder", + "ff", + "rand_core", + "subtle", +] + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e41b53715c6f0c4be49510bb82dee2c1e51c8586d885abe65396e82ed518548" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "js-sys" +version = "0.3.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce791b7ca6638aae45be056e068fc756d871eb3b3b10b8efa62d1c9cec616752" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "lock_api" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +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 = "num-bigint" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512" +dependencies = [ + "autocfg", + "num-integer", + "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 = "once_cell" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "opaque-debug" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" + +[[package]] +name = "pairing" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de9d09263c9966e8196fe0380c9dbbc7ea114b5cf371ba29004bc1f9c6db7f3" +dependencies = [ + "group", +] + +[[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", + "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 = "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.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "py_streamable" +version = "0.1.0" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "pyo3" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cf01dbf1c05af0a14c7779ed6f3aa9deac9c3419606ac9de537a2d649005720" +dependencies = [ + "cfg-if", + "indoc", + "inventory", + "libc", + "parking_lot", + "paste", + "pyo3-build-config", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pyo3-macros" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67701eb32b1f9a9722b4bc54b548ff9d7ebfded011c12daece7b9063be1fd755" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44f09e825ee49a105f2c7b23ebee50886a9aee0746f4dd5a704138a64b0218a" +dependencies = [ + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "quote" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags", +] + +[[package]] +name = "scoped-tls" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea6a9290e3c9cf0f18145ef7ffa62d68ee0bf5fcd651017e586dc7fd5da448c2" + +[[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.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sha2" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" +dependencies = [ + "block-buffer", + "cfg-if", + "cpufeatures", + "digest", + "opaque-debug", +] + +[[package]] +name = "smallvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" + +[[package]] +name = "subtle" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "typenum" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + +[[package]] +name = "unindent" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52fee519a3e570f7df377a06a1a7775cdbfb7aa460be7e08de2b1f0e69973a44" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasm-bindgen" +version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b608ecc8f4198fe8680e2ed18eccab5f0cd4caaf3d83516fa5fb2e927fda2586" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "580aa3a91a63d23aac5b6b267e2d13cb4f363e31dce6c352fca4752ae12e479f" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16646b21c3add8e13fdb8f20172f8a28c3dbf62f45406bcff0233188226cfe0c" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "171ebf0ed9e1458810dfcb31f2e766ad6b3a89dbda42d8901f2b268277e5f09c" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c2657dd393f03aa2a659c25c6ae18a13a4048cebd220e147933ea837efc589f" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e0c4a743a309662d45f4ede961d7afa4ba4131a59a639f29b0069c3798bbcc2" + +[[package]] +name = "wasm-bindgen-test" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce783b6c3854292723f498b7bfcf65a782a320b6f1cb3012d08dfbc603fa62f5" +dependencies = [ + "console_error_panic_hook", + "js-sys", + "scoped-tls", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-bindgen-test-macro", +] + +[[package]] +name = "wasm-bindgen-test-macro" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3859815cf8435b92f3a34381bef950daffc1403bbb77ef99e35422a7b0abb194" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "web-sys" +version = "0.3.52" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01c70a82d842c9979078c772d4a1344685045f1a5628f677c2b2eab4dd7d2696" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "wyz" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188" +dependencies = [ + "tap", +] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix new file mode 100644 index 0000000000..2df9c16f2a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/chia-rs/default.nix @@ -0,0 +1,49 @@ +{ buildPythonPackage +, lib +, fetchFromGitHub +, pytestCheckHook +, rustPlatform +}: + +buildPythonPackage rec { + pname = "chia-rs"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "chia-network"; + repo = "chia_rs"; + rev = version; + sha256 = "sha256-4TIRj7FMIArI/EvDARReC4MqDG44zjn/MKoUHAVqq5s="; + }; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + preBuild = '' + # avoid ENOENT in maturinBuildHook + touch wheel/Cargo.lock + ''; + + checkInputs = [ + pytestCheckHook + ]; + + buildAndTestSubdir = "wheel"; + + meta = with lib; { + description = "Rust crate & wheel with consensus code"; + homepage = "https://github.com/Chia-Network/chia_rs/"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix index 54aa1efeef..11452dee2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/chiapos/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "chiapos"; - version = "1.0.9"; + version = "1.0.10"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-emEHIR74RiIDK04etO/6G7tjzTufOVl4rLRWbEsQit0="; + sha256 = "sha256-2SqWdGzSXs53PafXnCvTGQXNJqD+5gdJnaYi2O2ABLg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix index d27f7cf0a8..275f4cd5c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ci-info/default.nix @@ -1,14 +1,14 @@ { lib, buildPythonPackage, isPy27, fetchPypi, pytest, pytestCheckHook }: buildPythonPackage rec { - version = "0.2.0"; + version = "0.3.0"; pname = "ci-info"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "05j6pamk8sd51qmvpkl3f7sxajmncrqm0cz6n6bqgsvzjwn66w6x"; + sha256 = "sha256-H9UMvUAfKa3/7rGLBIniMtFqwadFisa8MW3qtq5TX7A="; }; checkInputs = [ pytest pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cinemagoer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cinemagoer/default.nix new file mode 100644 index 0000000000..45d80c26b8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cinemagoer/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lxml +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "cinemagoer"; + version = "2022.2.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "8efe29dab44a7d275702f3160746015bd55c87b2eed85991dd57dda42594e6c6"; + }; + + propagatedBuildInputs = [ + lxml + sqlalchemy + ]; + + # Tests require networking, and https://github.com/cinemagoer/cinemagoer/issues/240 + doCheck = false; + + pythonImportsCheck = [ "imdb" ]; # Former "imdbpy", upstream is yet to rename here + + meta = with lib; { + description = "A Python package for retrieving and managing the data of the IMDb movie database about movies and people"; + downloadPage = "https://github.com/cinemagoer/cinemagoer/"; + homepage = "https://cinemagoer.github.io/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ superherointj ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index 1b2998e6a5..1459493ef0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.10"; + version = "9.2.13"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-viQC8FgZ/La3fdlBcFd3Lm+YiiPzNyxw41caRfZU0/I="; + hash = "sha256-kZs2BYVfXCqi1v/cnJCDtLsEKc7xh8nG59G4N1RVSjs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix new file mode 100644 index 0000000000..3e0245ab58 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/classify-imports/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "classify-imports"; + version = "4.1.0"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "asottile"; + repo = pname; + rev = "v${version}"; + hash = "sha256-w/+Sf2ZVSDmFNPICJfAKzfukcznWyFBhi7hjIELtYGI="; + }; + + pythonImportsCheck = [ + "classify_imports" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Utilities for refactoring imports in python-like syntax"; + homepage = "https://github.com/asottile/classify-imports"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index b4f1e5fb65..7a0177ad2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.10"; + version = "9.2.13"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-2B+yeQAWVTECW5M4/GFF4wvw3q6y/I6QQC+pYkUObN0="; + hash = "sha256-mgEDYUh3ZYvlcj8u3M3Rpfi57CA0MYuf2C3eZ4ElAzA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix index 0320355060..1d5a2047a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "1.42.3"; + version = "1.61.3"; format = "wheel"; src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - sha256 = "sha256-P0QuKkyFk3jvYJwtul0/eUTrDyj2QKAjU/Ac+4VCYYk="; + sha256 = "sha256-Y8CnbX9rhtk8sebJKo5kyqFwCkJgBjz3dgm58VHRPhY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix index 9e6d383db2..890c20b0d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clustershell/default.nix @@ -1,5 +1,13 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, pyyaml, openssh -, nose, bc, hostname, coreutils, bash, gnused +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, pyyaml +, openssh +, nose +, bc +, hostname +, bash }: buildPythonPackage rec { @@ -11,8 +19,6 @@ buildPythonPackage rec { sha256 = "ff6fba688a06e5e577315d899f0dab3f4fe479cef99d444a4e651af577b7d081"; }; - propagatedBuildInputs = [ pyyaml ]; - postPatch = '' substituteInPlace lib/ClusterShell/Worker/Ssh.py \ --replace '"ssh"' '"${openssh}/bin/ssh"' \ @@ -20,29 +26,40 @@ buildPythonPackage rec { substituteInPlace lib/ClusterShell/Worker/fastsubprocess.py \ --replace '"/bin/sh"' '"${bash}/bin/sh"' + + for f in tests/*; do + substituteInPlace $f \ + --replace '/bin/hostname' '${hostname}/bin/hostname' \ + --replace '/bin/sleep' 'sleep' \ + --replace '/bin/echo' 'echo' \ + --replace '/bin/uname' 'uname' \ + --replace '/bin/false' 'false' \ + --replace '/bin/true' 'true' \ + --replace '/usr/bin/printf' 'printf' + done + + # Fix warnings + substituteInPlace lib/ClusterShell/Task.py \ + --replace "notifyAll" "notify_all" + substituteInPlace tests/TaskPortTest.py lib/ClusterShell/Task.py \ + --replace "currentThread" "current_thread" ''; - checkInputs = [ nose bc hostname coreutils gnused ]; + propagatedBuildInputs = [ pyyaml ]; + + checkInputs = [ + bc + hostname + nose + ]; + + pythonImportsCheck = [ "ClusterShell" ]; # Many tests want to open network connections # https://github.com/cea-hpc/clustershell#test-suite # # Several tests fail on Darwin checkPhase = '' - for f in tests/*; do - substituteInPlace $f \ - --replace '/bin/hostname' '${hostname}/bin/hostname' \ - --replace '/bin/sleep' '${coreutils}/bin/sleep' \ - --replace '"sleep' '"${coreutils}/bin/sleep' \ - --replace '/bin/echo' '${coreutils}/bin/echo' \ - --replace '/bin/uname' '${coreutils}/bin/uname' \ - --replace '/bin/false' '${coreutils}/bin/false' \ - --replace '/bin/true' '${coreutils}/bin/true' \ - --replace '/usr/bin/printf' '${coreutils}/bin/printf' \ - --replace '"sed' '"${gnused}/bin/sed' \ - --replace ' sed ' ' ${gnused}/bin/sed ' - done - rm tests/CLIClushTest.py rm tests/TreeWorkerTest.py rm tests/TaskDistantMixin.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix index 231ae47cdd..7ea85e4147 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm-rs/default.nix @@ -9,31 +9,6 @@ , pkgs }: -let - # clvm-rs does not work with maturin 0.12 - # https://github.com/Chia-Network/clvm_rs/commit/32fba40178a5440a1306623f47d8b0684ae2339a#diff-50c86b7ed8ac2cf95bd48334961bf0530cdc77b5a56f852c5c61b89d735fd711 - maturin_0_11 = with pkgs; rustPlatform.buildRustPackage rec { - pname = "maturin"; - version = "0.11.5"; - src = fetchFromGitHub { - owner = "PyO3"; - repo = "maturin"; - rev = "v${version}"; - hash = "sha256-hwc6WObcJa6EXf+9PRByUtiupMMYuXThA8i/K4rl0MA="; - }; - cargoHash = "sha256-qGCEfKpQwAC57LKonFnUEgLW4Cc7HFJgSyUOzHkKN9c="; - - - nativeBuildInputs = [ pkg-config ]; - - buildInputs = lib.optionals stdenv.isLinux [ dbus ] - ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security libiconv ]; - - # Requires network access, fails in sandbox. - doCheck = false; - }; -in - buildPythonPackage rec { pname = "clvm_rs"; version = "0.1.19"; @@ -58,7 +33,6 @@ buildPythonPackage rec { nativeBuildInputs = [ perl # used by openssl-sys to configure - maturin_0_11 ] ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools-rs/default.nix new file mode 100644 index 0000000000..3d88084169 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools-rs/default.nix @@ -0,0 +1,40 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, rustPlatform +, pythonOlder +}: + +buildPythonPackage rec { + pname = "clvm-tools-rs"; + version = "0.1.19"; + disabled = pythonOlder "3.7"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "Chia-Network"; + repo = "clvm_tools_rs"; + rev = version; + sha256 = "sha256-LQbFBZBLUAjyqIAWIn+N8tUrBMskRoKvMMg5gfTyVU8="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + sha256 = "sha256-LcDWpMM+PUElsXO82H6QVOp338+NduC/j3pXQKSni3I="; + }; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + pythonImportsCheck = [ "clvm_tools_rs" ]; + + meta = with lib; { + homepage = "https://chialisp.com/"; + description = "Rust port of clvm_tools"; + license = licenses.asl20; + maintainers = teams.chia.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix index 66856191d4..1883309987 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clvm-tools/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "clvm_tools"; - version = "0.4.3"; + version = "0.4.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Chia-Network"; repo = "clvm_tools"; rev = version; - sha256 = "sha256-bWz3YCrakob/kROq+LOA+yD1wtIbInVrmDqtg4/cV4g="; + sha256 = "sha256-Fv7NTUEjbEDALyc+WLDQ7yJOdODZCwLobN+vUvaBWMY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix index c0480f2fa7..a6e3d44267 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "cma"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "CMA-ES"; repo = "pycma"; - rev = "r${version}"; - sha256 = "sha256-wLUD8HMJusUeCwwp37D/W7yJuJQcDfRwVGVKwBS6sR8="; + rev = "refs/tags/r${version}"; + sha256 = "sha256-STF7jtLqI2KiWvvI9/reRjP1XyW8l4/qy9uAPpE9mTs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix index 79cd6187dd..ada33a8594 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cmd2/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "cmd2"; - version = "2.4.0"; + version = "2.4.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CQkJq2yOzuQIE87HWeYd1ucMgiehqOlggvXysNOUvHc="; + sha256 = "sha256-Bz5VXAWFOw9pZfPQMym6vfnjil8s6gKOYaZM1+63StU="; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cock/default.nix index e7428823ad..384e2c42fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cock"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0d9021c2d9ce0dbf495a3c5ef960a9996a0681bb96ff6099f37302a3813a184e"; + sha256 = "sha256-B6r6+b+x5vEp4+yfhV03dfjlVjRbW2W6Pm91PC0Tb+o="; }; propagatedBuildInputs = [ click sortedcontainers pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix index f362bbd30b..76f9063ab9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorama"; - version = "0.4.4"; + version = "0.4.5"; src = fetchPypi { inherit pname version; - sha256 = "5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"; + sha256 = "sha256-5sa0M0/FCYimOdm5iqQpoLV9puF7mkTwRR+TC2lnt6Q="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix index b749761da0..7f9f9f1a9c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/colormath/default.nix @@ -8,20 +8,26 @@ buildPythonPackage rec { pname = "colormath"; - version = "3.0.0"; + # Switch to unstable which fixes an deprecation issue with newer numpy + # versions, should be included in versions > 3.0 + # https://github.com/gtaylor/python-colormath/issues/104 + version = "unstable-2021-04-17"; src = fetchFromGitHub { owner = "gtaylor"; - rev = "3.0.0"; repo = "python-colormath"; - sha256 = "1nqf5wy8ikx2g684khzvjc4iagkslmbsxxwilbv4jpaznr9lahdl"; + rev = "4a076831fd5136f685aa7143db81eba27b2cd19a"; + sha256 = "sha256-eACVPIQFgiGiVmQ/PjUxP/UH/hBOsCywz5PlgpA4dk4="; }; propagatedBuildInputs = [ networkx numpy ]; checkInputs = [ nose ]; + checkPhase = "nosetests"; + pythonImportsCheck = [ "colormath" ]; + meta = with lib; { description = "Color math and conversion library"; homepage = "https://github.com/gtaylor/python-colormath"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix new file mode 100644 index 0000000000..4e74d9592a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/colorzero/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pkginfo +, sphinxHook +, sphinx-rtd-theme +, pytestCheckHook +}: + + +buildPythonPackage rec { + pname = "colorzero"; + version = "2.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "waveform80"; + repo = pname; + rev = "refs/tags/release-${version}"; + hash = "sha256-0NoQsy86OHQNLZsTEuF5s2MlRUoacF28jNeHgFKAH14="; + }; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov" "" + ''; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + pkginfo + sphinx-rtd-theme + sphinxHook + ]; + + pythonImportsCheck = [ + "colorzero" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Yet another Python color library"; + homepage = "https://github.com/waveform80/colorzero"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix index 0143ffd1aa..f3a24d70fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: buildPythonPackage rec { - version = "1.8.2"; + version = "1.9.2"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "b79e836c3554bc51c6837a8a0152f7521c9bf31342f5b8e21eba6b28044fa585"; + sha256 = "sha256-L7l70l1Da9Wf4HmIWqd6Oi8jz6zpxjWdRwAFNmWEkmI="; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix index 00dae814b1..1dcf4e9b7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/container-inspector/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "container-inspector"; - version = "31.1.0"; + version = "32.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "nexB"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-44sTZelCT6sGPyMteJZBcPRReTHuO1ZUxeQ0Vp7Zmqo="; + hash = "sha256-J9glnfs6l36/IQoIvE8a+Cw4B8x/6r5UeAU8+T/OiQg="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coqui-trainer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coqui-trainer/default.nix index b7b08325e0..da8255a3b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coqui-trainer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coqui-trainer/default.nix @@ -17,7 +17,7 @@ let pname = "coqui-trainer"; - version = "0.0.12"; + version = "0.0.13"; in buildPythonPackage { inherit pname version; @@ -26,8 +26,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "coqui-ai"; repo = "Trainer"; - rev = "v${version}"; - hash = "sha256-MSB3XbQALEKQi6Jtr/d2K8cIqyZryebYEcewGG48HV0="; + rev = "refs/tags/v${version}"; + hash = "sha256-tRm/TElGjVTgCrI80wCt4F1hO82CsDPz2ynJzQKmbIs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix index 8019fc9496..6893458d5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coverage/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "coverage"; - version = "6.3.2"; + version = "6.4.2"; # uses f strings disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-A+KngmCGuR7zRf8YdC7p/Eemg5zNUXBh74+hl25lLOk="; + sha256 = "sha256-bDzP6Jw28+W5g3ue5QdHIxAWTzUsn+MyEgt2TJ1grb4="; }; # No tests in archive diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix index c4a698c525..a7d7dc3ec6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crate/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "crate"; - version = "0.26.0"; + version = "0.27.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6f650c2efe250b89bf35f8fe3211eb37ebc8d76f7a9c09bd73db3076708fa2fc"; + sha256 = "sha256-YYzn13yaTTVt4mxbE8wbymGrisraMRRHodydawSy/Uc="; }; propagatedBuildInputs = [ @@ -30,20 +30,19 @@ buildPythonPackage rec { ]; disabledTests = [ - "RequestsCaBundleTest" + # network access + "test_layer_from_uri" + ]; + + disabledTestPaths = [ + # imports setuptools.ssl_support, which doesn't exist anymore + "src/crate/client/test_http.py" ]; - disabledTestPaths = lib.optionals stdenv.isDarwin [ "src/crate/client/test_http.py" ]; meta = with lib; { homepage = "https://github.com/crate/crate-python"; description = "A Python client library for CrateDB"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; - # 2021-07-12 (@layus): Please unbreak when an update fixes compatibility - # with the version of SQLAlchemy in nixpkgs - # And also re-enable tests in pythonPackages.agate-sql. - # The version string below is intentionally split, so nixpkgs-update does - # not change it. That would make this warning pretty useless. - broken = assert version == "0.2"+"6.0"; true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix index 1b122f9b5e..8f21b00697 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "croniter"; - version = "1.3.4"; + version = "1.3.5"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-MWk2WRaDS+ZUwsrFfqFNcQ50L464pfzoBPbOVI2oC/I="; + hash = "sha256-dZL8DooA2Cr5jfonaLdZg7b7TCrcj20NfJMacVt87+4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix index 08314f7130..1442b784cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix @@ -27,19 +27,19 @@ let in buildPythonPackage rec { pname = "cryptography"; - version = "37.0.2"; # Also update the hash in vectors.nix + version = "37.0.4"; # Also update the hash in vectors.nix disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8iStJTzJzqdWj0kHcAfSJj76VzlqLy94EUBm/VS1xo4="; + hash = "sha256-Y/nBfA4kdMy+vJMCzi8HtVs7P8shHe0YpC1XZPXBCoI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "${pname}-${version}/${cargoRoot}"; name = "${pname}-${version}"; - sha256 = "sha256-qvrxvneoBXjP96AnUPyrtfmCnZo+IriHR5HbtWQ5Gk8="; + hash = "sha256-f8r6QclTwkgK20CNe9i65ZOqvSUeDc4Emv6BFBhh1hI="; }; cargoRoot = "src/rust"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix index d2c2beb9ab..3059d01a40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cryptography_vectors"; inherit version; - sha256 = "sha256-fGXT3lF1b0GBQt9gVBfsLG6WHDZPcMyKEDAwiJ1aMhk="; + hash = "sha256-WmFABRDiiTelZUtAxupOPlk8Wq8MIIHFuRLw58+IPqg="; }; # No tests included diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix new file mode 100644 index 0000000000..2fd90b23be --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptolyzer/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, certvalidator +, attrs +, six +, urllib3 +, cryptoparser +, requests +}: + +buildPythonPackage rec { + pname = "cryptolyzer"; + version = "0.8.1"; + + src = fetchPypi { + pname = "CryptoLyzer"; + inherit version; + sha256 = "sha256-FbxSjKxhzlpj3IezuLCQvoeZMG1q+OE/yn5vB/XE1rI="; + }; + + propagatedBuildInputs = [ + certvalidator + attrs + six + urllib3 + cryptoparser + requests + ]; + + doCheck = false; # Tests require networking + + pythonImportsCheck = [ "cryptolyzer" ]; + + meta = with lib; { + description = "Fast and flexible cryptographic protocol analyzer"; + homepage = "https://gitlab.com/coroner/cryptolyzer"; + license = licenses.mpl20; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix new file mode 100644 index 0000000000..cfac7f2037 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptoparser/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, attrs +, six +, asn1crypto +, python-dateutil +}: + +buildPythonPackage rec { + pname = "cryptoparser"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-kJg8d1PoGIC0feefbJM8oyXcRyMGdg1wWkQUl/nSNCo="; + }; + + propagatedBuildInputs = [ + attrs + six + asn1crypto + python-dateutil + ]; + + pythonImportsCheck = [ "cryptoparser" ]; + + meta = with lib; { + description = "Fast and flexible security protocol parser and generator"; + homepage = "https://gitlab.com/coroner/cryptoparser"; + license = licenses.mpl20; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix index 987e84ffce..5904f80ac2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "cssselect2"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2Yp7vdjrxGCTJ5GV1mmjNZvVoj+QwZ6CwZ2e7vMz5hc="; + sha256 = "sha256-W11t6oGl6wyco58RbIV43UE3eAYMlMH1EZY3FhiQkyU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix index 0e2fbb601e..0cb99dfee1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "cssutils"; - version = "2.5.0"; + version = "2.5.1"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-1H5N1nsowm/5oeVBEV3u05YX/5JlERxtJQD3qBcHeVs="; + hash = "sha256-tKTaWOeDJuyfSp01VQBN33BvPpn3oQJsGIDwk0NiuLQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix index cdd11e5010..ffe017698d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix @@ -9,12 +9,12 @@ let inherit (cudaPackages) cudatoolkit cudnn cutensor nccl; in buildPythonPackage rec { pname = "cupy"; - version = "10.3.1"; + version = "10.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-c8BOKI1AWU+zN8lhliRus55PUAgvFm+TlxKToYn7jWc="; + sha256 = "sha256-9jWpfd4l4LSptJewdQaaurm/huHcKv48+XOZDCLTJV8="; }; # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both @@ -70,5 +70,8 @@ in buildPythonPackage rec { license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ hyphon81 ]; + + # See https://github.com/NixOS/nixpkgs/pull/179912#issuecomment-1206265922. + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix index bce1a33a36..454e2e8f2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.10"; + version = "6.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5bcb9XuYgawUL76+riyLDTKUtW9uSKtkAyMh47Giuic="; + sha256 = "sha256-jzowyeM5TykGVeNG07RgkQZWswrGNHqHSZu1rTZcbnw="; }; disabled = pythonOlder "3.5"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 05cb491c14..cd69d5b1b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "2.6.0"; + version = "2.7.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-UM5z8FEu+Pua/LToraGh8N6V3ujUnu4F6lJec+4cUg4="; + hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix index 3c72f2e073..8ef0f4cac7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "cypherpunkpay"; - version = "1.0.15"; + version = "1.0.16"; format = "pyproject"; src = fetchFromGitHub { owner = "CypherpunkPay"; repo = "CypherpunkPay"; - rev = "v${version}"; - sha256 = "sha256-W2f4jtEqopDXiXx0pklZrjOmVhpx2kDdTJRPm2Ka0Cg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-X0DB0PVwR0gRnt3jixFzglWAOPKBMvqTOG6pK6OJ03w="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix index 9b1b9ecb8d..42305b4557 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cytoolz/default.nix @@ -3,6 +3,7 @@ , fetchPypi , isPyPy , pytestCheckHook +, cython , toolz , python , isPy27 @@ -10,14 +11,16 @@ buildPythonPackage rec { pname = "cytoolz"; - version = "0.11.2"; + version = "0.12.0"; disabled = isPy27 || isPyPy; src = fetchPypi { inherit pname version; - sha256 = "ea23663153806edddce7e4153d1d407d62357c05120a4e8485bddf1bd5ab22b4"; + sha256 = "sha256-wQWwX4XgP7zWAkQ3WWjmLkT+eYwVo1Mcki1TEBjSJBI="; }; + nativeBuildInputs = [ cython ]; + propagatedBuildInputs = [ toolz ]; # tests are located in cytoolz/tests, however we can't import cytoolz diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix index 81aa8de8bc..f0e5a54c95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , aiohttp , dask , distributed @@ -9,13 +9,18 @@ buildPythonPackage rec { pname = "dask-gateway"; # update dask-gateway lock step with dask-gateway-server - version = "0.9.0"; + version = "2022.6.1"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "743f3b88dabe7d1503ac08aadf399eb9205df786b12c5175ea2e10c6ded7df22"; + src = fetchFromGitHub { + owner = "dask"; + repo = "dask-gateway"; + rev = "refs/tags/${version}"; + hash = "sha256-PsagZdEPpeuZH9hFL98xB5z6zOdd4Cx/skGQ0eOYkCA="; }; + sourceRoot = "source/dask-gateway"; + propagatedBuildInputs = [ aiohttp dask @@ -31,6 +36,6 @@ buildPythonPackage rec { description = "A client library for interacting with a dask-gateway server"; homepage = "https://gateway.dask.org/"; license = licenses.bsd3; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix index 430047cb79..cc56413eea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "dask-jobqueue"; - version = "0.7.3"; + version = "0.7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aC18wOazGbarg6eomGgMEunHfdx33zgLQAQSkPVdTnk="; + hash = "sha256-XoQwazgJuFvhoEezhhGu2YvIp+VFAe7dhGIEVnuQ5kM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix index 3aec3e2522..8453b3e0ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2022.05.2"; + version = "2022.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - hash = "sha256-8M70Pf31PhYnBPRhSG55eWg6gK0lxsIFKF+cRCsf0/U="; + hash = "sha256-O5/TNeta0V0v9WTpPmF/kJMJ40ANo6rcRtzurr5/SwA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix index 05431026ec..24551340a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "databases"; - version = "0.6.0"; + version = "0.6.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "encode"; repo = pname; rev = version; - hash = "sha256-5+x735EFX9B25HgXiqzUJm0nbF7tDF5FOQVnbYQyomE="; + hash = "sha256-kHsA9XpolGmtuAGzRTj61igooLG9/LBQyv7TtuqiJ/A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix index 25fd928710..22cbd96cae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi , click +, oauthlib , requests , tabulate , six @@ -9,11 +10,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.16.4"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GBiQaBg7YY31bJft0W8Iq7WXhX98wPgPFHdNwuZ7WQY="; + sha256 = "sha256-SvoX2nPG6TygnF/fJPo1UpZYVLu8PxQoz00n7bdRtyw="; }; checkInputs = [ @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click + oauthlib requests tabulate six diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index e9fcda9ded..7a494e55d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "9.1.17"; + version = "10.4.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QBGeXZ8zvRRjmKGs0vyBWTvcug3PF/BFV2asYTqsScw="; + sha256 = "sha256-Dezqn6rZysRhDQFUuTgXdoJL9dn21Bx2QlryBG9MtR0="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix index aa3cd42e50..2c73d62de7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "datasets"; - version = "1.18.3"; + version = "2.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,10 +28,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "huggingface"; repo = pname; - rev = version; - hash = "sha256-2x6DpsDcVF2O5iJKeMEGw/aJwZPc7gSGaK2947c3B6s="; + rev = "refs/tags/${version}"; + hash = "sha256-VBYCDEOK5KyYuvlybr37LgOchlEUAl/aqiC+J6WQbSA="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "responses<0.19" "responses" + ''; + propagatedBuildInputs = [ aiohttp dill diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix index cb93ceb2b2..82f0851b1a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "datashader"; - version = "0.14.1"; + version = "0.14.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VGF6351lVCBat68EY9IY9lHk1hDMcjBcrVdPSliFq4Y="; + hash = "sha256-q8aOpuJD6aX9m9jPm9PY5vZGBJL6Jpf+pPHbcQVOJLg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix index 69aad6af3f..acd258c845 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "db-dtypes"; - version = "1.0.2"; + version = "1.0.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "googleapis"; repo = "python-db-dtypes-pandas"; rev = "refs/tags/v${version}"; - hash = "sha256-LLKhYLzGUQRx4ciWv1TilYvTOO0sj6rdkPlJLPZ8VXA="; + hash = "sha256-KkwXmJ9KwmslBPhBApm+bcY7Tu/J2ZK4sszBaMMDcpY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-client-gen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-client-gen/default.nix new file mode 100644 index 0000000000..d750df12cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus-client-gen/default.nix @@ -0,0 +1,21 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "dbus-client-gen"; + version = "0.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-DrpIeB6kMXPP6PfCjyx7Lsi8yyvwSl9k1nnUGtvVGKg="; + }; + + meta = with lib; { + description = "A Python Library for Generating D-Bus Client Code"; + homepage = "https://github.com/stratis-storage/dbus-client-gen"; + license = licenses.mpl20; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix index 0685ca6fcc..9d88bb4a9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dbus/default.nix @@ -4,8 +4,9 @@ buildPythonPackage rec { pname = "dbus-python"; version = "1.2.18"; - format = "other"; + disabled = isPyPy; + format = "other"; outputs = [ "out" "dev" ]; src = fetchPypi { @@ -17,11 +18,9 @@ buildPythonPackage rec { ./fix-includedir.patch ]; - disabled = isPyPy; - - preConfigure = if (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) then '' + preConfigure = lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinMinVersion "11" && stdenv.isDarwin) '' MACOSX_DEPLOYMENT_TARGET=10.16 - '' else null; + ''; configureFlags = [ "PYTHON=${python.pythonForBuild.interpreter}" @@ -36,9 +35,10 @@ buildPythonPackage rec { doCheck = isPy3k; checkInputs = [ dbus.out pygobject3 ]; - meta = { + meta = with lib; { description = "Python DBus bindings"; - license = lib.licenses.mit; + license = licenses.mit; platforms = dbus.meta.platforms; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix index bc5964c737..f419a717f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix @@ -9,23 +9,28 @@ buildPythonPackage rec { pname = "ddt"; - version = "1.4.4"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "8de39a69730442dc835e4d33f9d2e33043ff91151c8d18086959ee556febb9f8"; + sha256 = "sha256-2q1rxfx2GeWqfu1sOU4Fv4KUYWChPl3y4m3hdsuvNH4="; }; - checkInputs = [ six pyyaml mock pytestCheckHook ]; - propagatedBuildInputs = lib.optionals (!isPy3k) [ enum34 ]; + checkInputs = [ six pyyaml mock pytestCheckHook ]; + + preCheck = '' + # pytest can't import one file even with PYTHONPATH set + rm test/test_named_data.py + ''; + meta = with lib; { description = "Data-Driven/Decorated Tests, a library to multiply test cases"; homepage = "https://github.com/txels/ddt"; + maintainers = with maintainers; [ ]; license = licenses.mit; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix index 5efad06501..9830a8c027 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deap/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deap"; - version = "1.3.1"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "0bvshly83c4h5jhxaa97z192viczymz5fxp6vl8awjmmrs9l9x8i"; + sha256 = "sha256-h3LxsP/wQtXlFrCuusLHBiQwRap9DejguGWPOAGBzzE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debuglater/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debuglater/default.nix new file mode 100644 index 0000000000..6adbde7f51 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/debuglater/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, colorama +, dill +, fetchFromGitHub +, numpy +, pandas +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "debuglater"; + version = "1.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "ploomber"; + repo = pname; + rev = version; + hash = "sha256-n/Q6yt3q/+6QCGWNmaFrUK/phba6IVu42DMcvVj4vb0="; + }; + + propagatedBuildInputs = [ + colorama + ]; + + passthru.optional-dependencies = { + all = [ + dill + ]; + }; + + checkInputs = [ + numpy + pandas + pytestCheckHook + ] ++ passthru.optional-dependencies.all; + + pythonImportsCheck = [ + "debuglater" + ]; + + meta = with lib; { + description = "Module for post-mortem debugging of Python programs"; + homepage = "https://github.com/ploomber/debuglater"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix index 04b78d6c80..e492677d13 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix @@ -1,8 +1,10 @@ { lib , stdenv , buildPythonPackage +, pythonOlder , fetchFromGitHub , substituteAll +, fetchpatch , gdb , django , flask @@ -12,20 +14,20 @@ , pytest-xdist , pytestCheckHook , requests -, isPy3k -, pythonAtLeast }: buildPythonPackage rec { pname = "debugpy"; - version = "1.6.0"; + version = "1.6.2"; format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "Microsoft"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-WfZz2SimOTpG8CWNUic8NSp4Qd2JTXk+7JSUEPhuQ6Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-jcokiAZ2WwyIvsXNIUzvMIrRttR76RwDSE7gk0xHExc="; }; patches = [ @@ -50,6 +52,13 @@ buildPythonPackage rec { # To avoid this issue, debugpy should be installed using python.withPackages: # python.withPackages (ps: with ps; [ debugpy ]) ./fix-test-pythonpath.patch + + # Fix compiling attach library from source + # https://github.com/microsoft/debugpy/pull/978 + (fetchpatch { + url = "https://github.com/microsoft/debugpy/commit/08b3b13cba9035f4ab3308153aef26e3cc9275f9.patch"; + sha256 = "sha256-8E+Y40mYQou9T1ozWslEK2XNQtuy5+MBvPvDLt4eQak="; + }) ]; # Remove pre-compiled "attach" libraries and recompile for host platform @@ -59,17 +68,15 @@ buildPythonPackage rec { cd src/debugpy/_vendored/pydevd/pydevd_attach_to_process rm *.so *.dylib *.dll *.exe *.pdb ${stdenv.cc}/bin/c++ linux_and_mac/attach.cpp -Ilinux_and_mac -fPIC -nostartfiles ${{ - "x86_64-linux" = "-shared -m64 -o attach_linux_amd64.so"; - "i686-linux" = "-shared -m32 -o attach_linux_x86.so"; + "x86_64-linux" = "-shared -o attach_linux_amd64.so"; + "i686-linux" = "-shared -o attach_linux_x86.so"; "aarch64-linux" = "-shared -o attach_linux_arm64.so"; - "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch x86_64 -o attach_x86_64.dylib"; - "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch i386 -o attach_x86.dylib"; - "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -arch arm64 -o attach_arm64.dylib"; + "x86_64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86_64.dylib"; + "i686-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_x86.dylib"; + "aarch64-darwin" = "-std=c++11 -lc -D_REENTRANT -dynamiclib -o attach_arm64.dylib"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")} )''; - doCheck = isPy3k; - checkInputs = [ django flask @@ -86,16 +93,8 @@ buildPythonPackage rec { "--timeout=0" ]; - disabledTests = lib.optionals (pythonAtLeast "3.10") [ - "test_flask_breakpoint_multiproc" - "test_subprocess[program-launch-None]" - "test_systemexit[0-zero-uncaught-raised-launch(integratedTerminal)-module]" - "test_systemexit[0-zero-uncaught--attach_pid-program]" - "test_success_exitcodes[-break_on_system_exit_zero-0-attach_listen(cli)-module]" - "test_success_exitcodes[--0-attach_connect(api)-program]" - "test_run[code-attach_connect(api)]" - "test_subprocess[program-launch-None]" - ]; + # Fixes hanging tests on Darwin + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ "debugpy" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch index 537531cd97..0f51106988 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/fix-test-pythonpath.patch @@ -1,8 +1,8 @@ diff --git a/tests/debug/session.py b/tests/debug/session.py -index 101492fc..4ee7cfbe 100644 +index af242877..30b21a1e 100644 --- a/tests/debug/session.py +++ b/tests/debug/session.py -@@ -630,6 +630,7 @@ class Session(object): +@@ -622,6 +622,7 @@ class Session(object): if "PYTHONPATH" in self.config.env: # If specified, launcher will use it in lieu of PYTHONPATH it inherited # from the adapter when spawning debuggee, so we need to adjust again. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch index 0985126023..ad40a504c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-gdb.patch @@ -1,5 +1,5 @@ diff --git a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py -index 3c0e1b94..e995a20f 100644 +index 462feae9..eb2aa945 100644 --- a/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py +++ b/src/debugpy/_vendored/pydevd/pydevd_attach_to_process/add_code_to_python_process.py @@ -399,7 +399,7 @@ def run_python_code_linux(pid, python_code, connect_debugger_tracing=False, show diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch index 7d3fd5abfc..440513e26c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/hardcode-version.patch @@ -1,5 +1,5 @@ diff --git a/setup.py b/setup.py -index e7487100..10d36520 100644 +index 5fc40070..775a08ec 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ import sys @@ -26,24 +26,22 @@ index e7487100..10d36520 100644 description="An implementation of the Debug Adapter Protocol for Python", # noqa long_description=long_description, long_description_content_type="text/markdown", -diff --git a/src/debugpy/__init__.py b/src/debugpy/__init__.py -index baa5a7c5..53553272 100644 ---- a/src/debugpy/__init__.py -+++ b/src/debugpy/__init__.py -@@ -27,7 +27,6 @@ __all__ = [ - import codecs - import os +diff --git a/src/debugpy/public_api.py b/src/debugpy/public_api.py +index 3c800898..27743245 100644 +--- a/src/debugpy/public_api.py ++++ b/src/debugpy/public_api.py +@@ -7,8 +7,6 @@ from __future__ import annotations + import functools + import typing -from debugpy import _version - from debugpy.common import compat +- + + # Expose debugpy.server API from subpackage, but do not actually import it unless + # and until a member is invoked - we don't want the server package loaded in the +@@ -182,4 +180,4 @@ def trace_this_thread(__should_trace: bool): + """ -@@ -204,7 +203,7 @@ def trace_this_thread(should_trace): - return api.trace_this_thread(should_trace) - - --__version__ = _version.get_versions()["version"] -+__version__ = "@version@" - - # Force absolute path on Python 2. - __file__ = os.path.abspath(__file__) +-__version__: str = _version.get_versions()["version"] ++__version__: str = "@version@" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix index 837259380a..0e5e9b4566 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deepwave/default.nix @@ -10,29 +10,40 @@ , pytestCheckHook }: +let + linePatch = '' + import os + os.environ['PATH'] = os.environ['PATH'] + ':${ninja}/bin' + ''; +in buildPythonPackage rec { pname = "deepwave"; - version = "0.0.11"; + version = "0.0.14"; format = "pyproject"; src = fetchFromGitHub { owner = "ar4"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d4EahmzHACHaeKoNZy63OKwWZdlHbUydrbr4fD43X8s="; + sha256 = "sha256-k1MUrnIkllxGIpkEScTZBEDBBNHgJHxau1e/L8TOEKc="; }; # unable to find ninja although it is available, most likely because it looks for its pip version postPatch = '' substituteInPlace setup.cfg --replace "ninja" "" + + # Adding ninja to the path forcibly + mv src/deepwave/__init__.py tmp + echo "${linePatch}" > src/deepwave/__init__.py + cat tmp >> src/deepwave/__init__.py + rm tmp ''; # The source files are compiled at runtime and cached at the # $HOME/.cache folder, so for the check phase it is needed to # have a temporary home. This is also the reason ninja is not # needed at the nativeBuildInputs, since it will only be used - # at runtime. The user will have to add it to its nix-shell - # along with deepwave + # at runtime. preBuild = '' export HOME=$(mktemp -d) ''; @@ -40,7 +51,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytorch pybind11 ]; checkInputs = [ - ninja which scipy pytest-xdist diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix index c94f3d205c..62e92e8dde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.3.3"; + version = "5.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-eiznL23Pt7bwBLxNG8V3ITSNMnwMBjFdiGgu0cSoSw0="; + hash = "sha256-Lp5uIt6Zd8xQBcCWQcwL/YIHixXDpQ6ZTPSinLxr+PY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix index 12cbdf0a21..1cfa630337 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix @@ -1,17 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder -, fonttools, setuptools-scm -, pytest, pytest-runner, lxml, fs, unicodedata2, fontpens +{ lib +, buildPythonPackage +, fetchPypi +, fontpens +, fonttools +, fs +, lxml +, pytestCheckHook +, pythonOlder +, setuptools-scm +, unicodedata2 }: buildPythonPackage rec { pname = "defcon"; - version = "0.10.1"; + version = "0.10.2"; + format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+nlk9xG3mOCS4xHzp54J/V+he7HNMg1aMgFeTFTrMHA="; + hash = "sha256-ruOW5taeRa5lyCZHgTktTCkRaTSyc3rXbYIwtAwYKkQ="; extension = "zip"; }; @@ -24,18 +33,21 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest - pytest-runner - lxml - fs - unicodedata2 fontpens + fs + lxml + pytestCheckHook + unicodedata2 + ]; + + pythonImportsCheck = [ + "defcon" ]; meta = with lib; { description = "A set of UFO based objects for use in font editing applications"; homepage = "https://github.com/robotools/defcon"; license = licenses.mit; - maintainers = [ maintainers.sternenseemann ]; + maintainers = with maintainers; [ sternenseemann ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix index e9227891e0..a46c445be9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix @@ -2,11 +2,11 @@ , buildPythonPackage , fetchFromGitHub , gibberish-detector -, isPy27 , mock , pkgs , pyahocorasick , pytestCheckHook +, pythonOlder , pyyaml , requests , responses @@ -15,14 +15,16 @@ buildPythonPackage rec { pname = "detect-secrets"; - version = "1.2.0"; - disabled = isPy27; + version = "1.3.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "Yelp"; repo = pname; rev = "v${version}"; - hash = "sha256-4VcV06iaL3NAj7qF8RyfWV1zgrt928AQfjGeuO2Pbjk="; + hash = "sha256-Dl/2HgCacDko/ug9nGA9X+LyOkuDot11H28lxrgkwdE="; leaveDotGit = true; }; @@ -58,7 +60,9 @@ buildPythonPackage rec { "test_start_halfway" ]; - pythonImportsCheck = [ "detect_secrets" ]; + pythonImportsCheck = [ + "detect_secrets" + ]; meta = with lib; { description = "An enterprise friendly way of detecting and preventing secrets in code"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dill/default.nix index ac57417427..9167e629d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dill/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dill/default.nix @@ -1,20 +1,18 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 , pytestCheckHook }: buildPythonPackage rec { pname = "dill"; - version = "0.3.4"; - doCheck = !isPy27; + version = "0.3.5.1"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; - rev = "${pname}-${version}"; - sha256 = "0x702gh50wb3n820p2p9w49cn4a354y207pllwc7snfxprv6hypm"; + rev = "refs/tags/dill-${version}"; + sha256 = "sha256-gWE7aQodblgHjUqGAzOJGgxJ4qx9wHo/DU4KRE6JMWo="; }; checkInputs = [ @@ -27,13 +25,16 @@ buildPythonPackage rec { "tests/test_diff.py" "tests/test_module.py" "tests/test_objects.py" + "tests/test_session.py" ]; disabledTests = [ "test_class_objects" - "test_method_decorator" "test_importable" + "test_method_decorator" "test_the_rest" + # test exception catching needs updating, can probably be removed with next update + "test_recursive_function" ]; pythonImportsCheck = [ "dill" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix index 49de32439d..c9b09cbfe6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/discovery30303/default.nix @@ -31,6 +31,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace " --cov=discovery30303" "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix index cf3f7b514b..6a8d1e59ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix @@ -43,6 +43,8 @@ buildPythonPackage rec { "test_incr_version" "test_get_or_set" "test_get_many" + # see https://github.com/grantjenks/python-diskcache/issues/260 + "test_cache_write_unpicklable_object" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix index 426ee11079..646899d36c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distributed/default.nix @@ -21,16 +21,21 @@ buildPythonPackage rec { pname = "distributed"; - version = "2022.5.2"; + version = "2022.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BEqsUfpk/Z4WsaLEMVIg0oHw5cwbBfTT03hSQm8efLY="; + hash = "sha256-5oq6i+PiDl0RIKvKyEGQn/GAIXCKhBKvpY/xU8T6sKw="; }; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "tornado >= 6.0.3, <6.2" "tornado >= 6.0.3" + ''; + propagatedBuildInputs = [ click cloudpickle diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix index d0fe922dc1..be31d9cd47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "dj-rest-auth"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "iMerica"; repo = "dj-rest-auth"; rev = version; - sha256 = "sha256-vzcrGRaim1plksmkf8AC6sTl5P+106UG391Cy2yKQhQ="; + sha256 = "sha256-1oxkl7MJ2wIhcHlgxnCtj9Cp8o1puzNWs+vlMyi+3RM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix new file mode 100644 index 0000000000..05c525c0cc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, rcssmin +, rjsmin +, django-appconf +, beautifulsoup4 +, brotli +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "django-compressor"; + version = "4.1"; + format = "setuptools"; + + src = fetchPypi { + pname = "django_compressor"; + inherit version; + hash = "sha256-js5iHSqY9sZjVIDLizcB24kKmfeT+VyiDLAKvBlNMx0="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "rcssmin == 1.1.0" "rcssmin>=1.1.0" \ + --replace "rjsmin == 1.2.0" "rjsmin>=1.2.0" + ''; + + propagatedBuildInputs = [ + rcssmin + rjsmin + django-appconf + ]; + + pythonImportsCheck = [ + "compressor" + ]; + + doCheck = false; # missing package django-sekizai + + checkInputs = [ + beautifulsoup4 + brotli + pytestCheckHook + ]; + + DJANGO_SETTINGS_MODULE = "compressor.test_settings"; + + meta = with lib; { + description = "Compresses linked and inline JavaScript or CSS into single cached files"; + homepage = "https://django-compressor.readthedocs.org/en/latest/"; + license = licenses.mit; + maintainers = with maintainers; [ desiderius ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix index c9a0f10947..10cb2d132a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zYmHz45N024BmtPoolxYm8S0EMpKZs38vlwlpRenwK0="; + sha256 = "sha256-t7E8kTtbb24FyICv6uGpGxR6W8EfuVB5FR2cyItgalA="; }; propagatedBuildInputs = [ six django persisting-theory ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix index 0f0f4a0a11..b391fcac49 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "django-haystack"; - version = "3.1.1"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "6d05756b95d7d5ec1dbd4668eb999ced1504b47f588e2e54be53b1404c516a82"; + sha256 = "sha256-l+MZeu/CJf5AW28XYAolNL+CfLTWdDEwwgvBoG9yk6Q="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix index 78cce76ca5..326db4e323 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-hijack/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.2.0"; + version = "3.2.1"; # the wheel comes with pre-built assets, allowing us to avoid fighting # with npm/webpack/gettext to build them ourselves. @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "django_hijack"; dist = "py3"; python = "py3"; - sha256 = "1ixn7ppmbq1bgqahwv3z57hk80ql7sxpwl8jms7y8w5z1h91cn86"; + sha256 = "sha256-sHI3ULJH5bH2n2AKQLHVEkBAYfM5GOC/+0qpKDFOods="; }; propagatedBuildInputs = [ django django_compat ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-js-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-js-asset/default.nix index e7001d15a9..f921077934 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-js-asset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-js-asset/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "django-js-asset"; - version = "unstable-2021-06-07"; + version = "2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "matthiask"; repo = pname; - rev = "a186aa0b5721ca95da6cc032a2fb780a152f581b"; - sha256 = "141zxng0wwxalsi905cs8pdppy3ad717y3g4fkdxw4n3pd0fjp8r"; + rev = "refs/tags/${version}"; + hash = "sha256-YDOmbqB0xDBAlOSO1UBYJ8VfRjJ8Z6Hw1i24DNSrnjw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix index cc04bf0d44..9486764e27 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-mailman3/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django_compressor +{ lib, buildPythonPackage, fetchPypi, django-gravatar2, django-compressor , django-allauth, mailmanclient, django, mock }: @@ -12,7 +12,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - django-gravatar2 django_compressor django-allauth mailmanclient + django-gravatar2 django-compressor django-allauth mailmanclient ]; checkInputs = [ django mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix index 86bcc85eb0..fb16843b40 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-maintenance-mode/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "django-maintenance-mode"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "fabiocaccamo"; repo = pname; - rev = version; - sha256 = "0krcq04pf4g50q88l7q1wc53jgkhjmvif3acghfqq8c3s2y7mbz7"; + rev = "refs/tags/${version}"; + sha256 = "sha256-G08xQpLQxnt7JbtIo06z0NlRAMbca3UWbo4aXQR/Wy0="; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix index f81fc01bdd..a6ebb5714d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix @@ -1,24 +1,82 @@ -{ lib, buildPythonPackage, fetchPypi, django-picklefield, arrow -, blessed, django, future }: +{ arrow +, blessed +, buildPythonPackage +, croniter +, django +, django-redis +, django-picklefield +, fetchFromGitHub +, future +, lib +, poetry-core +, pytest-django +, pytest-mock +, pytestCheckHook +, pkgs +, stdenv +}: buildPythonPackage rec { pname = "django-q"; version = "1.3.9"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "5c6b4d530aa3aabf9c6aa57376da1ca2abf89a1562b77038b7a04e52a4a0a91b"; + src = fetchFromGitHub { + owner = "Koed00"; + repo = "django-q"; + sha256 = "sha256-gFSrAl3QGoJEJfvTTvLQgViPPjeJ6BfvgEwgLLo+uAA="; + rev = "v${version}"; }; + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ - django-picklefield arrow blessed django future + django-picklefield + arrow + blessed + django + future ]; - doCheck = false; + # fixes empty version string + # analog to https://github.com/NixOS/nixpkgs/pull/171200 + patches = [ + ./pep-621.patch + ]; + + pythonImportsCheck = [ + "django_q" + ]; + + preCheck = '' + ${pkgs.redis}/bin/redis-server & + REDIS_PID=$! + ''; + + postCheck = '' + kill $REDIS_PID + ''; + + checkInputs = [ + croniter + django-redis + pytest-django + pytest-mock + pytestCheckHook + ]; + + # don't bother with two more servers to test + disabledTests = [ + "test_disque" + "test_mongo" + ]; + + doCheck = !stdenv.isDarwin; meta = with lib; { description = "A multiprocessing distributed task queue for Django"; homepage = "https://django-q.readthedocs.org"; license = licenses.mit; + maintainers = with maintainers; [ gador ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-q/pep-621.patch b/third_party/nixpkgs/pkgs/development/python-modules/django-q/pep-621.patch new file mode 100644 index 0000000000..e0a1568f48 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-q/pep-621.patch @@ -0,0 +1,32 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 9a83e90..0cdffaf 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,16 +1,12 @@ +-[tool.poetry] ++[project] + name = "django-q" + version = "1.3.9" + description = "A multiprocessing distributed task queue for Django" +-authors = ["Ilan Steemers "] +-maintainers = ["Ilan Steemers "] +-license = "MIT" ++authors = [ { name = "Ilan Steemers", email = "koed00@gmail.com"} ] ++maintainers = [ { name = "Ilan Steemers", email = "koed00@gmail.com"} ] ++license.text = "MIT" + readme = 'README.rst' + +-repository = "https://github.com/koed00/django-q" +-homepage = "https://django-q.readthedocs.org" +-documentation = "https://django-q.readthedocs.org" +- + keywords = ["django", "distributed", "multiprocessing", "queue", "scheduler"] + + classifiers = [ +@@ -31,7 +27,6 @@ classifiers = [ + 'Topic :: System :: Distributed Computing', + 'Topic :: Software Development :: Libraries :: Python Modules', + ] +-include = ['CHANGELOG.md'] + + [tool.poetry.plugins] # Optional super table diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix index a4f93c6ce2..2932eb31e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "5.0.1"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-orJqS4SxEzgTbKnWRXpK8wcJkseoliOzSQCaEj8o6h0="; + sha256 = "sha256-JDoS7k4EwWEcDwdvv8MHTxrUCvxFrcZN5bokFMxOryk="; }; # tests assume the availability of a mysql/postgresql database diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix index 25a6e56178..040fe39d2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix @@ -1,20 +1,42 @@ { lib, buildPythonPackage, fetchPypi , django + +, azure-storage-blob +, boto3 +, dropbox +, google-cloud-storage +, libcloud +, paramiko }: buildPythonPackage rec { pname = "django-storages"; - version = "1.12.3"; + version = "1.13.1"; src = fetchPypi { inherit pname version; - sha256 = "a475edb2f0f04c4f7e548919a751ecd50117270833956ed5bd585c0575d2a5e7"; + sha256 = "sha256-s9mOzAnxsWJ8Kyz0MJZDIs5OCGF9v5tCNsFqModaHgs="; }; propagatedBuildInputs = [ django ]; - # django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. - doCheck = false; + preCheck = '' + export DJANGO_SETTINGS_MODULE=tests.settings + # timezone issues https://github.com/jschneier/django-storages/issues/1171 + substituteInPlace tests/test_sftp.py \ + --replace 'test_accessed_time' 'dont_test_accessed_time' \ + --replace 'test_modified_time' 'dont_test_modified_time' + ''; + checkInputs = [ + azure-storage-blob + boto3 + dropbox + google-cloud-storage + libcloud + paramiko + ]; + + pythonImportsCheck = [ "storages" ]; meta = with lib; { description = "Collection of custom storage backends for Django"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix index 815c609428..c620761dde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/3.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "django"; - version = "3.2.13"; + version = "3.2.14"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Django"; inherit version; - sha256 = "sha256-bZNJegqb9roOCxopzM3EDvv8dilyVbEwmzqISmiOxLY="; + sha256 = "sha256-Z3GCuotbKFpOBy86wXzu5q/xtc53/Rc8xbai09wCL88="; }; patches = lib.optional withGdal diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix index 8dc627b687..29e45201e0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix @@ -6,6 +6,7 @@ , substituteAll # patched in +, fetchpatch , geos , gdal , withGdal ? false @@ -39,23 +40,32 @@ buildPythonPackage rec { pname = "Django"; - version = "4.0.5"; + version = "4.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-90MaXecneWbzeFVXw5KEMzR9mYweZFkyRQE3iikeWqs="; + hash = "sha256-Ay+Kb8fPBczRIU5KLiHfzWojudV1xlc8rMjGeCjb5kI="; }; - patches = lib.optional withGdal + patches = [ + (fetchpatch { + # Fix regression in sqlite backend introduced in 4.1. + # https://github.com/django/django/pull/15925 + url = "https://github.com/django/django/commit/c0beff21239e70cbdcc9597e5be09e505bb8f76c.patch"; + hash = "sha256-QE7QnfYAK74wvK8gDJ15FtQ+BCIWRQKAVvM7v1FzwlE="; + excludes = [ "docs/releases/4.1.1.txt" ]; + }) + ] ++ lib.optionals withGdal [ (substituteAll { src = ./django_4_set_geos_gdal_lib.patch; geos = geos; gdal = gdal; extension = stdenv.hostPlatform.extensions.sharedLibrary; - }); + }) + ]; propagatedBuildInputs = [ asgiref diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix deleted file mode 100644 index 82684b5237..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_compressor/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, - rcssmin, rjsmin, django-appconf }: - -buildPythonPackage rec { - pname = "django_compressor"; - version = "3.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "c4a87bf65f9a534cfaf1c321a000a229c24e50c6d62ba6ab089482db42e819d9"; - }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'rcssmin == 1.0.6' 'rcssmin' \ - --replace 'rjsmin == 1.1.0' 'rjsmin' - ''; - - # requires django-sekizai, which we don't have packaged yet - doCheck = false; - - propagatedBuildInputs = [ rcssmin rjsmin django-appconf ]; - - meta = with lib; { - description = "Compresses linked and inline JavaScript or CSS into single cached files"; - homepage = "https://django-compressor.readthedocs.org/en/latest/"; - license = licenses.mit; - maintainers = with maintainers; [ desiderius ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_environ/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_environ/default.nix index 633d3e7286..4fa1b0e8ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_environ/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_environ/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-environ"; - version = "0.8.1"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "6f0bc902b43891656b20486938cba0861dc62892784a44919170719572a534cb"; + sha256 = "sha256-v/U4FTMFYyjJrAL3F5C9W/HOqBsb7rZI8ouByeg+CiE="; }; # The testsuite fails to modify the base environment diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix index 3af74be85b..b81e5b0927 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_silk/default.nix @@ -26,23 +26,16 @@ buildPythonPackage rec { pname = "django-silk"; - version = "4.1.0"; + version = "5.0.1"; # pypi tarball doesn't include test project src = fetchFromGitHub { owner = "jazzband"; repo = "django-silk"; rev = version; - sha256 = "1km3hmx1sir0c5gqr2p1h2938slhxp2hzf10cb80q98mas8spjkn"; + hash = "sha256-U2lj0B85cf2xu0o7enuLJB5YKaIt6gMvn+TgxleLslk="; }; - patches = lib.optional (pythonAtLeast "3.9") (fetchpatch { - # should be able to remove after 4.1.1 - name = "python-3.9-support.patch"; - url = "https://github.com/jazzband/django-silk/commit/134089e4cad7bd3b76fb0f70c423082cb7d2b34a.patch"; - sha256 = "09c1xd9y33h3ibiv5w9af9d79c909rgc1g5sxpd4y232h5id3c8r"; - }); - # "test_time_taken" tests aren't suitable for reproducible execution, but django's # test runner doesn't have an easy way to ignore tests - so instead prevent it from picking # them up as tests @@ -62,8 +55,13 @@ buildPythonPackage rec { checkInputs = [ freezegun contextlib2 networkx pydot factory_boy ]; checkPhase = '' - cd project - DB=sqlite3 DB_NAME=db.sqlite3 ${python.interpreter} manage.py test + runHook preCheck + + pushd project + DB_ENGINE=sqlite3 DB_NAME=':memory:' ${python.interpreter} manage.py test + popd # project + + runHook postCheck ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index d84a542d0b..7a24ba5a84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "djangorestframework-simplejwt"; - version = "5.1.0"; + version = "5.2.0"; src = fetchPypi { pname = "djangorestframework_simplejwt"; inherit version; - sha256 = "sha256-dTI1KKe5EIQ7h5GUdG8OvDSBxK2fNU3i3RYhYGYvuVo="; + sha256 = "sha256-pgsJr7J9ka0deskEzGMr1Szs6tjzifD6FTLOsPt1enQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix index 0f4ec03f5f..16d1dd3568 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dnslib"; - version = "0.9.19"; + version = "0.9.20"; src = fetchPypi { inherit pname version; - sha256 = "a6e36ca96c289e2cb4ac6aa05c037cbef318401ba8ff04a8676892ca79749c77"; + sha256 = "sha256-ApCrXQj6vR74XvFD0cM/3NVJyy5Qd57BpCOZiw0LKUU="; }; checkPhase = "VERSIONS=${python.interpreter} ./run_tests.sh"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix index 3cd680e062..9300779398 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docutils/default.nix @@ -8,11 +8,12 @@ buildPythonPackage rec { pname = "docutils"; - version = "0.18.1"; + version = "0.19"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Z5mHyvNhp1OdduWEy+3cMR467pN4d8hzRvMd68Y+nQY="; + hash = "sha256-M5laZ1PDC39Xf+v8LFBBH+xqrH9//rfEz+WZEHLc+eY="; }; # Only Darwin needs LANG, but we could set it in general. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix index f5fde969a8..c367556b4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "dogpile-cache"; - version = "1.1.7"; + version = "1.1.8"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "dogpile.cache"; inherit version; - sha256 = "sha256-IItZCpn6omXG4dEcLOnKZqsLgaU6zXL1aoJe7dI+5cg="; + sha256 = "sha256-2ETou2OMxPVEpMiag039Nv6TVAC3GhbL10Tr37cg/U4="; }; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix index 71cc9f6965..2ade1982ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/doit/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchPypi , buildPythonPackage +, importlib-metadata , isPy3k , mock , pytestCheckHook @@ -13,17 +14,18 @@ buildPythonPackage rec { pname = "doit"; - version = "0.35.0"; + version = "0.36.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-cVoyLIdMTLhiOU46DWn/MlcrUln1cDb7/cEFPEwB00g="; + sha256 = "sha256-cdB8zJUUyyL+WdmJmVd2ZeqrV+FvZE0EM2rgtLriNLw="; }; propagatedBuildInputs = [ cloudpickle + importlib-metadata toml ] ++ lib.optional stdenv.isLinux pyinotify ++ lib.optional stdenv.isDarwin macfsevents; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix index 3f0cca295d..aa840dc9ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix @@ -1,20 +1,34 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k }: +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "dominate"; - version = "2.6.0"; + version = "2.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4"; + hash = "sha256-UgEBNgiS6/nQVT9n0341n/kkA9ih4zgUAwUDCIoF2kk="; }; - doCheck = !isPy3k; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dominate" + ]; meta = with lib; { + description = "Library for creating and manipulating HTML documents using an elegant DOM API"; homepage = "https://github.com/Knio/dominate/"; - description = "Dominate is a Python library for creating and manipulating HTML documents using an elegant DOM API"; - license = licenses.lgpl3; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix index 59fed703e2..179d02b150 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dparse/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "dparse"; - version = "0.5.1"; + version = "0.5.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367"; + sha256 = "sha256-w0iZSh9ByF9mTY9aR0QmR7xOIsWvWxsm7ymv8Ppd3c0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix index 4b55a08f84..9606bbcf07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix @@ -14,16 +14,16 @@ buildPythonPackage rec { pname = "drf-yasg"; - version = "1.20.0"; + version = "1.21.3"; src = fetchPypi { inherit pname version; - sha256 = "d50f197c7f02545d0b736df88c6d5cf874f8fea2507ad85ad7de6ae5bf2d9e5a"; + sha256 = "sha256-su67Q4+mQVA6CNrHkb4kGD6ibbz+NxqYJOqR9uOpiKo="; }; postPatch = '' # https://github.com/axnsan12/drf-yasg/pull/710 - substituteInPlace requirements/base.txt --replace packaging "" + sed -i "/packaging/d" requirements/base.txt ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix index ef4bc58459..234f014a7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix @@ -8,10 +8,12 @@ , ipython-sql , poetry-core , sqlalchemy +, typing-extensions }: + buildPythonPackage rec { pname = "duckdb-engine"; - version = "0.1.11"; + version = "0.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,15 +21,15 @@ buildPythonPackage rec { src = fetchFromGitHub { repo = "duckdb_engine"; owner = "Mause"; - rev = "refs/tags/${version}"; - hash = "sha256-tjyaV9DmiP2XrKxSCX2qKo7T7GNZtT3y5d1yQLdVuSE="; + rev = "refs/tags/v${version}"; + hash = "sha256-UoTGFsno92iejBGvCsJ/jnhKJ41K9eTGwC7DomAp7IE="; }; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ duckdb sqlalchemy ]; - checkInputs = [ pytestCheckHook hypothesis ipython-sql ]; + checkInputs = [ pytestCheckHook hypothesis ipython-sql typing-extensions ]; pythonImportsCheck = [ "duckdb_engine" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix index dfbfe9b183..249f71c67d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/duecredit/default.nix @@ -26,7 +26,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ citeproc-py requests setuptools six ]; checkInputs = [ contextlib2 pytest pytestCheckHook vcrpy ]; - disabledTests = [ "test_io" ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "duecredit" ]; meta = with lib; { homepage = "https://github.com/duecredit/duecredit"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index 85b837d102..d95fef43fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -17,7 +17,7 @@ }: buildPythonPackage rec { - version = "0.20.44"; + version = "0.20.45"; pname = "dulwich"; format = "setuptools"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-EOjXN2PdMMhqmaFa3ov886uP6WUyzfSX6MsdEYMjUrg="; + hash = "sha256-cHEN2coqRCGQx+UGiS2wdMMYrHYuIh91KbjONIAgQbc="; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index 0274b52341..f5fc366c5f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.0.24"; + version = "0.1.13"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Sk4l9TL0SU6sPrBBed/Y4xDB/GzVzv2YTUD0IdjhB2M="; + hash = "sha256-dKqn7dMwPxKnLLBPJGgmD/2MFzdzrw7W9+w9Zi/9hsA="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix index 903a39383b..7e6a37a12d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.0.24"; + version = "0.1.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Hy/KLmu5mEIUazRi+XesTbKe+or/fzFL8e0zdV2WtC0="; + hash = "sha256-Edp2MRhe/eTUosL4XQfVbtwFWBg3D5RDWRb6r1C4MgE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix index adb19cf850..b6da5663f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-render/default.nix @@ -2,17 +2,18 @@ , buildPythonPackage , fetchFromGitHub , funcy +, matplotlib +, tabulate , pytestCheckHook , pytest-mock , pytest-test-utils , pythonOlder , setuptools-scm -, tabulate }: buildPythonPackage rec { pname = "dvc-render"; - version = "0.0.7"; + version = "0.0.9"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QUrXUfvxQ2XZPTWXXuYBJpzFGNb8KeqpMh47WdCQu04="; + hash = "sha256-ZUIyNg+PTj5CWC65RqB1whnB+pUp1yNJQj43iSBcyvU="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -30,16 +31,24 @@ buildPythonPackage rec { setuptools-scm ]; - propagatedBuildInputs = [ - funcy - tabulate - ]; + passthru.optional-dependencies = { + table = [ + tabulate + ]; + markdown = [ + tabulate + matplotlib + ]; + }; checkInputs = [ + funcy pytestCheckHook pytest-mock pytest-test-utils - ]; + ] + ++ passthru.optional-dependencies.table + ++ passthru.optional-dependencies.markdown; pythonImportsCheck = [ "dvc_render" @@ -47,8 +56,8 @@ buildPythonPackage rec { meta = with lib; { description = "Library for rendering DVC plots"; - homepage = "https://github.com/iterative/dvclive"; + homepage = "https://github.com/iterative/dvc-render"; license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab anthonyroussel ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix new file mode 100644 index 0000000000..b71cf3175e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools-scm +, kombu +, shortuuid +, celery +, funcy +, pytest-celery +, pytest-mock +, pytest-test-utils +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "dvc-task"; + version = "0.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "iterative"; + repo = pname; + rev = version; + hash = "sha256-LXjfFuLifgzU+3/EevycVCR7LhYBOoN6xg4YeNo5R4M="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + kombu + shortuuid + celery + funcy + ]; + + checkInputs = [ + pytest-celery + pytest-mock + pytest-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ + "dvc_task" + ]; + + meta = with lib; { + description = "Celery task queue used in DVC"; + homepage = "https://github.com/iterative/dvc-task"; + license = licenses.asl20; + maintainers = with maintainers; [ anthonyroussel ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix index 7b4c8151b2..23755f1065 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvclive/default.nix @@ -4,24 +4,26 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, tabulate }: buildPythonPackage rec { pname = "dvclive"; - version = "0.9.0"; + version = "0.10.0"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3kbP8eL/cO/aSAIVrbfGS+vwCTsWoCbNS2orExYt4aw="; + hash = "sha256-4sixsWZNnI3UJRlFyB21eAdUCgF8iIZ56ECgIeFV/u8="; }; propagatedBuildInputs = [ dvc-render + tabulate # will be available as dvc-render.optional-dependencies.table ]; # Circular dependency with dvc diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix index 3ee79ae448..456e0a6a62 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dynalite-devices/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "dynalite-devices"; - version = "0.46"; + version = "0.47"; src = fetchFromGitHub { owner = "ziv1234"; repo = "python-dynalite-devices"; - rev = "v${version}"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 - hash = "sha256-Fju2JpFkQBCbOln7r3L+crv82TI2SkdPJ1oaK7PEifo="; + rev = "refs/tags/v${version}"; # https://github.com/ziv1234/python-dynalite-devices/issues/2 + hash = "sha256-kJo4e5vhgWzijLUhQd9VBVk1URpg9SXhOA60dJYashM="; }; postPatch = '' @@ -27,6 +27,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + pythonImportsCheck = [ "dynalite_devices_lib" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix index 15d034bae4..ce3d5bd4ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ecdsa/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "ecdsa"; - version = "0.17.0"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "b9f500bb439e4153d0330610f5d26baaf18d17b8ced1bc54410d189385ea68aa"; + sha256 = "sha256-GQNIBBVZ4hsiodZc7khSgsoRpvgdUD/duE1QF+ntHkk="; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix index f4fea05b41..6ef09febb6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elastic-apm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.10.1"; + version = "6.11.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "v${version}"; - hash = "sha256-ql6qBnZXa0JL1qEXj2OzzP3onjYrMx6+Be6K3SDuWf4="; + hash = "sha256-ZmvOyEkXp0PEDHWcuGT91mhXwV2E6SPlrWBY/sNiRmc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix index f0815b15c7..737f4a5a0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elkm1-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.0.2"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "elkm1"; rev = version; - hash = "sha256-2UneQL8LT/zm0iusKay9SxeJClGrDi6yL0lRA8ugUms="; + hash = "sha256-uc+hU4RyF6IXUbdpZHozbF6vO2NE2hrfgxAnmmB27lw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix index bdd830810f..cb553c4fd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/email-validator/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "email-validator"; - version = "1.1.3"; + version = "1.2.1"; src = fetchFromGitHub { owner = "JoshData"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "19n6p75m96kwg38bpfsa7ksj26aki02p5pr5f36q8wv3af84s61c"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Avsqaev3LMoymU06y+u8MMv38ZI2cWk5tc/MkO+9oyA="; }; propagatedBuildInputs = [ @@ -32,6 +32,7 @@ buildPythonPackage rec { "test_deliverability_found" "test_deliverability_fails" "test_deliverability_dns_timeout" + "test_email_example_reserved_domain" "test_main_single_good_input" "test_main_multi_input" "test_main_input_shim" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix index 84a709ac53..ce1a57bc33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.7.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-8Wm0yqCnscUc5da4c2hLOQsFMcr3XVe8FArX9wllo8Q="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix index fbd22a42b5..d4b08af212 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix @@ -15,6 +15,11 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook pytest-mock ]; + disabledTests = [ + # console output order is racy + "test_rich_console_ex" + ]; + pythonImportsCheck = [ "enrich" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/enturclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enturclient/default.nix index b114c794ae..a177a68766 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/enturclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/enturclient/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "enturclient"; - version = "0.2.3"; + version = "0.2.4"; disabled = pythonOlder "3.8"; format = "pyproject"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "hfurubotten"; repo = pname; rev = "v${version}"; - sha256 = "1w0791f4p3yyncc1izx3q97fyaky2ling14qr0yn0acrmq9yh5cc"; + sha256 = "sha256-Y2sBPikCAxumylP1LUy8XgjBRCWaNryn5XHSrRjJIIo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix index 756472222d..7dbe665ede 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/epson-projector/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "epson-projector"; - version = "0.4.2"; + version = "0.4.6"; src = fetchPypi { pname = "epson_projector"; inherit version; - sha256 = "4ade1c7a0f7008d23b08bd886c8790c44cf7d60453d1eb5a8077c92aaf790d30"; + sha256 = "sha256-F8Dvk5OtlPbFyIedJb+zM2iN9eT0jDQEs06xbL3rlVs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix index 45f0599ea2..757dad33c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eradicate/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "eradicate"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "27434596f2c5314cc9b31410c93d8f7e8885747399773cd088d3adea647a60c8"; + sha256 = "sha256-qsc4SrJbG/IcTAEt6bS/g5iUWhTJjJEVRbLqUKtVgBQ="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix index 1e81450764..7bf0f9b497 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix @@ -42,6 +42,7 @@ buildPythonPackage rec { # boolean list representation changed "test_get_abi_strategy_returns_certain_strategies_for_known_type_strings" # hypothesis.errors.Flaky + "test_base_equals_has_expected_behavior_for_parsable_types" "test_has_arrlist_has_expected_behavior_for_parsable_types" "test_is_base_tuple_has_expected_behavior_for_parsable_types" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix new file mode 100644 index 0000000000..a428edc9e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/etils/default.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, flit-core + + # tests +, chex +, jaxlib +, pytest-subtests +, pytest-xdist +, pytestCheckHook +, yapf + + # optional +, jupyter +, mediapy +, numpy +, importlib-resources +, typing-extensions +, zipp +, absl-py +, tqdm +, dm-tree +, jax +, tensorflow +}: + +buildPythonPackage rec { + pname = "etils"; + version = "0.7.1"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-IHwJfdQYDV5asce37ni3v5Rx4SU03qziOx05LevSkvM="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + passthru.optional-dependencies = rec { + array-types = enp; + ecolab = [ jupyter numpy mediapy ] ++ enp ++ epy; + edc = epy; + enp = [ numpy ] ++ epy; + epath = [ importlib-resources typing-extensions zipp ] ++ epy; + epy = [ typing-extensions ]; + etqdm = [ absl-py tqdm ] ++ epy; + etree = array-types ++ epy ++ enp ++ etqdm; + etree-dm = [ dm-tree ] ++ etree; + etree-jax = [ jax ] ++ etree; + etree-tf = [ tensorflow etree ] ++ etree; + all = array-types ++ ecolab ++ edc ++ enp ++ epath ++ epy ++ etqdm + ++ etree ++ etree-dm ++ etree-jax ++ etree-tf; + }; + + doCheck = false; # disable tests until https://github.com/NixOS/nixpkgs/issues/185273 is resolved + + pythonImportsCheck = [ + "etils" + ]; + + checkInputs = [ + chex + jaxlib + pytest-subtests + pytest-xdist + pytestCheckHook + yapf + ] + ++ passthru.optional-dependencies.all; + + disabledTests = [ + "test_repr" # known to fail on Python 3.10, see https://github.com/google/etils/issues/143 + "test_public_access" # requires network access + "test_resource_path" # known to fail on Python 3.10, see https://github.com/google/etils/issues/143 + ]; + + meta = with lib; { + description = "Collection of eclectic utils for python"; + homepage = "https://github.com/google/etils"; + license = licenses.asl20; + maintainers = with maintainers; [ mcwitt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix index ff1d618ddb..446f825fd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix @@ -8,7 +8,6 @@ , monotonic , six , nose -, pyopenssl , iana-etc , pytestCheckHook , libredirect @@ -29,9 +28,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ dnspython greenlet - pyopenssl six - ] ++ lib.optional (pythonOlder "3.5") [ + ] ++ lib.optionals (pythonOlder "3.5") [ monotonic ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix index 16c5441803..1e4ba3c176 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ExifRead"; - version = "2.3.2"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a0f74af5040168d3883bbc980efe26d06c89f026dc86ba28eb34107662d51766"; + sha256 = "sha256-CsWjZBadvfK9YvlPXAc5cKtmlKMWYXf15EixDJQ+LKQ="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix index 0c776abb4d..0a8db86119 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/extractcode/default.nix @@ -1,14 +1,14 @@ { lib -, fetchPypi , buildPythonPackage +, extractcode-7z +, extractcode-libarchive +, fetchPypi +, patch +, pytest-xdist +, pytestCheckHook +, pythonOlder , setuptools-scm , typecode -, patch -, extractcode-libarchive -, extractcode-7z -, pytestCheckHook -, pytest-xdist -, pythonOlder }: buildPythonPackage rec { @@ -41,21 +41,23 @@ buildPythonPackage rec { pytest-xdist ]; - # CLI test tests the cli which we can't do until after install disabledTestPaths = [ + # CLI test tests the CLI which we can't do until after install "tests/test_extractcode_cli.py" ]; - # test_uncompress_* wants to use a binary to extract instead of the provided library disabledTests = [ + # test_uncompress_* wants to use a binary to extract instead of the provided library "test_uncompress_lz4_basic" "test_extract_tarlz4_basic" "test_extract_rar_with_trailing_data" - # tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox + # Tries to parse /boot/vmlinuz-*, which is not available in the nix sandbox "test_can_extract_qcow2_vm_image_as_tarball" "test_can_extract_qcow2_vm_image_not_as_tarball" "test_can_listfs_from_qcow2_image" "test_get_extractor_qcow2" + # WARNING patch:patch.py:450 inconsistent line ends in patch hunks + "test_patch_info_patch_patches_windows_plugin_explorer_patch" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix index 1c612e2b57..407083e4f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/factory_boy/default.nix @@ -4,7 +4,7 @@ , faker , fetchPypi , flask -, flask_sqlalchemy +, flask-sqlalchemy , mongoengine , pytestCheckHook , sqlalchemy @@ -28,7 +28,7 @@ buildPythonPackage rec { checkInputs = [ django flask - flask_sqlalchemy + flask-sqlalchemy mongoengine pytestCheckHook sqlalchemy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix index 7ca49a4843..a464d0372b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faker/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "faker"; - version = "13.3.4"; + version = "13.15.0"; src = fetchPypi { pname = "Faker"; inherit version; - hash = "sha256-GIlhBl+1x46mOfQhdvVRAPcskMOjF5rGyVXEvXErBRE="; + hash = "sha256-oSb6ZvVOZaZ/kT3MaYydAj3vcneIJTa94paPyscBv9U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix index 02f0d49279..9e49e4a223 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.8.1"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dsoftwareinc"; repo = "fakeredis-py"; rev = "refs/tags/v${version}"; - hash = "sha256-gmQuQIlpE4PdgZ1J5aucSQkJpfrh1qTJNLfyI+cMCJU="; + hash = "sha256-HmCF1CNZOCdvuJv3qr3qAWIP9wYr6053FToQyJ1MpmQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix index d76c2ef2f1..b70e239b4e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/faraday-plugins/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "faraday-plugins"; - version = "1.6.7"; + version = "1.6.8"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_plugins"; rev = "refs/tags/v${version}"; - sha256 = "sha256-sLY10lm9buhE2iJ81R5cItgVmnJA016Su+QEbW1/5DE="; + sha256 = "sha256-nRt2rcP/UldnNzDxANQDCzuqkFCU4LQxfWarqyc5a5Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix index 3ea51b2e03..883acef11b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastavro/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "fastavro"; - version = "1.5.2"; + version = "1.5.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-DNBTuONWlyn+ls4VfWv54tXXbsjxLVfwEjWp3PpruYk="; + sha256 = "sha256-6Zs4Whf/9c829D3tHvrhOzVRjYzqomcT9wzrBCklQmc="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix index c86dcd79aa..8f0b244723 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.5"; + version = "1.5.17"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-q0hdWucmR1qMMWIY8xZ/ccItcwb9EIVQauecJYSsQjc="; + sha256 = "sha256-glDjqcNLnk2p4zqfICiTLtENMYQ5S6UshwkP797NljY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix index 779949b38f..5fd8115152 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastnumbers/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { # Tests fail due to numeric precision differences on ARM # See https://github.com/SethMMorton/fastnumbers/issues/28 - doCheck = !(stdenv.isAarch64 || stdenv.isAarch32); + doCheck = !stdenv.hostPlatform.isAarch; checkInputs = [ hypothesis diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix index cd1b4e3bba..2ef751ad1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fastprogress/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "fastprogress"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lga6RCUFo6RFgdY97dzlv/HfF6y9w3JS98PxvlLB0kM="; + sha256 = "sha256-ehfStDiJD4OMBI7vzjLE3tRxl+zI6gQs7MM9PeuAIvU="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix index 216a84b9ec..4c2d10278e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fe25519/default.nix @@ -4,21 +4,20 @@ , fetchPypi , fountains , parts -, nose , pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "fe25519"; - version = "1.2.0"; - format = "setuptools"; + version = "1.3.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Hzdt8932WonJAaQPtL346JFPqxFXkNW4XQvbQlSoJJE="; + hash = "sha256-/grXAiWERDeTCWgFnNC1Ok8D5I9MBlwd1501TW0yK5c="; }; propagatedBuildInputs = [ @@ -28,13 +27,12 @@ buildPythonPackage rec { ]; checkInputs = [ - nose pytestCheckHook ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov=fe25519 --cov-report term-missing" "" + substituteInPlace pyproject.toml \ + --replace "--doctest-modules --ignore=docs --cov=fe25519 --cov-report term-missing" "" ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix index add6f3f90c..b5880a21b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "ffmpeg-progress-yield"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "26696726cc70c019d1b76bb25e4823c93f0837ddc86bc4ea26c08165270b4d92"; + sha256 = "sha256-/FkVzssJZYafn3MlN8bODd7kA917x9oW0JivIOWxl+8="; }; propagatedBuildInputs = [ colorama tqdm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix index 1a85a61f64..0feaa5595f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/filetype/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.13"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ahBHYv6T11XJYqqWyz2TCkj5GgdhBHEmxe6tIVPjOwM="; + hash = "sha256-r+SgAClgH2bSObcmiAZcx8IZ3sHJJ5lPkLgl6eU9j5M="; }; checkInputs = [ @@ -30,6 +30,8 @@ buildPythonPackage rec { "test_guess_memoryview" "test_guess_extension_memoryview" "test_guess_mime_memoryview" + # https://github.com/h2non/filetype.py/issues/128 + "test_guess_zstd" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix index 6c4f5daf64..e1d0850c9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/findpython/default.nix @@ -15,7 +15,7 @@ let pname = "findpython"; - version = "0.1.6"; + version = "0.2.1"; in buildPythonPackage { inherit pname version; @@ -25,7 +25,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-n9YYXNy5a6pxCTCER++0k7LH8aj1aeEorxTXJrKmnhg="; + hash = "sha256-Q5Shy828+NEOo0OeLYCGsuwHRQcJe25tvuGAKMblKwg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix index 75573c7a69..a3bc87c8d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-admin/default.nix @@ -6,7 +6,7 @@ , enum34 , fetchPypi , flask -, flask_sqlalchemy +, flask-sqlalchemy , flask-babelex , flask-mongoengine , geoalchemy2 @@ -46,7 +46,7 @@ buildPythonPackage rec { arrow colour email-validator - flask_sqlalchemy + flask-sqlalchemy flask-babelex flask-mongoengine geoalchemy2 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix index 9b0e993b1e..e52ecfc649 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix @@ -10,7 +10,7 @@ , flask-babel , flask_login , flask-openid -, flask_sqlalchemy +, flask-sqlalchemy , flask-wtf , flask-jwt-extended , jsonschema @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "flask-appbuilder"; - version = "4.0.0"; + version = "4.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -43,7 +43,7 @@ buildPythonPackage rec { # https://github.com/dpgaspar/Flask-AppBuilder/pull/1734 name = "flask-appbuilder-wtf3.patch"; url = "https://github.com/dpgaspar/Flask-AppBuilder/commit/bccb3d719cd3ceb872fe74a9ab304d74664fbf43.patch"; - sha256 = "1rsci0ynb7y6k53j164faggjr2g6l5v78w7953qbxcy8f55sb2fv"; + sha256 = "sha256-8NaTr0RcnsVik/AB4g8QL+FkcRlgkkASFe8fXIvFt/A="; excludes = [ "requirements.txt" "setup.py" @@ -61,7 +61,7 @@ buildPythonPackage rec { flask-babel flask_login flask-openid - flask_sqlalchemy + flask-sqlalchemy flask-wtf flask-jwt-extended jsonschema diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix index 6e78841ab8..6a7f51e81f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix @@ -11,14 +11,20 @@ buildPythonPackage rec { pname = "Flask-Caching"; - version = "1.11.1"; + version = "2.0.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "28af189e97defb9e39b43ebe197b54a58aaee81bdeb759f46d969c26d7aa7810"; + sha256 = "sha256-MwDvzNo1nWnODmgkuQy1cf+JWjkHwxJmwDQsykvEA0A="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "Flask <= 2.1.2" "Flask <= 2.2" + ''; + propagatedBuildInputs = [ cachelib flask diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix index 9f70e129ae..0453203203 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-migrate/default.nix @@ -5,7 +5,7 @@ , alembic , flask , flask_script -, flask_sqlalchemy +, flask-sqlalchemy , python }: @@ -25,7 +25,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ alembic flask - flask_sqlalchemy + flask-sqlalchemy ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix index e1a598d3a0..35216c6c03 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix @@ -12,7 +12,7 @@ , flask_mail # extras: fsqla -, flask_sqlalchemy +, flask-sqlalchemy , sqlalchemy , sqlalchemy-utils @@ -74,7 +74,7 @@ buildPythonPackage rec { flask_mail ]; fsqla = [ - flask_sqlalchemy + flask-sqlalchemy sqlalchemy sqlalchemy-utils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 421bc95332..cd45e8ab12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -1,4 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, flask, mock, sqlalchemy, pytest }: +{ lib +, buildPythonPackage +, fetchPypi +, flask +, mock +, sqlalchemy +, pytestCheckHook +}: buildPythonPackage rec { pname = "Flask-SQLAlchemy"; @@ -9,12 +16,20 @@ buildPythonPackage rec { sha256 = "2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; }; - propagatedBuildInputs = [ flask sqlalchemy ]; - checkInputs = [ mock pytest ]; + propagatedBuildInputs = [ + flask + sqlalchemy + ]; - checkPhase = '' - pytest - ''; + checkInputs = [ + mock + pytestCheckHook + ]; + + disabledTests = [ + # flaky + "test_session_scoping_changing" + ]; meta = with lib; { description = "SQLAlchemy extension for Flask"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix index d238ba5acb..e68f69e248 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-swagger-ui/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "flask-swagger-ui"; - version = "3.36.0"; + version = "4.11.1"; src = fetchPypi { inherit pname version; - sha256 = "f329752a65b2940ada8eeb57bce613f7c0a12856a9c31063bb9e33798554c9ed"; + sha256 = "sha256-o3AZmngNZ4sy448b4Q1Nge+g7mPp/i+3Zv8aS2w32sg="; }; doCheck = false; # there are no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix index e4ded57576..760c3ee671 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask/default.nix @@ -13,12 +13,13 @@ }: buildPythonPackage rec { - version = "2.1.2"; - pname = "Flask"; + pname = "flask"; + version = "2.1.3"; src = fetchPypi { - inherit pname version; - sha256 = "sha256-MV3tLd+KYoFWftsnOTAQ/jQGGIuvv+ZaMznVeH2J5Hc="; + pname = "Flask"; + inherit version; + sha256 = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix index 1cd6879047..5eda127fb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flax/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "flax"; - version = "0.4.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "v${version}"; - sha256 = "0j5ngdndm9nm49gcda7m36qzwk5lcbi4jnij9fi96vld54ip6f6v"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-t24JZ08EmvuAINZC26OQI1icklUhUkfz6ZRKPr2COAw="; }; buildInputs = [ jaxlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix index c8c9b7f4b1..14bb7ae6cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "flower"; - version = "1.0.0"; + version = "1.1.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "1gcczr04g7wx99h7pxxx1p9n50sbyi0zxrzy7f7m0sf5apxw85rf"; + sha256 = "sha256-+SDKKQLXU5/BgKsV5R8dkYNV5cwj2oVP+dWcbloXJbY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix index a075d64406..87fc01f83d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontmake/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "fontmake"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lD7MvZdr9CeWdoZtD3+8stVJTeQN5/AQ4miA/I2TFoE="; + sha256 = "sha256-g/JTmYE078qAFcTVCumVvGj65LbnDsCIUsFfqVlihTk="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix index 88789f6b57..cfcabbddc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fonttools/default.nix @@ -24,15 +24,15 @@ buildPythonPackage rec { pname = "fonttools"; - version = "4.33.3"; + version = "4.34.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "MUIZGnYwlfTat9655AOYgK5r6AvHj/xXghUvOZR8HIM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-GwbcrDsfxs5qRQJozhK/+n3W3NlO39g7pzxL9iIiDfU="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fountains/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fountains/default.nix index e62eedf046..1d65c4e643 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fountains/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fountains/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "fountains"; - version = "1.3.0"; - format = "setuptools"; + version = "2.0.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c6nw22UtAREYZp0XCEZE6p7GpRvSLukq5y0c9KvVf9w="; + hash = "sha256-9ASOgqkE1vwCKGAZXEJaHoABMXomIWTGv3jAsNssdsU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix index fe0c4b2335..6b47dc77c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix @@ -3,19 +3,18 @@ , fetchPypi , isPy3k , pytestCheckHook -, python }: buildPythonPackage rec { pname = "frozendict"; - version = "2.3.1"; + version = "2.3.4"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-vJHGkjPrkWu268QJiLbYSXNXcCQO/JxgvkW0q5GcG94="; + sha256 = "15b4b18346259392b0d27598f240e9390fafbff882137a9c48a1e0104fb17f78"; }; pythonImportsCheck = [ @@ -35,8 +34,8 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = "https://github.com/slezica/python-frozendict"; - description = "An immutable dictionary"; - license = licenses.mit; + homepage = "https://github.com/Marco-Sulla/python-frozendict"; + description = "A simple immutable dictionary"; + license = licenses.lgpl3Only; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/functorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/functorch/default.nix index e7f4e29fe9..53860d2c2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/functorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/functorch/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "functorch"; - version = "0.1.1"; + version = "0.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; - rev = "v${version}"; - hash = "sha256-FidM04Q3hkGEDr4dthJv0MWtGiRfnWxJoyzu7Wl3SD8="; + rev = "refs/tags/v${version}"; + hash = "sha256-33skKk5aAIHn+1149ifolXPA+tpQ+WROAZvwPeGBbrA="; }; # Somewhat surprisingly pytorch is actually necessary for the build process. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix new file mode 100644 index 0000000000..b4d66188e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/galois/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, pytestCheckHook +, pytest-xdist +, numpy +, numba +, typing-extensions +}: + +buildPythonPackage rec { + pname = "galois"; + version = "0.0.32"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mhostetter"; + repo = "galois"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-+cxRLrfqk3N9pWKCVsTxruZwMYZ5dQyKJRnrb8y+ECM="; + }; + + propagatedBuildInputs = [ + numpy + numba + typing-extensions + ]; + + checkInputs = [ + pytestCheckHook + pytest-xdist + ]; + + postPatch = '' + substituteInPlace setup.cfg \ + --replace "numpy >= 1.18.4, < 1.23" "numpy >= 1.18.4" + ''; + + pythonImportsCheck = [ "galois" ]; + + meta = { + description = "A Python 3 package that extends NumPy arrays to operate over finite fields"; + homepage = "https://github.com/mhostetter/galois"; + downloadPage = "https://github.com/mhostetter/galois/releases"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ chrispattison ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gatt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gatt/default.nix new file mode 100644 index 0000000000..6242011b31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gatt/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, dbus-python +, pygobject3 +}: + +buildPythonPackage rec { + pname = "gatt"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "getsenic"; + repo = "gatt-python"; + rev = "${version}"; + hash = "sha256-GMLqQ9ojQ649hbbJB+KiQoOhiTWweOgv6zaCDzhIB5A="; + }; + + propagatedBuildInputs = [ + dbus-python + pygobject3 + ]; + + pythonImportsCheck = [ "gatt" ]; + + meta = with lib; { + description = "Bluetooth (Generic Attribute Profile) GATT SDK for Python"; + homepage = "https://github.com/getsenic/gatt-python/"; + license = licenses.mit; + maintainers = with maintainers; [ tomfitzhenry ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix index 88fc47ad2a..2661ae1503 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gcovr/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "gcovr"; - version = "5.1"; + version = "5.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-d4CEQ1m/8LlsBBR9r/8l5uWF4FWFvVQjabvDd9ad4SE="; + hash = "sha256-IXGVCF7JQ0YpGoe3sebZz97u5WKz4PmjKyXJUws7zo8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix index 22c96920be..f82e287808 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ge25519/default.nix @@ -4,7 +4,6 @@ , fe25519 , fetchPypi , fountains -, nose , parts , pytestCheckHook , pythonOlder @@ -12,14 +11,14 @@ buildPythonPackage rec { pname = "ge25519"; - version = "1.2.0"; - format = "setuptools"; + version = "1.3.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8GsNY62SusUmQcaqlhKOPHbd0jvZulCaxMxeob37JJM="; + hash = "sha256-y9Nv59pLWk1kRjZG3EmalT34Mjx7RLZ4WkvJlRrK5LI="; }; propagatedBuildInputs = [ @@ -30,16 +29,14 @@ buildPythonPackage rec { ]; checkInputs = [ - nose pytestCheckHook ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace " --cov=ge25519 --cov-report term-missing" "" + substituteInPlace pyproject.toml \ + --replace "--doctest-modules --ignore=docs --cov=ge25519 --cov-report term-missing" "" ''; - pythonImportsCheck = [ "ge25519" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/generic/default.nix index 87dca630a1..98e601140d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/generic/default.nix @@ -2,25 +2,30 @@ , buildPythonPackage , pythonOlder , fetchPypi +, exceptiongroup , poetry-core }: buildPythonPackage rec { pname = "generic"; - version = "1.0.1"; + version = "1.1.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ex93I+ofo5lP6qoolZwzjxSspeqJimY3vpB32RLJ00k="; + sha256 = "sha256-/947oEvZSD5mjRD9qcuzKAFativTmaeejXxQ322UD+A="; }; nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ + exceptiongroup + ]; + pythonImportsCheck = [ "generic" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix index 9260bb6e3c..db1996a908 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geoalchemy2/default.nix @@ -5,18 +5,19 @@ , setuptools-scm , shapely , sqlalchemy +, alembic , psycopg2 , pytestCheckHook }: buildPythonPackage rec { pname = "GeoAlchemy2"; - version = "0.11.1"; + version = "0.12.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+SoPrdtbdDhNu/PHAAQzNYzo4HoYD+HWwoQ+qgQ3/wg="; + sha256 = "sha256-MSgMZF3EoPkMHSmdL1x9WrZ8eENTW0ULTCq4ifAB4EI="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ buildPythonPackage rec { ]; checkInputs = [ + alembic psycopg2 pytestCheckHook ]; @@ -48,6 +50,7 @@ buildPythonPackage rec { "tests/gallery/test_type_decorator.py" "tests/test_functional.py" "tests/test_functional_postgresql.py" + "tests/test_alembic_migrations.py" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix index 0526a584a4..12a542af50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix @@ -2,15 +2,17 @@ , buildPythonPackage , fetchPypi , pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "geographiclib"; - version = "1.52"; + version = "2.0"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rEANZyuJVLAwa8qJCwiLuLoqdX3IEzzKC4ePNLM7J0A="; + sha256 = "sha256-9/Qchdw+HC09k17IZmDcOyyEjIPhf5qeUbqdUUahWFk="; }; checkInputs = [ @@ -23,5 +25,6 @@ buildPythonPackage rec { homepage = "https://geographiclib.sourceforge.io"; description = "Algorithms for geodesics (Karney, 2013) for solving the direct and inverse problems for an ellipsoid of revolution"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix index 6b05bb7228..3ef58b9ec4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geopy/default.nix @@ -1,16 +1,18 @@ { lib , async_generator , buildPythonPackage +, docutils , fetchFromGitHub , geographiclib -, isPy3k , pytestCheckHook +, pythonOlder +, pytz }: buildPythonPackage rec { pname = "geopy"; version = "2.2.0"; - disabled = !isPy3k; # only Python 3 + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; @@ -19,15 +21,29 @@ buildPythonPackage rec { sha256 = "sha256-zFz0T/M/CABKkChuiKsFkWj2pphZuFeE5gz0HxZYaz8="; }; - propagatedBuildInputs = [ geographiclib ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "geographiclib<2,>=1.49" "geographiclib" + ''; + + propagatedBuildInputs = [ + geographiclib + ]; checkInputs = [ async_generator + docutils pytestCheckHook + pytz ]; - # Exclude tests which perform API calls - pytestFlagsArray = [ "--ignore test/geocoders/" ]; + disabledTests = [ + # ignore --skip-tests-requiring-internet flag + "test_user_agent_default" + ]; + + pytestFlagsArray = [ "--skip-tests-requiring-internet" ]; + pythonImportsCheck = [ "geopy" ]; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix index 4a349106ac..47aaeb37c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix @@ -8,18 +8,19 @@ , pytestCheckHook , pythonOlder , six +, urllib3 }: buildPythonPackage rec { pname = "geventhttpclient"; - version = "1.5.3"; + version = "2.0"; format = "setuptools"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-2A7J/0K3IZ8zVYGFSZ0LQ2VZf8Vf+IYge0X1Yy4Jl4A="; + hash = "sha256-SegzLaon80HeCNk4h4KJs7dzaVzblvIpZRjC1uPr7JI="; }; propagatedBuildInputs = [ @@ -32,10 +33,11 @@ buildPythonPackage rec { checkInputs = [ dpkt pytestCheckHook + urllib3 ]; disabledTests = [ - # socket.gaierror: [Errno -2] Name or service not known + # socket.gaierror: [Errno -3] Temporary failure in name resolution "test_client_simple" "test_client_without_leading_slas" "test_request_with_headers" @@ -50,8 +52,8 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/gwik/geventhttpclient"; - description = "HTTP client library for gevent"; + homepage = "https://github.com/geventhttpclient/geventhttpclient"; + description = "High performance, concurrent HTTP client library using gevent"; license = licenses.mit; maintainers = with maintainers; [ koral ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ghapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ghapi/default.nix index 002dbeaa0c..162ea67ad2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ghapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ghapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ghapi"; - version = "0.1.21"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "ghapi"; rev = "refs/tags/${version}"; - sha256 = "sha256-6VcsIcRhIHByd1aPZLIJ+g4o1einHpyJuSamwh1Ag5M="; + sha256 = "sha256-yFJ7Ek2kfFvkZwjrvvx3AXKFE4vRVsLYTSHfs+nr0Rg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix index 68283546e5..ab05ccfc3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gigalixir/default.nix @@ -18,14 +18,14 @@ buildPythonApplication rec { pname = "gigalixir"; - version = "1.2.5"; + version = "1.2.6"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P70xsI/zwsoSgK1XCPzJSI5NQ58M431kmgo5gHXbaNw="; + hash = "sha256-a2kU5vUSiOg0yFvGLxE2Edgyrar7psBD4NPEmDsP3IY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix index 535fd97507..97ff89852d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "glean-parser"; - version = "5.1.2"; + version = "6.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,13 +23,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "glean_parser"; inherit version; - hash = "sha256-PjOMNUnrz0kDfYEXv5Ni/9RIHn4Yylle6NJOK1Rb3SY="; + hash = "sha256-EqD+ztwRRNd/pXHgQi/z/qTbrcOB1jG+qACmsvWPT38="; }; postPatch = '' substituteInPlace setup.py \ --replace "pytest-runner" "" \ - --replace "MarkupSafe==2.0.1" "MarkupSafe" + --replace "MarkupSafe>=1.1.1,<=2.0.1" "MarkupSafe>=1.1.1" ''; nativeBuildInputs = [ @@ -50,9 +50,15 @@ buildPythonPackage rec { pytestCheckHook ]; + preCheck = '' + export HOME=$TMPDIR + ''; + disabledTests = [ - # https://bugzilla.mozilla.org/show_bug.cgi?id=1741668 + # Network access "test_validate_ping" + # Fails since yamllint 1.27.x + "test_yaml_lint" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix index 2f569758b4..8ede9275db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glean-sdk/default.nix @@ -16,19 +16,19 @@ buildPythonPackage rec { pname = "glean-sdk"; - version = "44.0.0"; + version = "51.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-gzLsBwq3wrFde5cEb5+oFLW4KrwoiZpr22JbJhNr1yk="; + hash = "sha256-Rt+N/sqX7IyoXbytzF9UkyXsx0vQXbGs+XJkaMhevE0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-lWFv8eiA3QHp5bhcg4qon/dvKUbFbtH1Q2oXGkk0Me0="; + hash = "sha256-oY94YVs6I+/klogyajBoCrYexp9oUSrQ6znWVbigf2E="; }; nativeBuildInputs = [ @@ -49,6 +49,11 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # RuntimeError: No ping received. + "test_client_activity_api" + ]; + postPatch = '' substituteInPlace glean-core/python/setup.py \ --replace "glean_parser==5.0.1" "glean_parser>=5.0.1" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix index accd8fcf5b..5eac6a3f2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glfw/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "glfw"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "FlorianRhiem"; repo = "pyGLFW"; rev = "refs/tags/v${version}"; - sha256 = "sha256-LaK/lYCUN7PDy8QsaGCnQPM1nvQNeBRTdEEkKtaMUHA="; + sha256 = "sha256-4Ym3Vmkf+HwORbhR72Ws/cqLkNMPCY8FL35O2hSalGQ="; }; # Patch path to GLFW shared object diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix index 2d6b19bea3..67cd409337 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/glyphslib/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , fonttools , openstep-plist , ufoLib2 @@ -16,22 +16,21 @@ buildPythonPackage rec { pname = "glyphslib"; - version = "6.0.4"; + version = "6.0.7"; format = "pyproject"; - src = fetchPypi { - pname = "glyphsLib"; - inherit version; - sha256 = "sha256-PT66n1WEO5FNcwov8GaXT1YNrAi22X4HN7iVNkuehKI="; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "glyphsLib"; + rev = "v${version}"; + sha256 = "sha256-PrHK9uEgs0DcNYW6EQ5Qw29CN4R2OcxOHrMeIswsxdA="; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "glyphsLib" ]; - propagatedBuildInputs = [ fonttools openstep-plist @@ -44,6 +43,10 @@ buildPythonPackage rec { skia-pathops ]; + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "glyphsLib" ]; + disabledTestPaths = [ "tests/builder/designspace_gen_test.py" # this test tries to use non-existent font "CoolFoundry Examplary Serif" "tests/builder/interpolation_test.py" # this test tries to use a font that previous test should made diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix index 42e2b84783..e196f0ec09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goobook/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "goobook"; - version = "3.5.1"; + version = "3.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6e69aeaf69112d116302f0c42ca1904f3b6efd17f15cefc12c866206160293be"; + sha256 = "sha256-i24Hh10iXFUiWVgokMs7f8ZpIVN/ZEF421tfa2ByQ4c="; }; nativeBuildInputs = [ docutils installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix index 6dc6f07e4a..3d4fd154c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/goodwe/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "goodwe"; - version = "0.2.18"; + version = "0.2.19"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "marcelblijleven"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-2AbEX/dYwcMIlp27umBcSGgPboGu5y0mmndefXCjkJg="; + sha256 = "sha256-H3N0hAJsjBX3pQ2i03r4MRBQQLCXjLhftokZQx0bF80="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix index 6fc435be49..50b58e5a3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "2.8.1"; + version = "2.8.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lYAkxqo0YLCPNXQSMQdqTdmkyBmmo51E2pYn/r6LKPA="; + sha256 = "sha256-BvckTGQDIrUIsSWQO7VwG+urzogy+Fq6kzXsALPQLtw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix index bce1897eac..1997d88821 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "2.42.0"; + version = "2.53.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e/WLZltjXQattHeXqaT3NILnOeAu0DbNlg3HwYM2H2c="; + sha256 = "sha256-kEs9aH4otT9N3iNrReRDxjh+FzYU6ZGD3FuKzb03DRg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 449a07ea40..d5e7848b3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.5.1"; + version = "0.5.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MFlrgk/GgI/ayi8EjkmYzED7SzWZ6upm0o3HCFs2xbg="; + sha256 = "sha256-1emKcSAzMGmfkqJrwIhHqS6MOxuNgqAh8a80Fk2xQ64="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index d228e40e1a..f1aba037ee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -2,46 +2,78 @@ , lib , buildPythonPackage , fetchPypi -, pytestCheckHook , cachetools +, pyasn1-modules +, rsa +, six +, aiohttp , cryptography +, pyopenssl +, pyu2f +, requests +, aioresponses +, asynctest , flask , freezegun +, grpcio , mock , oauth2client -, pyasn1-modules -, pyu2f +, pytest-asyncio , pytest-localserver +, pytestCheckHook , responses -, rsa +, urllib3 }: buildPythonPackage rec { pname = "google-auth"; - version = "2.6.6"; + version = "2.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-G6STjgMrc961HlnEZWoA4JOc8LERJXUJnxNrq7RWMxI="; + sha256 = "sha256-FCkvo0KfK7HpmGJVTN4e5zDWhA664GeBTT0V2FScCIg="; }; propagatedBuildInputs = [ cachetools pyasn1-modules rsa - pyu2f + six ]; + passthru.optional-dependencies = { + aiohttp = [ + aiohttp + requests + ]; + enterprise_cert = [ + cryptography + pyopenssl + ]; + pyopenssl = [ + pyopenssl + ]; + reauth = [ + pyu2f + ]; + }; + checkInputs = [ - cryptography + aioresponses + asynctest flask freezegun + grpcio mock oauth2client - pytestCheckHook + pytest-asyncio pytest-localserver + pytestCheckHook responses - ]; + urllib3 + ] ++ passthru.optional-dependencies.aiohttp + ++ passthru.optional-dependencies.enterprise_cert + ++ passthru.optional-dependencies.reauth; pythonImportsCheck = [ "google.auth" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 7c9a0d4609..620ba52ab4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.12"; + version = "0.1.13"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OHTuAh8JsKnK9sDkXZbx/P9ElrQRSCGBk83wuhL8qEg="; + hash = "sha256-AnWAJyvLU4vurVv9uJvi2fkl0Sk1nCK5iNxSplxflHs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix index ec355d51fd..5378243fe1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-appengine-logging"; - version = "1.1.2"; + version = "1.1.3"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-undhXBAPB+3akWVu3ht0ZZBwErhmOq18TnXvloeZQjc="; + hash = "sha256-pTakW1aYx5KlU8vgOXwu4kJDI4nEVi2y0YE0pTo3k30="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix index 63b989f4fa..b62326fac1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.9.1"; + version = "3.11.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-rGN3P4EfSs7bLLca4Y2J1jF1/wPR5Oc1d6iZFjeQHTM="; + hash = "sha256-d/eDAp8QuXr2Zh/zk9ONeKd+SdmqXlugdpx9t1hkMIM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix index 84bdaf7afe..2fae768eb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-audit-log"; - version = "0.2.2"; + version = "0.2.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bYmQOEiu6YF0d+zjBlRIUbkDpexWHalmu7pajRJQmk0="; + sha256 = "sha256-Yi8baD1TgpLr1zNH2i+CBeY+3gwL7Aq5nnmgZcSSZr0="; }; propagatedBuildInputs = [ googleapis-common-protos protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix index e2e2ad80d4..19bac6c4b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "2.7.3"; + version = "2.8.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c6Su9hff+eHr0ddQOyv1Zo0IqcpTw6SmMK+iR5WQMs8="; + hash = "sha256-kpi3RU66JEWt0guFPRtetBqn8F21qjE8kW1zc4oSBPM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index e67b32272e..8adc7d1b25 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.6.2"; + version = "3.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-y8W0qwm4rTHlDO8L+/fhIJlfW5PonUhAYBU5wLIZJ94="; + hash = "sha256-WSFulX1aN+mSW3RTukXDe0N/BsLDQX2RKjqzPUsWb2Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 59859e4cce..97d3ec13e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hIwKcQNPG6AHudqjy2dotACk51IeivwRbJZZaiFweqs="; + sha256 = "sha256-n8LMhjyZmWnb8ALrOZkKZ8Ctlo70zjyTRF9HxJIudmQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 94cebca1a0..da01f970df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -21,17 +21,17 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "3.1.0"; + version = "3.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0tbK940cEz5//ZsLfi198fmy9wPeN3SXuW2adM/o7AI="; + sha256 = "sha256-l/tDBuMky4aQnOMqmUToHSH7yyingMXN8BtuTUfUwyI="; }; postPatch = '' substituteInPlace setup.py \ - --replace 'pyarrow >= 3.0.0, < 8.0dev' 'pyarrow >= 3.0.0, < 9.0dev' + --replace 'pyarrow >= 3.0.0, < 9.0dev' 'pyarrow >= 3.0.0, < 10.0dev' ''; propagatedBuildInputs = [ @@ -84,6 +84,7 @@ buildPythonPackage rec { "test__initiate_resumable_upload" "test__initiate_resumable_upload_mtls" "test__initiate_resumable_upload_with_retry" + "test_table_clones" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix index ff684d597c..35e05bff0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "2.10.1"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-f4wMYlmex0QrcJrl33VyOZgbURYnIjeWDR7rz4MzMJw="; + hash = "sha256-3IEedcFLM46M+luI3wx/Q0V4rhyGmkZyIy1oU0rHzII="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix index 41b85f50a4..1b03d52859 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.10.8"; + version = "2.11.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cQ5wFAwgqT2NT+jTfsg13wA7OOq8bk/QIRiIsK2ZyJ0="; + hash = "sha256-KVLM4ytQh8260JYd3oviCattfZa73e5p5dNXQMgRKQQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix index c446c7a6d2..54dd6cb837 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/apinmF0tBd8LVbrirHd2HZhBk0KPpuwa2Lk1+I0Rmk="; + sha256 = "sha256-NDNDWcsEGHvcgN3PYT5GLf16Oqu8P+TRGFF6tLkwPVM="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index f38b604ddb..a587684170 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.8.1"; + version = "3.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-t7kFCkyH3/MNGFX8S4OzgWnW/NSomAFDbDPCx9hV40g="; + hash = "sha256-1VhEg22JMfUDeMT5/A1uX7jwqND4i0zVScFpMJKyCro="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 05b61dd958..568cf16eed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "4.0.3"; + version = "5.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9PqMYqZpcy+Lv/3sh5Ru0X0wQWW5VW7CDsFGgHvErpU="; + hash = "sha256-ldFvWqMTpSY2YHJ+I1vsrTiPESNoi3b055bthwwFjY4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix index d521bbd2ca..133a593002 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "2.7.2"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8o6OeewuiptrlkVNm2I7fwtqPAt+nNOHveIUEWDjyN0="; + sha256 = "sha256-/zqsy+xrgmjsSrybBpwCfphTGGVp2AOp+ANsYPSrVfA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix index 279893faf3..5478fa8393 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.7.1"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-q2I3ku8f55rSJQE5oiDttQOJFYtGPjmrW7htrZ+BMPU="; + hash = "sha256-xidZ7EteyDUFxxXOXgSg6OUkzlIzEgnAMRledha0s/Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index de0f9c32ad..922d94c83c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.5.3"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ISPjpV2fjZSMbkJa6YzFGdrwyEC8MauLwS6pohMtFoY="; + sha256 = "sha256-Iq+rOR7gMAfhn5WxfpFQ7s8MlwOxPm868DpgKg/sT/k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix index c1d6152297..bf2af25a42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.6.2"; + version = "2.8.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-IOl5ZWekpiikOOMQ/afryiP+0lPLt4idSmVARRJj8LE="; + sha256 = "sha256-3SBQKRr/dpNqksC7wLNCz4Oda/i90BAZLcxN9oMYOsA="; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix index 6a55519f79..0d6732392a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.11.2"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X95xD/L18dXPYxCbvxIPjaOolMSDr7vpyQnzb5oMFEQ="; + sha256 = "sha256-ySlCL0Ukppob6Iuu2+fVQjPDsAnmK1Yvbd2I8+DVylk="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index fd418f85a3..67a3f66c91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.10.1"; + version = "2.11.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VQRCqlP0iCxYt50uzrVFSkvHrsYb3R8SmrdhZHxLFKw="; + hash = "sha256-eLd8lHhyGjJBTaNzP8amzWa3LyaAixzj+6EpRU2J0bg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 8ecae2963b..ae095ad589 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.13.4"; + version = "2.13.5"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZhcBynfvHc0nveZP9z0y2IJf44vTzy8xB3XV5iJOLu0="; + hash = "sha256-bpokSPdTEE2dVytUsxhyb46fn+0lRvCeS/+3Cefn2+I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index edb73853ca..f52cd45721 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.11.1"; + version = "2.12.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-tSy0d8kdyDSE+/gcg4B+fplnLJ4ipoa+TZvUoExaYVU="; + hash = "sha256-FSJFryLFttU/HWIFl4buRYOQoSd5cGmUS+FlHO8YzNE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 5be79fd38f..f141cc730e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.11.1"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-XvjxdrGgdXaJqbArwdEWT31one+I43cpZ97PciM8yIA="; + hash = "sha256-Tz8TFt1EwmEuQr2IPzTgz+PIkGJqJwXwfCndl/5DIbA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index 88643251bb..30e359f40b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.16.0"; + version = "3.17.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vkjAkxpk50zFVbhvdN76U5n6KbrTXilughac73La9yM="; + sha256 = "sha256-OSMlbvkvSzp2xqwPVoe4dfpYn2leox1huqD/WXlXlZk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix index 7f4c314198..42b4ddf076 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -6,22 +6,35 @@ , libcst , mock , proto-plus -, pytestCheckHook , pytest-asyncio +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.9.1"; + version = "2.10.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wIO22BScrDJdbia6oOEuuXptedxrCehqWKLXmxTJmKE="; + hash = "sha256-Us6K8gf8zzdbek9CDgitkhb40IA9MkqFNblLw/KmfSc="; }; - propagatedBuildInputs = [ google-api-core grpc-google-iam-v1 libcst proto-plus ]; + propagatedBuildInputs = [ + google-api-core + grpc-google-iam-v1 + libcst + proto-plus + ]; - checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + checkInputs = [ + mock + pytest-asyncio + pytestCheckHook + ]; disabledTests = [ # requires credentials diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix index c5d02926f5..c2bd3f0a14 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "1.3.1"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X85NRgGZt7+OpL4poOyS+UWec4fuABiTxEYyFpkUpqs="; + sha256 = "sha256-bRjvNNmvsBy0sR4C0DoC/n7A9ez6AfXUJrXZiHKkz0g="; }; propagatedBuildInputs = [ click google-auth packaging six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 92d2272440..cc3d35c885 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4I7zmjZMjXjkxjEtwWNbev0ryTOIyOWsVkC46tgRyqc="; + sha256 = "sha256-HcLY/dpWQzsfCmwtwePidqlDuLHmlEgLUEdGkHOgdsw="; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix index 8665718fb0..9f5df9bd98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.6.2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nxyd8zE8PEQupVutLWhLD4I1jNhhJ0ARpTi52f21iBE="; + sha256 = "sha256-4EC6jLcFNF8G0dXvc+cZB6Ok3zeltc6Xon8EGRTkyCs="; }; propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 383780ec8a..449d0edfd6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.7.1"; + version = "2.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UqPwa3OogA2MLm0eCwl2fWSz5Pu6wc6SfiDIF/y8k9I="; + sha256 = "sha256-d5sEMQxHUTrCmGJehsFHBPK79YhpnscTGk9ilKpwrUQ="; }; propagatedBuildInputs = [ google-api-core proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix index ce4142fa11..52f3118063 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.8.0"; + version = "3.1.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-LOGfvz61Fw6QNH83lFe8TwI3a72fHLeTFFcqM9QL3QY="; + hash = "sha256-y1nqjaVX7Sm2PGjRxhxnqTiFJAudsgg3x2qsebyMW+8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix index 2cb706bc02..2c35387b12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.56.2"; + version = "1.56.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sJtW9UYwcMIVN1PvEj8H0uSSNeiRSOmyRZ7I7S9o19M="; + sha256 = "sha256-wlhzxHJ5OHz9y9r6NhSYh5AdNiAstkWg5PKWhr9uRBc="; }; propagatedBuildInputs = [ grpc protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix new file mode 100644 index 0000000000..1a3a31d7d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/govee-ble/default.nix @@ -0,0 +1,55 @@ +{ lib +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "govee-ble"; + version = "0.14.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iJ3fvbQBIk2fpCfz9/uvxk6WcGaL8OVDsNQux+pTBhM="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=govee_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "govee_ble" + ]; + + meta = with lib; { + description = "Library for Govee BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/govee-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gpiozero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpiozero/default.nix new file mode 100644 index 0000000000..639c5f0f69 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/gpiozero/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, sphinx-rtd-theme +, sphinxHook +, colorzero +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "gpiozero"; + version = "1.6.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "gpiozero"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-dmFc3DNTlEajYQ5e8QK2WfehwYwAsWyG2cxKg5ykEaI="; + }; + + outputs = [ + "out" + "doc" + ]; + + nativeBuildInputs = [ + sphinx-rtd-theme + sphinxHook + ]; + + propagatedBuildInputs = [ + colorzero + ]; + + pythonImportsCheck = [ + "gpiozero" + "gpiozero.tools" + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + + meta = with lib; { + description = "A simple interface to GPIO devices with Raspberry Pi"; + homepage = "https://github.com/gpiozero/gpiozero"; + license = licenses.bsd3; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gql/default.nix index 679d0fbdb7..0c8b2bd937 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gql/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "gql"; - version = "3.1.0"; + version = "3.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "graphql-python"; repo = pname; - rev = "v${version}"; - hash = "sha256-ZtrT+zeoP9KXdaCDKOUrjEwe7dN0+IwA20FDe5ja7l8="; + rev = "refs/tags/v${version}"; + hash = "sha256-yr8IyAwZ6y2MPTe6bHRW+CIp19R3ZJWHuqdN5qultnQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix index 75583cdbfe..a5893d87c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/graphql-core/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "graphql-core"; - version = "3.2.0"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "graphql-python"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-71Z+5nVvg+aozJAKmBGJg5Gqq1OIVH7Xv33Q82IHhXg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-LLvfjlio0UmTwR2ZRpsoKTJoWHOEk740QE6K+5GNlrk="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix index 920b487d83..c2da89dc6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/greeclimate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "1.2.1"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = "refs/tags/v${version}"; - hash = "sha256-SvAvLxWk/IIlkv54cUVN6FXj9rrM0QPKHAk36+PuqP0="; + hash = "sha256-4kR3Hc5M4FDG/WFtIW20a9d0vwLzmqtrlhd+teMiejA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix index ccff2f21e1..103bcd2a52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "green"; - version = "3.4.1"; + version = "3.4.2"; format = "setuptools"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5dda2d2a277012227011f8f21523d70a550ebe5d47cc890fa16b9fcd9a91da53"; + sha256 = "sha256-Jbmes0KDoYVbLzDJHSuNwB22ystzFBZkAXkce8CWwiE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix index 1288471c6b..5c55b8c6c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gridnet/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gridnet"; - version = "4.0.0"; + version = "4.1.0"; disabled = pythonOlder "3.9"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-gridnet"; - rev = "v${version}"; - hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; + rev = "refs/tags/v${version}"; + hash = "sha256-/UBZVbDRZMYHDrgifpYSTygAQTBiqgZ0tRGncE3GeT4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix index e13143f88e..f7e9fd7585 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/griffe/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { pname = "griffe"; - version = "0.21.0"; + version = "0.22.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonApplication rec { owner = "mkdocstrings"; repo = pname; rev = version; - hash = "sha256-yhhEcPwh1AjMtDlPZVDR69WX/728wuKqdJdc+yv/o4c="; + hash = "sha256-GqPXVi+SsfO0ufUJzEZ5eUzwJmM/wylLA1KMv+WaIsU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix index 794d504337..37f3617ecf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-status/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "grpcio-status"; - version = "1.46.3"; + version = "1.48.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "78442ac7d2813c56f9cc04f713efd7088596b10f88a4ddd09279211cc48402d5"; + sha256 = "afac961fc3713889d3c48c11461aba49842ca62a54dfe8f346442046036e9856"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix index c80bc6f9bf..4797772086 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.46.3"; + version = "1.48.0"; src = fetchPypi { inherit pname version; - sha256 = "31fee436ace5b3bd950cc3a8e68d6b84de1d6dc755959db7badc3470cdf22f70"; + sha256 = "dd7f757608e7dfae4ab2e7fc1e8951e6eb9526ebdc7ce90597329bc4c408c9a1"; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix index dadb9b5276..0ad6cabd95 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , buildPythonPackage +, fetchpatch , grpc , six , protobuf @@ -17,6 +18,15 @@ buildPythonPackage rec { inherit (grpc) src version; pname = "grpcio"; + patches = [ + # Fix build on armv6l + # https://github.com/grpc/grpc/pull/30401 + (fetchpatch { + url = "https://github.com/grpc/grpc/commit/65dc9f3edeee4c2d0e9b30d5a3ee63175437bea3.patch"; + hash = "sha256-pS4FsCcSjmjSs3J5Y96UonkxqPwfpkyhrEM0t6HaMd0="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cython pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix index ccaf7b6f03..f36c9daa12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gruut/default.nix @@ -36,14 +36,14 @@ let in buildPythonPackage rec { pname = "gruut"; - version = "2.2.3"; + version = "2.3.4"; format = "setuptools"; src = fetchFromGitHub { owner = "rhasspy"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-B5fPUW4YaMzDDXxncfrWwxGdUizuaxnPImNMf1ZZJ/I="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-DD7gnvH9T2R6E19+exWE7Si+XEpfh0Iy5FYbycjgzgM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix index 15a1ddbf06..5870f448db 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gtimelog/default.nix @@ -55,6 +55,5 @@ buildPythonPackage rec { homepage = "https://gtimelog.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ oxzi ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix index 7afa664c1a..cf4b9671b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "h5netcdf"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-d2cE+s2LgiRtbUBoxQXDibO3C5v5kgzPusfzXNxjTaw="; + hash = "sha256-iAih4JXwEitPtAjMmMYK3zmb1X/vSNHKfN9M2h0Ka0o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix index 36b1322a88..cd78af010a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix @@ -8,13 +8,13 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.6.0"; + version = "3.7.0"; pname = "h5py"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8752d2814a92aba4e2b2a5922d2782d0029102d99caaf3c201a566bc0b40db29"; + sha256 = "sha256-P883iEODxdpkhGq1EBkHIAJ9ygdo3vNN2Ny2Wdvly/M="; }; # avoid strict pinning of numpy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix index 197fc18e88..7d7967184c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "hahomematic"; - version = "2022.7.8"; + version = "2022.8.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Tzl7LH4Wisge3B7d2ChQnNPBAj1SNGmHI94k8fkMuqk="; + sha256 = "sha256-KgAjmppx+qH/4sCVnSDfHIaC5Gc6ToojyPfDUhhiQxc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix index 63a2e941f0..6756aae4d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix @@ -1,11 +1,11 @@ { lib , buildPythonPackage , base36 +, chacha20poly1305-reuseable , cryptography -, curve25519-donna -, ecdsa , fetchFromGitHub , h11 +, orjson , pyqrcode , pytest-asyncio , pytest-timeout @@ -16,31 +16,36 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.4.0"; + version = "4.5.0"; + format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; - rev = "v${version}"; - sha256 = "sha256-dSiI2W4U4FYwMRBInpxb/wkQLKxPzLHIkLPNgiZEhUA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-/XJvCL9hMIrOUwGPcrvSrJ6SZ/E6BQy+isFFlAniIM4="; }; propagatedBuildInputs = [ - base36 + chacha20poly1305-reuseable cryptography - curve25519-donna - ecdsa h11 - pyqrcode + orjson zeroconf ]; + passthru.optional-dependencies.QRCode = [ + base36 + pyqrcode + ]; + checkInputs = [ pytest-asyncio pytest-timeout pytestCheckHook - ]; + ] + ++ passthru.optional-dependencies.QRCode; disabledTestPaths = [ # Disable tests requiring network access diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix index 6e785d0c9a..4f5c1f9bf3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-vcs/default.nix @@ -35,6 +35,12 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = [ + # incompatible with setuptools-scm>=7 + # https://github.com/ofek/hatch-vcs/issues/8 + "test_write" + ]; + pythonImportsCheck = [ "hatch_vcs" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix index d2d212f541..684703e6b7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hatchling/default.nix @@ -20,7 +20,7 @@ let pname = "hatchling"; - version = "1.0.0"; + version = "1.5.0"; in buildPythonPackage { inherit pname version; @@ -28,7 +28,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "d235a5fa8aff89e8d9d6d4033594aa4c3bc00ec5e31d3e80c153bfcf951b4f98"; + sha256 = "sha256-nKQJpBFAzGYhZGgLeK3NO6d7I6lFmEvZlw0R/jjoajg="; }; # listed in backend/src/hatchling/ouroboros.py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix index 79693747cf..5ecad96567 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hiyapyco/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hiyapyco"; - version = "0.4.16"; + version = "0.5.0"; src = fetchFromGitHub { owner = "zerwes"; repo = pname; - rev = "release-${version}"; - sha256 = "1ams9dp05yhgbg6255wrjgchl2mqg0s34d8b8prvql9lsh59s1fj"; + rev = "refs/tags/release-${version}"; + sha256 = "sha256-v+q7MOJvRc8rzBzwf27jmuIHpZeYGDK7VbzB98qnhrQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix new file mode 100644 index 0000000000..17c25f74b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, poetry-core +, bleak +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "home-assistant-bluetooth"; + version = "1.4.0"; + format = "pyproject"; + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-viJOrmvrooHh47yyJJomOGBhQvcoWM3jKMRwZ+6/UJ8="; + }; + + postPatch = '' + # drop pytest parametrization (coverage, etc.) + sed -i '/addopts/d' pyproject.toml + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bleak + ]; + + pythonImportsCheck = [ + "home_assistant_bluetooth" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Basic bluetooth models used by Home Assistant"; + changelog = "https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/main/CHANGELOG.md"; + homepage = "https://github.com/home-assistant-libs/home-assistant-bluetooth"; + license = licenses.asl20; + maintainers = teams.home-assistant.members; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix index aded4c94b1..451a383f84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/homematicip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.4"; + version = "1.0.7"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,8 +25,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hahn-th"; repo = "homematicip-rest-api"; - rev = version; - hash = "sha256-rTTYJ/2R+/FLuL3rTWT7ieixN+Gv9GhwkUaKPfLqUGc="; + rev = "refs/tags/${version}"; + hash = "sha256-1nT5P3HNwwEJSSRbl77DXCuPPxGqiVFXNUK6Q3ZiByU="; }; propagatedBuildInputs = [ @@ -45,6 +45,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + disabledTests = [ # Assert issues with datetime "test_contact_interface_device" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix index cab1482ed9..249c9abff8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.12.1"; + version = "2022.8.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-Qr9K4+egrXD6eUgUtke2n7HyhXLthrju9ykXSI7Wl4Q="; + sha256 = "sha256-lQ28j4vOtxSjkMZXTKG+vesAN9KWj5T4sZ3QbaWP9Gw="; }; # Tests require network connection diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix index 67ece59407..a47d531e33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix @@ -1,19 +1,11 @@ { lib , buildPythonPackage , fetchPypi -, tornado -, requests -, httplib2 , sure -, nose -, nose-exclude -, coverage -, rednose -, nose-randomly , six -, mock , pytest , freezegun +, pytestCheckHook }: buildPythonPackage rec { @@ -31,25 +23,20 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - checkInputs = [ nose sure coverage mock rednose pytest - # Following not declared in setup.py - nose-randomly requests tornado httplib2 nose-exclude freezegun + checkInputs = [ + sure + freezegun + pytestCheckHook ]; - checkPhase = '' - nosetests tests/unit # functional tests cause trouble requiring /etc/protocol - ''; + disabledTestPaths = [ + "tests/bugfixes" + "tests/functional" + "tests/pyopenssl" + ]; __darwinAllowLocalNetworking = true; - # Those flaky tests are failing intermittently on all platforms - NOSE_EXCLUDE = lib.concatStringsSep "," [ - "tests.functional.test_httplib2.test_callback_response" - "tests.functional.test_requests.test_streaming_responses" - "tests.functional.test_httplib2.test_callback_response" - "tests.functional.test_requests.test_httpretty_should_allow_adding_and_overwritting_by_kwargs_u2" - ]; - meta = with lib; { homepage = "https://httpretty.readthedocs.org/"; description = "HTTP client request mocking tool"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hydra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hydra/default.nix index 362b0c51d0..82409936d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hydra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hydra/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, antlr4-python3-runtime +, antlr4_9-python3-runtime , buildPythonPackage , fetchFromGitHub , importlib-resources @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "hydra"; - version = "1.1.1"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "facebookresearch"; repo = pname; - rev = "v${version}"; - sha256 = "sha256:1svzysrjg47gb6lxx66fzd8wbhpbbsppprpbqssf5aqvhxgay3qk"; + rev = "refs/tags/v${version}"; + hash = "sha256-4r0ZWW9SGl35Oupf0ejwL/s6Nas6RoSN2egiBrvFZIA="; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - antlr4-python3-runtime + antlr4_9-python3-runtime omegaconf ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix index dc165f2b2c..35a9f8f6bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypercorn/default.nix @@ -44,6 +44,10 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.optionals (pythonOlder "3.8") [ mock ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + pythonImportsCheck = [ "hypercorn" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix index c92b655fab..1e8afe9e54 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage -, pythonAtLeast , fetchFromGitHub , attrs +, exceptiongroup , pexpect , doCheck ? true , pytestCheckHook @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "hypothesis"; - version = "6.46.10"; + version = "6.50.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "HypothesisWorks"; repo = "hypothesis"; rev = "hypothesis-python-${version}"; - hash = "sha256-eQ7Ns0k1hOVw8/xiINMei6GbQqDHXrBl+1v8YQeFO9Q="; + hash = "sha256-G7OXlYaCPBfdXtmX/f/6i2LRCZZk5yvzhLc6sissuRo="; }; postUnpack = "sourceRoot=$sourceRoot/hypothesis-python"; @@ -30,6 +30,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs sortedcontainers + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix index 46ed096486..201809d453 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hyrule/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "hyrule"; - version = "0.1"; + version = "0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hylang"; repo = pname; - rev = version; - sha256 = "sha256-sqS5vOcbln+Vfv/Ji/8rJ4GTQpXIuhgf+MukjV0Kkuw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-/YHgJq+C5+yc+44s76OR0WELUm8KHL2xxtJmGDTChCM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index fd98979cda..3e2d61843d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "ibm-cloud-sdk-core"; - version = "3.15.3"; + version = "3.16.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CuVem9b7NhDsC2tXCg/+1DWZAqSHqJ0GuWZCmA/kesE="; + hash = "sha256-MfWZGWbU0k586EYY0uhHHo2LuhQSmCfgs9Lz50Ds5Hc="; }; propagatedBuildInputs = [ @@ -59,6 +59,6 @@ buildPythonPackage rec { description = "Client library for the IBM Cloud services"; homepage = "https://github.com/IBM/python-sdk-core"; license = licenses.asl20; - maintainers = with maintainers; [ globin lheckemann ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix index d169190ef8..375748d75c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ibm-watson/default.nix @@ -55,6 +55,6 @@ buildPythonPackage rec { description = "Client library to use the IBM Watson Services"; homepage = "https://github.com/watson-developer-cloud/python-sdk"; license = licenses.asl20; - maintainers = with maintainers; [ globin lheckemann ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix index 81fd7c8a69..45dc837665 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icecream/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "icecream"; - version = "2.1.2"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CTALLRxnhxJBDL1HyVGY6xtYD2bzEaVUzNa551js4O4="; + sha256 = "sha256-CqSnwzdOw2FTodCPgeMIDoPYrB7v2X0vT+lUTo+bSd4="; }; propagatedBuildInputs = [ asttokens colorama executing pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix index f70be30c3f..ee14b6fc1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/idasen/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "idasen"; - version = "0.8.3"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "newAM"; repo = "idasen"; rev = "v${version}"; - hash = "sha256-tjA7qgU3JYvwSdDH+aWrmKBX1Q9J5/UT7KjiTBxvKAE="; + hash = "sha256-7Tg+/3BXRmzG39jIC281MKxyJyf9e9/1uOqUji08B3U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix index 4a9f68fed7..b33d53abd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/identify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "identify"; - version = "2.5.1"; + version = "2.5.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D66bw014FWGf26rG0e65wg6F/N1bl0z/Uemq+jUxJ74="; + sha256 = "sha256-7Glq1R0GT2rIFdEpvZdzi4yf4t42ryRIeeTbz8znJmg="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix index 82b00d5509..319b080c34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ifaddr/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.1.7"; + version = "0.2.0"; pname = "ifaddr"; src = fetchPypi { inherit pname version; - sha256 = "1f9e8a6ca6f16db5a37d3356f07b6e52344f6f9f7e806d618537731669eb1a94"; + sha256 = "sha256-zAy/yqv3ZdRFlYJfuWqZuxLHlxa3O0QzDqOO4rDErtQ="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix index 897b5975c9..9898ef4b3d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ignite/default.nix @@ -7,6 +7,7 @@ , pythonOlder , matplotlib , mock +, packaging , pytorch , scikit-learn , tqdm @@ -14,17 +15,17 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-S4wL1RyQ6aDW16wbSl+86VhSJ2S9oanYhNtPQdBtdrA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-KBEoMV9lwlEra4DiGDLgPb85+HrnK4Qiy3XYDa9hO3s="; }; checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; - propagatedBuildInputs = [ pytorch scikit-learn tqdm ]; + propagatedBuildInputs = [ packaging pytorch scikit-learn tqdm ]; # runs succesfully in 3.9, however, async isn't correctly closed so it will fail after test suite. doCheck = pythonOlder "3.9"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix index bacaea2f2c..d6933c25ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ihatemoney/default.nix @@ -17,7 +17,6 @@ , flask_mail , flask_migrate , flask-restful -, flask_sqlalchemy , flask-talisman , flask-wtf , debts diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 6998ff330a..2fa5f47d58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.5"; + version = "0.4.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f2ea4245a2adad25dedf98d343159579167e549ac8c4691cef5eff980e20c139"; + sha256 = "sha256-egiDj5fzY+N8pBghuGT9P9yZqx/iQhBAx4619Wqecj4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix index 7c3fd87b4a..f657f73a7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imageio/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.19.2"; + version = "2.19.3"; disabled = isPy27; src = fetchPypi { - sha256 = "sha256-RuHnQSiDfSoevIdHa39zl4tpoSj6I4vJibYlqYGb2bM="; + sha256 = "sha256-DJ34DkLy7mi+qSAB5/z2EqoUmRDv4EDrdX9c4yMlCuE="; inherit pname version; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix index 0fbe88a520..0f06d36df4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imagesize/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "imagesize"; - version = "1.3.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cd1750d452385ca327479d45b64d9c7729ecf0b3969a58148298c77092261f9d"; + sha256 = "sha256-aRUERK/7nLDVzFqSs2dvCy+3zZrjnpR6XhGja0SXzUo="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix index 59eb3afaa0..3b02ac4403 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imantics/default.nix @@ -3,7 +3,7 @@ , lib , numpy , opencv3 -, sphinx_rtd_theme +, sphinx-rtd-theme , lxml , xmljson }: @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy opencv3 - sphinx_rtd_theme + sphinx-rtd-theme lxml xmljson ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix index b1e5e91975..8a53e856b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.9.0"; + version = "0.9.1"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "836a4c137cc3c10310d4f6cd5ec34600ff488d7f8c243a997c3f9b551c91d0b2"; + sha256 = "sha256-ThT3rmB4tauEO3PDebKsULIHRGQV2cJDjIhdbLWv2WI="; }; propagatedBuildInputs = [ scikit-learn ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix deleted file mode 100644 index ab4d2a5ce0..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/imdbpy/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, lxml -, sqlalchemy -}: - -buildPythonPackage rec { - pname = "imdbpy"; - version = "2021.4.18"; - - src = fetchPypi { - pname = "IMDbPY"; - inherit version; - sha256 = "af57f03638ba3b8ab3d696bfef0eeaf6414385c85f09260aba0a16b32174853f"; - }; - - propagatedBuildInputs = [ - lxml - sqlalchemy - ]; - - # Tests require networking, and https://github.com/alberanid/imdbpy/issues/240 - doCheck = false; - - pythonImportsCheck = [ "imdb" ]; - - meta = with lib; { - description = "Python package for retrieving and managing the data of the IMDb database"; - homepage = "https://imdbpy.github.io/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ ivar ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix index 26612ff924..9e4176a5b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-metadata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "4.11.3"; + version = "4.12.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "importlib_metadata"; inherit version; - hash = "sha256-6kxZfr83FC+Ce485KZV54xaFwx06Q4tZ9GlAav0PJTk="; + hash = "sha256-Y3JFuLqytlAvy8dSzEt6b2JDuwKzHFwmFWrRA9PUVnA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix index 61fb5be068..2eb41c4c50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/importlib-resources/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "importlib-resources"; - version = "5.6.0"; + version = "5.8.0"; format = "pyproject"; disabled = isPy27; src = fetchPypi { pname = "importlib_resources"; inherit version; - sha256 = "sha256-G5MjjL8jtM3jQkDdgyHZnpvy60vJHAyZsohig+e6rYU="; + sha256 = "sha256-VoyfFssgT53syNbSSlcu7qJ9rLtM7p5rA6gCVzZ2l1E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix index a6c549b61f..bb98c5bd67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inflect/default.nix @@ -8,12 +8,13 @@ buildPythonPackage rec { pname = "inflect"; - version = "5.4.0"; + version = "5.6.2"; disabled = isPy27; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tY1YxOc//KmyXgdcHE/Jyt7LtcmdfNnzze3ac+zoPBw="; + sha256 = "sha256-qtx+1zko9eAUEpeUu6wDBYzKNdCpc6X8TrRcf6JgBfk="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix index 226d43b2bc..8442136e77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/influxdb-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.27.0"; + version = "1.30.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb-client-python"; - rev = "v${version}"; - hash = "sha256-M0Ob3HjIhlYSIWXGM54NXiEMSCmZzNLLNsCRyxAcjMc="; + rev = "refs/tags/v${version}"; + hash = "sha256-YGKFvRy76/klXhJ8Cdgqv9YqCq4E6XIiwWXl8W9fRX4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix new file mode 100644 index 0000000000..896905306d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/inkbird-ble/default.nix @@ -0,0 +1,55 @@ +{ lib +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "inkbird-ble"; + version = "0.5.2"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-ieVjgNCkU6AJDTgLzmn2YPCNm+kId65QW3SNu2Xou1Q="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=inkbird_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "inkbird_ble" + ]; + + meta = with lib; { + description = "Library for Inkbird BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/inkbird-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix index d74dbad18b..6203d9a03c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ipydatawidgets"; - version = "4.2.0"; + version = "4.3.1.post1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d0e4b58b59b508165e8562b8f5d1dbfcd739855847ec0477bd9185a5e9b7c5bc"; + sha256 = "sha256-aYGrzNmmupSuf2FuGBqabaPrFUM+VrtfFAQeXBEaJR8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix index d7302eaaec..e3f981964b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipykernel/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , callPackage , fetchPypi +, hatchling , pythonOlder , ipython , jupyter-client @@ -13,20 +14,25 @@ buildPythonPackage rec { pname = "ipykernel"; - version = "6.12.1"; + version = "6.15.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CGj1VhcpreREAR+Mp9NQLcnyf39E4g8dX+5+Hytxg6E="; + sha256 = "sha256-N6zDJUyqig2vzd3cjchjpgrRtGSHtoruNh2aFb2pgRI="; }; # debugpy is optional, see https://github.com/ipython/ipykernel/pull/767 postPatch = '' - sed -i "/debugpy/d" setup.py + sed -i "/debugpy/d" pyproject.toml ''; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ ipython jupyter-client diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix index b5d0b56bc0..b4d5ab0745 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipyparallel/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "8.2.1"; + version = "8.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8mdHPFL8aohsa4Fq2xVb7Asne8fSJPs/q+uDg05zPHI="; + sha256 = "sha256-Zwu+BXVTgXQuHqARd9xCj/jz6Urx8NVkLJ0Z83yoKJs="; }; buildInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix index 8894fbaf21..62737e7478 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ipywidgets/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.7.0"; + version = "7.7.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-q0pVloVaiLg3YZIcdocH1l5YRwaBObwXKd3+g0cDVCo="; + hash = "sha256-Xy+ht6+uGvMsiAiMmCitl43pPd2jk9ftQU5VP+6T3Ks="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix index 15747d3f70..88e7efbc23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix @@ -5,20 +5,18 @@ buildPythonPackage rec { pname = "irc"; - version = "20.0.0"; + version = "20.1.0"; + format = "pyproject"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "59acb8d69d61a0cbd290e77e6ff10a8c7f2201fb8c7b7d5a195b5883d0c40b0a"; + sha256 = "sha256-tvc3ky3UeR87GOMZ3nt9rwLSKFpr6iY9EB9NjlU4B+w="; }; - doCheck = false; - - pythonImportsCheck = [ "irc" ]; - nativeBuildInputs = [ setuptools-scm ]; + propagatedBuildInputs = [ six importlib-metadata @@ -30,10 +28,14 @@ buildPythonPackage rec { jaraco_collections ]; + doCheck = false; + + pythonImportsCheck = [ "irc" ]; + meta = with lib; { description = "IRC (Internet Relay Chat) protocol library for Python"; homepage = "https://github.com/jaraco/irc"; license = licenses.mit; - maintainers = []; + maintainers = with maintainers; []; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix index 41383a8f94..aa084783fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/islpy/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "islpy"; - version = "2022.2"; + version = "2022.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-a6fnFBt//yrkQkLoVBnxr7OkJTG7PJalz/CF7lhxVA8="; + sha256 = "07062ljvznm2dg3r9b3lq98qygxsha8ylxi4zs7hx49l0jw2vbjy"; }; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix index 74b8eabd86..ba8396d162 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "itemadapter"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Px9g69bJGwAiKCDzi/USaqSaj7bkZ9NR8DZEIflToV0="; + hash = "sha256-MsBh7Jq0fVND6AEbJocw9I/2MqAZK5UpLRGLGNvXaHo="; }; # Infinite recursion with Scrapy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix index 1742fc08e1..96c8fcfb3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "2.1"; + version = "2.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-oEXDW+ar3S0gJn2DdaOyq6GDE9dJaghQEpPBCfTL2Kw="; + sha256 = "sha256-rKvnr0C48mTkjbGyHhvNzgJ97p5mJ7F4wU8ZMPYV/rM="; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix index 7be0593592..4b097fd5b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-context/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "jaraco-context"; - version = "4.1.1"; - format = "setuptools"; + version = "4.1.2"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jaraco"; repo = "jaraco.context"; - rev = "v${version}"; - sha256 = "O9Lwv2d/qbiXxIVCp6FLmVKaz0MzAUkoUd0jAyIvgJc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-gfrDZW4d3X/QjUBN8DFSvKRLZge3pnZ6KkI7S7Nz3W0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -34,7 +34,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "jaraco.context" ]; - meta = with lib; { description = "Python module for context management"; homepage = "https://github.com/jaraco/jaraco.context"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix index d45d354b38..686095d3b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_collections/default.nix @@ -1,23 +1,45 @@ -{ buildPythonPackage, fetchPypi, setuptools-scm -, six, jaraco_classes, jaraco_text +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, jaraco_classes +, jaraco_text }: buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.5.1"; + version = "3.5.2"; + format = "pyproject"; + src = fetchPypi { inherit pname version; - sha256 = "b04f00bd4b3c4fc4ba5fe1baf8042c0efd192b13e386830ea23fff77bb69dc88"; + sha256 = "sha256-ByuT6zX55IUISFdVU05mo07xzISvKR/Sfzm0TUwN0sM="; }; + postPatch = '' + # break dependency cycle + sed -i "/'jaraco.text',/d" setup.cfg + ''; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + jaraco_classes + jaraco_text + ]; + pythonNamespaces = [ "jaraco" ]; doCheck = false; - buildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ six jaraco_classes jaraco_text ]; - # break dependency cycle - patchPhase = '' - sed -i "/'jaraco.text',/d" setup.py - ''; + pythonImportsCheck = [ "jaraco.collections" ]; + + meta = with lib; { + description = "Models and classes to supplement the stdlib 'collections' module"; + homepage = "https://github.com/jaraco/jaraco.collections"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix index 73aa7708cf..de4b8c5ce4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_functools/default.nix @@ -1,27 +1,36 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi +, more-itertools , setuptools-scm -, more-itertools, backports_functools_lru_cache }: +}: buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.5.0"; + version = "3.5.1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "31e0e93d1027592b7b0bec6ad468db850338981ebee76ba5e212e235f4c7dda0"; + sha256 = "sha256-0K3PkXEKCFPv6fI6ePrVhr9n31cvDW2OD6NtKJrhwdk="; }; nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ more-itertools backports_functools_lru_cache ]; + propagatedBuildInputs = [ + more-itertools + ]; doCheck = false; pythonNamespaces = [ "jaraco" ]; + pythonImportsCheck = [ "jaraco.functools" ]; + meta = with lib; { description = "Additional functools in the spirit of stdlib's functools"; homepage = "https://github.com/jaraco/jaraco.functools"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix index e1e82df89e..2bdf376ffe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaraco_text/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.7.0"; - format = "setuptools"; + version = "3.8.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-p/nMG0Sl8wlqIWy9EwtlDHprLJ+ABbAArpfzKSOafAA="; + sha256 = "sha256-RQlXw/j7mlU9nT5gc4czqxxcwns2pGM0KtuTfppwqz4="; }; pythonNamespaces = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix index f144cc49a9..c29a5c303c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jarowinkler"; - version = "1.1.2"; + version = "1.2.0"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "refs/tags/v${version}"; - hash = "sha256-yaJcmHkLxiRqrBiIel97mFxpav3N5QQSM+L9jA1kn5A="; + hash = "sha256-JR6nCLO6oUxpGKjnrrVAOLbrIALSNKkll53+3p4bb1g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix index e4e9139216..a302341c31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jax/default.nix @@ -87,6 +87,19 @@ buildPythonPackage rec { "testEigvalsGrad_shape" ]; + # See https://github.com/google/jax/issues/11722. This is a temporary fix in + # order to unblock etils, and upgrading jax/jaxlib to the latest version. See + # https://github.com/NixOS/nixpkgs/issues/183173#issuecomment-1204074993. + disabledTestPaths = [ + "tests/api_test.py" + "tests/core_test.py" + "tests/lax_numpy_indexing_test.py" + "tests/lax_numpy_test.py" + "tests/nn_test.py" + "tests/random_test.py" + "tests/sparse_test.py" + ]; + pythonImportsCheck = [ "jax" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix index 88d210caa9..a041edbd2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/bin.nix @@ -18,7 +18,7 @@ , autoPatchelfHook , buildPythonPackage , config -, cudnn +, cudnn ? cudaPackages.cudnn , fetchurl , flatbuffers , isPy39 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index ebbca4763a..91a3d0be9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.20.2"; + version = "1.20.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZhDk6JxgRASSezRkQ5KnRHKhQBykeZUpGCLW5zzLBSM="; + sha256 = "sha256-fiRd433bb0neUeyBtS3KbnYoJJzbGvKrZ29dofGYp0s="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix index 31e4517621..138390983e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jedi-language-server/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "jedi-language-server"; - version = "0.36.0"; + version = "0.36.1"; format = "pyproject"; src = fetchFromGitHub { owner = "pappasam"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-PTLzZu3CZincY4zxN+/GUryTzWre595W+kztgCXTueo="; + sha256 = "sha256-gwaFveFzdkiMvvmdyLLQ/9JthrM6n/+y1XkDQnYp8Y8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix index c6b1386ade..b867bf81b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jira"; - version = "3.1.1"; + version = "3.3.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pycontribs"; repo = pname; - rev = version; - hash = "sha256-1g7yNKRR7Ua2rjfiE1c94LKAQGVCX0gSeqTc2Pn7QhM="; + rev = "refs/tags/${version}"; + hash = "sha256-KRfyXWSnWmkt/SYmrpxG60KytEooMWNhHg8TrvFeATc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix index 18c2f46216..ca365b79b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix @@ -1,26 +1,29 @@ { lib , buildPythonPackage , fetchPypi -, ply -, nose +, hypothesis +, pytestCheckHook }: buildPythonPackage rec { pname = "jmespath"; - version = "1.0.0"; + version = "1.0.1"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pJDigO3R9X1t6IY2mS0Ftx6X1pomoZ8Fjs99MER0v14="; + sha256 = "sha256-kCYbIG1t79WP3V6F9Hi/YzopAXmJBr4q04kVDFxg7b4="; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ ply ]; + checkInputs = [ + hypothesis + pytestCheckHook + ]; meta = with lib; { - homepage = "https://github.com/boto/jmespath"; + homepage = "https://github.com/jmespath/jmespath.py"; description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; - license = "BSD"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix index b73f266d39..e03268fb98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsbeautifier/default.nix @@ -9,14 +9,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.14.4"; + version = "1.14.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cp+mwP6TWyZm8/6tfsV2+RGubo1731ePmy+5K6N3u7M="; + hash = "sha256-ziqW7PYmkvpPor1WIH9+qKs3p0qx1QJSVLgPtTFpqYs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix index 87d41a92ed..856ee981e3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -2,7 +2,6 @@ , beautifulsoup4 , buildPythonPackage , click -, dataclasses , dataclasses-json , fetchFromGitHub , htmlmin @@ -19,16 +18,16 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; - version = "0.41.3"; + version = "0.41.6"; format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "coveooss"; repo = pname; rev = "v${version}"; - hash = "sha256-PEialHz5MJxi4PbtHYpx2CY78KgAKclijbF6cPr36vY="; + hash = "sha256-t5t+tZwhzOHpI2nc69baWtZamEOeouseMuVBnCQyjzQ="; }; postPatch = '' @@ -50,8 +49,6 @@ buildPythonPackage rec { pytz pyyaml requests - ] ++ lib.optionals (pythonOlder "3.7") [ - dataclasses ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix index 4ae01488db..e6a8a68ddb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/json-stream/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "json-stream"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-J5DBa8zeandkDIXpEaRN6cneZIIG2aRHS5zjmM/H0Uw="; + hash = "sha256-ebB8l8H6yPLoCXmVOy60IijdBI61SEzJInC30aMe9Bk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsondiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsondiff/default.nix index fe41d0dd85..b6d6401b45 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsondiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsondiff/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsondiff"; - version = "1.3.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BM+uvUpeVziUirYVcQ3D7pjvvfhRJV/Tl3xMLuWecxI="; + sha256 = "sha256-J5WETvB17IorjThcTVn16kiwjnGA/OPLJ4e+DbALH7Q="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix index 4892d72aae..73e7d308ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to simplify working with jsonlines and ndjson data"; homepage = "https://github.com/wbolster/jsonlines"; - maintainers = with maintainers; [ sondr3 ]; + maintainers = with maintainers; [ ]; license = licenses.bsd3; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix index 1ffbbdd5e8..969869f86b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpickle/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-hGhM/FM4pTQXPI3WmAnkDyhl0L4fiit6+EZeW5aNz6k="; + sha256 = "sha256-eycpGLBVQYLlPcNA3dYtm3+QL+x+ewViDATzzO9Hmg4="; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix index 2bd41e0815..504b7f7035 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonpointer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpointer"; - version = "2.2"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "f09f8deecaaa5aea65b5eb4f67ca4e54e1a61f7a11c75085e360fe6feb6a48bf"; + sha256 = "sha256-l8ulFSbIKSgiGP65nasbHmvfjv0cQ9ydV74JPA1pyZo="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix index c3d68f77d8..9bd8ef8a10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -33,6 +33,7 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ + "--asyncio-mode=legacy" "tests.py" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix index 176334a0ed..944f35b964 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "jsonschema"; - version = "4.6.1"; + version = "4.7.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-7CgC5qN1F/CdR9m6EHlHWJrh0l/1V7kl2DoyH8KqXTs="; + sha256 = "sha256-c3ZPRh1h65egV8kpNoYQoTTR0f/9hYrP6Ihk7pTx8dM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix index 1dea4743cd..3de77e1709 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jug/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "jug"; - version = "2.2.0"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Jug"; inherit version; - hash = "sha256-2Y9xRr5DyV9UqG6tiq9rYET2Z7LaPXfzwYKKGwR3OSs="; + hash = "sha256-3uK6mWaLEGPFoPuznU+OcnkjFZ+beDoIw0vOC4l5gRg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix index 2670fc163f..6df956de52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-client/default.nix @@ -3,6 +3,7 @@ , fetchPypi , entrypoints , jupyter_core +, hatchling , nest-asyncio , python-dateutil , pyzmq @@ -14,13 +15,18 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "7.2.1"; + version = "7.3.4"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qhdyeekyBdBoHsDi4hDaAbIsWhRkpWq9RVrcrGTw3pE="; + sha256 = "sha256-qppsMgVLKQN0+V9zuwyukUVcWN+4T2XIWRkSuPZebVY="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ entrypoints jupyter_core diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix index bb2837d28f..ae700d9a80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -2,26 +2,36 @@ , buildPythonPackage , fetchPypi , deprecation +, hatchling , pythonOlder , packaging , pytestCheckHook +, pytest-timeout , tomlkit }: buildPythonPackage rec { pname = "jupyter-packaging"; - version = "0.12.0"; + version = "0.12.2"; disabled = pythonOlder "3.7"; + format = "pyproject"; src = fetchPypi { pname = "jupyter_packaging"; inherit version; - sha256 = "sha256-snRV1grck6e6ouC484a+gbkyu048ARYEbfntIwzT+qw="; + sha256 = "sha256-C5nq7PVrnR2Z57y2Yy2RSo6laY2kCyOLqJIno0FX3jI="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ deprecation packaging tomlkit ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + pytest-timeout + ]; preCheck = '' export HOME=$(mktemp -d) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix index b1389889b5..6e07fcc28c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, chardet , docker , entrypoints , escapism @@ -30,6 +31,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + chardet docker entrypoints escapism diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix index 6b3ac52767..73797f8fd0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jupyter-server-mathjax"; - version = "0.2.5"; + version = "0.2.6"; src = fetchPypi { inherit version; pname = "jupyter_server_mathjax"; - sha256 = "sha256-ZNlsjm3+btunN5ArLcOi3AWPF1FndsJfTTDKJGF+57M="; + sha256 = "sha256-ux5rbcBobB/jhqIrWIYWPbVIiTqZwoEMNjmenEyiOUM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix index 56cd051ecf..7355cb9276 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyter-sphinx"; - version = "0.3.2"; + version = "0.4.0"; src = fetchPypi { inherit version; pname = "jupyter_sphinx"; - sha256 = "37fc9408385c45326ac79ca0452fbd7ae2bf0e97842d626d2844d4830e30aaf2"; + sha256 = "sha256-DBGjjxNDE48sUFHA00xMVF9EgBdMG9QcAlb+gm4LqlU="; }; propagatedBuildInputs = [ nbconvert nbformat sphinx ipywidgets ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix index 5a3176b462..8943ba8adc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.4.3"; + version = "6.4.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VfMmJrC+ZHqF4yF93Nsi22nvx56LQDuXceuezGlgGbU="; + sha256 = "sha256-Fy9TNeMdYA32FhOpe38DUvLIJQu9EJLvLWWPdySfifs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix index 96dc7e82bc..657e7a9ce3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix @@ -30,12 +30,12 @@ buildPythonPackage rec { pname = "jupyter_server"; - version = "1.17.1"; + version = "1.18.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "a36781656645ae17b12819a49ace377c045bf633823b3e4cd4b0c88c01e7711b"; + sha256 = "sha256-K3L8WVvMrikiYKrYFXoOrY2ixwPsauG7ezbbrQ4mfqc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix index 9f36e03d48..606e2226d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "jupyterlab-git"; - version = "0.36.0"; + version = "0.37.1"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "jupyterlab_git"; inherit version; - sha256 = "sha256-K+h1ra9PsqKlSSPnc1jgSODICv3FoEdwqBGYWQYs6wE="; + sha256 = "sha256-vOM2y8XrjmKtVtI6h4/DUrHzSLJuZXIm0C7//gMh+5o="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index 77d2fd24c5..7093f41095 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.4.3"; + version = "3.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4tzEDpQ2bd5d5LGejEPuEzzwQbhS0Bo2JafPKVMtpJ0="; + sha256 = "sha256-WioP3SK9hiitRbYY41IDh8MqSBjjrxEtutH2STBN/CA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index e3693b450d..62730df149 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchPypi +, hatchling , jsonschema , pythonOlder , requests @@ -10,6 +11,7 @@ , babel , jupyter_server , openapi-core +, pytest-timeout , pytest-tornasync , ruamel-yaml , strict-rfc3339 @@ -17,12 +19,13 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.12.0"; + version = "2.15.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-AOD0tMOZ9Vk4Mj6hDPktkVKI/hJ1PjXRBp9soItyq78="; + sha256 = "sha256-qRxRXg55caj3w8mDS3SIV/faxQL5NgS/KDmHmR/Zh+8="; }; postPatch = '' @@ -33,11 +36,16 @@ buildPythonPackage rec { rm -r tests/translations/ ''; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ requests jsonschema pyjson5 babel jupyter_server ]; checkInputs = [ openapi-core pytestCheckHook + pytest-timeout pytest-tornasync ruamel-yaml ]; @@ -46,6 +54,11 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + pytestFlagsArray = [ + # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives + "-W ignore::DeprecationWarning" + ]; + __darwinAllowLocalNetworking = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/justbases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/justbases/default.nix new file mode 100644 index 0000000000..90f59b6cfc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/justbases/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +}: + +buildPythonPackage rec { + pname = "justbases"; + version = "0.15"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-vQEfC8Z7xMM/fhBG6jSuhLEP/Iece5Rje1yqbpjVuPg="; + }; + + checkInputs = [ hypothesis ]; + + meta = with lib; { + description = "conversion of ints and rationals to any base"; + homepage = "https://pythonhosted.org/justbases"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/justbytes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/justbytes/default.nix new file mode 100644 index 0000000000..31afb7540b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/justbytes/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, justbases +, hypothesis +}: + +buildPythonPackage rec { + pname = "justbytes"; + version = "0.15"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-qrMO9X0v5yYjeWa72mogegR+ii8tCi+o7qZ+Aff2wZQ="; + }; + + propagatedBuildInputs = [ justbases ]; + checkInputs = [ hypothesis ]; + + meta = with lib; { + description = "computing with and displaying bytes"; + homepage = "https://pythonhosted.org/justbytes"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ nickcao ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix new file mode 100644 index 0000000000..cc302cc586 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/justnimbus/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "justnimbus"; + version = "0.6.0"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "kvanzuijlen"; + repo = pname; + rev = version; + hash = "sha256-uQ5Nc5sxqHeAuavyfX4Q6Umsd54aileJjFwOOU6X7Yg="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + requests + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "justnimbus" + ]; + + meta = with lib; { + description = "Library for the JustNimbus API"; + homepage = "https://github.com/kvanzuijlen/justnimbus"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix index 714f51c0d3..c82f2b4c04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , fetchFromGitHub +, brotli , lz4 }: @@ -9,25 +10,26 @@ let kaitai_compress = fetchFromGitHub { owner = "kaitai-io"; repo = "kaitai_compress"; - rev = "434fb42220ff58778bb9fbadb6152cad7e4f5dd0"; - sha256 = "zVnkVl3amUDOB+pnw5SkMGSrVL/dTQ82E8IWfJvKC4Q="; + rev = "12f4cffb45d95b17033ee4f6679987656c6719cc"; + sha256 = "sha256-l3rGbblUgxO6Y7grlsMEiT3nRIgUZV1VqTyjIgIDtyA="; }; in buildPythonPackage rec { pname = "kaitaistruct"; - version = "0.9"; + version = "0.10"; src = fetchPypi { inherit pname version; - sha256 = "3d5845817ec8a4d5504379cc11bd570b038850ee49c4580bc0998c8fb1d327ad"; + sha256 = "sha256-oETe4pFz1q+6zye8rDna+JtlTdQYz6AJq4LZF4qa5So="; }; preBuild = '' ln -s ${kaitai_compress}/python/kaitai kaitai - sed '28ipackages = kaitai/compress' -i setup.cfg + sed '32ipackages = kaitai/compress' -i setup.cfg ''; propagatedBuildInputs = [ + brotli lz4 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix index 76289816a2..5a2829de05 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kajiki/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "kajiki"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "f0d6dfa27eb2b6c0d2a28ae21d69dceb5363cc0432f4045bcc98aac42a662ccb"; + sha256 = "sha256-Qe/FTQ6YrHiVklP3HFG9HsT7Yny6we2+Ithcj2UFdp4="; }; propagatedBuildInputs = [ babel pytz nine ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix index 6edafea1d5..3ebba4202b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-asciimagic/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "karton-asciimagic"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0vj4b8man81g99g4c53zyvp1gc47c2imj5ha9r4z4bf8gs3aqsv6"; + sha256 = "sha256-sY5ik9efzLBa6Fbh17Vh4q7PlwOGYjuodU9yvp/8E3k="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix index ea79a5f453..a5d4f2c86a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "karton-autoit-ripper"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "1gclrrc0n72bfj4m55kk8d69zrfvnlwm9692ni9w7d2231mvv7bw"; + sha256 = "sha256-D+M3JsIN8LUWg8GVweEzySHI7KaBb6cNHHn4pXoq55M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix index 8195632bdf..bcf4b075df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-classifier/default.nix @@ -10,7 +10,8 @@ buildPythonPackage rec { pname = "karton-classifier"; - version = "1.2.0"; + version = "1.4.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +19,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AG2CtNMgXYfbdlOqB1ZdjMT8H67fsSMXTgiFg6K41IQ="; + hash = "sha256-TRmAin0TAOIwR5EBMwTOJ9QaHO+mOx/eAjgqvyQZDj4="; }; propagatedBuildInputs = [ @@ -27,17 +28,25 @@ buildPythonPackage rec { python-magic ]; + checkInputs = [ + pytestCheckHook + ]; + postPatch = '' substituteInPlace requirements.txt \ --replace "chardet==3.0.4" "chardet" \ --replace "python-magic==0.4.18" "python-magic" ''; - checkInputs = [ - pytestCheckHook + pythonImportsCheck = [ + "karton.classifier" ]; - pythonImportsCheck = [ "karton.classifier" ]; + disabledTests = [ + # Tests expecting results from a different version of libmagic + "test_process_archive_ace" + "test_process_runnable_win32_lnk" + ]; meta = with lib; { description = "File type classifier for the Karton framework"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix index ab092fc256..673d756946 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-config-extractor/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "karton-config-extractor"; - version = "2.0.2"; + version = "2.1.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r0WMtfau5zeVDSjxy2h96INQl8bm4EP0IAcgnGPhTtk="; + sha256 = "sha256-ep69Rrm8Ek0lkgctz6vDAZ1MZ8kWKZSyIvMMAmzTngA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix index b839230b5f..d4e9548132 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-core/default.nix @@ -1,23 +1,26 @@ { lib +, boto3 , buildPythonPackage , fetchFromGitHub -, minio , python , redis }: buildPythonPackage rec { pname = "karton-core"; - version = "4.4.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - sha256 = "sha256-smgKrFexuL0bgt/1Ikm1tpSGPJNJm7Ko68iZn3AQw5E="; + hash = "sha256-0B2u2xnrGc3iQ8B9iAQ3fcovQQCPqdFsn5evgdDwg5M="; }; - propagatedBuildInputs = [ minio redis ]; + propagatedBuildInputs = [ + boto3 + redis + ]; checkPhase = '' runHook preCheck @@ -25,10 +28,14 @@ buildPythonPackage rec { runHook postCheck ''; + pythonImportsCheck = [ + "karton.core" + ]; + meta = with lib; { description = "Distributed malware processing framework"; homepage = "https://karton-core.readthedocs.io/"; - maintainers = with maintainers; [ chivay ]; license = licenses.bsd3; + maintainers = with maintainers; [ chivay fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix index 5b67123ee2..8ac4f1022d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix @@ -4,13 +4,14 @@ , flask , karton-core , mistune +, networkx , prometheus-client , pythonOlder }: buildPythonPackage rec { pname = "karton-dashboard"; - version = "1.2.1"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,20 +19,22 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-C1wtpHyuTlNS6Se1rR0RGUl3xht4aphAtddKlIsOAkI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-XMyQ0mRF4y61hqlqdxC+He+697P1URfOXQUMnV0pT7o="; }; propagatedBuildInputs = [ flask karton-core mistune + networkx prometheus-client ]; postPatch = '' substituteInPlace requirements.txt \ - --replace "Flask==1.1.1" "Flask" \ + --replace "Flask==2.0.3" "Flask" \ + --replace "networkx==2.6.3" "networkx" \ --replace "prometheus_client==0.11.0" "prometheus_client" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 0eae4b4421..75523b6761 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "karton-mwdb-reporter"; - version = "1.1.0"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - hash = "sha256-2qG/8D6ZlUFJg+BB/QZ9ZMJpbsLei/7TRXd6bF40Fvg="; + hash = "sha256-QVxczXT74Xt0AtCSDm4nhIK4qtHQ6bqmVNb/CALZSE4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix index 6183e95000..16b4036c90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-yaramatcher/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "karton-yaramatcher"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "0mv8v1gk6p21pw9kx6cxr76l6c5fxd3p6dk85cwfzz100h8mdvar"; + sha256 = "sha256-ulWwPXbjqQXwSRi8MFdcx7vC7P19yu66Ll8jkuTesao="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix index dbdebefdb5..edb928e682 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keras/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "keras"; - version = "2.8.0"; + version = "2.9.0"; format = "wheel"; src = fetchPypi { inherit format pname version; - sha256 = "sha256-dE053GV33NgP9KTUFUnpK3fWoX4O3VikMdMGVuKbyU4="; + sha256 = "sha256-VZESVvic/JNDyfvkth7EWi0z2Jcpy+GrncrPiwe4tqs="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix index 72ebfec8f7..743220e89e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyring/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "keyring"; - version = "23.6.0"; + version = "23.7.0"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-OsAMJuTJNznhkQMJGpmGqfeWZaeM8VpN8dun6prI2i8="; + hash = "sha256-eC4c0RMukb9Fn80kO88lsyYBXBrAsZjkQI+R+meRBis="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix index a45be02b55..45a85f0fd8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keyrings-alt/default.nix @@ -1,32 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27, six -, pytest, backports_unittest-mock, keyring, setuptools-scm +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, isPy27 +, six + +, pytestCheckHook +, keyring +, setuptools-scm }: buildPythonPackage rec { pname = "keyrings.alt"; - version = "4.1.0"; + version = "4.1.1"; + format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "52ccb61d6f16c10f32f30d38cceef7811ed48e086d73e3bae86f0854352c4ab2"; + sha256 = "sha256-6HFSuVYvqCK1Ew7jECVRK02m5tsNrzjIcFZtCLhK3tY="; }; - postPatch = '' - substituteInPlace pytest.ini \ - --replace "--flake8" "" - ''; + nativeBuildInputs = [ + setuptools-scm + ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ + six + ]; - checkInputs = [ pytest keyring ] ++ lib.optional (pythonOlder "3.3") backports_unittest-mock; - - # heavily relies on importing tests from keyring package - doCheck = false; - checkPhase = '' - py.test - ''; + checkInputs = [ + pytestCheckHook + keyring + ]; pythonImportsCheck = [ "keyrings.alt" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix index 258b3a5618..cc10ec9668 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/keystoneauth1/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "keystoneauth1"; - version = "4.6.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Bm8a3diRFM1qG5yzVVyOqn0BNnPuEDS9/lBgaIBKngU="; + sha256 = "sha256-brtfBEyd/SYwh6Mo1R1HmUfR3ckMCdr0GR333HEzQyM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix index b968fa3a50..e51324989e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "kiwisolver"; - version = "1.4.2"; + version = "1.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-f2BtkbiogWvkdlE6d/0wq+ZiJwOb1vi0BsNIywJH3Mk="; + hash = "sha256-1BmXUZ/LpKHkbrSi/jG8EvD/lXsrgbrCjbJHRPMz6VU="; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix index 27f05d83aa..9b0b241c5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "labelbox"; - version = "3.15.0"; + version = "3.24.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Labelbox"; repo = "labelbox-python"; - rev = "v.${version}"; - sha256 = "sha256-pJkDC/2EDPWbIw9WqV9kdYmr4X6apXtholzd0IYjgDg="; + rev = "refs/tags/v.${version}"; + sha256 = "sha256-pcIbCtVOr6pwodgNv8aGZ+k2Z9cQPCQm1UBJWJAlj/o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix index 0c0c5c108a..0749a54706 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lektor/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "lektor"; - version = "3.3.4"; + version = "3.3.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "lektor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9Zd+N6FkvRuW7rptWAr3JLIARXwJDcocxAp/ZCTQ3Hw="; + hash = "sha256-i3SuvRREuq0EENDtXjQegdmz30RmH1HVqBwdjq/mkTM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix index 975c61be2d..24c4f11b67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.19.2"; + version = "0.20.2"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "Levenshtein"; rev = "refs/tags/v${version}"; - hash = "sha256-tedoSeCwMWHwPlZ8qvzIMjVj5W9qJVoLAsT35hQBc/g="; + hash = "sha256-zVYfErh9tts3yPgXqqeX6xp8o+gLd7nN64+Ml6YZfjE="; }; nativeBuildInputs = [ @@ -51,6 +51,7 @@ buildPythonPackage rec { meta = with lib; { description = "Functions for fast computation of Levenshtein distance and string similarity"; homepage = "https://github.com/maxbachmann/Levenshtein"; + changelog = "https://github.com/maxbachmann/Levenshtein/blob/${src.rev}/HISTORY.md"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fab ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix index 2deb4f18d1..1aa0346795 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libagent/default.nix @@ -1,22 +1,49 @@ -{ lib, fetchFromGitHub, buildPythonPackage, ed25519, ecdsa , semver, mnemonic -, unidecode, mock, pytest , backports-shutil-which, configargparse -, python-daemon, pymsgbox, pynacl }: +{ lib +, fetchFromGitHub +, bech32 +, buildPythonPackage +, cryptography +, ed25519 +, ecdsa +, semver +, mnemonic +, unidecode +, mock +, pytest +, backports-shutil-which +, configargparse +, python-daemon +, pymsgbox +, pynacl +}: # XXX: when changing this package, please test the package onlykey-agent. buildPythonPackage rec { pname = "libagent"; - version = "0.14.4"; + version = "0.14.5"; src = fetchFromGitHub { owner = "romanz"; repo = "trezor-agent"; rev = "v${version}"; - sha256 = "1ksv494xpga27ifrjyn1bkqaya5h769lqb9rx1ng0n4kvmnrqr3l"; + sha256 = "sha256-RISAy0efdatr9u4CWNRGnlffkC8ksw1NyRpJWKwqz+s="; }; - propagatedBuildInputs = [ unidecode backports-shutil-which configargparse - python-daemon pymsgbox ecdsa ed25519 mnemonic semver pynacl ]; + propagatedBuildInputs = [ + unidecode + backports-shutil-which + configargparse + python-daemon + pymsgbox + ecdsa + ed25519 + mnemonic + semver + pynacl + bech32 + cryptography + ]; checkInputs = [ mock pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix index 7d6c185d1c..d763c52d81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "libcst"; - version = "0.4.3"; + version = "0.4.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,15 +25,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "instagram"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Lm62rVL5f+fu4KzOQMroM0Eu27l5v2dkGtRiIVPFNhg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-YrGajxs8t8PU4XRkFlhwtxoa9pzpKPXq8ZvN/uqftlE="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; sourceRoot = "source/${cargoRoot}"; name = "${pname}-${version}"; - hash = "sha256-i5BYYiILadKEPIJOaWdG1lZNSHfNQnwmc5j0D1jg/kc="; + hash = "sha256-V/WHZVvh8HtD8IUNk3V4e8/E2A8DebqY5i/lS1X6x3o="; }; cargoRoot = "native"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix index 494e887c79..2807804b77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libevdev/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "libevdev"; - version = "0.10"; + version = "0.11"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-9LM2Ftr6qmQYysCxso+XJSthwJdOU01J+yL8ZWbtwRM="; + sha256 = "sha256-6coAak3ySIpgvZp0ABHulI2BkEviNk8BflYBaVCPVg8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix index 957d37f217..3700ebb85d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/liblarch/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - version = "3.0.1"; + version = "3.2.0"; pname = "liblarch"; disabled = pythonOlder "3.5.0"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "getting-things-gnome"; repo = "liblarch"; rev = "v${version}"; - sha256 = "0xv2mfvyzipbny3iz8vll77wsqxfwh28xj6bj1ff0l452waph45m"; + sha256 = "sha256-A2qChe2z6rAhjRVX5VoHQitebf/nMATdVZQgtlquuYg="; }; checkInputs = [ @@ -26,6 +26,8 @@ buildPythonPackage rec { gtk3 ]; + buildInputs = [ gtk3 ]; + propagatedBuildInputs = [ pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix index 21a58e7e98..d12087e59f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/librosa/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "librosa"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ftXW4/RUbl48KEBpH53cVoePkUo1pQBg31/KKybUthQ="; + sha256 = "sha256-W1drXv3OQo6QvJiL3VqVPRKnJ+X5MfMNdMU7Y6u+PIk="; }; propagatedBuildInputs = [ joblib matplotlib six scikit-learn decorator audioread resampy soundfile pooch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix index c289860858..5064f39b99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "limits"; - version = "2.6.3"; + version = "2.7.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/limits/_version.py" ''; - hash = "sha256-YAuq8QycQ55emU2S0rQHxdHCD+jSRmzUKeYFdrV9NzM="; + hash = "sha256-TBZElCogPtoR2qX1YjBgpYh99LhrvLHFtr2ogemo9/c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index b0672c012a..2291a4ffcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.4.22"; + version = "2022.6.23"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-NKRxt25uvMBvSpY8vk4Vr56NmnW2VTpOLBHUzM2j/yc="; + hash = "sha256-f5xrLeIl1KbHBx8csUNKPWLX1tMiMitPULnoW4+vCtI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix index 76aa30f069..cafd6d3114 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/line_profiler/default.nix @@ -8,18 +8,19 @@ , scikit-build , cmake , pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "line-profiler"; - version = "3.4.0"; + version = "3.5.1"; disabled = pythonOlder "3.6" || isPyPy; src = fetchPypi { pname = "line_profiler"; inherit version; - sha256 = "b6b0a8100a2829358e31ef7c6f427b1dcf2b1d8e5d38b55b219719ecf758aee5"; + sha256 = "sha256-d0ACCL+9XUNBk4qaOk+1GU9a9/wjstSWyRN1X4MQ6Lg="; }; nativeBuildInputs = [ @@ -33,7 +34,7 @@ buildPythonPackage rec { ]; checkInputs = [ - ipython + pytestCheckHook ]; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lingua/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lingua/default.nix new file mode 100644 index 0000000000..f116df7e2f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/lingua/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchPypi +, buildPythonPackage +, flit-core +, polib +, click }: + +buildPythonPackage rec { + pname = "lingua"; + version = "4.15.0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-DhqUZ0HbKIpANhrQT/OP4EvwgZg0uKu4TEtTX+2bpO8="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + click + polib + ]; + + pythonImportsCheck = [ "lingua" ]; + + meta = with lib; { + description = "Translation toolset"; + homepage = "https://github.com/wichert/lingua"; + license = licenses.bsd3; + maintainers = with maintainers; [ np ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix index ddf73ee56b..37347331b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/liquidctl/default.nix @@ -14,14 +14,15 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.8.1"; + version = "1.10.0"; disabled = pythonOlder "3.6"; + format = "pyproject"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "0cl1xg3rqpn4yjflwcz667pwfjnbq0g41pkg2nak7x9mxqnbdk70"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-2mXWih3LchJ/YsjuwHwWse7SNJYx1vxtovl8vasKV4w="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix index 637a4deb3a..b928fe59c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/llvmlite/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.38.0"; + version = "0.38.1"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "a99d166ccf3b116f3b9ed23b9b70ba2415640a9c978f3aaa13fad49c58f4965c"; + sha256 = "sha256-BiKoYwH8+BzFDX7VtL6+mSwDBYDUE6hEOzKO1PTYJWE="; }; nativeBuildInputs = [ llvm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix b/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix index bbc65a51c3..ca9e5b17be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "logilab-constraint"; - version = "0.6.0"; + version = "0.6.2"; src = fetchPypi { inherit pname version; - sha256 = "1n0xim4ij1n4yvyqqvyc0wllhjs22szglsd5av0j8k2qmck4njcg"; + sha256 = "sha256-Jk6wvvcDEeHfy7dUcjbnzFIeGBYm5tXzCI26yy+t2qs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix index b075ead342..36b8c89789 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lru-dict/default.nix @@ -6,7 +6,7 @@ let pname = "lru-dict"; - version = "1.1.7"; + version = "1.1.8"; in buildPythonPackage { inherit pname version; @@ -14,7 +14,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - hash = "sha256-RbgfZ9dTQdRDOrreeZpH6cQqniKhGFMdy15UmGQDLXw="; + hash = "sha256-h4vI70Bz5c+5U9/Bz0WF20HouBTAEGq9400A7g0LMRU="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix index 08b66f8ff5..f0a9d6ff52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "lxml"; - version = "4.9.0"; + version = "4.9.1"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "lxml-${version}"; - sha256 = "sha256-3bPyfsiJGDNB0MPw4OhATRnsM3I8ThZwvPWI+easgNo="; + rev = "refs/tags/lxml-${version}"; + sha256 = "sha256-5MJw3ciXYnfctSNcemJ/QJGKAaYpadvdbFhkc8+pmPM="; }; # setuptoolsBuildPhase needs dependencies to be passed through nativeBuildInputs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix index c6966e632f..aaf4e0aa69 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-9gp67i2fotvFOpkaQZ82/YKnDEs3DnzXfuNCVRJg88I="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-hQuZkstsB37pFDWmA0W6qGd7rAer1mun7Z6MxMp0ZmE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix index 526f2b1286..b3077edcc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/m2r/default.nix @@ -22,6 +22,7 @@ buildPythonPackage rec { url = "https://github.com/miyakogi/m2r/commit/58ee9cabdadf5e3deb13037f3052238f0f2bffcd.patch"; sha256 = "sha256-CN3PWmnk7xsn1wngRHuEWmDTP3HtVNxkFv0xzD2Zjlo="; }) + ./docutils-0.19-compat.patch ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/m2r/docutils-0.19-compat.patch b/third_party/nixpkgs/pkgs/development/python-modules/m2r/docutils-0.19-compat.patch new file mode 100644 index 0000000000..9392702b98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/m2r/docutils-0.19-compat.patch @@ -0,0 +1,15 @@ +diff --git a/m2r.py b/m2r.py +index a4e43c2..fb9e588 100644 +--- a/m2r.py ++++ b/m2r.py +@@ -10,8 +10,8 @@ from argparse import ArgumentParser, Namespace + + from docutils import statemachine, nodes, io, utils + from docutils.parsers import rst +-from docutils.core import ErrorString +-from docutils.utils import SafeString, column_width ++from docutils.utils.error_reporting import ErrorString, SafeString ++from docutils.utils import column_width + import mistune + + if sys.version_info < (3, ): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix index 63cb8db5fd..aeae43aeee 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, makePythonPath , pythonOlder , python , click @@ -24,14 +25,14 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.5.3"; + version = "1.6.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral"; - rev = "v${version}"; - sha256 = "sha256-Uo3vcYez2qSq162SSKjoCkwygwR5awzDceIq8/h3dao="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-JVzaWwdHAn5JOruLEN9Z2/5eV1oh3J2NQffNI3RqYfA="; }; format = "pyproject"; @@ -57,14 +58,18 @@ buildPythonPackage rec { makeWrapperArgs = [ # Add the installed directories to the python path so the daemon can find them - "--prefix" "PYTHONPATH" ":" "${lib.concatStringsSep ":" (map (p: p + "/lib/${python.libPrefix}/site-packages") (python.pkgs.requiredPythonModules propagatedBuildInputs))}" - "--prefix" "PYTHONPATH" ":" "$out/lib/${python.libPrefix}/site-packages" + "--prefix PYTHONPATH : ${makePythonPath propagatedBuildInputs}" + "--prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages" ]; checkInputs = [ pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + disabledTests = [ # We don't want to benchmark "test_performance" @@ -85,7 +90,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open-source Dropbox client for macOS and Linux"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg sfrijters ]; platforms = platforms.unix; homepage = "https://maestral.app"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix index e437ee7290..d6c6108d52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/magicgui/default.nix @@ -12,15 +12,15 @@ , napari # a reverse-dependency, for tests }: buildPythonPackage rec { pname = "magicgui"; - version = "0.3.7"; + version = "0.5.1"; format = "pyproject"; src = fetchFromGitHub { owner = "napari"; repo = "magicgui"; - rev = "v${version}"; - sha256 = "sha256-LYXNNr5lS3ibQk2NIopZkB8kzC7j3yY8moGMk0Gr+hU="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-fVfBQaaT8/lUGqZRXjOPgvkC01Izb8Sxqn7RCqnW9bo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix index ca5b0d3184..36b1e9f42d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailchecker/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "mailchecker"; - version = "4.1.17"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-NfgLI490/9YoHIXTVD890RTe+qP9rrwAFv8Xkc1IY5s="; + hash = "sha256-d8RG/PSWPHvQy7o9tPLPGrEp0r/Y3JWwWoT3cS4iR38="; }; # Module has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mailsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mailsuite/default.nix index 8d1046387e..2cb6555109 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mailsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mailsuite/default.nix @@ -4,32 +4,44 @@ , lib # pythonPackages +, hatchling , dnspython +, expiringdict , html2text , mail-parser , imapclient +, publicsuffix2 }: buildPythonPackage rec { pname = "mailsuite"; - version = "1.6.1"; + version = "1.9.4"; + format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "17bsnfjjzv8hx5h397p5pa92l6cqc53i0zjjz2p7bjj3xqzhs45a"; + hash = "sha256-wgutyXxo1z3GxO3xikRlA4Og+oz+7+PrY2Hs6gicO/o="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ dnspython + expiringdict html2text mail-parser imapclient + publicsuffix2 ]; pythonImportsCheck = [ "mailsuite" ]; + doCheck = false; + meta = { description = "A Python package to simplify receiving, parsing, and sending email"; homepage = "https://seanthegeek.github.io/mailsuite/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix index 1d4ae63580..030ea2df31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/makefun/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "makefun"; - version = "1.13.1"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "985bb8b670ffbbb95d2a8aa996d318e6e9a3f26fc6f3ef2da93ebdf8f9c616bf"; + sha256 = "sha256-dwxuRY8e9HMEGFM08daG7iAXVdBhUqh44mRidTQMGB0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mariadb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mariadb/default.nix index 93260e9aac..54e31065a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mariadb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mariadb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "mariadb"; - version = "1.0.11"; + version = "1.1.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-dpFsiSvJNsWw824loUEfZRp7fOl4mSrjqN5+KD79rL8="; + hash = "sha256-c6CsvSrOOB7BvPxhztenmlGeZsAsJOEq5tJ7qgNxeHY="; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix index 389c94fb23..091809d831 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix @@ -1,17 +1,20 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , markdown }: buildPythonPackage rec { pname = "markdown-include"; - version = "0.6.0"; + version = "0.7.0"; format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "18p4qfhazvskcg6xsdv1np8m1gc1llyabp311xzhqy7p6q76hpbg"; + # only wheel on pypi + src = fetchFromGitHub { + owner = "cmacmackin"; + repo = pname; + rev = "v${version}"; + hash = "sha256-2pC0K/Z5l7q6sx4FSM4Pi1/5bt1wLZsqOmcbnE47rVs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix index c1a0f58789..f4c83d5df3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown-it-py/default.nix @@ -2,6 +2,7 @@ , attrs , buildPythonPackage , fetchFromGitHub +, flit-core , linkify-it-py , mdurl , psutil @@ -14,7 +15,7 @@ buildPythonPackage rec { pname = "markdown-it-py"; - version = "2.0.1"; + version = "2.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,10 +23,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "executablebooks"; repo = pname; - rev = "v${version}"; - sha256 = "0qrsl4ajhi2263i5q1kivp2s3n7naq3byfbsv11rni18skw3i2a6"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-6UATJho3SuIbLktZtFcDrCTWIAh52E+n5adcgl49un0="; }; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ attrs linkify-it-py diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix index e8b514bc45..cd11b56ac2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.12.4"; + version = "0.13.0"; disabled = pythonOlder "3.5"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - hash = "sha256-HjPr4pb0x2Sdq8ALaZeQRnGHmNAoEV8XUGbhOjY00jc="; + hash = "sha256-H3l8w2F+ZcJ1P/Dg0ZVBJPUK0itLocL7a0jeSrG3Ws8="; }; patches = [ @@ -66,12 +66,12 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + gobject-introspection wrapGAppsHook ]; buildInputs = [ gdk-pixbuf - gobject-introspection librsvg poppler_gi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix index 724a1459b7..586f1ef96a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/matrix-nio/default.nix @@ -78,7 +78,10 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--benchmark-disable" ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + "--benchmark-disable" + ]; disabledTests = [ # touches network diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mattermostdriver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mattermostdriver/default.nix index 2564670c8b..629960797b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mattermostdriver/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mattermostdriver/default.nix @@ -28,6 +28,6 @@ buildPythonPackage rec { description = "A Python Mattermost Driver"; homepage = "https://github.com/Vaelor/python-mattermost-driver"; license = licenses.mit; - maintainers = with maintainers; [ globin lheckemann ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix index 9fafec281d..7b85a17a31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.16.3"; + version = "0.17.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU="; + sha256 = "sha256-j49NrZJMDw8m5ZGP4DXxk7uzF+0BxDjs4coEkMDUP+0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix index 26d3207cc4..f8001dbdd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "9.2.0"; + version = "9.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "v${version}"; - hash = "sha256-poq/8+gRlKtrYpuLHmkPgS6OTTMTMaQw9rS1V2sfd6w="; + hash = "sha256-kNThVElEDqhbCitktBv5tQkjMaU4IsX0dJk63hvLhb0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix new file mode 100644 index 0000000000..08ea5eb8b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdutils/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "mdutils"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "didix21"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-regIrMWbGmW574dfojxZFJoivpaqOpN1I6YsqLEp8BM="; + }; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + meta = with lib; { + description = "Set of basic tools that can help to create Markdown files"; + longDescription = '' + This Python package contains a set of basic tools that can help to create + a Markdown file while running a Python code. Thus, if you are executing a + Python code and you save the result in a text file, Why not format it? So + using files such as Markdown can give a great look to those results. In + this way, mdutils will make things easy for creating Markdown files. + ''; + homepage = "https://github.com/didix21/mdutils"; + changelog = "https://github.com/didix21/mdutils/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix index 9ea39e27a1..5d100c3d24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mdx-truly-sane-lists/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , markdown , python }: @@ -16,10 +17,23 @@ buildPythonPackage rec { sha256 = "1h8403ch016cwdy5zklzp7c6xrdyyhl4z07h97qzbafrbq07jyss"; }; + patches = [ + # fix with markdown>=3.4 + # Upstream PR: https://github.com/radude/mdx_truly_sane_lists/pull/12/ + (fetchpatch { + url = "https://github.com/radude/mdx_truly_sane_lists/commit/197fa16bc8d3481b8ea29d54b9cc89716f5d43a2.patch"; + sha256 = "sha256-cYCb+EI4RpebNN02bCy1SSH9Tz4BsnFgUCOeQNC03Oo="; + }) + ]; + propagatedBuildInputs = [ markdown ]; pythonImportsCheck = [ "mdx_truly_sane_lists" ]; + # Hard ImportError from the package trying to view version of markdown, + # which was removed. + # Upstream issue: https://github.com/radude/mdx_truly_sane_lists/issues/11 + doCheck = false; checkPhase = '' ${python.interpreter} mdx_truly_sane_lists/tests.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix new file mode 100644 index 0000000000..9b188f9c2a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mediapy/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, ipython +, matplotlib +, numpy +, pillow +}: + +buildPythonPackage rec { + pname = "mediapy"; + version = "1.1.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-CejgiCiW7an1GpKB5MUiA1Alkigv3RmfTq0um9pc93E="; + }; + + propagatedBuildInputs = [ ipython matplotlib numpy pillow ]; + + pythonImportsCheck = [ "mediapy" ]; + + meta = with lib; { + description = "Read/write/show images and videos in an IPython notebook"; + homepage = "https://github.com/google/mediapy"; + license = licenses.asl20; + maintainers = with maintainers; [ mcwitt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix index 5b2acecf63..f215ec661f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meilisearch/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "meilisearch"; - version = "0.19.0"; + version = "0.19.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "meilisearch"; repo = "meilisearch-python"; rev = "refs/tags/v${version}"; - hash = "sha256-ky5Z1bu+JFpnSGfzaEB6g/nl/F/QJQGVpgb+Jf/o/tM="; + hash = "sha256-/z1UtZJE91dUHogXCbCv8nI8bd26HYVi1OzUV3sArJU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix index bee35f94f6..921f2962f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "memory-allocator"; - version = "0.1.2"; + version = "0.1.3"; src = fetchPypi { inherit version; pname = "memory_allocator"; - sha256 = "ddf42a2dcc678062f30c63c868335204d46a4ecdf4db0dc43ed4529f1d0ffab9"; + sha256 = "sha256-E4BcKuHAG3SJ+rXo6sk2FmK08sAkEuNlLuzkj/aVMWI="; }; propagatedBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix index 5bc7953e39..713408e08c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meross-iot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "meross-iot"; - version = "0.4.4.7"; + version = "0.4.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = "MerossIot"; rev = "refs/tags/${version}"; - sha256 = "sha256-9kRiBYlOX+TcI8+fk+cQ3ehbrV8NnptWa+HN62sKscA="; + sha256 = "sha256-6TWtqPYbHZKiAEHAGxZrPxvIiLdNhwOtqtgG+HtQGjI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix index 3c013e071b..5fb1804dc6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/metar/default.nix @@ -17,20 +17,24 @@ buildPythonPackage rec { }; patches = [ + # Fix flapping test; https://github.com/python-metar/python-metar/issues/161 (fetchpatch { - # Fix flapping test; https://github.com/python-metar/python-metar/issues/161 url = "https://github.com/python-metar/python-metar/commit/716fa76682e6c2936643d1cf62e3d302ef29aedd.patch"; hash = "sha256-y82NN+KDryOiH+eG+2ycXCO9lqQLsah4+YpGn6lM2As="; + name = "fix_flapping_test.patch"; + }) + + # Fix circumvent a sometimes impossible test + # https://github.com/python-metar/python-metar/issues/165 + (fetchpatch { + url = "https://github.com/python-metar/python-metar/commit/b675f4816d15fbfc27e23ba9a40cdde8bb06a552.patch"; + hash = "sha256-v+E3Ckwxb42mpGzi2C3ka96wHvurRNODMU3xLxDoVZI="; + name = "fix_impossible_test.patch"; }) ]; checkInputs = [ pytestCheckHook ]; - disabledTests = [ - # https://github.com/python-metar/python-metar/issues/165 - "test_033_parseTime_auto_month" - ]; - pythonImportsCheck = [ "metar" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix index 555059f568..c6f39a4fb2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/meteoalertapi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "meteoalertapi"; - version = "0.2.0"; + version = "0.3.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "rolfberkenbosch"; repo = "meteoalert-api"; rev = "v${version}"; - sha256 = "sha256-EdHqWEkE/uUtz/xjV4k4NvNvtPPU4sJjHGwUM7J+HWs="; + sha256 = "sha256-uB2nza9fj7vOWixL4WEQX1N3i2Y80zQPM3x1+gRtg+w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/meteocalc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meteocalc/default.nix new file mode 100644 index 0000000000..6b18bba979 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/meteocalc/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "meteocalc"; + version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "malexer"; + repo = pname; + rev = version; + hash = "sha256-WuIW6hROQkjMfbCLUouECIrp4s6oCd2/N79hsrTbVTk="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "meteocalc" + ]; + + meta = with lib; { + description = "Module for calculation of meteorological variables"; + homepage = "https://github.com/malexer/meteocalc"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix index 6607dc0739..d4087e12c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mezzanine/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mezzanine"; - version = "5.1.3"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; @@ -29,7 +29,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Mezzanine"; inherit version; - hash = "sha256-G/Oj5g70tFUhnbSVElVk0s9Ka+MEuPsEgj6blcFBOoY="; + hash = "sha256-R/PB4PFQpVp6jnCasyPszgC294SKjLzq2oMkR2qV86s="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix index 5b142406fa..e91507379e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/minio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "minio"; - version = "7.1.4"; + version = "7.1.10"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "minio"; repo = "minio-py"; - rev = version; - sha256 = "sha256-IzITqo23pRf83SFpnBZdryGHIsxh+7HrLVLM9CT5nQQ="; + rev = "refs/tags/${version}"; + sha256 = "sha256-od+I3rPLyLYbHAadWks5ccRkmAqhwn4+geRKq0qSnAs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mistune/common.nix b/third_party/nixpkgs/pkgs/development/python-modules/mistune/common.nix index 9610b735c7..24508372d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mistune/common.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mistune/common.nix @@ -1,4 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi, nose, version, sha256, format ? "setuptools" }: +{ lib +, buildPythonPackage +, fetchPypi +, nose +, version +, sha256 +, format ? "setuptools" +, extraMeta ? {} +}: buildPythonPackage rec { inherit version format; @@ -15,5 +23,5 @@ buildPythonPackage rec { description = "The fastest markdown parser in pure Python"; homepage = "https://github.com/lepture/mistune"; license = licenses.bsd3; - }; + } // extraMeta; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix index bb9d25d558..515844443f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mistune/default.nix @@ -2,10 +2,13 @@ self: rec { mistune_0_8 = self.callPackage ./common.nix { version = "0.8.4"; sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e"; + extraMeta = { + knownVulnerabilities = [ "CVE-2022-34749" ]; + }; }; mistune_2_0 = self.callPackage ./common.nix { - version = "2.0.2"; - sha256 = "sha256-b8iMPLSduosWaHtBcl5mHPhXhMEuiXSim50zbdWWw6E="; + version = "2.0.4"; + sha256 = "sha256-nuCmYFPiJnq6dyxx4GiR+o8a9tSwHV6E4me0Vw1NmAg="; format = "pyproject"; }; mistune = mistune_0_8; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index ea0f5dd104..ed390ef336 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; sha256 = "sha256-nW/WfiY6uF67qNa95tvNvSv/alP2WmzTk34LEBma/04="; }; @@ -121,6 +121,6 @@ buildPythonPackage rec { description = "Man-in-the-middle proxy"; homepage = "https://mitmproxy.org/"; license = licenses.mit; - maintainers = with maintainers; [ fpletz kamilchm ]; + maintainers = with maintainers; [ kamilchm SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix index d4d8f7875e..fed1eab648 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix @@ -13,7 +13,7 @@ buildPythonApplication rec { pname = "mkdocs-material"; - version = "8.3.7"; + version = "8.3.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonApplication rec { owner = "squidfunk"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LOsgWRjKFZ+ZkJkQzDStNNBUh+AwlI8zZcUBz7L/Ook="; + hash = "sha256-Mi5eWznVuyH+69RtS0fUS9YD9mCumTk8HmgLVDKZC+I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix index 7f3f97255d..48b70d35a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlflow/default.nix @@ -32,14 +32,14 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.26.1"; + version = "1.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VoBESElY6nG9MU7UICbP2V5kH+6+GFaKMuy/mv6bk9Q="; + hash = "sha256-aXZp4eQuiHwzBQKuTw7WROgUvgas2pDOpEU57M4zSmQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix index 05fc6b4bb5..63cc4e3b39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mlxtend/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "mlxtend"; - version = "0.19.0"; + version = "0.20.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rasbt"; repo = pname; - rev = version; - sha256 = "0qawzlzv4zf612n9n03fxnz6gxmzschq0ykh9dgv70l33ihmjbaw"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ECDO3nc9IEgmZNdSA70BzOODOi0wnisI00F2Dxzdz+M="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix index c6e9ee01ff..cfebe53237 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.24.1"; + version = "1.0.3"; disabled = isPy27; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mne-tools"; repo = pname; - rev = "v${version}"; - sha256 = "0n91pj97xmpn0bmlv56q2117szlvvs4b52pjjlm3g8ny4xb3iwr0"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-6eDS/hKqEQqUxJtnfsPhxw9b4p5CC1ifnxVCRBmVVA8="; }; propagatedBuildInputs = [ numpy scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moat-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moat-ble/default.nix new file mode 100644 index 0000000000..33a59c72f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/moat-ble/default.nix @@ -0,0 +1,55 @@ +{ lib +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "moat-ble"; + version = "0.1.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-dy1Fm0Z1PUsPY8QTiXUcWSi+csFnTUsobSkA92m06QI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=moat_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "moat_ble" + ]; + + meta = with lib; { + description = "Library for Moat BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/moat-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix index bba7b18841..1e9203f4ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "mocket"; - version = "3.10.5"; + version = "3.10.6"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-rF6ol5T6wH0nNmaP+lHQL8H+XZz1kl7OEe7NNO4MCtw="; + sha256 = "sha256-pD6WiK3OgDD2Xy9r59KOB9TT/LNiQa/DWRXA+w76oe8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix index e9af134ba1..1c27f7bccb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mockito/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, funcsigs, pytest, numpy }: buildPythonPackage rec { - version = "1.3.3"; + version = "1.3.4"; pname = "mockito"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mCRTdihXcyMHNPJkmGWLHcBFrTvhNCH1CMcaXHaVe8E="; + sha256 = "sha256-RdJibODIxwY8xE8Gox9X1B0kHvLsm9pAMtULOedZXrE="; }; propagatedBuildInputs = lib.optionals (!isPy3k) [ funcsigs ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix index 269ebf2ef3..ff91a63d79 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.24.0"; + version = "0.24.1"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-BQSB4SGlejARFreeTfqFMzCWvBc6Vvq9EOMLjhAihdI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-KmCk4YTkwpWePTOOFyp4hGIcxpy/rrfAAC1/Xes/IYk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix index 21f0b70f63..9f3ce69394 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix @@ -1,32 +1,43 @@ { lib , buildPythonPackage , fetchPypi -, nose +, flit-core +, pytestCheckHook , six , stdenv }: - buildPythonPackage rec { pname = "more-itertools"; - version = "8.12.0"; + version = "8.13.0"; + format = "flit"; src = fetchPypi { inherit pname version; - sha256 = "7dc6ad46f05f545f900dd59e8dfb4e84a4827b97b3cfecb175ea0c7d247f6064"; + sha256 = "sha256-pCkBoKWxadkl9vIXzVoZDjLvVDYJBbnDnufbUxO/7A8="; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ six ]; + nativeBuildInouts = [ + flit-core + ]; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + pytestCheckHook + ]; # iterable = range(10 ** 10) # Is efficiently reversible # OverflowError: Python int too large to convert to C long doCheck = !stdenv.hostPlatform.is32bit; - meta = { + meta = with lib; { homepage = "https://more-itertools.readthedocs.org"; changelog = "https://more-itertools.readthedocs.io/en/stable/versions.html"; description = "Expansion of the itertools module"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix index 9ff4bc02e7..e818b1d1e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/motionblinds/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "motionblinds"; - version = "0.6.10"; + version = "0.6.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "starkillerOG"; repo = "motion-blinds"; rev = "refs/tags/${version}"; - sha256 = "sha256-WCwj/2iUXOhmww4hiI5KPA7VyoVEYDeEMmnZM+DGHmc="; + sha256 = "sha256-LHZp5IXZqPYNwPlOQySwxon3uZX15caZvMeMY6QQIqk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix index fc0e613b24..52c0b6a250 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/moto/default.nix @@ -36,14 +36,14 @@ buildPythonPackage rec { pname = "moto"; - version = "3.1.11"; + version = "3.1.16"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GwxHL0t0AXdakuY/vPomESoA4Ie59u3aEiAqOcYsYYE="; + sha256 = "sha256-y+itipSfUZdx5dJbZwc4YEdX+2fNR0110UwgZ3WC6B8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix index b759368174..030b22a723 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/motor/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "motor"; - version = "2.5.1"; + version = "3.0.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mongodb"; repo = pname; - rev = version; - sha256 = "sha256-r+HyIEC+Jafn7eMqkAldsZ5hbem+n+P76RJGAymmBks="; + rev = "refs/tags/${version}"; + sha256 = "sha256-xq3EpTncnMskn3aJdLAtD/kKhn/cS2nrLrVliyh2z28="; }; propagatedBuildInputs = [ pymongo ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix index 491aa131bb..8558706485 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "multiprocess"; - version = "0.70.12.2"; + version = "0.70.13"; format = "setuptools"; src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; - rev = "multiprocess-${version}"; - sha256 = "1npikdgj0qriqj384vg22qgq2xqylypk67sx1qfmdzvk6c4iyg0w"; + rev = "refs/tags/multiprocess-${version}"; + sha256 = "sha256-L/PesvaidavDEgJGqBxwcCYtG9TlKSwaxrUMJ+XVFOM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix index b5415c51c4..835a9d8861 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix @@ -6,7 +6,7 @@ # docs , python , sphinx -, sphinx_rtd_theme +, sphinx-rtd-theme # tests , hypothesis @@ -29,11 +29,11 @@ buildPythonPackage rec { nativeBuildInputs = [ sphinx - sphinx_rtd_theme + sphinx-rtd-theme ]; postInstall = '' - ${python.interpreter} setup.py build_sphinx --build-dir=$doc + ${python.pythonForBuild.interpreter} setup.py build_sphinx --build-dir=$doc ''; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix index cb37545aa4..d87393aec3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy-boto3-s3/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "mypy-boto3-s3"; - version = "1.24.0"; + version = "1.24.36.post1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ITZItcLZ/Im/tWptkKXGc+H1lT4m1mIlljTP/w+6pNo="; + hash = "sha256-O9fgb5reUFnq4hgdep8aQef6gHrT6UwByZAYOOh+Cr4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix index 6358dccdb0..e81bf763b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/myst-parser/default.nix @@ -30,6 +30,11 @@ buildPythonPackage rec { sha256 = "sha256-GEtrC7o5YnkuvBfQQfhG5P74QMiHz63Fdh1cC/r5CF0="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "docutils>=0.15,<0.19" "docutils>=0.15" + ''; + format = "flit"; nativeBuildInputs = [ flit-core ]; @@ -60,6 +65,8 @@ buildPythonPackage rec { "test_footnotes" "test_gettext_html" "test_fieldlist_extension" + # docutils 0.19 expectation mismatches + "test_docutils_roles" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix index 0fd2c3e5e9..4ca75cf023 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napari-npe2/default.nix @@ -13,7 +13,7 @@ let pname = "napari-npe2"; - version = "0.3.0"; + version = "0.5.1"; in buildPythonPackage { inherit pname version; @@ -23,8 +23,8 @@ buildPythonPackage { src = fetchFromGitHub { owner = "napari"; repo = "npe2"; - rev = "v${version}"; - hash = "sha256-IyDUeztWQ8JWXDo//76iHzAlWWaZP6/0lwCh0eZAZsM="; + rev = "refs/tags/v${version}"; + hash = "sha256-+tTJrtJFUGwOhFzWgA5cFVp458DGuPVkErN/5O2LHk4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix index 837936f17a..a55d45bccc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/napari/default.nix @@ -28,15 +28,15 @@ , wrapQtAppsHook }: mkDerivationWith buildPythonPackage rec { pname = "napari"; - version = "0.4.15"; + version = "0.4.16"; format = "pyproject"; src = fetchFromGitHub { owner = "napari"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-52TDMU6box7TA26P0F9ZgPr8fyzYM646lPUfOektOuE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Fx3DoTIb2ev5wMP/gmprPIoxeF2f+Cbac6pnWB/zTTw="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix index 2c062d3ff9..fc311125c1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclassic/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "nbclassic"; - version = "0.3.5"; + version = "0.4.3"; disabled = pythonOlder "3.6"; # tests only on github src = fetchFromGitHub { owner = "jupyterlab"; repo = pname; - rev = "v${version}"; - sha256 = "1d0x7nwsaw5qjw4iaylc2sxlpiq3hlg9sy3i2nh7sn3wckwl76lc"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-5sof5EOqzK7kNHSXp7eJl3ZagZRWF74e08ahqJId2Z8="; }; propagatedBuildInputs = [ jupyter_server notebook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix index 84fe03be60..59cbd65b48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbclient/default.nix @@ -17,7 +17,7 @@ let nbclient = buildPythonPackage rec { pname = "nbclient"; - version = "0.6.3"; + version = "0.6.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ let nbclient = buildPythonPackage rec { owner = "jupyter"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ofyJNJeNkXbZ9qHLTuzJ13PgEXU9lDQ9NkT4nG/R8Ic="; + hash = "sha256-Rs4Jk4OtexB/NKM1Jo4cV87hBxXDlnX9X+4KO+pGb0E="; }; propagatedBuildInputs = [ async_generator traitlets nbformat nest-asyncio jupyter-client ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix index e110934fdd..e5185aa37f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbformat/default.nix @@ -1,7 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, fastjsonschema +, pytestCheckHook , glibcLocales , ipython_genutils , traitlets @@ -12,17 +13,17 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.2.0"; + version = "5.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-k98LnGciHTj7lwxI9tNhgZpsOIKZoO8xcbu5Eu3+EyQ="; + sha256 = "sha256-RLpcpqy4DF1aUA8eW4Pt6MvjZNWklcTIz2Cq8bplZQE="; }; LC_ALL="en_US.utf8"; - checkInputs = [ pytest glibcLocales ]; - propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core ]; + checkInputs = [ pytestCheckHook glibcLocales ]; + propagatedBuildInputs = [ ipython_genutils traitlets testpath jsonschema jupyter_core fastjsonschema ]; preCheck = '' mkdir tmp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index 38234c1486..ebba5c7b3f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.8"; + version = "0.8.9"; src = fetchPypi { inherit pname version; - sha256 = "b5090c824b330b36c2715065a1a179ad36526bff208485a9865453d1ddfc34ec"; + sha256 = "sha256-St6GsqQfj0Hv0+qZ2uhMM2j+i6P4N9UMiBXOlCTFmU8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix index 68eebbada8..1c4cc473bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbxmpp/default.nix @@ -25,6 +25,11 @@ buildPythonPackage rec { sha256 = "sha256-QnvV/sAxdl8V5nV1hk8sRrL6nn015dAy6cXAiy2Tmbs="; }; + nativeBuildInputs = [ + # required for pythonImportsCheck otherwise libsoup cannot be found + gobject-introspection + ]; + buildInputs = [ precis-i18n ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix index e28dbefca9..e11f1f8f23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nclib/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "nclib"; - version = "1.0.1"; + version = "1.0.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "9d41adb7df01a3fead10bc9698a175936b263d6bd18997078ed17e4fa61734d1"; + sha256 = "sha256-rA8oeYvMhw8HURxPLBRqpMHnAez/xBjyPFoKXIIvBjg="; }; # Project has no tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix index 384b6db360..faa015d85f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.5.4"; + version = "1.5.5"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "f969f6013a16fadb4adcf09d11a68a4f617c6049d7af7ac2c676110169a63abd"; + sha256 = "sha256-5EIpHNlCaYvmGYI6F6hqV1nqvh+GEwhHkN4Yn+nhbWU="; }; # tests not packaged with source dist as of 1.3.2/1.3.2, and diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix index 482c298a90..9686ae0f08 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netmiko/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "netmiko"; - version = "4.1.0"; + version = "4.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VwUZdHr82WsEprB7rk5d62AwaCxzngftDgjeBZW4OWQ="; + sha256 = "sha256-ZSmxHaFm0wCarBEzp+7bL7r2EQxRm7tLT0j4ZdjarJo="; }; buildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix index ec71527fa0..4e01e3ed6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/netutils/default.nix @@ -2,7 +2,6 @@ , lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , jinja2 , poetry-core , pytestCheckHook @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.1.0"; + version = "1.2.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +21,7 @@ buildPythonPackage rec { owner = "networktocode"; repo = pname; rev = "v${version}"; - hash = "sha256-rTSesG7XmIzu2DcJMVgZMlh0kRQ8jEB3t++rgf63Flw="; + hash = "sha256-6FoadV5QMZCJnF/eD3FXRsyP4MymO5nayJ/54PJXOB4="; }; nativeBuildInputs = [ @@ -36,15 +35,6 @@ buildPythonPackage rec { toml ]; - patches = [ - # Switch to poetry-core, https://github.com/networktocode/netutils/pull/115 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/networktocode/netutils/commit/edc8b06686db4e5b4c8c4deb6d0effbc22177b31.patch"; - sha256 = "sha256-K5oSbtOJYeKbxzbaZQBXcl6LsHQAK8CxBLfkak15V6M="; - }) - ]; - pythonImportsCheck = [ "netutils" ]; @@ -59,10 +49,10 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Library that is a collection of objects for common network automation tasks"; homepage = "https://github.com/networktocode/netutils"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix index 3fb08348c7..3acf8cdf63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.8.2"; + version = "2.8.4"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rpnJsNNeW0pizxz+oB5bNjPY0C9KDq1paFtufeW4Xqs="; + sha256 = "sha256-XlPwJ8DVZ88fiE27KDIk31JWROQ6/RFF1kydiKNYR2I="; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix new file mode 100644 index 0000000000..c99e7c909c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextdns/default.nix @@ -0,0 +1,49 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, orjson +, pytest-asyncio +, pytest-error-for-skips +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nextdns"; + version = "1.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-joPg5XZ5qEDnON96XCy5j4/OC+EkFw09Db4TH+ThsTY="; + }; + + propagatedBuildInputs = [ + aiohttp + orjson + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-error-for-skips + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nextdns" + ]; + + meta = with lib; { + description = "Module for the NextDNS API"; + homepage = "https://github.com/bieniu/nextdns"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix index 2494a446a8..121b204d5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.9.0"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+cjjCt71FImRCux3JLVpneF4Qn065jhz2tmyPdMh/nY="; + sha256 = "sha256-3YIbT/KzuH9eSwNOoPlfzkN1rOWG3o7Rfmpme94ZJdc="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix index 68a544c9ab..42d05d2477 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix @@ -49,12 +49,12 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.7.0"; + version = "1.8.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e689fe2e5049598c9cd3708e8df1cac732fa1a88696f283e3bc0a70fecb8ab51"; + sha256 = "sha256-Z/qa0NotxWFzweFHRm/MbJImivV8AZl68yiQ1jNvcAQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix index d9140d591c..bea2d9c2c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nocasedict/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "nocasedict"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-giC5e6BrCOst7e13TEBsd+DKDVNSrnEkn2+dHyoXvXs="; + sha256 = "sha256-fBEdpM79JEQzy2M3ev8IGkD4S92unm83bGfwhsD4Bto="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix index 5fc6bd6f8e..083174c824 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nocaselist/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "nocaselist"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4cEsoq6dNFs0lI8sj2DjiUYZ4r4u0otOzF5/HeoRfR0="; + sha256 = "sha256-SPBn+MuEEkXzTQMSC8G6mQDxOxnLUbzGx77gF/fIdNo="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix index 15850119c8..b3dfdda218 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "nose2"; - version = "0.11.0"; + version = "0.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-bSCNfW7J+dVcdNrIHJOUvDkG2++BqMpUILK5t/jmnek="; + hash = "sha256-lW55ub1VjuCLYgDAWtLHZGW344YMDAU3aGCJKFwyARM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix index 898d209d91..13e0d28a30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nplusone/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , flake8 -, flask_sqlalchemy +, flask-sqlalchemy , isPy27 , mock , peewee @@ -33,7 +33,7 @@ buildPythonPackage rec { checkInputs = [ flake8 - flask_sqlalchemy + flask-sqlalchemy mock peewee pytest-django diff --git a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix index bce4c0426e..8679da592c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.5.10"; + version = "0.5.11"; pname = "num2words"; src = fetchPypi { inherit pname version; - sha256 = "0myc27k087rhgpwn1a1dffzl32rwz6ngdbf3rm2i0zlgcxh4zk9p"; + sha256 = "sha256-bGhOIiDYrbNhLSyAepdyzDJplj+81395ebaJp39gQ9Q="; }; propagatedBuildInputs = [ docopt ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix index 69e6861329..cd01bce1d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba-scipy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "numba-scipy"; - version = "0.3.0"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-qJeoWiG1LdtFB9cME1d8xVaC0BXGDJEYjCOEdHvSkmQ="; + hash = "sha256-cApTGH5GJZH/RbkRjKhL3injvixD5kvfaS49FjrPA2U="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix index a9c152f412..9953ddec36 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix @@ -34,10 +34,10 @@ in buildPythonPackage rec { postPatch = '' # numpy substituteInPlace setup.py \ - --replace "1.22" "2" + --replace "1.23" "2" substituteInPlace numba/__init__.py \ - --replace "(1, 21)" "(2, 0)" + --replace "(1, 22)" "(2, 0)" ''; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix index 04e4cd77ba..438a54127a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numcodecs/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "numcodecs"; - version = "0.9.1"; + version = "0.10.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "35adbcc746b95e3ac92e949a161811f5aa2602b9eb1ef241b5ea6f09bb220997"; + sha256 = "sha256-LdQlZOd3KpOFkjsCo2Pjzt8FPOkwlKkGRIXn9ppvHJI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix index a163ef6449..68add2cdc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy/default.nix @@ -6,6 +6,7 @@ , gfortran , hypothesis , pytest +, typing-extensions , blas , lapack , writeTextFile @@ -44,15 +45,15 @@ in buildPythonPackage rec { # Attention! v1.22.0 breaks scipy and by extension scikit-learn, so # build both to verify they don't break. # https://github.com/scipy/scipy/issues/15414 - version = "1.21.6"; + version = "1.23.1"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "sha256-7LVSUROXBmaf3sL/BzyY746ahEc+UecWIRtBqg8Y5lY="; + extension = "tar.gz"; + hash = "sha256-10jvNJv+8uEZS1naN+1aKcGeqNfmNCAZkhuiuk/YtiQ="; }; patches = lib.optionals python.hasDistutilsCxxPatch [ @@ -83,6 +84,7 @@ in buildPythonPackage rec { checkInputs = [ pytest hypothesis + typing-extensions ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix index b770ac26fb..9eebc8c39a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpydoc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.2.1"; + version = "1.4.0"; format = "setuptools"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname; inherit version; - sha256 = "sha256-fOgm7Q1Uw/3JCXmSqNc6TUWdxGhhE1HGjkRP7ESkWvY="; + sha256 = "sha256-lJTa8cdhL1mQX6CeZcm4qQu6yzgE2R96lOd4gx5vz6U="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix index 4cfce28991..117d5cfdd1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nunavut/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.7.5"; + version = "1.8.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4wZfj2C6aUNqHaA00KiiXbKOMf/XBSD0N2+9c++e0K8="; + sha256 = "sha256-JI+0IpQWikE6vXfpZHWsVjx3JPaVJ/f4oAjTSNs1Wuk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix index 879a317469..205cd78757 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oci/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.63.0"; + version = "2.75.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "oracle"; repo = "oci-python-sdk"; - rev = "v${version}"; - hash = "sha256-EIn7BRXsVf7R2ij8iK3hrNWnLehxKDBlk96lAhFh0xw="; + rev = "refs/tags/v${version}"; + hash = "sha256-dr95RHM8h2JIqkaey7E9DzbTLfLlCCUL1ZmTIH4mBRw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix index 340907e0ed..0acaf78420 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.6.0"; + version = "13.7.0"; src = fetchFromGitHub { owner = "ocrmypdf"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-EY0dXma6tyXLT8XogS5iFdVgJPrtwB9YVrplhDT4gWw="; + hash = "sha256-cw2wZMPhWzxRpeM90g9NmuYBYpU13R2iDzs7a8SS/CY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/paths.patch index 9b1eed233c..71d96c9a98 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/paths.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/paths.patch @@ -1,8 +1,8 @@ diff --git a/src/ocrmypdf/_exec/ghostscript.py b/src/ocrmypdf/_exec/ghostscript.py -index 4da65483..af750249 100644 +index 9e21c33c..21f134b3 100644 --- a/src/ocrmypdf/_exec/ghostscript.py +++ b/src/ocrmypdf/_exec/ghostscript.py -@@ -35,15 +35,7 @@ log = logging.getLogger(__name__) +@@ -32,15 +32,7 @@ log = logging.getLogger(__name__) # Most reliable what to get the bitness of Python interpreter, according to Python docs _IS_64BIT = sys.maxsize > 2**32 @@ -20,10 +20,10 @@ index 4da65483..af750249 100644 def version(): diff --git a/src/ocrmypdf/_exec/jbig2enc.py b/src/ocrmypdf/_exec/jbig2enc.py -index 2e8a058b..65a09088 100644 +index 0f8f7392..db792b10 100644 --- a/src/ocrmypdf/_exec/jbig2enc.py +++ b/src/ocrmypdf/_exec/jbig2enc.py -@@ -14,7 +14,7 @@ from ocrmypdf.subprocess import get_version, run +@@ -12,7 +12,7 @@ from ocrmypdf.subprocess import get_version, run def version(): @@ -32,7 +32,7 @@ index 2e8a058b..65a09088 100644 def available(): -@@ -27,7 +27,7 @@ def available(): +@@ -25,7 +25,7 @@ def available(): def convert_group(*, cwd, infiles, out_prefix): args = [ @@ -41,7 +41,7 @@ index 2e8a058b..65a09088 100644 '-b', out_prefix, '-s', # symbol mode (lossy) -@@ -46,7 +46,7 @@ def convert_group_mp(args): +@@ -44,7 +44,7 @@ def convert_group_mp(args): def convert_single(*, cwd, infile, outfile): @@ -51,10 +51,10 @@ index 2e8a058b..65a09088 100644 proc = run(args, cwd=cwd, stdout=fstdout, stderr=PIPE) proc.check_returncode() diff --git a/src/ocrmypdf/_exec/pngquant.py b/src/ocrmypdf/_exec/pngquant.py -index ca8a4542..d0544174 100644 +index 64e91139..ab5b9c49 100644 --- a/src/ocrmypdf/_exec/pngquant.py +++ b/src/ocrmypdf/_exec/pngquant.py -@@ -19,7 +19,7 @@ from ocrmypdf.subprocess import get_version, run +@@ -17,7 +17,7 @@ from ocrmypdf.subprocess import get_version, run def version(): @@ -63,7 +63,7 @@ index ca8a4542..d0544174 100644 def available(): -@@ -46,7 +46,7 @@ def input_as_png(input_file: Path): +@@ -44,7 +44,7 @@ def input_as_png(input_file: Path): def quantize(input_file: Path, output_file: Path, quality_min: int, quality_max: int): with input_as_png(input_file) as input_stream: args = [ @@ -73,10 +73,10 @@ index ca8a4542..d0544174 100644 '--skip-if-larger', '--quality', diff --git a/src/ocrmypdf/_exec/tesseract.py b/src/ocrmypdf/_exec/tesseract.py -index 01177cac..665f1145 100644 +index ad98836a..a12d3002 100644 --- a/src/ocrmypdf/_exec/tesseract.py +++ b/src/ocrmypdf/_exec/tesseract.py -@@ -114,7 +114,7 @@ class TesseractVersion(Version): +@@ -111,7 +111,7 @@ class TesseractVersion(Version): def version() -> str: @@ -84,8 +84,8 @@ index 01177cac..665f1145 100644 + return get_version('@tesseract@', regex=r'tesseract\s(.+)') - def has_user_words(): -@@ -141,7 +141,7 @@ def get_languages(): + def has_user_words() -> bool: +@@ -138,7 +138,7 @@ def get_languages() -> set[str]: msg += output return msg @@ -94,20 +94,20 @@ index 01177cac..665f1145 100644 try: proc = run( args_tess, -@@ -163,7 +163,7 @@ def get_languages(): +@@ -160,7 +160,7 @@ def get_languages() -> set[str]: - def tess_base_args(langs: List[str], engine_mode: Optional[int]) -> List[str]: + def tess_base_args(langs: list[str], engine_mode: int | None) -> list[str]: - args = ['tesseract'] + args = ['@tesseract@'] if langs: args.extend(['-l', '+'.join(langs)]) if engine_mode is not None: diff --git a/src/ocrmypdf/_exec/unpaper.py b/src/ocrmypdf/_exec/unpaper.py -index 479959ef..cc15fdec 100644 +index d7f24265..d14f85de 100644 --- a/src/ocrmypdf/_exec/unpaper.py +++ b/src/ocrmypdf/_exec/unpaper.py -@@ -69,7 +69,7 @@ class UnpaperImageTooLargeError(Exception): +@@ -66,7 +66,7 @@ class UnpaperImageTooLargeError(Exception): def version() -> str: @@ -115,13 +115,13 @@ index 479959ef..cc15fdec 100644 + return get_version('@unpaper@') - SUFFIXES = {'1': '.pbm', 'L': '.pgm', 'RGB': '.ppm'} -@@ -123,7 +123,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[Tuple[Path, Path, Path]]: + SUPPORTED_MODES = {'1', 'L', 'RGB'} +@@ -120,7 +120,7 @@ def _setup_unpaper_io(input_file: Path) -> Iterator[tuple[Path, Path, Path]]: def run_unpaper( - input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: List[str] + input_file: Path, output_file: Path, *, dpi: DecFloat, mode_args: list[str] ) -> None: - args_unpaper = ['unpaper', '-v', '--dpi', str(round(dpi, 6))] + mode_args + args_unpaper = ['@unpaper@', '-v', '--dpi', str(round(dpi, 6))] + mode_args - with _setup_unpaper_io(input_file) as (input_pnm, output_pnm, tmpdir): + with _setup_unpaper_io(input_file) as (input_png, output_pnm, tmpdir): # To prevent any shenanigans from accepting arbitrary parameters in diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix index 14fc824f5c..7f34ff29fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix @@ -1,28 +1,47 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest-mock, pytestCheckHook -, pyyaml, pythonOlder, jre_minimal, antlr4-python3-runtime }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-mock +, pytestCheckHook +, pyyaml +, pythonOlder +, jre_minimal +, antlr4_9-python3-runtime +, pydevd }: buildPythonPackage rec { pname = "omegaconf"; - version = "2.1.1"; + version = "2.2.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "omry"; repo = pname; - rev = "v${version}"; - sha256 = "0hh6pk4q6nb94bz9rwa6cysf3nj50rmqkjh34pqkh28nzg44afjw"; + rev = "refs/tags/v${version}"; + hash = "sha256-bUJ80sa2ot2JSkt29eFwSiKL6R1X1+VVeE9dFIy4Mg0="; }; postPatch = '' substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"]' 'setup_requires=[]' ''; - checkInputs = [ pytestCheckHook pytest-mock ]; - nativeBuildInputs = [ jre_minimal ]; - propagatedBuildInputs = [ antlr4-python3-runtime pyyaml ]; + nativeBuildInputs = [ + jre_minimal + ]; - disabledTestPaths = [ "tests/test_pydev_resolver_plugin.py" ]; # needs pydevd - not in Nixpkgs + propagatedBuildInputs = [ + antlr4_9-python3-runtime + pyyaml + ]; + + checkInputs = [ + pydevd + pytestCheckHook + pytest-mock + ]; + + pythonImportsCheck = [ "omegaconf" ]; meta = with lib; { description = "A framework for configuring complex applications"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix index d8030a892a..b3f21afdad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onlykey-solo-python/default.nix @@ -13,13 +13,19 @@ buildPythonPackage rec { pname = "onlykey-solo-python"; - version = "0.0.28"; + version = "0.0.32"; + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Mbi5So2OgeXjg4Fzg7v2gAJuh1Y7ZCYu8Lrha/7PQfY="; + sha256 = "sha256-88DuhgX4FCwzIKzw4RqWgMtjRdf5huVlKEHAAEminuQ="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "fido2 == 0.9.3" "fido2" + ''; + patches = [ # https://github.com/trustcrypto/onlykey-solo-python/pull/2 (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix index 377521bb2f..d5db23bc2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.11.0"; + version = "1.12.0"; format = "setuptools"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-7KIkx8LI7kByoHQ+SJioSpvfgpe15ZEKJjLkxBgv+yo="; + sha256 = "sha256-E7PnfSdSO52/TzDfyclZRVhZ1eNOkhxE9xLWm4Np7/k="; }; nativeBuildInputs = [ @@ -47,8 +47,8 @@ buildPythonPackage rec { patchShebangs tools/protoc-gen-mypy.py substituteInPlace tools/protoc-gen-mypy.sh.in \ --replace "/bin/bash" "${bash}/bin/bash" - substituteInPlace setup.py \ - --replace "setup_requires.append('pytest-runner')" "" + + sed -i '/pytest-runner/d' setup.py ''; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix index 87fb5301d7..a95d63b830 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openai/default.nix @@ -4,10 +4,13 @@ , pythonOlder # Python dependencies +, numpy , openpyxl , pandas , pandas-stubs , requests +, scikit-learn +, tenacity , tqdm , wandb @@ -18,7 +21,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.20.0"; + version = "0.22.1"; disabled = pythonOlder "3.7.1"; @@ -27,14 +30,17 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-kG7gsLAOoBCt7pxViO1Zhil2FGHigPEMJfBjdIp2th8="; + sha256 = "sha256-QUnsm0ui1BFlLqAlH1bp7uDbhiRigePrAPAkSRjftM4="; }; propagatedBuildInputs = [ + numpy openpyxl pandas pandas-stubs requests + scikit-learn + tenacity tqdm wandb ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix index ced5f8ed68..c32b851901 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.2.3"; + version = "0.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; - rev = version; - sha256 = "sha256-rgl2B55dnbpZszr+gWM0FgeXMKfrkDG7HeZBSw5Eles="; + rev = "refs/tags/${version}"; + sha256 = "sha256-Ms00nR3dpJ0hGtHvVa5B29dasYtBP8igxrgMm0NiArc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix index 7ef70ab3d3..2edd464196 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,8 +1,19 @@ -{ lib, buildPythonPackage, isPy27, fetchPypi -, jsonschema, openapi-schema-validator, pyyaml, six, pathlib -, mock, pytest, pytest-cov, pytest-flake8, tox, setuptools +{ lib +, buildPythonPackage +, fetchFromGitHub , poetry-core + +# propagates +, jsonschema +, openapi-schema-validator +, pyyaml + +# optional , requests + +# tests +, mock +, pytestCheckHook }: buildPythonPackage rec { @@ -10,17 +21,52 @@ buildPythonPackage rec { version = "0.4.0"; format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-l/JYhQr8l7BI98JlOFXg+I+masEDwr5Qd8eWCsoq1Jo="; + # no tests via pypi sdist + src = fetchFromGitHub { + owner = "p1c2u"; + repo = pname; + rev = version; + hash = "sha256-mGgHlDZTUo72RNZ/448gkGdza4EntYU9YoBpSKDUCeA="; }; - nativeBuildInputs = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'openapi-schema-validator = "^0.2.0"' 'openapi-schema-validator = "*"' + ''; - propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools requests ] - ++ (lib.optionals (isPy27) [ pathlib ]); + nativeBuildInputs = [ + poetry-core + ]; - checkInputs = [ mock pytest pytest-cov pytest-flake8 tox ]; + propagatedBuildInputs = [ + jsonschema + openapi-schema-validator + pyyaml + ]; + + passthru.optional-dependencies.requests = [ + requests + ]; + + preCheck = '' + sed -i '/--cov/d' pyproject.toml + ''; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # network access + "test_default_valid" + "test_urllib_valid" + "test_valid" + ]; + + pythonImportsCheck = [ + "openapi_spec_validator" + "openapi_spec_validator.readers" + ]; meta = with lib; { homepage = "https://github.com/p1c2u/openapi-spec-validator"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix index 83401436bc..8afc16f86d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openpyxl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "3.0.9"; + version = "3.0.10"; disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - sha256 = "40f568b9829bf9e446acfffce30250ac1fa39035124d55fc024025c41481c90f"; + sha256 = "sha256-5HgFYnrrz4YO207feYexMJwbNjLzdQU47ZYrvMO9dEk="; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix index a813c1bf95..a30933e806 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/opensimplex/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "opensimplex"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "lmas"; repo = pname; rev = "v${version}"; - sha256 = "zljS0yu3cHF2Vz3rFkwLXiHnKjo970MDIrC/56FoHa4="; + sha256 = "C/MTKTHjxMsOgzuXvokw039Kv6N/PgBoOqKleWPLpw0="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix index 42541d9078..b04c1549b4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "deepmind"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-XAYztMBQpLBHNuNED/iodbwIMJSN/0GxdmTGQ5jD9Ws="; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix index 6dde9ededb..1236a24628 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "2.10.0"; + version = "2.10.1"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; - rev = "v${version}"; - sha256 = "0fha0pwxq6n3mbpvpz3vk8hh61zqncj5cnq063kzfl5d8rd48vcd"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-HHVEoLCZtEJEfc4xYobQrzRcDDxxeQjgL2Rw2KeVbi0="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix index d639f65672..831d24fc73 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix @@ -4,6 +4,7 @@ , rustPlatform , fetchFromGitHub , buildPythonPackage +, cffi , libiconv , numpy , psutil @@ -15,28 +16,30 @@ buildPythonPackage rec { pname = "orjson"; - version = "3.6.7"; + version = "3.7.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ijl"; repo = pname; rev = version; - sha256 = "1a55f1ipii7hg42bvsii053xczbgwwv8w6wgdb14qyirm5c9szd3"; + hash = "sha256-K/hLNzwwEeGN6S33Xkfh+ocDHmTmh6yZYcN4vxaAvoQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "1piy0b1gh56n8srzhyd1n971a6pqpgmwhr4v9a81wg0xkbva8gdk"; + hash = "sha256-kwZg1bC1O6XBI5HBgzahph/0k/RUKEkFIQMMuA1xe4w="; }; format = "pyproject"; - nativeBuildInputs = with rustPlatform; [ + nativeBuildInputs = [ + cffi + ] ++ (with rustPlatform; [ cargoSetupHook maturinBuildHook - ]; + ]); buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oscpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oscpy/default.nix index 07991a0fac..7b2be6ab77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oscpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oscpy/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, pytestCheckHook }: buildPythonPackage rec { pname = "oscpy"; @@ -11,6 +11,15 @@ buildPythonPackage rec { hash = "sha256-Luj36JLgU9xbBMydeobyf98U5zs5VwWQOPGV7TPXQwA="; }; + patches = [ + # Fix flaky tests with kivy/oscpy#67 - https://github.com/kivy/oscpy/pull/67 + (fetchpatch { + name = "improve-reliability-of-test_intercept_errors.patch"; + url = "https://github.com/kivy/oscpy/commit/2bc114a97692aef28f8b84d52d0d5a41554a7d93.patch"; + hash = "sha256-iT7cB3ChWD1o0Zx7//Czkk8TaU1oTU1pRQWvPeIpeWY="; + }) + ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "oscpy" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix index 90b49e5e77..3706a4577b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "oslo-concurrency"; - version = "4.5.1"; + version = "5.0.0"; src = fetchPypi { pname = "oslo.concurrency"; inherit version; - sha256 = "sha256-aGm5Rrk9lbq/IM0Wvgb8NaXsFNB+osHzFfSsbqXw2hc="; + sha256 = "sha256-n0aUbp+KcqBvFP49xBiaTT3TmGKDFSU5OjEZvbvniX4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix index f7e0969294..abdafc4481 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-config/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "8.8.0"; + version = "9.0.0"; src = fetchPypi { pname = "oslo.config"; inherit version; - sha256 = "sha256-lpM9MBHa4VYIoRYWv7ANlH4i2jywm2/zfd11dqvUdkw="; + sha256 = "sha256-O2tjxDzx4JNEuoULyxHW8rkgEIb76wqXqJUOfqw/JkU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix index c675848f38..7a393e69e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-db/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "oslo-db"; - version = "11.3.0"; + version = "12.0.0"; src = fetchPypi { pname = "oslo.db"; inherit version; - sha256 = "sha256-CSlZI05V8p+lCgjPcG6LZi4y2nVNrFhjI95TDM/WJnM="; + sha256 = "sha256-EFuxQWOk7GG85z+N8ZADLIdZiJuA8B1ZrsdwR+cN24c="; }; nativeBuildInputs = [ pbr ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix index e59258dda7..4b33bb06dc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-serialization/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "oslo-serialization"; - version = "4.3.0"; + version = "5.0.0"; src = fetchPypi { pname = "oslo.serialization"; inherit version; - sha256 = "sha256-OqRy9DSu6LvMByUxK39AmqH6VLvBNJBBJM9JsOhrkRU="; + sha256 = "sha256-KEUyjQ9H3Ioj/tKoIlPpCs/wqnMdvSTzec+OUObMZro="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix index 25bc4706f0..45e400856b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/oslo-utils/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "oslo-utils"; - version = "4.13.0"; + version = "6.0.0"; src = fetchPypi { pname = "oslo.utils"; inherit version; - sha256 = "sha256-RbqKql7QVqjo5GBZ75PVwte5yZvHSA42HPV4Pkfyj7o="; + sha256 = "sha256-CpLiTESWht7CgAlXZr4+uOV/EyXNpMbyEpVBVk5ei6g="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix index f03307ead1..0150f1f5a2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/outcome/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "outcome"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "e862f01d4e626e63e8f92c38d1f8d5546d3f9cce989263c521b2e7990d186967"; + sha256 = "sha256-b4K9PeRdowPPH3ceyvoWM3UKNYQ2qLtg4Goc63RdJnI="; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix index 07c6bfedbb..10e7580af6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/owslib/default.nix @@ -1,13 +1,19 @@ { lib, buildPythonPackage, fetchPypi, python-dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.25.0"; + version = "0.26.0"; src = fetchPypi { inherit pname version; - sha256 = "20d79bce0be10277caa36f3134826bd0065325df0301a55b2c8b1c338d8d8f0a"; + sha256 = "sha256-jEywYzjrZAXCrs7QttCFaCqmHw8uUo8ceI1o3FDflBs="; }; + # as now upstream https://github.com/geopython/OWSLib/pull/824 + postPatch = '' + substituteInPlace requirements.txt \ + --replace 'pyproj ' 'pyproj #' + ''; + buildInputs = [ pytest ]; propagatedBuildInputs = [ python-dateutil pyproj pytz requests pyyaml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix index 7a8bc9fd05..d1be6e639b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/p1monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "p1monitor"; - version = "1.1.0"; + version = "2.0.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "python-p1monitor"; - rev = "v${version}"; - hash = "sha256-X8by8qVcLEs5xrb4LjNeGomlmERAYYplo3Yqgh9lKrI="; + rev = "refs/tags/v${version}"; + hash = "sha256-0CPOK577tl86orjN9Xou8dPm425Yx1m8x6xfHaZEv10="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix index d02b5034b8..3caa8a5a5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packageurl-python/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.10.0"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-md8UOWC3EA//Oyz1sL66L2S22MgY9snxJa7W+sdDh2M="; + sha256 = "sha256-86VSrHQxFs154lz7uMqPk4sG+RyipS3rqA8GoqcBB0k="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix index b63baa80b3..f27b0130a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/packet-python/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "packet-python"; - version = "1.44.2"; + version = "1.44.3"; src = fetchPypi { inherit pname version; - sha256 = "4ce0827bc41d5bf5558284c18048344343f7c4c6e280b64bbe53fb51ab454892"; + sha256 = "sha256-WVfMELOoml7Hx78jy6TAwlFRLuSQu9dtsb6Khs6/cgI="; }; nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix index dad1d4499e..2c4f204783 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "pandas"; - version = "1.4.2"; + version = "1.4.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-krwfxYXxRjyoJ7RVNZV4FbfeshjFSbfBhALDIsdUmhI="; + sha256 = "sha256-L/d4hGjnWRdXTwgM1GgbJ+GnvzZGH+lotJqHtaVNAHw="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix index d117c8eb8d..b33f65bad5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "papis"; - version = "0.11.1"; + version = "0.12"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -40,8 +40,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "papis"; repo = pname; - rev = "v${version}"; - hash = "sha256-hlokGoXBhxkAMbqohztZEWlPBSSAUIAGuHtrF7iXcy0="; + rev = "refs/tags/v${version}"; + hash = "sha256-WKsU/5LXqXiFpWyTZGpvZn4lyANPosbvuhYH3opbBRs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parts/default.nix index 0b2d246056..ba54ce2e70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parts/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "parts"; - version = "1.4.0"; - format = "setuptools"; + version = "1.5.2"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Qs6+3dWG5sjSmeQiL/Q2evn5TImEX0Yk/nCIe5uIMp4="; + hash = "sha256-gOPDqXF05bQcG0Kv0+akBrikRr/CfHB9/tM/TJDPHdM="; }; # Project has no tests @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Python library for common list functions related to partitioning lists"; + description = "Library for common list functions related to partitioning lists"; homepage = "https://github.com/lapets/parts"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix index 144d5aad60..9c6dd62566 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pathos"; - version = "0.2.8"; + version = "0.2.9"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "uqfoundation"; repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-71hMaG+3FbWMtGqwcDOZ8uit0DsHEoc9H2GXfX7TeoM="; + rev = "refs/tags/pathos-${version}"; + sha256 = "sha256-39D+itH0nkOzmh3Rpg/HXLRj2F1UPsys+iU0ZiodkM0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix index 101c0c8e9d..f246528459 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pathvalidate/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pathvalidate"; - version = "2.5.0"; + version = "2.5.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "119ba36be7e9a405d704c7b7aea4b871c757c53c9adc0ed64f40be1ed8da2781"; + sha256 = "sha256-u8J+ZTM1q6eTWireIpliLnapSHvJAEzc8UQc6NL/SlQ="; }; # Requires `pytest-md-report`, causing infinite recursion. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix index 6dec8d2308..b9f8486aa5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -16,15 +16,15 @@ buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.16.3"; + version = "0.17.0"; - disabled = pythonOlder "3.7" || pythonAtLeast "3.10"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; rev = "v${version}"; - sha256 = "sha256-X21GQsyRZu1xdoTlD9DjceIWKpcuTLdIDf8UahntS3s="; + sha256 = "sha256-brC33ar2Jq3R2xdrklvVsQKf6pcnKwD25PO4TIvXgTg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix index 00cfea5cc9..d1a663dc87 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdfposter/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pdftools.pdfposter"; - version = "0.7.post1"; + version = "0.8"; propagatedBuildInputs = [ pypdf2 ]; src = fetchPypi { inherit pname version; - sha256 = "0c1avpbr9q53yzq5ar2x485rmp9d0l3z27aham32bg7gplzd7w0j"; + sha256 = "sha256-SYEn54kpO6KQ8ywpgu0+3uL+Ilr1hsfSornWrs2EBqQ="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix index 1b988b1f67..9cfe5a5e92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pdm-pep517"; - version = "0.12.5"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-z9FeVJhXkYa9wKGntu6p+YPnw6fdGip7CtItBdbcUJk="; + sha256 = "sha256-nVoqpYlvNzN1UJeUXsKnUc0Z7jOZMG4JlRQBSx5JrfE="; }; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index f9eebea5d3..89e7087273 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "3.2.0"; + version = "4.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cNbCGz/mXR7xrwdxmtD36v8ROCvLe5w1sD0M6aSrONE="; + hash = "sha256-B0t9kNl55VsPC8ZXP7/lRDJ0Hfm4uhSEMGX9To4fjAU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix index 65e1fdd0af..86fcd3948a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "peewee"; - version = "3.15.0"; + version = "3.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "coleifer"; repo = pname; - rev = version; - hash = "sha256-nmqq1RJzHZKp6f0RAxuUAejy04vsupV0IH8dHXM/WVw="; + rev = "refs/tags/${version}"; + hash = "sha256-2rxGOUCITEHuM83qhaKQGK4jSf4r8hcBAGxRImT/rhE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix index 9f11251ea8..f6268953fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "pelican"; - version = "4.7.2"; + version = "4.8.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "getpelican"; repo = pname; - rev = version; - hash = "sha256-ZBGzsyCtFt5uj9mpOpGdTzGJET0iwOAgDTy80P6anRU="; + rev = "refs/tags/${version}"; + hash = "sha256-T+XBRBfroG1gh9ZHU7V5wsgnI1xuNTXYAe6g5Xk8Qyg="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix index 8c386dde9a..248961d7f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pep8-naming/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pep8-naming"; - version = "0.13.0"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nzjm3Phnoft61H9f9ywN2uVEps9k6592ALezwLtZgLU="; + sha256 = "sha256-Ovd82qnHll98haVs1Xk1RVPJu9P98weKd28S21TdaUQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix index a2bb6baec9..1c8cdf4421 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix @@ -14,15 +14,15 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.10.1"; + version = "0.10.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-5qZolEJWjhqk1JakcGBWZ1hxeP1cLqcB7IZ3ufjOC/o="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-bu6eYQukhLE8sLkS3PbqTgXOqJFXJYXTcXAhmjaq48g="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix index 6859b6264a..17d210f400 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/persisting-theory/default.nix @@ -1,22 +1,26 @@ -{ lib, buildPythonPackage, fetchPypi -, nose +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook }: buildPythonPackage rec { pname = "persisting-theory"; - version = "0.2.1"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "02hcg7js23yjyw6gwxqzvyv2b1wfjrypk98cfxfgf7s8iz67vzq0"; + sha256 = "sha256-D4QPoiJHvKpRQJTafzsmxgI1lCmrEtLNiL4GtJozYpA="; }; - checkInputs = [ nose ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = "nosetests"; + pythonImportsCheck = [ "persisting_theory" ]; meta = with lib; { - homepage = "https://code.eliotberriot.com/eliotberriot/persisting-theory"; + homepage = "https://code.agate.blue/agate/persisting-theory"; description = "Automate data discovering and access inside a list of packages"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix index 7c0a236e62..b80f5058ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pescea/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pescea"; - version = "1.0.10"; + version = "1.0.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "lazdavila"; repo = pname; rev = "v${version}"; - sha256 = "Q38mLGjrRdXEvT+PCNsil1e2p0mmM0Xy8TUx9QOnFRA="; + sha256 = "sha256-yiBtvD7kCqR/F4yoJa5rIOekYy8+zlJh849Jv+HkA4M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix index 495af83848..1a1fa63ff4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.99"; + version = "2.1.103"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-P+r0JOSVwIVWkQROvsbpUocwB4x0HrVyy9oY9CdNj6s="; + hash = "sha256-B7zWM2Jrf9bRjrDWMDrP0KT7yzFpLnN7FXlGJtqJa/A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix index 70e5249331..bb369ffdc9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgcli/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , buildPythonPackage , fetchPypi -, isPy3k , cli-helpers , click , configobj @@ -29,6 +28,11 @@ buildPythonPackage rec { sha256 = "sha256-8DkwGH4n1g32WMqKBPtgHsXXR2xzXysVQsat7Fysj+I="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pgspecial>=1.13.1,<2.0.0" "pgspecial>=1.13.1" + ''; + propagatedBuildInputs = [ cli-helpers click @@ -57,6 +61,6 @@ buildPythonPackage rec { homepage = "https://pgcli.com"; changelog = "https://github.com/dbcli/pgcli/raw/v${version}/changelog.rst"; license = licenses.bsd3; - maintainers = with maintainers; [ dywedir ]; + maintainers = with maintainers; [ dywedir SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix index b3c5d12848..012eeb20eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pglast"; - version = "3.13"; + version = "3.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-H1IVoXBanNlmjUMhBHRbnBsbeK9LuruqXJaVgSgCFPo="; + hash = "sha256-geDH0Q5xp3Xz84f3ff4AeDMaDghrO8P504wwwi4jjhA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix index e7b4e62ab5..b2f28a189e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytestCheckHook -, psycopg2 +, psycopg , click , configobj , sqlparse @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.13.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1dq5ZpCQgnWRbcLGIu+uIX8ULggWX6NmlJ1By8VlhwE="; + sha256 = "sha256-ZEQ7vJrQm1fQ9Ny7OO/0TVKFO3QYyepS9YV6vhu1NOw="; }; propagatedBuildInputs = [ click sqlparse - psycopg2 + psycopg ]; checkInputs = [ @@ -35,7 +35,8 @@ buildPythonPackage rec { meta = with lib; { description = "Meta-commands handler for Postgres Database"; - homepage = "https://pypi.python.org/pypi/pgspecial"; + homepage = "https://github.com/dbcli/pgspecial"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix index 3d7d21bbb9..550a4fefd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix @@ -15,11 +15,11 @@ buildPythonApplication rec { pname = "phonemizer"; - version = "3.1.1"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PWVK0NLVa0Rx1xyUyQF2/RvUo3/geskn53FcEv0Jr0c="; + sha256 = "sha256-Bo+F+FqKmtxjijeHrqyvcaU+R1eLEtdzwJdDNQDNiSs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix index 3c45c602ae..06399b0b66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.13.1"; + version = "2.15.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-D7pBtcMbxMpt4XJVYDkslRDU4Uyk83AtbIIztUbji6A="; + sha256 = "sha256-iXvAXFtN1wKfasJAGt4FC04Q9Ntr4U2euA61YIdwLz0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix index 6af86d37af..c173e14804 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pick"; - version = "1.3.0"; + version = "1.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "wong2"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-McxgXg+nTQzCjTgKIC8VmlNIfTTMwDo+dGAGwocpIlM="; + sha256 = "sha256-y4wlYYDyhwnRjz9ItiDi2iCa/0F2RTB6Rstl8lmQ/3w="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix index 1c8cae9f04..a9791de651 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , gevent -, nose +, nose2 , mock , twisted , tornado @@ -10,33 +10,36 @@ buildPythonPackage rec { pname = "pika"; - version = "1.2.0"; + version = "1.3.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "pika"; repo = "pika"; - rev = version; - sha256 = "sha256-Wog6Wxa8V/zv/bBrFOigZi6KE5qRf82bf1GK2XwvpDI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-iWGqnDj8qhXUOTw8UNC7VHVBNyvMr4Kdk6NubX92KRI="; }; propagatedBuildInputs = [ gevent tornado twisted ]; - checkInputs = [ nose mock ]; + checkInputs = [ nose2 mock ]; postPatch = '' # don't stop at first test failure # don't run acceptance tests because they access the network # don't report test coverage - substituteInPlace setup.cfg \ + substituteInPlace nose2.cfg \ --replace "stop = 1" "stop = 0" \ --replace "tests=tests/unit,tests/acceptance" "tests=tests/unit" \ --replace "with-coverage = 1" "with-coverage = 0" ''; + doCheck = false; # tests require rabbitmq instance, unsure how to skip + checkPhase = '' runHook preCheck - PIKA_TEST_TLS=true nosetests + PIKA_TEST_TLS=true nose2 -v runHook postCheck ''; @@ -45,6 +48,6 @@ buildPythonPackage rec { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; homepage = "https://pika.readthedocs.org"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 07b2389039..886b1ffb82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "5.3.1"; + version = "5.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -39,7 +39,7 @@ buildPythonPackage rec { postFetch = '' rm "$out/.git_archival.txt" ''; - hash = "sha256-QYSI0oWuDw19EF8pwh3t1+VOY3Xe/AZxL1uARufg/nE="; + hash = "sha256-b4QUn+wfkk6Yx74ViBg6yaE1+bXtxidoyXYgBaJ9iiM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix index a061f53b6c..017069a7dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , buildPythonPackage , pythonOlder , fetchPypi @@ -13,24 +12,16 @@ import ./generic.nix (rec { pname = "pillow"; - version = "9.1.1"; + version = "9.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "Pillow"; inherit version; - sha256 = "sha256-dQJTmTm1PXVl89Edh8eOfskA08cpRdTuDi8lDVmDCaA="; + sha256 = "sha256-deY2/T4PuHJpPyPMuKX/LNV4gBJR86T2hUxqXUN9PAQ="; }; - patches = [ - # Fix failing test with libtiff 4.4.0 - (fetchpatch { - url = "https://github.com/python-pillow/Pillow/commit/40a918d274182b7d7c063d7797fb77d967982c4a.patch"; - sha256 = "sha256-f8m3Xt3V3pHggK1JEc2tnPmrTVPFjfV4YJqwE1KM1pA="; - }) - ]; - passthru.tests = { inherit imageio matplotlib pilkit pydicom reportlab; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix index c5a9148f0e..b4e68c1909 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pint/default.nix @@ -15,22 +15,21 @@ buildPythonPackage rec { pname = "pint"; - version = "0.18"; + version = "0.19.2"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit version; pname = "Pint"; - sha256 = "sha256-jEvOiEwmkFH+t6vGnb/RhAPAx2SryD2hMuinIi+LqAE="; + sha256 = "sha256-4dSYn/UQs3ja1k+RcR572r5cp411sGoYVprEVGeMS68="; }; - disabled = pythonOlder "3.6"; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - # Test suite explicitly requires pytest checkInputs = [ pytestCheckHook pytest-subtests @@ -38,13 +37,17 @@ buildPythonPackage rec { matplotlib uncertainties ]; + dontUseSetuptoolsCheck = true; + preCheck = '' + export HOME=$(mktemp -d) + ''; + meta = with lib; { description = "Physical quantities module"; license = licenses.bsd3; homepage = "https://github.com/hgrecco/pint/"; maintainers = with maintainers; [ costrouc doronbehar ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-api/default.nix index 5e4412dcf8..fe7cc3ef71 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pip-api"; - version = "0.0.29"; + version = "0.0.30"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9wFYTrHD4BAhyEb4nWKauTc7ZiTwYmdXd0rVT8TClXE="; + hash = "sha256-oF3yx6qbcVc3S89Cc1RCAaDHuuYKnGW8+E85We84lvM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix index 41e4edbb6b..84521397a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildPythonPackage +, build , click , fetchPypi , pep517 @@ -15,21 +16,24 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "6.6.2"; + version = "6.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9jhQOp932Y2afXJYSxUI0/gu0Bm4+rJPTlrQeMG4yV4="; + hash = "sha256-Oeiu5GVEbgInjYDb69QyXR3YYzJI9DITxzol9Y59ilU="; }; + patches = [ ./fix-setup-py-bad-syntax-detection.patch ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ + build click pep517 pip @@ -51,6 +55,7 @@ buildPythonPackage rec { # Tests require network access "network" "test_direct_reference_with_extras" + "test_local_duplicate_subdependency_combined" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/fix-setup-py-bad-syntax-detection.patch b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/fix-setup-py-bad-syntax-detection.patch new file mode 100644 index 0000000000..6a88222139 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pip-tools/fix-setup-py-bad-syntax-detection.patch @@ -0,0 +1,21 @@ +diff --color -ru a/piptools/scripts/compile.py b/piptools/scripts/compile.py +--- a/piptools/scripts/compile.py 2022-06-30 11:24:26.000000000 +0200 ++++ b/piptools/scripts/compile.py 2022-08-01 13:40:58.392515765 +0200 +@@ -6,7 +6,7 @@ + from typing import IO, Any, BinaryIO, List, Optional, Tuple, Union, cast + + import click +-from build import BuildBackendException ++from build import BuildException + from build.util import project_wheel_metadata + from click.utils import LazyFile, safecall + from pip._internal.commands import create_command +@@ -421,7 +421,7 @@ + metadata = project_wheel_metadata( + os.path.dirname(os.path.abspath(src_file)) + ) +- except BuildBackendException as e: ++ except (BuildException,StopIteration) as e: + log.error(str(e)) + log.error(f"Failed to parse {os.path.abspath(src_file)}") + sys.exit(2) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix index 3f461b15a3..955b2d8a7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix @@ -2,16 +2,19 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, hatchling , userpath , argcomplete , packaging , importlib-metadata +, pip , pytestCheckHook }: buildPythonPackage rec { pname = "pipx"; - version = "1.0.0"; + version = "1.1.0"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -19,10 +22,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pipxproject"; repo = pname; - rev = version; - sha256 = "1sgfrlhci2m83k436dfwfmqjpb8hij6yypm03pm3n8drmr2aaa4s"; + rev = "refs/tags/${version}"; + sha256 = "sha256-6cKKVOgHIoKNfGqvDWK5cwBGBDkgfyRuBRDV6fruBoA="; }; + nativeBuildInputs = [ + hatchling + ]; + propagatedBuildInputs = [ userpath argcomplete @@ -31,7 +38,9 @@ buildPythonPackage rec { importlib-metadata ]; - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + pytestCheckHook + ]; preCheck = '' export HOME=$(mktemp -d) @@ -61,6 +70,7 @@ buildPythonPackage rec { "legacy_venv" "determination" "json" + "test_list_short" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix index 092bcbfcfd..44d6094f46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pivy/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pivy"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "coin3d"; repo = "pivy"; - rev = version; - sha256 = "1xlynrbq22pb252r37r80b3myzap8hzhvknz4zfznfrsg9ykh8k2"; + rev = "refs/tags/${version}"; + hash = "sha256-mU3QRDJd56gGDWqwcxAN3yUCkAkABP/I9gIBMH2MOXA="; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix index 21659f638a..b3f4f1d450 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.8.2"; + version = "1.8.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-VC4NC2dQ4uIcIBeYA+QKtQWY2AZtUQl6Djgsup6wK/8="; + sha256 = "sha256-qE2kMY3Yb4cKlEeoyYNAqgYha/xvK3vcS4dmmErhhnw="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix index 44247bfdcc..0f45036030 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "9.7.0"; + version = "9.9.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yNjrWjlTF7cfEpFbPP6b/L6foNuhNa6JFNv6ImbAZ5k="; + hash = "sha256-uvozG1l+aGDs4nzOOjKUPScLLMNVop5u2Y89se8GvtY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix new file mode 100644 index 0000000000..b33f43ef93 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -0,0 +1,65 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, plantuml +, markdown +, requests +, six +, runCommand +, writeText +, plantuml-markdown +}: +let + pname = "plantuml-markdown"; + version = "3.6.2"; +in +buildPythonPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "mikitex70"; + repo = pname; + rev = version; + sha256 = "sha256-IADKU4EQHLLH5uD5iBAUiumFp5nyTNGt1LWoWdfbvJM="; + }; + + propagatedBuildInputs = [ + plantuml + markdown + requests + six + ]; + + # The package uses a custom script that downloads a certain version of plantuml for testing. + doCheck = false; + + pythonImportsCheck = [ "plantuml_markdown" ]; + + passthru.tests.example-doc = + let + exampleDoc = writeText "plantuml-markdown-example-doc.md" '' + ```plantuml + Bob -> Alice: Hello + ``` + ''; + in + runCommand "plantuml-markdown-example-doc" + { + nativeBuildInputs = [ plantuml-markdown ]; + } '' + markdown_py -x plantuml_markdown ${exampleDoc} > $out + + ! grep -q "Error" $out + ''; + + meta = with lib; { + description = "PlantUML plugin for Python-Markdown"; + longDescription = '' + This plugin implements a block extension which can be used to specify a PlantUML + diagram which will be converted into an image and inserted in the document. + ''; + homepage = "https://github.com/mikitex70/plantuml-markdown"; + license = licenses.bsd2; + maintainers = with maintainers; [ nikstur ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plantuml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plantuml/default.nix new file mode 100644 index 0000000000..f887453bd6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/plantuml/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib + # Runtime dependencies +, httplib2 +, six +}: + +buildPythonPackage { + pname = "plantuml"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "dougn"; + repo = "python-plantuml"; + rev = "93e1aac25b17d896b0d05d0a1aa352c7bd11dd31"; + sha256 = "sha256-aPXPqoKlu8VLi0Jn84brG7v3qM9L18Ut4sabYYGb3qQ="; + }; + + propagatedBuildInputs = [ + httplib2 + six + ]; + + # Project does not contain a test suite + doCheck = false; + + pythonImportsCheck = [ "plantuml" ]; + + meta = with lib; { + description = "Python interface to a plantuml web service instead of having to run java locally"; + homepage = "https://github.com/dougn/python-plantuml"; + license = licenses.bsd2; + maintainers = with maintainers; [ nikstur ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix index fcbb4925fc..45fd001dd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plexapi/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "plexapi"; - version = "4.11.2"; + version = "4.12.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; - rev = version; - sha256 = "sha256-N4ic1DDMAHnHYYoD59ZHFqlgLlvFZV8Nn7V47NDXE5U="; + rev = "refs/tags/${version}"; + sha256 = "sha256-OzHykLpcy+ZA3jfzrDwmCoNb4JhvdHYJErzfWn+zjqo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix index fc24a4c2e6..79c7784e23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "5.6.0"; + version = "5.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-2G5E69449HU9/5gqubXgPPhyqrj99TpAPpme03gVQzE="; + sha256 = "sha256-sFNucrvAs88WmsH9AHWdd6rnuxKuN4zcdcXcNi9d5XY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix index 8ebfd659b4..9e2a3a642a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.20.1"; + version = "0.21.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Sk7L0JPwn7IXVl5GeERxrG/vrHXeNwUjW1mgm4g40Ng="; + sha256 = "sha256-vWPKlI1dRj2bN36SnkkjibACPkCqjlQn2Dq9+usgOhc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix index 5b1e1a5ecb..dd9dbc114b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/polars/default.nix @@ -49,7 +49,36 @@ buildPythonPackage { # ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + # Adding cmake to nativeBuildInputs and using `dontUseCmakeConfigure = true;` + # The following error still happens + + # Compiling arrow2 v0.10.1 (https://github.com/ritchie46/arrow2?branch=polars#da703ae3) + # error[E0554]: `#![feature]` may not be used on the stable release channel + # --> /build/polars-0.13.19-vendor.tar.gz/arrow2/src/lib.rs:8:39 + # | + # 8 | #![cfg_attr(feature = "simd", feature(portable_simd))] + # | ^^^^^^^^^^^^^ + # error: aborting due to previous error + # For more information about this error, try `rustc --explain E0554`. + # error: could not compile `arrow2` due to 2 previous errors + # warning: build failed, waiting for other jobs to finish... + # maturin failed + # Caused by: Failed to build a native library through cargo + # Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s` + # error: builder for '/nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv' failed with exit code 1; + # last 10 log lines: + # > error: aborting due to previous error + # > + # > + # > For more information about this error, try `rustc --explain E0554`. + # > + # > error: could not compile `arrow2` due to 2 previous errors + # > warning: build failed, waiting for other jobs to finish... + # > maturin failed + # > Caused by: Failed to build a native library through cargo + # > Caused by: Cargo build finished with "exit status: 101": `cargo rustc --message-format json --manifest-path Cargo.toml -j 8 --frozen --target x86_64-unknown-linux-gnu --release --lib -- -C link-arg=-s` + # For full logs, run 'nix log /nix/store/qfnqi5hs3x4xdb6d4f6rpaf63n1w74yn-python3.10-polars-0.13.19.drv'. + broken = true; description = "Fast multi-threaded DataFrame library in Rust | Python | Node.js "; homepage = "https://github.com/pola-rs/polars"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix index 13308ef1c9..edb30132c3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/policy-sentry/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "policy-sentry"; - version = "0.12.3"; + version = "0.12.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "salesforce"; repo = "policy_sentry"; - rev = version; - sha256 = "sha256-LaSSjqa5BniwOIeCH/oR8vVhy2rCSo2je3rTqB4ifLg="; + rev = "refs/tags/${version}"; + sha256 = "sha256-eAydoWalAuhiZs06vU/D1JndxKBZZBsWqEFFbAvvfzA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix index cd7d6d03bb..2d57952de3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "2.4.0"; + version = "2.5.1"; pname = "portalocker"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pkitdhuOonNwy1kVNQEizYB7gg0hk+1cnMKPFj32N/Q="; + sha256 = "sha256-ro6cwmYNoEv0H6Gg7vfjALteSlhprfsabYVRYytVmys="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix index a0ff0f8549..b88bccfc53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "portpicker"; - version = "1.5.0"; + version = "1.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4TsUgAit6yeTz4tVvNIP3OxPdj8tO/PEX15eXR330ig="; + hash = "sha256-xVaDrXJfXACkG8fbAiUiPovgJLH6Vk0DntM5Dk/Uj7M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix index 2d60274681..9396a170ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/potentials/default.nix @@ -20,7 +20,7 @@ }: buildPythonPackage rec { - version = "0.3.3"; + version = "0.3.4"; pname = "potentials"; format = "setuptools"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-kj2RDls5ziCH+AF982h8TplZccwdcna3BQMoBXAbOHE="; + hash = "sha256-yBqU1FN2KlWE2Stg9OMdBLUfIQdbUGWCH4GU6r6HkDI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix index 292c44cf58..de97627f6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/powerline/default.nix @@ -13,14 +13,14 @@ # TODO: bzr support is missing because nixpkgs switched to `breezy` buildPythonPackage rec { - version = "2.8.2"; + version = "2.8.3"; pname = "powerline"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-6V8ozl5KJQvytfflBmKJlIZQ5m3hkpCzMBtWZ2SzcQ0="; + rev = "refs/tags/${version}"; + sha256 = "sha256-UIx9/IZg6Wv596wHzQb0CO6zwmQXUaFEPKBojo2LXmA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix index 26cfada429..cefa136100 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prance/default.nix @@ -14,6 +14,7 @@ buildPythonPackage rec { pname = "prance"; version = "0.21.8.0"; + format = "pyproject"; src = fetchFromGitHub { owner = "RonnyPfannschmidt"; @@ -23,6 +24,12 @@ buildPythonPackage rec { sha256 = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" \ + --replace "chardet>=3.0,<5.0" "chardet" + ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ @@ -42,11 +49,6 @@ buildPythonPackage rec { openapi-spec-validator ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" - ''; - # Disable tests that require network disabledTestPaths = [ "tests/test_convert.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix index 9508cd0e43..4a679a4031 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prayer-times-calculator/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "prayer-times-calculator"; - version = "0.0.5"; + version = "0.0.6"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "uchagani"; repo = pname; - rev = version; - sha256 = "sha256-wm1r0MK6dx0cJvyQ7ulxvGWyIrNiPV2RXJD/IuKP3+E="; + rev = "refs/tags/${version}"; + sha256 = "sha256-0hXbgzEKrWk79Ldd37fqnkOELa+dAGtc80RQfDZ1JTI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix index 7c4afe4a72..21e7a455da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "3.2.0"; + version = "3.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rn2WxkEAVD3GFmK0CijzsDwPlKUD7RIcb8ongsWBb4E="; + sha256 = "sha256-EY61T9J5QEm4EIk2U7IJUjSd9tO8F2Tn+s2KGAZPqbA="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix index be90726e18..f87558e519 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "prompt-toolkit"; - version = "3.0.28"; + version = "3.0.30"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "prompt_toolkit"; inherit version; - sha256 = "sha256-nxzRax6GwpaPJRnX+zHdnWaZFvUVYSwmnRTp7VK1FlA="; + sha256 = "sha256-hZsoPFC95F9fl4Kfd6RnTRwfzYhTk2Txsoo3gFz9icA="; }; propagatedBuildInputs = [ @@ -30,6 +30,8 @@ buildPythonPackage rec { ]; disabledTests = [ + # tests/test_completion.py:206: AssertionError + # https://github.com/prompt-toolkit/python-prompt-toolkit/issues/1657 "test_pathcompleter_can_expanduser" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix index 2d6ad894fa..c86ffd5bde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix @@ -14,19 +14,21 @@ , ncurses , networkmanager , pkgs-systemd +, python , xdg-utils +, makeWrapper }: buildPythonPackage rec { pname = "protonvpn-nm-lib"; - version = "3.10.0"; + version = "3.11.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ProtonVPN"; repo = pname; rev = version; - sha256 = "sha256-WVIQ43J01BQzYhEPDHcoAmUvlsaDw0Z7yLQGajVdedU="; + sha256 = "sha256-kfOLhM0/jzHj+KlDrnCe571Bcmv8TvuAbXMpt3uR2L0="; }; propagatedBuildInputs = [ @@ -51,6 +53,17 @@ buildPythonPackage rec { }) ]; + postPatch = '' + substituteInPlace protonvpn_nm_lib/core/dbus/dbus_reconnect.py \ + --replace "exec_start = python_interpreter_path + \" \" + python_service_path" "exec_start = \"$out/bin/protonvpn_reconnector.py\"" + ''; + + postInstall = '' + makeWrapper ${python.interpreter} $out/bin/protonvpn_reconnector.py \ + --add-flags $out/${python.sitePackages}/protonvpn_nm_lib/daemon/dbus_daemon_reconnector.py \ + --prefix PYTHONPATH : "$PYTHONPATH" + ''; + # Checks cannot be run in the sandbox # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory" doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix index c5daba1958..bea7081298 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proxy-py/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "proxy-py"; - version = "2.4.0"; + version = "2.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "abhinavsingh"; repo = "proxy.py"; - rev = "v${version}"; - sha256 = "sha256-VagX7ATVu6AT4POWoG9btizxFeBh9MLXiLpavtfXnyM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-dA7a9RicBFCSf6IoGX/CdvI8x/xMOFfNtyuvFn9YmHI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix index a642d6ba10..ae5c3e0ab1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psd-tools/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psd-tools"; - version = "1.9.18"; + version = "1.9.21"; src = fetchPypi { inherit pname version; - sha256 = "d7e510790512f0bb8150c508531c8681c3d9d0ea63b3ba9b11bbf0952cbd69a8"; + sha256 = "sha256-BlfJnC03W0BEOr2Nav0Tj0fzjwAVlTPjyN0KmxxQMVI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix new file mode 100644 index 0000000000..23e0f0bc0f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg/default.nix @@ -0,0 +1,136 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchurl +, pythonOlder +, substituteAll + +# links (libpq) +, postgresql + +# propagates +, backports-zoneinfo +, typing-extensions + +# docs +, furo +, shapely +, sphinxHook +, sphinx-autodoc-typehints + +# tests +, pproxy +, pytest-asyncio +, pytest-randomly +, pytestCheckHook +}: + +let + pname = "psycopg"; + version = "3.0.16"; +in + +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "psycopg"; + repo = pname; + rev = version; + hash = "sha256-jKhpmCcDi7FyMSpn51eSukFvmu3yacNovmRYG9jnu3g="; + }; + + outputs = [ + "out" + "doc" + ]; + + sphinxRoot = "../docs"; + + # Introduce this file necessary for the docs build via environment var + LIBPQ_DOCS_FILE = fetchurl { + url = "https://raw.githubusercontent.com/postgres/postgres/REL_14_STABLE/doc/src/sgml/libpq.sgml"; + hash = "sha256-yn09fR9+7zQni8SvTG7BUmYRD7MK7u2arVAznWz2oAw="; + }; + + patches = [ + (substituteAll { + src = ./libpq.patch; + libpq = "${postgresql.lib}/lib/libpq.so"; + }) + ]; + + # only move to sourceRoot after patching, makes patching easier + postPatch = '' + cd ${pname} + ''; + + nativeBuildInputs = [ + furo + shapely + sphinxHook + sphinx-autodoc-typehints + ]; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ + typing-extensions + ] ++ lib.optionals (pythonOlder "3.9") [ + backports-zoneinfo + ]; + + pythonImportsCheck = [ + "psycopg" + ]; + + passthru.optional-dependencies = { + # TODO: package remaining variants + #c = [ psycopg-c ]; + #pool = [ psycopg-pool ]; + }; + + preCheck = '' + cd .. + ''; + + checkInputs = [ + pproxy + pytest-asyncio + pytest-randomly + pytestCheckHook + postgresql + ]; + + disabledTests = [ + # linters shouldn't be run in checks + "test_version" + ]; + + disabledTestPaths = [ + # TODO: requires the pooled variant + "tests/pool/" + # Network access + "tests/test_dns.py" + "tests/test_dns_srv.py" + # Mypy typing test + "tests/test_typing.py" + ]; + + pytestFlagsArray = [ + "-o cache_dir=$TMPDIR" + ]; + + postCheck = '' + cd ${pname} + ''; + + meta = with lib; { + changelog = "https://github.com/psycopg/psycopg/blob/master/docs/news.rst"; + description = "PostgreSQL database adapter for Python"; + homepage = "https://github.com/psycopg/psycopg"; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psycopg/libpq.patch b/third_party/nixpkgs/pkgs/development/python-modules/psycopg/libpq.patch new file mode 100644 index 0000000000..51271c3021 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg/libpq.patch @@ -0,0 +1,22 @@ +diff --git a/psycopg/psycopg/pq/_pq_ctypes.py b/psycopg/psycopg/pq/_pq_ctypes.py +index bf04d560..9e79fc3f 100644 +--- a/psycopg/psycopg/pq/_pq_ctypes.py ++++ b/psycopg/psycopg/pq/_pq_ctypes.py +@@ -13,16 +13,7 @@ from typing import List, Optional, Tuple + + from ..errors import NotSupportedError + +-if sys.platform == "win32": +- libname = ctypes.util.find_library("libpq.dll") +-elif sys.platform == "darwin": +- libname = ctypes.util.find_library("libpq.dylib") +-else: +- libname = ctypes.util.find_library("pq") +-if not libname: +- raise ImportError("libpq library not found") +- +-pq = ctypes.cdll.LoadLibrary(libname) ++pq = ctypes.cdll.LoadLibrary("@libpq@") + + # Get the libpq version to define what functions are available. + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix index 4e05dd51b0..00b3b94066 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/psygnal/default.nix @@ -13,12 +13,12 @@ }: buildPythonPackage rec { pname = "psygnal"; - version = "0.3.3"; + version = "0.3.5"; src = fetchFromGitHub { owner = "tlambert03"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-BQmcA1gD2i4sxROH+a7gStcNK1mXYVerIZ2y6gn8vI8="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-8X6d0KZ61Uy5B68zuxtaimwnDSldWsVrL19iROS4X78="; }; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ typing-extensions ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index f650ad955b..80db92ca6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.4.1"; + version = "6.5.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-NpGhZrfUXKpz520l1S+cCfTrI2T/7XlO0Kk1e+XR8Ew="; + hash = "sha256-+x58aEvemav0Pz2jeICLFG36FTtZCu5dk/arb+j5nmo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix index 406d81e15b..c135b0b5cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pudb"; - version = "2022.1.1"; + version = "2022.1.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-2zvdZkI8nSkHTBwsSfyyJL0Nbwgxn+0bTn6taDkUCD8="; + hash = "sha256-a4OrgFvdtTcQEJaQoiN+mL+DwLOgADPFF8319qj6Rw0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-tree-sitter/default.nix new file mode 100644 index 0000000000..9d7b829869 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-tree-sitter/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, buildPythonPackage, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "py-tree-sitter"; + version = "unstable-2022-02-08"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "py-tree-sitter"; + rev = "9c8261d36e55d9e4a6543dc9e570bfd7911ed7bf"; + sha256 = "sha256-YDe9m85LIPNumo9mrhMMotUspq/8B3t5kt2ScMJI+hY="; + fetchSubmodules = true; + }; + + pythonImportsCheck = [ "tree_sitter" ]; + + meta = with lib; { + homepage = "https://github.com/tree-sitter/py-tree-sitter"; + description = "Python bindings for tree-sitter"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix index 73bdc12586..626de02595 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.43"; + version = "3.45"; src = fetchPypi { inherit pname version; - sha256 = "sha256-H37Jcd7wZmDiCn7fk0SmlWYj46D3w/B9BdsEwqgEBjw="; + sha256 = "sha256-ksZM2PaeYhluq4nyw6MTFjSb/fQNJha7BRc8/U/7zwg="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix index c4db96bca7..3721bf1d80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pyairvisual"; - version = "2021.10.0"; + version = "2022.07.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-Wj+ReRTYsP/XMrr74XPHrkHYT0sXfqcW/shbG3zNuH0="; + sha256 = "sha256-UzcKK0LJ/Xp5iVWsrDQ3nfhWgKAAxKmXrK1zPSoG/gY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix new file mode 100644 index 0000000000..0150e0cc9b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyarr/default.nix @@ -0,0 +1,30 @@ +{ lib +, fetchPypi +, buildPythonPackage +, types-requests +, requests +}: + +buildPythonPackage rec { + pname = "pyarr"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-3DX02V3Srpx6hqimWbesxfkDqslVH4+8uXY7XYDmjX0="; + }; + + propagatedBuildInputs = [ + requests + types-requests + ]; + + pythonImportsCheck = [ "pyarr" ]; + + meta = with lib; { + description = "Python client for Servarr API's (Sonarr, Radarr, Readarr, Lidarr)"; + homepage = "https://github.com/totaldebug/pyarr"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix index 53dde0cd0f..bdd907176f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyarrow/default.nix @@ -79,6 +79,8 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; + __darwinAllowLocalNetworking = true; + preBuild = '' export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; @@ -111,8 +113,10 @@ buildPythonPackage rec { preCheck = '' shopt -s extglob - rm -r pyarrow/!(tests) - '' + lib.optionalString stdenv.isDarwin '' + rm -r pyarrow/!(conftest.py|tests) + mv pyarrow/conftest.py pyarrow/tests/parent_conftest.py + substituteInPlace pyarrow/tests/conftest.py --replace ..conftest .parent_conftest + '' + lib.optionalString stdenv.isDarwin '' # OSError: [Errno 24] Too many open files ulimit -n 1024 ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix index 78a75817be..7863718d4f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pyathena"; - version = "2.9.1"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyAthena"; inherit version; - hash = "sha256-b1JdJhSe4ezKN4afZexwc/YT7OM9nIXHK7ca6nYRGnY="; + hash = "sha256-tt7Idp2MuR7DpXDUwtzqmMhQROb3018m/GxeSJia1j4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index 9d75c2b01d..25d61641f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -2,7 +2,6 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, freezegun , oauthlib , pytest-asyncio , pytest-mock @@ -12,20 +11,21 @@ , requests-oauthlib , requests-mock , setuptools-scm +, time-machine }: buildPythonPackage rec { pname = "pyatmo"; - version = "6.2.4"; - format = "setuptools"; + version = "7.0.1"; + format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jabesq"; repo = "pyatmo"; - rev = "v${version}"; - sha256 = "sha256-VXkQByaNA02fwBO2yuf7w1ZF/oJwd/h21de1EQlCu2U="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-WrpRLAfViudC0n7AG5es2CM8XbZ0yJqXCY9yod9czb0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -42,11 +42,11 @@ buildPythonPackage rec { ]; checkInputs = [ - freezegun pytest-asyncio pytest-mock pytestCheckHook requests-mock + time-machine ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix index 9454755f5c..644c346e4b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatv/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.10.2"; + version = "0.10.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "sha256-70bimFWsby2x8wBRH5CZgg9Xjw8n+xfhW07rOG9Pk0s="; + sha256 = "sha256-ng5KfW93p2/N2a6lnGbRJC6aWOQgTl0imBLdUIUlDic="; }; postPatch = '' @@ -65,6 +65,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + disabledTestPaths = [ # Test doesn't work in the sandbox "tests/protocols/companion/test_companion_auth.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix index e937b8759f..82f2b685d2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaudio/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "PyAudio"; - version = "0.2.11"; + version = "0.2.12"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "93bfde30e0b64e63a46f2fd77e85c41fd51182a4a3413d9edfaf9ffaa26efb74"; + sha256 = "sha256-Vd3123K8U3u6X128o6ufAiLuW4Qr2oOXjqsLe49g+54="; }; buildInputs = [ pkgs.portaudio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix index 4640be0c43..bddb9fb522 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix @@ -14,12 +14,12 @@ }: buildPythonPackage rec { - version = "0.15.0"; + version = "0.15.1"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Eq+4x7h1uR5QHXfgCEZl+7usc9CBFQClvV36Yyrqbd0="; + sha256 = "sha256-AlNQegTb/qQ+sfdaH3GqsEviEHa/6WwASIgAC4AuOPI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix index 85edbdb29b..d58dd9b333 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.20.1"; + version = "1.21.0"; disabled = pythonOlder "3.6"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pygobject"; repo = "pycairo"; - rev = "v${version}"; - sha256 = "09aisph7ycgb4xi2xglvrn59i3cyqms8jbb876cl9763g7yqbcr6"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cwkGN5O15DduCLkFWeh8DPO4lY64iIlCQaUsCBKB8Mw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix index d13a141e7e..91722ee89b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycep-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pycep-parser"; - version = "0.3.7"; + version = "0.3.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "gruebel"; repo = "pycep"; rev = "refs/tags/${version}"; - hash = "sha256-5XivzmwcJi+DrrskM0u3XBXtC5j0pjXbWHI+8mciMXM="; + hash = "sha256-y6npvFh6/QykOAKK8ihTHDcv5dFd4lLU64UXPIhBELA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix index ff050c15bf..f0399d751c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycognito/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pycognito"; - version = "2022.02.1"; + version = "2022.05.0"; disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; - rev = version; - sha256 = "sha256-0PqeZ8yy2MzvIi1xQNosR7V2Ma3tMT0Q/v4OIv7f1Kg="; + rev = "refs/tags/${version}"; + sha256 = "sha256-KPZcfTFZCPV/3tQHOGA99uAyYPkvusCwZrefKwEMAOo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix index 1c443712db..c0ea080396 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix @@ -24,11 +24,11 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2021.1"; + version = "2022.1"; src = fetchPypi { inherit pname version; - sha256 = "ab87312d0fc349d9c17294a087bb9615cffcf966ad7b115f5b051008a48dd6ed"; + sha256 = "sha256-rNkDDZPnbmCxIuM60WvPAbsTRPTDBN7f8c0r/7DzE6M="; }; preConfigure = with lib.versions; '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix index 6cefc75fe0..1134422e6e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydal/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pydal"; - version = "20220609.1"; + version = "20220807.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-c9cWdQ+V1Phw1cfe5MUif2edXIrFQaDZC9qGBDevedI="; + sha256 = "sha256-pIdDovZmKzqOB/4FKnivHQ5/YKuyj1Kq+30ZkHn33Wc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix index 19396b8ee5..f9993850f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.9.0"; + version = "1.9.1"; outputs = [ "out" @@ -40,8 +40,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-C4WP8tiMRFmkDkQRrvP3yOSM2zN8pHJmX9cdANIckpM="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-jqTtNJQ9lRkxDYGG4vg91qH1jrxRU9orEeUofO+bBpA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix index 7800f3e259..08e7fe72ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydash/default.nix @@ -6,7 +6,7 @@ , mock , pytestCheckHook , pythonOlder -, sphinx_rtd_theme +, sphinx-rtd-theme }: buildPythonPackage rec { @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ invoke mock - sphinx_rtd_theme + sphinx-rtd-theme pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix index a19eacc1c1..4305b8aa67 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydata-sphinx-theme"; - version = "0.8.1"; + version = "0.9.0"; format = "wheel"; @@ -21,7 +21,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "pydata_sphinx_theme"; - sha256 = "af2c99cb0b43d95247b1563860942ba75d7f1596360594fce510caaf8c4fcc16"; + sha256 = "sha256-sitEKm1kN+Xq8KHwVxaf/LMeqp8Qvn1UgaEl5zXHHBI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix index aa3a41e2f8..f9a3e7f5cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix @@ -11,6 +11,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ pygobject3 ]; + pythonImportsCheck = [ "pydbus" ]; + meta = { homepage = "https://github.com/LEW21/pydbus"; description = "Pythonic DBus library"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix index a61e45d2c4..45d69f53b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeconz"; - version = "98"; + version = "103"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Kane610"; repo = "deconz"; rev = "refs/tags/v${version}"; - hash = "sha256-hCJRoyDWDxrBrxs2g6mVh7MOe6UMd+S8+ftfWyzWgH8="; + hash = "sha256-nxM9airO1/CF4g9CeyV2WMxh22fBtu0fjz1R3X1zm+o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix index cc2b726a64..3325155b94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydeps/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.10.18"; + version = "1.10.22"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = pname; rev = "v${version}"; - hash = "sha256-AKpaGXUaKCVk1C8GqtWayZEU2xbz3eqbUenjZCtsAUY="; + hash = "sha256-PA+TpPAuzyAQSlD08ZgmZAKgVEGoIUw/zq4QdTmU8HE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix new file mode 100644 index 0000000000..11ada4189d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydevd/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, pytestCheckHook +, untangle +, psutil +, trio +, numpy +}: + +buildPythonPackage rec { + pname = "pydevd"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "fabioz"; + repo = "PyDev.Debugger"; + rev = "pydev_debugger_${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "sha256-+yRngN10654trB09ZZa8QQsTPdM7VxVj7r6jh7OcgAA="; + }; + + checkInputs = [ + numpy + psutil + pytestCheckHook + trio + untangle + ]; + + disabledTests = [ + # Require network connection + "test_completion_sockets_and_messages" + "test_path_translation" + "test_attach_to_pid_no_threads" + "test_attach_to_pid_halted" + "test_remote_debugger_threads" + "test_path_translation_and_source_reference" + "test_attach_to_pid" + "test_terminate" + "test_gui_event_loop_custom" + # AssertionError: assert '/usr/bin/' == '/usr/bin' + # https://github.com/fabioz/PyDev.Debugger/issues/227 + "test_to_server_and_to_client" + # AssertionError pydevd_tracing.set_trace_to_threads(tracing_func) == 0 + "test_tracing_other_threads" + "test_tracing_basic" + ]; + + pythonImportsCheck = [ "pydevd" ]; + + meta = with lib; { + description = "PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"; + homepage = "https://github.com/fabioz/PyDev.Debugger"; + license = licenses.epl10; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix index 68a19afddb..28d9eeaecd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydmd/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydmd"; - version = "0.4"; + version = "0.4.0.post2207"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mathLab"; repo = "PyDMD"; - rev = "v${version}"; - sha256 = "1qwa3dyrrm20x0pzr7rklcw7433fd822n4m8bbbdd7z83xh6xm8g"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-IiHNn8BXOl+eQdxwTrF8PQhDlsMOTj87ugpQ09kDTO4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix index 2491bc5ff9..6ebdc3d6cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydrive2/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pydrive2"; - version = "1.10.0"; + version = "1.14.0"; src = fetchPypi { pname = "PyDrive2"; inherit version; - sha256 = "sha256-970ZtP8e9sC5IvtqxVwNlHJKtTc4euSh3nl3hNd0Y6s="; + sha256 = "sha256-212jvmcWMPVxynEAsoHYtdcv0His1CUkem0pLis9KEA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix index d10e20eb0b..bd0785d940 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyface/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.4.1"; + version = "7.4.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-UtzzZ5yj5hCjynxLmQSpbGkWiASNtdflKvjlAZ5HrbY="; + sha256 = "sha256-YT7TAcubr7m6o3xEeT13XQPdI9hD7rkm/xPPaJ6v6N0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix index 2c2f07d32f..11359954c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfaidx/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.7.0"; + version = "0.7.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mtXMk4Hw3pxD1L3sD68Qa4KM37b4FQ7HHKssp8i+53A="; + sha256 = "sha256-OXdjK3/SkEn4sRA11+neoOLF2pwjX5grTD+uBv8foj8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix index c3c6513f33..9f9dbe7fd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.5.6"; + version = "4.6.2"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-kU17+ZRAbPvv7gtNRZGPYMFbQGr+k/gZSoBNpaRQqCI="; + sha256 = "sha256-jdnIAgvNCB8llleoadXq+cynuzZzx/A7+uiyi751mbY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix index f56591efda..7404a5fefc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame-gui/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pygame-gui"; - version = "0.6.4"; + version = "064"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "MyreMylar"; repo = "pygame_gui"; - rev = "v_${lib.replaceStrings ["."] [""] version}"; - sha256 = "13+fK1hYxiMh0T+xbbmHViZjyBoQfRyIDc05fIJ/46U="; + rev = "refs/tags/v_${version}"; + sha256 = "sha256-13+fK1hYxiMh0T+xbbmHViZjyBoQfRyIDc05fIJ/46U="; }; propagatedBuildInputs = [ pygame python-i18n ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix index 57970ad2f3..c02400fd19 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygeos/default.nix @@ -17,6 +17,12 @@ buildPythonPackage rec { sha256 = "sha256-PEFULvZ8ZgFfRDrj5uaDUDqKIh+cJPsjgPauQq7RYAo="; }; + patches = [ + # Adapt https://github.com/shapely/shapely/commit/4889bd2d72ff500e51ba70d5b954241878349562, + # backporting to pygeos + ./fix-for-geos-3-11.patch + ]; + nativeBuildInputs = [ geos # for geos-config cython diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch b/third_party/nixpkgs/pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch new file mode 100644 index 0000000000..fe81c0769c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygeos/fix-for-geos-3-11.patch @@ -0,0 +1,29 @@ +From ea82dbefeb573150935eb78a6916813775512e76 Mon Sep 17 00:00:00 2001 +From: Joris Van den Bossche +Date: Tue, 26 Apr 2022 22:17:00 +0200 +Subject: [PATCH] TST: fix tests for GEOS main (#1357) (backported for nixpkgs) + +--- + pygeos/tests/test_constructive.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/pygeos/tests/test_constructive.py b/pygeos/tests/test_constructive.py +index 87c0a9f..b3459d1 100644 +--- a/pygeos/tests/test_constructive.py ++++ b/pygeos/tests/test_constructive.py +@@ -48,7 +48,11 @@ def test_no_args_array(geometry, func): + @pytest.mark.parametrize("geometry", all_types) + @pytest.mark.parametrize("func", CONSTRUCTIVE_FLOAT_ARG) + def test_float_arg_array(geometry, func): +- if func is pygeos.offset_curve and pygeos.get_type_id(geometry) not in [1, 2]: ++ if ( ++ func is pygeos.offset_curve ++ and pygeos.get_type_id(geometry) not in [1, 2] ++ and pygeos.geos_version < (3, 11, 0) ++ ): + with pytest.raises(GEOSException, match="only accept linestrings"): + func([geometry, geometry], 0.0) + return +-- +2.36.1 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix index 22cea8c070..e9a6850b5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygls/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy3k +, pythonOlder , fetchFromGitHub , setuptools-scm , pydantic @@ -13,15 +13,16 @@ buildPythonPackage rec { pname = "pygls"; - version = "0.11.3"; + version = "0.12.1"; format = "setuptools"; - disabled = !isPy3k; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "openlawlibrary"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-/nmDaA67XzrrmfwlBm5syTS4hn25m30Zb3gvOdL+bR8="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-L2KTNiI+I+r2fF88B1NSunowokrDzGCw3PXbxekg/oE="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -32,12 +33,6 @@ buildPythonPackage rec { toml typeguard ]; - # We don't know why an early version of pydantic is required, see: - # https://github.com/openlawlibrary/pygls/issues/221 - preBuild = '' - substituteInPlace setup.cfg \ - --replace "pydantic>=1.7,<1.9" "pydantic" - ''; checkInputs = [ mock diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix index 447d49a944..20c45462d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygobject/3.nix @@ -12,11 +12,12 @@ , ninja , isPy3k , gnome +, python }: buildPythonPackage rec { pname = "pygobject"; - version = "3.42.1"; + version = "3.42.2"; outputs = [ "out" "dev" ]; @@ -26,9 +27,13 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "HzS192JN415E61p+tCg1MoW9AwBNVRMaX39/qbkPPMk="; + sha256 = "rehpXipwc4Sd0DFtMdhyjhXh4Lxx2f9tHAnoa+UryVc="; }; + depsBuildBuild = [ + pkg-config + ]; + nativeBuildInputs = [ pkg-config meson @@ -37,8 +42,9 @@ buildPythonPackage rec { ]; buildInputs = [ - glib + # # .so files link to these gobject-introspection + glib ] ++ lib.optionals stdenv.isDarwin [ ncurses ]; @@ -48,6 +54,13 @@ buildPythonPackage rec { cairo ]; + mesonFlags = [ + # This is only used for figuring out what version of Python is in + # use, and related stuff like figuring out what the install prefix + # should be, but it does need to be able to execute Python code. + "-Dpython=${python.pythonForBuild.interpreter}" + ]; + passthru = { updateScript = gnome.updateScript { packageName = pname; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix index 2c7019a26b..632bb090f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinfra/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.2"; + version = "2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,8 +26,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Fizzadar"; repo = pname; - rev = "v${version}"; - hash = "sha256-G0ApoSBs8RRq/sKxyyCB7uCIFNccDMMCqPMIAHuJLCI="; + rev = "refs/tags/v${version}"; + hash = "sha256-aKEbmvxsWOJU4DWkEWxezVqXwaUofMzEphB/Hj1XqHU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix index caa84f7a65..5340be273f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinsteon/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.1.3"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CYXsYOqh41qRob2DRxTB6zcc/jcdT9/vWJTRk2LJgWo="; + hash = "sha256-PMjvic+K/m7beavlZvGhJcizSNCzLPZYLm3P2V9EPLs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix index b34c4838cb..6a9847d377 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyipma/default.nix @@ -1,20 +1,28 @@ { lib , aiohttp +, aioresponses , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, freezegun +, mock , geopy +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "pyipma"; - version = "2.1.5"; + version = "3.0.2"; + format = "setuptools"; + disabled = pythonOlder "3.7"; - # Request for GitHub releases, https://github.com/dgomes/pyipma/issues/10 - src = fetchPypi { - inherit pname version; - sha256 = "0hq5dasqpsn64x2sf6a28hdmysygmcdq4in6s08w97jfvwc6xmym"; + src = fetchFromGitHub { + owner = "dgomes"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-AF4bwEsAwJ5MoBQieNDFQ00LILJu+bZZttw4T5+6gkk="; }; propagatedBuildInputs = [ @@ -22,13 +30,27 @@ buildPythonPackage rec { geopy ]; - # Project has no tests included in the PyPI releases - doCheck = false; + checkInputs = [ + aioresponses + freezegun + mock + pytest-asyncio + pytestCheckHook + ]; - pythonImportsCheck = [ "pyipma" ]; + pythonImportsCheck = [ + "pyipma" + ]; + + disabledTestPaths = [ + # Tests require network access + "tests/test_auxiliar.py" + "tests/test_location.py" + "tests/test_sea_forecast.py" + ]; meta = with lib; { - description = "Python library to retrieve information from Instituto Português do Mar e Atmosfera"; + description = "Library to retrieve information from Instituto Português do Mar e Atmosfera"; homepage = "https://github.com/dgomes/pyipma"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix index 3161548f8b..b4b4429459 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykdtree/default.nix @@ -1,19 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi, numpy, nose, openmp }: +{ lib, buildPythonPackage, fetchPypi, numpy, pytestCheckHook, openmp }: buildPythonPackage rec { pname = "pykdtree"; - version = "1.3.4"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "bebe5c608129f2997e88510c00010b9a78581b394924c0e3ecd131d52415165d"; + sha256 = "sha256-c0L3XnMRA+ZT/B9rn9q8JBDPkrbnsGFggEp1eGybV0c="; }; buildInputs = [ openmp ]; propagatedBuildInputs = [ numpy ]; - checkInputs = [ nose ]; + preCheck = '' + # make sure we don't import pykdtree from the source tree + mv pykdtree tests + ''; + + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "kd-tree implementation for fast nearest neighbour search in Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pykostalpiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykostalpiko/default.nix new file mode 100644 index 0000000000..1b36374b20 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pykostalpiko/default.nix @@ -0,0 +1,42 @@ +{ lib +, aiohttp +, buildPythonPackage +, click +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pykostalpiko"; + version = "1.1.1-1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "Florian7843"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0szkxR19iSWWpPAEo3wriMmI5TFI6YeYRTj86b4rKlU="; + }; + + propagatedBuildInputs = [ + aiohttp + click + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "pykostalpiko" + ]; + + meta = with lib; { + description = "Library and CLI-tool to fetch the data from a Kostal Piko inverter"; + homepage = "https://github.com/Florian7843/pykostalpiko"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix index 0289b24621..be3854d135 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylama/default.nix @@ -15,7 +15,7 @@ , pytestCheckHook }: -buildPythonPackage rec { +let pylama = buildPythonPackage rec { pname = "pylama"; version = "8.3.8"; @@ -46,13 +46,11 @@ buildPythonPackage rec { vulture ]; + # escape infinite recursion pylint -> isort -> pylama + doCheck = false; + checkInputs = [ - # avoid infinite recursion pylint -> isort -> pylama - (pylint.override { - isort = isort.overridePythonAttrs (old: { - doCheck = false; - }); - }) + pylint pytestCheckHook ]; @@ -69,6 +67,10 @@ buildPythonPackage rec { "pylama.main" ]; + passthru.tests = { + check = pylama.overridePythonAttrs (_: { doCheck = true; }); + }; + meta = with lib; { description = "Code audit tool for python"; homepage = "https://github.com/klen/pylama"; @@ -76,4 +78,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; -} +}; in pylama diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix index 9fb8401bdc..039c793f20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix @@ -1,23 +1,45 @@ -{ buildPythonPackage, fetchPypi, lib, libmemcached, zlib, cyrus_sasl }: +{ lib +, buildPythonPackage +, cyrus_sasl +, fetchPypi +, libmemcached +, pythonOlder +, zlib +}: buildPythonPackage rec { - version = "1.6.1"; pname = "pylibmc"; + version = "1.6.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1sg7d9j0v6g3xg3finf4l1hb72c13vcyyi6rqrc9shbx903d93ca"; + hash = "sha256-QatJ05VAdnN0iRvvC+tSkcqXvrcEi3r3dSEGSVPATcA="; }; - buildInputs = [ libmemcached zlib cyrus_sasl ]; - setupPyBuildFlags = [ "--with-sasl2" ]; + buildInputs = [ + cyrus_sasl + libmemcached + zlib + ]; - # requires an external memcached server running + setupPyBuildFlags = [ + "--with-sasl2" + ]; + + # Requires an external memcached server running doCheck = false; + pythonImportsCheck = [ + "pylibmc" + ]; + meta = with lib; { description = "Quick and small memcached client for Python"; homepage = "http://sendapatch.se/projects/pylibmc/"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix index 7da521ef48..9de8923527 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylink-square/default.nix @@ -11,15 +11,15 @@ buildPythonPackage rec { pname = "pylink-square"; - version = "0.13.0"; + version = "0.14.1"; format = "setuptools"; src = fetchFromGitHub { owner = "square"; repo = "pylink"; - rev = "v${version}"; - hash = "sha256-SH2oxOlsX5dE8wMXpWPA/rEVrJwxJzizsOiYbwaGjLw="; + rev = "refs/tags/v${version}"; + hash = "sha256-eCVNDPXtZAuzGb4ZOnjEmE1pKPOl52xRfZy+ppfxS3g="; }; propagatedBuildInputs = [ psutil six future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix index 5fa39298cb..3bc20493dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.14.1"; + version = "2.14.5"; format = "setuptools"; disabled = pythonOlder "3.7.2"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rtyqHRDywv3l8bDgEjQlsh8lvwWbLswOPujFakaLWOw="; + sha256 = "sha256-JTFGplqIA6WavwzKOkrm1rHBKNRrplBPvAdEkb/fTlI="; }; nativeBuildInputs = [ @@ -85,6 +85,8 @@ buildPythonPackage rec { "test_generate_toml_config" "test_help_msg" "test_output_of_callback_options" + # Failed: DID NOT WARN. No warnings of type (,) were emitted. The list of emitted warnings is: []. + "test_save_and_load_not_a_linter_stats" ] ++ lib.optionals stdenv.isDarwin [ "test_parallel_execution" "test_py3k_jobs_option" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix index 5358b18402..c9f263ad2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylsp-mypy/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pylsp-mypy"; - version = "0.5.8"; + version = "0.6.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Richardk2n"; repo = "pylsp-mypy"; rev = "refs/tags/${version}"; - sha256 = "sha256-Yu1e/8gYFYEZ/IoFo8WnyRNYkCZ9i7NgjEjYBbagWMA="; + sha256 = "sha256-uOfNSdQ1ONybEiYXW6xDHfUH+0HY9bxDlBCNl3xHEn8="; }; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix index 95a220adcf..1bbbcf3089 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylutron-caseta/default.nix @@ -34,6 +34,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + pythonImportsCheck = [ "pylutron_caseta" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix index 8b1c4f2fd4..a9107da6fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymanopt/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pymanopt"; - version = "0.2.5"; + version = "2.0.0"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "0zk775v281375sangc5qkwrkb8yc9wx1g8b1917s4s8wszzkp8k6"; + rev = "refs/tags/${version}"; + sha256 = "sha256-dqyduExNgXIbEFlgkckaPfhLFSVLqPgwAOyBUdowwiQ="; }; propagatedBuildInputs = [ numpy scipy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix index 361f8bff61..44abf56e7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.29"; + version = "2.4.31"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0k6DKkb/Izk15JKrSOC0u5wL3vT4x2CelZt112vc/p0="; + sha256 = "sha256-p7cvwMpW1fS9Ml72vsD9L35wqPjtsQHW5lclw5SJ4P0="; }; propagatedBuildInputs = [ future lxml ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix index 4ac8ed9ba6..7515c8fe9d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymazda/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.3.6"; + version = "0.3.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zzyaG1i5eEnQWBiW8Wh/cIncJsU/XdEC61JmkB6Z6mY="; + sha256 = "sha256-1xreFjoHmdMirpxjVya30cw31fBaCPt877yqTr9By+A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix index 068c319695..0874931258 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymdown-extensions/default.nix @@ -38,14 +38,14 @@ let in buildPythonPackage rec { pname = "pymdown-extensions"; - version = "9.4"; + version = "9.5"; format = "pyproject"; src = fetchFromGitHub { owner = "facelessuser"; repo = "pymdown-extensions"; - rev = version; - sha256 = "sha256-9oYLDerz6ZcE4QyLO4mFPuHws8oZoXX8LcSV209MFec="; + rev = "refs/tags/${version}"; + sha256 = "sha256-bgvoY+8bbGoG1A93A+Uan1UDpQmEUu/TJu3FOkXechQ="; }; nativeBuildInputs = [ hatchling ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix new file mode 100644 index 0000000000..00bdd85940 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymicrobot/default.nix @@ -0,0 +1,40 @@ +{ lib +, bleak +, bleak-retry-connector +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pymicrobot"; + version = "0.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.9"; + + src = fetchPypi { + pname = "PyMicroBot"; + inherit version; + hash = "sha256-I43a75jEU/jvjAEUBXeTZGGBy0pne1P3DA9Gbzy+c34="; + }; + + propagatedBuildInputs = [ + bleak + bleak-retry-connector + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "microbot" + ]; + + meta = with lib; { + description = "Library to communicate with MicroBot"; + homepage = "https://github.com/spycle/pyMicroBot/"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix index ba184f68b4..9ebe37f4b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.12.3"; + version = "4.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ConK3ABipeU2ZN3gQ/bAlxcrjBxfAJRJAJUoL/mZWl8="; + sha256 = "sha256-17jyXJsAQ8uvd7i4lYFOM+ejyAeglzd8B+G9SZRgMNU="; }; # Tests call a running mongodb instance diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index 24c214fcba..a516525e3b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.19.6"; + version = "1.20.1"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "sha256-7z0T4n8Vhdd29qJZfxE6q9KNNrZIuYOnKFCyHFOZqwg="; + sha256 = "sha256-MFwaZLj7L9Rl4nzIvcvw9kIk8Oxtd2Pj9fLKZ4MTZkk="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix index 934d5fb811..7016478cab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyopencl/default.nix @@ -22,7 +22,7 @@ let if stdenv.isDarwin then [ mesa_drivers.dev ] else [ ocl-icd ]; in buildPythonPackage rec { pname = "pyopencl"; - version = "2022.1"; + version = "2022.1.6"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers pybind11 ] ++ os-specific-buildInputs; @@ -40,7 +40,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-JMbZoKH/dgnz1zZevYd4YWpUM8QmVmwsjjX/qwDvIsQ="; + sha256 = "sha256-+Ih9VOZUWY84VEclQLLrIorFa1aiSRuVvfrI8VvhyUM="; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix index bd6b5d701d..3401e905a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyosmium/default.nix @@ -1,18 +1,19 @@ { lib, buildPythonPackage, fetchFromGitHub, cmake, python , libosmium, protozero, boost, expat, bzip2, zlib, pybind11 -, nose, shapely, pythonOlder, isPyPy, lz4, requests }: +, shapely, pythonOlder, isPyPy, lz4, requests, pytestCheckHook +}: buildPythonPackage rec { pname = "pyosmium"; - version = "3.2.0"; + version = "3.3.0"; disabled = pythonOlder "3.4" || isPyPy; src = fetchFromGitHub { owner = "osmcode"; repo = pname; - rev = "v${version}"; - sha256 = "0s9h1blz4vrgcvdiikbpi2d4cy69kg2s8ki4dzampm1s0pa92if5"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-vXxRXr+hRrA9oPf8wAS4qQT258Vz+KRSqYwwD6HrDxk="; }; nativeBuildInputs = [ cmake ]; @@ -21,9 +22,10 @@ buildPythonPackage rec { preBuild = "cd .."; - checkInputs = [ nose shapely ]; - - checkPhase = "(cd test && ${python.interpreter} run_tests.py)"; + checkInputs = [ + pytestCheckHook + shapely + ]; meta = with lib; { description = "Python bindings for libosmium"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix index b48c190ca1..790a3af135 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyotgw"; - version = "unstable-2021-03-25"; + version = "2.0.2"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "mvn23"; repo = pname; - rev = "1854ef4ffb907524ff457ba558e4979ba7fabd02"; - sha256 = "0zckd85dmzpz0drcgx16ly6kzh1f1slcxb9lrcf81wh1p4q9bcaa"; + rev = version; + hash = "sha256-lmhFQ1HhRuiS++NsELA53YafrJ9uX2UDBQ9Kgyq0N0o="; }; propagatedBuildInputs = [ @@ -28,7 +28,9 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "tests" ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; pythonImportsCheck = [ "pyotgw" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix index fe4f854e53..e725a72b64 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyoverkiz/default.nix @@ -45,6 +45,11 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'backoff = "^1.10.0"' 'backoff = "*"' + ''; + pythonImportsCheck = [ "pyoverkiz" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix index 8e46be2697..eb7287e4a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/default.nix @@ -1,14 +1,16 @@ -{ lib, substituteAll, buildPythonPackage, fetchPypi +{ lib, substituteAll, buildPythonPackage, fetchFromGitHub , pandoc, texlive }: buildPythonPackage rec { pname = "pypandoc"; - version = "1.7.5"; + version = "1.8.1"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-gCwmquF7ZBNsbQBpSdjOGDp9TZ+9Ty0FHmb0+59FylA="; + src = fetchFromGitHub { + owner = "NicklasTegner"; + repo = pname; + rev = "v${version}"; + hash = "sha256-1vQmONQFJrjptwVVjw25Wyt59loatjScsdnSax+q/f8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/skip-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/skip-tests.patch index 201c5105c5..b7788f5d46 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/skip-tests.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/skip-tests.patch @@ -1,8 +1,8 @@ diff --git a/tests.py b/tests.py -index deb50e0..aede281 100755 +index 704f049..ef68728 100755 --- a/tests.py +++ b/tests.py -@@ -179,6 +179,7 @@ class TestPypandoc(unittest.TestCase): +@@ -225,6 +225,7 @@ class TestPypandoc(unittest.TestCase): received = pypandoc.convert_file(file_url, 'rst') self.assertEqualExceptForNewlineEnd(expected, received) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch index 8f992185d6..cff02b01b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypandoc/static-pandoc-path.patch @@ -1,11 +1,12 @@ diff --git a/pypandoc/__init__.py b/pypandoc/__init__.py -index 6d5b79b..65437aa 100644 +index b8f4e9a..295e182 100644 --- a/pypandoc/__init__.py +++ b/pypandoc/__init__.py -@@ -582,4 +582,4 @@ def clean_pandocpath_cache(): +@@ -771,5 +771,5 @@ def clean_pandocpath_cache(): + __pandoc_path = None -__version = None -+__version = "@pandocVersion@" -__pandoc_path = None ++__version = "@pandocVersion@" +__pandoc_path = "@pandoc@" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix index 6fe6e016d1..c1996ae402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypck/default.nix @@ -28,6 +28,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + disabledTests = lib.optionals stdenv.isDarwin [ "test_connection_lost" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix index d147de042c..2ae89bf43f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypdf2/default.nix @@ -1,29 +1,35 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , glibcLocales +, typing-extensions , python , isPy3k }: buildPythonPackage rec { pname = "PyPDF2"; - version = "1.28.4"; + version = "2.9.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BM5CzQVweIH+28oxZHRFEYBf6MMGGK5M+yuUDjNo1a0="; + sha256 = "sha256-bPGMp9D3fhMG1I/NClc5BhbsZUV5a16zJaIJQ6VQHRg="; }; LC_ALL = "en_US.UTF-8"; buildInputs = [ glibcLocales ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.10") [ + typing-extensions + ]; + checkPhase = '' - ${python.interpreter} -m unittest discover -s Tests + ${python.interpreter} -m unittest discover ''; # Tests broken on Python 3.x - doCheck = !(isPy3k); + #doCheck = !(isPy3k); meta = with lib; { description = "A Pure-Python library built as a PDF toolkit"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix index 25cf9906cb..c45c437a44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.3.1"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-SsLiz3JKubUlInw7SmnxarXHFOpbrWHJdODF1XhyOKE="; + sha256 = "sha256-z85StSr7EJgQr80WePyeOY9wzhWHqwRIWctyKEaTTj0="; }; checkInputs = [ nose psutil ] ++ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix index 815f0fb84c..bcfb7a0ee1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproj/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyproj"; - version = "3.3.0"; + version = "3.3.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pyproj4"; repo = "pyproj"; - rev = version; - hash = "sha256-crLYNACS9I0WGOdkYCJNoyxeAYsR41ZszzKRZsYHCLY="; + rev = "refs/tags/${version}"; + hash = "sha256-QmpwnOnMjV29Tq+M6FCotDytq6zlhsp0Zgzw3V7nhNQ="; }; # force pyproj to use ${proj} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix index d2d5102465..4e62265776 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyprosegur/default.nix @@ -1,4 +1,5 @@ { lib +, aiofiles , aiohttp , backoff , buildPythonPackage @@ -9,17 +10,18 @@ buildPythonPackage rec { pname = "pyprosegur"; - version = "0.0.5"; + version = "0.0.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dgomes"; repo = pname; - rev = version; - sha256 = "0bpzxm8s548fw6j36brp7bcx9481x2hrypcw3yyg4ihsjhka5qln"; + rev = "refs/tags/${version}"; + sha256 = "sha256-Spxzyn0gZ1TIHrtt7W0j6VwKnm2Km5vLGZZ//HINyBA="; }; propagatedBuildInputs = [ + aiofiles aiohttp backoff click diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix index fd88e0fe4f..5e87e700a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/default.nix @@ -2,14 +2,20 @@ buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.12.2"; + version = "1.13.0"; src = fetchPypi { pname = "PyQt-builder"; inherit version; - sha256 = "f62bb688d70e0afd88c413a8d994bda824e6cebd12b612902d1945c5a67edcd7"; + sha256 = "sha256-SHdYDDjOtTIOEps4HQg7CoYBxoFm2LmXB/CPoKFonu8="; }; + patches = [ + # use the sip-distinfo executable from PATH instead of trying to guess, + # we know it's the right one because it's the _only_ one + ./use-sip-distinfo-from-path.patch + ]; + propagatedBuildInputs = [ packaging sip ]; pythonImportsCheck = [ "pyqtbuild" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/use-sip-distinfo-from-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/use-sip-distinfo-from-path.patch new file mode 100644 index 0000000000..43b2d7367e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt-builder/use-sip-distinfo-from-path.patch @@ -0,0 +1,20 @@ +diff --git a/pyqtbuild/builder.py b/pyqtbuild/builder.py +index 3f35a7f..58701dd 100644 +--- a/pyqtbuild/builder.py ++++ b/pyqtbuild/builder.py +@@ -51,15 +51,6 @@ class QmakeBuilder(Builder): + """ Set default values for user options that haven't been set yet. """ + + if tool in Option.BUILD_TOOLS: +- # A PEP 517 frontend will set PATH so that sip-distinfo is found on +- # it. However for our own frontends we want to use the version +- # corresponding to the frontend (and, anyway, the frontend may not +- # be on PATH). +- if tool != 'pep517': +- self._sip_distinfo = os.path.join( +- os.path.abspath(os.path.dirname(sys.argv[0])), +- self._sip_distinfo) +- + # Check we have a qmake. + if self.qmake is None: + self.qmake = self._find_exe('qmake') diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix index c604e61a2c..5a4c825770 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix @@ -19,16 +19,32 @@ buildPythonPackage rec { pname = "PyQt5"; - version = "5.15.4"; + version = "5.15.7"; format = "pyproject"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1gp5jz71nmg58zsm1h4vzhcphf36rbz37qgsfnzal76i1mz5js9a"; + sha256 = "sha256-dVEhpSs6CMsHJ1wQ67lldtNuMg5XJZHbFs/bxVgQFZQ="; }; + patches = [ + # Fix some wrong assumptions by ./project.py + # TODO: figure out how to send this upstream + ./pyqt5-fix-dbus-mainloop-support.patch + # confirm license when installing via pyqt5_sip + ./pyqt5-confirm-license.patch + ]; + + # be more verbose + postPatch = '' + cat >> pyproject.toml <= 4.1.0, < 5.0.0" "mailchecker >= 4.1.0" + ''; + propagatedBuildInputs = [ mailchecker phonenumbers diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-codon-tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-codon-tables/default.nix index 7c4551a9d6..715a982d9f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-codon-tables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-codon-tables/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "python-codon-tables"; - version = "0.1.11"; + version = "0.1.12"; src = fetchPypi { pname = "python_codon_tables"; inherit version; - sha256 = "ba590fcfb1988f9674c8627464caeb3ea0797d970872a2c27ea09906acd24110"; + sha256 = "sha256-pzPoR55nU8ObPv1iIE52qpqD5xGdYLm1uG3nCD6I46Y="; }; # no tests in tarball diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix index 378c58f023..1be846aa2a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-dbusmock/default.nix @@ -1,29 +1,51 @@ -{ lib, buildPythonPackage, fetchFromGitHub, runtimeShell, - nose, dbus, dbus-python, pygobject3, - which, pyflakes, pycodestyle, bluez, networkmanager +{ lib +, buildPythonPackage +, fetchFromGitHub +, nose +, dbus +, dbus-python +, pygobject3 +, bluez +, networkmanager +, setuptools-scm }: buildPythonPackage rec { pname = "python-dbusmock"; - version = "0.26.1"; + version = "0.28.3"; src = fetchFromGitHub { owner = "martinpitt"; repo = pname; - rev = version; - sha256 = "sha256-kavbWMTgKU/rBIo7RMs9NkwReYQyEdeFwMBSzEM9wa0="; + rev = "refs/tags/${version}"; + sha256 = "sha256-LV94F2f0Ir2Ayzk2YLL76TqeUuC0f7e+bH3vC/xKgfU="; }; - prePatch = '' - substituteInPlace tests/test_code.py \ - --replace "pyflakes3" "pyflakes" \ - --replace "/bin/bash" "${runtimeShell}" \ - --replace "--ignore=E124,E402,E731,W504" "--ignore=E124,E402,E731,W504,E501" # ignore long lines too + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"dbus-python"' "" ''; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + dbus-python + ]; + + checkInputs = [ + dbus + pygobject3 + bluez + (lib.getOutput "test" bluez) + networkmanager + nose + ]; + # TODO: Get the rest of these tests running? - # This is a mocking library used as a check dependency for a single derivation. - # That derivation's tests pass. Maybe not worth the effort to fix these... NOSE_EXCLUDE = lib.concatStringsSep "," [ "test_bluez4" # NixOS ships BlueZ5 # These appear to fail because they're expecting to run in an Ubuntu chroot? @@ -46,14 +68,9 @@ buildPythonPackage rec { # "test_networkmanager" ]; - checkInputs = [ - nose dbus dbus-python which pycodestyle pyflakes - pygobject3 bluez (lib.getOutput "test" bluez) networkmanager - ]; checkPhase = '' runHook preCheck - export PATH="$PATH:${lib.getOutput "test" bluez}/test"; nosetests -v runHook postCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix index 01ce4bc126..beca9b8489 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-efl/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; installPhase = '' - ${python.interpreter} setup.py install --prefix=$out + ${python.interpreter} setup.py install --prefix=$out --single-version-externally-managed ''; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index 6a7495041f..c9b344e5ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.3.3"; + version = "4.3.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "sha256-+0H7Ojy5/K0EllNTSvGLNIZlglcMh76r9XHxFMUwrrY="; + sha256 = "sha256-fymO9WqkYaRsHKCJHQJpySHqZor2t8BfVrfYUfYoJno="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-flirt/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/python-flirt/Cargo.lock new file mode 100644 index 0000000000..d6ad3d6aef --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-flirt/Cargo.lock @@ -0,0 +1,1465 @@ +# 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 = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + +[[package]] +name = "aho-corasick" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" +dependencies = [ + "memchr 0.1.11", +] + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr 2.5.0", +] + +[[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.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.66" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "better-panic" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d12a680cc74d8c4a44ee08be4a00dedf671b089c2440b2e3fdaa776cd468476" +dependencies = [ + "backtrace", + "console", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527" +dependencies = [ + "funty", + "radium", + "tap", + "wyz", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3" + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi 0.3.9", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim", + "term_size", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "clicolors-control" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90082ee5dcdd64dc4e9e0d37fbf3ee325419e39c0092191e0393df65518f741e" +dependencies = [ + "atty", + "lazy_static", + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "cmake" +version = "0.1.48" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8ad8cef104ac57b68b89df3208164d228503abbdce70f6880ffa3d970e7443a" +dependencies = [ + "cc", +] + +[[package]] +name = "console" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e0f3986890b3acbc782009e2629dfe2baa430ac091519ce3be26164a2ae6c0" +dependencies = [ + "clicolors-control", + "encode_unicode", + "lazy_static", + "libc", + "regex 1.6.0", + "termios", + "winapi 0.3.9", +] + +[[package]] +name = "criterion" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +dependencies = [ + "atty", + "cast", + "clap", + "criterion-plot", + "csv", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex 1.6.0", + "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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "once_cell", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "csv" +version = "1.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +dependencies = [ + "bstr", + "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 2.5.0", +] + +[[package]] +name = "dynasm" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add9a102807b524ec050363f09e06f1504214b0e1c7797f64261c891022dce8b" +dependencies = [ + "bitflags 1.3.2", + "byteorder", + "lazy_static", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "dynasmrt" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64fba5a42bd76a17cad4bfa00de168ee1cbfa06a5e8ce992ae880218c05641a9" +dependencies = [ + "byteorder", + "dynasm", + "memmap2", +] + +[[package]] +name = "either" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "fern" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bdd7b0849075e79ee9a1836df22c717d1eba30451796fdc631b04565dd11e2a" +dependencies = [ + "log", +] + +[[package]] +name = "funty" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e" + +[[package]] +name = "gcc" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" + +[[package]] +name = "gimli" +version = "0.26.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" + +[[package]] +name = "goblin" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32401e89c6446dcd28185931a01b1093726d0356820ac744023e6850689bf926" +dependencies = [ + "log", + "plain", + "scroll", +] + +[[package]] +name = "half" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" + +[[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 = "hexyl" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f823e021c22ebf3e1437685a9f3ceb2b93adb723e23dca2e4e38b47d3d49e447" +dependencies = [ + "ansi_term", + "anyhow", + "atty", + "clap", + "libc", + "thiserror", +] + +[[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 = "inflate" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cdb29978cc5797bd8dcc8e5bf7de604891df2a8dc576973d71a281e916db2ff" +dependencies = [ + "adler32", +] + +[[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.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" + +[[package]] +name = "js-sys" +version = "0.3.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27" +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 = "lancelot" +version = "0.7.0" +dependencies = [ + "anyhow", + "bitflags 1.3.2", + "bitvec", + "byteorder", + "chrono", + "criterion", + "dynasm", + "dynasmrt", + "fern", + "goblin", + "lancelot-flirt", + "lazy_static", + "log", + "regex 1.6.0", + "smallvec", + "smol_str", + "thiserror", + "unicorn", + "widestring", + "zydis", +] + +[[package]] +name = "lancelot-bin" +version = "0.7.0" +dependencies = [ + "ansi_term", + "anyhow", + "better-panic", + "chrono", + "clap", + "fern", + "goblin", + "hex", + "hexyl", + "lancelot", + "lancelot-flirt", + "log", + "thiserror", + "zydis", +] + +[[package]] +name = "lancelot-flirt" +version = "0.7.0" +dependencies = [ + "anyhow", + "better-panic", + "bitflags 1.3.2", + "bitvec", + "chrono", + "clap", + "criterion", + "fern", + "inflate", + "log", + "nom", + "regex 1.6.0", + "smallvec", + "thiserror", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "libunicorn-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf3199986a2161e4b771d09c7ab75d3776769132c78e4bd8c68488125ce2c4b" +dependencies = [ + "bitflags 0.8.2", + "build-helper", + "gcc", + "libc", + "os_type", + "pkg-config", +] + +[[package]] +name = "lock_api" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" +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 = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memmap2" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a79b39c93a7a5a27eeaf9a23b5ff43f1b9e0ad6b1cdd441140ae53c35613fc7" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "miniz_oxide" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +dependencies = [ + "adler", +] + +[[package]] +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +dependencies = [ + "memchr 2.5.0", + "minimal-lexical", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "object" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" +dependencies = [ + "memchr 2.5.0", +] + +[[package]] +name = "once_cell" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "os_type" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e8f383a1428eabebb01f650a03e7d1e5eb645e50f9ae4c26197647dd5e77a" +dependencies = [ + "regex 0.1.80", +] + +[[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", + "instant", + "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", +] + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "plain" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" + +[[package]] +name = "plotters" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9428003b84df1496fb9d6eeee9c5f8145cb41ca375eb0dad204328888832811f" +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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0918736323d1baff32ee0eade54984f6f201ad7e97d5cfb5d6ab4a358529615" +dependencies = [ + "plotters-backend", +] + +[[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.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" + +[[package]] +name = "proc-macro2" +version = "1.0.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdcc2916cde080c1876ff40292a396541241fe0072ef928cd76582e9ea5d60d2" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "pylancelot" +version = "0.7.0" +dependencies = [ + "anyhow", + "lancelot", + "pyo3", + "zydis", +] + +[[package]] +name = "pyo3" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d41d50a7271e08c7c8a54cd24af5d62f73ee3a6f6a314215281ebdec421d5752" +dependencies = [ + "cfg-if", + "indoc", + "libc", + "parking_lot", + "paste", + "pyo3-build-config", + "pyo3-macros", + "unindent", +] + +[[package]] +name = "pyo3-build-config" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "779239fc40b8e18bc8416d3a37d280ca9b9fb04bda54b98037bb6748595c2410" +dependencies = [ + "once_cell", +] + +[[package]] +name = "pyo3-macros" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b247e8c664be87998d8628e86f282c25066165f1f8dda66100c48202fdb93a" +dependencies = [ + "pyo3-macros-backend", + "quote", + "syn", +] + +[[package]] +name = "pyo3-macros-backend" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a8c2812c412e00e641d99eeb79dd478317d981d938aa60325dfa7157b607095" +dependencies = [ + "proc-macro2", + "pyo3-build-config", + "quote", + "syn", +] + +[[package]] +name = "python-flirt" +version = "0.7.0" +dependencies = [ + "anyhow", + "lancelot-flirt", + "pyo3", +] + +[[package]] +name = "quote" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "radium" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" + +[[package]] +name = "rayon" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" +dependencies = [ + "aho-corasick 0.5.3", + "memchr 0.1.11", + "regex-syntax 0.3.9", + "thread_local", + "utf8-ranges", +] + +[[package]] +name = "regex" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "aho-corasick 0.7.18", + "memchr 2.5.0", + "regex-syntax 0.6.27", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + +[[package]] +name = "rustc-demangle" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "ryu" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" + +[[package]] +name = "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 = "scroll" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fda28d4b4830b807a8b43f7b0e6b5df875311b3e7621d84577188c175b6ec1ec" +dependencies = [ + "scroll_derive", +] + +[[package]] +name = "scroll_derive" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.140" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +dependencies = [ + "itoa 1.0.2", + "ryu", + "serde", +] + +[[package]] +name = "smallvec" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd0db749597d91ff862fd1d55ea87f7855a744a8425a64695b6fca237d1dad1" + +[[package]] +name = "smol_str" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7475118a28b7e3a2e157ce0131ba8c5526ea96e90ee601d9f6bb2e286a35ab44" +dependencies = [ + "serde", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tap" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" + +[[package]] +name = "term_size" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" +dependencies = [ + "libc", + "winapi 0.3.9", +] + +[[package]] +name = "termios" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411c5bf740737c7918b8b1fe232dca4dc9f8e754b8ad5e20966814001ed0ac6b" +dependencies = [ + "libc", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "term_size", + "unicode-width", +] + +[[package]] +name = "thiserror" +version = "1.0.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +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", +] + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +dependencies = [ + "libc", + "wasi", + "winapi 0.3.9", +] + +[[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 = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unicorn" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b44a5d2a8bf4e20647959d44caa769fc6e025d2aeccabf7fa79667b36233e58" +dependencies = [ + "bitflags 0.8.2", + "gcc", + "libc", + "libunicorn-sys", +] + +[[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" +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 = "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 = "wasi" +version = "0.10.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" + +[[package]] +name = "wasm-bindgen" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be" + +[[package]] +name = "web-sys" +version = "0.3.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "widestring" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" + +[[package]] +name = "winapi" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-build" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "wyz" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188" +dependencies = [ + "tap", +] + +[[package]] +name = "zydis" +version = "3.1.1" +source = "git+https://github.com/williballenthin/zydis-rs?branch=fix-26#cc52d4fac3f5534c4834635a452b96995f283e0e" +dependencies = [ + "bitflags 1.3.2", + "cmake", +] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-flirt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-flirt/default.nix new file mode 100644 index 0000000000..cbd3de93b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-flirt/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, rustPlatform +}: + +buildPythonPackage rec { + pname = "python-flirt"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "williballenthin"; + repo = "lancelot"; + rev = "v${version}"; + sha256 = "sha256-FsdnWWfyQte7FDz5ldo+S+3IEtbOIODOeh1fHDP2/4s="; + }; + + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + + format = "pyproject"; + + nativeBuildInputs = with rustPlatform; [ + cargoSetupHook + maturinBuildHook + ]; + + buildAndTestSubdir = "pyflirt"; + + cargoDeps = rustPlatform.importCargoLock { + lockFile = ./Cargo.lock; + outputHashes = { + "zydis-3.1.1" = "sha256-/L28cBTCg/S7onDQXnqUoB5udoEO/depmxDUcnfIQEw="; + }; + }; + + pythonImportsCheck = [ "flirt" ]; + + meta = with lib; { + description = "Python library for parsing, compiling, and matching Fast Library Identification and Recognition Technology (FLIRT) signatures"; + homepage = "https://github.com/williballenthin/lancelot/tree/master/pyflirt"; + license = licenses.asl20; + maintainers = with maintainers; [ sbruder ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix index e26e60c43e..3ece771e7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gnupg/default.nix @@ -1,28 +1,29 @@ { lib, buildPythonPackage, fetchPypi, gnupg }: buildPythonPackage rec { - pname = "python-gnupg"; - version = "0.4.8"; + pname = "python-gnupg"; + version = "0.4.9"; + + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "b64de1ae5cedf872b437201a566fa2c62ce0c95ea2e30177eb53aee1258507d7"; + sha256 = "sha256-qqdIeVVyWRqvEntKyJhWhPNnP/grOfNwyDawBuaPxTc="; }; - # Let's make the library default to our gpg binary - patchPhase = '' + postPatch = '' substituteInPlace gnupg.py \ - --replace "gpgbinary='gpg'" "gpgbinary='${gnupg}/bin/gpg'" + --replace "gpgbinary='gpg'" "gpgbinary='${gnupg}/bin/gpg'" substituteInPlace test_gnupg.py \ - --replace "gpgbinary=GPGBINARY" "gpgbinary='${gnupg}/bin/gpg'" \ - --replace "test_search_keys" "disabled__test_search_keys" + --replace "os.environ.get('GPGBINARY', 'gpg')" "os.environ.get('GPGBINARY', '${gnupg}/bin/gpg')" ''; + pythonImportsCheck = [ "gnupg" ]; + meta = with lib; { - description = "A wrapper for the Gnu Privacy Guard"; - homepage = "https://pypi.python.org/pypi/python-gnupg"; - license = licenses.bsd3; + description = "API for the GNU Privacy Guard (GnuPG)"; + homepage = "https://github.com/vsajip/python-gnupg"; + license = licenses.bsd3; maintainers = with maintainers; [ copumpkin ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix index b98c445818..cc3d866707 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-gvm/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-gvm"; - version = "21.11.0"; + version = "22.7.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "greenbone"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-H3cM+4YA6obYbo7qm7BhLlQxW4DKV6A3X0ZKsXWPDBs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-0dshBFcZ0DLa6SXxzWyfzmgPPxTIiKq00OKCJfk0vKY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix index dc1694b83e..38daad08bd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix @@ -1,49 +1,51 @@ { lib -, buildPythonApplication -, fetchPypi -, pbr , babel +, buildPythonApplication , cliff +, fetchPypi , iso8601 +, keystoneauth1 , osc-lib -, prettytable , oslo-i18n , oslo-serialization , oslo-utils -, keystoneauth1 +, pbr +, prettytable , python-swiftclient +, pythonOlder , pyyaml , requests -, six +, requests-mock , stestr , testscenarios -, requests-mock }: buildPythonApplication rec { pname = "python-heatclient"; - version = "2.5.1"; + version = "3.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3l7XyxKm18BAM1DhNsCmRwcZR224+8m/jQ1YHrwLHCs="; + hash = "sha256-5OLysKbM2GbjMT8lshWDLMtqOrHq2DhhWvbw1oNBNZs="; }; propagatedBuildInputs = [ - pbr babel cliff iso8601 + keystoneauth1 osc-lib - prettytable oslo-i18n oslo-serialization oslo-utils - keystoneauth1 + pbr + prettytable python-swiftclient pyyaml requests - six ]; checkInputs = [ @@ -55,13 +57,16 @@ buildPythonApplication rec { checkPhase = '' stestr run -e <(echo " heatclient.tests.unit.test_common_http.HttpClientTest.test_get_system_ca_file + heatclient.tests.unit.test_deployment_utils.TempURLSignalTest.test_create_temp_url ") ''; - pythonImportsCheck = [ "heatclient" ]; + pythonImportsCheck = [ + "heatclient" + ]; meta = with lib; { - description = "A client library for Heat built on the Heat orchestration API"; + description = "Library for Heat built on the Heat orchestration API"; homepage = "https://github.com/openstack/python-heatclient"; license = licenses.asl20; maintainers = teams.openstack.members; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix index 9a13960090..7169c05608 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-homewizard-energy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-homewizard-energy"; - version = "1.0.3"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "DCSBL"; repo = pname; - rev = "v${version}"; - hash = "sha256-ioISqRFZZCojTJ/KYS8QUtoEpBNOPqY9lC9NFbZyh5A="; + rev = "refs/tags/v${version}"; + hash = "sha256-D+WgAsH5CaAIw/lYMUd191f/9EGLvM93qB+b2/XULD8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix index 0276843119..33b4140181 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.0.2"; + version = "2.0.4"; pname = "python-json-logger"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "202a4f29901a4b8002a6d1b958407eeb2dd1d83c18b18b816f5b64476dde9096"; + sha256 = "sha256-dk12IXX5n8xGML1IU7CWMqy2CmIkrLJ84IzXDwsbgb0="; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix index c45a32d2f6..d4c9524c9e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-kasa/default.nix @@ -43,6 +43,10 @@ buildPythonPackage rec { voluptuous ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + disabledTestPaths = [ # Skip the examples tests "kasa/tests/test_readme_examples.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix deleted file mode 100644 index e0de396b7c..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-language-server/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonAtLeast, pythonOlder, isPy27 -, backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8 -, pytestCheckHook, mock, pytest-cov, coverage, setuptools, ujson, flaky -, # Allow building a limited set of providers, e.g. ["pycodestyle"]. - providers ? ["*"] - # The following packages are optional and - # can be overwritten with null as your liking. -, autopep8 ? null -, mccabe ? null -, pycodestyle ? null -, pydocstyle ? null -, pyflakes ? null -, pylint ? null -, rope ? null -, yapf ? null -}: - -let - withProvider = p: builtins.elem "*" providers || builtins.elem p providers; -in - -buildPythonPackage rec { - pname = "python-language-server"; - version = "0.36.2"; - # https://github.com/palantir/python-language-server/issues/896#issuecomment-752790868 - disabled = pythonAtLeast "3.9"; - - src = fetchFromGitHub { - owner = "palantir"; - repo = "python-language-server"; - rev = version; - sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q"; - }; - - postPatch = '' - # Reading the changelog I don't expect an API break in pycodestyle and pyflakes - substituteInPlace setup.py \ - --replace "pycodestyle>=2.6.0,<2.7.0" "pycodestyle>=2.6.0,<2.8.0" \ - --replace "jedi>=0.17.2,<0.18.0" "jedi>=0.17.2,<0.19.0" \ - --replace "pyflakes>=2.2.0,<2.3.0" "pyflakes>=2.2.0,<2.4.0" - ''; - - propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ujson ] - ++ lib.optional (withProvider "autopep8") autopep8 - ++ lib.optional (withProvider "mccabe") mccabe - ++ lib.optional (withProvider "pycodestyle") pycodestyle - ++ lib.optional (withProvider "pydocstyle") pydocstyle - ++ lib.optional (withProvider "pyflakes") pyflakes - ++ lib.optional (withProvider "pylint") pylint - ++ lib.optional (withProvider "rope") rope - ++ lib.optional (withProvider "yapf") yapf - ++ lib.optional isPy27 configparser - ++ lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; - - # The tests require all the providers, disable otherwise. - doCheck = providers == ["*"]; - - checkInputs = [ - pytestCheckHook mock pytest-cov coverage flaky - # Do not propagate flake8 or it will enable pyflakes implicitly - flake8 - # rope is technically a dependency, but we don't add it by default since we - # already have jedi, which is the preferred option - rope - ]; - - dontUseSetuptoolsCheck = true; - - preCheck = '' - export HOME=$TEMPDIR - ''; - - # Tests failed since update to 0.31.8 - disabledTests = [ - "test_pyqt_completion" - "test_numpy_completions" - "test_pandas_completions" - "test_matplotlib_completions" - "test_snippet_parsing" - "test_numpy_hover" - "test_symbols" - ] ++ lib.optional isPy27 "test_flake8_lint"; - - meta = with lib; { - homepage = "https://github.com/palantir/python-language-server"; - description = "An implementation of the Language Server Protocol for Python"; - license = licenses.mit; - maintainers = [ ]; - # no longer maintained - # see https://github.com/palantir/python-language-server/pull/918#issuecomment-817361554 - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index aeb2d75677..eafad1a9ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -23,6 +23,7 @@ , setuptools-scm , stdenv , ujson +, whatthepatch , yapf , withAutopep8 ? true , withFlake8 ? true @@ -37,7 +38,7 @@ buildPythonPackage rec { pname = "python-lsp-server"; - version = "1.4.1"; + version = "1.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -45,12 +46,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "python-lsp"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-rEfjxHw2NIVIa8RepxLPiXkRFhcGWLzm6w43n60zkFE="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-tW2w94HI6iy8vcDb5pIL79bAO6BJp9q6SMAXgiVobm0="; }; postPatch = '' - substituteInPlace setup.cfg \ + substituteInPlace pyproject.toml \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ --replace "--cov pylsp --cov test" "" \ --replace "mccabe>=0.6.0,<0.7.0" "mccabe" @@ -75,7 +76,7 @@ buildPythonPackage rec { ++ lib.optional withPyflakes pyflakes ++ lib.optional withPylint pylint ++ lib.optional withRope rope - ++ lib.optional withYapf yapf; + ++ lib.optionals withYapf [ whatthepatch yapf ]; checkInputs = [ flaky @@ -87,7 +88,9 @@ buildPythonPackage rec { # pyqt5 is broken on aarch64-darwin ++ lib.optionals (!stdenv.isDarwin || !stdenv.isAarch64) [ pyqt5 ]; - disabledTests = lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config" + disabledTests = [ + "test_numpy_completions" # https://github.com/python-lsp/python-lsp-server/issues/243 + ] ++ lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config" # pyqt5 is broken on aarch64-darwin ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) "test_pyqt_completion"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix index 4c16d886e5..d0a8fc3a0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix @@ -23,14 +23,12 @@ buildPythonApplication rec { pname = "python-manilaclient"; - version = "3.4.0"; + version = "4.0.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; - src = fetchPypi { inherit pname version; - hash = "sha256-F41/k7NJigwFNw2946sj3dZDKDH+PkgOjkml9t3Mgtw="; + hash = "sha256-TEGzUNgYTkb2VrvW2E3lurD6N1XcIhH2tjmPlsJ/5MI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix index 3cbc48c3cd..d1497c43bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-miio/default.nix @@ -10,6 +10,7 @@ , defusedxml , fetchPypi , importlib-metadata +, micloud , netifaces , poetry-core , pytest-mock @@ -24,14 +25,14 @@ buildPythonPackage rec { pname = "python-miio"; - version = "0.5.11"; + version = "0.5.12"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1hC7yE/hGLx9g3NXqU45yC/6dcW6/0oZwgYW5bj/37c="; + hash = "sha256-BJw1Gg3FO2R6WWKjkrpxDN4fTMTug5AIj0SNq1gEbBY="; }; nativeBuildInputs = [ @@ -47,6 +48,7 @@ buildPythonPackage rec { croniter cryptography defusedxml + micloud netifaces pytz pyyaml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix index f152c1f264..16883ee942 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-pam/default.nix @@ -2,29 +2,41 @@ , buildPythonPackage , fetchFromGitHub , pam +, six +, toml }: buildPythonPackage rec { pname = "python-pam"; - version = "1.8.4"; + version = "2.0.2"; + format = "pyproject"; src = fetchFromGitHub { owner = "FirefighterBlu3"; repo = pname; - rev = "v${version}"; - sha256 = "0gp7vzd332j7jwndcnz7kc9j283d6lyv32bndd1nqv9ghzv69sxp"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-MR9LYXtkbltAmn7yoyyKZn4yMHyh3rj/i/pA8nJy2xU="; }; + postPatch = '' + substituteInPlace src/pam/__internals.py \ + --replace 'find_library("pam")' '"${pam}/lib/libpam.so"' \ + --replace 'find_library("pam_misc")' '"${pam}/lib/libpam_misc.so"' + ''; + buildInputs = [ pam ]; - postPatch = '' - sed "s|find_library(\"pam\")|\"${pam}/lib/libpam.so\"|g" -i pam.py - ''; + propagatedBuildInputs = [ + six + toml + ]; + + pythonImportsCheck = [ "pam" ]; meta = with lib; { - description = "Python pam module supporting py3 (and py2)"; + description = "Python pam module"; homepage = "https://github.com/FirefighterBlu3/python-pam"; license = licenses.mit; maintainers = with maintainers; [ abbradar mkg20001 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix index 1b1deba78f..ee77746545 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-smarttub/default.nix @@ -38,6 +38,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + postPatch = '' substituteInPlace setup.py \ --replace "pyjwt~=2.1.0" "pyjwt>=2.1.0" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index 56026e10fe..a6b2bc0d24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.7.0"; + version = "5.7.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-POYD4w0iBAdaN2L4cpLJz1aCE9J0Iob//VN94/5lJLw="; + sha256 = "sha256-KVaBSBWLeFJYiNJYTwoExExUmUaeNJ40c/WTgTc2Y/w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pythonix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pythonix/default.nix index 9261ab2a8f..9059e3b424 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pythonix/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pythonix/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { description = '' Eval nix code from python. ''; - maintainers = [ maintainers.mic92 ]; + maintainers = [ ]; license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix index b00cc63da1..8942d44e0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytibber/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.23.0"; + version = "0.24.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - hash = "sha256-DMYSv66PVBuOHuIio06OLrtGP0q7PeuDGKK+OznaLec="; + hash = "sha256-Ib9Rb6RkhUe4WDDHVLgaOYOleSFj7LFys6pW3WgxMQo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix index abc90f2a6c..8a6e374df0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytomorrowio/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pytomorrowio"; - version = "0.3.3"; + version = "0.3.4"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0d4f81dc90aefa26da18b927473cb7b08b093f7732301983ef5f0b1ca1181c62"; + sha256 = "sha256-d4twa9bHaQ9XTHSb8pwJnnJ7tDH6vGpck3/8Y39tRaY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix index 2ee74e64b0..3e811a39f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix @@ -5,23 +5,26 @@ , decorator , numpy , platformdirs +, typing-extensions , pytestCheckHook }: buildPythonPackage rec { pname = "pytools"; - version = "2022.1.2"; + version = "2022.1.12"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XoJBAYgKJGNUdWNliAplu0FvaoyrZRO2j8u0j7oJD8s="; + sha256 = "sha256-TWKHXpoqsqJOOTqai3mUkvGnIb/6hArzgHv9Qocd0fQ="; }; propagatedBuildInputs = [ decorator numpy platformdirs + ] ++ lib.optionals (pythonOlder "3.11") [ + typing-extensions ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix index 5dbf04ef47..b775f13fda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pytorch-lightning"; - version = "1.6.4"; + version = "1.6.5"; disabled = isPy27; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "PyTorchLightning"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-X1xPyE53uo/eWPjQdXiObAnjgWc/Y/K+077Ypi5ZzcE="; + hash = "sha256-CgD5g5nhz2DI4gOQyPl8/Cq6wWHzL0ALgOB5SgUOgaI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 8dd2211e3e..1c6b2d61ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -8,19 +8,20 @@ , pytorch , torchvision , tqdm +, faiss }: buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "1.2.0"; + version = "1.5.1"; disabled = isPy27; src = fetchFromGitHub { owner = "KevinMusgrave"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-M/iH+pIuamOmvxLtKMzWXiuMCnMXzpVFRb/HfYfCKdc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-d7Ngd4SzGTJXtpgs2Jqb+y1aeMt9YUqIOft5ByDtRsc="; }; propagatedBuildInputs = [ @@ -36,14 +37,18 @@ buildPythonPackage rec { export TEST_DEVICE=cpu export TEST_DTYPES=float32,float64 # half-precision tests fail on CPU ''; + # package only requires `unittest`, but use `pytest` to exclude tests - checkInputs = [ pytestCheckHook ]; + checkInputs = [ + faiss + pytestCheckHook + ]; + disabledTests = [ - # requires FAISS (not in Nixpkgs) - "test_accuracy_calculator_and_faiss" - "test_global_embedding_space_tester" - "test_with_same_parent_label_tester" + # TypeError: setup() missing 1 required positional argument: 'world_size' + "TestDistributedLossWrapper" # require network access: + "TestInference" "test_get_nearest_neighbors" "test_tuplestoweights_sampler" "test_untrained_indexer" @@ -59,6 +64,5 @@ buildPythonPackage rec { changelog = "https://github.com/KevinMusgrave/pytorch-metric-learning/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bcdarwin ]; - broken = true; # requires faiss which is unpackaged }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix index 9d55594c57..b50d734d01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytraccar/default.nix @@ -3,6 +3,8 @@ , aresponses , buildPythonPackage , fetchFromGitHub +, poetry-core +, pydantic , pytestCheckHook , pytest-asyncio , pythonOlder @@ -10,8 +12,8 @@ buildPythonPackage rec { pname = "pytraccar"; - version = "0.10.1"; - format = "setuptools"; + version = "1.0.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -19,11 +21,16 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-fqf7sckvq5GebgpDVVSgwHISu4/wntjc/WF9LFlXN2w="; + sha256 = "sha256-ngyLe6sbTTQ7n4WdV06OlQnn/vqkD+JUruyMYS1Ym+Q="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp + pydantic ]; checkInputs = [ @@ -32,10 +39,14 @@ buildPythonPackage rec { pytest-asyncio ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + postPatch = '' # Upstream doesn't set version in the repo - substituteInPlace setup.py \ - --replace 'version="master",' 'version="${version}",' + substituteInPlace pyproject.toml \ + --replace 'version = "0"' 'version = "${version}"' ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix index 1f523b60ea..f5cbce6bcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytradfri/default.nix @@ -4,12 +4,13 @@ , fetchFromGitHub , aiocoap , dtlssocket +, pydantic , pytestCheckHook }: buildPythonPackage rec { pname = "pytradfri"; - version = "9.0.0"; + version = "11.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,10 +18,14 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "home-assistant-libs"; repo = "pytradfri"; - rev = version; - hash = "sha256-12ol+2CnoPfkxmDGJJAkoafHGpQuWC4lh0N7lSvx2DE="; + rev = "refs/tags/${version}"; + hash = "sha256-+OOmoh2HLKiHAqOIH2aB4CZcW/ND/0bszgkcdRMYBlc="; }; + propagatedBuildInputs = [ + pydantic + ]; + passthru.optional-dependencies = { async = [ aiocoap diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix index 64b3d11e95..6207b992c7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyturbojpeg/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyturbojpeg"; - version = "1.6.6"; + version = "1.6.7"; format = "setuptools"; src = fetchPypi { pname = "PyTurboJPEG"; inherit version; - hash = "sha256-gN0VNISogw2rTr58DuHLQ8VyOg6VE3X9T/j6fw0EdXw="; + hash = "sha256-e++Dl7khHWLXo+G9Gd8RQiF458OtYn+X7JU6HF6WzYA="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix index c63bcbf399..64fa2d5480 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.0.11"; + version = "4.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-81nottXXenkIPiDnR8O44ELStoh8i2yROYCPvBLiWSU="; + hash = "sha256-ID3KSKPtgslS1Z+BZprMcTSQUnQbiHKgGQQipOSER9g="; }; propagatedBuildInputs = [ @@ -71,6 +71,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov=pyunifiprotect --cov-append" "" + substituteInPlace setup.cfg \ + --replace "pydantic!=1.9.1" "pydantic" ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix index 4751ded3f3..b8d4fee93c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyupgrade/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pyupgrade"; - version = "2.37.1"; + version = "2.37.3"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "asottile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nWiaKfs2eVnwyA+UACcB/OImWSb5Nn6n/8gcGPNevM4="; + sha256 = "sha256-woHYMzk1xLDfJ14UycPlbaMG8mHeBixqDvs9vO0TKQI="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index fc109115c0..6d365ef07b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.10"; + version = "9.2.13"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-0dUUEhkFedoZLW/HOhJQQgPmfcJbDYtyup4jCZBUhSI="; + hash = "sha256-YW8kfCs9j4Ay0Kw75MFZDp24NZrcmQ+82sOdJdpBsPI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix index 4742143eda..b9101e9888 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvips/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyvips"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "libvips"; repo = "pyvips"; rev = "v${version}"; - sha256 = "sha256-qMVoVzqXALhPWVKLzu+VqihHPN7J+pMhKnXdb+ow0zw="; + sha256 = "sha256-9S7h3bkm+QP78cpemYS7l3c8t+wXsJ5MUAP2T50R/Mc="; }; nativeBuildInputs = [ pkgconfig pkg-config ]; @@ -42,6 +42,6 @@ buildPythonPackage rec { description = "A python wrapper for libvips"; homepage = "https://github.com/libvips/pyvips"; license = licenses.mit; - maintainers = with maintainers; [ ccellado ]; + maintainers = with maintainers; [ ccellado anthonyroussel ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix index 0c87af03ec..4b7a179678 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa-py/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "pyvisa-py"; - version = "0.5.1"; + version = "0.5.3"; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa-py"; - rev = version; - hash = "sha256-V1BS+BvHVI8h/rynLnOHvQdIR6RwQrNa2p2S6GQug98="; + rev = "refs/tags/${version}"; + hash = "sha256-37GptqqBSIFOpm6SpS61ZZ9C4iU5AiOduVq255mTRNo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa/default.nix index 389adfbbb4..3fb0bbd51c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvisa/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvisa/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "pyvisa"; - version = "1.11.3"; + version = "1.12.0"; src = fetchFromGitHub { owner = "pyvisa"; repo = "pyvisa"; - rev = version; - hash = "sha256-Qe7W1zPI1aedLDnhkLTDPTa/lsNnCGik5Hu+jLn+meA="; + rev = "refs/tags/${version}"; + hash = "sha256-2khTfj0RRna9YDPOs5kQHHhkeMwv3kTtGyDBYnu+Yhw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix index 456b0c3f4f..75e427f3da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pywayland"; - version = "0.4.13"; + version = "0.4.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-x075CncvfjzbIsGMj2EwFpigpwlysqBZpoK08DW9iBo="; + hash = "sha256-CXJidzwFvS1ewqYyfpJhwQtqh4TtUfhO9O0iYJpOCy0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix index 0fcbf396d3..ccb9beb601 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywizlight/default.nix @@ -32,6 +32,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + disabledTests = [ # Tests requires network features (e. g., discovery testing) "test_Bulb_Discovery" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix index 0a75f62362..ec9b925982 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pywlroots/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.18"; + version = "0.15.19"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "ZKWA0pRrh/nP1D8wUHNhM+R53l5PCKO1tnqbMfMd2WE="; + sha256 = "sha256-Ch8ddN9J8STw3qjAwP9sAta5YBgEg/2wSYgDyWEAXhU="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix index 62de8e72b4..ea61a50560 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "23.0.0"; + version = "23.2.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-pF9cBHfRLfBe8uKSK0m3wK6dD0/5trsNZmVY3w7zcSI="; + hash = "sha256-pR8SqHGarZ3PtV1FYCLxa5CryN3n08qTzjEgtA4/oWk="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix index 62adb2afd6..95cd00d8fa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qcs-api-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "qcs-api-client"; - version = "0.20.17"; + version = "0.21.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,8 +28,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rigetti"; repo = "qcs-api-client-python"; - rev = "v${version}"; - hash = "sha256-5YGMBoykMtXZgdHubQJKwRqntDPnR6/qsWJc1cYk8CA="; + rev = "refs/tags/v${version}"; + hash = "sha256-F3Fc03JWS73LcDCufWl/gLkjGvzlwLdBFVsSxtn3LvE="; }; nativeBuildInputs = [ @@ -59,7 +59,7 @@ buildPythonPackage rec { (fetchpatch { name = "switch-to-poetry-core.patch"; url = "https://github.com/rigetti/qcs-api-client-python/commit/32f0b3c7070a65f4edf5b2552648d88435469e44.patch"; - sha256 = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ="; + hash = "sha256-mOc+Q/5cmwPziojtxeEMWWHSDvqvzZlNRbPtOSeTinQ="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix index 6e3b6064fc..2d402b0764 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdarkstyle/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "qdarkstyle"; - version = "3.0.3"; + version = "3.1"; src = fetchPypi { inherit version; pname = "QDarkStyle"; - sha256 = "936d2d35b552f429803a985dbc17fc879a2f966faa9fbf8983896ccfa33e68f6"; + sha256 = "sha256-YAWE1iU0Pg3dEo3gg5PTw1Y3eGpJgn8XTSmqfKqCecE="; }; # No tests available diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix index d8e043d546..f818f49fa6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qdldl/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "qdldl"; - version = "0.1.5.post0"; + version = "0.1.5.post2"; src = fetchPypi { inherit pname version; - sha256 = "c392c7427651d8b226423c7aba4a0f2338a1f38a4bbdabac6bc4afd8bc934f06"; + sha256 = "sha256-fa960b//HacdoG6C1RR72xrIZlgWF9jwbMTu2kjioUk="; }; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix new file mode 100644 index 0000000000..8cbc94a87c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/qingping-ble/default.nix @@ -0,0 +1,53 @@ +{ lib +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "qingping-ble"; + version = "0.2.3"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "bluetooth-devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-+iUZIsaSYgptHXtNSc9sJiBU8CUEFPDsLVGuFR5WvDw="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-sensor-state-data + sensor-state-data + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=qingping_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "qingping_ble" + ]; + + meta = with lib; { + description = "Library for Qingping BLE devices"; + homepage = "https://github.com/bluetooth-devices/qingping-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index ca2f9b22d8..4cad6f0bc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.19.1"; + version = "0.19.2"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-VdGdaOxCwD2Qa0JCCDVZJtcjhmTssS/KgpcjoaPXYB8="; + sha256 = "sha256-jfOyQ0wjYsJOAlix/P9dzBPmkv901eETmBYQzIHZqfg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix index a8f45b73e4..0b40fc8fc7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; @@ -31,8 +31,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Qiskit"; repo = "qiskit-ignis"; - rev = version; - hash = "sha256-5dsRKsz/nruWKuox/WJBghp2CWSDuYvax+G5ZxjZG4s="; + rev = "refs/tags/${version}"; + hash = "sha256-WyLNtZhtuGzqCJdOBvtBjZZiGFQihpeSjJQtP7lI248="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix index ab794c9e96..7c7510675f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-nature/default.nix @@ -21,15 +21,15 @@ buildPythonPackage rec { pname = "qiskit-nature"; - version = "0.3.2"; + version = "0.4.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Qiskit"; repo = pname; - rev = version; - sha256 = "sha256-BXUVRZ8X3OJiRexNXZsnvp+Yh8ARNYohYH49/IYFYM0="; + rev = "refs/tags/${version}"; + sha256 = "sha256-trThxcft6AOxalOglOKPwrJ23Bqt/FmMCAucKmNmB7c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix index 8a649b27bd..71486b30bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit-terra/default.nix @@ -56,7 +56,7 @@ in buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.20.1"; + version = "0.21.0"; disabled = pythonOlder "3.7"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "qiskit"; repo = pname; rev = version; - sha256 = "sha256-spKLPUlUXBmnIo/rnBPUFf72Vxd53xFhh409KzytpkI="; + hash = "sha256-imktzBpgP+lq6FsVWIUK82+t76gKTgt53kPfKOnsseQ="; }; nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ rust.rustc rust.cargo cargoSetupHook ]); @@ -72,7 +72,7 @@ buildPythonPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-KNx7c5Jc1AWIpldMQ1AcWYuMb4W+yLY/cgB87hzPuVY="; + hash = "sha256-SXC0UqWjWqLlZvKCRBylSX73r4Vale130KzS0zM8gjQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix index b3c15b1b38..458fa6a146 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qiskit/default.nix @@ -28,15 +28,15 @@ in buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.36.1"; + version = "0.37.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Qiskit"; repo = "qiskit"; - rev = version; - sha256 = "sha256-cprFWWvYgfoJXvK0Xoi67BwOXQfz7XeHT/JbfErqblk="; + rev = "refs/tags/${version}"; + sha256 = "sha256-TsDDiSWSjk2iXaxFjGXQxPFEPCR242dR26H0cpA6ZxY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qnapstats/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qnapstats/default.nix index 2eeb4e81d2..1803d2ffe7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qnapstats/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qnapstats/default.nix @@ -9,15 +9,15 @@ buildPythonPackage rec { pname = "qnapstats"; - version = "0.4.0"; + version = "0.5.0"; format = "setuptools"; src = fetchFromGitHub { owner = "colinodell"; repo = "python-qnapstats"; - rev = version; - hash = "sha256-Tzi2QG1Xw12fLVfV49SPJKdz5VdJ4hQMuCHH8gxcOBE="; + rev = "refs/tags/${version}"; + hash = "sha256-dpxl6a61h8zB7eS/2lxG+2//bOTzV6s4T1W+DVj0fnI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index f9eecbe23a..a1483518f9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.3.0"; + version = "5.3.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jjUg/cdeRqvEzGz/7KFvomUnVBCbiug5+ijifR66ViU="; + sha256 = "sha256-tzcj+sQ5OLaE3LI3qIUQ3HchxDpybOqK3heaKSfAovM="; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix index 6c574c47e7..31c05ce48f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtpy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "QtPy"; - version = "2.0.1"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "13zbhnl2rm30xafwrzfwdb4mjp7gk4s9h2xagbf83pnjzczhgzdd"; + sha256 = "sha256-yozUIXF1GGNEKZ7kwPfnrc82LHCFK6NbJVpTQHcCXAY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix index 35257708ae..e0b549dd6d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/questionary/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "questionary"; - version = "1.10.0"; + version = "unstable-2022-07-27"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tmbo"; repo = pname; - rev = version; - sha256 = "14k24fq2nmk90iv0k7pnmmdhmk8z261397wg52sfcsccyhpdw3i7"; + rev = "848b040c5b7086ffe75bd92c656e15e94d905146"; + hash = "sha256-W0d1Uoy5JdN3BFfeyk1GG0HBzmgKoBApaGad0UykZaY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix index 860f9461e4..c0fb2accc5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/raincloudy/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "raincloudy"; - version = "1.1.1"; + version = "1.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "vanstinator"; repo = pname; - rev = version; - hash = "sha256-c6tux0DZY56a4BpuiMXtaqm8+JKNDiyMxrFUju3cp2Y="; + rev = "refs/tags/${version}"; + hash = "sha256-qCkBVirM09iA1sXiOB9FJns8bHjQq7rRk8XbRWrtBDI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index ef76e2d8fa..e981ea4852 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.1.2"; + version = "2.4.3"; disabled = pythonOlder "3.6"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "maxbachmann"; repo = "RapidFuzz"; - rev = "v${version}"; - hash = "sha256-7BP22Fon+7a3ZxTCS838uoLXABYdEexMEH2vZ0/KoRQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-KKRqSMU1AzXYDB50CBQ1ZcL87KgG2/tL+cmR1jnrTVk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix index d7edf7927a..7876e66674 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rasterio/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "rasterio"; - version = "1.2.10"; # not x.y[ab]z, those are alpha/beta versions + version = "1.3.0"; # not x.y[ab]z, those are alpha/beta versions format = "pyproject"; disabled = pythonOlder "3.6"; @@ -38,8 +38,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rasterio"; repo = "rasterio"; - rev = version; - hash = "sha256-xVGwQfQvxsqYihUYXENJAz9Qp9xBkhsGc/RheRTJxgo="; + rev = "refs/tags/${version}"; + hash = "sha256-CBnG1zNMOL3rAmnErv7XZZ2Cu9W+DnRPcjtKdmYXHUA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix index ab74662e3b..1d1033944f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rcssmin"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "27fc400627fd3d328b7fe95af2a01f5d0af6b5af39731af5d071826a1f08e362"; + sha256 = "sha256-T5QAtDZtKfX1RG9Y54VJr6gzjmpZdAxzEV6fasQT3GQ="; }; # The package does not ship tests, and the setup machinary confuses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix index f98e4d992a..2dcb884931 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rdkit/default.nix @@ -40,7 +40,7 @@ let in buildPythonPackage rec { pname = "rdkit"; - version = "2022.03.3"; + version = "2022.03.4"; src = let @@ -50,7 +50,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "Release_${versionTag}"; - sha256 = "sha256-YZq1JKDlCQVvjv7+XpEhD/wfFcQ5m3i5VO4rNQ3ONRQ="; + sha256 = "13aga2fy1hgldb229n16niv30n3lwlypd7xv16smpbgw0cp1xpp2"; }; unpackPhase = '' @@ -133,6 +133,7 @@ buildPythonPackage rec { "-DBOOST_ROOT=${boost}" "-DBoost_NO_SYSTEM_PATHS=ON" "-DBoost_NO_BOOST_CMAKE=TRUE" + "-DCMAKE_SKIP_BUILD_RPATH=ON" # fails to find libs in pythonImportsCheckPhase otherwise ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index b71a675f6d..e0ba8cd57c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.1.5"; + version = "2.1.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-G/QuIOW3qUOJGnmM5cy5H9W6wiMLDBmdhTgMkhAHa3g="; + sha256 = "sha256-pX43E9r3e/kdG6GeS5iIpHwKv+tj7PAuOsd/z9mb/mk="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix index 2018006caa..adaf4d86ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/redis/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "redis"; - version = "4.2.1"; + version = "4.3.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/kVROIEinb7mEGILnggXsfSMR7pjWHAyD9RKcSIEu90="; + sha256 = "sha256-3fJwcd9K3zghxPLKWdZ1JcOoLl8mi+2XuBPLT6v4eIA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index 71b8ecad8e..e9d504f5bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.07.3"; + version = "2022.08.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-z7FrVnGQjpTjdIX/gatP/ZjzOLaj2D8XsQ+UTYBOHgE="; + sha256 = "sha256-JPJ+8h3r1C2fHxVPsQgk0ZuG7VqKfBb4qthAG+GCvcE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix index a2cfdd98d8..5b2165c758 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/renault-api/default.nix @@ -47,6 +47,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + pythonImportsCheck = [ "renault_api" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix index 0b5d783581..896eb093cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reolink/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "reolink"; - version = "0.60"; + version = "0.61"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "fwestenberg"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-4yk05obra0icWHPXaJ+Wj+xxDRkVYg/VsrXTQUdHJIc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-XUYTDHh0oTro6BT+h4LjRdMukOZTlWP+giFpjLciZNQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix index 1bb3475168..795a3168c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reorder-python-imports/default.nix @@ -4,21 +4,25 @@ , pytestCheckHook , pythonOlder , aspy-refactor-imports +, classify-imports }: buildPythonPackage rec { pname = "reorder-python-imports"; - version = "3.1.0"; + version = "3.8.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "asottile"; repo = "reorder_python_imports"; rev = "v${version}"; - hash = "sha256-Ge+VQjK24TqWLMQS19DBX+FFHF3irogK21orlENJx50="; + hash = "sha256-CLC9dfNSYqEBZB2fP34jpA/4cxm0HZzjo/e7Yn8XPFc="; }; - propagatedBuildInputs = [ aspy-refactor-imports ]; + propagatedBuildInputs = [ + aspy-refactor-imports + classify-imports + ]; pythonImportsCheck = [ "reorder_python_imports" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix index 35289d3b5d..58b80d89c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix @@ -12,11 +12,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.6.9"; + version = "3.6.11"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XQzDaCRWrSExUPbb/+fUfqtzfYCeUXwxYQM3a+VI+4Q="; + sha256 = "sha256-BPxEIPBUiBXQYj4DHIah9/PzAD5pnZr3FIdC4tcrAko="; }; checkInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index 5d5e27a2e1..9efb54e353 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "repoze.sphinx.autointerface"; - version = "0.8"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "8ef0383276ab722efb1e4a6523726262058dfd82615ccf7e5004aee3fe8ecc23"; + sha256 = "sha256-SGvxQjpGlrkVPkiM750ybElv/Bbd6xSwyYh7RsYOKKE="; }; propagatedBuildInputs = [ zope_interface sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix index 3f8376f659..ace3052e5a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, python3 +, python , pythonOlder , fetchFromGitHub , poetry-core @@ -26,7 +26,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace ./tests/unit/conftest.py --replace \ "os.path.abspath(os.path.join(__file__, \"../../../../reqif\"))" \ - "\"${placeholder "out"}/${python3.sitePackages}/reqif\"" + "\"${placeholder "out"}/${python.sitePackages}/reqif\"" substituteInPlace pyproject.toml --replace "^" ">=" substituteInPlace requirements.txt --replace "==" ">=" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix index 9e092ca825..23d24c9445 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-cache/default.nix @@ -3,24 +3,30 @@ , attrs , buildPythonPackage , bson +, boto3 +, botocore , cattrs +, exceptiongroup , fetchFromGitHub , itsdangerous , poetry-core +, pymongo , pytestCheckHook , pythonOlder , pyyaml +, redis , requests , requests-mock , rich , timeout-decorator , ujson +, urllib3 , url-normalize }: buildPythonPackage rec { pname = "requests-cache"; - version = "0.9.4"; + version = "0.9.5"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -29,7 +35,7 @@ buildPythonPackage rec { owner = "reclosedev"; repo = "requests-cache"; rev = "v${version}"; - hash = "sha256-9OlWMom/0OMlbPd3evjIaX75Gjlu+F8vKBJwX4Z58qQ="; + hash = "sha256-oVEai7SceZUdsGYlOOMxO6DxMZMVsvqXvEu0cHzq7lY="; }; nativeBuildInputs = [ @@ -39,21 +45,46 @@ buildPythonPackage rec { propagatedBuildInputs = [ appdirs attrs - bson cattrs - itsdangerous - pyyaml + exceptiongroup requests - ujson + urllib3 url-normalize ]; + passthru.optional-dependencies = { + dynamodb = [ + boto3 + botocore + ]; + mongodbo = [ + pymongo + ]; + redis = [ + redis + ]; + bson = [ + bson + ]; + json = [ + ujson + ]; + security = [ + itsdangerous + ]; + yaml = [ + pyyaml + ]; + }; + checkInputs = [ pytestCheckHook requests-mock rich timeout-decorator - ]; + ] + ++ passthru.optional-dependencies.json + ++ passthru.optional-dependencies.security; preCheck = '' export HOME=$(mktemp -d); diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix index 0417154a4a..af6788d173 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -26,7 +26,6 @@ buildPythonPackage rec { checkInputs = [ betamax mock - pyopenssl pytestCheckHook ]; @@ -37,6 +36,16 @@ buildPythonPackage rec { url = "https://github.com/requests/toolbelt/commit/7188b06330e5260be20bce8cbcf0d5ae44e34eaf.patch"; sha256 = "sha256-pRkG77sNglG/KsRX6JaPgk4QxmmSBXypFRp/vNA3ot4="; }) + # Make pyopenssl optional + (fetchpatch { + url = "https://github.com/requests/toolbelt/commit/c7c1f8626b73e5715e6ecc1de0833fabdfd67323.patch"; + sha256 = "sha256-OhE3nyYyKKRHs9rCq8EJYebwaYyjWjbvbtL79MIMMRc="; + }) + # Make pyopenssl optional + (fetchpatch { + url = "https://github.com/requests/toolbelt/commit/2453f32f1c995e7b19294750a4177bc32326826e.patch"; + sha256 = "sha256-qmKHp+aVeazZt8X+sZeYfZCB56SE0OvFvWCXRZtkCew="; + }) ]; disabledTests = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix index 241f0f9e9d..c144ed9adb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/respx/default.nix @@ -35,6 +35,10 @@ buildPythonPackage rec { trio ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + postPatch = '' sed -i "/--cov/d" setup.cfg ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix index 805f3cf6e9..168915a4ca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rich/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "rich"; - version = "12.4.4"; + version = "12.5.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DW6cKJ5bXZdHGzgbYzTS+ryjy71dU9Lcy+egMXL30F8="; + sha256 = "sha256-FjzvFx+A4DS2XeKBZ2DGRqudvH22AUSQJnIxKs2O0AU="; }; nativeBuildInputs = [ poetry-core ]; @@ -38,12 +39,17 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + # darwin console duplicates 3 of 4 lines + "test_rich_console_ex" + ]; + pythonImportsCheck = [ "rich" ]; meta = with lib; { description = "Render rich text, tables, progress bars, syntax highlighting, markdown and more to the terminal"; homepage = "https://github.com/Textualize/rich"; license = licenses.mit; - maintainers = with maintainers; [ ris ]; + maintainers = with maintainers; [ ris jyooru ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix index 2dbc72b1d0..426ec492b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "rjsmin"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "6c529feb6c400984452494c52dd9fdf59185afeacca2afc5174a28ab37751a1b"; + sha256 = "sha256-H5gr6OARQ4d3qUMHJ5tAE0o5NfwPB5MS7imXJbivVBE="; }; # The package does not ship tests, and the setup machinary confuses diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix index b43227c8f5..a81c24db7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.9.2"; + version = "0.9.3"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "b40f7869312b37975b6705057f73ee335dba8176bb784b607680c57d58c9ef62"; + sha256 = "sha256-C754uOezq5vsSWilG/N5XiZxABp4Cyt+vyriFSmI2jU="; }; buildInputs = [ unittest2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix index 5c46686ada..6e7897413e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/robotsuite/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "robotsuite"; - version = "2.2.1"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "8764e01990ac6774e0c983579bcb9cb79f44373a61ad47fbae9a1dc7eedbdd61"; + sha256 = "sha256-iugVKUPl6HTTO8K1EbSqAk1fl/fsEPoOcsOnnAgcEas="; }; buildInputs = [ unittest2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix index 82db76bc85..bdf6f0f319 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpcq/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rpcq"; - version = "3.9.2"; + version = "3.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rigetti"; repo = pname; - rev = "v${version}"; - sha256 = "1vvf6y7459f8aamhkcxx36ajiai143s2vwg751x0dl0lx7hp3yn5"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-J7jtGXJIF3jp0a0IQZmSR4TWf9D02Luau+Bupmi/d68="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix index 6e83db8a96..ac5eb3a90e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.4.5"; + version = "3.5.3"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "5d31a5ea43f5a59f6dec30faca87edb01fc9b8affa0beae96a99be923bd7dab3"; + sha256 = "sha256-U6CS1ItE9GQo+zDLMVVmTW0vevCOvExF35jfTEWkLMs="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch index a9e10f02b0..2617472096 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/rpy2/rpy2-3.x-r-libs-site.patch @@ -1,11 +1,11 @@ diff --git a/rpy2/rinterface_lib/embedded.py b/rpy2/rinterface_lib/embedded.py -index 1f4babbf..322363c5 100644 +index ccd3a315..51fb5da4 100644 --- a/rpy2/rinterface_lib/embedded.py +++ b/rpy2/rinterface_lib/embedded.py -@@ -118,6 +118,16 @@ def _initr( - if openrlib.R_HOME is None: - raise ValueError('openrlib.R_HOME cannot be None.') - os.environ['R_HOME'] = openrlib.R_HOME +@@ -276,6 +276,16 @@ def _initr( + os.environ.get('LD_LIBRARY_PATH', '')) + ) + ) + + # path to libraries + existing = os.environ.get('R_LIBS_SITE') diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix index a867a94348..b296f5dc16 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck-core/default.nix @@ -47,7 +47,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' + --replace 'types-docutils = ">=0.18, <0.19"' 'types-docutils = ">=0.18"' \ + --replace 'docutils = ">=0.7, <0.19"' 'docutils = ">=0.7"' ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtslib/default.nix index e6289378c9..ac0c0fb692 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rtslib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rtslib/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "rtslib"; - version = "2.1.74"; + version = "2.1.75"; src = fetchFromGitHub { owner = "open-iscsi"; repo = "${pname}-fb"; - rev = "v${version}"; - sha256 = "1in10z6ckmkfhykar435k1fmswbfajysv4g9nsav893ij8g694fy"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-qBlr4K+LeJIC6Hwy6dN9n/VjHIUYCy8pLlRtPvooWyE="; }; propagatedBuildInputs = [ six pyudev pygobject3 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix index 5febbe9f9a..8d7277823a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rx/default.nix @@ -1,16 +1,16 @@ -{ lib, fetchFromGitHub, buildPythonPackage, pythonOlder, nose }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, nose }: buildPythonPackage rec { pname = "rx"; version = "3.2.0"; disabled = pythonOlder "3.6"; - # There are no tests on the pypi source - src = fetchFromGitHub { - owner = "ReactiveX"; - repo = "rxpy"; - rev = "v${version}"; - sha256 = "159ln0c721rrdz0mqyl3zvv6qsry7ql7ddlpwpnxs9q15ik15mnj"; + # Use fetchPypi to avoid the updater script to migrate it to `reactivex` which + # is being developed in the same repository + src = fetchPypi { + inherit version; + pname = "Rx"; + sha256 = "b657ca2b45aa485da2f7dcfd09fac2e554f7ac51ff3c2f8f2ff962ecd963d91c"; }; checkInputs = [ nose ]; @@ -20,6 +20,8 @@ buildPythonPackage rec { # test_new_thread_scheduler_timeout: https://hydra.nixos.org/build/74949851 doCheck = false; + pythonImportsCheck = [ "rx" ]; + meta = { homepage = "https://github.com/ReactiveX/RxPY"; description = "Reactive Extensions for Python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3-credentials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3-credentials/default.nix index 032d3a5dda..13431569d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/s3-credentials/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/s3-credentials/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "s3-credentials"; - version = "0.12"; + version = "0.12.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NDUm/RhlmuZwB3fwwom2Y9PcF6J4+G29WHE7lqdDP3Y="; + hash = "sha256-w0pwQidSAh/CQPVbv4UocbbETyyOT/rcNFE1ixYz4lY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix index 3b07fe5b6d..acd739d854 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/s3transfer/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.5.0"; + version = "0.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "boto"; repo = pname; rev = version; - hash = "sha256-0Dl7oKB2xxq/a8do3HgBUIGay88yOGBUdOGo+QCtnUE="; + hash = "sha256-LM1/joc6TeyLLeAHpuCTz2vgpQ3TMkHrKitfiUp5ZrY="; }; propagatedBuildInputs = [ botocore ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix index edc339987d..4ae2b044ab 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sabyenc3/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "sabyenc3"; - version = "5.4.2"; + version = "5.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6wXwmL1RCZ72KSqJgMjO3grvuDLWyMsbuU+kJmEkCmM="; + hash = "sha256-ei/SnVg4Oy6cBBPxg14lMMQBgbNR4Fg0aa+8sVBTY0Y="; }; # Tests are not included in pypi distribution diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safeio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safeio/default.nix new file mode 100644 index 0000000000..313c32156c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/safeio/default.nix @@ -0,0 +1,24 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "safeio"; + version = "1.2"; + + src = fetchPypi { + pname = "safeIO"; + inherit version; + sha256 = "d480a6dab01a390ebc24c12d6b774ad00cef3db5348ad07d8bd11d272a808cd3"; + }; + + pythonImportsCheck = [ "safeIO" ]; + + meta = with lib; { + description = "Safely make I/O operations to files in Python even from multiple threads"; + homepage = "https://github.com/Animenosekai/safeIO"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix index b897d6ced4..5394a2af99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "safety"; - version = "2.0.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "d739d00a9e4203cfaba34540c822a73ca1d327159ed7776b3dce09391f81c35d"; + hash = "sha256-28Xf+i5H2nbMQ9/oy7v8qZ0pEY0MbFTfz6EcK9NJ3/Y="; }; postPatch = '' @@ -53,6 +53,9 @@ buildPythonPackage rec { "test_announcements_if_is_not_tty" "test_check_live" "test_check_live_cached" + "test_check_vulnerabilities" + "test_license" + "test_chained_review" ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index 34dd01607c..77d4cc5aa2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.99.0"; + version = "2.103.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-az3SmbDgA5bbyV6BPYVIWf2fgXLqNu67/6NoM/K7NL8="; + hash = "sha256-0iXIUWvoL6+kT+KaJq7yzdEzYA0orKBbQkGAVUYcSKk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix index 2ab9c0808b..45dec87633 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -107,6 +107,9 @@ buildPythonPackage rec { "test_keep_alive_client_timeout" "test_keep_alive_server_timeout" "test_zero_downtime" + # broke with ujson 5.4 upgrade + # https://github.com/sanic-org/sanic/pull/2504 + "test_json_response_json" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix index 1980b18dab..e35c1bb691 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "schema-salad"; - version = "8.2.20220204150214"; + version = "8.3.20220626185350"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-PlPb/nE3eWueUTWSDpa7JxPe2ee+KFna5VTR3IsClwQ="; + hash = "sha256-g8h3dAdN+tbdLRO3ctmsW+ZLiyhU0zPd1XR+XvEBpwo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix index a3e390a0d6..84b411de90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/schwifty/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "schwifty"; - version = "2022.7.0"; + version = "2022.7.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pvuyK++Te/SACKj3k/1SlitRkFD6t4GrAghhqoIdUgE="; + sha256 = "sha256-X0zp35iF/nQhHxm5WfRvrODRt7mkHTKP6zYMZlCTAa8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 803daeb2ab..7b9707278d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.12"; + version = "0.4.15"; format = "pyproject"; # fetch from github as we want the data files @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scikit-hep"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-ZnsOmsajW4dDv53I/Cuu97mPJywGiwFhNGpT1WRfxSw="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cEEtuLmGg/bDRYTUQXQiplzES28+xh8iQge6xZUTWIA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix index 82a85d7094..6a97bcd468 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-learn/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "1.0.2"; + version = "1.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-tYcJWaVIS2FPJtMcpMF1JLGwMXUiGZ3JhcO0JW4DB2c="; + sha256 = "sha256-Pne3Ho5kT4bItb5/HChe9ZfeTDhJYTie4+nKNsRFslY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix index 78ed6446f4..21baa7bfa3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikits-odes/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "scikits.odes"; - version = "2.6.3"; + version = "2.6.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9693da78d1bd0bd6af8db59aeaaed92a399c6af36960c6a0a665a2130eab59e7"; + sha256 = "sha256-fS9E0kO+ZEcGjiWQPAQHa52zOz9RafNSBPNKypm0GhA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix index d92dcc60f8..4b6342691d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-MdTy1rckvJqY5Se1hJuKflib8epjDDOqVj7akSyf8L0="; + sha256 = "sha256-nj+xsOiW8UqFqpoo1fdV2q7rVMiXt0bfelXMsCs0DzM="; }; nativeBuildInputs = [ cython gfortran pythran ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix index 07d942f010..69351e2e6a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrap-engine/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "scrap_engine"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-dn/9wxK1UHd3cc3Jo1Cp9tynOFUlndH+cZfIc244ysE="; + sha256 = "sha256-rMZRD/fE1ed8R5GwS3aZcHLScQ1+uSpX29LwBXtXEao="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix index 44c86cc47a..72e1c832da 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scrapy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { pname = "scrapy"; - version = "2.6.1"; + version = "2.6.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -38,7 +38,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "Scrapy"; - sha256 = "56fd55a59d0f329ce752892358abee5a6b50b4fc55a40420ea317dc617553827"; + sha256 = "55e21181165f25337105fff1efc8393296375cea7de699a7e703bbd265595f26"; }; nativeBuildInputs = [ @@ -111,6 +111,7 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ "test_xmliter_encoding" "test_download" + "test_reactor_default_twisted_reactor_select" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix index 90caa943eb..ca137888ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/screenlogicpy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "screenlogicpy"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "dieselrabbit"; repo = pname; - rev = "v${version}"; - sha256 = "0r9227s4v17jm5n0j31ssnak9f5p7xfvz4r1fwy61286is3j5gbb"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-1tBr7k7RutCHvea/56J7drl9P+WZ5bQpDeQwhgktc1s="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix index a1db98deeb..1011357943 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/selenium/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "selenium"; - version = "4.2.0"; + version = "4.3.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SeleniumHQ"; repo = "selenium"; - rev = "selenium-${version}"; # check if there is a newer tag with -python suffix - sha256 = "sha256-KhBCMsWGRD7hJqumA1+K8AVhJ7hq26XkEa1QbgY0Q0w="; + rev = "refs/tags/selenium-${version}"; # check if there is a newer tag with -python suffix + sha256 = "sha256-tD2sJGVBwqB0uOM3zwdNn71+ILYEHPAvWHvoJN24w6E="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix index d3ca445961..131cf230ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/semantic-version/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "semantic-version"; - version = "2.9.0"; + version = "2.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "semantic_version"; inherit version; - sha256 = "sha256-q/VIc1U+Xgem/U1fZTt4H1rkEpekk2ZrWdzyFABqErI="; + sha256 = "sha256-vau20zaZjLs3jUuds6S1ah4yNXAdwF6iaQ2amX7VBBw="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix new file mode 100644 index 0000000000..ab451315c5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "sensor-state-data"; + version = "2.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Z4sHrj0APoCfPhdSKB9guRrPo4TD47+GcQ0KoFgb268="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=sensor_state_data --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "sensor_state_data" + ]; + + meta = with lib; { + description = "Models for storing and converting Sensor Data state"; + homepage = "https://github.com/bluetooth-devices/sensor-state-data"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix new file mode 100644 index 0000000000..80fcbfa176 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sensorpush-ble/default.nix @@ -0,0 +1,55 @@ +{ lib +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "sensorpush-ble"; + version = "1.5.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-2Q56fXMgw1Al3l6WKI1cdGXfLmZ1qkidkoWKmvEXRaI="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bluetooth-sensor-state-data + home-assistant-bluetooth + sensor-state-data + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=sensorpush_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "sensorpush_ble" + ]; + + meta = with lib; { + description = "Library for SensorPush BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/sensorpush-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index eca91def23..91b0fb6b72 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.7.2"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-0VQ1P3xWC1keoXaPfIzh+uGXvRAK3nOrc6fLKIhfiHk="; + hash = "sha256-sZpM9wgybyt/5Rw3X05whLvQNMC55o+s7eYA4QJdj6c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix index 12abfba056..2ab2b081f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/serpent/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "serpent"; - version = "1.40"; + version = "1.41"; src = fetchPypi { inherit pname version; - sha256 = "10b34e7f8e3207ee6fb70dcdc9bce473851ee3daf0b47c58aec1b48032ac11ce"; + sha256 = "sha256-BAcDX+PGZEOH1Iz/FGfVqp/v+BTQc3K3hnftDuPtcJU="; }; propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix index 80fb7ab77f..c48b7b9e1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setproctitle/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "setproctitle"; - version = "1.2.2"; + version = "1.2.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "7dfb472c8852403d34007e01d6e3c68c57eb66433fb8a5c77b13b89a160d97df"; + sha256 = "sha256-7PKLHAenmddvQyblCBV7ca7aB7hLkDaOpFHAcQ29MsA="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix index ba6ff1649e..86d2784beb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-declarative-requirements/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "setuptools-declarative-requirements"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1l8zmcnp9h8sp8hsw7b81djaa1a9yig0y7i4phh5pihqz1gdn7yi"; + sha256 = "sha256-V6W5u5rTUMJ46Kpr5M3rvNklubpx1qcSoXimGM+4mPc="; }; buildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix index 10f46fecf6..04284a703b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "1.3.0"; + version = "1.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lYxb9Ktkg9Wdq4iFOBIYccxQBjVKQvsPvVCs8Dyq0d4="; + sha256 = "sha256-GP+FCDH1juIdV4OCXJn61jLaIeR2RelCf9fewEgCnnY="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix index 5dbb8ca2d1..556f1e0a37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm-git-archive/default.nix @@ -1,20 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytest }: +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, pytestCheckHook }: buildPythonPackage rec { pname = "setuptools-scm-git-archive"; - version = "1.1"; + version = "1.4"; src = fetchPypi { inherit version; pname = "setuptools_scm_git_archive"; - sha256 = "6026f61089b73fa1b5ee737e95314f41cb512609b393530385ed281d0b46c062"; + sha256 = "b048b27b32e1e76ec865b0caa4bb85df6ddbf4697d6909f567ac36709f6ef2f0"; }; nativeBuildInputs = [ setuptools-scm ]; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; + + pytestFlagsArray = [ + "tests.py" + ]; - doCheck = false; pythonImportsCheck = [ "setuptools_scm_git_archive" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix index 5fa082d822..229460e557 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-scm/default.nix @@ -2,6 +2,7 @@ , callPackage , fetchPypi , packaging +, typing-extensions , tomli , setuptools , lib @@ -9,16 +10,17 @@ buildPythonPackage rec { pname = "setuptools-scm"; - version = "6.4.2"; + version = "7.0.5"; src = fetchPypi { pname = "setuptools_scm"; inherit version; - sha256 = "sha256-aDOsZcbtlxGk1dImb4Akz6B8UzoOVfTBL27/KApanjA="; + sha256 = "sha256-Ax4Tr3cdb4krlBrbbqBFRbv5Hrxc5ox4qvP/9uH7SEQ="; }; propagatedBuildInputs = [ packaging + typing-extensions tomli setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix index 772d9c79c2..883ca18e93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchFromGitHub -, fetchpatch , python , bootstrapped-pip , lib @@ -11,7 +10,7 @@ let pname = "setuptools"; - version = "61.2.0"; + version = "63.2.0"; # Create an sdist of setuptools sdist = stdenv.mkDerivation rec { @@ -21,21 +20,13 @@ let owner = "pypa"; repo = pname; rev = "v${version}"; - hash = "sha256-Cgz3uA8U7A1lOZNuj1EYZVViZ3aL6VjcAno8GYQUufk="; + hash = "sha256-GyQjc0XulUxl3Btpj7Q6KHTpd1FDZnXCYviYjjgK7tY="; name = "${pname}-${version}-source"; }; patches = [ ./tag-date.patch ./setuptools-distutils-C++.patch - # Use sysconfigdata to find headers. Fixes cross-compilation of extension modules. - # https://github.com/pypa/distutils/pull/145 - (fetchpatch { - url = "https://github.com/pypa/distutils/commit/aed7294b7b0c228cc0666a8b04f2959bf310ab57.patch"; - hash = "sha256-/9+TKv0nllBfnj48zcXLrOgyBj52dBIVbrpnIaQ4O84="; - stripLen = 2; - extraPrefix = "setuptools/_distutils/"; - }) ]; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch index 43601d8b6e..ae844ecd2d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools/setuptools-distutils-C++.patch @@ -1,78 +1,84 @@ diff --git a/setuptools/_distutils/cygwinccompiler.py b/setuptools/_distutils/cygwinccompiler.py -index c5c86d8f..b879e447 100644 +index 445e2e51..2fdbdcca 100644 --- a/setuptools/_distutils/cygwinccompiler.py +++ b/setuptools/_distutils/cygwinccompiler.py -@@ -124,14 +124,19 @@ class CygwinCCompiler(UnixCCompiler): +@@ -131,14 +131,19 @@ class CygwinCCompiler(UnixCCompiler): self.cxx = os.environ.get('CXX', 'g++') self.linker_dll = self.cc + self.linker_dll_cxx = self.cxx shared_option = "-shared" - self.set_executables(compiler='%s -mcygwin -O -Wall' % self.cc, - compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc, - compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, -+ compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx, - linker_exe='%s -mcygwin' % self.cc, - linker_so=('%s -mcygwin %s' % -- (self.linker_dll, shared_option))) -+ (self.linker_dll, shared_option)), -+ linker_exe_cxx='%s -mcygwin' % self.cxx, -+ linker_so_cxx=('%s -mcygwin %s' % -+ (self.linker_dll_cxx, shared_option))) + self.set_executables( + compiler='%s -mcygwin -O -Wall' % self.cc, + compiler_so='%s -mcygwin -mdll -O -Wall' % self.cc, + compiler_cxx='%s -mcygwin -O -Wall' % self.cxx, ++ compiler_so_cxx='%s -mcygwin -mdll -O -Wall' % self.cxx, + linker_exe='%s -mcygwin' % self.cc, + linker_so=('%s -mcygwin %s' % (self.linker_dll, shared_option)), ++ linker_exe_cxx='%s -mcygwin' % self.cxx, ++ linker_so_cxx=('%s -mcygwin %s' % ++ (self.linker_dll_cxx, shared_option)), + ) # Include the appropriate MSVC runtime library if Python was built - # with MSVC 7.0 or later. -@@ -162,8 +167,12 @@ class CygwinCCompiler(UnixCCompiler): +@@ -170,9 +175,12 @@ class CygwinCCompiler(UnixCCompiler): raise CompileError(msg) - else: # for other files use the C-compiler + else: # for other files use the C-compiler try: -- self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) +- self.spawn( +- self.compiler_so + cc_args + [src, '-o', obj] + extra_postargs +- ) + if self.detect_language(src) == 'c++': + self.spawn(self.compiler_so_cxx + cc_args + [src, '-o', obj] + -+ extra_postargs) ++ extra_postargs) + else: -+ self.spawn(self.compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) ++ self.spawn( ++ self.compiler_so + cc_args + [src, '-o', obj] + extra_postargs) except DistutilsExecError as msg: raise CompileError(msg) -@@ -279,9 +288,13 @@ class Mingw32CCompiler(CygwinCCompiler): - self.set_executables(compiler='%s -O -Wall' % self.cc, - compiler_so='%s -mdll -O -Wall' % self.cc, - compiler_cxx='%s -O -Wall' % self.cxx, -+ compiler_so_cxx='%s -mdll -O -Wall' % self.cxx, - linker_exe='%s' % self.cc, - linker_so='%s %s' -- % (self.linker_dll, shared_option)) -+ % (self.linker_dll, shared_option), -+ linker_exe_cxx='%s' % self.cxx, -+ linker_so_cxx='%s %s' -+ % (self.linker_dll_cxx, shared_option)) +@@ -323,9 +331,12 @@ class Mingw32CCompiler(CygwinCCompiler): + self.set_executables( + compiler='%s -O -Wall' % self.cc, + compiler_so='%s -mdll -O -Wall' % self.cc, ++ compiler_so_cxx='%s -mdll -O -Wall' % self.cxx, + compiler_cxx='%s -O -Wall' % self.cxx, + linker_exe='%s' % self.cc, + linker_so='%s %s' % (self.linker_dll, shared_option), ++ linker_exe_cxx='%s' % self.cxx, ++ linker_so_cxx='%s %s' % (self.linker_dll_cxx, shared_option) + ) # Maybe we should also append -mthreads, but then the finished - # dlls need another dll (mingwm10.dll see Mingw32 docs) diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py -index 9fad3835..889e2595 100644 +index e41d51ee..f7ded14b 100644 --- a/setuptools/_distutils/sysconfig.py +++ b/setuptools/_distutils/sysconfig.py -@@ -216,9 +216,11 @@ def customize_compiler(compiler): - _osx_support.customize_compiler(_config_vars) - _config_vars['CUSTOMIZED_OSX_COMPILER'] = 'True' +@@ -280,6 +280,7 @@ def customize_compiler(compiler): + cflags, + ccshared, + ldshared, ++ ldcxxshared, + shlib_suffix, + ar, + ar_flags, +@@ -289,11 +290,14 @@ def customize_compiler(compiler): + 'CFLAGS', + 'CCSHARED', + 'LDSHARED', ++ 'LDCXXSHARED', + 'SHLIB_SUFFIX', + 'AR', + 'ARFLAGS', + ) -- (cc, cxx, cflags, ccshared, ldshared, shlib_suffix, ar, ar_flags) = \ -- get_config_vars('CC', 'CXX', 'CFLAGS', -- 'CCSHARED', 'LDSHARED', 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') -+ (cc, cxx, cflags, ccshared, ldshared, ldcxxshared, shlib_suffix, ar, ar_flags) = \ -+ get_config_vars('CC', 'CXX', 'CFLAGS', 'CCSHARED', 'LDSHARED', 'LDCXXSHARED', -+ 'SHLIB_SUFFIX', 'AR', 'ARFLAGS') -+ + cxxflags = cflags - ++ if 'CC' in os.environ: newcc = os.environ['CC'] -@@ -232,19 +234,27 @@ def customize_compiler(compiler): + if 'LDSHARED' not in os.environ and ldshared.startswith(cc): +@@ -305,19 +309,27 @@ def customize_compiler(compiler): cxx = os.environ['CXX'] if 'LDSHARED' in os.environ: ldshared = os.environ['LDSHARED'] @@ -81,7 +87,7 @@ index 9fad3835..889e2595 100644 if 'CPP' in os.environ: cpp = os.environ['CPP'] else: - cpp = cc + " -E" # not always + cpp = cc + " -E" # not always if 'LDFLAGS' in os.environ: ldshared = ldshared + ' ' + os.environ['LDFLAGS'] + ldcxxshared = ldcxxshared + ' ' + os.environ['LDFLAGS'] @@ -101,7 +107,7 @@ index 9fad3835..889e2595 100644 if 'AR' in os.environ: ar = os.environ['AR'] if 'ARFLAGS' in os.environ: -@@ -253,13 +263,17 @@ def customize_compiler(compiler): +@@ -326,13 +338,17 @@ def customize_compiler(compiler): archiver = ar + ' ' + ar_flags cc_cmd = cc + ' ' + cflags @@ -114,61 +120,46 @@ index 9fad3835..889e2595 100644 + compiler_cxx=cxx_cmd, + compiler_so_cxx=cxx_cmd + ' ' + ccshared, linker_so=ldshared, - linker_exe=cc, + linker_so_cxx=ldcxxshared, + linker_exe=cc, + linker_exe_cxx=cxx, - archiver=archiver) + archiver=archiver, + ) - if 'RANLIB' in os.environ and compiler.executables.get('ranlib', None): diff --git a/setuptools/_distutils/unixccompiler.py b/setuptools/_distutils/unixccompiler.py -index 715408f5..6125a1eb 100644 +index 4be74fdf..66f95aef 100644 --- a/setuptools/_distutils/unixccompiler.py +++ b/setuptools/_distutils/unixccompiler.py -@@ -110,14 +110,17 @@ class UnixCCompiler(CCompiler): - # are pretty generic; they will probably have to be set by an outsider - # (eg. using information discovered by the sysconfig about building - # Python extensions). -- executables = {'preprocessor' : None, -- 'compiler' : ["cc"], -- 'compiler_so' : ["cc"], -- 'compiler_cxx' : ["cc"], -- 'linker_so' : ["cc", "-shared"], -- 'linker_exe' : ["cc"], -- 'archiver' : ["ar", "-cr"], -- 'ranlib' : None, -+ executables = {'preprocessor' : None, -+ 'compiler' : ["cc"], -+ 'compiler_so' : ["cc"], -+ 'compiler_cxx' : ["c++"], -+ 'compiler_so_cxx' : ["c++"], -+ 'linker_so' : ["cc", "-shared"], -+ 'linker_exe' : ["cc"], -+ 'linker_so_cxx' : ["c++", "-shared"], -+ 'linker_exe_cxx' : ["c++"], -+ 'archiver' : ["ar", "-cr"], -+ 'ranlib' : None, - } +@@ -112,9 +112,12 @@ class UnixCCompiler(CCompiler): + 'preprocessor': None, + 'compiler': ["cc"], + 'compiler_so': ["cc"], +- 'compiler_cxx': ["cc"], ++ 'compiler_cxx': ["c++"], ++ 'compiler_so_cxx': ["c++"], + 'linker_so': ["cc", "-shared"], ++ 'linker_so_cxx': ["c++", "-shared"], + 'linker_exe': ["cc"], ++ 'linker_exe_cxx': ["c++", "-shared"], + 'archiver': ["ar", "-cr"], + 'ranlib': None, + } +@@ -174,8 +177,13 @@ class UnixCCompiler(CCompiler): - if sys.platform[:6] == "darwin": -@@ -169,9 +172,15 @@ class UnixCCompiler(CCompiler): def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - compiler_so = compiler_fixup( - self.compiler_so, cc_args + extra_postargs) -+ compiler_so_cxx = compiler_fixup( -+ self.compiler_so_cxx, cc_args + extra_postargs) + compiler_so = compiler_fixup(self.compiler_so, cc_args + extra_postargs) ++ compiler_so_cxx = compiler_fixup(self.compiler_so_cxx, cc_args + extra_postargs) try: -- self.spawn(compiler_so + cc_args + [src, '-o', obj] + -- extra_postargs) +- self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs) + if self.detect_language(src) == 'c++': + self.spawn(compiler_so_cxx + cc_args + [ src, '-o', obj] + -+ extra_postargs) ++ extra_postargs) + else: -+ self.spawn(compiler_so + cc_args + [src, '-o', obj] + -+ extra_postargs) ++ self.spawn(compiler_so + cc_args + [src, '-o', obj] + extra_postargs) except DistutilsExecError as msg: raise CompileError(msg) -@@ -233,7 +242,8 @@ class UnixCCompiler(CCompiler): +@@ -243,7 +251,8 @@ class UnixCCompiler(CCompiler): # building an executable or linker_so (with shared options) # when building a shared library. building_exe = target_desc == CCompiler.EXECUTABLE diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix index 5bd399713d..03f3b64ee5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sfepy/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isLinux && stdenv.isAarch64; homepage = "https://sfepy.org/"; description = "Simple Finite Elements in Python"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix index e6502a7652..737156ad83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shamir-mnemonic/default.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "Reference implementation of SLIP-0039"; homepage = "https://github.com/trezor/python-shamir-mnemonic"; license = licenses.mit; - maintainers = with maintainers; [ _1000101 prusnak ]; + maintainers = with maintainers; [ prusnak ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix index fbd43953b5..3041a7d92a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "shap"; - version = "0.40.0"; + version = "0.41.0"; disabled = isPy27; src = fetchFromGitHub { owner = "slundberg"; repo = pname; - rev = "v${version}"; - sha256 = "0ra0dp319qj13wxaqh2vz4xhn59m9h3bfg1m6wf3cxsix737b1k4"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-rYVWQ3VRvIObSQPwDRsxhTOGOKNkYkLtiHzVwoB3iJ0="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix index 49f5dcc822..a41381fe35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shapely/default.nix @@ -2,6 +2,7 @@ , stdenv , buildPythonPackage , fetchPypi +, fetchpatch , substituteAll , pythonOlder , geos @@ -43,6 +44,12 @@ buildPythonPackage rec { libgeos_c = GEOS_LIBRARY_PATH; libc = lib.optionalString (!stdenv.isDarwin) "${stdenv.cc.libc}/lib/libc${stdenv.hostPlatform.extensions.sharedLibrary}.6"; }) + (fetchpatch { + name = "fix-tests-geos-3.11.patch"; + url = "https://github.com/shapely/shapely/commit/21c8e8a7909e7fb3cce6daa5c5b8284ac927fcb0.patch"; + includes = [ "tests/test_parallel_offset.py" ]; + sha256 = "sha256-85c8NlmAzzfCgepe/411ug5Sq+665dFMb3ySaUt9Kew="; + }) ]; preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix index 4051378d06..f5a2764975 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shtab/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "shtab"; - version = "1.5.4"; + version = "1.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,8 +18,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "iterative"; repo = pname; - rev = "v${version}"; - hash = "sha256-MYLAQSz55913fOhRnH+Y9xugOdfO43gkavitazIgeqg="; + rev = "refs/tags/v${version}"; + hash = "sha256-I6De64eawNi36c8NiyVxj63PkxnZfUYYT4Dw4l42Ztk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix index 49ba916b48..e1a0cc3382 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix @@ -5,20 +5,29 @@ , mock , coverage , unittest2 +, attrs , funcsigs , six +, setuptools-scm }: buildPythonPackage rec { pname = "sigtools"; - version = "2.0.3"; + version = "4.0.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "e7789628ec0d02e421bca76532b0d5da149f96f09e7ed4a5cbf318624b75e949"; + sha256 = "sha256-fMhKC6VuNLfxXkM3RCaPEODEp21r/s6JzswaHKkROLY="; }; - propagatedBuildInputs = [ funcsigs six ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + ]; patchPhase = ''sed -i s/test_suite="'"sigtools.tests"'"/test_suite="'"unittest2.collector"'"/ setup.py''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix index af81f519f0..e508ab9dbf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.12.0"; + version = "1.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-Y+pNEjj6OBPhe0RPpcHF452YLFPm/zYaCCbMt3e/GKM="; + sha256 = "sha256-eDaqL4CsP5wOqfwrkeWJdg+rlcMnFT3l7A9xgVnhx0w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index 62edf7b0fc..42a9fa1ebf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.07.0"; + version = "2022.07.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-v3N2f5B6BrwTb4ik2bME8OLzwsHZ3qWx+Jx1pv7KX8A="; + sha256 = "sha256-mbdL1fX86OPMw6I7Lk7NDhm2kE6/iamYbyvYvJrkwLQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix index 4292c16778..d588c2dff6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/siosocks/default.nix @@ -30,6 +30,13 @@ buildPythonPackage rec { pytest-trio ]; + disabledTests = [ + # network access + "test_connection_direct_success" + "test_connection_socks_success" + "test_connection_socks_failed" + ]; + disabledTestPaths = [ # Timeout on Hydra "tests/test_trio.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix index d6ee1e76f5..6805214576 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, toml }: +{ lib, stdenv, fetchPypi, buildPythonPackage, packaging, ply, toml, fetchpatch }: buildPythonPackage rec { pname = "sip"; - version = "6.5.1"; + version = "6.6.2"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "sha256-IE8CQNuJmadJ1jiph7NRhhhD5pI5uBHsPRiBQSw3BqY="; + sha256 = "sha256-Dj76wcXf2OUlrlcUCSffJpk+E/WLidFXfDFPQQW/2Q0="; }; patches = [ @@ -15,9 +15,16 @@ buildPythonPackage rec { # and PIP will refuse to install the resulting wheel. # remove once upstream fixes this, hopefully in 6.5.2 ./fix-manylinux-version.patch + + # fix issue triggered by QGIS 3.26.x, already fixed upstream + # in SIP, waiting for release past 6.6.2 + (fetchpatch { + url = "https://riverbankcomputing.com/hg/sip/raw-diff/323d39a2d602/sipbuild/generator/parser/instantiations.py"; + hash = "sha256-QEQuRzXA+wK9Dt22U/LgIwtherY9pJURGJYpKpJkiok="; + }) ]; - propagatedBuildInputs = [ packaging toml ]; + propagatedBuildInputs = [ packaging ply toml ]; # There aren't tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index a4bef1ab8e..06ab6cd788 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.17.2"; + version = "3.18.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Rzs2ugG6Xm8IVWt20+1oLB0FxhBHyIfDGNL2jzgDnwc="; + sha256 = "sha256-pHIsYOY+/LlH9+kmp2ETEY1IE8izy5+R4tm0iY7NmQk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 304a1c3689..500a392b11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -46,7 +46,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.cfg \ --replace "pyOpenSSL>=16.2.0,<23.0.0" "pyOpenSSL" \ - --replace "cryptography>=3.1.0,<37.0.0" "cryptography" + --replace "cryptography>=3.1.0,<37.0.0" "cryptography" \ + --replace "charset-normalizer~=2.0.0" "charset_normalizer>=2" ''; # Tests require encrypted secrets, see diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index b2b6f92a01..6d30f143ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.3.4"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-nXTPnWChj/rIMmPoVZr1AhY7tHVRygmpNmh1oGR6W4A="; + sha256 = "sha256-9IooTfzXRmOE22huBSduM4kX8ltI6F50nvkUnXRkAFo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix index e76df373bf..6a8c483ada 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/solax/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "solax"; - version = "0.2.9"; + version = "0.2.10"; src = fetchPypi { inherit pname version; - sha256 = "e66db0c5d4ec840b047e574f0325ea01862d1f5563a844510541b35faa55f392"; + sha256 = "sha256-DUXaz9BF1NOG+RSeks9CxLGDz/wWwpZBxwWh4MQapio="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soundcloud-v2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soundcloud-v2/default.nix new file mode 100644 index 0000000000..ca21c4cebb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/soundcloud-v2/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonPackage +, fetchPypi +, dacite +, python-dateutil +, requests +}: + +buildPythonPackage rec { + pname = "soundcloud-v2"; + version = "1.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "9a9c12aa22e71566e2ca6015267cabc1856afd79fa458f0fc43c44872c184741"; + }; + + propagatedBuildInputs = [ + dacite + python-dateutil + requests + ]; + + # tests require network + doCheck = false; + + pythonImportsCheck = [ "soundcloud" ]; + + meta = with lib; { + description = "Python wrapper for the v2 SoundCloud API"; + homepage = "https://github.com/7x11x13/soundcloud.py"; + license = licenses.mit; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix index 8d92e49427..632894e869 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix @@ -1,20 +1,24 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , isPy3k , backports_functools_lru_cache }: buildPythonPackage rec { pname = "soupsieve"; - version = "2.3.1"; + version = "2.3.2.post1"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "b8d49b1cd4f037c7082a9683dfa1801aa2597fb11c3a1155b7a5b94829b4f1f9"; + sha256 = "sha256-/FOJOz2iwz3ilWZ6DhnweMFL+GVErzBzVN5fzxKj8w0="; }; - propagatedBuildInputs = lib.optional (!isPy3k) backports_functools_lru_cache; + nativeBuildInputs = [ + hatchling + ]; # Circular dependency on beautifulsoup4 doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix index 969338d410..30778ab633 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "spacy-pkuseg"; - version = "0.0.28"; + version = "0.0.31"; disabled = !isPy3k; src = fetchPypi { inherit version; pname = "spacy_pkuseg"; - hash = "sha256-mmA/baY9ohvrM41ak5L+G8CUrSQeZCrzmMAoND4X/NI="; + hash = "sha256-C/6uYeXjmmZiWFIvk/2P8+CEX4ZBhYNnRX1T4rD75N8="; }; # Does not seem to have actual tests, but unittest discover diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix index ee8b773c8b..e4f5868d84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "spacy"; - version = "3.3.1"; + version = "3.4.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-f4fb2xBNhRrmul/Tp2ouFOIuBIE1kD6YuvCFcaOqgcA="; + hash = "sha256-PM0an1Z1nl8Pnv31cRmgZwKtWcBF3eCzgwtUclk+Ce8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix new file mode 100644 index 0000000000..199788976e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, sphinx +, pytestCheckHook +}: + +let + pname = "sphinx-autodoc-typehints"; + version = "1.19.1"; +in + +buildPythonPackage { + inherit pname version; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + pname = "sphinx_autodoc_typehints"; + inherit version; + hash = "sha256-bIQdtV4Om+BIP/OWKiFStg55MG9CiNjE5+hqyESGpeo="; + }; + + propagatedBuildInputs = [ + sphinx + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # requires spobjinv, nbtyping + doCheck = false; + + pythonImportsCheck = [ + "sphinx_autodoc_typehints" + ]; + + meta = with lib; { + description = "Type hints (PEP 484) support for the Sphinx autodoc extension"; + homepage = "https://github.com/tox-dev/sphinx-autodoc-typehints"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix index 78f3e2b12f..3fd28acef9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "sphinx-book-theme"; - version = "0.3.2"; + version = "0.3.3"; format = "wheel"; @@ -20,7 +20,7 @@ buildPythonPackage rec { dist = "py3"; python = "py3"; pname = "sphinx_book_theme"; - sha256 = "4aed92f2ed9d27e002eac5dce1daa8eca42dd9e6464811533c569ee156a6f67d"; + sha256 = "9685959dbbb492af005165ef1b9229fdd5d5431580ac181578beae3b4d012d91"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix new file mode 100644 index 0000000000..748e4c6948 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-fortran/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, future +, numpy +, sphinx +, six +}: + +buildPythonPackage rec { + pname = "sphinx-fortran"; + version = "unstable-2022-03-02"; + + src = fetchFromGitHub { + owner = "VACUMM"; + repo = pname; + rev = "394ae990b43ed43fcff8beb048632f5e99794264"; + sha256 = "sha256-IVKu5u9gqs7/9EZrf4ZYd12K6J31u+/B8kk4+8yfohM="; + }; + + propagatedBuildInputs = [ + future + numpy + sphinx + six + ]; + + pythonImportsCheck = [ "sphinxfortran" ]; + + # Tests are failing because reference files are not updated + doCheck = false; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Fortran domain and autodoc extensions to Sphinx"; + homepage = "http://sphinx-fortran.readthedocs.org/"; + license = licenses.cecill21; + maintainers = with maintainers; [ loicreynier ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix index 937b6cf5d3..b087ed2bd3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { pname = "sphinx-jupyterbook-latex"; version = "0.4.6"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -18,6 +19,11 @@ buildPythonPackage rec { sha256 = "8ff3775b11ab4798e6e8ec983601d7aea4c3b8e8b5d28ca758578ede3a791334"; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "sphinx>=3,<5" "sphinx>=3" + ''; + propagatedBuildInputs = [ sphinx ] ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix similarity index 90% rename from third_party/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix rename to third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix index d0c9a3883a..514ce279fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-theme/default.nix @@ -8,11 +8,12 @@ }: buildPythonPackage rec { - pname = "sphinx_rtd_theme"; + pname = "sphinx-rtd-theme"; version = "1.0.0"; src = fetchPypi { - inherit pname version; + pname = "sphinx_rtd_theme"; + inherit version; sha256 = "0p3abj91c3l72ajj5jwblscsdf1jflrnn0djx2h5y6f2wjbx9ipf"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix index 40f17f10cf..166f9347d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch # propagatedBuildInputs , babel , alabaster @@ -30,7 +31,7 @@ buildPythonPackage rec { pname = "sphinx"; - version = "4.5.0"; + version = "5.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -38,8 +39,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sphinx-doc"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-Lw9yZWCQpt02SL/McWPcyFRfVhQHC0TejcYRbVw+VxY="; + rev = "refs/tags/v${version}"; + hash = "sha256-kdwznYvs4szhC+qoL2Zsib9cU69fag1KhCXl8qIGkZU="; postFetch = '' cd $out mv tests/roots/test-images/testimäge.png \ @@ -48,9 +49,18 @@ buildPythonPackage rec { ''; }; + patches = [ + # https://github.com/sphinx-doc/sphinx/pull/10624 + (fetchpatch { + name = "avoid-deprecated-docutils-0.19-api.patch"; + sha256 = "sha256-QIrLkxnexNcfuI00UOeCpAamMLqqt4wxoVY1VA72jIw="; + url = "https://github.com/sphinx-doc/sphinx/commit/8d99168794ab8be0de1e6281d1b76af8177acd3d.patch"; + }) + ]; + postPatch = '' substituteInPlace setup.py \ - --replace "docutils>=0.14,<0.18" "docutils>=0.14" + --replace "docutils>=0.14,<0.19" "docutils>=0.14" # remove impurity caused by date inclusion # https://github.com/sphinx-doc/sphinx/blob/master/setup.cfg#L4-L6 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 1fbd2ce6a7..55feba377d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "1.8.4"; + version = "1.9.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "8c4ec5fbedc1e6e8f4692bcc4fcd1abcfb9e8dfca8a4ded60ad811a743c22ccc"; + sha256 = "sha256-yJfqM33xatDN4wfL3+K+ziB3iN3hWH+k/IuFfR/F3Lo="; }; propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix new file mode 100644 index 0000000000..9a8c65377b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-confluencebuilder/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, sphinx +, requests +, jinja2 +}: + +buildPythonPackage rec { + pname = "sphinxcontrib-confluencebuilder"; + version = "1.8.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-u+sjhj/2fu8fLGRb2zgnNI+y7wIIUYTMJhRekrdtMeU="; + }; + + propagatedBuildInputs = [ + docutils + sphinx + requests + jinja2 + ]; + + # Tests are disabled due to a circular dependency on Sphinx + doCheck = false; + + pythonImportsCheck = [ + "sphinxcontrib.confluencebuilder" + ]; + + meta = with lib; { + description = "Confluence builder for sphinx"; + homepage = "https://github.com/sphinx-contrib/confluencebuilder"; + license = licenses.bsd1; + maintainers = with maintainers; [ graysonhead ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix index df05cd2736..20f182b55b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-plantuml"; - version = "0.23"; + version = "0.24"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HVVRjwqG7NbJa6j/jIhK3KBbrD5Y52ppKjzRmqf0Ks8="; + sha256 = "sha256-z2Xbc1j3haZJjuA+cZi2aAxiXSjlWzNHX8P2yUNRRR0="; }; # No tests included. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix index 2d4328ba3e..3742d15b35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "2.3.0"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-pdU20Oil53TX1hbBAqj6LWqkX9MwoLeZuY7vFYNW02w="; + sha256 = "sha256-urI7Ak25NZzsUYLiR+cIdfcd3ECoJx/RNT3gj0QPJtw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix index eaca9e6c7f..edcee3fe93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spyder/default.nix @@ -46,13 +46,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "5.3.0"; + version = "5.3.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ggCFvYUdUm5fVSpTZoN/OhNPJAQOyehwrQprYTzprbc="; + sha256 = "sha256-KJkamNMXr4Mi9Y6B7aKExoiqWKoExCFlELChCrQL6mQ="; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index da64d44a43..d0970d4277 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , flask , flask_login -, flask_sqlalchemy +, flask-sqlalchemy , flexmock , pytestCheckHook , sqlalchemy @@ -33,7 +33,7 @@ buildPythonPackage rec { sqlalchemy-i18n flask flask_login - flask_sqlalchemy + flask-sqlalchemy flexmock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix index c53ab7c412..49bba28113 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -17,12 +17,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.38.2"; + version = "0.38.3"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "9e01d6d3fb52d3926fcd4ea4a13f3540701b751aced0316bff78264402c2ceb4"; + sha256 = "sha256-n5r7pgekBFXPcDrfqYRlhL8mFooMWmCnAGO3DWUFH00="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch index 887128dd44..79aa12f03d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-utils/skip-database-tests.patch @@ -2,13 +2,15 @@ diff --git a/conftest.py b/conftest.py index 9e146cd..8dbc9a5 100644 --- a/conftest.py +++ b/conftest.py -@@ -61,16 +61,12 @@ def mysql_db_user(): +@@ -61,17 +61,12 @@ def mysql_db_user(): @pytest.fixture - def postgresql_dsn(postgresql_db_user, postgresql_db_password, db_name): -- return 'postgresql://{0}:{1}@localhost/{2}'.format( + def postgresql_dsn(postgresql_db_user, postgresql_db_password, postgresql_db_host, + db_name): +- return 'postgresql://{0}:{1}@{2}/{3}'.format( - postgresql_db_user, - postgresql_db_password, +- postgresql_db_host, - db_name - ) + pytest.skip() @@ -68,7 +70,7 @@ index 0ad6721..83f208d 100644 'TEMPLATE "my-template"') in str(excinfo.value) --class TestDatabasePostgresCreateDatabaseCloseConnection(object): +-class TestDatabasePostgresCreateDatabaseCloseConnection: - def test_create_database_twice( - self, - postgresql_db_user, diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index 87696e3acd..d3a8e39d48 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.7"; + version = "1.6.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-J0USsiCWaysQOir/wpkw6GT1ILckjK7EUiY541aoahA="; + sha256 = "sha256-OWIuYAms4SXQXVr0Wx8y7pne13IBclfq0P3VTy91Kz8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix index 7a2d6790b4..5108f9ea5e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/srsly/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "srsly"; - version = "2.4.3"; + version = "2.4.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-2+kfbdSuqegZSTYoNW3HFb2cYGSGKXu3yldI5uADhBw="; + hash = "sha256-6KBlgWJ7ZxLxnGAkG3wUwrspzobvBPeRN5p58bJJoSg="; }; nativeBuildInputs = [ cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ssh-mitm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ssh-mitm/default.nix index 3e93000628..ea2aa9531c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ssh-mitm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ssh-mitm/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ssh-mitm"; - version = "2.0.5"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zLVi+9XvNAfa3fB2GRdNnEPoDY2Wf3XkbQGOT0RNkdQ="; + hash = "sha256-DMXzDgSt1p3ZNGrXnSr79KH33SJNN8U4/94Hoz7Rs+I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix index ce9719a752..808f90f224 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stanza/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "stanza"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "stanfordnlp"; repo = pname; - rev = "v${version}"; - sha256 = "1j5918n875p3ibhzc5zp3vb97asbbnb04pj1igxwzl0xm6qcsbh8"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-EAES3UpJqE7wmvCPycFhwI1lMrReN+L6W8CEDwdHTlA="; }; disabled = pythonOlder "3.6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix index 05c3cd829f..d1e8f789fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/starlette/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.20.1"; + version = "0.20.4"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,8 +29,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "encode"; repo = pname; - rev = version; - hash = "sha256-PUZ9joOhXkL1K2yi0baiuY74PIi71V/epX8zdcUv1DA="; + rev = "refs/tags/${version}"; + hash = "sha256-vP2TJPn9lRGnLGkO8lUmnsoT6rSnhuWDD3WqNk76SM0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix index 13187285db..50e93eeac9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix @@ -2,6 +2,7 @@ , attrs , buildPythonPackage , cattrs +, exceptiongroup , fetchFromGitHub , fonttools , fs @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "statmake"; - version = "0.4.1"; + version = "0.5.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "daltonmaag"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-OXhoQAD4LEh80iRUZE2z8sCtWJDv/bSo0bwHbOOPVE0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-BpxjAr65ZQEJ0PSUIPtS78UvJbMG91qkV8py2K/+W2E="; }; nativeBuildInputs = [ @@ -37,6 +38,8 @@ buildPythonPackage rec { fonttools # required by fonttools[ufo] fs + ] ++ lib.optionals (pythonOlder "3.11") [ + exceptiongroup ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; @@ -55,13 +58,6 @@ buildPythonPackage rec { --replace 'cattrs = "^1.1"' 'cattrs = ">= 1.1"' ''; - disabledTests = [ - # cattrs.errors.IterableValidationError: While structuring typing.List[statmake.classes.Axis] - # https://github.com/daltonmaag/statmake/issues/42 - "test_load_stylespace_broken_range" - "test_load_stylespace_broken_multilingual_no_en" - ]; - pythonImportsCheck = [ "statmake" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix index 66f99c7b01..e7611fc232 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stevedore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "3.5.0"; + version = "4.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-9AJTiH2HEuqiuw6jgwN0QWc23I7A4i9aZQksEXTEQzU="; + sha256 = "sha256-+CzJmh/1UjENGcN5gnwsZN2fhaOLzVVZ2yRwFhhnt4Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix index 0b2fb134a9..a4fe702c8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix @@ -20,28 +20,16 @@ buildPythonPackage rec { pname = "streamz"; - version = "0.6.3"; + version = "0.6.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-0wZ1ldLFRAIL9R+gLfwsFbL+gvdORAkYWNjnDmeafm8="; + hash = "sha256-VXfWkEwuxInBQVQJV3IQXgGVRkiBmYfUZCBMbjyWNPM="; }; - patches = [ - # remove with next bump - (fetchpatch { - name = "fix-tests-against-distributed-2021.10.0.patch"; - url = "https://github.com/python-streamz/streamz/commit/5bd3bc4d305ff40c740bc2550c8491be9162778a.patch"; - sha256 = "1xzxcbf7yninkyizrwm3ahqk6ij2fmh0454iqjx2n7mmzx3sazx7"; - includes = [ - "streamz/tests/test_dask.py" - ]; - }) - ]; - propagatedBuildInputs = [ networkx six @@ -65,6 +53,12 @@ buildPythonPackage rec { ]; disabledTests = [ + # Error with distutils version: fixture 'cleanup' not found + "test_separate_thread_without_time" + "test_await_syntax" + "test_partition_then_scatter_sync" + "test_sync" + "test_sync_2" # Test fail in the sandbox "test_tcp_async" "test_tcp" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix index 0488a4ea95..494338cdde 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "stripe"; - version = "3.5.0"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CPdMrmYZ1KfXj4Fi/3K8PpyRP1PsluzV3cfYI8Lnnd0="; + hash = "sha256-0IWz6UUKVVCRL0dsbbsrr6Ep5IXiTW9AR8UJT/CNXeI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix index 2bc61dac16..68d91685c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/structlog/default.nix @@ -1,30 +1,47 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonOlder , pytestCheckHook , pytest-asyncio , pretend , freezegun , simplejson -, six +, typing-extensions , pythonAtLeast }: buildPythonPackage rec { pname = "structlog"; - version = "21.5.0"; + version = "22.1.0"; format = "flit"; src = fetchFromGitHub { owner = "hynek"; repo = "structlog"; - rev = version; - sha256 = "0bc5lj0732j0hjq89llgrncyzs6k3aaffvg07kr3la44w0hlrb4l"; + rev = "refs/tags/${version}"; + sha256 = "sha256-2sdH6iP+l+6pBNC+sjpAX8bCdCANqqkaqZRmR68uwxY="; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; - checkInputs = [ pytestCheckHook pytest-asyncio pretend freezegun simplejson ]; + pythonImportsCheck = [ + "structlog" + ]; + + checkInputs = [ + freezegun + pretend + pytest-asyncio + pytestCheckHook + simplejson + ]; + + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; meta = with lib; { description = "Painless structural logging"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix index 72101eaf29..f253225317 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subarulink/default.nix @@ -36,6 +36,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + postPatch = '' substituteInPlace setup.cfg \ --replace "--cov=subarulink" "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix index aae41b915b..adc4cae187 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/subprocess-tee/default.nix @@ -27,6 +27,8 @@ buildPythonPackage rec { disabledTests = [ # cyclic dependency on `molecule` (see https://github.com/pycontribs/subprocess-tee/issues/50) "test_molecule" + # duplicates in console output, rich issue + "test_rich_console_ex" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix index 86ab922c1b..430f20c5bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sumo/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "sumo"; - version = "2.3.0"; + version = "2.3.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "SMTG-UCL"; repo = "sumo"; rev = "refs/tags/v${version}"; - sha256 = "sha256-apI5Qt7Wrr4FXKL48iqqIQJDX2BIf3PPz/qIgSO7nuo="; + sha256 = "sha256-hY1rQG4s5j/lVvu5e+5e+GamKrYpviqxaWmq1qB6ejU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix index cacfad61bb..aad3afda8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.0.3"; + version = "4.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Ett9CBubdyKJh9MkwUhQ1kQH6/zBb6Ma0CdEH5Eqcw8="; + hash = "sha256-O4VjxcuJVgUjjz3VWyczCjJxvJvAL94MBnGsRn54Ld4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix index 1386706a33..4b59951048 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/superqt/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "superqt"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "napari"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-P1uKQaYgXVTE7DK5w4Ct4aJyfdQ6jUPfaTOcYkpo9pc="; + sha256 = "sha256-Ns3AFUL0BReIwTHfrlfXr/2GLtLvT7hfSjjh+r7btcY="; }; format = "pyproject"; nativeBuildInputs = [ setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svdtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svdtools/default.nix deleted file mode 100644 index 21e6a143ce..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/svdtools/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ lib -, buildPythonPackage -, pythonOlder -, fetchPypi -, braceexpand -, click -, pyyaml -, lxml -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "svdtools"; - version = "0.1.23"; - format = "setuptools"; - - disabled = pythonOlder "3.8"; - - src = fetchPypi { - inherit version pname; - hash = "sha256-LuursRuUZEDLbk9Wbnq/S0dsZHbzIJo1YCSVFMUoiog="; - }; - - propagatedBuildInputs = [ - braceexpand - click - pyyaml - lxml - ]; - - checkInputs = [ - pytestCheckHook - ]; - - pythonImportsCheck = [ - "svdtools" - ]; - - meta = with lib; { - description = "Python package to handle vendor-supplied, often buggy SVD files"; - homepage = "https://github.com/stm32-rs/svdtools"; - changelog = "https://github.com/stm32-rs/svdtools/blob/v${version}/CHANGELOG-python.md"; - license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ newam ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix index 7f1a8d8fac..97e03ad4b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/svglib/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "svglib"; - version = "1.3.0"; + version = "1.4.1"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-o4mYuV0buZVk3J3/rxXk6UU3YfJ5DS3UFHpK1fusEHg="; + sha256 = "sha256-SMJHBsI7tCYhc7b6Seq7EK+hW4QS8UKDEgVJUXzPoxQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix index 06a445450e..cf9a55d739 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tableaudocumentapi"; - version = "0.9"; + version = "0.10"; src = fetchPypi { inherit pname version; - sha256 = "0c7d01f01758dd6e50ff2fc915c6087c0da17298635e6635581aaf25c934d6ce"; + sha256 = "sha256-ahR+o4UgFLm/9aFsEqmlwXkcgTjqI0wU2Tl9EjVjLZs="; }; # tests not inclued with release diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix index 621445b2d5..34e6683398 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.9"; + version = "0.8.10"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7"; + sha256 = "sha256-bFfz8916wngncBVfOtstsLGiaWN+QvJ1mZJeZLEU9Rk="; }; checkInputs = [ nose ]; @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Pretty-print tabular data"; - homepage = "https://bitbucket.org/astanin/python-tabulate"; + homepage = "https://github.com/astanin/python-tabulate"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix index ac8a55e24d..0d4cd9c09e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/taskw/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { - version = "1.3.1"; + version = "2.0.0"; pname = "taskw"; src = fetchPypi { inherit pname version; - sha256 = "1a68e49cac2d4f6da73c0ce554fd6f94932d95e20596f2ee44a769a28c12ba7d"; + sha256 = "sha256-EQm9+b3nqbMqUAejAsh4MD/2UYi2QiWsdKMomkxUi90="; }; patches = [ ./use-template-for-taskwarrior-install-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix index a78952b1e4..fae42ac591 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.8.1"; + version = "5.8.2"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = "neogeny"; repo = "TatSu"; rev = "refs/tags/v${version}"; - sha256 = "sha256-2zEpP1WATqzAo0HsBGdjjk/RoliyIim1OltPoJTlxIU="; + sha256 = "sha256-eJJ438zjXRZ7dk36RPkFvhcIA5RYo5MsjptZIpjCrVI="; }; nativeBuildInputs = [ pytest-runner ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; homepage = "https://tatsu.readthedocs.io/"; license = licenses.bsd2; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix index ff837158fc..8b50406c7e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { pname = "tempora"; - version = "5.0.1"; + version = "5.0.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-y6Dxl6ZIg78+c2V++8AyTVvxcXnndpsThbTXXSbNkSc="; + sha256 = "sha256-MfpbszsmQQJiEfI+gI64vTUZAZiLFn1F8yPI9FDs8hE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix index f31c42e774..a32be33a37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-plugin-profile/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "tensorboard_plugin_profile"; - version = "2.5.0"; + version = "2.8.0"; format = "wheel"; src = fetchPypi { @@ -14,7 +14,7 @@ buildPythonPackage rec { format = "wheel"; dist = "py3"; python = "py3"; - sha256 = "16jch9py98h7wrffdiz6j0i3kdykxdp5m0kfxr1fxy2phqanpjqk"; + hash = "sha256-2LzXSdPrzS5G63ONvchdEL4aJD75eU9dF1pMqLcfbto="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix index 42fe33dcab..4e7087deb3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "tensorboard"; - version = "2.9.0"; + version = "2.9.1"; format = "wheel"; disabled = pythonOlder "3.6" || pythonAtLeast "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - hash = "sha256-vXghEHbcpe+icmCvrPqpbNBcfbEqbAnMdqHWsph8piE="; + hash = "sha256-uqcn95F3b55YQdNHEncgzu1LvVnDa0BgS5X7KuYCknY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix index 7aa29f34ba..93d94d0c38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix @@ -19,13 +19,13 @@ buildPythonPackage rec { pname = "tensorboardx"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; - rev = "v${version}"; - sha256 = "sha256-1jWpC64Ubl07Bday4h5ue0wuDj4yPTWL2nhjtoQBnM0="; + rev = "refs/tags/${version}"; + sha256 = "sha256-g6x0yUpofeSNA4rKPidqOKC7/TrOICstcc98VnQcfDY="; }; # apparently torch API changed a bit at 1.6 @@ -70,8 +70,6 @@ buildPythonPackage rec { disabledTestPaths = [ # we are not interested in linting errors "tests/test_lint.py" - # missing caffe2 dependency - "tests/test_caffe2.py" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix index 38d6458d4f..772e6da92e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -41,13 +41,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.5.2"; + version = "4.6.0"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; - rev = "v${version}"; - sha256 = "sha256-OZpaY/6BMISq5IeDXyuyu5L/yG+DwlFliw4BsipPOLg="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-z52UZz9d1AaZklLOPbWuzByEl1hJ6ra4Hoz6eNGD+hg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix index 1b402732f8..338affcbf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, bazel_4, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin +{ stdenv, bazel_5, buildBazelPackage, isPy3k, lib, fetchFromGitHub, symlinkJoin , addOpenGLRunpath, fetchpatch, patchelfUnstable # Python deps , buildPythonPackage, pythonOlder, python @@ -76,7 +76,7 @@ let tfFeature = x: if x then "1" else "0"; - version = "2.9.1"; + version = "2.10.0-rc0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; @@ -184,13 +184,13 @@ let stdenv = llvmPackages_11.stdenv; })) { name = "${pname}-${version}"; - bazel = bazel_4; + bazel = bazel_5; src = fetchFromGitHub { owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - hash = "sha256-kILNvwHi29F8BClYsZw+7RT2t6x57AsAHURVTfs5uOE="; + hash = "sha256-zN8I0wxKrxWcI0RuOqDz6srdW0Q+kgaZhJdXM46N1e8="; }; # On update, it can be useful to steal the changes from gentoo @@ -369,12 +369,13 @@ let fetchAttrs = { # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "sha256-mcK60pLz70tOAu1+THUXweiO2SCSFUdFdT91HaUokzA=" + "sha256-KtVReqHL3zxE8TPrqIerSOt59Mgke/ftoFZKMzgX/u8=" else if stdenv.isDarwin then - "sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjrk=" + # FIXME: this checksum is currently wrong, since the tensorflow dependency fetch is broken on darwin + "sha256-j2k9Q+k41nq5nP1VjjkkNjXRov1uAda4RCMDMAthjr0=" else - "sha256-teW6o9Fb4hUxmaHpQU2F+5ihE/DA+MIY8QaMEKMnFiE="; + "sha256-zH3xNFEU2JR0Ww8bpD4mCiorGtao0WVPP4vklVMgS4A="; }; buildAttrs = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorrt/default.nix new file mode 100644 index 0000000000..30da346c81 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorrt/default.nix @@ -0,0 +1,52 @@ +{ lib +, python +, buildPythonPackage +, autoPatchelfHook +, unzip +, cudaPackages +}: + +let + pyVersion = "${lib.versions.major python.version}${lib.versions.minor python.version}"; +in +buildPythonPackage rec { + pname = "tensorrt"; + version = cudaPackages.tensorrt.version; + + src = cudaPackages.tensorrt.src; + + format = "wheel"; + # We unpack the wheel ourselves because of the odd packaging. + dontUseWheelUnpack = true; + + nativeBuildInputs = [ + unzip + autoPatchelfHook + cudaPackages.autoAddOpenGLRunpathHook + ]; + + preUnpack = '' + mkdir -p dist + tar --strip-components=2 -xf "$src" --directory=dist \ + "TensorRT-${version}/python/tensorrt-${version}-cp${pyVersion}-none-linux_x86_64.whl" + ''; + + sourceRoot = "."; + + buildInputs = [ + cudaPackages.cudnn + cudaPackages.tensorrt + ]; + + pythonCheckImports = [ + "tensorrt" + ]; + + meta = with lib; { + description = "Python bindings for TensorRT, a high-performance deep learning interface"; + homepage = "https://developer.nvidia.com/tensorrt"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ aidalgol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix index 30673971a1..ac5481e13a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix @@ -1,27 +1,46 @@ { lib , buildPythonPackage , fetchPypi +, hatchling , ptyprocess , tornado +, pytest-timeout +, pytestCheckHook }: buildPythonPackage rec { pname = "terminado"; - version = "0.13.3"; + version = "0.15.0"; + format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-lNHPq2NSWZP31cm0aaUKGNDN85Q1tZeFcVU53UHjbA0="; + sha256 = "sha256-q07u3M/MHmE0v+6GEGr5CFLGnWAohOo6Hoym1Ehum/4="; }; - propagatedBuildInputs = [ ptyprocess tornado ]; + nativeBuildInputs = [ + hatchling + ]; + + propagatedBuildInputs = [ + ptyprocess + tornado + ]; + + pythonImportsCheck = [ + "terminado" + ]; + + checkInputs = [ + pytest-timeout + pytestCheckHook + ]; - # test_max_terminals fails - doCheck = false; meta = with lib; { description = "Terminals served by Tornado websockets"; homepage = "https://github.com/jupyter/terminado"; license = licenses.bsd2; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix index c0bceca72b..6357331495 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tern/default.nix @@ -8,6 +8,7 @@ , stevedore , pbr , debian-inspector +, license-expression , regex , GitPython , prettytable @@ -17,11 +18,11 @@ buildPythonPackage rec { pname = "tern"; - version = "2.10.0"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KpkEnpItHC/9IswfboFZ5nCcGaM9bWFX/i+6jxGN5hg="; + sha256 = "sha256-MMsq8/Obe3ogQSjiP8EebYseUJGcchMOczUrxE9jht4="; }; preBuild = '' @@ -36,6 +37,7 @@ buildPythonPackage rec { pyyaml docker dockerfile-parse + license-expression requests stevedore debian-inspector diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix index e814f01320..85cbff5a1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "einarhauks"; repo = pname; rev = version; - sha256 = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE="; + hash = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE="; }; nativeBuildInputs = [ @@ -40,13 +40,17 @@ buildPythonPackage rec { pytestCheckHook ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'backoff = "^1.11.1"' 'backoff = "*"' + ''; pythonImportsCheck = [ "tesla_wall_connector" ]; meta = with lib; { - description = "Python library for communicating with a Tesla Wall Connector"; + description = "Library for communicating with a Tesla Wall Connector"; homepage = "https://github.com/einarhauks/tesla-wall-connector"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix index 2b074168c5..ebc0f4e6ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-wAhi8TW0rOeJ3QWjmfLqJ3cKnLZShMekyQ6j7I2uwGY="; + sha256 = "sha256-BAayVUmp2dsaWzH8dvTjZCKGnpc6uY6Y/6gWYIgaES8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix index a690be8833..65c8ed8bf4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix @@ -3,8 +3,7 @@ , buildPythonPackage , deprecation , docker -, wrapt -}: +, wrapt }: buildPythonPackage rec { pname = "testcontainers"; @@ -31,7 +30,9 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Allows using docker containers for functional and integration testing"; + description = '' + Allows using docker containers for functional and integration testing + ''; homepage = "https://github.com/testcontainers/testcontainers-python"; license = licenses.asl20; maintainers = with maintainers; [ onny ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix index 91f91a3d7b..9f0de060d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.18.5"; + version = "7.0.0"; format = "setuptools"; # DO NOT CONTACT upstream. # https://github.com/simplistix/ is only concerned with internal CI process. @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-Atrog/Vn9bcP0608nu+5WRLniskL5sdES14vRr9XLIQ="; + hash = "sha256-jsrFowh5NFFkBZTZykLOibmHcR4eTJMShVMh7CH2zLQ="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix index 9243d3a3ed..0a8ee22365 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, python3 +, python , fetchFromGitHub , mkdocs , twine @@ -53,7 +53,7 @@ let postInstall = '' # FileNotFoundError: [Errno 2] No such file or directory: '$out/lib/python3.10/site-packages/textx/textx.tx - cp "$src/textx/textx.tx" "$out/${python3.sitePackages}/${pname}/" + cp "$src/textx/textx.tx" "$out/${python.sitePackages}/${pname}/" # Install tests as the tests output. mkdir $testout diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix index 44a8d5ff72..79faa769dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "thinc"; - version = "8.0.17"; + version = "8.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BCxRiqeZo4vsIqegvyjfgM5hfrfeMrwEl5hwfAo2Fn8="; + sha256 = "sha256-6q6pHcVsBBUWqCnEYEI6iu9TVwAWEMjWOVvOldglSgs="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix index f3fe08821f..2452c6bb44 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tifffile/default.nix @@ -43,6 +43,8 @@ buildPythonPackage rec { # AssertionError "test_write_bigtiff" "test_write_imagej_raw" + # https://github.com/cgohlke/tifffile/issues/142 + "test_func_bitorder_decode" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix index eabb2aff00..99020f8d7a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiledb/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "tiledb"; - version = "0.13.0"; + version = "0.16.3"; format = "setuptools"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB-Py"; - rev = version; - sha256 = "sha256-ku+9kMXXrlPy4teV5KpTXAwExhIoPpAsGAHIBvsl9KI="; + rev = "refs/tags/${version}"; + sha256 = "sha256-Tg2MHlLwwcpXoHoflaNWXmXr6s7dg3IJou4PZBahRzc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix new file mode 100644 index 0000000000..0c1e44f140 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tiler/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, numpy +, tqdm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "tiler"; + version = "0.5.7"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-2HWO/iJ9RCWNVmw2slu9F/+Mchk3evB5/F8EfbuMI/Y="; + }; + + propagatedBuildInputs = [ + numpy + tqdm + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "tiler" ]; + + meta = with lib; { + description = "N-dimensional NumPy array tiling and merging with overlapping, padding and tapering"; + homepage = "https://the-lay.github.io/tiler/"; + license = licenses.mit; + maintainers = with maintainers; [ atila ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix index 4ef4369669..6ecacbca80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/timetagger/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "timetagger"; - version = "22.6.4"; + version = "22.6.6"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-wLbC7NlDNgAyCnGjawfrnRPN/4DOcHVd93pIWrILs68="; + sha256 = "sha256-2qPtC8gsRw9ZOkl+H8euTwTrPVAB0cdfFflhbLqXz/I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix index fbe6c7be4d..6430bef1aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tomlkit/default.nix @@ -1,24 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, enum34, functools32, typing ? null +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, enum34 +, functools32, typing ? null +, pytestCheckHook +, pyaml }: buildPythonPackage rec { pname = "tomlkit"; - version = "0.10.1"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PFF4lOre9T6QctND035EJ7jwtiAKcLfJoZsuvR9TuVE="; + sha256 = "sha256-YZAfgf9AF5URGc0NHtm3rzHIIdaEXIxHdYe73NXlhU4="; }; propagatedBuildInputs = lib.optionals isPy27 [ enum34 functools32 ] ++ lib.optional isPy27 typing; - # The Pypi tarball doesn't include tests, and the GitHub source isn't - # buildable until we bootstrap poetry, see - # https://github.com/NixOS/nixpkgs/pull/53599#discussion_r245855665 - doCheck = false; + checkInputs = [ + pyaml + pytestCheckHook + ]; + + pythonImportsCheck = [ "tomlkit" ]; meta = with lib; { homepage = "https://github.com/sdispater/tomlkit"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix index 234cb471e4..6ca48fd1ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/toolz/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "toolz"; - version = "0.11.2"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "6b312d5e15138552f1bda8a4e66c30e236c831b612b2bf0005f8a1df10a4bc33"; + sha256 = "sha256-iMVwhhxEDuPy9gN8RlRhMij/QMk6bCXg66cNFygsYZQ="; }; checkInputs = [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix index be85d3d317..66bdb587bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "torchinfo"; - version = "1.7.0"; + version = "1.64"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "TylerYep"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-SfhFyv5ISbOG3srOK3m9BeSIkA7M8qJTm95GyfdqzcA="; + hash = "sha256-gcl8RxCD017FP4LtB60WVtOh7jg2Otv/vNd9hKneEAU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix index 590f9a8359..e71e623e42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchmetrics/default.nix @@ -15,7 +15,7 @@ let pname = "torchmetrics"; - version = "0.8.2"; + version = "0.9.2"; in buildPythonPackage { inherit pname version; @@ -24,7 +24,7 @@ buildPythonPackage { owner = "PyTorchLightning"; repo = "metrics"; rev = "refs/tags/v${version}"; - hash = "sha256-1TO2YgZzjVmrE5jhMwo0Y+bQUQ5jJj34k+kGpdqqPVQ="; + hash = "sha256-zkdmWxaTPTMyLe7P/zVfgKSYDCec3uh0eqCtahByMlY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix index 0cb280af67..4eb0368a82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/default.nix @@ -24,13 +24,13 @@ let cudaArchStr = lib.optionalString cudaSupport lib.strings.concatStringsSep ";" pytorch.cudaArchList; in buildPythonPackage rec { pname = "torchvision"; - version = "0.11.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; - rev = "v${version}"; - sha256 = "sha256-nJV0Jr6Uc+ALodAiekM6YpM6IbmIb4w+Jlc3bJRqayI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-nIE1HvmAhRh3Hvj3qlF52sN9LGIorLiXlLtN7tzQxqU="; }; nativeBuildInputs = [ libpng ninja which ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix index 4519641c48..c9fa36ec65 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tornado"; - version = "6.1"; + version = "6.2"; src = fetchPypi { inherit pname version; - sha256 = "33c6e81d7bd55b468d2e793517c909b139960b6c790a60b7991b9b6b76fb9791"; + sha256 = "sha256-m2MEGb3oTsZmv9fqCkyyqKZRwtXMzb3RlyoMhZ38PBM="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix index 2307073c32..cc9a96a1cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.24.5"; + version = "3.25.1"; buildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "67e0e32c90e278251fea45b696d0fef3879089ccbe979b0c556d35d5a70e2993"; + sha256 = "sha256-wTgyeBX1O8baT+VrrsXyXwBiKuae8/5OHjhXIOIkhvk="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix index e003d075a1..8f8d49d34f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix @@ -6,30 +6,30 @@ , cffi , cryptography , ibm-sw-tpm2 -, pkg-config -, pkgconfig +, pkgconfig # see nativeBuildInputs +, pkg-config # see nativeBuildInputs , pycparser , pytestCheckHook , python +, pyyaml , setuptools-scm , tpm2-tss }: buildPythonPackage rec { pname = "tpm2-pytss"; - version = "1.1.0"; + version = "1.2.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-O0d1b99/V8b3embg8veerTrJGSVb/prlPVb7qSHErdQ="; + sha256 = "sha256-OgWWTjcj3Qd4dSaCwY+fuRQpLSFn4+9o11kPR9n8a54="; }; nativeBuildInputs = [ cffi - pkgconfig - # somehow propagating from pkgconfig does not work - pkg-config + pkgconfig # this is the python module + pkg-config # this is the actual pkg-config tool setuptools-scm ]; @@ -41,6 +41,7 @@ buildPythonPackage rec { cffi asn1crypto cryptography + pyyaml ]; # https://github.com/tpm2-software/tpm2-pytss/issues/341 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix index 0b96ba37c1..0a32f931d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/traitlets/default.nix @@ -8,18 +8,21 @@ , decorator , pythonOlder , six +, hatchling }: buildPythonPackage rec { pname = "traitlets"; - version = "5.1.1"; + version = "5.3.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BZ9FbFp8HIK5jC6MeZ85ybgSj20NRpQe4RjarOnrcMc="; + sha256 = "sha256-C7nx+fAXqo7Bh9ixsqemYmoqHYdxFrq6UqEpv6Ek+OI="; }; + nativeBuildInputs = [ hatchling ]; checkInputs = [ glibcLocales pytest mock ]; propagatedBuildInputs = [ ipython_genutils decorator six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix index b23da19214..97132a9645 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transformers/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "transformers"; - version = "4.19.4"; + version = "4.20.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "huggingface"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MxP87tmRsjAOkTkJ7VmlUjG4RE3mh/wF76TZQE/UOoQ="; + hash = "sha256-3Kx7/3IJM428KXfOPRnPK4TYnAIXVOIMl33j8n5Cw60="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix index 44191bcab8..374c1d5dfa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/translatepy/default.nix @@ -4,25 +4,27 @@ , requests , beautifulsoup4 , pyuseragents +, safeio , inquirer , pytestCheckHook }: buildPythonPackage rec { pname = "translatepy"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "Animenosekai"; repo = "translate"; - rev = "v${version}"; - sha256 = "rnt4nmDgQXSgzwNCcsZwbQn2bv83DFhL86kebeiSosc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-cx5OeBrB8il8KrcyOmQbQ7VCXoaA5RP++oTTxCs/PcM="; }; propagatedBuildInputs = [ requests beautifulsoup4 pyuseragents + safeio inquirer ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trectools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trectools/default.nix new file mode 100644 index 0000000000..1c3b2a542b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/trectools/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, beautifulsoup4 +, pythonOlder +, pandas +, python +, numpy +, scikit-learn +, scipy +, lxml +, matplotlib +, sarge +}: + +buildPythonPackage rec { + pname = "trectools"; + version = "0.0.49"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "joaopalotti"; + repo = pname; + # https://github.com/joaopalotti/trectools/issues/41 + rev = "5c1d56e9cf955f45b5a1780ee6a82744d31e7a79"; + sha256 = "sha256-Lh6sK2rxEdCsOUKHn1jgm+rsn8FK1f2po0UuZfZajBA="; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "bs4 >= 0.0.0.1" "beautifulsoup4 >= 4.11.1" + ''; + + propagatedBuildInputs = [ + pandas + numpy + scikit-learn + scipy + lxml + beautifulsoup4 + matplotlib + sarge + ]; + + checkPhase = '' + cd unittests + ${python.interpreter} -m unittest runner + ''; + + pythonImportsCheck = [ "trectools" ]; + + meta = with lib; { + homepage = "https://github.com/joaopalotti/trectools"; + description = "Library for assisting Information Retrieval (IR) practitioners with TREC-like campaigns"; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ MoritzBoehme ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix index fb0a0c7d87..85896ac792 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/treex/default.nix @@ -34,7 +34,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'rich = "^11.2.0"' 'rich = "*"' \ - --replace 'treeo = "^0.0.10"' 'treeo = "*"' + --replace 'treeo = "^0.0.10"' 'treeo = "*"' \ + --replace 'certifi = "^2021.10.8"' 'certifi = "*"' ''; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix index bc9c59754d..b4a2925a41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor/default.nix @@ -80,6 +80,6 @@ buildPythonPackage rec { description = "Python library for communicating with Trezor Hardware Wallet"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; license = licenses.gpl3; - maintainers = with maintainers; [ np prusnak mmahut _1000101 ]; + maintainers = with maintainers; [ np prusnak mmahut ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix index 41ae2e2761..e5db9c72a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trezor_agent/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "trezor_agent"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "139d917d6495bf290bcc21da457f84ccd2e74c78b4d59a649e0cdde4288cd20c"; + sha256 = "sha256-4IylpUvXZYAXFkyFGNbN9iPTsHff3M/RL2Eq9f7wWFU="; }; propagatedBuildInputs = [ setuptools trezor libagent ecdsa ed25519 mnemonic keepkey semver wheel pinentry ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix index c11517f04d..96ca562dcd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.12.7"; + version = "3.13.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Sxuv0QNcRLVnnThFxvDQJ8pV2rhgdYCl7O12o/UJbUI="; + sha256 = "sha256-NTHh5kWu3Nri+Yoi9yvkHlWRD3slYraktKfcah7CEY8="; }; propagatedBuildInputs = [ numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix index f9b325ecc2..dde1391034 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trio/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "trio"; - version = "0.20.0"; + version = "0.21.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZwpS0xFdDoeeGsg4pOuZmvMvhYFj46cE/kg53ipnYHA="; + sha256 = "sha256-Uj85t7ae73NQHOv+Gq/UAKmq1bA1Q6Dt7VKVJIj/HBM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix index 24d8d61b50..df877a2e70 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/trytond/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "6.4.2"; + version = "6.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ylRyTpTnciZiBeG/Mx9PGBXFdh4q3qENeygY3NDDPKU="; + sha256 = "sha256-LzpEHUL1RUPtg4mQqViGHQ1iCfIwQ7KTlEcDZQfhHzA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttp-templates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttp-templates/default.nix index 9c7899462c..ac27cc1aef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ttp-templates/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttp-templates/default.nix @@ -2,12 +2,13 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, poetry-core }: buildPythonPackage rec { pname = "ttp-templates"; - version = "0.1.4"; - format = "setuptools"; + version = "0.3.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -15,13 +16,16 @@ buildPythonPackage rec { owner = "dmulyalin"; repo = "ttp_templates"; rev = "refs/tags/${version}"; - hash = "sha256-yVDJAJXZU4pwvXSKRKUfSHqU23NcdgedOMmynMAD/Po="; + hash = "sha256-35Ej76E9qy5EY41Jt2GDCldyXq7IkdqKxVFrBOJh9nE="; }; + nativeBuildInputs = [ + poetry-core + ]; + postPatch = '' # Drop circular dependency on ttp - substituteInPlace setup.py \ - --replace '"ttp>=0.6.0"' "" + sed -i '/ttp =/d' pyproject.toml ''; # Circular dependency on ttp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix index a484ed9f76..afa66b288a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix @@ -9,6 +9,7 @@ , netmiko , openpyxl , pytestCheckHook +, poetry-core , pyyaml , tabulate , ttp-templates @@ -17,16 +18,20 @@ buildPythonPackage rec { pname = "ttp"; - version = "0.8.4"; - format = "setuptools"; + version = "0.9.1"; + format = "pyproject"; src = fetchFromGitHub { owner = "dmulyalin"; repo = pname; - rev = version; - hash = "sha256-vuKlddqm8KirqAJyvBPfRb5Nw9zo4Fl1bwbfVMhmH9g="; + rev = "refs/tags/${version}"; + hash = "sha256-FhuIYXktcNnOVX+KU5cDOd2Qk7AcWaSKvfB/BZYpsZo="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ # https://github.com/dmulyalin/ttp/blob/master/docs/source/Installation.rst#additional-dependencies cerberus @@ -87,6 +92,8 @@ buildPythonPackage rec { "test_child_group_do_not_start_if_no_parent_started" # Assertion Error "test_in_threads_parsing" + # missing env var + "test_ttp_templates_dir_env_variable" ]; pytestFlagsArray = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix index 0dbfe22065..a605952b2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "tubes"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { pname = "Tubes"; inherit version; - sha256 = "0sg1gg2002h1xsgxigznr1zk1skwmhss72dzk6iysb9k9kdgymcd"; + sha256 = "sha256-WbkZfy+m9/xrwygd5VeXrccpu3XJxhO09tbEFZnw14s="; }; propagatedBuildInputs = [ characteristic six twisted ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix index c86f0298d3..3c6690bd39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "tubeup"; - version = "0.0.32"; + version = "0.0.33"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-YWBp6qXz4hNTBzywBGTXDQSzbWfoEEvJLQL5wy8DQ1g="; + sha256 = "sha256-RFM0vZeA5PDXf9KzlJ8RTSfM7bz50bpwwszU0gjV1DY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 2b85e9ef8b..8c0a1f7fc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.11.0"; + version = "7.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-JeguDPbsG3aeXDqqojfJHGpDVniY+IvWMD2GCgCUvuQ="; + hash = "sha256-/ni7QwBJTLc9hZPFg6wPskwuqmyKS4MHr+r7d/i87Mc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix index ceaadd74ee..7779f05313 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix @@ -104,6 +104,9 @@ buildPythonPackage rec { # twisted.python.runtime.platform.supportsINotify() == False substituteInPlace src/twisted/python/_inotify.py --replace \ "ctypes.util.find_library(\"c\")" "'${stdenv.cc.libc}/lib/libc.so.6'" + '' + lib.optionalString (stdenv.isAarch64 && stdenv.isDarwin) '' + echo 'AbortConnectionTests_AsyncioSelectorReactorTests.test_fullWriteBufferAfterByteExchange.skip = "Timeout after 120 seconds"' >> src/twisted/internet/test/test_tcp.py + echo 'AbortConnectionTests_AsyncioSelectorReactorTests.test_resumeProducingAbort.skip = "Timeout after 120 seconds"' >> src/twisted/internet/test/test_tcp.py ''; # Generate Twisted's plug-in cache. Twisted users must do it as well. See diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix index 97cb99e206..9427d39c20 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twitchapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twitchapi"; - version = "2.5.5"; + version = "2.5.7.1"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "twitchAPI"; inherit version; - hash = "sha256-NOLuooJNGpuHnKa9eAEEDzKJnXdJ6/Yx2/9KZqY9SDk="; + hash = "sha256-ZhmzrHWbwoHL+9FdkVoc+GGxH1v2j7rB/3ZiaWu9kjQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix index d9696122f1..3a6ee309ff 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "typed-settings"; - version = "1.0.1"; + version = "1.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xrIJgQiAaSXcANMnyXMnqEkLNUP+VyxjRoi9DkX+SLA="; + sha256 = "sha256-Ja2ZLqzJSSvK5hIMhayMztJta/Jc3tmb2tzdlxageAs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix index 29f104e640..2019a956ce 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix @@ -6,6 +6,7 @@ , flit-core , click , pytestCheckHook +, rich , shellingham , pytest-xdist , pytest-sugar @@ -15,14 +16,14 @@ buildPythonPackage rec { pname = "typer"; - version = "0.4.2"; + version = "0.6.1"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-uCYcbAFS3XNHi1upa6Z35daUjHFcMQ98kQefMR9i7AM="; + sha256 = "sha256-LVcgpeY/c+rzHtqhX2q4fzXwaQ+MojMBfX0j10OpHXM="; }; nativeBuildInputs = [ @@ -38,6 +39,7 @@ buildPythonPackage rec { pytest-xdist pytest-sugar shellingham + rich coverage # execs coverage in tests ]; @@ -48,12 +50,13 @@ buildPythonPackage rec { # likely related to https://github.com/sarugaku/shellingham/issues/35 "test_show_completion" "test_install_completion" + ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + "test_install_completion" ]; pythonImportsCheck = [ "typer" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Python library for building CLI applications"; homepage = "https://typer.tiangolo.com/"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix index c51b183552..f5d628b4b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-dateutil"; - version = "2.8.16"; + version = "2.8.18"; format = "setuptools"; src = fetchPypi { pname = "types-python-dateutil"; inherit version; - hash = "sha256-OqrEwTjra47LwlUJluwl1uRbXTKIfR5pPQhC7i+mWdI="; + hash = "sha256-hpXH16WxrvQALzq04SR+I7HUHNfMEobUWUwtjFWTyZE="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix index 5393a1604c..e3b8069f53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-protobuf/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-protobuf"; - version = "3.19.15"; + version = "3.19.22"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-03HQpbMueMLWhDKaXUSR04Xm6tyrSXs3xBFy3tMoxdk="; + sha256 = "sha256-0rJoYbDLRqPIZpsN9Qe373Lkh9pm1h+fNXaqds4CioM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix index 2c7e5f7387..fe533ab5ea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2022.1.1"; + version = "2022.1.2"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-TnrdcIhtwu5u51NcgYSibusKyduvrpliy4gtdLn2czA="; + sha256 = "sha256-GoslwiXF5r2EaKqetF3dOzN/ZxbUByrQqk7x5BR47rw="; }; # Modules doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix index e2c74aa1a4..28bf378738 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-pyyaml/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pyyaml"; - version = "6.0.9"; + version = "6.0.11"; format = "setuptools"; src = fetchPypi { pname = "types-PyYAML"; inherit version; - sha256 = "sha256-M651yEuPYf3fDGPpx+VX252xaUrTwu6GKOxe/rtaXps="; + sha256 = "sha256-f32i/RHpvB5enrPqG+hPSEl0cBeln8Lu4Oo07RFHwuA="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix index f1ce15b682..3ba8795694 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-redis/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-redis"; - version = "4.3.3"; + version = "4.3.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-064pr/eZk2HJ+XlJi9LiV/ky9ikbh2qsC0S18AEGxuE="; + sha256 = "sha256-qllV/18QuHqQIcAx6wAqVEpBoKYoAITsB1ioqBKjdcQ="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix index a409f71a47..f8b663abe6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-requests/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "types-requests"; - version = "2.28.1"; + version = "2.28.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-rNjteFCdJ73wTN3MBfcGbf3k0w3X26Z7gIzbEUHWL/4="; + sha256 = "sha256-ep97FS1ZShwY3UkyzdJZa4777t/XPKpOSrs3VYBbRoU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix index fafb100aa8..85001a87f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "63.2.0"; + version = "63.4.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/JpsR3ajmND1eyWcqJN0g0IXTFKjXVk9CLVvUqqZwaQ="; + sha256 = "sha256-aq2A3Ra7XuXHgmDXtVNt27lUcO2Mw9qxkCeAKn+Nw2I="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix index 296cffecba..b17d83a351 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.16"; + version = "1.26.22"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-i7ODLGhMMMvtQLluKLwEcDvssrl9gqxlukuWh4NFOw4="; + hash = "sha256-sFr5DnOInmiAlACKl8qVeI24vzc24ndv1D+2sXFIXZQ="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix index 97f0d48cec..36464204e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typing-extensions/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "typing-extensions"; - version = "4.1.1"; + version = "4.3.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,18 +16,13 @@ buildPythonPackage rec { src = fetchPypi { pname = "typing_extensions"; inherit version; - hash = "sha256-GpRi3MM0enmx8cAnH7556ERYC7WYuvoe0gi5TaPNzUI="; + hash = "sha256-5tJnejL0f8frJ5XbHdFcHzTv9ha8ryz7Xpl/hU+hxKY="; }; nativeBuildInputs = [ flit-core ]; - postPatch = '' - # Remove metadata for README which are outdated - sed -i -e '11,24d' pyproject.toml - ''; - # Tests are not part of PyPI releases. GitHub source can't be used # as it ends with an infinite recursion doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typogrify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typogrify/default.nix index 25445d8a7d..81425b22f1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/typogrify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/typogrify/default.nix @@ -1,32 +1,33 @@ { lib , buildPythonPackage , fetchPypi -, isPyPy -, django , smartypants -, jinja2 }: buildPythonPackage rec { pname = "typogrify"; version = "2.0.7"; - disabled = isPyPy; + + format = "setuptools"; src = fetchPypi { inherit pname version; sha256 = "8be4668cda434163ce229d87ca273a11922cb1614cb359970b7dc96eed13cb38"; }; - propagatedBuildInputs = [ django smartypants jinja2 ]; + propagatedBuildInputs = [ + smartypants + ]; # Wants to set up Django doCheck = false; + pythonImportsCheck = [ "typogrify.filters" ]; + meta = with lib; { description = "Filters to enhance web typography, including support for Django & Jinja templates"; homepage = "https://github.com/mintchaos/typogrify"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix index b1e5ea7905..5a87bfd42c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix @@ -7,18 +7,19 @@ , compreffor , booleanoperations , cffsubr +, ufoLib2 , pytestCheckHook }: buildPythonPackage rec { pname = "ufo2ft"; - version = "2.27.0"; + version = "2.28.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "r5bE4M/blt5TKzP43MpijwYY6ll3aasszmGksY5WTTE="; + sha256 = "sha256-pWHvjAvHNWlmJiQ75JRmFyrjYnzbJG7M8/DGoIWpEBk="; }; patches = [ @@ -37,6 +38,7 @@ buildPythonPackage rec { compreffor booleanoperations cffsubr + ufoLib2 ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch index 892cd4abeb..56aba78b5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/fonttools-cu2qu.patch @@ -1,4 +1,4 @@ -From 0b3631e91c93d56460929f40850f7d8a39a71bde Mon Sep 17 00:00:00 2001 +From eb63747509b2c18793b95eb12cc0141277520798 Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Thu, 11 Feb 2021 09:43:41 +0000 Subject: [PATCH 1/2] Rename cu2qu to fontTools.cu2qu @@ -6,14 +6,13 @@ Subject: [PATCH 1/2] Rename cu2qu to fontTools.cu2qu --- Lib/ufo2ft/filters/cubicToQuadratic.py | 4 ++-- Lib/ufo2ft/preProcessor.py | 4 ++-- - requirements.txt | 1 - setup.py | 1 - tests/outlineCompiler_test.py | 2 +- tests/preProcessor_test.py | 2 +- - 6 files changed, 6 insertions(+), 8 deletions(-) + 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py -index 87d81b1f..4b77144f 100644 +index 87d81b1..4b77144 100644 --- a/Lib/ufo2ft/filters/cubicToQuadratic.py +++ b/Lib/ufo2ft/filters/cubicToQuadratic.py @@ -1,7 +1,7 @@ @@ -27,44 +26,44 @@ index 87d81b1f..4b77144f 100644 from ufo2ft.filters import BaseFilter from ufo2ft.fontInfoData import getAttrWithFallback diff --git a/Lib/ufo2ft/preProcessor.py b/Lib/ufo2ft/preProcessor.py -index 05ac47dc..c796df2e 100644 +index e239152..9463aea 100644 --- a/Lib/ufo2ft/preProcessor.py +++ b/Lib/ufo2ft/preProcessor.py -@@ -217,7 +217,7 @@ def __init__( - layerNames=None, +@@ -267,7 +267,7 @@ class TTFInterpolatablePreProcessor: skipExportGlyphs=None, + filters=None, ): - from cu2qu.ufo import DEFAULT_MAX_ERR + from fontTools.cu2qu.ufo import DEFAULT_MAX_ERR self.ufos = ufos self.inplace = inplace -@@ -249,7 +249,7 @@ def __init__( - self.postFilters.append(post) +@@ -304,7 +304,7 @@ class TTFInterpolatablePreProcessor: + self.postFilters = [[f for f in filters if not f.pre] for filters in filterses] def process(self): - from cu2qu.ufo import fonts_to_quadratic + from fontTools.cu2qu.ufo import fonts_to_quadratic - # first apply all custom pre-filters - for funcs, ufo, glyphSet in zip(self.preFilters, self.ufos, self.glyphSets): + needs_decomposition = set() + diff --git a/setup.py b/setup.py -index 175429af..eef39ee1 100644 +index d8d9982..a165ab1 100644 --- a/setup.py +++ b/setup.py -@@ -30,7 +30,6 @@ +@@ -30,7 +30,6 @@ setup( tests_require=["pytest>=2.8"], install_requires=[ - "fonttools[ufo]>=4.28.5", + "fonttools[ufo]>=4.34.0", - "cu2qu>=1.6.7", "cffsubr>=0.2.8", "booleanOperations>=0.9.0", ], diff --git a/tests/outlineCompiler_test.py b/tests/outlineCompiler_test.py -index 74319184..e7b15a23 100644 +index b31319c..ee51920 100644 --- a/tests/outlineCompiler_test.py +++ b/tests/outlineCompiler_test.py -@@ -2,7 +2,7 @@ +@@ -2,7 +2,7 @@ import logging import os import pytest @@ -74,10 +73,10 @@ index 74319184..e7b15a23 100644 from fontTools.ttLib.tables._g_l_y_f import USE_MY_METRICS diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py -index 64196f92..87b23946 100644 +index 11196f8..bc32d55 100644 --- a/tests/preProcessor_test.py +++ b/tests/preProcessor_test.py -@@ -2,7 +2,7 @@ +@@ -2,7 +2,7 @@ import logging import os import pytest @@ -86,8 +85,10 @@ index 64196f92..87b23946 100644 from fontTools import designspaceLib import ufo2ft +-- +2.36.1 -From 27c5af88ec2c3314618ecbf65104050a53508bb0 Mon Sep 17 00:00:00 2001 +From 58f3ab5e5db8090aba10fefd58ad8df4b507e7c3 Mon Sep 17 00:00:00 2001 From: Simon Cozens Date: Thu, 11 Feb 2021 09:49:28 +0000 Subject: [PATCH 2/2] Sort the imports @@ -98,7 +99,7 @@ Subject: [PATCH 2/2] Sort the imports 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/ufo2ft/filters/cubicToQuadratic.py b/Lib/ufo2ft/filters/cubicToQuadratic.py -index 4b77144f..5f28ea42 100644 +index 4b77144..5f28ea4 100644 --- a/Lib/ufo2ft/filters/cubicToQuadratic.py +++ b/Lib/ufo2ft/filters/cubicToQuadratic.py @@ -1,7 +1,7 @@ @@ -111,10 +112,10 @@ index 4b77144f..5f28ea42 100644 from ufo2ft.filters import BaseFilter from ufo2ft.fontInfoData import getAttrWithFallback diff --git a/tests/preProcessor_test.py b/tests/preProcessor_test.py -index 87b23946..76ee495a 100644 +index bc32d55..41c579c 100644 --- a/tests/preProcessor_test.py +++ b/tests/preProcessor_test.py -@@ -2,8 +2,8 @@ +@@ -2,8 +2,8 @@ import logging import os import pytest @@ -124,3 +125,6 @@ index 87b23946..76ee495a 100644 import ufo2ft from ufo2ft.constants import ( +-- +2.36.1 + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix index 1baa1c86f6..ee2fede8e9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "5.3.0"; + version = "5.4.0"; disabled = isPyPy || pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-q5OHd7OsA3IjHuZUp/ahN4flh7HKJo2Kp+b7aEbkd9A="; + sha256 = "sha256-a5U+CUQeMHUEEwdV5b1rFYUBeNWR9mKSu6RgjE9/mwA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix index 180baf0d4d..06bdf12349 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uncertainties/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "uncertainties"; - version = "3.1.6"; + version = "3.1.7"; src = fetchPypi { inherit pname version; - sha256 = "0b9y0v73ih142bygi66dxqx17j2x4dfvl7xnhmafj9yjmymbakbw"; + sha256 = "sha256-gBEeCDnyOcWyM8tHcgF7SDoLehVzpYG5Krd0ajXm+qs="; }; propagatedBuildInputs = [ future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix index 5b1e864598..68d28d0f47 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix @@ -39,6 +39,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + postPatch = '' substituteInPlace pyproject.toml \ --replace "--cov=unifi_discovery --cov-report=term-missing:skip-covered" "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix index 820c96c38c..6582f5080b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/untangle/default.nix @@ -1,17 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python }: +{ lib, buildPythonPackage, fetchFromGitHub, python, defusedxml }: buildPythonPackage rec { pname = "untangle"; - version = "1.1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "stchris"; repo = "untangle"; # 1.1.1 is not tagged on GitHub - rev = "61b57cd771a40df7d1621e9ec3c68d9acd733d31"; - sha256 = "0ffvlfyyl82xi4akz1lls32lrnlrn44ik41v8x8xh9ghy0n0ick7"; + rev = "refs/tags/${version}"; + sha256 = "sha256-cJkN8vT5hW5hRuLxr/6udwMO4GVH1pJhAc6qmPO2EEI="; }; + propagatedBuildInputs = [ + defusedxml + ]; + checkPhase = '' ${python.interpreter} -m unittest discover -s tests ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix index 8bf8e67b8e..50bbb8b6fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uproot/default.nix @@ -4,6 +4,7 @@ , awkward , numpy , lz4 +, setuptools , xxhash , zstandard , pytestCheckHook @@ -12,20 +13,21 @@ buildPythonPackage rec { pname = "uproot"; - version = "4.2.0"; + version = "4.3.3"; # fetch from github for tests src = fetchFromGitHub { owner = "scikit-hep"; repo = "uproot4"; - rev = version; - sha256 = "sha256-ft2VXYGb+iPqRUrtOBvl7SgTPfPR4+IOdYFVTNbQAEw="; + rev = "refs/tags/${version}"; + sha256 = "sha256-7wc5KmnjCA90zOaq3qi5V1vvXi4tPwor8tK20i9WrTY="; }; propagatedBuildInputs = [ awkward numpy lz4 + setuptools xxhash zstandard ]; @@ -53,7 +55,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "uproot" ]; meta = with lib; { - homepage = "https://github.com/scikit-hep/uproot4"; + homepage = "https://github.com/scikit-hep/uproot5"; description = "ROOT I/O in pure Python and Numpy"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix index 790b497bb8..ba10224e92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/urllib3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "urllib3"; - version = "1.26.9"; + version = "1.26.10"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-qrrxZHeAal4d0ZqkH4wreVDdPHRjYtfjIj2+beasRI4="; + hash = "sha256-h5uk0eiWVNl2nOExIeD5QxDqMujS+M9Ye3fAi7zbMNY="; }; # FIXME: remove backwards compatbility hack diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix index cc9f884f7c..26d23f08af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , callPackage , fetchFromGitHub -, asgiref , click , h11 , httptools @@ -10,22 +9,21 @@ , pyyaml , typing-extensions , uvloop -, watchgod +, watchfiles , websockets -, wsproto , pythonOlder }: buildPythonPackage rec { pname = "uvicorn"; - version = "0.17.6"; + version = "0.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - hash = "sha256-iJlAU7zZl9X3FcQlJoJ7KlETZOx6WsE9FcpCK4Cm/Fo="; + hash = "sha256-nxtDqYh2OmDtoV10CEBGYQrQBf+Xtuf5k9yR6UfCgYc="; }; outputs = [ @@ -34,18 +32,19 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - asgiref click h11 + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + + passthru.optional-dependencies.standard = [ httptools python-dotenv pyyaml uvloop - watchgod + watchfiles websockets - wsproto - ] ++ lib.optionals (pythonOlder "3.8") [ - typing-extensions ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix index 2fc0e932b8..b9cd883f43 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvicorn/tests.nix @@ -1,5 +1,6 @@ { stdenv , buildPythonPackage +, asgiref , uvicorn , httpx , pytest-asyncio @@ -7,6 +8,8 @@ , pytest-mock , requests , trustme +, watchgod +, wsproto }: buildPythonPackage rec { @@ -19,6 +22,7 @@ buildPythonPackage rec { dontInstall = true; checkInputs = [ + asgiref uvicorn httpx pytestCheckHook @@ -26,7 +30,12 @@ buildPythonPackage rec { pytest-mock requests trustme - ]; + + # strictly optional dependencies + watchgod + wsproto + ] + ++ uvicorn.optional-dependencies.standard; doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix index ec7f3e47ca..3e877ea1a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix @@ -6,7 +6,7 @@ , libuv , CoreServices , ApplicationServices -# Check Inputs + # Check Inputs , aiohttp , psutil , pyopenssl @@ -34,7 +34,6 @@ buildPythonPackage rec { checkInputs = [ aiohttp pytestCheckHook - pyopenssl psutil ]; @@ -46,15 +45,18 @@ buildPythonPackage rec { "--assert=plain" "--strict" "--tb=native" - ] ++ lib.optionals (stdenv.isAarch32 || stdenv.isAarch64) [ + # Depend on pyopenssl + "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_flush_before_shutdown" + "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_renegotiation" + ] ++ lib.optionals stdenv.hostPlatform.isAarch [ # test gets stuck in epoll_pwait on hydras aarch64 builders # https://github.com/MagicStack/uvloop/issues/412 - "--deselect" "tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" + "--deselect tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data" ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Flaky test: https://github.com/MagicStack/uvloop/issues/412 - "--deselect" "tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" + "--deselect tests/test_tcp.py::Test_UV_TCPSSL::test_shutdown_timeout_handler_not_set" # Broken: https://github.com/NixOS/nixpkgs/issues/160904 - "--deselect" "tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" + "--deselect tests/test_context.py::Test_UV_Context::test_create_ssl_server_manual_connection_lost" ]; disabledTestPaths = [ @@ -66,7 +68,11 @@ buildPythonPackage rec { # Work around "OSError: AF_UNIX path too long" # https://github.com/MagicStack/uvloop/issues/463 export TMPDIR="/tmp" - '' + '' + '' + '' + # pyopenssl is not well supported by upstream + # https://github.com/NixOS/nixpkgs/issues/175875 + substituteInPlace tests/test_tcp.py \ + --replace "from OpenSSL import SSL as openssl_ssl" "" # force using installed/compiled uvloop vs source by moving tests to temp dir export TEST_DIR=$(mktemp -d) cp -r tests $TEST_DIR diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix index f83fe801a2..8cb42064ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validators/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "validators"; - version = "0.18.2"; + version = "0.20.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "37cd9a9213278538ad09b5b9f9134266e7c226ab1fede1d500e29e0a8fbb9ea6"; + sha256 = "sha256-JBSM5OZBAKLV4mcjPiPnr+tVMWtH0w+q5+tucpK8Imo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix index 2cf21522d4..3f0f40fc26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/validobj/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "validobj"; - version = "0.5.1"; + version = "0.6"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "430b0b56931a2cebdb857a9fe9da2467c06a3b4db37b728e7f1a8706e8887705"; + sha256 = "sha256-BvnHn0Erk87Ce3tYwYf0tBwRJMrG19Af/Y568VJ02uo="; }; nativeBuildInputs = [ flit ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix index 53af2f0dd9..821dbb19e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "vallox-websocket-api"; - version = "2.11.0"; + version = "2.12.0"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "yozik04"; repo = "vallox_websocket_api"; - rev = version; - hash = "sha256-wZiPrPl9ESp43PFdRPvqB2nOg+ogfaArunZOR3Q9cvs="; + rev = "refs/tags/${version}"; + hash = "sha256-Ibp+oAd6q8Vu9V+TaLzlPbWIDheFUjCyW83Hg4Ztw20="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix index 7766e75ba0..8dbc7b5054 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "4.1.1"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "57095bf22fc0a2d99ee9674cdafebed0f3ba763018582450706f7d3a74fff599"; + sha256 = "sha256-lFILhvt2WSWtyMd/+TToml4VbCjnSjFDICF+8bRUr+A="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix index a739ab2fd6..3fba7cdb50 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.14.0"; + version = "20.15.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-jltAIDcocSboHM3pQyuVqL5bGdNlhPZJVwYKNIjBHKg="; + sha256 = "sha256-KIFxE0ov87+xovVPEZ53zRuBwp/BJlojVvPo0Ux9WMQ="; }; nativeBuildInputs = [ @@ -72,6 +72,9 @@ buildPythonPackage rec { ]; disabledTests = [ + # Network access + "test_create_no_seed" + "test_seed_link_via_app_data" # Permission Error "test_bad_exe_py_info_no_raise" ] ++ lib.optionals isPy27 [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix index e94c96f72b..6b86123ade 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/viv-utils/default.nix @@ -1,45 +1,52 @@ { lib , buildPythonPackage -, isPy3k , fetchFromGitHub , funcy -, pefile -, vivisect , intervaltree -, setuptools +, pefile +, typing-extensions +, vivisect +, pytest-sugar +, pytestCheckHook +, python-flirt }: buildPythonPackage rec { pname = "viv-utils"; - version = "0.3.17"; - disabled = isPy3k; + version = "0.7.5"; src = fetchFromGitHub { owner = "williballenthin"; repo = "viv-utils"; rev = "v${version}"; - sha256 = "wZWp6PMn1to/jP6lzlY/x0IhS/0w0Ys7AdklNQ+Vmyc="; + sha256 = "sha256-JDu+1n1wP2Vsp2V/bKdE+RFp6bE8RNmimi4wdsatwME="; }; - # argparse is provided by Python itself - preBuild = '' - sed '/"argparse",/d' -i setup.py + postPatch = '' + substituteInPlace setup.py \ + --replace "==" ">=" ''; propagatedBuildInputs = [ funcy - pefile - vivisect intervaltree - setuptools + pefile + typing-extensions + vivisect ]; - # no tests - doCheck = false; - - pythonImportsCheck = [ - "viv_utils" + checkInputs = [ + pytest-sugar + pytestCheckHook ]; + passthru = { + optional-dependencies = { + flirt = [ + python-flirt + ]; + }; + }; + meta = with lib; { description = "Utilities for working with vivisect"; homepage = "https://github.com/williballenthin/viv-utils"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix index 68375a8ead..df0c72a344 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vivisect/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "vivisect"; - version = "1.0.7"; + version = "1.0.8"; src = fetchPypi { inherit pname version; - sha256 = "727a27ac1eb95d5a41f4430f6912e79940525551314fe68a2811fc9d51eaf2e9"; + sha256 = "sha256-Y8y6sAQJa9baPPdhtuR9Jv1tJkNWJsS1hJ1lknkHWU4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix index 3511d16962..adb55bd072 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "volvooncall"; - version = "0.10.0"; + version = "0.10.1"; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "molobrakos"; repo = "volvooncall"; rev = "v${version}"; - hash = "sha256-HLSanXJs1yPSgYo4oX0zJtrV5sKkxV2yLPhc2dVRHY8="; + hash = "sha256-udYvgKj7Rlc/hA86bbeBfnoVRjKkXT4TwpceWz226cU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix index e1dd04ed75..0062bbd9e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vulture/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pint , pythonOlder , pytestCheckHook , toml @@ -8,14 +9,14 @@ buildPythonPackage rec { pname = "vulture"; - version = "2.4"; + version = "2.5"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-gZQ5KUp2tOC44Ixw11VlqM49wfbgNVjtEjpfK7c3wOo="; + hash = "sha256-KDFpQFXrLjagnDt2gJNINxArm2wJaSBuOQLVE2Ehd8M="; }; postPatch = '' @@ -28,6 +29,7 @@ buildPythonPackage rec { ]; checkInputs = [ + pint pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix index 5bfade16e5..fc6dbadaec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wandb/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pname = "wandb"; - version = "0.12.20"; + version = "0.12.21"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -48,7 +48,7 @@ buildPythonPackage rec { owner = pname; repo = "client"; rev = "refs/tags/v${version}"; - hash = "sha256-zS3DA06uLfUApe0kDAbqPA+2is70bnb9EifgFWqcuRg="; + hash = "sha256-jKb2pNmCW4MYz6ncsMNg7o5giCI2bpKER/kb8lfJekI="; }; patches = [ @@ -101,47 +101,50 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment. - "tests/integrations/test_keras.py" - "tests/integrations/test_torch.py" - "tests/test_cli.py" - "tests/test_data_types.py" - "tests/test_file_stream.py" - "tests/test_file_upload.py" - "tests/test_footer.py" - "tests/test_internal_api.py" - "tests/test_label_full.py" - "tests/test_login.py" - "tests/test_meta.py" - "tests/test_metric_full.py" - "tests/test_metric_internal.py" - "tests/test_mode_disabled.py" - "tests/test_model_workflows.py" - "tests/test_mp_full.py" - "tests/test_public_api.py" - "tests/test_redir.py" - "tests/test_runtime.py" - "tests/test_sender.py" - "tests/test_start_method.py" - "tests/test_tb_watcher.py" - "tests/test_telemetry_full.py" - "tests/test_util.py" - "tests/wandb_agent_test.py" - "tests/wandb_artifacts_test.py" - "tests/wandb_integration_test.py" - "tests/wandb_run_test.py" - "tests/wandb_settings_test.py" - "tests/wandb_sweep_test.py" - "tests/wandb_tensorflow_test.py" - "tests/wandb_verify_test.py" + "tests/unit_tests/integrations/test_keras.py" + "tests/unit_tests/integrations/test_torch.py" + "tests/unit_tests/test_cli.py" + "tests/unit_tests/test_data_types.py" + "tests/unit_tests/test_file_stream.py" + "tests/unit_tests/test_file_upload.py" + "tests/unit_tests/test_footer.py" + "tests/unit_tests/test_internal_api.py" + "tests/unit_tests/test_label_full.py" + "tests/unit_tests/test_login.py" + "tests/unit_tests/test_meta.py" + "tests/unit_tests/test_metric_full.py" + "tests/unit_tests/test_metric_internal.py" + "tests/unit_tests/test_mode_disabled.py" + "tests/unit_tests/test_model_workflows.py" + "tests/unit_tests/test_mp_full.py" + "tests/unit_tests/test_public_api.py" + "tests/unit_tests/test_redir.py" + "tests/unit_tests/test_runtime.py" + "tests/unit_tests/test_sender.py" + "tests/unit_tests/test_start_method.py" + "tests/unit_tests/test_tb_watcher.py" + "tests/unit_tests/test_telemetry_full.py" + "tests/unit_tests/test_util.py" + "tests/unit_tests/wandb_agent_test.py" + "tests/unit_tests/wandb_artifacts_test.py" + "tests/unit_tests/wandb_integration_test.py" + "tests/unit_tests/wandb_run_test.py" + "tests/unit_tests/wandb_settings_test.py" + "tests/unit_tests/wandb_sweep_test.py" + "tests/unit_tests/wandb_tensorflow_test.py" + "tests/unit_tests/wandb_verify_test.py" + "tests/unit_tests/test_tpu.py" + "tests/unit_tests/test_plots.py" + "tests/unit_tests/test_report_api.py" # Requires metaflow, which is not yet packaged. - "tests/integrations/test_metaflow.py" + "tests/unit_tests/integrations/test_metaflow.py" # Fails and borks the pytest runner as well. - "tests/wandb_test.py" + "tests/unit_tests/wandb_test.py" # Tries to access /homeless-shelter - "tests/test_tables.py" + "tests/unit_tests/test_tables.py" ]; # Disable test that fails on darwin due to issue with python3Packages.psutil: @@ -156,7 +159,8 @@ buildPythonPackage rec { meta = with lib; { description = "A CLI and library for interacting with the Weights and Biases API"; - homepage = "https://github.com/wandb/client"; + homepage = "https://github.com/wandb/wandb"; + changelog = "https://github.com/wandb/wandb/raw/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wandb/hardcode-git-path.patch b/third_party/nixpkgs/pkgs/development/python-modules/wandb/hardcode-git-path.patch index 6d91add9d3..23097c535e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wandb/hardcode-git-path.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/wandb/hardcode-git-path.patch @@ -1,7 +1,7 @@ -diff --git a/functional_tests/kfp/wandb_probe.py b/functional_tests/kfp/wandb_probe.py +diff --git a/tests/functional_tests/t0_main/kfp/wandb_probe.py b/tests/functional_tests/t0_main/kfp/wandb_probe.py index 82fadfe1..25c1454c 100644 ---- a/functional_tests/kfp/wandb_probe.py -+++ b/functional_tests/kfp/wandb_probe.py +--- a/tests/functional_tests/t0_main/kfp/wandb_probe.py ++++ b/tests/functional_tests/t0_main/kfp/wandb_probe.py @@ -5,7 +5,7 @@ import subprocess def wandb_probe_package(): if not os.environ.get("WB_PROBE_PACKAGE"): diff --git a/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix index c20723e8d6..c646107c32 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, poetry-core , jsonpatch , jsonschema , six @@ -10,28 +11,29 @@ buildPythonPackage rec { pname = "warlock"; - version = "1.3.3"; - format = "setuptools"; + version = "2.0.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bcwaldon"; repo = pname; - rev = version; - hash = "sha256-59V4KOwjs/vhA3F3E0j3p5L4JnKPgcExN+mgSWs0Cn0="; + rev = "refs/tags/${version}"; + hash = "sha256-HOCLzFYmOL/tCXT+NO/tCZuVXVowNEPP3g33ZYg4+6Q="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace "jsonschema>=0.7,<4" "jsonschema" - sed -i "/--cov/d" pytest.ini + sed -i '/--cov/d' pytest.ini ''; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ jsonpatch jsonschema - six ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix index 177848497b..c530ea66cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "watchdog"; - version = "2.1.8"; + version = "2.1.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bQMUkSaGSr0ycV1OkmfSdUzt4lppBSkBOZNWrTvF7P8="; + sha256 = "sha256-Q84g67NqUfIfo3b3bR1GkkUrJSfM1gGVDWntNrniFgk="; }; patches = lib.optionals (stdenv.isDarwin && !stdenv.isAarch64) [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix index 49cbef94b8..f85bc75c80 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchfiles/default.nix @@ -15,28 +15,28 @@ buildPythonPackage rec { pname = "watchfiles"; - version = "0.14.1"; - format = "setuptools"; + version = "0.15.0"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; - rev = "v${version}"; - hash = "sha256-XjmmyL7ZRqkYwGGk6/KkxL7e/JA43tQN4W3knTtc7t0="; + rev = "refs/tags/v${version}"; + hash = "sha256-DibxoVH7uOy9rxzhiN4HmihA7HtdzErmJOnsI/NWY5I="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-sZMj1HQ37gAG3WM+qBMhcCQ2MuUGom23lF8c4L0RQzM="; + hash = "sha256-EakC/rSIS42Q4Y0pvWKG7mzppU5KjCktnC09iFMZM0A="; }; nativeBuildInputs = [ - setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook + maturinBuildHook rust.cargo rust.rustc ]); @@ -45,6 +45,10 @@ buildPythonPackage rec { anyio ]; + preCheck = '' + rm -rf watchfiles + ''; + checkInputs = [ dirty-equals pytest-mock @@ -56,10 +60,6 @@ buildPythonPackage rec { "watchfiles" ]; - preCheck = '' - cd tests - ''; - meta = with lib; { broken = stdenv.isDarwin; description = "Simple, modern file watching and code reload"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchgod/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchgod/default.nix index 70e93f1a20..80d95b3175 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchgod/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchgod/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "watchgod"; - version = "0.8.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-wS0V8999EedAcE5FOYJ3918dePRq1Zyp11Bb/YuNMIY="; + sha256 = "sha256-yxH/ZmV777qU2CjjtiLV+3byL72hN281Xz5uUel9lFA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix index d8db35fbda..cce9a162e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wavedrom/default.nix @@ -5,6 +5,7 @@ , fetchPypi , pillow , pytestCheckHook +, pyyaml , setuptools-scm , six , svgwrite @@ -13,12 +14,12 @@ buildPythonPackage rec { pname = "wavedrom"; - version = "2.0.3.post2"; + version = "2.0.3.post3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-I5s0Nf8RawkAfVUX7tdV/IWRiRtycaHNQNueQAwCRI0="; + hash = "sha256-MntNXcpZPIElfCAv6lFvepCHR/sRUnw1nwNPW3r39Hs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -29,6 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrdict + pyyaml svgwrite six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix index a1c0cfa82e..a73703f12a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websocket-client/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "websocket-client"; - version = "1.3.2"; + version = "1.3.3"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ULIdsAWPepU9Z8wERb5LlI1/wZbsvrgIPWjZRijkq/Y="; + sha256 = "sha256-1YxfKE1qm/g3natCMln+j4W3DV+l0pFtV5GoRZSxIrE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix index eb8c8f51d7..4cdea86dec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.38.1"; + version = "0.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-ybSslUdOlD87Kl6dkNRO/pHLBmQB3ioT/3p4uHYssBI="; + hash = "sha256-4qZWlICqYv8sewDfGbKSBGVVCtF/1BvYPc07gONZz8c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix index 719682eb00..734f6ed37a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.45.0"; + version = "0.47.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tillsteinbach"; repo = "WeConnect-python"; - rev = "v${version}"; - hash = "sha256-iAKw05vMaGTQ/V1uwqbkO2AZOOtsMOfSnponnE5AdXE="; + rev = "refs/tags/v${version}"; + hash = "sha256-wQBl8oxU+Dfsgs+udxcb01hquny+AFKnu4J7AULYOdc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix new file mode 100644 index 0000000000..9244e26520 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/whatthepatch/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "whatthepatch"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "cscorley"; + repo = pname; + rev = version; + hash = "sha256-0l/Ebq7Js9sKFJ/RzkQ1aWEDCxt+COVd2qVnLSWwFx0="; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "whatthepatch" ]; + + meta = with lib; { + description = "Python library for both parsing and applying patch files"; + homepage = "https://github.com/cscorley/whatthepatch"; + license = licenses.mit; + maintainers = with maintainers; [ jyooru ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix index 28a2c15a8d..b36a5c9a23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whisper/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "whisper"; - version = "1.1.8"; + version = "1.1.10"; src = fetchFromGitHub { owner = "graphite-project"; repo = pname; - rev = version; - sha256 = "11f7sarj62zgpw3ak4a2q55lj7ap4039l9ybc3a6yvs1ppvrcn7x"; + rev = "refs/tags/${version}"; + sha256 = "sha256-CnCbRmI2jc67mTtfupoE1uHtobrAiWoUXbfX8YeEV6A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix index 8ab9cc6fd9..fcb4d93893 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/whodap/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whodap"; - version = "0.1.5"; + version = "0.1.6"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "pogzyb"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Jm3+WMGuYc910TNDVzHjYcbNcts668D3xYORXxozWqA="; + hash = "sha256-gLA6tT6ZUMjb2ZF5t6DdI5nqiX2Uxatj3ThmQ+VZu9A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix index 563e792850..7609eb376f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "widgetsnbextension"; - version = "3.6.0"; + version = "3.6.1"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-6Ep6n8ubrz1XEG4YSnOJqPjrk1v3QaXrnWCqGMwCmoA="; + hash = "sha256-nISuZMKJPHy+Lqr8dQUiGnlcJ9aJOEVANKxIcxmnWxA="; }; # setup.py claims to require notebook, but the source doesn't have any imports diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix index 362d4e4d2b..9d42c48a60 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.13.2"; + version = "0.14.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "frenck"; repo = "python-wled"; - rev = "v${version}"; - sha256 = "sha256-Rv0jaKkN6jQ7oiv1cBYx4HAr7IqPm57jZFykXayp0T0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ytjCjxnJOMmFlGS+AuEAbIZcV2yoTgaXSLdqxPg6Hew="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix index e839aa805f..2714169aad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wrf-python/default.nix @@ -3,17 +3,19 @@ , fetchFromGitHub , pythonOlder , buildPythonPackage +, basemap , gfortran +, netcdf4 +, numpy +, python +, setuptools , xarray , wrapt -, numpy -, netcdf4 -, setuptools }: buildPythonPackage rec { pname = "wrf-python"; - version = "1.3.3"; + version = "1.3.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,21 +23,22 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "NCAR"; repo = "wrf-python"; - rev = version; - hash = "sha256-+v4FEK0FVE0oAIb18XDTOInHKfxXyykb1ngk9Uxwf0c="; + rev = "refs/tags/v${version}"; + hash = "sha256-4iIs/M9fzGJsnKCDSl09OTUoh7j6REBXuutE5uXFe3k="; }; - propagatedBuildInputs = [ - wrapt - numpy - setuptools - xarray - ]; - nativeBuildInputs = [ gfortran ]; + propagatedBuildInputs = [ + basemap + numpy + setuptools + xarray + wrapt + ]; + checkInputs = [ netcdf4 ]; @@ -43,7 +46,7 @@ buildPythonPackage rec { checkPhase = '' runHook preCheck cd ./test/ci_tests - python utests.py + ${python.interpreter} utests.py runHook postCheck ''; @@ -52,10 +55,10 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "WRF postprocessing library for Python"; homepage = "http://wrf-python.rtfd.org"; license = licenses.asl20; maintainers = with maintainers; [ mhaselsteiner ]; + broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xapp/default.nix index 7cb664d77f..ba48de4de7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xapp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xapp/default.nix @@ -5,19 +5,19 @@ , pygobject3 , gtk3 , gobject-introspection -, xapps +, xapp , polkit }: buildPythonPackage rec { pname = "xapp"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "python-xapp"; rev = version; - hash = "sha256-UC+0nbf+SRQsF5R0LcrPpmNbaoRM14DC82JccSpsKsY="; + hash = "sha256-ntjJ/O6HiRZMsqsuQY4HLM4fBE0aWpn/L4n5YCRlhhg="; }; propagatedBuildInputs = [ @@ -25,7 +25,7 @@ buildPythonPackage rec { pygobject3 gtk3 gobject-introspection - xapps + xapp polkit ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix index 921bedaae8..244541f7d8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xarray-einstats"; - version = "0.2.2"; + version = "0.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,8 +22,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "arviz-devs"; repo = pname; - rev = "v${version}"; - hash = "sha256-yc2dWKL9XhSSB7rUKS2uDCa4IyH/ajUf632Of2beY+4="; + rev = "refs/tags/v${version}"; + hash = "sha256-N8ievasPaqusx51FCxcl1FGIjXooyBsRqsuRU73puRM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix index b16a87e2fd..ccd2d3febf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xbox-webapi/default.nix @@ -44,6 +44,10 @@ buildPythonPackage rec { pytestCheckHook ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + meta = with lib; { description = "Library to authenticate with Windows Live/Xbox Live and use their API"; homepage = "https://github.com/OpenXbox/xbox-webapi-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix new file mode 100644 index 0000000000..7d13d6d3a6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -0,0 +1,59 @@ +{ lib +, bleak-retry-connector +, bluetooth-sensor-state-data +, buildPythonPackage +, fetchFromGitHub +, home-assistant-bluetooth +, poetry-core +, pycryptodomex +, pytestCheckHook +, pythonOlder +, sensor-state-data +}: + +buildPythonPackage rec { + pname = "xiaomi-ble"; + version = "0.8.0"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-HwA2NKsrqXBsC5/rUZUNfHDk8QA7I+zQmwqt0SVhw38="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + bleak-retry-connector + bluetooth-sensor-state-data + home-assistant-bluetooth + pycryptodomex + sensor-state-data + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=xiaomi_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "xiaomi_ble" + ]; + + meta = with lib; { + description = "Library for Xiaomi BLE devices"; + homepage = "https://github.com/Bluetooth-Devices/xiaomi-ble"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix index f5fb49daab..8a9ec6f0c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.21.5"; + version = "0.22.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-rtR77b4/cgDA6rf/Q+ecuKI5bl7N4YMim8TeQ7ovKhI="; + sha256 = "sha256-CQX6dd/taVyqLKMzhFJxmYjbpZQIHYD+Nps1WyGqqnw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix index be9323c774..06c494d76d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xml2rfc/default.nix @@ -26,15 +26,15 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.12.4"; + version = "3.14.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ietf-tools"; repo = "xml2rfc"; - rev = "v${version}"; - sha256 = "sha256-TAu2Ls553t7wJ/Jhgu+Ff+H4P6az0Du8OL00JjZyCDs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-BuOHQ6LnfjdlE9+wdJbl6wdD/oddKIklabVBx1IJJBA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix index 280cead6d2..fbc621a596 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "xsdata"; - version = "22.5"; + version = "22.7"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "701dcda5a4a07df3a642f8fb6f73f0e2e18224d359bcb7f4212b3c29d7af72c2"; + sha256 = "sha256-2EpbTNYdjcHOQQqe+bEpMzGxD2Jh34P+eI+uK4SJPdo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix new file mode 100644 index 0000000000..992bebc66f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs-ble/default.nix @@ -0,0 +1,59 @@ +{ lib +, async-timeout +, bleak +, bleak-retry-connector +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pycryptodome +, pytest-asyncio +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "yalexs-ble"; + version = "1.3.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "v${version}"; + hash = "sha256-YBFO9DnvcFf1iXnsMW3COn2qWs9PrD3kjQDz08WU1xQ="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + async-timeout + bleak + bleak-retry-connector + pycryptodome + ]; + + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=yalexs_ble --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "yalexs_ble" + ]; + + meta = with lib; { + description = "Library for Yale BLE devices"; + homepage = "https://github.com/bdraco/yalexs-ble"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix index 3e93a01b57..8a320eb103 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.25"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O7M9Shh8jp2fTaVQPM8mgh1pkv75wn22PFpxJVenbAo="; + sha256 = "sha256-7+4Icg3E6xrWmxObNzNuDc+MXJ9rnbgBHMK4uPBJeuY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index 0204b0f929..b82e870161 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.26.3"; + version = "1.27.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e"; + sha256 = "sha256-5ogyS1hWCraKGjz/LApHTj/tNx3+jaXRuYF7ffVQOc4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix index 2763055a0e..ed60315a8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yappi/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "yappi"; - version = "1.3.5"; + version = "1.3.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sumerc"; repo = pname; rev = version; - hash = "sha256-XxUAYrDQAY7fD9yTSmoRUmWJEs+L6KSQ0/bIVf/o9ag="; + hash = "sha256-MfvaLWw7EhfzFx4aZdRWvQVOOcvZ1Mt7EgxyB2nDB2c="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix index 8d5892979e..e9774ae85d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yara-python/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "yara-python"; - version = "4.2.0"; + version = "4.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "VirusTotal"; repo = "yara-python"; rev = "v${version}"; - hash = "sha256-jNxYuIddMzANZoQ0p7BbRrX6ISpaCA7T6j+iS+FOocg="; + hash = "sha256-spUQuezQMqaG1hboM0/Gs7siCM6x0b40O+sV7qGGBng="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix index 439cc31c8c..7eac21a5e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "youtube-search"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1541120273996fa433698b2e57b73296dfb8e90536211f29ea997dcf161b66fe"; + sha256 = "sha256-veu7PUPAbTz3B7tRYMGptIMbmmaGLCdL6azv0kCEd08="; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix index ea49ed1ae0..937c95864a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yq/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "yq"; - version = "3.0.2"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5H/yR5o3RvkL27d/hOPr23ic5GoJKxwmGuWx9fkU+Og="; + sha256 = "sha256-MKhKoiSGx0m6JpJWvVhsC803C34qcedsOSTq1IZ+dPI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zadnegoale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zadnegoale/default.nix new file mode 100644 index 0000000000..7d47cb347c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/zadnegoale/default.nix @@ -0,0 +1,51 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, dacite +, orjson +, pytest-asyncio +, pytest-error-for-skips +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "zadnegoale"; + version = "0.6.5"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "bieniu"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-ubBN4jvueNgReNbS+RXNDNHID0MF/rvQnb0+F4/DZaU="; + }; + + propagatedBuildInputs = [ + aiohttp + dacite + orjson + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-error-for-skips + pytestCheckHook + ]; + + pythonImportsCheck = [ + "zadnegoale" + ]; + + meta = with lib; { + description = "Python wrapper for getting allergen concentration data from Żadnego Ale servers"; + homepage = "https://github.com/bieniu/zadnegoale"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix index 972bd527ad..72cd251dcb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "zarr"; - version = "2.11.1"; + version = "2.12.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-EbYo9C3sNuAUeHnovUcVJLWbI4CUubIePDW+eDmcEV4="; + sha256 = "sha256-UVox7kuta7SK4FF4xYiuSaAqNd76Ad2aMpMwaQM2gWU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix index 8ad26668bc..26a47a1f76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zcs/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "zcs"; - version = "0.1.17"; + version = "0.1.18"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ZoQgAaJy3kKHLljyKA0Oo/D1kefE8X9FlsGDSNt1nPw="; + sha256 = "sha256-cIg0LFQFVo91Ywvulxtx0/PPyQnRflJFnIi0gaUGGq4="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix index ba50e19a4d..1c015d4d75 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.7"; + version = "3.7.8"; src = fetchPypi { inherit version pname; - sha256 = "415f4a673009fe9a5ef67b61c4469ddf14b73857b6d40f02d6b74f02ad935147"; + sha256 = "sha256-kodRHIkMXdFUBGNVRtSyjbVqGQRxPaHqgp6ddFT5ZIY="; }; buildInputs = [ openssl bzip2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix index 7c87b09c3b..4373d9a2d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroconf/default.nix @@ -1,5 +1,6 @@ -{ stdenv -, lib +{ lib +, stdenv +, async-timeout , buildPythonPackage , fetchFromGitHub , ifaddr @@ -10,7 +11,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.38.7"; + version = "0.39.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,10 +20,11 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - hash = "sha256-Q/rrN7xzbehwMa3yFVP5F9ztUcJCDsfBIGf0b/GPzLM="; + hash = "sha256-R6q5fq8P91q+qhy+lOCuoKUMFBvkKFsKLVCoqIy7Qpk="; }; propagatedBuildInputs = [ + async-timeout ifaddr ]; @@ -39,7 +41,7 @@ buildPythonPackage rec { "test_launch_and_close_v4_v6" "test_launch_and_close_v6_only" "test_integration_with_listener_ipv6" - # Starting with 0.38.7: AssertionError: assert [('add', '_ht..._tcp.local.')] + # Starting with 0.39.0: AssertionError: assert [('add', '_ht..._tcp.local.')] "test_service_browser_expire_callbacks" ] ++ lib.optionals stdenv.isDarwin [ "test_lots_of_names" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix index 033c9937fa..487ff10ada 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zha-quirks/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.77"; + version = "0.0.78"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-z/DLMTN0VsKore4crzbyvMhyG7O4bicC9XPbeGNf74M="; + hash = "sha256-S54reJhzvDMOC5+N/WZ8bz8XNXH/91jAAy8gCq90MvQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix index 822a041e5d..fa4122a7e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zict/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zict"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FbLMFflaR2++BiP9j3ceHncTEL96AflUEqC2BbbkdRA="; + sha256 = "sha256-1zZsLiKTMUES3PJDIQhCime5J7AABWGf7vwxDRLYM/M="; }; disabled = pythonOlder "3.6"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix index 83a7c4174d..163ef44f0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, gpiozero , mock , pyserial , pyserial-asyncio @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "zigpy-zigate"; - version = "0.9.0"; + version = "0.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,11 +22,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "zigpy"; repo = "zigpy-zigate"; - rev = "v${version}"; - hash = "sha256-rFmcgfn87XS1fvbSdJG6pItXRMkeogp4faKMe7pCxkM="; + rev = "refs/tags/${version}"; + hash = "sha256-H1R+wNUo/J5ATINHrkC4mJ8KKnBxVZUvF6X7y54aiVQ="; }; propagatedBuildInputs = [ + gpiozero pyserial pyserial-asyncio pyusb diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix index 789a152b62..5585324c0b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-znp/default.nix @@ -49,6 +49,10 @@ buildPythonPackage rec { asynctest ]; + pytestFlagsArray = [ + "--asyncio-mode=legacy" + ]; + pythonImportsCheck = [ "zigpy_znp" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index 4988535538..43cf5d59f8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.47.3"; + version = "0.49.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - sha256 = "sha256-iEPE4YPpIJK4xZMT4SFKZ2tu61TiehB9HP81Jo3pg30="; + sha256 = "sha256-mCqRqi7AUsrvfSOHyfK+WVj/4D7/4RDOYFWveS+tS/A="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix index ba3ea107ea..e773960730 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix @@ -9,14 +9,14 @@ let zipp = buildPythonPackage rec { pname = "zipp"; - version = "3.8.0"; + version = "3.8.1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Vr+Krbg8JNtsS1d+E943TM+2faIHi+uh0DfBeYC/Q60="; + sha256 = "sha256-BbRfHuj4B9DMkoSFykCgfLSRzwkv9YfA35yx/RVISNI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix index e3ede9f94a..b8d364b95e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_configuration/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.configuration"; - version = "4.4.0"; + version = "4.4.1"; src = fetchPypi { inherit pname version; - sha256 = "e9f02bac44405ad1526399d6574b91d792f9694f9c67df8b64e91fe10fcddb3c"; + sha256 = "sha256-giPqSvU5hmznqccwrH6xjlHRfrUVk6p3c7NZPI1tdgg="; }; checkInputs = [ zope_testrunner manuel ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix index 2638d43147..273326baeb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.4.0"; + version = "5.5"; src = fetchPypi { inherit pname version; - sha256 = "4869229fc909e4aa8e76665a718f90dc88f73858b32ca5fa3dea6840e9210fb4"; + sha256 = "sha256-/LhQZWGIoM380kmjt9Mw1JsVv7+DoQ8YW//cD6uQE+U="; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix index 5c0536166a..ea832cec6f 100755 --- a/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zstandard/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.17.0"; + version = "0.18.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "fa9194cb91441df7242aa3ddc4cb184be38876cb10dd973674887f334bafbfb6"; + sha256 = "sha256-CsA1eg2YW0/zGoVHRAQNe1dUOF0fmPcUXDDgLGhly28="; }; propagatedNativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix index 468b5b5315..8599c7495a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zstd/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.5.1.0"; + version = "1.5.2.5"; src = fetchPypi { inherit pname version; - sha256 = "9519bb0cd91c4498cd8cf66ef88fb22e5d6a442317704e6afd00b12726d17d0a"; + sha256 = "sha256-PEKbFmo7MksJg7/1OuCSi5dkxpOgF/Yv+2sg5hNeM48="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/quickemu/default.nix b/third_party/nixpkgs/pkgs/development/quickemu/default.nix index c693827cd1..c2f360fc0c 100644 --- a/third_party/nixpkgs/pkgs/development/quickemu/default.nix +++ b/third_party/nixpkgs/pkgs/development/quickemu/default.nix @@ -43,13 +43,13 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "3.15"; + version = "4.0"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - sha256="sha256-ako/eh8cMWKvdrgm9VTgSH67nA2igKUlJZtBeH1bu4Y="; + sha256 = "sha256-CiCQg1UsSAwlEnZEmzU2ynn2RZ+wXPv9FV1b9GVkc00="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix index 7bad0b442d..9d01e45311 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix @@ -21,6 +21,7 @@ , groups ? null , ignoreCollisions ? false , buildInputs ? [] +, extraConfigPaths ? [] , ... }@args: @@ -83,6 +84,8 @@ let ${maybeCopyAll mainGemName} cp ${gemFiles.gemfile} $out/Gemfile || ls -l $out/Gemfile cp ${gemFiles.lockfile} $out/Gemfile.lock || ls -l $out/Gemfile.lock + + ${lib.concatMapStringsSep "\n" (path: "cp -r ${path} $out/") extraConfigPaths} ''; buildGem = name: attrs: ( diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix index e3c430cc92..826ce9e593 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler-app/default.nix @@ -27,6 +27,7 @@ , allowSubstitutes ? false , installManpages ? true , meta ? {} +, nativeBuildInputs ? [] , buildInputs ? [] , postBuild ? "" , gemConfig ? null @@ -39,9 +40,12 @@ let cmdArgs = removeAttrs args [ "pname" "postBuild" "gemConfig" "passthru" "gemset" "gemdir" ] // { inherit preferLocalBuild allowSubstitutes; # pass the defaults - buildInputs = buildInputs ++ lib.optional (scripts != []) makeWrapper; + nativeBuildInputs = nativeBuildInputs ++ lib.optionals (scripts != []) [ makeWrapper ]; - meta = { platforms = ruby.meta.platforms; } // meta; + meta = { + mainProgram = pname; + inherit (ruby.meta) platforms; + } // meta; passthru = basicEnv.passthru // { inherit basicEnv; inherit (basicEnv) env; diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix index 584a13623b..04f97c68c6 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "2.3.9"; - source.sha256 = "sha256-VZiKuSDP3sSoBXUPcPmwHR/GbZs47NIF+ZlXtHSZWzg="; + version = "2.3.20"; + source.sha256 = "sha256-gJJ3vHzrJo6XpHS1iwLb77jd9ZB39GGLcOJQSrgaBHw="; dontPatchShebangs = true; postFixup = '' diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix index 6f9da13f50..5a6d885159 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix @@ -321,8 +321,12 @@ in substituteInPlace Makefile \ --replace '-Wno-invalid-source-encoding' "" '' + lib.optionalString stdenv.isDarwin '' + # For < v1.48.0 substituteInPlace src/ruby/ext/grpc/extconf.rb \ --replace "ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/" "" + # For >= v1.48.0 + substituteInPlace src/ruby/ext/grpc/extconf.rb \ + --replace 'apple_toolchain = ' 'apple_toolchain = false && ' ''; }; diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix index 7ba8c70a98..e5f9d045a5 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix @@ -18,7 +18,7 @@ # Normal gem packages can be used outside of bundler; a binstub is created in # $out/bin. -{ lib, fetchurl, fetchgit, makeWrapper, gitMinimal, darwin +{ lib, fetchurl, fetchgit, makeWrapper, gitMinimal, libobjc , ruby, bundler } @ defs: @@ -35,6 +35,7 @@ lib.makeOverridable ( , namePrefix ? (let rubyName = builtins.parseDrvName ruby.name; in "${rubyName.name}${rubyName.version}-") +, nativeBuildInputs ? [] , buildInputs ? [] , meta ? {} , patches ? [] @@ -87,11 +88,15 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { inherit dontStrip; inherit type; - buildInputs = [ + nativeBuildInputs = [ ruby makeWrapper ] ++ lib.optionals (type == "git") [ gitMinimal ] ++ lib.optionals (type != "gem") [ bundler ] - ++ lib.optional stdenv.isDarwin darwin.libobjc + ++ nativeBuildInputs; + + buildInputs = [ + ruby + ] ++ lib.optionals stdenv.isDarwin [ libobjc ] ++ buildInputs; #name = builtins.trace (attrs.name or "no attr.name" ) "${namePrefix}${gemName}-${version}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix index 24760051b2..4239f5c005 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ameba/default.nix @@ -2,15 +2,17 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.14.3"; + version = "1.0.1"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "sha256-oZdaHV+vnYUiCXNMrSuHvZzDYDgFZsoD715DE3tJ2bE="; + hash = "sha256-dvhGk6IbSV3pxtoIV7+0+qf47hz2TooPhsSwFd2+xkw="; }; + format = "make"; + meta = with lib; { description = "A static code analysis tool for Crystal"; homepage = "https://crystal-ameba.github.io"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix index 4291fdfd86..0fe62f5c65 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.3.1"; + version = "10.3.2"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-mHBCZtBvi2DxzzWckvncCXgRCZirzx1OTtx7m6kRNvc="; + sha256 = "sha256-VrTjpw/bT5n/ydUt9sK/cGqSi9gZJq1TsRupfm7RS1M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix index 37241a9534..2a59d95ab6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.176.3"; + version = "0.183.1"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-ZjWIaZ4XT7v66ozjQu+ld0Tz2gVjQFUD6JoL1nW/DmE="; + sha256 = "sha256-RaME+vbmF/hDjwB/ZdvL+/ZgLtWeETMpi/xBlK1EvA0="; }; makeFlags = [ "FLOW_RELEASE=1" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix index 503d5c6304..25259ae64c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/pmd/default.nix @@ -2,20 +2,32 @@ stdenv.mkDerivation rec { pname = "pmd"; - version = "6.43.0"; + version = "6.47.0"; src = fetchurl { - url = "mirror://sourceforge/pmd/pmd-bin-${version}.zip"; - sha256 = "sha256-+eJCN890vm4WBcMZ2VCGOS8WUyIckL+DfQVNaUSovGE="; + url = "https://github.com/pmd/pmd/releases/download/pmd_releases/${version}/pmd-bin-${version}.zip"; + hash = "sha256-0rOV6l5VCdBkk5+F/k2vYtHQWzwugvp3ogaTRuXUKXE="; }; nativeBuildInputs = [ unzip makeWrapper ]; + dontConfigure = true; + dontBuild = true; + installPhase = '' runHook preInstall - mkdir -p $out - cp -R {bin,lib} $out - wrapProgram $out/bin/run.sh --prefix PATH : ${openjdk.jre}/bin + + install -Dm755 bin/run.sh $out/libexec/pmd + install -Dm644 lib/*.jar -t $out/lib/pmd + + wrapProgram $out/libexec/pmd \ + --prefix PATH : ${openjdk.jre}/bin \ + --set LIB_DIR $out/lib/pmd + + for app in pmd cpd cpdgui designer bgastviewer designerold ast-dump; do + makeWrapper $out/libexec/pmd $out/bin/$app --argv0 $app --add-flags $app + done + runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix index 66258d0093..6c37a5dca4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.3.0"; + version = "4.3.1"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "sha256-3svBmXcRvscaK8YD4qm/geQSJ6cAm0en/d7H09h41PQ="; + sha256 = "sha256-GWg3W/jjDKH6BcvjGt215J03NiDVWihU/m+2kejPVPA="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix index d37b514138..00cc3c1234 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.38.1"; + version = "0.39.2"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sBvfcAOkfZ5V7SrLBWrSQr5zXwqbwOBmYehujk0y6eg="; + sha256 = "sha256-TOI3rkh6v0Ewo+gPo8N7at1orbSTjQkEZKA6sYDv0u8="; }; - vendorSha256 = "sha256-2v070TwDWkN4HZ/EOu85lotA9qIKLgpwD9TrfH7pGY4="; + vendorSha256 = "sha256-6sk1bFuSCrKt9uMrrwOpX/SBZrjFvtqVPFylbRNHpz4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index c93466fdd8..c807cdeac0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.26.3"; + version = "1.27.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - hash = "sha256-E18iy2cQmdiZwB6mWp0wohS+Iea2WxEB+zf2d+rAXUc="; + hash = "sha256-9RMSSgpYAmQgIAy4pJRk3tKwx+unaFmSNgXdKK3HYTU="; }; ldflags = [ @@ -22,7 +22,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorSha256 = "sha256-l4eIqWqDV3j/KgXuN5gnKmXa49m4uuYhoiFOdXrl/8o="; + vendorSha256 = "sha256-o3TGEsYtd7RVGcw7guhqpbKMFkiRBpvCFUeIhnKKIeQ="; subPackages = [ "cmd/tfsec" diff --git a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix index 52bd88619c..3c9c81a625 100644 --- a/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/aws-sam-cli/default.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.52.0"; + version = "1.53.0"; src = python3.pkgs.fetchPypi { inherit pname version; - hash = "sha256-ldr0X+I5+Nfb+WBDOe0m202WOuccGUI5HFL3fpbBNPo="; + hash = "sha256-kIW+aGYuS+JgOMsPbeLgPSgLFNKLSqHaZ1CHpjs/IVI="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -47,11 +47,12 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace requirements/base.txt \ --replace "aws_lambda_builders==" "aws-lambda-builders #" \ + --replace "aws-sam-translator==1.46.0" "aws-sam-translator~=1.46" \ --replace "click~=7.1" "click~=8.1" \ --replace "cookiecutter~=1.7.2" "cookiecutter>=1.7.2" \ --replace "dateparser~=1.0" "dateparser>=0.7" \ --replace "docker~=4.2.0" "docker>=4.2.0" \ - --replace "Flask~=1.1.2" "Flask~=2.0" \ + --replace "Flask~=1.1.4" "Flask~=2.0" \ --replace "jmespath~=0.10.0" "jmespath" \ --replace "MarkupSafe==2.0.1" "MarkupSafe #" \ --replace "PyYAML~=5.3" "PyYAML #" \ diff --git a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix index b4233ca869..c4572f9e1b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/azcopy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.15.0"; + version = "10.16.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = "v${version}"; - sha256 = "sha256-iXMkvrBANuOIyyVyQ11YQ1DWRQf4JAtu+1Ou3aQrhlc="; + sha256 = "sha256-FLrYovepVOE1NUB46Kc8z/l5o6IMFbJyY3smxPyuIsI="; }; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix index b46ad5efc8..6df8edd02c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/backblaze-b2/default.nix @@ -17,6 +17,10 @@ python3Packages.buildPythonApplication rec { --replace 'setuptools_scm<6.0' 'setuptools_scm' ''; + nativeBuildInputs = with python3Packages; [ + setuptools-scm + ]; + propagatedBuildInputs = with python3Packages; [ b2sdk phx-class-registry @@ -25,16 +29,14 @@ python3Packages.buildPythonApplication rec { rst2ansi ]; - nativeBuildInputs = with python3Packages; [ - setuptools-scm - ]; - checkInputs = with python3Packages; [ pytestCheckHook ]; disabledTests = [ + # require network "test_files_headers" + "test_copy_file_by_id" "test_integration" "test_get_account_info" ]; @@ -53,6 +55,5 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; license = licenses.mit; maintainers = with maintainers; [ hrdinka kevincox ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix index 5b0dd03494..816326489d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/default.nix @@ -1,4 +1,5 @@ { buildBazelPackage +, bazel_5 , fetchFromGitHub , git , go @@ -10,28 +11,49 @@ let patches = [ ./use-go-in-path.patch ]; + + # Patch the protoc alias so that it always builds from source. + rulesProto = fetchFromGitHub { + owner = "bazelbuild"; + repo = "rules_proto"; + rev = "4.0.0-3.19.2"; + sha256 = "sha256-wdmp+Tmf63PPr7G4X5F7rDas45WEETU3eKb47PFVI6o="; + postFetch = '' + sed -i 's|name = "protoc"|name = "_protoc_original"|' $out/proto/private/BUILD.release + cat <>$out/proto/private/BUILD.release + alias(name = "protoc", actual = "@com_github_protocolbuffers_protobuf//:protoc", visibility = ["//visibility:public"]) + EOF + ''; + }; + in buildBazelPackage rec { pname = "bazel-watcher"; - version = "0.14.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "0gigl1lg8sb4bj5crvj54329ws4yirldbncs15f96db6vhp0ig7r"; + sha256 = "sha256-aK18Q2nYxYajk9f/EEmtV7YJ8cYqbamR7vh3BTgu53Q="; }; nativeBuildInputs = [ go git python3 ]; removeRulesCC = false; + bazel = bazel_5; + bazelFlags = [ "--override_repository=rules_proto=${rulesProto}" ]; + bazelBuildFlags = lib.optionals stdenv.cc.isClang [ "--cxxopt=-x" "--cxxopt=c++" "--host_cxxopt=-x" "--host_cxxopt=c++" ]; bazelTarget = "//ibazel"; + fetchConfigured = false; # we want to fetch all dependencies, regardless of the current system fetchAttrs = { inherit patches; preBuild = '' patchShebangs . + + echo ${bazel_5.version} > .bazelversion ''; preInstall = '' @@ -54,9 +76,12 @@ buildBazelPackage rec { # should be equivalent. rm -rf $bazelOut/external/{bazel_gazelle_go_repository_tools,\@bazel_gazelle_go_repository_tools.marker} sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker + + # remove com_google_protobuf because it had files with different permissions on linux and darwin + rm -rf $bazelOut/external/com_google_protobuf ''; - sha256 = "1j175z3d4fbi4pl35py7yjq7ywrvwin6id131jv32hx0ck4g1m46"; + sha256 = "sha256-R+Hc9ldYcKgAXETKr2+Hk7IrjJ93WkrjyJ1SQRoM9V4="; }; buildAttrs = { @@ -66,10 +91,11 @@ buildBazelPackage rec { patchShebangs . substituteInPlace ibazel/BUILD --replace '{STABLE_GIT_VERSION}' ${version} + echo ${bazel_5.version} > .bazelversion ''; installPhase = '' - install -Dm755 bazel-bin/ibazel/*_pure_stripped/ibazel $out/bin/ibazel + install -Dm755 bazel-bin/ibazel/ibazel_/ibazel $out/bin/ibazel ''; }; @@ -78,8 +104,7 @@ buildBazelPackage rec { description = "Tools for building Bazel targets when source files change"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; + mainProgram = "ibazel"; platforms = platforms.all; - # broken on darwin, see https://github.com/NixOS/nixpkgs/issues/105573 - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/use-go-in-path.patch b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/use-go-in-path.patch index 010ba56165..d9d90c9127 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/use-go-in-path.patch +++ b/third_party/nixpkgs/pkgs/development/tools/bazel-watcher/use-go-in-path.patch @@ -6,7 +6,7 @@ index 51273b6..fcf9ffb 100644 go_rules_dependencies() --go_register_toolchains() +-go_register_toolchains(version = "1.17.6") +go_register_toolchains(go_version = "host") load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") diff --git a/third_party/nixpkgs/pkgs/development/tools/benthos/default.nix b/third_party/nixpkgs/pkgs/development/tools/benthos/default.nix new file mode 100644 index 0000000000..8884a8ae89 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/benthos/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "benthos"; + version = "4.3.0"; + + src = fetchFromGitHub { + owner = "benthosdev"; + repo = "benthos"; + rev = "v${version}"; + sha256 = "sha256-tRB9eTeyEyPkiR/sph76CMbPjJUNoDzfYuHmtFAzY7E="; + }; + + vendorSha256 = "sha256-nnaBQ7ADdAdo/+RQzXJHBBpXgTmxny0O/ij+eWsS5YM="; + + doCheck = false; + + subPackages = [ + "cmd/benthos" + ]; + + 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"; + license = licenses.mit; + maintainers = with maintainers; [ sagikazarmark ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix b/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix index 340c3b736c..839f7b1b6c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/biodiff/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "biodiff"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "8051Enthusiast"; repo = "biodiff"; rev = "v${version}"; - sha256 = "sha256-M1hwuIe5+quxcvFAacBkxQMiQyN6lhtWA6hEi5Buoho="; + sha256 = "sha256-ZIZ6XpRuqhacpvi1kf7zvMszzbF8IvWrMlxAZnJJSxE="; }; - cargoSha256 = "sha256-NIt4D2/T7Zl7rgksbQeVo6cNBt6cZkUGTJGztnp6SB0="; + cargoSha256 = "sha256-/LrrHK9j6xg3J56ubM9RdkJeMn4nvpddUGMtHu2s6OE="; meta = with lib; { description = "Hex diff viewer using alignment algorithms from biology"; diff --git a/third_party/nixpkgs/pkgs/development/tools/bpf-linker/default.nix b/third_party/nixpkgs/pkgs/development/tools/bpf-linker/default.nix new file mode 100644 index 0000000000..d1839eb86f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/bpf-linker/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, llvmPackages_14 +, zlib +, ncurses +, libxml2 +}: + +rustPlatform.buildRustPackage rec { + pname = "bpf-linker"; + version = "0.9.4"; + + src = fetchFromGitHub { + owner = "aya-rs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-jYuBk78aGQLUeNF6d6kjGPuMxEF22XJquHcs23WVGm0="; + }; + + cargoHash = "sha256-X8EVpOxDHwE/wj/gly/wdZ6tsrMrz3kkDe9gEPbk6iw="; + + buildNoDefaultFeatures = true; + buildFeatures = [ "system-llvm" ]; + + nativeBuildInputs = [ llvmPackages_14.llvm ]; + buildInputs = [ zlib ncurses libxml2 ]; + + # fails with: couldn't find crate `core` with expected target triple bpfel-unknown-none + # rust-src and `-Z build-std=core` are required to properly run the tests + doCheck = false; + + meta = with lib; { + description = "Simple BPF static linker"; + homepage = "https://github.com/aya-rs/bpf-linker"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ nickcao ]; + # llvm-sys crate locates llvm by calling llvm-config + # which is not available when cross compiling + broken = stdenv.buildPlatform != stdenv.hostPlatform; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix index c853e361ba..aae1c7af17 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sqByTrhtaytBMD8ULOP+xoacxMD6sw3n2XYVZ1hWIJ4="; + sha256 = "sha256-ALqyl5GLOxwsojR0/hfjO4yD3AEkyQK+faa3smMW94c="; }; - vendorSha256 = "sha256-H000xhqjSFXGW3Saa/ryYdVcDl2ieeSW3dq3DPVX+c0="; + vendorSha256 = "sha256-K+CAC2OrmjzpRF0DLSYp21BgvkxtJCF2FdpzYx/CqGI="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix index 500afa7c95..47b1d50284 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/arpa2cm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "arpa2cm"; - version = "0.9.0"; + version = "1.0.4"; src = fetchFromGitLab { - sha256 = "sha256-1z0fH8vZJiPkY/C654us9s2BULM1tlvvYcszNqk34yI="; - rev = "v${version}"; - repo = pname; owner = "arpa2"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2vb/7UL+uWGrQNh8yOZ3gih5G1/eOp064hF78SDsPGk="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix index 2cb085a4c0..6544db85a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_3/default.nix @@ -110,7 +110,9 @@ let # and libraries path. # We prefetch it, patch it, and override it in a global bazelrc. system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - arch = stdenv.hostPlatform.parsed.cpu.name; + + # 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}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix index aa9794b586..511234a1e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_4/default.nix @@ -135,7 +135,9 @@ let # and libraries path. # We prefetch it, patch it, and override it in a global bazelrc. system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - arch = stdenv.hostPlatform.parsed.cpu.name; + + # 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}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix index 9e6de5397a..0c06d61283 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_5/default.nix @@ -126,7 +126,9 @@ let platforms = lib.platforms.linux ++ lib.platforms.darwin; system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - arch = stdenv.hostPlatform.parsed.cpu.name; + + # on aarch64 Darwin, `uname -m` returns "arm64" + arch = with stdenv.hostPlatform; if isDarwin && isAarch64 then "arm64" else parsed.cpu.name; bazelRC = writeTextFile { name = "bazel-rc"; @@ -377,9 +379,10 @@ stdenv.mkDerivation rec { # 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 + sed -i -e 's;"/usr/bin/libtool";_find_generic(repository_ctx, "libtool", "LIBTOOL", overriden_tools);g' tools/cpp/unix_cc_configure.bzl wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/gcc,${stdenv.cc}/bin/clang,g" $wrapper sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper done ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index e636f938c7..50474c2a52 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.19"; + version = "3.0.20"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "sha256-Jj38dmzr8NDDMercfWyJrMFxGBSExCGPeG2IVEtnSxY="; + sha256 = "sha256-8hA0Y/AGczFwggxkTG7PQKOVnr2Oizx4OH38nS5jCU0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix index d577b62a19..e7c38c1b02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bmake/default.nix @@ -8,13 +8,13 @@ , pkgsMusl # for passthru.tests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bmake"; - version = "20220208"; + version = "20220726"; src = fetchurl { - url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - hash = "sha256-ewDB4UYrLh5Upk2ND88n/HfursPxOSDv+NlST/BZ1to="; + url = "http://www.crufty.net/ftp/pub/sjg/${finalAttrs.pname}-${finalAttrs.version}.tar.gz"; + hash = "sha256-G/N3B4lyJyHcp7C/+K/EqVINog8CGbt7xSNQrwEz8KA="; }; # Make tests work with musl @@ -60,10 +60,15 @@ stdenv.mkDerivation rec { ]; # Disabled tests: + # opt-chdir: ofborg complains about it somehow + # opt-keep-going-indirect: not yet known # varmod-localtime: musl doesn't support TZDIR and this test relies on impure, # implicit paths - # opt-chdir: ofborg complains about it somehow - BROKEN_TESTS = "varmod-localtime opt-chdir"; + BROKEN_TESTS = builtins.concatStringsSep " " [ + "opt-chdir" + "opt-keep-going-indirect" + "varmod-localtime" + ]; buildPhase = '' runHook preBuild @@ -105,9 +110,8 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ thoughtpolice AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isAarch64; # ofborg complains }; passthru.tests.bmakeMusl = pkgsMusl.bmake; -} +}) # TODO: report the quirks and patches to bmake devteam (especially the Musl one) diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 89e8e0e197..50f23f1bb7 100755 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -102,9 +102,8 @@ cmakeConfigurePhase() { cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags" fi - # Avoid cmake resetting the rpath of binaries, on make install - # And build always Release, to ensure optimisation flags - cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" + # Always build Release, to ensure optimisation flags + cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} $cmakeFlags" # Disable user package registry to avoid potential side effects # and unecessary attempts to access non-existent home folder diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix index 074a2945d5..a19b072157 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix @@ -100,9 +100,9 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_7 = gen { - version = "7.4.2"; + version = "7.5"; nativeVersion = "0.22-milestone-23"; - sha256 = "1nkz9gn1vb5l94dkf9yzb1j3hkll5x2vrl5p320msn2fk089pr19"; + sha256 = "1hjifd98dif0qy6vkqp56v9z7id5cf2bfkdd71ld8nsqqlig51yb"; defaultJava = jdk17; # Gradle 7 ships some binaries that are only available for some platforms # See https://github.com/gradle/native-platform#supported-platforms diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix index 14d9f14665..ad792a1791 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/qbs/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "qbs"; - version = "1.22.0"; + version = "1.23.0"; src = fetchFromGitHub { owner = "qbs"; repo = "qbs"; rev = "v${version}"; - sha256 = "sha256-gFPcT/TNsKEUNzkJVaXHCGNmhQ0dV1/NYgQQInYrcNI="; + sha256 = "sha256-F8dfSMim4OVGjBEGtIA4bGTNSLwZSwpHWI0J2e7pKCw="; }; nativeBuildInputs = [ qmake ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json index 77bc912c47..2c2c598255 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,17 +1,13 @@ { - "version": "0.1.9", + "version": "0.1.11", "assets": { - "aarch64-darwin": { - "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "10lirk7h0ir2k20rf0xl72642axdhik8g66lcbyn689jybj6vks6" - }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "10lirk7h0ir2k20rf0xl72642axdhik8g66lcbyn689jybj6vks6" + "sha256": "1s87knvvxbsikxbiza3hybykp437ba5j1amymlis20yf826k5sh7" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "11h471rcds0b396r6nqadzmny5dvmz8rxh1kwcj4bldss2mdcckz" + "sha256": "1by463daq5sa0bpd8hc5knj5gj30c4c8mbgmiq6fj3612220gc4c" } } } diff --git a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix index 09ec296bed..d0c630ab48 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildah/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "buildah"; - version = "1.26.2"; + version = "1.27.0"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "sha256-FQ0fYiQBz+Ba8Xe8PWIYpIKyWOYa+NlTNJqzBC64O6M="; + sha256 = "sha256-xaUOCinP46aSKcxkpvDKollRRBYlrLql737YaOkQPzc="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix index a4c9cd3290..db5898a605 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pack"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P6rfYrjk7MWVvNowaIKc0PzCzAyHRK+qw2BDe56CPp8="; + sha256 = "sha256-b1lqgY6pu4yt3yY2UupG7PQUkgotK0VDffCW/0thxoo="; }; - vendorSha256 = "sha256-ygHE52zYU/Zx/bSHMeTTFZyBvWrIKeuO0bciB4E0dHE="; + vendorSha256 = "sha256-JqSk4w0chtWNYDQXo8oh5spAxor2kixo3fZcpV4LJ+8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix b/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix new file mode 100644 index 0000000000..2c9e909293 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchurl, makeBinaryWrapper, jre_headless }: + +stdenv.mkDerivation rec { + pname = "bundletool"; + version = "1.11.0"; + + src = fetchurl { + url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; + sha256 = "sha256-xCw2Wuc2ndTcLrwR7uv5FFnwImxTcG/STeTQBiaKuIw="; + }; + + dontUnpack = true; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + installPhase = '' + runHook preInstall + makeWrapper ${jre_headless}/bin/java $out/bin/bundletool --add-flags "-jar $src" + runHook postInstall + ''; + + meta = with lib; { + description = "Command-line tool to manipulate Android App Bundles"; + homepage = "https://developer.android.com/studio/command-line/bundletool"; + changelog = "https://github.com/google/bundletool/releases/tag/${version}"; + maintainers = with maintainers; [ marsam ]; + platforms = jre_headless.meta.platforms; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/cbfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/cbfmt/default.nix new file mode 100644 index 0000000000..2a11ab5ca4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/cbfmt/default.nix @@ -0,0 +1,26 @@ +{ lib, rustPlatform, fetchFromGitHub, testers, cbfmt }: + +rustPlatform.buildRustPackage rec { + pname = "cbfmt"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cTX7eBcEZiTJm3b1d2Mwu7NdbtHjeF+dkc3YMede0cQ="; + }; + + cargoSha256 = "sha256-vEInZplfgrM4gD5wPATl7j5iTo9pSstElfd0Lq9giJw="; + + passthru.tests.version = testers.testVersion { + package = cbfmt; + }; + + meta = with lib; { + description = "A tool to format codeblocks inside markdown and org documents"; + homepage = "https://github.com/lukas-reineke/cbfmt"; + license = licenses.mit; + maintainers = [ maintainers.stehessel ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix index 1de648ffc9..c5587f741c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/checkmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "checkmate"; - version = "0.6.9"; + version = "0.8.0"; src = fetchFromGitHub { owner = "adedayo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Zs8vyPD1BpjA5EXzeKyfv9CzhD0iIp1LNLlqCp+zpaY="; + sha256 = "sha256-tK9jPImB3rklMVQGI84bFaWsEdmVZKnWXxfzLZL9jQU="; }; - vendorSha256 = "sha256-Wln6vf9FJ1VJgdll5a7QS+M6PCM151EB8aOb9fFkSXo="; + vendorSha256 = "sha256-w90f5b70qc9mgfMkhhloLJ7UWXboOLcZD6kUBluGGfk="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index 3fe90a3004..174f09e8f7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "clj-kondo"; - version = "2022.06.22"; + version = "2022.08.03"; src = fetchurl { url = "https://github.com/clj-kondo/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "sha256-g+0BYwk9bws+c7CfLGf88r2nfcDBCdDKyqRS285oIQM="; + sha256 = "sha256-tqwAC8qib7XLlHj6YD4pYnV/R5q9fW4bH5fA8Gl8G64="; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index 666ddd647f..7c96448dd9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.12.2"; + version = "0.16.2"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZBhuRv5IF2VmbvGtXLzVnY3eSso+TSCS05UvCbjtSZ0="; + sha256 = "sha256-dikjYEY6jrK9dUXM+z378SIWgI4jYd9vLsf1nQ5rUwg="; }; - vendorSha256 = "sha256-N4oyyWY/ANuRFxnfBBAGwacofaYR5/ZH867W/2sm+Gk="; + vendorSha256 = "sha256-DhFwTh7Bm2mPwXFBiYFylYKqWWcSm5/Cv2tXOJsPqm4="; ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/disable-test-timeouts.patch b/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/disable-test-timeouts.patch deleted file mode 100644 index febe7cf77e..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/disable-test-timeouts.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/test_server.py b/tests/test_server.py -index c0777f5..1184fb3 100644 ---- a/tests/test_server.py -+++ b/tests/test_server.py -@@ -11,7 +11,7 @@ from pygls.types import (CompletionContext, CompletionParams, - InitializeParams, Position, TextDocumentIdentifier, - TextDocumentItem, TextDocumentPositionParams) - --CALL_TIMEOUT = 2 -+CALL_TIMEOUT = None - - - def _init(client: LanguageServer, root: Path): diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix index 393d3cdcf8..3ec5ec8e67 100644 --- a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.33.1"; + version = "0.34.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-ok6fBdT0YWXnl8JR/uszUzFM+gJR7LTtOSgGaXvuY88="; + sha256 = "sha256-w9rqfmNEvp6yYXBl5CVeifgrP35dL+pYBgRs3vP1W4I="; }; - vendorSha256 = "sha256-WGrvYPNnHNpsjTxgK8Y/94ELH/peGv7OwZCBFr1UMKk="; + vendorSha256 = "sha256-NcizXQ4wQnA1ZdT74tVbuIbFwgEp5qJfoGnHmMC7kkI="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index a338952843..71b8f5515d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.37.0"; + version = "3.38.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-fjPMf9upHksijVApXgXumxCueI7huWRqQsIyAx7BCpI="; + sha256 = "sha256-W93yvdyfk6niSZ/usiOp6Yb8tFgEuC3UmJI6zDEHsFY="; }; - vendorSha256 = "sha256-BV5GUqv3u3kE4qOkEBmc3mGFJHqrGRxwObEY4PzRboA="; + vendorSha256 = "sha256-n+n+Fank/L8mVCB7ulVXJkpJpr65ELirtBqScot2ANM="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index 116cb78d78..0c04ece125 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkite-cli"; - version = "1.2.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-AIa+hEYtPJ4CFvAFSpNJFxY+B3+DJH1Q0hL/3BD/yN0="; + sha256 = "sha256-4MUgyUKyycsreAMVtyKJFpQOHvI6JJSn7TUZtbQANyc="; }; - vendorSha256 = "sha256-4AH9PZWSrBXi9w4Mr7dpXqDkQZGzuELG876YCaFTj2Q="; + vendorSha256 = "sha256-3x7yJenJ2BHdqVPaBaqfFVeOSJZ/VRNF/TTfSsw+2os="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index 5b5d13164b..de0e154b51 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.81.1"; + version = "0.83.0"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qbo7QGPvPLalKbiApkpTtPSeIh1SjqEuKXBIuHJJBB8="; + sha256 = "sha256-Ud4kdnKesn98CYIsB6S5FjJ3yOT3axTcVlrGroMNDPE="; }; vendorSha256 = "sha256-XVGFJv9TYjuwVubTcFVI2b+M2ZDE1Jv4u/dxowcLL2s="; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix index 86e4525212..eb6e796446 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,27 +2,27 @@ buildGoModule rec { pname = "dagger"; - version = "0.2.20"; + version = "0.2.28"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - sha256 = "sha256-TlysP5xf8LJoB9MU/sdQIM6yMfsaI8SP+drRlfG+tQ4="; + sha256 = "sha256-f9Oq9+FiGaL71RGR2eerHM9bBbNK7ysZsCWvOZo5u8g="; }; - vendorSha256 = "sha256-pE6g5z4rOQlqmI9LZQXoI6fRmSTXDv5H8Y+pNXVIcOU="; + vendorSha256 = "sha256-e++fNcgdQUPnbKVx7ncuf7NGc8eVdli5/rB7Jw+D/Ds="; subPackages = [ "cmd/dagger" ]; - ldflags = [ "-s" "-w" "-X go.dagger.io/dagger/version.Revision=${version}" ]; + ldflags = [ "-s" "-w" "-X go.dagger.io/dagger/version.Version=${version}" ]; meta = with lib; { description = "A portable devkit for CICD pipelines"; homepage = "https://dagger.io"; license = licenses.asl20; - maintainers = with maintainers; [ jfroche ]; + maintainers = with maintainers; [ jfroche sagikazarmark ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index 85eb3cfb64..1ecd394268 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "7.8.1"; + version = "7.8.2"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "sha256-A37XTLL6BcltKofriqai8RX+VQ4jcFRHriP4sUZ5g2c="; + sha256 = "sha256-Lgsn5k3ITJnRnOXXZjfjlEEG+OvTZjFq+LB3Us3DH8k="; }; - vendorSha256 = "sha256-aYu5K6pK6Q0Fmagr91i6nc3t55nUjn5vasIO+kUXWrs="; + vendorSha256 = "sha256-91N6AOxXFOI6AM28avlInseAeZkqE9IfybJAX31tPDg="; subPackages = [ "fly" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix index 1687fb7c52..c0f261ea49 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -42,13 +42,13 @@ let in stdenv.mkDerivation rec { pname = "github-runner"; - version = "2.294.0"; + version = "2.295.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; rev = "v${version}"; - hash = "sha256-2MOvqVlUZBmCt24EYSVjXWKR+fB2Mys70L/1/7jtwQQ="; + hash = "sha256-C5tINoFkd2PRbpnlSkPL/o59B7+J+so07oVvJu1m3dk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix index 0a75c0a97c..9af18a7d04 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/github-runner/deps.nix @@ -31,7 +31,7 @@ (fetchNuGet { pname = "Moq"; version = "4.11.0"; sha256 = "08bnk80scjjqnkdbjam8grcqrw2rvj9z7556hiznac7in3fcp77w"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.5.0-rc2-24027"; sha256 = "1kazwidj63w53r1s6fd8sgykb70kdic27fg9qhg74qzwm354imwm"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) - (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index d5e4edb2ab..bd1e4c5db2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl }: let - version = "15.1.0"; + version = "15.2.1"; in buildGoModule rec { inherit version; @@ -14,13 +14,13 @@ buildGoModule rec { "-X ${commonPackagePath}.REVISION=v${version}" ]; - vendorSha256 = "sha256-5MzhDBCsgcACzImnfvetr3Z6SO+fHozChIhvZG0JwBc="; + vendorSha256 = "sha256-weT4Ed/VNTLovxUu2xCdHDqxY7v/5Wi3WsWlNDWYLLc="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-G6V0l9kzbpl9XEYiiVBYjY7xOHemtOrb1xyB1HjhhTc="; + sha256 = "sha256-HaFxMNREHTtnbIuQUXCinhd4lhcnkLkacLczeySsfWQ="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 87a90aa90b..4384345c9a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.346.2"; + version = "2.346.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0ymp4zy73rxakk7i1pxai1i0hxp65ilzi57dan3mqspaprfllk7g"; + sha256 = "12bxni81qldm7f3sbr2rhx6wghbkabhy634pgbrmq6m3j1c8q7hl"; }; nativeBuildInputs = [ makeWrapper ]; @@ -70,7 +70,8 @@ stdenv.mkDerivation rec { homepage = "https://jenkins-ci.org"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.mit; - maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ]; + maintainers = with maintainers; [ coconnor earldouglas nequissimus ajs124 ]; + changelog = "https://www.jenkins.io/changelog-stable/#v${version}"; mainProgram = "jenkins-cli"; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/cli.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/cli.nix index b5eda9efb9..aa83dfb161 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/cli.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/woodpecker/cli.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, callPackage, fetchFromGitHub }: +{ lib, buildGoModule, callPackage, fetchFromGitHub, fetchpatch }: let common = callPackage ./common.nix { }; in @@ -7,6 +7,16 @@ buildGoModule { inherit (common) version src ldflags postBuild; vendorSha256 = null; + patches = [ + # Fixes https://github.com/NixOS/nixpkgs/issues/184875, until a new version + # is released. + (fetchpatch { + name = "display-system-ca-error-only-if-there-is-an-error.patch"; + url = "https://github.com/woodpecker-ci/woodpecker/commit/1fb800329488de74c9db7cfc5dc43fb5a4efbad8.patch"; + sha256 = "sha256-wKI/7PhbxsAD/qrl4nnkHyyQhQcvGlySysnxytGJzfU="; + }) + ]; + subPackages = "cmd/cli"; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/development/tools/cpm/default.nix b/third_party/nixpkgs/pkgs/development/tools/cpm/default.nix index cb707cb7b7..3fc916f908 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cpm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cpm/default.nix @@ -1,28 +1,25 @@ { lib , stdenvNoCC -, fetchFromGitHub +, fetchurl }: stdenvNoCC.mkDerivation rec { pname = "cpm"; - version = "0.35.1"; + version = "0.35.4"; - src = fetchFromGitHub { - owner = "cpm-cmake"; - repo = "CPM.cmake"; - rev = "v${version}"; - hash = "sha256-Oon/5iwkUUASsUDvde69iEwLe8/CAzwYKYsyzH5K+V0="; + src = fetchurl { + url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake"; + sha256 = "sha256-Ve+NhDAiAzH4x3ZUZjQkuZ69n65ljGc2h6cR62xnf+0="; }; + dontUnpack = true; dontConfigure = true; - dontBuild = true; installPhase = '' runHook preInstall - mkdir -p ${placeholder "out"}/share/cpm/ - cp ./cmake/CPM.cmake ${placeholder "out"}/share/cpm/ + install -Dm644 $src $out/share/cpm/CPM.cmake runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/cuelsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/cuelsp/default.nix new file mode 100644 index 0000000000..60366f3f6f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/cuelsp/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "cuelsp"; + version = "0.3.4"; + + src = fetchFromGitHub { + owner = "dagger"; + repo = "cuelsp"; + rev = "v${version}"; + sha256 = "sha256-+E49TR2D26HSTwgwO1XFkIwXr5lmvv9l3KtR8dVT/cQ="; + }; + + vendorSha256 = "sha256-zg4aXPY2InY5VEX1GLJkGhMlfa5EezObAjIuX/bGvlc="; + + doCheck = false; + + subPackages = [ + "cmd/cuelsp" + ]; + + meta = with lib; { + description = "Language Server implementation for CUE, with built-in support for Dagger"; + homepage = "https://github.com/dagger/cuelsp"; + license = licenses.asl20; + maintainers = with maintainers; [ sagikazarmark ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix index 2d3cec52af..a52fdcbd5f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "1.4.7"; + version = "1.4.9"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1lkG8Rboq6t/hRrdAweo3Kxz9IkukQ39sQSpidFTElw="; + sha256 = "sha256-I/4o9hynmB9Bj3WDgrNesy9noUgtV8pMOcSaA2EsX2o="; }; vendorSha256 = "sha256-N4zAdylb7etNknR0/VjIVkuI6kTWlk137HNT03Y2gWs="; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix index e1a2ac3408..e83c928008 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix @@ -13,7 +13,7 @@ # function correctly. rustPlatform.buildRustPackage rec { pname = "prisma-engines"; - version = "4.0.0"; + version = "4.1.1"; src = fetchFromGitHub { owner = "prisma"; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { # Use system openssl. OPENSSL_NO_VENDOR = 1; - cargoSha256 = "sha256-//Kis4lDi3SxeptCCnLi/GWPj+Kyay2pQbILYnlEkXE="; + cargoSha256 = "sha256-srawH5z38/RvmsXIykSNm8D2DKAcleRJdyjKAAkVwgc="; nativeBuildInputs = [ pkg-config ]; @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://www.prisma.io/"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ pamplemousse pimeys superherointj ]; + maintainers = with maintainers; [ pamplemousse pimeys superherointj tomhoule ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix index 4866eb03eb..85031b3aad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.13.0"; + version = "1.14.0"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "kyleconroy"; repo = "sqlc"; rev = "v${version}"; - sha256 = "sha256-HPCt47tctVV8Oz9/7AoVMezIAv6wEsaB7B4rgo9/fNU="; + sha256 = "sha256-+JkNuN5Hv1g1+UpJEBZpf7QV/3A85IVzMa5cfeRSQRo="; }; proxyVendor = true; - vendorSha256 = "sha256-miyNIF6RNOuvNEA9Hf+hOyRJG+5IcXU4Vo4Fzn+nIb4="; + vendorSha256 = "sha256-QG/pIsK8krBaO5IDgln10jpCnlw3XC8sIYyzuwYjTs0="; subPackages = [ "cmd/sqlc" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix index a37d8ff04e..dd503834dd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-Xh6JLfk0xDqEBJiEG3WBKBEqad/O0D8aeJk5s5w8PTI="; + sha256 = "sha256-uMOVhLqjZB21SAvNXT6VhdmFyCFhBYHID9lXeDABvnk="; }; nativeBuildInputs = [ makeWrapper unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index be29a0457e..28b0506ff1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,19 +2,18 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p1SU0wnB2XftuPMbm47EbJ2aZGV9amlk0y7FI0QOBkk="; + sha256 = "sha256-YZMjgEnZKxmGIO9gK00JXBpBRvNgZoXNA/cNieovT+g="; }; vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; - # Temporary fix of bug: https://github.com/timescale/timescaledb-tune/issues/95 - patches = [ ./fixMinMaxConn.diff ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "A tool for tuning your TimescaleDB for better performance"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix index 1dbd242b17..d68786a9ee 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "trino-cli"; - version = "390"; + version = "392"; jarfilename = "${pname}-${version}-executable.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-rqs2rWmr5hv4F/tc7xWBgkNht/l3meJUnpEyOn2cU48="; + sha256 = "sha256-yqTKXmcRgsSSr4KAZ2NV7FrCGIxCU/V14XFEZmUTj1s="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix b/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix index 43867d13b0..a077c2f124 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ddosify/default.nix @@ -2,20 +2,22 @@ buildGoModule rec { pname = "ddosify"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-ImVNiBXvKKYXuWtOajvLFobk956wNSQHLH7npdYY4SE="; + sha256 = "sha256-cedgJJd1+iWw3sxbKVBpi5XvmZdDcDL0sHhTELbkY9Q="; }; vendorSha256 = "sha256-mq82KNa01gHvW+RUREra+ysaJ1YWIwX0v/uYMxmFN4M="; ldflags = [ - "-s -w" + "-s" "-w" "-X main.GitVersion=${version}" + "-X main.GitCommit=unknown" + "-X main.BuildDate=unknown" ]; # TestCreateHammerMultipartPayload error occurred - Get "https://upload.wikimedia.org/wikipedia/commons/b/bd/Test.svg" diff --git a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix b/third_party/nixpkgs/pkgs/development/tools/dive/default.nix index d6217671b0..0d19a1071d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dive/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }: +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +, fetchpatch +, pkg-config +, btrfs-progs +, gpgme +, lvm2 +}: buildGoModule rec { pname = "dive"; @@ -11,7 +20,14 @@ buildGoModule rec { sha256 = "sha256-1pmw8pUlek5FlI1oAuvLSqDow7hw5rw86DRDZ7pFAmA="; }; - vendorSha256 = "sha256-0gJ3dAPoilh3IWkuesy8geNsuI1T0DN64XvInc9LvlM="; + patches = [ + (fetchpatch { + url = "https://github.com/wagoodman/dive/commit/fe9411c414418d839a8638bb9a12ccfc892b5845.patch"; + sha256 = "sha256-c0TcUQ87CeOiXHoTQ3z/04i72aDr403DL7fIbXTJ9cY="; + }) + ]; + + vendorSha256 = "sha256-YPkEei7d7mXP+5FhooNoMDARQLosH2fdSaLXGZ5C27o="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix b/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix index c2801422c0..c124749b6f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-6r7e35hJrrkBaDHMUJGVOP7b0OwekJzedTs/P5E8Ykc="; + sha256 = "sha256-sEzS7pRjpCZNZSK1VVL628SNjIn9Di0eNOvvM/29WMM="; }; - vendorSha256 = "sha256-nam/so7ylbGVhEjGKZzeYZyHz90rq5XEZelHkjcIeh8="; + vendorSha256 = "sha256-kanoe3cIvLROxqKZvdwFRnORv5I3eFLqOBZazvCnj48="; subPackages = [ "cmd/dyff" diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix index 43b7b19c6e..4b86be8048 100644 --- a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "earthly"; - version = "0.6.19"; + version = "0.6.21"; src = fetchFromGitHub { owner = "earthly"; repo = "earthly"; rev = "v${version}"; - sha256 = "sha256-TjAooHRkmC9bmgfRSLQByXyyKHVgXqj4X5xbCqAEYpM="; + sha256 = "sha256-i/iMrIvslxK+iqTKL7vEZc1ir8A9a0WVQ0J/KfSGyxo="; }; - vendorSha256 = "sha256-bXu1W0FpEPLBBw4D1B95Q3Uh2Ro2BYvjaPkROJpFlK4="; + vendorSha256 = "sha256-oK8fWi7zThzd1TrN6yd08T9QyVCOA4SAKZ2OPJTcgY8="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/ec2-metadata-mock/default.nix b/third_party/nixpkgs/pkgs/development/tools/ec2-metadata-mock/default.nix index 3967a061de..7fd87e839b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ec2-metadata-mock/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ec2-metadata-mock/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ec2-metadata-mock"; - version = "1.11.1"; + version = "1.11.2"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ec2-metadata-mock"; rev = "v${version}"; - sha256 = "sha256-H10aZB1xx2Q3cItmqmGAUiVgr+9+VloH3pzDrzP2MQw="; + sha256 = "sha256-hYyJtkwAzweH8boUY3vrvy6Ug+Ier5f6fvR52R+Di8o="; }; vendorSha256 = "sha256-T45abGVoiwxAEO60aPH3hUqiH6ON3aRhkrOFcOi+Bm8="; diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix index a1a593f522..fd2231dbe4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/default.nix @@ -23,7 +23,7 @@ let in rec { - electron = electron_19; + electron = electron_20; electron_9 = mkElectron "9.4.4" { x86_64-linux = "781d6ca834d415c71078e1c2c198faba926d6fce19e31448bbf4450869135450"; @@ -131,4 +131,13 @@ rec { aarch64-darwin = "f9042bce83fe8446e22f6885285dd5fc2dca048d0b89cbf7f326a46102ffc440"; headers = "09dbx4qh0rgp5mdm6srz6fgx12zq6b9jqq1k6l3gzyvwigi3wny1"; }; + + electron_20 = mkElectron "20.0.1" { + armv7l-linux = "6e1f216d0680fd1116ab378846ef9204bcd27916fa0f9bb510623a01c32bef9b"; + aarch64-linux = "60ebe86847b47d98ec16d259ee58a9dbd5fa7d84df6e23888ac1a340c9b9b467"; + x86_64-linux = "db6b9a6dd1d609fbf46cc7e2fd0f3ff317e59da85d037bce018cfc6810580c32"; + x86_64-darwin = "2ceea21ba4f79e1e9bea6d01e31a6339288a3d98adf23ac52a728bb22e55794c"; + aarch64-darwin = "42f251973d4ae90941f82898d4a2e21d7e4c899e920bc671aba03eedb871ee10"; + headers = "1xvi3w8x1knc103cxk4mkqb8xw4bp6if8lra527a8x2xan4syiq1"; + }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix index 6091fa902c..97e7fb5203 100644 --- a/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/electron/generic.nix @@ -104,14 +104,17 @@ let }; darwin = { - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ + makeWrapper + unzip + ]; buildCommand = '' mkdir -p $out/Applications unzip $src mv Electron.app $out/Applications mkdir -p $out/bin - ln -s $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron + makeWrapper $out/Applications/Electron.app/Contents/MacOS/Electron $out/bin/electron ''; }; in diff --git a/third_party/nixpkgs/pkgs/development/tools/ent/default.nix b/third_party/nixpkgs/pkgs/development/tools/ent/default.nix index c9ed951d59..42de24825e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ent/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ent-go"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "ent"; repo = "ent"; rev = "v${version}"; - sha256 = "sha256-MvfbQKGVYWbZkqc3X3BqsB+z2KMkr0gMOquL02qHwUY="; + sha256 = "sha256-EPUaBOvEAOjA24EYD0pyuNRdyX9qPxERXrBzHXC6cLI="; }; - vendorSha256 = "sha256-BF2eD/jOtY1XhZ0hB7f3/frKQYwS9PbuGxum5SSnjzA="; + vendorSha256 = "sha256-Q5vnfhUcbTmk3+t0D0z4dwU6pXKT7/hTfVHOUPXEzrg="; subPackages = [ "cmd/ent" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index 3d8138d642..b95a58470f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "esbuild"; - version = "0.14.49"; + version = "0.15.0"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-bQt9dLkwvXT4pLxTwYp+5Bg6IgwBnB8uu1gdAmhPn0A="; + sha256 = "sha256-ZQRU3UlUkvTgbRMGg+BVNy+0BSUYGYUysgZ69YTeqiA="; }; - vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; + vendorSha256 = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; subPackages = [ "cmd/esbuild" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/evans/default.nix b/third_party/nixpkgs/pkgs/development/tools/evans/default.nix index 3172d36798..1d012c6910 100644 --- a/third_party/nixpkgs/pkgs/development/tools/evans/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/evans/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "evans"; - version = "0.10.6"; + version = "0.10.8"; src = fetchFromGitHub { owner = "ktr0731"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rQwoiV87XMz/5GbVOyLDkfIKIgMzBcwY4ln73XCI/so="; + sha256 = "sha256-2Fn+pPYknuQCofTNrgDbZ4A6C5hazSqKqlUOUG10ekU="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-3R/HRfr1GjJwkCT6xQ51Y/zRcuvknunYKgVpM6jg+wY="; + vendorSha256 = "sha256-IxlzSzFEIIBC32S7u1Lkbi/fOxFYlbockNAfl/tnJpA="; meta = with lib; { description = "More expressive universal gRPC client"; diff --git a/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix index 8486014883..f35f64b0bc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/faas-cli/default.nix @@ -9,13 +9,13 @@ let in buildGoModule rec { pname = "faas-cli"; - version = "0.14.4"; + version = "0.14.5"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = version; - sha256 = "sha256-hpQn1lEJP0FmU1jhmXDgV/11RbMdEqblLPIrTQLKLOc="; + sha256 = "sha256-nHpsScpVQhSoqvNZ+xTv2cA3lV1MyPZAgNLZRuyvksE="; }; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix index 4cf9efb964..eb6ac3254b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "8.5.13"; + version = "9.1.3"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-9MEsZ5lc9cF7MKD+dYdZGR9cnMHFxELACp4gsC0gzRc="; + sha256 = "sha256-RmA9aP0YxYv2iDIp7W0k4x3CzvHMuPb398OM55q3Odo="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/fnlfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/fnlfmt/default.nix index aa34d02365..f762e5453c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fnlfmt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fnlfmt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fnlfmt"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromSourcehut { owner = "~technomancy"; repo = pname; rev = version; - sha256 = "sha256-ZuSXeAhxfH0F/Y0nwqisxLMwh21Kub7viNcXD3FVYOc="; + sha256 = "sha256-FKmr5Xihyk+ikYN8WXBq5UFJziwEb8xaUBswNt/JMBg="; }; nativeBuildInputs = [ fennel ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/fnm/default.nix b/third_party/nixpkgs/pkgs/development/tools/fnm/default.nix index c83966c7d6..ffcd313de0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fnm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.31.0"; + version = "1.31.1"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8A6MKDeyuk0bzyoDydcOy4LzyYe/S+x+ZJMTOo59UA8="; + sha256 = "sha256-5DonN9tzap3mMu6/WS5evXtOjpRg4g80evCaSOsTgQA="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoSha256 = "sha256-oiGYkRqxN6e5EG6EDQalIK0tOekyIVQ+GhxCKK0Sd3g="; + cargoSha256 = "sha256-E4Zbk3+fbjZMXRxBcTn9S8XMSts+5m78UIP33oZOsXQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix b/third_party/nixpkgs/pkgs/development/tools/fq/default.nix index 76757e1f89..697899ad86 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fq/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "fq"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "wader"; repo = "fq"; rev = "v${version}"; - sha256 = "sha256-4bCJcLpU/k87p884jw9Gq1i6ocuD4vMn4PuOStihssE="; + sha256 = "sha256-9ABlfA7osM1bYMwNy/pQyb32uJbwZry3s3iGHBXiQHQ="; }; - vendorSha256 = "sha256-XsMhxQ83nQO3fQ1EN2XxcZeN+I96h8mcAq+TNIvbTyo="; + vendorSha256 = "sha256-GDhaeR26MXWR23yVy4kjo/mIUR3vezEs8twjoRgzbwU="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix index db83912af6..664392f167 100644 --- a/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/frugal/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "frugal"; - version = "3.15.1"; + version = "3.15.4"; src = fetchFromGitHub { owner = "Workiva"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pRWTjlPTVwFzamq67hzb+ElqZuqP9aEAVz581DNMUBM="; + sha256 = "sha256-5Q5HPS5MOOJRRUA0sRZS+QURDz52OGKgwuFswhqQFAg="; }; subPackages = [ "." ]; - vendorSha256 = "sha256-ljZ3tpIJ+tg4UDBDzbse4M6ksb8AgPJLJCZeusMtQ0Q="; + vendorSha256 = "sha256-Nqfhrf8zX5F35W3B/XW11Sw7M+mmIL/dfXl+zXqBL0g="; meta = with lib; { description = "Thrift improved"; diff --git a/third_party/nixpkgs/pkgs/build-support/go/garble.nix b/third_party/nixpkgs/pkgs/development/tools/garble/default.nix similarity index 82% rename from third_party/nixpkgs/pkgs/build-support/go/garble.nix rename to third_party/nixpkgs/pkgs/development/tools/garble/default.nix index 502aba4e64..2162b378ec 100644 --- a/third_party/nixpkgs/pkgs/build-support/go/garble.nix +++ b/third_party/nixpkgs/pkgs/development/tools/garble/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "garble"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "burrowers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VeqF1MB8knM+NtG9Y+x1g2OF7LFZRC8/c8jicGP3vpo="; + sha256 = "sha256-QQRnnH/lbleZYkmHj4XUj2uMB9h/mwolhqWfaWMk2ys="; }; - vendorSha256 = "sha256-FQMeA6VUDQa6wpvMoYsigkzukQ0dArAkysiksJWq+iY="; + vendorSha256 = "sha256-Xax8KfNcFCLKqcLBNtRUNaneVCW4eUMFe4Ml+D4wLNA="; # Used for some of the tests. checkInputs = [git]; diff --git a/third_party/nixpkgs/pkgs/development/tools/git-ftp/default.nix b/third_party/nixpkgs/pkgs/development/tools/git-ftp/default.nix index 25295ad006..57b5e3c463 100644 --- a/third_party/nixpkgs/pkgs/development/tools/git-ftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/git-ftp/default.nix @@ -1,5 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, pandoc, man }: -stdenv.mkDerivation rec { +{ lib +, resholve +, fetchFromGitHub +, fetchpatch +, bash +, coreutils +, git +, gnugrep +, gawk +, curl +, hostname +, gnused +, findutils +, lftp +, pandoc +, man +}: + +resholve.mkDerivation rec { pname = "git-ftp"; version = "1.6.0"; src = fetchFromGitHub { @@ -11,11 +28,66 @@ stdenv.mkDerivation rec { dontBuild = true; + # fix bug/typo; PRed upstream @ + # https://github.com/git-ftp/git-ftp/pull/628 + patches = [ + (fetchpatch { + name = "fix-function-invocation-typo.patch"; + url = "https://github.com/git-ftp/git-ftp/commit/cddf7cbba80e710758f6aac0ec0d77552ea8cd75.patch"; + sha256 = "sha256-2B0QaMJi78Bg3bA1jp41aiyql1/LCryoaDs7+xmS1HY="; + }) + ]; + installPhase = '' make install-all prefix=$out ''; - buildInputs = [pandoc man]; + nativeBuildInputs = [ pandoc man ]; + + solutions = { + git-ftp = { + scripts = [ "bin/git-ftp" ]; + interpreter = "${bash}/bin/bash"; + inputs = [ + coreutils + git + gnugrep + gawk + curl + hostname + gnused + findutils + lftp + ]; + fake = { + # don't resolve impure system macOS security + # caution: will still be fragile if PATH is bad + # TODO: fixable once we figure out how to handle + # this entire class of problem... + "external" = [ "security" ]; + }; + keep = { + # looks like run-time user/env/git-config controlled + "$GIT_PAGER" = true; + "$hook" = true; # presumably git hooks given context + }; + execer = [ + # TODO: rm when binlore/resholve handle git; manually + # checked and see no obvious subexec for now + "cannot:${git}/bin/git" + /* + Mild uncertainty here. There *are* commandlikes in + the arguments (especially wait & cd), but I think they are + fine as-is, because I'm reading them as: + 1. ftp commands + 2. running on the remote anyways + + See https://github.com/git-ftp/git-ftp/blob/057f7d8e9f00ffc5a8c6ceaa4be30af2939df41a/git-ftp#L1214-L1221 + */ + "cannot:${lftp}/bin/lftp" + ]; + }; + }; meta = with lib; { description = "Git powered FTP client written as shell script"; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix index d0f02795ce..56b2a8b07c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-containerregistry/default.nix @@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in buildGoModule rec { pname = "go-containerregistry"; - version = "0.8.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TbMx+DVIYzhQ50f7sDXfhQnT/U6U+G9GTUbtYSu4/KI="; + sha256 = "sha256-9C5tlJChDyflFlqwn9YDZB+40PUqwjgIFcdxNBCxWTM="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix index 9f53c70201..68341e7e40 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-swag/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-swag"; - version = "1.8.0"; + version = "1.8.4"; src = fetchFromGitHub { owner = "swaggo"; repo = "swag"; rev = "v${version}"; - sha256 = "sha256-axvc3iwAfsKunheLLKmUThZh27axRh/GJRcKy9EfEBw="; + sha256 = "sha256-+e/wUHoeJ00MbGfkDpGwRvJH+fboMfyGY+SXbqBqP1c="; }; - vendorSha256 = "sha256-QphjiJSQRULphWjrJ8RzrUblTDYL/fYoSNT3+g0tP48="; + vendorSha256 = "sha256-RqhGGIwruAlrif2FZ+tvsicns56Ifjpy2ZHovDyjdB4="; subPackages = [ "cmd/swag" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix index dda4796704..1e7a6a3140 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "3.14.0"; + version = "3.14.1"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-J/pWx/osqP29GERBdzWwPNeA4Rzo6CYdW7GrmspevwM="; + sha256 = "sha256-GbCrMsMxhSjJOsZX4Gq9ZzBJ+F5vXDMi9vSyFrHNt44="; }; - vendorSha256 = "sha256-NlQ/5ibRgmuGDcuiUdzvuexYGnR/34v9fw1DUe3yXxE="; + vendorSha256 = "sha256-xp1s1aixPyXq9oVD8IZYSlUiL8UkIx5c8gYJRpIRD7I="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix index accc839099..f301b985d9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-toml/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-toml"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "pelletier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NdUD+QpqKU5CaY2vBEop6hoK6z1Ok4Dn+W9eUHaGFb4="; + sha256 = "sha256-lZUM31lA6l35EHEZnw6i+WR7qBo692RvlOBkxxBq6Vs="; }; - vendorSha256 = "sha256-TuyrtUAbT++S3glpCD603KV6QMkOFv5FgnPpYcMjy1I="; + vendorSha256 = "sha256-/F/ZbeNkiiO2+QibpoKUi1kC3Wv5Jujx6r468irlea0="; excludedPackages = [ "cmd/gotoml-test-decoder" "cmd/tomltestgen" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 33fa43f03d..c035110112 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, lib, installShellFiles }: +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: buildGoModule rec { pname = "golangci-lint"; - version = "1.46.2"; + version = "1.48.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "sha256-7sDAwWz+qoB/ngeH35tsJ5FZUfAQvQsU6kU9rUHIHMk="; + sha256 = "sha256-6nXn1+LsjiXjCeHhvVjyU1F6IJ8YP1Oj+5tDRhiMuUc="; }; - vendorSha256 = "sha256-w38OKN6HPoz37utG/2QSPMai55IRDXCIIymeMe6ogIU="; + vendorSha256 = "sha256-4ZqO4NEZfIhl/hWcB0HeRbp2jQ/WhMBpTLmP2W7X7xM="; doCheck = false; @@ -20,7 +20,11 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; ldflags = [ - "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" "-X main.date=19700101-00:00:00" + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=v${version}" + "-X main.date=19700101-00:00:00" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix b/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix index 087c4fcf3c..2df0e8ed94 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gomplate"; - version = "3.10.0"; + version = "3.11.2"; owner = "hairyhenderson"; rev = "v${version}"; src = fetchFromGitHub { inherit owner rev; repo = pname; - sha256 = "0dbi9saxbwcvypxc0s656ln9zq2vysx8dhrcz488nmy6rcpqiiah"; + sha256 = "sha256-NIepoz1JToaX2EJCL/kqkpBJigJVy2Tkz0jGn4ukfvI="; }; - vendorSha256 = "0rvki8ghlbbaqgnjfsbs1jswj08jfzmnz9ilynv2c6kfkx9zs108"; + vendorSha256 = "sha256-fXbwNX+GoujciZVxxe7Tl21MxWhyAD4cW/p8PCAAElw="; postPatch = '' # some tests require network access @@ -24,6 +24,11 @@ buildGoModule rec { internal/tests/integration/datasources_vault*_test.go ''; + # TestInputDir_RespectsUlimit + preCheck = '' + ulimit -n 1024 + ''; + ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix index 405cb6141d..130176591e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-+9NOQRu7cwEkRMB+HFEVrF7Z8y5UCxdUL005vZFPUHk="; + sha256 = "sha256-WpSF3HnSjCqUkD1PVvtYXoWSyjYnasr85AK8wMULPBI="; }; modRoot = "gopls"; - vendorSha256 = "sha256-V5HQAKRFtHfJJzdQ8eutCpVmnOWe0yYKKnlGxphulAc="; + vendorSha256 = "sha256-8NhZD7ImvsBGw0xi9NR7AB9SdHkwjsA+jV7UTjVF4wM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/gops/default.nix b/third_party/nixpkgs/pkgs/development/tools/gops/default.nix index 8fce1ee978..3804368d20 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gops/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.22"; + version = "0.3.25"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "sha256-97D92sWGqtMGzwrQ3NUR7prgsqtJvAQOjYlfmSWIEKo="; + sha256 = "sha256-y2T+v4EafiVuyRiuQdNDECc06e5eHtquvGA9ugW55Bs="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/gore/default.nix b/third_party/nixpkgs/pkgs/development/tools/gore/default.nix index 58ff4125c0..a8e393a050 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gore/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gore/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gore"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "motemen"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ipHvflsVBSjqohV/PliS0s0Nhie4nIP/HgupNH/Yui4="; + sha256 = "sha256-ZNv3sqwOEtxjvyqC9oR8xYwo8sywU2MF8ngBw407/ko="; }; vendorSha256 = "sha256-HrdNWsUVz5G5tG/ZFz2z1Vt4kM12I088/6OIkRFyDl8="; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 1f62c61297..5a84b6745c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotestsum"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "sha256-6GEkuVa6RCMv0FsTYXhhscVe3Ya78qwbj7Im9AL0fOo="; + sha256 = "sha256-EACzBakuMlwDUJTk/63OxFx3olNtyDLBYRdGE9BSSYI="; }; vendorSha256 = "sha256-wP5y8Ec6eSe+rdMEQQdX0fFTQ0HWuiyBRHxGlraZd+o="; diff --git a/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix index 9ea238233c..eaa521f7a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotools/default.nix @@ -43,7 +43,7 @@ buildGoModule rec { # Set GOTOOLDIR for derivations adding this to buildInputs postInstall = '' mkdir -p $out/nix-support - substitute ${../../go-modules/tools/setup-hook.sh} $out/nix-support/setup-hook \ + substitute ${./setup-hook.sh} $out/nix-support/setup-hook \ --subst-var-by bin $out ''; diff --git a/third_party/nixpkgs/pkgs/development/go-modules/tools/setup-hook.sh b/third_party/nixpkgs/pkgs/development/tools/gotools/setup-hook.sh similarity index 100% rename from third_party/nixpkgs/pkgs/development/go-modules/tools/setup-hook.sh rename to third_party/nixpkgs/pkgs/development/tools/gotools/setup-hook.sh diff --git a/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix b/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix index 800836dc9b..48ed8b3377 100644 --- a/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-gateway"; - version = "2.10.3"; + version = "2.11.1"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-gateway"; rev = "v${version}"; - sha256 = "sha256-4/iE+sK+ZbG6194i8E1ZHla/7C9blKGRHwM7iX7nvXU="; + sha256 = "sha256-bxGJvvm9gGkjUA+JCpX2V0Bj35a5WJ1M/JPxa1/2gbk="; }; - vendorSha256 = "sha256-FhiTU9VmDZNCPBWrmCqmQo/kPdDe8Da1T2E06CVN2kw="; + vendorSha256 = "sha256-DVVAbtfwndwc37iqxCB9Tsscinr8A8Kl//s9X+EFPcw="; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 7c6481caba..8dbd4fc9fa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,6 +1,6 @@ { lib , stdenv -, supportedGhcVersions ? [ "884" "8107" "902" "923" ] +, supportedGhcVersions ? [ "884" "8107" "902" "924" ] , dynamic ? false , haskellPackages , haskell diff --git a/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix new file mode 100644 index 0000000000..886ca482bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "hclfmt"; + version = "2.13.0"; + + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "hcl"; + rev = "v${version}"; + hash = "sha256-ENvXFOdsv3PL4jH7OfI3ZIY6ekj7ywgNOYl1uRQjypM="; + }; + + vendorSha256 = "sha256-9IGHILgByNFviQcHJCFoEX9cZif1uuHCu4xvmGZYoXk="; + + # The code repository includes other tools which are not useful. Only build + # hclfmt. + subPackages = [ "cmd/hclfmt" ]; + + meta = with lib; { + description = "a code formatter for the Hashicorp Configuration Language (HCL) format"; + homepage = "https://github.com/hashicorp/hcl/tree/main/cmd/hclfmt"; + license = licenses.mpl20; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix index 1b6489a74c..7b764fa79c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.30.0"; + version = "1.30.2"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-mbMrXPQg5yUhmfJ3ztrXD/NKmwJKkZFFPu+utrsaPEc="; + sha256 = "sha256-1ay0cW1zBCfaLIWvJGW7A/OeDc4l7OldnQHvrGeqXjE="; }; - vendorSha256 = "sha256-++uvg/vXRX2lPU4CmqAcLWbsWBXZHXaXO4qXEaq90T4"; + vendorSha256 = "sha256-DoCiyaEPh+QyKgC3PJ5oivJTlcKzscaphXET9et8T1g="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix index bf21200878..7880ef5ae6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "heroku"; - version = "7.59.2"; + version = "7.60.2"; src = fetchurl { url = "https://cli-assets.heroku.com/heroku-v${version}/heroku-v${version}.tar.xz"; - sha256 = "dbb69d4b5df99ff47ed0f6f1f58d968b3b144b13deee1b33c82fef7ef4006903"; + sha256 = "sha256-HKVfUT59TBrY9Sk/CxhD3ujT+Q3iEcBI50Bbu1MWOxY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/hjson-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/hjson-go/default.nix index 1700bae1a4..dbdea07701 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hjson-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hjson-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hjson-go"; - version = "3.2.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "hjson"; repo = pname; rev = "v${version}"; - sha256 = "sha256-plsiHxjrZXcnaqN8Frs+VuGwV7JOj8UwB0iibp3ApAk="; + sha256 = "sha256-Ni8sT69+/RsVazmS4Gs9hSxz5oqeLkwCG+mVu7/5ZL8="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ijq/default.nix b/third_party/nixpkgs/pkgs/development/tools/ijq/default.nix index 528294ac4e..a51518968d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ijq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ijq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ijq"; - version = "0.3.8"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~gpanders"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N4wrm0nUmQ0NTsLkomJrcSiYJWgFUEh1/yn3pagM9vI="; + sha256 = "sha256-EQfCEdQIrjg38JjjePNDNWKi0cFezjYvIGVJajbf9jw="; }; vendorSha256 = "sha256-DX8m5FsqMZnzk1wgJA/ESZl0QeDv3p9huF4h1HY9DIA="; diff --git a/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix b/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix index 9507c2fb4a..834a32d65b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/inferno/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "inferno"; - version = "0.10.7"; + version = "0.11.7"; # github version doesn't have a Cargo.lock src = fetchCrate { inherit pname version; - sha256 = "0bzrwa87j56sv03frl0lp6izfxsldn0692g2vpwfndhrsm0gy8z9"; + sha256 = "sha256-HZBCLgWC9yEo3lY7If18SILKZV3rwHv7FBVdumiTbJg="; }; - cargoSha256 = "1dvk1y1afqlmmqqdm91lg2wvny5q47yfjvmjzaryk2ic1s6g17b1"; + cargoSha256 = "sha256-upO+G9569NXFuc2vpxR6E4nxJqCjg+RMlxV7oKb7v1E="; # 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 @@ -19,6 +19,8 @@ rustPlatform.buildRustPackage rec { "--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" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix index ee72bc62ef..82f93cb73e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.1.2"; + version = "2.1.4"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "sha256-khbXzdsC0PA10HEu/dIFQ87+QbKpctmTUTt/zEuxV6c="; + sha256 = "sha256-o7gcKJy3gDUV3WPo5vO+5Zyyz1UVC2wGRTxZL69RxNE="; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/development/tools/jd-diff-patch/default.nix b/third_party/nixpkgs/pkgs/development/tools/jd-diff-patch/default.nix index 6977049ed9..ad7f7fad3c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jd-diff-patch/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jd-diff-patch/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "jd-diff-patch"; - version = "1.5.2"; + version = "1.6.1"; src = fetchFromGitHub { owner = "josephburnett"; repo = "jd"; rev = "v${version}"; - sha256 = "sha256-NUga7Rxh/hCEw6bZvbxsqBoIKdG2TTfEXdwHY42cgxE="; + sha256 = "sha256-Ti7eElLplnYGP7v1VuGpyeZ3ZIau6Ffx4ACMBDIBROw="; }; # not including web ui excludedPackages = [ "gae" "pack" ]; - vendorSha256 = "sha256-uoMOkCmJY417zxkTsXHGy+BZ/BH29nH4MhFaIKofh4k="; + vendorSha256 = null; meta = with lib; { description = "Commandline utility and Go library for diffing and patching JSON values"; diff --git a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix index ba36352601..58af734a16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jql/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "3.2.4"; + version = "4.0.7"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wokdlmczClYwVskBDpKQyka1GiLf4JvRiooK+qo7Tv4="; + sha256 = "sha256-5QVktJpGpHzwRUN8oIFoLydnA+ELhUprcQASeGzgLG8="; }; - cargoSha256 = "sha256-6L78LxxzqkjP9k71WmZhkhNVdKLXUwSYioKynaETTaA="; + cargoSha256 = "sha256-qmLmkWFP8T886uR8kJKCqB0G5XIfk+r+kubamKryktc="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; diff --git a/third_party/nixpkgs/pkgs/development/tools/just/default.nix b/third_party/nixpkgs/pkgs/development/tools/just/default.nix index 70ea28d231..8853b2208c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/just/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/just/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = version; - sha256 = "sha256-b0a5TaB0muojqLCxTVvD95zgGp7gz72OvxfK+QtZV8k="; + sha256 = "sha256-LDLxPNLUyDmJgnoFMMt82pt7J2qf/cBQilcCLk7xNUI="; }; - cargoSha256 = "sha256-ka5Np7YxfYRL42ipClD9xWTYA2vynDjQqy/6IsP5Ejs="; + cargoSha256 = "sha256-Gg0KaFTTsBH55VyYnIA0ZHy5l55tp9xodv0zBgHdLic="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix index 200eaa2cb5..cc9dcc62d3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/k6/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/k6/default.nix @@ -1,26 +1,34 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "k6"; - version = "0.38.3"; + version = "0.39.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MV5GbsXVvq99tI5LCK6VgcXRtNUfffoz3FopwPljhdA="; + sha256 = "sha256-fphhXbaK5wNhBaP8+d4Ktqf4G8OyX/1SLiHVF+jlUF0="; }; subPackages = [ "./" ]; vendorSha256 = null; - doCheck = true; + nativeBuildInputs = [ installShellFiles ]; + doInstallCheck = true; installCheckPhase = '' $out/bin/k6 version | grep ${version} > /dev/null ''; + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + installShellCompletion --cmd k6 \ + --bash <($out/bin/k6 completion bash) \ + --fish <($out/bin/k6 completion fish) \ + --zsh <($out/bin/k6 completion zsh) + ''; + meta = with lib; { description = "A modern load testing tool, using Go and JavaScript"; homepage = "https://k6.io/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/kaf/default.nix b/third_party/nixpkgs/pkgs/development/tools/kaf/default.nix index feb76c2a0b..5c0f2116b8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kaf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kaf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kaf"; - version = "0.1.44"; + version = "0.2.3"; src = fetchFromGitHub { owner = "birdayz"; repo = "kaf"; rev = "v${version}"; - sha256 = "sha256-gKg/iESUXS6l3v5ovdvvrfpvaUzahPtqh0/DH5OpXoY="; + sha256 = "sha256-5wSxaryaQ8jXwpzSltMmFRVrvaA9JMSrh8VBCnquLXE="; }; - vendorSha256 = "sha256-5WzREsQdcp9lelKUEXw+nHeemHBDsKrvRcG9v+qln/E="; + vendorSha256 = "sha256-Jpv02h+EeRhVdi/raStTEfHitz0A71dHpWdF/zcVJVU="; # Many tests require a running Kafka instance doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/kdash/default.nix b/third_party/nixpkgs/pkgs/development/tools/kdash/default.nix index daa07f1cee..efebf39984 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kdash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kdash/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "kdash"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "kdash-rs"; repo = pname; rev = "v${version}"; - sha256 = "08ca638kvs98xhbc9g1szw0730cjk9g01qqaja8j413n2h1pr8yq"; + sha256 = "sha256-u5Qa1rStWeFku3VA2ljg+RQxh12byfyBHXC+NQJTr0w="; }; nativeBuildInputs = [ perl python3 pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl xorg.xcbutil ] ++ lib.optional stdenv.isDarwin AppKit; - cargoSha256 = "0nb554y8r7gvw7ls6gnrg98xxbws0mc6zdsc6ss3p2x9z8xwx204"; + cargoSha256 = "sha256-rSPe7kkeHEYDqF80oO+Z+bGkWewtjnKut13EP6tmUIc="; meta = with lib; { description = "A simple and fast dashboard for Kubernetes"; diff --git a/third_party/nixpkgs/pkgs/development/tools/kubectx/bump-golang-x-sys.patch b/third_party/nixpkgs/pkgs/development/tools/kubectx/bump-golang-x-sys.patch new file mode 100644 index 0000000000..ec83872841 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/kubectx/bump-golang-x-sys.patch @@ -0,0 +1,25 @@ +diff --git a/go.mod b/go.mod +index c523783..1ef8d00 100644 +--- a/go.mod ++++ b/go.mod +@@ -9,6 +9,7 @@ require ( + github.com/imdario/mergo v0.3.9 // indirect + github.com/mattn/go-isatty v0.0.12 + github.com/pkg/errors v0.9.1 ++ golang.org/x/sys v0.0.0-20220731174439-a90be440212d // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c + k8s.io/apimachinery v0.21.0-alpha.1 + k8s.io/client-go v0.21.0-alpha.1 +diff --git a/go.sum b/go.sum +index 8f16b5a..7426c68 100644 +--- a/go.sum ++++ b/go.sum +@@ -293,6 +293,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w + golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY= + golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20220731174439-a90be440212d h1:Sv5ogFZatcgIMMtBSTTAgMYsicp25MXBubjXNDKwm80= ++golang.org/x/sys v0.0.0-20220731174439-a90be440212d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + 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= diff --git a/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix index 1de22705eb..dfdfebcf3e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubectx/default.nix @@ -11,7 +11,11 @@ buildGoModule rec { sha256 = "sha256-WY0zFt76mvdzk/s2Rzqys8n+DVw6qg7V6Y8JncOUVCM="; }; - vendorSha256 = "sha256-4sQaqC0BOsDfWH3cHy2EMQNMq6qiAcbV+RwxCdcSxsg="; + patches = [ + ./bump-golang-x-sys.patch + ]; + + vendorSha256 = "sha256-p4KUBmJw6hWG1J2qwg4QBbh6Vo1cr/HQz0IqytIDJjU="; nativeBuildInputs = [ installShellFiles ]; @@ -24,6 +28,5 @@ buildGoModule rec { license = licenses.asl20; homepage = "https://github.com/ahmetb/kubectx"; maintainers = with maintainers; [ jlesquembre ]; - platforms = with platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix index 82a130181e..d5bcfa6f46 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubepug"; - version = "1.3.2"; + version = "1.3.4"; src = fetchFromGitHub { owner = "rikatz"; repo = "kubepug"; rev = "v${version}"; - sha256 = "sha256-cjL718xTgtYev/lYL24vwZcB+joY3wIY4ixRCwAHQ4E="; + sha256 = "sha256-BljDmyueGtQztdHnix4YP+zvhor1+ofahQ8971/o1xY="; }; - vendorSha256 = "0hynxj3q4aa1gx3w4ak56z6j5iplxi2hzqzsjkgz20fy34nfd41s"; + vendorSha256 = "sha256-SZckJDFYGsjYEzpJOZ1BE0gNLqn4so23OcOUnPo6zdU="; ldflags = [ "-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}" diff --git a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix index 0bf711a229..cc40249e7c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-loVGMkB3p+xx7xRHdeSOcck+2vhV461VdNgUIpb/3O0="; + sha256 = "sha256-rLebv1lw1zaq401dPK4GbisYkES3/5lIiReTBPvgoJo="; }; - cargoSha256 = "sha256-BLKcuumF72MPL408+fUS+7MiTYjvSRORKNP2s0I7McI="; + cargoSha256 = "sha256-o1wnweT+wvZNnOT3ZNMJGuiZm7pkhZLssUuIfYeWnBc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index 4dca5d98e0..c6fbc71126 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.34"; + version = "0.35"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AXbbgNP10r3BVRXg9R8Ssd8yORCcQwaGRuHV6yXz5i0="; + sha256 = "sha256-TYtjwEQTXjkp1o95cXJw0VDVv5us07K+6NrJF9bsJfg="; }; vendorSha256 = null; @@ -21,6 +21,6 @@ buildGoModule rec { homepage = "https://github.com/jesseduffield/lazygit"; changelog = "https://github.com/jesseduffield/lazygit/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ fpletz equirosa Br1ght0ne ]; + maintainers = with maintainers; [ equirosa Br1ght0ne ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix b/third_party/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix index 72dc1ba218..d689504aca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "nuweb"; - version = "1.60"; + version = "1.62"; src = fetchurl { url = "mirror://sourceforge/project/nuweb/${pname}-${version}.tar.gz"; - sha256 = "08xmwq48biy2c1fr8wnyknyvqs9jfsj42cb7fw638xqv35f0xxvl"; + sha256 = "sha256-JVqPYkYPXBT0xLNWuW4DV6N6ZlKuBYQGT46frhnpU64="; }; buildInputs = [ tex ]; @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { # Workaround build failure on -fno-common toolchains like upstream # gcc-10. Otherwise build fails as: - # ld: global.o:/build/nuweb-1.60/global.h:91: multiple definition of - # `current_sector'; main.o:/build/nuweb-1.60/global.h:91: first defined here + # 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"; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix b/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix new file mode 100644 index 0000000000..3a7d00dea2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/lurk/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "lurk"; + version = "0.2.9"; + + src = fetchFromGitHub { + owner = "jakwai01"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Vvz1CWNpMbVpICL42VQHLM7AWSONGSXP5kfZ8rZlw8M="; + }; + + cargoSha256 = "sha256-AoFkgm13vj/18GOuSIgzs+xk82lSQ6zGpq4QVWcClv8="; + + meta = with lib; { + description = "A simple and pretty alternative to strace"; + homepage = "https://github.com/jakwai01/lurk"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ figsoda ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix index 45ea829299..27e8ec0875 100644 --- a/third_party/nixpkgs/pkgs/development/tools/metals/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metals"; - version = "0.11.6"; + version = "0.11.7"; deps = stdenv.mkDerivation { name = "${pname}-deps-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-/tFc7xAuUtx2JgEMLhGaq2FXpt7KQNMi82ODr/gTfhM="; + outputHash = "sha256-Zc/0kod3JM58WpyxwXiyQdixBHOJV7UDGg1YZtHJ3hw="; }; nativeBuildInputs = [ makeWrapper setJavaClassPath ]; @@ -29,23 +29,8 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - # This variant is not targeted at any particular client, clients are - # expected to declare their supported features in initialization options. makeWrapper ${jre}/bin/java $out/bin/metals \ --add-flags "${extraJavaOpts} -cp $CLASSPATH scala.meta.metals.Main" - - # Further variants targeted at clients with featuresets pre-set. - makeWrapper ${jre}/bin/java $out/bin/metals-emacs \ - --add-flags "${extraJavaOpts} -Dmetals.client=emacs -cp $CLASSPATH scala.meta.metals.Main" - - makeWrapper ${jre}/bin/java $out/bin/metals-vim \ - --add-flags "${extraJavaOpts} -Dmetals.client=coc.nvim -cp $CLASSPATH scala.meta.metals.Main" - - makeWrapper ${jre}/bin/java $out/bin/metals-vim-lsc \ - --add-flags "${extraJavaOpts} -Dmetals.client=vim-lsc -cp $CLASSPATH scala.meta.metals.Main" - - makeWrapper ${jre}/bin/java $out/bin/metals-sublime \ - --add-flags "${extraJavaOpts} -Dmetals.client=sublime -cp $CLASSPATH scala.meta.metals.Main" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/millet/default.nix b/third_party/nixpkgs/pkgs/development/tools/millet/default.nix index dca9df4dc2..f9951dc14f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/millet/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/millet/default.nix @@ -1,22 +1,17 @@ -{ lib, rustPlatform, fetchFromGitHub, rustfmt }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "millet"; - version = "0.1.14"; + version = "0.2.9"; src = fetchFromGitHub { owner = "azdavis"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kz2CwfntAUI33igYJBJQKPAmoW895toe/wS9dGnFB64="; + sha256 = "sha256-ZvLpLQ7WkRvApSZ7vPDmQH8iLLpKUEY5ig5Mn+rkMI8="; }; - cargoSha256 = "sha256-Rrnt6VEp7jDGLSsDcHuPfKhkm4USstxi/OW5oOVrgqY="; - - nativeBuildInputs = [ - # Required for `syntax-gen` crate https://github.com/azdavis/language-util/blob/8ec2dc509c88951102ad3e751820443059a363af/crates/syntax-gen/src/util.rs#L37 - rustfmt - ]; + cargoSha256 = "sha256-I5JgtW5Bgz2swJYiY2gV1UbSgeGxef7Hb4gDQYz/0TU="; cargoBuildFlags = [ "--package" "lang-srv" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix index 0bc4d9a9b6..a4b3241663 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.29"; + version = "0.2.30"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-n5IUhx5nZ6+bbYc3Z0d3stBSvr2Ht2XUwtDorQTcOhs="; + sha256 = "sha256-QNuCXBVSERNjn4ehqpOepAmLLqZAA2FvMBmMwceh4kI="; }; - vendorSha256 = "sha256-rMM1BcL4FGFXs0DHoLV9kt+BxnreVTL7kwCd9li1i6g="; + vendorSha256 = "sha256-T5HWT0h9ZSVQBbQbwIL1wu8BXvOkFIXtimz7QMUkWtQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix index 4457db0943..a25c1ce87b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix @@ -105,6 +105,17 @@ stdenv.mkDerivation { (if stdenv.targetPlatform.isMusl then substitute { src = ./mips64-default-n64.patch; replacements = [ "--replace" "gnuabi64" "muslabi64" ]; } else ./mips64-default-n64.patch) + # On PowerPC, when generating assembly code, GCC generates a `.machine` + # custom instruction which instructs the assembler to generate code for this + # machine. However, some GCC versions generate the wrong one, or make it + # too strict, which leads to some confusing "unrecognized opcode: wrtee" + # or "unrecognized opcode: eieio" errors. + # + # To remove when binutils 2.39 is released. + # + # Upstream commit: + # https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=cebc89b9328eab994f6b0314c263f94e7949a553 + ++ lib.optional stdenv.targetPlatform.isPower ./ppc-make-machine-less-strict.patch ; outputs = [ "out" "info" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch new file mode 100644 index 0000000000..c2452414fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/ppc-make-machine-less-strict.patch @@ -0,0 +1,51 @@ +From cebc89b9328eab994f6b0314c263f94e7949a553 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Mon, 21 Feb 2022 10:58:57 +1030 +Subject: [PATCH] binutils 2.38 vs. ppc32 linux kernel + +Commit b25f942e18d6 made .machine more strict. Weaken it again. + + * config/tc-ppc.c (ppc_machine): Treat an early .machine specially, + keeping sticky options to work around gcc bugs. +--- + gas/config/tc-ppc.c | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c +index 054f9c72161..89bc7d3f9b9 100644 +--- a/gas/config/tc-ppc.c ++++ b/gas/config/tc-ppc.c +@@ -5965,7 +5965,30 @@ ppc_machine (int ignore ATTRIBUTE_UNUSED) + options do not count as a new machine, instead they add + to currently selected opcodes. */ + ppc_cpu_t machine_sticky = 0; +- new_cpu = ppc_parse_cpu (ppc_cpu, &machine_sticky, cpu_string); ++ /* Unfortunately, some versions of gcc emit a .machine ++ directive very near the start of the compiler's assembly ++ output file. This is bad because it overrides user -Wa ++ cpu selection. Worse, there are versions of gcc that ++ emit the *wrong* cpu, not even respecting the -mcpu given ++ to gcc. See gcc pr101393. And to compound the problem, ++ as of 20220222 gcc doesn't pass the correct cpu option to ++ gas on the command line. See gcc pr59828. Hack around ++ this by keeping sticky options for an early .machine. */ ++ asection *sec; ++ for (sec = stdoutput->sections; sec != NULL; sec = sec->next) ++ { ++ segment_info_type *info = seg_info (sec); ++ /* Are the frags for this section perturbed from their ++ initial state? Even .align will count here. */ ++ if (info != NULL ++ && (info->frchainP->frch_root != info->frchainP->frch_last ++ || info->frchainP->frch_root->fr_type != rs_fill ++ || info->frchainP->frch_root->fr_fix != 0)) ++ break; ++ } ++ new_cpu = ppc_parse_cpu (ppc_cpu, ++ sec == NULL ? &sticky : &machine_sticky, ++ cpu_string); + if (new_cpu != 0) + ppc_cpu = new_cpu; + else +-- +2.31.1 diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix index bd753016fc..a401fc47ea 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20210330"; + version = "0.20220729"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "sha256-jipSipgD0avd7XODlpxnqjHK3s6nacaxbIQIddix7X8="; + sha256 = "sha256-eSWgk6KdEyjDLPc27CsOCXDU7AKMoXNyzoA6dSwZ5TI="; }; nativeBuildInputs = [ cmake llvmPackages.llvm.dev ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix index ff91e227de..836f5013db 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,18 +2,18 @@ buildGraalvmNativeImage rec { pname = "clojure-lsp"; - version = "2022.06.29-19.32.13"; + version = "2022.07.24-18.25.43"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-skU1p0rEO+9JMxaOepULZhG/xG56KuGNLEUiQ945Pv0="; + sha256 = "sha256-3GBuVHLcoPLj1RNzhp9qcfU3pKBOK4fXQfrCifBi2xw="; }; jar = fetchurl { url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp-standalone.jar"; - sha256 = "97446cacf42966e6096570b9f9c48c653a81903a33e98987cba4b855b417c76f"; + sha256 = "7c0093ee0db015b5287c6878cfb348293d357a046d21794b86fd92c59c4d771c"; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix similarity index 64% rename from third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix rename to third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix index 12c14fcb73..168c40911e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cmake-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -2,8 +2,8 @@ , buildPythonApplication , fetchFromGitHub , poetry +, cmake-format , pygls -, pyparsing , cmake , pytest-datadir , pytestCheckHook @@ -11,14 +11,14 @@ buildPythonApplication rec { pname = "cmake-language-server"; - version = "0.1.4"; + version = "0.1.6"; format = "pyproject"; src = fetchFromGitHub { owner = "regen100"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-FOyyXSgoFpX4mOHFyZtVW618M1Xs7k+IioJzm1sdkKY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-B7dhCQo3g2E8+fzyl1RhaYQE6TFoqoLtp9Z7sZcv5xk="; }; patches = [ @@ -26,15 +26,22 @@ buildPythonApplication rec { ./disable-test-timeouts.patch ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'pyparsing = "^2.4"' 'pyparsing = "^3.0.6"' - ''; + nativeBuildInputs = [ + poetry + ]; - nativeBuildInputs = [ poetry ]; - propagatedBuildInputs = [ pygls pyparsing ]; + propagatedBuildInputs = [ + cmake-format + pygls + ]; + + checkInputs = [ + cmake + cmake-format + pytest-datadir + pytestCheckHook + ]; - checkInputs = [ cmake pytest-datadir pytestCheckHook ]; dontUseCmakeConfigure = true; pythonImportsCheck = [ "cmake_language_server" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch new file mode 100644 index 0000000000..6b66681056 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/cmake-language-server/disable-test-timeouts.patch @@ -0,0 +1,13 @@ +diff --git a/tests/test_server.py b/tests/test_server.py +index 2d09bb2..59a122a 100644 +--- a/tests/test_server.py ++++ b/tests/test_server.py +@@ -26,7 +26,7 @@ from pygls.lsp.types import ( + ) + from pygls.server import LanguageServer + +-CALL_TIMEOUT = 2 ++CALL_TIMEOUT = None + + + def _init(client: LanguageServer, root: Path) -> None: diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix index 2d9aa55ed0..66424e4396 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/coccinelle/default.nix @@ -1,21 +1,53 @@ -{ fetchurl, lib, stdenv, python3, ncurses, ocamlPackages, pkg-config }: +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, ocamlPackages +, pkg-config +, autoreconfHook +}: stdenv.mkDerivation rec { pname = "coccinelle"; - version = "1.1.0"; + version = "1.1.1"; - src = fetchurl { - url = "https://coccinelle.gitlabpages.inria.fr/website/distrib/${pname}-${version}.tar.gz"; - sha256 = "0k0x4qnxzj8fymkp6y9irggcah070hj7hxq8l6ddj8ccpmjbhnsb"; + src = fetchFromGitHub { + repo = pname; + rev = version; + owner = "coccinelle"; + hash = "sha256-rS9Ktp/YcXF0xUtT4XZtH5F9huvde0vRztY7vGtyuqY="; }; - buildInputs = with ocamlPackages; [ - ocaml findlib menhir - ocaml_pcre parmap stdcompat - python3 ncurses pkg-config + patches = [ + # Fix data path lookup. + # https://github.com/coccinelle/coccinelle/pull/270 + (fetchpatch { + url = "https://github.com/coccinelle/coccinelle/commit/540888ff426e0b1f7907b63ce26e712d1fc172cc.patch"; + sha256 = "sha256-W8RNIWDAC3lQ5bG+gD50r7x919JIcZRpt3QSOSMWpW4="; + }) ]; - doCheck = false; + nativeBuildInputs = with ocamlPackages; [ + autoreconfHook + pkg-config + ocaml + findlib + menhir + ]; + + buildInputs = with ocamlPackages; [ + ocaml_pcre + parmap + pyml + stdcompat + ]; + + strictDeps = true; + + postPatch = '' + # Ensure dependencies from Nixpkgs are picked up. + rm -rf bundles/ + ''; meta = { description = "Program to apply semantic patches to C code"; @@ -33,8 +65,8 @@ stdenv.mkDerivation rec { and others) for finding and fixing bugs in systems code. ''; - homepage = "http://coccinelle.lip6.fr/"; - license = lib.licenses.gpl2; + homepage = "https://coccinelle.gitlabpages.inria.fr/website/"; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.thoughtpolice ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix index c49fb15610..7e3604c351 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/coreboot-toolchain/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage }: +{ stdenv, lib, callPackage }: let common = arch: callPackage ( { bison @@ -22,14 +22,14 @@ let src = fetchgit { url = "https://review.coreboot.org/coreboot"; rev = version; - sha256 = "073n8yid3v0l9wgwnrdqrlgzaj9mnhs33a007dgr7xq3z0iw3i52"; + sha256 = "sha256-PCum+IvJ136eZQLovUi9u4xTLLs17MkMP5Oc0/2mMY4="; fetchSubmodules = false; leaveDotGit = true; postFetch = '' - patchShebangs $out/util/crossgcc/buildgcc - PATH=${lib.makeBinPath [ getopt ]}:$PATH $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version + PATH=${lib.makeBinPath [ getopt ]}:$PATH ${stdenv.shell} $out/util/crossgcc/buildgcc -W > $out/.crossgcc_version rm -rf $out/.git ''; + allowedRequisites = [ ]; }; nativeBuildInputs = [ bison curl git perl ]; @@ -40,6 +40,8 @@ let dontInstall = true; postPatch = '' + patchShebangs $out/util/crossgcc/buildgcc + mkdir -p util/crossgcc/tarballs ${lib.concatMapStringsSep "\n" ( diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/drush/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/drush/default.nix index 8cafab36f2..c06a566fb5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/drush/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/drush/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "drush"; - version = "8.4.10"; + version = "8.4.11"; src = fetchurl { url = "https://github.com/drush-ops/drush/releases/download/${version}/drush.phar"; - sha256 = "sha256-yXSoTDFLsjDiYkRfrIxv2WTVdHzgxZRvtn3Pht5XF4k="; + sha256 = "sha256-4DD16PQHGZzAGwmm/WNeZ/dDKnlQslcb35AkpiJs5tQ="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix index ff95935326..3accb063cc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = version; - sha256 = "sha256-zbE/je5ZxCX83hxl88c8/FoZzOLatrSEjSAI+eIOVQQ="; + sha256 = "sha256-S/iIanLToWN4OsItvSLGSEhgoYRJgUt0w3QFp1+scfY="; }; - vendorSha256 = "sha256-SrBrYyExeDHXhezvtfGLtm8NM1eX4/8kzwUICQLZDjo="; + vendorSha256 = "sha256-ktyUuWW0xlhRLkertrc4/ZYCyDh/tfYBuHqIrdTkotQ="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix index d9b56428f5..6b5c2ba42f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix @@ -102,6 +102,7 @@ stdenv.mkDerivation rec { "--with-auto-load-safe-path=${builtins.concatStringsSep ":" safePaths}" ] ++ lib.optional (!pythonSupport) "--without-python" ++ lib.optional stdenv.hostPlatform.isMusl "--disable-nls" + ++ lib.optional stdenv.hostPlatform.isStatic "--disable-inprocess-agent" ++ lib.optional enableDebuginfod "--with-debuginfod=yes"; postInstall = diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix index 2ca092fa65..d5d7970d45 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/grcov/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "grcov"; - version = "0.8.9"; + version = "0.8.11"; src = fetchFromGitHub { owner = "mozilla"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VSjKZoK/o05kYX5mRCnaS6r/+4dZep9Bp9Im1Zw7piM="; + sha256 = "sha256-PUZ60dc2ciUInr98dF67Fi0xP/IHgITtYYG54wlLZYE="; }; - cargoSha256 = "sha256-7I0BizeDbikpog0YG/X8vwoO4PGE1qYzRTWTr0RUQws="; + cargoSha256 = "sha256-7bDWxiVmSi2GT6cSTzT0GTAs1qmFaj40JmVaD/sFwsA="; # tests do not find grcov path correctly checkFlags = let diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix index 59beb7acd8..991473a8fc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/grpc-client-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpc-client-cli"; - version = "1.12.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${version}"; - sha256 = "sha256-hsx+nmkYLkSsrUEDAf5556qNLeZ3w5txFBUpDv+b3a4="; + sha256 = "sha256-ILQuo0UO8L71mdCgyf+rQNZ2LXzZ7kVdbL1X7Z+H9P4="; }; - vendorSha256 = "sha256-1WcnEl3odjxyXfSNyzPU3fa5yrF4MaEgfCAsbr3xedA="; + vendorSha256 = "sha256-benXxv//bB4fcfAsZ69DZu9E+4iKQgVbaWGYcFsnyfM="; meta = with lib; { description = "generic gRPC command line client"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix index fef4d7d405..e240834f2b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "k2tf"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "sl1pm4t"; repo = pname; rev = "v${version}"; - sha256 = "sha256-75L8fcmZbG7PbZrF4cScRQjqbuu5eTnLIaDGzgF57/0="; + sha256 = "sha256-zkkRzCTZCvbwBj4oIhTo5d3PvqLMJPzT3zV9jU3PEJs="; }; - vendorSha256 = "sha256-YsSOw3G5ufxBn8Wu5J8md2Aaqhl0VJa7uB6ZzSPWo/A="; + vendorSha256 = "sha256-iCRiBCppqCZrCUQipoVgc4jUnLkX6QVFjxI6sv6n7tU="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/libtool/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/libtool/default.nix index 79db7e710b..b9e3237292 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/libtool/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/libtool/default.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; + dontFixLibtool = true; meta = { description = "Generic library support script"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix b/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix index 813cc71938..92a230374d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/libtool/libtool2.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation rec { # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the # "fixed" path in generated files! dontPatchShebangs = true; + dontFixLibtool = true; # XXX: The GNU ld wrapper does all sorts of nasty things wrt. RPATH, which # leads to the failure of a number of tests. diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix index f3f29cc1ac..9cf752af5b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lsof/default.nix @@ -4,7 +4,7 @@ let dialect = with lib; last (splitString "-" stdenv.hostPlatform.system); in stdenv.mkDerivation rec { pname = "lsof"; - version = "4.94.0"; + version = "4.95.0"; depsBuildBuild = [ buildPackages.stdenv.cc ]; buildInputs = [ ncurses ]; @@ -13,18 +13,24 @@ stdenv.mkDerivation rec { owner = "lsof-org"; repo = "lsof"; rev = version; - sha256 = "0yxv2jg6rnzys49lyrz9yjb4knamah4xvlqj596y6ix3vm4k3chp"; + sha256 = "sha256-HgU7/HxLdUOfLU2E/dpusko6gBOoEKeWPJIFbBQGzFU="; }; patches = [ ./no-build-info.patch # Pull upstream fix for -fno-common toolchains: - # https://github.com/lsof-org/lsof/pull/221 + # https://github.com/lsof-org/lsof/pull/226 + # https://github.com/lsof-org/lsof/pull/233 (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/lsof-org/lsof/commit/80e7c890585deec02c527dbcf42bc0e5d8d7c534.patch"; - sha256 = "17xshi7j7af9nli1zjk1m5f4il2ajvvhw7lii8g8d27rkkgyb8g6"; + name = "add-extern.patch"; + url = "https://github.com/lsof-org/lsof/commit/180ffa29b0544f77cabbc54d7f77d50d33dd27d7.patch"; + sha256 = "sha256-zzcN9HrFYMTBeEekeAwi2RIcVukymgaqtpvFIBV6njU="; + }) + (fetchpatch { + name = "add-declaration.patch"; + url = "https://github.com/lsof-org/lsof/commit/8e47e1491636e8cf41baf834554391be45177b00.patch"; + sha256 = "sha256-kwkDQp7VApLenOLTPMY24Me+/xUhD56skHWRd4ZB1I4="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/no-build-info.patch b/third_party/nixpkgs/pkgs/development/tools/misc/lsof/no-build-info.patch index cf785e248f..c433fd6e08 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lsof/no-build-info.patch +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lsof/no-build-info.patch @@ -1,12 +1,9 @@ -diff -ru -x '*~' lsof_4.91_src-orig/usage.c lsof_4.91_src/usage.c ---- lsof_4.91_src-orig/usage.c 2018-02-14 15:20:32.000000000 +0100 -+++ lsof_4.91_src/usage.c 2018-10-08 21:57:45.718560869 +0200 -@@ -930,26 +930,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 @@ (void) fprintf(stderr, " configuration info: %s\n", cp); #endif /* defined(LSOF_CINFO) */ -- if ((cp = isnullstr(LSOF_CCDATE))) -- (void) fprintf(stderr, " constructed: %s\n", cp); - cp = isnullstr(LSOF_HOST); - if (!(cp1 = isnullstr(LSOF_LOGNAME))) - cp1 = isnullstr(LSOF_USER); diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix index b7eabf6f9a..7020be669d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.4"; + version = "2.13.7"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-Vl8xAkEKU9SE9Mj/UXl48dxZ9n+dFvhy9DV/PKEiAPY="; + sha256 = "sha256-0XoC6PF4p880A+PJ7fuQrToWKOIKoLUTFAiuR/ci8I0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix index c57b421dbe..d736e4a1d2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/netcoredbg/default.nix @@ -30,7 +30,9 @@ let hardeningDisable = [ "strictoverflow" ]; preConfigure = '' + export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 dotnetVersion="$(${dotnet-sdk}/bin/dotnet --list-runtimes | grep -Po '^Microsoft.NETCore.App \K.*?(?= )')" + cmakeFlagsArray+=( "-DDBGSHIM_RUNTIME_DIR=${dotnet-sdk}/shared/Microsoft.NETCore.App/$dotnetVersion" ) diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix index 41eb956715..af4ed6977b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nimlsp/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage rec { pname = "nimlsp"; - version = "0.4.0"; + version = "0.4.1"; nimBinOnly = true; src = fetchFromGitHub { owner = "PMunch"; repo = "nimlsp"; rev = "v${version}"; - sha256 = "sha256-eih8JmofLFXkidanRocjtA6wv84HkA1bi0M4dxkiDr4="; + sha256 = "sha256-LAtUGhYEcOwvZzexQ2y3/HPgOge2EsScCbujJ/hz5Ec="; }; buildInputs = with nimPackages; [ jsonschema ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nix-bisect/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nix-bisect/default.nix index 23efce44cf..a4c3179e8e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nix-bisect/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nix-bisect/default.nix @@ -25,6 +25,11 @@ python3.pkgs.buildPythonApplication { url = "https://github.com/timokau/nix-bisect/commit/01eefe174b740cb90e48b06d67d5582d51786b96.patch"; hash = "sha256-Gls/NtHH7LujdEgLbcIRZ12KsJDrasXIMcHeeBVns4A="; }) + (fetchpatch { + # Fixes TypeError crashes associated with drvs_failed inconsistency + url = "https://github.com/timokau/nix-bisect/commit/9f3a17783046baae64c16f9e2be917c2603977fc.patch"; + hash = "sha256-U9NUtgwslcgIf/wvH/WE7t0HGs2OP3wvYDKrb5j+lp0="; + }) ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix index 7ffd92451b..7d2cbabef4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nrfutil/default.nix @@ -1,41 +1,20 @@ { lib , stdenv , fetchFromGitHub -, pkgs , python3 -, python3Packages }: -let - py = python3.override { - packageOverrides = self: super: { - libusb1 = super.libusb1.overridePythonAttrs (oldAttrs: rec { - version = "1.9.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "0j8p7jb7sibiiib18vyv3w5rrk0f4d2dl99bs18nwkq6pqvwxrk0"; - }; - - postPatch = '' - substituteInPlace usb1/libusb1.py --replace \ - "ctypes.util.find_library(base_name)" \ - "'${pkgs.libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; - }); - }; - }; -in -with py.pkgs; +with python3.pkgs; buildPythonApplication rec { pname = "nrfutil"; - version = "6.1.3"; + version = "6.1.6"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-nrfutil"; rev = "v${version}"; - sha256 = "1gpxjdcjn4rjvk649vpkh563c7lx3rrfvamazb1qjii1pxrvvqa7"; + sha256 = "sha256-UiGNNJxNSpIzpeYMlzocLG2kuetl8xti5A3n6zz0lcY="; }; propagatedBuildInputs = [ @@ -60,6 +39,7 @@ buildPythonApplication rec { postPatch = '' mkdir test-reports + substituteInPlace requirements.txt --replace "libusb1==1.9.3" "libusb1" ''; meta = with lib; { @@ -68,7 +48,5 @@ buildPythonApplication rec { license = licenses.unfreeRedistributable; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; - # libusb1 1.9.3 uses setuptools' 2to3 translation feature, which has been removed in setuptools 58 - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/polylith/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/polylith/default.nix index a48f629ad6..3d28ffa523 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/polylith/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/polylith/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "polylith"; - version = "0.2.13-alpha"; + version = "0.2.14-alpha"; src = fetchurl { url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar"; - sha256 = "sha256-iLN92qurc8+D0pt7Hwag+TFGoeFl9DvEeS67sKmmoSI="; + sha256 = "sha256-0yJLSveKd49nBnCtBVfwcACXfIH43ZgqTLoo2aLPE2g="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/prelink/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/prelink/default.nix index 384829daad..d5c7428411 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/prelink/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/prelink/default.nix @@ -31,16 +31,8 @@ stdenv.mkDerivation rec { libiberty ]; - # Disable some tests because they're failing - preCheck = '' - for f in reloc2 layout1 unprel1 tls3 cxx2 cxx3 quick1 quick2 deps1 deps2; do - echo '#' > testsuite/''${f}.sh - done - patchShebangs --build testsuite - ''; - # most tests fail - doCheck = !stdenv.isAarch64; + doCheck = false; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix index f606bc6097..9203eb6228 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/saleae-logic-2/default.nix @@ -1,10 +1,10 @@ { lib, fetchurl, makeDesktopItem, appimageTools }: let name = "saleae-logic-2"; - version = "2.3.55"; + version = "2.3.58"; src = fetchurl { url = "https://downloads.saleae.com/logic2/Logic-${version}-master.AppImage"; - sha256 = "sha256-fL72KZzOh9pWrjSaXDCMz0ijqRj1Vc5Ym37onv4E7aI="; + sha256 = "sha256-WQa9J+rK71+T2IFUVpPLjkYfHy9GmZ9DZTBo+U4JKfo="; }; desktopItem = makeDesktopItem { inherit name; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix index a8f7f63d02..378e941c89 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sccache/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, openssl, Security }: rustPlatform.buildRustPackage rec { - version = "0.2.15"; + version = "0.3.0"; pname = "sccache"; src = fetchFromGitHub { owner = "mozilla"; repo = "sccache"; rev = "v${version}"; - sha256 = "1kygk7ilv7la36kv4jdn1ird7f3896wgr88kyqf0iagfqkzb2vsb"; + sha256 = "sha256-z4pLtSx1mg53AHPhT8P7BOEMCWHsieoS3rI0kEyJBcY="; }; - cargoSha256 = "1f42cqaqnjwi9k4ihqil6z2dqh5dnf76x54gk7mndzkrfg3rl573"; + cargoSha256 = "sha256-4YF1fqthnWY6eu6J4SMwFG655KXdFCXmA9wxLyOOAw4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix new file mode 100644 index 0000000000..b4263220c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/misc/seer/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, qtcharts, qtbase, wrapQtAppsHook }: + +stdenv.mkDerivation rec { + pname = "seer"; + version = "1.7"; + + src = fetchFromGitHub { + owner = "epasveer"; + repo = "seer"; + rev = "v${version}"; + sha256 = "sha256-/EuXit1kHW2cdqa5BJEj29Wu3WafVZb6DpPnIg2tDP0="; + }; + + preConfigure = '' + cd src + ''; + + buildInputs = [ qtbase qtcharts ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + meta = with lib; { + description = "A Qt gui frontend for GDB"; + homepage = "https://github.com/epasveer/seer"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ foolnotion ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/sipp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/sipp/default.nix index 0d5ceba125..297669733c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/sipp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/sipp/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { "-DUSE_PCAP=1" "-DUSE_SSL=1" "-DUSE_SCTP=${if stdenv.isLinux then "1" else "0"}" + + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix index 2e3075c7b1..22703a4afc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.0"; + version = "0.2.4"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-WZuFYiPV6HbBH9QT4h9FbnmkbFBadUaV0HujiQ0hu7I="; + sha256 = "sha256-m7xV5sQZnRytT3QY1a9qihZV0Ub6zKjfDytZ+TDwdFg="; }; - cargoSha256 = "sha256-tafxN3ots1UTSv950NlwCs6TItMnKz5tn5vw7PTcARU="; + cargoSha256 = "sha256-993XWYSUC2KuV2/dgTYAatoy5lGIveT3lL7eOYsbCig="; meta = with lib; { description = "SystemVerilog language server"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index b3fd7a54ec..d101e017bf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.7.4"; + version = "0.8.1"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QaJoHnuzSQXxEuGpui9lyKAjT2wdz4XmMAh5cAOKvBg="; + sha256 = "sha256-pI/TxC+RCQjtkYBA+BwW1jlDURKh1uf45GTIqz/rih8="; }; - vendorSha256 = "sha256-HcUH3cnaeyB2XnfcRLulsRcHaCwdLkiIb518Ucl2tv8="; + vendorSha256 = "sha256-ihoWhiK3TO1lAvk1oU8HVVDBDvLFBw+MMaK2avWfCB4="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix index ccd7c70336..eddefa44ed 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraformer/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terraformer"; - version = "0.8.19"; + version = "0.8.21"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = pname; rev = version; - sha256 = "sha256-h6hqgAHyMNnE7AXNPTUM2srgHW9WGcGmO8d30U2IbSo="; + sha256 = "sha256-IcxXR+EQItfUtUfBOlRi8VvxZ3y4OE8mdbch5KqG+wg="; }; - vendorSha256 = "sha256-bT6+fH0VJfcgehiiLIDTEYyWgVHIMUGuRaebzm2st60="; + vendorSha256 = "sha256-zek9c5y6HEvY0eFdv78RDS8+Q2/++34VHRJsIONse6c="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix index 229c2b68f6..4371efca4f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/texlab/default.nix @@ -2,6 +2,7 @@ , stdenv , rustPlatform , fetchFromGitHub +, help2man , installShellFiles , libiconv , Security @@ -9,34 +10,47 @@ , nix-update-script }: -rustPlatform.buildRustPackage rec { +let + isCross = stdenv.hostPlatform != stdenv.buildPlatform; +in rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-oYM+OAYjQ8aNAryg0Cthj14BsxMFnOtz38XdUQZZolk="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-za3TauhNoxGDphpY615EnTt46HpMgS+sYpBln/twefw="; }; - cargoSha256 = "sha256-TDGiqC9eNIJfLTc1R3nvE84rAsVE8jtTaeQbVNMeVgg="; + cargoSha256 = "sha256-wppaa3IGOqkFu/1CAp8g+PlPtMWm/7qNpPu0k4/mL3A="; - outputs = [ "out" "man" ]; + outputs = [ "out" ] ++ lib.optional (!isCross) "man"; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles ] + ++ lib.optional (!isCross) help2man; - buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + Security + CoreServices + ]; postInstall = '' - installManPage texlab.1 - # Remove generated dylib of human_name dependency. TexLab statically # links to the generated rlib and doesn't reference the dylib. I # couldn't find any way to prevent building this by passing cargo flags. # See https://github.com/djudd/human-name/blob/master/Cargo.toml#L43 rm "$out/lib/libhuman_name${stdenv.hostPlatform.extensions.sharedLibrary}" rmdir "$out/lib" + '' + # When we cross compile we cannot run the output executable to + # generate the man page + + lib.optionalString (!isCross) '' + # TexLab builds man page separately in CI: + # https://github.com/latex-lsp/texlab/blob/v4.2.1/.github/workflows/publish.yml#L131-L135 + help2man --no-info "$out/bin/texlab" > texlab.1 + installManPage texlab.1 ''; passthru.updateScript = nix-update-script { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix index e802078713..422fe28787 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/uncrustify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "uncrustify"; - version = "0.75.0"; + version = "0.75.1"; src = fetchFromGitHub { owner = "uncrustify"; repo = "uncrustify"; rev = "uncrustify-${version}"; - sha256 = "sha256-UbcQvNnuN2VX60O9wXTksrijgrSGzYCseq0tGUtJ9Mg="; + sha256 = "sha256-wLzj/KcqXlcTsOJo7T166jLcWi1KNLmgblIqqkj7/9c="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix index 00079c82c3..63a2fd5812 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mold"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "rui314"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KSIbMKaLcVUM2k+WQ5V+kU/TUQQFWpsCBVs8TQW+3g4="; + sha256 = "sha256-d1rSmDPiVHpYbDPWQKkDhcJJklKlM1+vGdzvjICTT14="; }; buildInputs = [ zlib openssl ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix index e838463641..b84c884340 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix @@ -40,16 +40,16 @@ let in stdenv.mkDerivation rec{ pname = "mysql-shell"; - version = "8.0.29"; + version = "8.0.30"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; - sha256 = "sha256-ijwyamQgMoUEcMNpIJjJxH/dRuRFpdcXGmQqpD+WrmA="; + sha256 = "sha256-/UJgcYkPG8RShZzybqdcMQDpNUTVWAfAa2p0Cm23fXA="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; - sha256 = "sha256-USFw+m94ppTW8Y0ZfpmdJxbuaNxUHXZE3ZIqNmNAcmY="; + sha256 = "sha256-yYjVxrqaVmkqbNbpgTRltfyTaO1LRh35cFmi/BYMi4Q="; }) ]; @@ -95,9 +95,6 @@ stdenv.mkDerivation rec{ -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql-${version} -B ../mysql-${version}/build cmake --build ../mysql-${version}/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient - - # Get libv8_monolith - mkdir -p ../v8/lib && ln -s ${v8}/lib/libv8.a ../v8/lib/libv8_monolith.a ''; cmakeFlags = [ @@ -110,7 +107,7 @@ stdenv.mkDerivation rec{ "-DWITH_PROTOBUF=${protobuf}" "-DHAVE_V8=1" "-DV8_INCLUDE_DIR=${v8}/include" - "-DV8_LIB_DIR=../v8/lib" + "-DV8_LIB_DIR=${v8}/lib" "-DHAVE_PYTHON=1" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/neil/default.nix b/third_party/nixpkgs/pkgs/development/tools/neil/default.nix index 4c0b1e2da3..1f3495de3f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/neil/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/neil/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.0.31"; + version = "0.1.36"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-+TDFSg7WA/roIqkuvECPS2UyBqiKQSLp1dooBsVP4uk="; + sha256 = "sha256-byBQLYwFSUQJioV2FccsFqXGMlESSA1kg8aBeSaWbwA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix index 97a769628f..471932ff83 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp4/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchzip, which, ocaml, ocamlbuild }: -if lib.versionAtLeast ocaml.version "4.14" +if lib.versionAtLeast ocaml.version "4.15" then throw "camlp4 is not available for OCaml ${ocaml.version}" else @@ -41,6 +41,9 @@ let param = { "4.13" = { version = "4.13+1"; sha256 = "0fzxa1zdhk74mlxpin7p90flks6sp4gkc0mfclmj9zak15rii55n"; }; + "4.14" = { + version = "4.14+1"; + sha256 = "sha256-cPN3GioZT/Zt6uzbjGUPEGVJcPQdsAnCkU/AQoPfvuo="; }; }.${ocaml.meta.branch}; in diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix index 299a337d27..2917a4905b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "sha256-hAyASRv+Erq18rmdSeFj8+TE0vxLSj5vsWwk3M1VAuE="; + sha256 = "sha256-KZ+jPP/BCMwm/1nV/J0J9ssKs6woC/I6ARTP3AtAxsU="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix index a441d97452..a92fafeac4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -1,35 +1,17 @@ { lib, fetchurl, fetchzip, callPackage }: -let mkOCamlformat = callPackage ./generic.nix; in - # Older versions should be removed when their usage decrease # This script scraps Github looking for OCamlformat's options and versions usage: # https://gist.github.com/Julow/110dc94308d6078225e0665e3eccd433 rec { - ocamlformat_0_19_0 = mkOCamlformat { - version = "0.19.0"; - }; + ocamlformat_0_19_0 = ocamlformat.override { version = "0.19.0"; }; + ocamlformat_0_20_0 = ocamlformat.override { version = "0.20.0"; }; + ocamlformat_0_20_1 = ocamlformat.override { version = "0.20.1"; }; + ocamlformat_0_21_0 = ocamlformat.override { version = "0.21.0"; }; + ocamlformat_0_22_4 = ocamlformat.override { version = "0.22.4"; }; + ocamlformat_0_23_0 = ocamlformat.override { version = "0.23.0"; }; + ocamlformat_0_24_0 = ocamlformat.override { version = "0.24.0"; }; - ocamlformat_0_20_0 = mkOCamlformat { - version = "0.20.0"; - }; - - ocamlformat_0_20_1 = mkOCamlformat { - version = "0.20.1"; - }; - - ocamlformat_0_21_0 = mkOCamlformat { - version = "0.21.0"; - }; - - ocamlformat_0_22_4 = mkOCamlformat { - version = "0.22.4"; - }; - - ocamlformat_0_23_0 = mkOCamlformat { - version = "0.23.0"; - }; - - ocamlformat = ocamlformat_0_23_0; + ocamlformat = callPackage ./generic.nix {}; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 5e58699fa7..a27672fcd7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -1,5 +1,5 @@ { lib, fetchurl, fetchzip, ocaml-ng -, version +, version ? "0.24.0" , tarballName ? "ocamlformat-${version}.tbz", }: @@ -13,6 +13,7 @@ let src = "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA="; "0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0="; + "0.24.0" = "sha256-Zil0wceeXmq2xy0OVLxa/Ujl4Dtsmc4COyv6Jo7rVaM="; }."${version}"; }; ocamlPackages = ocaml-ng.ocamlPackages; @@ -48,8 +49,10 @@ buildDunePackage { uutf ] ++ lib.optionals (lib.versionAtLeast version "0.20.0") [ ocaml-version either ] - ++ (if lib.versionAtLeast version "0.20.1" - then [ odoc-parser ] + ++ (if lib.versionAtLeast version "0.24.0" + then [ (odoc-parser.override { version = "2.0.0"; }) ] + else if lib.versionAtLeast version "0.20.1" + then [ (odoc-parser.override { version = "1.0.1"; }) ] else [ (odoc-parser.override { version = "0.9.0"; }) ]) ++ (if lib.versionAtLeast version "0.21.0" then [ cmdliner_1_1 ] diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix index 1ca8cfb5c5..b055ccbde5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "ocp-index"; - version = "1.3.1"; + version = "1.3.3"; useDune2 = true; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - sha256 = "120w72fqymjp6ibicbp31jyx9yv34mdvgkr0zdfpzvfb7lgd8rc7"; + sha256 = "sha256-ElCXjUR85tkyBLIpIKefDouE1upzJytQnk4xoQt/cb0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix index aa7cced501..b915cdb65c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, getconf, - ocaml, unzip, ncurses, curl, aspcud, bubblewrap + ocaml, unzip, ncurses, curl, bubblewrap }: assert lib.versionAtLeast ocaml.version "4.02.3"; @@ -119,7 +119,7 @@ in stdenv.mkDerivation { mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl index c914bac8b5..2e816da8cc 100755 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -21,12 +21,12 @@ chomp $OPAM_RELEASE_SHA256; my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG"; my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`; -my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" {>= "(.*)"}$/m +my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" \{>= "(.*)"}$/m or die "could not parse ocaml version bound\n"; print <<"EOF"; { stdenv, lib, fetchurl, makeWrapper, getconf, - ocaml, unzip, ncurses, curl, aspcud, bubblewrap + ocaml, unzip, ncurses, curl, bubblewrap }: assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION"; @@ -114,7 +114,7 @@ print <<'EOF'; mv $out/bin/opam $out/bin/.opam-wrapped makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ --argv0 "opam" \ - --suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ + --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ $out/bin/opam-installer --prefix=$installer opam-installer.install ''; diff --git a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix index ec4974876c..c116cd929f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.4.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - sha256 = "sha256-+shhY7/chtq4xPwYSlcVgL/RGMNA0ahTCqT9pVQqpG4="; + sha256 = "sha256-VNtlH8Syj3myVEE4WAZpBnP10rl0e73cFg7TgCFh0EY="; }; vendorSha256 = "sha256-W1/QBMnMdZWokWSFmHhPqmOu827bpGXS8+GFp5Iu9Ig="; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index e51d5fda36..71fb31f131 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-Sn0vtC6skQE/IxXj3cjrq5iXYjM1wi17d4eavPKhk+g="; + sha256 = "sha256-ZxMeYWrUnNoCUgYrg/f3C19kGeN81boTfJRSpZZ/GL4="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index fabc6e5ac4..d3e0ab91ed 100644 --- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.18.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BusShYGgaUGwLMWr/EHS7kDUTnTJyHzWUztlaMJskAg="; + sha256 = "sha256-SpSdVJeN+rOZ6jeFPKadXKQLBZmrLjbrBrJsK9zDiZg="; }; - vendorSha256 = "sha256-VH2ALKSr+UFk26Y5/1yhLP//wc1t8f9O5dMg0RGz4ZM="; + vendorSha256 = "sha256-MiA3XbdSwzZLilvrqlNU8e2nMAfhmVnNeG1oUx4ISRU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/oras/default.nix b/third_party/nixpkgs/pkgs/development/tools/oras/default.nix index 94a81144cc..5d82e5c3a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/oras/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/oras/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "oras"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "oras-project"; repo = "oras"; rev = "v${version}"; - sha256 = "sha256-6W7vmWFjULIJnOVtgSrCEKw/83W8jNSbM0AF4LZZR6U="; + sha256 = "sha256-QmyMDmZXOXD+6T+7Xl9kPFeOrkP1styzwwWi5tH9aO0="; }; - vendorSha256 = "sha256-3UKsH4Jbq7G5PRwhn5lW0NR80jhmuzT9daa++v2sFWk="; + vendorSha256 = "sha256-JoSo716o1RmMlAFSauzgzH6ypE/Kxo/PniJ2PGdfKZ8="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix index f9a3b17cd7..43ef3ffa3e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/bison/default.nix @@ -28,7 +28,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + # Normal check and install check largely execute the same test suite + doCheck = false; doInstallCheck = true; meta = { diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix index e4a4ab162f..81d7d9f0b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/ragel/default.nix @@ -3,7 +3,7 @@ }: let - generic = { version, sha256, license }: + generic = { version, sha256, broken ? false, license }: stdenv.mkDerivation rec { pname = "ragel"; inherit version; @@ -26,10 +26,9 @@ let doCheck = true; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://www.colm.net/open-source/ragel/"; description = "State machine compiler"; - inherit license; + inherit broken license; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; @@ -48,5 +47,6 @@ in version = "7.0.0.12"; sha256 = "0x3si355lv6q051lgpg8bpclpiq5brpri5lv3p8kk2qhzfbyz69r"; license = lib.licenses.mit; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix index 16ef0a9939..2fbde80590 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "5.2"; + version = "5.3"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "sha256-NNdg3H+tB5ovKWGneOs496c0b2dv/zFYF4CZhuH07Fs="; + sha256 = "sha256-W6xIUQhCUuPo2oIArqlM8RX2hlrPts12rTQQo+/74iM="; }; outputs = [ "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/pgloader/default.nix b/third_party/nixpkgs/pkgs/development/tools/pgloader/default.nix index 7e4c5c56ba..94bdb69c15 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pgloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pgloader/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchurl, makeWrapper, sbcl_2_0_8, sqlite, freetds, libzip, curl, git, cacert, openssl }: +{ lib, stdenv, fetchurl, makeWrapper, sbcl_2_2_6, sqlite, freetds, libzip, curl, git, cacert, openssl }: stdenv.mkDerivation rec { pname = "pgloader"; - version = "3.6.2"; + version = "3.6.6"; src = fetchurl { - url = "https://github.com/dimitri/pgloader/releases/download/v3.6.2/pgloader-bundle-3.6.2.tgz"; - sha256 = "1jqnw6pw11kwyy8zm2g7g85r8197fy0q4l70yybw9wr87wnqqnz3"; + url = "https://github.com/dimitri/pgloader/releases/download/v3.6.6/pgloader-bundle-3.6.6.tgz"; + sha256 = "sha256-GDdWXY/O2xMsaIhaQIk+w8WQt9qevO8cDlgLGfNTVE0="; }; nativeBuildInputs = [ git makeWrapper ]; - buildInputs = [ sbcl_2_0_8 cacert sqlite freetds libzip curl openssl ]; + buildInputs = [ sbcl_2_2_6 cacert sqlite freetds libzip curl openssl ]; LD_LIBRARY_PATH = lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix b/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix index 9b8ebf0719..c5362cc0ab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pip-audit/default.nix @@ -25,14 +25,14 @@ with py.pkgs; buildPythonApplication rec { pname = "pip-audit"; - version = "2.4.1"; + version = "2.4.3"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "v${version}"; - hash = "sha256-Uko8ZtVMu9a/WrgSREFY3c8O+psE6cWpyHKVrOTJOJE="; + hash = "sha256-Q5wZJKP5YgLZQ9lrwE+8W9V7pZCJTLBm6qbjzmYJ9yg="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonApplication rec { lockfile packaging pip-api + pip-requirements-parser progress resolvelib rich diff --git a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix index e0d73d7f8f..77089d133a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pipenv/default.nix @@ -19,11 +19,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.4.8"; + version = "2022.7.24"; src = fetchPypi { inherit pname version; - sha256 = "sha256-U1Yr9p2eUjj5mh4hAcNWdGscCu+l3OubioSlo+IB3g0="; + sha256 = "sha256-N05jRQIg16uymMuu4GxLAidObxyyznt7Z3/V/T3TCEE="; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix index d92b805082..77e872a68b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-entgrpc"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "ent"; repo = "contrib"; rev = "v${version}"; - sha256 = "sha256-cpk8yRDBsupI277NWYFaLCvi3ltQDLgCrcpJ/FUVi9o="; + sha256 = "sha256-hK4I2LVvw7hkbUKRuDoaRuNX3nwlwipYucnXwzOCcXs="; }; - vendorSha256 = "sha256-RwwGFBiasxMmtKMLSyAqvkozqoyzzYuslMq+HnzZUhw="; + vendorSha256 = "sha256-bAM+NxD7mNd2fFxRDHCAzJTD7PVfT/9XHF88v9RHKwE="; subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix index 271d51042e..659b9c2c2a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.28.0"; + version = "1.28.1"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-GXXhBXzeFgS4DjY3jDRaJu/9PbfUnmWJiE4BwDBh7Ns="; + sha256 = "sha256-7Cg7fByLR9jX3OSCqJfLw5PAHDQi/gopkjtkbobnyWM="; }; vendorSha256 = "sha256-yb8l4ooZwqfvenlxDRg95rqiL+hmsn0weS/dPv/oD2Y="; diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-rust/default.nix new file mode 100644 index 0000000000..4ddc2fdb8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-rust/default.nix @@ -0,0 +1,29 @@ +{ fetchCrate +, lib +, rustPlatform +, protobuf +}: + +rustPlatform.buildRustPackage rec { + pname = "protoc-gen-rust"; + version = "3.1.0"; + + src = fetchCrate { + inherit version; + pname = "protobuf-codegen"; + sha256 = "sha256-DaydUuENqmN812BgQmpewRPhkq9lT6+g+VPuytLc25Y="; + }; + + cargoSha256 = "sha256-kzc2Wd+Y3mNmOHxRj5R1LIbvXz5NyGcRnz2e0jdfdPg="; + + cargoBuildFlags = ["--bin" pname]; + + nativeBuildInputs = [ protobuf ]; + + meta = with lib; { + description = "Protobuf plugin for generating Rust code"; + homepage = "https://github.com/stepancheg/rust-protobuf"; + license = licenses.mit; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix index c375869603..126c7d4398 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.90.0"; + version = "0.112.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-uOKx367fFJQvoqakY5PmesOk2l9eYsnECf6AdO2NsuI="; + sha256 = "sha256-Q2qZI5Y+qyt71orPh9zNfEylBeJw4o9SA3BnlI/h5yg="; }; - vendorSha256 = "sha256-IUntyI3EeYsf2tesvm0H+bNCtpnNfQV7WURLFvJXMac="; + vendorSha256 = "sha256-MZUd8muhso8a6Houv1Mf/6+SC0hD4UnjIFssB9wscaQ="; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix index c6bc51b4f8..0ade6d722d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/py-spy/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "py-spy"; - version = "0.3.11"; + version = "0.3.12"; src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; rev = "v${version}"; - sha256 = "sha256-4Zp4IGd4lKBC0ye2/7Tfpz8vJzm0VnkKqx/2k3mCj3A="; + sha256 = "sha256-k58PPJAF9MsKRlscFSqdtTY5/rriaF0mXjgkADT+F4s="; }; NIX_CFLAGS_COMPILE = "-L${libunwind}/lib"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { checkInputs = [ python3 ]; - cargoSha256 = "sha256-LEtmzCoT8esBYh9PkCGpzUU7miaWd3Ao0z/LzxhP39A="; + cargoSha256 = "sha256-DC+EfJ671/bvFoHHjpJlFCO/phdndNcldnP3DsIKqAg="; meta = with lib; { description = "Sampling profiler for Python programs"; diff --git a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix index 04557a27f7..cc1baad2bb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/qtcreator/default.nix @@ -9,6 +9,8 @@ let # Fetch clang from qt vendor, this contains submodules like this: # clang<-clang-tools-extra<-clazy. clang_qt_vendor = llvmPackages_8.clang-unwrapped.overrideAttrs (oldAttrs: { + # file RPATH_CHANGE could not write new RPATH + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=ON" ]; src = fetchgit { url = "https://code.qt.io/clang/clang.git"; rev = "c12b012bb7465299490cf93c2ae90499a5c417d5"; diff --git a/third_party/nixpkgs/pkgs/development/tools/railway/default.nix b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix new file mode 100644 index 0000000000..d5408e4527 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/railway/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "railway"; + version = "2.0.8"; + + src = fetchFromGitHub { + owner = "railwayapp"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-E6DCY+xM796pQb48xkVQ6d3qgIB528hbCU96SCu2eYI="; + }; + + ldflags = [ "-s" "-w" ]; + + vendorSha256 = "sha256-nLuomuAScodgLUKzMTiygtFBnNHrqAojOySZgKLVGJY="; + + postInstall = '' + mv $out/bin/cli $out/bin/railway + ''; + + meta = with lib; { + description = "Railway CLI"; + homepage = "https://railway.app"; + license = licenses.mit; + maintainers = with maintainers; [ Crafter ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix b/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix index fbd9788242..4e7135233b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rbspy/default.nix @@ -1,4 +1,11 @@ -{ stdenv, rustPlatform, fetchFromGitHub, lib, ruby, which}: +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, fetchpatch +, ruby +, which +}: rustPlatform.buildRustPackage rec { pname = "rbspy"; version = "0.12.1"; @@ -13,6 +20,15 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "98vmUoWSehX/9rMlHNSvKHJvJxW99pOhS08FI3OeLGo="; 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. preCheck = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix index 3bd89c2daa..967c554199 100644 --- a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix @@ -38,10 +38,10 @@ let ]; in stdenv.mkDerivation rec { pname = "react-native-debugger"; - version = "0.12.1"; + version = "0.13.0"; src = fetchurl { url = "https://github.com/jhen0409/react-native-debugger/releases/download/v${version}/rn-debugger-linux-x64.zip"; - sha256 = "sha256-DzDZmZn45gpZb/fkSssb0PtR7EVyBk44IjC57beg0RM="; + sha256 = "sha256-/uVXMVrVS7n4/mqz6IlKkk63hy67fn9KRjZ1wP5MHB0="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/refinery-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/refinery-cli/default.nix new file mode 100644 index 0000000000..11219f6eec --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/refinery-cli/default.nix @@ -0,0 +1,25 @@ +{ fetchCrate, lib, openssl, pkg-config, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "refinery-cli"; + version = "0.8.5"; + + src = fetchCrate { + pname = "refinery_cli"; + inherit version; + sha256 = "sha256-I9YjMsl70eiws4ea0P9oqOsNzN+gfO5Jwr7VlFCltq8="; + }; + + cargoSha256 = "sha256-Ehofdr6UNtOwRT0QVFaXDrWFRPqdF9eA8eL/hRwIJUM="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + meta = with lib; { + description = "Run migrations for the Refinery ORM for Rust via the CLI"; + homepage = "https://github.com/rust-db/refinery"; + license = licenses.mit; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/relic/default.nix b/third_party/nixpkgs/pkgs/development/tools/relic/default.nix index d602afecdc..771849168a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/relic/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/relic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "relic"; - version = "7.3.0"; + version = "7.4.0"; src = fetchFromGitHub { owner = "sassoftware"; repo = pname; rev = "v${version}"; - sha256 = "sha256:0lmxgr9ld6rvqk990c60qh4gb8lr8s77f8i2p4jmp6cf434sc6y0"; + sha256 = "sha256-3YzZUwS2rU+OROMXuIbVeLDQMIpEmZz+PNnI4dbQs+Y="; }; - vendorSha256 = "sha256:1l6xxr54rzjfvwmfvpavwzjnscsp532hjqhmdv0l1vx1psdk2aci"; + vendorSha256 = "sha256-aguirMJgh/uAGl0l3wKBMH2QEIH2N8pq7Dl9Ngfkc90="; meta = with lib; { homepage = "https://github.com/sassoftware/relic"; diff --git a/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix b/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix new file mode 100644 index 0000000000..4f3eb67b7f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "remodel"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "rojo-rbx"; + repo = "remodel"; + rev = "v${version}"; + sha256 = "sha256-bUwTryGc4Y614nXKToPXp5KZqO12MmtdT3FUST4OvQY="; + }; + + cargoSha256 = "sha256-b9+eV2co4hcKLZxJRqDIX2U0O25Ba5UHQiNpfjE4fN4="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ] ++ lib.optionals stdenv.isDarwin [ + Security + ]; + + meta = with lib; { + description = "Roblox file manipulation tool"; + longDescription = '' + Remodel is a command line tool for manipulating Roblox files and the instances contained within them. + ''; + homepage = "https://github.com/rojo-rbx/remodel"; + downloadPage = "https://github.com/rojo-rbx/remodel/releases/tag/v${version}"; + changelog = "https://github.com/rojo-rbx/remodel/raw/v${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ wackbyte ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/resolve-march-native/default.nix b/third_party/nixpkgs/pkgs/development/tools/resolve-march-native/default.nix new file mode 100644 index 0000000000..963e5ad120 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/resolve-march-native/default.nix @@ -0,0 +1,30 @@ +{ python3Packages +, fetchFromGitHub +, gcc +, lib +}: + +python3Packages.buildPythonApplication rec { + pname = "resolve-march-native"; + version = "unstable-2022-07-29"; + + src = fetchFromGitHub { + owner = "hartwork"; + repo = pname; + rev = "acfc87875e19ae9d4b0e5c9de1d21bc259415336"; + hash = "sha256-Hdy8/fJXQV3p51EggyLqE2t00O0phwZjbqPhhMQKT5E="; + }; + + # NB: The tool uses gcc at runtime to resolve the -march=native flags + propagatedBuildInputs = [ gcc ]; + + doCheck = true; + + meta = with lib; { + description = "Tool to determine what GCC flags -march=native would resolve into"; + homepage = "https://github.com/hartwork/resolve-march-native"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovesegfault ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/revive/default.nix b/third_party/nixpkgs/pkgs/development/tools/revive/default.nix index 56ef62ce13..5b11a4c9d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/revive/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.2.1"; + version = "1.2.3"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xZakVuw+QKzFh6wsnZbltLEEwyb9WcMvVWEzKnS9aWc="; + sha256 = "sha256-g19YrO8qTWsZmDngaDfiKVXP9aCaUbEO7Ac9Ir9KE14="; # 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-Fpl5i+qMvJ/CDh8X0gps9C/BxF7/Uvln+3DpVOXE0WQ="; + vendorSha256 = "sha256-sa4OkTSRyoPFXTGmjpiqBug+EKgxkcJrNxQwbTRfN2A="; ldflags = [ "-s" @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.2.1.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.2.3.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) diff --git a/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix b/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix index 89c2745e33..50f074a266 100644 --- a/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/roswell/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Roswell is a Lisp implementation installer/manager, launcher, and much more"; license = licenses.mit; maintainers = with maintainers; [ hiro98 ]; - platforms = platforms.linux; + platforms = platforms.unix; homepage = "https://github.com/roswell/roswell"; mainProgram = "ros"; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix index ed625cb229..27a9de154e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deny/default.nix @@ -11,19 +11,19 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-w64fdjKXiCaM+U28Hte+I0LPqmGKxbCVRUyhNWcVyTc="; + sha256 = "sha256-2NfM1Gd+I9+XGuTyKXxoxH63mqR/G4YcvAjMU2Evhb0="; }; # enable pkg-config feature of zstd cargoPatches = [ ./zstd-pkg-config.patch ]; - cargoSha256 = "sha256-K9Ab4L/wnpUqe+gLKhtHX4fOgWXv6ZL9faa58hzdq/0="; + cargoSha256 = "sha256-6k35fv0HwHuu2k7V2GBjvdAajLVuXuFzVSpVSFF8y+s="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix index 53f7d581b3..6e3d6904eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-edit/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-edit"; - version = "0.9.0"; + version = "0.10.4"; src = fetchFromGitHub { owner = "killercup"; repo = pname; rev = "v${version}"; - hash = "sha256-4N45IBDlIVbZbZgdX2DBmjolFHwzPjHVyWGadhR1FFw="; + hash = "sha256-U3B/Tb7q61R5jmBni1QKqqul2JJgjtmh3st04apu0xE="; }; - cargoSha256 = "sha256-o7NDw7P6Flut0ZFnDUdVCmuUzW2P+KXyfu0gApTEx60="; + cargoSha256 = "sha256-e8ICBRI6kNfItu3CxxbIY+56/2ho0Rnn1B3w/WJX+KM="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix index ebca19b3cb..a19393b7e2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-expand/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "1.0.27"; + version = "1.0.29"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-lj6B+9AdKhHc71cyzp7TcHmHv3K2ZoXEzMn/d3H0bB4="; + sha256 = "sha256-HK6FnB8S3rVTN9p7wYvmMUmdNmYQ738ua5491R6/KME="; }; - cargoSha256 = "sha256-j14l3E+vyeyEMYN+TEsuxlEdWa2Em0B6Y2LoTot2Np8="; + cargoSha256 = "sha256-hqg4Htf8nRRPLm9xyJgb2T8ycsPUZmrRMvk4E5f17Fc="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix index 3e5c8e2b9e..a0e458bbd6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "cargo-geiger"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "rust-secure-code"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-xymDV/FHJABw1s94m8fl8D51PQwkF5dX+1XD96++RX8="; + sha256 = "sha256-GxlUhfzGIKHSTNcSme/mQums6yI4ev8V0L1bXAWt8pw="; }; - cargoSha256 = "sha256-2szgR9N3PGjGCIjqgtGNFSnzfSv57sGfslZ/PZyqMjI="; + cargoSha256 = "sha256-nCMUnhxNAMdk3Mi6eebrViQ1G5jcc3jk+CPRTUvcWRc="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation Security libiconv curl ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix index 417cdd6761..910971fbdd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-lines/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-llvm-lines"; - version = "0.4.16"; + version = "0.4.17"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "sha256-MDRVNCfyObEaN0eNnaDBQCYQV2Y1Ck5/8zdpG4eZbaE="; + sha256 = "sha256-Xlzvfic2uuMTMxAwWbWGii1ZdJglYxRI3iY1YQaufNQ="; }; - cargoSha256 = "sha256-oOUidCM3Xex8bqBVJmrigHZHMdjXBNDdKaPiA/+MR7s="; + cargoSha256 = "sha256-3xlKZGRgxOzKtGNQCkZpSKnnczxDNuS4kY1VO/6LxlA="; meta = with lib; { description = "Count the number of lines of LLVM IR across all instantiations of a generic function"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 59ea51406c..d42b410949 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.13"; + version = "0.35.16"; src = fetchCrate { inherit pname version; - sha256 = "sha256-rkE/GLFZP1C5C4s6ghbfsJY92Wu3ku27VRorU/ZGelA="; + sha256 = "sha256-QRsJoQ2lUOnSkQYwCgUI1su0avQLqEYn56Y0H1hOaVw="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-GSHbs8GUHqFrBN1Op6Uh4fPzXEjSkX+a6beBQxS19K8="; + cargoSha256 = "sha256-ppg+UksukKQLRncZYlvI7Qi9bdQn07dFPrNn8nQRCsI="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix index 3b833ae425..04a9b05732 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.5.9"; + version = "0.5.11"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = version; - sha256 = "sha256-7bcFKsKDp+DBOZRBrSOat+7AIShCgmasKItI8xcsaC0="; + sha256 = "sha256-dxy46ls0n7j2uax+djqB9Zy/uGgV37w5K1Zc8Wzd1Vc="; }; - cargoSha256 = "sha256-CCjJq2ghAL6k7unPlZGYKKAxXfv05GIDivw/rbl2Wd4="; + cargoSha256 = "sha256-2Q4pGnMo4FiPPGz2XXOv6+zB5DxHA8oEqztidO2Vvyw="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix index f3cc8f5e1b..2fe692d74f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.24"; + version = "0.9.33"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-CGtPftjt09qGbEnI4qGSoRkjMVVTfPHNOzIb4/Hx78g="; + sha256 = "sha256-RWlpco03YKlYv9QaGaySudBUG+rZaKURdgMeqFwrq1E="; }; - cargoSha256 = "sha256-KAy5BDUrV3Voe3JBDBH2nZVUioRkONFMTdOyPjzx0Sk="; + cargoSha256 = "sha256-azT4enQOdj2/rznU3fA8tr+4a/mRLj/HNsyDNRYLonM="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix index 2013f15d1e..8103229bb6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-outdated/default.nix @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/kbknapp/cargo-outdated"; changelog = "https://github.com/kbknapp/cargo-outdated/blob/${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ sondr3 ivan ]; + maintainers = with maintainers; [ ivan ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/default.nix new file mode 100644 index 0000000000..4ad70bfa9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-pgx/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchCrate, rustPlatform, pkg-config, openssl, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-pgx"; + version = "0.4.5"; + + src = fetchCrate { + inherit version pname; + sha256 = "sha256-BcMGa/1ATwLG8VnwItfd5eqmrck/u0MEoR5sA2yuzyQ="; + }; + + cargoSha256 = "sha256-urlwqBCZMxlPEjLLPBhI2lDNTusCSZ1bZu1p8poVrtw="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "Cargo subcommand for ‘pgx’ to make Postgres extension development easy"; + homepage = "https://github.com/tcdi/pgx/tree/v${version}/cargo-pgx"; + license = licenses.mit; + maintainers = with maintainers; [ typetetris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix index a4937ee412..441b906ab3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-play"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "fanzeyi"; repo = pname; - rev = "v${version}"; - sha256 = "01r00akfmvpzp924yqqybd9s0pwiwxy8vklsg4m9ypzljc3nlv02"; + rev = version; + sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA="; }; - cargoSha256 = "1xkscd9ci9vlkmbsaxvavrna1xpi16xcf9ri879lw8bdh7sa3nx8"; + cargoSha256 = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ="; # these tests require internet access checkFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-profiler/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-profiler/default.nix new file mode 100644 index 0000000000..88a04885a7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-profiler/default.nix @@ -0,0 +1,33 @@ +{ fetchFromGitHub +, lib +, rustPlatform }: + +let + # Constants + pname = "cargo-profiler"; + owner = "svenstaro"; + + # Version-specific variables + version = "0.2.0"; + rev = "0a8ab772fd5c0f1579e4847c5d05aa443ffa2bc8"; + sha256 = "sha256-ZRAbvSMrPtgaWy9RwlykQ3iiPxHCMh/tS5p67/4XqqA="; + cargoSha256 = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI="; + + inherit (rustPlatform) buildRustPackage; +in buildRustPackage rec { + inherit pname version; + + src = fetchFromGitHub { + inherit owner rev sha256; + repo = pname; + }; + + inherit cargoSha256; + + meta = with lib; { + description = "Cargo subcommand for profiling Rust binaries"; + homepage = "https://github.com/svenstaro/cargo-profiler"; + license = licenses.mit; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix index ef4f8dcb2f..e58c741d2c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.12.2"; + version = "0.12.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ZpzR6A9mV6ARz2+SedVtLjNANOEj8Ks09AWcQooltug="; + sha256 = "sha256-URCKsI7q0/b8KkCooKeYr342m7C8ukJJITRDgOUmcEM="; }; - cargoSha256 = "sha256-8BZ1fPzRSJysyLCmoMxk+8xOfmfIs7viHFCeSfnxvt8="; + cargoSha256 = "sha256-qXJeNbGvC6zoxdn2QmApw1m7gn4CI1eUC3Cqhrn8dpU="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix index 965c94742e..7c0917c57d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-release/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-release"; - version = "0.21.0"; + version = "0.21.1"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; rev = "v${version}"; - sha256 = "sha256-QTHevbEifYsf/nCmkarbrHgijjlHragLieCpVZBfKGQ="; + sha256 = "sha256-Ll2/wdjJdSW3fA6kscfFROVVrPYer0b5CHyOGUKPXmQ="; }; - cargoSha256 = "sha256-hEHEcB42mRn6pO5413wQbEWfJNBbiOSUuy9PGjP5EYw="; + cargoSha256 = "sha256-yASjTRldbHnXFpZHncfAdZstdchTHBxCDhxEof3mY6k="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix index eb74f1a378..dccb76b1d9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.8"; + version = "1.0.9"; src = fetchCrate { inherit pname version; - sha256 = "sha256-NGYXe94eHvRQNxJgH7EiQaL9S+dtNlUrpVSWWQ/wHWY="; + sha256 = "sha256-KwR//7UpVoxreQVBY4/GawdU9Bk0d2Qj9EW3odvofc0="; }; - cargoSha256 = "sha256-vXhZyVMKa/itc+loKuSkSqIWyS3VSowOg1QRS213DPo="; + cargoSha256 = "sha256-myqSki5pBT01bsJcEy92HkZHbLaWT+5Tl5u4LEUmlK4="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix index 204654eb0e..b276a61811 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/maturin/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "0.12.9"; + version = "0.13.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-FskCBviLl1yafPOlsp/IjaEOlGUuWLcGlxDrNA/qf8k="; + hash = "sha256-uKpYI+Oc49xgoIZCh72baBMZLcpMXk7g2Jb1DQxW9lk="; }; - cargoHash = "sha256-zakSQptKK/X/8MDJxRUHTDIGPh77cq5PrOmPEneD0YM="; + cargoHash = "sha256-levBWghFIXOXe+NGXvwBqQpPmWeUK53ruSyLik1urSU="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 41a813ec10..cb6d8305b9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-07-11"; - cargoSha256 = "sha256-XpLXx3f+BC8+O4Df/PJ4LWuLxX14e/ga+aFu/JxVdpg="; + version = "2022-08-01"; + cargoSha256 = "sha256-7ZYrIFSIOlL1JojtaQBIvvlfvjZGlR40PKVjmEtMBMo="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-HU1+Rql35ouZe0lx1ftCMDDwC9lqN3COudvMe+8XIx0="; + sha256 = "sha256-OUezy1BkIoqpkTE5wOtsjJ/Gy48Ql8EL1/t6MZzRkWw="; }; patches = [ - # Code format and git history check require more dependencies but don't really matter for packaging. - # So just ignore them. - ./ignore-git-and-rustfmt-tests.patch + # Code format check requires more dependencies but don't really matter for packaging. + # So just ignore it. + ./ignore-rustfmt-test.patch ]; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch deleted file mode 100644 index 1247e48046..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/crates/rust-analyzer/tests/slow-tests/tidy.rs -+++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs -@@ -6,6 +6,7 @@ use std::{ - use xshell::{cmd, pushd, pushenv, read_file}; - - #[test] -+#[ignore] - fn check_code_formatting() { - let _dir = pushd(sourcegen::project_root()).unwrap(); - let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); -@@ -138,6 +139,7 @@ fn check_cargo_toml(path: &Path, text: String) -> () { - } - - #[test] -+#[ignore] - fn check_merge_commits() { - let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..") - .read() diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch new file mode 100644 index 0000000000..fd7e833557 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch @@ -0,0 +1,10 @@ +--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs ++++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs +@@ -6,6 +6,7 @@ use std::{ + use xshell::{cmd, pushd, pushenv, read_file}; + + #[test] ++#[ignore] + fn check_code_formatting() { + let _dir = pushd(sourcegen::project_root()).unwrap(); + let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix index 4165063677..a1edc13567 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-script/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-script"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "fornwall"; repo = pname; rev = "v${version}"; - sha256 = "sha256-WcvRkp57VyBB5gQgamFoR6wK1cRJ+3hQqixOBgeapJU="; + sha256 = "sha256-5T5DivfT7/MkBJo5YgLAVnfct84nBhw/OXWQ/4TMm2A="; }; - cargoSha256 = "sha256-qJIftByppOrT4g3sxmKRSLhxtpAW4eXWX0FhmMDJNu0="; + cargoSha256 = "sha256-mDH3R9gn64DXVoe3Vkl2Kwhr7OTOUWKBLW5Y+Uo4aXM="; # tests require network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch index 13649b387a..2b191031da 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/0001-dynamically-patchelf-binaries.patch @@ -1,8 +1,8 @@ diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs -index 3beddf54..0f859b8d 100644 +index 73a533b5..408ab815 100644 --- a/src/dist/component/package.rs +++ b/src/dist/component/package.rs -@@ -113,6 +113,7 @@ impl Package for DirectoryPackage { +@@ -113,6 +113,7 @@ fn install<'a>( } else { builder.move_file(path.clone(), &src_path)? } @@ -10,13 +10,13 @@ index 3beddf54..0f859b8d 100644 } "dir" => { if self.copy { -@@ -135,6 +136,29 @@ impl Package for DirectoryPackage { +@@ -135,6 +136,29 @@ fn components(&self) -> Vec { } } +fn nix_patchelf_if_needed(dest_path: &Path, src_path: &Path) { + let (is_bin, is_lib) = if let Some(p) = src_path.parent() { -+ (p.ends_with("bin"), p.ends_with("lib")) ++ (p.ends_with("bin") || p.ends_with("libexec"), p.ends_with("lib")) + } else { + (false, false) + }; @@ -38,5 +38,5 @@ index 3beddf54..0f859b8d 100644 +} + #[derive(Debug)] - pub struct TarPackage<'a>(DirectoryPackage, temp::Dir<'a>); + pub(crate) struct TarPackage<'a>(DirectoryPackage, temp::Dir<'a>); diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix index f20864b43f..f34efb9441 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/sqlx-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sqlx-cli"; - version = "0.5.13"; + version = "0.6.1"; src = fetchFromGitHub { owner = "launchbadge"; repo = "sqlx"; rev = "v${version}"; - sha256 = "sha256-uUIvzUDDv6WUA25zMhaL2Tn3wHTu/IRgzmnB119BLvk="; + sha256 = "sha256-4XJ0dNbACCcbN5+d05H++jlRKuL+au3iOLMoBR/whOs="; }; - cargoSha256 = "sha256-IHbOuW2FPt2cH0/ld28fp1uBrJadVsJ8izG0JrZy488="; + cargoSha256 = "sha256-sIe+uVCzTVUTePNIBekCA/uwRG+GWGonnvzhRDwh5Y4="; doCheck = false; cargoBuildFlags = [ "-p sqlx-cli" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index 7efcfb08c4..ca40554c18 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.24.1"; + version = "0.25.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-BIATH7GsTPtvEFpCb8Kfb0k6s8K7xfhRHni+IgzAQ8k="; + sha256 = "sha256-k+/FxVCUPQuVXZFk+FE3cAtAf/YCgk/fGVtRKIeefJ8="; }; - cargoSha256 = "sha256-kg+QW84bq+aD3/t0DmtL1W8ESC5Ug4X+I0pFJRalu7Q="; + cargoSha256 = "sha256-RxpBhA5lf+mcr4VMtsrdzlxN8oDttNcWuwxQAAYN8U8="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix index c1c5bbee0a..2faf1880ff 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sd-local/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sd-local"; - version = "1.0.40"; + version = "1.0.42"; src = fetchFromGitHub { owner = "screwdriver-cd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/b9ZmwTw9DbdO0KI7rfT0YW0Xo2cxfwhk1TEfTe3ySU="; + sha256 = "sha256-xPskMKInmaWi5dwx5E5z1ssTQ6Smj1L40Voy++g7Rhs="; }; vendorSha256 = "sha256-43hcIIGqBscMjQzaIGdMqV5lq3od4Ls4TJdTeFGtu5Y="; diff --git a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix index 37071321f5..d9a2782f33 100644 --- a/third_party/nixpkgs/pkgs/development/tools/selene/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.16.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-S0EeFJS90bzQ7C+hN4CyZ7l9wmizT2d3P6utshI5JWs="; + sha256 = "sha256-ScO2ih+Y8R1OrazSmLlz9QtTUjQ6tIPf5F5juj2nc7Y="; }; - cargoSha256 = "sha256-3J1Q595LxAI0LBP4/cLHDrMbZBnoA2+OSr8/erQcN+0="; + cargoSha256 = "sha256-pJZrNjgtYjribIKo4DWR47dnyoSuy9sSRPd+ginDlOU="; nativeBuildInputs = lib.optional robloxSupport pkg-config; diff --git a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix index 0ba8e3b3d3..d753b48222 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "1.74.3"; + version = "2.5.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-savbS/1j6PJqmkk6c+XMOUEkrLZNU2p0YbN8rHfz2po="; + sha256 = "sha256-VNYZMeKX3QJNxwWK+gn8LIm/W6l4NAjJtCG6nlO9Clc="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-7B8cmrDYufhlIMv2r6TSD+C8NLE2Juewgy4XYYr+QKs="; + cargoSha256 = "sha256-Nn7GolRtBs2eVBPT75hqXiTNrqNZfcSPdHwXWkb48NA="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index 460b1a139b..36358b4c9f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skaffold"; - version = "1.38.0"; + version = "1.39.1"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "sha256-Sy8DpCZEFps6Z4x57ESofNm2EZsPUCHzLz1icl1MOVE="; + sha256 = "sha256-InC4cfDQCwc6+4hPUsRitP7/uuOyBgbQjZhe3lGqlDw="; }; vendorSha256 = "sha256-RA2KgUjYB3y6sOQdnLSZjr52VosZSaRrVU0BXZvjB1M="; diff --git a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix index 4ac1a996b6..583624d816 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.9.0"; + version = "1.9.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-z+jrDbXtcx4dH5n4X3WDHSIzmRP09cpO/WIAU3Ewas0="; + sha256 = "sha256-F2kIFBsLhjV8Ecof05Ii5TzneEUdl9dmCZ2NhOABdmc="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/spr/default.nix b/third_party/nixpkgs/pkgs/development/tools/spr/default.nix index 4d2c005b71..a9ed5c3c21 100644 --- a/third_party/nixpkgs/pkgs/development/tools/spr/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/spr/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "spr"; - version = "1.3.3"; + version = "1.3.4"; src = fetchCrate { inherit pname version; - sha256 = "sha256-ozirfRyJWgs5+CWZrXkIHzlNQcUOEAuX/XV+VrUnJC8="; + sha256 = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc="; }; - cargoSha256 = "sha256-Khua8g/vk0KTBmca37VhiBSHvfi8tKVhqxDYeJ594Qg="; + cargoSha256 = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock index 94587de9ac..2449a6038e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - google-protobuf (3.15.6) - pg_query (2.0.2) - google-protobuf (~> 3.15.5) - sqlint (0.2.0) + google-protobuf (3.21.2) + pg_query (2.1.3) + google-protobuf (>= 3.19.2) + sqlint (0.2.1) pg_query (~> 2) PLATFORMS @@ -14,4 +14,4 @@ DEPENDENCIES sqlint BUNDLED WITH - 2.1.4 + 2.3.9 diff --git a/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix index 674fe75dc1..0bbd8fe005 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sqlint/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ak5yqqhr04b4x0axzvpw1xzwmxmfcw0gf4r1ijixv15kidhsj3z"; + sha256 = "1i5g23mjc4fiwymrfkvgcmsym50rapw7vm988fm46rlpg3zijgl1"; type = "gem"; }; - version = "3.15.6"; + version = "3.21.2"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bvn0swyzzhl9x8hlgaz7m7s1jqmpdi2c4klarix0hiyapy2il9y"; + sha256 = "00bhwkhjy6bkp04313m5il7vd165i3fz0x4jissflf66i164ppgk"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.3"; }; sqlint = { dependencies = ["pg_query"]; @@ -26,9 +26,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ylicsc9x4vpj6ff3hmrm6iz1xswrwwgn1m7ri8nx86ij30w9hkk"; + sha256 = "1wbsi0ivashmpgavz7j22qns3zcya8j6sd2f9y8hk8bnqx7i3ak0"; type = "gem"; }; - version = "0.2.0"; + version = "0.2.1"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/sshs/default.nix b/third_party/nixpkgs/pkgs/development/tools/sshs/default.nix index 76cd63876a..cd999ed39a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sshs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sshs/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sshs"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "quantumsheep"; repo = pname; rev = version; - sha256 = "D9doNVb2sTnzM8tF8cSJbIoaIYjGurkUHEyhcE3OqQg="; + sha256 = "OTyk3EGlpr5k6QSwGmHFoF3cAJKQEEkWJuV53Wi8ook="; }; - vendorSha256 = "QWFz85bOrTnPGum5atccB5hKeATlZvDAt32by+DO/Fo="; + vendorSha256 = "wClgX08UbItCpWOkWLgmsy7Ad5LlpvXrStN3JHujVww="; ldflags = [ "-s" "-w" "-X github.com/quantumsheep/sshs/cmd.Version=${version}" ]; @@ -27,6 +27,6 @@ buildGoModule rec { description = "Terminal user interface for SSH"; homepage = "https://github.com/quantumsheep/sshs"; license = licenses.mit; - maintainers = with maintainers; [ ihatethefrench ]; + maintainers = with maintainers; [ not-my-segfault ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix b/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix index 146ff9df76..836b0bc1b0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sslmate/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sslmate"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://packages.sslmate.com/other/${pname}-${version}.tar.gz"; - sha256 = "sha256-PkASJIRJH1kXjegOFMz36QzqT+qUBWslx/iavjFoW5g="; + sha256 = "sha256-F5szGn1cbw7R3lHMocM7as1RS/uaBqKCsvOxA+rXDOc="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix index 3bba34c531..7e234eef66 100644 --- a/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/stylua/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "stylua"; - version = "0.14.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "johnnymorganz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G7fCLkvpO5GHqWCfy2m3GxSgDSHCcYOaXyPDtdmdSY0="; + sha256 = "sha256-FqtpMRR647YiIIduIf37rKewytXgRl01OCmBUXd/44k="; }; - cargoSha256 = "sha256-MqRoGuRMEgOYvL2VI324EXZjrPVCbCE/c7aVEXr0xmw="; + cargoSha256 = "sha256-Z5W1eJUHFFuHRSemXspW3gUhiAieyUg/6lIVvqAL/Oo="; buildFeatures = lib.optional lua52Support "lua52" ++ lib.optional luauSupport "luau"; diff --git a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix index efe13a52d0..f1e19c060c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, darwin }: +{ lib, stdenv, fetchFromGitHub, ninja, makeWrapper, CoreFoundation, Foundation }: let target = if stdenv.isDarwin then "macOS" else "Linux"; in @@ -20,17 +20,10 @@ stdenv.mkDerivation rec { ]; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreFoundation - darwin.apple_sdk.frameworks.Foundation + CoreFoundation + Foundation ]; - # Disable cwd support on x86 darwin, because it requires macOS>=10.15 - preConfigure = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' - for file in 3rd/bee.lua/bee/subprocess/subprocess_posix.cpp 3rd/luamake/3rd/bee.lua/bee/subprocess/subprocess_posix.cpp; do - substituteInPlace $file --replace '#define USE_POSIX_SPAWN 1' "" - done - ''; - preBuild = '' cd 3rd/luamake '' diff --git a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix index 7444470d89..850ad6ca29 100644 --- a/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/symfony-cli/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "symfony-cli"; - version = "5.4.5"; - vendorSha256 = "sha256-ss3AtHigm1U3KhVhulIAquNf0WG7y4BSQcxs4pwnHVY="; + version = "5.4.12"; + vendorSha256 = "sha256-P83dH+4vcf+UWphsqqJs03oJ47JLwUYt1cgnuCaM5lA="; src = fetchFromGitHub { owner = "symfony-cli"; repo = "symfony-cli"; rev = "v${version}"; - sha256 = "sha256-xYNq5hnkk6OIsnDHhN/vh1LNuP7isTNgtTY2WUwC8x4="; + sha256 = "sha256-8cJqcvBXjyy9Sk5ZYw0LZs1zPVWrc6udL3qKdIjTklI="; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix index 49377bd001..25ff528c6b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/default.nix @@ -1,19 +1,20 @@ { stdenv, lib, fetchurl, unzip }: let # You can check the latest version with `curl -sS https://update.tabnine.com/bundles/version` - version = "4.4.40"; + # There's a handy prefetch script in ./fetch-latest.sh + version = "4.4.98"; supportedPlatforms = { "x86_64-linux" = { name = "x86_64-unknown-linux-musl"; - sha256 = "sha256-goPPGU4oZWBD/C15rbbX5YMqua16A4MdLhBoC4JxaCI="; + hash = "sha256-AYgv/XrHjEOhtyx8QeOhssdsc/fssShZcA+15fFgI1g="; }; "x86_64-darwin" = { name = "x86_64-apple-darwin"; - sha256 = "sha256-CgYHQ91U6K3+kMyOSSia2B7IncR5u0eq9h3EZiBsRdU="; + hash = "sha256-XUd97ZUUb8XqMrlnSBER68fU3+58zpwKnzZ+i3dlWIs="; }; "aarch64-darwin" = { name = "aarch64-apple-darwin"; - sha256 = "sha256-JwX3TdKYmLQO3mWb15Ds/60VAAurGxqfJlMCQqy2pxg="; + hash = "sha256-L2r4fB4OtJJUvwnFP7zYAm8RLf8b7r6kDNGlwZRkLnw="; }; }; platform = @@ -28,7 +29,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://update.tabnine.com/bundles/${version}/${platform.name}/TabNine.zip"; - inherit (platform) sha256; + inherit (platform) hash; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/tabnine/fetch-latest.sh b/third_party/nixpkgs/pkgs/development/tools/tabnine/fetch-latest.sh new file mode 100755 index 0000000000..240a559766 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/tabnine/fetch-latest.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +set -euo pipefail + +function prefetch-sri() { + nix-prefetch-url "$1" 2>/dev/null | xargs nix hash to-sri --type sha256 +} + +declare -a PLATFORMS=( + x86_64-unknown-linux-musl + x86_64-apple-darwin + aarch64-apple-darwin +) + +LATEST="$(curl -sS https://update.tabnine.com/bundles/version)" + +cat <<-EOF +version = "${LATEST}"; +EOF + +for platform in "${PLATFORMS[@]}"; do + url="https://update.tabnine.com/bundles/${LATEST}/${platform}/TabNine.zip" + sha="$(prefetch-sri "$url")" + cat <<-EOF +name = "${platform}"; +hash = "${sha}"; + +EOF +done diff --git a/third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/taplo/default.nix similarity index 54% rename from third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix rename to third_party/nixpkgs/pkgs/development/tools/taplo/default.nix index 0c584a36a5..64437bb325 100644 --- a/third_party/nixpkgs/pkgs/development/tools/taplo-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/taplo/default.nix @@ -1,26 +1,35 @@ -{ lib, rustPlatform, fetchCrate, stdenv, pkg-config, openssl, Security }: +{ lib +, rustPlatform +, fetchCrate +, openssl +, stdenv +, Security +, withLsp ? true +}: rustPlatform.buildRustPackage rec { - pname = "taplo-cli"; - version = "0.6.2"; + pname = "taplo"; + version = "0.6.9"; src = fetchCrate { - inherit pname version; - sha256 = "sha256-vz3ClC2PI0ti+cItuVdJgP8KLmR2C+uGUzl3DfVuTrY="; + inherit version; + pname = "taplo-cli"; + sha256 = "sha256-gf58V/KIsbM+mCT3SvjZ772cuikS2L81eRb7uy8OPys="; }; - cargoSha256 = "sha256-m6wsca/muGPs58myQH7ZLPPM+eGP+GL2sC5suu+vWU0="; + cargoSha256 = "sha256-f+jefc3qw4rljmikvrmvZfCCadBKicBs7SMh/mJ4WSs="; OPENSSL_LIB_DIR = "${lib.getLib openssl}/lib"; OPENSSL_INCLUDE_DIR = "${openssl.dev}/include"; buildInputs = lib.optional stdenv.isDarwin Security; + buildFeatures = lib.optional withLsp "lsp"; + meta = with lib; { description = "A TOML toolkit written in Rust"; homepage = "https://taplo.tamasfe.dev"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; - mainProgram = "taplo"; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/tfplugindocs/default.nix b/third_party/nixpkgs/pkgs/development/tools/tfplugindocs/default.nix index 8308092d33..ecb0835e28 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tfplugindocs/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tfplugindocs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tfplugindocs"; - version = "0.9.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform-plugin-docs"; rev = "v${version}"; - sha256 = "sha256-1grwbi/nG0d2NwEE/eOeo1+0uGpZ1BRJdubyLwhvKfU="; + sha256 = "sha256-0FpzUJDFGKLe88QW+7UI6QPwFMUfqPindOHtGRpOLo8="; }; - vendorSha256 = "sha256-VhnPRBVlvR/Xh7wkX7qx0m5s+yBOCJQE1zcAe8//lNw="; + vendorSha256 = "sha256-gKRgFfyUahWI+c97uYSCAGNoFy2RPgAw0uYGauEOLt8="; meta = with lib; { description = "Generate and validate Terraform plugin/provider documentation"; diff --git a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix index 3c40a0c0ce..804acffc2d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/trunk/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "thedodd"; repo = "trunk"; rev = "v${version}"; - sha256 = "sha256-VHUs/trR1M5WacEA0gwKLkGtsws9GFmn1vK0kRxpNII="; + sha256 = "sha256-6o+frbLtuw+DwJiWv4x11qX4GUffhxF19pi/7FLYmHA="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoSha256 = "sha256-czXe9W+oR1UV7zGZiiHcbydzH6sowa/8upm+5lkPG1U="; + cargoSha256 = "sha256-j/i2io1JfcNA7eeAXAAKMBtHORZm4J5dOFFNnzvx2cg="; meta = with lib; { homepage = "https://github.com/thedodd/trunk"; diff --git a/third_party/nixpkgs/pkgs/development/tools/twiggy/default.nix b/third_party/nixpkgs/pkgs/development/tools/twiggy/default.nix new file mode 100644 index 0000000000..f1ee4c68fb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/twiggy/default.nix @@ -0,0 +1,22 @@ +{ lib +, fetchCrate +, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "twiggy"; + version = "0.7.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-NbtS7A5Zl8634Q3xyjVzNraNszjt1uIXqmctArfnqkk="; + }; + + cargoSha256 = "sha256-94pfhVZ0CNMn+lCl5O+wOyE+D6fVXbH4NAPx92nMNbM="; + + meta = with lib; { + homepage = "https://rustwasm.github.io/twiggy/"; + description = "A code size profiler for Wasm"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ lucperkins ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix new file mode 100644 index 0000000000..3f1c9eab04 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/txtpbfmt/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "txtpbfmt"; + version = "unstable-2022-06-08"; + + src = fetchFromGitHub { + owner = "protocolbuffers"; + repo = "txtpbfmt"; + rev = "fc78c767cd6a4e6e3953f5d72f1e0e4c5811990b"; + sha256 = "sha256-5Pj2REFrzWCzrqdplNlyfX+sJqPjXEld6MFNy0S3MFM="; + }; + + vendorSha256 = "sha256-shjcQ3DJQYeAW0bX3OuF/esgIvrQ4yuLEa677iFV82g="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Formatter for text proto files"; + homepage = "https://github.com/protocolbuffers/txtpbfmt"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/Cargo.lock index 4de3b80928..97a7addb26 100644 --- a/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/Cargo.lock @@ -4,21 +4,15 @@ version = 3 [[package]] name = "anyhow" -version = "1.0.53" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" [[package]] name = "askama" -version = "0.10.5" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d298738b6e47e1034e560e5afe63aa488fea34e25ec11b855a76f0d7b8e73134" +checksum = "fb98f10f371286b177db5eeb9a6e5396609555686a35e1d4f7b9a9c6d8af0139" dependencies = [ "askama_derive", "askama_escape", @@ -27,9 +21,9 @@ dependencies = [ [[package]] name = "askama_derive" -version = "0.10.5" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2925c4c290382f9d2fa3d1c1b6a63fa1427099721ecca4749b154cc9c25522" +checksum = "87bf87e6e8b47264efa9bde63d6225c6276a52e05e91bf37eaa8afd0032d6b71" dependencies = [ "askama_shared", "proc-macro2", @@ -38,18 +32,20 @@ dependencies = [ [[package]] name = "askama_escape" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1bb320f97e6edf9f756bf015900038e43c7700e059688e5724a928c8f3b8d5" +checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341" [[package]] name = "askama_shared" -version = "0.11.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" +checksum = "bf722b94118a07fcbc6640190f247334027685d4e218b794dbfe17c32bf38ed0" dependencies = [ "askama_escape", - "nom 6.2.1", + "mime", + "mime_guess", + "nom 7.1.1", "proc-macro2", "quote", "serde", @@ -57,6 +53,23 @@ dependencies = [ "toml", ] +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + [[package]] name = "bitflags" version = "1.3.2" @@ -77,26 +90,15 @@ dependencies = [ [[package]] name = "bytes" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" - -[[package]] -name = "callbacks" -version = "0.17.0" -dependencies = [ - "lazy_static", - "thiserror", - "uniffi", - "uniffi_build", - "uniffi_macros", -] +checksum = "f0b3de4a0c5e67e16066a0715723abd91edc2f9001d09c46e1dca929351e130e" [[package]] name = "camino" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23" +checksum = "869119e97797867fd90f5e22af7d0bd274bd4635ebb9eb68c04f3f513ae6c412" dependencies = [ "serde", ] @@ -112,22 +114,17 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.13.1" +version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081e3f0755c1f380c2d010481b6fa2e02973586d5f2b24eebb7a2a1d98b143d8" +checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", "semver", - "semver-parser", "serde", "serde_json", ] -[[package]] -name = "cdylib-dependency" -version = "0.17.0" - [[package]] name = "cfg-if" version = "1.0.0" @@ -136,29 +133,46 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "2.34.0" +version = "3.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" dependencies = [ + "atty", "bitflags", + "clap_derive", + "clap_lex", + "indexmap", + "lazy_static", + "strsim", + "termcolor", "textwrap", - "unicode-width", ] [[package]] -name = "coverall" -version = "0.17.0" +name = "clap_derive" +version = "3.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c" dependencies = [ - "lazy_static", - "thiserror", - "uniffi", - "uniffi_build", - "uniffi_macros", + "heck", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", ] [[package]] name = "crate_one" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "bytes", @@ -169,7 +183,7 @@ dependencies = [ [[package]] name = "crate_two" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "bytes", @@ -179,70 +193,6 @@ dependencies = [ "uniffi_macros", ] -[[package]] -name = "custom-types" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "serde_json", - "uniffi", - "uniffi_build", - "uniffi_macros", - "url", -] - -[[package]] -name = "ext-types-guid" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "serde_json", - "thiserror", - "uniffi", - "uniffi_build", - "uniffi_macros", -] - -[[package]] -name = "ext-types-lib" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "custom-types", - "ext-types-guid", - "uniffi", - "uniffi-one", - "uniffi_build", - "uniffi_macros", - "url", -] - -[[package]] -name = "external_types_lib" -version = "0.17.0" -dependencies = [ - "anyhow", - "bytes", - "crate_one", - "crate_two", - "uniffi", - "uniffi_build", - "uniffi_macros", -] - -[[package]] -name = "ffi-crate" -version = "0.17.0" -dependencies = [ - "cdylib-dependency", - "uniffi", - "uniffi_build", - "uniffi_macros", -] - [[package]] name = "form_urlencoded" version = "1.0.1" @@ -253,6 +203,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "fs-err" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bd79fa345a495d3ae89fb7165fec01c0e72f41821d642dda363a1e97975652e" + [[package]] name = "funty" version = "1.1.0" @@ -266,30 +222,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] -name = "heck" -version = "0.3.3" +name = "hashbrown" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] -name = "i1015-fully-qualified-types" -version = "0.17.0" -dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", -] +name = "heck" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] -name = "i356-enum-without-int-helpers" -version = "0.17.0" +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", + "libc", ] [[package]] @@ -304,19 +254,20 @@ dependencies = [ ] [[package]] -name = "itoa" -version = "1.0.1" +name = "indexmap" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" +dependencies = [ + "autocfg", + "hashbrown", +] [[package]] -name = "kotlin-experimental-unsigned-types" -version = "0.17.0" -dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", -] +name = "itoa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" [[package]] name = "lazy_static" @@ -325,23 +276,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] -name = "lexical-core" -version = "0.7.6" +name = "libc" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "libloading" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" dependencies = [ - "arrayvec", - "bitflags", "cfg-if", - "ryu", - "static_assertions", + "winapi", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if", ] @@ -359,15 +313,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] -name = "nom" -version = "5.1.2" +name = "mime" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" dependencies = [ - "memchr", - "version_check", + "mime", + "unicase", ] +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + [[package]] name = "nom" version = "6.2.1" @@ -376,31 +342,37 @@ checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6" dependencies = [ "bitvec", "funty", - "lexical-core", "memchr", "version_check", ] [[package]] -name = "omit_argument_labels" -version = "0.17.0" +name = "nom" +version = "7.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" dependencies = [ - "uniffi", - "uniffi_build", - "uniffi_macros", + "memchr", + "minimal-lexical", ] [[package]] name = "once_cell" -version = "1.9.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "os_str_bytes" +version = "6.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" [[package]] name = "paste" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" +checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "percent-encoding" @@ -409,28 +381,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] -name = "pest" -version = "2.1.3" +name = "proc-macro-error" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "ucd-trie", + "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.36" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] name = "quote" -version = "1.0.15" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -443,43 +430,33 @@ checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "ryu" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" [[package]] name = "semver" -version = "0.11.0" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1" dependencies = [ - "semver-parser", "serde", ] -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" -version = "1.0.136" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "dc1d3230c1de7932af58ad8ffbe1d784bd55efd5a9d84ac24f69c72d83543dfb" dependencies = [ "proc-macro2", "quote", @@ -488,9 +465,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.78" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" dependencies = [ "itoa", "ryu", @@ -504,14 +481,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] -name = "syn" -version = "1.0.86" +name = "strsim" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "syn" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -522,36 +505,33 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "termcolor" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" dependencies = [ "winapi-util", ] [[package]] name = "textwrap" -version = "0.11.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" dependencies = [ "proc-macro2", "quote", @@ -560,9 +540,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -575,72 +555,65 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] [[package]] name = "trybuild" -version = "1.0.55" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099a24e67e2b4083a6d0beb5a98e274c3160edfb879d71cd2cd14da93786a93b" +checksum = "764b9e244b482a9b81bde596aa37aa6f1347bf8007adab25e59f901b32b4e0a0" dependencies = [ "glob", "once_cell", "serde", + "serde_derive", "serde_json", "termcolor", "toml", ] [[package]] -name = "ucd-trie" -version = "0.1.3" +name = "unicase" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" +checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ + "version_check", +] [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" + +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - [[package]] name = "uniffi" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "bytes", + "camino", "cargo_metadata", "lazy_static", "log", @@ -652,7 +625,7 @@ dependencies = [ [[package]] name = "uniffi-example-arithmetic" -version = "0.17.0" +version = "0.19.3" dependencies = [ "thiserror", "uniffi", @@ -662,16 +635,29 @@ dependencies = [ [[package]] name = "uniffi-example-callbacks" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", "uniffi_macros", ] +[[package]] +name = "uniffi-example-custom-types" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "uniffi", + "uniffi_build", + "uniffi_macros", + "url", +] + [[package]] name = "uniffi-example-geometry" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", @@ -680,7 +666,7 @@ dependencies = [ [[package]] name = "uniffi-example-rondpoint" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", @@ -689,7 +675,7 @@ dependencies = [ [[package]] name = "uniffi-example-sprites" -version = "0.17.0" +version = "0.19.3" dependencies = [ "uniffi", "uniffi_build", @@ -698,7 +684,7 @@ dependencies = [ [[package]] name = "uniffi-example-todolist" -version = "0.17.0" +version = "0.19.3" dependencies = [ "lazy_static", "thiserror", @@ -708,9 +694,10 @@ dependencies = [ ] [[package]] -name = "uniffi-fixture-time" -version = "0.17.0" +name = "uniffi-fixture-callbacks" +version = "0.19.3" dependencies = [ + "lazy_static", "thiserror", "uniffi", "uniffi_build", @@ -718,8 +705,47 @@ dependencies = [ ] [[package]] -name = "uniffi-one" -version = "0.17.0" +name = "uniffi-fixture-coverall" +version = "0.19.3" +dependencies = [ + "lazy_static", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-ext-types" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "uniffi", + "uniffi-example-custom-types", + "uniffi-fixture-ext-types-guid", + "uniffi-fixture-ext-types-lib-one", + "uniffi_build", + "uniffi_macros", + "url", +] + +[[package]] +name = "uniffi-fixture-ext-types-guid" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "serde_json", + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-ext-types-lib-one" +version = "0.19.3" dependencies = [ "anyhow", "bytes", @@ -728,33 +754,153 @@ dependencies = [ "uniffi_macros", ] +[[package]] +name = "uniffi-fixture-external-types" +version = "0.19.3" +dependencies = [ + "anyhow", + "bytes", + "crate_one", + "crate_two", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-keywords-kotlin" +version = "0.19.3" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-keywords-rust" +version = "0.19.3" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-reexport-scaffolding-macro" +version = "0.19.3" +dependencies = [ + "cargo_metadata", + "lazy_static", + "libloading", + "uniffi", + "uniffi-fixture-callbacks", + "uniffi-fixture-coverall", + "uniffi_bindgen", +] + +[[package]] +name = "uniffi-fixture-regression-cdylib-dependency" +version = "0.19.3" + +[[package]] +name = "uniffi-fixture-regression-cdylib-dependency-ffi-crate" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi-fixture-regression-cdylib-dependency", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-i1015-fully-qualified-types" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-i356-enum-without-int-helpers" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-kotlin-experimental-unsigned-types" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-regression-missing-newline" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-swift-omit-argument-labels" +version = "0.19.3" +dependencies = [ + "uniffi", + "uniffi_build", + "uniffi_macros", +] + +[[package]] +name = "uniffi-fixture-time" +version = "0.19.3" +dependencies = [ + "thiserror", + "uniffi", + "uniffi_build", + "uniffi_macros", +] + [[package]] name = "uniffi_bindgen" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", "askama", + "camino", "cargo_metadata", "clap", + "fs-err", "heck", + "lazy_static", "paste", "serde", "toml", - "weedle", + "weedle2", ] [[package]] name = "uniffi_build" -version = "0.17.0" +version = "0.19.3" dependencies = [ "anyhow", + "camino", "uniffi_bindgen", ] [[package]] name = "uniffi_macros" -version = "0.17.0" +version = "0.19.3" dependencies = [ + "camino", "glob", "proc-macro2", "quote", @@ -762,9 +908,22 @@ dependencies = [ "uniffi_build", ] +[[package]] +name = "uniffi_testing" +version = "0.19.3" +dependencies = [ + "anyhow", + "camino", + "cargo_metadata", + "fs-err", + "lazy_static", + "serde", + "serde_json", +] + [[package]] name = "uniffi_uitests" -version = "0.17.0" +version = "0.19.3" dependencies = [ "trybuild", "uniffi", @@ -791,12 +950,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] -name = "weedle" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "610950904727748ca09682e857f0d6d6437f0ca862f32f9229edba8cec8b2635" +name = "weedle2" +version = "3.0.0" dependencies = [ - "nom 5.1.2", + "fs-err", + "nom 6.2.1", ] [[package]] diff --git a/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/default.nix index 59ecd71a41..28ecc281a1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/default.nix @@ -11,17 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "uniffi-bindgen"; - version = "0.17.0"; + version = "0.19.3"; src = fetchFromGitHub { owner = "mozilla"; repo = "uniffi-rs"; rev = "v${version}"; - hash = "sha256-EGyJrW0U/dnKT7OWgd8LehCyvj6mxud3QWbBVyhoK4Y="; + hash = "sha256-A6Zd1jfhoR4yW2lT5qYE3vJTpiJc94pK/XQmfE2QLFc="; }; - cargoLock.lockFileContents = builtins.readFile ./Cargo.lock; - cargoHash = "sha256-Fw+yCAI32NdFKJGPuNU6t0FiEfohoVD3VQfInNJuooI="; + cargoLock.lockFile = ./Cargo.lock; cargoBuildFlags = [ "-p uniffi_bindgen" ]; cargoTestFlags = [ "-p uniffi_bindgen" ]; @@ -36,6 +35,8 @@ rustPlatform.buildRustPackage rec { --suffix PATH : ${lib.strings.makeBinPath [ rustfmt ktlint yapf rubocop ] } ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Toolkit for building cross-platform software components in Rust"; homepage = "https://mozilla.github.io/uniffi-rs/"; diff --git a/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/update.sh b/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/update.sh new file mode 100755 index 0000000000..4815f6eedd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/uniffi-bindgen/update.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env nix-shell +#! nix-shell -p nix cargo rsync nix-update +#! nix-shell -i bash + +set -euo pipefail + +if [[ -z "${UPDATE_NIX_ATTR_PATH+x}" ]]; then + echo "Error: run the following command from nixpkgs root:" >&2 + echo " nix-shell maintainers/scripts/update.nix --argstr package uniffi-bindgen" >&2 + exit 1 +fi + +targetLockfile="$(dirname "$0")/Cargo.lock" + +# Update version and hash +nix-update "$UPDATE_NIX_ATTR_PATH" + +# Update lockfile through `cargo update` +src=$(nix-build -A "${UPDATE_NIX_ATTR_PATH}.src" --no-out-link) + +tmp=$(mktemp -d) + +cleanup() { + echo "Removing $tmp" >&2 + rm -rf "$tmp" +} + +trap cleanup EXIT + +rsync -a --chmod=ugo=rwX "$src/" "$tmp" + +pushd "$tmp" +cargo update +cp "Cargo.lock" "$targetLockfile" +popd diff --git a/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix index 6841b069b1..c3b65fd2d6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix @@ -17,8 +17,7 @@ buildGoModule { sha256 = "0n9pf0i5y59kiiv6dq8h8w1plaz9w6s67rqr2acqgxa45iq36mkh"; }; - vendorSha256 = "1xgl4avq0rblzqqpaxl4dwg4ysrhacwhfd21vb0v9ffr3zcpdw9n"; - proxyVendor = true; + vendorSha256 = "sha256-e5n0QhgffzC1igZX1zS18IX5oF5F0Zy/s8jWyNOD8NM="; subPackages = [ "." ]; @@ -36,8 +35,5 @@ buildGoModule { license = licenses.mit; maintainers = with maintainers; [ adisbladis ]; mainProgram = "vgo2nix"; - # vendoring fails with cryptic error: - # reading file:///nix/store/..../github.com/orivej/e/@v/v0.0.0-20180728214217-ac3492690fda.zip: no such file or directory - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix b/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix index a6d28b36bf..5d48a7a3ba 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix @@ -27,6 +27,7 @@ buildPythonApplication rec { description = "Fast and Highly Extensible Vim script Language Lint implemented by Python"; homepage = "https://github.com/Kuniwak/vint"; license = licenses.mit; + mainProgram = "vint"; maintainers = with maintainers; [ andsild ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index 6e80c62b78..40753ffe21 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.12.2"; + version = "2.14.2"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ylSzPfBTIFZXLLxj/LHkzTNqpDZvT43UKIiG4y/aQJQ="; + sha256 = "sha256-Rlill4T9zHdJUVk/46cPknaBXNN+PUGungqRdTMHFz4="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix index 131bd38d64..2ff94ae2d7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wails/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wails/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "wails"; - version = "2.0.0-beta.38"; + version = "2.0.0-beta.42"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yZgqdJMc48IKd3fimCWPLNkCdUEeIiQs4Xi4D9f5sHA="; + sha256 = "sha256-ZfzaDUUM3W2ZvmLJufeVZ3eK/grvSxbKbsReV7BmcGA="; } + "/v2"; - vendorSha256 = "sha256-tUNOMNQ2NoYvNt2AdKzkMa+oiPNszBjuhs9EgbDVcTU="; + vendorSha256 = "sha256-qmj7pZV9VaxWcC7EgbKZOjlDj6/66Qf5d222aj4TViw="; proxyVendor = true; @@ -66,8 +66,6 @@ buildGoModule rec { --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" ''; - doCheck = true; - meta = with lib; { description = "Build applications using Go + HTML + CSS + JS"; homepage = "https://wails.io"; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix index 575d18f9e7..6bd45dc6f6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasm-pack/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "wasm-pack"; - version = "0.10.2"; + version = "0.10.3"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-pack"; rev = "v${version}"; - sha256 = "sha256-nhO/SLeJTq2viDqsJCRNLbgjyDKRli3RWExUNzKT9ug="; + sha256 = "sha256-5AhHh/ycoNhhCH30RXvW6MyJkscrjFW+pvudw0MXieU="; }; - cargoSha256 = "sha256-6qrCHpg92IRPsf/dK6xcLGX8BLmqox3vgLRqsV4ubsY="; + cargoSha256 = "sha256-4TKu9O5jLac5kLZF53DGjxEPize8jZm2B+CurelzSuo="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix new file mode 100644 index 0000000000..f2a4863ecb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/wasmedge/default.nix @@ -0,0 +1,42 @@ +{ lib +, fetchFromGitHub +, llvmPackages +, boost +, cmake +, gtest +, spdlog +}: + +llvmPackages.stdenv.mkDerivation rec { + pname = "wasmedge"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "WasmEdge"; + repo = "WasmEdge"; + rev = version; + sha256 = "sha256-SJi8CV0sa+g+Ngvdw8+SxV3kHqoiKBhYUwDLZM4+jX0="; + }; + + buildInputs = [ + boost + spdlog + llvmPackages.llvm + ]; + + nativeBuildInputs = [ cmake llvmPackages.lld ]; + + checkInputs = [ gtest ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + "-DWASMEDGE_BUILD_TESTS=OFF" # Tests are downloaded using git + ]; + + meta = with lib; { + homepage = "https://wasmedge.org/"; + license = with licenses; [ asl20 ]; + description = "A lightweight, high-performance, and extensible WebAssembly runtime for cloud native, edge, and decentralized applications"; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/wasynth/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/wasynth/Cargo.lock index 64802fe5b6..c231fd9e97 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasynth/Cargo.lock +++ b/third_party/nixpkgs/pkgs/development/tools/wasynth/Cargo.lock @@ -25,18 +25,18 @@ checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" [[package]] name = "codegen-luajit" -version = "0.11.0" +version = "0.12.0" dependencies = [ "wasm-ast", - "wasmparser", + "wasmparser 0.86.0", ] [[package]] name = "codegen-luau" -version = "0.11.0" +version = "0.12.0" dependencies = [ "wasm-ast", - "wasmparser", + "wasmparser 0.86.0", ] [[package]] @@ -52,7 +52,7 @@ dependencies = [ [[package]] name = "dev-test" -version = "0.11.0" +version = "0.12.0" dependencies = [ "codegen-luajit", "codegen-luau", @@ -77,9 +77,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "hashbrown" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "indexmap" @@ -116,9 +116,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "once_cell" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "proc-macro2" @@ -192,9 +192,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" [[package]] name = "unicode-width" @@ -210,9 +210,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "wasm-ast" -version = "0.11.0" +version = "0.12.0" dependencies = [ - "wasmparser", + "wasmparser 0.86.0", ] [[package]] @@ -225,17 +225,26 @@ dependencies = [ ] [[package]] -name = "wasm-smith" -version = "0.11.1" +name = "wasm-encoder" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85cf25be85aac46356216b4662eb5768347046449a45c938ae1443b788665bb" +checksum = "f76068e87fe9b837a6bc2ccded66784173eadb828c4168643e9fddf6f9ed2e61" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasm-smith" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73250e61e41d0e467b78559c7d761841005d724384bb0b78d52ff974acf5520" dependencies = [ "arbitrary", "flagset", "indexmap", "leb128", - "wasm-encoder", - "wasmparser", + "wasm-encoder 0.14.0", + "wasmparser 0.87.0", ] [[package]] @@ -247,6 +256,15 @@ dependencies = [ "indexmap", ] +[[package]] +name = "wasmparser" +version = "0.87.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c04e207cd2e8ecb6f9bd28a2cf3119b4c6bfeee6fe3a25cc1daf8041d00a875" +dependencies = [ + "indexmap", +] + [[package]] name = "wast" version = "42.0.0" @@ -256,5 +274,5 @@ dependencies = [ "leb128", "memchr", "unicode-width", - "wasm-encoder", + "wasm-encoder 0.13.0", ] diff --git a/third_party/nixpkgs/pkgs/development/tools/wasynth/default.nix b/third_party/nixpkgs/pkgs/development/tools/wasynth/default.nix index c7c75f7859..0edefb2333 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wasynth/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wasynth/default.nix @@ -6,13 +6,13 @@ rustPlatform.buildRustPackage rec { pname = "wasynth"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "Rerumu"; repo = "Wasynth"; rev = "v${version}"; - sha256 = "sha256-QYWseogWHAjnNRi1OVtiJYOCxOLtHKjmlAd/U8Yv4tI="; + sha256 = "sha256-hbY+epUtYSQrvnAbCELsVcqd3UoXGn24FkzWfrM0K14="; }; # A lock file isn't provided, so it must be added manually. diff --git a/third_party/nixpkgs/pkgs/development/tools/wizer/default.nix b/third_party/nixpkgs/pkgs/development/tools/wizer/default.nix new file mode 100644 index 0000000000..f79c96f545 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/wizer/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, rustPlatform, fetchCrate }: + +rustPlatform.buildRustPackage rec { + pname = "wizer"; + version = "1.4.0"; + + src = fetchCrate { + inherit pname version; + + sha256 = "sha256-3Hc3KKqtbZtvD+3lb/W7+AyrwPukJyxpUe94KGQlzBI="; + }; + + cargoSha256 = "sha256-zv36/W7dNpIupYn8TS+NaF7uX+BVjrI6AW6Hrlqr8Xg="; + + cargoBuildFlags = [ "--bin" pname ]; + + buildFeatures = [ "env_logger" "structopt" ]; + + # Setting $HOME to a temporary directory is necessary to prevent checks from failing, as + # the test suite creates a cache directory at $HOME/Library/Caches/BytecodeAlliance.wasmtime. + preCheck = '' + export HOME=$(mktemp -d) + ''; + + 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; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/worker-build/default.nix b/third_party/nixpkgs/pkgs/development/tools/worker-build/default.nix index 4f6c595ee9..41c92732dc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/worker-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/worker-build/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "worker-build"; - version = "0.0.9"; + version = "0.0.10"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-rs"; rev = "v${version}"; - sha256 = "sha256-nrvnIuLBtdMMBcYm8McOxHc/HHYDrogEG9Ii2Bevl+w="; + sha256 = "sha256-p19Q/XAOvDKXRvDWeMRo4C1TnvxYg88CAyldN7AhJDM="; }; - cargoSha256 = "sha256-xLssAmyfHr4EBQ72XZFqybA6ZI1UM2Q2kS5UWmIkteM="; + cargoSha256 = "sha256-8fnsiWZjxCxhv4NWcRIpKbT8vQyhe27es80ttKX/oPs="; buildAndTestSubdir = "worker-build"; diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix index c34c3b0a03..c7fd84464b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.19.11"; + version = "1.19.12"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8Vka8HTU0YkTS1DeQuqVLsnRGnig7Aiql5e/6NBk7qs="; + sha256 = "sha256-HnenF3X/6tvzwlbuOiQAvB76GrdRsqETG+3fp1fx334="; }; - cargoSha256 = "sha256-bw6Z4SW+NOFFpUJ5xGwdccv8KQnSri/TFxAJp+9fsWk="; + cargoSha256 = "sha256-mJyuqVSiuBKI/x3P865W1/ei5Ya2mV5LVXzaL3peocE="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index c36ad127e8..309be805cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -69,7 +69,7 @@ in rec { yarnLock, yarnNix ? mkYarnNix { inherit yarnLock; }, offlineCache ? importOfflineCache yarnNix, - yarnFlags ? defaultYarnFlags, + yarnFlags ? [ ], pkgConfig ? {}, preBuild ? "", postBuild ? "", @@ -141,7 +141,7 @@ in rec { ${workspaceDependencyLinks} - yarn install ${lib.escapeShellArgs yarnFlags} + yarn install ${lib.escapeShellArgs (defaultYarnFlags ++ yarnFlags)} ${lib.concatStringsSep "\n" postInstall} @@ -241,7 +241,7 @@ in rec { yarnLock ? src + "/yarn.lock", yarnNix ? mkYarnNix { inherit yarnLock; }, offlineCache ? importOfflineCache yarnNix, - yarnFlags ? defaultYarnFlags, + yarnFlags ? [ ], yarnPreBuild ? "", yarnPostBuild ? "", pkgConfig ? {}, diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index 408dff3faa..3b686aaa8b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.26.1"; + version = "4.27.2"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-5EDFttaUgef2/EQUSORY17UjbErCjVDdy3Dls1mMYLQ="; + sha256 = "sha256-42rcptmZrMfUTN4kjnbulwosLOUNf0qw85eqmpD31gw="; }; - vendorSha256 = "sha256-w9TaCYxu3a8R3oCfyNyioe2W9PrejhTj/3eaBeg7UAw="; + vendorSha256 = "sha256-fHqTgFsUKaDlWU9PGYqAFknzgq7tYzSTqNb+edwWZJg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix index ebd3bf510a..ec8c0f46cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ytt/default.nix @@ -1,17 +1,21 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.41.1"; + version = "0.42.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-JOmDEhisJh4sezxf/Whsf1W7rn4q7C3GqmINQ/A13J0="; + sha256 = "sha256-D9ugW/b8k1SIUjlReLB8bk0VOSymBKYrm7tSlU2B9zg="; }; vendorSha256 = null; + ldflags = [ + "-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=${version}" + ]; + subPackages = [ "cmd/ytt" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix index f3f8bae1e8..8cc2e119a4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/zprint/default.nix @@ -2,11 +2,11 @@ buildGraalvmNativeImage rec { pname = "zprint"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}"; - sha256 = "sha256-CaugPTfEGC0IFgYUSHcE3nsnrP5DSXS1becXChbPggQ="; + sha256 = "sha256-DIiUFHlK9NNQeUcfzp4N/+14ejZ9+LRx+5FUjtCa9RM="; }; extraNativeImageBuildArgs = [ diff --git a/third_party/nixpkgs/pkgs/development/web/bun/default.nix b/third_party/nixpkgs/pkgs/development/web/bun/default.nix index dcfad88bdc..5cdab24a76 100644 --- a/third_party/nixpkgs/pkgs/development/web/bun/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/bun/default.nix @@ -4,25 +4,31 @@ let aarch64-darwin = { arch = "aarch64"; shortName = "darwin"; - sha256 = "sha256-6mi1I8dga16dQLFy2+qa4dzDzlW6J0fdiv104Re3cZ0="; + sha256 = "c82547d96125bf93ae76dafe203cae5f7cd50d041bfb1cf972f9f0232a0d1cc1"; + }; + + aarch64-linux = { + arch = "aarch64"; + shortName = "linux"; + sha256 = "3430f3ff456ee86ddb607a46ee937c9c1a02b8e4d2546de52b4493878f66afb8"; }; x86_64-darwin = { arch = "x64"; shortName = "darwin"; - sha256 = "sha256-RGlpwRKLo4Y6uPvwubclIg3wJWePgKTDJvuzdxOrtfM="; + sha256 = "51fb5f29b5f00207ede11c892ccf5bb3ab437b77e7420e1c18b7fc91e02e2494"; }; x86_64-linux = { arch = "x64"; shortName = "linux"; - sha256 = "sha256-Xjm+1wkAsC5Mn6Fm4MRdGyL4gpw2L++N0nKo7ofXLXs="; + sha256 = "89fe00713a4e0e9f77d8842c5e07f771bd743271746fcb755c5d98cb5c00456e"; }; }; dist = dists.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); in stdenvNoCC.mkDerivation rec { - version = "0.1.2"; + version = "0.1.6"; pname = "bun"; src = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix index af8e916490..20a946ac32 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/cypress-example-kitchensink.nix @@ -1,12 +1,12 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}: let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile; + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix index c2b723195b..2590dd267a 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-env.nix @@ -1,6 +1,6 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile}: +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master @@ -40,36 +40,22 @@ let ''; }; - includeDependencies = {dependencies}: - lib.optionalString (dependencies != []) - (lib.concatMapStrings (dependency: - '' - # Bundle the dependencies of the package - mkdir -p node_modules - cd node_modules + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 - # Only include dependencies if they don't exist. They may also be bundled in the package. - if [ ! -e "${dependency.name}" ] - then - ${composePackage dependency} - fi + local strippedName - cd .. - '' - ) dependencies); - - # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: - builtins.addErrorContext "while evaluating node package '${packageName}'" '' - DIR=$(pwd) + local DIR=$PWD cd $TMPDIR - unpackFile ${src} + unpackFile $src # Make the base dir in which the target dependency resides first - mkdir -p "$(dirname "$DIR/${packageName}")" + mkdir -p "$(dirname "$DIR/$packageName")" - if [ -f "${src}" ] + if [ -f "$src" ] then # Figure out what directory has been unpacked packageDir="$(find . -maxdepth 1 -type d | tail -1)" @@ -79,28 +65,53 @@ let chmod -R u+w "$packageDir" # Move the extracted tarball into the output folder - mv "$packageDir" "$DIR/${packageName}" - elif [ -d "${src}" ] + mv "$packageDir" "$DIR/$packageName" + elif [ -d "$src" ] then # Get a stripped name (without hash) of the source directory. # On old nixpkgs it's already set internally. if [ -z "$strippedName" ] then - strippedName="$(stripHash ${src})" + strippedName="$(stripHash $src)" fi # Restore write permissions to make building work chmod -R u+w "$strippedName" # Move the extracted directory into the output folder - mv "$strippedName" "$DIR/${packageName}" + mv "$strippedName" "$DIR/$packageName" fi - # Unset the stripped name to not confuse the next unpack step - unset strippedName + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; - # Include the dependencies of the package - cd "$DIR/${packageName}" + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.packageName}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" ${includeDependencies { inherit dependencies; }} cd .. ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} @@ -246,8 +257,8 @@ let var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); if(![1, 2].includes(packageLock.lockfileVersion)) { - process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); - process.exit(1); + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); } if(packageLock.dependencies !== undefined) { @@ -379,7 +390,7 @@ let buildNodePackage = { name , packageName - , version + , version ? null , dependencies ? [] , buildInputs ? [] , production ? true @@ -391,13 +402,14 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -414,6 +426,8 @@ let passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + # Create and enter a root node_modules/ folder mkdir -p $out/lib/node_modules cd $out/lib/node_modules @@ -427,6 +441,14 @@ let if [ -d "$out/lib/node_modules/.bin" ] then ln -s $out/lib/node_modules/.bin $out/bin + + # Patch the shebang lines of all the executables + ls $out/bin/* | while read i + do + file="$(readlink -f "$i")" + chmod u+rwx "$file" + patchShebangs "$file" + done fi # Create symlinks to the deployed manual page folders, if applicable @@ -446,13 +468,18 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a node environment (a node_modules folder and a set of binaries) buildNodeDependencies = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -470,7 +497,7 @@ let extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; in stdenv.mkDerivation ({ - name = "node-dependencies-${name}-${version}"; + name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux @@ -486,6 +513,8 @@ let passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; installPhase = '' + source ${installPackage} + mkdir -p $out/${packageName} cd $out/${packageName} @@ -498,6 +527,7 @@ let if [ -f ${src}/package-lock.json ] then cp ${src}/package-lock.json . + chmod 644 package-lock.json fi ''} @@ -520,7 +550,7 @@ let buildNodeShell = { name , packageName - , version + , version ? null , src , dependencies ? [] , buildInputs ? [] @@ -536,9 +566,10 @@ let let nodeDependencies = buildNodeDependencies args; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; + stdenv.mkDerivation ({ + name = "node-shell-${name}${if version == null then "" else "-${version}"}"; buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; buildCommand = '' @@ -557,7 +588,7 @@ let export NODE_PATH=${nodeDependencies}/lib/node_modules export PATH="${nodeDependencies}/bin:$PATH" ''; - }; + } // extraArgs); in { buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist; diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-packages.nix b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-packages.nix index 08a39661a3..cf6977ce8d 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/node-packages.nix @@ -1,43 +1,43 @@ -# This file has been generated by node2nix 1.9.0. Do not edit! +# This file has been generated by node2nix 1.11.1. Do not edit! {nodeEnv, fetchurl, fetchgit, callPackage, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: let sources = { - "@babel/code-frame-7.8.3" = { + "@babel/code-frame-7.18.6" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.8.3"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/helper-validator-identifier-7.9.5" = { + "@babel/helper-validator-identifier-7.18.6" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.9.5"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; - sha512 = "/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; + sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; }; }; - "@babel/highlight-7.9.0" = { + "@babel/highlight-7.18.6" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.9.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; - sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/runtime-7.9.2" = { + "@babel/runtime-7.18.9" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.9.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz"; - sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz"; + sha512 = "lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw=="; }; }; "@bahmutov/print-env-1.2.0" = { @@ -49,6 +49,15 @@ let sha512 = "Vf4AX+maJYV6f0RCUjmCsv6dcJPdPp33By8orMU1enb3t867xTGERhfn7aBdeisSKYJ3Dau5nwCiR2sGPSoS+w=="; }; }; + "@colors/colors-1.5.0" = { + name = "_at_colors_slash_colors"; + packageName = "@colors/colors"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"; + sha512 = "ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="; + }; + }; "@cypress/eslint-plugin-dev-5.0.0" = { name = "_at_cypress_slash_eslint-plugin-dev"; packageName = "@cypress/eslint-plugin-dev"; @@ -58,22 +67,13 @@ let sha512 = "wAvXudTesd75WKnO8PWtCy7bRuoG1v2JctfedtXn8uNN7M862WvkdXZaluW8Ex/Ahj6VI6fh4hfhdFzxhlF83Q=="; }; }; - "@cypress/listr-verbose-renderer-0.4.1" = { - name = "_at_cypress_slash_listr-verbose-renderer"; - packageName = "@cypress/listr-verbose-renderer"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz"; - sha1 = "a77492f4b11dcc7c446a34b3e28721afd33c642a"; - }; - }; - "@cypress/request-2.88.5" = { + "@cypress/request-2.88.10" = { name = "_at_cypress_slash_request"; packageName = "@cypress/request"; - version = "2.88.5"; + version = "2.88.10"; src = fetchurl { - url = "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz"; - sha512 = "TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA=="; + url = "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz"; + sha512 = "Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg=="; }; }; "@cypress/xvfb-1.2.4" = { @@ -100,7 +100,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/bourne/-/bourne-1.3.2.tgz"; - sha1 = "0a7095adea067243ce3283e1b56b8a8f453b242a"; + sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; }; }; "@hapi/hoek-8.5.1" = { @@ -118,7 +118,7 @@ let version = "15.1.1"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/joi/-/joi-15.1.1.tgz"; - sha1 = "c675b8a71296f02833f8d6d243b34c57b8ce19d7"; + sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; }; }; "@hapi/topo-3.1.6" = { @@ -127,16 +127,16 @@ let version = "3.1.6"; src = fetchurl { url = "https://registry.npmjs.org/@hapi/topo/-/topo-3.1.6.tgz"; - sha1 = "68d935fa3eae7fdd5ab0d7f953f3205d8b2bfc29"; + sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@koa/cors-3.1.0" = { + "@koa/cors-3.3.0" = { name = "_at_koa_slash_cors"; packageName = "@koa/cors"; - version = "3.1.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@koa/cors/-/cors-3.1.0.tgz"; - sha512 = "7ulRC1da/rBa6kj6P4g2aJfnET3z8Uf3SWu60cjbtxTA5g8lxRdX/Bd2P92EagGwwAhANeNw8T8if99rJliR6Q=="; + url = "https://registry.npmjs.org/@koa/cors/-/cors-3.3.0.tgz"; + sha512 = "lzlkqLlL5Ond8jb6JLnVVDmD2OPym0r5kvZlMgAWiS9xle+Q5ulw1T358oW+RVguxUkANquZQz82i/STIRmsqQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -148,13 +148,13 @@ let sha512 = "bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g=="; }; }; - "@nodelib/fs.scandir-2.1.3" = { + "@nodelib/fs.scandir-2.1.5" = { name = "_at_nodelib_slash_fs.scandir"; packageName = "@nodelib/fs.scandir"; - version = "2.1.3"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz"; - sha512 = "eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw=="; + url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"; + sha512 = "vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g=="; }; }; "@nodelib/fs.stat-1.1.3" = { @@ -166,40 +166,49 @@ let sha512 = "shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw=="; }; }; - "@nodelib/fs.stat-2.0.3" = { + "@nodelib/fs.stat-2.0.5" = { name = "_at_nodelib_slash_fs.stat"; packageName = "@nodelib/fs.stat"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz"; - sha512 = "bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA=="; + url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"; + sha512 = "RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A=="; }; }; - "@nodelib/fs.walk-1.2.4" = { + "@nodelib/fs.walk-1.2.8" = { name = "_at_nodelib_slash_fs.walk"; packageName = "@nodelib/fs.walk"; - version = "1.2.4"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz"; - sha512 = "1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ=="; + url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"; + sha512 = "oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="; }; }; - "@octokit/auth-token-2.4.0" = { + "@octokit/auth-token-2.5.0" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.0.tgz"; - sha512 = "eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz"; + sha512 = "r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g=="; }; }; - "@octokit/endpoint-6.0.1" = { + "@octokit/endpoint-6.0.12" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.1"; + version = "6.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz"; - sha512 = "pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz"; + sha512 = "lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA=="; + }; + }; + "@octokit/openapi-types-12.10.1" = { + name = "_at_octokit_slash_openapi-types"; + packageName = "@octokit/openapi-types"; + version = "12.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.10.1.tgz"; + sha512 = "P+SukKanjFY0ZhsK6wSVnQmxTP2eVPPE8OPSNuxaMYtgVzwJZgfGdwlYjf4RlRU4vLEw4ts2fsE2icG4nZ5ddQ=="; }; }; "@octokit/plugin-paginate-rest-1.1.2" = { @@ -211,13 +220,13 @@ let sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q=="; }; }; - "@octokit/plugin-request-log-1.0.0" = { + "@octokit/plugin-request-log-1.0.4" = { name = "_at_octokit_slash_plugin-request-log"; packageName = "@octokit/plugin-request-log"; - version = "1.0.0"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz"; - sha512 = "ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw=="; + url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz"; + sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA=="; }; }; "@octokit/plugin-rest-endpoint-methods-2.4.0" = { @@ -229,13 +238,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.2" = { + "@octokit/request-5.6.3" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.2"; + version = "5.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz"; - sha512 = "zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz"; + sha512 = "bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A=="; }; }; "@octokit/request-error-1.2.1" = { @@ -247,40 +256,40 @@ let sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; }; }; - "@octokit/request-error-2.0.0" = { + "@octokit/request-error-2.1.0" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.0.tgz"; - sha512 = "rtYicB4Absc60rUv74Rjpzek84UbVHGHJRu4fNVlZ1mCcyUPPuzFfG9Rn6sjHrd95DEsmjSt1Axlc699ZlbDkw=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz"; + sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg=="; }; }; - "@octokit/rest-16.43.1" = { + "@octokit/rest-16.43.2" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.43.1"; + version = "16.43.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz"; - sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.43.2.tgz"; + sha512 = "ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ=="; }; }; - "@octokit/types-2.11.1" = { + "@octokit/types-2.16.2" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "2.11.1"; + version = "2.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-2.11.1.tgz"; - sha512 = "QaLoLkmFdfoNbk3eOzPv7vKrUY0nRJIYmZDoz/pTer4ICpqu80aSQTVHnnUxEFuURCiidig76CcxUOYC/bY3RQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-2.16.2.tgz"; + sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@samverschueren/stream-to-observable-0.3.1" = { - name = "_at_samverschueren_slash_stream-to-observable"; - packageName = "@samverschueren/stream-to-observable"; - version = "0.3.1"; + "@octokit/types-6.40.0" = { + name = "_at_octokit_slash_types"; + packageName = "@octokit/types"; + version = "6.40.0"; src = fetchurl { - url = "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz"; - sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.40.0.tgz"; + sha512 = "MFZOU5r8SwgJWDMhrLUSvyJPtVsqA6VnbVI3TNbsmw+Jnvrktzvq2fYES/6RiJA/5Ykdwq4mJmtlYUfW7CGjmw=="; }; }; "@semantic-release/commit-analyzer-6.3.3" = { @@ -337,13 +346,13 @@ let sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; }; }; - "@szmarczak/http-timer-4.0.5" = { + "@szmarczak/http-timer-4.0.6" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; - version = "4.0.5"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz"; - sha512 = "PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ=="; + url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz"; + sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w=="; }; }; "@tootallnate/once-1.1.2" = { @@ -355,94 +364,85 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; - "@types/cacheable-request-6.0.1" = { + "@types/cacheable-request-6.0.2" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz"; - sha512 = "ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ=="; + url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz"; + sha512 = "B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA=="; }; }; - "@types/color-name-1.1.1" = { - name = "_at_types_slash_color-name"; - packageName = "@types/color-name"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; - sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; - }; - }; - "@types/events-3.0.0" = { - name = "_at_types_slash_events"; - packageName = "@types/events"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz"; - sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; - }; - }; - "@types/glob-7.1.1" = { + "@types/glob-7.2.0" = { name = "_at_types_slash_glob"; packageName = "@types/glob"; - version = "7.1.1"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz"; - sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; + url = "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz"; + sha512 = "ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA=="; }; }; - "@types/http-cache-semantics-4.0.0" = { + "@types/http-cache-semantics-4.0.1" = { name = "_at_types_slash_http-cache-semantics"; packageName = "@types/http-cache-semantics"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz"; - sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; + url = "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz"; + sha512 = "SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ=="; }; }; - "@types/keyv-3.1.1" = { + "@types/json-buffer-3.0.0" = { + name = "_at_types_slash_json-buffer"; + packageName = "@types/json-buffer"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-buffer/-/json-buffer-3.0.0.tgz"; + sha512 = "3YP80IxxFJB4b5tYC2SUPwkg0XQLiu0nWvhRgEatgjf+29IcWO9X1k8xRv5DGssJ/lCrjYTjQPcobJr2yWIVuQ=="; + }; + }; + "@types/keyv-3.1.4" = { name = "_at_types_slash_keyv"; packageName = "@types/keyv"; - version = "3.1.1"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz"; - sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; + url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz"; + sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg=="; }; }; - "@types/minimatch-3.0.3" = { + "@types/minimatch-3.0.5" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz"; - sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; + url = "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"; + sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/node-13.13.0" = { + "@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.18.22" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.0"; + version = "14.18.22"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.0.tgz"; - sha512 = "WE4IOAC6r/yBZss1oQGM5zs2D7RuKR6Q+w+X2SouPofnWn+LbCqClRyhO3ZE7Ix8nmFgo/oVuuE01cJT2XB13A=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.18.22.tgz"; + sha512 = "qzaYbXVzin6EPjghf/hTdIbnVW1ErMx8rPzwRNJhlbyJhu2SyqlvjGOY/tbUt6VFyzg56lROcOeSQRInpt63Yw=="; }; }; - "@types/node-14.17.0" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.17.0.tgz"; - sha512 = "w8VZUN/f7SSbvVReb9SWp6cJFevxb4/nkG65yLAya//98WgocKm5PLDAtSs5CtJJJM+kHmJjO/6mmYW4MHShZA=="; - }; - }; - "@types/normalize-package-data-2.4.0" = { + "@types/normalize-package-data-2.4.1" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz"; - sha512 = "f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA=="; + url = "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz"; + sha512 = "Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw=="; }; }; "@types/parse-json-4.0.0" = { @@ -472,13 +472,13 @@ let sha512 = "wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="; }; }; - "@types/sinonjs__fake-timers-6.0.2" = { + "@types/sinonjs__fake-timers-8.1.1" = { name = "_at_types_slash_sinonjs__fake-timers"; packageName = "@types/sinonjs__fake-timers"; - version = "6.0.2"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz"; - sha512 = "dIPoZ3g5gcx9zZEszaxLSVTvMReD3xxyyDnQUjA6IYDG9Ba2AV0otMPs+77sG9ojB4Qr2N2Vk5RnKeuA0X/0bg=="; + url = "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz"; + sha512 = "0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g=="; }; }; "@types/sizzle-2.3.3" = { @@ -490,13 +490,13 @@ let sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; }; }; - "@types/yauzl-2.9.1" = { + "@types/yauzl-2.10.0" = { name = "_at_types_slash_yauzl"; packageName = "@types/yauzl"; - version = "2.9.1"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.1.tgz"; - sha512 = "A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA=="; + url = "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz"; + sha512 = "Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw=="; }; }; "@zeit/schemas-2.6.0" = { @@ -517,31 +517,31 @@ let sha512 = "E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ=="; }; }; - "accepts-1.3.7" = { + "accepts-1.3.8" = { name = "accepts"; packageName = "accepts"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; - sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"; + sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw=="; }; }; - "acorn-7.2.0" = { + "acorn-7.4.1" = { name = "acorn"; packageName = "acorn"; - version = "7.2.0"; + version = "7.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-7.2.0.tgz"; - sha512 = "apwXVmYVpQ34m/i71vrApRrRKCWQnZZF1+npOD0WV5xZFfwWOmKGQ2RWlfdy9vWITsenisM8M0Qeq8agcFHNiQ=="; + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-jsx-5.2.0" = { + "acorn-jsx-5.3.2" = { name = "acorn-jsx"; packageName = "acorn-jsx"; - version = "5.2.0"; + version = "5.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha512 = "HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ=="; + url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"; + sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ=="; }; }; "agent-base-5.1.1" = { @@ -562,22 +562,22 @@ let sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; - "aggregate-error-3.0.1" = { + "aggregate-error-3.1.0" = { name = "aggregate-error"; packageName = "aggregate-error"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz"; - sha512 = "quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA=="; + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; }; - "ajv-6.12.2" = { + "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; - version = "6.12.2"; + version = "6.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; - sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"; + sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; "ajv-6.5.3" = { @@ -595,7 +595,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz"; - sha1 = "c36aeccba563b89ceb556f3690f0b1d9e3547f7f"; + sha512 = "TdlOggdA/zURfMYa7ABC66j+oqfMew58KpJMbUlH3bcZP1b+cBHIHDDn5uH9INsxrHBPjsqM0tDB4jPTF/vgJA=="; + }; + }; + "ansi-colors-4.1.3" = { + name = "ansi-colors"; + packageName = "ansi-colors"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"; + sha512 = "/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="; }; }; "ansi-escape-sequences-5.1.2" = { @@ -616,13 +625,13 @@ let sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; - "ansi-escapes-4.3.1" = { + "ansi-escapes-4.3.2" = { name = "ansi-escapes"; packageName = "ansi-escapes"; - version = "4.3.1"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz"; - sha512 = "JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA=="; + url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"; + sha512 = "gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ=="; }; }; "ansi-regex-2.1.1" = { @@ -631,34 +640,34 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; + sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; }; }; - "ansi-regex-3.0.0" = { + "ansi-regex-3.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"; - sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"; + sha512 = "+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw=="; }; }; - "ansi-regex-4.1.0" = { + "ansi-regex-4.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "4.1.0"; + version = "4.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"; - sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz"; + sha512 = "ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g=="; }; }; - "ansi-regex-5.0.0" = { + "ansi-regex-5.0.1" = { name = "ansi-regex"; packageName = "ansi-regex"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"; + sha512 = "quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="; }; }; "ansi-styles-2.2.1" = { @@ -667,7 +676,7 @@ let version = "2.2.1"; src = fetchurl { url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe"; + sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="; }; }; "ansi-styles-3.2.1" = { @@ -679,15 +688,6 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; - "ansi-styles-4.2.1" = { - name = "ansi-styles"; - packageName = "ansi-styles"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha512 = "9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA=="; - }; - }; "ansi-styles-4.3.0" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -703,16 +703,7 @@ let version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz"; - sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979"; - }; - }; - "any-observable-0.3.0" = { - name = "any-observable"; - packageName = "any-observable"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz"; - sha512 = "/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog=="; + sha512 = "QXu7BPrP29VllRxH8GwB7x5iX5qWKAAMLqKQGWTeLWVlNHNOpVMJ91dsxQAIWXpjuW5wqvxu3Jd/nRjrJ+0pqg=="; }; }; "any-promise-1.3.0" = { @@ -721,16 +712,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; - sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; - }; - }; - "arch-2.1.1" = { - name = "arch"; - packageName = "arch"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/arch/-/arch-2.1.1.tgz"; - sha512 = "BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg=="; + sha512 = "7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="; }; }; "arch-2.2.0" = { @@ -766,7 +748,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/argv-formatter/-/argv-formatter-1.0.0.tgz"; - sha1 = "a0ca0cbc29a5b73e836eebe1cbf6c5e0e4eb82f9"; + sha512 = "F2+Hkm9xFaRg+GkaNnbwXNDV5O6pnCFEmqyhvfC/Ic5LbgOWjJh3L+mN/s91rxVL3znE7DYVpW0GJFT+4YBgWw=="; }; }; "arr-diff-4.0.0" = { @@ -775,7 +757,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; - sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; + sha512 = "YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA=="; }; }; "arr-flatten-1.1.0" = { @@ -793,7 +775,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; - sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; + sha512 = "sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q=="; }; }; "array-back-3.1.0" = { @@ -805,22 +787,13 @@ let sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q=="; }; }; - "array-back-4.0.1" = { + "array-back-4.0.2" = { name = "array-back"; packageName = "array-back"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-back/-/array-back-4.0.1.tgz"; - sha512 = "Z/JnaVEXv+A9xabHzN43FiiiWEE7gPCRXMrVmRm00tWbjZRul1iHm7ECzlyNq1p4a4ATXz+G9FJ3GqGOkOV3fg=="; - }; - }; - "array-find-index-1.0.2" = { - name = "array-find-index"; - packageName = "array-find-index"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; - sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; + url = "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz"; + sha512 = "NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg=="; }; }; "array-ify-1.0.0" = { @@ -829,7 +802,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz"; - sha1 = "9e528762b4a9066ad163a6962a364418e9626ece"; + sha512 = "c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng=="; }; }; "array-union-1.0.2" = { @@ -838,7 +811,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"; - sha1 = "9a34410e4f4e3da23dea375be5be70f24778ec39"; + sha512 = "Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng=="; }; }; "array-union-2.1.0" = { @@ -847,7 +820,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"; - sha1 = "b798420adbeb1de828d84acd8a2e23d3efe85e8d"; + sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; "array-uniq-1.0.3" = { @@ -856,7 +829,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"; - sha1 = "af6ac877a25cc7f74e058894753858dfdb24fdb6"; + sha512 = "MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q=="; }; }; "array-unique-0.3.2" = { @@ -865,7 +838,7 @@ let version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; - sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ=="; }; }; "arrify-1.0.1" = { @@ -874,7 +847,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"; - sha1 = "898508da2226f380df904728456849c1501a4b0d"; + sha512 = "3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA=="; }; }; "asap-2.0.6" = { @@ -883,16 +856,16 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; - sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + sha512 = "BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="; }; }; - "asn1-0.2.4" = { + "asn1-0.2.6" = { name = "asn1"; packageName = "asn1"; - version = "0.2.4"; + version = "0.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"; - sha1 = "8d2475dfab553bb33e77b54e59e880bb8ce23136"; + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"; + sha512 = "ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ=="; }; }; "assert-plus-1.0.0" = { @@ -901,7 +874,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; + sha512 = "NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw=="; }; }; "assign-symbols-1.0.0" = { @@ -910,7 +883,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; - sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; + sha512 = "Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw=="; }; }; "astral-regex-1.0.0" = { @@ -922,22 +895,31 @@ let sha512 = "+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg=="; }; }; + "astral-regex-2.0.0" = { + name = "astral-regex"; + packageName = "astral-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"; + sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; + }; + }; "async-1.5.2" = { name = "async"; packageName = "async"; version = "1.5.2"; src = fetchurl { url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + sha512 = "nSVgobk4rv61R9PUSDtYt7mPVB2olxNR5RWJcAsH676/ef11bUZwvu7+RGYrYauVdDPcO519v68wRhXQtxsV9w=="; }; }; - "async-3.2.0" = { + "async-3.2.4" = { name = "async"; packageName = "async"; - version = "3.2.0"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; - sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; + url = "https://registry.npmjs.org/async/-/async-3.2.4.tgz"; + sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; }; }; "asynckit-0.4.0" = { @@ -946,7 +928,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + sha512 = "Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="; }; }; "at-least-node-1.0.0" = { @@ -973,7 +955,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/atob-lite/-/atob-lite-2.0.0.tgz"; - sha1 = "0fef5ad46f1bd7a8502c65727f0367d5ee43d696"; + sha512 = "LEeSAWeh2Gfa2FtlQE1shxQ8zi5F9GHarrGKz08TMdODD5T4eH6BMsvtnhbWZ+XQn+Gb6om/917ucvRu7l7ukw=="; }; }; "aws-sign2-0.7.0" = { @@ -982,25 +964,25 @@ let version = "0.7.0"; src = fetchurl { url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"; - sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; + sha512 = "08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA=="; }; }; - "aws4-1.9.1" = { + "aws4-1.11.0" = { name = "aws4"; packageName = "aws4"; - version = "1.9.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz"; - sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; - "balanced-match-1.0.0" = { + "balanced-match-1.0.2" = { name = "balanced-match"; packageName = "balanced-match"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz"; - sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; "base-0.11.2" = { @@ -1036,7 +1018,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"; - sha1 = "dc34314f4e679318093fc760272525f94bf25c16"; + sha512 = "x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="; }; }; "bcrypt-pbkdf-1.0.2" = { @@ -1045,16 +1027,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"; - sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; + sha512 = "qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w=="; }; }; - "before-after-hook-2.1.0" = { + "before-after-hook-2.2.2" = { name = "before-after-hook"; packageName = "before-after-hook"; - version = "2.1.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.1.0.tgz"; - sha512 = "IWIbu7pMqyw3EAJHzzHbWa85b6oud/yfKYg5rqB5hNE8CeMi3nX+2C2sj0HswfblST86hpVEOAb9x34NZd6P7A=="; + url = "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz"; + sha512 = "3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ=="; }; }; "bl-4.1.0" = { @@ -1081,7 +1063,7 @@ let version = "3.5.0"; src = fetchurl { url = "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz"; - sha1 = "791420d7f551eea2897453a8a77653f96606d67c"; + sha512 = "3LE8m8bqjGdoxfvf71yhFNrUcwy3NLy00SAo+b6MfJ8l+Bc2DzQ7mUHwX6pjK2AxfgV+YfsjCeVW3T5HLQTBsQ=="; }; }; "bluebird-3.7.1" = { @@ -1090,7 +1072,7 @@ let version = "3.7.1"; src = fetchurl { url = "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz"; - sha1 = "df70e302b471d7473489acf26a93d63b53f874de"; + sha512 = "DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg=="; }; }; "bluebird-3.7.2" = { @@ -1144,7 +1126,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha1 = "3454e1a462ee8d599e236df336cd9ea4f8afe107"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; }; }; "btoa-lite-1.0.0" = { @@ -1153,7 +1135,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/btoa-lite/-/btoa-lite-1.0.0.tgz"; - sha1 = "337766da15801210fdd956c22e9c6891ab9d0337"; + sha512 = "gvW7InbIyF8AicrqWoptdW08pUxuhq8BEgowNajy9RhiE86fmGAGl+bLKo6oB8QP0CkqHLowfN0oJdKC/J6LbA=="; }; }; "buffer-5.7.1" = { @@ -1171,16 +1153,7 @@ let version = "0.2.13"; src = fetchurl { url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; - sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; - }; - }; - "buffer-from-1.1.1" = { - name = "buffer-from"; - packageName = "buffer-from"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz"; - sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; + sha512 = "VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ=="; }; }; "byte-size-6.2.0" = { @@ -1198,16 +1171,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; - sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + sha512 = "pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw=="; }; }; - "bytes-3.1.0" = { + "bytes-3.1.2" = { name = "bytes"; packageName = "bytes"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; - sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"; + sha512 = "/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="; }; }; "cache-base-1.0.1" = { @@ -1237,13 +1210,13 @@ let sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; }; }; - "cacheable-request-7.0.1" = { + "cacheable-request-7.0.2" = { name = "cacheable-request"; packageName = "cacheable-request"; - version = "7.0.1"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz"; - sha512 = "lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw=="; + url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz"; + sha512 = "pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew=="; }; }; "cachedir-2.3.0" = { @@ -1255,13 +1228,22 @@ let sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw=="; }; }; + "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=="; + }; + }; "call-me-maybe-1.0.1" = { name = "call-me-maybe"; packageName = "call-me-maybe"; version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz"; - sha1 = "26d208ea89e37b5cbde60250a15f031c16a4d66b"; + sha512 = "wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw=="; }; }; "caller-callsite-2.0.0" = { @@ -1270,7 +1252,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; - sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; + sha512 = "JuG3qI4QOftFsZyOn1qq87fq5grLIyk1JYd5lJmdA+fG7aQ9pA/i3JIJGcO3q0MrRcHlOt1U+ZeHW8Dq9axALQ=="; }; }; "caller-path-2.0.0" = { @@ -1279,7 +1261,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; - sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; + sha512 = "MCL3sf6nCSXOwCTzvPKhN18TU7AHTvdtam8DAogxcrJ8Rjfbbg7Lgng64H9Iy+vUV6VGFClN/TyxBkAebLRR4A=="; }; }; "callsites-2.0.0" = { @@ -1288,7 +1270,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; + sha512 = "ksWePWBloaWPxJYQ8TL0JHvtci6G5QTKwQ95RcWAa/lzoAKuAOflGdAK92hpHXjkwb8zLxoLNUoNYZgVsaJzvQ=="; }; }; "callsites-3.1.0" = { @@ -1306,7 +1288,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; - sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + sha512 = "DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw=="; }; }; "camelcase-4.1.0" = { @@ -1315,7 +1297,7 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; + sha512 = "FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw=="; }; }; "camelcase-5.3.1" = { @@ -1327,13 +1309,13 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "camelcase-keys-4.2.0" = { + "camelcase-keys-6.2.2" = { name = "camelcase-keys"; packageName = "camelcase-keys"; - version = "4.2.0"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz"; - sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz"; + sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg=="; }; }; "cardinal-2.1.1" = { @@ -1342,7 +1324,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz"; - sha1 = "7cc1055d822d212954d07b085dea251cc7bc5505"; + sha512 = "JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw=="; }; }; "caseless-0.12.0" = { @@ -1351,7 +1333,7 @@ let version = "0.12.0"; src = fetchurl { url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; + sha512 = "4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw=="; }; }; "chalk-1.1.3" = { @@ -1360,7 +1342,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; - sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="; }; }; "chalk-2.4.1" = { @@ -1381,31 +1363,13 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "chalk-3.0.0" = { + "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; - version = "3.0.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"; - sha512 = "4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg=="; - }; - }; - "chalk-4.0.0" = { - name = "chalk"; - packageName = "chalk"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz"; - sha512 = "N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A=="; - }; - }; - "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=="; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; "chardet-0.7.0" = { @@ -1423,7 +1387,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/chdir-promise/-/chdir-promise-0.4.0.tgz"; - sha1 = "46dc602ed193197470140f152459a4382cf79974"; + sha512 = "fAvt/5sjLFKVp5bOc6FnMWB7kcXHk1uZSQa6tWdkkcT/Dv/hmsVwuabyDujd6G7a17mZipoYLJEaQcSEYrTG6Q=="; }; }; "check-more-types-2.23.0" = { @@ -1432,7 +1396,7 @@ let version = "2.23.0"; src = fetchurl { url = "https://registry.npmjs.org/check-more-types/-/check-more-types-2.23.0.tgz"; - sha1 = "6226264d30b1095aa1c0a5b874edbdd5d2d0a66f"; + sha512 = "dDo5EKT4pZj5GArqso+z2TJmk5/fb+MqtwqJO4IdVhmL9rjglTvndCTRRwxDlQT9FObaYJENljJ0A+8ckAYakQ=="; }; }; "check-more-types-2.24.0" = { @@ -1441,7 +1405,7 @@ let version = "2.24.0"; src = fetchurl { url = "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz"; - sha1 = "1420ffb10fd444dcfc79b43891bbfffd32a84600"; + sha512 = "Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA=="; }; }; "chownr-1.1.4" = { @@ -1462,13 +1426,13 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; - "ci-info-3.1.1" = { + "ci-info-3.3.2" = { name = "ci-info"; packageName = "ci-info"; - version = "3.1.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-3.1.1.tgz"; - sha512 = "kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ=="; + url = "https://registry.npmjs.org/ci-info/-/ci-info-3.3.2.tgz"; + sha512 = "xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg=="; }; }; "class-utils-0.3.6" = { @@ -1495,25 +1459,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz"; - sha1 = "4fa917c3e59c94a004cd61f8ee509da651687143"; - }; - }; - "cli-cursor-1.0.2" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz"; - sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987"; - }; - }; - "cli-cursor-2.1.0" = { - name = "cli-cursor"; - packageName = "cli-cursor"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + sha512 = "3Fo5wu8Ytle8q9iCzS4D2MWVL2X7JVWRiS1BnXbTFDhS9c/REkM9vd1AmabsoZoY5/dGi5TT9iKL8Kb6DeBRQg=="; }; }; "cli-cursor-3.1.0" = { @@ -1531,34 +1477,43 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz"; - sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"; + sha512 = "h/TzJrgwzVV+W6laITBZAxAWfBjX4T0x+LF5XJdS1AzDkXqmraMNnKQ/O/f3AHJKVR85fOglUEdS/B0P1wS7Aw=="; }; }; - "cli-table3-0.6.0" = { + "cli-table-0.3.11" = { + name = "cli-table"; + packageName = "cli-table"; + version = "0.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.11.tgz"; + sha512 = "IqLQi4lO0nIB4tcdTpN4LCB9FI3uqrJZK7RC515EnhZ6qBaglkIgICb1wjeAqpdoOabm1+SuQtkXIPdYC93jhQ=="; + }; + }; + "cli-table3-0.6.2" = { name = "cli-table3"; packageName = "cli-table3"; - version = "0.6.0"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.0.tgz"; - sha512 = "gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ=="; + url = "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.2.tgz"; + sha512 = "QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw=="; }; }; - "cli-truncate-0.2.1" = { + "cli-truncate-2.1.0" = { name = "cli-truncate"; packageName = "cli-truncate"; - version = "0.2.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-0.2.1.tgz"; - sha1 = "9f15cfbb0705005369216c626ac7d05ab90dd574"; + url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz"; + sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg=="; }; }; - "cli-width-2.2.1" = { + "cli-width-3.0.0" = { name = "cli-width"; packageName = "cli-width"; - version = "2.2.1"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz"; - sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; + url = "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"; + sha512 = "FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="; }; }; "clipboardy-1.2.3" = { @@ -1576,7 +1531,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; + sha512 = "0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w=="; }; }; "cliui-6.0.0" = { @@ -1588,13 +1543,13 @@ let sha512 = "t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="; }; }; - "clone-response-1.0.2" = { + "clone-response-1.0.3" = { name = "clone-response"; packageName = "clone-response"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz"; - sha1 = "d1dc973920314df67fbeb94223b4ee350239e96b"; + url = "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz"; + sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA=="; }; }; "co-4.6.0" = { @@ -1603,7 +1558,7 @@ let version = "4.6.0"; src = fetchurl { url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; + sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; }; }; "co-body-6.1.0" = { @@ -1621,7 +1576,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; + sha512 = "RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA=="; }; }; "collection-visit-1.0.0" = { @@ -1630,7 +1585,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; - sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; + sha512 = "lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw=="; }; }; "colon-names-1.0.0" = { @@ -1666,7 +1621,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; }; "color-name-1.1.4" = { @@ -1678,13 +1633,22 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; + "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=="; + }; + }; "colors-1.0.3" = { name = "colors"; packageName = "colors"; version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz"; - sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; + sha512 = "pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw=="; }; }; "colors-1.1.2" = { @@ -1693,16 +1657,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; - }; - }; - "colors-1.4.0" = { - name = "colors"; - packageName = "colors"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"; - sha512 = "a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="; + sha512 = "ENwblkFQpqqia6b++zLD/KUWafYlVY/UNnAp7oz7LY7E924wmpye416wBOmvv/HMWzl8gL1kJlfvId/1Dg176w=="; }; }; "combined-stream-1.0.8" = { @@ -1711,34 +1666,25 @@ let version = "1.0.8"; src = fetchurl { url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"; - sha1 = "c3d45a8b34fd730631a110a8a2520682b31d5a7f"; + sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; - "command-line-args-5.1.1" = { + "command-line-args-5.2.1" = { name = "command-line-args"; packageName = "command-line-args"; - version = "5.1.1"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz"; - sha512 = "hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg=="; + url = "https://registry.npmjs.org/command-line-args/-/command-line-args-5.2.1.tgz"; + sha512 = "H4UfQhZyakIjC74I9d34fGYDwk3XpSr17QhEd0Q3I9Xq1CETHo4Hcuo87WyWHpAF1aSLjLRf5lD9ZGX2qStUvg=="; }; }; - "command-line-usage-6.1.1" = { + "command-line-usage-6.1.3" = { name = "command-line-usage"; packageName = "command-line-usage"; - version = "6.1.1"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz"; - sha512 = "F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA=="; - }; - }; - "commander-2.20.3" = { - name = "commander"; - packageName = "commander"; - version = "2.20.3"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"; - sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; + url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.3.tgz"; + sha512 = "sH5ZSPr+7UStsloltmDh7Ce5fb8XPlHyoPzTpyyMuYCtervL65+ubVZ6Q61cFtFl62UyJlc8/JwERRbAFPUqgw=="; }; }; "commander-2.9.0" = { @@ -1747,7 +1693,7 @@ let version = "2.9.0"; src = fetchurl { url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"; - sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; + sha512 = "bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A=="; }; }; "commander-5.1.0" = { @@ -1777,13 +1723,22 @@ let sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; }; }; - "compare-func-1.3.2" = { + "common-tags-1.8.2" = { + name = "common-tags"; + packageName = "common-tags"; + version = "1.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz"; + sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="; + }; + }; + "compare-func-2.0.0" = { name = "compare-func"; packageName = "compare-func"; - version = "1.3.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz"; - sha1 = "99dd0ba457e1f9bc722b12c08ec33eeab31fa648"; + url = "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz"; + sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA=="; }; }; "component-emitter-1.3.0" = { @@ -1795,6 +1750,15 @@ let sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; }; }; + "compress-brotli-1.3.8" = { + name = "compress-brotli"; + packageName = "compress-brotli"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/compress-brotli/-/compress-brotli-1.3.8.tgz"; + sha512 = "lVcQsjhxhIXsuupfy9fmZUFtAIdBmXA7EGY6GBdgZ++qkM9zG4YFT8iU7FoBxzryNDMOpD1HIFHUSX4D87oqhQ=="; + }; + }; "compressible-2.0.18" = { name = "compressible"; packageName = "compressible"; @@ -1819,16 +1783,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "concat-stream-1.6.2" = { - name = "concat-stream"; - packageName = "concat-stream"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"; - sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; }; "content-disposition-0.5.2" = { @@ -1837,7 +1792,7 @@ let version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; + sha512 = "kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA=="; }; }; "content-type-1.0.4" = { @@ -1849,40 +1804,40 @@ let sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; }; }; - "conventional-changelog-angular-5.0.6" = { + "conventional-changelog-angular-5.0.13" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "5.0.6"; + version = "5.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz"; - sha512 = "QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA=="; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.13.tgz"; + sha512 = "i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA=="; }; }; - "conventional-changelog-writer-4.0.11" = { + "conventional-changelog-writer-4.1.0" = { name = "conventional-changelog-writer"; packageName = "conventional-changelog-writer"; - version = "4.0.11"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.0.11.tgz"; - sha512 = "g81GQOR392I+57Cw3IyP1f+f42ME6aEkbR+L7v1FBBWolB0xkjKTeCWVguzRrp6UiT1O6gBpJbEy2eq7AnV1rw=="; + url = "https://registry.npmjs.org/conventional-changelog-writer/-/conventional-changelog-writer-4.1.0.tgz"; + sha512 = "WwKcUp7WyXYGQmkLsX4QmU42AZ1lqlvRW9mqoyiQzdD+rJWbTepdWoKJuwXTS+yq79XKnQNa93/roViPQrAQgw=="; }; }; - "conventional-commits-filter-2.0.2" = { + "conventional-commits-filter-2.0.7" = { name = "conventional-commits-filter"; packageName = "conventional-commits-filter"; - version = "2.0.2"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz"; - sha512 = "WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ=="; + url = "https://registry.npmjs.org/conventional-commits-filter/-/conventional-commits-filter-2.0.7.tgz"; + sha512 = "ASS9SamOP4TbCClsRHxIHXRfcGCnIoQqkvAzCSbZzTFLfcTqJVugB0agRgsEELsqaeWgsXv513eS116wnlSSPA=="; }; }; - "conventional-commits-parser-3.0.8" = { + "conventional-commits-parser-3.2.4" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "3.0.8"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.8.tgz"; - sha512 = "YcBSGkZbYp7d+Cr3NWUeXbPDFUN6g3SaSIzOybi8bjHL5IJ5225OSCxJJ4LgziyEJ7AaJtE9L2/EU6H7Nt/DDQ=="; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.2.4.tgz"; + sha512 = "nK7sAtfi+QXbxHCYfhpZsfRtaitZLIA6889kFIouLvz6repszQDgxBu7wf2WbU+Dco7sAnNCJYERCwt54WPC2Q=="; }; }; "cookies-0.8.0" = { @@ -1900,7 +1855,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; - sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; + sha512 = "XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw=="; }; }; "copy-to-2.0.1" = { @@ -1909,16 +1864,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/copy-to/-/copy-to-2.0.1.tgz"; - sha1 = "2680fbb8068a48d08656b6098092bdafc906f4a5"; + sha512 = "3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w=="; }; }; - "core-js-2.6.11" = { + "core-js-2.6.12" = { name = "core-js"; packageName = "core-js"; - version = "2.6.11"; + version = "2.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz"; - sha512 = "5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"; + sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; "core-util-is-1.0.2" = { @@ -1927,7 +1882,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; }; }; "cosmiconfig-5.2.1" = { @@ -1963,7 +1918,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + sha512 = "pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A=="; }; }; "cross-spawn-6.0.5" = { @@ -1975,15 +1930,6 @@ let sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; - "cross-spawn-7.0.2" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "7.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz"; - sha512 = "PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw=="; - }; - }; "cross-spawn-7.0.3" = { name = "cross-spawn"; packageName = "cross-spawn"; @@ -1999,25 +1945,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz"; - sha1 = "a230f64f568310e1498009940790ec99545bca7e"; + sha512 = "GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg=="; }; }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; - }; - }; - "cypress-7.3.0" = { + "cypress-10.0.0" = { name = "cypress"; packageName = "cypress"; - version = "7.3.0"; + version = "10.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/cypress/-/cypress-7.3.0.tgz"; - sha512 = "aseRCH1tRVCrM6oEfja6fR/bo5l6e4SkHRRSATh27UeN4f/ANC8U7tGIulmrISJVy9xuOkOdbYKbUb2MNM+nrw=="; + url = "https://registry.npmjs.org/cypress/-/cypress-10.0.0.tgz"; + sha512 = "OdND7TaYZcDD+UYBlL6VCEMZcsclliG9TY/T6zLzeGtwOf5dwi+41nU9XAZzSbByoqturb8HS4G/+XD8PthN5w=="; }; }; "d3-helpers-0.3.0" = { @@ -2026,7 +1963,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/d3-helpers/-/d3-helpers-0.3.0.tgz"; - sha1 = "4b31dce4a2121a77336384574d893fbed5fb293d"; + sha512 = "uNJ5QRsTW7CdNC6CHX528VwIEzYCC/iFHMQ9ReaDUGA+iiJXHcR2uKobK68FkKSWmNYPxwaUV+9SswjoygF6VA=="; }; }; "dashdash-1.14.1" = { @@ -2035,16 +1972,7 @@ let version = "1.14.1"; src = fetchurl { url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "date-fns-1.30.1" = { - name = "date-fns"; - packageName = "date-fns"; - version = "1.30.1"; - src = fetchurl { - url = "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz"; - sha512 = "hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw=="; + sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; "dateformat-3.0.3" = { @@ -2056,13 +1984,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.10.4" = { + "dayjs-1.11.3" = { name = "dayjs"; packageName = "dayjs"; - version = "1.10.4"; + version = "1.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz"; - sha512 = "RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.3.tgz"; + sha512 = "xxwlswWOlGhzgQ4TKzASQkUhqERI3egRNqgV4ScR8wlANA/A9tZ7miXa44vTTKEq5l7vWoL5G57bG3zA+Kow0A=="; }; }; "debug-2.6.3" = { @@ -2071,7 +1999,7 @@ let version = "2.6.3"; src = fetchurl { url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; - sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; + sha512 = "9k275CFA9z/NW+7nojeyxyOCFYsc+Dfiq4Sg8CBP5WjzmJT5K1utEepahY7wuWhlsumHgmAqnwAnxPCgOOyAHA=="; }; }; "debug-2.6.9" = { @@ -2083,15 +2011,6 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-3.1.0" = { - name = "debug"; - packageName = "debug"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; - }; - }; "debug-3.2.7" = { name = "debug"; packageName = "debug"; @@ -2110,22 +2029,13 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "debug-4.3.1" = { + "debug-4.3.4" = { name = "debug"; packageName = "debug"; - version = "4.3.1"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz"; - sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ=="; - }; - }; - "debug-4.3.2" = { - name = "debug"; - packageName = "debug"; - version = "4.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; + url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; }; "decamelize-1.2.0" = { @@ -2134,7 +2044,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; }; "decamelize-keys-1.1.0" = { @@ -2143,7 +2053,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; - sha1 = "d171a87933252807eb3cb61dc1c1445d078df2d9"; + sha512 = "ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg=="; }; }; "decode-uri-component-0.2.0" = { @@ -2152,7 +2062,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="; }; }; "decompress-response-5.0.0" = { @@ -2170,7 +2080,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; - sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + sha512 = "bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw=="; }; }; "deep-extend-0.6.0" = { @@ -2182,13 +2092,13 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; - "deep-is-0.1.3" = { + "deep-is-0.1.4" = { name = "deep-is"; packageName = "deep-is"; - version = "0.1.3"; + version = "0.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"; + sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; }; "defer-to-connect-2.0.1" = { @@ -2200,13 +2110,13 @@ let sha512 = "4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="; }; }; - "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=="; }; }; "define-property-0.2.5" = { @@ -2215,7 +2125,7 @@ let version = "0.2.5"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; - sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + sha512 = "Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA=="; }; }; "define-property-1.0.0" = { @@ -2224,7 +2134,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; - sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + sha512 = "cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA=="; }; }; "define-property-2.0.2" = { @@ -2242,7 +2152,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; }; }; "delegates-1.0.0" = { @@ -2251,7 +2161,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"; - sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; }; }; "depd-1.1.2" = { @@ -2260,7 +2170,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; }; }; "depd-2.0.0" = { @@ -2281,22 +2191,22 @@ let sha512 = "xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ=="; }; }; - "destroy-1.0.4" = { + "destroy-1.2.0" = { name = "destroy"; packageName = "destroy"; - version = "1.0.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; + url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; + sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; }; }; - "detect-indent-6.0.0" = { + "detect-indent-6.1.0" = { name = "detect-indent"; packageName = "detect-indent"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/detect-indent/-/detect-indent-6.0.0.tgz"; - sha512 = "oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA=="; + url = "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz"; + sha512 = "reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA=="; }; }; "detect-newline-3.1.0" = { @@ -2317,13 +2227,13 @@ let sha512 = "0M8kobnSQE0Jmly7Mhbeq0W/PpZfnuK+WjN2ZRVPbGqYwCHCioAVp84H0TcLimgECcN5H976y5QiXMGBC9JKmg=="; }; }; - "diff-match-patch-1.0.4" = { + "diff-match-patch-1.0.5" = { name = "diff-match-patch"; packageName = "diff-match-patch"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.4.tgz"; - sha512 = "Uv3SW8bmH9nAtHKaKSanOQmj2DnlH65fUpcrMdfdaOxUG02QQ4YGZ8AE7kKOMisF7UqvOlGKVYWRvezdncW9lg=="; + url = "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz"; + sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; "dir-glob-2.2.2" = { @@ -2341,7 +2251,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"; - sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; + sha512 = "WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA=="; }; }; "doctrine-3.0.0" = { @@ -2353,22 +2263,22 @@ let sha512 = "yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w=="; }; }; - "dot-prop-3.0.0" = { + "dot-prop-5.3.0" = { name = "dot-prop"; packageName = "dot-prop"; - version = "3.0.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz"; - sha1 = "1b708af094a49c9a0e7dbcad790aba539dac1177"; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz"; + sha512 = "QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q=="; }; }; - "duplexer-0.1.1" = { + "duplexer-0.1.2" = { name = "duplexer"; packageName = "duplexer"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"; + sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; }; "duplexer2-0.1.4" = { @@ -2377,16 +2287,16 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz"; - sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1"; + sha512 = "asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA=="; }; }; - "duplexer3-0.1.4" = { + "duplexer3-0.1.5" = { name = "duplexer3"; packageName = "duplexer3"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz"; + sha512 = "1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="; }; }; "ecc-jsbn-0.1.2" = { @@ -2395,7 +2305,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; }; }; "ee-first-1.1.1" = { @@ -2404,16 +2314,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; - }; - }; - "elegant-spinner-1.0.1" = { - name = "elegant-spinner"; - packageName = "elegant-spinner"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-1.0.1.tgz"; - sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; + sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; "emoji-regex-7.0.3" = { @@ -2440,7 +2341,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; "end-of-stream-1.4.4" = { @@ -2452,6 +2353,15 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; + "enquirer-2.3.6" = { + name = "enquirer"; + packageName = "enquirer"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; + sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; + }; + }; "env-ci-4.5.2" = { name = "env-ci"; packageName = "env-ci"; @@ -2470,13 +2380,13 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.17.5" = { + "es-abstract-1.20.1" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.5"; + version = "1.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; - sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz"; + sha512 = "WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA=="; }; }; "es-to-primitive-1.2.1" = { @@ -2494,7 +2404,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; }; }; "escape-string-regexp-1.0.5" = { @@ -2503,7 +2413,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; }; "eslint-7.0.0" = { @@ -2551,40 +2461,40 @@ let sha512 = "bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg=="; }; }; - "eslint-scope-5.0.0" = { + "eslint-scope-5.1.1" = { name = "eslint-scope"; packageName = "eslint-scope"; - version = "5.0.0"; + version = "5.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz"; - sha512 = "oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw=="; + url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; - "eslint-utils-2.0.0" = { + "eslint-utils-2.1.0" = { name = "eslint-utils"; packageName = "eslint-utils"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz"; - sha512 = "0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA=="; + url = "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha512 = "w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg=="; }; }; - "eslint-visitor-keys-1.1.0" = { + "eslint-visitor-keys-1.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; - version = "1.1.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha512 = "8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A=="; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha512 = "6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ=="; }; }; - "espree-7.0.0" = { + "espree-7.3.1" = { name = "espree"; packageName = "espree"; - version = "7.0.0"; + version = "7.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-7.0.0.tgz"; - sha512 = "/r2XEx5Mw4pgKdyb7GNLQNsu++asx/dltf/CI8RFi9oGHxmQFgvLbc5Op4U6i8Oaj+kdslhJtVlEZeAqH5qOTw=="; + url = "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz"; + sha512 = "v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g=="; }; }; "esprima-4.0.1" = { @@ -2596,22 +2506,22 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esquery-1.3.1" = { + "esquery-1.4.0" = { name = "esquery"; packageName = "esquery"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; - sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"; + sha512 = "cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w=="; }; }; - "esrecurse-4.2.1" = { + "esrecurse-4.3.0" = { name = "esrecurse"; packageName = "esrecurse"; - version = "4.2.1"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz"; - sha512 = "64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ=="; + url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"; + sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag=="; }; }; "estraverse-4.3.0" = { @@ -2623,13 +2533,13 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.1.0" = { + "estraverse-5.3.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.1.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz"; - sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"; + sha512 = "MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="; }; }; "esutils-2.0.3" = { @@ -2647,7 +2557,7 @@ let version = "1.8.1"; src = fetchurl { url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; "event-stream-3.3.4" = { @@ -2656,16 +2566,16 @@ let version = "3.3.4"; src = fetchurl { url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz"; - sha1 = "4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571"; + sha512 = "QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g=="; }; }; - "eventemitter2-6.4.4" = { + "eventemitter2-6.4.6" = { name = "eventemitter2"; packageName = "eventemitter2"; - version = "6.4.4"; + version = "6.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.4.tgz"; - sha512 = "HLU3NDY6wARrLCEwyGKRBvuWYyvW6mHYv72SJJAH3iJN3a6eVUvkjFkcxah1bcTgGVBBrFdIopBJPhCQFMLyXw=="; + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.6.tgz"; + sha512 = "OHqo4wbHX5VbvlbB6o6eDwhYmiTjrpWACjF8Pmof/GTD6rdBNdZFNck3xlhqOiQFGCOoq3uzHvA0cQpFHIGVAQ=="; }; }; "execa-0.7.0" = { @@ -2674,7 +2584,7 @@ let version = "0.7.0"; src = fetchurl { url = "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz"; - sha1 = "944becd34cc41ee32a63a9faf27ad5a65fc59777"; + sha512 = "RztN09XglpYI7aBBrJCPW95jEH7YF1UEPOoX9yDhUTPdp7mK+CQvnLTuD10BNXZ3byLTu2uehZ8EcKT/4CGiFw=="; }; }; "execa-0.8.0" = { @@ -2683,7 +2593,7 @@ let version = "0.8.0"; src = fetchurl { url = "https://registry.npmjs.org/execa/-/execa-0.8.0.tgz"; - sha1 = "d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da"; + sha512 = "zDWS+Rb1E8BlqqhALSt9kUhss8Qq4nN3iof3gsOdyINksElaPyNBtKUMTR62qhvgVWR0CqCX7sdnKe4MnUbFEA=="; }; }; "execa-1.0.0" = { @@ -2710,7 +2620,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz"; - sha1 = "e5d3ecd837d2a60ec50f3da78fd39767747bbe99"; + sha512 = "Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw=="; }; }; "execa-3.4.0" = { @@ -2740,22 +2650,13 @@ let sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; }; }; - "exit-hook-1.1.1" = { - name = "exit-hook"; - packageName = "exit-hook"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz"; - sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; - }; - }; "expand-brackets-2.1.4" = { name = "expand-brackets"; packageName = "expand-brackets"; version = "2.1.4"; src = fetchurl { url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; - sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + sha512 = "w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA=="; }; }; "extend-3.0.2" = { @@ -2764,7 +2665,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"; - sha1 = "f8b1136b4071fbd8eb140aff858b1019ec2915fa"; + sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; "extend-shallow-2.0.1" = { @@ -2773,7 +2674,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + sha512 = "zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug=="; }; }; "extend-shallow-3.0.2" = { @@ -2782,7 +2683,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + sha512 = "BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q=="; }; }; "external-editor-3.1.0" = { @@ -2803,15 +2704,6 @@ let sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; }; }; - "extract-zip-1.7.0" = { - name = "extract-zip"; - packageName = "extract-zip"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz"; - sha512 = "xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA=="; - }; - }; "extract-zip-2.0.1" = { name = "extract-zip"; packageName = "extract-zip"; @@ -2827,7 +2719,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="; }; }; "fast-deep-equal-2.0.1" = { @@ -2836,16 +2728,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + sha512 = "bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w=="; }; }; - "fast-deep-equal-3.1.1" = { + "fast-deep-equal-3.1.3" = { name = "fast-deep-equal"; packageName = "fast-deep-equal"; - version = "3.1.1"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="; + url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; "fast-glob-2.2.7" = { @@ -2857,13 +2749,13 @@ let sha512 = "g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw=="; }; }; - "fast-glob-3.2.2" = { + "fast-glob-3.2.11" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.2"; + version = "3.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz"; - sha512 = "UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"; + sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -2881,7 +2773,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; }; "fast-url-parser-1.1.3" = { @@ -2890,16 +2782,16 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz"; - sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; + sha512 = "5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ=="; }; }; - "fastq-1.7.0" = { + "fastq-1.13.0" = { name = "fastq"; packageName = "fastq"; - version = "1.7.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.7.0.tgz"; - sha512 = "YOadQRnHd5q6PogvAR/x62BGituF2ufiEA6s8aavQANw5YKHERI4AREboX6KotzP8oX2klxYF2wcV/7bn1clfQ=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"; + sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; }; "fd-slicer-1.1.0" = { @@ -2908,16 +2800,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "25c7c89cb1f9077f8891bbe61d8f390eae256f1e"; - }; - }; - "figures-1.7.0" = { - name = "figures"; - packageName = "figures"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"; - sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; + sha512 = "cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g=="; }; }; "figures-2.0.0" = { @@ -2926,7 +2809,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + sha512 = "Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="; }; }; "figures-3.2.0" = { @@ -2953,7 +2836,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; - sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + sha512 = "VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ=="; }; }; "fill-range-7.0.1" = { @@ -2962,7 +2845,7 @@ let version = "7.0.1"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha1 = "1919a6a7c75fe38b2c7c77e5198535da9acdda40"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; "find-replace-3.0.0" = { @@ -2980,7 +2863,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ=="; }; }; "find-up-3.0.0" = { @@ -3034,7 +2917,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + sha512 = "7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="; }; }; "forever-agent-0.6.1" = { @@ -3043,7 +2926,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="; }; }; "form-data-2.3.3" = { @@ -3052,7 +2935,7 @@ let version = "2.3.3"; src = fetchurl { url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"; - sha1 = "dcce52c05f644f298c6a7ab936bd724ceffbf3a6"; + sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; "fragment-cache-0.2.1" = { @@ -3061,7 +2944,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; - sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + sha512 = "GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA=="; }; }; "fresh-0.5.2" = { @@ -3070,7 +2953,7 @@ let version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; }; }; "from-0.1.7" = { @@ -3079,7 +2962,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/from/-/from-0.1.7.tgz"; - sha1 = "83c60afc58b9c56997007ed1a768b3ab303a44fe"; + sha512 = "twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g=="; }; }; "from2-2.3.0" = { @@ -3088,7 +2971,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; - sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + sha512 = "OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g=="; }; }; "fs-constants-1.0.0" = { @@ -3124,7 +3007,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; "function-bind-1.1.1" = { @@ -3136,13 +3019,31 @@ 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=="; + }; + }; "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"; - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + 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" = { @@ -3154,6 +3055,15 @@ let 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-stdin-6.0.0" = { name = "get-stdin"; packageName = "get-stdin"; @@ -3169,7 +3079,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz"; - sha1 = "8e943d1358dc37555054ecbe2edb05aa174ede14"; + sha512 = "GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ=="; }; }; "get-stream-4.1.0" = { @@ -3181,15 +3091,6 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; - "get-stream-5.1.0" = { - name = "get-stream"; - packageName = "get-stream"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; - sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; - }; - }; "get-stream-5.2.0" = { name = "get-stream"; packageName = "get-stream"; @@ -3199,13 +3100,22 @@ let sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; + "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=="; + }; + }; "get-value-2.0.6" = { name = "get-value"; packageName = "get-value"; version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; - sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + sha512 = "Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA=="; }; }; "getos-3.2.1" = { @@ -3223,7 +3133,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; }; }; "ggit-1.15.1" = { @@ -3232,7 +3142,7 @@ let version = "1.15.1"; src = fetchurl { url = "https://registry.npmjs.org/ggit/-/ggit-1.15.1.tgz"; - sha1 = "80d552e8e1712c9805fe5ba1cf119a4e7e3bd998"; + sha512 = "xfdO/qLRT2Xqv8sZgom726ZhWmBBjhTd6qKhEZ1LnRzAu14bN+qf+CGd/u1YJP0k18KEbC65gsW/pbKnNtOWzg=="; }; }; "git-hooks-list-1.0.3" = { @@ -3250,7 +3160,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/git-log-parser/-/git-log-parser-1.2.0.tgz"; - sha1 = "2e6a4c1b13fc00028207ba795a7ac31667b9fd4a"; + sha512 = "rnCVNfkTL8tdNryFuaY0fYiBWEBcgF748O6ZI61rslBvr2o7U65c2/6npCRqH40vuAhtgtDiqLTJjBVdrejCzA=="; }; }; "glob-7.1.1" = { @@ -3259,16 +3169,16 @@ let version = "7.1.1"; src = fetchurl { url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; - sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; + sha512 = "mRyN/EsN2SyNhKWykF3eEGhDpeNplMWaW18Bmh76tnOqk5TbELAVwFAYOCmKVssOYFrYvvLMguiA+NXO3ZTuVA=="; }; }; - "glob-7.1.6" = { + "glob-7.2.3" = { name = "glob"; packageName = "glob"; - version = "7.1.6"; + version = "7.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; - sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; + url = "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"; + sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; }; "glob-parent-3.1.0" = { @@ -3277,16 +3187,16 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; - sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + sha512 = "E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA=="; }; }; - "glob-parent-5.1.1" = { + "glob-parent-5.1.2" = { name = "glob-parent"; packageName = "glob-parent"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; - sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; + sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; }; }; "glob-to-regexp-0.3.0" = { @@ -3295,7 +3205,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"; - sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; + sha512 = "Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig=="; }; }; "global-dirs-3.0.0" = { @@ -3361,13 +3271,13 @@ let sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; "graceful-readlink-1.0.1" = { @@ -3376,16 +3286,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; + sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w=="; }; }; - "handlebars-4.7.6" = { + "handlebars-4.7.7" = { name = "handlebars"; packageName = "handlebars"; - version = "4.7.6"; + version = "4.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz"; - sha512 = "1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz"; + sha512 = "aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA=="; }; }; "har-schema-2.0.0" = { @@ -3394,16 +3304,25 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="; }; }; - "har-validator-5.1.3" = { + "har-validator-5.1.5" = { name = "har-validator"; packageName = "har-validator"; - version = "5.1.3"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; + url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"; + sha512 = "nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="; + }; + }; + "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=="; }; }; "has-1.0.3" = { @@ -3421,7 +3340,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg=="; + }; + }; + "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-2.0.0" = { @@ -3430,7 +3358,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz"; - sha1 = "e8207af1cc7b30d446cc70b734b5e8be18f88d51"; + sha512 = "P+1n3MnwjR/Epg9BBo1KT8qbye2g2Ou4sFumihwt6I4tsUX7jnLcX4BTOSKg/B1ZrIYMN9FcEnG4x5a7NB8Eng=="; }; }; "has-flag-3.0.0" = { @@ -3439,7 +3367,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; }; "has-flag-4.0.0" = { @@ -3451,13 +3379,31 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-symbols-1.0.1" = { + "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.1"; + version = "1.0.3"; 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-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-value-0.3.1" = { @@ -3466,7 +3412,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; - sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + sha512 = "gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q=="; }; }; "has-value-1.0.0" = { @@ -3475,7 +3421,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; - sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + sha512 = "IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw=="; }; }; "has-values-0.1.4" = { @@ -3484,7 +3430,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; - sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + sha512 = "J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ=="; }; }; "has-values-1.0.0" = { @@ -3493,7 +3439,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; - sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + sha512 = "ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ=="; }; }; "hook-std-2.0.0" = { @@ -3505,31 +3451,40 @@ let sha512 = "zZ6T5WcuBMIUVh49iPQS9t977t7C0l7OtHrpeMb5uk48JdflRX0NSFvCekfYNmGQETnLq9W/isMyHl69kxGi8g=="; }; }; - "hosted-git-info-2.8.8" = { + "hosted-git-info-2.8.9" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.8.8"; + version = "2.8.9"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz"; - sha512 = "f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"; + sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw=="; }; }; - "hosted-git-info-3.0.4" = { + "hosted-git-info-3.0.8" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "3.0.4"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.4.tgz"; - sha512 = "4oT62d2jwSDBbLLFLZE+1vPuQ1h8p9wjrJ8Mqx5TjsyWmBMV5B13eJqn8pvluqubLf3cJPTfiYCIwNwDNmzScQ=="; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz"; + sha512 = "aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw=="; }; }; - "http-assert-1.4.1" = { + "hosted-git-info-4.1.0" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz"; + sha512 = "kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA=="; + }; + }; + "http-assert-1.5.0" = { name = "http-assert"; packageName = "http-assert"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-assert/-/http-assert-1.4.1.tgz"; - sha512 = "rdw7q6GTlibqVVbXr0CKelfV5iY8G2HqEUkhSk297BMbSpSL8crXC+9rjKoMcZZEsksX30le6f/4ul4E28gegw=="; + url = "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz"; + sha512 = "uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w=="; }; }; "http-cache-semantics-4.1.0" = { @@ -3547,25 +3502,25 @@ let version = "1.6.3"; src = fetchurl { url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; - sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + sha512 = "lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A=="; }; }; - "http-errors-1.7.3" = { + "http-errors-1.8.1" = { name = "http-errors"; packageName = "http-errors"; - version = "1.7.3"; + version = "1.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; - sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; }; }; - "http-errors-1.8.0" = { + "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; - version = "1.8.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.0.tgz"; - sha512 = "4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; }; }; "http-proxy-agent-3.0.0" = { @@ -3592,7 +3547,16 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; + }; + }; + "http-signature-1.3.6" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz"; + sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; }; }; "https-proxy-agent-4.0.0" = { @@ -3604,13 +3568,13 @@ let sha512 = "zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg=="; }; }; - "https-proxy-agent-5.0.0" = { + "https-proxy-agent-5.0.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; "human-signals-1.1.1" = { @@ -3658,13 +3622,13 @@ let sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; }; }; - "ignore-5.1.4" = { + "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; - version = "5.1.4"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz"; - sha1 = "84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"; + url = "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"; + sha512 = "CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ=="; }; }; "import-fresh-2.0.0" = { @@ -3673,16 +3637,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz"; - sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + sha512 = "eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg=="; }; }; - "import-fresh-3.2.1" = { + "import-fresh-3.3.0" = { name = "import-fresh"; packageName = "import-fresh"; - version = "3.2.1"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz"; - sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"; + sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; }; "import-from-3.0.0" = { @@ -3700,16 +3664,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; - }; - }; - "indent-string-3.2.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz"; - sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; }; }; "indent-string-4.0.0" = { @@ -3727,7 +3682,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz"; - sha1 = "8b417e47c28f925a45133d914ca1fd389107f30f"; + sha512 = "m3xv4hJYR2oXw4o4Y5l6P5P16WYmazYof+el6Al3f+YlggGj6qT9kImBAnzDelRALnP5d3h4jGBPKzYCizjZZw=="; }; }; "inflight-1.0.6" = { @@ -3736,7 +3691,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; }; "inherits-2.0.3" = { @@ -3745,7 +3700,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + sha512 = "x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="; }; }; "inherits-2.0.4" = { @@ -3757,13 +3712,13 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ini-1.3.5" = { + "ini-1.3.8" = { name = "ini"; packageName = "ini"; - version = "1.3.5"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; + url = "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"; + sha512 = "JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="; }; }; "ini-2.0.0" = { @@ -3775,22 +3730,31 @@ let sha512 = "7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA=="; }; }; - "inquirer-7.1.0" = { + "inquirer-7.3.3" = { name = "inquirer"; packageName = "inquirer"; - version = "7.1.0"; + version = "7.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.1.0.tgz"; - sha512 = "5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg=="; + url = "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"; + sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "interpret-1.2.0" = { + "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=="; + }; + }; + "interpret-1.4.0" = { name = "interpret"; packageName = "interpret"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz"; - sha512 = "mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="; + url = "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"; + sha512 = "agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="; }; }; "into-stream-5.1.1" = { @@ -3808,7 +3772,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; }; }; "is-accessor-descriptor-0.1.6" = { @@ -3817,7 +3781,7 @@ let version = "0.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + sha512 = "e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="; }; }; "is-accessor-descriptor-1.0.0" = { @@ -3835,7 +3799,25 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; + }; + }; + "is-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-buffer-1.1.6" = { @@ -3847,13 +3829,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-callable-1.1.5" = { + "is-callable-1.2.4" = { name = "is-callable"; packageName = "is-callable"; - version = "1.1.5"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz"; - sha512 = "ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="; + url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"; + sha512 = "nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w=="; }; }; "is-ci-2.0.0" = { @@ -3865,13 +3847,22 @@ let sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; }; - "is-ci-3.0.0" = { + "is-ci-3.0.1" = { name = "is-ci"; packageName = "is-ci"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz"; - sha512 = "kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ=="; + url = "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz"; + sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ=="; + }; + }; + "is-core-module-2.9.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; + sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; }; }; "is-data-descriptor-0.1.4" = { @@ -3880,7 +3871,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + sha512 = "+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="; }; }; "is-data-descriptor-1.0.0" = { @@ -3892,13 +3883,13 @@ let sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; }; }; - "is-date-object-1.0.2" = { + "is-date-object-1.0.5" = { name = "is-date-object"; packageName = "is-date-object"; - version = "1.0.2"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; + url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"; + sha512 = "9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ=="; }; }; "is-descriptor-0.1.6" = { @@ -3925,16 +3916,16 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"; - sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + sha512 = "yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw=="; }; }; - "is-docker-2.1.1" = { + "is-docker-2.2.1" = { name = "is-docker"; packageName = "is-docker"; - version = "2.1.1"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; - sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; + url = "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"; + sha512 = "F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="; }; }; "is-extendable-0.1.1" = { @@ -3943,7 +3934,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + sha512 = "5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="; }; }; "is-extendable-1.0.1" = { @@ -3961,7 +3952,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -3970,7 +3961,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="; }; }; "is-fullwidth-code-point-2.0.0" = { @@ -3979,7 +3970,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + sha512 = "VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="; }; }; "is-fullwidth-code-point-3.0.0" = { @@ -3991,13 +3982,13 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; - "is-generator-function-1.0.8" = { + "is-generator-function-1.0.10" = { name = "is-generator-function"; packageName = "is-generator-function"; - version = "1.0.8"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz"; - sha512 = "2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ=="; + url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz"; + sha512 = "jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A=="; }; }; "is-glob-3.1.0" = { @@ -4006,16 +3997,16 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + sha512 = "UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw=="; }; }; - "is-glob-4.0.1" = { + "is-glob-4.0.3" = { name = "is-glob"; packageName = "is-glob"; - version = "4.0.1"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"; + sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg=="; }; }; "is-installed-globally-0.4.0" = { @@ -4027,13 +4018,22 @@ let sha512 = "iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ=="; }; }; + "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-3.0.0" = { name = "is-number"; packageName = "is-number"; version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + sha512 = "4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg=="; }; }; "is-number-7.0.0" = { @@ -4042,25 +4042,25 @@ let version = "7.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha1 = "7535345b896734d5f80c4d06c50955527a14f12b"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; }; }; - "is-obj-1.0.1" = { + "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-obj-2.0.0" = { name = "is-obj"; packageName = "is-obj"; - version = "1.0.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; - }; - }; - "is-observable-1.1.0" = { - name = "is-observable"; - packageName = "is-observable"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz"; - sha512 = "NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA=="; + url = "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; }; }; "is-path-inside-3.0.3" = { @@ -4078,7 +4078,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; }; }; "is-plain-obj-2.1.0" = { @@ -4099,31 +4099,31 @@ let sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; }; }; - "is-plain-object-3.0.0" = { + "is-plain-object-5.0.0" = { name = "is-plain-object"; packageName = "is-plain-object"; - version = "3.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-3.0.0.tgz"; - sha512 = "tZIpofR+P05k8Aocp7UI/2UTa9lTJSebCXpFFoR9aibpokDj/uXBsJ8luUu0tTVYKkMU6URDUuOfJZ7koewXvg=="; + url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"; + sha512 = "VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="; }; }; - "is-promise-2.2.2" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; - sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; - }; - }; - "is-regex-1.0.5" = { + "is-regex-1.1.4" = { name = "is-regex"; packageName = "is-regex"; - version = "1.0.5"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz"; - sha512 = "vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ=="; + 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-stream-1.1.0" = { @@ -4132,25 +4132,34 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; }; }; - "is-stream-2.0.0" = { + "is-stream-2.0.1" = { name = "is-stream"; packageName = "is-stream"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz"; - sha512 = "XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw=="; + url = "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"; + sha512 = "hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="; }; }; - "is-symbol-1.0.3" = { + "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.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; + url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"; + sha512 = "C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg=="; }; }; "is-text-path-1.0.1" = { @@ -4159,7 +4168,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-text-path/-/is-text-path-1.0.1.tgz"; - sha1 = "4e1aa0fb51bfbcb3e92688001397202c1775b66e"; + sha512 = "xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w=="; }; }; "is-typedarray-1.0.0" = { @@ -4168,7 +4177,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; }; }; "is-unicode-supported-0.1.0" = { @@ -4180,6 +4189,15 @@ let sha512 = "knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="; }; }; + "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-windows-1.0.2" = { name = "is-windows"; packageName = "is-windows"; @@ -4204,7 +4222,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + sha512 = "D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="; }; }; "isarray-1.0.0" = { @@ -4213,7 +4231,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; "isexe-2.0.0" = { @@ -4222,7 +4240,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; "isobject-2.1.0" = { @@ -4231,7 +4249,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + sha512 = "+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="; }; }; "isobject-3.0.1" = { @@ -4240,16 +4258,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; - }; - }; - "isobject-4.0.0" = { - name = "isobject"; - packageName = "isobject"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-4.0.0.tgz"; - sha512 = "S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA=="; + sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; }; }; "isstream-0.1.2" = { @@ -4258,7 +4267,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; }; }; "issue-parser-5.0.0" = { @@ -4288,13 +4297,13 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.13.1" = { + "js-yaml-3.14.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.13.1"; + version = "3.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; + sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; }; }; "jsbn-0.1.1" = { @@ -4303,7 +4312,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; }; }; "json-buffer-3.0.1" = { @@ -4315,13 +4324,13 @@ let sha512 = "4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="; }; }; - "json-fixer-1.4.1" = { + "json-fixer-1.6.13" = { name = "json-fixer"; packageName = "json-fixer"; - version = "1.4.1"; + version = "1.6.13"; src = fetchurl { - url = "https://registry.npmjs.org/json-fixer/-/json-fixer-1.4.1.tgz"; - sha512 = "zbvD9byMClUKRcGsazP2WBO5kG6hS8q6oRAuIWiOvhDDN4zFFIC+tPYG0I20Vhxv8S4W1VeHzesWZB0p5pzvlA=="; + url = "https://registry.npmjs.org/json-fixer/-/json-fixer-1.6.13.tgz"; + sha512 = "DKQ71M+0uwAG3QsUkeVgh6XREw/OkpnTfHfM+sdmxRjHvYZ8PlcMVF4ibsHQ1ckR63NROs68qUr1I0u6yPVePQ=="; }; }; "json-parse-better-errors-1.0.2" = { @@ -4333,13 +4342,22 @@ let sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; }; - "json-schema-0.2.3" = { + "json-parse-even-better-errors-2.3.1" = { + name = "json-parse-even-better-errors"; + packageName = "json-parse-even-better-errors"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; + }; + }; + "json-schema-0.4.0" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.3"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; + sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; }; }; "json-schema-traverse-0.4.1" = { @@ -4357,7 +4375,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; }; "json-stringify-safe-5.0.1" = { @@ -4366,7 +4384,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; "jsonfile-4.0.0" = { @@ -4375,7 +4393,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; }; }; "jsonfile-6.1.0" = { @@ -4393,16 +4411,25 @@ let version = "1.3.1"; src = fetchurl { url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"; - sha1 = "3f4dae4a91fac315f71062f8521cc239f1366280"; + sha512 = "POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg=="; }; }; - "jsprim-1.4.1" = { + "jsprim-1.4.2" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz"; + sha512 = "P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw=="; + }; + }; + "jsprim-2.0.2" = { + name = "jsprim"; + packageName = "jsprim"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz"; + sha512 = "gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ=="; }; }; "keygrip-1.1.0" = { @@ -4414,13 +4441,13 @@ let sha512 = "iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ=="; }; }; - "keyv-4.0.3" = { + "keyv-4.3.3" = { name = "keyv"; packageName = "keyv"; - version = "4.0.3"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz"; - sha512 = "zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.3.3.tgz"; + sha512 = "AcysI17RvakTh8ir03+a3zJr5r0ovnAH/XTXei/4HIv3bL2K/jzvgivLK9UuI/JbU1aJjM3NSAnVvVVd3n+4DQ=="; }; }; "kind-of-3.2.2" = { @@ -4429,7 +4456,7 @@ let version = "3.2.2"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + sha512 = "NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="; }; }; "kind-of-4.0.0" = { @@ -4438,7 +4465,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; + sha512 = "24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw=="; }; }; "kind-of-5.1.0" = { @@ -4459,13 +4486,13 @@ let sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; }; }; - "koa-2.13.1" = { + "koa-2.13.4" = { name = "koa"; packageName = "koa"; - version = "2.13.1"; + version = "2.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/koa/-/koa-2.13.1.tgz"; - sha512 = "Lb2Dloc72auj5vK4X4qqL7B5jyDPQaZucc9sR/71byg7ryoD1NCaCm63CShk9ID9quQvDEi1bGR/iGjCG7As3w=="; + url = "https://registry.npmjs.org/koa/-/koa-2.13.4.tgz"; + sha512 = "43zkIKubNbnrULWlHdN5h1g3SEKXOEzoAlRsHOTFpnlDu8JlAOZSMJBLULusuXRequboiwJcj5vtYXKB3k7+2g=="; }; }; "koa-bodyparser-4.3.0" = { @@ -4477,15 +4504,6 @@ let sha512 = "uyV8G29KAGwZc4q/0WUAjH+Tsmuv9ImfBUF2oZVyZtaeo0husInagyn/JH85xMSxM0hEk/mbCII5ubLDuqW/Rw=="; }; }; - "koa-compose-3.2.1" = { - name = "koa-compose"; - packageName = "koa-compose"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/koa-compose/-/koa-compose-3.2.1.tgz"; - sha1 = "a85ccb40b7d986d8e5a345b3a1ace8eabcf54de7"; - }; - }; "koa-compose-4.1.0" = { name = "koa-compose"; packageName = "koa-compose"; @@ -4510,16 +4528,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/koa-conditional-get/-/koa-conditional-get-2.0.0.tgz"; - sha1 = "a43f3723c1d014b730a34ece8adf30b93c8233f2"; + sha512 = "FTZYr681zfyW0bz8FDc55RJrRnicz6KPv2oA3GOf6knksJd0uJdfenKud+RtBjHzO0g1tVHNjwN6gk7OfHAtbQ=="; }; }; - "koa-convert-1.2.0" = { + "koa-convert-2.0.0" = { name = "koa-convert"; packageName = "koa-convert"; - version = "1.2.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/koa-convert/-/koa-convert-1.2.0.tgz"; - sha1 = "da40875df49de0539098d1700b50820cebcd21d0"; + url = "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz"; + sha512 = "asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA=="; }; }; "koa-etag-3.0.0" = { @@ -4528,7 +4546,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/koa-etag/-/koa-etag-3.0.0.tgz"; - sha1 = "9ef7382ddd5a82ab0deb153415c915836f771d3f"; + sha512 = "HYU1zIsH4S9xOlUZGuZIP1PIiJ0EkBXgwL8PjFECb/pUYmAee8gfcvIovregBMYxECDhLulEWT2+ZRsA/lczCQ=="; }; }; "koa-is-json-1.0.0" = { @@ -4537,7 +4555,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz"; - sha1 = "273c07edcdcb8df6a2c1ab7d59ee76491451ec14"; + sha512 = "+97CtHAlWDx0ndt0J8y3P12EWLwTLMXIfMnYDev3wOTwH/RpBGMlfn4bDXlMEg1u73K6XRE9BbUp+5ZAYoRYWw=="; }; }; "koa-json-2.0.2" = { @@ -4546,7 +4564,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/koa-json/-/koa-json-2.0.2.tgz"; - sha1 = "36af14e6ea1f5d646d7c44a285701c6f85a4fde4"; + sha512 = "8+dz0T2ekDuNN1svYoKPCV2txotQ3Ufg8Fn5bft1T48MPJWiC/HKmkk+3xj9EC/iNZuFYeLRazN2h2o3RSUXuQ=="; }; }; "koa-morgan-1.0.1" = { @@ -4555,7 +4573,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/koa-morgan/-/koa-morgan-1.0.1.tgz"; - sha1 = "08052e0ce0d839d3c43178b90a5bb3424bef1f99"; + sha512 = "JOUdCNlc21G50afBXfErUrr1RKymbgzlrO5KURY+wmDG1Uvd2jmxUJcHgylb/mYXy2SjiNZyYim/ptUBGsIi3A=="; }; }; "koa-range-0.3.0" = { @@ -4564,7 +4582,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/koa-range/-/koa-range-0.3.0.tgz"; - sha1 = "3588e3496473a839a1bd264d2a42b1d85bd7feac"; + sha512 = "Ich3pCz6RhtbajYXRWjIl6O5wtrLs6kE3nkXc9XmaWe+MysJyZO7K4L3oce1Jpg/iMgCbj+5UCiMm/rqVtcDIg=="; }; }; "koa-route-3.2.0" = { @@ -4573,7 +4591,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/koa-route/-/koa-route-3.2.0.tgz"; - sha1 = "76298b99a6bcfa9e38cab6fe5c79a8733e758bce"; + sha512 = "8FsuWw/L+CUWJfpgN6vrlYUDNTheEinG8Zkm97GyuLJNyWjCVUs9p10Ih3jTIWwmDVQcz6827l0RKadAS5ibqA=="; }; }; "koa-send-5.0.1" = { @@ -4600,7 +4618,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.5.0.tgz"; - sha1 = "ca15be243c7c475b8565cdbfa0f9c2f374f2a01d"; + sha512 = "5l6J7+KWp/OiisiR/KkwuPgeaIyb8d5jlLZsncDpffa5aBtOCcEcyoXoMGxOw50fr7RrCxEGqXkIHGRl1PL7ig=="; }; }; "lazy-ass-1.6.0" = { @@ -4609,7 +4627,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz"; - sha1 = "7999655e8646c17f089fdd187d150d3324d54513"; + sha512 = "cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw=="; }; }; "lcid-1.0.0" = { @@ -4618,7 +4636,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw=="; }; }; "leprechaun-0.0.2" = { @@ -4627,7 +4645,7 @@ let version = "0.0.2"; src = fetchurl { url = "https://registry.npmjs.org/leprechaun/-/leprechaun-0.0.2.tgz"; - sha1 = "8b96514a9e634c53fbe59a8094f3378c8fb2084d"; + sha512 = "wSaITQll6YyIuSAGQPVOqdRxJWAd+Uu2UgE+ABGB2HaFTt88Zs49KMkphGWRv6TkV9ZW2IGcdvnRXSMorhVVvA=="; }; }; "levn-0.4.1" = { @@ -4645,52 +4663,25 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz"; - sha1 = "d25af2936b6f4849172b312e4792d1d987bc34a2"; + sha512 = "Ktrjk5noGYlHsVnYWh62FLVs4hTb8A3e+vucNZMgPeAOITdshMSgv4cCZQeRDjm7+goqmo6+liZwTXo+U3sVww=="; }; }; - "lines-and-columns-1.1.6" = { + "lines-and-columns-1.2.4" = { name = "lines-and-columns"; packageName = "lines-and-columns"; - version = "1.1.6"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; }; - "listr-0.14.3" = { - name = "listr"; - packageName = "listr"; - version = "0.14.3"; + "listr2-3.14.0" = { + name = "listr2"; + packageName = "listr2"; + version = "3.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz"; - sha512 = "RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA=="; - }; - }; - "listr-silent-renderer-1.1.1" = { - name = "listr-silent-renderer"; - packageName = "listr-silent-renderer"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz"; - sha1 = "924b5a3757153770bf1a8e3fbf74b8bbf3f9242e"; - }; - }; - "listr-update-renderer-0.5.0" = { - name = "listr-update-renderer"; - packageName = "listr-update-renderer"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz"; - sha512 = "tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA=="; - }; - }; - "listr-verbose-renderer-0.5.0" = { - name = "listr-verbose-renderer"; - packageName = "listr-verbose-renderer"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz"; - sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; + url = "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz"; + sha512 = "TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g=="; }; }; "load-json-file-4.0.0" = { @@ -4699,7 +4690,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz"; - sha1 = "2f5f45ab91e33216234fd53adab668eb4ec0993b"; + sha512 = "Kx8hMakjX03tiGTLAIdJ+lL0htKnXjEZN6hk/tozf/WOuYGdZBJrZ+rCJRbVCugsjB3jMLn9746NsQIf5VjBMw=="; }; }; "load-module-3.0.0" = { @@ -4726,7 +4717,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA=="; }; }; "locate-path-3.0.0" = { @@ -4753,16 +4744,7 @@ let version = "3.10.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"; - sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6"; - }; - }; - "lodash-4.17.15" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.15"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; + sha512 = "9mDDwqVIma6OZX79ZlDACZl8sBm0TEnkf99zV3iMA4GzkIT/9hiqP5mY0HoT1iNLCrKc/R1HByV+yJfRWVJryQ=="; }; }; "lodash-4.17.21" = { @@ -4780,7 +4762,7 @@ let version = "4.2.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz"; - sha1 = "127a97f02adc41751a954d24b0de17e100e038eb"; + sha512 = "ZznplvbvtjK2gMvnQ1BR/zqPFZmS6jbK4p+6Up4xcRYA7yMIwxHCfbTcrYxXKzzqLsQ05eJPVznEW3tuwV7k1g=="; }; }; "lodash.camelcase-4.3.0" = { @@ -4789,7 +4771,7 @@ let version = "4.3.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; - sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + sha512 = "TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="; }; }; "lodash.capitalize-4.2.1" = { @@ -4798,7 +4780,7 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.capitalize/-/lodash.capitalize-4.2.1.tgz"; - sha1 = "f826c9b4e2a8511d84e3aca29db05e1a4f3b72a9"; + sha512 = "kZzYOKspf8XVX5AvmQF94gQW0lejFVgb80G85bU4ZWzoJ6C03PQg3coYAUpSTpQWelrZELd3XWgHzw4Ck5kaIw=="; }; }; "lodash.escaperegexp-4.1.2" = { @@ -4807,7 +4789,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; - sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + sha512 = "TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw=="; }; }; "lodash.get-4.4.2" = { @@ -4816,7 +4798,7 @@ let version = "4.4.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"; - sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ=="; }; }; "lodash.ismatch-4.4.0" = { @@ -4825,7 +4807,7 @@ let version = "4.4.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz"; - sha1 = "756cb5150ca3ba6f11085a78849645f188f85f37"; + sha512 = "fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g=="; }; }; "lodash.isplainobject-4.0.6" = { @@ -4834,7 +4816,7 @@ let version = "4.0.6"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + sha512 = "oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA=="; }; }; "lodash.isstring-4.0.1" = { @@ -4843,7 +4825,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; + sha512 = "0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw=="; }; }; "lodash.merge-4.6.2" = { @@ -4861,7 +4843,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"; - sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; + sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg=="; }; }; "lodash.set-4.3.2" = { @@ -4870,7 +4852,7 @@ let version = "4.3.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz"; - sha1 = "d8757b1da807dde24816b0d6a84bea1a76230b23"; + sha512 = "4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg=="; }; }; "lodash.snakecase-4.1.1" = { @@ -4879,7 +4861,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; - sha1 = "39d714a35357147837aefd64b5dcbb16becd8f8d"; + sha512 = "QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw=="; }; }; "lodash.throttle-4.1.1" = { @@ -4888,16 +4870,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"; - sha1 = "c23e91b710242ac70c37f1e1cda9274cc39bf2f4"; - }; - }; - "lodash.toarray-4.4.0" = { - name = "lodash.toarray"; - packageName = "lodash.toarray"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz"; - sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; + sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="; }; }; "lodash.uniq-4.5.0" = { @@ -4906,7 +4879,7 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; }; }; "lodash.uniqby-4.7.0" = { @@ -4915,7 +4888,7 @@ let version = "4.7.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz"; - sha1 = "d99c07a669e9e6d24e1362dfe266c67616af1302"; + sha512 = "e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww=="; }; }; "log-symbols-1.0.2" = { @@ -4924,7 +4897,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"; - sha1 = "376ff7b58ea3086a0f09facc74617eca501e1a18"; + sha512 = "mmPrW0Fh2fxOzdBbFv4g1m6pR72haFLPJ2G5SJEELf1y+iaQrDG6cWCPjy54RHYbZAt7X+ls690Kw62AdWXBzQ=="; }; }; "log-symbols-4.1.0" = { @@ -4936,22 +4909,13 @@ let sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg=="; }; }; - "log-update-2.3.0" = { + "log-update-4.0.0" = { name = "log-update"; packageName = "log-update"; - version = "2.3.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz"; - sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; - }; - }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + url = "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz"; + sha512 = "9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg=="; }; }; "lowercase-keys-2.0.0" = { @@ -4972,13 +4936,13 @@ let sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g=="; }; }; - "lru-cache-5.1.1" = { + "lru-cache-6.0.0" = { name = "lru-cache"; packageName = "lru-cache"; - version = "5.1.1"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; + sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; "lws-3.1.0" = { @@ -5035,13 +4999,13 @@ let sha512 = "U05yDlFJKIYa7gJZYfnc1HIEuXbKpDJztgkvNYyxCqJC28j/k9ORoNnFNOIHpBh/jlPJgV8x7uH34mIxFAryWA=="; }; }; - "lws-cors-3.0.0" = { + "lws-cors-3.1.1" = { name = "lws-cors"; packageName = "lws-cors"; - version = "3.0.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/lws-cors/-/lws-cors-3.0.0.tgz"; - sha512 = "diUkoyVZyzLB8LamdtUYYAfJdPAyu/+IjE3ZUcdnNQz9koECe4O2x3SWD7LSV43pd3CKgyiwwSxWJ4hTBZFIvQ=="; + url = "https://registry.npmjs.org/lws-cors/-/lws-cors-3.1.1.tgz"; + sha512 = "JMqRHdZ8wS17LB9MbHZvOAiDE/2MD3TSODvEAmNkIPEvutKq1Z6wfuFbfiNjAQRGyImUfiUM99vJOFHmLCg2cw=="; }; }; "lws-index-2.0.0" = { @@ -5125,13 +5089,13 @@ let sha512 = "P25A0+IXdkB6Y6gZAG7X0mnaa+FJ8aTiWLUgM5kazaWmruRO7lyhSjitsA3y5TLI3DpPCZn0mWE4SRREujUZLg=="; }; }; - "macos-release-2.3.0" = { + "macos-release-2.5.0" = { name = "macos-release"; packageName = "macos-release"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/macos-release/-/macos-release-2.3.0.tgz"; - sha512 = "OHhSbtcviqMPt7yfw5ef5aghS2jzFVKEFyCJndQt2YpSQ9qRVSEv2axSJI1paVThEu+FFGs584h/1YhxjVqajA=="; + url = "https://registry.npmjs.org/macos-release/-/macos-release-2.5.0.tgz"; + sha512 = "EIgv+QZ9r+814gjJj0Bt5vSLJLzswGmSUbUpbi9AIr/fsN2IWFBl2NucV9PAiek+U1STK468tEkxmVYUtuAN3g=="; }; }; "map-cache-0.2.2" = { @@ -5140,7 +5104,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + sha512 = "8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg=="; }; }; "map-obj-1.0.1" = { @@ -5149,16 +5113,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="; }; }; - "map-obj-2.0.0" = { + "map-obj-4.3.0" = { name = "map-obj"; packageName = "map-obj"; - version = "2.0.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz"; - sha1 = "a65cd29087a92598b8791257a523e021222ac1f9"; + url = "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz"; + sha512 = "hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ=="; }; }; "map-stream-0.1.0" = { @@ -5167,7 +5131,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + sha512 = "CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="; }; }; "map-visit-1.0.0" = { @@ -5176,7 +5140,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; - sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w=="; }; }; "marked-0.7.0" = { @@ -5203,7 +5167,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; }; "memorystream-0.3.1" = { @@ -5212,16 +5176,16 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz"; - sha1 = "86d7090b30ce455d63fbae12dda51a47ddcaf9b2"; + sha512 = "S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw=="; }; }; - "meow-5.0.0" = { + "meow-8.1.2" = { name = "meow"; packageName = "meow"; - version = "5.0.0"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz"; - sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; + url = "https://registry.npmjs.org/meow/-/meow-8.1.2.tgz"; + sha512 = "r85E3NdZ+mpYk1C6RjPFEMSE+s1iZMuHtsHAqY0DT3jZczl0diWUZ8g6oU7h0M9cD2EL+PzaYghhCLzR0ZNn5Q=="; }; }; "merge-stream-2.0.0" = { @@ -5230,16 +5194,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"; - sha1 = "52823629a14dd00c9770fb6ad47dc6310f2c1f60"; + sha512 = "abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="; }; }; - "merge2-1.3.0" = { + "merge2-1.4.1" = { name = "merge2"; packageName = "merge2"; - version = "1.3.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz"; - sha512 = "2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw=="; + url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; + sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; }; }; "methods-1.1.2" = { @@ -5248,7 +5212,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; }; }; "micromatch-3.1.10" = { @@ -5260,22 +5224,22 @@ let sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; }; }; - "micromatch-4.0.2" = { + "micromatch-4.0.5" = { name = "micromatch"; packageName = "micromatch"; - version = "4.0.2"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha1 = "4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"; + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; + sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; }; }; - "mime-2.4.4" = { + "mime-2.6.0" = { name = "mime"; packageName = "mime"; - version = "2.4.4"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz"; - sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; + url = "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz"; + sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg=="; }; }; "mime-db-1.33.0" = { @@ -5287,13 +5251,13 @@ let sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; }; }; - "mime-db-1.43.0" = { + "mime-db-1.52.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.43.0"; + version = "1.52.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; }; "mime-types-2.1.18" = { @@ -5305,22 +5269,13 @@ let sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; }; }; - "mime-types-2.1.26" = { + "mime-types-2.1.35" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.26"; + version = "2.1.35"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; - }; - }; - "mimic-fn-1.2.0" = { - name = "mimic-fn"; - packageName = "mimic-fn"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; }; }; "mimic-fn-2.1.0" = { @@ -5350,6 +5305,15 @@ let sha512 = "wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="; }; }; + "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=="; + }; + }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -5359,31 +5323,40 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; + "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-0.0.10" = { name = "minimist"; packageName = "minimist"; version = "0.0.10"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + sha512 = "iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw=="; }; }; - "minimist-1.2.5" = { + "minimist-1.2.6" = { name = "minimist"; packageName = "minimist"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; }; - "minimist-options-3.0.2" = { + "minimist-options-4.1.0" = { name = "minimist-options"; packageName = "minimist-options"; - version = "3.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/minimist-options/-/minimist-options-3.0.2.tgz"; - sha512 = "FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ=="; + url = "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz"; + sha512 = "Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A=="; }; }; "mixin-deep-1.3.2" = { @@ -5395,13 +5368,13 @@ let sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; }; }; - "mkdirp-0.5.5" = { + "mkdirp-0.5.6" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.5"; + version = "0.5.6"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; - sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"; + sha512 = "FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw=="; }; }; "mkdirp-classic-0.5.3" = { @@ -5428,7 +5401,7 @@ let version = "2.18.1"; src = fetchurl { url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; - sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; + sha512 = "QGcnVKRSEhbWy2i0pqFhjWMCczL/YU5ICMB3maUavFcyUqBszRnzsswvOaGOqSfWZ/R+dMnb9gGBuRT4LMTdVQ=="; }; }; "morgan-1.10.0" = { @@ -5446,7 +5419,7 @@ let version = "0.7.2"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; + sha512 = "5NnE67nQSQDJHVahPJna1PQ/zCXMnQop3yUCxjKPNzCxuyPSKWTQ/5Gu5CZmjetwGLWRA+PzeF5thlbOdbQldA=="; }; }; "ms-2.0.0" = { @@ -5455,7 +5428,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; }; }; "ms-2.1.2" = { @@ -5509,7 +5482,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; }; "nconf-0.10.0" = { @@ -5521,22 +5494,22 @@ let sha512 = "fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q=="; }; }; - "negotiator-0.6.2" = { + "negotiator-0.6.3" = { name = "negotiator"; packageName = "negotiator"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; - sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; }; }; - "neo-async-2.6.1" = { + "neo-async-2.6.2" = { name = "neo-async"; packageName = "neo-async"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz"; - sha512 = "iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="; + url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; + sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; "nerf-dart-1.0.0" = { @@ -5545,7 +5518,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/nerf-dart/-/nerf-dart-1.0.0.tgz"; - sha1 = "e6dab7febf5ad816ea81cf5c629c5a0ebde72c1a"; + sha512 = "EZSPZB70jiVsivaBLYDCyntd5eH8NTSMOn3rB+HxwdmKThGELLdYv8qVIMWvZEFy9w8ZZpW9h9OB32l1rGtj7g=="; }; }; "netlify-plugin-cypress-2.0.0" = { @@ -5566,31 +5539,22 @@ let sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; - "node-emoji-1.10.0" = { + "node-emoji-1.11.0" = { name = "node-emoji"; packageName = "node-emoji"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz"; - sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; + url = "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz"; + sha512 = "wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A=="; }; }; - "node-fetch-2.6.0" = { + "node-fetch-2.6.7" = { name = "node-fetch"; packageName = "node-fetch"; - version = "2.6.0"; + version = "2.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"; - sha512 = "8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="; - }; - }; - "node-fetch-2.6.1" = { - name = "node-fetch"; - packageName = "node-fetch"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"; - sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="; + url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"; + sha512 = "ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ=="; }; }; "node-version-matches-2.0.1" = { @@ -5611,22 +5575,40 @@ let sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA=="; }; }; - "normalize-url-4.5.0" = { - name = "normalize-url"; - packageName = "normalize-url"; - version = "4.5.0"; + "normalize-package-data-3.0.3" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz"; - sha512 = "2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="; + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz"; + sha512 = "p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA=="; }; }; - "npm-6.14.4" = { + "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"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"; + sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; + }; + }; + "npm-6.14.17" = { name = "npm"; packageName = "npm"; - version = "6.14.4"; + version = "6.14.17"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.4.tgz"; - sha512 = "B8UDDbWvdkW6RgXFn8/h2cHJP/u/FPa4HWeGzW23aNEBARN3QPrRaHqPIZW2NSN3fW649gtgUDNZpaRs0zTMPw=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.17.tgz"; + sha512 = "CxEDn1ydVRPDl4tHrlnq+WevYAhv4GF2AEHzJKQ4prZDZ96IS3Uo6t0Sy6O9kB6XzqkI+J00WfYCqqk0p6IJ1Q=="; }; }; "npm-run-all-4.1.5" = { @@ -5644,7 +5626,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + sha512 = "lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="; }; }; "npm-run-path-3.1.0" = { @@ -5671,7 +5653,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="; }; }; "oauth-sign-0.9.0" = { @@ -5689,7 +5671,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; }; "object-copy-0.1.0" = { @@ -5698,16 +5680,16 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; - sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + sha512 = "79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="; }; }; - "object-inspect-1.7.0" = { + "object-inspect-1.12.2" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.7.0"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; - sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; + sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; }; }; "object-keys-1.1.1" = { @@ -5725,16 +5707,16 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; - sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + sha512 = "GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA=="; }; }; - "object.assign-4.1.0" = { + "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz"; - sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; }; "object.pick-1.3.0" = { @@ -5743,7 +5725,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + sha512 = "tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="; }; }; "octokit-pagination-methods-1.1.0" = { @@ -5761,7 +5743,16 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="; + }; + }; + "on-finished-2.4.1" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; }; }; "on-headers-1.0.2" = { @@ -5779,34 +5770,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "onetime-1.1.0" = { - name = "onetime"; - packageName = "onetime"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"; - sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; - }; - }; - "onetime-2.0.1" = { - name = "onetime"; - packageName = "onetime"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; - }; - }; - "onetime-5.1.0" = { - name = "onetime"; - packageName = "onetime"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz"; - sha512 = "5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q=="; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; }; "onetime-5.1.2" = { @@ -5824,7 +5788,7 @@ let version = "0.0.2"; src = fetchurl { url = "https://registry.npmjs.org/only/-/only-0.0.2.tgz"; - sha1 = "2afde84d03e50b9a8edc444e30610a70295edfb4"; + sha512 = "Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ=="; }; }; "open-7.4.2" = { @@ -5842,7 +5806,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + sha512 = "snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g=="; }; }; "optionator-0.9.1" = { @@ -5860,7 +5824,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; - sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + sha512 = "PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g=="; }; }; "os-name-3.1.0" = { @@ -5878,7 +5842,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; }; }; "ospath-1.2.2" = { @@ -5887,16 +5851,16 @@ let version = "1.2.2"; src = fetchurl { url = "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz"; - sha1 = "1276639774a3f8ef2572f7fe4280e0ea4550c07b"; + sha512 = "o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA=="; }; }; - "p-cancelable-2.0.0" = { + "p-cancelable-2.1.1" = { name = "p-cancelable"; packageName = "p-cancelable"; - version = "2.0.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz"; - sha512 = "wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="; + url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz"; + sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg=="; }; }; "p-event-4.2.0" = { @@ -5923,7 +5887,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; }; }; "p-finally-2.0.1" = { @@ -5968,7 +5932,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg=="; }; }; "p-locate-3.0.0" = { @@ -5998,6 +5962,15 @@ let sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; + "p-map-4.0.0" = { + name = "p-map"; + packageName = "p-map"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"; + sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ=="; + }; + }; "p-reduce-2.1.0" = { name = "p-reduce"; packageName = "p-reduce"; @@ -6007,13 +5980,13 @@ let sha512 = "2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw=="; }; }; - "p-retry-4.2.0" = { + "p-retry-4.6.2" = { name = "p-retry"; packageName = "p-retry"; - version = "4.2.0"; + version = "4.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/p-retry/-/p-retry-4.2.0.tgz"; - sha512 = "jPH38/MRh263KKcq0wBNOGFJbm+U6784RilTmHjB/HM9kH9V8WlCpVUcdOmip9cjXOh6MxZ5yk1z2SjDUJfWmA=="; + url = "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz"; + sha512 = "312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ=="; }; }; "p-timeout-3.2.0" = { @@ -6031,7 +6004,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww=="; }; }; "p-try-2.2.0" = { @@ -6058,16 +6031,16 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + sha512 = "aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw=="; }; }; - "parse-json-5.0.0" = { + "parse-json-5.2.0" = { name = "parse-json"; packageName = "parse-json"; - version = "5.0.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz"; - sha512 = "OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw=="; + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; }; "parseurl-1.3.3" = { @@ -6085,7 +6058,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + sha512 = "XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw=="; }; }; "path-dirname-1.0.2" = { @@ -6094,7 +6067,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; - sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + sha512 = "ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="; }; }; "path-exists-3.0.0" = { @@ -6103,7 +6076,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + sha512 = "bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="; }; }; "path-exists-4.0.0" = { @@ -6121,7 +6094,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; "path-is-inside-1.0.2" = { @@ -6130,7 +6103,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; - sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + sha512 = "DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="; }; }; "path-key-2.0.1" = { @@ -6139,7 +6112,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + sha512 = "fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="; }; }; "path-key-3.1.1" = { @@ -6151,13 +6124,13 @@ let sha512 = "ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="; }; }; - "path-parse-1.0.6" = { + "path-parse-1.0.7" = { name = "path-parse"; packageName = "path-parse"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; }; }; "path-to-regexp-1.8.0" = { @@ -6178,13 +6151,13 @@ let sha512 = "gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ=="; }; }; - "path-to-regexp-6.2.0" = { + "path-to-regexp-6.2.1" = { name = "path-to-regexp"; packageName = "path-to-regexp"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.0.tgz"; - sha512 = "f66KywYG6+43afgE/8j/GoiNyygk/bnoCbps++3ErRKsIYkGGupyv07R2Ok5m9i67Iqc+T2g1eAUGUPzWhYTyg=="; + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.1.tgz"; + sha512 = "JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw=="; }; }; "path-type-3.0.0" = { @@ -6202,7 +6175,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; - sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; "pause-stream-0.0.11" = { @@ -6211,7 +6184,7 @@ let version = "0.0.11"; src = fetchurl { url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + sha512 = "e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A=="; }; }; "pegjs-0.10.0" = { @@ -6220,7 +6193,7 @@ let version = "0.10.0"; src = fetchurl { url = "https://registry.npmjs.org/pegjs/-/pegjs-0.10.0.tgz"; - sha1 = "cf8bafae6eddff4b5a7efb185269eaaf4610ddbd"; + sha512 = "qI5+oFNEGi3L5HAxDwN2LA4Gg7irF70Zs25edhjld9QemOgp0CbvMtbFcMvFtEo1OityPrcCzkQFB8JP/hxgow=="; }; }; "pend-1.2.0" = { @@ -6229,7 +6202,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; + sha512 = "F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg=="; }; }; "performance-now-2.1.0" = { @@ -6238,16 +6211,16 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; - "picomatch-2.2.2" = { + "picomatch-2.3.1" = { name = "picomatch"; packageName = "picomatch"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; "pidtree-0.3.1" = { @@ -6265,7 +6238,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + sha512 = "udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="; }; }; "pify-3.0.0" = { @@ -6274,7 +6247,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; }; }; "pify-4.0.1" = { @@ -6292,7 +6265,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/pkg-conf/-/pkg-conf-2.1.0.tgz"; - sha1 = "2126514ca6f2abfebd168596df18ba57867f0058"; + sha512 = "C+VUP+8jis7EsQZIhDYmS5qlNtjv2yP4SNtjXK9AP1ZcTRlnSfuumaTnRfYZnYgUUYVIKqL0fRvmUGDV2fmp6g=="; }; }; "pkg-dir-3.0.0" = { @@ -6328,7 +6301,7 @@ let version = "5.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pluralize/-/pluralize-5.0.0.tgz"; - sha1 = "e8b9073af9a0cb02e4c2efa95b55bebbdbf01299"; + sha512 = "3XyqUZZQZhBf6vt9FP49WhY+ZeqYT7Y6pWn4uWCAifD5tganssOlrsLbMysFM1Rgnmd9k2OUsgvDe7jWSXrchQ=="; }; }; "pop-iterate-1.0.1" = { @@ -6337,7 +6310,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz"; - sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3"; + sha512 = "HRCx4+KJE30JhX84wBN4+vja9bNfysxg1y28l0DuJmkoaICiv2ZSilKddbS48pq50P8d2erAhqDLbp47yv3MbQ=="; }; }; "posix-character-classes-0.1.1" = { @@ -6346,7 +6319,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; - sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + sha512 = "xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="; }; }; "prelude-ls-1.2.1" = { @@ -6385,6 +6358,15 @@ let sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; }; + "proxy-from-env-1.0.0" = { + name = "proxy-from-env"; + packageName = "proxy-from-env"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz"; + sha512 = "F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A=="; + }; + }; "proxy-from-env-1.1.0" = { name = "proxy-from-env"; packageName = "proxy-from-env"; @@ -6400,7 +6382,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz"; - sha1 = "5e7425b89508736cdd4f2224d028f7bb3f722ebd"; + sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="; }; }; "pseudomap-1.0.2" = { @@ -6409,16 +6391,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; }; }; - "psl-1.8.0" = { + "psl-1.9.0" = { name = "psl"; packageName = "psl"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; + sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; }; "pump-3.0.0" = { @@ -6430,22 +6412,13 @@ let sha512 = "LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="; }; }; - "punycode-1.3.2" = { - name = "punycode"; - packageName = "punycode"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; - }; - }; "punycode-1.4.1" = { name = "punycode"; packageName = "punycode"; version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; "punycode-2.1.1" = { @@ -6472,7 +6445,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/q/-/q-1.1.2.tgz"; - sha1 = "6357e291206701d99f197ab84e57e8ad196f2a89"; + sha512 = "ROtylwux7Vkc4C07oKE/ReigUmb33kVoLtcR4SJ1QVqwaZkBEDL3vX4/kwFzIERQ5PfCl0XafbU8u2YUhyGgVA=="; }; }; "q-1.5.1" = { @@ -6481,7 +6454,7 @@ let version = "1.5.1"; src = fetchurl { url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; - sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; }; }; "q-2.0.3" = { @@ -6490,7 +6463,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz"; - sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134"; + sha512 = "gv6vLGcmAOg96/fgo3d9tvA4dJNZL3fMyBqVRrGxQ+Q/o4k9QzbJ3NQF9cOO/71wRodoXhaPgphvMFU68qVAJQ=="; }; }; "qrcode-terminal-0.12.0" = { @@ -6502,31 +6475,31 @@ let sha512 = "EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ=="; }; }; - "qs-6.5.2" = { + "qs-6.5.3" = { name = "qs"; packageName = "qs"; - version = "6.5.2"; + version = "6.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"; - sha1 = "cb3ae806e8740444584ef154ce8ee98d403f3e36"; + url = "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz"; + sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA=="; }; }; - "querystring-0.2.0" = { - name = "querystring"; - packageName = "querystring"; - version = "0.2.0"; + "queue-microtask-1.2.3" = { + name = "queue-microtask"; + packageName = "queue-microtask"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; + sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; - "quick-lru-1.1.0" = { + "quick-lru-4.0.1" = { name = "quick-lru"; packageName = "quick-lru"; - version = "1.1.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-1.1.0.tgz"; - sha1 = "4360b17c61136ad38078397ff11416e186dcfbb8"; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; + sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; }; }; "quote-0.4.0" = { @@ -6535,7 +6508,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/quote/-/quote-0.4.0.tgz"; - sha1 = "10839217f6c1362b89194044d29b233fd7f32f01"; + sha512 = "KHp3y3xDjuBhRx+tYKOgzPnVHMRlgpn2rU450GcU4PL24r1H6ls/hfPrxDwX2pvYMlwODHI2l8WwgoV69x5rUQ=="; }; }; "ramda-0.26.1" = { @@ -6562,7 +6535,7 @@ let version = "0.9.1"; src = fetchurl { url = "https://registry.npmjs.org/ramda/-/ramda-0.9.1.tgz"; - sha1 = "cc914dc3a82c608d003090203787c3f6826c1d87"; + sha512 = "Rccpyj5OM4v2ecM8Ej0canQkH4FSAu9o+mZezRl20/Uph1B1deJ26NjevZH4v7E0ngANvbKw7azX1a8v6KoBrQ=="; }; }; "range-parser-1.2.0" = { @@ -6571,16 +6544,16 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; - sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; + sha512 = "kA5WQoNVo4t9lNx2kQNFCxKeBl5IbbSNBl1M/tLkw9WCn+hxNBAW5Qh8gdhs63CJnhjJ2zQWFoqPJP2sK1AV5A=="; }; }; - "raw-body-2.4.1" = { + "raw-body-2.5.1" = { name = "raw-body"; packageName = "raw-body"; - version = "2.4.1"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz"; - sha512 = "9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA=="; + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"; + sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig=="; }; }; "rc-1.2.8" = { @@ -6598,7 +6571,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz"; - sha1 = "9cbc686978fee65d16c00e2b19c237fcf6e38389"; + sha512 = "BLq/cCO9two+lBgiTYNqD6GdtK8s4NpaWrl6/rCO9w0TUS8oJl7cmToOZfRYllKTISY6nt1U7jQ53brmKqY6BA=="; }; }; "read-pkg-4.0.1" = { @@ -6607,7 +6580,7 @@ let version = "4.0.1"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz"; - sha1 = "963625378f3e1c4d48c85872b5a6ec7d5d093237"; + sha512 = "+UBirHHDm5J+3WDmLBZYSklRYg82nMlz+enn+GMZ22nSR2f4bzxmhso6rzQW/3mT2PVzpzDTiYIZahk8UmZ44w=="; }; }; "read-pkg-5.2.0" = { @@ -6619,15 +6592,6 @@ let sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg=="; }; }; - "read-pkg-up-3.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz"; - sha1 = "3ed496685dba0f8fe118d0691dc51f4a1ff96f07"; - }; - }; "read-pkg-up-7.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -6661,16 +6625,16 @@ let version = "0.6.2"; src = fetchurl { url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"; - sha1 = "85204b54dba82d5742e28c96756ef43af50e3384"; + sha512 = "HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw=="; }; }; - "redent-2.0.0" = { + "redent-3.0.0" = { name = "redent"; packageName = "redent"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz"; - sha1 = "c1b2007b42d57eb1389079b3c8333639d5e1ccaa"; + url = "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"; + sha512 = "6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg=="; }; }; "redeyed-2.1.1" = { @@ -6679,7 +6643,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/redeyed/-/redeyed-2.1.1.tgz"; - sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; + sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ=="; }; }; "reduce-flatten-2.0.0" = { @@ -6691,22 +6655,22 @@ let sha512 = "EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w=="; }; }; - "reduce-flatten-3.0.0" = { + "reduce-flatten-3.0.1" = { name = "reduce-flatten"; packageName = "reduce-flatten"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-3.0.0.tgz"; - sha512 = "eczl8wAYBxJ6Egl6I1ECIF+8z6sHu+KE7BzaEDZTpPXKXfy9SUDQlVYwkRcNTjJLC3Iakxbhss50KuT/R6SYfg=="; + url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-3.0.1.tgz"; + sha512 = "bYo+97BmUUOzg09XwfkwALt4PQH1M5L0wzKerBt6WLm3Fhdd43mMS89HiT1B9pJIqko/6lWx3OnV4J9f2Kqp5Q=="; }; }; - "regenerator-runtime-0.13.5" = { + "regenerator-runtime-0.13.9" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.5"; + version = "0.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha512 = "ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; "regex-not-1.0.2" = { @@ -6718,13 +6682,22 @@ let sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; }; }; - "regexpp-3.1.0" = { + "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.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz"; - sha512 = "ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q=="; + url = "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"; + sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; "registry-auth-token-3.3.2" = { @@ -6736,13 +6709,13 @@ let sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ=="; }; }; - "registry-auth-token-4.1.1" = { + "registry-auth-token-4.2.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "4.1.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz"; - sha512 = "9bKS7nTl9+/A1s7tnPeGrUpRcVY+LUh7bfFgzpndALdPfXQBfQV77rQVtqgUV3ti4vc/Ik81Ex8UJDWDQ12zQA=="; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz"; + sha512 = "PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="; }; }; "registry-url-3.1.0" = { @@ -6751,16 +6724,16 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz"; - sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942"; + sha512 = "ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA=="; }; }; - "repeat-element-1.1.3" = { + "repeat-element-1.1.4" = { name = "repeat-element"; packageName = "repeat-element"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; - sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; + url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz"; + sha512 = "LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ=="; }; }; "repeat-string-1.6.1" = { @@ -6769,7 +6742,7 @@ let version = "1.6.1"; src = fetchurl { url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + sha512 = "PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="; }; }; "request-2.88.2" = { @@ -6787,7 +6760,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz"; - sha1 = "4ca754081c7fec63f505e4faa825aa06cd669dbe"; + sha512 = "MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg=="; }; }; "require-directory-2.1.1" = { @@ -6796,7 +6769,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; }; }; "require-main-filename-2.0.0" = { @@ -6808,13 +6781,13 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "resolve-1.16.1" = { + "resolve-1.22.1" = { name = "resolve"; packageName = "resolve"; - version = "1.16.1"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.16.1.tgz"; - sha512 = "rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; }; }; "resolve-from-3.0.0" = { @@ -6823,7 +6796,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + sha512 = "GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw=="; }; }; "resolve-from-4.0.0" = { @@ -6850,7 +6823,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz"; - sha1 = "c4bda9f5efb2fce65247873ab36bb4d834fe16f7"; + sha512 = "i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w=="; }; }; "resolve-url-0.2.1" = { @@ -6859,34 +6832,16 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; - sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="; }; }; - "responselike-2.0.0" = { + "responselike-2.0.1" = { name = "responselike"; packageName = "responselike"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz"; - sha512 = "xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw=="; - }; - }; - "restore-cursor-1.0.1" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz"; - sha1 = "34661f46886327fed2991479152252df92daa541"; - }; - }; - "restore-cursor-2.0.0" = { - name = "restore-cursor"; - packageName = "restore-cursor"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + url = "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz"; + sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw=="; }; }; "restore-cursor-3.1.0" = { @@ -6907,13 +6862,13 @@ let sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; }; }; - "retry-0.12.0" = { + "retry-0.13.1" = { name = "retry"; packageName = "retry"; - version = "0.12.0"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; - sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + url = "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"; + sha512 = "XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="; }; }; "reusify-1.0.4" = { @@ -6925,6 +6880,15 @@ let sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; }; }; + "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-2.6.3" = { name = "rimraf"; packageName = "rimraf"; @@ -6961,13 +6925,13 @@ let sha512 = "kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A=="; }; }; - "run-parallel-1.1.9" = { + "run-parallel-1.2.0" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.9"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; - sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; + sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; }; }; "rx-4.1.0" = { @@ -6976,16 +6940,25 @@ let version = "4.1.0"; src = fetchurl { url = "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"; - sha1 = "a5f13ff79ef3b740fe30aa803fb09f98805d4782"; + sha512 = "CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug=="; }; }; - "rxjs-6.5.5" = { + "rxjs-6.6.7" = { name = "rxjs"; packageName = "rxjs"; - version = "6.5.5"; + version = "6.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.5.tgz"; - sha512 = "WfQI+1gohdf0Dai/Bbmk5L5ItH5tYqm3ki2c5GdWhKjalzjg93N3avFjVStyZZz+A2Em+ZxKH5bNghw9UeylGQ=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; + sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; + }; + }; + "rxjs-7.5.6" = { + name = "rxjs"; + packageName = "rxjs"; + version = "7.5.6"; + src = fetchurl { + url = "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz"; + sha512 = "dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw=="; }; }; "safe-buffer-5.1.2" = { @@ -7003,7 +6976,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; - sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="; }; }; "safer-buffer-2.1.2" = { @@ -7021,7 +6994,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz"; - sha1 = "f0c82d98a3b139a8776a8808050b824431087fca"; + sha512 = "nZi59hW3Sl5P3+wOO89eHBAAGwmCPd2aE1+dLZV5MO+ItQctIvAqihzaAXIQhvtH4KJPxM080HsnqltR2y8cWg=="; }; }; "semantic-release-15.13.32" = { @@ -7051,13 +7024,13 @@ let sha512 = "b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="; }; }; - "semver-7.3.2" = { + "semver-7.3.7" = { name = "semver"; packageName = "semver"; - version = "7.3.2"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; - sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; "semver-compare-1.0.0" = { @@ -7066,7 +7039,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz"; - sha1 = "0dee216a1c941ab37e9efb1788f6afc5ff5537fc"; + sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow=="; }; }; "semver-regex-2.0.0" = { @@ -7111,7 +7084,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; "set-value-2.0.1" = { @@ -7132,15 +7105,6 @@ let sha512 = "BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="; }; }; - "setprototypeof-1.1.1" = { - name = "setprototypeof"; - packageName = "setprototypeof"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; - sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; - }; - }; "setprototypeof-1.2.0" = { name = "setprototypeof"; packageName = "setprototypeof"; @@ -7156,7 +7120,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + sha512 = "EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="; }; }; "shebang-command-2.0.0" = { @@ -7174,7 +7138,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + sha512 = "wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="; }; }; "shebang-regex-3.0.0" = { @@ -7186,31 +7150,40 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "shell-quote-1.7.2" = { + "shell-quote-1.7.3" = { name = "shell-quote"; packageName = "shell-quote"; - version = "1.7.2"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz"; - sha512 = "mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg=="; + url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.3.tgz"; + sha512 = "Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw=="; }; }; - "shelljs-0.8.4" = { + "shelljs-0.8.5" = { name = "shelljs"; packageName = "shelljs"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz"; - sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ=="; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.5.tgz"; + sha512 = "TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow=="; }; }; - "signal-exit-3.0.3" = { + "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.3"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz"; - sha512 = "VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; "signale-1.4.0" = { @@ -7237,16 +7210,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"; - sha1 = "6539be870c165adbd5240220dbe361f1bc4d4634"; - }; - }; - "slice-ansi-0.0.4" = { - name = "slice-ansi"; - packageName = "slice-ansi"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"; - sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; + sha512 = "g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="; }; }; "slice-ansi-2.1.0" = { @@ -7258,6 +7222,24 @@ let sha512 = "Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ=="; }; }; + "slice-ansi-3.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz"; + sha512 = "pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ=="; + }; + }; + "slice-ansi-4.0.0" = { + name = "slice-ansi"; + packageName = "slice-ansi"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; + }; + }; "snapdragon-0.8.2" = { name = "snapdragon"; packageName = "snapdragon"; @@ -7294,13 +7276,13 @@ let sha512 = "855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg=="; }; }; - "sort-package-json-1.42.2" = { + "sort-package-json-1.57.0" = { name = "sort-package-json"; packageName = "sort-package-json"; - version = "1.42.2"; + version = "1.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/sort-package-json/-/sort-package-json-1.42.2.tgz"; - sha512 = "B4cIYKeBdNUJXHPxe0G+x3uHHpSWSgJ3z62+W1C28wT1whkEhrz/B3r9lSyW+VVhz1rc+ymGmNkr1mJ323w0xQ=="; + url = "https://registry.npmjs.org/sort-package-json/-/sort-package-json-1.57.0.tgz"; + sha512 = "FYsjYn2dHTRb41wqnv+uEqCUvBpK3jZcTp9rbz2qDTmel7Pmdtf+i2rLaaPMRZeSVM60V3Se31GyWFpmKs4Q5Q=="; }; }; "source-map-0.5.7" = { @@ -7309,7 +7291,7 @@ let version = "0.5.7"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; }; }; "source-map-0.6.1" = { @@ -7330,13 +7312,13 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-url-0.4.0" = { + "source-map-url-0.4.1" = { name = "source-map-url"; packageName = "source-map-url"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz"; - sha1 = "3e935d7ddd73631b97659956d55128e87b5084a3"; + url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"; + sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="; }; }; "spawn-error-forwarder-1.0.0" = { @@ -7345,43 +7327,43 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/spawn-error-forwarder/-/spawn-error-forwarder-1.0.0.tgz"; - sha1 = "1afd94738e999b0346d7b9fc373be55e07577029"; + sha512 = "gRjMgK5uFjbCvdibeGJuy3I5OYz6VLoVdsOJdA6wV0WlfQVLFueoqMxwwYD9RODdgb6oUIvlRlsyFSiQkMKu0g=="; }; }; - "spdx-correct-3.1.0" = { + "spdx-correct-3.1.1" = { name = "spdx-correct"; packageName = "spdx-correct"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha512 = "cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w=="; }; }; - "spdx-exceptions-2.2.0" = { + "spdx-exceptions-2.3.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; }; }; - "spdx-expression-parse-3.0.0" = { + "spdx-expression-parse-3.0.1" = { name = "spdx-expression-parse"; packageName = "spdx-expression-parse"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg=="; + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha512 = "cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q=="; }; }; - "spdx-license-ids-3.0.5" = { + "spdx-license-ids-3.0.11" = { name = "spdx-license-ids"; packageName = "spdx-license-ids"; - version = "3.0.5"; + version = "3.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha512 = "J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q=="; + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"; + sha512 = "Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g=="; }; }; "split-0.3.3" = { @@ -7390,7 +7372,7 @@ let version = "0.3.3"; src = fetchurl { url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; - sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; + sha512 = "wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA=="; }; }; "split-1.0.1" = { @@ -7417,16 +7399,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/split2/-/split2-1.0.0.tgz"; - sha1 = "52e2e221d88c75f9a73f90556e263ff96772b314"; + sha512 = "NKywug4u4pX/AZBB1FCPzZ6/7O+Xhz1qMVbzTvvKvikjO99oPN87SkK08mEY9P63/5lWjK+wgOOgApnTg5r6qg=="; }; }; - "split2-2.2.0" = { + "split2-3.2.2" = { name = "split2"; packageName = "split2"; - version = "2.2.0"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-2.2.0.tgz"; - sha512 = "RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw=="; + url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"; + sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; "spots-0.4.0" = { @@ -7435,7 +7417,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/spots/-/spots-0.4.0.tgz"; - sha1 = "01eec5efc143669d9d3a20e3eec8b8cbd9842df6"; + sha512 = "WugtpL4zoap6ZE2VWKZTMfmhEE32jSHYHdbzoMbaXjgLmbE0aUnEErIzpyeb3JyfW8HLmcfcCCIjK1jrdTRg1Q=="; }; }; "sprintf-js-1.0.3" = { @@ -7444,16 +7426,16 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; - "sshpk-1.16.1" = { + "sshpk-1.17.0" = { name = "sshpk"; packageName = "sshpk"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"; - sha1 = "fb661c0bef29b39db40769ee39fa70093d6f6877"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz"; + sha512 = "/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ=="; }; }; "start-server-and-test-1.10.6" = { @@ -7462,7 +7444,7 @@ let version = "1.10.6"; src = fetchurl { url = "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-1.10.6.tgz"; - sha1 = "43355173e49a165b0ce9e928733b574bb877379c"; + sha512 = "Gr/TDePT4JczaoBiKZLZRIWmYgRcoGcFQePtPEHEvZFUuxbdUqTZozx8dqrlKl/67+pipg5OOtBH21U1oJXJIQ=="; }; }; "static-extend-0.1.2" = { @@ -7471,7 +7453,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; - sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + sha512 = "72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g=="; }; }; "statuses-1.5.0" = { @@ -7480,7 +7462,16 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; + }; + }; + "statuses-2.0.1" = { + name = "statuses"; + packageName = "statuses"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; + sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; }; }; "stop-build-1.1.0" = { @@ -7489,7 +7480,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/stop-build/-/stop-build-1.1.0.tgz"; - sha1 = "06a7b19d998a436ed3a8bbe96c8fb341e91069be"; + sha512 = "RKkSh9/FY4YbK9Pbf5lbnTcjI3mpkgfBDuD0ZeL0N4DxdZCRA8TVEuAlinbzoKcNBv+UtyPr1VekSybbuwUugg=="; }; }; "stream-combiner-0.0.4" = { @@ -7498,7 +7489,7 @@ let version = "0.0.4"; src = fetchurl { url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + sha512 = "rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw=="; }; }; "stream-combiner2-1.1.1" = { @@ -7507,7 +7498,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; - sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; + sha512 = "3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw=="; }; }; "stream-log-stats-3.0.2" = { @@ -7525,7 +7516,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/stream-slice/-/stream-slice-0.1.2.tgz"; - sha1 = "2dc4f4e1b936fb13f3eb39a2def1932798d07a4b"; + sha512 = "QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA=="; }; }; "stream-via-1.0.4" = { @@ -7543,7 +7534,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/streaming-json-stringify/-/streaming-json-stringify-3.1.0.tgz"; - sha1 = "80200437a993cc39c4fe00263b7b3b903ac87af5"; + sha512 = "axtfs3BDxAsrZ9swD163FBrXZ8dhJJp6kUI6C97TvUZG9RHKfbg9nFbXqEheFNOb3IYMEt2ag9F62sWLFUZ4ug=="; }; }; "string-width-1.0.2" = { @@ -7552,7 +7543,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="; }; }; "string-width-2.1.1" = { @@ -7573,67 +7564,40 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string-width-4.2.0" = { + "string-width-4.2.3" = { name = "string-width"; packageName = "string-width"; - version = "4.2.0"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; - sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"; + sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; }; - "string-width-4.2.2" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; - sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; - }; - }; - "string.prototype.padend-3.1.0" = { + "string.prototype.padend-3.1.3" = { name = "string.prototype.padend"; packageName = "string.prototype.padend"; - version = "3.1.0"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz"; - sha512 = "3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA=="; + url = "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.3.tgz"; + sha512 = "jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg=="; }; }; - "string.prototype.trimend-1.0.1" = { + "string.prototype.trimend-1.0.5" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.1"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"; + sha512 = "I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog=="; }; }; - "string.prototype.trimleft-2.1.2" = { - name = "string.prototype.trimleft"; - packageName = "string.prototype.trimleft"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; - sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="; - }; - }; - "string.prototype.trimright-2.1.2" = { - name = "string.prototype.trimright"; - packageName = "string.prototype.trimright"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; - sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="; - }; - }; - "string.prototype.trimstart-1.0.1" = { + "string.prototype.trimstart-1.0.5" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.1"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"; + sha512 = "THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg=="; }; }; "string_decoder-1.1.1" = { @@ -7642,7 +7606,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; - sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; }; }; "strip-ansi-3.0.1" = { @@ -7651,7 +7615,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; }; }; "strip-ansi-4.0.0" = { @@ -7660,7 +7624,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + sha512 = "4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="; }; }; "strip-ansi-5.2.0" = { @@ -7672,13 +7636,13 @@ let sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; - "strip-ansi-6.0.0" = { + "strip-ansi-6.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; - sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"; + sha512 = "Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="; }; }; "strip-bom-3.0.0" = { @@ -7687,7 +7651,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; }; }; "strip-eof-1.0.0" = { @@ -7696,7 +7660,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + sha512 = "7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="; }; }; "strip-final-newline-2.0.0" = { @@ -7705,16 +7669,16 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"; - sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; + sha512 = "BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA=="; }; }; - "strip-indent-2.0.0" = { + "strip-indent-3.0.0" = { name = "strip-indent"; packageName = "strip-indent"; - version = "2.0.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz"; - sha1 = "5ef8db295d01e6ed6cbf7aab96998d7822527b68"; + 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" = { @@ -7723,16 +7687,16 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; }; }; - "strip-json-comments-3.1.0" = { + "strip-json-comments-3.1.1" = { name = "strip-json-comments"; packageName = "strip-json-comments"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz"; - sha512 = "e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w=="; + url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha512 = "6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="; }; }; "supports-color-2.0.0" = { @@ -7741,7 +7705,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="; }; }; "supports-color-5.5.0" = { @@ -7753,15 +7717,6 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-7.1.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; - sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; - }; - }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -7789,13 +7744,13 @@ let sha512 = "HHi5kVSefKaJkGYXbDuKbUGRVxqnWGn3J2e39CYcNJEfWciGq2zYtOhXLTlvrOZW1QU7VX67w7fMmWafHX9Pfw=="; }; }; - "symbol-observable-1.2.0" = { - name = "symbol-observable"; - packageName = "symbol-observable"; - version = "1.2.0"; + "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/symbol-observable/-/symbol-observable-1.2.0.tgz"; - sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; + url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; }; }; "table-5.4.6" = { @@ -7807,13 +7762,13 @@ let sha512 = "wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug=="; }; }; - "table-layout-1.0.1" = { + "table-layout-1.0.2" = { name = "table-layout"; packageName = "table-layout"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/table-layout/-/table-layout-1.0.1.tgz"; - sha512 = "dEquqYNJiGwY7iPfZ3wbXDI944iqanTSchrACLL2nOB+1r+h1Nzu2eH+DuPPvWvm5Ry7iAPeFlgEtP5bIp5U7Q=="; + url = "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz"; + sha512 = "qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A=="; }; }; "tar-fs-2.1.1" = { @@ -7840,7 +7795,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz"; - sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; + sha512 = "xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ=="; }; }; "tempy-0.3.0" = { @@ -7858,7 +7813,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz"; - sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; + sha512 = "7dPUZQGy/+m3/wjVz3ZW5dobSoD/02NxJpoXUX0WIyjfVS3l0c+b/+9phIDFA7FHzkYtwtMFgeGZ/Y8jVTeqQQ=="; }; }; "text-extensions-1.9.0" = { @@ -7876,7 +7831,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; "thenify-3.3.1" = { @@ -7894,7 +7849,7 @@ let version = "1.6.0"; src = fetchurl { url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; - sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + sha512 = "RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA=="; }; }; "throttleit-1.0.0" = { @@ -7903,7 +7858,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"; - sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; + sha512 = "rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g=="; }; }; "through-2.3.8" = { @@ -7912,7 +7867,7 @@ let version = "2.3.8"; src = fetchurl { url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; }; }; "through2-2.0.5" = { @@ -7924,13 +7879,13 @@ let sha512 = "/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ=="; }; }; - "through2-3.0.1" = { + "through2-4.0.2" = { name = "through2"; packageName = "through2"; - version = "3.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"; - sha512 = "M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww=="; + url = "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"; + sha512 = "iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="; }; }; "tmp-0.0.33" = { @@ -7957,7 +7912,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; - sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + sha512 = "9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg=="; }; }; "to-readable-stream-2.1.0" = { @@ -7984,7 +7939,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + sha512 = "ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg=="; }; }; "to-regex-range-5.0.1" = { @@ -7993,16 +7948,16 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha1 = "1648c44aae7c8d988a326018ed72f5b4dd0392e4"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; }; }; - "toidentifier-1.0.0" = { + "toidentifier-1.0.1" = { name = "toidentifier"; packageName = "toidentifier"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; - sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; }; }; "tough-cookie-2.5.0" = { @@ -8014,40 +7969,49 @@ let sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; + "tr46-0.0.3" = { + name = "tr46"; + packageName = "tr46"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; + sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="; + }; + }; "traverse-0.6.6" = { name = "traverse"; packageName = "traverse"; version = "0.6.6"; src = fetchurl { url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz"; - sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137"; + sha512 = "kdf4JKs8lbARxWdp7RKdNzoJBhGUcIalSYibuGyHJbmk40pOysQ0+QPvlkCOICOivDWU2IJo2rkrxyTK2AH4fw=="; }; }; - "trim-newlines-2.0.0" = { + "trim-newlines-3.0.1" = { name = "trim-newlines"; packageName = "trim-newlines"; - version = "2.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz"; - sha1 = "b403d0b91be50c331dfc4b82eeceb22c3de16d20"; + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz"; + sha512 = "c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw=="; }; }; - "trim-off-newlines-1.0.1" = { - name = "trim-off-newlines"; - packageName = "trim-off-newlines"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz"; - sha1 = "9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"; - }; - }; - "tslib-1.11.1" = { + "tslib-1.14.1" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; + version = "1.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"; + sha512 = "Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="; + }; + }; + "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=="; }; }; "tsscmp-1.0.6" = { @@ -8065,7 +8029,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; }; }; "tweetnacl-0.14.5" = { @@ -8074,7 +8038,7 @@ let version = "0.14.5"; src = fetchurl { url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; "type-check-0.4.0" = { @@ -8095,13 +8059,22 @@ let sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; }; }; - "type-fest-0.11.0" = { + "type-fest-0.18.1" = { name = "type-fest"; packageName = "type-fest"; - version = "0.11.0"; + version = "0.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz"; - sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz"; + sha512 = "OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw=="; + }; + }; + "type-fest-0.21.3" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.21.3"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"; + sha512 = "t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="; }; }; "type-fest-0.3.1" = { @@ -8140,24 +8113,6 @@ let 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"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; - }; - }; - "typescript-3.7.4" = { - name = "typescript"; - packageName = "typescript"; - version = "3.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz"; - sha512 = "A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw=="; - }; - }; "typical-4.0.0" = { name = "typical"; packageName = "typical"; @@ -8185,13 +8140,22 @@ let sha512 = "+g3NEp7fJLe9DPa1TArHm9QAA7YciZmWnfAqEaFrBihQ7epOv9i99rjtgb6Iz0wh3WuQDjsCTDfgRoGnmHN81A=="; }; }; - "uglify-js-3.9.1" = { + "uglify-js-3.16.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.9.1"; + version = "3.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz"; - sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.2.tgz"; + sha512 = "AaQNokTNgExWrkEYA24BTNMSjyqEXPSfhqoS0AxmHkCJ4U+Dyy5AvbGV/sqxuxficEfGGoX3zWw9R7QpLFfEsg=="; + }; + }; + "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=="; }; }; "unbzip2-stream-1.4.3" = { @@ -8218,7 +8182,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz"; - sha1 = "9e1057cca851abb93398f8b33ae187b99caec11a"; + sha512 = "ODgiYu03y5g76A1I9Gt0/chLCzQjvzDy7DsZGsLOE/1MrF6wriEskSncj1+/C58Xk/kPZDppSctDybCwOSaGAg=="; }; }; "universal-user-agent-4.0.1" = { @@ -8230,13 +8194,13 @@ let sha512 = "LnST3ebHwVL2aNe4mejI9IQh2HfZ1RLo8Io2HugSif8ekzD1TlWpHpColOB/eh8JHMLkGH3Akqf040I+4ylNxg=="; }; }; - "universal-user-agent-5.0.0" = { + "universal-user-agent-6.0.0" = { name = "universal-user-agent"; packageName = "universal-user-agent"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-5.0.0.tgz"; - sha512 = "B5TPtzZleXyPrUMKCpEHFmVhMN6EhmJYjG5PQna9s7mXeSqGTLap4OpqLl5FCEFUI3UBmllkETwKf/db66Y54Q=="; + url = "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz"; + sha512 = "isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w=="; }; }; "universalify-0.1.2" = { @@ -8263,7 +8227,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; }; }; "unset-value-1.0.0" = { @@ -8272,7 +8236,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; - sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="; }; }; "untildify-4.0.0" = { @@ -8293,13 +8257,13 @@ let sha512 = "1TrmYLuLj/5ZovwUS7fFd1jMH3NnFDN1y1A8dboedIDt7zs/zJMo6TwwlhYKkSeEwzleeiSBV5/3c9ufAQWDaQ=="; }; }; - "uri-js-4.2.2" = { + "uri-js-4.4.1" = { name = "uri-js"; packageName = "uri-js"; - version = "4.2.2"; + version = "4.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; + url = "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"; + sha512 = "7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg=="; }; }; "urix-0.1.0" = { @@ -8308,16 +8272,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; - sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; - }; - }; - "url-0.11.0" = { - name = "url"; - packageName = "url"; - version = "0.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; - sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; }; }; "url-join-4.0.1" = { @@ -8344,7 +8299,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; }; "uuid-3.4.0" = { @@ -8356,13 +8311,22 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "v8-compile-cache-2.1.0" = { + "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.1.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; - sha512 = "usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g=="; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; }; "validate-npm-package-license-3.0.4" = { @@ -8380,7 +8344,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; }; }; "verror-1.10.0" = { @@ -8389,7 +8353,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; "wait-on-3.3.0" = { @@ -8398,7 +8362,7 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/wait-on/-/wait-on-3.3.0.tgz"; - sha1 = "9940981d047a72a9544a97b8b5fca45b2170a082"; + sha512 = "97dEuUapx4+Y12aknWZn7D25kkjMk16PbWoYzpSdA8bYpVfS6hpl2a2pOWZ3c+Tyt3/i4/pglyZctG3J4V1hWQ=="; }; }; "walk-back-4.0.0" = { @@ -8410,13 +8374,31 @@ let sha512 = "kudCA8PXVQfrqv2mFTG72vDBRi8BKWxGgFLwPpzHcpZnSwZk93WMwUDVcLHWNsnm+Y0AC4Vb6MUNRgaHfyV2DQ=="; }; }; - "weak-map-1.0.5" = { + "weak-map-1.0.8" = { name = "weak-map"; packageName = "weak-map"; - version = "1.0.5"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; - sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; + url = "https://registry.npmjs.org/weak-map/-/weak-map-1.0.8.tgz"; + sha512 = "lNR9aAefbGPpHO7AEnY0hCFjz1eTkWCXYvkTRrTHs9qv8zJp+SkVYpzfLIFXQQiG3tVvbNFQgVg2bQS8YGgxyw=="; + }; + }; + "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-1.3.1" = { @@ -8437,13 +8419,22 @@ let 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=="; + }; + }; "which-module-2.0.0" = { name = "which-module"; packageName = "which-module"; version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="; }; }; "widest-line-2.0.1" = { @@ -8461,16 +8452,16 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; - sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + sha512 = "2thx4pB0cV3h+Bw7QmMXcEbdmOzv9t0HFplJH/Lz6yu60hXYy5RT8rUu+wlIreVxWsGN20mo+MHeCSfUpQBwPw=="; }; }; - "windows-release-3.3.0" = { + "windows-release-3.3.3" = { name = "windows-release"; packageName = "windows-release"; - version = "3.3.0"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/windows-release/-/windows-release-3.3.0.tgz"; - sha512 = "2HetyTg1Y+R+rUgrKeUEhAG/ZuOmTrI1NBb3ZyAGQMYmOJjBBPe4MTodghRkmLJZHwkuPi02anbeGP+Zf401LQ=="; + url = "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz"; + sha512 = "OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg=="; }; }; "word-wrap-1.2.3" = { @@ -8488,7 +8479,7 @@ let version = "0.0.3"; src = fetchurl { url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + sha512 = "1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw=="; }; }; "wordwrap-1.0.0" = { @@ -8497,16 +8488,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="; }; }; - "wordwrapjs-4.0.0" = { + "wordwrapjs-4.0.1" = { name = "wordwrapjs"; packageName = "wordwrapjs"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.0.tgz"; - sha512 = "Svqw723a3R34KvsMgpjFBYCgNOSdcW3mQFK4wIfhGQhtaFVOJmdYoXgi63ne3dTlWgatVcUc7t4HtQ/+bUVIzQ=="; + url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz"; + sha512 = "kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA=="; }; }; "wrap-ansi-2.1.0" = { @@ -8515,16 +8506,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - }; - "wrap-ansi-3.0.1" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz"; - sha1 = "288a04d87eda5c286e060dfe8f135ce8d007f8ba"; + sha512 = "vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw=="; }; }; "wrap-ansi-6.2.0" = { @@ -8536,13 +8518,22 @@ let sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; }; + "wrap-ansi-7.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"; + sha512 = "YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q=="; + }; + }; "wrappy-1.0.2" = { name = "wrappy"; packageName = "wrappy"; version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; "write-1.0.3" = { @@ -8554,13 +8545,13 @@ let sha512 = "/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig=="; }; }; - "ws-7.4.3" = { + "ws-7.5.9" = { name = "ws"; packageName = "ws"; - version = "7.4.3"; + version = "7.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz"; - sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; + sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; "xtend-4.0.2" = { @@ -8572,22 +8563,22 @@ let sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="; }; }; - "y18n-3.2.1" = { + "y18n-3.2.2" = { name = "y18n"; packageName = "y18n"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz"; + sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ=="; }; }; - "y18n-4.0.0" = { + "y18n-4.0.3" = { name = "y18n"; packageName = "y18n"; - version = "4.0.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz"; - sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; + url = "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz"; + sha512 = "JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ=="; }; }; "yallist-2.1.2" = { @@ -8596,25 +8587,25 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; }; - "yallist-3.1.1" = { + "yallist-4.0.0" = { name = "yallist"; packageName = "yallist"; - version = "3.1.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; + url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; + sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; }; }; - "yaml-1.9.1" = { + "yaml-1.10.2" = { name = "yaml"; packageName = "yaml"; - version = "1.9.1"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/yaml/-/yaml-1.9.1.tgz"; - sha512 = "xbWX1ayUVoW8DPM8qxOBowac4XxSTi0mFLbiokRq880ViYglN+F3nJ4Dc2GdypXpykrknKS39d8I3lzFoHv1kA=="; + url = "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"; + sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; "yaml-lint-1.2.4" = { @@ -8626,13 +8617,13 @@ let sha512 = "qpKE0szyKsE9TrlVPi+bxKxVAjl30QjNAOyOxy7noQdf/WCCYUlT4xiCRxMG48eyeBzMBtBN6PgGfaB0MJePNw=="; }; }; - "yargs-15.3.1" = { + "yargs-15.4.1" = { name = "yargs"; packageName = "yargs"; - version = "15.3.1"; + version = "15.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz"; - sha512 = "92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA=="; + url = "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz"; + sha512 = "aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A=="; }; }; "yargs-3.32.0" = { @@ -8641,16 +8632,7 @@ let version = "3.32.0"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; - sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; - }; - }; - "yargs-parser-10.1.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "10.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz"; - sha512 = "VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ=="; + sha512 = "ONJZiimStfZzhKamYvR/xvmgW3uEkAUFSP91y2caTEPhzF6uP2JfPiVZcq66b/YR0C3uitxSV7+T1x8p5bkmMg=="; }; }; "yargs-parser-18.1.3" = { @@ -8662,22 +8644,31 @@ let sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; + "yargs-parser-20.2.9" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "20.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"; + sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; + }; + }; "yauzl-2.10.0" = { name = "yauzl"; packageName = "yauzl"; version = "2.10.0"; src = fetchurl { url = "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"; - sha1 = "c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"; + sha512 = "p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g=="; }; }; - "ylru-1.2.1" = { + "ylru-1.3.2" = { name = "ylru"; packageName = "ylru"; - version = "1.2.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz"; - sha512 = "faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ=="; + url = "https://registry.npmjs.org/ylru/-/ylru-1.3.2.tgz"; + sha512 = "RXRJzMiK6U2ye0BlGGZnmpwJDPgakn6aNQ0A7gHRbD4I0uvK4TW6UqkK1V0pp9jskjJBAXd3dRrbzWkqJ+6cxA=="; }; }; }; @@ -8687,22 +8678,14 @@ let version = "0.0.0-development"; src = callPackage ./src.nix {}; dependencies = [ - sources."@babel/code-frame-7.8.3" - sources."@babel/helper-validator-identifier-7.9.5" - sources."@babel/highlight-7.9.0" - sources."@babel/runtime-7.9.2" + sources."@babel/code-frame-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/highlight-7.18.6" + sources."@babel/runtime-7.18.9" sources."@bahmutov/print-env-1.2.0" + sources."@colors/colors-1.5.0" sources."@cypress/eslint-plugin-dev-5.0.0" - (sources."@cypress/listr-verbose-renderer-0.4.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - sources."@cypress/request-2.88.5" + sources."@cypress/request-2.88.10" (sources."@cypress/xvfb-1.2.4" // { dependencies = [ sources."debug-3.2.7" @@ -8714,169 +8697,173 @@ let sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" - sources."@koa/cors-3.1.0" + sources."@koa/cors-3.3.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@nodelib/fs.scandir-2.1.3" // { + sources."@nodelib/fs.scandir-2.1.5" + sources."@nodelib/fs.stat-2.0.5" + sources."@nodelib/fs.walk-1.2.8" + sources."@octokit/auth-token-2.5.0" + (sources."@octokit/endpoint-6.0.12" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.3" + sources."is-plain-object-5.0.0" + sources."universal-user-agent-6.0.0" ]; }) - sources."@nodelib/fs.stat-1.1.3" - sources."@nodelib/fs.walk-1.2.4" - sources."@octokit/auth-token-2.4.0" - (sources."@octokit/endpoint-6.0.1" // { + sources."@octokit/openapi-types-12.10.1" + (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ - sources."is-plain-object-3.0.0" - sources."isobject-4.0.0" - sources."universal-user-agent-5.0.0" + sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/plugin-paginate-rest-1.1.2" - sources."@octokit/plugin-request-log-1.0.0" - sources."@octokit/plugin-rest-endpoint-methods-2.4.0" - (sources."@octokit/request-5.4.2" // { + sources."@octokit/plugin-request-log-1.0.4" + (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { dependencies = [ - sources."@octokit/request-error-2.0.0" - sources."is-plain-object-3.0.0" - sources."isobject-4.0.0" - sources."universal-user-agent-5.0.0" + sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/request-error-1.2.1" - sources."@octokit/rest-16.43.1" - sources."@octokit/types-2.11.1" - sources."@samverschueren/stream-to-observable-0.3.1" + (sources."@octokit/request-5.6.3" // { + dependencies = [ + sources."@octokit/request-error-2.1.0" + sources."is-plain-object-5.0.0" + sources."universal-user-agent-6.0.0" + ]; + }) + (sources."@octokit/request-error-1.2.1" // { + dependencies = [ + sources."@octokit/types-2.16.2" + ]; + }) + sources."@octokit/rest-16.43.2" + sources."@octokit/types-6.40.0" (sources."@semantic-release/commit-analyzer-6.3.3" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."@semantic-release/error-2.2.0" (sources."@semantic-release/github-5.5.8" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.3" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."debug-4.1.1" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.2" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" + sources."agent-base-5.1.1" + sources."debug-4.3.4" + sources."fs-extra-8.1.0" sources."globby-10.0.2" - sources."ignore-5.1.4" - sources."is-number-7.0.0" - sources."micromatch-4.0.2" + sources."http-proxy-agent-3.0.0" + sources."https-proxy-agent-4.0.0" + sources."ignore-5.2.0" + sources."jsonfile-4.0.0" sources."ms-2.1.2" - sources."path-type-4.0.0" - sources."slash-3.0.0" - sources."to-regex-range-5.0.1" + sources."universalify-0.1.2" ]; }) (sources."@semantic-release/npm-5.3.5" // { dependencies = [ - sources."cross-spawn-7.0.2" + sources."cross-spawn-7.0.3" sources."execa-3.4.0" - sources."get-stream-5.1.0" - sources."is-stream-2.0.0" - sources."mimic-fn-2.1.0" + sources."fs-extra-8.1.0" + sources."get-stream-5.2.0" + sources."is-stream-2.0.1" + sources."jsonfile-4.0.0" + sources."normalize-url-4.5.1" sources."npm-run-path-4.0.1" - sources."onetime-5.1.0" sources."p-finally-2.0.1" - sources."parse-json-5.0.0" + sources."parse-json-5.2.0" sources."path-key-3.1.1" sources."read-pkg-5.2.0" - sources."registry-auth-token-4.1.1" + sources."registry-auth-token-4.2.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" + sources."type-fest-0.6.0" + sources."universalify-0.1.2" sources."which-2.0.2" ]; }) (sources."@semantic-release/release-notes-generator-7.3.5" // { dependencies = [ - sources."debug-4.1.1" - sources."get-stream-5.1.0" + sources."debug-4.3.4" + sources."get-stream-5.2.0" sources."ms-2.1.2" ]; }) sources."@sindresorhus/is-2.1.1" - sources."@szmarczak/http-timer-4.0.5" + sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" - sources."@types/cacheable-request-6.0.1" - sources."@types/color-name-1.1.1" - sources."@types/events-3.0.0" - sources."@types/glob-7.1.1" - sources."@types/http-cache-semantics-4.0.0" - sources."@types/keyv-3.1.1" - sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.0" - sources."@types/normalize-package-data-2.4.0" + sources."@types/cacheable-request-6.0.2" + sources."@types/glob-7.2.0" + sources."@types/http-cache-semantics-4.0.1" + sources."@types/json-buffer-3.0.0" + sources."@types/keyv-3.1.4" + sources."@types/minimatch-3.0.5" + sources."@types/minimist-1.2.2" + sources."@types/node-14.18.22" + sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.0" - sources."@types/sinonjs__fake-timers-6.0.2" + sources."@types/sinonjs__fake-timers-8.1.1" sources."@types/sizzle-2.3.3" - sources."@types/yauzl-2.9.1" + sources."@types/yauzl-2.10.0" sources."@zeit/schemas-2.6.0" sources."JSONStream-1.3.5" - sources."accepts-1.3.7" - sources."acorn-7.2.0" - sources."acorn-jsx-5.2.0" - sources."agent-base-5.1.1" - (sources."aggregate-error-3.0.1" // { + sources."accepts-1.3.8" + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.2" + (sources."agent-base-6.0.2" // { dependencies = [ - sources."indent-string-4.0.0" + sources."debug-4.3.4" + sources."ms-2.1.2" ]; }) + sources."aggregate-error-3.1.0" sources."ajv-6.5.3" sources."ansi-align-2.0.0" + sources."ansi-colors-4.1.3" sources."ansi-escape-sequences-5.1.2" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."ansi-escapes-4.3.2" + sources."ansi-regex-3.0.1" sources."ansi-styles-3.2.1" sources."ansicolors-0.3.2" - sources."any-observable-0.3.0" sources."any-promise-1.3.0" - sources."arch-2.1.1" + sources."arch-2.2.0" sources."arg-2.0.0" sources."argparse-1.0.10" sources."argv-formatter-1.0.0" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-back-4.0.1" - sources."array-find-index-1.0.2" + sources."array-back-4.0.2" sources."array-ify-1.0.0" - sources."array-union-1.0.2" + sources."array-union-2.1.0" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" sources."arrify-1.0.1" sources."asap-2.0.6" - sources."asn1-0.2.4" + sources."asn1-0.2.6" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."astral-regex-1.0.0" - sources."async-3.2.0" + sources."astral-regex-2.0.0" + sources."async-3.2.4" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.9.1" - sources."balanced-match-1.0.0" + sources."aws4-1.11.0" + sources."balanced-match-1.0.2" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" + sources."isobject-3.0.1" ]; }) sources."base64-js-1.5.1" sources."basic-auth-2.0.1" sources."batch-0.6.1" sources."bcrypt-pbkdf-1.0.2" - sources."before-after-hook-2.1.0" + sources."before-after-hook-2.2.2" (sources."bl-4.1.0" // { dependencies = [ sources."readable-stream-3.6.0" @@ -8887,26 +8874,26 @@ let sources."bottleneck-2.19.5" sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."braces-3.0.2" sources."btoa-lite-1.0.0" sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.1" sources."byte-size-6.2.0" sources."bytes-3.0.0" - sources."cache-base-1.0.1" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."cache-content-type-1.0.1" sources."cacheable-lookup-2.0.1" - (sources."cacheable-request-7.0.1" // { + (sources."cacheable-request-7.0.2" // { dependencies = [ sources."get-stream-5.2.0" ]; }) sources."cachedir-2.3.0" + sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" (sources."caller-callsite-2.0.0" // { dependencies = [ @@ -8916,7 +8903,11 @@ let sources."caller-path-2.0.0" sources."callsites-3.1.0" sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" + (sources."camelcase-keys-6.2.2" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."cardinal-2.1.1" sources."caseless-0.12.0" sources."chalk-2.4.2" @@ -8930,37 +8921,34 @@ let }) sources."check-more-types-2.24.0" sources."chownr-1.1.4" - sources."ci-info-2.0.0" + sources."ci-info-3.3.2" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" + sources."isobject-3.0.1" ]; }) sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" - sources."cli-cursor-1.0.2" - (sources."cli-table-0.3.1" // { + sources."cli-cursor-3.1.0" + sources."cli-table-0.3.11" + (sources."cli-table3-0.6.2" // { dependencies = [ - sources."colors-1.0.3" - ]; - }) - (sources."cli-table3-0.6.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - (sources."cli-truncate-0.2.1" // { + (sources."cli-truncate-2.1.0" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" + sources."ansi-regex-5.0.1" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" ]; }) - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" (sources."clipboardy-1.2.3" // { dependencies = [ sources."cross-spawn-5.1.0" @@ -8969,18 +8957,17 @@ let }) (sources."cliui-6.0.0" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."wrap-ansi-6.2.0" ]; }) - (sources."clone-response-1.0.2" // { + (sources."clone-response-1.0.3" // { dependencies = [ sources."mimic-response-1.0.1" ]; @@ -8992,42 +8979,43 @@ let sources."colon-names-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."colors-1.4.0" + sources."colorette-2.0.19" + sources."colors-1.0.3" sources."combined-stream-1.0.8" - (sources."command-line-args-5.1.1" // { + (sources."command-line-args-5.2.1" // { dependencies = [ sources."array-back-3.1.0" sources."typical-4.0.0" ]; }) - (sources."command-line-usage-6.1.1" // { + (sources."command-line-usage-6.1.3" // { dependencies = [ sources."typical-5.2.0" ]; }) sources."commander-5.1.0" sources."common-log-format-1.0.0" - sources."common-tags-1.8.0" - sources."compare-func-1.3.2" + sources."common-tags-1.8.2" + sources."compare-func-2.0.0" sources."component-emitter-1.3.0" + sources."compress-brotli-1.3.8" sources."compressible-2.0.18" sources."compression-1.7.3" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" sources."content-disposition-0.5.2" sources."content-type-1.0.4" - sources."conventional-changelog-angular-5.0.6" - (sources."conventional-changelog-writer-4.0.11" // { + sources."conventional-changelog-angular-5.0.13" + (sources."conventional-changelog-writer-4.1.0" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."conventional-commits-filter-2.0.2" - sources."conventional-commits-parser-3.0.8" + sources."conventional-commits-filter-2.0.7" + sources."conventional-commits-parser-3.2.4" sources."cookies-0.8.0" sources."copy-descriptor-0.1.1" sources."copy-to-2.0.1" - sources."core-js-2.6.11" + sources."core-js-2.6.12" sources."core-util-is-1.0.2" (sources."cosmiconfig-5.2.1" // { dependencies = [ @@ -9036,53 +9024,40 @@ let ]; }) sources."create-mixin-3.0.0" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."cross-spawn-6.0.5" sources."crypto-random-string-1.0.0" - sources."currently-unhandled-0.4.1" - (sources."cypress-7.3.0" // { + (sources."cypress-10.0.0" // { dependencies = [ - sources."@types/node-14.17.0" sources."ansi-styles-4.3.0" - sources."arch-2.2.0" - (sources."chalk-4.1.1" // { + (sources."chalk-4.1.2" // { dependencies = [ sources."supports-color-7.2.0" ]; }) - sources."ci-info-3.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."debug-4.3.2" + sources."debug-4.3.4" sources."execa-4.1.0" - sources."fs-extra-9.1.0" sources."get-stream-5.2.0" sources."has-flag-4.0.0" - sources."is-ci-3.0.0" - sources."is-stream-2.0.0" - sources."jsonfile-6.1.0" - sources."lodash-4.17.21" + sources."is-stream-2.0.1" + sources."lru-cache-6.0.0" sources."ms-2.1.2" sources."npm-run-path-4.0.1" - sources."onetime-5.1.2" sources."path-key-3.1.1" - sources."ramda-0.27.1" + sources."semver-7.3.7" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."supports-color-8.1.1" - sources."universalify-2.0.0" sources."which-2.0.2" + sources."yallist-4.0.0" ]; }) sources."d3-helpers-0.3.0" sources."dashdash-1.14.1" - sources."date-fns-1.30.1" sources."dateformat-3.0.3" - sources."dayjs-1.10.4" + sources."dayjs-1.11.3" sources."debug-2.6.9" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -9094,46 +9069,49 @@ let sources."decompress-response-5.0.0" sources."deep-equal-1.0.1" sources."deep-extend-0.6.0" - sources."deep-is-0.1.3" + sources."deep-is-0.1.4" sources."defer-to-connect-2.0.1" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" (sources."define-property-2.0.2" // { dependencies = [ sources."is-accessor-descriptor-1.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" + sources."isobject-3.0.1" ]; }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-2.0.0" sources."deprecation-2.3.1" - sources."destroy-1.0.4" - sources."detect-indent-6.0.0" + sources."destroy-1.2.0" + sources."detect-indent-6.1.0" sources."detect-newline-3.1.0" sources."devtools-protocol-0.0.847576" - sources."diff-match-patch-1.0.4" - sources."dir-glob-2.2.2" + sources."diff-match-patch-1.0.5" + (sources."dir-glob-3.0.1" // { + dependencies = [ + sources."path-type-4.0.0" + ]; + }) sources."doctrine-3.0.0" - sources."dot-prop-3.0.0" - sources."duplexer-0.1.1" + sources."dot-prop-5.3.0" + sources."duplexer-0.1.2" sources."duplexer2-0.1.4" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" + sources."enquirer-2.3.6" (sources."env-ci-4.5.2" // { dependencies = [ - sources."cross-spawn-7.0.2" + sources."cross-spawn-7.0.3" sources."execa-3.4.0" - sources."get-stream-5.1.0" - sources."is-stream-2.0.0" - sources."mimic-fn-2.1.0" + sources."get-stream-5.2.0" + sources."is-stream-2.0.1" sources."npm-run-path-4.0.1" - sources."onetime-5.1.0" sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -9142,56 +9120,63 @@ let ]; }) sources."error-ex-1.3.2" - sources."es-abstract-1.17.5" + sources."es-abstract-1.20.1" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" (sources."eslint-7.0.0" // { dependencies = [ - sources."ajv-6.12.2" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-4.0.0" + sources."ajv-6.12.6" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."cross-spawn-7.0.2" - sources."debug-4.1.1" - sources."fast-deep-equal-3.1.1" - sources."glob-parent-5.1.1" - sources."globals-12.4.0" + sources."cross-spawn-7.0.3" + sources."debug-4.3.4" + sources."fast-deep-equal-3.1.3" sources."has-flag-4.0.0" + sources."lru-cache-6.0.0" sources."ms-2.1.2" sources."path-key-3.1.1" - sources."semver-7.3.2" + sources."semver-7.3.7" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."strip-ansi-6.0.0" - sources."strip-json-comments-3.1.0" - sources."supports-color-7.1.0" - sources."type-fest-0.8.1" + sources."strip-ansi-6.0.1" + sources."strip-json-comments-3.1.1" + sources."supports-color-7.2.0" sources."which-2.0.2" + sources."yallist-4.0.0" + ]; + }) + (sources."eslint-plugin-cypress-2.8.1" // { + dependencies = [ + sources."globals-11.12.0" ]; }) - sources."eslint-plugin-cypress-2.8.1" (sources."eslint-plugin-json-format-2.0.1" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."eslint-plugin-mocha-5.3.0" sources."eslint-rule-composer-0.3.0" - sources."eslint-scope-5.0.0" - sources."eslint-utils-2.0.0" - sources."eslint-visitor-keys-1.1.0" - sources."espree-7.0.0" + sources."eslint-scope-5.1.1" + sources."eslint-utils-2.1.0" + sources."eslint-visitor-keys-1.3.0" + sources."espree-7.3.1" sources."esprima-4.0.1" - (sources."esquery-1.3.1" // { + (sources."esquery-1.4.0" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.3.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.3.0" ]; }) - sources."esrecurse-4.2.1" sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."etag-1.8.1" @@ -9200,14 +9185,12 @@ let sources."split-0.3.3" ]; }) - sources."eventemitter2-6.4.4" + sources."eventemitter2-6.4.6" (sources."execa-2.0.5" // { dependencies = [ - sources."get-stream-5.1.0" - sources."is-stream-2.0.0" - sources."mimic-fn-2.1.0" + sources."get-stream-5.2.0" + sources."is-stream-2.0.1" sources."npm-run-path-3.1.0" - sources."onetime-5.1.0" sources."p-finally-2.0.1" sources."path-key-3.1.1" ]; @@ -9217,7 +9200,6 @@ let sources."pify-2.3.0" ]; }) - sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -9244,10 +9226,16 @@ let sources."is-descriptor-1.0.2" ]; }) - sources."extract-zip-1.7.0" + (sources."extract-zip-2.0.1" // { + dependencies = [ + sources."debug-4.3.4" + sources."get-stream-5.2.0" + sources."ms-2.1.2" + ]; + }) sources."extsprintf-1.3.0" sources."fast-deep-equal-2.0.1" - sources."fast-glob-2.2.7" + sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" (sources."fast-url-parser-1.1.3" // { @@ -9255,15 +9243,11 @@ let sources."punycode-1.4.1" ]; }) - sources."fastq-1.7.0" + sources."fastq-1.13.0" sources."fd-slicer-1.1.0" - sources."figures-1.7.0" + sources."figures-3.2.0" sources."file-entry-cache-5.0.1" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-7.0.1" (sources."find-replace-3.0.0" // { dependencies = [ sources."array-back-3.1.0" @@ -9285,25 +9269,33 @@ let sources."from-0.1.7" sources."from2-2.3.0" sources."fs-constants-1.0.0" - sources."fs-extra-8.1.0" + sources."fs-extra-9.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-stdin-6.0.0" sources."get-stream-3.0.0" + sources."get-symbol-description-1.0.0" sources."get-value-2.0.6" sources."getos-3.2.1" sources."getpass-0.1.7" (sources."ggit-1.15.1" // { dependencies = [ sources."bluebird-3.5.0" + (sources."cli-table-0.3.1" // { + dependencies = [ + sources."colors-1.0.3" + ]; + }) sources."colors-1.1.2" sources."commander-2.9.0" sources."debug-2.6.3" sources."glob-7.1.1" sources."lodash-3.10.1" - sources."moment-2.18.1" sources."ms-0.7.2" sources."q-2.0.3" sources."ramda-0.9.1" @@ -9316,22 +9308,50 @@ let sources."through2-2.0.5" ]; }) - sources."glob-7.1.6" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) + sources."glob-7.2.3" + sources."glob-parent-5.1.2" sources."glob-to-regexp-0.3.0" (sources."global-dirs-3.0.0" // { dependencies = [ sources."ini-2.0.0" ]; }) - sources."globals-11.12.0" + (sources."globals-12.4.0" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) (sources."globby-9.1.0" // { dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."dir-glob-2.2.2" + sources."fast-glob-2.2.7" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."isobject-3.0.1" + sources."micromatch-3.1.10" sources."pify-4.0.1" + sources."slash-2.0.0" + sources."to-regex-range-2.1.1" ]; }) (sources."got-10.7.0" // { @@ -9340,107 +9360,113 @@ let sources."type-fest-0.10.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.10" sources."graceful-readlink-1.0.1" - (sources."handlebars-4.7.6" // { + (sources."handlebars-4.7.7" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."har-schema-2.0.0" - (sources."har-validator-5.1.3" // { + (sources."har-validator-5.1.5" // { dependencies = [ - sources."ajv-6.12.2" - sources."fast-deep-equal-3.1.1" + sources."ajv-6.12.6" + sources."fast-deep-equal-3.1.3" ]; }) + sources."hard-rejection-2.1.0" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" ]; }) + sources."has-bigints-1.0.2" sources."has-flag-3.0.0" - sources."has-symbols-1.0.1" - sources."has-value-1.0.0" + sources."has-property-descriptors-1.0.0" + sources."has-symbols-1.0.3" + sources."has-tostringtag-1.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) (sources."has-values-1.0.0" // { dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) sources."kind-of-4.0.0" ]; }) sources."hook-std-2.0.0" - sources."hosted-git-info-2.8.8" - (sources."http-assert-1.4.1" // { - dependencies = [ - sources."depd-1.1.2" - sources."http-errors-1.7.3" - ]; - }) + sources."hosted-git-info-2.8.9" + sources."http-assert-1.5.0" sources."http-cache-semantics-4.1.0" - (sources."http-errors-1.8.0" // { + (sources."http-errors-1.8.1" // { dependencies = [ sources."depd-1.1.2" - sources."setprototypeof-1.2.0" ]; }) - (sources."http-proxy-agent-3.0.0" // { + (sources."http-proxy-agent-4.0.1" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."http-signature-1.2.0" - (sources."https-proxy-agent-4.0.0" // { + sources."http-signature-1.3.6" + (sources."https-proxy-agent-5.0.1" // { dependencies = [ - sources."debug-4.1.1" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) sources."human-signals-1.1.1" (sources."husky-1.3.1" // { dependencies = [ + sources."ci-info-2.0.0" sources."execa-1.0.0" sources."get-stream-4.1.0" + sources."is-ci-2.0.0" sources."read-pkg-4.0.1" + sources."slash-2.0.0" ]; }) sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" sources."ignore-4.0.6" - sources."import-fresh-3.2.1" + sources."import-fresh-3.3.0" (sources."import-from-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" ]; }) sources."imurmurhash-0.1.4" - sources."indent-string-3.2.0" + sources."indent-string-4.0.0" sources."inflation-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" - (sources."inquirer-7.1.0" // { + sources."ini-1.3.8" + (sources."inquirer-7.3.3" // { dependencies = [ - sources."ansi-escapes-4.3.1" - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" - sources."cli-cursor-3.1.0" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."figures-3.2.0" sources."has-flag-4.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.0" - sources."restore-cursor-3.1.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - sources."supports-color-7.1.0" - sources."type-fest-0.11.0" + sources."rxjs-6.6.7" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."supports-color-7.2.0" + sources."tslib-1.14.1" ]; }) - sources."interpret-1.2.0" + sources."internal-slot-1.0.3" + sources."interpret-1.4.0" sources."into-stream-5.1.1" sources."invert-kv-1.0.0" (sources."is-accessor-descriptor-0.1.6" // { @@ -9449,92 +9475,96 @@ let ]; }) sources."is-arrayish-0.2.1" + sources."is-bigint-1.0.4" + sources."is-boolean-object-1.1.2" sources."is-buffer-1.1.6" - sources."is-callable-1.1.5" - sources."is-ci-2.0.0" + sources."is-callable-1.2.4" + sources."is-ci-3.0.1" + sources."is-core-module-2.9.0" (sources."is-data-descriptor-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" ]; }) - sources."is-date-object-1.0.2" + sources."is-date-object-1.0.5" (sources."is-descriptor-0.1.6" // { dependencies = [ sources."kind-of-5.1.0" ]; }) sources."is-directory-0.3.1" - sources."is-docker-2.1.1" + sources."is-docker-2.2.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-generator-function-1.0.8" - sources."is-glob-4.0.1" + sources."is-generator-function-1.0.10" + sources."is-glob-4.0.3" sources."is-installed-globally-0.4.0" - (sources."is-number-3.0.0" // { + 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-inside-3.0.3" + sources."is-plain-obj-2.1.0" + (sources."is-plain-object-2.0.4" // { dependencies = [ - sources."kind-of-3.2.2" + sources."isobject-3.0.1" ]; }) - sources."is-obj-1.0.1" - sources."is-observable-1.1.0" - sources."is-path-inside-3.0.3" - sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" - sources."is-promise-2.2.2" - sources."is-regex-1.0.5" + sources."is-regex-1.1.4" + sources."is-shared-array-buffer-1.0.2" sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" + sources."is-string-1.0.7" + sources."is-symbol-1.0.4" sources."is-text-path-1.0.1" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" + sources."is-weakref-1.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" + sources."isobject-2.1.0" sources."isstream-0.1.2" sources."issue-parser-5.0.0" sources."java-properties-1.0.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.13.1" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-buffer-3.0.1" - (sources."json-fixer-1.4.1" // { + (sources."json-fixer-1.6.13" // { dependencies = [ - sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."supports-color-7.1.0" + sources."supports-color-7.2.0" ]; }) sources."json-parse-better-errors-1.0.2" - sources."json-schema-0.2.3" + sources."json-parse-even-better-errors-2.3.1" + sources."json-schema-0.4.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" + sources."jsonfile-6.1.0" sources."jsonparse-1.3.1" - sources."jsprim-1.4.1" + sources."jsprim-2.0.2" sources."keygrip-1.1.0" - sources."keyv-4.0.3" + sources."keyv-4.3.3" sources."kind-of-6.0.3" - (sources."koa-2.13.1" // { + (sources."koa-2.13.4" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.3.4" + sources."ms-2.1.2" ]; }) sources."koa-bodyparser-4.3.0" sources."koa-compose-4.1.0" sources."koa-compress-3.1.0" sources."koa-conditional-get-2.0.0" - (sources."koa-convert-1.2.0" // { - dependencies = [ - sources."koa-compose-3.2.1" - ]; - }) + sources."koa-convert-2.0.0" sources."koa-etag-3.0.0" sources."koa-is-json-1.0.0" sources."koa-json-2.0.2" @@ -9548,7 +9578,7 @@ let }) (sources."koa-send-5.0.1" // { dependencies = [ - sources."debug-4.3.1" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -9571,38 +9601,14 @@ let ]; }) sources."levn-0.4.1" - (sources."line-column-1.0.2" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."lines-and-columns-1.1.6" - sources."listr-0.14.3" - sources."listr-silent-renderer-1.1.1" - (sources."listr-update-renderer-0.5.0" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."log-symbols-1.0.2" - sources."strip-ansi-3.0.1" - sources."supports-color-2.0.0" - ]; - }) - (sources."listr-verbose-renderer-0.5.0" // { - dependencies = [ - sources."cli-cursor-2.1.0" - sources."figures-2.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - ]; - }) + sources."line-column-1.0.2" + sources."lines-and-columns-1.2.4" + sources."listr2-3.14.0" sources."load-json-file-4.0.0" sources."load-module-3.0.0" sources."local-web-server-4.2.1" sources."locate-path-3.0.0" - sources."lodash-4.17.15" + sources."lodash-4.17.21" sources."lodash.assignwith-4.2.0" sources."lodash.camelcase-4.3.0" sources."lodash.capitalize-4.2.1" @@ -9616,41 +9622,44 @@ let sources."lodash.set-4.3.2" sources."lodash.snakecase-4.1.1" sources."lodash.throttle-4.1.1" - sources."lodash.toarray-4.4.0" sources."lodash.uniq-4.5.0" sources."lodash.uniqby-4.7.0" (sources."log-symbols-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.1" + 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."log-update-2.3.0" // { + (sources."log-update-4.0.0" // { dependencies = [ - sources."cli-cursor-2.1.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."is-fullwidth-code-point-3.0.0" + sources."slice-ansi-4.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + sources."wrap-ansi-6.2.0" ]; }) - sources."loud-rejection-1.6.0" sources."lowercase-keys-2.0.0" sources."lru-cache-4.1.5" sources."lws-3.1.0" sources."lws-basic-auth-2.0.0" (sources."lws-blacklist-3.0.0" // { dependencies = [ - sources."path-to-regexp-6.2.0" + sources."path-to-regexp-6.2.1" ]; }) sources."lws-body-parser-2.0.0" sources."lws-compress-2.0.0" sources."lws-conditional-get-2.0.0" - sources."lws-cors-3.0.0" + sources."lws-cors-3.1.1" sources."lws-index-2.0.0" sources."lws-json-2.0.0" sources."lws-log-2.0.0" @@ -9659,56 +9668,65 @@ let sources."lws-request-monitor-2.0.0" (sources."lws-rewrite-3.1.1" // { dependencies = [ - sources."agent-base-6.0.2" - sources."debug-4.3.1" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" - sources."ms-2.1.2" - sources."path-to-regexp-6.2.0" + sources."path-to-regexp-6.2.1" ]; }) sources."lws-spa-3.0.0" sources."lws-static-2.0.0" - sources."macos-release-2.3.0" + sources."macos-release-2.5.0" sources."map-cache-0.2.2" - sources."map-obj-2.0.0" + sources."map-obj-4.3.0" sources."map-stream-0.1.0" sources."map-visit-1.0.0" sources."marked-0.7.0" - sources."marked-terminal-3.3.0" + (sources."marked-terminal-3.3.0" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + ]; + }) sources."media-typer-0.3.0" sources."memorystream-0.3.1" - (sources."meow-5.0.0" // { + (sources."meow-8.1.2" // { dependencies = [ - sources."find-up-2.1.0" - sources."locate-path-2.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."read-pkg-up-3.0.0" + sources."hosted-git-info-4.1.0" + sources."lru-cache-6.0.0" + sources."normalize-package-data-3.0.3" + sources."semver-7.3.7" + sources."type-fest-0.18.1" + sources."yallist-4.0.0" ]; }) sources."merge-stream-2.0.0" - sources."merge2-1.3.0" + sources."merge2-1.4.1" sources."methods-1.1.2" - sources."micromatch-3.1.10" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."micromatch-4.0.5" + sources."mime-2.6.0" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."mimic-response-2.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."minimist-options-3.0.2" + sources."min-indent-1.0.1" + sources."minimatch-3.1.2" + sources."minimist-1.2.6" + (sources."minimist-options-4.1.0" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) - sources."mkdirp-0.5.5" + sources."mkdirp-0.5.6" sources."mkdirp-classic-0.5.3" sources."modify-values-1.0.1" - sources."morgan-1.10.0" + sources."moment-2.18.1" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."on-finished-2.3.0" + ]; + }) sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."mz-2.7.0" @@ -9724,31 +9742,32 @@ let sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wrap-ansi-2.1.0" - sources."y18n-3.2.1" + sources."y18n-3.2.2" sources."yargs-3.32.0" ]; }) - sources."negotiator-0.6.2" - sources."neo-async-2.6.1" + sources."negotiator-0.6.3" + sources."neo-async-2.6.2" sources."nerf-dart-1.0.0" (sources."netlify-plugin-cypress-2.0.0" // { dependencies = [ + sources."common-tags-1.8.0" sources."debug-4.1.1" sources."ms-2.1.3" sources."ramda-0.27.1" ]; }) sources."nice-try-1.0.5" - sources."node-emoji-1.10.0" - sources."node-fetch-2.6.0" - sources."node-version-matches-2.0.1" - (sources."normalize-package-data-2.5.0" // { + sources."node-emoji-1.11.0" + sources."node-fetch-2.6.7" + (sources."node-version-matches-2.0.1" // { dependencies = [ - sources."semver-5.7.1" + sources."semver-6.3.0" ]; }) - sources."normalize-url-4.5.0" - sources."npm-6.14.4" + sources."normalize-package-data-2.5.0" + sources."normalize-url-6.1.0" + sources."npm-6.14.17" sources."npm-run-all-4.1.5" sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" @@ -9760,16 +9779,24 @@ let sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.7.0" + sources."object-inspect-1.12.2" sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.pick-1.3.0" + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."object.assign-4.1.2" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."octokit-pagination-methods-1.1.0" - 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-1.1.0" + sources."onetime-5.1.2" sources."only-0.0.2" sources."open-7.4.2" (sources."optimist-0.6.1" // { @@ -9783,16 +9810,20 @@ let sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" sources."ospath-1.2.2" - sources."p-cancelable-2.0.0" + sources."p-cancelable-2.1.1" sources."p-event-4.2.0" - sources."p-filter-2.1.0" + (sources."p-filter-2.1.0" // { + dependencies = [ + sources."p-map-2.1.0" + ]; + }) sources."p-finally-1.0.0" sources."p-is-promise-3.0.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" - sources."p-map-2.1.0" + sources."p-map-4.0.0" sources."p-reduce-2.1.0" - sources."p-retry-4.2.0" + sources."p-retry-4.6.2" sources."p-timeout-3.2.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" @@ -9804,14 +9835,14 @@ let sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."path-parse-1.0.6" + sources."path-parse-1.0.7" sources."path-to-regexp-2.2.1" sources."path-type-3.0.0" sources."pause-stream-0.0.11" sources."pegjs-0.10.0" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.2" + sources."picomatch-2.3.1" sources."pidtree-0.3.1" sources."pify-3.0.0" (sources."pkg-conf-2.1.0" // { @@ -9832,41 +9863,37 @@ let sources."pretty-bytes-5.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."proxy-from-env-1.1.0" + sources."proxy-from-env-1.0.0" sources."ps-tree-1.2.0" sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."pump-3.0.0" sources."punycode-2.1.1" (sources."puppeteer-7.1.0" // { dependencies = [ - sources."agent-base-6.0.2" - sources."debug-4.3.1" - sources."extract-zip-2.0.1" + sources."debug-4.3.4" sources."find-up-4.1.0" - sources."get-stream-5.2.0" - sources."https-proxy-agent-5.0.0" sources."locate-path-5.0.0" sources."ms-2.1.2" - sources."node-fetch-2.6.1" sources."p-locate-4.1.0" sources."path-exists-4.0.0" sources."pkg-dir-4.2.0" + sources."proxy-from-env-1.1.0" ]; }) sources."q-1.5.1" sources."qrcode-terminal-0.12.0" - sources."qs-6.5.2" - sources."querystring-0.2.0" - sources."quick-lru-1.1.0" + sources."qs-6.5.3" + sources."queue-microtask-1.2.3" + sources."quick-lru-4.0.1" sources."quote-0.4.0" sources."ramda-0.26.1" sources."range-parser-1.2.0" - (sources."raw-body-2.4.1" // { + (sources."raw-body-2.5.1" // { dependencies = [ - sources."bytes-3.1.0" - sources."depd-1.1.2" - sources."http-errors-1.7.3" + sources."bytes-3.1.2" + sources."http-errors-2.0.0" + sources."statuses-2.0.1" ]; }) sources."rc-1.2.8" @@ -9876,7 +9903,7 @@ let sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."p-locate-4.1.0" - sources."parse-json-5.0.0" + sources."parse-json-5.2.0" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -9888,21 +9915,28 @@ let }) sources."readable-stream-2.3.7" sources."rechoir-0.6.2" - sources."redent-2.0.0" + sources."redent-3.0.0" sources."redeyed-2.1.1" - sources."reduce-flatten-3.0.0" - sources."regenerator-runtime-0.13.5" + sources."reduce-flatten-3.0.1" + sources."regenerator-runtime-0.13.9" sources."regex-not-1.0.2" - sources."regexpp-3.1.0" + sources."regexp.prototype.flags-1.4.3" + sources."regexpp-3.2.0" sources."registry-auth-token-3.3.2" sources."registry-url-3.1.0" - sources."repeat-element-1.1.3" + sources."repeat-element-1.1.4" sources."repeat-string-1.6.1" - sources."request-2.88.2" + (sources."request-2.88.2" // { + dependencies = [ + sources."http-signature-1.2.0" + sources."jsprim-1.4.2" + sources."uuid-3.4.0" + ]; + }) sources."request-progress-3.0.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.16.1" + sources."resolve-1.22.1" sources."resolve-from-4.0.0" (sources."resolve-path-1.4.0" // { dependencies = [ @@ -9913,17 +9947,18 @@ let ]; }) sources."resolve-url-0.2.1" - sources."responselike-2.0.0" - sources."restore-cursor-1.0.1" + sources."responselike-2.0.1" + sources."restore-cursor-3.1.0" sources."ret-0.1.15" - sources."retry-0.12.0" + sources."retry-0.13.1" sources."reusify-1.0.4" + sources."rfdc-1.3.0" sources."rimraf-3.0.2" sources."run-async-2.4.1" sources."run-node-1.0.0" - sources."run-parallel-1.1.9" + sources."run-parallel-1.2.0" sources."rx-4.1.0" - sources."rxjs-6.5.5" + sources."rxjs-7.5.6" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" @@ -9931,21 +9966,18 @@ let (sources."semantic-release-15.13.32" // { dependencies = [ sources."cosmiconfig-6.0.0" - sources."cross-spawn-7.0.2" - sources."debug-4.1.1" + sources."cross-spawn-7.0.3" + sources."debug-4.3.4" sources."execa-3.4.0" - sources."figures-3.2.0" - sources."get-stream-5.1.0" - sources."hosted-git-info-3.0.4" - sources."is-stream-2.0.0" - sources."lru-cache-5.1.1" - sources."mimic-fn-2.1.0" + sources."get-stream-5.2.0" + sources."hosted-git-info-3.0.8" + sources."is-stream-2.0.1" + sources."lru-cache-6.0.0" sources."ms-2.1.2" sources."npm-run-path-4.0.1" - sources."onetime-5.1.0" sources."p-finally-2.0.1" sources."p-locate-4.1.0" - sources."parse-json-5.0.0" + sources."parse-json-5.2.0" sources."path-key-3.1.1" sources."path-type-4.0.0" sources."resolve-from-5.0.0" @@ -9953,10 +9985,10 @@ let sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."which-2.0.2" - sources."yallist-3.1.1" + sources."yallist-4.0.0" ]; }) - sources."semver-6.3.0" + sources."semver-5.7.1" sources."semver-compare-1.0.0" sources."semver-regex-2.0.0" (sources."serve-11.3.0" // { @@ -9968,6 +10000,7 @@ let dependencies = [ sources."mime-db-1.33.0" sources."mime-types-2.1.18" + sources."minimatch-3.0.4" ]; }) (sources."serve-index-75lb-2.0.1" // { @@ -9984,19 +10017,27 @@ let sources."extend-shallow-2.0.1" ]; }) - sources."setprototypeof-1.1.1" + sources."setprototypeof-1.2.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shell-quote-1.7.2" - sources."shelljs-0.8.4" - sources."signal-exit-3.0.3" + sources."shell-quote-1.7.3" + sources."shelljs-0.8.5" + sources."side-channel-1.0.4" + sources."signal-exit-3.0.7" (sources."signale-1.4.0" // { dependencies = [ sources."figures-2.0.0" ]; }) - sources."slash-2.0.0" - sources."slice-ansi-0.0.4" + sources."slash-3.0.0" + (sources."slice-ansi-3.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."is-fullwidth-code-point-3.0.0" + ]; + }) (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -10009,6 +10050,7 @@ let sources."is-accessor-descriptor-1.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" + sources."isobject-3.0.1" ]; }) (sources."snapdragon-util-3.0.1" // { @@ -10017,55 +10059,40 @@ let ]; }) sources."sort-object-keys-1.1.3" - (sources."sort-package-json-1.42.2" // { + (sources."sort-package-json-1.57.0" // { dependencies = [ - sources."@nodelib/fs.stat-2.0.3" - sources."array-union-2.1.0" - sources."braces-3.0.2" - sources."dir-glob-3.0.1" - sources."fast-glob-3.2.2" - sources."fill-range-7.0.1" - sources."glob-parent-5.1.1" sources."globby-10.0.0" - sources."ignore-5.1.4" - sources."is-number-7.0.0" - sources."is-plain-obj-2.1.0" - sources."micromatch-4.0.2" - sources."path-type-4.0.0" - sources."slash-3.0.0" - sources."to-regex-range-5.0.1" + sources."ignore-5.2.0" ]; }) sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" + sources."source-map-url-0.4.1" sources."spawn-error-forwarder-1.0.0" - sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" - sources."spdx-expression-parse-3.0.0" - sources."spdx-license-ids-3.0.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.11" sources."split-1.0.1" sources."split-string-3.1.0" - (sources."split2-2.2.0" // { + (sources."split2-3.2.2" // { dependencies = [ - sources."through2-2.0.5" + sources."readable-stream-3.6.0" ]; }) sources."spots-0.4.0" sources."sprintf-js-1.0.3" - sources."sshpk-1.16.1" + sources."sshpk-1.17.0" (sources."start-server-and-test-1.10.6" // { dependencies = [ sources."bluebird-3.7.1" - sources."cross-spawn-7.0.2" + sources."cross-spawn-7.0.3" sources."debug-4.1.1" sources."execa-2.1.0" - sources."get-stream-5.1.0" - sources."is-stream-2.0.0" - sources."mimic-fn-2.1.0" - sources."ms-2.1.2" + sources."get-stream-5.2.0" + sources."is-stream-2.0.1" + sources."ms-2.1.3" sources."npm-run-path-3.1.0" - sources."onetime-5.1.0" sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -10087,17 +10114,15 @@ let sources."stream-via-1.0.4" sources."streaming-json-stringify-3.1.0" sources."string-width-2.1.1" - sources."string.prototype.padend-3.1.0" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimleft-2.1.2" - sources."string.prototype.trimright-2.1.2" - sources."string.prototype.trimstart-1.0.1" + sources."string.prototype.padend-3.1.3" + sources."string.prototype.trimend-1.0.5" + sources."string.prototype.trimstart-1.0.5" sources."string_decoder-1.1.1" sources."strip-ansi-4.0.0" sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" sources."strip-final-newline-2.0.0" - sources."strip-indent-2.0.0" + sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" (sources."supports-hyperlinks-1.0.1" // { @@ -10105,19 +10130,20 @@ let sources."has-flag-2.0.0" ]; }) - sources."symbol-observable-1.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" (sources."table-5.4.6" // { dependencies = [ - sources."ajv-6.12.2" - sources."ansi-regex-4.1.0" + sources."ajv-6.12.6" + sources."ansi-regex-4.1.1" + sources."astral-regex-1.0.0" sources."emoji-regex-7.0.3" - sources."fast-deep-equal-3.1.1" + sources."fast-deep-equal-3.1.3" sources."slice-ansi-2.1.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; }) - (sources."table-layout-1.0.1" // { + (sources."table-layout-1.0.2" // { dependencies = [ sources."typical-5.2.0" ]; @@ -10146,7 +10172,11 @@ let sources."thenify-all-1.6.0" sources."throttleit-1.0.0" sources."through-2.3.8" - sources."through2-3.0.1" + (sources."through2-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."tmp-0.2.1" (sources."to-object-path-0.3.0" // { dependencies = [ @@ -10155,32 +10185,27 @@ let }) sources."to-readable-stream-2.1.0" sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - sources."toidentifier-1.0.0" + sources."to-regex-range-5.0.1" + sources."toidentifier-1.0.1" sources."tough-cookie-2.5.0" + sources."tr46-0.0.3" sources."traverse-0.6.6" - sources."trim-newlines-2.0.0" - sources."trim-off-newlines-1.0.1" - sources."tslib-1.11.1" + sources."trim-newlines-3.0.1" + sources."tslib-2.4.0" sources."tsscmp-1.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.4.0" - sources."type-fest-0.6.0" + sources."type-fest-0.21.3" sources."type-is-1.6.18" - sources."typedarray-0.0.6" - sources."typescript-3.7.4" sources."typical-6.0.1" - (sources."uglify-js-3.9.1" // { - dependencies = [ - sources."commander-2.20.3" - ]; - }) + sources."uglify-js-3.16.2" + sources."unbox-primitive-1.0.2" sources."unbzip2-stream-1.4.3" sources."union-value-1.0.1" sources."unique-string-1.0.0" sources."universal-user-agent-4.0.1" - sources."universalify-0.1.2" + sources."universalify-2.0.0" sources."unpipe-1.0.0" (sources."unset-value-1.0.0" // { dependencies = [ @@ -10190,33 +10215,32 @@ let ]; }) sources."has-values-0.1.4" + sources."isobject-3.0.1" ]; }) sources."untildify-4.0.0" sources."update-check-1.5.2" - sources."uri-js-4.2.2" + sources."uri-js-4.4.1" sources."urix-0.1.0" - (sources."url-0.11.0" // { - dependencies = [ - sources."punycode-1.3.2" - ]; - }) sources."url-join-4.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."v8-compile-cache-2.1.0" + sources."uuid-8.3.2" + sources."v8-compile-cache-2.3.0" sources."validate-npm-package-license-3.0.4" sources."vary-1.1.2" sources."verror-1.10.0" sources."wait-on-3.3.0" sources."walk-back-4.0.0" - sources."weak-map-1.0.5" + sources."weak-map-1.0.8" + sources."webidl-conversions-3.0.1" + sources."whatwg-url-5.0.0" sources."which-1.3.1" + sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" sources."widest-line-2.0.1" sources."window-size-0.1.4" - (sources."windows-release-3.3.0" // { + (sources."windows-release-3.3.3" // { dependencies = [ sources."execa-1.0.0" sources."get-stream-4.1.0" @@ -10224,39 +10248,48 @@ let }) sources."word-wrap-1.2.3" sources."wordwrap-1.0.0" - (sources."wordwrapjs-4.0.0" // { + (sources."wordwrapjs-4.0.1" // { dependencies = [ sources."reduce-flatten-2.0.0" sources."typical-5.2.0" ]; }) - sources."wrap-ansi-3.0.1" + (sources."wrap-ansi-7.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.1" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" + ]; + }) sources."wrappy-1.0.2" sources."write-1.0.3" - sources."ws-7.4.3" + sources."ws-7.5.9" sources."xtend-4.0.2" - sources."y18n-4.0.0" + sources."y18n-4.0.3" sources."yallist-2.1.2" - sources."yaml-1.9.1" + sources."yaml-1.10.2" sources."yaml-lint-1.2.4" - (sources."yargs-15.3.1" // { + (sources."yargs-15.4.1" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."ansi-regex-5.0.1" sources."camelcase-5.3.1" - sources."emoji-regex-8.0.0" sources."find-up-4.1.0" sources."is-fullwidth-code-point-3.0.0" sources."locate-path-5.0.0" sources."p-locate-4.1.0" sources."path-exists-4.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" + sources."string-width-4.2.3" + sources."strip-ansi-6.0.1" sources."yargs-parser-18.1.3" ]; }) - sources."yargs-parser-10.1.0" + sources."yargs-parser-20.2.9" sources."yauzl-2.10.0" - sources."ylru-1.2.1" + sources."ylru-1.3.2" ]; buildInputs = globalBuildInputs; meta = { diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/src.nix b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/src.nix index 8f9999a704..ce21eea772 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/src.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/cypress-example-kitchensink/src.nix @@ -1,6 +1,6 @@ { fetchFromGitHub }: fetchFromGitHub { owner = "cypress-io"; repo = "cypress-example-kitchensink"; - rev = "1572887a2003c2f35ff46d14f5f1cdfef975c9be"; - sha256 = "sha256-A7d95b9V707iOzlIg+3nItPPB8HNVVOjPhGqa8MXRPE="; + rev = "6fd2fbf1a561742acba3cc45c389928483aac7f8"; + sha256 = "sha256-2oqjYoGANudYzkYwEtAbO2P5fpGM5k5wC8/CCeyGjqk="; } diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index 97d47c9223..0b1ce3de75 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "10.2.0"; + version = "10.3.1"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "y34EnCoAmV9ib72LpT7D0eUxP1h80h+rKqvrn9TfsQg="; + sha256 = "sha256-LfvTnvOGFFZn7tUQ150fCO0gw7TK6JJj+Ys75VjJJ2M="; }; # don't remove runtime deps @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ tweber mmahut ]; + maintainers = with maintainers; [ tweber mmahut Crafter ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index cdc82dc26a..92de17fe00 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.351"; + version = "0.0.370"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-vxX11kaQMOQ2LJ/2q4QrlzMmuJtkn1Oe1iBHQgXn0mI="; + sha256 = "sha256-Med1B6E6e1oLkpaL8aNtT/qoHZtkCOwSRVkVQRPNRpI="; }; - vendorSha256 = "sha256-gAdKrPU6js3zrzX2+NWQZSXxGuuUiggprua4gvd++OQ="; + vendorSha256 = "sha256-CloCB7El/fSlBXVzBstm1wgMEobBNKPIQJCilS/PhX8="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/web/grails/default.nix b/third_party/nixpkgs/pkgs/development/web/grails/default.nix index 2497956b91..da72db1643 100644 --- a/third_party/nixpkgs/pkgs/development/web/grails/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.1.7"; + version = "5.2.2"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-Sk+VvuEyzZ9sSeI9fOuHgmgSu89WjriiK/6UU/eWqag="; + sha256 = "sha256-ghWWoAySJsiYmpdoFZIQrHSV7kOQe0kDQrONwgqFMzY="; }; nativeBuildInputs = [ unzip ]; @@ -46,6 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://grails.org/"; license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/third_party/nixpkgs/pkgs/development/web/kore/default.nix b/third_party/nixpkgs/pkgs/development/web/kore/default.nix index 7a3ec5fe4a..affadf281c 100644 --- a/third_party/nixpkgs/pkgs/development/web/kore/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/kore/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kore"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "jorisvink"; repo = pname; rev = version; - sha256 = "sha256-MC4PCjRuAqWuGvNDsZXKohb4HdSWMV0Oc0pZ0rnhG7Y="; + sha256 = "sha256-B1Fm02EHkV4mogz4PrqdZWvRQ8ixO+sRhvqW7ObzJjY="; }; buildInputs = [ openssl curl postgresql yajl ]; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix index 2f044b44f2..89b6c3e436 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -1,4 +1,4 @@ -{ callPackage, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, fetchpatch, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -8,9 +8,17 @@ let in buildNodejs { inherit enableNpm; - version = "16.15.0"; # Do not upgrade until #176127 is solved - sha256 = "sha256-oPgS78Q/eDIeygiVeWCkj15r+XAE1QWMjdOwPGRupPc="; + version = "16.16.0"; + sha256 = "sha256-FFFR7/Oyql6+czhACcUicag3QK5oepPJjGKM19UnNus="; patches = [ ./disable-darwin-v8-system-instrumentation.patch + # Fix npm silently fail without a HOME directory https://github.com/npm/cli/issues/4996 + (fetchpatch { + url = "https://github.com/npm/cli/commit/9905d0e24c162c3f6cc006fa86b4c9d0205a4c6f.patch"; + sha256 = "sha256-RlabXWtjzTZ5OgrGf4pFkolonvTDIPlzPY1QcYDd28E="; + includes = [ "deps/npm/lib/npm.js" "deps/npm/lib/utils/log-file.js" ]; + stripLen = 1; + extraPrefix = "deps/npm/"; + }) ]; } diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix index 6d0cc28917..ca85a18951 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix @@ -7,8 +7,8 @@ let in buildNodejs { inherit enableNpm; - version = "18.6.0"; - sha256 = "0k05phvlpwf467sbaxcvdzr4ncclm9fpldml8fbfrjigl4rhr2sz"; + version = "18.7.0"; + sha256 = "sha256-iDSjPJLf5rqJA+ZxXK6qJd/0ZX5wPFTNBuwRNJPiw8I="; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/web/postman/darwin.nix b/third_party/nixpkgs/pkgs/development/web/postman/darwin.nix index fcc4b03689..be52288701 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/darwin.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/darwin.nix @@ -11,12 +11,12 @@ let dist = { aarch64-darwin = { arch = "arm64"; - sha256 = "sha256-EtTf17LS18zC3JMbSoyZGGHuIcwGN3Q15XOhVqeh7C4="; + sha256 = "62b4b3c63668fa4074b35afe08c212557437ff54c742a500087c74955cec9e04"; }; x86_64-darwin = { arch = "64"; - sha256 = "sha256-kTgbqGPgOn5dyjL/IMl3hg2+VUfB+jpPJsqXof8UL+c="; + sha256 = "42160a3c3011f43692fcb28b37dec5f708395318681de960f0cb932cea36021f"; }; }.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); diff --git a/third_party/nixpkgs/pkgs/development/web/postman/default.nix b/third_party/nixpkgs/pkgs/development/web/postman/default.nix index a5d3676e43..fa8940e71d 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/default.nix @@ -2,14 +2,14 @@ let pname = "postman"; - version = "9.14.0"; + version = "9.25.2"; meta = with lib; { homepage = "https://www.getpostman.com"; description = "API Development Environment"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.postman; platforms = [ "x86_64-linux" "aarch64-darwin" "x86_64-darwin" ]; - maintainers = with maintainers; [ johnrichardrinehart evanjs tricktron ]; + maintainers = with maintainers; [ johnrichardrinehart evanjs tricktron Crafter ]; }; in diff --git a/third_party/nixpkgs/pkgs/development/web/postman/linux.nix b/third_party/nixpkgs/pkgs/development/web/postman/linux.nix index 39c82c2b34..f764500754 100644 --- a/third_party/nixpkgs/pkgs/development/web/postman/linux.nix +++ b/third_party/nixpkgs/pkgs/development/web/postman/linux.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "sha256-pA3gT4xoIWhajY03JzVgHK5KyTx1uH6gyasuLTdt6cM="; + sha256 = "118da102904cd7b04c50d3e2c2daac3fc1228f05e541eacef55e8ecbf73d3896"; name = "${pname}.tar.gz"; }; diff --git a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix index a09dbc5112..b91804ca0d 100644 --- a/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/twitter-bootstrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bootstrap"; - version = "5.1.3"; + version = "5.2.0"; src = fetchurl { url = "https://github.com/twbs/bootstrap/releases/download/v${version}/${pname}-${version}-dist.zip"; - sha256 = "sha256-vewp21DsjR7My3AgIrgj3wozPhBYFMJksyG9UYuJxyE="; + sha256 = "sha256-CLykGjXxTZCXIJAyF6YBeEeC3oCz3g5Kcm0kLdOQUks="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/games/0ad/game.nix b/third_party/nixpkgs/pkgs/games/0ad/game.nix index 34a2cdddac..e51aab519a 100644 --- a/third_party/nixpkgs/pkgs/games/0ad/game.nix +++ b/third_party/nixpkgs/pkgs/games/0ad/game.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, perl, fetchurl, python3, fmt, libidn +{ stdenv, lib, fetchpatch, perl, fetchurl, python3, fmt, libidn , pkg-config, spidermonkey_78, boost, icu, libxml2, libpng, libsodium , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc , openal, libGLU, libGL, xorgproto, libX11, libXcursor, nspr, SDL2 @@ -50,7 +50,14 @@ stdenv.mkDerivation rec { "-I${fmt.dev}/include" ]; - patches = [ ./rootdir_env.patch ]; + patches = [ + ./rootdir_env.patch + (fetchpatch { + # fix build with gcc11 and glibc 2.35 + url = "https://github.com/0ad/0ad/commit/7df614338cbd41f5e254ce75f649490b2637e1d0.patch"; + hash = "sha256-QZvcNm8Zni3aJnMPueft0OITf8zeMDXWBjOLYoirJs0="; + }) + ]; configurePhase = '' # Delete shipped libraries which we don't need. diff --git a/third_party/nixpkgs/pkgs/games/anki/bin.nix b/third_party/nixpkgs/pkgs/games/anki/bin.nix index 45ec432dc7..82064325ab 100644 --- a/third_party/nixpkgs/pkgs/games/anki/bin.nix +++ b/third_party/nixpkgs/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.52"; + version = "2.1.54"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-+eRflNMxutoSY9yQfnhIjfLg9b9CNv+7UuYyg4jgfK4="; + sha256 = "sha256-NFhgVd4ctEsh7iaSZ9v0OMszd81H41eq+y+FRIhcCtE="; }; # 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-keQxaf0KOQjCb22dQD/1VytW2fk35OPUJyJ42kaoAr8="; + sha256 = "sha256-kus59Z9Oe4sbAlF4szeg751hlSEUR0ijKz4rjfHEWgA="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-mYPSOjXh18nWpZjXLAjEodoxopr6rxadESMAf/t9SlI="; + sha256 = "sha256-ROIpGB3W21ttWj+cRkf0rpLFrO4LR6+ZyGRsalz5J+E="; }; }; diff --git a/third_party/nixpkgs/pkgs/games/bzflag/default.nix b/third_party/nixpkgs/pkgs/games/bzflag/default.nix index 6715c1b362..db144a147f 100644 --- a/third_party/nixpkgs/pkgs/games/bzflag/default.nix +++ b/third_party/nixpkgs/pkgs/games/bzflag/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "https://bzflag.org/"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/ckan/default.nix b/third_party/nixpkgs/pkgs/games/ckan/default.nix index 3649369aea..88d13b9b6f 100644 --- a/third_party/nixpkgs/pkgs/games/ckan/default.nix +++ b/third_party/nixpkgs/pkgs/games/ckan/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ckan"; - version = "1.30.4"; + version = "1.31.0"; src = fetchurl { url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe"; - sha256 = "sha256-IgPqUEDpaIuGoaGoH2GCEzh3KxF3pkJC3VjTYXwSiQE="; + sha256 = "sha256-+Tm1aQUibRNn1jfewowOTBHt1OngJKD+Jeh9meg0YxA="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/games/domination/default.nix b/third_party/nixpkgs/pkgs/games/domination/default.nix index 8bba2d1f94..919d22b41d 100644 --- a/third_party/nixpkgs/pkgs/games/domination/default.nix +++ b/third_party/nixpkgs/pkgs/games/domination/default.nix @@ -26,7 +26,7 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.2.4"; + version = "1.2.5"; # The .zip releases do not contain the build.xml file src = fetchsvn { @@ -34,8 +34,8 @@ in stdenv.mkDerivation { # There are no tags in the repository. # Look for commits like "new version x.y.z info on website" # or "website update for x.y.z". - rev = "2109"; - sha256 = "sha256-awTaEkv0zUXgrKVKuFzi5sgHgrfiNmAFMODO5U0DL6I="; + rev = "2212"; + sha256 = "sha256-XuPMxGDap8x7I+U7+1C+DlkQkoV/u2FCwYyTZFWmYHM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix index 2064aa0199..49e8fabd45 100644 --- a/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/third_party/nixpkgs/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -157,10 +157,6 @@ let touch .git/index .git/modules/library/xml/index ''; - preBuild = '' - export LD_LIBRARY_PATH="$PWD/depends/protobuf''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - ''; - cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index ba33d689b6..37abb4aed0 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,12 +2,12 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.61.tar.xz", + "name": "factorio_alpha_x64-1.1.65.tar.xz", "needsAuth": true, - "sha256": "1rgb3i6l9v5vv3qw0ngfxryamql2fhhqymv4dr86rxjy863rpx65", + "sha256": "0rzifli06s3k3gyzxpzzisxkvnvcidw4njkibrld2n5pwhjg8qbb", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.61/alpha/linux64", - "version": "1.1.61" + "url": "https://factorio.com/get-download/1.1.65/alpha/linux64", + "version": "1.1.65" }, "stable": { "name": "factorio_alpha_x64-1.1.61.tar.xz", @@ -38,12 +38,12 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.61.tar.xz", + "name": "factorio_headless_x64-1.1.65.tar.xz", "needsAuth": false, - "sha256": "0ndnc0f22bqjg1v6ah7i4nzghvk7cn73sgm22lf715di6f6srr38", + "sha256": "1h5ziip9jbqr03ci2fvf3zqwmy0l7m25br3rm5xv0af9wig9wvh1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.61/headless/linux64", - "version": "1.1.61" + "url": "https://factorio.com/get-download/1.1.65/headless/linux64", + "version": "1.1.65" }, "stable": { "name": "factorio_headless_x64-1.1.61.tar.xz", diff --git a/third_party/nixpkgs/pkgs/games/ferium/default.nix b/third_party/nixpkgs/pkgs/games/ferium/default.nix index 2b2a26dc20..2d21d5dc52 100644 --- a/third_party/nixpkgs/pkgs/games/ferium/default.nix +++ b/third_party/nixpkgs/pkgs/games/ferium/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.1.5"; + version = "4.1.10"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NxrV8mi7xsr+x9oOp78DkHoPls0JLm5eol/8q9NwuTs="; + sha256 = "sha256-dHubI5IaPAjn+vcHvT1t4HqBraO0QztZnp3sdzpYBJo="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-hR2PKQqSvtSBOOhZKW2IsGGjuU4jCdLMeruAHxErQtU="; + cargoSha256 = "sha256-r3QLCh/TXOoXh72AjyV1Ng6nYNCEV9/JggBmd2Gu7j8="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; @@ -21,10 +21,19 @@ rustPlatform.buildRustPackage rec { # Requires an internet connection doCheck = false; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + for shell in bash fish zsh; do + $out/bin/ferium complete $shell > ferium.$shell + installShellCompletion ferium.$shell + done + ''; + meta = with lib; { description = "Fast and multi-source CLI program for managing Minecraft mods and modpacks from Modrinth, CurseForge, and GitHub Releases"; homepage = "https://github.com/gorilla-devs/ferium"; license = licenses.mpl20; - maintainers = [ maintainers.leo60228 ]; + maintainers = with maintainers; [ leo60228 imsofi ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix index f22c162419..83c856359a 100644 --- a/third_party/nixpkgs/pkgs/games/fheroes2/default.nix +++ b/third_party/nixpkgs/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "0.9.17"; + version = "0.9.18"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - sha256 = "sha256-mitkB7BDqqDbWa+zhcg66dh/SQd6XuUjl/kLWob9zwI="; + sha256 = "sha256-I79PoNE6GFvYD4jnsxKo7MsoPgVow8b8fTIiClOGnAI="; }; buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; diff --git a/third_party/nixpkgs/pkgs/games/fishfight/use-system-sdl2.patch b/third_party/nixpkgs/pkgs/games/fishfight/use-system-sdl2.patch deleted file mode 100644 index fcae36ce68..0000000000 --- a/third_party/nixpkgs/pkgs/games/fishfight/use-system-sdl2.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -96,15 +96,6 @@ version = "1.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - --[[package]] --name = "cmake" --version = "0.1.46" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089" --dependencies = [ -- "cc", --] -- - [[package]] - name = "color_quant" - version = "1.1.0" -@@ -605,7 +596,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "94cb479353c0603785c834e2307440d83d196bf255f204f7f6741358de8d6a2f" - dependencies = [ - "cfg-if", -- "cmake", - "libc", - "version-compare", - ] -diff --git a/Cargo.toml b/Cargo.toml -index d2af29e..a813f30 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -14,7 +14,7 @@ macroquad-profiler = "0.1" - - ff-particles = { version = "0.1", features = ["serde"] } - --fishsticks = { version = "0.2.0", features = ["bundled-sdl2"] } -+fishsticks = "0.2.0" - - stunclient = { git = "https://github.com/not-fl3/rust-stunclient", default-features = false } - diff --git a/third_party/nixpkgs/pkgs/games/freeciv/default.nix b/third_party/nixpkgs/pkgs/games/freeciv/default.nix index e3057d59cd..abe8aff158 100644 --- a/third_party/nixpkgs/pkgs/games/freeciv/default.nix +++ b/third_party/nixpkgs/pkgs/games/freeciv/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "freeciv"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-1QGARXIfb97aLxQ5TZ6Fjznlniznnyuc2ugiW/Drf9g="; + sha256 = "sha256-WIp1R27UahbkLZZuF0nbX/XHVDc2OJukPKgoQ+qnjMc="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/games/gemrb/default.nix b/third_party/nixpkgs/pkgs/games/gemrb/default.nix index 947957bc3a..b29eed160c 100644 --- a/third_party/nixpkgs/pkgs/games/gemrb/default.nix +++ b/third_party/nixpkgs/pkgs/games/gemrb/default.nix @@ -18,7 +18,7 @@ let # the GLES backend on rpi is untested as I don't have the hardware backend = - if (stdenv.isx86_32 || stdenv.isx86_64) then "OpenGL" else "GLES"; + if stdenv.hostPlatform.isx86 then "OpenGL" else "GLES"; withVLC = stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/games/gnubg/default.nix b/third_party/nixpkgs/pkgs/games/gnubg/default.nix index 90d54638b6..7276267905 100644 --- a/third_party/nixpkgs/pkgs/games/gnubg/default.nix +++ b/third_party/nixpkgs/pkgs/games/gnubg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, python, gtk2, readline }: +{ lib, stdenv, fetchurl, pkg-config, glib, python2, gtk2, readline }: stdenv.mkDerivation rec { pname = "gnubg"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "11xwhcli1h12k6rnhhyq4jphzrhfik7i8ah3k32pqw803460n6yf"; }; - nativeBuildInputs = [ pkg-config python glib ]; + nativeBuildInputs = [ pkg-config python2 glib ]; buildInputs = [ gtk2 readline ]; diff --git a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix index 901045f750..23e245149a 100644 --- a/third_party/nixpkgs/pkgs/games/grapejuice/default.nix +++ b/third_party/nixpkgs/pkgs/games/grapejuice/default.nix @@ -18,26 +18,26 @@ python3Packages.buildPythonApplication rec { pname = "grapejuice"; - version = "5.1.1"; + version = "5.2.2"; src = fetchFromGitLab { owner = "BrinkerVII"; repo = "grapejuice"; rev = "v${version}"; - sha256 = "sha256-31pxQtKw5sLGnnNdboF7AAIFqsan5pXKHIHtKq/ErRE="; + sha256 = "sha256-YEAYoZF1Lf0ykB13cuRf5sOR1HIxwdcibyJLgP3g4Jk="; }; nativeBuildInputs = [ gobject-introspection desktop-file-utils glib - gtk3 wrapGAppsHook ]; buildInputs = [ cairo gettext + gtk3 ]; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/games/gscrabble/default.nix b/third_party/nixpkgs/pkgs/games/gscrabble/default.nix index f0e4121d8f..b21cdadac1 100644 --- a/third_party/nixpkgs/pkgs/games/gscrabble/default.nix +++ b/third_party/nixpkgs/pkgs/games/gscrabble/default.nix @@ -4,13 +4,13 @@ buildPythonApplication { pname = "gscrabble"; - version = "unstable-2019-03-11"; + version = "unstable-2020-04-21"; src = fetchFromGitHub { owner = "RaaH"; repo = "gscrabble"; - rev = "4b6e4e151a4cd4a4f66a5be2c8616becac3f2a29"; - sha256 = "0a89kqh04x52q7qyv1rfa7xif0pdw3zc0dw5a24msala919g90q2"; + rev = "aba37f062a6b183dcc084c453f395af1dc437ec8"; + sha256 = "sha256-rYpPHgOlPRnlA+Nkvo/J+/8/vl24/Ssk55fTq9oNCz4="; }; doCheck = false; @@ -31,10 +31,14 @@ buildPythonApplication { ''; meta = with lib; { + # Fails to build, propably incompatible with latest Python + # error: Multiple top-level packages discovered in a flat-layout + # https://github.com/RaaH/gscrabble/issues/13 + broken = true; description = "Golden Scrabble crossword puzzle game"; homepage = "https://github.com/RaaH/gscrabble/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ onny ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix index a45c4fee05..d69ba93aae 100644 --- a/third_party/nixpkgs/pkgs/games/hedgewars/default.nix +++ b/third_party/nixpkgs/pkgs/games/hedgewars/default.nix @@ -1,7 +1,7 @@ -{ mkDerivation, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut +{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut , lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer , zlib, libpng, libGL, libGLU, physfs -, qtbase, qttools +, qtbase, qttools, wrapQtAppsHook , llvm , withServer ? true }: @@ -14,7 +14,7 @@ let ]); in -mkDerivation rec { +stdenv.mkDerivation rec { pname = "hedgewars"; version = "1.0.0"; @@ -23,7 +23,7 @@ mkDerivation rec { sha256 = "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1"; }; - nativeBuildInputs = [ cmake pkg-config qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image @@ -103,10 +103,5 @@ mkDerivation rec { all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; inherit (fpc.meta) platforms; - - # Appears to be some sort of C++ linking error. - # Example: https://hydra.nixos.org/build/174544990/nixlog/6 - broken = true; - hydraPlatforms = platforms.none; }; } diff --git a/third_party/nixpkgs/pkgs/games/fishfight/default.nix b/third_party/nixpkgs/pkgs/games/jumpy/default.nix similarity index 56% rename from third_party/nixpkgs/pkgs/games/fishfight/default.nix rename to third_party/nixpkgs/pkgs/games/jumpy/default.nix index 422901fd98..2afba817fc 100644 --- a/third_party/nixpkgs/pkgs/games/fishfight/default.nix +++ b/third_party/nixpkgs/pkgs/games/jumpy/default.nix @@ -2,54 +2,53 @@ , rustPlatform , fetchFromGitHub , stdenv -, SDL2 +, pkg-config , alsa-lib , libGL , libX11 , libXi -, AudioToolbox +, udev , Cocoa -, CoreAudio , OpenGL }: rustPlatform.buildRustPackage rec { - pname = "fishfight"; - version = "0.3"; + pname = "jumpy"; + version = "0.4.3"; src = fetchFromGitHub { - owner = "fishfight"; + owner = "fishfolks"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kLdk7zTICZ8iawNttTsWUVKGvh2zykXVsMqUyYoGrBs="; + sha256 = "sha256-01zhiQi6v/8ZajsdBU+4hKUCj+PRJ/vUHluOIzy/Gi8="; }; - # use system sdl2 instead of bundled sdl2 - cargoPatches = [ ./use-system-sdl2.patch ]; + cargoSha256 = "sha256-AXaGuRqSFiq+Uiy+UaqPdPVyDhCogC64KZZ0Ah1Yo7A="; - cargoSha256 = "sha256-KQiqUzdsVMIjDmmreihekrrFoXeyNzd6ZbqApwH8B4Q="; + nativeBuildInputs = lib.optionals stdenv.isLinux [ + pkg-config + ]; - buildInputs = [ - SDL2 - ] ++ lib.optionals stdenv.isLinux [ + buildInputs = lib.optionals stdenv.isLinux [ alsa-lib libGL libX11 libXi + udev ] ++ lib.optionals stdenv.isDarwin [ - AudioToolbox Cocoa - CoreAudio OpenGL ]; postPatch = '' - substituteInPlace src/main.rs --replace ./assets $out/share/assets + substituteInPlace src/main.rs \ + --replace ./assets $out/share/assets \ + --replace ./mods $out/share/mods ''; postInstall = '' mkdir $out/share - cp -r assets $out/share + cp -r assets mods $out/share ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/kabeljau/default.nix b/third_party/nixpkgs/pkgs/games/kabeljau/default.nix index b277966f31..0b5b1167ea 100644 --- a/third_party/nixpkgs/pkgs/games/kabeljau/default.nix +++ b/third_party/nixpkgs/pkgs/games/kabeljau/default.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "papojari"; + owner = "annaaurora"; repo = "kabeljau"; rev = "v${version}"; sha256 = "sha256-RedVItgfr6vgqXHA3bOiHXDpfGuHI+sX4jCHL9G5jYk="; @@ -33,8 +33,8 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Survive as a stray cat in an ncurses game"; - homepage = "https://codeberg.org/papojari/kabeljau"; + homepage = "https://codeberg.org/annaaurora/kabeljau"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/keeperrl/default.nix b/third_party/nixpkgs/pkgs/games/keeperrl/default.nix index a1ead9a3f9..f1c0f17126 100644 --- a/third_party/nixpkgs/pkgs/games/keeperrl/default.nix +++ b/third_party/nixpkgs/pkgs/games/keeperrl/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ ]; # TODO: Add OS X - platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/lgames/lbreakouthd/default.nix b/third_party/nixpkgs/pkgs/games/lgames/lbreakouthd/default.nix index 59447f2d00..bfe8eecc95 100644 --- a/third_party/nixpkgs/pkgs/games/lgames/lbreakouthd/default.nix +++ b/third_party/nixpkgs/pkgs/games/lgames/lbreakouthd/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lbreakouthd"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-MHwK4jeDfZSS4jh///jW0/q4ntM4IuB0fQ8Bsaq0d0s="; + hash = "sha256-hlGhPa91u6pOaZoFJSDcXYQdizTFjuuTLnx9fcrXUhA="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/lgames/lpairs2/default.nix b/third_party/nixpkgs/pkgs/games/lgames/lpairs2/default.nix index 7fcc03d8cc..394b690b63 100644 --- a/third_party/nixpkgs/pkgs/games/lgames/lpairs2/default.nix +++ b/third_party/nixpkgs/pkgs/games/lgames/lpairs2/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lpairs2"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-35KYDnPWOjNPu9wz9AWvSBAo1tdVDo7I2TNxtxE5RRg="; + hash = "sha256-swe/cB9RqxHSNSShiryJ8XfwZk2X6qIDxFURbwNOd58="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix b/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix index acf0f64d8c..618e86561f 100644 --- a/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix +++ b/third_party/nixpkgs/pkgs/games/lgames/ltris/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ltris"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { url = "mirror://sourceforge/lgames/${pname}-${version}.tar.gz"; - hash = "sha256-1ut7MBAjJ4YE2SkqkvL9L1ED7kEqdaEm0lUOLsI2j4M="; + hash = "sha256-Ksb5TdQMTEzaJfjHVhgq27dSFvZxUnNUQ6OpAU+xwzM="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json b/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json index 319c7cbac1..8dce87bb30 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json +++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/versions.json @@ -1,8 +1,8 @@ { "1.19": { - "url": "https://launcher.mojang.com/v1/objects/e00c4052dac1d59a1188b2aa9d5a87113aaf1122/server.jar", - "sha1": "e00c4052dac1d59a1188b2aa9d5a87113aaf1122", - "version": "1.19", + "url": "https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar", + "sha1": "f69c284232d7c7580bd89a5a4931c3581eae1378", + "version": "1.19.2", "javaVersion": 17 }, "1.18": { diff --git a/third_party/nixpkgs/pkgs/games/minetest/default.nix b/third_party/nixpkgs/pkgs/games/minetest/default.nix index 2a1039901f..ed6b2deda5 100644 --- a/third_party/nixpkgs/pkgs/games/minetest/default.nix +++ b/third_party/nixpkgs/pkgs/games/minetest/default.nix @@ -1,8 +1,44 @@ -{ lib, stdenv, fetchFromGitHub, cmake, irrlichtmt, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, libGLU, libGL, openal, libvorbis, sqlite, luajit -, freetype, gettext, doxygen, ncurses, graphviz, xorg, gmp, libspatialindex -, leveldb, postgresql, hiredis, libiconv, zlib, libXrandr, libX11, ninja, prometheus-cpp -, OpenGL, OpenAL ? openal, Carbon, Cocoa, withTouchSupport ? false +{ lib +, stdenv +, fetchFromGitHub +, cmake +, irrlichtmt +, coreutils +, libpng +, bzip2 +, curl +, libogg +, jsoncpp +, libjpeg +, libXxf86vm +, libGLU +, libGL +, openal +, libvorbis +, sqlite +, luajit +, freetype +, gettext +, doxygen +, ncurses +, graphviz +, xorg +, gmp +, libspatialindex +, leveldb +, postgresql +, hiredis +, libiconv +, zlib +, libXrandr +, libX11 +, ninja +, prometheus-cpp +, OpenGL +, OpenAL ? openal +, Carbon +, Cocoa +, withTouchSupport ? false }: with lib; @@ -72,9 +108,14 @@ let leveldb postgresql hiredis prometheus-cpp ]; + postPatch = '' + substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm" + ''; + postInstall = '' mkdir -pv $out/share/minetest/games/minetest_game/ cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ + patchShebangs $out ''; meta = with lib; { @@ -91,9 +132,9 @@ let }; v5 = { - version = "5.5.0"; - sha256 = "sha256-V+ggqvZibSQrJbrtNCEkmRYHhgSKTQsdBh3c8+t6WeA="; - dataSha256 = "sha256-6ZS3EET3nm09eL0czCGadwzon35/EBfAg2KjPX3ZP/0="; + version = "5.5.1"; + sha256 = "sha256-ssaDy6tYxhXGZ1+05J5DwoKYnfhKIKtZj66DOV84WxA="; + dataSha256 = "sha256-SI6I1wXbB0CgTmIemm3VY9DNnWMoI5bt/hqRwHlUl4k="; }; in { diff --git a/third_party/nixpkgs/pkgs/games/mudlet/default.nix b/third_party/nixpkgs/pkgs/games/mudlet/default.nix index f4ca916aa4..b2696d7278 100644 --- a/third_party/nixpkgs/pkgs/games/mudlet/default.nix +++ b/third_party/nixpkgs/pkgs/games/mudlet/default.nix @@ -62,6 +62,11 @@ stdenv.mkDerivation rec { yajl ]; + cmakeFlags = [ + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + WITH_FONTS = "NO"; WITH_UPDATER = "NO"; diff --git a/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix b/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix index 0da53bbf9a..cd4fd216ea 100644 --- a/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix +++ b/third_party/nixpkgs/pkgs/games/oh-my-git/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "oh-my-git"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "git-learning-game"; repo = "oh-my-git"; rev = version; - sha256 = "sha256-GQLHyBUXF+yqEZ/LYutAn6TBCXFX8ViOaERQEm2J6CY="; + sha256 = "sha256-XqxliMVU55D5JSt7Yo5btvZnnTlagSukyhXv6Akgklo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/games/openxray/default.nix b/third_party/nixpkgs/pkgs/games/openxray/default.nix index 2340f14edc..aef6c0c2e9 100644 --- a/third_party/nixpkgs/pkgs/games/openxray/default.nix +++ b/third_party/nixpkgs/pkgs/games/openxray/default.nix @@ -13,10 +13,10 @@ , libogg , pcre , makeWrapper -, enableMultiplayer ? false # Requires old, insecure Crypto++ version }: -let +stdenv.mkDerivation rec { + pname = "openxray"; version = "1144-december-2021-rc1"; src = fetchFromGitHub { @@ -27,39 +27,6 @@ let sha256 = "07qj1lpp21g4p583gvz5h66y2q71ymbsz4g5nr6dcys0vm7ph88v"; }; - # https://github.com/OpenXRay/xray-16/issues/518 - ancientCryptopp = stdenv.mkDerivation { - pname = "cryptopp"; - version = "5.6.5"; - - inherit src; - - sourceRoot = "source/Externals/cryptopp"; - - installFlags = [ "PREFIX=${placeholder "out"}" ]; - - enableParallelBuilding = true; - - doCheck = true; - - dontStrip = true; - - meta = with lib; { - description = "Crypto++, a free C++ class library of cryptographic schemes"; - homepage = "https://cryptopp.com/"; - license = with licenses; [ boost publicDomain ]; - platforms = platforms.all; - knownVulnerabilities = [ - "CVE-2019-14318" - ]; - }; - }; -in -stdenv.mkDerivation rec { - pname = "openxray"; - - inherit version src; - nativeBuildInputs = [ cmake makeWrapper @@ -76,20 +43,12 @@ stdenv.mkDerivation rec { libjpeg libogg pcre - ] ++ lib.optionals enableMultiplayer [ - ancientCryptopp ]; # Crashes can happen, we'd like them to be reasonably debuggable cmakeBuildType = "RelWithDebInfo"; dontStrip = true; - cmakeFlags = [ - "-DUSE_CRYPTOPP=${if enableMultiplayer then "ON" else "OFF"}" - ] ++ lib.optionals enableMultiplayer [ - "-DCMAKE_INCLUDE_PATH=${ancientCryptopp}/include/cryptopp" - ]; - postInstall = '' # needed because of SDL_LoadObject library loading code wrapProgram $out/bin/xr_3da \ @@ -101,7 +60,7 @@ stdenv.mkDerivation rec { description = "Improved version of the X-Ray Engine, the game engine used in the world-famous S.T.A.L.K.E.R. game series by GSC Game World"; homepage = "https://github.com/OpenXRay/xray-16/"; license = licenses.unfree // { - url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt"; + url = "https://github.com/OpenXRay/xray-16/blob/${version}/License.txt"; }; maintainers = with maintainers; [ OPNA2608 ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 945f70ebbc..262df2e853 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2022.709.1"; + version = "2022.723.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-7tK3jRTfkCn4quQ52fgGsXeXIViaIQTcteq6FMiJzyU="; + sha256 = "sha256-j3NxT/WCOCSB62JUO8hYCRUoF+GL1QAdaUaynY7aGj8="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; @@ -73,7 +73,7 @@ buildDotnetModule rec { cc-by-nc-40 unfreeRedistributable # osu-framework contains libbass.so in repository ]; - maintainers = with maintainers; [ oxalica ]; + maintainers = with maintainers; [ oxalica thiagokokada ]; platforms = [ "x86_64-linux" ]; mainProgram = "osu!"; }; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index fa41323829..52c3b6f7a9 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -1,12 +1,12 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AutoMapper"; version = "11.0.1"; sha256 = "1z1x5c1dkwk6142km5q6jglhpq9x82alwjjy5a72c8qnq9ppdfg3"; }) - (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.40"; sha256 = "171pq2zh26hlnwjv4n1lvsammi94an72ggms9n1n1qfi7zak1i4l"; }) + (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.42"; sha256 = "1xxrr9jmgn343d467nz40569mkybinnmxaxyc4fhgy6yddvzk1y0"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) (fetchNuGet { pname = "Fody"; version = "6.6.2"; sha256 = "1jnpvqzi7bdk96skqax82765q1kjpx921yqakqawkx5b3bhqpihs"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) - (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.42"; sha256 = "0cvnc1qdfcjbqkh335bv4wp44zisb4hc69lq3zphiyzqfrjisnyb"; }) + (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.43"; sha256 = "08xh6fm5l9f8lhhkk0h9vrp8qa60qmiq8k6wyip8lqn810jld50m"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; }) (fetchNuGet { pname = "Humanizer.Core"; version = "2.8.26"; sha256 = "1v8xd12yms4qq1md4vh6faxicmqrvahqdd7sdkyzrphab9v44nsm"; }) @@ -64,19 +64,18 @@ (fetchNuGet { pname = "ManagedBass.Fx"; version = "3.1.0"; sha256 = "130rrf6sb64dcq58mr1gigma3pzr7hg5mxn5fbryg375x3vphbs8"; }) (fetchNuGet { pname = "ManagedBass.Mix"; version = "3.1.0"; sha256 = "1ppxczh1i67k5xicr0q4n0k7zdzghs99wwkcpjmh726hkdsshnib"; }) (fetchNuGet { pname = "Markdig"; version = "0.23.0"; sha256 = "1bwn885w7balwncmr764vidyyp9bixqlq6r3lhsapj8ykrpxxa70"; }) - (fetchNuGet { pname = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) - (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) + (fetchNuGet { pname = "MessagePack"; version = "2.4.35"; sha256 = "0y8pz073ync51cv39lxldc797nmcm39r4pdhy2il6r95rppjqg5h"; }) + (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.4.35"; sha256 = "1jny2r6rwq7xzwymm779w9x8a5rhyln97mxzplxwd53wwbb0wbzd"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "6.0.5"; sha256 = "05crn1mj59yvljlmhfdy6wkblw8fj9hamyq9zvijl6ah684a9fwq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "6.0.5"; sha256 = "1nirf76vwhg4r96mvc6ajbm2b4gkmvn7s8dp5zdf9vxmnka9r76l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "6.0.5"; sha256 = "162kqhv8gsx6w52xa4hd7mkvgzwpf424k4pnqvjyz3m5piym10af"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "6.0.5"; sha256 = "0wrpw1l3jbid7hv76h8jvcpjaw3mc2ybmxhp2fk65d9bjni9xjmf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "6.0.5"; sha256 = "139sfsgq6nkr55yd8sfqk536k9517lhha51a3fck7svqwr7fapxx"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "6.0.5"; sha256 = "0grkijyfbq0pa76hflp5xiddii75zm98prpxw0gn64qj4i3sxlx0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "6.0.5"; sha256 = "0b5xy15jz3kw4qzfpi2p9h6k0flv6sazjmplyx9x0rl4ysq01jjq"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "6.0.5"; sha256 = "0z6cjyl0ycwcgmgncapmls8cirhy50dmymzz48mnfsv5456w232c"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "6.0.5"; sha256 = "1dhgpv4iwrg0p68bz2w1bzk9vqdh0m0b7dvdlm2p0gqdc5kvwkry"; }) - (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "6.0.6"; sha256 = "1xdck1rg6flfh8l4gsfcq72yk0vh81k646i503s73573qhlc3hr4"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "6.0.6"; sha256 = "0jkr96x382hdcjnfw6m8lglamcnrmaxi3pjc6w8si7lgacn6h0jz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "6.0.6"; sha256 = "19hsxybw189v07d618pf7n8ib3sgwl6rd3r9dyincbp4qfgp20zr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "6.0.6"; sha256 = "1cnyw4cx4pvw2086anlz734c60iqb5j9y6xwx26ppgimrm54py3h"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "6.0.6"; sha256 = "0snmcxssxaig920g7vj5hj79f2hyisxj6npy8hgg8v3rh0948iia"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "6.0.6"; sha256 = "0js5n6chb9vrmrn5rxip3d241ml9f091k50k0cak8yvmz7v531x0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "6.0.6"; sha256 = "197dx2311dxm1fl22b9x7a8kbsjjgq5r88qk487d337clsbbq4gc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "6.0.6"; sha256 = "1lq2l95m1x9xsw8a9dh7dp0pxs4kjjwa6v8l485bj4yx1icb8w0k"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "6.0.6"; sha256 = "1ihg09dqsx03z90im0nwyypakz3hla79mjy7mas5rdymnm6k0lbw"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; version = "3.3.3"; sha256 = "1z6x0d8lpcfjr3sxy25493i17vvcg5bsay6c03qan6mnj5aqzw2k"; }) @@ -104,7 +103,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "5.0.0"; sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "6.0.5"; sha256 = "01lsvmqg58570nwsm6j2x86dda1j51nlzyl5hfrfrz5l2kpx6pas"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "6.0.6"; sha256 = "0w94hm2r2dsqhd1q8xqf0v9cbf4sxash7pmw9f2pjr91c34lrvw0"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) @@ -115,6 +114,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "6.0.0"; sha256 = "008pnk2p50i594ahz308v81a41mbjz9mwcarqhmrjpl2d20c868g"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "5.0.0"; sha256 = "0swqcknyh87ns82w539z1mvy804pfwhgzs97cr3nwqk6g5s42gd6"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "6.0.0"; sha256 = "1kjiw6s4yfz9gm7mx3wkhp06ghnbs95icj9hi505shz9rjrg42q2"; }) + (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "1.0.0"; sha256 = "06yakiyzgss399giivfx6xdrnfxqfsvy5fzm90scjanvandv0sdj"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) @@ -142,14 +142,14 @@ (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) - (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.2"; sha256 = "0blwfs1cacxq0vs6fy7zjnsny8qdsr5jlxix3icmphyqgz0g4g39"; }) - (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.2"; sha256 = "18q6gjayqrwk6n1kf359z94z8zyb3yz4hr1dpgglk51sq6wi2z84"; }) - (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.2"; sha256 = "12hf4v8j8asc9wlywpykajb8yrzx10w6h11qbykckmrfxvz8pc0a"; }) - (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.2"; sha256 = "0z2n5jysw06zp2cxmfqddbg3g88jdm1irr2hv04q8valq0plaq5c"; }) + (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.4"; sha256 = "1fk0029b1183pxd6qvzkmy8byx5dhjka3f8x20sd7drbzvqpn6am"; }) + (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.4"; sha256 = "0ahxg4mckzljav5y9g7c1795wgyx2banysg5l7ix3xrl4xmjfmp3"; }) + (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.4"; sha256 = "1zz9afqbaif6sl7gzayl0ww9jhysi4q06jicmx4g35yk82w07vzn"; }) + (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.4"; sha256 = "0lim2aqw42c1cc73fbbw0h41wcwaxa5d89srzalgg8dpi3bds1mp"; }) (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2022.607.0"; sha256 = "07rf10lpnly9d8wf7mwys3jsr4kh0rkf86rjck1hmb73b8524jq9"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.707.0"; sha256 = "08s5yfj1h5d6mzkamssbx6fqfgc5q6rr31wvwdj0kfvnfz470iax"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.722.0"; sha256 = "1ps8cfny35hyairw32bjz3cvkdhqch27yfzz83zbv6rdbk687zjq"; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.702.0"; sha256 = "1vw8prjdvf91zpkqwn6n0kv834kwv9fd2si6lx9jm3z3wsf3ydkz"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.722.0"; sha256 = "0ilzm9cfvhzxwlv1irzcsbwnm3p5qjbc3hzh5ss992s0y5v6xray"; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.192"; sha256 = "0k6nlsxdl6qa5kbn66nbxh5x43hkgpnz8h3zjlbr5siqdjcrvcvg"; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.563-alpha"; sha256 = "09bk81nibfwicjmy8bg4h14myp3x0a7yz4axwdfnk33pj5dsn953"; }) (fetchNuGet { pname = "Realm"; version = "10.14.0"; sha256 = "0pbnqp2z27lm6i8j8pbb2500gyyv8gb73kskv49ympvpa09mzcrv"; }) @@ -196,8 +196,9 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Sentry"; version = "3.17.1"; sha256 = "1k83a5kz6yyfd3iamxfa7wrgayxvs72slywq15aaw5ywl1a5c6i0"; }) + (fetchNuGet { pname = "Sentry"; version = "3.19.0"; sha256 = "0nkkzy7xzaij2cbj7y6v227f2s26fs1i1arbmg8i48q4gllb4pr0"; }) (fetchNuGet { pname = "SharpCompress"; version = "0.31.0"; sha256 = "01az7amjkxjbya5rdcqwxzrh2d3kybf1gsd3617rsxvvxadyra1r"; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.32.1"; sha256 = "0n7iv6kp7gzgqrxxvwdxklvhia3ngpydc6l2nw7hzw637v4bjfl6"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.0"; sha256 = "0lmj3qs39v5jcf2rjwav43nqnc7g6sd4l226l2jw85nidzmpvkwr"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.0.4"; sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm"; }) @@ -213,7 +214,6 @@ (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) - (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "5.0.0"; sha256 = "1kvcllagxz2q92g81zkz81djkn2lid25ayjfgjalncyc68i15p0r"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) @@ -259,12 +259,12 @@ (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) - (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.6.0"; sha256 = "18h375q5bn9h7swxnk4krrxym1dxmi9bm26p89xps9ygrj4q6zqw"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) - (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.6.0"; sha256 = "0hry2k6b7kicg4zxnq0hhn0ys52711pxy7l9v5sp7gvp9cicwpgp"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.7.0"; sha256 = "0mbjfajmafkca47zr8v36brvknzks5a7pgb49kfq2d188pyv6iap"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.8.1"; sha256 = "17xxl3m99wa4hcpqy42vl8qb1jk2jfq32rj3sfjc1a46hi2si5jj"; }) @@ -309,13 +309,14 @@ (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "5.0.0"; sha256 = "1bn2pzaaq4wx9ixirr8151vm5hynn3lmrljcgjx9yghmm4k677k0"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "5.0.0"; sha256 = "144pgy65jc3bkar7d4fg1c0rq6qmkx68gj9k1ldk97558w22v1r1"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "5.0.1"; sha256 = "00yg63qnp94q2qryxxggzigi276bibb8b3b96gcvsyrxy7b703n9"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Json"; version = "5.0.0"; sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; }) (fetchNuGet { pname = "System.Text.Json"; version = "5.0.2"; sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.4"; sha256 = "19ygfw7b6rasjk0v6bdra85a5rh1qq4q2wgrclzvcrps66lcv5w1"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.5"; sha256 = "12fg196sdq3gcjcz365kypfkkmdrprpcw2fvjnww9jqa4yn8v99l"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) @@ -323,7 +324,6 @@ (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) diff --git a/third_party/nixpkgs/pkgs/games/pokete/default.nix b/third_party/nixpkgs/pkgs/games/pokete/default.nix index c5f7379065..391faaa52b 100644 --- a/third_party/nixpkgs/pkgs/games/pokete/default.nix +++ b/third_party/nixpkgs/pkgs/games/pokete/default.nix @@ -7,15 +7,15 @@ python3.pkgs.buildPythonApplication rec { pname = "pokete"; - version = "0.7.3"; + version = "0.8.2"; format = "other"; src = fetchFromGitHub { owner = "lxgr-linux"; repo = "pokete"; - rev = version; - sha256 = "sha256-sP6fI3F/dQHei1ZJU6gChKxft9fGpTct4EyU3OdBtr4="; + rev = "v${version}"; + sha256 = "sha256-carQ/m7akdXLO4h5o0cE0EiQmsAyarMAV4AtG3KATYQ="; }; pythonPath = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/games/polymc/default.nix b/third_party/nixpkgs/pkgs/games/polymc/default.nix index c285423900..e2ceec0e97 100644 --- a/third_party/nixpkgs/pkgs/games/polymc/default.nix +++ b/third_party/nixpkgs/pkgs/games/polymc/default.nix @@ -16,21 +16,22 @@ , openal , msaClientID ? "" , jdks ? [ jdk jdk8 ] +, extra-cmake-modules }: stdenv.mkDerivation rec { pname = "polymc"; - version = "1.3.2"; + version = "1.4.1"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-hqsyS82UzgCUZ9HjoPKjOLE49fwLntRAh3mVrTsmi3o="; + sha256 = "sha256-Pu2Eb3g6gwCZjJN0N6S/N82eBMLduQQUzXo8nMmtE+Y="; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake file jdk wrapQtAppsHook ]; + nativeBuildInputs = [ extra-cmake-modules cmake file jdk wrapQtAppsHook ]; buildInputs = [ qtbase zlib quazip ]; cmakeFlags = lib.optionals (msaClientID != "") [ "-DLauncher_MSA_CLIENT_ID=${msaClientID}" ]; @@ -53,7 +54,7 @@ stdenv.mkDerivation rec { in '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 wrapQtApp $out/bin/polymc \ - --set GAME_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ + --set LD_LIBRARY_PATH /run/opengl-driver/lib:${libpath} \ --prefix POLYMC_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks} \ --prefix PATH : ${lib.makeBinPath [ xorg.xrandr ]} ''; @@ -68,7 +69,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; changelog = "https://github.com/PolyMC/PolyMC/releases/tag/${version}"; - license = licenses.gpl3Plus; + license = licenses.gpl3Only; maintainers = with maintainers; [ cleverca22 starcraft66 ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/default.nix b/third_party/nixpkgs/pkgs/games/quakespasm/default.nix index faeea7e476..d130df696b 100644 --- a/third_party/nixpkgs/pkgs/games/quakespasm/default.nix +++ b/third_party/nixpkgs/pkgs/games/quakespasm/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "quakespasm"; - version = "0.94.3"; + version = "0.94.7"; src = fetchurl { url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz"; - sha256 = "sha256-PpX20+XHIF4aRosErKGnylXIqdMtG3Ubsi70zNG9Dq0="; + sha256 = "sha256-xkXG+PBCCM+vzSZESgP2kOsD0rSg6pRupJdH5Y+fc/4="; }; sourceRoot = "${pname}-${version}/Quake"; diff --git a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix index a6aadef7a5..eedab296ce 100644 --- a/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix +++ b/third_party/nixpkgs/pkgs/games/quakespasm/vulkan.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader }: +{ lib, stdenv, fetchFromGitHub, makeWrapper +, SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader, moltenvk +}: stdenv.mkDerivation rec { pname = "vkquake"; @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { libvorbis libmad vulkan-loader - ]; + ] ++ lib.optional stdenv.isDarwin moltenvk; buildFlags = [ "DO_USERDIRS=1" ]; @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { specialization constants, CPU/GPU parallelism and memory pooling. ''; - platforms = platforms.linux; - maintainers = with maintainers; [ ]; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ ylh ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix index 7419b6810c..4c537d4dd3 100644 --- a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix +++ b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix @@ -1,15 +1,16 @@ { lib, stdenv, fetchurl, desktop-file-utils , gtk3, libX11, cmake, imagemagick , pkg-config, perl, wrapGAppsHook +, isMobile ? false }: stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20220613.387d323"; + version = "20220802.8399cff"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-Vcm7gxC9R7vvLkgkHblvEOONGLkYSHGMRfSBktgN/oQ="; + hash = "sha256-f68Nj8P8oIJj1LWyq8Iamv32ex+boPH/lsV5t+YhM9o="; }; sgt-puzzles-menu = fetchurl { @@ -26,6 +27,8 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; + NIX_CFLAGS_COMPILE = if isMobile then "-DSTYLUS_BASED" else ""; + buildInputs = [ gtk3 libX11 ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix index 0d765d0c11..f32f46f1f1 100644 --- a/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix +++ b/third_party/nixpkgs/pkgs/games/steam/fhsenv.nix @@ -95,9 +95,11 @@ in buildFHSUserEnv rec { json-glib # paradox launcher (Stellaris) libdrm libxkbcommon # paradox launcher + libvorbis # Dead Cells mono xorg.xkeyboardconfig xorg.libpciaccess + xorg.libXScrnSaver # Dead Cells udev # shadow of the tomb raider icu # dotnet runtime, e.g. stardew valley @@ -182,6 +184,7 @@ in buildFHSUserEnv rec { flac freeglut libjpeg + libpng libpng12 libsamplerate libmikmod diff --git a/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix b/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix index ba2112617b..6b739c8049 100644 --- a/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix +++ b/third_party/nixpkgs/pkgs/games/the-powder-toy/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A free 2D physics sandbox game"; homepage = "http://powdertoy.co.uk/"; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.unix; license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar siraben ]; mainProgram = "powder"; diff --git a/third_party/nixpkgs/pkgs/games/tintin/default.nix b/third_party/nixpkgs/pkgs/games/tintin/default.nix new file mode 100644 index 0000000000..7add5af64f --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/tintin/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, lib, zlib, pcre +, memorymappingHook, memstreamHook +, gnutls +}: + +stdenv.mkDerivation rec { + pname = "tintin"; + version = "2.02.20"; + + src = fetchFromGitHub { + owner = "scandum"; + repo = "tintin"; + rev = version; + hash = "sha256-H9Cjg/GkyV50pgewv77zOJ8/Op78P9sQmZ5LorO4L+A="; + }; + + buildInputs = [ zlib pcre gnutls ] + ++ lib.optionals (stdenv.system == "x86_64-darwin") [ memorymappingHook memstreamHook ]; + + preConfigure = '' + cd src + ''; + + meta = with lib; { + description = "A free MUD client for macOS, Linux and Windows"; + homepage = "https://tintin.mudhalla.net/index.php"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ abathur ]; + mainProgram = "tt++"; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/tome4/default.nix b/third_party/nixpkgs/pkgs/games/tome4/default.nix index b732777ed3..704d09d72d 100644 --- a/third_party/nixpkgs/pkgs/games/tome4/default.nix +++ b/third_party/nixpkgs/pkgs/games/tome4/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { homepage = "https://te4.org/"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/games/uqm/default.nix b/third_party/nixpkgs/pkgs/games/uqm/default.nix index 5b67b9bce9..797c41916f 100644 --- a/third_party/nixpkgs/pkgs/games/uqm/default.nix +++ b/third_party/nixpkgs/pkgs/games/uqm/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub, pkg-config, libGLU, libGL -, SDL, SDL_image, libpng, libvorbis, libogg, libmikmod +, SDL2, libpng, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null , haskellPackages ? null @@ -28,37 +28,37 @@ let in stdenv.mkDerivation rec { pname = "uqm"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { - url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz"; - sha256 = "08dj7fsvflxx69an6vpf3wx050mk0ycmdv401yffrrqbgxgmqsd3"; + url = "mirror://sourceforge/sc2/uqm-${version}-src.tgz"; + sha256 = "JPL325z3+vU7lfniWA5vWWIFqY7QwzXP6DTGR4WtT1o="; }; content = fetchurl { url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm"; - sha256 = "1gx39ns698hyczd4nx73mr0z86bbi4q3h8sw3pxjh1lzla5xpxmq"; + sha256 = "d9dawl5vt1WjPEujs4p7e8Qfy8AolokbDMmskhS3Lu8="; }; voice = fetchurl { url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm"; - sha256 = "0yf9ff5sxk229202gsa7ski6wn7a8hkjjyr1yr7mjdxsnh0zik5w"; + sha256 = "ntv1HXfYtTM5nF86+1STFKghDXqrccosUbTySDIzekU="; }; music = fetchurl { url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm"; - sha256 = "10nbvcrr0lc0mxivxfkcbxnibwk3vwmamabrlvwdsjxd9pk8aw65"; + sha256 = "RM087H6VabQRettNd/FSKJCXJWYmc5GuCWMUhdIx2Lk="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod libGLU libGL ]; + buildInputs = [ SDL2 libpng libvorbis libogg libmikmod libGLU libGL ]; postUnpack = '' mkdir -p uqm-${version}/content/packages mkdir -p uqm-${version}/content/addons - ln -s "$content" "uqm-${version}/content/packages/uqm-0.7.0-content.uqm" - ln -s "$music" "uqm-${version}/content/addons/uqm-0.7.0-3domusic.uqm" - ln -s "$voice" "uqm-${version}/content/addons/uqm-0.7.0-voice.uqm" + ln -s "$content" "uqm-${version}/content/packages/uqm-${version}-content.uqm" + ln -s "$music" "uqm-${version}/content/addons/uqm-${version}-3domusic.uqm" + ln -s "$voice" "uqm-${version}/content/addons/uqm-${version}-voice.uqm" '' + lib.optionalString useRemixPacks (lib.concatMapStrings (disc: '' ln -s "${disc}" "uqm-$version/content/addons/${disc.name}" '') remixPacks) + lib.optionalString use3DOVideos '' diff --git a/third_party/nixpkgs/pkgs/games/urbanterror/default.nix b/third_party/nixpkgs/pkgs/games/urbanterror/default.nix index dfbad29fa9..fbb633bb65 100644 --- a/third_party/nixpkgs/pkgs/games/urbanterror/default.nix +++ b/third_party/nixpkgs/pkgs/games/urbanterror/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://www.urbanterror.info"; license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ astsmtl fpletz ]; + maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; hydraPlatforms = []; }; diff --git a/third_party/nixpkgs/pkgs/games/wargus/default.nix b/third_party/nixpkgs/pkgs/games/wargus/default.nix index fda4f792c7..ca4b70923e 100644 --- a/third_party/nixpkgs/pkgs/games/wargus/default.nix +++ b/third_party/nixpkgs/pkgs/games/wargus/default.nix @@ -1,11 +1,30 @@ { stdenv, lib, callPackage, fetchFromGitHub +, fetchurl, runCommand, unzip, bchunk, p7zip , cmake, pkg-config, makeWrapper , zlib, bzip2, libpng -, dialog, python3, cdparanoia +, dialog, python3, cdparanoia, ffmpeg }: let stratagus = callPackage ./stratagus.nix {}; + + dataDownload = fetchurl { + url = "https://archive.org/download/warcraft-ii-tides-of-darkness_202105/Warcess.zip"; + sha256 = "0yxgvf8xpv1w2bjmny4a38pa3xcdgqckk9abj21ilkc5zqzqmm9b"; + }; + + data = runCommand "warcraft2" { + buildInputs = [ unzip bchunk p7zip ]; + meta.license = lib.licenses.unfree; + } '' + unzip ${dataDownload} "Warcraft.II.Tides.of.Darkness/Warcraft II - Tides of Darkness (1995)/games/WarcrafD/cd/"{WC2BTDP.img,WC2BTDP.cue} + bchunk "Warcraft.II.Tides.of.Darkness/Warcraft II - Tides of Darkness (1995)/games/WarcrafD/cd/"{WC2BTDP.img,WC2BTDP.cue} WC2BTDP + rm -r Warcraft.II.Tides.of.Darkness + 7z x WC2BTDP01.iso + rm WC2BTDP*.{iso,cdr} + cp -r DATA $out + ''; + in stdenv.mkDerivation rec { pname = "wargus"; @@ -15,10 +34,10 @@ stdenv.mkDerivation rec { owner = "wargus"; repo = "wargus"; rev = "v${version}"; - sha256 = "0dibm68jxaqzgzcyblfj2bmwyz9v5ax0njnnbvak7xjk1zlh11sx"; + sha256 = "sha256-yJeMFxCD0ikwVPQApf+IBuMQ6eOjn1fVKNmqh6r760c="; }; - nativeBuildInputs = [ cmake pkg-config makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config makeWrapper ffmpeg ]; buildInputs = [ zlib bzip2 libpng ]; cmakeFlags = [ "-DSTRATAGUS=${stratagus}/games/stratagus" @@ -26,7 +45,12 @@ stdenv.mkDerivation rec { ]; postInstall = '' makeWrapper $out/games/wargus $out/bin/wargus \ - --prefix PATH : ${lib.makeBinPath [ "$out" cdparanoia python3 ]} + --prefix PATH : ${lib.makeBinPath [ "$out" ]} + substituteInPlace $out/share/applications/wargus.desktop \ + --replace $out/games/wargus $out/bin/wargus + + $out/bin/wartool -v -r ${data} $out/share/games/stratagus/wargus + ln -s $out/share/games/stratagus/wargus/{contrib/black_title.png,graphics/ui/black_title.png} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/games/wargus/stratagus.nix b/third_party/nixpkgs/pkgs/games/wargus/stratagus.nix index aa050442bf..fc4f234279 100644 --- a/third_party/nixpkgs/pkgs/games/wargus/stratagus.nix +++ b/third_party/nixpkgs/pkgs/games/wargus/stratagus.nix @@ -1,25 +1,25 @@ { lib, stdenv, fetchFromGitHub , cmake, pkg-config, makeWrapper , zlib, bzip2, libpng, lua5_1, toluapp -, SDL, SDL_mixer, SDL_image, libGL +, SDL2, SDL2_mixer, SDL2_image, libGL }: stdenv.mkDerivation rec { pname = "stratagus"; - version = "2.4.3"; + version = "3.3.1"; src = fetchFromGitHub { owner = "wargus"; repo = "stratagus"; rev = "v${version}"; - sha256 = "128m5n9axq007xi8a002ig7d4dyw8j060542x220ld66ibfprhcn"; + sha256 = "sha256-q8AvIWr/bOzI0wV0D2emxIXYEKDYmFxbtwr2BS+xYfA="; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ zlib bzip2 libpng lua5_1 toluapp - (lib.getDev SDL) SDL_image SDL_mixer libGL + (lib.getDev SDL2) SDL2_image SDL2_mixer libGL ]; cmakeFlags = [ "-DCMAKE_CXX_FLAGS=-Wno-error=format-overflow" diff --git a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix index 4e4cee5cb1..5060f2fb4f 100644 --- a/third_party/nixpkgs/pkgs/games/wesnoth/default.nix +++ b/third_party/nixpkgs/pkgs/games/wesnoth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.3"; + version = "1.16.4"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-om6Tps5ZdAWq1WE9lq9v2oGwfPDPSRJ08pmMlT6DjGk="; + sha256 = "sha256-yb/Y54MVtzIi5+FnQQZTNDNGgkPn0j2n+7cH6qejAO0="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/misc/autotiling-rs/default.nix b/third_party/nixpkgs/pkgs/misc/autotiling-rs/default.nix new file mode 100644 index 0000000000..6e0ffebf03 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/autotiling-rs/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "autotiling-rs"; + version = "0.1.3"; + + src = fetchFromGitHub { + owner = "ammgws"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-LQbmF2M6pWa0QEbKF770x8TFLMGrJeq5HnXHvLrDDPA="; + }; + + cargoHash = "sha256-wot5GKBA2TBrA/jnWD0eypPRqUodmk/TJlYJMl3/gm4="; + + meta = with lib; { + description = "Autotiling for sway (and possibly i3)"; + homepage = "https://github.com/ammgws/autotiling-rs"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 40a1414cfa..8390d5e0ba 100644 --- a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation { pname = "cnijfilter2"; - version = "6.10"; + version = "6.40"; src = fetchzip { - url = "https://gdlp01.c-wss.com/gds/1/0100010921/01/cnijfilter2-source-6.10-1.tar.gz"; - sha256 = "0w121issdjxdv5i9ksa5m23if6pz1r9ql8p894f1pqn16w0kw1ix"; + url = "https://gdlp01.c-wss.com/gds/1/0100011381/01/cnijfilter2-source-6.40-1.tar.gz"; + sha256 = "3RoG83jLOsdTEmvUkkxb7wa8oBrJA4v1mGtxTGwSowU="; }; nativeBuildInputs = [ automake autoconf ]; @@ -16,6 +16,10 @@ stdenv.mkDerivation { cups glib libxml2 libusb1 libtool ]; + patches = [ + ./patches/get_protocol.patch + ]; + # lgmon3's --enable-libdir flag is used soley for specifying in which # directory the cnnnet.ini cache file should reside. # NixOS uses /var/cache/cups, and given the name, it seems like a reasonable @@ -25,7 +29,7 @@ stdenv.mkDerivation { # $out/lib/cups/filter/libcnbpcnclapicom2.so buildPhase = '' mkdir -p $out/lib - cp com/libs_bin64/* $out/lib + cp com/libs_bin_x86_64/* $out/lib mkdir -p $out/lib/cups/filter ln -s $out/lib/libcnbpcnclapicom2.so $out/lib/cups/filter @@ -51,6 +55,12 @@ stdenv.mkDerivation { make ) + ( + cd cmdtocanonij3 + ./autogen.sh --prefix=$out + make + ) + ( cd cnijbe2 substituteInPlace src/Makefile.am \ @@ -90,6 +100,11 @@ stdenv.mkDerivation { make install ) + ( + cd cmdtocanonij3 + make install + ) + ( cd cnijbe2 make install diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch new file mode 100644 index 0000000000..18cb1ce1d0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/patches/get_protocol.patch @@ -0,0 +1,14 @@ +# Resolves the compilation issue reported at https://github.com/NixOS/nixpkgs/pull/180681#issuecomment-1192304711 +# An identical issue was previously reported in Gentoo: https://bugs.gentoo.org/723186 +# This patch is taken from the solution of Alfredo Tupone (https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24688d64544b43f2c14be54531ad8764419dde09) +--- a/lgmon3/src/cnijlgmon3.c 2022-07-22 12:44:32.194641628 +0100 ++++ b/lgmon3/src/cnijlgmon3.c 2022-07-22 12:43:53.954817724 +0100 +@@ -55,7 +55,7 @@ + int (*GET_STATUS)(char *, int, int *, int * , char *); + int (*GET_STATUS2)(char *, int, char *, int *, int * , char *, char *); + int (*GET_STATUS2_MAINTENANCE)(char *, int, char *, int *, int * , char *, char *); +-int (*GET_PROTOCOL)(char *, size_t); ++static int (*GET_PROTOCOL)(char *, size_t); + + + int main(int argc, char *argv[]) diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix index 9c4998ecaa..40e6c7b3b1 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl, cups }: -stdenv.mkDerivation { +let version = "1.7.20"; +in stdenv.mkDerivation { pname = "epson-escpr"; - version = "1.7.16"; + inherit version; src = fetchurl { # To find new versions, visit @@ -11,10 +12,11 @@ stdenv.mkDerivation { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/12/97/30/97f146010d33b9a55badbc23429296f6b9b46011/epson-inkjet-printer-escpr-1.7.16-1lsb3.2.tar.gz" - "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/12/97/30/97f146010d33b9a55badbc23429296f6b9b46011/epson-inkjet-printer-escpr-1.7.16-1lsb3.2.tar.gz" + "https://download3.ebz.epson.net/dsc/f/03/00/13/76/45/5ac2ea8f9cf94a48abd64afd0f967f98c4fc24aa/epson-inkjet-printer-escpr-${version}-1lsb3.2.tar.gz" + + "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/13/76/45/5ac2ea8f9cf94a48abd64afd0f967f98c4fc24aa/epson-inkjet-printer-escpr-${version}-1lsb3.2.tar.gz" ]; - sha256 = "18n6fgyrii8084vdjhys94lr6nhhbmn7zzjd8jckvv1grb0iz9nv"; + sha256 = "sha256:09rscpm557dgaflylr93wcwmyn6fnvr8nc77abwnq97r6hxwrkhk"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix index ad3477d2a0..02553d5a9e 100644 --- a/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/third_party/nixpkgs/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.48"; + version = "1.1.49"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/13/52/26/977f2b2c13cc185981479fbd225b802c35c92beb/epson-inkjet-printer-escpr2-1.1.48-1lsb3.2.src.rpm"; - sha256 = "sha256-E+ZZLt7hdXojQkKr0qgdL+UuSZXAESWW9AHIfAX1jK0="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/13/76/47/16f624dc1dfad10c3b4eb141c50c651a6360f69a/epson-inkjet-printer-escpr2-1.1.49-1lsb3.2.src.rpm"; + sha256 = "sha256-WKDOpS7YL7J/IaNQcTjcoyXNXJGOuEexopdhYFubf50="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/misc/drivers/xow/default.nix b/third_party/nixpkgs/pkgs/misc/drivers/xow/default.nix deleted file mode 100644 index c084b45d15..0000000000 --- a/third_party/nixpkgs/pkgs/misc/drivers/xow/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, cabextract, fetchurl, fetchFromGitHub, libusb1 }: - -stdenv.mkDerivation rec { - pname = "xow"; - version = "unstable-2022-04-24"; - - src = fetchFromGitHub { - owner = "medusalix"; - repo = "xow"; - rev = "d335d6024f8380f52767a7de67727d9b2f867871"; - sha256 = "0q5nr21p4dlx2a99hiivwz6qj9anrqqsdhiz6xi375yqkxis4251"; - }; - - firmware = fetchurl { - url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab"; - sha256 = "013g1zngxffavqrk5jy934q3bdhsv6z05ilfixdn8dj0zy26lwv5"; - }; - - makeFlags = [ - "BUILD=RELEASE" - "VERSION=${version}-${src.rev}" - "BINDIR=${placeholder "out"}/bin" - "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" - "MODLDIR=${placeholder "out"}/lib/modules-load.d" - "MODPDIR=${placeholder "out"}/lib/modprobe.d" - "SYSDDIR=${placeholder "out"}/lib/systemd/system" - ]; - - postUnpack = '' - cabextract -F FW_ACC_00U.bin ${firmware} - mv FW_ACC_00U.bin source/firmware.bin - ''; - - enableParallelBuilding = true; - nativeBuildInputs = [ cabextract ]; - buildInputs = [ libusb1 ]; - - meta = with lib; { - homepage = "https://github.com/medusalix/xow"; - description = "Linux driver for the Xbox One wireless dongle"; - license = licenses.gpl2Plus; - maintainers = [ maintainers.jansol ]; - platforms = platforms.linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/misc/dxvk/default.nix b/third_party/nixpkgs/pkgs/misc/dxvk/default.nix index b51f215419..6664db0e9e 100644 --- a/third_party/nixpkgs/pkgs/misc/dxvk/default.nix +++ b/third_party/nixpkgs/pkgs/misc/dxvk/default.nix @@ -25,8 +25,8 @@ stdenvNoCC.mkDerivation (finalAttrs: darwin = { inherit (default) rev hash version; }; default = { rev = "v${finalAttrs.version}"; - hash = "sha256-+6PkrkamSvhCaGj2tq+RXri/yQ7vs0cAqgdRAFtU8UA="; - version = "1.10.1"; + hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE="; + version = "1.10.3"; }; }; in diff --git a/third_party/nixpkgs/pkgs/misc/fastly/default.nix b/third_party/nixpkgs/pkgs/misc/fastly/default.nix index 4462603d3e..64e39319b2 100644 --- a/third_party/nixpkgs/pkgs/misc/fastly/default.nix +++ b/third_party/nixpkgs/pkgs/misc/fastly/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, installShellFiles, buildGoModule }: +{ lib, fetchFromGitHub, installShellFiles, buildGoModule, go }: buildGoModule rec { pname = "fastly"; - version = "3.1.1"; + version = "3.2.4"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-mUWGvFyei5Ep3xRDVVZoa6tMiqfV89hn82/Uai+Gh8Y="; + sha256 = "sha256-eIqdDBU4NWNMyRs+h30ufg4QwEEGid+wCjATZYXDGm8="; # 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, @@ -34,10 +34,11 @@ buildGoModule rec { "-w" "-X github.com/fastly/cli/pkg/revision.AppVersion=v${version}" "-X github.com/fastly/cli/pkg/revision.Environment=release" + "-X github.com/fastly/cli/pkg/revision.GoHostOS=${go.GOHOSTOS}" + "-X github.com/fastly/cli/pkg/revision.GoHostArch=${go.GOHOSTARCH}" ]; preBuild = '' ldflags+=" -X github.com/fastly/cli/pkg/revision.GitCommit=$(cat COMMIT)" - ldflags+=" -X 'github.com/fastly/cli/pkg/revision.GoVersion=$(go version)'" ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/misc/logging/beats/6.x.nix b/third_party/nixpkgs/pkgs/misc/logging/beats/6.x.nix index bdef9dd213..1c3e4adccf 100644 --- a/third_party/nixpkgs/pkgs/misc/logging/beats/6.x.nix +++ b/third_party/nixpkgs/pkgs/misc/logging/beats/6.x.nix @@ -26,7 +26,7 @@ let beat = package : extraArgs : buildGoPackage (rec { meta = with lib; { homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; - maintainers = with maintainers; [ fadenb basvandijk ]; + maintainers = with maintainers; [ fadenb basvandijk dfithian ]; platforms = platforms.linux; }; } // extraArgs); diff --git a/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix b/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix index 55fed8fb67..a2a7e79691 100644 --- a/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix +++ b/third_party/nixpkgs/pkgs/misc/logging/beats/7.x.nix @@ -18,7 +18,7 @@ let beat = package: extraArgs: buildGoModule (rec { meta = with lib; { homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; - maintainers = with maintainers; [ fadenb basvandijk ]; + maintainers = with maintainers; [ fadenb basvandijk dfithian ]; platforms = platforms.linux; }; } // extraArgs); diff --git a/third_party/nixpkgs/pkgs/misc/logging/pacemaker/default.nix b/third_party/nixpkgs/pkgs/misc/logging/pacemaker/default.nix index 07194380d4..5da634203d 100644 --- a/third_party/nixpkgs/pkgs/misc/logging/pacemaker/default.nix +++ b/third_party/nixpkgs/pkgs/misc/logging/pacemaker/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "pacemaker"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "Pacemaker-${version}"; - sha256 = "1w7vq3lmgcz38pfww9vccm142vjsjqz3qc9nnk09ynkx4agqhxdg"; + sha256 = "sha256-b3ljxAuawhqTnURBJMqy4Zzzfi8PCFwie/zC1yeErhQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/misc/my-env/default.nix b/third_party/nixpkgs/pkgs/misc/my-env/default.nix index 8a35525b3e..df4c8fc6b6 100644 --- a/third_party/nixpkgs/pkgs/misc/my-env/default.nix +++ b/third_party/nixpkgs/pkgs/misc/my-env/default.nix @@ -73,7 +73,7 @@ mkDerivation { }; buildPhase = let - initialPath = import ../../stdenv/common-path.nix { inherit pkgs; }; + initialPath = import ../../stdenv/generic/common-path.nix { inherit pkgs; }; in '' set -x mkdir -p "$out/dev-envs" "$out/nix-support" "$out/bin" diff --git a/third_party/nixpkgs/pkgs/misc/rkdeveloptool/default.nix b/third_party/nixpkgs/pkgs/misc/rkdeveloptool/default.nix index 517a8cc653..a07748fbe2 100644 --- a/third_party/nixpkgs/pkgs/misc/rkdeveloptool/default.nix +++ b/third_party/nixpkgs/pkgs/misc/rkdeveloptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rkdeveloptool"; - version = "unstable-2021-02-03"; + version = "unstable-2021-04-08"; src = fetchFromGitHub { owner = "rockchip-linux"; repo = "rkdeveloptool"; - rev = "e607a5d6ad3f6af66d3daf3f6370e6dc9763a20d"; - sha256 = "08m0yfds5rpr5l0s75ynfarq3hrv94l3aadld17cz5gqapqcfs2n"; + rev = "46bb4c073624226c3f05b37b9ecc50bbcf543f5a"; + sha256 = "eIFzyoY6l3pdfCN0uS16hbVp0qzdG3MtcS1jnDX1Yk0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ libusb1 ]; # main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5 - CPPFLAGS = "-Wno-error=format-truncation"; + CPPFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ]; meta = with lib; { homepage = "https://github.com/rockchip-linux/rkdeveloptool"; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix index ff1736c094..4b79758ef8 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; homepage = "https://electricsheep.org/"; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.gpl1; }; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix index d89ac88684..a14977d964 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/pipes-rs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pipes-rs"; - version = "1.4.7"; + version = "1.6.0"; src = fetchFromGitHub { owner = "lhvy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-egjmvvbPmIjccg44F2/TiGrn5HRN5hp8XL0yd0/ctv0="; + sha256 = "sha256-UwRXErlGtneEtc3UAiREwILQPTRQn1AgxiWDzSCZv/M="; }; - cargoSha256 = "sha256-i9aR0dGNRF37Hhs9vq0wpdZGIVkX7M1SzbpASR5ve+g="; + cargoSha256 = "sha256-Qyuvg13SnTN1dvxn4Gu4tizmjk4zrEi/iuXTV28fZbQ="; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix index ac739d6a0d..ff351961c7 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xlockmore/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "xlockmore"; - version = "5.69"; + version = "5.70"; src = fetchurl { url = "http://sillycycle.com/xlock/xlockmore-${version}.tar.xz"; - sha256 = "sha256-6pJlTAASJoSHZaJRpzvLxHPM7xe3IcwY1TYfWdvW07k="; + sha256 = "sha256-DzvLm4AkFs2Hu24WOjhD/qXX+tkP8Eg42hIsKSw9DaI="; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix index fcec51506a..72e283eaf1 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation rec { - version = "6.03"; + version = "6.04"; pname = "xscreensaver"; src = fetchurl { url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Mo1ReXNSrPWMpbq0nnb78mA058rXhfZR6hHOe0P7olo="; + sha256 = "sha256-eHAUsp8MV5Pswtk+EQmgSf9IqwwpuFHas09oPO72sVI="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; # "marbling" has NEON code that mixes signed and unsigned vector types - NIX_CFLAGS_COMPILE = lib.optional (with stdenv.hostPlatform; isAarch64 || isAarch32) "-flax-vector-conversions"; + NIX_CFLAGS_COMPILE = lib.optional stdenv.hostPlatform.isAarch "-flax-vector-conversions"; postInstall = '' for bin in $out/bin/*; do diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix index e9c7eebacc..2c51d20807 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xssproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xssproxy"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "timakro"; repo = "xssproxy"; rev = "v${version}"; - sha256 = "0c83wmipnsdnbihc5niyczs7jrkss2s8n6iwwjdia7hkjzbd0hl7"; + sha256 = "sha256-xaFr+AM5GdTZQsN1g8QsXgzsfve9GoteiXHpoMvwEBg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/misc/sndio/default.nix b/third_party/nixpkgs/pkgs/misc/sndio/default.nix index ea2229f264..a65c0cd7b0 100644 --- a/third_party/nixpkgs/pkgs/misc/sndio/default.nix +++ b/third_party/nixpkgs/pkgs/misc/sndio/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sndio"; - version = "1.8.1"; + version = "1.9.0"; src = fetchurl { url = "https://www.sndio.org/sndio-${version}.tar.gz"; - sha256 = "08b33bbrhbva1lyzzsj5k6ggcqzrfjfhb2n99a0b8b07kqc3f7gq"; + sha256 = "sha256-8wgm/JwH42nTkk1fzt9qClPA30rh9atQ/pzygFQPaZo="; }; nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; diff --git a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix index 87a9a0f979..dd0cf011b1 100644 --- a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ tpm2-tss tpm2-tools opensc openssl sqlite libyaml - (python3.withPackages (ps: [ ps.pyyaml ps.cryptography ps.pyasn1-modules ps.tpm2-pytss ])) + (python3.withPackages (ps: with ps; [ packaging pyyaml cryptography pyasn1-modules tpm2-pytss ])) ]; outputs = [ "out" "bin" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix b/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix index cc98cf46d0..e5601095eb 100644 --- a/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix +++ b/third_party/nixpkgs/pkgs/misc/wiki-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "wiki-tui"; - version = "0.4.8"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Builditluc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/u0segKHrrtXfEjOmpnQ/iFbsM+VfsZKTpyc1IfuOU8="; + sha256 = "sha256-kcVfqj5vRfPcF6lO1Ley3ctZajNA02jUqQRlpi3MkXc="; }; buildInputs = [ ncurses openssl ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkg-config ]; - cargoSha256 = "sha256-3xvaEzqAz/U8CkdGYXLBnxrgW1raeKuzRsmD+0Sd4iQ="; + cargoSha256 = "sha256-OW2kutjvQC9neiguixTdJx2hUFsnmQhR9DbniBr6V8w="; # Tests fail with this error: `found argument --test-threads which was not expected` doCheck = false; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix index d2d21cc9d6..df47d53514 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -280,9 +280,11 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { objc4 = applePackage "objc4" "osx-10.12.6" "1cj1vhbcs9pkmag2ms8wslagicnq9bxi2qjkszmp3ys7z7ccrbwz" {}; ppp = applePackage "ppp" "osx-10.12.6" "1kcc2nc4x1kf8sz0a23i6nfpvxg381kipi0qdisrp8x9z2gbkxb8" {}; removefile = applePackage "removefile" "osx-10.12.6" "0jzjxbmxgjzhssqd50z7kq9dlwrv5fsdshh57c0f8mdwcs19bsyx" {}; - xnu = applePackage "xnu" "osx-10.12.6" "1sjb0i7qzz840v2h4z3s4jyjisad4r5yyi6sg8pakv3wd81i5fg5" { + xnu = if stdenv.isx86_64 then + applePackage "xnu" "osx-10.12.6" "1sjb0i7qzz840v2h4z3s4jyjisad4r5yyi6sg8pakv3wd81i5fg5" { 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" {}; @@ -291,7 +293,9 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // { diskdev_cmds = applePackage "diskdev_cmds" "osx-10.11.6" "1ssdyiaq5m1zfy96yy38yyknp682ki6bvabdqd5z18fa0rv3m2ar" { macosPackages_11_0_1 = macosPackages_11_0_1; }; - network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {}; + network_cmds = if stdenv.isx86_64 then + applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {} + 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" {}; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 2c93ad38b3..9a95eb04e6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,11 +1,13 @@ -{ lib, appleDerivation, xcbuildHook +{ lib, appleDerivation, xcbuildHook, stdenv , libressl_3_4, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; buildInputs = [ libressl_3_4 xnu Librpcsvc libpcap developer_cmds ]; - NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; + # Work around error from 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/"; # "spray" requires some files that aren't compiling correctly in xcbuild. # "rtadvd" seems to fail with some missing constants. @@ -16,6 +18,10 @@ appleDerivation { --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" \ --replace "72CD1D9C0EE8C47C005F825D /* PBXTargetDependency */," "" \ --replace "7216D2C20EE89ADF00AE70E4 /* PBXTargetDependency */," "" + '' + lib.optionalString stdenv.isAarch64 '' + # "unbound" does not build on aarch64 + substituteInPlace network_cmds.xcodeproj/project.pbxproj \ + --replace "71D958C51A9455A000C9B286 /* PBXTargetDependency */," "" ''; # temporary install phase until xcodebuild has "install" support diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix index 90f572d394..8b0d2054d5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix @@ -4,12 +4,15 @@ , headersOnly ? true }: -appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ({ +appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ( + let arch = if stdenv.isx86_64 then "x86_64" else "arm64"; + in + { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bootstrap_cmds bison flex gnum4 unifdef perl python3 ]; - patches = [ ./python3.patch ]; + patches = lib.optional stdenv.isx86_64 [ ./python3.patch ]; postPatch = '' substituteInPlace Makefile \ @@ -41,9 +44,16 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ({ --replace " -o 0" "" \ --replace '$SRC/$mig' '-I$DSTROOT/include $SRC/$mig' \ --replace '$SRC/servers/netname.defs' '-I$DSTROOT/include $SRC/servers/netname.defs' \ - --replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR' + --replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR' \ + --replace 'MACHINE_ARCH=armv7' 'MACHINE_ARCH=arm64' # this might break the comments saying 32-bit is required patchShebangs . + '' + lib.optionalString stdenv.isAarch64 '' + # iig is closed-sourced, we don't have it + # create an empty file to the header instead + # this line becomes: echo "" > $@; echo --header ... + substituteInPlace iokit/DriverKit/Makefile \ + --replace '--def $<' '> $@; echo' ''; PLATFORM = "MacOSX"; @@ -62,18 +72,22 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) ({ HOST_BISON = "bison"; HOST_GM4 = "m4"; MIGCC = "cc"; - ARCHS = "x86_64"; + ARCHS = arch; + ARCH_CONFIGS = arch; NIX_CFLAGS_COMPILE = "-Wno-error"; - preBuild = '' + 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" + + lib.optionalString stdenv.isAarch64 " 10.12 10.13 10.14 10.15 11.0"; + in '' # This is a bit of a hack... mkdir -p sdk/usr/local/libexec cat > sdk/usr/local/libexec/availability.pl < "${MVK_HDR_FILE}" - echo "static const char* mvkRevString = \"${MVK_GIT_REV}\";" >> "${MVK_HDR_FILE}" -- diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/pngpaste/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/pngpaste/default.nix new file mode 100644 index 0000000000..99ae8048f7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/pngpaste/default.nix @@ -0,0 +1,37 @@ +{ lib, stdenv, fetchFromGitHub, AppKit, Cocoa }: + +let + pname = "pngpaste"; + version = "0.2.3"; +in stdenv.mkDerivation { + inherit pname version; + src = fetchFromGitHub { + owner = "jcsalterego"; + repo = pname; + rev = version; + sha256 = "uvajxSelk1Wfd5is5kmT2fzDShlufBgC0PDCeabEOSE="; + }; + + buildInputs = [ AppKit Cocoa ]; + + installPhase = '' + mkdir -p $out/bin + cp pngpaste $out/bin + ''; + + meta = with lib; { + description = "Paste image files from clipboard to file on MacOS"; + longDescription = '' + Paste PNG into files on MacOS, much like pbpaste does for text. + Supported input formats are PNG, PDF, GIF, TIF, JPEG. + Supported output formats are PNG, GIF, JPEG, TIFF. Output + formats are determined by the provided filename extension, + falling back to PNG. + ''; + homepage = "https://github.com/jcsalterego/pngpaste"; + changelog = "https://github.com/jcsalterego/pngpaste/raw/${version}/CHANGELOG.md"; + platforms = platforms.darwin; + license = licenses.bsd2; + maintainers = with maintainers; [ samw ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix index a870adf353..4f089c7be3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/sketchybar/default.nix @@ -10,13 +10,13 @@ in stdenv.mkDerivation rec { pname = "sketchybar"; - version = "2.7.1"; + version = "2.8.2"; src = fetchFromGitHub { owner = "FelixKratz"; repo = "SketchyBar"; rev = "v${version}"; - sha256 = "sha256-JzZ7X/McWIui9nkSkSGTSdBvJvMics/j7Qqh9wZU7iM="; + sha256 = "sha256-GmM+0h6xxUzW2kpTDZWAiqJAXoQgdsJRlNbvsuxKmZ8="; }; buildInputs = [ Carbon Cocoa SkyLight ] diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix index 4928f114a8..db8ede6feb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/alsa-project/alsa-lib/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "alsa-lib"; - version = "1.2.7.1"; + version = "1.2.7.2"; src = fetchurl { url = "mirror://alsa/lib/${pname}-${version}.tar.bz2"; - hash = "sha256-BG3ELfz60mkhe+BZVGhhN+XnOX8wQTcvjG3NfXlGHmE="; + hash = "sha256-ijW3IY5Q8qLHk0LQ3pje2BQ5zhnhKAk4Xsm+lZbefC8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix index 44cfefe680..bcc53e82b9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apfs/default.nix @@ -1,30 +1,20 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , kernel }: stdenv.mkDerivation { pname = "apfs"; - version = "unstable-2022-02-03-${kernel.version}"; + version = "unstable-2022-07-24-${kernel.version}"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "linux-apfs-rw"; - rev = "a0d6a4dca69b6eab3cabaaee4d4284807828a266"; - sha256 = "sha256-3T1BNc6g3SDTxb0VrronLUIp/CWbwnzXTsc8Qk5c4jY="; + rev = "925d86b7be3ccf21b17734cfececf40e43c4598e"; + sha256 = "sha256-N5lGJu4c03cVDk3WTcegzZHBDmguPEX8dCedJS2TMSI="; }; - patches = [ - # Fix build for Linux 5.18+. - # https://github.com/linux-apfs/linux-apfs-rw/pull/24 - (fetchpatch { - url = "https://github.com/linux-apfs/linux-apfs-rw/commit/93b93767acab614c4e6426c9fd38bdf9af00bc13.patch"; - sha256 = "1ss7cal851qadcmkn3jcckpa2f003nzb03xsx1g8vkb1cl0n8gi7"; - }) - ]; - hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; @@ -39,7 +29,7 @@ stdenv.mkDerivation { homepage = "https://github.com/linux-apfs/linux-apfs-rw"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = kernel.kernelOlder "4.9"; + broken = kernel.kernelOlder "4.9" || kernel.kernelAtLeast "5.19"; maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix index fd4164be34..ba34609389 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/autosuspend/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "languitar"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-UdHaz1JIofUrw9G/K40AVhBWdvMdTK4Wa7FWb6ntwr0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-aIWqE422xfAzAyF+4hARYOcomZHraTrtxtw2YfAxJ1M="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix index 4f19c29e1c..886bf3e6fe 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bbswitch/default.nix @@ -2,7 +2,7 @@ let baseName = "bbswitch"; - version = "0.8"; + version = "unstable-2021-11-29"; name = "${baseName}-${version}-${kernel.version}"; in @@ -13,18 +13,15 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "Bumblebee-Project"; repo = "bbswitch"; - rev = "v${version}"; - hash = "sha256-FHC8myKnouNDERVds2QCJj1ZstjHrOzFpb+FDiSBjL4="; + # https://github.com/Bumblebee-Project/bbswitch/tree/develop + rev = "23891174a80ea79c7720bcc7048a5c2bfcde5cd9"; + hash = "sha256-50v1Jxem5kaI1dHOKmgBbPLxI82QeYxiaRHhrHpWRzU="; }; patches = [ (fetchpatch { - url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch"; - sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; - }) - (fetchpatch { - url = "https://github.com/Bumblebee-Project/bbswitch/pull/196.patch"; - sha256 = "02ihy3piws7783qbm9q0mb9s18ipn5ckdy1iar74xn31qjrsn99n"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0bd986055ba52887b81048de5c61e618eec06eb0/trunk/0003-kernel-5.18.patch"; + sha256 = "sha256-va62/bR1qyBBMPg0lUwCH7slGG0XijxVCsFa4FCoHEQ="; }) ]; @@ -64,6 +61,5 @@ stdenv.mkDerivation { homepage = "https://github.com/Bumblebee-Project/bbswitch"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2Plus; - broken = kernel.kernelAtLeast "5.18"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix index 73edb3be9e..7c20b74e54 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/can-isotp/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation { nativeBuildInputs = kernel.moduleBuildDependencies; meta = with lib; { + broken = kernel.kernelAtLeast "5.16"; description = "Kernel module for ISO-TP (ISO 15765-2)"; homepage = "https://github.com/hartkopp/can-isotp"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix index af77264582..5475a565b0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/criu/default.nix @@ -1,20 +1,30 @@ -{ stdenv, lib, fetchurl, protobuf, protobufc, asciidoc, iptables -, xmlto, docbook_xsl, libpaper, libnl, libcap, libnet, pkg-config -, which, python3, makeWrapper, docbook_xml_dtd_45, perl }: +{ 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 }: stdenv.mkDerivation rec { pname = "criu"; - version = "3.15"; + version = "3.17.1"; - src = fetchurl { - url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2"; - sha256 = "09d0j24x0cyc7wkgi7cnxqgfjk7kbdlm79zxpj8d356sa3rw2z24"; + src = fetchFromGitHub { + owner = "checkpoint-restore"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0B0cdX5bemy4glF9iWjrQIXIqilyYcCcAN9x4Jjrwzk="; }; + patches = [ + # Fixes redefinition of rseq headers + (fetchpatch { + url = "https://github.com/checkpoint-restore/criu/commit/1e6e826ffb7ac05f33fa123051c2fc2ddf0f68ea.patch"; + hash = "sha256-LJjk0jQ5v5wqeprvBMpxhjLXn7v+lSPldEGgazGUM44="; + }) + ]; + enableParallelBuilding = true; nativeBuildInputs = [ pkg-config docbook_xsl which makeWrapper docbook_xml_dtd_45 python3 python3.pkgs.wrapPython perl ]; - buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet iptables ]; - propagatedBuildInputs = with python3.pkgs; [ python python3.pkgs.protobuf ]; + buildInputs = [ protobuf asciidoc xmlto libpaper libnl libcap libnet nftables libbsd ]; + propagatedBuildInputs = [ protobufc ] ++ (with python3.pkgs; [ python python3.pkgs.protobuf ]); postPatch = '' substituteInPlace ./Documentation/Makefile \ @@ -39,7 +49,8 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/criu \ - --prefix PATH : ${lib.makeBinPath [ iptables ]} + --set-default CR_IPTABLES ${iptables}/bin/iptables \ + --set-default CR_IP_TOOL ${iproute2}/bin/ip wrapPythonPrograms ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix index a699472275..ea69ecd751 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix @@ -1,20 +1,29 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , kernel }: stdenv.mkDerivation rec { pname = "dddvb"; - version = "0.9.38-pre.4"; + version = "0.9.38-pre.6"; src = fetchFromGitHub { owner = "DigitalDevices"; repo = "dddvb"; - rev = "e9ccab3578965234c0ea38c5b30969f33600561d"; - sha256 = "sha256-gOG+dAeQ++kTC5xaEpsr3emz3s6FXiKeCHmA9shYBJk="; + rev = "refs/tags/${version}"; + hash = "sha256-bt/vMnqRWDDChZ6R4JbCr77cz3nlSPkx6siC9KLSEqs="; }; + patches = [ + (fetchpatch { + # pci_*_dma_mask no longer exists in 5.18 + url = "https://github.com/DigitalDevices/dddvb/commit/871821d6a0be147313bb52570591ce3853b3d370.patch"; + hash = "sha256-wY05HrsduvsIdp/KpS9NWfL3hR9IvGjuNCDljFn7dd0="; + }) + ]; + postPatch = '' sed -i '/depmod/d' Makefile ''; @@ -35,6 +44,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; maintainers = with maintainers; [ hexa ]; platforms = platforms.linux; - broken = kernel.kernelAtLeast "5.18"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix index 785e59840d..d920e44d42 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix @@ -20,22 +20,22 @@ let in stdenv.mkDerivation rec { pname = "displaylink"; - version = "5.5.0-59.151"; + version = "5.6.0-59.176"; src = requireFile rec { - name = "displaylink-55.zip"; - sha256 = "0pswmczzrqqq0s0ksp6rfnkm693ligq4nblki1v53jdh0y7d1gff"; + name = "displaylink-56.zip"; + sha256 = "1v9s4ksr4mnl629n24si14g762b7knr00sqacz60mxcmy4mch5fa"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.5 + https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.6 Once you have downloaded the file, please use the following commands and re-run the installation: - mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.5-EXE.zip" \$PWD/${name} + mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu5.6-EXE.zip" \$PWD/${name} nix-prefetch-url file://\$PWD/${name} ''; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/facetimehd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/facetimehd/default.nix index 28abc20ea3..3bb656e8cb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/facetimehd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/facetimehd/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "facetimehd-${version}-${kernel.version}"; - version = "unstable-2020-04-16"; + version = "0.5.18"; # Note: When updating this revision: # 1. Also update pkgs/os-specific/linux/firmware/facetimehd-firmware/ @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { # still works. src = fetchFromGitHub { owner = "patjak"; - repo = "bcwc_pcie"; - rev = "82626d4892eeb9eb704538bf0dc49a00725ff451"; - sha256 = "118z6vjvhhcwvs4n3sgwwdagys9w718b8nkh6l9ic93732vv7cqx"; + repo = "facetimehd"; + rev = version; + sha256 = "sha256-UO8t2zrfdJlu4uzhhyWOuHIjJNVezIq3nUPGZeW/KJU="; }; preConfigure = '' @@ -39,6 +39,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ womfoo grahamc kraem ]; platforms = [ "i686-linux" "x86_64-linux" ]; - broken = kernel.kernelAtLeast "5.18"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix index bd9f0d2474..56001cb225 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "fwupd-efi"; - version = "1.2"; + version = "1.3"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/${pname}-${version}.tar.xz"; - sha256 = "sha256-aRx38RwhAQSNjauvY8bQ/iLPrQ5dQyIEHJurzrr86z8="; + sha256 = "sha256-1Ys04TwhWYZ8ORJgr04kGO6/lI1I36sC6kcrVoP/r1k="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index 8f3a2381dc..c136f935e0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,33 +1,33 @@ diff --git a/data/meson.build b/data/meson.build -index 9176aa34..1a0298a9 100644 +index d8494020d..7c896fa0d 100644 --- a/data/meson.build +++ b/data/meson.build @@ -26,7 +26,7 @@ endif if build_standalone install_data(['daemon.conf'], -- install_dir : join_paths(sysconfdir, 'fwupd') -+ install_dir : join_paths(sysconfdir_install, 'fwupd') +- install_dir: join_paths(sysconfdir, 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'fwupd') ) - install_data(['power.quirk', 'cfi.quirk'], - install_dir: join_paths(datadir, 'fwupd', 'quirks.d')) + plugin_quirks += join_paths(meson.current_source_dir(), 'power.quirk') + plugin_quirks += join_paths(meson.current_source_dir(), 'cfi.quirk') diff --git a/data/pki/meson.build b/data/pki/meson.build -index 499b7201..1be13607 100644 +index 3649fecea..c3462744b 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build @@ -12,13 +12,13 @@ install_data([ 'GPG-KEY-Linux-Foundation-Firmware', 'GPG-KEY-Linux-Vendor-Firmware-Service', ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') +- install_dir: join_paths(sysconfdir, 'pki', 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd') ) install_data([ 'GPG-KEY-Linux-Foundation-Metadata', 'GPG-KEY-Linux-Vendor-Firmware-Service', ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') +- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata') ++ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') ) endif @@ -35,32 +35,32 @@ index 499b7201..1be13607 100644 install_data([ 'LVFS-CA.pem', ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') +- install_dir: join_paths(sysconfdir, 'pki', 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd') ) install_data([ 'LVFS-CA.pem', ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') +- install_dir: join_paths(sysconfdir, 'pki', 'fwupd-metadata') ++ install_dir: join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') ) endif diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build -index 87e794b1..ebeeeca7 100644 +index 1d1698a7e..5469d00a6 100644 --- a/data/remotes.d/meson.build +++ b/data/remotes.d/meson.build @@ -2,7 +2,7 @@ if build_standalone and get_option('lvfs') != 'false' install_data([ 'lvfs-testing.conf', ], -- install_dir : join_paths(sysconfdir, 'fwupd', 'remotes.d') -+ install_dir : join_paths(sysconfdir_install, 'fwupd', 'remotes.d') +- install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d') ++ install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d') ) con3 = configuration_data() if get_option('lvfs') == 'disabled' @@ -15,7 +15,7 @@ if build_standalone and get_option('lvfs') != 'false' - output : 'lvfs.conf', - configuration : con3, + output: 'lvfs.conf', + configuration: con3, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), @@ -68,22 +68,22 @@ index 87e794b1..ebeeeca7 100644 i18n.merge_file( input: 'lvfs.metainfo.xml', @@ -49,12 +49,12 @@ configure_file( - output : 'vendor.conf', - configuration : con2, + output: 'vendor.conf', + configuration: con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) configure_file( - input : 'vendor-directory.conf', - output : 'vendor-directory.conf', - configuration : con2, + input: 'vendor-directory.conf', + output: 'vendor-directory.conf', + configuration: con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b91dd037..a8de7810 100644 +index e6b717078..f8a7a7455 100644 --- a/meson.build +++ b/meson.build @@ -195,6 +195,12 @@ endif @@ -97,10 +97,10 @@ index b91dd037..a8de7810 100644 +endif + diffcmd = find_program('diff') - gio = dependency('gio-2.0', version : '>= 2.45.8') - giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false) + gio = dependency('gio-2.0', version: '>= 2.45.8') + giounix = dependency('gio-unix-2.0', version: '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index d00038db..c84652ca 100644 +index 06d242371..d9e517fc0 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ @@ -109,75 +109,75 @@ index d00038db..c84652ca 100644 option('consolekit', type : 'feature', description : 'ConsoleKit support', deprecated: {'true': 'enabled', 'false': 'disabled'}) option('static_analysis', type : 'boolean', value : false, description : 'enable GCC static analysis support') diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build -index 00b7ecda..789f34ca 100644 +index 67bd3b9d9..ad04a91b6 100644 --- a/plugins/dell-esrt/meson.build +++ b/plugins/dell-esrt/meson.build @@ -38,6 +38,6 @@ configure_file( - output : 'dell-esrt.conf', - configuration : con2, + output: 'dell-esrt.conf', + configuration: con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) endif diff --git a/plugins/msr/meson.build b/plugins/msr/meson.build -index 1a278375..f57ae530 100644 +index 13f03ccd4..9235ebe33 100644 --- a/plugins/msr/meson.build +++ b/plugins/msr/meson.build -@@ -12,7 +12,7 @@ install_data(['fwupd-msr.conf'], +@@ -10,7 +10,7 @@ install_data(['fwupd-msr.conf'], endif install_data(['msr.conf'], -- install_dir: join_paths(sysconfdir, 'fwupd') -+ install_dir: join_paths(sysconfdir_install, 'fwupd') +- install_dir: join_paths(sysconfdir, 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'fwupd') ) shared_module('fu_plugin_msr', fu_hash, diff --git a/plugins/redfish/meson.build b/plugins/redfish/meson.build -index 8717d50f..9a703723 100644 +index 95606e478..e5355e520 100644 --- a/plugins/redfish/meson.build +++ b/plugins/redfish/meson.build -@@ -51,7 +51,7 @@ shared_module('fu_plugin_redfish', +@@ -43,7 +43,7 @@ shared_module('fu_plugin_redfish', ) install_data(['redfish.conf'], -- install_dir: join_paths(sysconfdir, 'fwupd'), -+ install_dir: join_paths(sysconfdir_install, 'fwupd'), +- install_dir: join_paths(sysconfdir, 'fwupd'), ++ install_dir: join_paths(sysconfdir_install, 'fwupd'), ) if get_option('tests') diff --git a/plugins/thunderbolt/meson.build b/plugins/thunderbolt/meson.build -index aa6c8ce1..61734c4d 100644 +index 5f8ffbf90..9ba323e75 100644 --- a/plugins/thunderbolt/meson.build +++ b/plugins/thunderbolt/meson.build -@@ -35,7 +35,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', +@@ -32,7 +32,7 @@ fu_plugin_thunderbolt = shared_module('fu_plugin_thunderbolt', ) install_data(['thunderbolt.conf'], -- install_dir: join_paths(sysconfdir, 'fwupd') -+ install_dir: join_paths(sysconfdir_install, 'fwupd') +- install_dir: join_paths(sysconfdir, 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'fwupd') ) # we use functions from 2.52 in the tests if get_option('tests') and run_sanitize_unsafe_tests and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi-capsule/meson.build b/plugins/uefi-capsule/meson.build -index 2d9ba819..0feb5f6b 100644 +index ef38dc03e..78ff65e1d 100644 --- a/plugins/uefi-capsule/meson.build +++ b/plugins/uefi-capsule/meson.build -@@ -21,7 +21,7 @@ if host_machine.system() == 'linux' - output : '35_fwupd', - configuration : con2, +@@ -20,7 +20,7 @@ if host_machine.system() == 'linux' + output: '35_fwupd', + configuration: con2, install: true, - install_dir: join_paths(sysconfdir, 'grub.d') + install_dir: join_paths(sysconfdir_install, 'grub.d') ) elif host_machine.system() == 'freebsd' backend_srcs += 'fu-uefi-backend-freebsd.c' -@@ -112,7 +112,7 @@ if get_option('compat_cli') and get_option('man') +@@ -110,7 +110,7 @@ if get_option('compat_cli') and get_option('man') endif install_data(['uefi_capsule.conf'], -- install_dir: join_paths(sysconfdir, 'fwupd') -+ install_dir: join_paths(sysconfdir_install, 'fwupd') +- install_dir: join_paths(sysconfdir, 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'fwupd') ) # add all the .po files as inputs to watch diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix index 94a5c2ac03..541bef93a8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -4,7 +4,7 @@ , lib , fetchurl , fetchFromGitHub -, gtk-doc +, gi-docgen , pkg-config , gobject-introspection , gettext @@ -17,7 +17,6 @@ , libarchive , curl , libjcat -, libxslt , elfutils , libsmbios , efivar @@ -25,14 +24,12 @@ , meson , libuuid , colord -, docbook_xml_dtd_43 -, docbook-xsl-nons , ninja , gcab , gnutls , protobufc , python3 -, wrapGAppsHook +, wrapGAppsNoGuiHook , json-glib , bash-completion , shared-mime-info @@ -117,7 +114,7 @@ let self = stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.8.1"; + version = "1.8.3"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -126,7 +123,7 @@ let src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "sha256-V1ZGZELrkTT7QM3IpG+eAQAyR8jqyC+l2LFvZCA3W3k="; + sha256 = "sha256-ciIpd86KhmJRH/o8CIFWb2xFjsjWHSUNlGYRfWEiOOw="; }; patches = [ @@ -152,7 +149,7 @@ let nativeBuildInputs = [ meson ninja - gtk-doc + gi-docgen pkg-config gobject-introspection gettext @@ -160,12 +157,9 @@ let valgrind gcab gnutls - docbook_xml_dtd_43 - docbook-xsl-nons - libxslt protobufc # for protoc python - wrapGAppsHook + wrapGAppsNoGuiHook vala ]; @@ -201,7 +195,7 @@ let ]; mesonFlags = [ - "-Ddocs=gtkdoc" + "-Ddocs=enabled" "-Dplugin_dummy=true" # We are building the official releases. "-Dsupported_build=enabled" @@ -216,6 +210,8 @@ let "-Dsysconfdir_install=${placeholder "out"}/etc" "-Defi_os_dir=nixos" "-Dplugin_modem_manager=enabled" + # Requires Meson 0.63 + "-Dgresource_quirks=disabled" # We do not want to place the daemon into lib (cyclic reference) "--libexecdir=${placeholder "out"}/libexec" @@ -261,10 +257,20 @@ let meson_post_install.sh \ po/test-deps + # This checks a version of a dependency of gi-docgen but gi-docgen is self-contained in Nixpkgs. + echo "Clearing docs/test-deps.py" + test -f docs/test-deps.py + echo > docs/test-deps.py + substituteInPlace data/installed-tests/fwupdmgr-p2p.sh \ --replace "gdbus" ${glib.bin}/bin/gdbus ''; + preBuild = '' + # jcat-tool at buildtime requires a home directory + export HOME="$(mktemp -d)" + ''; + preCheck = '' addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" ''; @@ -298,8 +304,8 @@ let ) ''; - # Since we had to disable wrapGAppsHook, we need to wrap the executables manually. postFixup = '' + # Since we had to disable wrapGAppsHook, we need to wrap the executables manually. find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ | while IFS= read -r -d ''' file; do if [[ "$file" != *.efi ]]; then @@ -307,6 +313,9 @@ let wrapGApp "$file" fi done + + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. + moveToOutput "share/doc" "$devdoc" ''; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch index c67665f212..f3369b6e13 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch @@ -4,11 +4,11 @@ index 1afa28e1..3da81d30 100644 +++ b/libfwupdplugin/meson.build @@ -220,7 +220,8 @@ fwupdplugin = library( ], - link_args : cc.get_supported_link_arguments([vflag]), - link_depends : fwupdplugin_mapfile, -- install : true -+ install : true, -+ install_dir : bindir / '..' / 'lib', + link_args: cc.get_supported_link_arguments([vflag]), + link_depends: fwupdplugin_mapfile, +- install: true ++ install: true, ++ install_dir: bindir / '..' / 'lib', ) fwupdplugin_pkgg = import('pkgconfig') @@ -16,9 +16,9 @@ index 1afa28e1..3da81d30 100644 girtargets, fwupd_gir[0], ], -- install : true -+ install : true, -+ install_dir_typelib : bindir / '..' / 'lib' / 'girepository-1.0', +- install: true ++ install: true, ++ install_dir_typelib: bindir / '..' / 'lib' / 'girepository-1.0', ) # Verify the map file is correct -- note we can't actually use the generated diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index 7192fbac47..b15f4c4949 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "sof-firmware"; - version = "2.1.1"; + version = "2.2"; src = fetchFromGitHub { owner = "thesofproject"; repo = "sof-bin"; rev = "v${version}"; - sha256 = "sha256-/OYYfIJWMT+rBBhSCtHaSWvwRMlReEQ5y4FuMfk5zUg="; + sha256 = "sha256-/gjGTDOXJ0vz/MH2hlistS3X3Euqf8T6TLnD1A2SBYo="; }; dontFixup = true; # binaries must not be stripped or patchelfed diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix index a1f355a849..b925615854 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hd-idle/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hd-idle"; - version = "1.16"; + version = "1.17"; src = fetchFromGitHub { owner = "adelolmo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-LZcMwF/BhHiWWXMcrzbk8GyvwXdA3B2olmbOBxQwV5g="; + sha256 = "sha256-BHUjKvhUDeD/Xm0KKbkLH2XWn1W77E7Pm3OSPARF6Xw="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hid-ite8291r3/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hid-ite8291r3/default.nix new file mode 100644 index 0000000000..d4f69c734a --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hid-ite8291r3/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + pname = "hid-ite8291r3"; + version = "unstable-2022-06-01"; + + src = fetchFromGitHub { + owner = "pobrn"; + repo = "hid-ite8291r3"; + rev = "48e04cb96517f8574225ebabb286775feb942ef5"; + hash = "sha256-/69vvVbAVULDW8rwDYSj5706vrqJ6t4s/T6s3vmG9wk="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "VERSION=${version}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + runHook preInstall + install -D hid-ite8291r3.ko -t $out/lib/modules/${kernel.modDirVersion}/extra + runHook postInstall + ''; + + meta = with lib; { + description = "Linux driver for the ITE 8291 RGB keyboard backlight controller"; + homepage = "https://github.com/pobrn/hid-ite8291r3/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ aacebedo ]; + platforms = platforms.linux; + broken = kernel.kernelOlder "5.9"; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/intel-cmt-cat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/intel-cmt-cat/default.nix index af194d9dc1..669f79fab4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/intel-cmt-cat/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/intel-cmt-cat/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "4.3.0"; + version = "4.4.0"; pname = "intel-cmt-cat"; src = fetchFromGitHub { owner = "intel"; repo = "intel-cmt-cat"; rev = "v${version}"; - sha256 = "sha256-9XZuSHWcAFN5otBfG8xE4gTIDixw7mYnHT/CTjyOvwo="; + sha256 = "sha256-THP0ie9Ta0iNcAJYCRXMajqYBIFuT67kGMDakL4vIZc="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix index b11be3f273..d09b5f38f9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/irqbalance/default.nix @@ -2,27 +2,16 @@ stdenv.mkDerivation rec { pname = "irqbalance"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "irqbalance"; repo = "irqbalance"; rev = "v${version}"; - sha256 = "sha256-K+Nv6HqBZb0pwfNV127QDq+suaUD7TTV413S6j8NdUU="; + sha256 = "sha256-OifGlOUT/zFz5gussEmLL24w4AovGeyNfbg/yCfzerw="; }; - patches = [ - # pull pending upstream inclusion fix for ncurses-6.3: - # https://github.com/Irqbalance/irqbalance/pull/194 - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/Irqbalance/irqbalance/commit/f8bdd0e64284d841544fd3ebe22f4652902ba8d2.patch"; - sha256 = "sha256-QJIXr8BiKmn/81suuhNJsBRhY2as19/e480lsp2wd6g="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ glib ncurses libcap_ng ]; LDFLAGS = "-lncurses"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ithc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ithc/default.nix new file mode 100644 index 0000000000..69b202e7e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ithc/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + pname = "ithc"; + version = "unstable-2022-06-07"; + + src = fetchFromGitHub { + owner = "quo"; + repo = "ithc-linux"; + rev = "5af2a2213d2f3d944b19ec7ccdb96f16d56adddb"; + hash = "sha256-p4TooWUOWPfNdePE18ESmRJezPDAl9nLb55LQtkJiSg="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "VERSION=${version}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + postPatch = '' + sed -i ./Makefile -e '/depmod/d' + ''; + + installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; + + meta = with lib; { + description = "Linux driver for Intel Touch Host Controller"; + homepage = "https://github.com/quo/ithc-linux"; + license = licenses.publicDomain; + maintainers = with maintainers; [ aacebedo ]; + platforms = platforms.linux; + broken = kernel.kernelOlder "5.9"; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 708d63ed4c..a859d7eea4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -852,6 +852,8 @@ let MOUSE_PS2_VMMOUSE = yes; MTRR_SANITIZER = yes; NET_FC = yes; # Fibre Channel driver support + # Needed for touchpads to work on some AMD laptops + PINCTRL_AMD = whenAtLeast "5.19" yes; # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks PINCTRL_BAYTRAIL = yes; # GPIO for Braswell and Cherryview devices @@ -917,7 +919,7 @@ let FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes); - ASHMEM = { optional = true; tristate = whenAtLeast "5.0" "y";}; + ASHMEM = { optional = true; tristate = whenBetween "5.0" "5.18" "y";}; ANDROID = { optional = true; tristate = whenAtLeast "5.0" "y";}; ANDROID_BINDER_IPC = { optional = true; tristate = whenAtLeast "5.0" "y";}; ANDROID_BINDERFS = { optional = true; tristate = whenAtLeast "5.0" "y";}; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix index bca6554ca2..056544014f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/generic.nix @@ -6,6 +6,7 @@ , gmp ? null , libmpc ? null , mpfr ? null +, pahole , lib , stdenv @@ -124,7 +125,8 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ perl gmp libmpc mpfr ] - ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ]; + ++ lib.optionals (lib.versionAtLeast version "4.16") [ bison flex ] + ++ lib.optional (lib.versionAtLeast version "5.2") pahole; platformName = stdenv.hostPlatform.linux-kernel.name; # e.g. "defconfig" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index 0e00eac0ba..798d89102e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -2,61 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.288-hardened1.patch", - "sha256": "0d592ppnd1bw375zyrfj92kg0k60knbq6g1lpawx7xhflklrlcfw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.288-hardened1/linux-hardened-4.14.288-hardened1.patch" + "name": "linux-hardened-4.14.290-hardened1.patch", + "sha256": "14bnps4y5k2aa0fd2g4bdbiir1w7xfrvgsqd3cfzni8zhf4xrw0l", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.290-hardened1/linux-hardened-4.14.290-hardened1.patch" }, - "sha256": "0yyzxyz66mfngx3ll3pl43413xb67iyxddzh3lpzqcfg7d0rxfwz", - "version": "4.14.288" + "sha256": "0zyxb99a7fa2l85vnzmvg2nry99clj20d4j38piqm921iqxak2j4", + "version": "4.14.290" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.252-hardened1.patch", - "sha256": "04jrv10z1kjqlnb58wmc3765xdpp8lm59vyhi94kbra3krzq7yax", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.252-hardened1/linux-hardened-4.19.252-hardened1.patch" + "name": "linux-hardened-4.19.254-hardened1.patch", + "sha256": "0c8mlpykk3j3zmh2fszyc0xnyqdfqf02nna5fq018179pmsglbnk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.254-hardened1/linux-hardened-4.19.254-hardened1.patch" }, - "sha256": "0ac7k6x9h8gqi37n8d4fyi52h4cmzyy8f5vfv1aiihww4kvzca7v", - "version": "4.19.252" + "sha256": "1rd40wmdaymbly2zvf60mjqsflkd4n1y232qz0ixn1rfl28yz62i", + "version": "4.19.254" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.130-hardened1.patch", - "sha256": "13wf4khc1nqljrvmc283145j6wxcd22qvqg8gwrjndqxlb5qb5bl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.130-hardened1/linux-hardened-5.10.130-hardened1.patch" + "name": "linux-hardened-5.10.134-hardened1.patch", + "sha256": "0d6ygrsssbww9aqy55q1zxq2b1y9lwnz0j8xfqpya3c3hll1951a", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.134-hardened1/linux-hardened-5.10.134-hardened1.patch" }, - "sha256": "0b4nm96yvkb9r5rkwlq9vsmllzqvvffdnpyl8dvrgqm8a7caci71", - "version": "5.10.130" + "sha256": "0s9j4zzck9880kvyb18i2ng6dc16p0dwsi95mkwdhg83vyn16dgc", + "version": "5.10.134" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.54-hardened1.patch", - "sha256": "1zk6lgm9hg4m7pp16l8dhdv4pf0c1x94sfaah1ppjlq8i64704hd", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.54-hardened1/linux-hardened-5.15.54-hardened1.patch" + "name": "linux-hardened-5.15.58-hardened1.patch", + "sha256": "1c2friimfzi5i0x76z66wdgkfafly1rhpy8zzs7li3s79d22138k", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.58-hardened1/linux-hardened-5.15.58-hardened1.patch" }, - "sha256": "0kffavh9mbycqljacmvjd04nfrl4r4v8i0zgvq49qgm7n25m8ksr", - "version": "5.15.54" + "sha256": "1a2gzjfymfafvk8cvibr1zdfydzxg0c5j772c9hqwcabkibxjnyp", + "version": "5.15.58" }, "5.18": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.18.11-hardened1.patch", - "sha256": "19g8w933srq3p3zsi38j26cda5a43lzkhhla4pcbd54kmvwjyyjl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.11-hardened1/linux-hardened-5.18.11-hardened1.patch" + "name": "linux-hardened-5.18.15-hardened1.patch", + "sha256": "0ir6k4d9mx4skyhxjin2hn237kl3qh6cl0kmjqkqyxkm83k12kln", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.15-hardened1/linux-hardened-5.18.15-hardened1.patch" }, - "sha256": "1bqm32nqas1dvcx5b0qh3cshh3gcmpl8wbkn4adhgxw2lxa8w3g2", - "version": "5.18.11" + "sha256": "0g5yvhq7rmkzvfl4w50l7bg56a20insvg4s4nvgnk2iqvkmlz039", + "version": "5.18.15" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.205-hardened1.patch", - "sha256": "074jyvxmk8fhskndxhc80ibprnh1h2f5z16i7b2pp3723dlm5p5l", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.205-hardened1/linux-hardened-5.4.205-hardened1.patch" + "name": "linux-hardened-5.4.208-hardened1.patch", + "sha256": "0pknl9ac0qn8yig1hfm3hmlmvf5pxswymyilv0w3kcsacgg22xyi", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.208-hardened1/linux-hardened-5.4.208-hardened1.patch" }, - "sha256": "1m8ms5nizw3iimhw61kr11a09b6h8cfi8az3wwg4mcpb0k58lqrp", - "version": "5.4.205" + "sha256": "0i0fxv04r6g5ha84chih5cqsy59cv67pjxp8zfrdk1qapwddyvgh", + "version": "5.4.208" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix index ce7ea63f0a..4e42288aff 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/htmldocs.nix @@ -15,7 +15,8 @@ let packageOverrides = final: prev: rec { docutils_old = prev.docutils.overridePythonAttrs (oldAttrs: rec { version = "0.16"; - src = oldAttrs.src.override { + src = final.fetchPypi { + pname = "docutils"; inherit version; sha256 = "sha256-wt46YOnn0Hvia38rAMoDCcIH4GwQD5zCqUkx/HWkePw="; }; @@ -30,7 +31,7 @@ let doCheck = false; }; - sphinx_rtd_theme = prev.sphinx_rtd_theme.override { + sphinx-rtd-theme = prev.sphinx-rtd-theme.override { inherit sphinx; docutils = docutils_old; }; @@ -58,7 +59,7 @@ stdenv.mkDerivation { imagemagick perl py.pkgs.sphinx - py.pkgs.sphinx_rtd_theme + py.pkgs.sphinx-rtd-theme which ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 8220a15234..018ec0e8a9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.288"; + version = "4.14.290"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0yyzxyz66mfngx3ll3pl43413xb67iyxddzh3lpzqcfg7d0rxfwz"; + sha256 = "0zyxb99a7fa2l85vnzmvg2nry99clj20d4j38piqm921iqxak2j4"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index c3906f10eb..afa8423d57 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.252"; + version = "4.19.254"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0ac7k6x9h8gqi37n8d4fyi52h4cmzyy8f5vfv1aiihww4kvzca7v"; + sha256 = "1rd40wmdaymbly2zvf60mjqsflkd4n1y232qz0ixn1rfl28yz62i"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index ea49282823..3fb588d3cb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.323"; + version = "4.9.325"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1h96ai9w5q2axhliw85aymdsg8py9y6gl8big5r2gwkbls6h7pa3"; + sha256 = "04msx0x0d8v93zjr3jj0qqkgg7m4hb7rj6hk5vzrzasmgbjmb3dl"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 495a6ff8b5..a7184b37f4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.131"; + version = "5.10.135"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b"; + sha256 = "0i1kahv739qpyyml7d7sx306nv7gp55i5d97vlb0fryfx4dsd6g4"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix index 9735868b14..e6e3ca260e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.55"; + version = "5.15.59"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1k7x7fp675wglfd357n7hjidnm3j8zj3gcymyazg6fkcid8bvxhy"; + sha256 = "1jxw6fnc7yaw7r6193wy6l8wdlpy3frw48drnc3dnh3k0m1cdpg6"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.18.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.18.nix index 2ad48c7afc..edfdb85950 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.18.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.18.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.18.12"; + version = "5.18.16"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "09wmgfrnv1df6jg9v3svwhvnxl0j6h4f240p903xlmgj884lvds0"; + sha256 = "1khi1npn8d8jimwdy8bf3r7l780mxdmvk5azdv419pk33qjqdxgi"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.19.nix new file mode 100644 index 0000000000..5c622c24a5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.19.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.19"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1a05a3hw4w3k530mxhns96xw7hag743xw5w967yazqcykdbhq97z"; + }; +} // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 5fd398d111..e727097c02 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.206"; + version = "5.4.209"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1asvc7y1f938icspxx39n6y6r0w9mp0k9vik84rsx1hzzv0db41c"; + sha256 = "1kdnz99k7zspzaxqaxahbf6hncigy4cvjlb79jsy7a95qxxr31qf"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index a1eb20eaae..389bae7335 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18825"; - sha256 = "0gqmdlcxq3ws3mafbf47j40vrrfr5966nily6l7gj8hq2j0016cj"; + rev = "18837"; + sha256 = "0645lkbh5bi9a8nhdyh21h7rrw8x8pmb7la08zn7gpkmwvk3wnwx"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index 0754ff335b..0ed4c48047 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15-rc6"; + version = "5.19-rc5"; 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"; - sha256 = "1lp3jqwsbd97k3bx4crs8rc2wssyaf0v8x4kl4zv7g7ww2kkg2ii"; + sha256 = "sha256-eqBbQBZaqexgx6m3jAoU/0HWAdHbAuT3slZWMZhrht0="; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix index 910541f0ba..377f7fc1c0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,6 +1,5 @@ { lib, buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio, elfutils, zstd, python3Minimal, zlib, pahole -, writeTextFile }: let @@ -61,17 +60,12 @@ let ++ optional (lib.versionAtLeast version "5.13") zstd; - installkernel = writeTextFile { name = "installkernel"; executable=true; text = '' - #!${stdenv.shell} -e + installkernel = buildPackages.writeShellScript "installkernel" '' + set -e mkdir -p $4 cp -av $2 $4 cp -av $3 $4 - ''; }; - - commonMakeFlags = [ - "O=$(buildRoot)" - ] ++ lib.optionals (stdenv.hostPlatform.linux-kernel ? makeFlags) - stdenv.hostPlatform.linux-kernel.makeFlags; + ''; drvAttrs = config_: kernelConf: kernelPatches: configfile: let @@ -114,7 +108,8 @@ let patches = map (p: p.patch) kernelPatches # Required for deterministic builds along with some postPatch magic. - ++ optional (lib.versionAtLeast version "4.13") ./randstruct-provide-seed.patch + ++ optional (lib.versionAtLeast version "4.13" && 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; @@ -334,13 +329,15 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat hardeningDisable = [ "bindnow" "format" "fortify" "stackprotector" "pic" "pie" ]; # Absolute paths for compilers avoid any PATH-clobbering issues. - makeFlags = commonMakeFlags ++ [ + makeFlags = [ + "O=$(buildRoot)" "CC=${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc" "HOSTCC=${buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" "ARCH=${stdenv.hostPlatform.linuxArch}" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" - ] ++ extraMakeFlags; + ] ++ (stdenv.hostPlatform.linux-kernel.makeFlags or []) + ++ extraMakeFlags; karch = stdenv.hostPlatform.linuxArch; } // (optionalAttrs (pos != null) { inherit pos; })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/randstruct-provide-seed-5.19.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/randstruct-provide-seed-5.19.patch new file mode 100644 index 0000000000..5ca897a76b --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/randstruct-provide-seed-5.19.patch @@ -0,0 +1,13 @@ +diff --git a/scripts/gen-randstruct-seed.sh b/scripts/gen-randstruct-seed.sh +index 61017b36c464..7bb494dd2e18 100755 +--- a/scripts/gen-randstruct-seed.sh ++++ b/scripts/gen-randstruct-seed.sh +@@ -1,7 +1,7 @@ + #!/bin/sh + # SPDX-License-Identifier: GPL-2.0 + +-SEED=$(od -A n -t x8 -N 32 /dev/urandom | tr -d ' \n') ++SEED="NIXOS_RANDSTRUCT_SEED" + echo "$SEED" > "$1" + HASH=$(echo -n "$SEED" | sha256sum | cut -d" " -f1) + echo "#define RANDSTRUCT_HASHED_SEED \"$HASH\"" > "$2" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 33ddc3f6b6..cca6a8d1cf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -1,19 +1,23 @@ { lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - stableVariant = { - version = "5.15.53"; - suffix = "xanmod1"; - hash = "sha256-mLgzaXG6QaJ0hfzfNlLbAEldxHK6iHuMVUv6p8zqRBo="; + ltsVariant = { + version = "5.15.54"; + hash = "sha256-0Odo+ZrQok3MMPl/512F8kIQ31mGZH6e9FyVVpXrYf0="; }; edgeVariant = { - version = "5.18.10"; - suffix = "xanmod1"; - hash = "sha256-RtvrJujd854bKf1YPiPavTh9oplpFN9ykr624K17vKE="; + version = "5.18.11"; + hash = "sha256-UPLwaEWhBu1yriCUJu9L/B8yy+1zxnTQzHaKlT507UY="; }; - xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { + ttVariant = { + version = "5.15.54"; + suffix = "xanmod1-tt"; + hash = "sha256-4ck9PAFuIt/TxA/U+moGlVfCudJnzSuAw7ooFG3OJis="; + }; + + xanmodKernelFor = { version, suffix ? "xanmod1", hash }: buildLinux (args // rec { inherit version; modDirVersion = "${version}-${suffix}"; @@ -24,51 +28,45 @@ let inherit hash; }; - structuredExtraConfig = - with lib.kernel; - with (lib.kernel.whenHelpers version); - { - # TODO: remove this once https://github.com/NixOS/nixpkgs/pull/175433 is in master - WERROR = no; + structuredExtraConfig = with lib.kernel; { + # removed options + CFS_BANDWIDTH = lib.mkForce (option no); + RT_GROUP_SCHED = lib.mkForce (option no); + SCHED_AUTOGROUP = lib.mkForce (option no); - # removed options - CFS_BANDWIDTH = lib.mkForce (option no); - RT_GROUP_SCHED = lib.mkForce (option no); - SCHED_AUTOGROUP = lib.mkForce (option no); + # AMD P-state driver + X86_AMD_PSTATE = yes; - # AMD P-state driver - X86_AMD_PSTATE = yes; + # Paragon's NTFS3 driver + NTFS3_FS = module; + NTFS3_LZX_XPRESS = yes; + NTFS3_FS_POSIX_ACL = yes; - # Paragon's NTFS3 driver - NTFS3_FS = module; - NTFS3_LZX_XPRESS = yes; - NTFS3_FS_POSIX_ACL = yes; + # Preemptive Full Tickless Kernel at 500Hz + SCHED_CORE = lib.mkForce (option no); + PREEMPT_VOLUNTARY = lib.mkForce no; + PREEMPT = lib.mkForce yes; + NO_HZ_FULL = yes; + HZ_500 = yes; - # Preemptive Full Tickless Kernel at 500Hz - SCHED_CORE = lib.mkForce (option no); - PREEMPT_VOLUNTARY = lib.mkForce no; - PREEMPT = lib.mkForce yes; - NO_HZ_FULL = yes; - HZ_500 = yes; + # Google's BBRv2 TCP congestion Control + TCP_CONG_BBR2 = yes; + DEFAULT_BBR2 = yes; - # Google's BBRv2 TCP congestion Control - TCP_CONG_BBR2 = yes; - DEFAULT_BBR2 = yes; + # FQ-PIE Packet Scheduling + NET_SCH_DEFAULT = yes; + DEFAULT_FQ_PIE = yes; - # FQ-PIE Packet Scheduling - NET_SCH_DEFAULT = yes; - DEFAULT_FQ_PIE = yes; + # Graysky's additional CPU optimizations + CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes; - # Graysky's additional CPU optimizations - CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes; + # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. + FUTEX = yes; + FUTEX_PI = yes; - # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync. - FUTEX = yes; - FUTEX_PI = yes; - - # WineSync driver for fast kernel-backed Wine - WINESYNC = module; - }; + # WineSync driver for fast kernel-backed Wine + WINESYNC = module; + }; extraMeta = { branch = lib.versions.majorMinor version; @@ -79,6 +77,7 @@ let } // (args.argsOverride or { })); in { - stable = xanmodKernelFor stableVariant; + lts = xanmodKernelFor ltsVariant; edge = xanmodKernelFor edgeVariant; + tt = xanmodKernelFor ttVariant; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index aa9115d2b1..c4716e9b19 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "5.18.12"; #zen + version = "5.18.16"; #zen suffix = "zen1"; #zen - sha256 = "1h0qnwq967ncqv40msa94jlwqf9rw2kgrr4gwx6n8i6wn0dmxpbq"; #zen + sha256 = "016pkwjg6la2xkqrqyw6ragmpk4z6x4rqw8dbykx2l4fzb57w56g"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.18.12"; #lqx - suffix = "lqx1"; #lqx - sha256 = "0bxmscx7m9fp73brj6x3d2vk5fnys7a502vllsf8dg74k0g83781"; #lqx + version = "5.18.16"; #lqx + suffix = "lqx2"; #lqx + sha256 = "1mmqsv6qbm6ndbcwnk50z6z2iffgkcrndf81s2ycqngb076hq969"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { @@ -32,7 +32,7 @@ let extraMeta = { branch = lib.versions.majorMinor version + "/master"; - maintainers = with lib.maintainers; [ andresilva pedrohlc psydvl ]; + maintainers = with lib.maintainers; [ andresilva pedrohlc ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." + lib.optionalString isLqx " (Same as linux_zen but less aggressive release schedule)"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix index 0631e1da2b..6faa401ecc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kexec-tools/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, zlib }: +{ lib, stdenv, buildPackages, fetchurl, fetchpatch, zlib }: stdenv.mkDerivation rec { pname = "kexec-tools"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "qmPNbH3ZWwbOumJAp/3GeSeJytp1plXmcUmHF1IkJBs="; }; + patches = [ + # Use ELFv2 ABI on ppc64be + (fetchpatch { + url = "https://raw.githubusercontent.com/void-linux/void-packages/6c1192cbf166698932030c2e3de71db1885a572d/srcpkgs/kexec-tools/patches/ppc64-elfv2.patch"; + sha256 = "19wzfwb0azm932v0vhywv4221818qmlmvdfwpvvpfyw4hjsc2s1l"; + }) + ]; + hardeningDisable = [ "format" "pic" "relro" "pie" ]; # Prevent kexec-tools from using uname to detect target, which is wrong in diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch deleted file mode 100644 index 4d9931b03e..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/darwin.patch +++ /dev/null @@ -1,138 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 194e111..0a095b5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -80,8 +80,7 @@ EXTRA_DIST += libkmod/README \ - libkmod/COPYING testsuite/COPYING tools/COPYING COPYING - - libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \ -- -version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE) \ -- -Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym -+ -version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE) - libkmod_libkmod_la_DEPENDENCIES = \ - shared/libshared.la \ - ${top_srcdir}/libkmod/libkmod.sym -@@ -91,8 +90,7 @@ libkmod_libkmod_la_LIBADD = \ - - noinst_LTLIBRARIES += libkmod/libkmod-internal.la - libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES) --libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \ -- -Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym -+libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) - libkmod_libkmod_internal_la_DEPENDENCIES = $(libkmod_libkmod_la_DEPENDENCIES) - libkmod_libkmod_internal_la_LIBADD = $(libkmod_libkmod_la_LIBADD) - -diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c -index 889f264..6f0a285 100644 ---- a/libkmod/libkmod-module.c -+++ b/libkmod/libkmod-module.c -@@ -787,7 +787,11 @@ KMOD_EXPORT int kmod_module_remove_module(struct kmod_module *mod, - flags &= KMOD_REMOVE_FORCE; - flags |= KMOD_REMOVE_NOWAIT; - -+#if defined(__linux__) - err = delete_module(mod->name, flags); -+#else -+ err = -1; -+#endif - if (err != 0) { - err = -errno; - ERR(mod->ctx, "could not remove '%s': %m\n", mod->name); -@@ -879,7 +883,11 @@ KMOD_EXPORT int kmod_module_insert_module(struct kmod_module *mod, - } - size = kmod_file_get_size(mod->file); - -+#if defined(__linux__) - err = init_module(mem, size, args); -+#else -+ err = -1; -+#endif - init_finished: - if (err < 0) { - err = -errno; -diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c -index 429ffbd..17a3b9c 100644 ---- a/libkmod/libkmod-signature.c -+++ b/libkmod/libkmod-signature.c -@@ -17,7 +17,10 @@ - * License along with this library; if not, see . - */ - -+#if defined(__linux__) - #include -+#endif -+ - #include - #include - #include -diff --git a/shared/macro.h b/shared/macro.h -index 4fc5405..b5a2702 100644 ---- a/shared/macro.h -+++ b/shared/macro.h -@@ -53,6 +53,10 @@ - #define CONCATENATE(x, y) XCONCATENATE(x, y) - #define UNIQ(x) CONCATENATE(x, __COUNTER__) - -+#if !defined(__linux__) -+#define program_invocation_short_name getprogname() -+#endif -+ - /* Temporaries for importing index handling */ - #define NOFAIL(x) (x) - #define fatal(x...) do { } while (0) -diff --git a/shared/missing.h b/shared/missing.h -index 4c0d136..ad8ec0f 100644 ---- a/shared/missing.h -+++ b/shared/missing.h -@@ -45,6 +45,9 @@ static inline int finit_module(int fd, const char *uargs, int flags) - #endif - - #if !HAVE_DECL_BE32TOH -+ -+#if defined(__linux__) -+ - #include - #include - #if __BYTE_ORDER == __LITTLE_ENDIAN -@@ -52,4 +55,16 @@ static inline int finit_module(int fd, const char *uargs, int flags) - #else - #define be32toh(x) (x) - #endif -+ -+#elif defined(__APPLE__) -+ -+#include -+#define be32toh(x) OSSwapBigToHostInt32(x) -+ -+#else -+ -+#error No be32toh known for platform -+ -+#endif -+ - #endif -diff --git a/shared/util.c b/shared/util.c -index fd2028d..ecb0141 100644 ---- a/shared/util.c -+++ b/shared/util.c -@@ -367,7 +367,7 @@ char *path_make_absolute_cwd(const char *p) - if (path_is_absolute(p)) - return strdup(p); - -- cwd = get_current_dir_name(); -+ cwd = getcwd(NULL, 0); - if (!cwd) - return NULL; - ---- a/shared/util.h 2018-01-31 18:10:59.000000000 +0100 -+++ b/shared/util.h 2020-12-28 19:48:21.000000000 +0100 -@@ -7,6 +7,9 @@ - #include - #include - #include -+#ifdef __APPLE__ -+#include -+#endif - - #include - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix index a0b390b756..8023350463 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix @@ -3,6 +3,7 @@ , libxslt, xz, zstd, elf-header , withDevdoc ? stdenv.hostPlatform == stdenv.buildPlatform , withStatic ? stdenv.hostPlatform.isStatic +, gitUpdater }: let @@ -11,7 +12,7 @@ let in stdenv.mkDerivation rec { pname = "kmod"; - version = "29"; + version = "30"; # autogen.sh is missing from the release tarball, # and we need to run it to regenerate gtk_doc.make, @@ -20,7 +21,7 @@ in stdenv.mkDerivation rec { # https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/.gitignore?id=61a93a043aa52ad62a11ba940d4ba93cb3254e78 src = fetchzip { url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/snapshot/kmod-${version}.tar.gz"; - sha256 = "sha256-7O5VdBd8rBZdIERPE+2zkjj5POvSurwlV2EpWmkFUD0="; + sha256 = "sha256-/dih2LoqgRrAsVdHRwld28T8pXgqnzapnQhqkXnxbbc="; }; outputs = [ "out" "dev" "lib" ] ++ lib.optional withDevdoc "devdoc"; @@ -30,7 +31,7 @@ in stdenv.mkDerivation rec { docbook_xml_dtd_42 # for the man pages ] ++ lib.optionals withDevdoc [ docbook_xml_dtd_43 gtk-doc ]; - buildInputs = [ xz zstd ] ++ lib.optional stdenv.isDarwin elf-header; + buildInputs = [ xz zstd ]; preConfigure = '' ./autogen.sh @@ -45,7 +46,6 @@ in stdenv.mkDerivation rec { ] ++ lib.optional withStatic "--enable-static"; patches = [ ./module-dir.patch ] - ++ lib.optional stdenv.isDarwin ./darwin.patch ++ lib.optional withStatic ./enable-static.patch; postInstall = '' @@ -57,6 +57,13 @@ in stdenv.mkDerivation rec { ln -s bin $out/sbin ''; + passthru.updateScript = gitUpdater { + inherit pname version; + # No nicer place to find latest release. + url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Tools for loading and managing Linux kernel modules"; longDescription = '' @@ -69,7 +76,7 @@ in stdenv.mkDerivation rec { downloadPage = "https://www.kernel.org/pub/linux/utils/kernel/kmod/"; changelog = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/plain/NEWS?h=v${version}"; license = with licenses; [ lgpl21Plus gpl2Plus ]; # GPLv2+ for tools - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ artturin ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kvdo/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kvdo/default.nix index 3e0936cc8a..7e7c765bd8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kvdo/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kvdo/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "dm-vdo"; repo = "kvdo"; rev = version; - sha256 = "1xl7dwcqx00w1gbpb6vlkn8nchyfj1fsc8c06vgda0sgxp7qs5gn"; + hash = "sha256-4FYTFUIvGjea3bh2GbQYG7hSswVDdNS3S+jWQ9+inpg="; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix index e9b04ff641..2c15e3d49e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "libbpf"; repo = "libbpf"; rev = "v${version}"; - sha256 = "sha256-D2ASqSZFNShCdRCH8LDocLP/O4sME9nT73rk1KsJeJE="; + sha256 = "sha256-daVS+TErmDU8ksThOvcepg1A61iD8N8GIkC40cmc9/8="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix index 070a18f698..ebfe492f73 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libpsm2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libpsm2"; - version = "11.2.206"; + version = "11.2.229"; preConfigure= '' export UDEVDIR=$out/etc/udev @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "opa-psm2"; rev = "PSM2_${version}"; - sha256 = "sha256-HsM2OaoX+SdbIednX1MWw1M4kkkPwUs5Dm32q2H7Mg4="; + sha256 = "sha256-t3tZCxGmGMscDmeyCATLbHxU7jEJqAzxwPV0Z8pl2ko="; }; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix index 7fc577d0ab..c81949bf39 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libtraceevent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "libtraceevent"; - version = "1.6.1"; + version = "1.6.2"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git"; rev = "libtraceevent-${version}"; - sha256 = "sha256-Yt7W+ouEZ/pJEKyY2Cgh+mYG0qz0lOIou5JufAD9Zd0="; + sha256 = "sha256-iLy2rEKn0UJguRcY/W8RvUq7uX+snQojb/cXOmMsjwc="; }; # Don't build and install html documentation diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix index c4bec66298..3a973b9880 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libtracefs/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.4.1"; + version = "1.4.2"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "sha256-htif1Hty/AQkx6jALHUVMBF1wIpVwLmdINP8QUZmv/s="; + sha256 = "sha256-CmFzonPq91iLflolJaucpPWzb8MCgfuov/OQ6KUD3f4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix index a29fe923f6..e5e4e1dca8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/linux-wifi-hotspot/default.nix @@ -14,7 +14,15 @@ , iproute2 , flock , iptables -, gawk }: +, gawk +, coreutils +, gnugrep +, gnused +, kmod +, networkmanager +, procps +}: + stdenv.mkDerivation rec { pname = "linux-wifi-hotspot"; @@ -56,7 +64,21 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/create_ap \ --prefix PATH : ${lib.makeBinPath [ - hostapd getopt iw which dnsmasq iproute2 flock iptables gawk + coreutils + dnsmasq + flock + gawk + getopt + gnugrep + gnused + hostapd + iproute2 + iptables + iw + kmod + networkmanager + procps + which ]} wrapProgram $out/bin/wihotspot-gui \ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix index 0b522f2aef..b2fa105680 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lttng-modules/default.nix @@ -1,14 +1,41 @@ -{ lib, stdenv, fetchurl, kernel }: +{ lib, stdenv, fetchgit, fetchpatch, kernel }: stdenv.mkDerivation rec { pname = "lttng-modules-${kernel.version}"; - version = "2.13.2"; + version = "2.13.4"; - src = fetchurl { - url = "https://lttng.org/files/lttng-modules/lttng-modules-${version}.tar.bz2"; - sha256 = "sha256-39VH2QQcjFRa5be/7z8O8tnyUg1qtEGIyeqN5W1dKYo="; + src = fetchgit { + url = "https://git.lttng.org/lttng-modules.git"; + rev = "v${version}"; + hash = "sha256-J2Tr1vOiCAilmnf3attF3bz8Irn9IQ2QbapdXJ4MUSg="; }; + 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" ]; @@ -30,6 +57,5 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl21Only gpl2Only mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - broken = kernel.kernelAtLeast "5.18"; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix index 62f63a8c3a..18c23c46c1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lxc/default.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { ''; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix index 68bf035523..67e96289e2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { changelog = "https://linuxcontainers.org/lxcfs/news/"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 fpletz ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix index 002284e215..6bb2855719 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20220510"; + version = "20220809"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "sha256-x+8qyC7YP7co/7qLhaAtjMtyeANaZJ/r41iFl1Mut+M="; + hash = "sha256-vcuLQHAGr5uRkGWWIwA2WXLJadVNxfcPgjmNS82Logg="; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix index 7f9c72ad87..6d737ea6ba 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mmc-utils/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "mmc-utils"; - version = "unstable-2022-04-26"; + version = "unstable-2022-07-13"; src = fetchzip rec { url = "https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git/snapshot/mmc-utils-${passthru.rev}.tar.gz"; - passthru.rev = "b7e4d5a6ae9942d26a11de9b05ae7d52c0802802"; - sha256 = "D2QgntRsa6Y39nCkXQupXFbJR++JfBpMeEZE0Gv0btc="; + passthru.rev = "d7b343fd262880994f041ce2335442e7bd1071f5"; + sha256 = "cTF3xSNvZ1wifItPmflNFd+fpYArPRvinM7Cyg3JoeE="; }; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "prefix=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix index 8a04386a71..2286e86df7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/mwprocapture/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { ''; meta = { + broken = kernel.kernelAtLeast "5.16"; homepage = "http://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 95004f4479..ebbb596f91 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -20,7 +20,7 @@ origArgs=("$@") copyClosureFlags=() extraBuildFlags=() lockFlags=() -flakeFlags=() +flakeFlags=(--extra-experimental-features 'nix-command flakes') action= buildNix=1 fast= @@ -120,7 +120,6 @@ while [ "$#" -gt 0 ]; do ;; --flake) flake="$1" - flakeFlags=(--extra-experimental-features 'nix-command flakes') shift 1 ;; --no-flake) @@ -254,7 +253,7 @@ nixBuild() { nixFlakeBuild() { logVerbose "Building in flake mode." - if [[ -z "$buildHost" && -z "$targetHost" && "$action" != switch && "$action" != boot ]] + if [[ -z "$buildHost" && -z "$targetHost" && "$action" != switch && "$action" != boot && "$action" != test && "$action" != dry-activate ]] then runCmd nix "${flakeFlags[@]}" build "$@" readlink -f ./result diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nmon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nmon/default.nix index 9372018f5b..41c16f9f39 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nmon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nmon/default.nix @@ -13,8 +13,8 @@ stdenv.mkDerivation rec { dontUnpack = true; buildPhase = "${stdenv.cc.targetPrefix}cc -o nmon ${src} -g -O2 -D JFS -D GETUSER -Wall -D LARGEMEM -lncurses -lm -g -D ${ with stdenv.targetPlatform; - if isx86_32 || isx86_64 then "X86" - else if isAarch32 || isAarch64 then "ARM" + if isx86 then "X86" + else if isAarch then "ARM" else if isPower then "POWER" else "UNKNOWN" }"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix index 4b7912e3a6..9144c38e2a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -17,11 +17,11 @@ rec { # Policy: use the highest stable version as the default (on our master). stable = if stdenv.hostPlatform.system == "x86_64-linux" then generic { - version = "515.57"; - sha256_64bit = "sha256-hB1p/hQmiDZHESuwcP4vKaH4ScZKyAqNYccJcNjT1SI="; - openSha256 = "sha256-D8fXlmuGEHkFAT2aSAj7hXpndi2bfOd6vQAcKfsQx4U="; - settingsSha256 = "sha256-M9AVeMsHSQv+zhIdBtXm+QRXf7NcZpLfCDmKMUjBl1U="; - persistencedSha256 = "sha256-joKUuP4PgQxu4kOxy8SkHORPkEmuYfk3b+7svAyMQ1Q="; + version = "515.65.01"; + sha256_64bit = "sha256-BJLdxbXmWqAMvHYujWaAIFyNCOEDtxMQh6FRJq7klek="; + openSha256 = "sha256-GCCDnaDsbXTmbCYZBCM3fpHmOSWti/DkBJwYrRGAMPI="; + settingsSha256 = "sha256-kBELMJCIWD9peZba14wfCoxsi3UXO3ehFYcVh4nvzVg="; + persistencedSha256 = "sha256-P8oT7g944HvNk2Ot/0T0sJM7dZs+e0d+KwbwRrmsuDY="; } else legacy_390; @@ -55,19 +55,35 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.129.06"; - sha256_64bit = "sha256-QQkQtwBuFzBjMnaDKfS1PW+ekcxVXCiJkXWOKo8IqZg="; - settingsSha256 = "sha256-vUS4O/c4IrbC8offzUFGLlMdP/Tlz1GwQIV2geRfj/o="; - persistencedSha256 = "sha256-jCcYUsbhQ77IOQquXqbTZfh1N0IvKQOWrIMU9rEwSW0="; + version = "470.141.03"; + sha256_64bit = "sha256-vpjSR6Q9dJGmW/3Jl/tlMeFZQ0brEqD6qgRGcs21cJ8="; + settingsSha256 = "sha256-OWSUmUBqAxsR3e6EPzcIotpd6nm4Le8hIj4pzJ5WnhE="; + persistencedSha256 = "sha256-XsGYGgucDhvPpqtM9IBLfo3tbn7sIobpo5JW/XqOkTo="; }; # Last one supporting x86 legacy_390 = generic { - version = "390.151"; - sha256_32bit = "sha256-lOOZtFllnBKxNE6Mj09e7h7VkV/0WfyLuDHJ4dRGd9s="; - sha256_64bit = "sha256-UibkhCBEz/2Qlt6tr2iTTBM9p04FuAzNISNlhLOvsfw="; - settingsSha256 = "sha256-teXQa0pQctQl1dvddVJtI7U/vVuMu6ER1Xd99Jprpvw="; - persistencedSha256 = "sha256-FxiTXYABplKFcBXr4orhYWiJq4zVePpplMbg2kvEuXk="; + version = "390.154"; + sha256_32bit = "sha256-XuhxuEvZ8o4iW3o+Xxvh+eLQBn83uNa40MJRcC8G0+c="; + sha256_64bit = "sha256-9EICgMVSEJZMAI1bck8mFYRdR61MnAXY7SamL8YzH3w="; + settingsSha256 = "sha256-iNT6//EvtasivDfXPY6j6OrpymbslO/q45uKd5smFUw="; + persistencedSha256 = "sha256-y+MkudjQBkuVzHrY/rh7IGRN8VjLsJQ3a+fYDXdrzzk="; + + broken = kernel.kernelAtLeast "5.18"; + + patches = + let patch390 = o: + (lib.optional ((lib.versions.majorMinor kernel.modDirVersion) == o.version) (fetchpatch { + inherit (o) sha256; + url = "https://gitlab.com/herecura/packages/nvidia-390xx-dkms/-/raw/herecura/kernel-${o.version}.patch"; + })); + in + [] + ++ (patch390 { + version = "5.18"; + sha256 = "sha256-A6itoozgDWmXKQAU0D8bT2vUaZqh5G5Tg3d3E+CLOTs="; + }) + ; }; legacy_340 = generic { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix index 18b699221e..5f8715aa73 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation { homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules"; license = with licenses; [ gpl2Plus mit ]; platforms = platforms.linux; + broken = kernel.kernelAtLeast "5.19"; maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix index 873e09df8d..884ccdd6c5 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -1,6 +1,7 @@ nvidia_x11: sha256: -{ stdenv, lib, fetchFromGitHub, pkg-config, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, m4, jansson, gtk2, dbus, gtk3 +, libXv, libXrandr, libXext, libXxf86vm, libvdpau , librsvg, wrapGAppsHook , withGtk2 ? false, withGtk3 ? true }: @@ -43,21 +44,23 @@ in stdenv.mkDerivation { pname = "nvidia-settings"; version = nvidia_x11.settingsVersion; + inherit src; - nativeBuildInputs = [ pkg-config m4 ]; - - buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] - ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; - - enableParallelBuilding = true; - makeFlags = nvidia_x11.makeFlags ++ [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; - installFlags = [ "PREFIX=$(out)" ]; + patches = lib.optional (lib.versionOlder nvidia_x11.settingsVersion "440") + (fetchpatch { + # fixes "multiple definition of `VDPAUDeviceFunctions'" linking errors + url = "https://github.com/NVIDIA/nvidia-settings/commit/a7c1f5fce6303a643fadff7d85d59934bd0cf6b6.patch"; + hash = "sha256-ZwF3dRTYt/hO8ELg9weoz1U/XcU93qiJL2d1aq1Jlak="; + }); postPatch = lib.optionalString nvidia_x11.useProfiles '' sed -i 's,/usr/share/nvidia/,${nvidia_x11.bin}/share/nvidia/,g' src/gtk+-2.x/ctkappprofile.c ''; + enableParallelBuilding = true; + makeFlags = nvidia_x11.makeFlags ++ [ "NV_USE_BUNDLED_LIBJANSSON=0" ]; + preBuild = '' if [ -e src/libXNVCtrl/libXNVCtrl.a ]; then ( cd src/libXNVCtrl @@ -66,6 +69,13 @@ stdenv.mkDerivation { fi ''; + nativeBuildInputs = [ pkg-config m4 ]; + + buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] + ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook ]; + + installFlags = [ "PREFIX=$(out)" ]; + postInstall = '' ${lib.optionalString (!withGtk2) '' rm -f $out/lib/libnvidia-gtk2.so.* @@ -87,7 +97,6 @@ stdenv.mkDerivation { ''; binaryName = if withGtk3 then ".nvidia-settings-wrapped" else "nvidia-settings"; - postFixup = '' patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \ $out/bin/$binaryName diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index 1952d31b02..75f210f4c2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -10,12 +10,12 @@ buildGoModule rec { pname = "oci-seccomp-bpf-hook"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "containers"; repo = "oci-seccomp-bpf-hook"; rev = "v${version}"; - sha256 = "sha256-PU7WX5RAV6wWVRsqq6MdEjr00AtlTT4cSacRaxrEF2s="; + sha256 = "sha256-+HGVxPBCPIdFwzZf3lFE0MWA2xMKsHQkfDo4zyNgzpg="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix index ffb397334c..1c54c42120 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pam_gnupg"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "cruegge"; repo = "pam-gnupg"; rev = "v${version}"; - sha256 = "sha256-NDl6MsvIDAXkaLqXt7Wa0T7aulT31P5Z/d/Vb+ILya0="; + sha256 = "sha256-6I9a841qohA42lhOgZf/hharnjkthuB8lRptPDxUgMI="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix index b51a5fed0c..402b253616 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -67,6 +67,8 @@ stdenv.mkDerivation rec { glib polkit python3 # for cli tool + # Duplicate from checkInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved + umockdev ]; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/powercap/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/powercap/default.nix index 24832e5fdf..96ec83852d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/powercap/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/powercap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "powercap"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "powercap"; repo = "powercap"; rev = "v${version}"; - sha256 = "sha256-VvepbABc7daRE0/sJqsCb+m2my8O3B1ICXywBqsjSO8="; + sha256 = "sha256-l+IpFqBnCYUU825++sUPySD/Ku0TEIX2kt+S0Wml6iA="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix index ce0c05346e..9a2c23d735 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix @@ -1,7 +1,24 @@ -{ stdenv, lib, makeWrapper, p7zip -, gawk, util-linux, xorg, glib, dbus-glib, zlib, bbe, bash, timetrap, netcat, cups -, kernel ? null, libsOnly ? false -, fetchurl, undmg, perl, autoPatchelfHook +{ stdenv +, lib +, makeWrapper +, p7zip +, gawk +, util-linux +, xorg +, glib +, dbus-glib +, zlib +, bbe +, bash +, timetrap +, netcat +, cups +, kernel ? null +, libsOnly ? false +, fetchurl +, undmg +, perl +, autoPatchelfHook }: assert (!libsOnly) -> kernel != null; @@ -14,7 +31,7 @@ stdenv.mkDerivation rec { # 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"; + url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg"; sha256 = "sha256-gjLxQOTFuVghv1Bj+zfbNW97q1IN2rurSnPQi13gzRA="; }; @@ -39,7 +56,8 @@ stdenv.mkDerivation rec { fi ''; - patches = lib.optionals (lib.versionAtLeast kernel.version "5.18") [ ./prl-tools.patch ]; + patches = lib.optional (lib.versionAtLeast kernel.version "5.18") ./prl-tools-5.18.patch + ++ lib.optional (lib.versionAtLeast kernel.version "5.19") ./prl-tools-5.19.patch; kernelVersion = lib.optionalString (!libsOnly) kernel.modDirVersion; kernelDir = lib.optionalString (!libsOnly) "${kernel.dev}/lib/modules/${kernelVersion}"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools.patch b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools-5.18.patch similarity index 100% rename from third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools.patch rename to third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools-5.18.patch diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools-5.19.patch b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools-5.19.patch new file mode 100644 index 0000000000..5ec00e6dd0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools-5.19.patch @@ -0,0 +1,29 @@ +diff -puNr prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c +--- prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c ++++ prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c +@@ -851,7 +851,7 @@ ssize_t prlfs_rw(struct inode *inode, char *buf, size_t size, + loff_t *off, unsigned int rw, int user, int flags); + + +-int prlfs_readpage(struct file *file, struct page *page) { ++int prlfs_read_folio(struct file *file, struct folio *folio) { + char *buf; + ssize_t ret; + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0) +@@ -859,6 +859,7 @@ int prlfs_readpage(struct file *file, struct page *page) { + #else + struct inode *inode = file->f_dentry->d_inode; + #endif ++ struct page *page = &folio->page; + loff_t off = page->index << PAGE_SHIFT; + + if (!file) { +@@ -950,7 +951,7 @@ out: + } + + static const struct address_space_operations prlfs_aops = { +- .readpage = prlfs_readpage, ++ .read_folio = prlfs_read_folio, + .writepage = prlfs_writepage, + .write_begin = simple_write_begin, + .write_end = prlfs_write_end, diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/qc71_laptop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/qc71_laptop/default.nix new file mode 100644 index 0000000000..92818ccfb0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/qc71_laptop/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, kernel }: + +stdenv.mkDerivation rec { + pname = "qc71_laptop"; + version = "unstable-2022-06-01"; + + src = fetchFromGitHub { + owner = "pobrn"; + repo = "qc71_laptop"; + rev = "28106e0602807d78d1f5fa220ab6148dd6477c1c"; + hash = "sha256-3bhw2HbEVuxPfGMt/eE2nCuMLHzYHRY3nRWPzZxKHro="; + }; + + nativeBuildInputs = kernel.moduleBuildDependencies; + + makeFlags = kernel.makeFlags ++ [ + "VERSION=${version}" + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; + + installPhase = '' + runHook preInstall + install -D qc71_laptop.ko -t $out/lib/modules/${kernel.modDirVersion}/extra + runHook postInstall + ''; + + meta = with lib; { + description = "Linux driver for QC71 laptop"; + homepage = "https://github.com/pobrn/qc71_laptop/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ aacebedo ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index 44308d8a89..aeed100fd8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "rdma-core"; - version = "40.0"; + version = "41.0"; src = fetchFromGitHub { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "0pcpbri50y5gzrmdqx90wngfd6cfas3m7zlfhz9lqr583fp08vfw"; + sha256 = "sha256-D6pgWdJKA6ZL+atFChqSW7hI6/dYfDBRzvb6hu1wxPg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix index 0e635583d6..f02b0acd34 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/reptyr/default.nix @@ -1,24 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, python2 }: +{ stdenv, lib, fetchFromGitHub, python2 }: stdenv.mkDerivation rec { - version = "0.7.0"; + version = "0.9.0"; pname = "reptyr"; src = fetchFromGitHub { owner = "nelhage"; repo = "reptyr"; rev = "reptyr-${version}"; - sha256 = "1hnijfz1ab34j2h2cxc3f43rmbclyihgn9x9wxa7jqqgb2xm71hj"; + sha256 = "sha256-gM3aMEqk71RWUN1NxByd21tIzp6PmJ54Cqrh5MsjHtI="; }; - patches = [ - # Fix tests hanging - (fetchpatch { - url = "https://github.com/nelhage/reptyr/commit/bca3070ac0f3888b5d37ee162505be81b3b496ff.patch"; - sha256 = "0w6rpv9k4a80q0ijzdq5hlpr37ncr284piqjv5agy8diniwlilab"; - }) - ]; - makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ]; checkInputs = [ (python2.withPackages (p: [ p.pexpect ])) ]; @@ -34,6 +26,7 @@ stdenv.mkDerivation rec { "armv6l-linux" "armv7l-linux" "aarch64-linux" + "riscv64-linux" ]; maintainers = with lib.maintainers; [raskin]; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix index 278a370d47..6700077625 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rt-tests/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "rt-tests"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot/${pname}-${version}.tar.gz"; - sha256 = "Q+rNdpRdsmW2gcsrfwg12EzpvO6qlEP/Mb/OWQMNmr8="; + sha256 = "sha256-yuSfeYTaCZ0F1GXQkDnH8PBvyzR2w/XDitN8csHB9xE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix index c1032473db..a755404e6e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189es/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { makeFlags = kernel.makeFlags ++ [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ("CONFIG_PLATFORM_I386_PC=" + (if (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isx86_64) then "y" else "n")) - ("CONFIG_PLATFORM_ARM_RPI=" + (if (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) then "y" else "n")) + ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n")) ]; preInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix new file mode 100644 index 0000000000..c1fe5e9733 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8189fs/default.nix @@ -0,0 +1,22 @@ +{ lib, kernel, rtl8189es, fetchFromGitHub }: + +# rtl8189fs is a branch of the rtl8189es driver +rtl8189es.overrideAttrs (drv: rec { + name = "rtl8189fs-${kernel.version}-${version}"; + version = "2022-05-20"; + + src = fetchFromGitHub { + owner = "jwrdegoede"; + repo = "rtl8189ES_linux"; + rev = "71500c28164369800041d1716ac513457179ce93"; + sha256 = "sha256-JTv+ssSv5toNcZ5wR6p0Cywdk87z9Bdq0ftU0ekr/98="; + }; + + meta = with lib; { + description = "Driver for Realtek rtl8189fs"; + homepage = "https://github.com/jwrdegoede/rtl8189ES_linux/tree/rtl8189fs"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ puffnfresh ]; + }; +}) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix index b385b9a27d..30f04c1eb8 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8812au/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "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")) + ("CONFIG_PLATFORM_ARM_RPI=" + (if stdenv.hostPlatform.isAarch then "y" else "n")) ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix index e092d145ab..cd13c48779 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl88x2bu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rtl88x2bu"; - version = "${kernel.version}-unstable-2022-02-22"; + version = "${kernel.version}-unstable-2022-05-23"; src = fetchFromGitHub { owner = "morrownr"; repo = "88x2bu-20210702"; - rev = "6a5b7f005c071ffa179b6183ee034c98ed30db80"; - sha256 = "sha256-BqTyJpICW3D4EfHHoN5svasteJnunu2Uz449u/CmNE0="; + rev = "3fbe980a9a8cee223e4671449128212cf7514b3c"; + sha256 = "1p4bp8g94ny385nl3m2ca824dbm6lhjvh7s5rqyzk220il2sa0nd"; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix index 3013df7e29..c7d9c1f8fb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ryzenadj/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, pciutils, cmake }: stdenv.mkDerivation rec { pname = "ryzenadj"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "FlyGoat"; repo = "RyzenAdj"; rev = "v${version}"; - sha256 = "sha256-RoKRqqIVY9zjyXzGxHo+J4OV7cKc7CkqsdbpreB7EHc="; + sha256 = "sha256-SEM+HN5ecxp64jZTOouWuFO1HICtc6M+GitnS+bdfb4="; }; nativeBuildInputs = [ pciutils cmake ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix index 41e8f0d72e..054d0c9fa1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/sssd/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "sssd"; - version = "2.7.0"; + version = "2.7.3"; src = fetchFromGitHub { owner = "SSSD"; repo = pname; rev = version; - sha256 = "sha256-aGPt2ZXMnd8TXC+YhVGYZKbsl3YYkjmYF2yDQB4t/BY="; + sha256 = "sha256-mdgBRFqIT5SvDTeNiv1IbTyd9tcu8YJVfbw49gR6bKI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index 404b0d2ee6..2699c38440 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,7 +1,7 @@ -From 8622539fe2ce67934ed2e60626a2303ef8191e40 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 -Subject: [PATCH 01/19] Start device units for uninitialised encrypted devices +Subject: [PATCH] Start device units for uninitialised encrypted devices This is necessary because the NixOS service that initialises the filesystem depends on the appearance of the device unit. Also, this @@ -27,6 +27,3 @@ index 25b8a590a6..d18999ea87 100644 # add symlink to GPT root disk SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index d37ace3250..f46480d32f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,7 +1,7 @@ -From a845786195182c376b72a85433e278c35243676d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 -Subject: [PATCH 02/19] Don't try to unmount /nix or /nix/store +Subject: [PATCH] Don't try to unmount /nix or /nix/store They'll still be remounted read-only. @@ -25,10 +25,10 @@ index f683f05981..5a04c2c2a6 100644 "/etc")) return true; diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index f5a2cb20c1..51608d24c0 100644 +index 820aa8e286..653e43053d 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c -@@ -502,6 +502,8 @@ static int delete_md(MountPoint *m) { +@@ -518,6 +518,8 @@ static int delete_md(MountPoint *m) { static bool nonunmountable_path(const char *path) { return path_equal(path, "/") @@ -37,6 +37,3 @@ index f5a2cb20c1..51608d24c0 100644 #if ! HAVE_SPLIT_USR || path_equal(path, "/usr") #endif --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index 56c6238b81..a669350dbe 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,7 +1,7 @@ -From d33f3461fa2202ef9b0d6cdf2137c510c59fb052 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Apr 2014 10:59:28 +0200 -Subject: [PATCH 03/19] Fix NixOS containers +Subject: [PATCH] Fix NixOS containers In NixOS containers, the init script is bind-mounted into the container, so checking early whether it exists will fail. @@ -10,25 +10,22 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 8f17ab8810..197e5aa252 100644 +index 4ce80bba70..bb149192bd 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5625,6 +5625,7 @@ static int run(int argc, char *argv[]) { +@@ -5651,6 +5651,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { +#if 0 - const char *p, *q; + _cleanup_free_ char *p = NULL; if (arg_pivot_root_new) -@@ -5639,6 +5640,7 @@ static int run(int argc, char *argv[]) { - r = -EINVAL; +@@ -5665,6 +5666,7 @@ static int run(int argc, char *argv[]) { + "Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory); goto finish; } +#endif } } else { --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index 36d0ee0cde..dfaf53e4a3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,7 +1,7 @@ -From 8fd5968163f3a1cb5f196d934756ba08ccaa5b1e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 May 2014 14:10:10 +0200 -Subject: [PATCH 04/19] Look for fsck in the right place +Subject: [PATCH] Look for fsck in the right place --- src/fsck/fsck.c | 2 +- @@ -20,6 +20,3 @@ index 745d01ff50..dd4eef45c3 100644 cmdline[i++] = arg_repair; cmdline[i++] = "-T"; --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index 6acac84a9d..8a06e2cf69 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,7 +1,7 @@ -From 90d1a90d3147e9c8db5caec8befabda270e755d4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Dec 2014 14:46:17 +0100 -Subject: [PATCH 05/19] Add some NixOS-specific unit directories +Subject: [PATCH] Add some NixOS-specific unit directories Look in `/nix/var/nix/profiles/default/lib/systemd/{system,user}` for units provided by packages installed into the default profile via @@ -14,7 +14,7 @@ Also, remove /usr and /lib as these don't exist on NixOS. 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c -index 6fb8c40e7a..142ecdecec 100644 +index 1f4331a8bf..4b9a8ae26e 100644 --- a/src/basic/path-lookup.c +++ b/src/basic/path-lookup.c @@ -92,11 +92,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) { @@ -29,7 +29,7 @@ index 6fb8c40e7a..142ecdecec 100644 NULL }; -@@ -614,15 +610,13 @@ int lookup_paths_init( +@@ -617,15 +613,13 @@ int lookup_paths_init( persistent_config, SYSTEM_CONFIG_UNIT_DIR, "/etc/systemd/system", @@ -46,7 +46,7 @@ index 6fb8c40e7a..142ecdecec 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -638,14 +632,11 @@ int lookup_paths_init( +@@ -641,14 +635,11 @@ int lookup_paths_init( persistent_config, USER_CONFIG_UNIT_DIR, "/etc/systemd/user", @@ -62,23 +62,23 @@ index 6fb8c40e7a..142ecdecec 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -795,7 +786,6 @@ char **generator_binary_paths(UnitFileScope scope) { - case UNIT_FILE_SYSTEM: +@@ -808,7 +799,6 @@ char **generator_binary_paths(LookupScope scope) { + case LOOKUP_SCOPE_SYSTEM: add = strv_new("/run/systemd/system-generators", "/etc/systemd/system-generators", - "/usr/local/lib/systemd/system-generators", SYSTEM_GENERATOR_DIR); break; -@@ -803,7 +793,6 @@ char **generator_binary_paths(UnitFileScope scope) { - case UNIT_FILE_USER: +@@ -816,7 +806,6 @@ char **generator_binary_paths(LookupScope scope) { + case LOOKUP_SCOPE_USER: add = strv_new("/run/systemd/user-generators", "/etc/systemd/user-generators", - "/usr/local/lib/systemd/user-generators", USER_GENERATOR_DIR); break; -@@ -842,12 +831,10 @@ char **env_generator_binary_paths(bool is_system) { +@@ -855,12 +844,10 @@ char **env_generator_binary_paths(bool is_system) { if (is_system) add = strv_new("/run/systemd/system-environment-generators", "/etc/systemd/system-environment-generators", @@ -92,7 +92,7 @@ index 6fb8c40e7a..142ecdecec 100644 if (!add) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index fc0f8c34fa..162432e77f 100644 +index 693433b34b..5932a21b5b 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -38,10 +38,10 @@ systemdsystemconfdir=${systemd_system_conf_dir} @@ -121,6 +121,3 @@ index fc0f8c34fa..162432e77f 100644 systemdusergeneratorpath=${systemd_user_generator_path} systemd_sleep_dir=${root_prefix}/lib/systemd/system-sleep --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index 438d841bb1..c06f125502 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,7 +1,7 @@ -From 213279752124dc4a57a4189df9b5b2e96feaa0b3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 15:39:38 +0200 -Subject: [PATCH 06/19] Get rid of a useless message in user sessions +Subject: [PATCH] Get rid of a useless message in user sessions Namely lots of variants of @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 9368a1dfa1..5b0bdb1bc7 100644 +index 296b759959..71ef7f27b4 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -1408,7 +1408,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { +@@ -1428,7 +1428,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) { if (!unit_is_bound_by_inactive(u, &culprit)) continue; @@ -26,6 +26,3 @@ index 9368a1dfa1..5b0bdb1bc7 100644 /* If stopping a unit fails continuously we might enter a stop loop here, hence stop acting on the * service being unnecessary after a while. */ --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index a93488afbf..174cca335b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,8 +1,8 @@ -From 14474d5e116609ce4fac60d779b08fa3eab840c3 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 6 Dec 2015 14:26:36 +0100 -Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that - change system settings. +Subject: [PATCH] hostnamed, localed, timedated: disable methods that change + system settings. --- src/hostname/hostnamed.c | 6 ++++++ @@ -11,10 +11,10 @@ Subject: [PATCH 07/19] hostnamed, localed, timedated: disable methods that 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index b20a93ad81..6292fca4fc 100644 +index 5f09e6d0eb..46bef3b59d 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -813,6 +813,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -910,6 +910,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -24,7 +24,7 @@ index b20a93ad81..6292fca4fc 100644 name = empty_to_null(name); context_read_etc_hostname(c); -@@ -876,6 +879,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess +@@ -973,6 +976,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -35,10 +35,10 @@ index b20a93ad81..6292fca4fc 100644 context_read_machine_info(c); diff --git a/src/locale/localed.c b/src/locale/localed.c -index c228385d0e..942ccaa038 100644 +index 89bf9c6fba..af2f37a4ca 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c -@@ -360,6 +360,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er +@@ -359,6 +359,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er if (r < 0) return r; @@ -48,7 +48,7 @@ index c228385d0e..942ccaa038 100644 use_localegen = locale_gen_check_available(); /* If single locale without variable name is provided, then we assume it is LANG=. */ -@@ -485,6 +488,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro +@@ -484,6 +487,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro if (r < 0) return r; @@ -58,7 +58,7 @@ index c228385d0e..942ccaa038 100644 keymap = empty_to_null(keymap); keymap_toggle = empty_to_null(keymap_toggle); -@@ -665,6 +671,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err +@@ -664,6 +670,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err if (r < 0) return r; @@ -69,10 +69,10 @@ index c228385d0e..942ccaa038 100644 model = empty_to_null(model); variant = empty_to_null(variant); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 66b454269d..0a8fe25d0f 100644 +index 9ca5d37b75..e41d8d73df 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -668,6 +668,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * +@@ -669,6 +669,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * if (r < 0) return r; @@ -83,7 +83,7 @@ index 66b454269d..0a8fe25d0f 100644 if (!timezone_is_valid(z, LOG_DEBUG)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); -@@ -747,6 +751,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error +@@ -748,6 +752,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error if (r < 0) return r; @@ -103,6 +103,3 @@ index 66b454269d..0a8fe25d0f 100644 r = context_update_ntp_status(c, bus, m); if (r < 0) return r; --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index e1bc44a148..69bd1cc97b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,7 +1,7 @@ -From d668df39728c992ec0c691ef6e76664e7121f5bd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 7 Jul 2016 02:47:13 +0300 -Subject: [PATCH 08/19] Fix hwdb paths +Subject: [PATCH] Fix hwdb paths Patch by vcunat. --- @@ -9,10 +9,10 @@ Patch by vcunat. 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libsystemd/sd-hwdb/hwdb-internal.h b/src/libsystemd/sd-hwdb/hwdb-internal.h -index 5ddc2211e6..ee621eec46 100644 +index 62d27f7b89..87318e041b 100644 --- a/src/libsystemd/sd-hwdb/hwdb-internal.h +++ b/src/libsystemd/sd-hwdb/hwdb-internal.h -@@ -82,8 +82,5 @@ struct trie_value_entry2_f { +@@ -83,8 +83,5 @@ struct trie_value_entry2_f { } _packed_; #define hwdb_bin_paths \ @@ -23,6 +23,3 @@ index 5ddc2211e6..ee621eec46 100644 - UDEVLIBEXECDIR "/hwdb.bin\0" + "/etc/udev/hwdb.bin\0" + --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 68d40980ab..106eba2bed 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,7 +1,7 @@ -From dd59ce5f1bbdafb0b92f8aeacc68b000ec347a61 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 11 Oct 2016 13:12:08 +0300 -Subject: [PATCH 09/19] Change /usr/share/zoneinfo to /etc/zoneinfo +Subject: [PATCH] Change /usr/share/zoneinfo to /etc/zoneinfo NixOS uses this path. --- @@ -35,10 +35,10 @@ index e486474c44..5f373d0723 100644 Etc/UTC. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index b659d6905d..660b1c6fed 100644 +index 0ad8de4b9a..b794c6c7d0 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1267,7 +1267,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { +@@ -1281,7 +1281,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) { assert(ret); @@ -47,7 +47,7 @@ index b659d6905d..660b1c6fed 100644 if (!f) return -errno; -@@ -1306,7 +1306,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { +@@ -1320,7 +1320,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) { _cleanup_strv_free_ char **zones = NULL; int r; @@ -56,7 +56,7 @@ index b659d6905d..660b1c6fed 100644 if (!f) return -errno; -@@ -1419,7 +1419,7 @@ int verify_timezone(const char *name, int log_level) { +@@ -1433,7 +1433,7 @@ int verify_timezone(const char *name, int log_level) { if (p - name >= PATH_MAX) return -ENAMETOOLONG; @@ -65,7 +65,7 @@ index b659d6905d..660b1c6fed 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) -@@ -1510,7 +1510,7 @@ int get_timezone(char **ret) { +@@ -1491,7 +1491,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* returns EINVAL if not a symlink */ @@ -75,7 +75,7 @@ index b659d6905d..660b1c6fed 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index d28a416e5d..c7c215731d 100644 +index 39160182ef..8dcc3307c8 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -494,7 +494,7 @@ static int process_timezone(void) { @@ -88,10 +88,10 @@ index d28a416e5d..c7c215731d 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 197e5aa252..c674fa61d5 100644 +index bb149192bd..08751ed944 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1899,8 +1899,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid +@@ -1901,8 +1901,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -103,10 +103,10 @@ index 197e5aa252..c674fa61d5 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 0a8fe25d0f..2f02b9a520 100644 +index e41d8d73df..ff1a384b3b 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -279,7 +279,7 @@ static int context_read_data(Context *c) { +@@ -282,7 +282,7 @@ static int context_read_data(Context *c) { r = get_timezone(&t); if (r == -EINVAL) @@ -115,7 +115,7 @@ index 0a8fe25d0f..2f02b9a520 100644 else if (r < 0) log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); -@@ -303,7 +303,7 @@ static int context_write_data_timezone(Context *c) { +@@ -306,7 +306,7 @@ static int context_write_data_timezone(Context *c) { if (isempty(c->zone) || streq(c->zone, "UTC")) { @@ -124,7 +124,7 @@ index 0a8fe25d0f..2f02b9a520 100644 if (unlink("/etc/localtime") < 0 && errno != ENOENT) return -errno; -@@ -311,9 +311,9 @@ static int context_write_data_timezone(Context *c) { +@@ -314,9 +314,9 @@ static int context_write_data_timezone(Context *c) { return 0; } @@ -136,6 +136,3 @@ index 0a8fe25d0f..2f02b9a520 100644 if (!p) return -ENOMEM; --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index f2514de6c6..a3315a1e65 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,7 +1,7 @@ -From a93da270bed88972f4d60a1fa08f24e00712d7fb Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Imuli Date: Wed, 19 Oct 2016 08:46:47 -0400 -Subject: [PATCH 10/19] localectl: use /etc/X11/xkb for list-x11-* +Subject: [PATCH] localectl: use /etc/X11/xkb for list-x11-* NixOS has an option to link the xkb data files to /etc/X11, but not to /usr/share/X11. @@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index b5624209dc..4ab7adfdb6 100644 +index 661d54c27d..e98b578531 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -279,7 +279,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { +@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { } state = NONE, look_for; int r; @@ -22,6 +22,3 @@ index b5624209dc..4ab7adfdb6 100644 if (!f) return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index c21a1bda41..75d113d003 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,17 +1,17 @@ -From 3bc3462165cd72de93a1c71f03e6c4150726b159 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Feb 2018 04:37:44 +0100 -Subject: [PATCH 11/19] build: don't create statedir and don't touch prefixdir +Subject: [PATCH] build: don't create statedir and don't touch prefixdir --- meson.build | 3 --- 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index c0cbadecb1..8266bf57de 100644 +index 9c170acc0a..818b7a3eb5 100644 --- a/meson.build +++ b/meson.build -@@ -3729,9 +3729,6 @@ install_data('LICENSE.GPL2', +@@ -3928,9 +3928,6 @@ install_data('LICENSE.GPL2', install_subdir('LICENSES', install_dir : docdir) @@ -21,6 +21,3 @@ index c0cbadecb1..8266bf57de 100644 ############################################################ # Ensure that changes to the docs/ directory do not break the --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch similarity index 87% rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch index d008cf2821..c1659ae8a7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-add-rootprefix-to-lookup-dir-paths.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-add-rootprefix-to-lookup-dir-paths.patch @@ -1,7 +1,7 @@ -From b30d2273d3ce1480b0c4c27c25211f84e04172e9 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 9 May 2019 11:15:22 +0200 -Subject: [PATCH 13/19] add rootprefix to lookup dir paths +Subject: [PATCH] add rootprefix to lookup dir paths systemd does not longer use the UDEVLIBEXEC directory as root for discovery default udev rules. By adding `$out/lib` to the lookup paths @@ -12,7 +12,7 @@ files that I might have missed. 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/basic/def.h b/src/basic/def.h -index eccee3d3fa..e94a2c8bd0 100644 +index 0a1ae023a3..cc00ff6c68 100644 --- a/src/basic/def.h +++ b/src/basic/def.h @@ -39,13 +39,15 @@ @@ -33,6 +33,3 @@ index eccee3d3fa..e94a2c8bd0 100644 #define CONF_PATHS(n) \ CONF_PATHS_USR(n) \ --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch deleted file mode 100644 index 5f27e41752..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-inherit-systemd-environment-when-calling-generators.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 85f0ad0cb7b4f0cfd482c9611f9cbc2dacbba33a Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold -Date: Fri, 2 Nov 2018 21:15:42 +0100 -Subject: [PATCH 12/19] inherit systemd environment when calling generators. - -Systemd generators need access to the environment configured in -stage-2-init.sh since it schedules fsck and mkfs executions based on -being able to find an appropriate binary for the target filesystem. - -With this commit I am altering the systemd behaviour since upstream -tries to gather environments with that they call -"environment-generators" and then seems to pass that on to all the other -executables that are being called from managers. ---- - src/core/manager.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/core/manager.c b/src/core/manager.c -index 5b0bdb1bc7..1538a5200a 100644 ---- a/src/core/manager.c -+++ b/src/core/manager.c -@@ -3653,10 +3653,15 @@ static int manager_run_generators(Manager *m) { - argv[4] = NULL; - - RUN_WITH_UMASK(0022) -- (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, NULL, NULL, -- (char**) argv, m->transient_environment, -- EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS | EXEC_DIR_SET_SYSTEMD_EXEC_PID); -- -+ (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, -+ // On NixOS we must propagate PATH to generators so they are -+ // able to find binaries such as `fsck.${fstype}` and -+ // `mkfs.${fstype}`. That is why the last argument of the -+ // function (envp) is set to NULL. This propagates systemd's -+ // environment (e.g. PATH) that was setup -+ // before calling systemd from stage-2-init.sh. -+ NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, -+ EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS | EXEC_DIR_SET_SYSTEMD_EXEC_PID); - r = 0; - - finish: --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch similarity index 85% rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 49c6651c0e..4add87267d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,7 +1,7 @@ -From 76da27ff77e5db07e502d4d8d26286d69c3f0319 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:45:55 +0300 -Subject: [PATCH 14/19] systemd-shutdown: execute scripts in +Subject: [PATCH] systemd-shutdown: execute scripts in /etc/systemd/system-shutdown This is needed for NixOS to use such scripts as systemd directory is immutable. @@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 7ad9930677..fdb03a2e1a 100644 +index 2c3cbec02c..1b876203c6 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -335,7 +335,7 @@ int main(int argc, char *argv[]) { @@ -22,6 +22,3 @@ index 7ad9930677..fdb03a2e1a 100644 /* The log target defaults to console, but the original systemd process will pass its log target in through a * command line argument, which will override this default. Also, ensure we'll never log to the journal or --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch similarity index 67% rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index 78d77c0058..22e2bc8e53 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,8 +1,7 @@ -From 47c651f97acae814d4ff679ae04d78d4532cbca6 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:46:58 +0300 -Subject: [PATCH 15/19] systemd-sleep: execute scripts in - /etc/systemd/system-sleep +Subject: [PATCH] systemd-sleep: execute scripts in /etc/systemd/system-sleep This is needed for NixOS to use such scripts as systemd directory is immutable. --- @@ -10,10 +9,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index 7064f3a905..b60ced9d9b 100644 +index 65e391d02a..28af2f8bf5 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -182,6 +182,7 @@ static int execute( +@@ -180,6 +180,7 @@ static int execute( }; static const char* const dirs[] = { SYSTEM_SLEEP_PATH, @@ -21,6 +20,3 @@ index 7064f3a905..b60ced9d9b 100644 NULL }; --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch similarity index 86% rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 882690ad91..653f3beea9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,7 +1,7 @@ -From f21722ac0f51b0b59a5c030af3db5fe4e6397f7c Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 8 Mar 2020 01:05:54 +0100 -Subject: [PATCH 17/19] path-util.h: add placeholder for DEFAULT_PATH_NORMAL +Subject: [PATCH] path-util.h: add placeholder for DEFAULT_PATH_NORMAL This will be the $PATH used to lookup ExecStart= etc. options, which systemd itself uses extensively. @@ -10,7 +10,7 @@ systemd itself uses extensively. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index 518f3340bf..18e826ea0b 100644 +index 553aa4fb58..46294f4bb1 100644 --- a/src/basic/path-util.h +++ b/src/basic/path-util.h @@ -24,11 +24,11 @@ @@ -28,6 +28,3 @@ index 518f3340bf..18e826ea0b 100644 #if HAVE_SPLIT_USR # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch deleted file mode 100644 index 3c1643e0f1..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ /dev/null @@ -1,27 +0,0 @@ -From df0fec7ac2f33bcca60ba9a2396af33397ba42cc Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Sat, 7 Mar 2020 22:40:27 +0100 -Subject: [PATCH 16/19] kmod-static-nodes.service: Update ConditionFileNotEmpty - -On NixOS, kernel modules of the currently booted systems are located at -/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/. ---- - units/kmod-static-nodes.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in -index 777e82d16b..b6abc2bba0 100644 ---- a/units/kmod-static-nodes.service.in -+++ b/units/kmod-static-nodes.service.in -@@ -12,7 +12,7 @@ Description=Create List of Static Device Nodes - DefaultDependencies=no - Before=sysinit.target systemd-tmpfiles-setup-dev.service - ConditionCapability=CAP_SYS_MODULE --ConditionFileNotEmpty=/lib/modules/%v/modules.devname -+ConditionFileNotEmpty=/run/booted-system/kernel-modules/lib/modules/%v/modules.devname - - [Service] - Type=oneshot --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-pkg-config-derive-prefix-from-prefix.patch similarity index 83% rename from third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch rename to third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-pkg-config-derive-prefix-from-prefix.patch index e602bef9c3..3fbfd7f10a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-pkg-config-derive-prefix-from-prefix.patch +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-pkg-config-derive-prefix-from-prefix.patch @@ -1,7 +1,7 @@ -From 968bd0c7bc058a4b05b6457f9ff20d02b70c9852 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 6 Dec 2020 08:34:19 +0100 -Subject: [PATCH 18/19] pkg-config: derive prefix from --prefix +Subject: [PATCH] pkg-config: derive prefix from --prefix Point prefix to the one configured, instead of `/usr` `systemd` has limited support for making the pkgconfig prefix overridable, and interpolates those @@ -16,7 +16,7 @@ Co-Authored-By: Florian Klink 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index 162432e77f..2fc20daf03 100644 +index 5932a21b5b..20bf8e316d 100644 --- a/src/core/systemd.pc.in +++ b/src/core/systemd.pc.in @@ -11,7 +11,7 @@ @@ -28,6 +28,3 @@ index 162432e77f..2fc20daf03 100644 root_prefix={{ROOTPREFIX_NOSLASH}} rootprefix=${root_prefix} sysconf_dir={{SYSCONF_DIR}} --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch new file mode 100644 index 0000000000..f4925437aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-inherit-systemd-environment-when-calling-generators.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Yuriy Taraday +Date: Fri, 17 Jun 2022 12:45:10 +0000 +Subject: [PATCH] inherit systemd environment when calling generators. + +Systemd generators need access to the environment configured in +stage-2-init.sh since it schedules fsck and mkfs executions based on +being able to find an appropriate binary for the target filesystem. + +With this commit I am altering the systemd behaviour since upstream +tries to gather environments with that they call +"environment-generators" and then seems to pass that on to all the other +executables that are being called from managers. +--- + src/core/manager.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/core/manager.c b/src/core/manager.c +index 71ef7f27b4..33ded94a7c 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -3704,9 +3704,17 @@ static int build_generator_environment(Manager *m, char ***ret) { + * adjust generated units to that. Let's pass down some bits of information that are easy for us to + * determine (but a bit harder for generator scripts to determine), as environment variables. */ + ++ // On NixOS we must propagate PATH to generators so they are ++ // able to find binaries such as `fsck.${fstype}` and ++ // `mkfs.${fstype}`. That is why we ignore transient_environment that ++ // overrides the PATH variable. This propagates systemd's ++ // environment (e.g. PATH) that was setup ++ // before calling systemd from stage-2-init.sh. ++#if 0 + nl = strv_copy(m->transient_environment); + if (!nl) + return -ENOMEM; ++#endif + + r = strv_env_assign(&nl, "SYSTEMD_SCOPE", MANAGER_IS_SYSTEM(m) ? "system" : "user"); + if (r < 0) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch deleted file mode 100644 index 916f95e194..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0019-core-handle-lookup-paths-being-symlinks.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 169fc6f270ff3e3903a7a31550c964152f9751ec Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold -Date: Wed, 18 Aug 2021 19:10:08 +0200 -Subject: [PATCH 19/19] core: handle lookup paths being symlinks - -With a recent change paths leaving the statically known lookup paths -would be treated differently then those that remained within those. That -was done (AFAIK) to consistently handle alias names. Unfortunately that -means that on some distributions, especially those where /etc/ consists -mostly of symlinks, would trigger that new detection for every single -unit in /etc/systemd/system. The reason for that is that the units -directory itself is already a symlink. ---- - src/basic/unit-file.c | 33 +++++++++++++++++++++++++++++++-- - 1 file changed, 31 insertions(+), 2 deletions(-) - -diff --git a/src/basic/unit-file.c b/src/basic/unit-file.c -index 30c632dfce..6179100126 100644 ---- a/src/basic/unit-file.c -+++ b/src/basic/unit-file.c -@@ -255,6 +255,7 @@ int unit_file_build_name_map( - - _cleanup_hashmap_free_ Hashmap *ids = NULL, *names = NULL; - _cleanup_set_free_free_ Set *paths = NULL; -+ _cleanup_strv_free_ char **expanded_search_paths = NULL; - uint64_t timestamp_hash; - char **dir; - int r; -@@ -274,6 +275,34 @@ int unit_file_build_name_map( - return log_oom(); - } - -+ /* Go over all our search paths, chase their symlinks and store the -+ * result in the expanded_search_paths list. -+ * -+ * This is important for cases where any of the unit directories itself -+ * are symlinks into other directories and would therefore cause all of -+ * the unit files to be recognized as linked units. -+ * -+ * This is important for distributions such as NixOS where most paths -+ * in /etc/ are symlinks to some other location on the filesystem (e.g. -+ * into /nix/store/). -+ */ -+ STRV_FOREACH(dir, (char**) lp->search_path) { -+ _cleanup_free_ char *resolved_dir = NULL; -+ r = strv_extend(&expanded_search_paths, *dir); -+ if (r < 0) -+ return log_oom(); -+ -+ r = chase_symlinks(*dir, NULL, 0, &resolved_dir, NULL); -+ if (r < 0) { -+ if (r != -ENOENT) -+ log_warning_errno(r, "Failed to resolve symlink %s, ignoring: %m", *dir); -+ continue; -+ } -+ -+ if (strv_consume(&expanded_search_paths, TAKE_PTR(resolved_dir)) < 0) -+ return log_oom(); -+ } -+ - STRV_FOREACH(dir, (char**) lp->search_path) { - _cleanup_closedir_ DIR *d = NULL; - -@@ -386,11 +415,11 @@ int unit_file_build_name_map( - continue; - } - -- /* Check if the symlink goes outside of our search path. -+ /* Check if the symlink goes outside of our (expanded) search path. - * If yes, it's a linked unit file or mask, and we don't care about the target name. - * Let's just store the link source directly. - * If not, let's verify that it's a good symlink. */ -- char *tail = path_startswith_strv(simplified, lp->search_path); -+ char *tail = path_startswith_strv(simplified, expanded_search_paths); - if (!tail) { - log_debug("%s: linked unit file: %s → %s", - __func__, filename, simplified); --- -2.34.0 - diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index 5007895c00..348f0e1134 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -127,13 +127,13 @@ assert withCryptsetup -> (cryptsetup != null); let wantCurl = withRemote || withImportd; wantGcrypt = withResolved || withImportd; - version = "250.4"; + version = "251.3"; # Bump this variable on every (major) version change. See below (in the meson options list) for why. # command: # $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \ # jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime' - releaseTimestamp = "1640290180"; + releaseTimestamp = "1653143108"; in stdenv.mkDerivation { inherit pname version; @@ -144,12 +144,13 @@ stdenv.mkDerivation { owner = "systemd"; repo = "systemd-stable"; rev = "v${version}"; - sha256 = "sha256-AdzPh7dGVrGbbjL9+PqytQOpRzNDUUEftmKZAbFH3L4="; + sha256 = "sha256-vcj+k/duRID2R+wGQIyq+dVRrFYNQTsjHya6k0hmZxk="; }; # On major changes, or when otherwise required, you *must* reformat the patches, # `git am path/to/00*.patch` them into a systemd worktree, rebase to the more recent - # systemd version, and export the patches again via `git -c format.signoff=false format-patch v${version}`. + # systemd version, and export the patches again via + # `git -c format.signoff=false format-patch v${version} --no-numbered --zero-commit --no-signature`. # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all patches patches = [ ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -163,55 +164,33 @@ stdenv.mkDerivation { ./0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch ./0010-localectl-use-etc-X11-xkb-for-list-x11.patch ./0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch - ./0012-inherit-systemd-environment-when-calling-generators.patch - ./0013-add-rootprefix-to-lookup-dir-paths.patch - ./0014-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch - ./0015-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch - ./0016-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch - ./0017-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch - ./0018-pkg-config-derive-prefix-from-prefix.patch - - # In v248 or v249 we started to get in trouble due to our - # /etc/systemd/system being a symlink and thus being treated differently by - # systemd. With the below patch we mitigate that effect by special casing - # all our root unit dirs if they are symlinks. This does exactly what we - # need (AFAICT). - # See https://github.com/systemd/systemd/pull/20479 for upstream discussion. - ./0019-core-handle-lookup-paths-being-symlinks.patch - - # fixes reproducability of dbus xml files - # Should no longer be necessary with v251. - (fetchpatch { - url = "https://github.com/systemd/systemd/pull/22174.patch"; - sha256 = "sha256-RVhxUEUiISgRlIP/AhU+w1VHfDQw2W16cFl2TXXyxno="; - }) + ./0012-add-rootprefix-to-lookup-dir-paths.patch + ./0013-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch + ./0014-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch + ./0015-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch + ./0016-pkg-config-derive-prefix-from-prefix.patch + ./0017-inherit-systemd-environment-when-calling-generators.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-7e35a575ef09a85e625a81e0b4d80b020e3e3a92.tar.bz2"; - sha256 = "0dvz4685nk0y7nnq3sr2q8ab3wfx0bi8ilwcgn0h6kagwcnav2n8"; + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-86a33f98a7c0d6f2c2b51d02ba9e01b63062cf98.tar.bz2"; + sha256 = "081j01sw21hl405l7g9z4bavvq0q0k4g80365677m0ykhiqlx3am"; }; musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; in [ - (musl-patches + "/0002-don-t-use-glibc-specific-qsort_r.patch") - (musl-patches + "/0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch") + (musl-patches + "/0003-missing_type.h-add-comparison_fn_t.patch") (musl-patches + "/0004-add-fallback-parse_printf_format-implementation.patch") (musl-patches + "/0005-src-basic-missing.h-check-for-missing-strndupa.patch") (musl-patches + "/0007-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch") (musl-patches + "/0008-add-missing-FTW_-macros-for-musl.patch") - (musl-patches + "/0009-fix-missing-of-__register_atfork-for-non-glibc-build.patch") (musl-patches + "/0010-Use-uintmax_t-for-handling-rlim_t.patch") (musl-patches + "/0011-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch") (musl-patches + "/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch") (musl-patches + "/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch") (musl-patches + "/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch") (musl-patches + "/0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch") - (musl-patches + "/0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch") - (musl-patches + "/0017-missing_type.h-add-__compar_d_fn_t-definition.patch") (musl-patches + "/0018-avoid-redefinition-of-prctl_mm_map-structure.patch") - (musl-patches + "/0019-Handle-missing-LOCK_EX.patch") - (musl-patches + "/0021-test-json.c-define-M_PIl.patch") (musl-patches + "/0022-do-not-disable-buffer-in-writing-files.patch") (musl-patches + "/0025-Handle-__cpu_mask-usage.patch") (musl-patches + "/0026-Handle-missing-gshadow.patch") @@ -226,8 +205,8 @@ stdenv.mkDerivation { substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" substituteInPlace src/boot/efi/meson.build \ --replace \ - "find_program('objcopy'" \ - "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" + "run_command(cc.cmd_array(), '-print-prog-name=objcopy', check: true).stdout().strip()" \ + "'${stdenv.cc.bintools.targetPrefix}objcopy'" '' + ( let # The following patches references to dynamic libraries to ensure that @@ -547,6 +526,7 @@ stdenv.mkDerivation { "src/analyze/test-verify.c" "src/test/test-env-file.c" "src/test/test-fileio.c" + "src/test/test-load-fragment.c" ]; } { @@ -573,29 +553,39 @@ stdenv.mkDerivation { replacement = "\\\"${gnutar}/bin/tar\\\""; where = [ "src/import/export-tar.c" - "src/import/export.c" "src/import/import-common.c" "src/import/import-tar.c" + ]; + ignore = [ + # occurences here refer to the tar sub command + "src/sysupdate/sysupdate-resource.c" + "src/sysupdate/sysupdate-transfer.c" + "src/import/pull.c" + "src/import/export.c" "src/import/import.c" "src/import/importd.c" + # runs `tar` but also also creates a temporary directory with the string "src/import/pull-tar.c" - "src/import/pull.c" ]; } ]; # { replacement, search, where } -> List[str] - mkSubstitute = { replacement, search, where }: + mkSubstitute = { replacement, search, where, ignore ? [] }: map (path: "substituteInPlace ${path} --replace '${search}' \"${replacement}\"") where; - mkEnsureSubstituted = { replacement, search, where }: - '' - if [[ $(grep -r '${search}' | grep -v "${replacement}" | grep -Ev 'NEWS|^test/' | wc -l) -gt 0 ]]; then - echo "Not all references to '${search}' have been replaced. Found the following matches:" - grep '${search}' -r | grep -v "${replacement}" | grep -Ev 'NEWS|^test/' - exit 1 - fi - ''; - + mkEnsureSubstituted = { replacement, search, where, ignore ? [] }: + let + ignore' = lib.concatStringsSep "|" (ignore ++ ["^test" "NEWS"]); + in '' + set +e + search=$(grep '${search}' -r | grep -v "${replacement}" | grep -Ev "${ignore'}") + set -e + if [[ -n "$search" ]]; then + echo "Not all references to '${search}' have been replaced. Found the following matches:" + echo "$search" + exit 1 + fi + ''; in '' mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") @@ -606,6 +596,9 @@ stdenv.mkDerivation { substituteInPlace src/libsystemd/sd-journal/catalog.c \ --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ + + substituteInPlace src/import/pull-tar.c \ + --replace 'wait_for_terminate_and_check("tar"' 'wait_for_terminate_and_check("${gnutar}/bin/tar"' ''; # These defines are overridden by CFLAGS and would trigger annoying diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix index e16c2dffe5..5ef0b0b0ea 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tiscamera/default.nix @@ -108,10 +108,6 @@ stdenv.mkDerivation rec { "-DTCAM_INTERNAL_ARAVIS=OFF" "-DTCAM_ARAVIS_USB_VISION=${if withAravis && withAravisUsbVision then "ON" else "OFF"}" "-DTCAM_INSTALL_FORCE_PREFIX=ON" - # There are gobject introspection commands launched as part of the build. Those have a runtime - # dependency on `libtcam` (which itself is built as part of this build). In order to allow - # that, we set the dynamic linker's path to point on the build time location of the library. - "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix index 2ef6d8c824..ae24c4db6e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/upower/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "upower"; - version = "0.99.19"; + version = "1.90.0"; outputs = [ "out" "dev" ] ++ lib.optionals withDocs [ "devdoc" ]; @@ -37,18 +37,9 @@ stdenv.mkDerivation rec { owner = "upower"; repo = "upower"; rev = "v${version}"; - sha256 = "gpLsBh4jgiDO8bxic2BTFhjIwc2q/tuAIxykTHqK6UM="; + hash = "sha256-+C/4dDg6WTLpBgkpNyxjthSdqYdaTLC8vG6jG1LNJ7w="; }; - patches = [ - # Fix test - # https://gitlab.freedesktop.org/upower/upower/-/merge_requests/150 - (fetchpatch { - url = "https://gitlab.freedesktop.org/upower/upower/-/commit/a78ee6039054770b466749f8ec4bfbe4c278d697.patch"; - sha256 = "aUPXnr/2PlOZNb7mQl43hmKe01DtuBUrGnqvwBFRf7Q="; - }) - ]; - strictDeps = true; depsBuildBuild = [ @@ -73,6 +64,8 @@ stdenv.mkDerivation rec { libusb1 udev systemd + # Duplicate from checkInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved + umockdev ] ++ lib.optionals useIMobileDevice [ libimobiledevice ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix index 51eb20ecac..cb323e623b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/util-linux/default.nix @@ -8,15 +8,17 @@ , systemdSupport ? stdenv.isLinux && !stdenv.hostPlatform.isStatic , systemd , nlsSupport ? true +, translateManpages ? true +, po4a }: stdenv.mkDerivation rec { pname = "util-linux" + lib.optionalString (!nlsSupport && !ncursesSupport && !systemdSupport) "-minimal"; - version = "2.37.4"; + version = "2.38"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/util-linux-${version}.tar.xz"; - sha256 = "sha256-Y05pFq2RM2bDU2tkaOeER2lUm5mnsr+AMU3nirVlW4M="; + hash = "sha256-bREcvk1VszbbLx++/7xluJkIcEwBE2Nx0yqpvsNz62Q="; }; patches = [ @@ -51,6 +53,7 @@ stdenv.mkDerivation rec { (lib.withFeature systemdSupport "systemd") (lib.withFeatureAs systemdSupport "systemdsystemunitdir" "${placeholder "bin"}/lib/systemd/system/") + (lib.enableFeature translateManpages "poman") "SYSCONFSTATICDIR=${placeholder "lib"}/lib" ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "scanf_cv_type_modifier=ms" @@ -62,7 +65,9 @@ stdenv.mkDerivation rec { "usrsbin_execdir=${placeholder "bin"}/sbin" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config ] + ++ lib.optionals translateManpages [ po4a ]; + buildInputs = [ zlib ] ++ lib.optionals pamSupport [ pam ] ++ lib.optionals capabilitiesSupport [ libcap_ng ] diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/vdo/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/vdo/default.nix index 1904445d4c..d9033e6587 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/vdo/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/vdo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "vdo"; - version = "8.1.1.360"; # kvdo uses this! + version = "8.2.0.2"; # kvdo uses this! src = fetchFromGitHub { owner = "dm-vdo"; repo = pname; rev = version; - sha256 = "1zp8aaw0diramnlx5z96jcpbm6x0r204xf1vwq6k21rzcazczkwv"; + hash = "sha256-IP/nL4jQ+rIWuUxXUiBtlIKTMZCNelvxgTfTcaB1it0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-wacom/default.nix index 80762aa784..af1dc126bf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xf86-input-wacom"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "linuxwacom"; repo = pname; rev = "${pname}-${version}"; - sha256 = "sha256-WitvT1y9KpXJriMr6Z9CrmAQdKPBZ5g9fP2nIgzJzAc="; + sha256 = "sha256-AYjO7B0Z6G1JqpLdvm9LS+ujz7iUp8UwZ9X1WQ/dGk0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xmm7360-pci/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xmm7360-pci/default.nix deleted file mode 100644 index 435ff94afb..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/xmm7360-pci/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, kernel, perl, bc, breakpointHook }: - -stdenv.mkDerivation rec { - pname = "xmm7360-pci"; - version = "unstable-2021-07-19"; - - src = fetchFromGitHub { - owner = "xmm7360"; - repo = "xmm7360-pci"; - rev = "7086b80bb609180b1b89fb478751e5e8414ab64f"; - sha256 = "1wdb0phqg9rj9g9ycqdya0m7lx24kzjlh25yw0ifp898ddxrrr0c"; - }; - - makeFlags = kernel.makeFlags ++ [ - "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" - "INSTALL_MOD_PATH=${placeholder "out"}" - ]; - - nativeBuildInputs = kernel.moduleBuildDependencies; - installFlags = [ "DEPMOD=true" ]; - - meta = with lib; { - homepage = "https://github.com/xmm7360/xmm7360-pci"; - description = "PCI driver for Fibocom L850-GL modem based on Intel XMM7360 modem"; - downloadPage = "https://github.com/xmm7360/xmm7360-pci"; - license = licenses.isc; - maintainers = with maintainers; [ flokli hexa ]; - platforms = platforms.linux; - broken = kernel.kernelOlder "4.10" || kernel.kernelAtLeast "5.14"; - }; -} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix index f04ccc569d..71bafb7abd 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/xone/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, kernel, fetchurl }: stdenv.mkDerivation rec { - name = "xone-${version}-${kernel.version}"; - version = "0.2"; + pname = "xone"; + version = "0.3"; src = fetchFromGitHub { owner = "medusalix"; - repo = "xone"; - rev = "v${version}"; - sha256 = "sha256-m4305Xl5w4nyAVqubjwWsiyPDVtfGykjlSW2eKEytVk="; + repo = pname; + rev = "refs/tags/v${version}"; + sha256 = "sha256-h+j4xCV9R6hp9trsv1NByh9m0UBafOz42ZuYUjclILE="; }; setSourceRoot = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix index c5aa09a886..623b881cd0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/xpadneo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "xpadneo"; - version = "0.9.1"; + version = "0.9.4"; src = fetchFromGitHub { owner = "atar-axis"; repo = pname; - rev = "v${version}"; - hash = "sha256-VUcS4OzvPj0o627ZWIOBqEAQJ4JuMCMjgaZoMkL/IHc="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-4zd+x9uYl0lJgePM9LEgLYFqvcw6VPF/CbR1XiYSwGE="; }; setSourceRoot = '' @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Advanced Linux driver for Xbox One wireless controllers"; homepage = "https://atar-axis.github.io/xpadneo"; - license = licenses.gpl3Plus; + license = licenses.gpl3Only; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index eec2d1ad04..5d55d1db65 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -203,7 +203,7 @@ let changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = lib.licenses.cddl; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman fpletz globin ]; + maintainers = with lib.maintainers; [ hmenke jcumming jonringer wizeman globin ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. # On NixOS set the option boot.zfs.enableUnstable. diff --git a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix index d51219e69a..d781f1c503 100644 --- a/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/solo5/default.nix @@ -2,7 +2,7 @@ , pkg-config, qemu, syslinux, util-linux }: let - version = "0.6.9"; + version = "0.7.3"; # list of all theoretically available targets targets = [ "genode" @@ -21,14 +21,16 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Solo5/solo5/releases/download/v${version}/solo5-v${version}.tar.gz"; - sha256 = "03lvk9mab3yxrmi73wrvvhykqcydjrsda0wj6aasnjm5lx9jycpr"; + sha256 = "sha256-8LftT22XzmmWxgYez+BAHDX4HOyl5DrwrpuO2+bqqcY="; }; + patches = [ ./test_sleep.patch ]; + hardeningEnable = [ "pie" ]; configurePhase = '' runHook preConfigure - sh configure.sh + sh configure.sh --prefix=/ runHook postConfigure ''; @@ -38,15 +40,7 @@ in stdenv.mkDerivation { runHook preInstall export DESTDIR=$out export PREFIX=$out - make install-tools - - # get CONFIG_* vars from Makeconf which also parse in sh - grep '^CONFIG_' Makeconf > nix_tmp_targetconf - source nix_tmp_targetconf - # install opam / pkg-config files for all enabled targets - ${lib.concatMapStrings (bind: '' - [ -n "$CONFIG_${lib.toUpper bind}" ] && make install-opam-${bind} - '') targets} + make install substituteInPlace $out/bin/solo5-virtio-mkimage \ --replace "/usr/lib/syslinux" "${syslinux}/share/syslinux" \ diff --git a/third_party/nixpkgs/pkgs/os-specific/solo5/test_sleep.patch b/third_party/nixpkgs/pkgs/os-specific/solo5/test_sleep.patch new file mode 100644 index 0000000000..f86a83d09d --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/solo5/test_sleep.patch @@ -0,0 +1,22 @@ +diff --git a/tests/test_time/test_time.c b/tests/test_time/test_time.c +index 931500b..cde64ad 100644 +--- a/tests/test_time/test_time.c ++++ b/tests/test_time/test_time.c +@@ -110,7 +110,8 @@ int solo5_app_main(const struct solo5_start_info *si __attribute__((unused))) + /* + * Verify that we did not sleep less than requested (see above). + */ +- if (delta < NSEC_PER_SEC) { ++ const solo5_time_t slack = 100000000ULL; ++ if (delta < NSEC_PER_SEC - slack) { + printf("[%d] ERROR: slept too little (expected at least %llu ns)\n", + iters, (unsigned long long)NSEC_PER_SEC); + failed = true; +@@ -120,7 +121,6 @@ int solo5_app_main(const struct solo5_start_info *si __attribute__((unused))) + * Verify that we did not sleep more than requested, within reason + * (scheduling delays, general inaccuracy of the current timing code). + */ +- const solo5_time_t slack = 100000000ULL; + if (delta > (NSEC_PER_SEC + slack)) { + printf("[%d] ERROR: slept too much (expected at most %llu ns)\n", + iters, (unsigned long long)slack); diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix index e7689ca797..35ffe2d5dc 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-PYq6AKX3Ifo8vMnPYGjqHwFejOBuQjhfDG5nXnccfvE="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-SLGzciTzzvW0DTG8v6lNb1IovbOjxBFgFVjNY6MEyKY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-ep5/VMO7LmfD6+chG2SGwkc5awoeqACQeP04YpMXI1s="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-d7hnCM7BJuYfSH89jv516uVyKTMueQmVKQxEeTGIDUE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-rD5UDkAMeBfnrEpxfZWgDQEUN+82D6Ul2gjclS8A8CU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-wTmUF6NHWis4dyw/bPjAjvZ0aQ1l1BCDlm6eLu4m/0o="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-buBp5WZ1jIzQDbxzVOZC/t3iv1Dw0P/PN3wGBbGaYvU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-Mxe9Gb1ErrZZl3a+0SqC/0ghoeV51X93YxIOs9gM2lY="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-d6Z46L6qeXi5UNPY3/nlTJvVCuQ0lamtR49Z73O87Wc="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-SyHuzXAe24Nf0v9Ds3Z+cbXoIVLCJSj243I6B0XWBlM="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.9/AdGuardHome_linux_arm64.tar.gz"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix index 66b8b12e09..374eaad1bf 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.8"; + version = "0.107.9"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/alps/default.nix b/third_party/nixpkgs/pkgs/servers/alps/default.nix index 2d842165d1..2a98b97170 100644 --- a/third_party/nixpkgs/pkgs/servers/alps/default.nix +++ b/third_party/nixpkgs/pkgs/servers/alps/default.nix @@ -13,6 +13,20 @@ buildGoModule rec { vendorSha256 = "sha256-cpY+lYM/nAX3nUaFknrRAavxDk8UDzJkoqFjJ1/KWeg="; + ldflags = [ + "-X main.themesPath=${placeholder "out"}/share/alps/themes" + "-X git.sr.ht/~migadu/alps.PluginDir=${placeholder "out"}/share/alps/plugins" + ]; + + postPatch = '' + substituteInPlace plugin.go --replace "const PluginDir" "var PluginDir" + ''; + + postInstall = '' + mkdir -p "$out/share/alps" + cp -r themes plugins "$out/share/alps/" + ''; + proxyVendor = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix index ed8447accf..8ea89293a3 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/confluence.nix @@ -6,7 +6,14 @@ assert withMysql -> (mysql_jdbc != null); -stdenvNoCC.mkDerivation rec { +let + optionalWarning = cond: msg: + if cond then lib.warn msg + else lib.id; +in + +optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated!" +(stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; version = "7.18.1"; @@ -45,6 +52,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://www.atlassian.com/software/confluence"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = with maintainers; [ fpletz globin willibutz ciil techknowlogick ]; + maintainers = with maintainers; [ globin willibutz ciil techknowlogick ma27 ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix b/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix index f62abe805c..918aec8e16 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix @@ -1,13 +1,20 @@ { lib, stdenv, fetchurl, home ? "/var/lib/crowd" , port ? 8092, proxyUrl ? null, openidPassword ? "WILL_NEVER_BE_SET" }: -stdenv.mkDerivation rec { +let + optionalWarning = cond: msg: + if cond then lib.warn msg + else lib.id; +in + +optionalWarning (openidPassword != "WILL_NEVER_BE_SET") "Using `crowdProperties` is deprecated!" +(stdenv.mkDerivation rec { pname = "atlassian-crowd"; - version = "4.4.0"; + version = "5.0.1"; src = fetchurl { url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz"; - sha256 = "0ipfvdjs8v02y37rmihljy9lkb3ycz5hyc14mcg65ilsscsq3x91"; + sha256 = "sha256-ccXSNuiXP0+b9WObboikqVd0nKH0Fi2gMVEF3+WAx5M="; }; buildPhase = '' @@ -44,6 +51,6 @@ stdenv.mkDerivation rec { description = "Single sign-on and identity management tool"; homepage = "https://www.atlassian.com/software/crowd"; license = licenses.unfree; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ globin ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix index 5b4d9d695f..fcb709d7f4 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "Proprietary issue tracking product, also providing project management functions"; homepage = "https://www.atlassian.com/software/jira"; license = licenses.unfree; - maintainers = with maintainers; [ fpletz globin ciil megheaiulian techknowlogick ma27 ]; + maintainers = with maintainers; [ globin ciil megheaiulian techknowlogick ma27 ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/bird/default.nix b/third_party/nixpkgs/pkgs/servers/bird/default.nix index 4ea9d6a030..8b0de8f538 100644 --- a/third_party/nixpkgs/pkgs/servers/bird/default.nix +++ b/third_party/nixpkgs/pkgs/servers/bird/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "BIRD Internet Routing Daemon"; homepage = "http://bird.network.cz"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ globin ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix index 9e7a9cae17..1505f6894a 100644 --- a/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix +++ b/third_party/nixpkgs/pkgs/servers/calibre-web/default.nix @@ -55,10 +55,12 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace setup.cfg \ --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-Login>=0.3.2,<0.5.1" "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" \ + --replace "tornado>=4.1,<6.2" "tornado>=4.1,<7" \ --replace "PyPDF3>=1.0.0,<1.0.7" "PyPDF3>=1.0.0" \ --replace "requests>=2.11.1,<2.28.0" "requests" \ --replace "unidecode>=0.04.19,<1.4.0" "unidecode>=0.04.19" \ diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix index b64d8b1e44..ace84a58f0 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool, curl , python3, munge, perl, pam, shadow, coreutils, dbus, libbpf -, ncurses, libmysqlclient, gtk2, lua, hwloc, numactl +, ncurses, libmysqlclient, lua, hwloc, numactl , readline, freeipmi, xorg, lz4, rdma-core, nixosTests , pmix , libjwt @@ -9,11 +9,12 @@ , http-parser # enable internal X11 support via libssh2 , enableX11 ? true +, enableGtk2 ? false, gtk2 }: stdenv.mkDerivation rec { pname = "slurm"; - version = "22.05.2.1"; + version = "22.05.3.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1zfv5n7cqqn3c78h2svjazbdkdchyrk54prn2bq5diw80wgcmyrc"; + sha256 = "113l23zf98r2rz4smyb0lk68p5jj2gx2y2j11vvf5wq4apzyz8jf"; }; outputs = [ "out" "dev" ]; @@ -51,11 +52,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libtool python3 perl ]; buildInputs = [ curl python3 munge pam - libmysqlclient ncurses gtk2 lz4 rdma-core + libmysqlclient ncurses lz4 rdma-core lua hwloc numactl readline freeipmi shadow.su pmix json_c libjwt libyaml dbus libbpf http-parser - ] ++ lib.optionals enableX11 [ xorg.xauth ]; + ] ++ lib.optionals enableX11 [ xorg.xauth ] + ++ lib.optionals enableGtk2 [ gtk2 ]; configureFlags = with lib; [ "--with-freeipmi=${freeipmi}" @@ -70,7 +72,7 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc/slurm" "--with-pmix=${pmix}" "--with-bpf=${libbpf}" - ] ++ (optional (gtk2 == null) "--disable-gtktest") + ] ++ (optional enableGtk2 "--disable-gtktest") ++ (optional (!enableX11) "--disable-x11"); diff --git a/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix b/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix index d1dfdd98c8..61c9d40c14 100644 --- a/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix +++ b/third_party/nixpkgs/pkgs/servers/confluent-platform/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "confluent-platform"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor version}/confluent-${version}.tar.gz"; - sha256 = "sha256-TtHPsrkmZ53mNL+/Ru2eHb0RKoXW/xSagrD6HF2s5ew="; + sha256 = "sha256-vflWZjW8RwaDOwEFy8GHRfcmsHcRKxs8WwFfT66SIM4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index d6545756b5..7d69103282 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.12.3"; + version = "1.13.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-QCSlRGbYCOOS81M7sl8Skr1/DhEX+U+0dCroWydzifw="; + sha256 = "sha256-bPLVQ5XvOk6cWtjHNtvZ3McM2SKVbjY6280rIldInpQ="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-3WjmAbY7AVApZZXdCfbjr2X9I8vvwR2EfNmCJv9Gk6A="; + vendorSha256 = "sha256-bPfS8hoH45ad34CsR+9WLEDCDsx1E/ZKdipVZqirfDY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix b/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix index a7759191a1..07458c40b8 100644 --- a/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "dcnnt"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-LP3tOInpqVpO/BWla7/gZCGUUZ/1J8dHegGa0hRiRDQ="; + sha256 = "sha256-vKCQgg0m58hoN79WcZ4mM6bjCJOPxhAT4ifZ3b/5bkA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix index e5adfd2422..c5fab10b24 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix @@ -52,7 +52,12 @@ stdenv.mkDerivation rec { doCheck = false; # requires root and the net - passthru.tests = { inherit (nixosTests) bind; }; + passthru.tests = { + inherit (nixosTests) bind; + prometheus-exporter = nixosTests.prometheus-exporters.bind; + kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node; + kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node; + }; meta = with lib; { homepage = "https://www.isc.org/bind/"; diff --git a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix index 20f7f831bd..23fefe80e7 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/knot-dns/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.1.8"; + version = "3.1.9"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "767e458a56277a1270b359294c3be6c63fd734884d62a045e01756a46507aa94"; + sha256 = "sha256-s8pPHUROlf8n0gltPMWkfBDB1poeSIWuipcngfYnnYI="; }; outputs = [ "bin" "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix index 8feae334be..2778ac9b71 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix @@ -107,7 +107,5 @@ buildGoModule { homepage = "https://github.com/namecoin/ncdns"; license = licenses.gpl3Plus; maintainers = with maintainers; [ rnhmjoj ]; - # module github.com/btcsuite/btcd@latest found (v0.23.1), but does not contain package github.com/btcsuite/btcd/btcec - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix index 251e442457..4eeb47870f 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-z81v3Zk0TKWn73wpQMJBvO9HH8MlK6PcvUxX4GOOiDY="; + sha256 = "sha256-CQYtm4Pfzd5OTlPsNhVJbWjCgh2DgdDUZOvqMaWXXIE="; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix index fedec6213f..ded457c43a 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1329ycxavhkx963q0c6rqyzlg0689v5rrmjlydiw6px324djm1z4"; + sha256 = "sha256-0vlFc6bw5joQNMorMBwn6/LhMAplW6ZpzFAtXqjW7Gg="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/echoip/default.nix b/third_party/nixpkgs/pkgs/servers/echoip/default.nix index 840d7a2d4e..91e0818a9c 100644 --- a/third_party/nixpkgs/pkgs/servers/echoip/default.nix +++ b/third_party/nixpkgs/pkgs/servers/echoip/default.nix @@ -1,28 +1,36 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +}: buildGoModule { pname = "echoip"; - version = "unstable-2019-07-12"; + version = "unstable-2021-08-03"; src = fetchFromGitHub { owner = "mpolden"; repo = "echoip"; - rev = "fb5fac92d2173c2a5b07ed4ecc7b5fefe8484ed2"; - sha256 = "17gkh1qfxasvxy25lmjdwk5fsjkcp7lmw9si3xzf01m7qnj5zi4b"; + rev = "ffa6674637a5bf906d78ae6675f9a4680a78ab7b"; + sha256 = "sha256-yN7PIwoIi2SPwwFWnHDoXnwvKohkPPf4kVsNxHLpqCE="; }; - vendorSha256 = "0vvs717pl5gzggxpbn2vkyxmpiw5zjdfnpbh8i81xidbqvlnm22h"; + vendorSha256 = "sha256-lXYpkeGpBK+WGHqyLxJz7kS3t7a55q55QQLTqtxzroc="; - outputs = [ "out" "index" ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' - mkdir -p $index - cp $src/index.html $index/index.html + install -D html/* -t $out/share/echoip/html + wrapProgram $out/bin/echoip \ + --add-flags "-t $out/share/echoip/html" ''; + doCheck = false; + meta = with lib; { + description = "IP address lookup service"; homepage = "https://github.com/mpolden/echoip"; license = licenses.bsd3; - maintainers = with maintainers; [ rvolosatovs ]; + maintainers = with maintainers; [ rvolosatovs SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix b/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix index 320d5c4137..ffd8c355b8 100644 --- a/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix @@ -5,18 +5,16 @@ buildGoModule rec { pname = "endlessh-go"; - version = "20220710"; + version = "20220731"; src = fetchFromGitHub { owner = "shizunge"; repo = "endlessh-go"; rev = version; - sha256 = "sha256-T8DLzHfITMLeHJtKuK4AjEzGGCIDJUPlqF2Lj56xPxY="; + sha256 = "sha256-xV9VCbpd6JC/m3RXJt0v8WCCGs8UpZLvAv3bzPRrae4="; }; - vendorSha256 = "sha256-hMCjYAqsI6h9B8iGVYQcNbKU5icalOHavvPKwOmvf/w="; - - proxyVendor = true; + vendorSha256 = "sha256-YGVLntDnOX55IoIHIn0z1K7V/PhRLruEASfAGQsTUkk="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/servers/etcd/3.3.nix b/third_party/nixpkgs/pkgs/servers/etcd/3.3.nix index 4dbe693297..44edfd76a2 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/3.3.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/3.3.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoPackage, fetchFromGitHub, nixosTests, stdenv }: buildGoPackage rec { pname = "etcd"; @@ -31,5 +31,6 @@ buildGoPackage rec { license = licenses.asl20; homepage = "https://etcd.io/"; maintainers = with maintainers; [ offline zowoq ]; + broken = stdenv.isDarwin; # outdated golang.org/x/sys }; } diff --git a/third_party/nixpkgs/pkgs/servers/etcd/3.5.nix b/third_party/nixpkgs/pkgs/servers/etcd/3.5.nix index ff07116e2b..3de8fef118 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/3.5.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/3.5.nix @@ -1,15 +1,18 @@ { lib, buildGoModule, fetchFromGitHub, symlinkJoin }: let - etcdVersion = "3.5.4"; - etcdSrc = fetchFromGitHub { + version = "3.5.4"; + + src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; - rev = "v${etcdVersion}"; + rev = "v${version}"; sha256 = "sha256-mTQHxLLfNiihvHg5zaTeVNWKuzvE0KBiJdY3qMJHMCM="; }; - commonMeta = with lib; { + CGO_ENABLED = 0; + + meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; homepage = "https://etcd.io/"; @@ -19,60 +22,50 @@ let etcdserver = buildGoModule rec { pname = "etcdserver"; - version = etcdVersion; + + inherit CGO_ENABLED meta src version; vendorSha256 = "sha256-4djUQvWp9hScua9l1ZTq298zWSeDYRDojEt2AWmarzw="; - src = etcdSrc; modRoot = "./server"; postBuild = '' mv $GOPATH/bin/{server,etcd} ''; - CGO_ENABLED = 0; - # We set the GitSHA to `GitNotFound` to match official build scripts when # git is unavailable. This is to avoid doing a full Git Checkout of etcd. # User facing version numbers are still available in the binary, just not # the sha it was built from. ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ]; - - meta = commonMeta; }; etcdutl = buildGoModule rec { pname = "etcdutl"; - version = etcdVersion; + + inherit CGO_ENABLED meta src version; vendorSha256 = "sha256-nk56XGpNsDwcGrTKithKGnPCX0NhpQmzNSXHk3vmdtg="; - src = etcdSrc; modRoot = "./etcdutl"; - - CGO_ENABLED = 0; - - meta = commonMeta; }; etcdctl = buildGoModule rec { pname = "etcdctl"; - version = etcdVersion; + + inherit CGO_ENABLED meta src version; vendorSha256 = "sha256-WIMYrXfay6DMz+S/tIc/X4ffMizxub8GS1DDgIR40D4="; - src = etcdSrc; modRoot = "./etcdctl"; - - CGO_ENABLED = 0; - - meta = commonMeta; }; in symlinkJoin { - name = "etcd"; - version = etcdVersion; - meta = commonMeta; + name = "etcd-${version}"; + + inherit meta version; + + passthru = { inherit etcdserver etcdutl etcdctl; }; paths = [ etcdserver diff --git a/third_party/nixpkgs/pkgs/servers/freeradius/default.nix b/third_party/nixpkgs/pkgs/servers/freeradius/default.nix index 2ac3f3ec98..fb557bb73f 100644 --- a/third_party/nixpkgs/pkgs/servers/freeradius/default.nix +++ b/third_party/nixpkgs/pkgs/servers/freeradius/default.nix @@ -24,11 +24,11 @@ assert withRest -> withJson; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.0.25"; + version = "3.2.0"; src = fetchurl { url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz"; - hash = "sha256-SIOmi7PO5GAlNZqXwWkc5lXour/W3DwCHQDhCaL/TBA="; + hash = "sha256-QtGgoC7CrxRyjcdoySHUeAC8gwP0FyIetvMvBCNbBDE="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { homepage = "https://freeradius.org/"; description = "A modular, high performance free RADIUS suite"; license = licenses.gpl2; - maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann ]; + maintainers = with maintainers; [ sheenobu willibutz lheckemann ]; platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/gemini/gmid/default.nix b/third_party/nixpkgs/pkgs/servers/gemini/gmid/default.nix index 3f4a440746..754ab57c1c 100644 --- a/third_party/nixpkgs/pkgs/servers/gemini/gmid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gemini/gmid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gmid"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-vghoPsyGspPn22Kl61qiaALS2R243JSuS80uKFBHc9k="; + hash = "sha256-WI3EJEhhd0UwtbOhRpt+8XEHuG6YrKAcT4mO1caZ+hE="; }; nativeBuildInputs = [ bison ]; diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix index 0fc184e063..9c6d79fd3b 100644 --- a/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geoserver"; - version = "2.21.0"; + version = "2.21.1"; src = fetchurl { url = "mirror://sourceforge/geoserver/GeoServer/${version}/geoserver-${version}-bin.zip"; - sha256 = "sha256-UCr22Ffhnux6eA0w5qoaf5Hvuypsl/FGpK+emi8G0Mc="; + sha256 = "sha256-Ln7vHU/J80edOJbL3lAezXrk+jJQ2mGWY9+61GyiLXk="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/mapserver/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/mapserver/default.nix index 9ec9ad01bc..e643f790bb 100644 --- a/third_party/nixpkgs/pkgs/servers/geospatial/mapserver/default.nix +++ b/third_party/nixpkgs/pkgs/servers/geospatial/mapserver/default.nix @@ -47,6 +47,9 @@ stdenv.mkDerivation rec { "-DWITH_CURL=ON" "-DWITH_CLIENT_WMS=ON" "-DWITH_CLIENT_WFS=ON" + + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" ] ++ lib.optional withPython "-DWITH_PYTHON=ON"; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/pg_tileserv/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/pg_tileserv/default.nix index a380af0311..59d58a6a61 100644 --- a/third_party/nixpkgs/pkgs/servers/geospatial/pg_tileserv/default.nix +++ b/third_party/nixpkgs/pkgs/servers/geospatial/pg_tileserv/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pg_tileserv"; - version = "1.0.8"; + version = "1.0.9"; src = fetchFromGitHub { owner = "CrunchyData"; repo = pname; rev = "v${version}"; - sha256 = "07xj807cbggnh8k7d2i7h326p4wjb8sz5ng0hbdnznvyc4sb2cdw"; + sha256 = "sha256-pNm802DJu5t+Y9QZU6wDUcAVpJTZ4SxDK0J61wzuuRE="; }; - vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E="; + vendorSha256 = "sha256-iw9bIh1Ngj5IGhrZwmSPciyaAR73msZ283TB0ibwt+c="; ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/tile38/default.nix b/third_party/nixpkgs/pkgs/servers/geospatial/tile38/default.nix index 50342fef59..9389b45dea 100644 --- a/third_party/nixpkgs/pkgs/servers/geospatial/tile38/default.nix +++ b/third_party/nixpkgs/pkgs/servers/geospatial/tile38/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tile38"; - version = "1.28.0"; + version = "1.29.0"; src = fetchFromGitHub { owner = "tidwall"; repo = pname; rev = version; - sha256 = "sha256-Kac0iNqJFLLRR+Xu5GlxrsQqvim60uDlToe883++/7g="; + sha256 = "sha256-sb/DKfQ9dmItxKqICVjG5cslpf8lHzLcs5gd6ue/Zn8="; }; vendorSha256 = "sha256-/7dDPUXutyzkWq6EVVINFKzhuaiBCv5GrAF5pWG3ikc="; diff --git a/third_party/nixpkgs/pkgs/servers/gotty/default.nix b/third_party/nixpkgs/pkgs/servers/gotty/default.nix index d1e87412f7..87dbd296ba 100644 --- a/third_party/nixpkgs/pkgs/servers/gotty/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gotty/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gotty"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "sorenisanerd"; repo = "gotty"; rev = "v${version}"; - sha256 = "sha256-KkFnZ0j6rrzX2M+C0nVdSdta34B9rvL7cC0TOL38lGQ="; + sha256 = "sha256-Pi+opqNEKaw/2qWRqZkVAysMT4moLyEG5g9J/Z9pUDQ="; }; - vendorSha256 = "sha256-6SgF61LW5F/61cB2Yd4cyu3fmFhDooSTw9+NnIAo7lc="; + vendorSha256 = "sha256-XtqIiREtKg0LRnwOg8UyYrWUWJNQbCJUw+nVvaiN3GQ="; # upstream did not update the tests, so they are broken now # https://github.com/sorenisanerd/gotty/issues/13 diff --git a/third_party/nixpkgs/pkgs/servers/gpsd/default.nix b/third_party/nixpkgs/pkgs/servers/gpsd/default.nix index cf23ef9d2f..2bf07ff70a 100644 --- a/third_party/nixpkgs/pkgs/servers/gpsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gpsd/default.nix @@ -109,7 +109,6 @@ stdenv.mkDerivation rec { # remove binaries for x-less install because xgps sconsflag is partially broken postFixup = '' - ${if guiSupport then "" else "rm $out/bin/xgps*"} wrapPythonProgramsIn $out/bin "$out $pythonPath" ''; diff --git a/third_party/nixpkgs/pkgs/servers/hbase/default.nix b/third_party/nixpkgs/pkgs/servers/hbase/default.nix index 46521da885..40b5dc7e0b 100644 --- a/third_party/nixpkgs/pkgs/servers/hbase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hbase/default.nix @@ -21,7 +21,9 @@ let common = { version, hash, jdk ? jdk11_headless, tests }: installPhase = '' mkdir -p $out cp -R * $out - wrapProgram $out/bin/hbase --set-default JAVA_HOME ${jdk.home} + wrapProgram $out/bin/hbase --set-default JAVA_HOME ${jdk.home} \ + --run "test -d /etc/hadoop-conf && export HBASE_CONF_DIR=\''${HBASE_CONF_DIR-'/etc/hadoop-conf/'}" \ + --set-default HBASE_CONF_DIR "$out/conf/" ''; passthru = { inherit tests; }; diff --git a/third_party/nixpkgs/pkgs/servers/headscale/default.nix b/third_party/nixpkgs/pkgs/servers/headscale/default.nix index 8249eb6d98..41245cb681 100644 --- a/third_party/nixpkgs/pkgs/servers/headscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "headscale"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-ZgChln6jcxyEHbCy89kNnwd9qWcB0yDq05xFkM69WLs="; + sha256 = "sha256-uQpvIWK80+s/aFJQZGdSSrWsCwjvbpK9jLdmcFMAeLw="; }; - vendorSha256 = "sha256-0jZ37tmBG8E0HS/wbQyQvAKo1UKQdaZDa+OTGfGDAi4="; + vendorSha256 = "sha256-RzmnAh81BN4tbzAGzJbb6CMuws8kuPJDw7aPkRRnSS8="; ldflags = [ "-s" "-w" "-X github.com/juanfont/headscale/cmd/headscale/cli.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix index 82599cdcba..576df924ad 100644 --- a/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/heisenbridge/default.nix @@ -1,5 +1,20 @@ { lib, fetchFromGitHub, fetchpatch, python3 }: -python3.pkgs.buildPythonApplication rec { + +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; + sha256 = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU="; + }; + }); + }; + }; + +in python.pkgs.buildPythonApplication rec { pname = "heisenbridge"; version = "1.13.1"; @@ -14,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { echo "${version}" > heisenbridge/version.txt ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ aiohttp irc mautrix @@ -22,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { pyyaml ]; - checkInputs = with python3.pkgs; [ + checkInputs = with python.pkgs; [ pytestCheckHook ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 71d8971ddc..e8d156728d 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.7.4"; + version = "2022.8.3"; components = { "abode" = ps: with ps; [ abodepy @@ -85,6 +85,7 @@ boto3 ]; "ambee" = ps: with ps; [ + aiohttp-cors ambee ]; "amberelectric" = ps: with ps; [ @@ -107,7 +108,6 @@ "analytics" = ps: with ps; [ aiohttp-cors fnvhash - lru-dict sqlalchemy ]; "android_ip_webcam" = ps: with ps; [ @@ -124,6 +124,7 @@ "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ + aiohttp-cors ]; # missing inputs: anthemav "apache_kafka" = ps: with ps; [ aiokafka @@ -281,10 +282,16 @@ "bluesound" = ps: with ps; [ xmltodict ]; + "bluetooth" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + ]; "bluetooth_le_tracker" = ps: with ps; [ - pygatt - ] - ++ pygatt.optional-dependencies.GATTTOOL; + aiohttp-cors + bleak + bluetooth-adapters + ]; "bluetooth_tracker" = ps: with ps; [ bt-proximity pybluez @@ -489,11 +496,12 @@ aiodiscover aiohttp-cors async-upnp-client + bleak + bluetooth-adapters fnvhash hass-nabucasa home-assistant-frontend ifaddr - lru-dict pillow pyserial pyudev @@ -510,7 +518,6 @@ "demo" = ps: with ps; [ aiohttp-cors fnvhash - lru-dict sqlalchemy ]; "denon" = ps: with ps; [ @@ -711,7 +718,6 @@ "energy" = ps: with ps; [ aiohttp-cors fnvhash - lru-dict sqlalchemy ]; "enigma2" = ps: with ps; [ @@ -741,6 +747,9 @@ "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter "eq3btsmart" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters construct ]; # missing inputs: python-eq3bt "esphome" = ps: with ps; [ @@ -807,7 +816,6 @@ ]; "filter" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "fints" = ps: with ps; [ @@ -830,6 +838,9 @@ fixerio ]; "fjaraskupan" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters fjaraskupan ]; "fleetgo" = ps: with ps; [ @@ -856,6 +867,7 @@ pyflume ]; "flunearyou" = ps: with ps; [ + aiohttp-cors pyflunearyou ]; "flux" = ps: with ps; [ @@ -916,7 +928,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -944,7 +955,6 @@ ]; "generic_thermostat" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "geniushub" = ps: with ps; [ @@ -1024,6 +1034,12 @@ ]; "google_wifi" = ps: with ps; [ ]; + "govee_ble" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + govee-ble + ]; "gpsd" = ps: with ps; [ gps3 ]; @@ -1033,7 +1049,9 @@ "graphite" = ps: with ps; [ ]; "gree" = ps: with ps; [ + aiohttp-cors greeclimate + ifaddr ]; "greeneye_monitor" = ps: with ps; [ greeneye-monitor @@ -1063,7 +1081,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1079,7 +1096,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1109,12 +1125,10 @@ "history" = ps: with ps; [ aiohttp-cors fnvhash - lru-dict sqlalchemy ]; "history_stats" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "hitron_coda" = ps: with ps; [ @@ -1135,11 +1149,13 @@ ]; "homeassistant" = ps: with ps; [ ]; + "homeassistant_alerts" = ps: with ps; [ + aiohttp-cors + ]; "homeassistant_yellow" = ps: with ps; [ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1157,6 +1173,8 @@ "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors + bleak + bluetooth-adapters ifaddr zeroconf ]; @@ -1257,6 +1275,12 @@ influxdb-client influxdb ]; + "inkbird" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + inkbird-ble + ]; "input_boolean" = ps: with ps; [ ]; "input_button" = ps: with ps; [ @@ -1274,7 +1298,6 @@ fnvhash home-assistant-frontend insteon-frontend-home-assistant - lru-dict pillow pyinsteon pyserial @@ -1428,7 +1451,7 @@ aiolifx aiolifx-effects ifaddr - ]; + ]; # missing inputs: aiolifx-connection "lifx_cloud" = ps: with ps; [ ]; "light" = ps: with ps; [ @@ -1471,7 +1494,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1533,7 +1555,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1613,8 +1634,8 @@ aiohttp-cors ]; "miflora" = ps: with ps; [ - bluepy - ]; # missing inputs: miflora + aiohttp-cors + ]; "mikrotik" = ps: with ps; [ librouteros ]; @@ -1633,9 +1654,16 @@ minio ]; "mitemp_bt" = ps: with ps; [ - ]; # missing inputs: mitemp_bt + aiohttp-cors + ]; "mjpeg" = ps: with ps; [ ]; + "moat" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + moat-ble + ]; "mobile_app" = ps: with ps; [ pynacl pyturbojpeg @@ -1713,7 +1741,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1795,6 +1822,9 @@ "nextcloud" = ps: with ps; [ nextcloudmonitor ]; + "nextdns" = ps: with ps; [ + nextdns + ]; "nfandroidtv" = ps: with ps; [ ]; # missing inputs: notifications-android-tv "nightscout" = ps: with ps; [ @@ -1885,7 +1915,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -1913,6 +1942,7 @@ "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ + aiohttp-cors ]; "opencv" = ps: with ps; [ numpy @@ -1992,7 +2022,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -2000,7 +2029,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -2044,7 +2072,6 @@ ]; "plant" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "plex" = ps: with ps; [ @@ -2162,6 +2189,7 @@ radios ]; "radiotherm" = ps: with ps; [ + aiohttp-cors radiotherm ]; "rainbird" = ps: with ps; [ @@ -2183,7 +2211,6 @@ aiohttp-cors fnvhash home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -2197,7 +2224,6 @@ ]; "recorder" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "recswitch" = ps: with ps; [ @@ -2214,10 +2240,14 @@ "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ - ]; # missing inputs: gpiozero pigpio + gpiozero + ]; # missing inputs: pigpio "renault" = ps: with ps; [ renault-api ]; + "repairs" = ps: with ps; [ + aiohttp-cors + ]; "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetierng "rest" = ps: with ps; [ @@ -2232,6 +2262,9 @@ "rfxtrx" = ps: with ps; [ pyrfxtrx ]; + "rhasspy" = ps: with ps; [ + aiohttp-cors + ]; "ridwell" = ps: with ps; [ aioridwell ]; @@ -2298,7 +2331,6 @@ fnvhash hass-nabucasa home-assistant-frontend - lru-dict pillow sqlalchemy ]; @@ -2359,9 +2391,14 @@ ]; "sensor" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; + "sensorpush" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + sensorpush-ble + ]; "sentry" = ps: with ps; [ sentry-sdk ]; @@ -2413,6 +2450,7 @@ pysignalclirestapi ]; "simplepush" = ps: with ps; [ + aiohttp-cors ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ simplisafe-python @@ -2528,9 +2566,7 @@ ]; "soundtouch" = ps: with ps; [ aiohttp-cors - ifaddr libsoundtouch - zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors @@ -2575,13 +2611,13 @@ ]; "statistics" = ps: with ps; [ fnvhash - lru-dict sqlalchemy ]; "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ + aiohttp-cors steamodd ]; "steamist" = ps: with ps; [ @@ -2635,6 +2671,9 @@ ]; "switchbot" = ps: with ps; [ pyswitchbot + aiohttp-cors + bleak + bluetooth-adapters ]; "switcher_kis" = ps: with ps; [ aioswitcher @@ -2745,7 +2784,6 @@ ]; "tibber" = ps: with ps; [ fnvhash - lru-dict pytibber sqlalchemy ]; @@ -2916,6 +2954,7 @@ pyudev ]; "uscis" = ps: with ps; [ + aiohttp-cors ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ aio-geojson-usgs-earthquakes @@ -3101,6 +3140,12 @@ netdisco zeroconf ]; + "xiaomi_ble" = ps: with ps; [ + aiohttp-cors + bleak + bluetooth-adapters + xiaomi-ble + ]; "xiaomi_miio" = ps: with ps; [ construct micloud @@ -3177,7 +3222,6 @@ fnvhash home-assistant-frontend ifaddr - lru-dict pillow pyserial-asyncio pyserial @@ -3274,6 +3318,7 @@ "blebox" "blink" "blueprint" + "bluetooth" "bluetooth_le_tracker" "bmw_connected_drive" "bond" @@ -3424,6 +3469,7 @@ "google_translate" "google_travel_time" "google_wifi" + "govee_ble" "gpslogger" "graphite" "gree" @@ -3448,6 +3494,7 @@ "home_connect" "home_plus_control" "homeassistant" + "homeassistant_alerts" "homeassistant_yellow" "homekit" "homekit_controller" @@ -3473,6 +3520,7 @@ "image_processing" "imap_email_content" "influxdb" + "inkbird" "input_boolean" "input_button" "input_datetime" @@ -3550,6 +3598,7 @@ "minecraft_server" "minio" "mjpeg" + "moat" "mobile_app" "modbus" "modem_callerid" @@ -3580,6 +3629,7 @@ "network" "nexia" "nextbus" + "nextdns" "nightscout" "nina" "no_ip" @@ -3601,7 +3651,6 @@ "onvif" "open_meteo" "openalpr_cloud" - "openalpr_local" "openerz" "opengarage" "openhardwaremonitor" @@ -3656,10 +3705,12 @@ "reddit" "remote" "renault" + "repairs" "rest" "rest_command" "rflink" "rfxtrx" + "rhasspy" "ridwell" "ring" "risco" @@ -3686,6 +3737,7 @@ "senseme" "sensibo" "sensor" + "sensorpush" "sentry" "senz" "seventeentrack" @@ -3848,6 +3900,7 @@ "xbox" "xiaomi" "xiaomi_aqara" + "xiaomi_ble" "xiaomi_miio" "yale_smart_alarm" "yamaha" diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 5dd4d60cbd..c045703afe 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -30,6 +30,29 @@ let defaultOverrides = [ # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt + (self: super: { + advantage-air = super.advantage-air.overridePythonAttrs (oldAttrs: rec { + version = "0.3.1"; + src = super.fetchPypi { + pname = "advantage_air"; + inherit version; + hash = "sha256-C+cB6oHmbr9mHZKnbls42yenQy3+L8huLk9wKazIWfU="; + }; + }); + }) + + (self: super: { + backoff = super.backoff.overridePythonAttrs (oldAttrs: rec { + version = "1.11.1"; + src = fetchFromGitHub { + owner = "litl"; + repo = "backoff"; + rev = "v${version}"; + hash = "sha256-87IMcLaoCn0Vns8Ub/AFmv0gXtS0aPZX0cSt7+lOPm4="; + }; + }); + }) + (self: super: { bsblan = super.bsblan.overridePythonAttrs (oldAttrs: rec { version = "0.5.0"; @@ -44,6 +67,30 @@ let }); }) + (self: super: { + gridnet = super.gridnet.overridePythonAttrs (oldAttrs: rec { + version = "4.0.0"; + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-gridnet"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ihs8qUx50tAUcRBsVArRhzoLcQUi1vbYh8sPyK75AEk="; + }; + }); + }) + + (self: super: { + p1monitor = super.p1monitor.overridePythonAttrs (oldAttrs: rec { + version = "1.0.1"; + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-p1monitor"; + rev = "refs/tags/v${version}"; + hash = "sha256-g3isA2gF2AD+VVzTqpnD+YiJQ9Kcl0VKvwd5l5Yx/Uo="; + }; + }); + }) + # pytest-aiohttp>0.3.0 breaks home-assistant tests (self: super: { pytest-aiohttp = super.pytest-aiohttp.overridePythonAttrs (oldAttrs: rec { @@ -65,9 +112,6 @@ let hass-nabucasa = super.hass-nabucasa.overridePythonAttrs (oldAttrs: { doCheck = false; # requires aiohttp>=1.0.0 }); - pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: { - doCheck = false; # requires pytest-aiohttp>=1.0.0 - }); pynws = super.pynws.overridePythonAttrs (oldAttrs: { doCheck = false; # requires pytest-aiohttp>=1.0.0 }); @@ -85,6 +129,18 @@ let }); }) + (self: super: { + plugwise = super.plugwise.overridePythonAttrs (oldAttrs: rec { + version = "0.20.1"; + src = fetchFromGitHub { + owner = "plugwise"; + repo = "python-plugwise"; + rev = "refs/tags/v${version}"; + hash = "sha256-Sk7L0JPwn7IXVl5GeERxrG/vrHXeNwUjW1mgm4g40Ng="; + }; + }); + }) + # Pinned due to API changes in 0.1.0 (mkOverride "poolsense" "0.0.8" "sha256-17MHrYRmqkH+1QLtgq2d6zaRtqvb9ju9dvPt9gB2xCc=") @@ -101,6 +157,46 @@ let }); }) + (self: super: { + pyatmo = super.pyatmo.overridePythonAttrs (oldAttrs: rec { + version = "6.2.4"; + src = fetchFromGitHub { + owner = "jabesq"; + repo = "pyatmo"; + rev = "refs/tags/v${version}"; + hash = "sha256-VXkQByaNA02fwBO2yuf7w1ZF/oJwd/h21de1EQlCu2U="; + }; + checkInputs = [ super.freezegun ]; + }); + }) + + # pyunifiprotect excludes pydantic==1.9.1 + (self: super: { + pydantic = super.pydantic.overridePythonAttrs (oldAttrs: rec { + version = "1.9.0"; + src = fetchFromGitHub { + owner = "samuelcolvin"; + repo = "pydantic"; + rev = "refs/tags/v${version}"; + hash = "sha256-C4WP8tiMRFmkDkQRrvP3yOSM2zN8pHJmX9cdANIckpM="; + }; + }); + }) + + (self: super: { + pydeconz = super.pydeconz.overridePythonAttrs (oldAttrs: rec { + version = "102"; + src = fetchFromGitHub { + owner = "Kane610"; + repo = "deconz"; + rev = "refs/tags/v${version}"; + hash = "sha256-Dbhp/+xyyWhFcYp2VRnivn5d1JMR5hBctdArIzLKIjM="; + }; + doCheck = false; # requires pytest-aiohttp>=1.0.0 + }); + }) + + (self: super: { python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; @@ -112,6 +208,40 @@ let }); }) + (self: super: { + 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="; + }; + }); + }) + + (self: super: { + solax = super.solax.overridePythonAttrs (oldAttrs: rec { + version = "0.2.9"; + src = super.fetchPypi { + pname = "solax"; + inherit version; + hash = "sha256-5m2wxdTshAsEfldPAyXqAYYtH1VjqERRBUGzX6pV85I="; + }; + }); + }) + + (self: super: { + 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.4.0 (self: super: { vilfo-api-client = super.vilfo-api-client.overridePythonAttrs (oldAttrs: rec { @@ -177,7 +307,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.7.4"; + hassVersion = "2022.8.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -195,7 +325,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-TQsIChMoIlTd8+gN4bxiWFId6V2wB1j3XfhXYpYMw9M="; + hash = "sha256-Wx5l51+vcByOqdwqcnOn1+yYgp98kXggRmgO/wtiI+U="; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -213,7 +343,9 @@ in python.pkgs.buildPythonApplication rec { "awesomeversion" "bcrypt" "cryptography" + "home-assistant-bluetooth" "httpx" + "ifaddr" "orjson" "PyJWT" "requests" @@ -240,6 +372,7 @@ in python.pkgs.buildPythonApplication rec { ciso8601 cryptography httpx + home-assistant-bluetooth ifaddr jinja2 lru-dict diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 0d067d7d3d..868b8359e7 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20220707.0"; + version = "20220802.0"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-ZNaa+YyY77b8Pg462tVewUe+K7ePTflESjZ+ar1cFc4="; + sha256 = "sha256-vUK/apsaJLaR/i6I2EWPxyohps+EazOr9ZuBKoRcyCI="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix index 26f71e9dcc..37b60ce56a 100644 --- a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix @@ -5,7 +5,7 @@ , cairo , fetchurl , flac -, gcc11 +, gcc12 , gnome , gssdp , gupnp @@ -22,11 +22,11 @@ }: stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.32.2-92"; + version = "4.32.4-94sse42"; src = fetchurl { - url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm"; - hash = "sha256-chgzu5r35VTSc1xOVTPCWCRrjABOy+vs57SsKOSzvkM="; + url = "https://www.signalyst.eu/bins/${pname}/fc36/${pname}-${version}.fc36.x86_64.rpm"; + hash = "sha256-hTckJdZzD/Sx/uV30dlGiT46QvzIGp6BQdNNRlQ/Mgw="; }; unpackPhase = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { alsa-lib cairo flac - gcc11.cc.lib + gcc12.cc.lib gnome.rygel gssdp gupnp diff --git a/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix b/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix index 9a5f03e4c0..cc4b85518b 100644 --- a/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.54.0"; + version = "1.62.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-XPIUDHDoxuRiWar2P6dzPWY7YRn1jDU69TL3ZmGx1AM="; + sha256 = "sha256-sGZUns6ad4FQ/5VYEi7hhgp35YIdbwyaMYPMbK8hlNA="; }; - vendorSha256 = "sha256-knW8IiuNGyirHCs8LR3VwWG4hxhWr9SmFzxjdbQ9l+k="; + vendorSha256 = "sha256-UHSXhRfegqgKyFl2W/2am9VNIzVYeIuUsVlha8nAZw0="; subPackages = [ "." ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix index d0b11d9b7c..2885676279 100644 --- a/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/lighttpd/default.nix @@ -10,25 +10,18 @@ , enableWebDAV ? false, sqlite, libuuid , enableExtendedAttrs ? false, attr , perl +, nixosTests }: stdenv.mkDerivation rec { pname = "lighttpd"; - version = "1.4.64"; + version = "1.4.66"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor version}.x/${pname}-${version}.tar.xz"; - sha256 = "sha256-4Uidn6dJb78uBxwzi1k7IwDTjCPx5ZZ+UsnvSC4bDiY="; + sha256 = "sha256-R6xuYCcaoBluZUctAtAZVW3HxtCd87Zd8sGraGY0jjs="; }; - patches = [ - (fetchpatch { - name = "macos-10.12-avoid-ccrandomgeneratebytes.patch"; - url = "https://redmine.lighttpd.net/projects/lighttpd/repository/14/revisions/6791f71b20a127b5b0091020dd065f4f9c7cafb6/diff?format=diff"; - sha256 = "1x5ybkvxwinl7s1nv3rrc57m4mj38q0gbyjp1ijr4w5lhabw4vzs"; - }) - ]; - postPatch = '' patchShebangs tests # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests @@ -80,6 +73,10 @@ stdenv.mkDerivation rec { rm "$out/share/lighttpd/doc/config/vhosts.d/Makefile"* ''; + passthru.tests = { + inherit (nixosTests) lighttpd; + }; + meta = with lib; { description = "Lightweight high-performance web server"; homepage = "http://www.lighttpd.net/"; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix index 227b4212e0..ba84963a76 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.23.0"; - sha256 = "sha256-ggrKo1uScr6ennL23vpKXykhgkcJ+KpHcseKsx7ZTNE="; + version = "1.23.1"; + sha256 = "sha256-Xu4b0cI+O5R3pFUy8fNq5heLQ9VxqWB+aVPO8m1d8eI="; } diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix index 84133e3a08..e2f7119440 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -264,8 +264,8 @@ in name = "moreheaders"; owner = "openresty"; repo = "headers-more-nginx-module"; - rev = "e536bc595d8b490dbc9cf5999ec48fca3f488632"; - sha256 = "sha256-gxLgs07XdFLcV4lv4JpiG2WGeLhBk13FRyzI0FOUjyA="; + rev = "v0.34"; + sha256 = "sha256-LsrN/rF/p17x/80Jw9CgbmK69to6LycCM1OwTBojz8M="; }; }; diff --git a/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix index ec7982adf7..3d151a9f35 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "8d0753760546"; # branch=quic - sha256 = "sha256-HcYkjbm3qfTU34ahseHCZhHYWNm1phfVph6oJBARMI8="; + rev = "3550b00d9dc8"; # branch=quic + sha256 = "sha256-JtE5FO4FHlDuqXd4UTXXPIFAdyyhQbOSMTT0NXh2iH4="; }; preConfigure = '' @@ -19,5 +19,5 @@ callPackage ./generic.nix args { "--with-stream_quic_module" ]; - version = "1.23.0-quic"; + version = "1.23.1-quic"; } diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix b/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix index c5966a1093..d02f1b5a7e 100644 --- a/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/hylafaxplus/default.nix @@ -13,6 +13,7 @@ , gnugrep , gnused , libtiff +, openssl , psmisc , sharutils , util-linux @@ -30,8 +31,8 @@ let pname = "hylafaxplus"; - version = "7.0.5"; - sha256 = "1blv251r0yhnhxk9wgkjgr35al50q23hiskjkcbs8lmqqrz0cm8f"; + version = "7.0.6"; + hash = "sha512-0faeEwF/XQE/85zwUMOnrGzvGanuWRDr53SnrgbX0i/SHjHelzSEd2TK6plVOfV4w8RY7Ox7lSO1gjqEEzfZyw=="; configSite = substituteAll { name = "${pname}-config.site"; @@ -65,7 +66,7 @@ stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "mirror://sourceforge/hylafax/hylafax-${version}.tar.gz"; - inherit sha256; + inherit hash; }; patches = [ # adjust configure check to work with libtiff > 4.1 @@ -78,6 +79,7 @@ stdenv.mkDerivation { file # for `file` command ghostscript libtiff + openssl psmisc # for `fuser` command sharutils # for `uuencode` command util-linux # for `agetty` command diff --git a/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch b/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch index 7faa897403..c890f317e5 100644 --- a/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch +++ b/third_party/nixpkgs/pkgs/servers/hylafaxplus/libtiff-4.patch @@ -5,7 +5,7 @@ https://bugs.gentoo.org/706154 echo '#define TIFFSTRIPBYTECOUNTS uint32_t' echo '#define TIFFVERSION TIFF_VERSION' echo '#define TIFFHEADER TIFFHeader';; -- 4.[0123]) tiff_runlen_t="uint32_t" +- 4.[01234]) tiff_runlen_t="uint32_t" + 4.[0-9]) tiff_runlen_t="uint32_t" tiff_offset_t="uint64_t" echo '#define TIFFSTRIPBYTECOUNTS uint64_t' diff --git a/third_party/nixpkgs/pkgs/servers/irc/charybdis/default.nix b/third_party/nixpkgs/pkgs/servers/irc/charybdis/default.nix index 53bfbb81cd..37d5b29983 100644 --- a/third_party/nixpkgs/pkgs/servers/irc/charybdis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/irc/charybdis/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "IRCv3 server designed to be highly scalable"; homepage = "https://github.com/charybdis-ircd/charybdis"; license = licenses.gpl2; - maintainers = with maintainers; [ lassulus fpletz ]; + maintainers = with maintainers; [ lassulus ]; platforms = platforms.unix; }; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index c0ebbd6e36..c70438f564 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.709"; + version = "0.20.1473"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "Gx1VHjs37XBcvw20pQNrA/meLuVmogdGIzroRXvTv5Q="; + sha256 = "5HrdlBk/MKBW1Y5WsKRRxF1vYagsQnCBo5a1lhMDklE="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/deps.nix b/third_party/nixpkgs/pkgs/servers/jackett/deps.nix index 022c604d0a..1652efc789 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/deps.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/deps.nix @@ -8,7 +8,7 @@ (fetchNuGet { pname = "CommandLineParser"; version = "2.8.0"; sha256 = "1m32xyilv2b7k55jy8ddg08c20glbcj2yi545kxs9hj2ahanhrbb"; }) (fetchNuGet { pname = "coverlet.msbuild"; version = "3.1.0"; sha256 = "1rx5x2zks2aryy6mbly86a83gxzm0y7bbx9834b3224673rs7ra0"; }) (fetchNuGet { pname = "DotNet4.SocksProxy"; version = "1.4.0.1"; sha256 = "1ig2a9ism041a6qrqkxa9xhvp19yxzcadlap5i1kz97f05a2msvb"; }) - (fetchNuGet { pname = "FlareSolverrSharp"; version = "2.2.0"; sha256 = "07jsyhlrg0jb1cjn1p20wp2c9rsjqxv7kh6vvd0xv0mjd88idchr"; }) + (fetchNuGet { pname = "FlareSolverrSharp"; version = "2.2.4"; sha256 = "17q1nwvlwzg8qhrzdwliwijz9sd68jrwwf2alh8kc0sxx3zaj4l5"; }) (fetchNuGet { pname = "FluentAssertions"; version = "6.2.0"; sha256 = "10zhr7hgzm9w0gfg0sa0h2qdlna0w7n2jl72s4j7hi6mf68px2xm"; }) (fetchNuGet { pname = "Microsoft.AspNetCore"; version = "2.2.0"; sha256 = "0vsv7hcsmnsgqhs67zp207n7m9ix3dbwm1p2ch3dizkcdvz235f9"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Antiforgery"; version = "2.2.0"; sha256 = "026wjdwjx0lgccqv0xi5gxylxzgz5ifgxf25p5pqakgrhkz0a59l"; }) @@ -168,7 +168,8 @@ (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) (fetchNuGet { pname = "MimeMapping"; version = "1.0.1.37"; sha256 = "19kkfjrvx9akm4l8z1dddkv7mfx4k2dkn5b69690z93mjpsa0l2g"; }) - (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { pname = "Mono.Posix"; version = "7.1.0-final.1.21458.1"; sha256 = "0gn70m4ajkyyv5jvcx09935anj7i2565yj0g8sgzaacnxjp5pfli"; }) + (fetchNuGet { pname = "Mono.Unix"; version = "7.1.0-final.1.21458.1"; sha256 = "0yv065hyikg2n3m61dlg8qf1z609y2f37ya2zsg50f5qx64ffvdn"; }) (fetchNuGet { pname = "MSTest.TestAdapter"; version = "2.2.7"; sha256 = "0285pdxhndcn77pqjg5zhv381yrv8dq2z6j05gf4j2yc8zkz2kmb"; }) (fetchNuGet { pname = "MSTest.TestFramework"; version = "2.2.7"; sha256 = "1dmdb3g07wkciccv69nfrvqnda400qlh0kkgy28l8s00iil31dmr"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) diff --git a/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix b/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix index 3400b5c505..d71f11fc5b 100644 --- a/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix +++ b/third_party/nixpkgs/pkgs/servers/janus-gateway/default.nix @@ -15,13 +15,13 @@ in stdenv.mkDerivation rec { pname = "janus-gateway"; - version = "1.0.0"; + version = "1.0.4"; src = fetchFromGitHub { owner = "meetecho"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BREPSDmGR85kDx1PWLdwpbwImAFuctLLx3AcHqAcURk="; + sha256 = "sha256-1WQo1v5TJPPJjC2lc8k9aWmtRUFITYEuwSfsPzh5320="; }; nativeBuildInputs = [ autoreconfHook pkg-config gengetopt ]; diff --git a/third_party/nixpkgs/pkgs/servers/klipper/klipper-firmware.nix b/third_party/nixpkgs/pkgs/servers/klipper/klipper-firmware.nix new file mode 100644 index 0000000000..f80cec0b68 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/klipper/klipper-firmware.nix @@ -0,0 +1,61 @@ +{ stdenv +, lib +, pkg-config +, pkgsCross +, bintools-unwrapped +, libffi +, libusb1 +, wxGTK +, python2 +, python3 +, gcc-arm-embedded +, klipper +, avrdude +, stm32flash +, mcu ? "mcu" +, firmwareConfig ? ./simulator.cfg +}: stdenv.mkDerivation rec { + name = "klipper-firmware-${mcu}-${version}"; + version = klipper.version; + src = klipper.src; + + nativeBuildInputs = [ + python2 + python3 + pkgsCross.avr.stdenv.cc + gcc-arm-embedded + bintools-unwrapped + libffi + libusb1 + avrdude + stm32flash + pkg-config + wxGTK # Required for bossac + ]; + + preBuild = "cp ${firmwareConfig} ./.config"; + + postPatch = '' + patchShebangs . + ''; + + makeFlags = [ + "V=1" + "KCONFIG_CONFIG=${firmwareConfig}" + ]; + + installPhase = '' + mkdir -p $out + cp ./.config $out/config + cp -r out/* $out + ''; + + dontFixup = true; + + meta = with lib; { + inherit (klipper.meta) homepage license; + description = "Firmware part of Klipper"; + maintainers = with maintainers; [ vtuan10 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/klipper/klipper-flash.nix b/third_party/nixpkgs/pkgs/servers/klipper/klipper-flash.nix new file mode 100644 index 0000000000..fedc477c27 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/klipper/klipper-flash.nix @@ -0,0 +1,38 @@ +{ lib +, writeShellApplication +, gnumake +, pkgsCross +, klipper +, klipper-firmware +, python2 +, avrdude +, stm32flash +, mcu ? "mcu" +, flashDevice ? "/dev/null" +, firmwareConfig ? ./simulator.cfg +}: +let + supportedArches = [ "avr" "stm32" "lpc176x" ]; + matchBoard = with builtins; match ''^.*CONFIG_BOARD_DIRECTORY="([a-zA-Z0-9_]+)".*$'' (readFile firmwareConfig); + boardArch = if matchBoard == null then null else builtins.head matchBoard; +in +writeShellApplication { + name = "klipper-flash-${mcu}"; + runtimeInputs = [ + python2 + pkgsCross.avr.stdenv.cc + gnumake + ] ++ lib.optionals (boardArch == "avr") [ avrdude ] ++ lib.optionals (boardArch == "stm32") [ stm32flash ]; + text = '' + if ${lib.boolToString (!builtins.elem boardArch supportedArches)}; then + printf "Flashing Klipper firmware to your board is not supported yet.\n" + printf "Please use the compiled firmware at ${klipper-firmware} and flash it using the tools provided for your microcontroller." + exit 1 + fi + if ${lib.boolToString (boardArch == "stm32")}; then + make -C ${klipper.src} FLASH_DEVICE="${toString flashDevice}" OUT="${klipper-firmware}/" KCONFIG_CONFIG="${klipper-firmware}/config" serialflash + else + make -C ${klipper.src} FLASH_DEVICE="${toString flashDevice}" OUT="${klipper-firmware}/" KCONFIG_CONFIG="${klipper-firmware}/config" flash + fi + ''; +} diff --git a/third_party/nixpkgs/pkgs/servers/klipper/klipper-genconf.nix b/third_party/nixpkgs/pkgs/servers/klipper/klipper-genconf.nix new file mode 100644 index 0000000000..42eb519e8c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/klipper/klipper-genconf.nix @@ -0,0 +1,21 @@ +{ writeShellApplication +, klipper +, python2 +, gnumake +, pkgsCross +}: writeShellApplication { + name = "klipper-genconf"; + runtimeInputs = [ + python2 + pkgsCross.avr.stdenv.cc + gnumake + ]; + text = '' + CURRENT_DIR=$(pwd) + TMP=$(mktemp -d) + make -C ${klipper.src} OUT="$TMP" KCONFIG_CONFIG="$CURRENT_DIR/config" menuconfig + rm -rf "$TMP" config.old + printf "\nYour firmware configuration for klipper:\n\n" + cat config + ''; +} diff --git a/third_party/nixpkgs/pkgs/servers/klipper/simulator.cfg b/third_party/nixpkgs/pkgs/servers/klipper/simulator.cfg new file mode 100644 index 0000000000..4dc19b1e40 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/klipper/simulator.cfg @@ -0,0 +1,23 @@ +# CONFIG_LOW_LEVEL_OPTIONS is not set +# CONFIG_MACH_AVR is not set +# CONFIG_MACH_ATSAM is not set +# CONFIG_MACH_ATSAMD is not set +# CONFIG_MACH_LPC176X is not set +# CONFIG_MACH_STM32 is not set +# CONFIG_MACH_RP2040 is not set +# CONFIG_MACH_PRU is not set +# CONFIG_MACH_LINUX is not set +CONFIG_MACH_SIMU=y +CONFIG_BOARD_DIRECTORY="simulator" +CONFIG_CLOCK_FREQ=20000000 +CONFIG_SERIAL=y +CONFIG_SIMULATOR_SELECT=y +CONFIG_SERIAL_BAUD=250000 +CONFIG_USB_VENDOR_ID=0x1d50 +CONFIG_USB_DEVICE_ID=0x614e +CONFIG_USB_SERIAL_NUMBER="12345" +CONFIG_HAVE_GPIO=y +CONFIG_HAVE_GPIO_ADC=y +CONFIG_HAVE_GPIO_SPI=y +CONFIG_HAVE_GPIO_HARD_PWM=y +CONFIG_INLINE_STEPPER_HACK=y diff --git a/third_party/nixpkgs/pkgs/servers/kubemq-community/default.nix b/third_party/nixpkgs/pkgs/servers/kubemq-community/default.nix index 823f3125cb..420e10f52d 100644 --- a/third_party/nixpkgs/pkgs/servers/kubemq-community/default.nix +++ b/third_party/nixpkgs/pkgs/servers/kubemq-community/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "kubemq-community"; - version = "2.2.12"; + version = "2.2.13"; src = fetchFromGitHub { owner = "kubemq-io"; repo = pname; rev = "v${version}"; - sha256 = "06n3avcqknqzf9y03xqcsg36pwcha29j2psp9xsnir7hrx66zww8"; + sha256 = "sha256-YeFSea6aCNH+v3AKqiG8BY4u7/enmOPlEybkz6RwU8w="; }; CGO_ENABLED=0; @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; # grpc tests are flaky - vendorSha256 = "1sh0dzz8z065964k2gzkzw9p3db3rcf6mv901zym0wqm4p71045w"; + vendorSha256 = "sha256-pRbYNR3z4KdA9pdthX8a3FZ0LNyvoT+PR+6OinDGF2g="; meta = { homepage = "https://github.com/kubemq-io/kubemq-community"; diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix index 2b8959a8f3..406e104e88 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailman/hyperkitty.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { django-haystack django-mailman3 django-q - django_compressor + django-compressor django-extensions djangorestframework flufl_lock diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index d719916e8a..8f5240b42e 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.62.0"; + version = "1.64.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-14aHO13FCUEq3pwLUDvrI1au6i8Wykhc5d5C3tLpE3g="; + sha256 = "sha256-hybl63hbhuUYnMi03z0Yp7L4n0x01z5uR8r5ZwHzgfI="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix index c9aa674cbd..7372c2f769 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/mjolnir-antispam.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "matrix-synapse-mjolnir-antispam"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "refs/tags/v${version}"; - sha256 = "sha256-887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM="; + sha256 = "sha256-YmP+r9W5e63Aw66lSQeTTbYwSF/vjPyHkoehJxtcRNw="; }; sourceRoot = "./source/synapse_antispam"; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix index 3734d7c602..fcf123d6e1 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/tools/rust-synapse-compress-state.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-synapse-compress-state"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "matrix-org"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uL7uoJPvZoTbrmEFY7jiBphvjWSRpH9pyk3x7s3Yvrs="; + sha256 = "sha256-SSfVtG8kwHarVbB1O7xC2SSbUpPGYMHTMyoxu8mpEk0="; }; - cargoSha256 = "sha256-3w5RyVrpCnetXnxnzgVl94kUZa+1i9bU2O8vp7sb3lY="; + cargoSha256 = "sha256-PG+UeovhJMsIlm5dOYdtMxbUxZjwG3V59kAcB9aFP5c="; cargoBuildFlags = [ "--all" diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix index a9d18d5b3f..20ffc299d0 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix @@ -45,6 +45,6 @@ buildGoModule rec { description = "Mattermost is an open source platform for secure collaboration across the entire software development lifecycle"; homepage = "https://www.mattermost.org"; license = with licenses; [ agpl3 asl20 ]; - maintainers = with maintainers; [ fpletz ryantm numinit kranzes ]; + maintainers = with maintainers; [ ryantm numinit kranzes ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix index ac45923409..bc78495a50 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix @@ -19,7 +19,7 @@ buildGoModule rec { inherit (src.meta) homepage; description = "Minimal IRC server bridge to Mattermost"; license = licenses.mit; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix index 2d0ab908cb..eb6372b120 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-telegram/default.nix @@ -5,6 +5,21 @@ let python = python3.override { packageOverrides = self: super: { + asyncpg = super.asyncpg.overridePythonAttrs (oldAttrs: rec { + version = "0.25.0"; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-Y/jmppczsoVJfChVRko03mV/LMzSWurutQcYcuk4JUA="; + }; + }); + mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec { + version = "0.16.3"; + src = oldAttrs.src.override { + inherit (oldAttrs) pname; + inherit version; + sha256 = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU="; + }; + }); tulir-telethon = self.telethon.overridePythonAttrs (oldAttrs: rec { version = "1.25.0a7"; pname = "tulir-telethon"; diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix index 52fac7f963..493f067f0f 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "xKj1iKKzFQFjzXZGqoCDyuwXs55QNmnPdojgxy0dQTY="; + sha256 = "zhFc6BAurjrp0pHa48Eb8Iypww6o6YXPXp2ba2CXB6Q="; }; buildInputs = [ olm ]; - vendorSha256 = "svpUQQI9dDNQoL+LDoxhEch7dtNd20ojG3YHga1r15c="; + vendorSha256 = "EiaQDEsysTiXNHKhbfGVgVdMKgfdUHm48eooGR1rtQg="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/servers/memcached/default.nix index eedb420f2e..61f48824ea 100644 --- a/third_party/nixpkgs/pkgs/servers/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.15"; + version = "1.6.16"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-jXq+PWSTeO27oW9C7x1myj8qwHXy65cUXOFkOI5u1RU="; + sha256 = "sha256-MFGpO/HdDDry0OWJ/272UR+HY4WjWxjp/4dB5KGrNNo="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/metabase/default.nix b/third_party/nixpkgs/pkgs/servers/metabase/default.nix index 9ec8ddf47d..a44ff18138 100644 --- a/third_party/nixpkgs/pkgs/servers/metabase/default.nix +++ b/third_party/nixpkgs/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.43.1"; + version = "0.43.3"; src = fetchurl { url = "https://downloads.metabase.com/v${version}/metabase.jar"; - hash = "sha256-WGbIsmCWsSxgE7Ktr539qTt/o5cJrYi0yu3ZkfbxOV0="; + hash = "sha256-XUJNnyzBGYC3jMi1pVvdMNRo8zxkFcxzdHjytmCAVqM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index 3349f0cf3a..9340dc24fc 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2022-05-08T23-50-31Z"; + version = "2022-08-08T18-34-09Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Ssuqk/ax6MWdXtbJqWeTTtsIiTK4FmYSR5rOqxh+IaU="; + sha256 = "sha256-HuKfpQY6dllxkrictCMBczHTg2oCLQtZrJQqPG2l6N8="; }; - vendorSha256 = "sha256-JoI3B3rDzlY0lDHF3rjrzv8/Rq+XCFRs35bWVZqfAKA="; + vendorSha256 = "sha256-uoavsixaLQg0gL70m4ea5fgH5R06YyIZHy1oxDSA0ko="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix index 0a3e9af510..a46a25ee5a 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.0.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-gyaAtFJubvDiz5b7lk6vmPHIqr9ccWK3N2iy4LvYiMg="; + sha256 = "sha256-iFtoxEjb+Wk8E2oj1SjSRNwxg20//0LgFtjMq9qJOEQ="; }; - vendorSha256 = "sha256-RSsvFD3RvYKxdwPDGG3YHVUzKLgwReZkoVabH5KWXMA="; + vendorSha256 = "sha256-FxfER3THsA7NRuQKEdWQxgUN0SiNI00hGUMVD+3BaG4="; postConfigure = '' export CGO_ENABLED=0 diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix index d05b7fc2af..173dd0caa8 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/default.nix @@ -1,50 +1,74 @@ -{ lib, stdenv, fetchurl, ffmpeg, ffmpegSupport ? true, makeWrapper, nixosTests }: +{ callPackage +, buildGoModule +, fetchFromGitHub +, lib +, pkg-config +, stdenv +, ffmpeg +, taglib +, zlib +, makeWrapper +, nixosTests +, ffmpegSupport ? true +}: -with lib; +let -stdenv.mkDerivation rec { - pname = "navidrome"; version = "0.47.5"; + src = fetchFromGitHub { + owner = "navidrome"; + repo = "navidrome"; + rev = "v${version}"; + hash = "sha256-gTvJI+brdEpdpbEcdQycqw15seI+k5dMDVrjY3v6i14="; + }; - src = fetchurl (if stdenv.hostPlatform.system == "x86_64-linux" - then { - url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_x86_64.tar.gz"; - sha256 = "sha256-AkSjtln53HDdIcQgnA8Wj010RXnOlOsFm2wfVgbvwtc="; - } - else { - url = "https://github.com/deluan/navidrome/releases/download/v${version}/navidrome_${version}_Linux_arm64.tar.gz"; - sha256 = "sha256-+VBRiV2zKa6PwamWj/jmE4iuoohAD6oeGnlFi4/01HM="; - }); + ui = callPackage ./ui { + inherit src version; + }; - nativeBuildInputs = [ makeWrapper ]; +in - unpackPhase = '' - tar xvf $src navidrome +buildGoModule { + + pname = "navidrome"; + + inherit src version; + + vendorSha256 = "sha256-xMAxGbq2VSXkF9R9hxB9EEk2CnqsRxg2Nmt7zyXohJI="; + + nativeBuildInputs = [ makeWrapper pkg-config ]; + + buildInputs = [ taglib zlib ]; + + ldflags = [ + "-X github.com/navidrome/navidrome/consts.gitSha=${src.rev}" + "-X github.com/navidrome/navidrome/consts.gitTag=v${version}" + ]; + + CGO_CFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-return-local-addr" ]; + + prePatch = '' + cp -r ${ui}/* ui/build ''; - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - cp navidrome $out/bin - - runHook postInstall - ''; - - postFixup = optionalString ffmpegSupport '' + postFixup = lib.optionalString ffmpegSupport '' wrapProgram $out/bin/navidrome \ - --prefix PATH : ${makeBinPath [ ffmpeg ]} + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} ''; - passthru.tests.navidrome = nixosTests.navidrome; + passthru = { + inherit ui; + tests.navidrome = nixosTests.navidrome; + updateScript = callPackage ./update.nix {}; + }; meta = { description = "Navidrome Music Server and Streamer compatible with Subsonic/Airsonic"; homepage = "https://www.navidrome.org/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = licenses.gpl3Only; - platforms = [ "x86_64-linux" "aarch64-linux" ]; - maintainers = with maintainers; [ aciceri ]; + license = lib.licenses.gpl3Only; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ aciceri squalus ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/default.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/default.nix new file mode 100644 index 0000000000..3fb6fe4249 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/default.nix @@ -0,0 +1,27 @@ +{ buildPackages, nodejs, stdenv, src, version }: + +let + + nodeComposition = import ./node-composition.nix { + inherit (buildPackages) nodejs; + inherit (stdenv.hostPlatform) system; + pkgs = buildPackages; + }; + +in + +nodeComposition.package.override { + + pname = "navidrome"; + inherit version; + src = "${src}/ui"; + + dontNpmInstall = true; + + postInstall = '' + npm run build + cd $out + mv lib/node_modules/navidrome-ui/build/* . + rm -rf lib + ''; +} diff --git a/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/node-composition.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/node-composition.nix new file mode 100644 index 0000000000..a10eaa345e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/node-composition.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.11.1. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile 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/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/node-env.nix b/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/node-env.nix new file mode 100644 index 0000000000..2590dd267a --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/misc/navidrome/ui/node-env.nix @@ -0,0 +1,598 @@ +# 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 <> $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); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version ? 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 < +Date: Tue, 14 Jun 2022 17:55:43 +0200 +Subject: [PATCH] Another Qt5 fix + +--- + qtsingleapplication/qtlocalpeer.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp +index 4a84036..e6ccc72 100644 +--- a/qtsingleapplication/qtlocalpeer.cpp ++++ b/qtsingleapplication/qtlocalpeer.cpp +@@ -41,6 +41,9 @@ + + #include "qtlocalpeer.h" + #include ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) ++#include ++#endif + #include + + #if defined(Q_OS_WIN) +-- +2.36.0 + diff --git a/third_party/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix b/third_party/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix index 4e752a0e28..748acdd4cf 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -1,21 +1,35 @@ -{ lib, stdenv -, fetchurl -, qmake4Hook -, qt4 +{ lib +, stdenv +, fetchgit +, qmake +, wrapQtAppsHook +, qtbase , xorg }: stdenv.mkDerivation rec { pname = "qremotecontrol-server"; - version = "2.4.1"; + version = "unstable-2014-11-05"; # basically 2.4.2 + qt5 - src = fetchurl { - url = "mirror://sourceforge/project/qrc/${version}/qremotecontrol-${version}.tar.bz2"; - sha256 = "07hzc9959a56b49jgmcv8ry8b9sppklvqs9kns3qjj3v9d22nbrp"; + src = fetchgit { + url = "https://git.code.sf.net/p/qrc/gitcode"; + rev = "8f1c55eac10ac8af974c3c20157d90ef57f7308a"; + sha256 = "sha256-AfFScec5/emG/f+yc5Zn37USIEWzGP/sBifE6Kx8d0E="; }; - nativeBuildInputs = [ qmake4Hook ]; - buildInputs = [ qt4 xorg.libXtst ]; + patches = [ + ./0001-fix-qt5-build-include-QDataStream.patch + ]; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + xorg.libXtst + ]; postPatch = '' substituteInPlace QRemoteControl-Server.pro \ @@ -26,8 +40,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; - homepage = "https://qremote.org/"; - downloadPage = "https://qremote.org/download.php#Download"; + homepage = "https://sourceforge.net/projects/qrc/"; description = "Remote control your desktop from your mobile"; longDescription = '' With QRemoteControl installed on your desktop you can easily control @@ -43,4 +56,3 @@ stdenv.mkDerivation rec { ''; }; } - diff --git a/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix index 68f60792c2..25d3a504ef 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/virtiofsd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - sha256 = "sha256-pLlO9M2r80/t7gGpIk+b1pEuSK2g8HxamaaotOmJxXo="; + sha256 = "sha256-r8r7rDIFgZqxnudVQqO8kOdfNoMkV2LWiW+yE1qJgJM="; }; - cargoSha256 = "sha256-03LnZdtbejkrjnuwCDaeAPVJrLY+4fmt7YOJpBemaVc="; + cargoSha256 = "sha256-bK+N11SmdXrWU4HlACkOWav/xuwRUvXrbLC394N9urs="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = diff --git a/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix b/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix index 75f60a883c..4162ea9d6c 100644 --- a/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mjolnir/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "mjolnir"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "mjolnir"; rev = "v${version}"; - sha256 = "887azmXT5PGpcOqtWtKwdoyEtsXGm5DzpNRgEMlgSfM="; + sha256 = "YmP+r9W5e63Aw66lSQeTTbYwSF/vjPyHkoehJxtcRNw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/mjolnir/node-deps.nix b/third_party/nixpkgs/pkgs/servers/mjolnir/node-deps.nix index b75e4ddfa7..b30d53b36f 100644 --- a/third_party/nixpkgs/pkgs/servers/mjolnir/node-deps.nix +++ b/third_party/nixpkgs/pkgs/servers/mjolnir/node-deps.nix @@ -13,31 +13,31 @@ let sha512 = "Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw=="; }; }; - "@babel/code-frame-7.16.7" = { + "@babel/code-frame-7.18.6" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; - sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/helper-validator-identifier-7.16.7" = { + "@babel/helper-validator-identifier-7.18.6" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; - sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; + sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; }; }; - "@babel/highlight-7.17.9" = { + "@babel/highlight-7.18.6" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.17.9"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz"; - sha512 = "J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; "@eslint/eslintrc-0.4.3" = { @@ -139,13 +139,13 @@ let sha512 = "6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA=="; }; }; - "@types/express-serve-static-core-4.17.28" = { + "@types/express-serve-static-core-4.17.29" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.28"; + version = "4.17.29"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz"; - sha512 = "P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz"; + sha512 = "uMd++6dMKS32EOuw1Uli3e3BPgdLIXmezcfHv7N4c1s3gkhikBplORPpMq3fuWkxncZN1reb16d5n8yhQ80x7Q=="; }; }; "@types/html-to-text-8.1.0" = { @@ -229,13 +229,13 @@ let sha512 = "Z61JK7DKDtdKTWwLeElSEBcWGRLY8g95ic5FoQqI9CMx0ns/Ghep3B4DfcEimiKMvtamNVULVNKEsiwV3aQmXw=="; }; }; - "@types/node-16.11.35" = { + "@types/node-16.11.45" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "16.11.35"; + version = "16.11.45"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.11.35.tgz"; - sha512 = "QXu45LyepgnhUfnIAj/FyT4uM87ug5KpIrgXfQtUPNAlx8w5hmd8z8emqCLNvG11QkpRSCG9Qg2buMxvqfjfsQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-16.11.45.tgz"; + sha512 = "3rKg/L5x0rofKuuUt5zlXzOnKyIHXmIu5R8A0TuNDMF2062/AOIDBciFIjToLEJ/9F9DzkHNot+BpNsMI1OLdQ=="; }; }; "@types/parse5-6.0.3" = { @@ -427,13 +427,13 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; - "ansi-colors-4.1.2" = { + "ansi-colors-4.1.3" = { name = "ansi-colors"; packageName = "ansi-colors"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.2.tgz"; - sha512 = "cEG18jjLG0O74o/33eEfnmtXYDEY196ZjL0eQEISULF+Imi7vr25l6ntGYmqS5lIrQIEeze+CqUtPVItywE7ZQ=="; + url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"; + sha512 = "/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw=="; }; }; "ansi-regex-5.0.1" = { @@ -784,7 +784,7 @@ let version = "1.1.3"; src = fetchurl { url = "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"; - sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; }; "color-name-1.1.4" = { @@ -829,7 +829,7 @@ let version = "0.0.1"; src = fetchurl { url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; }; "config-3.3.7" = { @@ -874,7 +874,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="; }; }; "core-util-is-1.0.2" = { @@ -883,7 +883,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; }; }; "cross-spawn-7.0.3" = { @@ -937,7 +937,7 @@ let version = "1.14.1"; src = fetchurl { url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; "data-urls-2.0.0" = { @@ -1018,7 +1018,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; }; }; "depd-2.0.0" = { @@ -1081,7 +1081,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; - sha1 = "e38331f0844bba49b9a9cb71c771585aab1bc65a"; + sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; }; }; "doctrine-3.0.0" = { @@ -1153,7 +1153,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; }; }; "editorconfig-0.15.3" = { @@ -1171,7 +1171,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; "emoji-regex-8.0.0" = { @@ -1189,7 +1189,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; "enquirer-2.3.6" = { @@ -1225,7 +1225,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; }; }; "escape-string-regexp-1.0.5" = { @@ -1234,7 +1234,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; }; "escape-string-regexp-2.0.0" = { @@ -1378,7 +1378,7 @@ let version = "1.8.1"; src = fetchurl { url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; "expect-27.5.1" = { @@ -1414,7 +1414,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="; }; }; "fast-deep-equal-3.1.3" = { @@ -1441,7 +1441,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; }; "file-entry-cache-6.0.1" = { @@ -1498,13 +1498,13 @@ let sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; }; - "flatted-3.2.5" = { + "flatted-3.2.6" = { name = "flatted"; packageName = "flatted"; - version = "3.2.5"; + version = "3.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; - sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz"; + sha512 = "0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ=="; }; }; "forever-agent-0.6.1" = { @@ -1513,7 +1513,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="; }; }; "form-data-2.3.3" = { @@ -1549,7 +1549,7 @@ let version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; }; }; "fs.realpath-1.0.0" = { @@ -1558,7 +1558,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; "fsevents-2.3.2" = { @@ -1585,7 +1585,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; }; }; "get-caller-file-2.0.5" = { @@ -1597,13 +1597,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.1.1" = { + "get-intrinsic-1.1.2" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.1"; + version = "1.1.2"; 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.2.tgz"; + sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; }; }; "getpass-0.1.7" = { @@ -1612,7 +1612,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; }; }; "glob-7.2.0" = { @@ -1651,13 +1651,13 @@ let sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="; }; }; - "globals-13.15.0" = { + "globals-13.16.0" = { name = "globals"; packageName = "globals"; - version = "13.15.0"; + version = "13.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.15.0.tgz"; - sha512 = "bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog=="; + url = "https://registry.npmjs.org/globals/-/globals-13.16.0.tgz"; + sha512 = "A1lrQfpNF+McdPOnnFqY3kSN0AFTy485bTi1bkLk4mVPODIUEcSfhHgRqA+QdXPksrSTTztYXx37NFV+GpGk3Q=="; }; }; "graceful-fs-4.2.10" = { @@ -1684,7 +1684,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="; }; }; "har-validator-5.1.5" = { @@ -1711,7 +1711,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; }; "has-flag-4.0.0" = { @@ -1783,7 +1783,7 @@ let version = "0.0.4"; src = fetchurl { url = "https://registry.npmjs.org/htmlencode/-/htmlencode-0.0.4.tgz"; - sha1 = "f7e2d6afbe18a87a78e63ba3308e753766740e3f"; + sha512 = "0uDvNVpzj/E2TfvLLyyXhKBRvF1y84aZsyRxRXFsQobnHaL4pcaXk+Y9cnFlvnxrBLeXDNq/VJBD+ngdBgQG1w=="; }; }; "htmlparser2-4.1.0" = { @@ -1828,7 +1828,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; }; }; "https-proxy-agent-5.0.1" = { @@ -1840,13 +1840,13 @@ let sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; - "humanize-duration-3.27.1" = { + "humanize-duration-3.27.2" = { name = "humanize-duration"; packageName = "humanize-duration"; - version = "3.27.1"; + version = "3.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.1.tgz"; - sha512 = "jCVkMl+EaM80rrMrAPl96SGG4NRac53UyI1o/yAzebDntEY6K6/Fj2HOjdPg8omTqIe5Y0wPBai2q5xXrIbarA=="; + url = "https://registry.npmjs.org/humanize-duration/-/humanize-duration-3.27.2.tgz"; + sha512 = "A15OmA3FLFRnehvF4ZMocsxTZYvHq4ze7L+AgR1DeHw0xC9vMd4euInY83uqGU9/XXKNnVIEeKc1R8G8nKqtzg=="; }; }; "humanize-duration-ts-2.1.1" = { @@ -1891,7 +1891,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; }; }; "inflight-1.0.6" = { @@ -1900,7 +1900,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; }; "inherits-2.0.4" = { @@ -1945,7 +1945,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; }; "is-fullwidth-code-point-3.0.0" = { @@ -2017,7 +2017,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; }; }; "is-unicode-supported-0.1.0" = { @@ -2035,7 +2035,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; "isstream-0.1.2" = { @@ -2044,7 +2044,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; }; }; "jest-diff-27.5.1" = { @@ -2116,7 +2116,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; }; }; "jsdom-16.7.0" = { @@ -2161,7 +2161,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; }; "json-stringify-safe-5.0.1" = { @@ -2170,7 +2170,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; "json5-1.0.1" = { @@ -2206,7 +2206,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA=="; }; }; "levn-0.4.1" = { @@ -2251,7 +2251,7 @@ let version = "4.4.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="; }; }; "log-symbols-4.1.0" = { @@ -2314,7 +2314,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; }; "merge-descriptors-1.0.1" = { @@ -2323,7 +2323,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; "methods-1.1.2" = { @@ -2332,7 +2332,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; }; }; "micromatch-4.0.5" = { @@ -2458,7 +2458,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; }; }; "ms-2.1.2" = { @@ -2503,7 +2503,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; }; "nearley-2.20.1" = { @@ -2533,13 +2533,13 @@ let sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; }; }; - "nwsapi-2.2.0" = { + "nwsapi-2.2.1" = { name = "nwsapi"; packageName = "nwsapi"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"; - sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; + url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.1.tgz"; + sha512 = "JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg=="; }; }; "oauth-sign-0.9.0" = { @@ -2551,13 +2551,13 @@ let sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="; }; }; - "object-inspect-1.12.0" = { + "object-inspect-1.12.2" = { name = "object-inspect"; packageName = "object-inspect"; - version = "1.12.0"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.0.tgz"; - sha512 = "Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g=="; + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"; + sha512 = "z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ=="; }; }; "on-finished-2.3.0" = { @@ -2566,7 +2566,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="; }; }; "on-finished-2.4.1" = { @@ -2593,7 +2593,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; }; "optionator-0.8.3" = { @@ -2656,7 +2656,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"; - sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; + sha512 = "/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q=="; }; }; "parse5-6.0.1" = { @@ -2701,7 +2701,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; "path-key-3.1.1" = { @@ -2728,7 +2728,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; }; }; "performance-now-2.1.0" = { @@ -2737,7 +2737,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; "picocolors-1.0.0" = { @@ -2764,16 +2764,16 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; }; }; - "postcss-8.4.13" = { + "postcss-8.4.14" = { name = "postcss"; packageName = "postcss"; - version = "8.4.13"; + version = "8.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.4.13.tgz"; - sha512 = "jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz"; + sha512 = "E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig=="; }; }; "prelude-ls-1.1.2" = { @@ -2782,7 +2782,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w=="; }; }; "prelude-ls-1.2.1" = { @@ -2827,16 +2827,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; }; }; - "psl-1.8.0" = { + "psl-1.9.0" = { name = "psl"; packageName = "psl"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; + sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; }; "punycode-2.1.1" = { @@ -2872,7 +2872,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; - sha1 = "eb7e6267548ddedfb899c1b90e57374559cddb7e"; + sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="; }; }; "randexp-0.4.6" = { @@ -2971,7 +2971,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; }; }; "require-from-string-2.0.2" = { @@ -2983,13 +2983,13 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "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-from-4.0.0" = { @@ -3169,7 +3169,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"; - sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590"; + sha512 = "fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g=="; }; }; "slash-3.0.0" = { @@ -3223,7 +3223,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; "sshpk-1.17.0" = { @@ -3259,7 +3259,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g=="; }; }; "steno-0.4.4" = { @@ -3268,7 +3268,7 @@ let version = "0.4.4"; src = fetchurl { url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz"; - sha1 = "071105bdfc286e6615c0403c27e9d7b5dcb855cb"; + sha512 = "EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w=="; }; }; "string-width-4.2.3" = { @@ -3295,7 +3295,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"; - sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; + sha512 = "vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA=="; }; }; "strip-json-comments-3.1.1" = { @@ -3367,7 +3367,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; "to-regex-range-5.0.1" = { @@ -3475,7 +3475,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; }; }; "tweetnacl-0.14.5" = { @@ -3484,7 +3484,7 @@ let version = "0.14.5"; src = fetchurl { url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; "type-check-0.3.2" = { @@ -3493,7 +3493,7 @@ let version = "0.3.2"; src = fetchurl { url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg=="; }; }; "type-check-0.4.0" = { @@ -3523,13 +3523,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typescript-4.6.4" = { + "typescript-4.7.4" = { name = "typescript"; packageName = "typescript"; - version = "4.6.4"; + version = "4.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.6.4.tgz"; - sha512 = "9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz"; + sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="; }; }; "typescript-formatter-7.2.2" = { @@ -3556,7 +3556,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; }; }; "uri-js-4.4.1" = { @@ -3574,7 +3574,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; }; }; "uuid-3.4.0" = { @@ -3601,7 +3601,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; }; }; "verror-1.10.0" = { @@ -3610,7 +3610,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; "w3c-hr-time-1.0.2" = { @@ -3718,16 +3718,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; - "ws-7.5.7" = { + "ws-7.5.9" = { name = "ws"; packageName = "ws"; - version = "7.5.7"; + version = "7.5.9"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.7.tgz"; - sha512 = "KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A=="; + url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"; + sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q=="; }; }; "xml-name-validator-3.0.0" = { @@ -3763,7 +3763,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; }; "yallist-4.0.0" = { @@ -3808,7 +3808,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/yn/-/yn-2.0.0.tgz"; - sha1 = "e5adabc8acf408f6385fc76495684c88e6af689a"; + sha512 = "uTv8J/wiWTgUTg+9vLTi//leUl5vDQS6uii/emeTb2ssY7vl6QWf2fFbIIGjnhjvbdKlU0ed7QPgY1htTC86jQ=="; }; }; "yocto-queue-0.1.0" = { @@ -3824,12 +3824,12 @@ let args = { name = "mjolnir"; packageName = "mjolnir"; - version = "1.4.2"; - src = ../../../../../../../nix/store/spvdzz0i3m55099ds9bjrd30c15cv8a6-source; + version = "1.5.0"; + src = ../../../../../../../nix/store/q7qh1pmk8jl32g0d9v89kp9nnlz68fil-source; dependencies = [ sources."@babel/code-frame-7.12.11" - sources."@babel/helper-validator-identifier-7.16.7" - (sources."@babel/highlight-7.17.9" // { + sources."@babel/helper-validator-identifier-7.18.6" + (sources."@babel/highlight-7.18.6" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -3863,7 +3863,7 @@ let sources."@types/connect-3.4.35" sources."@types/crypto-js-4.1.1" sources."@types/express-4.17.13" - sources."@types/express-serve-static-core-4.17.28" + sources."@types/express-serve-static-core-4.17.29" sources."@types/html-to-text-8.1.0" sources."@types/humanize-duration-3.27.1" sources."@types/istanbul-lib-coverage-2.0.4" @@ -3873,7 +3873,7 @@ let sources."@types/json5-0.0.29" sources."@types/mime-1.3.2" sources."@types/mocha-9.1.1" - sources."@types/node-16.11.35" + sources."@types/node-16.11.45" sources."@types/parse5-6.0.3" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -3901,7 +3901,7 @@ let ]; }) sources."ajv-6.12.6" - sources."ansi-colors-4.1.2" + sources."ansi-colors-4.1.3" sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" @@ -4046,7 +4046,7 @@ let sources."find-up-5.0.0" sources."flat-5.0.2" sources."flat-cache-3.0.4" - sources."flatted-3.2.5" + sources."flatted-3.2.6" sources."forever-agent-0.6.1" sources."form-data-3.0.1" sources."forwarded-0.2.0" @@ -4056,12 +4056,12 @@ let sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.1" + sources."get-intrinsic-1.1.2" sources."getpass-0.1.7" sources."glob-7.2.3" sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" - sources."globals-13.15.0" + sources."globals-13.16.0" sources."graceful-fs-4.2.10" sources."growl-1.10.5" sources."har-schema-2.0.0" @@ -4089,7 +4089,7 @@ let sources."ms-2.1.2" ]; }) - sources."humanize-duration-3.27.1" + sources."humanize-duration-3.27.2" sources."humanize-duration-ts-2.1.1" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" @@ -4117,7 +4117,7 @@ let sources."jest-matcher-utils-27.5.1" (sources."jest-message-util-27.5.1" // { dependencies = [ - sources."@babel/code-frame-7.16.7" + sources."@babel/code-frame-7.18.6" ]; }) sources."js-tokens-4.0.0" @@ -4188,9 +4188,9 @@ let sources."nearley-2.20.1" sources."negotiator-0.6.3" sources."normalize-path-3.0.0" - sources."nwsapi-2.2.0" + sources."nwsapi-2.2.1" sources."oauth-sign-0.9.0" - sources."object-inspect-1.12.0" + sources."object-inspect-1.12.2" sources."on-finished-2.4.1" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -4212,7 +4212,7 @@ let sources."picocolors-1.0.0" sources."picomatch-2.3.1" sources."pify-3.0.0" - sources."postcss-8.4.13" + sources."postcss-8.4.14" sources."prelude-ls-1.1.2" (sources."pretty-format-27.5.1" // { dependencies = [ @@ -4222,7 +4222,7 @@ let sources."progress-2.0.3" sources."proxy-addr-2.0.7" sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.10.3" sources."railroad-diagrams-1.0.0" @@ -4248,7 +4248,7 @@ let sources."request-promise-core-1.1.4" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.22.0" + sources."resolve-1.22.1" sources."resolve-from-4.0.0" sources."ret-0.1.15" sources."rimraf-3.0.2" @@ -4339,7 +4339,7 @@ let sources."type-check-0.3.2" sources."type-fest-0.20.2" sources."type-is-1.6.18" - sources."typescript-4.6.4" + sources."typescript-4.7.4" sources."typescript-formatter-7.2.2" sources."universalify-0.1.2" sources."unpipe-1.0.0" @@ -4360,7 +4360,7 @@ let sources."workerpool-6.2.0" sources."wrap-ansi-7.0.0" sources."wrappy-1.0.2" - sources."ws-7.5.7" + sources."ws-7.5.9" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."y18n-5.0.8" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix index 73fe3ed119..186b893ac0 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cadvisor"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; rev = "v${version}"; - sha256 = "sha256-OVUKQGP9zzlzoC/25BHNbJuP6ELstBMaRFAzUnDSR0U="; + sha256 = "sha256-hH3unhGRrB8IegVaX+j2idY0woMqzchEEXZB/ppzIf0="; }; modRoot = "./cmd"; - vendorSha256 = "sha256-LGMouB76GT/ZvG3kLoo/jmnHT0CEeND9pObTOKaS9T0="; + vendorSha256 = "sha256-Mcelh/nYFcNTrI1Kq9KqkJeSnbgJhd7HfbexhNYbPFg="; ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/exportarr/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/exportarr/default.nix new file mode 100644 index 0000000000..911708a53c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/exportarr/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "exportarr"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "onedr0p"; + repo = "exportarr"; + rev = "v${version}"; + hash = "sha256-KTuOhyBFS6fgA9N70vq+5fJIGVsgEZ7Uxls8efqLuII="; + }; + + vendorSha256 = "sha256-Yox3LAVbTZqsDmk45uSuKgITRz3zE+HTAKxVf9wdtjE="; + + subPackages = [ "cmd/exportarr" ]; + + ldflags = [ + "-s" + "-w" + ] ++ lib.optionals stdenv.isLinux [ + "-extldflags=-static" + ]; + + tags = lib.optionals stdenv.isLinux [ "netgo" ]; + + meta = with lib; { + description = "AIO Prometheus Exporter for Sonarr, Radarr or Lidarr"; + homepage = "https://github.com/onedr0p/exportarr"; + changelog = "https://github.com/onedr0p/exportarr/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index eda6b1ec95..c25c34c125 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.0.3"; + version = "9.0.7"; 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-oFVAiQt+ZxLB1On1wKM2R2qTEl5zBbWpkvBOLQ081+A="; + sha256 = "sha256-rmcoyYBTT1po0TphmoGSoiS13W98LvjBhizKkhZVMzE="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-l2XTC0OxIeUD4sjM4w9WsT9s5akGjWpFmnZnmI/vSEA="; + sha256 = "sha256-9mXmot/UjMNrfDQ1MXSQvjn6cBBNQ4gP7bJvpBqBIKc="; }; - vendorSha256 = "sha256-ncMIu6J7D3xflZSxf8txpaQd0YW62CtzcO5w/PUE1UU="; + vendorSha256 = "sha256-6Z1qvn5HTybKAjsst8kSGYCbEIBsPyhNswVGGiMD9B8="; nativeBuildInputs = [ wire ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 8d7a06a4e7..627598a219 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.6.0"; + version = "2.6.1"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "sha256-LPunSNKF0HBlmYOn0AIT0zLSVmLaizDnDchJhMjexfM="; + sha256 = "sha256-6g0tzI6ZW+wwbPrNTdj0t2H0/M8+M9ioJl6iPL0mAtY="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index 54307fb98b..8b7f6042a7 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.72.9"; + version = "0.73.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+3a0FyVf5AB85gGGBI8/ssLBqj9Kp3w9DUNbSaAtXvA="; + sha256 = "sha256-Ev7GhJjGNgMlkvfGV2oi2uvtvlDTTIo3YQAM87KC4r0="; }; nativeBuildInputs = [ makeWrapper ]; checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorSha256 = "sha256-4hdy+Yr9EoUjJ4+pJ2ZEPGlnq+4sx5JLm92eFFav6tU="; + vendorSha256 = "sha256-K/HnlrXFgLsm+9161RkeTBbToY8SoHVinY2aY2+S6p4="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix index 9a837073ee..57f99a4388 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mimir/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "mimir"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { rev = "${pname}-${version}"; owner = "grafana"; repo = pname; - sha256 = "sha256-n7Vzp/GQIC+Mryu9SycMZ3ScPo5O+5tA4TdigpKzmLU="; + sha256 = "sha256-c2WOE7lm62uZ+oVSWd2Gyo0UZJaf9yFzEQZvcwpvshA="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix index 205e33ee01..b8e1c9e1eb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "check_ssl_cert"; - version = "2.34.0"; + version = "2.36.0"; src = fetchFromGitHub { owner = "matteocorti"; repo = "check_ssl_cert"; rev = "v${version}"; - hash = "sha256-cEjYDb614JLNyuzpSUcIiZgK4vHa6NkL/DefqV+IGdQ="; + hash = "sha256-J+sjJEZlkNWGAt66iwNmlIgqzRgp3nKO62FzSXN4cGE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix index 5e7aa35d62..e4447d7a84 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/net-snmp/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "net-snmp"; - version = "5.9.1"; + version = "5.9.3"; src = fetchurl { url = "mirror://sourceforge/net-snmp/${pname}-${version}.tar.gz"; - sha256 = "sha256-63/UpE3mzdv/2akqha0TCeXBBU+51afdkweciVP0jD8="; + sha256 = "sha256-IJfym34b8/EwC0uuUvojCNC7jV05mNvgL5RipBOi7wo="; }; patches = diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index f6cd44ca7b..a5cb1f25cd 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "blackbox_exporter"; - version = "0.21.1"; + version = "0.22.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "sha256-57+bNoLUfB98WqDUe8ysRdoG87RhKXttmkA//ucSqbQ="; + sha256 = "sha256-TelyZTzh/+fHe42H3AarZzuU8zY1EflHVo9c4WymMVc="; }; - vendorSha256 = "sha256-7V5WEEy/Rz1QjscPD2Kz+viGkKQsWjs+8QN/3W7D+Ik="; + vendorSha256 = "sha256-pzEEi9O/Sgsv1dFm7wQt6PaP/beV5PMrXEZC9N/6lUc="; # dns-lookup is performed for the tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index d089a3877c..4f059b7e84 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -20,7 +20,7 @@ buildGoPackage rec { description = "Relay server for exporting metrics from collectd to Prometheus"; homepage = "https://github.com/prometheus/collectd_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix index 2ec89972a6..46e81508b4 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/dmarc-metrics-exporter/default.nix @@ -4,7 +4,7 @@ python3.pkgs.buildPythonApplication rec { pname = "dmarc-metrics-exporter"; - version = "0.6.0"; + version = "0.6.1"; disabled = python3.pythonOlder "3.7"; @@ -12,11 +12,12 @@ python3.pkgs.buildPythonApplication rec { src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "70f39b373ead42acb8caf56040f7ebf13ab67aea505511025c09ecf4560f8b1b"; + hash = "sha256-VYmSHDde3zLq7NcsX7xp1JYe6x6RKFEravpakIzW390="; }; postPatch = '' substituteInPlace pyproject.toml \ + --replace 'uvicorn = {extras = ["standard"], version = "^0.15.0"}' 'uvicorn = {version = "^0.15.0"}' \ --replace '"^' '">=' ''; @@ -31,7 +32,8 @@ python3.pkgs.buildPythonApplication rec { typing-extensions uvicorn xsdata - ]; + ] + ++ uvicorn.optional-dependencies.standard; checkInputs = with python3.pkgs; [ aiohttp diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index f4c64d225e..5d47bede00 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -19,7 +19,7 @@ buildGoModule rec { description = "HAProxy Exporter for the Prometheus monitoring system"; homepage = "https://github.com/prometheus/haproxy_exporter"; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix index 35c67af92b..8b6a422b59 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "influxdb_exporter"; - version = "0.8.0"; + version = "0.10.0"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "influxdb_exporter"; - sha256 = "sha256-aNj4ru3yDet+jdcEpckFVaymmjWmKzTMPcTxPMNFbgo="; + sha256 = "sha256-AK1vlaYd2/+8/1rpzT1lKvTgybgxoL7gFqZIadfEUQY="; }; - vendorSha256 = null; + vendorSha256 = "sha256-xTxSKeCTkWKl70wm+5htFncMW6SdzbA4zW9tjKE9vDM="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix index 78224bcfaa..735fc85299 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openvpn-exporter.nix @@ -18,6 +18,6 @@ buildGoModule rec { description = "Prometheus exporter for OpenVPN"; broken = true; license = licenses.asl20; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix index af6d6cfebb..4d38236061 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/postgres-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "postgres_exporter"; - version = "0.10.1"; + version = "0.11.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "postgres_exporter"; rev = "v${version}"; - sha256 = "sha256-AH4nVwmNS4YtKxrWlFNqN+Q59TaSCGdoiCfpelPtJuM="; + sha256 = "sha256-XrCO77R/rfkhSvebMjYwhe8JJ/Ley4VrXMqi5jax86k="; }; - vendorSha256 = "sha256-ST/Mc8RDEu2G6ufus8Gi7dwdBNIpaKJjn+Fw1AKCaXs="; + vendorSha256 = "sha256-ocapAJAQD84zISbTduAf3QyjaZ0UroNMdQig6IBNDpw="; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix index f14ceec44e..f8a195c92f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -42,7 +42,7 @@ buildGoPackage rec { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; homepage = "https://github.com/prometheus/pushgateway"; license = licenses.asl20; - maintainers = with maintainers; [ benley fpletz ]; + maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index 398af24535..dbda3a7cf0 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "statsd_exporter"; - version = "0.22.2"; + version = "0.22.7"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "statsd_exporter"; - sha256 = "sha256-pLzUbeSCMV0yr4gSR7m6NYrpm8ZhCPbwwZ5nQzy6lEM="; + sha256 = "sha256-hkzgLjxFczqKKJHdVfCKPqMXVFShlS5lZoX8NA27u90="; }; - vendorSha256 = "sha256-gBeeOxnVT0+x33VuwZhfjk3Fb8JHZdAzaDuFZlUfdgM="; + vendorSha256 = "sha256-/qc3Ui18uSDfHsXiNA63+uPSfxShz7cs3kv0rQPgCok="; meta = with lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix index 96029c99d8..4d5d97da76 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "systemd_exporter"; - version = "0.4.0"; + version = "0.5.0"; - vendorSha256 = "sha256-bYoB0r+d0j3esi/kK2a7/Duup9cf4M3WJjiBNs2+bj8="; + vendorSha256 = "sha256-XkwBhj2M1poirPkWzS71NbRTshc8dTKwaHoDfFxpykU="; src = fetchFromGitHub { owner = "povilasv"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JDfRHczFnTP9sxA7polUE9qzJhSPIiAU58GBNDYkX4c="; + sha256 = "sha256-q6rnD8JCtB1zTkUfZt6f2Uyo91uFi3HYI7WFlZdzpBM="; }; passthru.tests = { inherit (nixosTests.prometheus-exporters) systemd; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix new file mode 100644 index 0000000000..8f0be0901e --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/zfs-exporter.nix @@ -0,0 +1,30 @@ +{ buildGoModule +, lib +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zfs_exporter"; + version = "2.2.5"; + + src = fetchFromGitHub { + owner = "pdf"; + repo = pname; + rev = "v" + version; + hash = "sha256-FY3P2wmNWyr7mImc1PJs1G2Ae8rZvDzq0kRZfiRTzyc="; + }; + + vendorSha256 = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c="; + + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} *.md + ''; + + meta = with lib; { + description = "ZFS Exporter for the Prometheus monitoring system"; + homepage = "https://github.com/pdf/zfs_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 8428885d99..d803f68ee3 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.22.4"; + version = "1.23.3"; excludedPackages = "test"; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "sha256-Cftxm+Lb3ekK8YZrklD/C+p0EpyEVU/xxVI5oiNgBxk="; + sha256 = "sha256-RkyHEcz5T8BZoIeLK5OjrJVBNQg5rfFDcHpE52sNM6U="; }; - vendorSha256 = "sha256-VyNPIYRMAC51zp38BKoM5/bLbfwULtFEtRC3LQjVJK4="; + vendorSha256 = "sha256-JvDX55JY5B7f+6GK7x6D1iSyM/h2l5MuAkH2YXodYdM="; proxyVendor = true; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index 7b1bd2960a..0507d6de93 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.25.2"; + version = "0.27.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-CAeI+5aC8kSQaKOk/5WCQiQMOX82hogAQGP2Em3DJAw="; + sha256 = "sha256-QE096mJRRnO86AeA1COgi8gSWwIczefFP7j7V+lx/t4="; }; - vendorSha256 = "sha256-tHtfS4PnO9n3ckUdaG6dQAIE2D2PG6km4Tqofaab/eg="; + vendorSha256 = "sha256-BXLndaLR/A4FIgSXgQZlMzVdDAiDMXa8VkuZakiq/5M="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index 79a84f965b..28f3a85442 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -145,6 +145,12 @@ let ] ++ concatAttrVals features_ nativeFeatureDependencies; + postPatch = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.targetPlatform.darwinSdkVersion "12.0") '' + substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \ + --replace kAudioObjectPropertyElement{Main,Master} \ + --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume + ''; + # Otherwise, the meson log says: # # Program zip found: NO @@ -179,7 +185,7 @@ let description = "A flexible, powerful daemon for playing music"; homepage = "https://www.musicpd.org/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ astsmtl ehmry fpletz tobim ]; + maintainers = with maintainers; [ astsmtl ehmry tobim ]; platforms = platforms.unix; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index a666c3fee3..2ac4be1af5 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -25,7 +25,7 @@ let meta = with lib; { description = "Sharing solution for files, calendars, contacts and more"; homepage = "https://nextcloud.com"; - maintainers = with maintainers; [ schneefux bachp globin fpletz ma27 ]; + maintainers = with maintainers; [ schneefux bachp globin ma27 ]; license = licenses.agpl3Plus; platforms = with platforms; unix; knownVulnerabilities = extraVulnerabilities @@ -46,15 +46,15 @@ in { ''; nextcloud23 = generic { - version = "23.0.6"; - sha256 = "34fbc3a6c16a623f57971b8c4df7c5e62b3650728edec7d05ec116b295040548"; + version = "23.0.8"; + sha256 = "ac3d042253399be25a2aa01c799dec75a1459b6ae453874414f6528cc2ee5061"; }; nextcloud24 = generic { - version = "24.0.2"; - sha256 = "30d6cac1265dff221836bec46a937dcafd7e7d52ee59b939841750b514e5033d"; + version = "24.0.4"; + sha256 = "d107426f8e1c193db882a04c844f9bc7e7eeb7c21e46c46197e5154d6d6ac28e"; }; - # tip: get she sha with: + # tip: get the sha with: # curl 'https://download.nextcloud.com/server/releases/nextcloud-${version}.tar.bz2.sha256' } diff --git a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix index 0c8b871ade..34d0fde0e8 100644 --- a/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nfs-ganesha/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "nfs-ganesha"; - version = "4.0"; + version = "4.0.7"; src = fetchFromGitHub { owner = "nfs-ganesha"; repo = "nfs-ganesha"; rev = "V${version}"; - sha256 = "1zv7aprmydyjs53xnn1h1s6xxb22pic7va23459zq0nfnhmsgd26"; + sha256 = "sha256-SI8n3QdjI72QXQsK+LOj4wmmKQGPU+Y1Ysmfo+N+fY0="; }; preConfigure = "cd src"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix index 2095ac009d..7dc692e113 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "7.0.3"; + version = "7.0.4"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-LN59FyFP/jBZU9qf/xIzPopyyqV/1JI+SHL2NiogjnM="; + sha256 = "sha256-8OZf2nTESj3U+p1RLU1Ngz3Qk5yTTpRqXGIqYw0Ffy8="; }; # Cross-compiling fixes diff --git a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index 0fe4dc28d2..b68fb2cf52 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.77.2"; + version = "1.80.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-S0HXIjZI48A+tMv+gT8UfYqmCI4NOwWAFykfhW73WPc="; + sha256 = "sha256-SIwl8Mgbkk/z3xZ6wCmce7D2T2A2+dcuQ607BOsfrkQ="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix b/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix index 7f9ce7d5b5..6e7672e39f 100644 --- a/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oauth2-proxy"; - version = "7.2.1"; + version = "7.3.0"; src = fetchFromGitHub { repo = pname; owner = "oauth2-proxy"; - sha256 = "sha256-8hYsyHq0iyWzY/HHE4JWBtlaRcSTyM6BdAPcByThme8="; + sha256 = "sha256-GeJRB57CR719Vo1SWk1HYmTR1WEqokMZsUqGO2r0j0Q="; rev = "v${version}"; }; - vendorSha256 = "sha256-+5/j2lZJpyo67uRRSn4Fd8S2K0gfAGMe69OoEEdWijc="; + vendorSha256 = "sha256-sFb3hrjG/Msa29LVicaaAS7LYjDfBsq2DhUwyFQRrSs="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile ldflags = [ "-X main.VERSION=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix b/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix new file mode 100644 index 0000000000..703eaecf60 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/onlyoffice-documentserver/default.nix @@ -0,0 +1,152 @@ +{ lib +, stdenv +, buildFHSUserEnvBubblewrap +, corefonts +, dejavu_fonts +, dpkg +, fetchurl +, gcc-unwrapped +, liberation_ttf_v1 +, writeScript +, xorg +}: + +let + # var/www/onlyoffice/documentserver/server/DocService/docservice + onlyoffice-documentserver = stdenv.mkDerivation rec { + pname = "onlyoffice-documentserver"; + version = "7.1.1-23"; + + 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-hmQx8htSjFszdSAzJgiU7Lo6ebF7TVRfK8rJbJDhX5Q="; + }; + + preferLocalBuild = true; + + unpackCmd = "dpkg -x $curSrc source"; + + nativeBuildInputs = [ + dpkg + ]; + + installPhase = '' + # replace dangling symlinks which are not copied into fhs with actually files + rm lib/*.so* + for file in var/www/onlyoffice/documentserver/server/FileConverter/bin/*.so* ; do + ln -rs "$file" lib/$(basename "$file") + done + + # NixOS uses systemd, not supervisor + rm -rf etc/supervisor + + install -Dm755 usr/bin/documentserver-prepare4shutdown.sh -t $out/bin + # maintainer scripts which expect supervisorctl, try to write into the nix store or are handled by nixos modules + rm -rf usr/bin + + # .deb default documentation + rm -rf usr/share + + # required for bwrap --bind + mkdir -p var/lib/onlyoffice/ var/www/onlyoffice/documentserver/fonts/ + + mv * $out/ + ''; + + # stripping self extracting javascript binaries likely breaks them + dontStrip = true; + + passthru = { + fhs = buildFHSUserEnvBubblewrap { + name = "onlyoffice-wrapper"; + + targetPkgs = pkgs: [ + gcc-unwrapped.lib + onlyoffice-documentserver + + # fonts + corefonts + dejavu_fonts + liberation_ttf_v1 + ]; + + extraBwrapArgs = [ + "--bind var/lib/onlyoffice/ var/lib/onlyoffice/" + "--bind var/lib/onlyoffice/documentserver/sdkjs/common/ var/www/onlyoffice/documentserver/sdkjs/common/" + "--bind var/lib/onlyoffice/documentserver/sdkjs/slide/themes/ var/www/onlyoffice/documentserver/sdkjs/slide/themes/" + "--bind var/lib/onlyoffice/documentserver/fonts/ var/www/onlyoffice/documentserver/fonts/" + "--bind var/lib/onlyoffice/documentserver/server/FileConverter/bin/ var/www/onlyoffice/documentserver/server/FileConverter/bin/" + ]; + + runScript = writeScript "onlyoffice-documentserver-run-script" '' + export NODE_CONFIG_DIR=$2 + export NODE_DISABLE_COLORS=1 + export NODE_ENV=production-linux + + if [[ $1 == DocService/docservice ]]; then + mkdir -p var/www/onlyoffice/documentserver/sdkjs/slide/themes/ + # symlinking themes/src breaks discovery in allfontsgen + rm -rf var/www/onlyoffice/documentserver/sdkjs/slide/themes/src + cp -r ${onlyoffice-documentserver}/var/www/onlyoffice/documentserver/sdkjs/slide/themes/src var/www/onlyoffice/documentserver/sdkjs/slide/themes/ + chmod -R u+w var/www/onlyoffice/documentserver/sdkjs/slide/themes/ + + # onlyoffice places generated files in those directores + rm -rf var/www/onlyoffice/documentserver/sdkjs/common/* + ${xorg.lndir}/bin/lndir -silent ${onlyoffice-documentserver}/var/www/onlyoffice/documentserver/sdkjs/common/ var/www/onlyoffice/documentserver/sdkjs/common/ + rm -rf var/www/onlyoffice/documentserver/server/FileConverter/bin/* + ${xorg.lndir}/bin/lndir -silent ${onlyoffice-documentserver}/var/www/onlyoffice/documentserver/server/FileConverter/bin/ var/www/onlyoffice/documentserver/server/FileConverter/bin/ + + # https://github.com/ONLYOFFICE/document-server-package/blob/master/common/documentserver/bin/documentserver-generate-allfonts.sh.m4 + echo -n Generating AllFonts.js, please wait... + "var/www/onlyoffice/documentserver/server/tools/allfontsgen"\ + --input="${onlyoffice-documentserver}/var/www/onlyoffice/documentserver/core-fonts"\ + --allfonts-web="var/www/onlyoffice/documentserver/sdkjs/common/AllFonts.js"\ + --allfonts="var/www/onlyoffice/documentserver/server/FileConverter/bin/AllFonts.js"\ + --images="var/www/onlyoffice/documentserver/sdkjs/common/Images"\ + --selection="var/www/onlyoffice/documentserver/server/FileConverter/bin/font_selection.bin"\ + --output-web="var/www/onlyoffice/documentserver/fonts"\ + --use-system="true" + echo Done + + echo -n Generating presentation themes, please wait... + "var/www/onlyoffice/documentserver/server/tools/allthemesgen"\ + --converter-dir="var/www/onlyoffice/documentserver/server/FileConverter/bin"\ + --src="var/www/onlyoffice/documentserver/sdkjs/slide/themes"\ + --output="var/www/onlyoffice/documentserver/sdkjs/common/Images" + + "var/www/onlyoffice/documentserver/server/tools/allthemesgen"\ + --converter-dir="var/www/onlyoffice/documentserver/server/FileConverter/bin"\ + --src="var/www/onlyoffice/documentserver/sdkjs/slide/themes"\ + --output="var/www/onlyoffice/documentserver/sdkjs/common/Images"\ + --postfix="ios"\ + --params="280,224" + + "var/www/onlyoffice/documentserver/server/tools/allthemesgen"\ + --converter-dir="var/www/onlyoffice/documentserver/server/FileConverter/bin"\ + --src="var/www/onlyoffice/documentserver/sdkjs/slide/themes"\ + --output="var/www/onlyoffice/documentserver/sdkjs/common/Images"\ + --postfix="android"\ + --params="280,224" + echo Done + fi + + exec var/www/onlyoffice/documentserver/server/$1 + ''; + }; + }; + + meta = with lib; { + description = "ONLYOFFICE Document Server is an online office suite comprising viewers and editors"; + longDescription = '' + ONLYOFFICE Document Server is an online office suite comprising viewers and editors for texts, spreadsheets and presentations, + fully compatible with Office Open XML formats: .docx, .xlsx, .pptx and enabling collaborative editing in real time. + ''; + homepage = "ONLYOFFICE Document Server is an online office suite comprising viewers and editors"; + license = licenses.agpl3; + platforms = [ "x86_64-linux" ]; + sourceProvenance = sourceTypes.binaryNativeCode; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; + }; +in +onlyoffice-documentserver diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.9/bosserver.patch b/third_party/nixpkgs/pkgs/servers/openafs/1.9/bosserver.patch deleted file mode 100644 index 094d9871f6..0000000000 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.9/bosserver.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -u openafs-1.8.0/src/bozo/bosserver.c /tmp/buffer-content-13110-gd ---- openafs-1.8.0/src/bozo/bosserver.c -+++ # -@@ -244,24 +244,6 @@ - static int - CreateDirs(const char *coredir) - { -- if ((!strncmp -- (AFSDIR_USR_DIRPATH, AFSDIR_CLIENT_ETC_DIRPATH, -- strlen(AFSDIR_USR_DIRPATH))) -- || -- (!strncmp -- (AFSDIR_USR_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH, -- strlen(AFSDIR_USR_DIRPATH)))) { -- if (MakeDir(AFSDIR_USR_DIRPATH)) -- return errno; -- } -- if (!strncmp -- (AFSDIR_SERVER_AFS_DIRPATH, AFSDIR_SERVER_BIN_DIRPATH, -- strlen(AFSDIR_SERVER_AFS_DIRPATH))) { -- if (MakeDir(AFSDIR_SERVER_AFS_DIRPATH)) -- return errno; -- } -- if (MakeDir(AFSDIR_SERVER_BIN_DIRPATH)) -- return errno; - if (MakeDir(AFSDIR_SERVER_ETC_DIRPATH)) - return errno; - if (MakeDir(AFSDIR_SERVER_LOCAL_DIRPATH)) - -Diff finished. Fri Jun 29 15:45:46 2018 diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.9/cross-build.patch b/third_party/nixpkgs/pkgs/servers/openafs/1.9/cross-build.patch deleted file mode 100644 index 62254164a1..0000000000 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.9/cross-build.patch +++ /dev/null @@ -1,223 +0,0 @@ -diff -Nur --unidirectional-new-file openafs-1.8.2/configure.ac openafs-1.8.2.new/configure.ac ---- openafs-1.8.2/configure.ac 2018-09-11 17:52:48.000000000 +0200 -+++ openafs-1.8.2.new/configure.ac 2018-10-16 15:56:36.512277860 +0200 -@@ -23,6 +23,7 @@ - AFS_LT_INIT - - AC_PROG_CC -+AX_PROG_CC_FOR_BUILD - - AC_PATH_PROGS([PATH_CPP], [cpp], [${CC-cc} -E], [$PATH:/lib:/usr/ccs/lib]) - AC_SUBST([PATH_CPP]) -diff -Nur --unidirectional-new-file openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4 ---- openafs-1.8.2/src/cf/ax_prog_cc_for_build.m4 1970-01-01 01:00:00.000000000 +0100 -+++ openafs-1.8.2.new/src/cf/ax_prog_cc_for_build.m4 2018-10-16 16:20:40.278641658 +0200 -@@ -0,0 +1,125 @@ -+# =========================================================================== -+# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_PROG_CC_FOR_BUILD -+# -+# DESCRIPTION -+# -+# This macro searches for a C compiler that generates native executables, -+# that is a C compiler that surely is not a cross-compiler. This can be -+# useful if you have to generate source code at compile-time like for -+# example GCC does. -+# -+# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything -+# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). -+# The value of these variables can be overridden by the user by specifying -+# a compiler with an environment variable (like you do for standard CC). -+# -+# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object -+# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if -+# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are -+# substituted in the Makefile. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Paolo Bonzini -+# -+# Copying and distribution of this file, with or without modification, are -+# permitted in any medium without royalty provided the copyright notice -+# and this notice are preserved. This file is offered as-is, without any -+# warranty. -+ -+#serial 9 -+ -+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) -+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_PROG_CPP])dnl -+AC_REQUIRE([AC_EXEEXT])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+ -+dnl Use the standard macros, but make them use other variable names -+dnl -+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl -+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl -+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl -+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl -+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl -+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl -+pushdef([ac_cv_objext], ac_cv_build_objext)dnl -+pushdef([ac_exeext], ac_build_exeext)dnl -+pushdef([ac_objext], ac_build_objext)dnl -+pushdef([CC], CC_FOR_BUILD)dnl -+pushdef([CPP], CPP_FOR_BUILD)dnl -+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl -+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl -+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl -+pushdef([host], build)dnl -+pushdef([host_alias], build_alias)dnl -+pushdef([host_cpu], build_cpu)dnl -+pushdef([host_vendor], build_vendor)dnl -+pushdef([host_os], build_os)dnl -+pushdef([ac_cv_host], ac_cv_build)dnl -+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl -+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl -+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl -+pushdef([ac_cv_host_os], ac_cv_build_os)dnl -+pushdef([ac_cpp], ac_build_cpp)dnl -+pushdef([ac_compile], ac_build_compile)dnl -+pushdef([ac_link], ac_build_link)dnl -+ -+save_cross_compiling=$cross_compiling -+save_ac_tool_prefix=$ac_tool_prefix -+cross_compiling=no -+ac_tool_prefix= -+ -+AC_PROG_CC -+AC_PROG_CPP -+AC_EXEEXT -+ -+ac_tool_prefix=$save_ac_tool_prefix -+cross_compiling=$save_cross_compiling -+ -+dnl Restore the old definitions -+dnl -+popdef([ac_link])dnl -+popdef([ac_compile])dnl -+popdef([ac_cpp])dnl -+popdef([ac_cv_host_os])dnl -+popdef([ac_cv_host_vendor])dnl -+popdef([ac_cv_host_cpu])dnl -+popdef([ac_cv_host_alias])dnl -+popdef([ac_cv_host])dnl -+popdef([host_os])dnl -+popdef([host_vendor])dnl -+popdef([host_cpu])dnl -+popdef([host_alias])dnl -+popdef([host])dnl -+popdef([LDFLAGS])dnl -+popdef([CPPFLAGS])dnl -+popdef([CFLAGS])dnl -+popdef([CPP])dnl -+popdef([CC])dnl -+popdef([ac_objext])dnl -+popdef([ac_exeext])dnl -+popdef([ac_cv_objext])dnl -+popdef([ac_cv_exeext])dnl -+popdef([ac_cv_prog_cc_g])dnl -+popdef([ac_cv_prog_cc_cross])dnl -+popdef([ac_cv_prog_cc_works])dnl -+popdef([ac_cv_prog_gcc])dnl -+popdef([ac_cv_prog_CPP])dnl -+ -+dnl Finally, set Makefile variables -+dnl -+BUILD_EXEEXT=$ac_build_exeext -+BUILD_OBJEXT=$ac_build_objext -+AC_SUBST(BUILD_EXEEXT)dnl -+AC_SUBST(BUILD_OBJEXT)dnl -+AC_SUBST([CFLAGS_FOR_BUILD])dnl -+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl -+AC_SUBST([LDFLAGS_FOR_BUILD])dnl -+]) -diff -Nur --unidirectional-new-file openafs-1.8.2/src/comerr/Makefile.in openafs-1.8.2.new/src/comerr/Makefile.in ---- openafs-1.8.2/src/comerr/Makefile.in 2018-09-11 17:52:48.000000000 +0200 -+++ openafs-1.8.2.new/src/comerr/Makefile.in 2018-10-16 15:48:19.678898925 +0200 -@@ -38,11 +38,14 @@ - compile_et: compile_et.o error_table.o - $(Q)case $(SYS_NAME) in \ - *_linux* | *_umlinux* | *_darwin* ) \ -- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr $(buildtool_roken) $(MT_LIBS);; \ -+ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build $(buildtool_roken) $(MT_LIBS);; \ - * ) \ -- $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr -ll $(buildtool_roken) $(MT_LIBS);; \ -+ $(LT_LDRULE_static_NOQ) compile_et.o error_table.o -L${TOP_LIBDIR} -lopr_build -ll $(buildtool_roken) $(MT_LIBS);; \ - esac - -+compile_et compile_et.o error_table.o: CC=$(CC_FOR_BUILD) -+compile_et compile_et.o error_table.o: LD=$(CC_FOR_BUILD) -+ - libafscom_err.a: $(LT_objs) - $(LT_LDLIB_lwp) $(LT_objs) - -diff -Nur --unidirectional-new-file openafs-1.8.2/src/config/Makefile.in openafs-1.8.2.new/src/config/Makefile.in ---- openafs-1.8.2/src/config/Makefile.in 2018-09-11 17:52:48.000000000 +0200 -+++ openafs-1.8.2.new/src/config/Makefile.in 2018-10-16 15:48:19.677898926 +0200 -@@ -54,6 +54,8 @@ - - config.o: config.c AFS_component_version_number.c - -+config mkvers config.o mc.o: CC=$(CC_FOR_BUILD) -+ - # - # Include installation targets - # -diff -Nur --unidirectional-new-file openafs-1.8.2/src/opr/Makefile.in openafs-1.8.2.new/src/opr/Makefile.in ---- openafs-1.8.2/src/opr/Makefile.in 2018-09-11 17:52:48.000000000 +0200 -+++ openafs-1.8.2.new/src/opr/Makefile.in 2018-10-16 15:48:19.678898925 +0200 -@@ -21,7 +21,7 @@ - $(TOP_INCDIR)/opr/time.h \ - $(TOP_INCDIR)/opr/uuid.h - --all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a -+all: $(HEADERS) liboafs_opr.la $(TOP_LIBDIR)/libopr_pic.a $(TOP_LIBDIR)/libopr.a $(TOP_LIBDIR)/libopr_build.a - - liboafs_opr.la: liboafs_opr.la.sym $(LT_objs) $(LT_deps) - $(LT_LDLIB_shlib) $(LT_objs) $(LT_deps) $(LT_libs) -@@ -29,12 +29,26 @@ - libopr.a: $(LT_objs) - $(LT_LDLIB_static) $(LT_objs) - -+LT_objs_build = $(patsubst %.lo, %_build.lo, $(LT_objs)) -+ -+%_build.lo: %.c -+ $(LT_CCRULE) $< -+ -+libopr_build.a: $(LT_objs_build) -+ $(LT_LDLIB_static) $(LT_objs_build) -+ -+libopr_build.a $(LT_objs_build): CC=$(CC_FOR_BUILD) -+libopr_build.a $(LT_objs_build): LD=$(CC_FOR_BUILD) -+ - libopr_pic.la: $(LT_objs) - $(LT_LDLIB_pic) $(LT_objs) - - $(TOP_LIBDIR)/libopr.a: libopr.a - $(INSTALL_DATA) libopr.a $@ - -+$(TOP_LIBDIR)/libopr_build.a: libopr_build.a -+ $(INSTALL_DATA) libopr_build.a $@ -+ - $(TOP_LIBDIR)/libopr_pic.a: libopr_pic.la - $(INSTALL_DATA) .libs/libopr_pic.a $@ - -diff -Nur --unidirectional-new-file openafs-1.8.2/src/rxgen/Makefile.in openafs-1.8.2.new/src/rxgen/Makefile.in ---- openafs-1.8.2/src/rxgen/Makefile.in 2018-09-11 17:52:48.000000000 +0200 -+++ openafs-1.8.2.new/src/rxgen/Makefile.in 2018-10-16 15:48:19.677898926 +0200 -@@ -25,6 +25,8 @@ - - CFLAGS_rpc_main.o= -DPATH_CPP="\"$(PATH_CPP)\"" - -+rxgen $(OBJS): CC=$(CC_FOR_BUILD) -+ - # - # Install targets - # diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.9/default.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.9/default.nix deleted file mode 100644 index 918a20ce5a..0000000000 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.9/default.nix +++ /dev/null @@ -1,105 +0,0 @@ -{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex -, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file -, docbook_xml_dtd_43, libtool_2 -, withDevdoc ? false, doxygen, dblatex # Extra developer documentation -, ncurses # Extra ncurses utilities. Needed for debugging and monitoring. -, tsmbac ? null # Tivoli Storage Manager Backup Client from IBM -}: - -with (import ./srcs.nix { inherit fetchurl; }); -let - inherit (lib) optional optionalString optionals; - -in stdenv.mkDerivation { - pname = "openafs"; - inherit version srcs; - - depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl - which bison ] ++ optionals withDevdoc [ doxygen dblatex ]; - - buildInputs = [ libkrb5 ncurses ]; - - patches = [ ./bosserver.patch ./cross-build.patch ] ++ optional (tsmbac != null) ./tsmbac.patch; - - outputs = [ "out" "dev" "man" "doc" ] ++ optional withDevdoc "devdoc"; - - enableParallelBuilding = false; - - setOutputFlags = false; - - # Makefiles don't include install targets for all new shared libs, yet. - dontDisableStatic = true; - - preConfigure = '' - patchShebangs . - for i in `grep -l -R '/usr/\(include\|src\)' .`; do - echo "Patch /usr/include and /usr/src in $i" - substituteInPlace $i \ - --replace "/usr/include" "${glibc.dev}/include" \ - --replace "/usr/src" "$TMP" - done - - for i in ./doc/xml/{AdminGuide,QuickStartUnix,UserGuide}/*.xml; do - substituteInPlace "''${i}" --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ - "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" - done - - ./regen.sh - - - configureFlagsArray=( - "--with-gssapi" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--disable-kernel-module" - "--disable-fuse-client" - "--with-docbook-stylesheets=${docbook_xsl}/share/xml/docbook-xsl" - ${optionalString (tsmbac != null) "--enable-tivoli-tsm"} - ${optionalString (ncurses == null) "--disable-gtx"} - "--disable-linux-d_splice-alias-extra-iput" - ) - '' + optionalString (tsmbac != null) '' - export XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I${tsmbac}/lib64/sample -DXBSA_TSMLIB=\\\"${tsmbac}/lib64/libApiTSM64.so\\\"" - export XBSA_XLIBS="-ldl" - ''; - - buildFlags = [ "all_nolibafs" ]; - - postBuild = '' - for d in doc/xml/{AdminGuide,QuickStartUnix,UserGuide}; do - make -C "''${d}" index.html - done - '' + optionalString withDevdoc '' - make dox - ''; - - postInstall = '' - mkdir -p $doc/share/doc/openafs/{AdminGuide,QuickStartUnix,UserGuide} - cp -r doc/txt README LICENSE $doc/share/doc/openafs - for d in AdminGuide QuickStartUnix UserGuide ; do - cp "doc/xml/''${d}"/*.html "$doc/share/doc/openafs/''${d}" - done - - rm -r $out/lib/openafs - '' + optionalString withDevdoc '' - mkdir -p $devdoc/share/devhelp/openafs/doxygen - cp -r doc/{pdf,protocol} $devdoc/share/devhelp/openafs - cp -r doc/doxygen/output/html $devdoc/share/devhelp/openafs/doxygen - ''; - - # Avoid references to $TMPDIR by removing it and let patchelf cleanup the - # binaries. - preFixup = '' - rm -rf "$(pwd)" && mkdir "$(pwd)" - ''; - - meta = with lib; { - outputsToInstall = [ "out" "doc" "man" ]; - description = "Open AFS client"; - homepage = "https://www.openafs.org"; - license = licenses.ipl10; - platforms = platforms.linux; - maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix deleted file mode 100644 index ec1b8e1d67..0000000000 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.9/module.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison -, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }: - -with (import ./srcs.nix { - inherit fetchurl; -}); - -let - modDestDir = "$out/lib/modules/${kernel.modDirVersion}/extra/openafs"; - kernelBuildDir = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - -in stdenv.mkDerivation { - pname = "openafs"; - version = "${version}-${kernel.modDirVersion}"; - inherit src; - - nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ] - ++ kernel.moduleBuildDependencies; - - buildInputs = [ libkrb5 ]; - - patches = []; - - hardeningDisable = [ "pic" ]; - - configureFlags = [ - "--with-linux-kernel-build=${kernelBuildDir}" - "--sysconfdir=/etc" - "--localstatedir=/var" - "--with-gssapi" - "--disable-linux-d_splice-alias-extra-iput" - ]; - - preConfigure = '' - patchShebangs . - for i in `grep -l -R '/usr/\(include\|src\)' .`; do - echo "Patch /usr/include and /usr/src in $i" - substituteInPlace $i \ - --replace "/usr/include" "${glibc.dev}/include" \ - --replace "/usr/src" "${kernelBuildDir}" - done - - ./regen.sh -q - ''; - - buildPhase = '' - make V=1 only_libafs - ''; - - installPhase = '' - mkdir -p ${modDestDir} - cp src/libafs/MODLOAD-*/libafs-${kernel.modDirVersion}.* ${modDestDir}/libafs.ko - xz -f ${modDestDir}/libafs.ko - ''; - - meta = with lib; { - description = "Open AFS client kernel module"; - homepage = "https://www.openafs.org"; - license = licenses.ipl10; - platforms = platforms.linux; - maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; - broken = kernel.kernelAtLeast "5.15" || kernel.isHardened; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.9/srcs.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.9/srcs.nix deleted file mode 100644 index 853cd2aaba..0000000000 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.9/srcs.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ fetchurl }: -rec { - version = "1.9.1"; - src = fetchurl { - url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "sha256-7rHihVR4VobHAzt0ZALFOLJnlfd1Qwsa5ohpRFWBPbw="; - }; - - srcs = [ src - (fetchurl { - url = "https://www.openafs.org/dl/openafs/${version}/openafs-${version}-doc.tar.bz2"; - sha256 = "sha256-pvF8CdTl+5DNuymNvhb3UrGW05LcXRv8cZp2QQlXF+E="; - })]; -} diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.9/tsmbac.patch b/third_party/nixpkgs/pkgs/servers/openafs/1.9/tsmbac.patch deleted file mode 100644 index f68c777b6f..0000000000 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.9/tsmbac.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -ru openafs-1.8.0/src/butc/afsxbsa.c openafs-1.8.0.new/src/butc/afsxbsa.c ---- openafs-1.8.0/src/butc/afsxbsa.c 2018-04-06 03:21:12.000000000 +0200 -+++ openafs-1.8.0.new/src/butc/afsxbsa.c 2018-06-12 16:26:26.272522305 +0200 -@@ -651,7 +651,7 @@ - #if defined(AFS_AIX_ENV) - dynlib = dlopen("/usr/lib/libApiDS.a(dsmapish.o)", RTLD_NOW | RTLD_LOCAL | RTLD_MEMBER); - #elif defined (AFS_AMD64_LINUX26_ENV) -- dynlib = dlopen("/usr/lib64/libApiTSM64.so", RTLD_NOW | RTLD_LOCAL); -+ dynlib = dlopen(XBSA_TSMLIB, RTLD_NOW | RTLD_LOCAL); - #elif defined(AFS_SUN5_ENV) || defined(AFS_LINUX26_ENV) - dynlib = dlopen("/usr/lib/libApiDS.so", RTLD_NOW | RTLD_LOCAL); - #else -diff -ru openafs-1.8.0/src/cf/tivoli.m4 openafs-1.8.0.new/src/cf/tivoli.m4 ---- openafs-1.8.0/src/cf/tivoli.m4 2018-04-06 03:21:12.000000000 +0200 -+++ openafs-1.8.0.new/src/cf/tivoli.m4 2018-06-12 16:26:26.072522485 +0200 -@@ -1,45 +1,7 @@ - AC_DEFUN([OPENAFS_TIVOLI_TESTS],[ - dnl check for tivoli - AC_MSG_CHECKING(for tivoli tsm butc support) --XBSA_CFLAGS="" --if test "$enable_tivoli_tsm" = "yes"; then -- XBSADIR1=/usr/tivoli/tsm/client/api/bin/xopen -- XBSADIR2=/opt/tivoli/tsm/client/api/bin/xopen -- XBSADIR3=/usr/tivoli/tsm/client/api/bin/sample -- XBSADIR4=/opt/tivoli/tsm/client/api/bin/sample -- XBSADIR5=/usr/tivoli/tsm/client/api/bin64/sample -- XBSADIR6=/opt/tivoli/tsm/client/api/bin64/sample -- -- if test -r "$XBSADIR3/dsmapifp.h"; then -- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR3" -- XBSA_XLIBS="-ldl" -- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) -- elif test -r "$XBSADIR4/dsmapifp.h"; then -- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR4" -- XBSA_XLIBS="-ldl" -- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) -- elif test -r "$XBSADIR5/dsmapifp.h"; then -- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR5" -- XBSA_XLIBS="-ldl" -- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) -- elif test -r "$XBSADIR6/dsmapifp.h"; then -- XBSA_CFLAGS="-Dxbsa -DNEW_XBSA -I$XBSADIR6" -- XBSA_XLIBS="-ldl" -- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) -- elif test -r "$XBSADIR1/xbsa.h"; then -- XBSA_CFLAGS="-Dxbsa -I$XBSADIR1" -- XBSA_XLIBS="" -- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) -- elif test -r "$XBSADIR2/xbsa.h"; then -- XBSA_CFLAGS="-Dxbsa -I$XBSADIR2" -- XBSA_XLIBS="" -- AC_MSG_RESULT([yes, $XBSA_CFLAGS]) -- else -- AC_MSG_RESULT([no, missing xbsa.h and dsmapifp.h header files]) -- fi --else -- AC_MSG_RESULT([no]) --fi -+AC_MSG_RESULT([yes]) - AC_SUBST(XBSA_CFLAGS) - AC_SUBST(XBSA_XLIBS) - XLIBS="$XBSA_XLIBS $XLIBS" diff --git a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix index 99ef62210b..4953ac8592 100644 --- a/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/openvscode-server/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "openvscode-server"; - version = "1.66.0"; + version = "1.69.2"; src = fetchFromGitHub { owner = "gitpod-io"; repo = "openvscode-server"; rev = "openvscode-server-v${version}"; - sha256 = "g5QaxZDVXvE/vOe2BjBXlqYLGZ2EG4nTKdUlLdt8H8A="; + sha256 = "e2vEEZg2H37oFRN+0kZnWW5RU2ma2JJR66XLFDNEOXc="; }; yarnCache = stdenv.mkDerivation { @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-BeVJsruiRLReGMwThfcEm/ez4UFcr0oI4wwevJwxt58="; + outputHash = "sha256-5wOR7rKzGLE8EAlGd4CkrFUsUOEJOdwuNWQzEdbAL+g="; }; # Extract the Node.js source code which is used to compile packages with diff --git a/third_party/nixpkgs/pkgs/servers/owncast/default.nix b/third_party/nixpkgs/pkgs/servers/owncast/default.nix index 313d17e8e8..a4dff20d31 100644 --- a/third_party/nixpkgs/pkgs/servers/owncast/default.nix +++ b/third_party/nixpkgs/pkgs/servers/owncast/default.nix @@ -30,6 +30,7 @@ buildGoModule rec { ) [ ! -d "$PWD/static" ] && ( + [ -L "$PWD/static" ] && ${coreutils}/bin/rm "$PWD/static" ${coreutils}/bin/ln -s "${placeholder "out"}/static" "$PWD" ) ''; diff --git a/third_party/nixpkgs/pkgs/servers/p910nd/default.nix b/third_party/nixpkgs/pkgs/servers/p910nd/default.nix index 9cd06a3ebc..858b5ed865 100644 --- a/third_party/nixpkgs/pkgs/servers/p910nd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/p910nd/default.nix @@ -1,28 +1,29 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, installShellFiles }: stdenv.mkDerivation rec { pname = "p910nd"; version = "0.97"; - src = fetchurl { - sha256 = "0vy2qf386dif1nqznmy3j953mq7c4lk6j2hgyzkbmfi4msiq1jaa"; - url = "mirror://sourceforge/p910nd/${pname}-${version}.tar.bz2"; + src = fetchFromGitHub { + owner = "kenyapcomau"; + repo = "p910nd"; + rev = version; + hash = "sha256-MM4o7d3L3XIRYWJ/KPM2OltlVfVA/BgMuyhJMm/BS3c="; }; - postPatch = '' - substituteInPlace Makefile --replace "/usr" "" - substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" - ''; + nativeBuildInputs = [ installShellFiles ]; - makeFlags = [ "DESTDIR=$(out)" "BINDIR=/bin" ]; + enableParallelBuilding = true; - postInstall = '' - # Match the man page: - mv $out/etc/init.d/p910nd{,.sh} + # instead of mucking around with the Makefile, just install the bits we need + installPhase = '' + runHook preInstall - # The legacy init script is useful only (and even then...) as an example: - mkdir -p $out/share/doc/examples - mv $out/etc $out/share/doc/examples + install -Dm555 -t $out/bin p910nd + install -Dm444 -t $out/share/doc/p910nd *.md + installManPage p910nd.? + + runHook postInstall ''; meta = with lib; { @@ -37,9 +38,9 @@ stdenv.mkDerivation rec { the AppSocket protocol and has the scheme socket://. LPRng also supports this protocol and the syntax is lp=remotehost%9100 in /etc/printcap. ''; - homepage = "http://p910nd.sourceforge.net/"; - downloadPage = "https://sourceforge.net/projects/p910nd/"; - license = licenses.gpl2; + homepage = "https://github.com/kenyapcomau/p910nd"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/servers/peertube/default.nix b/third_party/nixpkgs/pkgs/servers/peertube/default.nix index f4a80cbe26..6b94fec153 100644 --- a/third_party/nixpkgs/pkgs/servers/peertube/default.nix +++ b/third_party/nixpkgs/pkgs/servers/peertube/default.nix @@ -6,18 +6,18 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then "linux-x64" else throw "Unsupported architecture: ${stdenv.hostPlatform.system}"; - version = "4.2.1"; + version = "4.2.2"; source = fetchFromGitHub { owner = "Chocobozzz"; repo = "PeerTube"; rev = "v${version}"; - sha256 = "sha256-bb22/GidSPaRtvbht6FzVqTGzzNDYgBdHqHGnzA1Iy0="; + sha256 = "sha256-q6wSk5AO91Z6dw5MgpO7QTAlA8Q5Xx1CboBr7SElVUA="; }; yarnOfflineCacheServer = fetchYarnDeps { yarnLock = "${source}/yarn.lock"; - sha256 = "sha256-7fYQ4YS92XbzeI7nwpQfI2reDp6EiDgncK5YGSWzHF0="; + sha256 = "sha256-MMsxh20jcbW4YYsJyoupKbT9+Xa1BWZAmYHoj2/t+LM="; }; yarnOfflineCacheTools = fetchYarnDeps { diff --git a/third_party/nixpkgs/pkgs/servers/piping-server-rust/default.nix b/third_party/nixpkgs/pkgs/servers/piping-server-rust/default.nix index 8885179de4..c889edb886 100644 --- a/third_party/nixpkgs/pkgs/servers/piping-server-rust/default.nix +++ b/third_party/nixpkgs/pkgs/servers/piping-server-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "piping-server-rust"; - version = "0.12.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "nwtgck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-L15ofIM5a/qoJHGXmkuTsmQLLmERG/PxAJ4+z1nn7w4="; + sha256 = "sha256-ON3/GaDwQ9DtApRZuYClZWzFhmiLi988jIBvl0DgYSM="; }; - cargoSha256 = "sha256-CcIM7T7P4LbPxPK1ZqoJRP0IsLMEwMZg9DcuRu0aJHM="; + cargoSha256 = "sha256-rc3VTJllDu4oIFcswCNUJejJHzC2PoJJV9EU5fOC7fQ="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index 078bd329a3..8c2e178e05 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -12,16 +12,16 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.27.2.5929-a806c5905"; + version = "1.28.0.5999-97678ded3"; 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 = "0xm8bjmmybmyv1nbip8n23pd61lnvr41rsxa12cb9j6bg4nbka3x"; + sha256 = "sha256-irHHEkbdRabzcNiemcFeFoDmB7LZqhFYMe+zVpMv5JQ="; } else fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb"; - sha256 = "15wjy59ga5y93y09l5mbi20rqw63v61xv7x831iinhp96v5ixq00"; + sha256 = "sha256-RxD0wLZ/Uw0niKZdAfEhDxnf2jZapbrjSjH3XerfTsM="; }; outputs = [ "out" "basedb" ]; diff --git a/third_party/nixpkgs/pkgs/servers/polaris/node-packages.nix b/third_party/nixpkgs/pkgs/servers/polaris/node-packages.nix index 21006c32ac..a8b4c76f13 100644 --- a/third_party/nixpkgs/pkgs/servers/polaris/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/polaris/node-packages.nix @@ -4,940 +4,40 @@ let sources = { - "@babel/code-frame-7.12.13" = { + "@babel/code-frame-7.16.7" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.12.13"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz"; - sha512 = "HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; + sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.13.12" = { - name = "_at_babel_slash_compat-data"; - packageName = "@babel/compat-data"; - version = "7.13.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz"; - sha512 = "3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ=="; - }; - }; - "@babel/core-7.13.14" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.13.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.13.14.tgz"; - sha512 = "wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA=="; - }; - }; - "@babel/generator-7.13.9" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.13.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz"; - sha512 = "mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw=="; - }; - }; - "@babel/helper-annotate-as-pure-7.12.13" = { - name = "_at_babel_slash_helper-annotate-as-pure"; - packageName = "@babel/helper-annotate-as-pure"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz"; - sha512 = "7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw=="; - }; - }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" = { - name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; - packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz"; - sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; - }; - }; - "@babel/helper-compilation-targets-7.13.13" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.13.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz"; - sha512 = "q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ=="; - }; - }; - "@babel/helper-create-class-features-plugin-7.13.11" = { - name = "_at_babel_slash_helper-create-class-features-plugin"; - packageName = "@babel/helper-create-class-features-plugin"; - version = "7.13.11"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz"; - sha512 = "ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw=="; - }; - }; - "@babel/helper-create-regexp-features-plugin-7.12.17" = { - name = "_at_babel_slash_helper-create-regexp-features-plugin"; - packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.12.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz"; - sha512 = "p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg=="; - }; - }; - "@babel/helper-define-polyfill-provider-0.1.5" = { - name = "_at_babel_slash_helper-define-polyfill-provider"; - packageName = "@babel/helper-define-polyfill-provider"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz"; - sha512 = "nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg=="; - }; - }; - "@babel/helper-explode-assignable-expression-7.13.0" = { - name = "_at_babel_slash_helper-explode-assignable-expression"; - packageName = "@babel/helper-explode-assignable-expression"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz"; - sha512 = "qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA=="; - }; - }; - "@babel/helper-function-name-7.12.13" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz"; - sha512 = "TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA=="; - }; - }; - "@babel/helper-get-function-arity-7.12.13" = { - name = "_at_babel_slash_helper-get-function-arity"; - packageName = "@babel/helper-get-function-arity"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz"; - sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; - }; - }; - "@babel/helper-hoist-variables-7.13.0" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz"; - sha512 = "0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g=="; - }; - }; - "@babel/helper-member-expression-to-functions-7.13.12" = { - name = "_at_babel_slash_helper-member-expression-to-functions"; - packageName = "@babel/helper-member-expression-to-functions"; - version = "7.13.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz"; - sha512 = "48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw=="; - }; - }; - "@babel/helper-module-imports-7.13.12" = { - name = "_at_babel_slash_helper-module-imports"; - packageName = "@babel/helper-module-imports"; - version = "7.13.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz"; - sha512 = "4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA=="; - }; - }; - "@babel/helper-module-transforms-7.13.14" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.13.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz"; - sha512 = "QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g=="; - }; - }; - "@babel/helper-optimise-call-expression-7.12.13" = { - name = "_at_babel_slash_helper-optimise-call-expression"; - packageName = "@babel/helper-optimise-call-expression"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz"; - sha512 = "BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA=="; - }; - }; - "@babel/helper-plugin-utils-7.13.0" = { - name = "_at_babel_slash_helper-plugin-utils"; - packageName = "@babel/helper-plugin-utils"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz"; - sha512 = "ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ=="; - }; - }; - "@babel/helper-remap-async-to-generator-7.13.0" = { - name = "_at_babel_slash_helper-remap-async-to-generator"; - packageName = "@babel/helper-remap-async-to-generator"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz"; - sha512 = "pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg=="; - }; - }; - "@babel/helper-replace-supers-7.13.12" = { - name = "_at_babel_slash_helper-replace-supers"; - packageName = "@babel/helper-replace-supers"; - version = "7.13.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz"; - sha512 = "Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw=="; - }; - }; - "@babel/helper-simple-access-7.13.12" = { - name = "_at_babel_slash_helper-simple-access"; - packageName = "@babel/helper-simple-access"; - version = "7.13.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz"; - sha512 = "7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA=="; - }; - }; - "@babel/helper-skip-transparent-expression-wrappers-7.12.1" = { - name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; - packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz"; - sha512 = "Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA=="; - }; - }; - "@babel/helper-split-export-declaration-7.12.13" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz"; - sha512 = "tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg=="; - }; - }; - "@babel/helper-validator-identifier-7.12.11" = { + "@babel/helper-validator-identifier-7.16.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.12.11"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; - sha512 = "np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; + sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; }; - "@babel/helper-validator-option-7.12.17" = { - name = "_at_babel_slash_helper-validator-option"; - packageName = "@babel/helper-validator-option"; - version = "7.12.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz"; - sha512 = "TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw=="; - }; - }; - "@babel/helper-wrap-function-7.13.0" = { - name = "_at_babel_slash_helper-wrap-function"; - packageName = "@babel/helper-wrap-function"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz"; - sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; - }; - }; - "@babel/helpers-7.13.10" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.13.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz"; - sha512 = "4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ=="; - }; - }; - "@babel/highlight-7.13.10" = { + "@babel/highlight-7.16.10" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.13.10"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz"; - sha512 = "5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"; + sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; }; }; - "@babel/parser-7.13.13" = { + "@babel/parser-7.17.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.13.13"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz"; - sha512 = "OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw=="; - }; - }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" = { - name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.13.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz"; - sha512 = "d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ=="; - }; - }; - "@babel/plugin-proposal-async-generator-functions-7.13.8" = { - name = "_at_babel_slash_plugin-proposal-async-generator-functions"; - packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.13.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz"; - sha512 = "rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA=="; - }; - }; - "@babel/plugin-proposal-class-properties-7.13.0" = { - name = "_at_babel_slash_plugin-proposal-class-properties"; - packageName = "@babel/plugin-proposal-class-properties"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz"; - sha512 = "KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg=="; - }; - }; - "@babel/plugin-proposal-dynamic-import-7.13.8" = { - name = "_at_babel_slash_plugin-proposal-dynamic-import"; - packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.13.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz"; - sha512 = "ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ=="; - }; - }; - "@babel/plugin-proposal-export-namespace-from-7.12.13" = { - name = "_at_babel_slash_plugin-proposal-export-namespace-from"; - packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz"; - sha512 = "INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw=="; - }; - }; - "@babel/plugin-proposal-json-strings-7.13.8" = { - name = "_at_babel_slash_plugin-proposal-json-strings"; - packageName = "@babel/plugin-proposal-json-strings"; - version = "7.13.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz"; - sha512 = "w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q=="; - }; - }; - "@babel/plugin-proposal-logical-assignment-operators-7.13.8" = { - name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; - packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.13.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz"; - sha512 = "aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A=="; - }; - }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" = { - name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; - packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.13.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz"; - sha512 = "iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A=="; - }; - }; - "@babel/plugin-proposal-numeric-separator-7.12.13" = { - name = "_at_babel_slash_plugin-proposal-numeric-separator"; - packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz"; - sha512 = "O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w=="; - }; - }; - "@babel/plugin-proposal-object-rest-spread-7.13.8" = { - name = "_at_babel_slash_plugin-proposal-object-rest-spread"; - packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.13.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz"; - sha512 = "DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g=="; - }; - }; - "@babel/plugin-proposal-optional-catch-binding-7.13.8" = { - name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; - packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.13.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz"; - sha512 = "0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA=="; - }; - }; - "@babel/plugin-proposal-optional-chaining-7.13.12" = { - name = "_at_babel_slash_plugin-proposal-optional-chaining"; - packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.13.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz"; - sha512 = "fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ=="; - }; - }; - "@babel/plugin-proposal-private-methods-7.13.0" = { - name = "_at_babel_slash_plugin-proposal-private-methods"; - packageName = "@babel/plugin-proposal-private-methods"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz"; - sha512 = "MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q=="; - }; - }; - "@babel/plugin-proposal-unicode-property-regex-7.12.13" = { - name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; - packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz"; - sha512 = "XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg=="; - }; - }; - "@babel/plugin-syntax-async-generators-7.8.4" = { - name = "_at_babel_slash_plugin-syntax-async-generators"; - packageName = "@babel/plugin-syntax-async-generators"; - version = "7.8.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; - sha512 = "tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw=="; - }; - }; - "@babel/plugin-syntax-class-properties-7.12.13" = { - name = "_at_babel_slash_plugin-syntax-class-properties"; - packageName = "@babel/plugin-syntax-class-properties"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"; - sha512 = "fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA=="; - }; - }; - "@babel/plugin-syntax-dynamic-import-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-dynamic-import"; - packageName = "@babel/plugin-syntax-dynamic-import"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; - sha512 = "5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ=="; - }; - }; - "@babel/plugin-syntax-export-namespace-from-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-export-namespace-from"; - packageName = "@babel/plugin-syntax-export-namespace-from"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; - sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; - }; - }; - "@babel/plugin-syntax-flow-7.12.13" = { - name = "_at_babel_slash_plugin-syntax-flow"; - packageName = "@babel/plugin-syntax-flow"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz"; - sha512 = "J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA=="; - }; - }; - "@babel/plugin-syntax-json-strings-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-json-strings"; - packageName = "@babel/plugin-syntax-json-strings"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; - sha512 = "lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA=="; - }; - }; - "@babel/plugin-syntax-jsx-7.12.13" = { - name = "_at_babel_slash_plugin-syntax-jsx"; - packageName = "@babel/plugin-syntax-jsx"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz"; - sha512 = "d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g=="; - }; - }; - "@babel/plugin-syntax-logical-assignment-operators-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-logical-assignment-operators"; - packageName = "@babel/plugin-syntax-logical-assignment-operators"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; - sha512 = "d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig=="; - }; - }; - "@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-nullish-coalescing-operator"; - packageName = "@babel/plugin-syntax-nullish-coalescing-operator"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; - sha512 = "aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ=="; - }; - }; - "@babel/plugin-syntax-numeric-separator-7.10.4" = { - name = "_at_babel_slash_plugin-syntax-numeric-separator"; - packageName = "@babel/plugin-syntax-numeric-separator"; - version = "7.10.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; - sha512 = "9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug=="; - }; - }; - "@babel/plugin-syntax-object-rest-spread-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-object-rest-spread"; - packageName = "@babel/plugin-syntax-object-rest-spread"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; - sha512 = "XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA=="; - }; - }; - "@babel/plugin-syntax-optional-catch-binding-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-optional-catch-binding"; - packageName = "@babel/plugin-syntax-optional-catch-binding"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; - sha512 = "6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q=="; - }; - }; - "@babel/plugin-syntax-optional-chaining-7.8.3" = { - name = "_at_babel_slash_plugin-syntax-optional-chaining"; - packageName = "@babel/plugin-syntax-optional-chaining"; - version = "7.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; - sha512 = "KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg=="; - }; - }; - "@babel/plugin-syntax-top-level-await-7.12.13" = { - name = "_at_babel_slash_plugin-syntax-top-level-await"; - packageName = "@babel/plugin-syntax-top-level-await"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz"; - sha512 = "A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ=="; - }; - }; - "@babel/plugin-syntax-typescript-7.12.13" = { - name = "_at_babel_slash_plugin-syntax-typescript"; - packageName = "@babel/plugin-syntax-typescript"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz"; - sha512 = "cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w=="; - }; - }; - "@babel/plugin-transform-arrow-functions-7.13.0" = { - name = "_at_babel_slash_plugin-transform-arrow-functions"; - packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz"; - sha512 = "96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg=="; - }; - }; - "@babel/plugin-transform-async-to-generator-7.13.0" = { - name = "_at_babel_slash_plugin-transform-async-to-generator"; - packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz"; - sha512 = "3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg=="; - }; - }; - "@babel/plugin-transform-block-scoped-functions-7.12.13" = { - name = "_at_babel_slash_plugin-transform-block-scoped-functions"; - packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz"; - sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; - }; - }; - "@babel/plugin-transform-block-scoping-7.12.13" = { - name = "_at_babel_slash_plugin-transform-block-scoping"; - packageName = "@babel/plugin-transform-block-scoping"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz"; - sha512 = "Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ=="; - }; - }; - "@babel/plugin-transform-classes-7.13.0" = { - name = "_at_babel_slash_plugin-transform-classes"; - packageName = "@babel/plugin-transform-classes"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz"; - sha512 = "9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g=="; - }; - }; - "@babel/plugin-transform-computed-properties-7.13.0" = { - name = "_at_babel_slash_plugin-transform-computed-properties"; - packageName = "@babel/plugin-transform-computed-properties"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz"; - sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; - }; - }; - "@babel/plugin-transform-destructuring-7.13.0" = { - name = "_at_babel_slash_plugin-transform-destructuring"; - packageName = "@babel/plugin-transform-destructuring"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz"; - sha512 = "zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA=="; - }; - }; - "@babel/plugin-transform-dotall-regex-7.12.13" = { - name = "_at_babel_slash_plugin-transform-dotall-regex"; - packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz"; - sha512 = "foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ=="; - }; - }; - "@babel/plugin-transform-duplicate-keys-7.12.13" = { - name = "_at_babel_slash_plugin-transform-duplicate-keys"; - packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz"; - sha512 = "NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ=="; - }; - }; - "@babel/plugin-transform-exponentiation-operator-7.12.13" = { - name = "_at_babel_slash_plugin-transform-exponentiation-operator"; - packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz"; - sha512 = "fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA=="; - }; - }; - "@babel/plugin-transform-flow-strip-types-7.13.0" = { - name = "_at_babel_slash_plugin-transform-flow-strip-types"; - packageName = "@babel/plugin-transform-flow-strip-types"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.13.0.tgz"; - sha512 = "EXAGFMJgSX8gxWD7PZtW/P6M+z74jpx3wm/+9pn+c2dOawPpBkUX7BrfyPvo6ZpXbgRIEuwgwDb/MGlKvu2pOg=="; - }; - }; - "@babel/plugin-transform-for-of-7.13.0" = { - name = "_at_babel_slash_plugin-transform-for-of"; - packageName = "@babel/plugin-transform-for-of"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz"; - sha512 = "IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg=="; - }; - }; - "@babel/plugin-transform-function-name-7.12.13" = { - name = "_at_babel_slash_plugin-transform-function-name"; - packageName = "@babel/plugin-transform-function-name"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz"; - sha512 = "6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ=="; - }; - }; - "@babel/plugin-transform-literals-7.12.13" = { - name = "_at_babel_slash_plugin-transform-literals"; - packageName = "@babel/plugin-transform-literals"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz"; - sha512 = "FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ=="; - }; - }; - "@babel/plugin-transform-member-expression-literals-7.12.13" = { - name = "_at_babel_slash_plugin-transform-member-expression-literals"; - packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz"; - sha512 = "kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg=="; - }; - }; - "@babel/plugin-transform-modules-amd-7.13.0" = { - name = "_at_babel_slash_plugin-transform-modules-amd"; - packageName = "@babel/plugin-transform-modules-amd"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz"; - sha512 = "EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ=="; - }; - }; - "@babel/plugin-transform-modules-commonjs-7.13.8" = { - name = "_at_babel_slash_plugin-transform-modules-commonjs"; - packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.13.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz"; - sha512 = "9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw=="; - }; - }; - "@babel/plugin-transform-modules-systemjs-7.13.8" = { - name = "_at_babel_slash_plugin-transform-modules-systemjs"; - packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.13.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz"; - sha512 = "hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A=="; - }; - }; - "@babel/plugin-transform-modules-umd-7.13.0" = { - name = "_at_babel_slash_plugin-transform-modules-umd"; - packageName = "@babel/plugin-transform-modules-umd"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz"; - sha512 = "D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw=="; - }; - }; - "@babel/plugin-transform-named-capturing-groups-regex-7.12.13" = { - name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; - packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz"; - sha512 = "Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA=="; - }; - }; - "@babel/plugin-transform-new-target-7.12.13" = { - name = "_at_babel_slash_plugin-transform-new-target"; - packageName = "@babel/plugin-transform-new-target"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz"; - sha512 = "/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ=="; - }; - }; - "@babel/plugin-transform-object-super-7.12.13" = { - name = "_at_babel_slash_plugin-transform-object-super"; - packageName = "@babel/plugin-transform-object-super"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz"; - sha512 = "JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ=="; - }; - }; - "@babel/plugin-transform-parameters-7.13.0" = { - name = "_at_babel_slash_plugin-transform-parameters"; - packageName = "@babel/plugin-transform-parameters"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz"; - sha512 = "Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw=="; - }; - }; - "@babel/plugin-transform-property-literals-7.12.13" = { - name = "_at_babel_slash_plugin-transform-property-literals"; - packageName = "@babel/plugin-transform-property-literals"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz"; - sha512 = "nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A=="; - }; - }; - "@babel/plugin-transform-react-display-name-7.12.13" = { - name = "_at_babel_slash_plugin-transform-react-display-name"; - packageName = "@babel/plugin-transform-react-display-name"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz"; - sha512 = "MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA=="; - }; - }; - "@babel/plugin-transform-react-jsx-7.13.12" = { - name = "_at_babel_slash_plugin-transform-react-jsx"; - packageName = "@babel/plugin-transform-react-jsx"; - version = "7.13.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz"; - sha512 = "jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA=="; - }; - }; - "@babel/plugin-transform-react-jsx-development-7.12.17" = { - name = "_at_babel_slash_plugin-transform-react-jsx-development"; - packageName = "@babel/plugin-transform-react-jsx-development"; - version = "7.12.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz"; - sha512 = "BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ=="; - }; - }; - "@babel/plugin-transform-react-pure-annotations-7.12.1" = { - name = "_at_babel_slash_plugin-transform-react-pure-annotations"; - packageName = "@babel/plugin-transform-react-pure-annotations"; - version = "7.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz"; - sha512 = "RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg=="; - }; - }; - "@babel/plugin-transform-regenerator-7.12.13" = { - name = "_at_babel_slash_plugin-transform-regenerator"; - packageName = "@babel/plugin-transform-regenerator"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz"; - sha512 = "lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA=="; - }; - }; - "@babel/plugin-transform-reserved-words-7.12.13" = { - name = "_at_babel_slash_plugin-transform-reserved-words"; - packageName = "@babel/plugin-transform-reserved-words"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz"; - sha512 = "xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg=="; - }; - }; - "@babel/plugin-transform-shorthand-properties-7.12.13" = { - name = "_at_babel_slash_plugin-transform-shorthand-properties"; - packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz"; - sha512 = "xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw=="; - }; - }; - "@babel/plugin-transform-spread-7.13.0" = { - name = "_at_babel_slash_plugin-transform-spread"; - packageName = "@babel/plugin-transform-spread"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz"; - sha512 = "V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg=="; - }; - }; - "@babel/plugin-transform-sticky-regex-7.12.13" = { - name = "_at_babel_slash_plugin-transform-sticky-regex"; - packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz"; - sha512 = "Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg=="; - }; - }; - "@babel/plugin-transform-template-literals-7.13.0" = { - name = "_at_babel_slash_plugin-transform-template-literals"; - packageName = "@babel/plugin-transform-template-literals"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz"; - sha512 = "d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw=="; - }; - }; - "@babel/plugin-transform-typeof-symbol-7.12.13" = { - name = "_at_babel_slash_plugin-transform-typeof-symbol"; - packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz"; - sha512 = "eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ=="; - }; - }; - "@babel/plugin-transform-typescript-7.13.0" = { - name = "_at_babel_slash_plugin-transform-typescript"; - packageName = "@babel/plugin-transform-typescript"; - version = "7.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz"; - sha512 = "elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ=="; - }; - }; - "@babel/plugin-transform-unicode-escapes-7.12.13" = { - name = "_at_babel_slash_plugin-transform-unicode-escapes"; - packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz"; - sha512 = "0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw=="; - }; - }; - "@babel/plugin-transform-unicode-regex-7.12.13" = { - name = "_at_babel_slash_plugin-transform-unicode-regex"; - packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz"; - sha512 = "mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA=="; - }; - }; - "@babel/preset-env-7.13.12" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; - version = "7.13.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.12.tgz"; - sha512 = "JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA=="; - }; - }; - "@babel/preset-modules-0.1.4" = { - name = "_at_babel_slash_preset-modules"; - packageName = "@babel/preset-modules"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; - sha512 = "J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg=="; - }; - }; - "@babel/preset-react-7.13.13" = { - name = "_at_babel_slash_preset-react"; - packageName = "@babel/preset-react"; - version = "7.13.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.13.13.tgz"; - sha512 = "gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA=="; - }; - }; - "@babel/runtime-7.13.10" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.13.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz"; - sha512 = "4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw=="; - }; - }; - "@babel/template-7.12.13" = { - name = "_at_babel_slash_template"; - packageName = "@babel/template"; - version = "7.12.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz"; - sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; - }; - }; - "@babel/traverse-7.13.13" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.13.13"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.13.tgz"; - sha512 = "CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg=="; - }; - }; - "@babel/types-7.13.14" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.13.14"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz"; - sha512 = "A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz"; + sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="; }; }; "@cypress/listr-verbose-renderer-0.4.1" = { @@ -949,13 +49,13 @@ let sha1 = "a77492f4b11dcc7c446a34b3e28721afd33c642a"; }; }; - "@cypress/request-2.88.5" = { + "@cypress/request-2.88.10" = { name = "_at_cypress_slash_request"; packageName = "@cypress/request"; - version = "2.88.5"; + version = "2.88.10"; src = fetchurl { - url = "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz"; - sha512 = "TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA=="; + url = "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz"; + sha512 = "Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg=="; }; }; "@cypress/xvfb-1.2.4" = { @@ -967,274 +67,247 @@ let sha512 = "skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q=="; }; }; - "@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=="; - }; - }; - "@nodelib/fs.scandir-2.1.4" = { - name = "_at_nodelib_slash_fs.scandir"; - packageName = "@nodelib/fs.scandir"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz"; - sha512 = "33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA=="; - }; - }; - "@nodelib/fs.stat-2.0.4" = { - name = "_at_nodelib_slash_fs.stat"; - packageName = "@nodelib/fs.stat"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz"; - sha512 = "IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q=="; - }; - }; - "@nodelib/fs.walk-1.2.6" = { - name = "_at_nodelib_slash_fs.walk"; - packageName = "@nodelib/fs.walk"; - version = "1.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz"; - sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; - }; - }; - "@parcel/babel-ast-utils-2.0.0-beta.2" = { - name = "_at_parcel_slash_babel-ast-utils"; - packageName = "@parcel/babel-ast-utils"; - version = "2.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/babel-ast-utils/-/babel-ast-utils-2.0.0-beta.2.tgz"; - sha512 = "2ujEqleotjlX+QBODAEAJ4V/fHSA7oYjyUsHsBstoyMQyunBuj0xqQlLFzE9buGrdZoNGDuSHoDaVo7cP2f7nQ=="; - }; - }; - "@parcel/babel-preset-env-2.0.0-beta.2" = { - name = "_at_parcel_slash_babel-preset-env"; - packageName = "@parcel/babel-preset-env"; - version = "2.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/babel-preset-env/-/babel-preset-env-2.0.0-beta.2.tgz"; - sha512 = "duECb8ShpWR0QXZGKOtHPUdekmCTtBsikzpKVVI4wanyUpz583t++GLZvmypPCwOzPy+L5hFaHc3RQIJgpsiJw=="; - }; - }; - "@parcel/babylon-walk-2.0.0-beta.2" = { - name = "_at_parcel_slash_babylon-walk"; - packageName = "@parcel/babylon-walk"; - version = "2.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/babylon-walk/-/babylon-walk-2.0.0-beta.2.tgz"; - sha512 = "bfMq8kDpzqkMT/yRYAnjVsrkuPhEDLRxiCNR4yoSje4Mcj2sMwiGyjFkSQAgGzav7O8iBa0NsL+txiF1QnmcUg=="; - }; - }; - "@parcel/bundler-default-2.0.0-beta.2" = { + "@parcel/bundler-default-2.3.2" = { name = "_at_parcel_slash_bundler-default"; packageName = "@parcel/bundler-default"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.0.0-beta.2.tgz"; - sha512 = "in1BrUnpeXmG5+zo9zORoVXs83bBT9BqG1DElATfQAEERqe6xEk+kTLc3Eokg7J3dJ+VZZ7jT8c/0keh2Dyg6g=="; + url = "https://registry.npmjs.org/@parcel/bundler-default/-/bundler-default-2.3.2.tgz"; + sha512 = "JUrto4mjSD0ic9dEqRp0loL5o3HVYHja1ZIYSq+rBl2UWRV6/9cGTb07lXOCqqm0BWE+hQ4krUxB76qWaF0Lqw=="; }; }; - "@parcel/cache-2.0.0-beta.2" = { + "@parcel/cache-2.3.2" = { name = "_at_parcel_slash_cache"; packageName = "@parcel/cache"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.0.0-beta.2.tgz"; - sha512 = "bYOLGSsTar86TZt4kaPjF0hULwbC2uPrtv9HqpCgZz3wSwB0+EDHBu8+ztbDp1yGLm6ZKND2SjO6O7QVNBRLEg=="; + url = "https://registry.npmjs.org/@parcel/cache/-/cache-2.3.2.tgz"; + sha512 = "Xxq+ekgcFEme6Fn1v7rEOBkyMOUOUu7eNqQw0l6HQS+INZ2Q7YzzfdW7pI8rEOAAICVg5BWKpmBQZpgJlT+HxQ=="; }; }; - "@parcel/codeframe-2.0.0-beta.2" = { + "@parcel/codeframe-2.3.2" = { name = "_at_parcel_slash_codeframe"; packageName = "@parcel/codeframe"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.0.0-beta.2.tgz"; - sha512 = "l7/meH8amRVsDFmNJqX/cUH8O9FqPwZHcKCLi0yu1KzemKLODQCfMPJqm3JRwaAUK4oC8fULVGpN7m4wKlSQnQ=="; + url = "https://registry.npmjs.org/@parcel/codeframe/-/codeframe-2.3.2.tgz"; + sha512 = "ireQALcxxrTdIEpzTOoMo/GpfbFm1qlyezeGl3Hce3PMvHLg3a5S6u/Vcy7SAjdld5GfhHEqVY+blME6Z4CyXQ=="; }; }; - "@parcel/config-default-2.0.0-beta.2" = { + "@parcel/compressor-raw-2.3.2" = { + name = "_at_parcel_slash_compressor-raw"; + packageName = "@parcel/compressor-raw"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/compressor-raw/-/compressor-raw-2.3.2.tgz"; + sha512 = "8dIoFwinYK6bOTpnZOAwwIv0v73y0ezsctPmfMnIqVQPn7wJwfhw/gbKVcmK5AkgQMkyid98hlLZoaZtGF1Mdg=="; + }; + }; + "@parcel/config-default-2.3.2" = { name = "_at_parcel_slash_config-default"; packageName = "@parcel/config-default"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.0.0-beta.2.tgz"; - sha512 = "y7hvO8kVksGgX/LBtoYAZ6/lQhEdJ7kW7HIvvr+EYpzDF9OB4IYBO5nahc9QSiyn1qdUt/TYB+L9E4ysh/lplA=="; + url = "https://registry.npmjs.org/@parcel/config-default/-/config-default-2.3.2.tgz"; + sha512 = "E7/iA7fGCYvXU3u6zF9nxjeDVsgjCN6MVvDjymjaxYMoDWTIsPV245SBEXqzgtmzbMAV+VAl4rVWLMB4pzMt9g=="; }; }; - "@parcel/core-2.0.0-beta.2" = { + "@parcel/core-2.3.2" = { name = "_at_parcel_slash_core"; packageName = "@parcel/core"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/core/-/core-2.0.0-beta.2.tgz"; - sha512 = "PiZk8g4iIjNs2/6ZcMrbwrIF733ggWWClA+ALOaipvebGCNtTnVcE+XP2n7DB2NBWNvshpHGZiMcAVad460OwQ=="; + url = "https://registry.npmjs.org/@parcel/core/-/core-2.3.2.tgz"; + sha512 = "gdJzpsgeUhv9H8T0UKVmyuptiXdduEfKIUx0ci+/PGhq8cCoiFnlnuhW6H7oLr79OUc+YJStabDJuG4U2A6ysw=="; }; }; - "@parcel/diagnostic-2.0.0-beta.2" = { + "@parcel/diagnostic-2.3.2" = { name = "_at_parcel_slash_diagnostic"; packageName = "@parcel/diagnostic"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.0.0-beta.2.tgz"; - sha512 = "6cRnWSRjzy5OPJyXl6DWAWoVfQg90chttwKd3lWDM4lpDDRq9hbpp4ADaOVAnF5rDd/B+mwwjAzxcgwJQD8u/w=="; + url = "https://registry.npmjs.org/@parcel/diagnostic/-/diagnostic-2.3.2.tgz"; + sha512 = "/xW93Az4AOiifuYW/c4CDbUcu3lx5FcUDAj9AGiR9NSTsF/ROC/RqnxvQ3AGtqa14R7vido4MXEpY3JEp6FsqA=="; }; }; - "@parcel/events-2.0.0-beta.2" = { + "@parcel/events-2.3.2" = { name = "_at_parcel_slash_events"; packageName = "@parcel/events"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/events/-/events-2.0.0-beta.2.tgz"; - sha512 = "kbiFb/Qd8TavhmL84FTg3dN29Zi5Bi8bWqMgzA8hq7E8W5ezXpmw1Tu5wkjsNzHuOTj2YcAtxlTh3l29UEmh2g=="; + url = "https://registry.npmjs.org/@parcel/events/-/events-2.3.2.tgz"; + sha512 = "WiYIwXMo4Vd+pi58vRoHkul8TPE5VEfMY+3FYwVCKPl/LYqSD+vz6wMx9uG18mEbB1d/ofefv5ZFQNtPGKO4tQ=="; }; }; - "@parcel/fs-2.0.0-beta.2" = { + "@parcel/fs-2.3.2" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.0.0-beta.2.tgz"; - sha512 = "/+3icntxOXvMSPZDfp/qhJkASY/eW+MX2/Sl5DBjP8CKR8GYBPBAVQvO2QZmBtEhIS/TGUFJ+Oo0ANrugteaoQ=="; + url = "https://registry.npmjs.org/@parcel/fs/-/fs-2.3.2.tgz"; + sha512 = "XV+OsnRpN01QKU37lBN0TFKvv7uPKfQGbqFqYOrMbXH++Ae8rBU0Ykz+Yu4tv2h7shMlde+AMKgRnRTAJZpWEQ=="; }; }; - "@parcel/fs-search-2.0.0-beta.2" = { + "@parcel/fs-search-2.3.2" = { name = "_at_parcel_slash_fs-search"; packageName = "@parcel/fs-search"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.0.0-beta.2.tgz"; - sha512 = "JlbkbzBxPEsjRSh/Vl3ZZQiX6XFChNdDKddEqQX5zWTzNa80Kd7Ue5nVTnnQLTKZ2lcimEAxfCHC4vG+53+qrA=="; + url = "https://registry.npmjs.org/@parcel/fs-search/-/fs-search-2.3.2.tgz"; + sha512 = "u3DTEFnPtKuZvEtgGzfVjQUytegSSn3POi7WfwMwPIaeDPfYcyyhfl+c96z7VL9Gk/pqQ99/cGyAwFdFsnxxXA=="; }; }; - "@parcel/fs-write-stream-atomic-2.0.0-beta.2" = { - name = "_at_parcel_slash_fs-write-stream-atomic"; - packageName = "@parcel/fs-write-stream-atomic"; - version = "2.0.0-beta.2"; + "@parcel/graph-2.3.2" = { + name = "_at_parcel_slash_graph"; + packageName = "@parcel/graph"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/fs-write-stream-atomic/-/fs-write-stream-atomic-2.0.0-beta.2.tgz"; - sha512 = "AEgLVjw0lvVjS8JgSedkHqYvH1cg21PAbY4FbCgWr0qNiCHRA08SX1+vU26MwCS5QoaxaNie1L89M95aEJunRw=="; + url = "https://registry.npmjs.org/@parcel/graph/-/graph-2.3.2.tgz"; + sha512 = "ltTBM3IEqumgmy4ABBFETT8NtAwSsjD9mY3WCyJ5P8rUshfVCg093rvBPbpuJYMaH/TV1AHVaWfZqaZ4JQDIQQ=="; }; }; - "@parcel/logger-2.0.0-beta.2" = { + "@parcel/hash-2.3.2" = { + name = "_at_parcel_slash_hash"; + packageName = "@parcel/hash"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/hash/-/hash-2.3.2.tgz"; + sha512 = "SMtYTsHihws/wqdVnOr0QAGyGYsW9rJSJkkoRujUxo8l2ctnBN1ztv89eOUrdtgHsmcnj/oz1yw6sN38X+BUng=="; + }; + }; + "@parcel/logger-2.3.2" = { name = "_at_parcel_slash_logger"; packageName = "@parcel/logger"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.0.0-beta.2.tgz"; - sha512 = "YuTUGN47eMctdtTx0hhqKUCRCtuqqV+n6MRrm5sTlg/XpZP8ySUnq4+8VqMqslB761GgXmaDKtNIebe0lc+Erw=="; + url = "https://registry.npmjs.org/@parcel/logger/-/logger-2.3.2.tgz"; + sha512 = "jIWd8TXDQf+EnNWSa7Q10lSQ6C1LSH8OZkTlaINrfVIw7s+3tVxO3I4pjp7/ARw7RX2gdNPlw6fH4Gn/HvvYbw=="; }; }; - "@parcel/markdown-ansi-2.0.0-beta.2" = { + "@parcel/markdown-ansi-2.3.2" = { name = "_at_parcel_slash_markdown-ansi"; packageName = "@parcel/markdown-ansi"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.0.0-beta.2.tgz"; - sha512 = "5fYNvwp2PpQaBxMM3qsVjVz5W8Rrc/eZdCaWudlxhucmUxy3BLedQ1ci6bSzjG1Fl/PDgzcIbZdrqD2+Z+QppA=="; + url = "https://registry.npmjs.org/@parcel/markdown-ansi/-/markdown-ansi-2.3.2.tgz"; + sha512 = "l01ggmag5QScCk9mYA0xHh5TWSffR84uPFP2KvaAMQQ9NLNufcFiU0mn/Mtr3pCb5L5dSzmJ+Oo9s7P1Kh/Fmg=="; }; }; - "@parcel/namer-default-2.0.0-beta.2" = { + "@parcel/namer-default-2.3.2" = { name = "_at_parcel_slash_namer-default"; packageName = "@parcel/namer-default"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.0.0-beta.2.tgz"; - sha512 = "opHDerfbtI86C/Exer5CiJPZYKDQZuZXynH8bkfIVclmJ6tvCgTYMapWop2MsgJMqqHbQBW1FD+MKJyW5GVwiA=="; + url = "https://registry.npmjs.org/@parcel/namer-default/-/namer-default-2.3.2.tgz"; + sha512 = "3QUMC0+5+3KMKfoAxYAbpZtuRqTgyZKsGDWzOpuqwemqp6P8ahAvNPwSCi6QSkGcTmvtYwBu9/NHPSONxIFOfg=="; }; }; - "@parcel/node-libs-browser-2.0.0-beta.2" = { - name = "_at_parcel_slash_node-libs-browser"; - packageName = "@parcel/node-libs-browser"; - version = "2.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/node-libs-browser/-/node-libs-browser-2.0.0-beta.2.tgz"; - sha512 = "ds0/uQDnMCiO9UyF0Jw7XPb/wFt5IBVu45OZYfUZmIQPO5nrkO0Fi1W2dAgSs1u2wMV3aYHunECLdDwX2aFdkQ=="; - }; - }; - "@parcel/node-resolver-core-2.0.0-beta.2" = { + "@parcel/node-resolver-core-2.3.2" = { name = "_at_parcel_slash_node-resolver-core"; packageName = "@parcel/node-resolver-core"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.0.0-beta.2.tgz"; - sha512 = "sViXWwrNVODYzeZbvsdgFPpO7h36t0fPSJcNL+vsRwGn04jIX178p7mmreHCr/P2Zt0gUfiv1gtC4SJzRU5zQg=="; + url = "https://registry.npmjs.org/@parcel/node-resolver-core/-/node-resolver-core-2.3.2.tgz"; + sha512 = "wmrnMNzJN4GuHw2Ftho+BWgSWR6UCkW3XoMdphqcxpw/ieAdS2a+xYSosYkZgQZ6lGutSvLyJ1CkVvP6RLIdQQ=="; }; }; - "@parcel/optimizer-cssnano-2.0.0-beta.2" = { + "@parcel/optimizer-cssnano-2.3.2" = { name = "_at_parcel_slash_optimizer-cssnano"; packageName = "@parcel/optimizer-cssnano"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-cssnano/-/optimizer-cssnano-2.0.0-beta.2.tgz"; - sha512 = "/9SgfIPYQEYmK4yQbktzk+xwRu0MxTs0YTMHWtWAxLY34+I7TRooOwSRlegEuJ9jDyTJcu1j5CL1TlB8P6QXUg=="; + url = "https://registry.npmjs.org/@parcel/optimizer-cssnano/-/optimizer-cssnano-2.3.2.tgz"; + sha512 = "wTBOxMiBI38NAB9XIlQZRCjS59+EWjWR9M04D3TWyxl+dL5gYMc1cl4GNynUnmcPdz+3s1UbOdo5/8V90wjiiw=="; }; }; - "@parcel/optimizer-htmlnano-2.0.0-beta.2" = { + "@parcel/optimizer-htmlnano-2.3.2" = { name = "_at_parcel_slash_optimizer-htmlnano"; packageName = "@parcel/optimizer-htmlnano"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.0.0-beta.2.tgz"; - sha512 = "Pj46hqYyLU/fezm5e88VeBSxngUqhQKb+YzhAyBeWwRjgmSAmMzInaAJmOmbAwzGW4Qtk6AGzl9bWfDPneWzvA=="; + url = "https://registry.npmjs.org/@parcel/optimizer-htmlnano/-/optimizer-htmlnano-2.3.2.tgz"; + sha512 = "U8C0TDSxsx8HmHaLW0Zc7ha1fXQynzhvBjCRMGYnOiLiw0MOfLQxzQ2WKVSeCotmdlF63ayCwxWsd6BuqStiKQ=="; }; }; - "@parcel/optimizer-terser-2.0.0-beta.2" = { + "@parcel/optimizer-image-2.3.2" = { + name = "_at_parcel_slash_optimizer-image"; + packageName = "@parcel/optimizer-image"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-image/-/optimizer-image-2.3.2.tgz"; + sha512 = "HOk3r5qdvY/PmI7Q3i2qEgFH3kP2QWG4Wq3wmC4suaF1+c2gpiQc+HKHWp4QvfbH3jhT00c5NxQyqPhbXeNI9Q=="; + }; + }; + "@parcel/optimizer-svgo-2.3.2" = { + name = "_at_parcel_slash_optimizer-svgo"; + packageName = "@parcel/optimizer-svgo"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/optimizer-svgo/-/optimizer-svgo-2.3.2.tgz"; + sha512 = "l7WvZ5+e7D1mVmLUxMVaSb29cviXzuvSY2OpQs0ukdPACDqag+C65hWMzwTiOSSRGPMIu96kQKpeVru2YjibhA=="; + }; + }; + "@parcel/optimizer-terser-2.3.2" = { name = "_at_parcel_slash_optimizer-terser"; packageName = "@parcel/optimizer-terser"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.0.0-beta.2.tgz"; - sha512 = "R3Ncpa/NEF2aFegSyZMrIpZed8kzmCJsW7WNP6AnatqrXL2+vuHQgihje7JLJqyMetgi9EGwMLaW5YflMdHFkg=="; + url = "https://registry.npmjs.org/@parcel/optimizer-terser/-/optimizer-terser-2.3.2.tgz"; + sha512 = "dOapHhfy0xiNZa2IoEyHGkhhla07xsja79NPem14e5jCqY6Oi40jKNV4ab5uu5u1elWUjJuw69tiYbkDZWbKQw=="; }; }; - "@parcel/package-manager-2.0.0-beta.2" = { + "@parcel/package-manager-2.3.2" = { name = "_at_parcel_slash_package-manager"; packageName = "@parcel/package-manager"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.0.0-beta.2.tgz"; - sha512 = "hEVIwa3X3fcQOmhWIIWJmYmYWwlQuXN1CoBiXswE7G9d9+S1v3b1M617EXVaCo1J86Hm09aF4LRWVt3M8J4gcw=="; + url = "https://registry.npmjs.org/@parcel/package-manager/-/package-manager-2.3.2.tgz"; + sha512 = "pAQfywKVORY8Ee+NHAyKzzQrKbnz8otWRejps7urwhDaTVLfAd5C/1ZV64ATZ9ALYP9jyoQ8bTaxVd4opcSuwg=="; }; }; - "@parcel/packager-css-2.0.0-beta.2" = { + "@parcel/packager-css-2.3.2" = { name = "_at_parcel_slash_packager-css"; packageName = "@parcel/packager-css"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.0.0-beta.2.tgz"; - sha512 = "ICNcbBXXREscjKaWKs9ahN03+tV5gvZVsiK8OtTVLzF183T9CAVbmuO8eqCBJwwaX9ACU6hd4pt5Z6IQgSGCLQ=="; + url = "https://registry.npmjs.org/@parcel/packager-css/-/packager-css-2.3.2.tgz"; + sha512 = "ByuF9xDnQnpVL1Hdu9aY6SpxOuZowd3TH7joh1qdRPLeMHTEvUywHBXoiAyNdrhnLGum8uPEdY8Ra5Xuo1U7kg=="; }; }; - "@parcel/packager-html-2.0.0-beta.2" = { + "@parcel/packager-html-2.3.2" = { name = "_at_parcel_slash_packager-html"; packageName = "@parcel/packager-html"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.0.0-beta.2.tgz"; - sha512 = "gQlOQvQys5vyS2L2ocYBYTBSGTLVrqYJ7o9IHllpgbpnG4Gebc+rRJ8BG53ZoTtRkj9uWf9nZG8W9313mQ5A5g=="; + url = "https://registry.npmjs.org/@parcel/packager-html/-/packager-html-2.3.2.tgz"; + sha512 = "YqAptdU+uqfgwSii76mRGcA/3TpuC6yHr8xG+11brqj/tEFLsurmX0naombzd7FgmrTE9w+kb0HUIMl2vRBn0A=="; }; }; - "@parcel/packager-js-2.0.0-beta.2" = { + "@parcel/packager-js-2.3.2" = { name = "_at_parcel_slash_packager-js"; packageName = "@parcel/packager-js"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.0.0-beta.2.tgz"; - sha512 = "8gYGGf23Rpq+PT6dfTP5Izb1tIeIlRB0EYpSscIhzNm6LdOQb9r0oy0VI4T6uC1dKiC/QLc2GUIvhIno0cvP+g=="; + url = "https://registry.npmjs.org/@parcel/packager-js/-/packager-js-2.3.2.tgz"; + sha512 = "3OP0Ro9M1J+PIKZK4Ec2N5hjIPiqk++B2kMFeiUqvaNZjJgKrPPEICBhjS52rma4IE/NgmIMB3aI5pWqE/KwNA=="; }; }; - "@parcel/packager-raw-2.0.0-beta.2" = { + "@parcel/packager-raw-2.3.2" = { name = "_at_parcel_slash_packager-raw"; packageName = "@parcel/packager-raw"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.0.0-beta.2.tgz"; - sha512 = "l8pNCXb4vsoU8Y78J9seN6TFBrf+cpo+3lX8SsJNH2J2IauWvGZQhQgwrCLtWRxiOiz98+Kv4NgUVvvCcYcLfQ=="; + url = "https://registry.npmjs.org/@parcel/packager-raw/-/packager-raw-2.3.2.tgz"; + sha512 = "RnoZ7WgNAFWkEPrEefvyDqus7xfv9XGprHyTbfLittPaVAZpl+4eAv43nXyMfzk77Cgds6KcNpkosj3acEpNIQ=="; + }; + }; + "@parcel/packager-svg-2.3.2" = { + name = "_at_parcel_slash_packager-svg"; + packageName = "@parcel/packager-svg"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/packager-svg/-/packager-svg-2.3.2.tgz"; + sha512 = "iIC0VeczOXynS7M5jCi3naMBRyAznBVJ3iMg92/GaI9duxPlUMGAlHzLAKNtoXkc00HMXDH7rrmMb04VX6FYSg=="; }; }; "@parcel/plugin-2.0.0-beta.2" = { @@ -1246,175 +319,193 @@ let sha512 = "I89k7uc+yeSe6LrREajkvR6HnfcZzMDoz/TjnfG0W+iQYdKKaAuggf9zlQ6aOr8moGM1orcVSx5X+77u/tX0gg=="; }; }; - "@parcel/reporter-cli-2.0.0-beta.2" = { + "@parcel/plugin-2.3.2" = { + name = "_at_parcel_slash_plugin"; + packageName = "@parcel/plugin"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/plugin/-/plugin-2.3.2.tgz"; + sha512 = "SaLZAJX4KH+mrAmqmcy9KJN+V7L+6YNTlgyqYmfKlNiHu7aIjLL+3prX8QRcgGtjAYziCxvPj0cl1CCJssaiGg=="; + }; + }; + "@parcel/reporter-cli-2.3.2" = { name = "_at_parcel_slash_reporter-cli"; packageName = "@parcel/reporter-cli"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.0.0-beta.2.tgz"; - sha512 = "OmuFVMjifauy29vQMEeYeorNmOoZ3kbjB5peUt6vZ3y3lP+OmentlXw1MHl9QudCzSl/PlK1HKotKaHLLUBdFA=="; + url = "https://registry.npmjs.org/@parcel/reporter-cli/-/reporter-cli-2.3.2.tgz"; + sha512 = "VYetmTXqW83npsvVvqlQZTbF3yVL3k/FCCl3kSWvOr9LZA0lmyqJWPjMHq37yIIOszQN/p5guLtgCjsP0UQw1Q=="; }; }; - "@parcel/reporter-dev-server-2.0.0-beta.2" = { + "@parcel/reporter-dev-server-2.3.2" = { name = "_at_parcel_slash_reporter-dev-server"; packageName = "@parcel/reporter-dev-server"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.0.0-beta.2.tgz"; - sha512 = "4b7YVivhsCDse2hbFwaJqAQN9Cup/jPyFFSaSotDEFcjLu2+uU4UEq1eUCevkeahTS6EIpqN9e6HHuvocYhjmg=="; + url = "https://registry.npmjs.org/@parcel/reporter-dev-server/-/reporter-dev-server-2.3.2.tgz"; + sha512 = "E7LtnjAX4iiWMw2qKUyFBi3+bDz0UGjqgHoPQylUYYLi6opXjJz/oC+cCcCy4e3RZlkrl187XonvagS59YjDxA=="; }; }; - "@parcel/resolver-default-2.0.0-beta.2" = { + "@parcel/resolver-default-2.3.2" = { name = "_at_parcel_slash_resolver-default"; packageName = "@parcel/resolver-default"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.0.0-beta.2.tgz"; - sha512 = "yU05cB8A/gmCo932Ua7lkOIPmGqs61tpMQkwgBtdyNBRbmMS5eYkvb2OPHKn0VL/3hXfyko/v+oRUKwBNS2wQQ=="; + url = "https://registry.npmjs.org/@parcel/resolver-default/-/resolver-default-2.3.2.tgz"; + sha512 = "y3r+xOwWsATrNGUWuZ6soA7q24f8E5tY1AZ9lHCufnkK2cdKZJ5O1cyd7ohkAiKZx2/pMd+FgmVZ/J3oxetXkA=="; }; }; - "@parcel/runtime-browser-hmr-2.0.0-beta.2" = { + "@parcel/runtime-browser-hmr-2.3.2" = { name = "_at_parcel_slash_runtime-browser-hmr"; packageName = "@parcel/runtime-browser-hmr"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.0.0-beta.2.tgz"; - sha512 = "dcqIjmCVup8uhcbIq7a0niAptzkCWZGDBOxGoNDpDhx2Kv39GZwf+nWcNe7ybcaI6L9D8B5Trq09J3iqtdi6OA=="; + url = "https://registry.npmjs.org/@parcel/runtime-browser-hmr/-/runtime-browser-hmr-2.3.2.tgz"; + sha512 = "nRD6uOyF1+HGylP9GASbYmvUDOsDaNwvaxuGTSh8+5M0mmCgib+hVBiPEKbwdmKjGbUPt9wRFPyMa/JpeQZsIQ=="; }; }; - "@parcel/runtime-js-2.0.0-beta.2" = { + "@parcel/runtime-js-2.3.2" = { name = "_at_parcel_slash_runtime-js"; packageName = "@parcel/runtime-js"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.0.0-beta.2.tgz"; - sha512 = "bYEYAfPrStDlom4ML5QtRIE6izBo03vFZnDhjp4NjiDnBT794DpGUeUgIt6OyrinX5oOCa2lEafcYQmBrCchpg=="; + url = "https://registry.npmjs.org/@parcel/runtime-js/-/runtime-js-2.3.2.tgz"; + sha512 = "SJepcHvYO/7CEe/Q85sngk+smcJ6TypuPh4D2R8kN+cAJPi5WvbQEe7+x5BEgbN+5Jumi/Uo3FfOOE5mYh+F6g=="; }; }; - "@parcel/runtime-react-refresh-2.0.0-beta.2" = { + "@parcel/runtime-react-refresh-2.3.2" = { name = "_at_parcel_slash_runtime-react-refresh"; packageName = "@parcel/runtime-react-refresh"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.0.0-beta.2.tgz"; - sha512 = "zpfS3LNRn2OzGh5ZINKz1dl3Weg5gq7KoHxFVXDAABvVSWYt5pDO4viX/31FDNLBgaQWhZUty1owJqW7ka/D6A=="; + url = "https://registry.npmjs.org/@parcel/runtime-react-refresh/-/runtime-react-refresh-2.3.2.tgz"; + sha512 = "P+GRPO2XVDSBQ4HmRSj2xfbHSQvL9+ahTE/AB74IJExLTITv5l4SHAV3VsiKohuHYUAYHW3A/Oe7tEFCAb6Cug=="; }; }; - "@parcel/scope-hoisting-2.0.0-beta.2" = { - name = "_at_parcel_slash_scope-hoisting"; - packageName = "@parcel/scope-hoisting"; - version = "2.0.0-beta.2"; + "@parcel/runtime-service-worker-2.3.2" = { + name = "_at_parcel_slash_runtime-service-worker"; + packageName = "@parcel/runtime-service-worker"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/scope-hoisting/-/scope-hoisting-2.0.0-beta.2.tgz"; - sha512 = "KuM1iBaiOS6KautBVa+rbU78gxOQ5vt0/mtqu1RNLIyhkG4fOOq/kif3TMacyKUvK9AZ9zpK0nxdCoB3Okz1WQ=="; + url = "https://registry.npmjs.org/@parcel/runtime-service-worker/-/runtime-service-worker-2.3.2.tgz"; + sha512 = "iREHj/eapphC4uS/zGUkiTJvG57q+CVbTrfE42kB8ECtf/RYNo5YC9htdvPZjRSXDPrEPc5NCoKp4X09ENNikw=="; }; }; - "@parcel/source-map-2.0.0-alpha.4.21" = { + "@parcel/source-map-2.0.2" = { name = "_at_parcel_slash_source-map"; packageName = "@parcel/source-map"; - version = "2.0.0-alpha.4.21"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.0.0-alpha.4.21.tgz"; - sha512 = "rKuySz3wRrAhmFriWGmAoAiVF+8VmA+Bzc19y9ITopk4Ax8a8+gmM5AJcXLZCmeVfr6gqdCwr+NsDwmT2Fk7QA=="; + url = "https://registry.npmjs.org/@parcel/source-map/-/source-map-2.0.2.tgz"; + sha512 = "NnUrPYLpYB6qyx2v6bcRPn/gVigmGG6M6xL8wIg/i0dP1GLkuY1nf+Hqdf63FzPTqqT7K3k6eE5yHPQVMO5jcA=="; }; }; - "@parcel/transformer-babel-2.0.0-beta.2" = { + "@parcel/transformer-babel-2.3.2" = { name = "_at_parcel_slash_transformer-babel"; packageName = "@parcel/transformer-babel"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.0.0-beta.2.tgz"; - sha512 = "I8lbiRhINjfEExV74pLDdqUWtdU+GWmzSXmRoY1hpfUAXGOruDX/LEqPAvrBcvOufqz5LuHZZmryHU+I/0dOCA=="; + url = "https://registry.npmjs.org/@parcel/transformer-babel/-/transformer-babel-2.3.2.tgz"; + sha512 = "QpWfH2V6jJ+kcUBIMM/uBBG8dGFvNaOGS+8jD6b+eTP+1owzm83RoWgqhRV2D/hhv2qMXEQzIljoc/wg2y+X4g=="; }; }; - "@parcel/transformer-css-2.0.0-beta.2" = { + "@parcel/transformer-css-2.3.2" = { name = "_at_parcel_slash_transformer-css"; packageName = "@parcel/transformer-css"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.0.0-beta.2.tgz"; - sha512 = "saOur9P8UHjqWs8SSZ0lmqUGb1zRF1eVlerpG4wlYnG2ZIHjjPFs9BQR/PJL0De/fBPcXfLWGYGBA/dcEW1Shw=="; + url = "https://registry.npmjs.org/@parcel/transformer-css/-/transformer-css-2.3.2.tgz"; + sha512 = "8lzvDny+78DIAqhcXam2Bf9FyaUoqzHdUQdNFn+PuXTHroG/QGPvln1kvqngJjn4/cpJS9vYmAPVXe+nai3P8g=="; }; }; - "@parcel/transformer-html-2.0.0-beta.2" = { + "@parcel/transformer-html-2.3.2" = { name = "_at_parcel_slash_transformer-html"; packageName = "@parcel/transformer-html"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.0.0-beta.2.tgz"; - sha512 = "+tzf/FtVKaQXOHdPbtOTJJd91krH1qkj3bzpT7Mzg+zN/iCN2nvg8C7pMHwxQJlqB4Lc4TuLlZDI8ztYHqKT6A=="; + url = "https://registry.npmjs.org/@parcel/transformer-html/-/transformer-html-2.3.2.tgz"; + sha512 = "idT1I/8WM65IFYBqzRwpwT7sf0xGur4EDQDHhuPX1w+pIVZnh0lkLMAnEqs6ar1SPRMys4chzkuDNnqh0d76hg=="; }; }; - "@parcel/transformer-js-2.0.0-beta.2" = { + "@parcel/transformer-image-2.3.2" = { + name = "_at_parcel_slash_transformer-image"; + packageName = "@parcel/transformer-image"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-image/-/transformer-image-2.3.2.tgz"; + sha512 = "0K7cJHXysli6hZsUz/zVGO7WCoaaIeVdzAxKpLA1Yl3LKw/ODiMyXKt08LiV/ljQ2xT5qb9EsXUWDRvcZ0b96A=="; + }; + }; + "@parcel/transformer-js-2.3.2" = { name = "_at_parcel_slash_transformer-js"; packageName = "@parcel/transformer-js"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.0.0-beta.2.tgz"; - sha512 = "zmifvYS0wCNe4cXxDRPSvC4NBvo5WVkLu95jVeuzeYZrMJZmFPgss/a6YTYLwjWEHQejWNhk9s2WaDw0GX6Jrw=="; + url = "https://registry.npmjs.org/@parcel/transformer-js/-/transformer-js-2.3.2.tgz"; + sha512 = "U1fbIoAoqR5P49S+DMhH8BUd9IHRPwrTTv6ARYGsYnhuNsjTFhNYE0kkfRYboe/e0z7vEbeJICZXjnZ7eQDw5A=="; }; }; - "@parcel/transformer-json-2.0.0-beta.2" = { + "@parcel/transformer-json-2.3.2" = { name = "_at_parcel_slash_transformer-json"; packageName = "@parcel/transformer-json"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.0.0-beta.2.tgz"; - sha512 = "U8fxwFtRzILbKkrunh+/RZcnV6GnwvV3/0xwFz4XMWnEv1PW9iTiIpnZqsnANWXL3S4AZq7vkRHtM+6S07K5Cw=="; + url = "https://registry.npmjs.org/@parcel/transformer-json/-/transformer-json-2.3.2.tgz"; + sha512 = "Pv2iPaxKINtFwOk5fDbHjQlSm2Vza/NLimQY896FLxiXPNAJxWGvMwdutgOPEBKksxRx9LZPyIOHiRVZ0KcA3w=="; }; }; - "@parcel/transformer-postcss-2.0.0-beta.2" = { + "@parcel/transformer-postcss-2.3.2" = { name = "_at_parcel_slash_transformer-postcss"; packageName = "@parcel/transformer-postcss"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.0.0-beta.2.tgz"; - sha512 = "wtMOe2OelMfNxO05DPBTno1JTnh47DHTdlk3lP50Ejs3n+2mmIHlcXJEdTXY1TOnVgsDIL6Hh73x7gSJ86pbMg=="; + url = "https://registry.npmjs.org/@parcel/transformer-postcss/-/transformer-postcss-2.3.2.tgz"; + sha512 = "Rpdxc1rt2aJFCh/y/ccaBc9J1crDjNY5o44xYoOemBoUNDMREsmg5sR5iO81qKKO5GxfoosGb2zh59aeTmywcg=="; }; }; - "@parcel/transformer-posthtml-2.0.0-beta.2" = { + "@parcel/transformer-posthtml-2.3.2" = { name = "_at_parcel_slash_transformer-posthtml"; packageName = "@parcel/transformer-posthtml"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.0.0-beta.2.tgz"; - sha512 = "1nJiGD5d2ap3qagfPv3xBb4Ym151bj0d1Qz5d3/xIhJIimiBxHTzln43OTlO2SxDETacleqJOB5YB9brAbmRsA=="; + url = "https://registry.npmjs.org/@parcel/transformer-posthtml/-/transformer-posthtml-2.3.2.tgz"; + sha512 = "tMdVExfdM+1G8A9KSHDsjg+S9xEGbhH5mApF2NslPnNZ4ciLKRNuHU2sSV/v8i0a6kacKvDTrwQXYBQJGOodBw=="; }; }; - "@parcel/transformer-raw-2.0.0-beta.2" = { + "@parcel/transformer-raw-2.3.2" = { name = "_at_parcel_slash_transformer-raw"; packageName = "@parcel/transformer-raw"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.0.0-beta.2.tgz"; - sha512 = "vaJjTpG9EcCvo2lFGD9ySv+gUXgw8xZGjyd1tDg7ruUudcCydhUb7kI2l1oH/l29qcFScxmT5qSd9uHo9xHzfQ=="; + url = "https://registry.npmjs.org/@parcel/transformer-raw/-/transformer-raw-2.3.2.tgz"; + sha512 = "lY7eOCaALZ90+GH+4PZRmAPGQRXoZ66NakSdhEtH6JSSAYOmZKDvNLGTMRo/vK1oELzWMuAHGdqvbcPDtNLLVw=="; }; }; - "@parcel/transformer-react-refresh-babel-2.0.0-beta.2" = { - name = "_at_parcel_slash_transformer-react-refresh-babel"; - packageName = "@parcel/transformer-react-refresh-babel"; - version = "2.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-babel/-/transformer-react-refresh-babel-2.0.0-beta.2.tgz"; - sha512 = "cQQTLJp+zmlDimqy4prLjCQttTPOKZkB7NhZbOkfMqnKCRJKzZNlOmPXHNq5NOfoN4a3zAPv6AFaJL5j/Va5EQ=="; - }; - }; - "@parcel/transformer-react-refresh-wrap-2.0.0-beta.2" = { + "@parcel/transformer-react-refresh-wrap-2.3.2" = { name = "_at_parcel_slash_transformer-react-refresh-wrap"; packageName = "@parcel/transformer-react-refresh-wrap"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.0.0-beta.2.tgz"; - sha512 = "rbkv8ZGiGqQi5KESnfWPFsUbrkCmrZLji3brJ9GSgrK+sUSUReme3hWk7DPlLipAMng+mIR8KxGzvT+eM0JFww=="; + url = "https://registry.npmjs.org/@parcel/transformer-react-refresh-wrap/-/transformer-react-refresh-wrap-2.3.2.tgz"; + sha512 = "FZaderyCExn0SBZ6D+zHPWc8JSn9YDcbfibv0wkCl+D7sYfeWZ22i7MRp5NwCe/TZ21WuxDWySCggEp/Waz2xg=="; }; }; - "@parcel/transformer-vue-2.0.0-beta.2" = { + "@parcel/transformer-svg-2.3.2" = { + name = "_at_parcel_slash_transformer-svg"; + packageName = "@parcel/transformer-svg"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/transformer-svg/-/transformer-svg-2.3.2.tgz"; + sha512 = "k9My6bePsaGgUh+tidDjFbbVgKPTzwCAQfoloZRMt7y396KgUbvCfqDruk04k6k+cJn7Jl1o/5lUpTEruBze7g=="; + }; + }; + "@parcel/transformer-vue-2.3.2" = { name = "_at_parcel_slash_transformer-vue"; packageName = "@parcel/transformer-vue"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/transformer-vue/-/transformer-vue-2.0.0-beta.2.tgz"; - sha512 = "fnhrDZxoisBgakbMt+mhLVpd152J4mGdu3b7tXDiIGgwtGb41JkrzYB2OYbzvjkDDHQMODDgc2qyPSThVh8vFw=="; + url = "https://registry.npmjs.org/@parcel/transformer-vue/-/transformer-vue-2.3.2.tgz"; + sha512 = "6s72rpAropKkGctrAj+ILay7c87Fm9QecZIUeLHfHE+d/3ka6Cw256Ol3/kjRAlRskddbPA+/rfpDpcGEtLziw=="; }; }; "@parcel/types-2.0.0-beta.2" = { @@ -1426,31 +517,40 @@ let sha512 = "ri2BPGAFDntQbA5p3m/4QgnEqWYToUMkAtLelXSPbwnTM0KARavTAwSRqz1xwTdXa8gQyv4SSV7xURwaPaZ3GA=="; }; }; - "@parcel/utils-2.0.0-beta.2" = { + "@parcel/types-2.3.2" = { + name = "_at_parcel_slash_types"; + packageName = "@parcel/types"; + version = "2.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@parcel/types/-/types-2.3.2.tgz"; + sha512 = "C77Ct1xNM7LWjPTfe/dQ/9rq1efdsX5VJu2o8/TVi6qoFh64Wp/c5/vCHwKInOTBZUTchVO6z4PGJNIZoUVJuA=="; + }; + }; + "@parcel/utils-2.3.2" = { name = "_at_parcel_slash_utils"; packageName = "@parcel/utils"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.0.0-beta.2.tgz"; - sha512 = "v8vFGdUY/IuuL7dvmdNxhv4TowgqYDxupToxEvMix1GePRx7QTV1ugy/uWgMXhNIytFo4qyo1fWD7VcXLMS1TQ=="; + url = "https://registry.npmjs.org/@parcel/utils/-/utils-2.3.2.tgz"; + sha512 = "xzZ+0vWhrXlLzGoz7WlANaO5IPtyWGeCZruGtepUL3yheRWb1UU4zFN9xz7Z+j++Dmf1Fgkc3qdk/t4O8u9HLQ=="; }; }; - "@parcel/watcher-2.0.0-alpha.10" = { + "@parcel/watcher-2.0.5" = { name = "_at_parcel_slash_watcher"; packageName = "@parcel/watcher"; - version = "2.0.0-alpha.10"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.0-alpha.10.tgz"; - sha512 = "8uA7Tmx/1XvmUdGzksg0+oN7uj24pXFFnKJqZr3L3mgYjdrL7CMs3PRIHv1k3LUz/hNRsb/p3qxztSkWz1IGZA=="; + url = "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.5.tgz"; + sha512 = "x0hUbjv891omnkcHD7ZOhiyyUqUUR6MNjq89JhEI3BxppeKWAm6NPQsqqRrAkCJBogdT/o/My21sXtTI9rJIsw=="; }; }; - "@parcel/workers-2.0.0-beta.2" = { + "@parcel/workers-2.3.2" = { name = "_at_parcel_slash_workers"; packageName = "@parcel/workers"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.0.0-beta.2.tgz"; - sha512 = "WrxtEFVTM6N4+az42g1pPCqa8OjnH1PVZVEYGodtq0sxc0dtHuYvo30B0GvPVJVddLrWoNwtIrqvC/zucX24yg=="; + url = "https://registry.npmjs.org/@parcel/workers/-/workers-2.3.2.tgz"; + sha512 = "JbOm+Ceuyymd1SuKGgodC2EXAiPuFRpaNUSJpz3NAsS3lVIt2TDAPMOWBivS7sML/KltspUfl/Q9YwO0TPUFNw=="; }; }; "@samverschueren/stream-to-observable-0.3.1" = { @@ -1462,184 +562,166 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@types/http-proxy-1.17.5" = { - name = "_at_types_slash_http-proxy"; - packageName = "@types/http-proxy"; - version = "1.17.5"; + "@swc/helpers-0.2.14" = { + name = "_at_swc_slash_helpers"; + packageName = "@swc/helpers"; + version = "0.2.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.5.tgz"; - sha512 = "GNkDE7bTv6Sf8JbV2GksknKOsk7OznNYHSdrtvPJXO0qJ9odZig6IZKUi5RFGi6d1bf6dgIAe4uXi3DBc7069Q=="; + url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.2.14.tgz"; + sha512 = "wpCQMhf5p5GhNg2MmGKXzUNwxe7zRiCsmqYsamez2beP7mKPCSiu+BjZcdN95yYSzO857kr0VfQewmGpS77nqA=="; }; }; - "@types/node-14.14.37" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "14.14.37"; + "@trysound/sax-0.2.0" = { + name = "_at_trysound_slash_sax"; + packageName = "@trysound/sax"; + version = "0.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.37.tgz"; - sha512 = "XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw=="; + url = "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"; + sha512 = "L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA=="; }; }; - "@types/q-1.5.4" = { - name = "_at_types_slash_q"; - packageName = "@types/q"; - version = "1.5.4"; + "@types/parse-json-4.0.0" = { + name = "_at_types_slash_parse-json"; + packageName = "@types/parse-json"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/q/-/q-1.5.4.tgz"; - sha512 = "1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug=="; + url = "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; }; - "@types/sinonjs__fake-timers-6.0.1" = { + "@types/sinonjs__fake-timers-6.0.4" = { name = "_at_types_slash_sinonjs__fake-timers"; packageName = "@types/sinonjs__fake-timers"; - version = "6.0.1"; + version = "6.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.1.tgz"; - sha512 = "yYezQwGWty8ziyYLdZjwxyMb0CZR49h8JALHGrxjQHWlqGgc8kLdHEgWrgL0uZ29DMvEVBDnHU2Wg36zKSIUtA=="; + url = "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.4.tgz"; + sha512 = "IFQTJARgMUBF+xVd2b+hIgXWrZEjND3vJtRCvIelcFB5SIXfjV4bOHbHJ0eXKh+0COrBRc8MqteKAz/j88rE0A=="; }; }; - "@types/sizzle-2.3.2" = { + "@types/sizzle-2.3.3" = { name = "_at_types_slash_sizzle"; packageName = "@types/sizzle"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz"; - sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="; + url = "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"; + sha512 = "JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ=="; }; }; - "@vue/compiler-core-3.0.9" = { + "@vue/compiler-core-3.2.31" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.9"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.9.tgz"; - sha512 = "bHAPwfVoLhGx8d6KV/OfGf/3gwpymVirgfmSyhgv5YuXDybLa6BwjSLvhNMAyDP+4q4pp0p6g248LuoOy5W6OA=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.2.31.tgz"; + sha512 = "aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ=="; }; }; - "@vue/compiler-dom-3.0.9" = { + "@vue/compiler-dom-3.2.31" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.9"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.9.tgz"; - sha512 = "tkq6umPSELaghvOExWfGNwrCRc7FTul3RLykKzBZWhb87sSESq0XxiKELfBOfEbzdhWg6BJ1WXKDeq+al/viEQ=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.2.31.tgz"; + sha512 = "60zIlFfzIDf3u91cqfqy9KhCKIJgPeqxgveH2L+87RcGU/alT6BRrk5JtUso0OibH3O7NXuNOQ0cDc9beT0wrg=="; }; }; - "@vue/compiler-sfc-3.0.9" = { + "@vue/compiler-sfc-3.2.31" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.9"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.9.tgz"; - sha512 = "meneFRb9xIDgv/gYWCr9xKryvPi0tVffQzLjCkyN4RF1EndqLS71xugUX9wQsS4F1SAP+zlZbcgMFmTSC4OpHw=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.2.31.tgz"; + sha512 = "748adc9msSPGzXgibHiO6T7RWgfnDcVQD+VVwYgSsyyY8Ans64tALHZANrKtOzvkwznV/F4H7OAod/jIlp/dkQ=="; }; }; - "@vue/compiler-ssr-3.0.9" = { + "@vue/compiler-ssr-3.2.31" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.9"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.9.tgz"; - sha512 = "99h5k6Up+s8AzTNH1ljtXE/QlnG8yaGLePwQ4XQaWfk23ESUnmGZWEC+y+ZXznf8pIfJ0uPeD9EVgQzQAyZ2aA=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.2.31.tgz"; + sha512 = "mjN0rqig+A8TVDnsGPYJM5dpbjlXeHUm2oZHZwGyMYiGT/F4fhJf/cXy8QpjnLQK4Y9Et4GWzHn9PS8AHUnSkw=="; }; }; - "@vue/reactivity-3.0.9" = { + "@vue/devtools-api-6.1.3" = { + name = "_at_vue_slash_devtools-api"; + packageName = "@vue/devtools-api"; + version = "6.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.1.3.tgz"; + sha512 = "79InfO2xHv+WHIrH1bHXQUiQD/wMls9qBk6WVwGCbdwP7/3zINtvqPNMtmSHXsIKjvUAHc8L0ouOj6ZQQRmcXg=="; + }; + }; + "@vue/reactivity-3.2.31" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.9"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.9.tgz"; - sha512 = "W1AbGhzphVjY+TL32lQDwLDNvLzZKOcUgaIaLOoALWMtjzN4ExOUJzrR1FC3ynlpMHIEfcUo8GPgfnNmvMGdgQ=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.2.31.tgz"; + sha512 = "HVr0l211gbhpEKYr2hYe7hRsV91uIVGFYNHj73njbARVGHQvIojkImKMaZNDdoDZOIkMsBc9a1sMqR+WZwfSCw=="; }; }; - "@vue/runtime-core-3.0.9" = { + "@vue/reactivity-transform-3.2.31" = { + name = "_at_vue_slash_reactivity-transform"; + packageName = "@vue/reactivity-transform"; + version = "3.2.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.2.31.tgz"; + sha512 = "uS4l4z/W7wXdI+Va5pgVxBJ345wyGFKvpPYtdSgvfJfX/x2Ymm6ophQlXXB6acqGHtXuBqNyyO3zVp9b1r0MOA=="; + }; + }; + "@vue/runtime-core-3.2.31" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.9"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.9.tgz"; - sha512 = "j94xZ/wRZTVhqpoUgmxBTlojnPFu6TTXNw1Vw8oQkW1ZTGD0IwiJe3ycsKd1bpleXEMVt55GzGlCopI33/Gdmg=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.2.31.tgz"; + sha512 = "Kcog5XmSY7VHFEMuk4+Gap8gUssYMZ2+w+cmGI6OpZWYOEIcbE0TPzzPHi+8XTzAgx1w/ZxDFcXhZeXN5eKWsA=="; }; }; - "@vue/runtime-dom-3.0.9" = { + "@vue/runtime-dom-3.2.31" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.9"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.9.tgz"; - sha512 = "6NCjpwa5hNBFDdokquAgMl2tNEYyQD6kBy9Mh6M2776bxYLXZCqL4/e0UrpBuBiHTrkAlUGODD7PyYGaqH6fyA=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.2.31.tgz"; + sha512 = "N+o0sICVLScUjfLG7u9u5XCjvmsexAiPt17GNnaWHJUfsKed5e85/A3SWgKxzlxx2SW/Hw7RQxzxbXez9PtY3g=="; }; }; - "@vue/shared-3.0.9" = { + "@vue/server-renderer-3.2.31" = { + name = "_at_vue_slash_server-renderer"; + packageName = "@vue/server-renderer"; + version = "3.2.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.2.31.tgz"; + sha512 = "8CN3Zj2HyR2LQQBHZ61HexF5NReqngLT3oahyiVRfSSvak+oAvVmu8iNLSu6XR77Ili2AOpnAt1y8ywjjqtmkg=="; + }; + }; + "@vue/shared-3.2.31" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.9"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.9.tgz"; - sha512 = "lv20q1O5dybwro+V+vnxHCmSIxi9mvTORSgAbGrANGYK8zF4K1S9TOankIvdkcvfZ88IR95O2pTI2Pb3c3BaNg=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.2.31.tgz"; + sha512 = "ymN2pj6zEjiKJZbrf98UM2pfDd6F2H7ksKw7NDt/ZZ1fh5Ei39X5tABugtT03ZRlWd9imccoK0hE8hpjpU7irQ=="; }; }; - "abab-2.0.5" = { - name = "abab"; - packageName = "abab"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"; - sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; - }; - }; - "abortcontroller-polyfill-1.7.1" = { + "abortcontroller-polyfill-1.7.3" = { name = "abortcontroller-polyfill"; packageName = "abortcontroller-polyfill"; - version = "1.7.1"; + version = "1.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.1.tgz"; - sha512 = "yml9NiDEH4M4p0G4AcPkg8AAa4mF3nfYF28VQxaokpO67j9H7gWgmsVWJ/f1Rn+PzsnDYvzJzWIQzCqDKRvWlA=="; + url = "https://registry.npmjs.org/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.3.tgz"; + sha512 = "zetDJxd89y3X99Kvo4qFx8GKlt6GsvN3UcRZHwU6iFA/0KiOmhkTVhe8oRoTBiTVPZu09x3vCra47+w8Yz1+2Q=="; }; }; - "acorn-6.4.2" = { + "acorn-8.7.0" = { name = "acorn"; packageName = "acorn"; - version = "6.4.2"; + version = "8.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz"; - sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ=="; - }; - }; - "acorn-globals-4.3.4" = { - name = "acorn-globals"; - packageName = "acorn-globals"; - version = "4.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz"; - sha512 = "clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A=="; - }; - }; - "acorn-walk-6.2.0" = { - name = "acorn-walk"; - packageName = "acorn-walk"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz"; - sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA=="; - }; - }; - "ajv-6.11.0" = { - name = "ajv"; - packageName = "ajv"; - version = "6.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz"; - sha512 = "nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA=="; - }; - }; - "alphanum-sort-1.0.2" = { - name = "alphanum-sort"; - packageName = "alphanum-sort"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; - sha1 = "97a1119649b211ad33691d9f9f486a8ec9fbe0a3"; + url = "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz"; + sha512 = "V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ=="; }; }; "ansi-escapes-3.2.0" = { @@ -1651,15 +733,6 @@ let sha512 = "cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ=="; }; }; - "ansi-html-0.0.7" = { - name = "ansi-html"; - packageName = "ansi-html"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz"; - sha1 = "813584021962a9e9e6fd039f940d12f56ca7859e"; - }; - }; "ansi-regex-2.1.1" = { name = "ansi-regex"; packageName = "ansi-regex"; @@ -1678,15 +751,6 @@ let sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; }; - "ansi-regex-5.0.0" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; - sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; - }; - }; "ansi-styles-2.2.1" = { name = "ansi-styles"; packageName = "ansi-styles"; @@ -1723,76 +787,13 @@ let sha512 = "/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog=="; }; }; - "arch-2.1.2" = { + "arch-2.2.0" = { name = "arch"; packageName = "arch"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz"; - sha512 = "NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ=="; - }; - }; - "argparse-1.0.10" = { - name = "argparse"; - packageName = "argparse"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"; - sha512 = "o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="; - }; - }; - "arr-diff-4.0.0" = { - name = "arr-diff"; - packageName = "arr-diff"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"; - sha1 = "d6461074febfec71e7e15235761a329a5dc7c520"; - }; - }; - "arr-flatten-1.1.0" = { - name = "arr-flatten"; - packageName = "arr-flatten"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"; - sha512 = "L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg=="; - }; - }; - "arr-union-3.1.0" = { - name = "arr-union"; - packageName = "arr-union"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"; - sha1 = "e39b09aea9def866a8f206e288af63919bae39c4"; - }; - }; - "array-equal-1.0.0" = { - name = "array-equal"; - packageName = "array-equal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz"; - sha1 = "8c2a5ef2472fd9ea742b04c77a75093ba2757c93"; - }; - }; - "array-filter-1.0.0" = { - name = "array-filter"; - packageName = "array-filter"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/array-filter/-/array-filter-1.0.0.tgz"; - sha1 = "baf79e62e6ef4c2a4c0b831232daffec251f9d83"; - }; - }; - "array-unique-0.3.2" = { - name = "array-unique"; - packageName = "array-unique"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"; - sha1 = "a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"; + url = "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"; + sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; }; }; "asn1-0.2.4" = { @@ -1804,24 +805,6 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "asn1.js-5.4.1" = { - name = "asn1.js"; - packageName = "asn1.js"; - version = "5.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz"; - sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA=="; - }; - }; - "assert-2.0.0" = { - name = "assert"; - packageName = "assert"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz"; - sha512 = "se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A=="; - }; - }; "assert-plus-1.0.0" = { name = "assert-plus"; packageName = "assert-plus"; @@ -1831,49 +814,13 @@ let sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; }; - "assign-symbols-1.0.0" = { - name = "assign-symbols"; - packageName = "assign-symbols"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"; - sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; - }; - }; - "astral-regex-2.0.0" = { - name = "astral-regex"; - packageName = "astral-regex"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"; - sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; - }; - }; - "astring-1.7.0" = { - name = "astring"; - packageName = "astring"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/astring/-/astring-1.7.0.tgz"; - sha512 = "43bervUZNvahG1v74a+POdGlAWcOUGSvP9fJVj6sywzM/SquwDkA+CdP938e8tWHUV77fStCiqzaQHAt0u6MVA=="; - }; - }; - "async-3.2.0" = { + "async-3.2.3" = { name = "async"; packageName = "async"; - version = "3.2.0"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.0.tgz"; - sha512 = "TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw=="; - }; - }; - "async-limiter-1.0.1" = { - name = "async-limiter"; - packageName = "async-limiter"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; + url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz"; + sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; "asynckit-0.4.0" = { @@ -1885,24 +832,6 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "atob-2.1.2" = { - name = "atob"; - packageName = "atob"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"; - sha512 = "Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="; - }; - }; - "available-typed-arrays-1.0.2" = { - name = "available-typed-arrays"; - packageName = "available-typed-arrays"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz"; - sha512 = "XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ=="; - }; - }; "aws-sign2-0.7.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -1921,42 +850,6 @@ let sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; }; }; - "babel-plugin-dynamic-import-node-2.3.3" = { - name = "babel-plugin-dynamic-import-node"; - packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; - sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; - }; - }; - "babel-plugin-polyfill-corejs2-0.1.10" = { - name = "babel-plugin-polyfill-corejs2"; - packageName = "babel-plugin-polyfill-corejs2"; - version = "0.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz"; - sha512 = "DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA=="; - }; - }; - "babel-plugin-polyfill-corejs3-0.1.7" = { - name = "babel-plugin-polyfill-corejs3"; - packageName = "babel-plugin-polyfill-corejs3"; - version = "0.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz"; - sha512 = "u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw=="; - }; - }; - "babel-plugin-polyfill-regenerator-0.1.6" = { - name = "babel-plugin-polyfill-regenerator"; - packageName = "babel-plugin-polyfill-regenerator"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz"; - sha512 = "OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg=="; - }; - }; "balanced-match-1.0.0" = { name = "balanced-match"; packageName = "balanced-match"; @@ -1966,31 +859,13 @@ let sha1 = "89b4d199ab2bee49de164ea02b89ce462d71b767"; }; }; - "base-0.11.2" = { - name = "base"; - packageName = "base"; - version = "0.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/base/-/base-0.11.2.tgz"; - sha512 = "5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg=="; - }; - }; - "base-x-3.0.8" = { + "base-x-3.0.9" = { name = "base-x"; packageName = "base-x"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz"; - sha512 = "Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA=="; - }; - }; - "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=="; + url = "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz"; + sha512 = "H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ=="; }; }; "bcrypt-pbkdf-1.0.2" = { @@ -2002,24 +877,6 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; - "big.js-5.2.2" = { - name = "big.js"; - packageName = "big.js"; - version = "5.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"; - sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="; - }; - }; - "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"; @@ -2029,24 +886,6 @@ let sha512 = "XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="; }; }; - "bn.js-4.12.0" = { - name = "bn.js"; - packageName = "bn.js"; - version = "4.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz"; - sha512 = "c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA=="; - }; - }; - "bn.js-5.2.0" = { - name = "bn.js"; - packageName = "bn.js"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz"; - sha512 = "D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="; - }; - }; "boolbase-1.0.0" = { name = "boolbase"; packageName = "boolbase"; @@ -2065,112 +904,13 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; - "braces-2.3.2" = { - name = "braces"; - packageName = "braces"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"; - sha512 = "aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w=="; - }; - }; - "braces-3.0.2" = { - name = "braces"; - packageName = "braces"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; - sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; - }; - }; - "brorand-1.1.0" = { - name = "brorand"; - packageName = "brorand"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz"; - sha1 = "12c25efe40a45e3c323eb8675a0a0ce57b22371f"; - }; - }; - "browser-process-hrtime-1.0.0" = { - name = "browser-process-hrtime"; - packageName = "browser-process-hrtime"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"; - sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; - }; - }; - "browserify-aes-1.2.0" = { - name = "browserify-aes"; - packageName = "browserify-aes"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz"; - sha512 = "+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA=="; - }; - }; - "browserify-cipher-1.0.1" = { - name = "browserify-cipher"; - packageName = "browserify-cipher"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz"; - sha512 = "sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w=="; - }; - }; - "browserify-des-1.0.2" = { - name = "browserify-des"; - packageName = "browserify-des"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz"; - sha512 = "BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A=="; - }; - }; - "browserify-rsa-4.1.0" = { - name = "browserify-rsa"; - packageName = "browserify-rsa"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz"; - sha512 = "AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog=="; - }; - }; - "browserify-sign-4.2.1" = { - name = "browserify-sign"; - packageName = "browserify-sign"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz"; - sha512 = "/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg=="; - }; - }; - "browserify-zlib-0.2.0" = { - name = "browserify-zlib"; - packageName = "browserify-zlib"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz"; - sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA=="; - }; - }; - "browserslist-4.16.3" = { + "browserslist-4.20.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.3"; + version = "4.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz"; - sha512 = "vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw=="; - }; - }; - "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=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz"; + sha512 = "CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA=="; }; }; "buffer-crc32-0.2.13" = { @@ -2191,42 +931,6 @@ let sha512 = "MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A=="; }; }; - "buffer-xor-1.0.3" = { - name = "buffer-xor"; - packageName = "buffer-xor"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"; - sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; - }; - }; - "builtin-status-codes-3.0.0" = { - name = "builtin-status-codes"; - packageName = "builtin-status-codes"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; - sha1 = "85982878e21b98e1c66425e03d0174788f569ee8"; - }; - }; - "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"; - sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; - }; - }; - "cache-base-1.0.1" = { - name = "cache-base"; - packageName = "cache-base"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"; - sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ=="; - }; - }; "cachedir-2.3.0" = { name = "cachedir"; packageName = "cachedir"; @@ -2236,49 +940,13 @@ let sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw=="; }; }; - "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=="; - }; - }; - "caller-callsite-2.0.0" = { - name = "caller-callsite"; - packageName = "caller-callsite"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz"; - sha1 = "847e0fce0a223750a9a027c54b33731ad3154134"; - }; - }; - "caller-path-2.0.0" = { - name = "caller-path"; - packageName = "caller-path"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz"; - sha1 = "468f83044e369ab2010fac5f06ceee15bb2cb1f4"; - }; - }; - "callsites-2.0.0" = { + "callsites-3.1.0" = { name = "callsites"; packageName = "callsites"; - version = "2.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz"; - sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; - }; - }; - "camelcase-6.2.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "6.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; - sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; + url = "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"; + sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="; }; }; "caniuse-api-3.0.0" = { @@ -2290,13 +958,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001204" = { + "caniuse-lite-1.0.30001319" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001204"; + version = "1.0.30001319"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz"; - sha512 = "JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001319.tgz"; + sha512 = "xjlIAFHucBRSMUo1kb5D4LYgcN1M45qdKP++lhqowDpwJwGkpIRTt5qQqnhxjj1vHcI7nrJxWhCC1ATrCEBTcw=="; }; }; "caseless-0.12.0" = { @@ -2326,13 +994,13 @@ let sha512 = "Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ=="; }; }; - "chalk-4.1.0" = { + "chalk-4.1.2" = { name = "chalk"; packageName = "chalk"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"; - sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"; + sha512 = "oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA=="; }; }; "check-more-types-2.24.0" = { @@ -2362,24 +1030,6 @@ let sha512 = "5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="; }; }; - "cipher-base-1.0.4" = { - name = "cipher-base"; - packageName = "cipher-base"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz"; - sha512 = "Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q=="; - }; - }; - "class-utils-0.3.6" = { - name = "class-utils"; - packageName = "class-utils"; - version = "0.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"; - sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg=="; - }; - }; "cli-cursor-1.0.2" = { name = "cli-cursor"; packageName = "cli-cursor"; @@ -2398,24 +1048,6 @@ let sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; }; }; - "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-table3-0.5.1" = { name = "cli-table3"; packageName = "cli-table3"; @@ -2434,15 +1066,6 @@ let sha1 = "9f15cfbb0705005369216c626ac7d05ab90dd574"; }; }; - "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-2.1.2" = { name = "clone"; packageName = "clone"; @@ -2452,15 +1075,6 @@ let sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; }; }; - "coa-2.0.2" = { - name = "coa"; - packageName = "coa"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz"; - sha512 = "q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA=="; - }; - }; "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; @@ -2470,24 +1084,6 @@ let sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; }; }; - "collection-visit-1.0.0" = { - name = "collection-visit"; - packageName = "collection-visit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"; - sha1 = "4bc0373c164bc3291b4d368c829cf1a80a59dca0"; - }; - }; - "color-3.1.3" = { - name = "color"; - packageName = "color"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.1.3.tgz"; - sha512 = "xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ=="; - }; - }; "color-convert-1.9.3" = { name = "color-convert"; packageName = "color-convert"; @@ -2524,13 +1120,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.5.5" = { - name = "color-string"; - packageName = "color-string"; - version = "1.5.5"; + "colord-2.9.2" = { + name = "colord"; + packageName = "colord"; + version = "2.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz"; - sha512 = "jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg=="; + url = "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz"; + sha512 = "Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ=="; }; }; "colorette-1.2.2" = { @@ -2560,15 +1156,6 @@ let 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-2.20.3" = { name = "commander"; packageName = "commander"; @@ -2587,15 +1174,6 @@ let sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; }; }; - "commander-5.1.0" = { - name = "commander"; - packageName = "commander"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; - sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; - }; - }; "commander-7.2.0" = { name = "commander"; packageName = "commander"; @@ -2605,22 +1183,13 @@ let sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; }; - "common-tags-1.8.0" = { + "common-tags-1.8.2" = { name = "common-tags"; packageName = "common-tags"; - version = "1.8.0"; + version = "1.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz"; - sha512 = "6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw=="; - }; - }; - "component-emitter-1.3.0" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"; - sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg=="; + url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz"; + sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA=="; }; }; "concat-map-0.0.1" = { @@ -2641,24 +1210,6 @@ let sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; }; - "connect-3.7.0" = { - name = "connect"; - packageName = "connect"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz"; - sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ=="; - }; - }; - "console-browserify-1.2.0" = { - name = "console-browserify"; - packageName = "console-browserify"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz"; - sha512 = "ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="; - }; - }; "consolidate-0.16.0" = { name = "consolidate"; packageName = "consolidate"; @@ -2668,60 +1219,6 @@ let sha512 = "Nhl1wzCslqXYTJVDyJCu3ODohy9OfBMB5uD2BiBTzd7w+QY0lBzafkR8y8755yMYHAaMD4NuzbAw03/xzfw+eQ=="; }; }; - "constants-browserify-1.0.0" = { - name = "constants-browserify"; - packageName = "constants-browserify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz"; - sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75"; - }; - }; - "content-disposition-0.5.2" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz"; - sha1 = "0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"; - }; - }; - "convert-source-map-1.7.0" = { - name = "convert-source-map"; - packageName = "convert-source-map"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; - sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; - }; - }; - "copy-descriptor-0.1.1" = { - name = "copy-descriptor"; - packageName = "copy-descriptor"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"; - sha1 = "676f6eb3c39997c2ee1ac3a924fd6124748f578d"; - }; - }; - "core-js-3.9.1" = { - name = "core-js"; - packageName = "core-js"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.9.1.tgz"; - sha512 = "gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg=="; - }; - }; - "core-js-compat-3.9.1" = { - name = "core-js-compat"; - packageName = "core-js-compat"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.9.1.tgz"; - sha512 = "jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA=="; - }; - }; "core-util-is-1.0.2" = { name = "core-util-is"; packageName = "core-util-is"; @@ -2731,40 +1228,13 @@ let sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; }; - "cosmiconfig-5.2.1" = { + "cosmiconfig-7.0.1" = { name = "cosmiconfig"; packageName = "cosmiconfig"; - version = "5.2.1"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz"; - sha512 = "H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA=="; - }; - }; - "create-ecdh-4.0.4" = { - name = "create-ecdh"; - packageName = "create-ecdh"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz"; - sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; - }; - }; - "create-hash-1.2.0" = { - name = "create-hash"; - packageName = "create-hash"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz"; - sha512 = "z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg=="; - }; - }; - "create-hmac-1.1.7" = { - name = "create-hmac"; - packageName = "create-hmac"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz"; - sha512 = "MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg=="; + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; + sha512 = "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; }; }; "cross-spawn-6.0.5" = { @@ -2776,94 +1246,40 @@ let sha512 = "eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ=="; }; }; - "crypto-browserify-3.12.0" = { - name = "crypto-browserify"; - packageName = "crypto-browserify"; - version = "3.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz"; - sha512 = "fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg=="; - }; - }; - "css-color-names-0.0.4" = { - name = "css-color-names"; - packageName = "css-color-names"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz"; - sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; - }; - }; - "css-declaration-sorter-4.0.1" = { + "css-declaration-sorter-6.1.4" = { name = "css-declaration-sorter"; packageName = "css-declaration-sorter"; - version = "4.0.1"; + version = "6.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz"; - sha512 = "BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA=="; + url = "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz"; + sha512 = "lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw=="; }; }; - "css-modules-loader-core-1.1.0" = { - name = "css-modules-loader-core"; - packageName = "css-modules-loader-core"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz"; - sha1 = "5908668294a1becd261ae0a4ce21b0b551f21d16"; - }; - }; - "css-select-2.1.0" = { + "css-select-4.2.1" = { name = "css-select"; packageName = "css-select"; - version = "2.1.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz"; - sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; + url = "https://registry.npmjs.org/css-select/-/css-select-4.2.1.tgz"; + sha512 = "/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ=="; }; }; - "css-select-base-adapter-0.1.1" = { - name = "css-select-base-adapter"; - packageName = "css-select-base-adapter"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz"; - sha512 = "jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w=="; - }; - }; - "css-selector-tokenizer-0.7.3" = { - name = "css-selector-tokenizer"; - packageName = "css-selector-tokenizer"; - version = "0.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz"; - sha512 = "jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg=="; - }; - }; - "css-tree-1.0.0-alpha.37" = { + "css-tree-1.1.3" = { name = "css-tree"; packageName = "css-tree"; - version = "1.0.0-alpha.37"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; - sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"; + sha512 = "tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q=="; }; }; - "css-tree-1.1.2" = { - name = "css-tree"; - packageName = "css-tree"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.1.2.tgz"; - sha512 = "wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ=="; - }; - }; - "css-what-3.4.2" = { + "css-what-5.1.0" = { name = "css-what"; packageName = "css-what"; - version = "3.4.2"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz"; - sha512 = "ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ=="; + url = "https://registry.npmjs.org/css-what/-/css-what-5.1.0.tgz"; + sha512 = "arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw=="; }; }; "cssesc-3.0.0" = { @@ -2875,58 +1291,31 @@ let sha512 = "/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg=="; }; }; - "cssnano-4.1.10" = { + "cssnano-5.1.5" = { name = "cssnano"; packageName = "cssnano"; - version = "4.1.10"; + version = "5.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano/-/cssnano-4.1.10.tgz"; - sha512 = "5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ=="; + url = "https://registry.npmjs.org/cssnano/-/cssnano-5.1.5.tgz"; + sha512 = "VZO1e+bRRVixMeia1zKagrv0lLN1B/r/u12STGNNUFxnp97LIFgZHQa0JxqlwEkvzUyA9Oz/WnCTAFkdEbONmg=="; }; }; - "cssnano-preset-default-4.0.7" = { + "cssnano-preset-default-5.2.5" = { name = "cssnano-preset-default"; packageName = "cssnano-preset-default"; - version = "4.0.7"; + version = "5.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz"; - sha512 = "x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA=="; + url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.5.tgz"; + sha512 = "WopL7PzN7sos3X8B54/QGl+CZUh1f0qN4ds+y2d5EPwRSSc3jsitVw81O+Uyop0pXyOfPfZxnc+LmA8w/Ki/WQ=="; }; }; - "cssnano-util-get-arguments-4.0.0" = { - name = "cssnano-util-get-arguments"; - packageName = "cssnano-util-get-arguments"; - version = "4.0.0"; + "cssnano-utils-3.1.0" = { + name = "cssnano-utils"; + packageName = "cssnano-utils"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; - sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; - }; - }; - "cssnano-util-get-match-4.0.0" = { - name = "cssnano-util-get-match"; - packageName = "cssnano-util-get-match"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; - sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; - }; - }; - "cssnano-util-raw-cache-4.0.1" = { - name = "cssnano-util-raw-cache"; - packageName = "cssnano-util-raw-cache"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz"; - sha512 = "qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA=="; - }; - }; - "cssnano-util-same-parent-4.0.1" = { - name = "cssnano-util-same-parent"; - packageName = "cssnano-util-same-parent"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz"; - sha512 = "WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q=="; + url = "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"; + sha512 = "JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA=="; }; }; "csso-4.2.0" = { @@ -2938,31 +1327,13 @@ let sha512 = "wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA=="; }; }; - "cssom-0.3.8" = { - name = "cssom"; - packageName = "cssom"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"; - sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="; - }; - }; - "cssstyle-1.4.0" = { - name = "cssstyle"; - packageName = "cssstyle"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz"; - sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA=="; - }; - }; - "csstype-2.6.16" = { + "csstype-2.6.20" = { name = "csstype"; packageName = "csstype"; - version = "2.6.16"; + version = "2.6.20"; src = fetchurl { - url = "https://registry.npmjs.org/csstype/-/csstype-2.6.16.tgz"; - sha512 = "61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q=="; + url = "https://registry.npmjs.org/csstype/-/csstype-2.6.20.tgz"; + sha512 = "/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA=="; }; }; "cypress-4.12.1" = { @@ -2983,15 +1354,6 @@ let sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; }; }; - "data-urls-1.1.0" = { - name = "data-urls"; - packageName = "data-urls"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz"; - sha512 = "YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ=="; - }; - }; "date-fns-1.30.1" = { name = "date-fns"; packageName = "date-fns"; @@ -3010,13 +1372,13 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-3.2.6" = { + "debug-3.2.7" = { name = "debug"; packageName = "debug"; - version = "3.2.6"; + version = "3.2.7"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz"; - sha512 = "mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ=="; + url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"; + sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ=="; }; }; "debug-4.1.1" = { @@ -3028,69 +1390,6 @@ let sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; }; }; - "decode-uri-component-0.2.0" = { - name = "decode-uri-component"; - packageName = "decode-uri-component"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; - }; - }; - "deep-is-0.1.3" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }; - }; - "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"; - }; - }; - "define-properties-1.1.3" = { - name = "define-properties"; - packageName = "define-properties"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; - }; - }; - "define-property-0.2.5" = { - name = "define-property"; - packageName = "define-property"; - version = "0.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; - sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; - }; - }; - "define-property-1.0.0" = { - name = "define-property"; - packageName = "define-property"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; - sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; - }; - }; - "define-property-2.0.2" = { - name = "define-property"; - packageName = "define-property"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"; - sha512 = "jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ=="; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -3100,15 +1399,6 @@ let sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; }; }; - "des.js-1.0.1" = { - name = "des.js"; - packageName = "des.js"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz"; - sha512 = "Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA=="; - }; - }; "detect-libc-1.0.3" = { name = "detect-libc"; packageName = "detect-libc"; @@ -3118,121 +1408,40 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; - "diffie-hellman-5.0.3" = { - name = "diffie-hellman"; - packageName = "diffie-hellman"; - version = "5.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz"; - sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg=="; - }; - }; - "dom-serializer-0.2.2" = { + "dom-serializer-1.3.2" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "0.2.2"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; - sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.3.2.tgz"; + sha512 = "5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig=="; }; }; - "dom-serializer-1.2.0" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz"; - sha512 = "n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA=="; - }; - }; - "domain-browser-3.5.0" = { - name = "domain-browser"; - packageName = "domain-browser"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domain-browser/-/domain-browser-3.5.0.tgz"; - sha512 = "zrzUu6auyZWRexjCEPJnfWc30Hupxh2lJZOJAF3qa2bCuD4O/55t0FvQt3ZMhEw++gjNkwdkOVZh8yA32w/Vfw=="; - }; - }; - "domelementtype-1.3.1" = { + "domelementtype-2.2.0" = { name = "domelementtype"; packageName = "domelementtype"; - version = "1.3.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz"; - sha512 = "BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w=="; + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz"; + sha512 = "DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="; }; }; - "domelementtype-2.1.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz"; - sha512 = "LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="; - }; - }; - "domexception-1.0.1" = { - name = "domexception"; - packageName = "domexception"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz"; - sha512 = "raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug=="; - }; - }; - "domhandler-2.4.2" = { + "domhandler-4.3.1" = { name = "domhandler"; packageName = "domhandler"; - version = "2.4.2"; + version = "4.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz"; - sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA=="; + url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"; + sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ=="; }; }; - "domhandler-3.3.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"; - sha512 = "J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA=="; - }; - }; - "domhandler-4.0.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz"; - sha512 = "KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA=="; - }; - }; - "domutils-1.7.0" = { + "domutils-2.8.0" = { name = "domutils"; packageName = "domutils"; - version = "1.7.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz"; - sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; - }; - }; - "domutils-2.5.0" = { - name = "domutils"; - packageName = "domutils"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.5.0.tgz"; - sha512 = "Ho16rzNMOFk2fPwChGh3D2D9OEHAfG19HgmRR2l+WLSsIstNsAYBzePH412bL0y5T44ejABIVfTHQ8nqi/tBCg=="; - }; - }; - "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=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"; + sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; }; }; "dotenv-7.0.0" = { @@ -3262,31 +1471,13 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "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"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; - }; - }; - "ejs-2.7.4" = { - name = "ejs"; - packageName = "ejs"; - version = "2.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-2.7.4.tgz"; - sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; - }; - }; - "electron-to-chromium-1.3.702" = { + "electron-to-chromium-1.4.89" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.702"; + version = "1.4.89"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.702.tgz"; - sha512 = "qJVUKFWQnF6wP7MmTngDkmm8/KPzaiTXNFOAg5j7DSa6J7kPou7mTBqC8jpUOxauQWwHR3pn4dMRdV8IE1xdtA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.89.tgz"; + sha512 = "z1Axg0Fu54fse8wN4fd+GAINdU5mJmLtcl6bqIcYyzNVGONcfHAeeJi88KYMQVKalhXlYuVPzKkFIU5VD0raUw=="; }; }; "elegant-spinner-1.0.1" = { @@ -3298,51 +1489,6 @@ let sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; }; }; - "elliptic-6.5.4" = { - name = "elliptic"; - packageName = "elliptic"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz"; - sha512 = "iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ=="; - }; - }; - "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=="; - }; - }; - "emojis-list-3.0.0" = { - name = "emojis-list"; - packageName = "emojis-list"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"; - sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; - }; - }; - "emphasize-4.2.0" = { - name = "emphasize"; - packageName = "emphasize"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/emphasize/-/emphasize-4.2.0.tgz"; - sha512 = "yGKvcFUHlBsUPwlxTlzKLR8+zhpbitkFOMCUxN8fTJng9bdH3WNzUGkhdaGdjndSUgqmMPBN7umfwnUdLz5Axg=="; - }; - }; - "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"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; - }; - }; "end-of-stream-1.4.4" = { name = "end-of-stream"; packageName = "end-of-stream"; @@ -3352,15 +1498,6 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "entities-1.1.2" = { - name = "entities"; - packageName = "entities"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz"; - sha512 = "f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w=="; - }; - }; "entities-2.2.0" = { name = "entities"; packageName = "entities"; @@ -3370,6 +1507,15 @@ let sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; }; + "entities-3.0.1" = { + name = "entities"; + packageName = "entities"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz"; + sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; + }; + }; "error-ex-1.3.2" = { name = "error-ex"; packageName = "error-ex"; @@ -3379,33 +1525,6 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; - "es-abstract-1.18.0" = { - name = "es-abstract"; - packageName = "es-abstract"; - version = "1.18.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz"; - sha512 = "LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw=="; - }; - }; - "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=="; - }; - }; - "es6-object-assign-1.1.0" = { - name = "es6-object-assign"; - packageName = "es6-object-assign"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz"; - sha1 = "c2c3582656247c39ea107cb1e6652b6f9f24523c"; - }; - }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -3415,15 +1534,6 @@ let 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"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; - }; - }; "escape-string-regexp-1.0.5" = { name = "escape-string-regexp"; packageName = "escape-string-regexp"; @@ -3433,33 +1543,6 @@ let sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; }; - "escodegen-1.14.3" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.14.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz"; - sha512 = "qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw=="; - }; - }; - "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=="; - }; - }; - "estraverse-4.3.0" = { - name = "estraverse"; - packageName = "estraverse"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"; - sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; - }; - }; "estree-walker-2.0.2" = { name = "estree-walker"; packageName = "estree-walker"; @@ -3469,49 +1552,13 @@ let sha512 = "Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="; }; }; - "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=="; - }; - }; - "eventemitter2-6.4.3" = { + "eventemitter2-6.4.5" = { name = "eventemitter2"; packageName = "eventemitter2"; - version = "6.4.3"; + version = "6.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.3.tgz"; - sha512 = "t0A2msp6BzOf+QAcI6z9XMktLj52OjGQg+8SJH6v5+3uxNpWYRR3wQmfA+6xtMU9kOC59qk9licus5dYcrYkMQ=="; - }; - }; - "eventemitter3-4.0.7" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"; - sha512 = "8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="; - }; - }; - "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=="; - }; - }; - "evp_bytestokey-1.0.3" = { - name = "evp_bytestokey"; - packageName = "evp_bytestokey"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz"; - sha512 = "/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA=="; + url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.5.tgz"; + sha512 = "bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw=="; }; }; "execa-1.0.0" = { @@ -3541,15 +1588,6 @@ let sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8"; }; }; - "expand-brackets-2.1.4" = { - name = "expand-brackets"; - packageName = "expand-brackets"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; - sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; - }; - }; "extend-3.0.2" = { name = "extend"; packageName = "extend"; @@ -3559,33 +1597,6 @@ let sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; - "extend-shallow-2.0.1" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; - }; - }; - "extend-shallow-3.0.2" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; - }; - }; - "extglob-2.0.4" = { - name = "extglob"; - packageName = "extglob"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"; - sha512 = "Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw=="; - }; - }; "extract-zip-1.7.0" = { name = "extract-zip"; packageName = "extract-zip"; @@ -3604,87 +1615,6 @@ let sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; }; }; - "fast-deep-equal-3.1.1" = { - name = "fast-deep-equal"; - packageName = "fast-deep-equal"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha512 = "8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="; - }; - }; - "fast-glob-3.1.1" = { - name = "fast-glob"; - packageName = "fast-glob"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.1.tgz"; - sha512 = "nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g=="; - }; - }; - "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-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"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; - }; - }; - "fast-url-parser-1.1.3" = { - name = "fast-url-parser"; - packageName = "fast-url-parser"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz"; - sha1 = "f4af3ea9f34d8a271cf58ad2b3759f431f0b318d"; - }; - }; - "fastest-levenshtein-1.0.12" = { - name = "fastest-levenshtein"; - packageName = "fastest-levenshtein"; - version = "1.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz"; - sha512 = "On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow=="; - }; - }; - "fastparse-1.1.2" = { - name = "fastparse"; - packageName = "fastparse"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz"; - sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; - }; - }; - "fastq-1.11.0" = { - name = "fastq"; - packageName = "fastq"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"; - sha512 = "7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g=="; - }; - }; - "fault-1.0.4" = { - name = "fault"; - packageName = "fault"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz"; - sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; - }; - }; "fd-slicer-1.1.0" = { name = "fd-slicer"; packageName = "fd-slicer"; @@ -3712,69 +1642,6 @@ let sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; }; - "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=="; - }; - }; - "fill-range-4.0.0" = { - name = "fill-range"; - packageName = "fill-range"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; - sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; - }; - }; - "fill-range-7.0.1" = { - name = "fill-range"; - packageName = "fill-range"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; - sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; - }; - }; - "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.13.3" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.3.tgz"; - sha512 = "DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA=="; - }; - }; - "for-in-1.0.2" = { - name = "for-in"; - packageName = "for-in"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; - }; - }; - "foreach-2.0.5" = { - name = "foreach"; - packageName = "foreach"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz"; - sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99"; - }; - }; "forever-agent-0.6.1" = { name = "forever-agent"; packageName = "forever-agent"; @@ -3793,24 +1660,6 @@ let sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="; }; }; - "format-0.2.2" = { - name = "format"; - packageName = "format"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/format/-/format-0.2.2.tgz"; - sha1 = "d6170107e9efdc4ed30c9dc39016df942b5cb58b"; - }; - }; - "fragment-cache-0.2.1" = { - name = "fragment-cache"; - packageName = "fragment-cache"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; - sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; - }; - }; "fs-extra-8.1.0" = { name = "fs-extra"; packageName = "fs-extra"; @@ -3829,42 +1678,6 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "function-bind-1.1.1" = { - name = "function-bind"; - packageName = "function-bind"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; - sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; - }; - }; - "generic-names-2.0.1" = { - name = "generic-names"; - packageName = "generic-names"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz"; - sha512 = "kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ=="; - }; - }; - "gensync-1.0.0-beta.2" = { - name = "gensync"; - packageName = "gensync"; - version = "1.0.0-beta.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; - sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; - }; - }; - "get-intrinsic-1.1.1" = { - name = "get-intrinsic"; - packageName = "get-intrinsic"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; - }; - }; "get-port-4.2.0" = { name = "get-port"; packageName = "get-port"; @@ -3883,15 +1696,6 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; - "get-value-2.0.6" = { - name = "get-value"; - packageName = "get-value"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; - sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; - }; - }; "getos-3.2.1" = { name = "getos"; packageName = "getos"; @@ -3919,40 +1723,22 @@ let sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; - "glob-parent-5.1.2" = { - name = "glob-parent"; - packageName = "glob-parent"; - version = "5.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"; - sha512 = "AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow=="; - }; - }; - "global-dirs-2.0.1" = { + "global-dirs-2.1.0" = { name = "global-dirs"; packageName = "global-dirs"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.0.1.tgz"; - sha512 = "5HqUqdhkEovj2Of/ms3IeS/EekcO54ytHRLV4PEY2rhRwrHXLQjeVEES0Lhka0xwNDtGYn58wyC4s5+MHsOO6A=="; + url = "https://registry.npmjs.org/global-dirs/-/global-dirs-2.1.0.tgz"; + sha512 = "MG6kdOUh/xBnyo9cJFeIKkLEc1AyFq42QTU4XiX51i2NEdxLxLWXIjEjmqKeSuKR7pAZjTqUVoT2b2huxVLgYQ=="; }; }; - "globals-11.12.0" = { + "globals-13.13.0" = { name = "globals"; packageName = "globals"; - version = "11.12.0"; + version = "13.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"; - sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; - }; - }; - "globals-13.7.0" = { - name = "globals"; - packageName = "globals"; - version = "13.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.7.0.tgz"; - sha512 = "Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA=="; + url = "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz"; + sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; }; }; "graceful-fs-4.2.3" = { @@ -3964,42 +1750,6 @@ let sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; }; }; - "graceful-fs-4.2.6" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; - sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; - }; - }; - "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"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; - }; - }; - "har-validator-5.1.3" = { - name = "har-validator"; - packageName = "har-validator"; - version = "5.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"; - sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g=="; - }; - }; - "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-ansi-2.0.0" = { name = "has-ansi"; packageName = "has-ansi"; @@ -4009,24 +1759,6 @@ let sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; }; }; - "has-bigints-1.0.1" = { - name = "has-bigints"; - packageName = "has-bigints"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz"; - sha512 = "LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA=="; - }; - }; - "has-flag-1.0.0" = { - name = "has-flag"; - packageName = "has-flag"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; - }; - }; "has-flag-3.0.0" = { name = "has-flag"; packageName = "has-flag"; @@ -4045,283 +1777,40 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-symbols-1.0.2" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; - }; - }; - "has-value-0.3.1" = { - name = "has-value"; - packageName = "has-value"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; - sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; - }; - }; - "has-value-1.0.0" = { - name = "has-value"; - packageName = "has-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; - sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; - }; - }; - "has-values-0.1.4" = { - name = "has-values"; - packageName = "has-values"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; - sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; - }; - }; - "has-values-1.0.0" = { - name = "has-values"; - packageName = "has-values"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; - sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; - }; - }; - "hash-base-3.1.0" = { - name = "hash-base"; - packageName = "hash-base"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"; - sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; - }; - }; - "hash-sum-2.0.0" = { - name = "hash-sum"; - packageName = "hash-sum"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz"; - sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; - }; - }; - "hash.js-1.1.7" = { - name = "hash.js"; - packageName = "hash.js"; - version = "1.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz"; - sha512 = "taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA=="; - }; - }; - "hex-color-regex-1.1.0" = { - name = "hex-color-regex"; - packageName = "hex-color-regex"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz"; - sha512 = "l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ=="; - }; - }; - "highlight.js-10.4.1" = { - name = "highlight.js"; - packageName = "highlight.js"; - version = "10.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/highlight.js/-/highlight.js-10.4.1.tgz"; - sha512 = "yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg=="; - }; - }; - "hmac-drbg-1.0.1" = { - name = "hmac-drbg"; - packageName = "hmac-drbg"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; - }; - }; - "hsl-regex-1.0.0" = { - name = "hsl-regex"; - packageName = "hsl-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz"; - sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; - }; - }; - "hsla-regex-1.0.0" = { - name = "hsla-regex"; - packageName = "hsla-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz"; - sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; - }; - }; - "html-comment-regex-1.1.2" = { - name = "html-comment-regex"; - packageName = "html-comment-regex"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.2.tgz"; - sha512 = "P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ=="; - }; - }; - "html-encoding-sniffer-1.0.2" = { - name = "html-encoding-sniffer"; - packageName = "html-encoding-sniffer"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz"; - sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; - }; - }; - "html-tags-1.2.0" = { - name = "html-tags"; - packageName = "html-tags"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/html-tags/-/html-tags-1.2.0.tgz"; - sha1 = "c78de65b5663aa597989dd2b7ab49200d7e4db98"; - }; - }; - "htmlnano-0.2.8" = { + "htmlnano-2.0.0" = { name = "htmlnano"; packageName = "htmlnano"; - version = "0.2.8"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.8.tgz"; - sha512 = "q5gbo4SIDAE5sfJ5V0UD6uu+n1dcO/Mpr0B6SlDlJBoV7xKPne4uG4UwrT8vUWjdjIPJl95TY8EDuEbBW2TG0A=="; - }; - }; - "htmlparser2-3.10.1" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz"; - sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ=="; - }; - }; - "htmlparser2-5.0.1" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz"; - sha512 = "vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ=="; - }; - }; - "http-proxy-1.18.1" = { - name = "http-proxy"; - packageName = "http-proxy"; - version = "1.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"; - sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ=="; - }; - }; - "http-proxy-middleware-1.1.0" = { - name = "http-proxy-middleware"; - packageName = "http-proxy-middleware"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.1.0.tgz"; - sha512 = "OnjU5vyVgcZVe2AjLJyMrk8YLNOC2lspCHirB5ldM+B/dwEfZ5bgVTrFyzE9R7xRWAP/i/FXtvIqKjTNEZBhBg=="; - }; - }; - "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"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; - }; - }; - "https-browserify-1.0.0" = { - name = "https-browserify"; - packageName = "https-browserify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; - sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; - }; - }; - "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=="; - }; - }; - "icss-replace-symbols-1.1.0" = { - name = "icss-replace-symbols"; - packageName = "icss-replace-symbols"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"; - sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; - }; - }; - "icss-utils-4.1.1" = { - name = "icss-utils"; - packageName = "icss-utils"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz"; - 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=="; - }; - }; - "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=="; - }; - }; - "iferr-1.0.2" = { - name = "iferr"; - packageName = "iferr"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/iferr/-/iferr-1.0.2.tgz"; - sha512 = "9AfeLfji44r5TKInjhz3W9DyZI1zR1JAf2hVBMGhddAKPqBsupb89jGfbCTHIGZd6fGZl9WlHdn4AObygyMKwg=="; - }; - }; - "import-fresh-2.0.0" = { - name = "import-fresh"; - packageName = "import-fresh"; version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz"; - sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-2.0.0.tgz"; + sha512 = "thKQfhcp2xgtsWNE27A2bliEeqVL5xjAgGn0wajyttvFFsvFWWah1ntV9aEX61gz0T6MBQ5xK/1lXuEumhJTcg=="; }; }; - "imurmurhash-0.1.4" = { - name = "imurmurhash"; - packageName = "imurmurhash"; - version = "0.1.4"; + "htmlparser2-7.2.0" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "7.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-7.2.0.tgz"; + sha512 = "H7MImA4MS6cw7nbyURtLPO1Tms7C5H602LRETv95z1MxO/7CP7rDVROehUYeYBUYEON94NXXDEPmZuq+hX4sog=="; + }; + }; + "http-signature-1.3.6" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz"; + sha512 = "3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw=="; + }; + }; + "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=="; }; }; "indent-string-3.2.0" = { @@ -4333,15 +1822,6 @@ let sha1 = "4a5fd6d27cc332f37e5419a504dbb837105c9289"; }; }; - "indexes-of-1.0.1" = { - name = "indexes-of"; - packageName = "indexes-of"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"; - sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; - }; - }; "inflight-1.0.6" = { name = "inflight"; packageName = "inflight"; @@ -4360,58 +1840,13 @@ let sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; }; }; - "ini-1.3.5" = { + "ini-1.3.7" = { name = "ini"; packageName = "ini"; - version = "1.3.5"; + version = "1.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz"; - sha512 = "RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="; - }; - }; - "is-absolute-url-2.1.0" = { - name = "is-absolute-url"; - packageName = "is-absolute-url"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; - sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; - }; - }; - "is-absolute-url-3.0.3" = { - name = "is-absolute-url"; - packageName = "is-absolute-url"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; - sha512 = "opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="; - }; - }; - "is-accessor-descriptor-0.1.6" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; - }; - }; - "is-accessor-descriptor-1.0.0" = { - name = "is-accessor-descriptor"; - packageName = "is-accessor-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"; - sha512 = "m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ=="; - }; - }; - "is-arguments-1.1.0" = { - name = "is-arguments"; - packageName = "is-arguments"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz"; - sha512 = "1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg=="; + url = "https://registry.npmjs.org/ini/-/ini-1.3.7.tgz"; + sha512 = "iKpRpXP+CrP2jyrxvg1kMUpXDyRUFDWurxbnVT1vQPx+Wz9uCYsMIqYuSBLV+PAaZG/d7kRLKRFc9oDMsH+mFQ=="; }; }; "is-arrayish-0.2.1" = { @@ -4423,51 +1858,6 @@ let sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; }; }; - "is-arrayish-0.3.2" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"; - sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; - }; - }; - "is-bigint-1.0.1" = { - name = "is-bigint"; - packageName = "is-bigint"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz"; - sha512 = "J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg=="; - }; - }; - "is-boolean-object-1.1.0" = { - name = "is-boolean-object"; - packageName = "is-boolean-object"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz"; - sha512 = "a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA=="; - }; - }; - "is-buffer-1.1.6" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"; - sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; - }; - }; - "is-callable-1.2.3" = { - name = "is-callable"; - packageName = "is-callable"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz"; - sha512 = "J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ=="; - }; - }; "is-ci-2.0.0" = { name = "is-ci"; packageName = "is-ci"; @@ -4477,114 +1867,6 @@ let sha512 = "YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w=="; }; }; - "is-color-stop-1.1.0" = { - name = "is-color-stop"; - packageName = "is-color-stop"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz"; - sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; - }; - }; - "is-core-module-2.2.0" = { - name = "is-core-module"; - packageName = "is-core-module"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; - sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; - }; - }; - "is-data-descriptor-0.1.4" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; - }; - }; - "is-data-descriptor-1.0.0" = { - name = "is-data-descriptor"; - packageName = "is-data-descriptor"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"; - sha512 = "jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ=="; - }; - }; - "is-date-object-1.0.2" = { - name = "is-date-object"; - packageName = "is-date-object"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz"; - sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; - }; - }; - "is-descriptor-0.1.6" = { - name = "is-descriptor"; - packageName = "is-descriptor"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"; - sha512 = "avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg=="; - }; - }; - "is-descriptor-1.0.2" = { - name = "is-descriptor"; - packageName = "is-descriptor"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"; - sha512 = "2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg=="; - }; - }; - "is-directory-0.3.1" = { - name = "is-directory"; - packageName = "is-directory"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"; - sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; - }; - }; - "is-docker-2.1.1" = { - name = "is-docker"; - packageName = "is-docker"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz"; - sha512 = "ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw=="; - }; - }; - "is-extendable-0.1.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; - }; - }; - "is-extendable-1.0.1" = { - name = "is-extendable"; - packageName = "is-extendable"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"; - sha512 = "arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA=="; - }; - }; - "is-extglob-2.1.1" = { - name = "is-extglob"; - packageName = "is-extglob"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; - }; - }; "is-fullwidth-code-point-1.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -4603,42 +1885,6 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; - "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-generator-function-1.0.8" = { - name = "is-generator-function"; - packageName = "is-generator-function"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.8.tgz"; - sha512 = "2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ=="; - }; - }; - "is-glob-4.0.1" = { - name = "is-glob"; - packageName = "is-glob"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; - sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; - }; - }; - "is-html-1.1.0" = { - name = "is-html"; - packageName = "is-html"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-html/-/is-html-1.1.0.tgz"; - sha1 = "e04f1c18d39485111396f9a0273eab51af218464"; - }; - }; "is-installed-globally-0.3.2" = { name = "is-installed-globally"; packageName = "is-installed-globally"; @@ -4648,67 +1894,13 @@ let 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-nan-1.3.2" = { - name = "is-nan"; - packageName = "is-nan"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz"; - sha512 = "E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w=="; - }; - }; - "is-negative-zero-2.0.1" = { - name = "is-negative-zero"; - packageName = "is-negative-zero"; + "is-json-2.0.1" = { + name = "is-json"; + packageName = "is-json"; version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz"; - sha512 = "2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w=="; - }; - }; - "is-number-3.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; - }; - }; - "is-number-7.0.0" = { - name = "is-number"; - packageName = "is-number"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; - sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; - }; - }; - "is-number-object-1.0.4" = { - name = "is-number-object"; - packageName = "is-number-object"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz"; - sha512 = "zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw=="; - }; - }; - "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=="; + url = "https://registry.npmjs.org/is-json/-/is-json-2.0.1.tgz"; + sha1 = "6be166d144828a131d686891b983df62c39491ff"; }; }; "is-observable-1.1.0" = { @@ -4720,31 +1912,13 @@ let sha512 = "NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA=="; }; }; - "is-path-inside-3.0.2" = { + "is-path-inside-3.0.3" = { name = "is-path-inside"; packageName = "is-path-inside"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.2.tgz"; - sha512 = "/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg=="; - }; - }; - "is-plain-obj-3.0.0" = { - name = "is-plain-obj"; - packageName = "is-plain-obj"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz"; - sha512 = "gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="; - }; - }; - "is-plain-object-2.0.4" = { - name = "is-plain-object"; - packageName = "is-plain-object"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"; - sha512 = "h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og=="; + url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"; + sha512 = "Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ=="; }; }; "is-promise-2.2.2" = { @@ -4756,24 +1930,6 @@ let sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; - "is-regex-1.1.2" = { - name = "is-regex"; - packageName = "is-regex"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz"; - sha512 = "axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg=="; - }; - }; - "is-resolvable-1.1.0" = { - name = "is-resolvable"; - packageName = "is-resolvable"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz"; - sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg=="; - }; - }; "is-stream-1.1.0" = { name = "is-stream"; packageName = "is-stream"; @@ -4783,42 +1939,6 @@ let sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; }; }; - "is-string-1.0.5" = { - name = "is-string"; - packageName = "is-string"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz"; - sha512 = "buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="; - }; - }; - "is-svg-3.0.0" = { - name = "is-svg"; - packageName = "is-svg"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-svg/-/is-svg-3.0.0.tgz"; - sha512 = "gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ=="; - }; - }; - "is-symbol-1.0.3" = { - name = "is-symbol"; - packageName = "is-symbol"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz"; - sha512 = "OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ=="; - }; - }; - "is-typed-array-1.1.5" = { - name = "is-typed-array"; - packageName = "is-typed-array"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.5.tgz"; - sha512 = "S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug=="; - }; - }; "is-typedarray-1.0.0" = { name = "is-typedarray"; packageName = "is-typedarray"; @@ -4828,42 +1948,6 @@ 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-url-1.2.4" = { - name = "is-url"; - packageName = "is-url"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz"; - sha512 = "ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="; - }; - }; - "is-windows-1.0.2" = { - name = "is-windows"; - packageName = "is-windows"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"; - sha512 = "eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="; - }; - }; - "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"; @@ -4882,24 +1966,6 @@ let sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; }; }; - "isobject-2.1.0" = { - name = "isobject"; - packageName = "isobject"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; - }; - }; - "isobject-3.0.1" = { - name = "isobject"; - packageName = "isobject"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; - }; - }; "isstream-0.1.2" = { name = "isstream"; packageName = "isstream"; @@ -4918,15 +1984,6 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.14.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"; - sha512 = "okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g=="; - }; - }; "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; @@ -4936,58 +1993,22 @@ let sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; - "jsdom-14.1.0" = { - name = "jsdom"; - packageName = "jsdom"; - version = "14.1.0"; + "json-parse-even-better-errors-2.3.1" = { + name = "json-parse-even-better-errors"; + packageName = "json-parse-even-better-errors"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-14.1.0.tgz"; - sha512 = "O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng=="; + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha512 = "xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="; }; }; - "jsesc-0.5.0" = { - name = "jsesc"; - packageName = "jsesc"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; - }; - }; - "jsesc-2.5.2" = { - name = "jsesc"; - packageName = "jsesc"; - version = "2.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"; - sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; - }; - }; - "json-parse-better-errors-1.0.2" = { - name = "json-parse-better-errors"; - packageName = "json-parse-better-errors"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz"; - sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; - }; - }; - "json-schema-0.2.3" = { + "json-schema-0.4.0" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.3"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "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=="; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"; + sha512 = "es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA=="; }; }; "json-source-map-0.6.1" = { @@ -5008,22 +2029,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "json5-1.0.1" = { + "json5-2.2.1" = { name = "json5"; packageName = "json5"; - version = "1.0.1"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"; - sha512 = "aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow=="; - }; - }; - "json5-2.2.0" = { - name = "json5"; - packageName = "json5"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"; - sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; + url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; + sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; }; }; "jsonfile-4.0.0" = { @@ -5035,49 +2047,13 @@ let sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; - "jsprim-1.4.1" = { + "jsprim-2.0.2" = { name = "jsprim"; packageName = "jsprim"; - version = "1.4.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"; - sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"; - }; - }; - "kind-of-3.2.2" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; - }; - }; - "kind-of-4.0.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; - }; - }; - "kind-of-5.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"; - sha512 = "NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw=="; - }; - }; - "kind-of-6.0.3" = { - name = "kind-of"; - packageName = "kind-of"; - version = "6.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"; - sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="; + url = "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz"; + sha512 = "gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ=="; }; }; "lazy-ass-1.6.0" = { @@ -5089,13 +2065,22 @@ let sha1 = "7999655e8646c17f089fdd187d150d3324d54513"; }; }; - "levn-0.3.0" = { - name = "levn"; - packageName = "levn"; - version = "0.3.0"; + "lilconfig-2.0.4" = { + name = "lilconfig"; + packageName = "lilconfig"; + version = "2.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + url = "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.4.tgz"; + sha512 = "bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA=="; + }; + }; + "lines-and-columns-1.2.4" = { + name = "lines-and-columns"; + packageName = "lines-and-columns"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"; + sha512 = "7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="; }; }; "listr-0.14.3" = { @@ -5134,22 +2119,13 @@ let sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw=="; }; }; - "loader-utils-1.4.0" = { - name = "loader-utils"; - packageName = "loader-utils"; - version = "1.4.0"; + "lmdb-2.2.6" = { + name = "lmdb"; + packageName = "lmdb"; + version = "2.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"; - sha512 = "qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA=="; - }; - }; - "lodash-4.17.20" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.20"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; - sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; + url = "https://registry.npmjs.org/lmdb/-/lmdb-2.2.6.tgz"; + sha512 = "UmQV0oZZcV3EN6rjcAjIiuWcc3MYZGWQ0GUYz46Ron5fuTa/dUow7WSQa6leFkvZIKVUdECBWVw96tckfEzUFQ=="; }; }; "lodash-4.17.21" = { @@ -5161,33 +2137,6 @@ let sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="; }; }; - "lodash.camelcase-4.3.0" = { - name = "lodash.camelcase"; - packageName = "lodash.camelcase"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; - sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; - }; - }; - "lodash.clone-4.5.0" = { - name = "lodash.clone"; - packageName = "lodash.clone"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz"; - sha1 = "195870450f5a13192478df4bc3d23d2dea1907b6"; - }; - }; - "lodash.debounce-4.0.8" = { - name = "lodash.debounce"; - packageName = "lodash.debounce"; - version = "4.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; - }; - }; "lodash.memoize-4.1.2" = { name = "lodash.memoize"; packageName = "lodash.memoize"; @@ -5206,15 +2155,6 @@ let sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac"; }; }; - "lodash.sortby-4.7.0" = { - name = "lodash.sortby"; - packageName = "lodash.sortby"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; - }; - }; "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; @@ -5242,15 +2182,6 @@ let sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; }; }; - "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=="; - }; - }; "log-update-2.3.0" = { name = "log-update"; packageName = "log-update"; @@ -5260,67 +2191,13 @@ let sha1 = "88328fd7d1ce7938b29283746f0b1bc126b24708"; }; }; - "lowlight-1.17.0" = { - name = "lowlight"; - packageName = "lowlight"; - version = "1.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lowlight/-/lowlight-1.17.0.tgz"; - sha512 = "vmtBgYKD+QVNy7tIa7ulz5d//Il9R4MooOVh4nkOf9R9Cb/Dk5TXMSTieg/vDulkBkIWj59/BIlyFQxT9X1oAQ=="; - }; - }; - "lru-cache-5.1.1" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "5.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"; - sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="; - }; - }; - "lru-cache-6.0.0" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "6.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"; - sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; - }; - }; - "magic-string-0.25.7" = { + "magic-string-0.25.9" = { name = "magic-string"; packageName = "magic-string"; - version = "0.25.7"; + version = "0.25.9"; src = fetchurl { - url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"; - sha512 = "4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA=="; - }; - }; - "map-cache-0.2.2" = { - name = "map-cache"; - packageName = "map-cache"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; - }; - }; - "map-visit-1.0.0" = { - name = "map-visit"; - packageName = "map-visit"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; - sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; - }; - }; - "md5.js-1.3.5" = { - name = "md5.js"; - packageName = "md5.js"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz"; - sha512 = "xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg=="; + url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz"; + sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ=="; }; }; "mdn-data-2.0.14" = { @@ -5332,69 +2209,6 @@ let sha512 = "dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="; }; }; - "mdn-data-2.0.4" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz"; - sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; - }; - }; - "merge-source-map-1.1.0" = { - name = "merge-source-map"; - packageName = "merge-source-map"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; - sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; - }; - }; - "merge2-1.4.1" = { - name = "merge2"; - packageName = "merge2"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"; - sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; - }; - }; - "micromatch-3.1.10" = { - name = "micromatch"; - packageName = "micromatch"; - version = "3.1.10"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"; - sha512 = "MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg=="; - }; - }; - "micromatch-4.0.2" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz"; - sha512 = "y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q=="; - }; - }; - "miller-rabin-4.0.1" = { - name = "miller-rabin"; - packageName = "miller-rabin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz"; - sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA=="; - }; - }; - "mime-db-1.33.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.33.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz"; - sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; - }; - }; "mime-db-1.43.0" = { name = "mime-db"; packageName = "mime-db"; @@ -5404,15 +2218,6 @@ let sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; }; }; - "mime-types-2.1.18" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.18"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz"; - sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; - }; - }; "mime-types-2.1.26" = { name = "mime-types"; packageName = "mime-types"; @@ -5431,33 +2236,6 @@ let sha512 = "jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ=="; }; }; - "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=="; - }; - }; - "minimalistic-assert-1.0.1" = { - name = "minimalistic-assert"; - packageName = "minimalistic-assert"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"; - sha512 = "UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="; - }; - }; - "minimalistic-crypto-utils-1.0.1" = { - name = "minimalistic-crypto-utils"; - packageName = "minimalistic-crypto-utils"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; - }; - }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -5476,15 +2254,6 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; - "mixin-deep-1.3.2" = { - name = "mixin-deep"; - packageName = "mixin-deep"; - version = "1.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"; - sha512 = "WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="; - }; - }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -5494,13 +2263,13 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "moment-2.27.0" = { + "moment-2.29.1" = { name = "moment"; packageName = "moment"; - version = "2.27.0"; + version = "2.29.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz"; - sha512 = "al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; + sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; "ms-2.0.0" = { @@ -5521,6 +2290,33 @@ let sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; }; }; + "msgpackr-1.5.5" = { + name = "msgpackr"; + packageName = "msgpackr"; + version = "1.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.5.5.tgz"; + sha512 = "JG0V47xRIQ9pyUnx6Hb4+3TrQoia2nA3UIdmyTldhxaxtKFkekkKpUW/N6fwHwod9o4BGuJGtouxOk+yCP5PEA=="; + }; + }; + "msgpackr-extract-1.0.16" = { + name = "msgpackr-extract"; + packageName = "msgpackr-extract"; + version = "1.0.16"; + src = fetchurl { + url = "https://registry.npmjs.org/msgpackr-extract/-/msgpackr-extract-1.0.16.tgz"; + sha512 = "fxdRfQUxPrL/TizyfYfMn09dK58e+d65bRD/fcaVH4052vj30QOzzqxcQIS7B0NsqlypEQ/6Du3QmP2DhWFfCA=="; + }; + }; + "nan-2.15.0" = { + name = "nan"; + packageName = "nan"; + version = "2.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz"; + sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; + }; + }; "nanoid-3.1.22" = { name = "nanoid"; packageName = "nanoid"; @@ -5530,22 +2326,13 @@ let sha512 = "/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ=="; }; }; - "nanomatch-1.2.13" = { - name = "nanomatch"; - packageName = "nanomatch"; - version = "1.2.13"; + "nanoid-3.3.1" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"; - sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA=="; - }; - }; - "ncp-2.0.0" = { - name = "ncp"; - packageName = "ncp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; - sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz"; + sha512 = "n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw=="; }; }; "nice-try-1.0.5" = { @@ -5557,22 +2344,13 @@ let sha512 = "1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="; }; }; - "node-addon-api-3.1.0" = { + "node-addon-api-3.2.1" = { name = "node-addon-api"; packageName = "node-addon-api"; - version = "3.1.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.1.0.tgz"; - sha512 = "flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw=="; - }; - }; - "node-forge-0.10.0" = { - name = "node-forge"; - packageName = "node-forge"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz"; - sha512 = "PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="; + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"; + sha512 = "mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A=="; }; }; "node-gyp-build-4.2.3" = { @@ -5584,22 +2362,31 @@ let sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="; }; }; - "node-releases-1.1.71" = { - name = "node-releases"; - packageName = "node-releases"; - version = "1.1.71"; + "node-gyp-build-4.3.0" = { + name = "node-gyp-build"; + packageName = "node-gyp-build"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz"; - sha512 = "zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz"; + sha512 = "iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q=="; }; }; - "normalize-url-3.3.0" = { + "node-releases-2.0.2" = { + name = "node-releases"; + packageName = "node-releases"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz"; + sha512 = "XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="; + }; + }; + "normalize-url-6.1.0" = { name = "normalize-url"; packageName = "normalize-url"; - version = "3.3.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/normalize-url/-/normalize-url-3.3.0.tgz"; - sha512 = "U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg=="; + url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"; + sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A=="; }; }; "npm-run-path-2.0.2" = { @@ -5611,13 +2398,13 @@ let sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; }; }; - "nth-check-1.0.2" = { + "nth-check-2.0.1" = { name = "nth-check"; packageName = "nth-check"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz"; - sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; + url = "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz"; + sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; }; }; "nullthrows-1.1.1" = { @@ -5638,24 +2425,6 @@ let sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; - "nwsapi-2.2.0" = { - name = "nwsapi"; - packageName = "nwsapi"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"; - sha512 = "h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="; - }; - }; - "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"; @@ -5665,96 +2434,6 @@ let sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; }; }; - "object-copy-0.1.0" = { - name = "object-copy"; - packageName = "object-copy"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; - sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; - }; - }; - "object-inspect-1.9.0" = { - name = "object-inspect"; - packageName = "object-inspect"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz"; - sha512 = "i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw=="; - }; - }; - "object-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" = { - 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-visit-1.0.1" = { - name = "object-visit"; - packageName = "object-visit"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; - sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; - }; - }; - "object.assign-4.1.2" = { - name = "object.assign"; - packageName = "object.assign"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; - sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; - }; - }; - "object.getownpropertydescriptors-2.1.2" = { - name = "object.getownpropertydescriptors"; - packageName = "object.getownpropertydescriptors"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz"; - sha512 = "WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ=="; - }; - }; - "object.pick-1.3.0" = { - name = "object.pick"; - packageName = "object.pick"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; - }; - }; - "object.values-1.1.3" = { - name = "object.values"; - packageName = "object.values"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object.values/-/object.values-1.1.3.tgz"; - sha512 = "nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw=="; - }; - }; - "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"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; - }; - }; "once-1.4.0" = { name = "once"; packageName = "once"; @@ -5782,49 +2461,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "onetime-5.1.2" = { - name = "onetime"; - packageName = "onetime"; - version = "5.1.2"; + "ordered-binary-1.2.4" = { + name = "ordered-binary"; + packageName = "ordered-binary"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; - sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; - }; - }; - "open-7.4.2" = { - name = "open"; - packageName = "open"; - version = "7.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz"; - sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q=="; - }; - }; - "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=="; - }; - }; - "ora-5.4.0" = { - name = "ora"; - packageName = "ora"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-5.4.0.tgz"; - sha512 = "1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg=="; - }; - }; - "os-browserify-0.3.0" = { - name = "os-browserify"; - packageName = "os-browserify"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; - sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.2.4.tgz"; + sha512 = "A/csN0d3n+igxBPfUrjbV5GC69LWj2pjZzAAeeHXLukQ4+fytfP4T1Lg0ju7MSPSwq7KtHkGaiwO8URZN5IpLg=="; }; }; "ospath-1.2.2" = { @@ -5854,22 +2497,13 @@ let sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw=="; }; }; - "pako-1.0.11" = { - name = "pako"; - packageName = "pako"; - version = "1.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"; - sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="; - }; - }; - "parcel-2.0.0-beta.2" = { + "parcel-2.3.2" = { name = "parcel"; packageName = "parcel"; - version = "2.0.0-beta.2"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/parcel/-/parcel-2.0.0-beta.2.tgz"; - sha512 = "fOoxOYdoZpmBP4jd+qNKuW5DeqLTIILIKtaBqXm+DCRjaQGbZw0zQ+mhW9PStcT0pbjJedcXuUyc1GGHdvobYw=="; + url = "https://registry.npmjs.org/parcel/-/parcel-2.3.2.tgz"; + sha512 = "4jhgoBcQaiGKmnmBvNyKyOvZrxCgzgUzdEoVup/fRCOP99hNmvYIN5IErIIJxsU9ObcG/RGCFF8wa4kVRsWfIg=="; }; }; "parcel-reporter-static-files-copy-1.2.2" = { @@ -5881,58 +2515,22 @@ let sha512 = "DMtv5QVoEp5Jp07G1QKF6IB6uns8/+joGiTh1SU71x8qsm5BBR7AqmzaKed1CAlzYPyzu0It6IjzIC8mFvn4iw=="; }; }; - "parse-asn1-5.1.6" = { - name = "parse-asn1"; - packageName = "parse-asn1"; - version = "5.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"; - sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; - }; - }; - "parse-json-4.0.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; - }; - }; - "parse5-5.1.0" = { - name = "parse5"; - packageName = "parse5"; - version = "5.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz"; - sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; - }; - }; - "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=="; - }; - }; - "pascalcase-0.1.1" = { - name = "pascalcase"; - packageName = "pascalcase"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; - }; - }; - "path-browserify-1.0.1" = { - name = "path-browserify"; - packageName = "path-browserify"; + "parent-module-1.0.1" = { + name = "parent-module"; + packageName = "parent-module"; version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz"; - sha512 = "b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="; + url = "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"; + sha512 = "GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g=="; + }; + }; + "parse-json-5.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"; + sha512 = "ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg=="; }; }; "path-is-absolute-1.0.1" = { @@ -5944,15 +2542,6 @@ let sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; }; - "path-is-inside-1.0.2" = { - name = "path-is-inside"; - packageName = "path-is-inside"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; - sha1 = "365417dede44430d1c11af61027facf074bdfc53"; - }; - }; "path-key-2.0.1" = { name = "path-key"; packageName = "path-key"; @@ -5962,31 +2551,13 @@ let sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; }; }; - "path-parse-1.0.6" = { - name = "path-parse"; - packageName = "path-parse"; - version = "1.0.6"; + "path-type-4.0.0" = { + name = "path-type"; + packageName = "path-type"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz"; - sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="; - }; - }; - "path-to-regexp-2.2.1" = { - name = "path-to-regexp"; - packageName = "path-to-regexp"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.2.1.tgz"; - sha512 = "gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ=="; - }; - }; - "pbkdf2-3.1.1" = { - name = "pbkdf2"; - packageName = "pbkdf2"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.1.tgz"; - sha512 = "4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg=="; + url = "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"; + sha512 = "gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="; }; }; "pend-1.2.0" = { @@ -6007,13 +2578,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "picomatch-2.2.2" = { - name = "picomatch"; - packageName = "picomatch"; - version = "2.2.2"; + "picocolors-1.0.0" = { + name = "picocolors"; + packageName = "picocolors"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; - sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + url = "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"; + sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; }; }; "pify-2.3.0" = { @@ -6025,60 +2596,6 @@ let sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; }; }; - "pn-1.1.0" = { - name = "pn"; - packageName = "pn"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz"; - sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA=="; - }; - }; - "posix-character-classes-0.1.1" = { - name = "posix-character-classes"; - packageName = "posix-character-classes"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; - sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; - }; - }; - "postcss-6.0.1" = { - name = "postcss"; - packageName = "postcss"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.1.tgz"; - sha1 = "000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"; - }; - }; - "postcss-6.0.23" = { - name = "postcss"; - packageName = "postcss"; - version = "6.0.23"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"; - sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; - }; - }; - "postcss-7.0.32" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.32"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz"; - sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; - }; - }; - "postcss-7.0.35" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.35"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz"; - sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; - }; - }; "postcss-8.2.8" = { name = "postcss"; packageName = "postcss"; @@ -6088,499 +2605,319 @@ let sha512 = "1F0Xb2T21xET7oQV9eKuctbM9S7BC0fetoHCc4H13z0PT6haiRLP4T0ZY4XWh7iLP0usgqykT6p9B2RtOf4FPw=="; }; }; - "postcss-calc-7.0.5" = { + "postcss-8.4.12" = { + name = "postcss"; + packageName = "postcss"; + version = "8.4.12"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.4.12.tgz"; + sha512 = "lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg=="; + }; + }; + "postcss-calc-8.2.4" = { name = "postcss-calc"; packageName = "postcss-calc"; - version = "7.0.5"; + version = "8.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz"; - sha512 = "1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg=="; + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"; + sha512 = "SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q=="; }; }; - "postcss-colormin-4.0.3" = { + "postcss-colormin-5.3.0" = { name = "postcss-colormin"; packageName = "postcss-colormin"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz"; - sha512 = "WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw=="; - }; - }; - "postcss-convert-values-4.0.1" = { - name = "postcss-convert-values"; - packageName = "postcss-convert-values"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz"; - sha512 = "Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ=="; - }; - }; - "postcss-discard-comments-4.0.2" = { - name = "postcss-discard-comments"; - packageName = "postcss-discard-comments"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz"; - sha512 = "RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg=="; - }; - }; - "postcss-discard-duplicates-4.0.2" = { - name = "postcss-discard-duplicates"; - packageName = "postcss-discard-duplicates"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz"; - sha512 = "ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ=="; - }; - }; - "postcss-discard-empty-4.0.1" = { - name = "postcss-discard-empty"; - packageName = "postcss-discard-empty"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz"; - sha512 = "B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w=="; - }; - }; - "postcss-discard-overridden-4.0.1" = { - name = "postcss-discard-overridden"; - packageName = "postcss-discard-overridden"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz"; - sha512 = "IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg=="; - }; - }; - "postcss-merge-longhand-4.0.11" = { - name = "postcss-merge-longhand"; - packageName = "postcss-merge-longhand"; - version = "4.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz"; - sha512 = "alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw=="; - }; - }; - "postcss-merge-rules-4.0.3" = { - name = "postcss-merge-rules"; - packageName = "postcss-merge-rules"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz"; - sha512 = "U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ=="; - }; - }; - "postcss-minify-font-values-4.0.2" = { - name = "postcss-minify-font-values"; - packageName = "postcss-minify-font-values"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz"; - sha512 = "j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg=="; - }; - }; - "postcss-minify-gradients-4.0.2" = { - name = "postcss-minify-gradients"; - packageName = "postcss-minify-gradients"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz"; - sha512 = "qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q=="; - }; - }; - "postcss-minify-params-4.0.2" = { - name = "postcss-minify-params"; - packageName = "postcss-minify-params"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz"; - sha512 = "G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg=="; - }; - }; - "postcss-minify-selectors-4.0.2" = { - name = "postcss-minify-selectors"; - packageName = "postcss-minify-selectors"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz"; - sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; - }; - }; - "postcss-modules-3.2.2" = { - name = "postcss-modules"; - packageName = "postcss-modules"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-3.2.2.tgz"; - sha512 = "JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw=="; - }; - }; - "postcss-modules-4.0.0" = { - name = "postcss-modules"; - packageName = "postcss-modules"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-4.0.0.tgz"; - sha512 = "ghS/ovDzDqARm4Zj6L2ntadjyQMoyJmi0JkLlYtH2QFLrvNlxH5OAVRPWPeKilB0pY7SbuhO173KOWkPAxRJcw=="; - }; - }; - "postcss-modules-extract-imports-1.1.0" = { - name = "postcss-modules-extract-imports"; - packageName = "postcss-modules-extract-imports"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz"; - sha1 = "b614c9720be6816eaee35fb3a5faa1dba6a05ddb"; - }; - }; - "postcss-modules-extract-imports-2.0.0" = { - name = "postcss-modules-extract-imports"; - packageName = "postcss-modules-extract-imports"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"; - 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"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz"; - sha1 = "f7d80c398c5a393fa7964466bd19500a7d61c069"; - }; - }; - "postcss-modules-local-by-default-3.0.3" = { - name = "postcss-modules-local-by-default"; - packageName = "postcss-modules-local-by-default"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"; - 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"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz"; - sha1 = "d6ea64994c79f97b62a72b426fbe6056a194bb90"; - }; - }; - "postcss-modules-scope-2.2.0" = { - name = "postcss-modules-scope"; - packageName = "postcss-modules-scope"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; - 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"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz"; - sha1 = "ecffa9d7e192518389f42ad0e83f72aec456ea20"; - }; - }; - "postcss-modules-values-3.0.0" = { - name = "postcss-modules-values"; - packageName = "postcss-modules-values"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; - 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-normalize-charset-4.0.1" = { - name = "postcss-normalize-charset"; - packageName = "postcss-normalize-charset"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz"; - sha512 = "gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g=="; - }; - }; - "postcss-normalize-display-values-4.0.2" = { - name = "postcss-normalize-display-values"; - packageName = "postcss-normalize-display-values"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz"; - sha512 = "3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ=="; - }; - }; - "postcss-normalize-positions-4.0.2" = { - name = "postcss-normalize-positions"; - packageName = "postcss-normalize-positions"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz"; - sha512 = "Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA=="; - }; - }; - "postcss-normalize-repeat-style-4.0.2" = { - name = "postcss-normalize-repeat-style"; - packageName = "postcss-normalize-repeat-style"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz"; - sha512 = "qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q=="; - }; - }; - "postcss-normalize-string-4.0.2" = { - name = "postcss-normalize-string"; - packageName = "postcss-normalize-string"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz"; - sha512 = "RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA=="; - }; - }; - "postcss-normalize-timing-functions-4.0.2" = { - name = "postcss-normalize-timing-functions"; - packageName = "postcss-normalize-timing-functions"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz"; - sha512 = "acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A=="; - }; - }; - "postcss-normalize-unicode-4.0.1" = { - name = "postcss-normalize-unicode"; - packageName = "postcss-normalize-unicode"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz"; - sha512 = "od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg=="; - }; - }; - "postcss-normalize-url-4.0.1" = { - name = "postcss-normalize-url"; - packageName = "postcss-normalize-url"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz"; - sha512 = "p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA=="; - }; - }; - "postcss-normalize-whitespace-4.0.2" = { - name = "postcss-normalize-whitespace"; - packageName = "postcss-normalize-whitespace"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz"; - sha512 = "tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA=="; - }; - }; - "postcss-ordered-values-4.1.2" = { - name = "postcss-ordered-values"; - packageName = "postcss-ordered-values"; - version = "4.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz"; - sha512 = "2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw=="; - }; - }; - "postcss-reduce-initial-4.0.3" = { - name = "postcss-reduce-initial"; - packageName = "postcss-reduce-initial"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz"; - sha512 = "gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA=="; - }; - }; - "postcss-reduce-transforms-4.0.2" = { - name = "postcss-reduce-transforms"; - packageName = "postcss-reduce-transforms"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz"; - sha512 = "EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg=="; - }; - }; - "postcss-selector-parser-3.1.2" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; - sha512 = "h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA=="; - }; - }; - "postcss-selector-parser-6.0.2" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; - }; - }; - "postcss-selector-parser-6.0.4" = { - name = "postcss-selector-parser"; - packageName = "postcss-selector-parser"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; - sha512 = "gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw=="; - }; - }; - "postcss-svgo-4.0.2" = { - name = "postcss-svgo"; - packageName = "postcss-svgo"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-4.0.2.tgz"; - sha512 = "C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw=="; - }; - }; - "postcss-unique-selectors-4.0.1" = { - name = "postcss-unique-selectors"; - packageName = "postcss-unique-selectors"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz"; - sha512 = "+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg=="; - }; - }; - "postcss-value-parser-3.3.1" = { - name = "postcss-value-parser"; - packageName = "postcss-value-parser"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz"; - sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; - }; - }; - "postcss-value-parser-4.1.0" = { - name = "postcss-value-parser"; - packageName = "postcss-value-parser"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; - sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; - }; - }; - "posthtml-0.13.4" = { - name = "posthtml"; - packageName = "posthtml"; - version = "0.13.4"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.13.4.tgz"; - sha512 = "i2oTo/+dwXGC6zaAQSF6WZEQSbEqu10hsvg01DWzGAfZmy31Iiy9ktPh9nnXDfZiYytjxTIvxoK4TI0uk4QWpw=="; - }; - }; - "posthtml-0.15.1" = { - name = "posthtml"; - packageName = "posthtml"; - version = "0.15.1"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.15.1.tgz"; - sha512 = "QSnUnvnnRv+wt7T9igqNG7GPcc+ZsbX93X+9aPldzgiuQfqIXTbnD47FY8pAtq4gjB9QZrDadDuG8jusmOPpYA=="; - }; - }; - "posthtml-parser-0.5.3" = { - name = "posthtml-parser"; - packageName = "posthtml-parser"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.5.3.tgz"; - sha512 = "uHosRn0y+1wbnlYKrqMjBPoo/kK5LPYImLtiETszNFYfFwAD3cQdD1R2E13Mh5icBxkHj+yKtlIHozCsmVWD/Q=="; - }; - }; - "posthtml-parser-0.6.0" = { - name = "posthtml-parser"; - packageName = "posthtml-parser"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.6.0.tgz"; - sha512 = "5ffwKQNgtVHdhZniWxu+1ryvaZv5l25HPLUV6W5xy5nYVWMXtvjtwRnbSpfbKFvbyl7XI+d4AqkjmonkREqnXA=="; - }; - }; - "posthtml-render-1.3.1" = { - name = "posthtml-render"; - packageName = "posthtml-render"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.3.1.tgz"; - sha512 = "eSToKjNLu0FiF76SSGMHjOFXYzAc/CJqi677Sq6hYvcvFCBtD6de/W5l+0IYPf7ypscqAfjCttxvTdMJt5Gj8Q=="; - }; - }; - "posthtml-render-1.4.0" = { - name = "posthtml-render"; - packageName = "posthtml-render"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.4.0.tgz"; - sha512 = "W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw=="; - }; - }; - "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"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; - }; - }; - "pretty-bytes-5.3.0" = { - name = "pretty-bytes"; - packageName = "pretty-bytes"; version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; - sha512 = "hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg=="; + url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz"; + sha512 = "WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg=="; }; }; - "process-0.11.10" = { - name = "process"; - packageName = "process"; - version = "0.11.10"; + "postcss-convert-values-5.1.0" = { + name = "postcss-convert-values"; + packageName = "postcss-convert-values"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; - sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz"; + sha512 = "GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g=="; + }; + }; + "postcss-discard-comments-5.1.1" = { + name = "postcss-discard-comments"; + packageName = "postcss-discard-comments"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz"; + sha512 = "5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ=="; + }; + }; + "postcss-discard-duplicates-5.1.0" = { + name = "postcss-discard-duplicates"; + packageName = "postcss-discard-duplicates"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"; + sha512 = "zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw=="; + }; + }; + "postcss-discard-empty-5.1.1" = { + name = "postcss-discard-empty"; + packageName = "postcss-discard-empty"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"; + sha512 = "zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A=="; + }; + }; + "postcss-discard-overridden-5.1.0" = { + name = "postcss-discard-overridden"; + packageName = "postcss-discard-overridden"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"; + sha512 = "21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw=="; + }; + }; + "postcss-merge-longhand-5.1.3" = { + name = "postcss-merge-longhand"; + packageName = "postcss-merge-longhand"; + version = "5.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.3.tgz"; + sha512 = "lX8GPGvZ0iGP/IboM7HXH5JwkXvXod1Rr8H8ixwiA372hArk0zP4ZcCy4z4Prg/bfNlbbTf0KCOjCF9kKnpP/w=="; + }; + }; + "postcss-merge-rules-5.1.1" = { + name = "postcss-merge-rules"; + packageName = "postcss-merge-rules"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz"; + sha512 = "8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww=="; + }; + }; + "postcss-minify-font-values-5.1.0" = { + name = "postcss-minify-font-values"; + packageName = "postcss-minify-font-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"; + sha512 = "el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA=="; + }; + }; + "postcss-minify-gradients-5.1.1" = { + name = "postcss-minify-gradients"; + packageName = "postcss-minify-gradients"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz"; + sha512 = "VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw=="; + }; + }; + "postcss-minify-params-5.1.2" = { + name = "postcss-minify-params"; + packageName = "postcss-minify-params"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz"; + sha512 = "aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g=="; + }; + }; + "postcss-minify-selectors-5.2.0" = { + name = "postcss-minify-selectors"; + packageName = "postcss-minify-selectors"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz"; + sha512 = "vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA=="; + }; + }; + "postcss-normalize-charset-5.1.0" = { + name = "postcss-normalize-charset"; + packageName = "postcss-normalize-charset"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"; + sha512 = "mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg=="; + }; + }; + "postcss-normalize-display-values-5.1.0" = { + name = "postcss-normalize-display-values"; + packageName = "postcss-normalize-display-values"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"; + sha512 = "WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA=="; + }; + }; + "postcss-normalize-positions-5.1.0" = { + name = "postcss-normalize-positions"; + packageName = "postcss-normalize-positions"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz"; + sha512 = "8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ=="; + }; + }; + "postcss-normalize-repeat-style-5.1.0" = { + name = "postcss-normalize-repeat-style"; + packageName = "postcss-normalize-repeat-style"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz"; + sha512 = "IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw=="; + }; + }; + "postcss-normalize-string-5.1.0" = { + name = "postcss-normalize-string"; + packageName = "postcss-normalize-string"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"; + sha512 = "oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w=="; + }; + }; + "postcss-normalize-timing-functions-5.1.0" = { + name = "postcss-normalize-timing-functions"; + packageName = "postcss-normalize-timing-functions"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"; + sha512 = "DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg=="; + }; + }; + "postcss-normalize-unicode-5.1.0" = { + name = "postcss-normalize-unicode"; + packageName = "postcss-normalize-unicode"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz"; + sha512 = "J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ=="; + }; + }; + "postcss-normalize-url-5.1.0" = { + name = "postcss-normalize-url"; + packageName = "postcss-normalize-url"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"; + sha512 = "5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew=="; + }; + }; + "postcss-normalize-whitespace-5.1.1" = { + name = "postcss-normalize-whitespace"; + packageName = "postcss-normalize-whitespace"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"; + sha512 = "83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA=="; + }; + }; + "postcss-ordered-values-5.1.1" = { + name = "postcss-ordered-values"; + packageName = "postcss-ordered-values"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz"; + sha512 = "7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw=="; + }; + }; + "postcss-reduce-initial-5.1.0" = { + name = "postcss-reduce-initial"; + packageName = "postcss-reduce-initial"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz"; + sha512 = "5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw=="; + }; + }; + "postcss-reduce-transforms-5.1.0" = { + name = "postcss-reduce-transforms"; + packageName = "postcss-reduce-transforms"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"; + sha512 = "2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ=="; + }; + }; + "postcss-selector-parser-6.0.9" = { + name = "postcss-selector-parser"; + packageName = "postcss-selector-parser"; + version = "6.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz"; + sha512 = "UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ=="; + }; + }; + "postcss-svgo-5.1.0" = { + name = "postcss-svgo"; + packageName = "postcss-svgo"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"; + sha512 = "D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA=="; + }; + }; + "postcss-unique-selectors-5.1.1" = { + name = "postcss-unique-selectors"; + packageName = "postcss-unique-selectors"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"; + sha512 = "5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA=="; + }; + }; + "postcss-value-parser-4.2.0" = { + name = "postcss-value-parser"; + packageName = "postcss-value-parser"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"; + sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="; + }; + }; + "posthtml-0.16.6" = { + name = "posthtml"; + packageName = "posthtml"; + version = "0.16.6"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.16.6.tgz"; + sha512 = "JcEmHlyLK/o0uGAlj65vgg+7LIms0xKXe60lcDOTU7oVX/3LuEuLwrQpW3VJ7de5TaFKiW4kWkaIpJL42FEgxQ=="; + }; + }; + "posthtml-parser-0.10.2" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.10.2.tgz"; + sha512 = "PId6zZ/2lyJi9LiKfe+i2xv57oEjJgWbsHGGANwos5AvdQp98i6AtamAl8gzSVFGfQ43Glb5D614cvZf012VKg=="; + }; + }; + "posthtml-parser-0.11.0" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.11.0.tgz"; + sha512 = "QecJtfLekJbWVo/dMAA+OSwY79wpRmbqS5TeXvXSX+f0c6pW4/SE6inzZ2qkU7oAMCPqIDkZDvd/bQsSFUnKyw=="; + }; + }; + "posthtml-render-3.0.0" = { + name = "posthtml-render"; + packageName = "posthtml-render"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-3.0.0.tgz"; + sha512 = "z+16RoxK3fUPgwaIgH9NGnK1HKY9XIDpydky5eQGgAFVXTCSezalv9U2jQuNV+Z9qV1fDWNzldcw4eK0SSbqKA=="; + }; + }; + "pretty-bytes-5.6.0" = { + name = "pretty-bytes"; + packageName = "pretty-bytes"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"; + sha512 = "FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg=="; }; }; "process-nextick-args-2.0.1" = { @@ -6601,15 +2938,6 @@ let sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; }; }; - "public-encrypt-4.0.3" = { - name = "public-encrypt"; - packageName = "public-encrypt"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz"; - sha512 = "zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q=="; - }; - }; "pump-3.0.0" = { name = "pump"; packageName = "pump"; @@ -6628,15 +2956,6 @@ let sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; }; }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; "punycode-2.1.1" = { name = "punycode"; packageName = "punycode"; @@ -6646,24 +2965,6 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "purgecss-2.3.0" = { - name = "purgecss"; - packageName = "purgecss"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/purgecss/-/purgecss-2.3.0.tgz"; - sha512 = "BE5CROfVGsx2XIhxGuZAT7rTH9lLeQx/6M0P7DTXQH4IUc3BBzs9JUzt4yzGf3JrH9enkeq6YJBe9CTtkm1WmQ=="; - }; - }; - "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"; - sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; - }; - }; "qs-6.5.2" = { name = "qs"; packageName = "qs"; @@ -6682,24 +2983,6 @@ let sha1 = "b209849203bb25df820da756e747005878521620"; }; }; - "querystring-es3-0.2.1" = { - name = "querystring-es3"; - packageName = "querystring-es3"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; - sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; - }; - }; - "queue-microtask-1.2.3" = { - name = "queue-microtask"; - packageName = "queue-microtask"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"; - sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; - }; - }; "ramda-0.26.1" = { name = "ramda"; packageName = "ramda"; @@ -6709,33 +2992,6 @@ let sha512 = "hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ=="; }; }; - "randombytes-2.1.0" = { - name = "randombytes"; - packageName = "randombytes"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"; - sha512 = "vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ=="; - }; - }; - "randomfill-1.0.4" = { - name = "randomfill"; - packageName = "randomfill"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz"; - sha512 = "87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw=="; - }; - }; - "range-parser-1.2.0" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"; - sha1 = "f49be6b487894ddc40dcc94a322f611092e00d5e"; - }; - }; "react-refresh-0.9.0" = { name = "react-refresh"; packageName = "react-refresh"; @@ -6754,121 +3010,13 @@ let sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; }; }; - "readable-stream-3.6.0" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; - }; - }; - "regenerate-1.4.2" = { - name = "regenerate"; - packageName = "regenerate"; - version = "1.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; - sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; - }; - }; - "regenerate-unicode-properties-8.2.0" = { - name = "regenerate-unicode-properties"; - packageName = "regenerate-unicode-properties"; - version = "8.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"; - sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; - }; - }; - "regenerator-runtime-0.13.7" = { + "regenerator-runtime-0.13.9" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; - version = "0.13.7"; + version = "0.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; - sha512 = "a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="; - }; - }; - "regenerator-transform-0.14.5" = { - name = "regenerator-transform"; - packageName = "regenerator-transform"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; - sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; - }; - }; - "regex-not-1.0.2" = { - name = "regex-not"; - packageName = "regex-not"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"; - sha512 = "J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A=="; - }; - }; - "regexpu-core-4.7.1" = { - name = "regexpu-core"; - packageName = "regexpu-core"; - version = "4.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz"; - sha512 = "ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ=="; - }; - }; - "regjsgen-0.5.2" = { - name = "regjsgen"; - packageName = "regjsgen"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.2.tgz"; - sha512 = "OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A=="; - }; - }; - "regjsparser-0.6.9" = { - name = "regjsparser"; - packageName = "regjsparser"; - version = "0.6.9"; - src = fetchurl { - url = "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz"; - sha512 = "ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ=="; - }; - }; - "relateurl-0.2.7" = { - name = "relateurl"; - packageName = "relateurl"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; - sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; - }; - }; - "repeat-element-1.1.3" = { - name = "repeat-element"; - packageName = "repeat-element"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz"; - sha512 = "ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g=="; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; - "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=="; + url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"; + sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; "request-progress-3.0.0" = { @@ -6880,58 +3028,13 @@ let sha1 = "4ca754081c7fec63f505e4faa825aa06cd669dbe"; }; }; - "request-promise-core-1.1.4" = { - name = "request-promise-core"; - packageName = "request-promise-core"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz"; - sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw=="; - }; - }; - "request-promise-native-1.0.9" = { - name = "request-promise-native"; - packageName = "request-promise-native"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz"; - sha512 = "wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g=="; - }; - }; - "requires-port-1.0.0" = { - name = "requires-port"; - packageName = "requires-port"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; - }; - }; - "resolve-1.20.0" = { - name = "resolve"; - packageName = "resolve"; - version = "1.20.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; - }; - }; - "resolve-from-3.0.0" = { + "resolve-from-4.0.0" = { name = "resolve-from"; packageName = "resolve-from"; - version = "3.0.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; - }; - }; - "resolve-url-0.2.1" = { - name = "resolve-url"; - packageName = "resolve-url"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; - sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"; + sha512 = "pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="; }; }; "restore-cursor-1.0.1" = { @@ -6952,51 +3055,6 @@ let sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; }; }; - "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=="; - }; - }; - "ret-0.1.15" = { - name = "ret"; - packageName = "ret"; - version = "0.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"; - sha512 = "TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg=="; - }; - }; - "reusify-1.0.4" = { - name = "reusify"; - packageName = "reusify"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"; - sha512 = "U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw=="; - }; - }; - "rgb-regex-1.0.1" = { - name = "rgb-regex"; - packageName = "rgb-regex"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz"; - sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; - }; - }; - "rgba-regex-1.0.0" = { - name = "rgba-regex"; - packageName = "rgba-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz"; - sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; - }; - }; "rimraf-2.7.1" = { name = "rimraf"; packageName = "rimraf"; @@ -7006,40 +3064,13 @@ let sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; - "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=="; - }; - }; - "ripemd160-2.0.2" = { - name = "ripemd160"; - packageName = "ripemd160"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz"; - sha512 = "ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA=="; - }; - }; - "run-parallel-1.2.0" = { - name = "run-parallel"; - packageName = "run-parallel"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"; - sha512 = "5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA=="; - }; - }; - "rxjs-6.6.2" = { + "rxjs-6.6.7" = { name = "rxjs"; packageName = "rxjs"; - version = "6.6.2"; + version = "6.6.7"; src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz"; - sha512 = "BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg=="; + url = "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"; + sha512 = "hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ=="; }; }; "safe-buffer-5.1.2" = { @@ -7051,24 +3082,6 @@ let sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; }; }; - "safe-buffer-5.2.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"; - sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; - }; - }; - "safe-regex-1.1.0" = { - name = "safe-regex"; - packageName = "safe-regex"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; - sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; - }; - }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -7078,24 +3091,6 @@ let sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; }; }; - "sax-1.2.4" = { - name = "sax"; - packageName = "sax"; - version = "1.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"; - sha512 = "NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="; - }; - }; - "saxes-3.1.11" = { - name = "saxes"; - packageName = "saxes"; - version = "3.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz"; - sha512 = "Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g=="; - }; - }; "semver-5.7.1" = { name = "semver"; packageName = "semver"; @@ -7105,60 +3100,6 @@ let sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; }; }; - "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.0.0" = { - name = "semver"; - packageName = "semver"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"; - sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; - }; - }; - "serve-handler-6.1.3" = { - name = "serve-handler"; - packageName = "serve-handler"; - version = "6.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz"; - sha512 = "FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w=="; - }; - }; - "set-value-2.0.1" = { - name = "set-value"; - packageName = "set-value"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"; - sha512 = "JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw=="; - }; - }; - "setimmediate-1.0.5" = { - name = "setimmediate"; - packageName = "setimmediate"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; - }; - }; - "sha.js-2.4.11" = { - name = "sha.js"; - packageName = "sha.js"; - version = "2.4.11"; - src = fetchurl { - url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz"; - sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ=="; - }; - }; "shebang-command-1.2.0" = { name = "shebang-command"; packageName = "shebang-command"; @@ -7186,15 +3127,6 @@ let sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; }; }; - "simple-swizzle-0.2.2" = { - name = "simple-swizzle"; - packageName = "simple-swizzle"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; - }; - }; "slice-ansi-0.0.4" = { name = "slice-ansi"; packageName = "slice-ansi"; @@ -7204,51 +3136,6 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "slice-ansi-4.0.0" = { - name = "slice-ansi"; - packageName = "slice-ansi"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"; - sha512 = "qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ=="; - }; - }; - "snapdragon-0.8.2" = { - name = "snapdragon"; - packageName = "snapdragon"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"; - sha512 = "FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg=="; - }; - }; - "snapdragon-node-2.1.1" = { - name = "snapdragon-node"; - packageName = "snapdragon-node"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"; - sha512 = "O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw=="; - }; - }; - "snapdragon-util-3.0.1" = { - name = "snapdragon-util"; - packageName = "snapdragon-util"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"; - sha512 = "mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ=="; - }; - }; - "source-map-0.5.7" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; - }; - }; "source-map-0.6.1" = { name = "source-map"; packageName = "source-map"; @@ -7267,31 +3154,22 @@ let sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; - "source-map-resolve-0.5.3" = { - name = "source-map-resolve"; - packageName = "source-map-resolve"; - version = "0.5.3"; + "source-map-js-1.0.2" = { + name = "source-map-js"; + packageName = "source-map-js"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; - sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; + url = "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"; + sha512 = "R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="; }; }; - "source-map-support-0.5.19" = { + "source-map-support-0.5.21" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.19"; + version = "0.5.21"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; - sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; - }; - }; - "source-map-url-0.4.1" = { - name = "source-map-url"; - packageName = "source-map-url"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"; - sha512 = "cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"; + sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w=="; }; }; "sourcemap-codec-1.4.8" = { @@ -7303,42 +3181,6 @@ let sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; }; }; - "split-string-3.1.0" = { - name = "split-string"; - packageName = "split-string"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"; - sha512 = "NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw=="; - }; - }; - "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=="; - }; - }; - "sprintf-js-1.0.3" = { - name = "sprintf-js"; - packageName = "sprintf-js"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; - }; - }; - "srcset-3.0.0" = { - name = "srcset"; - packageName = "srcset"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/srcset/-/srcset-3.0.0.tgz"; - sha512 = "D59vF08Qzu/C4GAOXVgMTLfgryt5fyWo93FZyhEWANo0PokFz/iWdDe13mX3O5TRf6l8vMTqckAfR4zPiaH0yQ=="; - }; - }; "sshpk-1.16.1" = { name = "sshpk"; packageName = "sshpk"; @@ -7357,51 +3199,6 @@ let sha512 = "ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w=="; }; }; - "static-extend-0.1.2" = { - name = "static-extend"; - packageName = "static-extend"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; - sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; - }; - }; - "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"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; - }; - }; - "stealthy-require-1.1.1" = { - name = "stealthy-require"; - packageName = "stealthy-require"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; - }; - }; - "stream-http-3.1.1" = { - name = "stream-http"; - packageName = "stream-http"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-3.1.1.tgz"; - sha512 = "S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg=="; - }; - }; - "string-hash-1.1.3" = { - name = "string-hash"; - packageName = "string-hash"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz"; - sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b"; - }; - }; "string-width-1.0.2" = { name = "string-width"; packageName = "string-width"; @@ -7420,33 +3217,6 @@ let sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw=="; }; }; - "string-width-4.2.2" = { - name = "string-width"; - packageName = "string-width"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz"; - sha512 = "XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA=="; - }; - }; - "string.prototype.trimend-1.0.4" = { - name = "string.prototype.trimend"; - packageName = "string.prototype.trimend"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz"; - sha512 = "y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A=="; - }; - }; - "string.prototype.trimstart-1.0.4" = { - name = "string.prototype.trimstart"; - packageName = "string.prototype.trimstart"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz"; - sha512 = "jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw=="; - }; - }; "string_decoder-1.1.1" = { name = "string_decoder"; packageName = "string_decoder"; @@ -7456,15 +3226,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=="; - }; - }; "strip-ansi-3.0.1" = { name = "strip-ansi"; packageName = "strip-ansi"; @@ -7483,15 +3244,6 @@ let sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; }; - "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-eof-1.0.0" = { name = "strip-eof"; packageName = "strip-eof"; @@ -7501,13 +3253,13 @@ let sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; }; }; - "stylehacks-4.0.3" = { + "stylehacks-5.1.0" = { name = "stylehacks"; packageName = "stylehacks"; - version = "4.0.3"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz"; - sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; + url = "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz"; + sha512 = "SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q=="; }; }; "supports-color-2.0.0" = { @@ -7519,15 +3271,6 @@ let sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; }; }; - "supports-color-3.2.3" = { - name = "supports-color"; - packageName = "supports-color"; - version = "3.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz"; - sha1 = "65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"; - }; - }; "supports-color-5.5.0" = { name = "supports-color"; packageName = "supports-color"; @@ -7537,24 +3280,6 @@ let sha512 = "QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow=="; }; }; - "supports-color-6.1.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz"; - sha512 = "qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ=="; - }; - }; - "supports-color-7.1.0" = { - name = "supports-color"; - packageName = "supports-color"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz"; - sha512 = "oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g=="; - }; - }; "supports-color-7.2.0" = { name = "supports-color"; packageName = "supports-color"; @@ -7564,13 +3289,13 @@ let sha512 = "qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="; }; }; - "svgo-1.3.2" = { + "svgo-2.8.0" = { name = "svgo"; packageName = "svgo"; - version = "1.3.2"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz"; - sha512 = "yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw=="; + url = "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"; + sha512 = "+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg=="; }; }; "symbol-observable-1.2.0" = { @@ -7582,40 +3307,13 @@ let sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="; }; }; - "symbol-tree-3.2.4" = { - name = "symbol-tree"; - packageName = "symbol-tree"; - version = "3.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"; - sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; - }; - }; - "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=="; - }; - }; - "terser-4.8.0" = { + "terser-5.12.1" = { name = "terser"; packageName = "terser"; - version = "4.8.0"; + version = "5.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz"; - sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; - }; - }; - "terser-5.6.1" = { - name = "terser"; - packageName = "terser"; - version = "5.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz"; - sha512 = "yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw=="; + url = "https://registry.npmjs.org/terser/-/terser-5.12.1.tgz"; + sha512 = "NXbs+7nisos5E+yXwAD+y7zrcTkMqb0dEJxIGtSKPdCBzopf7ni4odPul2aechpV7EXNvOudYOX2bb5tln1jbQ=="; }; }; "throttleit-1.0.0" = { @@ -7627,15 +3325,6 @@ let sha1 = "9e785836daf46743145a5984b6268d828528ac6c"; }; }; - "timers-browserify-2.0.12" = { - name = "timers-browserify"; - packageName = "timers-browserify"; - version = "2.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz"; - sha512 = "9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ=="; - }; - }; "timsort-0.3.0" = { name = "timsort"; packageName = "timsort"; @@ -7654,51 +3343,6 @@ let sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; }; }; - "to-fast-properties-2.0.0" = { - name = "to-fast-properties"; - packageName = "to-fast-properties"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; - }; - }; - "to-object-path-0.3.0" = { - name = "to-object-path"; - packageName = "to-object-path"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; - sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; - }; - }; - "to-regex-3.0.2" = { - name = "to-regex"; - packageName = "to-regex"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"; - sha512 = "FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw=="; - }; - }; - "to-regex-range-2.1.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; - }; - }; - "to-regex-range-5.0.1" = { - name = "to-regex-range"; - packageName = "to-regex-range"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; - sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; - }; - }; "tough-cookie-2.5.0" = { name = "tough-cookie"; packageName = "tough-cookie"; @@ -7708,15 +3352,6 @@ let sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; - "tr46-1.0.1" = { - name = "tr46"; - packageName = "tr46"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; - sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; - }; - }; "tslib-1.13.0" = { name = "tslib"; packageName = "tslib"; @@ -7726,15 +3361,6 @@ let sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; }; - "tty-browserify-0.0.1" = { - name = "tty-browserify"; - packageName = "tty-browserify"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz"; - sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="; - }; - }; "tunnel-agent-0.6.0" = { name = "tunnel-agent"; packageName = "tunnel-agent"; @@ -7753,15 +3379,6 @@ let sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; }; - "type-check-0.3.2" = { - name = "type-check"; - packageName = "type-check"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; - }; - }; "type-fest-0.20.2" = { name = "type-fest"; packageName = "type-fest"; @@ -7780,87 +3397,6 @@ let sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; }; }; - "unbox-primitive-1.0.1" = { - name = "unbox-primitive"; - packageName = "unbox-primitive"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"; - sha512 = "tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw=="; - }; - }; - "uncss-0.17.3" = { - name = "uncss"; - packageName = "uncss"; - version = "0.17.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uncss/-/uncss-0.17.3.tgz"; - sha512 = "ksdDWl81YWvF/X14fOSw4iu8tESDHFIeyKIeDrK6GEVTQvqJc1WlOEXqostNwOCi3qAj++4EaLsdAgPmUbEyog=="; - }; - }; - "unicode-canonical-property-names-ecmascript-1.0.4" = { - name = "unicode-canonical-property-names-ecmascript"; - packageName = "unicode-canonical-property-names-ecmascript"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz"; - sha512 = "jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="; - }; - }; - "unicode-match-property-ecmascript-1.0.4" = { - name = "unicode-match-property-ecmascript"; - packageName = "unicode-match-property-ecmascript"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz"; - sha512 = "L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg=="; - }; - }; - "unicode-match-property-value-ecmascript-1.2.0" = { - name = "unicode-match-property-value-ecmascript"; - packageName = "unicode-match-property-value-ecmascript"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz"; - sha512 = "wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ=="; - }; - }; - "unicode-property-aliases-ecmascript-1.1.0" = { - name = "unicode-property-aliases-ecmascript"; - packageName = "unicode-property-aliases-ecmascript"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz"; - sha512 = "PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg=="; - }; - }; - "union-value-1.0.1" = { - name = "union-value"; - packageName = "union-value"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"; - sha512 = "tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg=="; - }; - }; - "uniq-1.0.1" = { - name = "uniq"; - packageName = "uniq"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; - sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; - }; - }; - "uniqs-2.0.0" = { - name = "uniqs"; - packageName = "uniqs"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"; - sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; - }; - }; "universalify-0.1.2" = { name = "universalify"; packageName = "universalify"; @@ -7870,33 +3406,6 @@ let sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="; }; }; - "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"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - }; - "unquote-1.1.1" = { - name = "unquote"; - packageName = "unquote"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz"; - sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; - }; - }; - "unset-value-1.0.0" = { - name = "unset-value"; - packageName = "unset-value"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; - sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; - }; - }; "untildify-4.0.0" = { name = "untildify"; packageName = "untildify"; @@ -7906,24 +3415,6 @@ let sha512 = "KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw=="; }; }; - "uri-js-4.2.2" = { - name = "uri-js"; - packageName = "uri-js"; - version = "4.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz"; - sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ=="; - }; - }; - "urix-0.1.0" = { - name = "urix"; - packageName = "urix"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; - sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; - }; - }; "url-0.11.0" = { name = "url"; packageName = "url"; @@ -7933,24 +3424,6 @@ let sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; }; }; - "use-3.1.1" = { - name = "use"; - packageName = "use"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/use/-/use-3.1.1.tgz"; - sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; - }; - }; - "util-0.12.3" = { - name = "util"; - packageName = "util"; - version = "0.12.3"; - src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.12.3.tgz"; - sha512 = "I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog=="; - }; - }; "util-deprecate-1.0.2" = { name = "util-deprecate"; packageName = "util-deprecate"; @@ -7960,31 +3433,22 @@ let sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; }; - "util.promisify-1.0.1" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.0.1"; + "utility-types-3.10.0" = { + name = "utility-types"; + packageName = "utility-types"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz"; - sha512 = "g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA=="; + url = "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz"; + sha512 = "O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg=="; }; }; - "utils-merge-1.0.1" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; - }; - }; - "uuid-3.4.0" = { + "uuid-8.3.2" = { name = "uuid"; packageName = "uuid"; - version = "3.4.0"; + version = "8.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"; - sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; }; }; "v8-compile-cache-2.3.0" = { @@ -7996,15 +3460,6 @@ let sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; }; - "vendors-1.0.4" = { - name = "vendors"; - packageName = "vendors"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz"; - sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; - }; - }; "verror-1.10.0" = { name = "verror"; packageName = "verror"; @@ -8014,103 +3469,40 @@ let sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; }; }; - "vm-browserify-1.1.2" = { - name = "vm-browserify"; - packageName = "vm-browserify"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz"; - sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ=="; - }; - }; - "vue-3.0.9" = { + "vue-3.2.31" = { name = "vue"; packageName = "vue"; - version = "3.0.9"; + version = "3.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.9.tgz"; - sha512 = "MOvqDpvDslMWJo5kyGW1nTsTIPAuSzgVqmlzSQInIEqkHOu16pNbXuTjnG7jc/yIvQYFSQZqv6Pvad0iO5QkyQ=="; + url = "https://registry.npmjs.org/vue/-/vue-3.2.31.tgz"; + sha512 = "odT3W2tcffTiQCy57nOT93INw1auq5lYLLYtWpPYQQYQOOdHiqFct9Xhna6GJ+pJQaF67yZABraH47oywkJgFw=="; }; }; - "vue-router-4.0.5" = { + "vue-router-4.0.14" = { name = "vue-router"; packageName = "vue-router"; - version = "4.0.5"; + version = "4.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/vue-router/-/vue-router-4.0.5.tgz"; - sha512 = "AQq+pllb6FCc7rS6vh4PPcce3XA1jgK3hKNkQ4hXHwoVN7jOeAOMKCnX7XAX3etV9rmN7iNW8iIwgPk95ckBjw=="; + url = "https://registry.npmjs.org/vue-router/-/vue-router-4.0.14.tgz"; + sha512 = "wAO6zF9zxA3u+7AkMPqw9LjoUCjSxfFvINQj3E/DceTt6uEz1XZLraDhdg2EYmvVwTBSGlLYsUw8bDmx0754Mw=="; }; }; - "vuex-4.0.0" = { + "vuex-4.0.2" = { name = "vuex"; packageName = "vuex"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vuex/-/vuex-4.0.0.tgz"; - sha512 = "56VPujlHscP5q/e7Jlpqc40sja4vOhC4uJD1llBCWolVI8ND4+VzisDVkUMl+z5y0MpIImW6HjhNc+ZvuizgOw=="; - }; - }; - "w3c-hr-time-1.0.2" = { - name = "w3c-hr-time"; - packageName = "w3c-hr-time"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"; - sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ=="; - }; - }; - "w3c-xmlserializer-1.1.2" = { - name = "w3c-xmlserializer"; - packageName = "w3c-xmlserializer"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz"; - sha512 = "p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg=="; - }; - }; - "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"; version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; + url = "https://registry.npmjs.org/vuex/-/vuex-4.0.2.tgz"; + sha512 = "M6r8uxELjZIK8kTKDGgZTYX/ahzblnzC4isU1tpmEuOIIKmV+TRdc+H4s8ds2NuZ7wpUTdGRzJRtoj+lI+pc0Q=="; }; }; - "whatwg-encoding-1.0.5" = { - name = "whatwg-encoding"; - packageName = "whatwg-encoding"; - version = "1.0.5"; + "weak-lru-cache-1.2.2" = { + name = "weak-lru-cache"; + packageName = "weak-lru-cache"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"; - sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw=="; - }; - }; - "whatwg-mimetype-2.3.0" = { - name = "whatwg-mimetype"; - packageName = "whatwg-mimetype"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"; - sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g=="; - }; - }; - "whatwg-url-7.1.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz"; - sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; + url = "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz"; + sha512 = "DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw=="; }; }; "which-1.3.1" = { @@ -8122,33 +3514,6 @@ let sha512 = "HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ=="; }; }; - "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=="; - }; - }; - "which-typed-array-1.1.4" = { - name = "which-typed-array"; - packageName = "which-typed-array"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.4.tgz"; - sha512 = "49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA=="; - }; - }; - "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=="; - }; - }; "wrap-ansi-3.0.1" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -8167,67 +3532,22 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-6.2.1" = { - name = "ws"; - packageName = "ws"; - version = "6.2.1"; + "xxhash-wasm-0.4.2" = { + name = "xxhash-wasm"; + packageName = "xxhash-wasm"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz"; - sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; + url = "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-0.4.2.tgz"; + sha512 = "/eyHVRJQCirEkSZ1agRSCwriMhwlyUcFkXD5TPVSLP+IPzjsqMVzZwdoczLp1SoQU0R3dxz1RpIK+4YNQbCVOA=="; }; }; - "ws-7.4.4" = { - name = "ws"; - packageName = "ws"; - version = "7.4.4"; + "yaml-1.10.2" = { + name = "yaml"; + packageName = "yaml"; + version = "1.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.4.tgz"; - sha512 = "Qm8k8ojNQIMx7S+Zp8u/uHOx7Qazv3Yv4q68MiWWWOJhiwG5W3x7iqmRtJo8xxrciZUY4vRxUTJCKuRnF28ZZw=="; - }; - }; - "xml-name-validator-3.0.0" = { - name = "xml-name-validator"; - packageName = "xml-name-validator"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"; - sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw=="; - }; - }; - "xmlchars-2.2.0" = { - name = "xmlchars"; - packageName = "xmlchars"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"; - sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="; - }; - }; - "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=="; - }; - }; - "yallist-3.1.1" = { - name = "yallist"; - packageName = "yallist"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"; - sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="; - }; - }; - "yallist-4.0.0" = { - name = "yallist"; - packageName = "yallist"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"; - sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="; + url = "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"; + sha512 = "r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="; }; }; "yauzl-2.10.0" = { @@ -8244,134 +3564,15 @@ let name = "polaris-web"; packageName = "polaris-web"; version = "1.0.0"; - src = ../../../../../../../nix/store/ixk8b6nml2l25i729k7a7gx5hjgndwwi-source; + src = ../../../../../../../../../nix/store/jmc09cn278v9s9s503ani8jn55gqwfx7-source; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/compat-data-7.13.12" - (sources."@babel/core-7.13.14" // { + sources."@babel/code-frame-7.16.7" + (sources."@babel/highlight-7.16.10" // { dependencies = [ - sources."json5-2.2.0" - sources."semver-6.3.0" - sources."source-map-0.5.7" + sources."@babel/helper-validator-identifier-7.16.7" ]; }) - (sources."@babel/generator-7.13.9" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - sources."@babel/helper-annotate-as-pure-7.12.13" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.13.13" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-create-class-features-plugin-7.13.11" - sources."@babel/helper-create-regexp-features-plugin-7.12.17" - (sources."@babel/helper-define-polyfill-provider-0.1.5" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-explode-assignable-expression-7.13.0" - sources."@babel/helper-function-name-7.12.13" - sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.0" - sources."@babel/helper-member-expression-to-functions-7.13.12" - sources."@babel/helper-module-imports-7.13.12" - sources."@babel/helper-module-transforms-7.13.14" - sources."@babel/helper-optimise-call-expression-7.12.13" - sources."@babel/helper-plugin-utils-7.13.0" - sources."@babel/helper-remap-async-to-generator-7.13.0" - sources."@babel/helper-replace-supers-7.13.12" - sources."@babel/helper-simple-access-7.13.12" - sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" - sources."@babel/helper-split-export-declaration-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.10" - sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.13" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-async-generator-functions-7.13.8" - sources."@babel/plugin-proposal-class-properties-7.13.0" - sources."@babel/plugin-proposal-dynamic-import-7.13.8" - sources."@babel/plugin-proposal-export-namespace-from-7.12.13" - sources."@babel/plugin-proposal-json-strings-7.13.8" - sources."@babel/plugin-proposal-logical-assignment-operators-7.13.8" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.13.8" - sources."@babel/plugin-proposal-numeric-separator-7.12.13" - sources."@babel/plugin-proposal-object-rest-spread-7.13.8" - sources."@babel/plugin-proposal-optional-catch-binding-7.13.8" - sources."@babel/plugin-proposal-optional-chaining-7.13.12" - sources."@babel/plugin-proposal-private-methods-7.13.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.12.13" - sources."@babel/plugin-syntax-async-generators-7.8.4" - sources."@babel/plugin-syntax-class-properties-7.12.13" - 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.12.13" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-jsx-7.12.13" - 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-top-level-await-7.12.13" - sources."@babel/plugin-syntax-typescript-7.12.13" - sources."@babel/plugin-transform-arrow-functions-7.13.0" - sources."@babel/plugin-transform-async-to-generator-7.13.0" - sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.12.13" - sources."@babel/plugin-transform-classes-7.13.0" - sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.0" - sources."@babel/plugin-transform-dotall-regex-7.12.13" - sources."@babel/plugin-transform-duplicate-keys-7.12.13" - sources."@babel/plugin-transform-exponentiation-operator-7.12.13" - sources."@babel/plugin-transform-flow-strip-types-7.13.0" - sources."@babel/plugin-transform-for-of-7.13.0" - sources."@babel/plugin-transform-function-name-7.12.13" - sources."@babel/plugin-transform-literals-7.12.13" - sources."@babel/plugin-transform-member-expression-literals-7.12.13" - sources."@babel/plugin-transform-modules-amd-7.13.0" - sources."@babel/plugin-transform-modules-commonjs-7.13.8" - sources."@babel/plugin-transform-modules-systemjs-7.13.8" - sources."@babel/plugin-transform-modules-umd-7.13.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.12.13" - sources."@babel/plugin-transform-new-target-7.12.13" - sources."@babel/plugin-transform-object-super-7.12.13" - sources."@babel/plugin-transform-parameters-7.13.0" - sources."@babel/plugin-transform-property-literals-7.12.13" - sources."@babel/plugin-transform-react-display-name-7.12.13" - sources."@babel/plugin-transform-react-jsx-7.13.12" - sources."@babel/plugin-transform-react-jsx-development-7.12.17" - sources."@babel/plugin-transform-react-pure-annotations-7.12.1" - sources."@babel/plugin-transform-regenerator-7.12.13" - sources."@babel/plugin-transform-reserved-words-7.12.13" - sources."@babel/plugin-transform-shorthand-properties-7.12.13" - sources."@babel/plugin-transform-spread-7.13.0" - sources."@babel/plugin-transform-sticky-regex-7.12.13" - sources."@babel/plugin-transform-template-literals-7.13.0" - sources."@babel/plugin-transform-typeof-symbol-7.12.13" - sources."@babel/plugin-transform-typescript-7.13.0" - sources."@babel/plugin-transform-unicode-escapes-7.12.13" - sources."@babel/plugin-transform-unicode-regex-7.12.13" - (sources."@babel/preset-env-7.13.12" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/preset-modules-0.1.4" - sources."@babel/preset-react-7.13.13" - sources."@babel/runtime-7.13.10" - sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.13" - sources."@babel/types-7.13.14" + sources."@babel/parser-7.17.8" (sources."@cypress/listr-verbose-renderer-0.4.1" // { dependencies = [ sources."ansi-styles-2.2.1" @@ -8379,322 +3580,366 @@ let sources."supports-color-2.0.0" ]; }) - (sources."@cypress/request-2.88.5" // { + (sources."@cypress/request-2.88.10" // { dependencies = [ - sources."tough-cookie-2.5.0" + sources."http-signature-1.3.6" + sources."json-schema-0.4.0" + sources."jsprim-2.0.2" + sources."uuid-8.3.2" ]; }) (sources."@cypress/xvfb-1.2.4" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-3.2.7" ]; }) - sources."@iarna/toml-2.2.5" - sources."@nodelib/fs.scandir-2.1.4" - sources."@nodelib/fs.stat-2.0.4" - sources."@nodelib/fs.walk-1.2.6" - sources."@parcel/babel-ast-utils-2.0.0-beta.2" - sources."@parcel/babel-preset-env-2.0.0-beta.2" - sources."@parcel/babylon-walk-2.0.0-beta.2" - sources."@parcel/bundler-default-2.0.0-beta.2" - sources."@parcel/cache-2.0.0-beta.2" - (sources."@parcel/codeframe-2.0.0-beta.2" // { + (sources."@parcel/bundler-default-2.3.2" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."is-fullwidth-code-point-3.0.0" - sources."slice-ansi-4.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" ]; }) - sources."@parcel/config-default-2.0.0-beta.2" - sources."@parcel/core-2.0.0-beta.2" - sources."@parcel/diagnostic-2.0.0-beta.2" - sources."@parcel/events-2.0.0-beta.2" - (sources."@parcel/fs-2.0.0-beta.2" // { - dependencies = [ - sources."graceful-fs-4.2.6" - sources."rimraf-3.0.2" - ]; - }) - sources."@parcel/fs-search-2.0.0-beta.2" - sources."@parcel/fs-write-stream-atomic-2.0.0-beta.2" - sources."@parcel/logger-2.0.0-beta.2" - (sources."@parcel/markdown-ansi-2.0.0-beta.2" // { + sources."@parcel/cache-2.3.2" + (sources."@parcel/codeframe-2.3.2" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" ]; }) - sources."@parcel/namer-default-2.0.0-beta.2" - (sources."@parcel/node-libs-browser-2.0.0-beta.2" // { + (sources."@parcel/compressor-raw-2.3.2" // { dependencies = [ - sources."punycode-1.4.1" - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - sources."string_decoder-1.3.0" + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" ]; }) - (sources."@parcel/node-resolver-core-2.0.0-beta.2" // { + sources."@parcel/config-default-2.3.2" + (sources."@parcel/core-2.3.2" // { dependencies = [ - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."micromatch-3.1.10" - sources."to-regex-range-2.1.1" + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" ]; }) - sources."@parcel/optimizer-cssnano-2.0.0-beta.2" - sources."@parcel/optimizer-htmlnano-2.0.0-beta.2" - (sources."@parcel/optimizer-terser-2.0.0-beta.2" // { + sources."@parcel/diagnostic-2.3.2" + sources."@parcel/events-2.3.2" + (sources."@parcel/fs-2.3.2" // { dependencies = [ - sources."commander-2.20.3" - sources."source-map-0.7.3" - sources."terser-5.6.1" + sources."@parcel/types-2.3.2" + ]; + }) + sources."@parcel/fs-search-2.3.2" + sources."@parcel/graph-2.3.2" + sources."@parcel/hash-2.3.2" + sources."@parcel/logger-2.3.2" + (sources."@parcel/markdown-ansi-2.3.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."@parcel/namer-default-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + sources."@parcel/node-resolver-core-2.3.2" + (sources."@parcel/optimizer-cssnano-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + sources."nanoid-3.3.1" + sources."postcss-8.4.12" + ]; + }) + (sources."@parcel/optimizer-htmlnano-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/optimizer-image-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/optimizer-svgo-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/optimizer-terser-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/package-manager-2.3.2" // { + dependencies = [ + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/packager-css-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/packager-html-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/packager-js-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/packager-raw-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/packager-svg-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" ]; }) - sources."@parcel/package-manager-2.0.0-beta.2" - sources."@parcel/packager-css-2.0.0-beta.2" - sources."@parcel/packager-html-2.0.0-beta.2" - sources."@parcel/packager-js-2.0.0-beta.2" - sources."@parcel/packager-raw-2.0.0-beta.2" sources."@parcel/plugin-2.0.0-beta.2" - (sources."@parcel/reporter-cli-2.0.0-beta.2" // { + (sources."@parcel/reporter-cli-2.3.2" // { dependencies = [ - sources."ansi-regex-5.0.0" + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.2" - sources."strip-ansi-6.0.0" ]; }) - (sources."@parcel/reporter-dev-server-2.0.0-beta.2" // { + (sources."@parcel/reporter-dev-server-2.3.2" // { dependencies = [ - sources."ws-7.4.4" + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" ]; }) - sources."@parcel/resolver-default-2.0.0-beta.2" - sources."@parcel/runtime-browser-hmr-2.0.0-beta.2" - sources."@parcel/runtime-js-2.0.0-beta.2" - sources."@parcel/runtime-react-refresh-2.0.0-beta.2" - (sources."@parcel/scope-hoisting-2.0.0-beta.2" // { + (sources."@parcel/resolver-default-2.3.2" // { dependencies = [ - sources."globals-13.7.0" + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" ]; }) - sources."@parcel/source-map-2.0.0-alpha.4.21" - sources."@parcel/transformer-babel-2.0.0-beta.2" - sources."@parcel/transformer-css-2.0.0-beta.2" - (sources."@parcel/transformer-html-2.0.0-beta.2" // { + (sources."@parcel/runtime-browser-hmr-2.3.2" // { dependencies = [ - (sources."dom-serializer-1.2.0" // { - dependencies = [ - sources."domhandler-4.0.0" - ]; - }) - sources."domelementtype-2.1.0" - sources."domhandler-3.3.0" - (sources."domutils-2.5.0" // { - dependencies = [ - sources."domhandler-4.0.0" - ]; - }) - sources."htmlparser2-5.0.1" - sources."posthtml-parser-0.6.0" - sources."posthtml-render-1.4.0" + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" ]; }) - sources."@parcel/transformer-js-2.0.0-beta.2" - (sources."@parcel/transformer-json-2.0.0-beta.2" // { + (sources."@parcel/runtime-js-2.3.2" // { dependencies = [ - sources."json5-2.2.0" + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" ]; }) - sources."@parcel/transformer-postcss-2.0.0-beta.2" - (sources."@parcel/transformer-posthtml-2.0.0-beta.2" // { + (sources."@parcel/runtime-react-refresh-2.3.2" // { dependencies = [ - (sources."dom-serializer-1.2.0" // { - dependencies = [ - sources."domhandler-4.0.0" - ]; - }) - sources."domelementtype-2.1.0" - sources."domhandler-3.3.0" - (sources."domutils-2.5.0" // { - dependencies = [ - sources."domhandler-4.0.0" - ]; - }) - sources."htmlparser2-5.0.1" - sources."posthtml-parser-0.6.0" - sources."posthtml-render-1.4.0" + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/runtime-service-worker-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + sources."@parcel/source-map-2.0.2" + (sources."@parcel/transformer-babel-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/transformer-css-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + sources."nanoid-3.3.1" + sources."postcss-8.4.12" + ]; + }) + (sources."@parcel/transformer-html-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + sources."posthtml-parser-0.10.2" + ]; + }) + (sources."@parcel/transformer-image-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/transformer-js-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/transformer-json-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/transformer-postcss-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/transformer-posthtml-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + sources."posthtml-parser-0.10.2" + ]; + }) + (sources."@parcel/transformer-raw-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/transformer-react-refresh-wrap-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + ]; + }) + (sources."@parcel/transformer-svg-2.3.2" // { + dependencies = [ + sources."@parcel/plugin-2.3.2" + sources."@parcel/types-2.3.2" + sources."posthtml-parser-0.10.2" + ]; + }) + (sources."@parcel/transformer-vue-2.3.2" // { + dependencies = [ + sources."@parcel/cache-2.3.2" + sources."@parcel/codeframe-2.3.2" + sources."@parcel/diagnostic-2.3.2" + sources."@parcel/events-2.3.2" + sources."@parcel/fs-2.3.2" + sources."@parcel/fs-search-2.3.2" + sources."@parcel/logger-2.3.2" + sources."@parcel/markdown-ansi-2.3.2" + sources."@parcel/package-manager-2.3.2" + sources."@parcel/plugin-2.3.2" + sources."@parcel/source-map-2.0.2" + sources."@parcel/types-2.3.2" + sources."@parcel/utils-2.3.2" + sources."@parcel/watcher-2.0.5" + sources."@parcel/workers-2.3.2" + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."node-addon-api-3.2.1" + sources."node-gyp-build-4.3.0" ]; }) - sources."@parcel/transformer-raw-2.0.0-beta.2" - sources."@parcel/transformer-react-refresh-babel-2.0.0-beta.2" - sources."@parcel/transformer-react-refresh-wrap-2.0.0-beta.2" - sources."@parcel/transformer-vue-2.0.0-beta.2" sources."@parcel/types-2.0.0-beta.2" - (sources."@parcel/utils-2.0.0-beta.2" // { + (sources."@parcel/utils-2.3.2" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" ]; }) - sources."@parcel/watcher-2.0.0-alpha.10" - sources."@parcel/workers-2.0.0-beta.2" + (sources."@parcel/watcher-2.0.5" // { + dependencies = [ + sources."node-gyp-build-4.3.0" + ]; + }) + (sources."@parcel/workers-2.3.2" // { + dependencies = [ + sources."@parcel/types-2.3.2" + ]; + }) sources."@samverschueren/stream-to-observable-0.3.1" - sources."@types/http-proxy-1.17.5" - sources."@types/node-14.14.37" - sources."@types/q-1.5.4" - sources."@types/sinonjs__fake-timers-6.0.1" - sources."@types/sizzle-2.3.2" - (sources."@vue/compiler-core-3.0.9" // { + sources."@swc/helpers-0.2.14" + sources."@trysound/sax-0.2.0" + sources."@types/parse-json-4.0.0" + sources."@types/sinonjs__fake-timers-6.0.4" + sources."@types/sizzle-2.3.3" + sources."@vue/compiler-core-3.2.31" + sources."@vue/compiler-dom-3.2.31" + (sources."@vue/compiler-sfc-3.2.31" // { dependencies = [ - sources."@babel/parser-7.13.13" - sources."@babel/types-7.13.14" - sources."lodash-4.17.21" + sources."@babel/parser-7.17.8" + sources."@vue/compiler-core-3.2.31" + sources."@vue/compiler-dom-3.2.31" + sources."@vue/shared-3.2.31" ]; }) - sources."@vue/compiler-dom-3.0.9" - (sources."@vue/compiler-sfc-3.0.9" // { + (sources."@vue/compiler-ssr-3.2.31" // { dependencies = [ - sources."icss-utils-5.1.0" - sources."lru-cache-5.1.1" - sources."postcss-modules-4.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."yallist-3.1.1" + sources."@babel/parser-7.17.8" + sources."@vue/compiler-core-3.2.31" + sources."@vue/compiler-dom-3.2.31" + sources."@vue/shared-3.2.31" ]; }) - sources."@vue/compiler-ssr-3.0.9" - sources."@vue/reactivity-3.0.9" - sources."@vue/runtime-core-3.0.9" - sources."@vue/runtime-dom-3.0.9" - sources."@vue/shared-3.0.9" - sources."abab-2.0.5" - sources."abortcontroller-polyfill-1.7.1" - sources."acorn-6.4.2" - sources."acorn-globals-4.3.4" - sources."acorn-walk-6.2.0" - sources."ajv-6.11.0" - sources."alphanum-sort-1.0.2" + sources."@vue/devtools-api-6.1.3" + sources."@vue/reactivity-3.2.31" + (sources."@vue/reactivity-transform-3.2.31" // { + dependencies = [ + sources."@babel/parser-7.17.8" + sources."@vue/compiler-core-3.2.31" + sources."@vue/shared-3.2.31" + ]; + }) + sources."@vue/runtime-core-3.2.31" + sources."@vue/runtime-dom-3.2.31" + sources."@vue/server-renderer-3.2.31" + sources."@vue/shared-3.2.31" + sources."abortcontroller-polyfill-1.7.3" + sources."acorn-8.7.0" sources."ansi-escapes-3.2.0" - sources."ansi-html-0.0.7" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."any-observable-0.3.0" - sources."arch-2.1.2" - sources."argparse-1.0.10" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-equal-1.0.0" - sources."array-filter-1.0.0" - sources."array-unique-0.3.2" + sources."arch-2.2.0" sources."asn1-0.2.4" - (sources."asn1.js-5.4.1" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."assert-2.0.0" sources."assert-plus-1.0.0" - sources."assign-symbols-1.0.0" - sources."astral-regex-2.0.0" - sources."astring-1.7.0" - sources."async-3.2.0" - sources."async-limiter-1.0.1" + sources."async-3.2.3" sources."asynckit-0.4.0" - sources."atob-2.1.2" - sources."available-typed-arrays-1.0.2" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" - sources."babel-plugin-dynamic-import-node-2.3.3" - (sources."babel-plugin-polyfill-corejs2-0.1.10" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.1.7" - sources."babel-plugin-polyfill-regenerator-0.1.6" sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - ]; - }) - sources."base-x-3.0.8" - sources."base64-js-1.5.1" + sources."base-x-3.0.9" sources."bcrypt-pbkdf-1.0.2" - sources."big.js-5.2.2" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) sources."bluebird-3.7.2" - sources."bn.js-5.2.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."brorand-1.1.0" - sources."browser-process-hrtime-1.0.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."safe-buffer-5.2.1" - ]; - }) - sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.3" - sources."buffer-5.7.1" + sources."browserslist-4.20.2" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" - sources."buffer-xor-1.0.3" - sources."builtin-status-codes-3.0.0" - sources."bytes-3.0.0" - sources."cache-base-1.0.1" sources."cachedir-2.3.0" - sources."call-bind-1.0.2" - sources."caller-callsite-2.0.0" - sources."caller-path-2.0.0" - sources."callsites-2.0.0" - sources."camelcase-6.2.0" + sources."callsites-3.1.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001204" + sources."caniuse-lite-1.0.30001319" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { dependencies = [ @@ -8704,14 +3949,7 @@ let sources."check-more-types-2.24.0" sources."chrome-trace-event-1.0.2" sources."ci-info-2.0.0" - sources."cipher-base-1.0.4" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) sources."cli-cursor-1.0.2" - sources."cli-spinners-2.6.0" sources."cli-table3-0.5.1" (sources."cli-truncate-0.2.1" // { dependencies = [ @@ -8720,422 +3958,119 @@ let ]; }) sources."clone-2.1.2" - sources."coa-2.0.2" sources."code-point-at-1.1.0" - sources."collection-visit-1.0.0" - sources."color-3.1.3" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" + sources."colord-2.9.2" sources."colorette-1.2.2" sources."colors-1.4.0" sources."combined-stream-1.0.8" - sources."command-exists-1.2.9" sources."commander-7.2.0" - sources."common-tags-1.8.0" - sources."component-emitter-1.3.0" + sources."common-tags-1.8.2" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - (sources."connect-3.7.0" // { - dependencies = [ - sources."debug-2.6.9" - sources."ms-2.0.0" - ]; - }) - sources."console-browserify-1.2.0" sources."consolidate-0.16.0" - sources."constants-browserify-1.0.0" - sources."content-disposition-0.5.2" - sources."convert-source-map-1.7.0" - sources."copy-descriptor-0.1.1" - sources."core-js-3.9.1" - (sources."core-js-compat-3.9.1" // { - dependencies = [ - sources."semver-7.0.0" - ]; - }) sources."core-util-is-1.0.2" - 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."cosmiconfig-7.0.1" sources."cross-spawn-6.0.5" - sources."crypto-browserify-3.12.0" - sources."css-color-names-0.0.4" - (sources."css-declaration-sorter-4.0.1" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - (sources."css-modules-loader-core-1.1.0" // { - dependencies = [ - sources."ansi-styles-2.2.1" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) - sources."has-flag-1.0.0" - sources."postcss-6.0.1" - sources."source-map-0.5.7" - sources."supports-color-3.2.3" - ]; - }) - sources."css-select-2.1.0" - sources."css-select-base-adapter-0.1.1" - sources."css-selector-tokenizer-0.7.3" - sources."css-tree-1.0.0-alpha.37" - sources."css-what-3.4.2" + sources."css-declaration-sorter-6.1.4" + sources."css-select-4.2.1" + sources."css-tree-1.1.3" + sources."css-what-5.1.0" sources."cssesc-3.0.0" - (sources."cssnano-4.1.10" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - (sources."cssnano-preset-default-4.0.7" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - sources."cssnano-util-get-arguments-4.0.0" - sources."cssnano-util-get-match-4.0.0" - (sources."cssnano-util-raw-cache-4.0.1" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.2.0" // { - dependencies = [ - sources."css-tree-1.1.2" - sources."mdn-data-2.0.14" - ]; - }) - sources."cssom-0.3.8" - sources."cssstyle-1.4.0" - sources."csstype-2.6.16" + sources."cssnano-5.1.5" + sources."cssnano-preset-default-5.2.5" + sources."cssnano-utils-3.1.0" + sources."csso-4.2.0" + sources."csstype-2.6.20" (sources."cypress-4.12.1" // { dependencies = [ sources."commander-4.1.1" - sources."has-flag-4.0.0" - sources."lodash-4.17.20" sources."log-symbols-3.0.0" - sources."minimist-1.2.5" - sources."supports-color-7.1.0" ]; }) sources."dashdash-1.14.1" - sources."data-urls-1.1.0" sources."date-fns-1.30.1" sources."debug-4.1.1" - sources."decode-uri-component-0.2.0" - sources."deep-is-0.1.3" - (sources."defaults-1.0.3" // { - dependencies = [ - sources."clone-1.0.4" - ]; - }) - sources."define-properties-1.1.3" - (sources."define-property-2.0.2" // { - dependencies = [ - sources."is-accessor-descriptor-1.0.0" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - ]; - }) sources."delayed-stream-1.0.0" - sources."des.js-1.0.1" sources."detect-libc-1.0.3" - (sources."diffie-hellman-5.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - (sources."dom-serializer-0.2.2" // { - dependencies = [ - sources."domelementtype-2.1.0" - ]; - }) - sources."domain-browser-3.5.0" - sources."domelementtype-1.3.1" - sources."domexception-1.0.1" - sources."domhandler-2.4.2" - sources."domutils-1.7.0" - sources."dot-prop-5.3.0" + sources."dom-serializer-1.3.2" + sources."domelementtype-2.2.0" + sources."domhandler-4.3.1" + sources."domutils-2.8.0" sources."dotenv-7.0.0" sources."dotenv-expand-5.1.0" sources."ecc-jsbn-0.1.2" - sources."ee-first-1.1.1" - sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.702" + sources."electron-to-chromium-1.4.89" sources."elegant-spinner-1.0.1" - (sources."elliptic-6.5.4" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) - sources."emoji-regex-8.0.0" - sources."emojis-list-3.0.0" - (sources."emphasize-4.2.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) - sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-2.2.0" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0" - sources."es-to-primitive-1.2.1" - sources."es6-object-assign-1.1.0" sources."escalade-3.1.1" - sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - sources."escodegen-1.14.3" - sources."esprima-4.0.1" - sources."estraverse-4.3.0" sources."estree-walker-2.0.2" - sources."esutils-2.0.3" - sources."eventemitter2-6.4.3" - sources."eventemitter3-4.0.7" - sources."events-3.3.0" - sources."evp_bytestokey-1.0.3" + sources."eventemitter2-6.4.5" sources."execa-1.0.0" sources."executable-4.1.1" sources."exit-hook-1.1.1" - (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."ms-2.0.0" - ]; - }) sources."extend-3.0.2" - (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."is-accessor-descriptor-1.0.0" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - ]; - }) (sources."extract-zip-1.7.0" // { dependencies = [ sources."debug-2.6.9" - sources."minimist-1.2.5" - sources."mkdirp-0.5.5" sources."ms-2.0.0" ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-3.1.1" - sources."fast-glob-3.1.1" - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - (sources."fast-url-parser-1.1.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."fastest-levenshtein-1.0.12" - sources."fastparse-1.1.2" - sources."fastq-1.11.0" - sources."fault-1.0.4" sources."fd-slicer-1.1.0" sources."figures-1.7.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."follow-redirects-1.13.3" - sources."for-in-1.0.2" - sources."foreach-2.0.5" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."format-0.2.2" - sources."fragment-cache-0.2.1" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."generic-names-2.0.1" - sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.1" sources."get-port-4.2.0" sources."get-stream-4.1.0" - sources."get-value-2.0.6" sources."getos-3.2.1" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."glob-parent-5.1.2" - sources."global-dirs-2.0.1" - sources."globals-11.12.0" + sources."global-dirs-2.1.0" + sources."globals-13.13.0" sources."graceful-fs-4.2.3" - sources."har-schema-2.0.0" - sources."har-validator-5.1.3" - sources."has-1.0.3" sources."has-ansi-2.0.0" - sources."has-bigints-1.0.1" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { + sources."htmlnano-2.0.0" + (sources."htmlparser2-7.2.0" // { dependencies = [ - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."kind-of-4.0.0" + sources."entities-3.0.1" ]; }) - (sources."hash-base-3.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - sources."safe-buffer-5.2.1" - ]; - }) - sources."hash-sum-2.0.0" - sources."hash.js-1.1.7" - sources."hex-color-regex-1.1.0" - sources."highlight.js-10.4.1" - sources."hmac-drbg-1.0.1" - sources."hsl-regex-1.0.0" - sources."hsla-regex-1.0.0" - sources."html-comment-regex-1.1.2" - sources."html-encoding-sniffer-1.0.2" - sources."html-tags-1.2.0" - (sources."htmlnano-0.2.8" // { - dependencies = [ - sources."posthtml-0.13.4" - ]; - }) - (sources."htmlparser2-3.10.1" // { - dependencies = [ - sources."entities-1.1.2" - sources."readable-stream-3.6.0" - ]; - }) - sources."http-proxy-1.18.1" - sources."http-proxy-middleware-1.1.0" - sources."http-signature-1.2.0" - sources."https-browserify-1.0.0" - sources."iconv-lite-0.4.24" - sources."icss-replace-symbols-1.1.0" - (sources."icss-utils-4.1.1" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - sources."ieee754-1.2.1" - sources."iferr-1.0.2" - sources."import-fresh-2.0.0" - sources."imurmurhash-0.1.4" + sources."import-fresh-3.3.0" sources."indent-string-3.2.0" - sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."ini-1.3.5" - sources."is-absolute-url-2.1.0" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-arguments-1.1.0" + sources."ini-1.3.7" sources."is-arrayish-0.2.1" - sources."is-bigint-1.0.1" - sources."is-boolean-object-1.1.0" - sources."is-buffer-1.1.6" - sources."is-callable-1.2.3" sources."is-ci-2.0.0" - sources."is-color-stop-1.1.0" - sources."is-core-module-2.2.0" - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-date-object-1.0.2" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."is-directory-0.3.1" - sources."is-docker-2.1.1" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-generator-function-1.0.8" - sources."is-glob-4.0.1" - sources."is-html-1.1.0" sources."is-installed-globally-0.3.2" - sources."is-interactive-1.0.0" - sources."is-nan-1.3.2" - sources."is-negative-zero-2.0.1" - sources."is-number-7.0.0" - sources."is-number-object-1.0.4" - sources."is-obj-2.0.0" + sources."is-json-2.0.1" sources."is-observable-1.1.0" - sources."is-path-inside-3.0.2" - sources."is-plain-obj-3.0.0" - sources."is-plain-object-2.0.4" + sources."is-path-inside-3.0.3" sources."is-promise-2.2.2" - sources."is-regex-1.1.2" - sources."is-resolvable-1.1.0" sources."is-stream-1.1.0" - sources."is-string-1.0.5" - sources."is-svg-3.0.0" - sources."is-symbol-1.0.3" - sources."is-typed-array-1.1.5" sources."is-typedarray-1.0.0" - sources."is-unicode-supported-0.1.0" - sources."is-url-1.2.4" - 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."isstream-0.1.2" sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" sources."jsbn-0.1.1" - sources."jsdom-14.1.0" - sources."jsesc-2.5.2" - sources."json-parse-better-errors-1.0.2" - sources."json-schema-0.2.3" - sources."json-schema-traverse-0.4.1" + sources."json-parse-even-better-errors-2.3.1" sources."json-source-map-0.6.1" sources."json-stringify-safe-5.0.1" - sources."json5-1.0.1" + sources."json5-2.2.1" sources."jsonfile-4.0.0" - sources."jsprim-1.4.1" - sources."kind-of-6.0.3" sources."lazy-ass-1.6.0" - sources."levn-0.3.0" + sources."lilconfig-2.0.4" + sources."lines-and-columns-1.2.4" sources."listr-0.14.3" sources."listr-silent-renderer-1.1.1" (sources."listr-update-renderer-0.5.0" // { @@ -9154,643 +4089,185 @@ let sources."restore-cursor-2.0.0" ]; }) - sources."loader-utils-1.4.0" + sources."lmdb-2.2.6" sources."lodash-4.17.21" - sources."lodash.camelcase-4.3.0" - sources."lodash.clone-4.5.0" - sources."lodash.debounce-4.0.8" sources."lodash.memoize-4.1.2" sources."lodash.once-4.1.1" - sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" - (sources."log-symbols-4.1.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) (sources."log-update-2.3.0" // { dependencies = [ - sources."ansi-regex-3.0.0" sources."cli-cursor-2.1.0" sources."onetime-2.0.1" sources."restore-cursor-2.0.0" - sources."strip-ansi-4.0.0" - sources."wrap-ansi-3.0.1" - ]; - }) - sources."lowlight-1.17.0" - sources."lru-cache-6.0.0" - sources."magic-string-0.25.7" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."md5.js-1.3.5" - sources."mdn-data-2.0.4" - sources."merge-source-map-1.1.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.2" - (sources."miller-rabin-4.0.1" // { - dependencies = [ - sources."bn.js-4.12.0" ]; }) + sources."magic-string-0.25.9" + sources."mdn-data-2.0.14" sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."mimic-fn-1.2.0" - sources."minimalistic-assert-1.0.1" - sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."mkdirp-0.5.5" - sources."moment-2.27.0" + sources."moment-2.29.1" sources."ms-2.1.2" + sources."msgpackr-1.5.5" + sources."msgpackr-extract-1.0.16" + sources."nan-2.15.0" sources."nanoid-3.1.22" - sources."nanomatch-1.2.13" - sources."ncp-2.0.0" sources."nice-try-1.0.5" - sources."node-addon-api-3.1.0" - sources."node-forge-0.10.0" + sources."node-addon-api-3.2.1" sources."node-gyp-build-4.2.3" - sources."node-releases-1.1.71" - sources."normalize-url-3.3.0" + sources."node-releases-2.0.2" + sources."normalize-url-6.1.0" sources."npm-run-path-2.0.2" - sources."nth-check-1.0.2" + sources."nth-check-2.0.1" sources."nullthrows-1.1.1" sources."number-is-nan-1.0.1" - sources."nwsapi-2.2.0" - sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."kind-of-3.2.2" - ]; - }) - sources."object-inspect-1.9.0" - sources."object-is-1.1.5" - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.2" - sources."object.getownpropertydescriptors-2.1.2" - sources."object.pick-1.3.0" - sources."object.values-1.1.3" - sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-1.1.0" - sources."open-7.4.2" - sources."optionator-0.8.3" - (sources."ora-5.4.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" - sources."cli-cursor-3.1.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."mimic-fn-2.1.0" - sources."onetime-5.1.2" - sources."restore-cursor-3.1.0" - sources."strip-ansi-6.0.0" - ]; - }) - sources."os-browserify-0.3.0" + sources."ordered-binary-1.2.4" sources."ospath-1.2.2" sources."p-finally-1.0.0" sources."p-map-2.1.0" - sources."pako-1.0.11" - (sources."parcel-2.0.0-beta.2" // { + (sources."parcel-2.3.2" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" ]; }) sources."parcel-reporter-static-files-copy-1.2.2" - sources."parse-asn1-5.1.6" - sources."parse-json-4.0.0" - sources."parse5-5.1.0" - sources."parseurl-1.3.3" - sources."pascalcase-0.1.1" - sources."path-browserify-1.0.1" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" sources."path-key-2.0.1" - sources."path-parse-1.0.6" - sources."path-to-regexp-2.2.1" - sources."pbkdf2-3.1.1" + sources."path-type-4.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."picomatch-2.2.2" + sources."picocolors-1.0.0" sources."pify-2.3.0" - sources."pn-1.1.0" - sources."posix-character-classes-0.1.1" sources."postcss-8.2.8" - (sources."postcss-calc-7.0.5" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-colormin-4.0.3" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-convert-values-4.0.1" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-discard-comments-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-discard-duplicates-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-discard-empty-4.0.1" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-discard-overridden-4.0.1" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-merge-longhand-4.0.11" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-merge-rules-4.0.3" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-selector-parser-3.1.2" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-minify-font-values-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-minify-gradients-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-minify-params-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-minify-selectors-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-selector-parser-3.1.2" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-modules-3.2.2" // { - dependencies = [ - sources."postcss-7.0.35" - 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."supports-color-6.1.0" - ]; - }) - (sources."postcss-modules-extract-imports-1.1.0" // { - dependencies = [ - sources."postcss-6.0.23" - sources."supports-color-5.5.0" - ]; - }) - (sources."postcss-modules-local-by-default-1.2.0" // { - dependencies = [ - sources."postcss-6.0.23" - sources."supports-color-5.5.0" - ]; - }) - (sources."postcss-modules-scope-1.1.0" // { - dependencies = [ - sources."postcss-6.0.23" - sources."supports-color-5.5.0" - ]; - }) - (sources."postcss-modules-values-1.3.0" // { - dependencies = [ - sources."postcss-6.0.23" - sources."supports-color-5.5.0" - ]; - }) - (sources."postcss-normalize-charset-4.0.1" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-normalize-display-values-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-normalize-positions-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-normalize-repeat-style-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-normalize-string-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-normalize-timing-functions-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-normalize-unicode-4.0.1" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-normalize-url-4.0.1" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-normalize-whitespace-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-ordered-values-4.1.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-reduce-initial-4.0.3" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-reduce-transforms-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - sources."postcss-selector-parser-6.0.4" - (sources."postcss-svgo-4.0.2" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-value-parser-3.3.1" - sources."supports-color-6.1.0" - ]; - }) - (sources."postcss-unique-selectors-4.0.1" // { - dependencies = [ - sources."postcss-7.0.35" - sources."supports-color-6.1.0" - ]; - }) - sources."postcss-value-parser-4.1.0" - (sources."posthtml-0.15.1" // { - dependencies = [ - (sources."dom-serializer-1.2.0" // { - dependencies = [ - sources."domhandler-4.0.0" - ]; - }) - sources."domelementtype-2.1.0" - sources."domhandler-3.3.0" - (sources."domutils-2.5.0" // { - dependencies = [ - sources."domhandler-4.0.0" - ]; - }) - sources."htmlparser2-5.0.1" - sources."posthtml-parser-0.6.0" - ]; - }) - sources."posthtml-parser-0.5.3" - sources."posthtml-render-1.3.1" - sources."prelude-ls-1.1.2" - sources."pretty-bytes-5.3.0" - sources."process-0.11.10" + sources."postcss-calc-8.2.4" + sources."postcss-colormin-5.3.0" + sources."postcss-convert-values-5.1.0" + sources."postcss-discard-comments-5.1.1" + 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.3" + sources."postcss-merge-rules-5.1.1" + sources."postcss-minify-font-values-5.1.0" + sources."postcss-minify-gradients-5.1.1" + sources."postcss-minify-params-5.1.2" + sources."postcss-minify-selectors-5.2.0" + sources."postcss-normalize-charset-5.1.0" + sources."postcss-normalize-display-values-5.1.0" + sources."postcss-normalize-positions-5.1.0" + sources."postcss-normalize-repeat-style-5.1.0" + sources."postcss-normalize-string-5.1.0" + sources."postcss-normalize-timing-functions-5.1.0" + sources."postcss-normalize-unicode-5.1.0" + sources."postcss-normalize-url-5.1.0" + sources."postcss-normalize-whitespace-5.1.1" + sources."postcss-ordered-values-5.1.1" + sources."postcss-reduce-initial-5.1.0" + sources."postcss-reduce-transforms-5.1.0" + sources."postcss-selector-parser-6.0.9" + sources."postcss-svgo-5.1.0" + sources."postcss-unique-selectors-5.1.1" + sources."postcss-value-parser-4.2.0" + sources."posthtml-0.16.6" + sources."posthtml-parser-0.11.0" + sources."posthtml-render-3.0.0" + sources."pretty-bytes-5.6.0" sources."process-nextick-args-2.0.1" sources."psl-1.7.0" - (sources."public-encrypt-4.0.3" // { - dependencies = [ - sources."bn.js-4.12.0" - ]; - }) sources."pump-3.0.0" sources."punycode-2.1.1" - (sources."purgecss-2.3.0" // { - dependencies = [ - sources."commander-5.1.0" - sources."postcss-7.0.32" - sources."supports-color-6.1.0" - ]; - }) - sources."q-1.5.1" sources."qs-6.5.2" sources."querystring-0.2.0" - sources."querystring-es3-0.2.1" - sources."queue-microtask-1.2.3" sources."ramda-0.26.1" - sources."randombytes-2.1.0" - sources."randomfill-1.0.4" - sources."range-parser-1.2.0" sources."react-refresh-0.9.0" sources."readable-stream-2.3.7" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.13.7" - sources."regenerator-transform-0.14.5" - sources."regex-not-1.0.2" - sources."regexpu-core-4.7.1" - sources."regjsgen-0.5.2" - (sources."regjsparser-0.6.9" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."relateurl-0.2.7" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" - sources."request-2.88.2" + sources."regenerator-runtime-0.13.9" sources."request-progress-3.0.0" - sources."request-promise-core-1.1.4" - sources."request-promise-native-1.0.9" - sources."requires-port-1.0.0" - sources."resolve-1.20.0" - sources."resolve-from-3.0.0" - sources."resolve-url-0.2.1" + sources."resolve-from-4.0.0" sources."restore-cursor-1.0.1" - sources."ret-0.1.15" - sources."reusify-1.0.4" - sources."rgb-regex-1.0.1" - sources."rgba-regex-1.0.0" sources."rimraf-2.7.1" - sources."ripemd160-2.0.2" - sources."run-parallel-1.2.0" - sources."rxjs-6.6.2" + sources."rxjs-6.6.7" sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.4" - sources."saxes-3.1.11" sources."semver-5.7.1" - (sources."serve-handler-6.1.3" // { - dependencies = [ - sources."mime-db-1.33.0" - sources."mime-types-2.1.18" - ]; - }) - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."setimmediate-1.0.5" - sources."sha.js-2.4.11" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - (sources."simple-swizzle-0.2.2" // { - dependencies = [ - sources."is-arrayish-0.3.2" - ]; - }) sources."slice-ansi-0.0.4" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."debug-2.6.9" - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - sources."ms-2.0.0" - sources."source-map-0.5.7" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) sources."source-map-0.6.1" - sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.19" - sources."source-map-url-0.4.1" + sources."source-map-js-1.0.2" + sources."source-map-support-0.5.21" sources."sourcemap-codec-1.4.8" - sources."split-string-3.1.0" - (sources."split2-3.2.2" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."sprintf-js-1.0.3" - sources."srcset-3.0.0" sources."sshpk-1.16.1" sources."stable-0.1.8" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - ]; - }) - sources."statuses-1.5.0" - sources."stealthy-require-1.1.1" - (sources."stream-http-3.1.1" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."string-hash-1.1.3" (sources."string-width-2.1.1" // { dependencies = [ sources."ansi-regex-3.0.0" sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimend-1.0.4" - sources."string.prototype.trimstart-1.0.4" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-eof-1.0.0" - (sources."stylehacks-4.0.3" // { - dependencies = [ - sources."postcss-7.0.35" - sources."postcss-selector-parser-3.1.2" - sources."supports-color-6.1.0" - ]; - }) + sources."stylehacks-5.1.0" (sources."supports-color-7.2.0" // { dependencies = [ sources."has-flag-4.0.0" ]; }) - sources."svgo-1.3.2" + sources."svgo-2.8.0" sources."symbol-observable-1.2.0" - sources."symbol-tree-3.2.4" - sources."term-size-2.2.1" - (sources."terser-4.8.0" // { + (sources."terser-5.12.1" // { dependencies = [ sources."commander-2.20.3" + sources."source-map-0.7.3" ]; }) sources."throttleit-1.0.0" - sources."timers-browserify-2.0.12" sources."timsort-0.3.0" sources."tmp-0.1.0" - sources."to-fast-properties-2.0.0" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" - sources."tr46-1.0.1" sources."tslib-1.13.0" - sources."tty-browserify-0.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-check-0.3.2" sources."type-fest-0.20.2" sources."typedarray-0.0.6" - sources."unbox-primitive-1.0.1" - (sources."uncss-0.17.3" // { - dependencies = [ - sources."commander-2.20.3" - sources."is-absolute-url-3.0.3" - sources."postcss-7.0.35" - sources."postcss-selector-parser-6.0.2" - sources."supports-color-6.1.0" - ]; - }) - sources."unicode-canonical-property-names-ecmascript-1.0.4" - sources."unicode-match-property-ecmascript-1.0.4" - sources."unicode-match-property-value-ecmascript-1.2.0" - sources."unicode-property-aliases-ecmascript-1.1.0" - sources."union-value-1.0.1" - sources."uniq-1.0.1" - sources."uniqs-2.0.0" sources."universalify-0.1.2" - 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-4.0.0" - sources."uri-js-4.2.2" - sources."urix-0.1.0" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) - sources."use-3.1.1" - sources."util-0.12.3" sources."util-deprecate-1.0.2" - sources."util.promisify-1.0.1" - sources."utils-merge-1.0.1" - sources."uuid-3.4.0" + sources."utility-types-3.10.0" sources."v8-compile-cache-2.3.0" - sources."vendors-1.0.4" sources."verror-1.10.0" - sources."vm-browserify-1.1.2" - sources."vue-3.0.9" - sources."vue-router-4.0.5" - sources."vuex-4.0.0" - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-1.1.2" - sources."wcwidth-1.0.1" - 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."vue-3.2.31" + sources."vue-router-4.0.14" + sources."vuex-4.0.2" + sources."weak-lru-cache-1.2.2" sources."which-1.3.1" - sources."which-boxed-primitive-1.0.2" - sources."which-typed-array-1.1.4" - sources."word-wrap-1.2.3" + (sources."wrap-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" + ]; + }) sources."wrappy-1.0.2" - sources."ws-6.2.1" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.2.0" - sources."xtend-4.0.2" - sources."yallist-4.0.0" + sources."xxhash-wasm-0.4.2" + sources."yaml-1.10.2" sources."yauzl-2.10.0" ]; buildInputs = globalBuildInputs; diff --git a/third_party/nixpkgs/pkgs/servers/polaris/web.nix b/third_party/nixpkgs/pkgs/servers/polaris/web.nix index b8a97e625d..b2d6d6de9f 100644 --- a/third_party/nixpkgs/pkgs/servers/polaris/web.nix +++ b/third_party/nixpkgs/pkgs/servers/polaris/web.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "polaris-web"; - version = "build-50"; + version = "build-54"; src = fetchFromGitHub { owner = "agersant"; repo = "polaris-web"; rev = "${version}"; - sha256 = "Xe+eAlWIDJR4CH1KCQaVlMAunpEikrmD96B5cqFWYYM="; + sha256 = "+Tpj4XgWL1U+Y33YbEruilfV/6WGl8Dtj9FdXm2JVNU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix index 670db15329..0d980a6c3f 100644 --- a/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix +++ b/third_party/nixpkgs/pkgs/servers/radicale/3.x.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.1.7"; + version = "3.1.8"; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; - hash = "sha256-D/JPq8p+iLmm0XaoXvNonRHr9PIhQ11yTDqur3DiYdc="; + hash = "sha256-V0nqgxGUxcTRAYFuxpKUEVB/g/Mbvw+9OIcvAexXwuM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/rainloop/default.nix b/third_party/nixpkgs/pkgs/servers/rainloop/default.nix index bc1f0905c6..1c7c76b2bd 100644 --- a/third_party/nixpkgs/pkgs/servers/rainloop/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rainloop/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, unzip, pkgs, dataPath ? "/var/lib/rainloop" }: let +{ lib, stdenv, fetchurl, unzip, writeText, dos2unix, dataPath ? "/var/lib/rainloop" }: let common = { edition, sha256 }: stdenv.mkDerivation (rec { pname = "rainloop${lib.optionalString (edition != "") "-${edition}"}"; version = "1.16.0"; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ unzip dos2unix ]; unpackPhase = '' mkdir rainloop @@ -16,7 +16,19 @@ sha256 = sha256; }; - includeScript = pkgs.writeText "include.php" '' + prePatch = '' + dos2unix ./rainloop/rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php + ''; + + patches = [ + ./fix-cve-2022-29360.patch + ]; + + postPatch = '' + unix2dos ./rainloop/rainloop/v/1.16.0/app/libraries/MailSo/Base/HtmlUtils.php + ''; + + includeScript = writeText "include.php" '' setAttribute($sKey, $sValue); + } + +- $oWrapDom = $oDom->createElement('div', '___xxx___'); ++ $rand_str = base64_encode(random_bytes(32)); ++ $oWrapDom = $oDom->createElement('div', $rand_str); + $oWrapDom->setAttribute('data-x-div-type', 'body'); + foreach ($aBodylAttrs as $sKey => $sValue) + { +@@ -250,7 +251,7 @@ class HtmlUtils + + $sWrp = $oDom->saveHTML($oWrapHtml); + +- $sResult = \str_replace('___xxx___', $sResult, $sWrp); ++ $sResult = \str_replace($rand_str, $sResult, $sWrp); + } + + $sResult = \str_replace(\MailSo\Base\HtmlUtils::$KOS, ':', $sResult); diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix index 80d5e8743f..44be67fc89 100644 --- a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix +++ b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchzip }: let - version = "22.1.3"; + version = "22.1.7"; 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-Uz7KjbsH3lKRL0iI73DxwS5rcIkPQiMFkIQsc06gF0k="; + linux.amd = "sha256-FjDDrJmLvelQ8PmTEtnvV+5zpixizR0bowoJPLyPFcA="; linux.arm = "sha256-WHjYAbytiu747jFqN0KZ/CkIwAVI7fb32ywtRiQOBm8="; }; in stdenv.mkDerivation rec { diff --git a/third_party/nixpkgs/pkgs/servers/rmfakecloud/default.nix b/third_party/nixpkgs/pkgs/servers/rmfakecloud/default.nix index b3055cf566..acb55b8bb8 100644 --- a/third_party/nixpkgs/pkgs/servers/rmfakecloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rmfakecloud/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rmfakecloud"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "ddvk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ax+eozbAIE3425ndT4z4fVBMwzLN7iR5fTz8rz60zWg="; + sha256 = "sha256-Q9zymQW8XWApy5ssfMtojN4AhteqrQzZyMeAkOsJDyw="; }; vendorSha256 = "sha256-NwDaPpjkQogXE37RGS3zEALlp3NuXP9RW//vbwM6y0A="; diff --git a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix index b89932ac52..30247c13c3 100644 --- a/third_party/nixpkgs/pkgs/servers/roon-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roon-server/default.nix @@ -14,18 +14,18 @@ , openssl , stdenv }: -stdenv.mkDerivation rec { +let + version = "1.8-1021"; + urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version; +in +stdenv.mkDerivation { pname = "roon-server"; - version = "1.8-988"; + inherit version; - src = - let - urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "00" ] version; - in - fetchurl { - url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-e8hSvHKeyJOIp6EWy1JLOWnj6HE2McFk9bw5vVZ96/I="; - }; + src = fetchurl { + url = "https://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; + hash = "sha256-obG6e/6AxNvUZkZzgS2QAxoSbJIM2pwuQDI0O2B90J8="; + }; dontConfigure = true; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix index 9376a024ec..18856c5567 100644 --- a/third_party/nixpkgs/pkgs/servers/roundcube/default.nix +++ b/third_party/nixpkgs/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.5.3"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-S8+sIZ8uAAXJEtrDIndDzB7Q3tacgi90yBpw0EHlo70="; + sha256 = "sha256-JAnM3+LkZfCGy5/BjIjf4Kr2zMI5JFZJdQYSCZIWlLo="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix index b9ad0a3b51..80cdf08ab9 100644 --- a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.17.17"; + version = "0.19.3"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - hash = "sha256-JHqD9/meOOqR5Uds03/YbhfTVm3QApM64oydB0VqTxM="; + hash = "sha256-nIxh6mbpkM5vX0S2ze8ylfEP1B07/DaqjoF8jDirJb8="; }; - vendorSha256 = "sha256-8ULyCg36yVSM2En82ZiB+CLak1vQPykgs/i2mNhgebg="; + vendorSha256 = "sha256-zz2RLmljfOw5DtQuFkfS47yHq/bWMJzmmJf+PBlPJJQ="; # Tests need docker doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/seafile-server/default.nix b/third_party/nixpkgs/pkgs/servers/seafile-server/default.nix index 526bc456ac..af3e8c4ea8 100644 --- a/third_party/nixpkgs/pkgs/servers/seafile-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/seafile-server/default.nix @@ -10,13 +10,13 @@ let }; in stdenv.mkDerivation rec { pname = "seafile-server"; - version = "8.0.8"; + version = "9.0.6"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-server"; - rev = "807867afb7a86f526a6584278914ce9f3f51d1da"; - sha256 = "1nq6dw4xzifbyhxn7yn5398q2sip1p1xwqz6xbis4nzgx4jldd4g"; + rev = "881c270aa8d99ca6648e7aa1458fc283f38e6f31"; # using a fixed revision because upstream may re-tag releases :/ + sha256 = "sha256-M1jIysirtl1KKyEvScOIshLvSa5vjxTdFEARgy8bLTc="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix b/third_party/nixpkgs/pkgs/servers/ser2net/default.nix index 440d98b1d2..4ebe1d5438 100644 --- a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.3.5"; + version = "4.3.7"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - hash = "sha256-B0O3Vcb+aM1qSQNrTFV9dY7j4CGOYFkGKfyMgt7PwIM="; + hash = "sha256-5/gdKueqWKEhHDho+q719J6lQt4XG9JExWef5/Y3y1s="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/servers/shishi/default.nix b/third_party/nixpkgs/pkgs/servers/shishi/default.nix index a2105a8b14..d752c1bb8a 100644 --- a/third_party/nixpkgs/pkgs/servers/shishi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/shishi/default.nix @@ -6,14 +6,6 @@ }: let - mkFlag = trueStr: falseStr: cond: name: val: "--" - + (if cond then trueStr else falseStr) - + name - + lib.optionalString (val != null && cond != false) "=${val}"; - mkEnable = mkFlag "enable-" "disable-"; - mkWith = mkFlag "with-" "without-"; - mkOther = mkFlag "" "" true; - shouldUsePkg = pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null; optPam = shouldUsePkg pam; @@ -37,19 +29,19 @@ stdenv.mkDerivation rec { buildInputs = [ libgcrypt libgpg-error libtasn1 optPam optLibidn optGnutls ]; configureFlags = [ - (mkOther "sysconfdir" "/etc") - (mkOther "localstatedir" "/var") - (mkEnable true "libgcrypt" null) - (mkEnable (optPam != null) "pam" null) - (mkEnable true "ipv6" null) - (mkWith (optLibidn != null) "stringprep" null) - (mkEnable (optGnutls != null) "starttls" null) - (mkEnable true "des" null) - (mkEnable true "3des" null) - (mkEnable true "aes" null) - (mkEnable true "md" null) - (mkEnable false "null" null) - (mkEnable true "arcfour" null) + "--sysconfdir=/etc" + "--localstatedir=/var" + (enableFeature true "libgcrypt") + (enableFeature (optPam != null) "pam") + (enableFeature true "ipv6") + (withFeature (optLibidn != null) "stringprep") + (enableFeature (optGnutls != null) "starttls") + (enableFeature true "des") + (enableFeature true "3des") + (enableFeature true "aes") + (enableFeature true "md") + (enableFeature false "null") + (enableFeature true "arcfour") ]; NIX_CFLAGS_COMPILE diff --git a/third_party/nixpkgs/pkgs/servers/simple-http-server/0001-cargo-remove-vendored-openssl.patch b/third_party/nixpkgs/pkgs/servers/simple-http-server/0001-cargo-remove-vendored-openssl.patch new file mode 100644 index 0000000000..558b444349 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/simple-http-server/0001-cargo-remove-vendored-openssl.patch @@ -0,0 +1,26 @@ +From 7e90a58be65bc9d81e53dfba39a44fdd2c7a79a4 Mon Sep 17 00:00:00 2001 +From: Maxim Zhukov +Date: Sat, 23 Jul 2022 08:44:07 +0300 +Subject: [PATCH] cargo: remove vendored openssl + +Signed-off-by: Maxim Zhukov +--- + Cargo.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 341c722..81665fb 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -23,7 +23,7 @@ url = "2.1.0" + hyper-native-tls = { version = "0.3.0", optional = true } + mime_guess = "2.0" + open = "1" +-openssl = { version = "0.10", features = ["vendored"] } ++openssl = { version = "0.10" } + # Iron crates + iron = "0.6.1" + iron-cors = "0.8.0" +-- +2.36.0 + diff --git a/third_party/nixpkgs/pkgs/servers/simple-http-server/Cargo.lock b/third_party/nixpkgs/pkgs/servers/simple-http-server/Cargo.lock new file mode 100644 index 0000000000..0a12f3fd0f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/simple-http-server/Cargo.lock @@ -0,0 +1,1220 @@ +# 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 = "ansi_term" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "antidote" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" + +[[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 = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "base64" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +dependencies = [ + "byteorder", + "safemem", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "buf_redux" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b953a6887648bb07a535631f2bc00fbdb2a2216f135552cb3f534ed136b9c07f" +dependencies = [ + "memchr", + "safemem", +] + +[[package]] +name = "byteorder" +version = "1.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" + +[[package]] +name = "cc" +version = "1.0.73" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +dependencies = [ + "libc", + "num-integer", + "num-traits", + "time", + "winapi", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ + "bitflags", +] + +[[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 = "crc32fast" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "fastrand" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +dependencies = [ + "instant", +] + +[[package]] +name = "filetime" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94a7bbaa59354bc20dd75b67f23e2797b4490e9d6928203fb105c79e448c86c" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "windows-sys", +] + +[[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 = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding 2.1.0", +] + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "getopts" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "getrandom" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" +dependencies = [ + "cfg-if", + "libc", + "wasi 0.11.0+wasi-snapshot-preview1", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "htmlescape" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163" + +[[package]] +name = "httparse" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" + +[[package]] +name = "hyper" +version = "0.10.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" +dependencies = [ + "base64", + "httparse", + "language-tags", + "log 0.3.9", + "mime 0.2.6", + "num_cpus", + "time", + "traitobject", + "typeable", + "unicase 1.4.2", + "url 1.7.2", +] + +[[package]] +name = "hyper-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" +dependencies = [ + "antidote", + "hyper", + "native-tls", +] + +[[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 = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "iron" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" +dependencies = [ + "hyper", + "log 0.3.9", + "mime_guess 1.8.8", + "modifier", + "num_cpus", + "plugin", + "typemap", + "url 1.7.2", +] + +[[package]] +name = "iron-cors" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24b02b8856c7f14e443c483e802cf0ce693f3bec19f49d2c9a242b18f88c9b70" +dependencies = [ + "iron", + "log 0.4.17", +] + +[[package]] +name = "language-tags" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "log" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +dependencies = [ + "log 0.4.17", +] + +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "mime" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" +dependencies = [ + "log 0.3.9", +] + +[[package]] +name = "mime" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" + +[[package]] +name = "mime_guess" +version = "1.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3" +dependencies = [ + "mime 0.2.6", + "phf", + "phf_codegen", + "unicase 1.4.2", +] + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" +dependencies = [ + "mime 0.3.16", + "unicase 2.6.0", +] + +[[package]] +name = "miniz_oxide" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc" +dependencies = [ + "adler", +] + +[[package]] +name = "modifier" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" + +[[package]] +name = "multipart" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136eed74cadb9edd2651ffba732b19a450316b680e4f48d6c79e905799e19d01" +dependencies = [ + "buf_redux", + "httparse", + "iron", + "log 0.4.17", + "mime 0.2.6", + "mime_guess 1.8.8", + "quick-error", + "rand 0.6.5", + "safemem", + "tempfile", + "twoway", +] + +[[package]] +name = "native-tls" +version = "0.2.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" +dependencies = [ + "lazy_static", + "libc", + "log 0.4.17", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg 1.1.0", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "open" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcea7a30d6b81a2423cc59c43554880feff7b57d12916f231a79f8d6d9470201" +dependencies = [ + "pathdiff", + "winapi", +] + +[[package]] +name = "openssl" +version = "0.10.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "618febf65336490dfcf20b73f885f5651a0c89c64c2d4a8c3662585a70bf5bd0" +dependencies = [ + "bitflags", + "cfg-if", + "foreign-types", + "libc", + "once_cell", + "openssl-macros", + "openssl-sys", +] + +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.75" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5f9bd0c2710541a3cda73d6f9ac4f1b240de4ae261065d309dbe73d9dceb42f" +dependencies = [ + "autocfg 1.1.0", + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "path-dedot" +version = "1.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45c58ab1edb03f77d0bb3f08e4a179dd43ce9bc8eab9867ec53a78285ea3039b" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "phf" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +dependencies = [ + "phf_shared", + "rand 0.6.5", +] + +[[package]] +name = "phf_shared" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +dependencies = [ + "siphasher", + "unicase 1.4.2", +] + +[[package]] +name = "pkg-config" +version = "0.3.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" + +[[package]] +name = "plugin" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" +dependencies = [ + "typemap", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" + +[[package]] +name = "pretty-bytes" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "009d6edd2c1dbf2e1c0cd48a2f7766e03498d49ada7109a01c6911815c685316" +dependencies = [ + "atty", + "getopts", +] + +[[package]] +name = "proc-macro2" +version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-error" +version = "1.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + +[[package]] +name = "quote" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ + "autocfg 0.1.8", + "libc", + "rand_chacha 0.1.1", + "rand_core 0.4.2", + "rand_hc", + "rand_isaac", + "rand_jitter", + "rand_os", + "rand_pcg", + "rand_xorshift", + "winapi", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.3", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.3.1", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.3", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ + "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ + "libc", + "rand_core 0.4.2", + "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ + "cloudabi", + "fuchsia-cprng", + "libc", + "rand_core 0.4.2", + "rdrand", + "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ + "autocfg 0.1.8", + "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ + "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +dependencies = [ + "bitflags", +] + +[[package]] +name = "remove_dir_all" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +dependencies = [ + "winapi", +] + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "schannel" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +dependencies = [ + "lazy_static", + "windows-sys", +] + +[[package]] +name = "security-framework" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "simple-http-server" +version = "0.6.2" +dependencies = [ + "chrono", + "clap", + "filetime", + "flate2", + "htmlescape", + "hyper-native-tls", + "iron", + "iron-cors", + "lazy_static", + "mime_guess 2.0.4", + "multipart", + "open", + "openssl", + "path-dedot", + "percent-encoding 2.1.0", + "pretty-bytes", + "rand 0.8.5", + "termcolor", + "time", + "url 2.2.2", +] + +[[package]] +name = "siphasher" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + +[[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" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "tempfile" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" +dependencies = [ + "cfg-if", + "fastrand", + "libc", + "redox_syscall", + "remove_dir_all", + "winapi", +] + +[[package]] +name = "termcolor" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "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 = "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 = "traitobject" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" + +[[package]] +name = "twoway" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b11b2b5241ba34be09c3cc85a36e56e48f9888862e19cedf23336d35316ed1" +dependencies = [ + "memchr", +] + +[[package]] +name = "typeable" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" + +[[package]] +name = "typemap" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +dependencies = [ + "unsafe-any", +] + +[[package]] +name = "unicase" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" +dependencies = [ + "version_check 0.1.5", +] + +[[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.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + +[[package]] +name = "unicode-normalization" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "854cbdc4f7bc6ae19c820d44abdc3277ac3e1b2b93db20a636825d9322fb60e6" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" + +[[package]] +name = "unsafe-any" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +dependencies = [ + "traitobject", +] + +[[package]] +name = "url" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +dependencies = [ + "idna 0.1.5", + "matches", + "percent-encoding 1.0.1", +] + +[[package]] +name = "url" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +dependencies = [ + "form_urlencoded", + "idna 0.2.3", + "matches", + "percent-encoding 2.1.0", +] + +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + +[[package]] +name = "version_check" +version = "0.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 = "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.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.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" diff --git a/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix b/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix index 1ecb44aed8..0a8bacb2be 100644 --- a/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/simple-http-server/default.nix @@ -2,20 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "simple-http-server"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "TheWaWaR"; repo = pname; rev = "v${version}"; - sha256 = "01a129i1ph3m8k6zkdcqnnkqbhlqpk7qvvdsz2i2kas54csbgsww"; + sha256 = "sha256-ndLFN9FZZA+zsb+bjZ3gMvQJqo6I92erGOQ44H+/LCg="; }; - cargoSha256 = "050avk6wff8v1dlsfvxwvldmmgfakdxmhglv2bhvc2f3q8cf1d5d"; + cargoLock.lockFile = ./Cargo.lock; + + patches = [ ./0001-cargo-remove-vendored-openssl.patch ]; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sks/default.nix b/third_party/nixpkgs/pkgs/servers/sks/default.nix index 0f21690bbe..2ace06edc9 100644 --- a/third_party/nixpkgs/pkgs/servers/sks/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sks/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix b/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix index 5884e02614..f5d743bde6 100644 --- a/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix +++ b/third_party/nixpkgs/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-uzjcLLWo+67ayaSjAvk2ktBO3s1z0jDyGRj+Q9F6UVQ="; + sha256 = "sha256-LxtVum/yM+G3lyGSsOv3bICQrQC6kZKIMoAA7AnQ8VY="; }; - vendorSha256 = "sha256-AQwd4N4uYEDCsrlxrrGiXAqLcsSA/2MBydHEnH1j+Do="; + vendorSha256 = "sha256-KUB6w03Dw57baRYhRK1wWVWFvjMLx3KOJnS/YLbE7GE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sonarr/default.nix b/third_party/nixpkgs/pkgs/servers/sonarr/default.nix index b944154631..d47ea4c544 100644 --- a/third_party/nixpkgs/pkgs/servers/sonarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sonarr"; - version = "3.0.8.1507"; + version = "3.0.9.1549"; src = fetchurl { url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz"; - sha256 = "sha256-O2UvU1juO54gb9LVnEuIXhT0Ux2rEIq2WdmsoWVDh1w="; + sha256 = "sha256-Ba1nrvnlmVkPI+OEpwShNxfNLrpxS+N7wsx3ajkcGoQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/default.nix b/third_party/nixpkgs/pkgs/servers/spicedb/default.nix new file mode 100644 index 0000000000..a7da457ea3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/spicedb/default.nix @@ -0,0 +1,32 @@ + +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "spicedb"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "authzed"; + repo = "spicedb"; + rev = "v${version}"; + hash = "sha256-X52sf21IMr5muEx9SUoYQmFonXDPeW8NKylPmoAZYjw"; + }; + + vendorHash = "sha256-lO4H2DlMfYuV2BYPnMV3Ynx0khFE6KDxf/aXA53pBpU"; + + subPackages = [ "cmd/spicedb" ]; + + meta = with lib; { + description = "Open source permission database"; + longDescription = '' + SpiceDB is an open-source permissions database inspired by + Google Zanzibar. + ''; + homepage = "https://authzed.com/"; + license = licenses.asl20; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix new file mode 100644 index 0000000000..39ac2ddc6d --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/spicedb/zed.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zed"; + version = "0.4.4"; + + src = fetchFromGitHub { + owner = "authzed"; + repo = "zed"; + rev = "v${version}"; + hash = "sha256-tw8Z8JtmmRLcvFacRDAdIi6TyMtm9FAZvRYNgd49qXg="; + }; + + vendorHash = "sha256-/BxQiaBFkJsySnQRU870CzvPxtPwvdwx4DwSzhaYYYQ="; + + meta = with lib; { + description = "Command line for managing SpiceDB"; + longDescription = '' + SpiceDB is an open-source permissions database inspired by + Google Zanzibar. zed is the command line client for SpiceDB. + ''; + homepage = "https://authzed.com/"; + license = licenses.asl20; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index 072bd79334..5626217fef 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.39.2"; + version = "0.40.15"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-rCGjBb5aiDLPBKYX4jhHxtBDf3Xs1/p1DdsFmdfLNLM="; + sha256 = "sha256-KIV9ZEVmx7gsFHjtb8d0QfDwN7eQTsS2jYBKrKj988Y="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-yemt7hUcLXgC42B2q4+1MalGd3jCMHcVD/Bpq8B2x7M="; + vendorSha256 = "sha256-5FGcM9TFl0BGsN3hryIm1hQDCiRww2AEf2kUw3Uga78="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix index 5f876b455e..2b86df4f9d 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/5.7.x.nix @@ -31,7 +31,6 @@ self = stdenv.mkDerivation rec { outputs = [ "out" "static" ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build. "-DWITH_SSL=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DWITH_UNIT_TESTS=no" diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix index f7611d253e..25115eafeb 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/mysql/8.0.x.nix @@ -34,7 +34,6 @@ self = stdenv.mkDerivation rec { outputs = [ "out" "static" ]; cmakeFlags = [ - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build. "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin. "-DWITH_ROUTER=OFF" # It may be packaged separately. "-DWITH_SYSTEM_LIBS=ON" diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index 7c1ed8b6b3..83bdcec739 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -4,14 +4,13 @@ let # dependencies { stdenv, lib, fetchurl, makeWrapper , glibc, zlib, readline, openssl, icu, lz4, systemd, libossp_uuid - , pkg-config, libxml2, tzdata + , pkg-config, libxml2, tzdata, libkrb5 # This is important to obtain a version of `libpq` that does not depend on systemd. - , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin) - , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic, libkrb5 + , enableSystemd ? (lib.versionAtLeast version "9.6" && !stdenv.isDarwin && !stdenv.hostPlatform.isStatic) + , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic - - # for postgreql.pkgs + # for postgresql.pkgs , this, self, newScope, buildEnv # source specification diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 9e4b3171dd..561c16c964 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.6.0"; + version = "4.7.0"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-DpK3D7PEZ1sO9bYvwwT9L8jtDmUGMbHtx2s9juzL6RQ="; + sha256 = "sha256-Hbg3lf9XEIt5r4sYW+1r1tu6GyBgRXQxrPRWNuZPsvM="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix index 6d34900dee..5d69e312f5 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.3.6"; + version = "2.3.7"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-/GimaiFuMEuw4u9if3Z//1KPT78rvaJ+jNjbG3ugkLA="; + sha256 = "sha256-EodqpYF3wJJdgzHZHqmY0tsrF2YnGirnQWCWaDZ9v8E="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix index f75fbe7137..f01a9d47ad 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.3.0"; + version = "3.3.1"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GWufuOsAYLIOy5MXYVNFWVeVdLntd5ZeUnSdEahlkak="; + sha256 = "sha256-QOIuJM0d1l56ESzTjtm5IIiZx+2oYrO5mIhkAD8kFpQ="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix index 1b71dd01c8..ddc51e8d2b 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pgvector.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pgvector"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { - owner = "ankane"; - repo = pname; + owner = "pgvector"; + repo = "pgvector"; rev = "v${version}"; - sha256 = "sha256-NmUI4pXwf6PHuLbkFy/hoA67j++A2Ju7zG/4og9U+qk="; + sha256 = "sha256-kIgdr3+KC11Qxk1uBTmcN4dDaLIhfo/Fs898boESsBc="; }; buildInputs = [ postgresql ]; @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open-source vector similarity search for PostgreSQL"; - homepage = "https://github.com/ankane/pgvector"; - changelog = "https://github.com/ankane/pgvector/raw/v${version}/CHANGELOG.md"; + homepage = "https://github.com/pgvector/pgvector"; + changelog = "https://github.com/pgvector/pgvector/raw/v${version}/CHANGELOG.md"; license = licenses.postgresql; platforms = postgresql.meta.platforms; maintainers = [ maintainers.marsam ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index 17e2294598..761e90eaad 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql_check"; - version = "2.1.5"; + version = "2.1.8"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DYdZuHraecQZ33xHX6ugiUJVfFVAayD2spIQt2Qqa5U="; + sha256 = "sha256-YFU1gMHtcsdMbUufVi2fkjiD5Mk1q4b+W4c3/fj4rZE="; }; buildInputs = [ postgresql ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix index d0dfa5d00f..d8373f5984 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation rec { pname = "postgis"; - version = "3.2.1"; + version = "3.2.2"; outputs = [ "out" "doc" ]; src = fetchurl { url = "https://download.osgeo.org/postgis/source/postgis-${version}.tar.gz"; - sha256 = "sha256-+6to3ebKOTSyS6CMirDP8llPV/k96rQaFcgq4btpiT4="; + sha256 = "sha256-GM89AT9FsaqO1Z14vHB+nhJeJQ2PBhU5aum/4918PXw="; }; buildInputs = [ libxml2 postgresql geos proj gdal json_c protobufc ] diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix index 4576febce9..f849e62e36 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "repmgr"; - version = "5.3.1"; + version = "5.3.2"; src = fetchFromGitHub { owner = "2ndQuadrant"; repo = "repmgr"; rev = "v${version}"; - sha256 = "sha256-fHoXbFOF3xj/eNHgQIghF15vbDObnuwl2DAH+zRVGZQ="; + sha256 = "sha256-M8FMin9y6nAiPYeT5pUUy0KyZ1dkuH708GshZ6GoXXw="; }; nativeBuildInputs = [ flex ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 219efeea13..384d8140af 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "2.7.0"; + version = "2.7.2"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl libkrb5 ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = version; - sha256 = "sha256-h9mDa4dfr7ksIqd6OZg6L3jyiwPL+fmJJzoXFZH8mqM="; + sha256 = "sha256-roM4a+WWn8aODkS/kvouM6rO4TnVR7hAZmCkJkLpHKQ="; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" "-DTAP_CHECKS=OFF" ] diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/servers/squid/default.nix index 70b9c869f1..2374917038 100644 --- a/third_party/nixpkgs/pkgs/servers/squid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "5.4.1"; + version = "5.6"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v5/${pname}-${version}.tar.xz"; - sha256 = "sha256-300xCpFmOuWcKbD4GD8iYjxeb3MYaa95OAWYerlMpBw="; + sha256 = "sha256-ONJzOKNHWXzg6T0MO+bl9mtnUEF8R0yofuDWG7bRSNs="; }; nativeBuildInputs = [ pkg-config ]; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "http://www.squid-cache.org"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz raskin ]; + maintainers = with maintainers; [ raskin ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix b/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix new file mode 100644 index 0000000000..17a7bb799f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/syncstorage-rs/default.nix @@ -0,0 +1,63 @@ +{ fetchFromGitHub +, rustPlatform +, pkg-config +, python3 +, openssl +, cmake +, libmysqlclient +, makeBinaryWrapper +, lib +}: + +let + pyFxADeps = python3.withPackages (p: [ + p.setuptools # imports pkg_resources + # remainder taken from requirements.txt + p.pyfxa + p.tokenlib + p.cryptography + ]); +in + +rustPlatform.buildRustPackage rec { + pname = "syncstorage-rs"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "mozilla-services"; + repo = pname; + rev = version; + hash = "sha256-VfIpjpBS7LXe32fxIFp7xmbm40VwxUdHIEm5PnMpd4s="; + }; + + nativeBuildInputs = [ + cmake + makeBinaryWrapper + pkg-config + python3 + ]; + + buildInputs = [ + libmysqlclient + openssl + ]; + + preFixup = '' + wrapProgram $out/bin/syncstorage \ + --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]} + ''; + + cargoSha256 = "sha256-JXxArKA/2SIYJvjNA1yZHR9xDKt3N2U7HVMP/6M3BxE="; + + buildFeatures = [ "grpcio/openssl" ]; + + # almost all tests need a DB to test against + doCheck = false; + + meta = { + description = "Mozilla Sync Storage built with Rust"; + homepage = "https://github.com/mozilla-services/syncstorage-rs"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ pennae ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 5678502454..ee17c110e1 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "1.26.2"; + version = "1.28.0"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256:0axcqkqrj4l8c63fd316hp0wlndrbry9x3wml7ssah491f4f3g9w"; + sha256 = "sha256-6h9LAtaDIwQb+oU4zNABJeBOMaiKqWvhxsFbwEQNC4o="; }; - vendorSha256 = "sha256:0b04ihp5ds8vcqv78kjdz5ffn91yid0pn0aq54jawdd4cfb6bmji"; + vendorSha256 = "sha256-W5QiHhdSP5xPIJWs8LMl+EGu/AE9/aFD2sOZOnDL0yo="; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix index c2d44b29a0..ceb8582a68 100644 --- a/third_party/nixpkgs/pkgs/servers/tautulli/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.10.1"; + version = "2.10.2"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qM3PiBZD0AfbhIdJFYFUGYhsB4U6ZZEW4i7S9waP7VE="; + sha256 = "sha256-nEiyYpj5J95tQAFcyRlaF5VEfosCkk4cmdYKLjfeA98="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index 425f8bcb8e..522e6eb98b 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.8.1"; + version = "2.8.2"; # 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-+5A94I9WKFs2/etoQpwImt6yneX8pt44F9NfFF/X0Hk="; + sha256 = "sha256-ycGbzkFwoLWJZTNhHNdMl41reDThKnnB6S5MqgM7u6Q="; stripRoot = false; }; - vendorSha256 = "sha256-QHddmS1edjHckl3tpI9BDL4jjdvsMCw9aA9K/g3fSug="; + vendorSha256 = "sha256-xq3zGGKmWI/QlI49/JhHszTPazu7jcXv2XZBTIvtHxw="; subPackages = [ "cmd/traefik" ]; diff --git a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix b/third_party/nixpkgs/pkgs/servers/ttyd/default.nix index 9553862dc7..60038a2125 100644 --- a/third_party/nixpkgs/pkgs/servers/ttyd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ttyd/default.nix @@ -7,12 +7,12 @@ with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "ErWd99js2EldkRNWFdgZw/X3DIz266kM3lLlC34Deno="; + sha256 = "sha256-Q1A3UMlC3CYzqQxle7XT/o22eWHorMJ5hDXTIT/UMQM="; }; nativeBuildInputs = [ pkg-config cmake xxd ]; diff --git a/third_party/nixpkgs/pkgs/servers/uftp/default.nix b/third_party/nixpkgs/pkgs/servers/uftp/default.nix index 2a80f5ca28..480857cc8a 100644 --- a/third_party/nixpkgs/pkgs/servers/uftp/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "uftp"; - version = "5.0"; + version = "5.0.1"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "1q08schd765fsm9647ac4ic2x70ys2x48mqz97mibdi4bbm72bsn"; + sha256 = "sha256-8ENfvI6f+hJeBWAMtsf8kz19WH9brkGyVyZ75PLODmE="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/servers/unifi/default.nix b/third_party/nixpkgs/pkgs/servers/unifi/default.nix index 72ba0046d2..3631cd936e 100644 --- a/third_party/nixpkgs/pkgs/servers/unifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifi/default.nix @@ -66,7 +66,7 @@ in rec { }; unifi7 = generic { - version = "7.1.66"; - sha256 = "sha256-lLpudaDUWdUM3HKn8yLJJh2XrqfQv7QYwYTV21iFZ7k="; + version = "7.1.68"; + sha256 = "sha256-N12/v1uUPBpU/lXOvj7AjSKo/CjWTjGr9SMIiE/ldF8="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix index 83f745536e..569a814d22 100644 --- a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "sha256-o+dE3SX+Q+nhxUO4biEluLEeQhsZgzjXdWTdQcw/H2o="; + sha256 = "sha256-GcuVFLqMDZo4fm/WspEMyoaYKu7g+HMXXrsvRYS+cAs="; }; - vendorSha256 = "sha256-vo5Saq0QEEKi3/0ZXuQDtlMmEIPwshYHHr8h24cD0sI="; + vendorSha256 = "sha256-xoIqhkPOwlBzgaqejU3efK77EcjgvgLKCUZq1bmyokU="; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; diff --git a/third_party/nixpkgs/pkgs/servers/uxplay/default.nix b/third_party/nixpkgs/pkgs/servers/uxplay/default.nix index 46c68e349f..e11cdad335 100644 --- a/third_party/nixpkgs/pkgs/servers/uxplay/default.nix +++ b/third_party/nixpkgs/pkgs/servers/uxplay/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "uxplay"; - version = "1.52"; + version = "1.55"; src = fetchFromGitHub { owner = "FDH2"; repo = "UxPlay"; rev = "v${version}"; - sha256 = "sha256-2wPUG50fbXLg6w2Rni3NyeiCyUNPcOvxvqopD9QZJaQ="; + sha256 = "sha256-X5+vqGhgEQqjbzSs58t1/znlhlDJHLUwgNokYV7xNhc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/varnish/default.nix b/third_party/nixpkgs/pkgs/servers/varnish/default.nix index e20cc1c972..37705cc689 100644 --- a/third_party/nixpkgs/pkgs/servers/varnish/default.nix +++ b/third_party/nixpkgs/pkgs/servers/varnish/default.nix @@ -2,14 +2,14 @@ , coreutils, python3, makeWrapper }: let - common = { version, sha256, extraNativeBuildInputs ? [] }: + common = { version, hash, extraNativeBuildInputs ? [] }: stdenv.mkDerivation rec { pname = "varnish"; inherit version; src = fetchurl { url = "https://varnish-cache.org/_downloads/${pname}-${version}.tgz"; - inherit sha256; + inherit hash; }; passthru.python = python3; @@ -42,7 +42,7 @@ let description = "Web application accelerator also known as a caching HTTP reverse proxy"; homepage = "https://www.varnish-cache.org"; license = licenses.bsd2; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ ajs124 ]; platforms = platforms.unix; }; }; @@ -50,10 +50,10 @@ in { varnish60 = common { version = "6.0.10"; - sha256 = "1sr60wg5mzjb14y75cga836f19sbmmpgh13mwc4alyg3irsbz1bb"; + hash = "sha256-a4W/dI7jeaoI43UE+G6tS6fgzEDqsXI8CUv+Wh4HJus="; }; varnish71 = common { - version = "7.1.0"; - sha256 = "1flyqr212jamqpwafdil170vc966r1mbb7n3ngjn8xk6hn3bhjpm"; + version = "7.1.1"; + hash = "sha256-LK++JZDn1Yp7rIrZm+kuRA/k04raaBbdiDbyL6UToZA="; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix index aef269907a..2f0f3740ca 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/healthchecks/default.nix @@ -38,7 +38,7 @@ py.pkgs.buildPythonApplication rec { cronsim cryptography django - django_compressor + django-compressor fido2 minio psycopg2 diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix index 92f1713372..dd72cd7f09 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/default.nix @@ -1,7 +1,6 @@ { lib , stdenv -, fetchFromGitHub -, fetchpatch +, fetchzip , makeWrapper , which , nodejs @@ -9,80 +8,44 @@ , fetchYarnDeps , python3 , nixosTests -, buildGoModule }: -let - pinData = lib.importJSON ./pin.json; - - # we need a different version than the one already available in nixpkgs - esbuild-hedgedoc = buildGoModule rec { - pname = "esbuild"; - version = "0.12.27"; - - src = fetchFromGitHub { - owner = "evanw"; - repo = "esbuild"; - rev = "v${version}"; - sha256 = "sha256-UclUTfm6fxoYEEdEEmO/j+WLZLe8SFzt7+Tej4bR0RU="; - }; - - vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; - }; -in - mkYarnPackage rec { pname = "hedgedoc"; - inherit (pinData) version; + version = "1.9.4"; - src = fetchFromGitHub { - owner = "hedgedoc"; - repo = "hedgedoc"; - rev = version; - sha256 = pinData.srcHash; + # 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-YBPxL1/2bj+8cemSBZSNqSlD/DYJRxSG5UuyUipf3R8="; }; nativeBuildInputs = [ which makeWrapper ]; - extraBuildInputs = [ python3 esbuild-hedgedoc ]; + extraBuildInputs = [ python3 ]; + + packageJSON = ./package.json; + yarnFlags = [ "--production" ]; offlineCache = fetchYarnDeps { - inherit yarnLock; - sha256 = pinData.yarnHash; + yarnLock = src + "/yarn.lock"; + sha256 = "sha256-tnxubtu2lv5DKYY4rwQzNwvsFu3pD3NF4VUN/xieqpc="; }; - # FIXME(@Ma27) on the bump to 1.9.0 I had to patch this file manually: - # I replaced `midi "https://github.com/paulrosen/MIDI.js.git#abcjs"` with - # `midi "git+https://github.com/paulrosen/MIDI.js.git#abcjs"` on all occurrences. - # - # Without this change `yarn` attempted to download the code directly from GitHub, with - # the `git+`-prefix it actually uses the `midi.js` version from the offline cache - # created by `yarn2nix`. On future bumps this may be necessary as well! - yarnLock = ./yarn.lock; - packageJSON = ./package.json; - - postConfigure = '' - rm deps/HedgeDoc/node_modules - cp -R "$node_modules" deps/HedgeDoc - chmod -R u+w deps/HedgeDoc + configurePhase = '' + cp -r "$node_modules" node_modules + chmod -R u+w node_modules ''; buildPhase = '' runHook preBuild - cd deps/HedgeDoc - pushd node_modules/sqlite3 export CPPFLAGS="-I${nodejs}/include/node" npm run install --build-from-source --nodedir=${nodejs}/include/node popd - pushd node_modules/esbuild - rm bin/esbuild - ln -s ${lib.getBin esbuild-hedgedoc}/bin/esbuild bin/ - popd - - npm run build - patchShebangs bin/* runHook postBuild @@ -108,7 +71,6 @@ mkYarnPackage rec { ''; passthru = { - updateScript = ./update.sh; tests = { inherit (nixosTests) hedgedoc; }; }; @@ -116,7 +78,7 @@ mkYarnPackage rec { description = "Realtime collaborative markdown notes on all platforms"; license = licenses.agpl3; homepage = "https://hedgedoc.org"; - maintainers = with maintainers; [ willibutz globin ]; + maintainers = with maintainers; [ willibutz SuperSandro2000 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json index 80d86d9ccb..fcf8c6d68c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/package.json @@ -1,6 +1,6 @@ { "name": "HedgeDoc", - "version": "1.9.0", + "version": "1.9.4", "description": "The best platform to write and share markdown.", "main": "app.js", "license": "AGPL-3.0", @@ -30,25 +30,25 @@ "compression": "^1.6.2", "connect-flash": "^0.1.1", "connect-session-sequelize": "^7.1.2", - "cookie": "^0.4.0", + "cookie": "^0.5.0", "cookie-parser": "^1.4.3", "deep-freeze": "^0.0.1", "diff-match-patch": "git+https://github.com/hackmdio/diff-match-patch.git", "ejs": "^3.0.0", "express": ">=4.14", "express-session": "^1.14.2", - "file-type": "^16.1.0", - "formidable": "^1.0.17", + "file-type": "^17.0.0", + "formidable": "^2.0.0", "graceful-fs": "^4.1.11", "helmet": "^4.5.0", - "i18n": "^0.13.0", + "i18n": "^0.15.0", "is-svg": "^4.3.1", "jsdom-nogyp": "^0.8.3", "lodash": "^4.17.20", "lutim": "^1.0.2", "lz-string": "git+https://github.com/hackmdio/lz-string.git", - "mariadb": "^2.1.2", - "markdown-it": "^12.0.0", + "mariadb": "^3.0.0", + "markdown-it": "^13.0.0", "markdown-it-abbr": "^1.0.4", "markdown-it-container": "^3.0.0", "markdown-it-deflist": "^2.0.1", @@ -65,12 +65,12 @@ "meta-marked": "git+https://github.com/hedgedoc/meta-marked", "method-override": "^3.0.0", "minimist": "^1.2.0", - "minio": "^7.0.19", + "minio": "7.0.29", "moment": "^2.17.1", "morgan": "^1.7.0", "mysql2": "^2.0.0", "node-fetch": "^2.6.1", - "passport": "^0.4.0", + "passport": "^0.6.0", "passport-dropbox-oauth2": "^1.1.0", "passport-facebook": "^3.0.0", "passport-github": "^1.1.0", @@ -85,7 +85,7 @@ "pdfobject": "^2.0.201604172", "pg": "^8.2.1", "pg-hstore": "^2.3.3", - "prom-client": "^13.1.0", + "prom-client": "^14.0.0", "prometheus-api-metrics": "^3.2.0", "randomcolor": "^0.6.0", "readline-sync": "^1.4.7", @@ -94,7 +94,7 @@ "sequelize": "^5.21.1", "shortid": "2.2.16", "socket.io": "^2.1.1", - "sqlite3": "^5.0.0", + "sqlite3": "^5.0.8", "store": "^2.0.12", "string": "^3.3.3", "toobusy-js": "^0.5.1", @@ -104,13 +104,8 @@ "winston": "^3.1.0", "xss": "^1.0.3" }, - "resolutions": { - "**/tough-cookie": "~2.5.0", - "**/minimatch": "^3.0.2", - "**/request": "^2.88.0" - }, "engines": { - "node": ">=12" + "node": "^14.13.1 || 16.x" }, "bugs": "https://github.com/hedgedoc/hedgedoc/issues", "keywords": [ @@ -139,7 +134,7 @@ "url": "https://github.com/hedgedoc/hedgedoc.git" }, "devDependencies": { - "abcjs": "5.12.0", + "abcjs": "6.0.3", "babel-cli": "6.26.0", "babel-core": "6.26.3", "babel-loader": "7.1.5", @@ -153,19 +148,20 @@ "copy-webpack-plugin": "6.4.1", "css-loader": "5.2.7", "emojify.js": "1.1.0", - "esbuild-loader": "2.15.1", + "esbuild-loader": "2.19.0", "escape-html": "1.0.3", - "eslint": "7.32.0", - "eslint-config-standard": "16.0.3", - "eslint-plugin-import": "2.24.2", + "eslint": "8.19.0", + "eslint-config-standard": "17.0.0", + "eslint-plugin-import": "2.26.0", + "eslint-plugin-n": "15.2.4", "eslint-plugin-node": "11.1.0", - "eslint-plugin-promise": "5.1.0", + "eslint-plugin-promise": "6.0.0", "eslint-plugin-standard": "4.1.0", "exports-loader": "1.1.1", "expose-loader": "1.0.3", "file-loader": "6.2.0", "file-saver": "2.0.5", - "flowchart.js": "1.15.0", + "flowchart.js": "1.17.1", "fork-awesome": "1.2.0", "gist-embed": "2.6.0", "highlight.js": "10.7.3", @@ -174,28 +170,28 @@ "ionicons": "2.0.1", "jquery": "3.6.0", "jquery-mousewheel": "3.1.13", - "jquery-ui": "1.12.1", + "jquery-ui": "1.13.1", "js-cookie": "3.0.1", "js-sequence-diagrams": "git+https://github.com/hedgedoc/js-sequence-diagrams.git", "js-yaml": "3.14.1", "jsonlint": "1.6.3", "keymaster": "1.6.2", - "less": "4.1.1", + "less": "4.1.3", "less-loader": "7.3.0", "list.js": "2.3.1", "mathjax": "2.7.9", - "mermaid": "8.12.1", + "mermaid": "9.1.3", "mini-css-extract-plugin": "1.6.2", - "mocha": "9.1.1", + "mocha": "10.0.0", "mock-require": "3.0.3", "optimize-css-assets-webpack-plugin": "6.0.1", - "prismjs": "1.24.1", + "prismjs": "1.28.0", "raphael": "2.3.0", - "remark-cli": "10.0.0", - "remark-preset-lint-markdown-style-guide": "5.0.1", + "remark-cli": "11.0.0", + "remark-preset-lint-markdown-style-guide": "5.1.2", "reveal.js": "3.9.2", "select2": "3.5.2-browserify", - "socket.io-client": "2.4.0", + "socket.io-client": "2.5.0", "spin.js": "4.1.1", "string-loader": "0.0.1", "turndown": "7.1.1", @@ -204,7 +200,7 @@ "visibilityjs": "2.0.2", "viz.js": "1.8.2", "webpack": "4.46.0", - "webpack-cli": "4.8.0", + "webpack-cli": "4.10.0", "webpack-merge": "5.8.0", "wurl": "2.5.4" }, diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/pin.json b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/pin.json deleted file mode 100644 index a27498808f..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/pin.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": "1.9.0", - "srcHash": "hSKQGkI1+68Zf05RhgRKZo47buyobzjhURSZ30/h0PA=", - "yarnHash": "0v51jmmbg8fx66ay2glby0gxw07in95igz325p42g5hjd5kankf6" -} diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/update.sh b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/update.sh index e61101e457..6403eb5da7 100755 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/update.sh +++ b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/update.sh @@ -1,5 +1,7 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github +#!nix-shell -I nixpkgs=../../../../ -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq +set -euo pipefail +cd "$(dirname "$0")" if [ "$#" -gt 1 ] || [[ "$1" == -* ]]; then echo "Regenerates packaging data for the element packages." @@ -9,24 +11,16 @@ fi version="$1" -set -euo pipefail - if [ -z "$version" ]; then version="$(wget -O- "https://api.github.com/repos/hedgedoc/hedgedoc/releases?per_page=1" | jq -r '.[0].tag_name')" fi src="https://raw.githubusercontent.com/hedgedoc/hedgedoc/$version" wget "$src/package.json" -O package.json -wget "$src/yarn.lock" -O yarn.lock -sed 's;midi "https://github\.com/paulrosen/MIDI\.js\.git;midi "git+https://github.com/paulrosen/MIDI.js.git;g' -i yarn.lock -src_hash=$(nix-prefetch-github hedgedoc hedgedoc --rev ${version} | jq -r .sha256) +src_hash=$(nix-prefetch-github hedgedoc hedgedoc --rev "${version}" | jq -r .sha256) yarn_hash=$(prefetch-yarn-deps yarn.lock) -cat > pin.json << EOF -{ - "version": "$version", - "srcHash": "$src_hash", - "yarnHash": "$yarn_hash" -} -EOF +sed -i "s/version = \".*\"/version = \"$version\"/" default.nix +sed -i "s/hash = \".*\"/hash = \"$src_hash\"/" default.nix +sed -i "s/sha256 = \".*\"/sha256 = \"$yarn_hash\"/" default.nix diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock b/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock deleted file mode 100644 index e7020b8325..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/hedgedoc/yarn.lock +++ /dev/null @@ -1,11615 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/code-frame@7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" - integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== - dependencies: - "@babel/highlight" "^7.10.4" - -"@babel/code-frame@^7.0.0": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" - integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== - dependencies: - "@babel/highlight" "^7.14.5" - -"@babel/helper-validator-identifier@^7.14.5": - version "7.14.9" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" - integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== - -"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" - integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== - dependencies: - "@babel/helper-validator-identifier" "^7.14.5" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@braintree/sanitize-url@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz#8ff71d51053cd5ee4981e5a501d80a536244f7fd" - integrity sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg== - -"@dabh/diagnostics@^2.0.2": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.2.tgz#290d08f7b381b8f94607dc8f471a12c675f9db31" - integrity sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q== - dependencies: - colorspace "1.1.x" - enabled "2.0.x" - kuler "^2.0.0" - -"@discoveryjs/json-ext@^0.5.0": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d" - integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== - -"@eslint/eslintrc@^0.4.3": - version "0.4.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" - integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== - dependencies: - ajv "^6.12.4" - debug "^4.1.1" - espree "^7.3.0" - globals "^13.9.0" - ignore "^4.0.6" - import-fresh "^3.2.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - strip-json-comments "^3.1.1" - -"@gar/promisify@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" - integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== - -"@humanwhocodes/config-array@^0.5.0": - version "0.5.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" - integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== - dependencies: - "@humanwhocodes/object-schema" "^1.2.0" - debug "^4.1.1" - minimatch "^3.0.4" - -"@humanwhocodes/object-schema@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" - integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== - -"@nodelib/fs.scandir@2.1.5": - version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" - integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== - dependencies: - "@nodelib/fs.stat" "2.0.5" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": - version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" - integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== - -"@nodelib/fs.walk@^1.2.3": - version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" - integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== - dependencies: - "@nodelib/fs.scandir" "2.1.5" - fastq "^1.6.0" - -"@npmcli/fs@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f" - integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ== - dependencies: - "@gar/promisify" "^1.0.1" - semver "^7.3.5" - -"@npmcli/move-file@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" - integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== - dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" - -"@passport-next/passport-openid@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@passport-next/passport-openid/-/passport-openid-1.0.0.tgz#d3b5e067a9aa1388ed172ab7cc02c39b8634283d" - integrity sha512-W9uj4Ui/ZK/iBUNzSNxPWDQ8wCD1tUddGEVSGm0FN0B7ewo3yBQLGMoW3i3UqcwEzxdyGbAj06ohAhNQIXC4VA== - dependencies: - "@passport-next/passport-strategy" "1.x.x" - openid "2.x.x" - -"@passport-next/passport-strategy@1.x.x": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@passport-next/passport-strategy/-/passport-strategy-1.1.0.tgz#4c0df069e2ec9262791b9ef1e23320c1d73bdb74" - integrity sha512-2KhFjtPueJG6xVj2HnqXt9BlANOfYCVLyu+pXYjPGBDT8yk+vQwc/6tsceIj+mayKcoxMau2JimggXRPHgoc8w== - -"@tokenizer/token@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" - integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A== - -"@trysound/sax@0.2.0": - version "0.2.0" - resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad" - integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA== - -"@types/accepts@*": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" - integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ== - dependencies: - "@types/node" "*" - -"@types/body-parser@*": - version "1.19.1" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" - integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg== - dependencies: - "@types/connect" "*" - "@types/node" "*" - -"@types/concat-stream@^1.0.0": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@types/concat-stream/-/concat-stream-1.6.1.tgz#24bcfc101ecf68e886aaedce60dfd74b632a1b74" - integrity sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA== - dependencies: - "@types/node" "*" - -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== - dependencies: - "@types/node" "*" - -"@types/content-disposition@*": - version "0.5.4" - resolved "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.4.tgz#de48cf01c79c9f1560bcfd8ae43217ab028657f8" - integrity sha512-0mPF08jn9zYI0n0Q/Pnz7C4kThdSt+6LD4amsrYDDpgBfrVWa3TcCOxKX1zkGgYniGagRv8heN2cbh+CAn+uuQ== - -"@types/cookies@*": - version "0.7.7" - resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.7.tgz#7a92453d1d16389c05a5301eef566f34946cfd81" - integrity sha512-h7BcvPUogWbKCzBR2lY4oqaZbO3jXZksexYJVFvkrFeLgbZjQkU4x8pRq6eg2MHXQhY0McQdqmmsxRWlVAHooA== - dependencies: - "@types/connect" "*" - "@types/express" "*" - "@types/keygrip" "*" - "@types/node" "*" - -"@types/debug@^4.0.0": - version "4.1.7" - resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" - integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== - dependencies: - "@types/ms" "*" - -"@types/express-serve-static-core@^4.17.12", "@types/express-serve-static-core@^4.17.18": - version "4.17.24" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" - integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@*", "@types/express@^4.17.8": - version "4.17.13" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" - integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/geojson@^7946.0.7": - version "7946.0.8" - resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" - integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== - -"@types/hast@^2.0.0": - version "2.3.4" - resolved "https://registry.yarnpkg.com/@types/hast/-/hast-2.3.4.tgz#8aa5ef92c117d20d974a82bdfb6a648b08c0bafc" - integrity sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g== - dependencies: - "@types/unist" "*" - -"@types/html-minifier-terser@^5.0.0": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57" - integrity sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w== - -"@types/http-assert@*": - version "1.5.3" - resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.3.tgz#ef8e3d1a8d46c387f04ab0f2e8ab8cb0c5078661" - integrity sha512-FyAOrDuQmBi8/or3ns4rwPno7/9tJTijVW6aQQjK02+kOQ8zmoNg2XJtAuQhvQcy1ASJq38wirX5//9J1EqoUA== - -"@types/http-errors@*": - version "1.8.1" - resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.1.tgz#e81ad28a60bee0328c6d2384e029aec626f1ae67" - integrity sha512-e+2rjEwK6KDaNOm5Aa9wNGgyS9oSZU/4pfSMMPYNOfjvFI0WVXm29+ITRFr6aKDvvKo7uU1jV68MW4ScsfDi7Q== - -"@types/is-empty@^1.0.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@types/is-empty/-/is-empty-1.2.0.tgz#16bc578060c9b0b6953339eea906c255a375bf86" - integrity sha512-brJKf2boFhUxTDxlpI7cstwiUtA2ovm38UzFTi9aZI6//ARncaV+Q5ALjCaJqXaMtdZk/oPTJnSutugsZR6h8A== - -"@types/js-yaml@^4.0.0": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-4.0.3.tgz#9f33cd6fbf0d5ec575dc8c8fc69c7fec1b4eb200" - integrity sha512-5t9BhoORasuF5uCPr+d5/hdB++zRFUTMIZOzbNkr+jZh3yQht4HYbRDyj9fY8n2TZT30iW9huzav73x4NikqWg== - -"@types/json-schema@^7.0.8": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= - -"@types/keygrip@*": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.2.tgz#513abfd256d7ad0bf1ee1873606317b33b1b2a72" - integrity sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw== - -"@types/koa-compose@*": - version "3.2.5" - resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.5.tgz#85eb2e80ac50be95f37ccf8c407c09bbe3468e9d" - integrity sha512-B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ== - dependencies: - "@types/koa" "*" - -"@types/koa@*", "@types/koa@^2.11.4": - version "2.13.4" - resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.4.tgz#10620b3f24a8027ef5cbae88b393d1b31205726b" - integrity sha512-dfHYMfU+z/vKtQB7NUrthdAEiSvnLebvBjwHtfFmpZmB7em2N3WVQdHgnFq+xvyVgxW5jKDmjWfLD3lw4g4uTw== - dependencies: - "@types/accepts" "*" - "@types/content-disposition" "*" - "@types/cookies" "*" - "@types/http-assert" "*" - "@types/http-errors" "*" - "@types/keygrip" "*" - "@types/koa-compose" "*" - "@types/node" "*" - -"@types/ldapjs@^1.0.9": - version "1.0.11" - resolved "https://registry.yarnpkg.com/@types/ldapjs/-/ldapjs-1.0.11.tgz#34077176af2b06186bd54e4a38ceb6e852387fa4" - integrity sha512-O4D1frY6xy2mQr5WouNPeltMe5EHdmU4FxbLDC6TMDX5HXOuafusGu+7Y9WAoqBaYHZ5hcFa7jfkpggyexfeXQ== - 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" - integrity sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA== - dependencies: - "@types/unist" "*" - -"@types/mime@^1": - version "1.3.2" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" - integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== - -"@types/ms@*": - version "0.7.31" - resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" - integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== - -"@types/node@*", "@types/node@^16.0.0": - version "16.9.1" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708" - integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g== - -"@types/node@^14.14.28": - version "14.17.15" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.15.tgz#d5ebfb62a69074ebb85cbe0529ad917bb8f2bae8" - integrity sha512-D1sdW0EcSCmNdLKBGMYb38YsHUS6JcM7yQ6sLQ9KuZ35ck7LYCKE7kYFHOO59ayFOY3zobWVZxf4KXhYHcHYFA== - -"@types/parse5@^6.0.0": - version "6.0.1" - resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.1.tgz#f8ae4fbcd2b9ba4ff934698e28778961f9cb22ca" - integrity sha512-ARATsLdrGPUnaBvxLhUlnltcMgn7pQG312S8ccdYlnyijabrX9RN/KN/iGj9Am96CoW8e/K9628BA7Bv4XHdrA== - -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== - -"@types/serve-static@*": - version "1.13.10" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9" - integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ== - dependencies: - "@types/mime" "^1" - "@types/node" "*" - -"@types/source-list-map@*": - version "0.1.2" - resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" - integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== - -"@types/supports-color@^8.0.0": - version "8.1.1" - resolved "https://registry.yarnpkg.com/@types/supports-color/-/supports-color-8.1.1.tgz#1b44b1b096479273adf7f93c75fc4ecc40a61ee4" - integrity sha512-dPWnWsf+kzIG140B8z2w3fr5D03TLWbOAFQl45xUpI3vcizeXriNR5VYkWZ+WTMsUHqZ9Xlt3hrxGNANFyNQfw== - -"@types/tapable@^1", "@types/tapable@^1.0.5": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" - integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ== - -"@types/text-table@^0.2.0": - version "0.2.2" - resolved "https://registry.yarnpkg.com/@types/text-table/-/text-table-0.2.2.tgz#774c90cfcfbc8b4b0ebb00fecbe861dc8b1e8e26" - integrity sha512-dGoI5Af7To0R2XE8wJuc6vwlavWARsCh3UKJPjWs1YEqGUqfgBI/j/4GX0yf19/DsDPPf0YAXWAp8psNeIehLg== - -"@types/uglify-js@*": - version "3.13.1" - resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea" - integrity sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ== - dependencies: - source-map "^0.6.1" - -"@types/unist@*", "@types/unist@^2.0.0": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d" - integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ== - -"@types/webpack-sources@*": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b" - integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg== - dependencies: - "@types/node" "*" - "@types/source-list-map" "*" - source-map "^0.7.3" - -"@types/webpack@^4.41.8": - version "4.41.31" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa" - integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ== - dependencies: - "@types/node" "*" - "@types/tapable" "^1" - "@types/uglify-js" "*" - "@types/webpack-sources" "*" - anymatch "^3.0.0" - source-map "^0.6.0" - -"@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== - -"@webassemblyjs/ast@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" - integrity sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA== - dependencies: - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/wast-parser" "1.9.0" - -"@webassemblyjs/floating-point-hex-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4" - integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA== - -"@webassemblyjs/helper-api-error@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2" - integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw== - -"@webassemblyjs/helper-buffer@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00" - integrity sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA== - -"@webassemblyjs/helper-code-frame@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz#647f8892cd2043a82ac0c8c5e75c36f1d9159f27" - integrity sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA== - dependencies: - "@webassemblyjs/wast-printer" "1.9.0" - -"@webassemblyjs/helper-fsm@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz#c05256b71244214671f4b08ec108ad63b70eddb8" - integrity sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw== - -"@webassemblyjs/helper-module-context@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz#25d8884b76839871a08a6c6f806c3979ef712f07" - integrity sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g== - dependencies: - "@webassemblyjs/ast" "1.9.0" - -"@webassemblyjs/helper-wasm-bytecode@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790" - integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw== - -"@webassemblyjs/helper-wasm-section@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346" - integrity sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - -"@webassemblyjs/ieee754@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4" - integrity sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95" - integrity sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab" - integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w== - -"@webassemblyjs/wasm-edit@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf" - integrity sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/helper-wasm-section" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - "@webassemblyjs/wasm-opt" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - "@webassemblyjs/wast-printer" "1.9.0" - -"@webassemblyjs/wasm-gen@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c" - integrity sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/ieee754" "1.9.0" - "@webassemblyjs/leb128" "1.9.0" - "@webassemblyjs/utf8" "1.9.0" - -"@webassemblyjs/wasm-opt@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61" - integrity sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-buffer" "1.9.0" - "@webassemblyjs/wasm-gen" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - -"@webassemblyjs/wasm-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e" - integrity sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-api-error" "1.9.0" - "@webassemblyjs/helper-wasm-bytecode" "1.9.0" - "@webassemblyjs/ieee754" "1.9.0" - "@webassemblyjs/leb128" "1.9.0" - "@webassemblyjs/utf8" "1.9.0" - -"@webassemblyjs/wast-parser@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz#3031115d79ac5bd261556cecc3fa90a3ef451914" - integrity sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/floating-point-hex-parser" "1.9.0" - "@webassemblyjs/helper-api-error" "1.9.0" - "@webassemblyjs/helper-code-frame" "1.9.0" - "@webassemblyjs/helper-fsm" "1.9.0" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/wast-printer@1.9.0": - version "1.9.0" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899" - integrity sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/wast-parser" "1.9.0" - "@xtuc/long" "4.2.2" - -"@webpack-cli/configtest@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz#f03ce6311c0883a83d04569e2c03c6238316d2aa" - integrity sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ== - -"@webpack-cli/info@^1.3.0": - version "1.3.0" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz#9d78a31101a960997a4acd41ffd9b9300627fe2b" - integrity sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w== - dependencies: - envinfo "^7.7.3" - -"@webpack-cli/serve@^1.5.2": - version "1.5.2" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz#ea584b637ff63c5a477f6f21604b5a205b72c9ec" - integrity sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw== - -"@xmldom/xmldom@^0.7.0", "@xmldom/xmldom@^0.7.2": - version "0.7.4" - resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.4.tgz#93b2f9486c88b6464e97f76c9ab49b0a548fbe57" - integrity sha512-wdxC79cvO7PjSM34jATd/RYZuYWQ8y/R7MidZl1NYYlbpFn1+spfjkiR3ZsJfcaTs2IyslBN7VwBBJwrYKM+zw== - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -"@zxing/text-encoding@0.9.0": - version "0.9.0" - resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b" - integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA== - -"Idle.Js@git+https://github.com/shawnmclean/Idle.js": - version "0.0.1" - resolved "git+https://github.com/shawnmclean/Idle.js#2b57cc6e49d177b7ddce0cca00ef5cbe07453541" - -JSV@^4.0.x: - version "4.0.2" - resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57" - integrity sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c= - -abbrev@1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -abcjs@5.10.3: - version "5.10.3" - resolved "https://registry.yarnpkg.com/abcjs/-/abcjs-5.10.3.tgz#294702140ec1caa292859ba9d2af0452f7e9e046" - integrity sha512-YGmW4CUWd7T2/HqZa/SQOTE+lXg7Z68HwwpJhHJBvdHqLi1uLCiYva1ZRGhB/MPyl1QKqJMfF+LQ1jGAEK69XQ== - dependencies: - midi "git+https://github.com/paulrosen/MIDI.js.git#abcjs" - -abcjs@5.11.0: - version "5.11.0" - resolved "https://registry.yarnpkg.com/abcjs/-/abcjs-5.11.0.tgz#397592ea6a56948aee64a8364f9a7a589e254300" - integrity sha512-kLehHwwttcTCVhKQaDkmqYbWBLAWmfyzYSbUQoEDAOTOX5RzDGakX8tXpzlsNHw6Lh8W8odZw44e0siwbG4TKA== - dependencies: - abcjs "5.10.3" - midi "git+https://github.com/paulrosen/MIDI.js.git#abcjs" - -abcjs@5.12.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/abcjs/-/abcjs-5.12.0.tgz#06fec076d570821309b0a12598cd356cd589eb08" - integrity sha512-pvi7SjOAKT7cRyRtywUSwYB0SNtRHKLxZUZ9Oc4E+nvpBHr8Z2/M9Pfyv3oIaiEpxlWTFK+B/H5t/DckiNFgpg== - dependencies: - abcjs "5.11.0" - midi "git+https://github.com/paulrosen/MIDI.js.git#abcjs" - -abstract-logging@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/abstract-logging/-/abstract-logging-2.0.1.tgz#6b0c371df212db7129b57d2e7fcf282b8bf1c839" - integrity sha512-2BjRTZxTPvheOvGbBslFSYOUkr+SjPtOnrLP33f+VIWLzezQpZcqVg7ja3L4dBXmzzgwT+a029jRx5PCi3JuiA== - -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: - version "1.3.7" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" - integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== - dependencies: - mime-types "~2.1.24" - negotiator "0.6.2" - -acorn-jsx@^5.3.1: - version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" - integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== - -acorn@^6.4.1: - version "6.4.2" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" - integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== - -acorn@^7.4.0: - version "7.4.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" - integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== - -after@0.8.2: - version "0.8.2" - resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f" - integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8= - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - -ajv-errors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" - integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== - -ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: - version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^8.0.1: - version "8.6.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.3.tgz#11a66527761dc3e9a3845ea775d2d3c0414e8764" - integrity sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - -alphanum-sort@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" - integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= - -ansi-colors@4.1.1, 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@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== - -ansi-regex@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" - integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== - -ansi-styles@^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@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" - integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - dependencies: - color-convert "^2.0.1" - -ansi-styles@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178" - integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg= - -any-promise@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" - integrity sha1-q8av7tzqUugJzcA3au0845Y10X8= - -anymatch@^1.3.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a" - integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA== - dependencies: - micromatch "^2.1.5" - normalize-path "^2.0.0" - -anymatch@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw== - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -anymatch@^3.0.0, anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -aproba@^1.0.3, aproba@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== - -archiver-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2" - integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw== - dependencies: - glob "^7.1.4" - graceful-fs "^4.2.0" - lazystream "^1.0.0" - lodash.defaults "^4.2.0" - lodash.difference "^4.5.0" - lodash.flatten "^4.4.0" - lodash.isplainobject "^4.0.6" - lodash.union "^4.6.0" - normalize-path "^3.0.0" - readable-stream "^2.0.0" - -archiver@^5.0.2: - version "5.3.0" - resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.0.tgz#dd3e097624481741df626267564f7dd8640a45ba" - integrity sha512-iUw+oDwK0fgNpvveEsdQ0Ase6IIKztBJU2U0E9MzszMfmVVUyv1QJhS2ITW9ZCqx8dktAxVAjWWkKehuZE8OPg== - dependencies: - archiver-utils "^2.1.0" - async "^3.2.0" - buffer-crc32 "^0.2.1" - readable-stream "^3.6.0" - readdir-glob "^1.0.0" - tar-stream "^2.2.0" - zip-stream "^4.1.0" - -are-we-there-yet@~1.1.2: - version "1.1.7" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" - integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== - dependencies: - delegates "^1.0.0" - readable-stream "^2.0.6" - -argparse@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== - dependencies: - sprintf-js "~1.0.2" - -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== - -arr-diff@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf" - integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8= - dependencies: - arr-flatten "^1.0.1" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= - -arr-flatten@^1.0.1, arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg== - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= - -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= - -array-includes@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" - integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" - get-intrinsic "^1.1.1" - is-string "^1.0.5" - -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== - -array-unique@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53" - integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM= - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= - -array.prototype.flat@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" - integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - -arraybuffer.slice@~0.0.7: - version "0.0.7" - resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675" - integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog== - -asn1.js@^5.2.0: - version "5.4.1" - resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" - integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== - dependencies: - bn.js "^4.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - safer-buffer "^2.1.0" - -asn1@^0.2.4, asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== - dependencies: - safer-buffer "~2.1.0" - -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= - -assert@^1.1.1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" - integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA== - dependencies: - object-assign "^4.1.1" - util "0.10.3" - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= - -astral-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" - integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== - -async-each@^1.0.0, async-each@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf" - integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ== - -async@0.9.x: - version "0.9.2" - resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" - integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= - -async@^1.4.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" - integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= - -async@^3.0.0, async@^3.1.0, async@^3.2.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/async/-/async-3.2.1.tgz#d3274ec66d107a47476a4c49136aacdb00665fc8" - integrity sha512-XdD5lRO/87udXCMC9meWdYiR+Nq6ZjUfXidViUZGu2F1MO4T3XwZ1et0hb2++BgLfhyJwy44BGB/yx80ABx8hg== - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= - -atob@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== - -available-typed-arrays@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" - integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== - -aws-sdk@^2.987.0: - version "2.988.0" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.988.0.tgz#46538de14c4c5cd3d7718badedffd31471a0c0e9" - integrity sha512-2b56fPJ9vHgLnDeZ6NDgQzzJT/0NbSGNYIzGZx47/FROwoxRArqt9agiQ14y1zlXPsP9QNKPjp6HsW4IFLjGWQ== - dependencies: - buffer "4.9.2" - events "1.1.1" - ieee754 "1.1.13" - jmespath "0.15.0" - querystring "0.2.0" - sax "1.2.1" - url "0.10.3" - uuid "3.3.2" - xml2js "0.4.19" - -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.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== - -axios@^0.21.1: - version "0.21.4" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575" - integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg== - dependencies: - follow-redirects "^1.14.0" - -azure-storage@^2.7.0: - version "2.10.4" - resolved "https://registry.yarnpkg.com/azure-storage/-/azure-storage-2.10.4.tgz#c481d207eabc05f57f019b209f7faa8737435104" - integrity sha512-zlfRPl4js92JC6+79C2EUmNGYjSknRl8pOiHQF78zy+pbOFOHtlBF6BU/OxPeHQX3gaa6NdEZnVydFxhhndkEw== - dependencies: - browserify-mime "~1.2.9" - extend "^3.0.2" - json-edm-parser "0.1.2" - md5.js "1.3.4" - readable-stream "~2.0.0" - request "^2.86.0" - underscore "^1.12.1" - uuid "^3.0.0" - validator "~9.4.1" - xml2js "0.2.8" - xmlbuilder "^9.0.7" - -babel-cli@6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.26.0.tgz#502ab54874d7db88ad00b887a06383ce03d002f1" - integrity sha1-UCq1SHTX24itALiHoGODzgPQAvE= - dependencies: - babel-core "^6.26.0" - babel-polyfill "^6.26.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - commander "^2.11.0" - convert-source-map "^1.5.0" - fs-readdir-recursive "^1.0.0" - glob "^7.1.2" - lodash "^4.17.4" - output-file-sync "^1.1.2" - path-is-absolute "^1.0.1" - slash "^1.0.0" - source-map "^0.5.6" - v8flags "^2.1.1" - optionalDependencies: - chokidar "^1.6.1" - -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.3, babel-core@^6.26.0: - 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-builder-binary-assignment-operator-visitor@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664" - integrity sha1-zORReto1b0IgvK6KAsKzRvmlZmQ= - dependencies: - babel-helper-explode-assignable-expression "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-call-delegate@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d" - integrity sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340= - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-helper-define-map@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f" - integrity sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8= - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-helper-explode-assignable-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa" - integrity sha1-8luCz33BBDPFX3BZLVdGQArCLKo= - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.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-hoist-variables@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76" - integrity sha1-HssnaJydJVE+rbyZFKc/VAi+enY= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-optimise-call-expression@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257" - integrity sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-helper-regex@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72" - integrity sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI= - dependencies: - babel-runtime "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -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-helper-replace-supers@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a" - integrity sha1-v22/5Dk40XNpohPKiov3S2qQqxo= - dependencies: - babel-helper-optimise-call-expression "^6.24.1" - babel-messages "^6.23.0" - 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-loader@7.1.5: - version "7.1.5" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.1.5.tgz#e3ee0cd7394aa557e013b02d3e492bfd07aa6d68" - integrity sha512-iCHfbieL5d1LfOQeeVJEUyD9rTwBcP/fcEbRCfempxTDuqrKpu0AZjLAQHEQa3Yqyj9ORKe2iHfoj4rHLf7xpw== - dependencies: - find-cache-dir "^1.0.0" - loader-utils "^1.0.2" - mkdirp "^0.5.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-check-es2015-constants@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a" - integrity sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o= - 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-syntax-exponentiation-operator@^6.8.0: - version "6.13.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" - integrity sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4= - -babel-plugin-syntax-trailing-function-commas@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3" - integrity sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM= - -babel-plugin-transform-async-to-generator@^6.22.0: - 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-plugin-transform-es2015-arrow-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221" - integrity sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141" - integrity sha1-u8UbSflk1wy42OC5ToICRs46YUE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-block-scoping@^6.23.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" - integrity sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8= - dependencies: - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - lodash "^4.17.4" - -babel-plugin-transform-es2015-classes@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db" - integrity sha1-WkxYpQyclGHlZLSyo7+ryXolhNs= - dependencies: - babel-helper-define-map "^6.24.1" - babel-helper-function-name "^6.24.1" - babel-helper-optimise-call-expression "^6.24.1" - babel-helper-replace-supers "^6.24.1" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-computed-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3" - integrity sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM= - dependencies: - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-destructuring@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d" - integrity sha1-mXux8auWf2gtKwh2/jWNYOdlxW0= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-duplicate-keys@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e" - integrity sha1-c+s9MQypaePvnskcU3QabxV2Qj4= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-for-of@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691" - integrity sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-function-name@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b" - integrity sha1-g0yJhTvDaxrw86TF26qU/Y6sqos= - dependencies: - babel-helper-function-name "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e" - integrity sha1-T1SgLWzWbPkVKAAZox0xklN3yi4= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154" - integrity sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ= - dependencies: - babel-plugin-transform-es2015-modules-commonjs "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.2" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" - integrity sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q== - dependencies: - babel-plugin-transform-strict-mode "^6.24.1" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-types "^6.26.0" - -babel-plugin-transform-es2015-modules-systemjs@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23" - integrity sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM= - dependencies: - babel-helper-hoist-variables "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-modules-umd@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468" - integrity sha1-rJl+YoXNGO1hdq22B9YCNErThGg= - dependencies: - babel-plugin-transform-es2015-modules-amd "^6.24.1" - babel-runtime "^6.22.0" - babel-template "^6.24.1" - -babel-plugin-transform-es2015-object-super@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d" - integrity sha1-JM72muIcuDp/hgPa0CH1cusnj40= - dependencies: - babel-helper-replace-supers "^6.24.1" - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-parameters@^6.23.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b" - integrity sha1-V6w1GrScrxSpfNE7CfZv3wpiXys= - dependencies: - babel-helper-call-delegate "^6.24.1" - 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-plugin-transform-es2015-shorthand-properties@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0" - integrity sha1-JPh11nIch2YbvZmkYi5R8U3jiqA= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-spread@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1" - integrity sha1-1taKmfia7cRTbIGlQujdnxdG+NE= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-sticky-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc" - integrity sha1-AMHNsaynERLN8M9hJsLta0V8zbw= - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-plugin-transform-es2015-template-literals@^6.22.0: - version "6.22.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d" - integrity sha1-qEs0UPfp+PH2g51taH2oS7EjbY0= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-typeof-symbol@^6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372" - integrity sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-es2015-unicode-regex@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9" - integrity sha1-04sS9C6nMj9yk4fxinxa4frrNek= - dependencies: - babel-helper-regex "^6.24.1" - babel-runtime "^6.22.0" - regexpu-core "^2.0.0" - -babel-plugin-transform-exponentiation-operator@^6.22.0: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e" - integrity sha1-KrDJx/MJj6SJB3cruBP+QejeOg4= - dependencies: - babel-helper-builder-binary-assignment-operator-visitor "^6.24.1" - babel-plugin-syntax-exponentiation-operator "^6.8.0" - babel-runtime "^6.22.0" - -babel-plugin-transform-regenerator@^6.22.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f" - integrity sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8= - dependencies: - regenerator-transform "^0.10.0" - -babel-plugin-transform-runtime@6.23.0: - version "6.23.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz#88490d446502ea9b8e7efb0fe09ec4d99479b1ee" - integrity sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4= - dependencies: - babel-runtime "^6.22.0" - -babel-plugin-transform-strict-mode@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758" - integrity sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g= - dependencies: - babel-runtime "^6.22.0" - babel-types "^6.24.1" - -babel-polyfill@6.26.0, babel-polyfill@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" - integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM= - dependencies: - babel-runtime "^6.26.0" - core-js "^2.5.0" - regenerator-runtime "^0.10.5" - -babel-preset-env@1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a" - integrity sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg== - dependencies: - babel-plugin-check-es2015-constants "^6.22.0" - babel-plugin-syntax-trailing-function-commas "^6.22.0" - babel-plugin-transform-async-to-generator "^6.22.0" - babel-plugin-transform-es2015-arrow-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" - babel-plugin-transform-es2015-block-scoping "^6.23.0" - babel-plugin-transform-es2015-classes "^6.23.0" - babel-plugin-transform-es2015-computed-properties "^6.22.0" - babel-plugin-transform-es2015-destructuring "^6.23.0" - babel-plugin-transform-es2015-duplicate-keys "^6.22.0" - babel-plugin-transform-es2015-for-of "^6.23.0" - babel-plugin-transform-es2015-function-name "^6.22.0" - babel-plugin-transform-es2015-literals "^6.22.0" - babel-plugin-transform-es2015-modules-amd "^6.22.0" - babel-plugin-transform-es2015-modules-commonjs "^6.23.0" - babel-plugin-transform-es2015-modules-systemjs "^6.23.0" - babel-plugin-transform-es2015-modules-umd "^6.23.0" - babel-plugin-transform-es2015-object-super "^6.22.0" - babel-plugin-transform-es2015-parameters "^6.23.0" - babel-plugin-transform-es2015-shorthand-properties "^6.22.0" - babel-plugin-transform-es2015-spread "^6.22.0" - babel-plugin-transform-es2015-sticky-regex "^6.22.0" - babel-plugin-transform-es2015-template-literals "^6.22.0" - babel-plugin-transform-es2015-typeof-symbol "^6.23.0" - babel-plugin-transform-es2015-unicode-regex "^6.22.0" - babel-plugin-transform-exponentiation-operator "^6.22.0" - babel-plugin-transform-regenerator "^6.22.0" - browserslist "^3.2.6" - invariant "^2.2.2" - semver "^5.3.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.26.0, babel-runtime@^6.18.0, babel-runtime@^6.22.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.19.0, babel-types@^6.24.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== - -backo2@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" - integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= - -backoff@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/backoff/-/backoff-2.5.0.tgz#f616eda9d3e4b66b8ca7fca79f695722c5f8e26f" - integrity sha1-9hbtqdPktmuMp/ynn2lXIsX44m8= - dependencies: - precond "0.2" - -bail@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/bail/-/bail-2.0.1.tgz#d676736373a374058a935aec81b94c12ba815771" - integrity sha512-d5FoTAr2S5DSUPKl85WNm2yUwsINN8eidIdIwsOge2t33DaOfOdSmmsI11jMN3GmALCXaw+Y6HMVHDzePshFAA== - -balanced-match@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" - integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== - -base64-arraybuffer@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812" - integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI= - -base64-js@^1.0.2, 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== - -base64id@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" - integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== - -base64url@3.x.x, base64url@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d" - integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A== - -base@^0.11.1: - version "0.11.2" - resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg== - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -basic-auth@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a" - integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg== - dependencies: - safe-buffer "5.1.2" - -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" - -bcryptjs@^2.4.0: - version "2.4.3" - resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" - integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= - -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== - -binary-extensions@^1.0.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65" - integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw== - -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== - -bindings@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" - integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== - dependencies: - file-uri-to-path "1.0.0" - -bintrees@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bintrees/-/bintrees-1.0.1.tgz#0e655c9b9c2435eaab68bf4027226d2b55a34524" - integrity sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ= - -bl@^4.0.3: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -blob@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683" - integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig== - -block-stream2@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-2.1.0.tgz#ac0c5ef4298b3857796e05be8ebed72196fa054b" - integrity sha512-suhjmLI57Ewpmq00qaygS8UgEq2ly2PCItenIyhMqVjo4t4pGzqMvfgJuX8iWTeSDdfSSqS6j38fL4ToNL7Pfg== - dependencies: - readable-stream "^3.4.0" - -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.5.0, bluebird@^3.5.5, bluebird@^3.7.2: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9: - version "4.12.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" - integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== - -bn.js@^5.0.0, bn.js@^5.1.1: - version "5.2.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" - integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== - -body-parser@1.19.0, body-parser@^1.15.2: - version "1.19.0" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" - integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== - dependencies: - bytes "3.1.0" - content-type "~1.0.4" - debug "2.6.9" - depd "~1.1.2" - http-errors "1.7.2" - iconv-lite "0.4.24" - on-finished "~2.3.0" - qs "6.7.0" - raw-body "2.4.0" - type-is "~1.6.17" - -boolbase@^1.0.0, boolbase@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= - -bootstrap-validator@0.11.9: - version "0.11.9" - resolved "https://registry.yarnpkg.com/bootstrap-validator/-/bootstrap-validator-0.11.9.tgz#fb7058eef53623e78f5aa7967026f98f875a9404" - integrity sha1-+3BY7vU2I+ePWqeWcCb5j4dalAQ= - -bootstrap@3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72" - integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA== - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^1.8.2: - version "1.8.5" - resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7" - integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc= - dependencies: - expand-range "^1.8.1" - preserve "^0.2.0" - repeat-element "^1.1.2" - -braces@^2.3.1, braces@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w== - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -braces@^3.0.1, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" - -brorand@^1.0.1, brorand@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= - -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== - -browserify-aes@^1.0.0, browserify-aes@^1.0.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" - integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== - dependencies: - buffer-xor "^1.0.3" - cipher-base "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.3" - inherits "^2.0.1" - safe-buffer "^5.0.1" - -browserify-cipher@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" - integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w== - dependencies: - browserify-aes "^1.0.4" - browserify-des "^1.0.0" - evp_bytestokey "^1.0.0" - -browserify-des@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c" - integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A== - dependencies: - cipher-base "^1.0.1" - des.js "^1.0.0" - inherits "^2.0.1" - safe-buffer "^5.1.2" - -browserify-mime@~1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/browserify-mime/-/browserify-mime-1.2.9.tgz#aeb1af28de6c0d7a6a2ce40adb68ff18422af31f" - integrity sha1-rrGvKN5sDXpqLOQK22j/GEIq8x8= - -browserify-rsa@^4.0.0, browserify-rsa@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d" - integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog== - dependencies: - bn.js "^5.0.0" - randombytes "^2.0.1" - -browserify-sign@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz#eaf4add46dd54be3bb3b36c0cf15abbeba7956c3" - integrity sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg== - dependencies: - bn.js "^5.1.1" - browserify-rsa "^4.0.1" - create-hash "^1.2.0" - create-hmac "^1.1.7" - elliptic "^6.5.3" - inherits "^2.0.4" - parse-asn1 "^5.1.5" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" - -browserify-zlib@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" - integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA== - dependencies: - pako "~1.0.5" - -browserslist@^3.2.6: - version "3.2.8" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" - integrity sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ== - dependencies: - caniuse-lite "^1.0.30000844" - electron-to-chromium "^1.3.47" - -browserslist@^4.0.0, browserslist@^4.16.0, browserslist@^4.16.6: - version "4.17.0" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.0.tgz#1fcd81ec75b41d6d4994fb0831b92ac18c01649c" - integrity sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g== - dependencies: - caniuse-lite "^1.0.30001254" - colorette "^1.3.0" - electron-to-chromium "^1.3.830" - escalade "^3.1.1" - node-releases "^1.1.75" - -buffer-crc32@^0.2.1, buffer-crc32@^0.2.13: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -buffer-writer@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" - integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw== - -buffer-xor@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= - -buffer@4.9.2, buffer@^4.3.0: - version "4.9.2" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8" - integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg== - dependencies: - base64-js "^1.0.2" - ieee754 "^1.1.4" - isarray "^1.0.0" - -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -bufferutil@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/bufferutil/-/bufferutil-4.0.3.tgz#66724b756bed23cd7c28c4d306d7994f9943cc6b" - integrity sha512-yEYTwGndELGvfXsImMBLop58eaGW+YdONi1fNjTINSY98tmMmFijBG6WXgdkfuLNt4imzQNtIE+eBp1PVpMCSw== - dependencies: - node-gyp-build "^4.2.0" - -builtin-status-codes@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= - -builtins@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/builtins/-/builtins-4.0.0.tgz#a8345420de82068fdc4d6559d0456403a8fb1905" - integrity sha512-qC0E2Dxgou1IHhvJSLwGDSTvokbRovU5zZFuDY6oY8Y2lF3nGt5Ad8YZK7GMtqzY84Wu7pXTPeHQeHcXSXsRhw== - dependencies: - semver "^7.0.0" - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg= - -bytes@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" - integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== - -cacache@^12.0.2: - version "12.0.4" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" - integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - infer-owner "^1.0.3" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - -cacache@^15.0.5: - version "15.3.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" - integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== - dependencies: - "@npmcli/fs" "^1.0.0" - "@npmcli/move-file" "^1.0.1" - chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" - infer-owner "^1.0.4" - lru-cache "^6.0.0" - minipass "^3.1.1" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.0.2" - unique-filename "^1.1.1" - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ== - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camel-case@^4.1.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" - integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== - dependencies: - pascal-case "^3.1.2" - tslib "^2.0.3" - -camelcase@^6.0.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809" - integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg== - -caniuse-api@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0" - integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw== - dependencies: - browserslist "^4.0.0" - caniuse-lite "^1.0.0" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" - -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001254: - version "1.0.30001257" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001257.tgz#150aaf649a48bee531104cfeda57f92ce587f6e5" - integrity sha512-JN49KplOgHSXpIsVSF+LUyhD8PUp6xPpAXeRrrcBh4KBeP7W864jHn6RvzJgDlrReyeVjMFJL3PLpPvKIxlIHA== - -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - -ccount@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.0.tgz#3d6fb55803832766a24c6f339abc507297eb5d25" - integrity sha512-VOR0NWFYX65n9gELQdcpqsie5L5ihBXuZGAgaPEp/U7IOSjnPMEH6geE+2f6lcekaNEfWzAHS45mPvSo5bqsUA== - -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@^2.0.0, chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0.0, chalk@^4.1.0: - version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" - integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chalk@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f" - integrity sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8= - dependencies: - ansi-styles "~1.0.0" - has-color "~0.1.0" - strip-ansi "~0.1.0" - -chance@^1.0.4: - version "1.1.8" - resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.8.tgz#5d6c2b78c9170bf6eb9df7acdda04363085be909" - integrity sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg== - -character-entities-html4@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/character-entities-html4/-/character-entities-html4-2.0.0.tgz#55fcf3ed00febfe41f8f6a5709d25ab8ed73a449" - integrity sha512-dwT2xh5ZhUAjyP96k57ilMKoTQyASaw9IAMR9U5c1lCu2RUni6O6jxfpUEdO2RcPT6TJFvr8pqsbami4Jk+2oA== - -character-entities-legacy@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/character-entities-legacy/-/character-entities-legacy-2.0.0.tgz#57f4d00974c696e8f74e9f493e7fcb75b44d7ee7" - integrity sha512-YwaEtEvWLpFa6Wh3uVLrvirA/ahr9fki/NUd/Bd4OR6EdJ8D22hovYQEOUCBfQfcqnC4IAMGMsHXY1eXgL4ZZA== - -character-entities@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.0.tgz#508355fcc8c73893e0909efc1a44d28da2b6fdf3" - integrity sha512-oHqMj3eAuJ77/P5PaIRcqk+C3hdfNwyCD2DAUcD5gyXkegAuF2USC40CEqPscDk4I8FRGMTojGJQkXDsN5QlJA== - -character-reference-invalid@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-2.0.0.tgz#a0bdeb89c051fe7ed5d3158b2f06af06984f2813" - integrity sha512-pE3Z15lLRxDzWJy7bBHBopRwfI20sbrMVLQTC7xsPglCHf4Wv1e167OgYAFP78co2XlhojDyAqA+IAJse27//g== - -cheerio@^0.22.0: - version "0.22.0" - resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e" - integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4= - dependencies: - css-select "~1.2.0" - dom-serializer "~0.1.0" - entities "~1.1.1" - htmlparser2 "^3.9.1" - lodash.assignin "^4.0.9" - lodash.bind "^4.1.4" - lodash.defaults "^4.0.1" - lodash.filter "^4.4.0" - lodash.flatten "^4.2.0" - lodash.foreach "^4.3.0" - lodash.map "^4.4.0" - lodash.merge "^4.4.0" - lodash.pick "^4.2.1" - lodash.reduce "^4.4.0" - lodash.reject "^4.4.0" - lodash.some "^4.4.0" - -chokidar@3.5.2, chokidar@^3.0.0, chokidar@^3.4.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" - integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -chokidar@^1.6.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468" - integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg= - dependencies: - anymatch "^1.3.0" - async-each "^1.0.0" - glob-parent "^2.0.0" - inherits "^2.0.1" - is-binary-path "^1.0.0" - is-glob "^2.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.0.0" - optionalDependencies: - fsevents "^1.0.0" - -chokidar@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" - integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg== - dependencies: - anymatch "^2.0.0" - async-each "^1.0.1" - braces "^2.3.2" - glob-parent "^3.1.0" - inherits "^2.0.3" - is-binary-path "^1.0.0" - is-glob "^4.0.0" - normalize-path "^3.0.0" - path-is-absolute "^1.0.0" - readdirp "^2.2.1" - upath "^1.1.1" - optionalDependencies: - fsevents "^1.2.7" - -chownr@^1.1.1, chownr@^1.1.4: - 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== - -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de" - integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg== - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -clean-css@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" - integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== - dependencies: - source-map "~0.6.0" - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - -cls-bluebird@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/cls-bluebird/-/cls-bluebird-2.1.0.tgz#37ef1e080a8ffb55c2f4164f536f1919e7968aee" - integrity sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4= - dependencies: - is-bluebird "^1.0.2" - shimmer "^1.1.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= - -"codemirror@git+https://github.com/hedgedoc/CodeMirror.git": - version "5.58.2" - resolved "git+https://github.com/hedgedoc/CodeMirror.git#f780b569b3717cdff4c8507538cc63101bfa02e1" - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0, color-convert@^1.9.1: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -color-name@^1.0.0, color-name@~1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== - -color-string@^1.5.2: - version "1.6.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" - integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== - dependencies: - color-name "^1.0.0" - simple-swizzle "^0.2.2" - -color@3.0.x: - version "3.0.0" - resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a" - integrity sha512-jCpd5+s0s0t7p3pHQKpnJ0TpQKKdleP71LWcA0aqiljpiuAkOSUFN/dyH8ZwF0hRmFlrIuRhufds1QyEP9EB+w== - dependencies: - color-convert "^1.9.1" - color-string "^1.5.2" - -colord@^2.0.1, colord@^2.6: - version "2.7.0" - resolved "https://registry.yarnpkg.com/colord/-/colord-2.7.0.tgz#706ea36fe0cd651b585eb142fe64b6480185270e" - integrity sha512-pZJBqsHz+pYyw3zpX6ZRXWoCHM1/cvFikY9TV8G3zcejCaKE0lhankoj8iScyrrePA8C7yJ5FStfA9zbcOnw7Q== - -colorette@^1.2.1, colorette@^1.2.2, colorette@^1.3.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40" - integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== - -colors@^1.2.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" - integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - -colorspace@1.1.x: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.2.tgz#e0128950d082b86a2168580796a0aa5d6c68d8c5" - integrity sha512-vt+OoIP2d76xLhjwbBaucYlNSpPsrJWPlBTtwCpQKIu6/CSMutyzX93O/Do0qzpH3YoHEes8YEFXyZ797rEhzQ== - dependencies: - color "3.0.x" - text-hex "1.0.x" - -combined-stream@^1.0.5, 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" - -comma-separated-tokens@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-2.0.2.tgz#d4c25abb679b7751c880be623c1179780fe1dd98" - integrity sha512-G5yTt3KQN4Yn7Yk4ed73hlZ1evrFKXeUW3086p3PRFNp7m2vIjI6Pg+Kgb+oyzhd9F2qdcoj67+y3SdxL5XWsg== - -commander@2, commander@^2.11.0, commander@^2.20.0, commander@^2.20.3: - version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" - integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== - -commander@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== - -commander@^7.0.0, commander@^7.2.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" - integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== - -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= - -component-bind@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" - integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= - -component-emitter@1.2.1, component-emitter@~1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= - -component-emitter@^1.2.1, component-emitter@~1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== - -component-inherit@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" - integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM= - -compress-commons@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.1.tgz#df2a09a7ed17447642bad10a85cc9a19e5c42a7d" - integrity sha512-QLdDLCKNV2dtoTorqgxngQCMA+gWXkM/Nwu7FpeBhk/RdkzimqC3jueb/FDmaZeXh+uby1jkBqE3xArsLBE5wQ== - dependencies: - buffer-crc32 "^0.2.13" - crc32-stream "^4.0.2" - normalize-path "^3.0.0" - readable-stream "^3.6.0" - -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== - dependencies: - mime-db ">= 1.43.0 < 2" - -compression@^1.6.2: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" - -concat-map@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -concat-stream@^1.5.0: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -concat-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1" - integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A== - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.0.2" - typedarray "^0.0.6" - -connect-flash@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/connect-flash/-/connect-flash-0.1.1.tgz#d8630f26d95a7f851f9956b1e8cc6732f3b6aa30" - integrity sha1-2GMPJtlaf4UfmVax6MxnMvO2qjA= - -connect-session-sequelize@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/connect-session-sequelize/-/connect-session-sequelize-7.1.2.tgz#03ae9a1bd2221526c63a66959b6ddd18599be2ac" - integrity sha512-g24R4u6IfowKl6ApklvkAaKHNtzaKqbwqXkrgkKgkCzlCxdRPZ7qgQ8tWWmeUuVq6GejT1B7M0X8CC4rGfMIRg== - dependencies: - debug "^4.1.1" - deep-equal "^2.0.3" - -console-browserify@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" - integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== - -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= - -constants-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= - -content-disposition@0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" - integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== - dependencies: - safe-buffer "5.1.2" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - -convert-source-map@^1.5.0, convert-source-map@^1.5.1: - version "1.8.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" - integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== - dependencies: - safe-buffer "~5.1.1" - -cookie-parser@^1.4.3: - version "1.4.5" - resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.5.tgz#3e572d4b7c0c80f9c61daf604e4336831b5d1d49" - integrity sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw== - dependencies: - cookie "0.4.0" - cookie-signature "1.0.6" - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= - -cookie@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" - integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== - -cookie@0.4.1, cookie@^0.4.0, cookie@~0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.1.tgz#afd713fe26ebd21ba95ceb61f9a8116e50a537d1" - integrity sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA== - -cookiejar@2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.0.6.tgz#0abf356ad00d1c5a219d88d44518046dd026acfe" - integrity sha1-Cr81atANHFohnYjURRgEbdAmrP4= - -copy-anything@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.3.tgz#842407ba02466b0df844819bbe3baebbe5d45d87" - integrity sha512-GK6QUtisv4fNS+XcI7shX0Gx9ORg7QqIznyfho79JTnX1XhLiyZHfftvGiziqzRiEi/Bjhgpi+D2o7HxJFPnDQ== - dependencies: - is-what "^3.12.0" - -copy-concurrently@^1.0.0: - version "1.0.5" - resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0" - integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A== - dependencies: - aproba "^1.1.1" - fs-write-stream-atomic "^1.0.8" - iferr "^0.1.5" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.0" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= - -copy-webpack-plugin@6.4.1: - version "6.4.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz#138cd9b436dbca0a6d071720d5414848992ec47e" - integrity sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA== - dependencies: - cacache "^15.0.5" - fast-glob "^3.2.4" - find-cache-dir "^3.3.1" - glob-parent "^5.1.1" - globby "^11.0.1" - loader-utils "^2.0.0" - normalize-path "^3.0.0" - p-limit "^3.0.2" - schema-utils "^3.0.0" - serialize-javascript "^5.0.1" - webpack-sources "^1.4.3" - -core-js@^2.4.0, core-js@^2.5.0: - version "2.6.12" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" - integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== - -core-util-is@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - -crc-32@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.0.tgz#cb2db6e29b88508e32d9dd0ec1693e7b41a18208" - integrity sha512-1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA== - dependencies: - exit-on-epipe "~1.0.1" - printj "~1.1.0" - -crc32-stream@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.2.tgz#c922ad22b38395abe9d3870f02fa8134ed709007" - integrity sha512-DxFZ/Hk473b/muq1VJ///PMNLj0ZMnzye9thBpmjpJKCc5eMgB95aK8zCGrGfQ90cWo561Te6HK9D+j4KPdM6w== - dependencies: - crc-32 "^1.2.0" - readable-stream "^3.4.0" - -create-ecdh@^4.0.0: - version "4.0.4" - resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e" - integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A== - dependencies: - bn.js "^4.1.0" - elliptic "^6.5.3" - -create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" - integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== - dependencies: - cipher-base "^1.0.1" - inherits "^2.0.1" - md5.js "^1.3.4" - ripemd160 "^2.0.1" - sha.js "^2.4.0" - -create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: - version "1.1.7" - resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" - integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg== - dependencies: - cipher-base "^1.0.3" - create-hash "^1.1.0" - inherits "^2.0.1" - ripemd160 "^2.0.0" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - -cross-spawn@^7.0.2, cross-spawn@^7.0.3: - version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" - integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -crypto-browserify@^3.11.0: - version "3.12.0" - resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" - integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg== - dependencies: - browserify-cipher "^1.0.0" - browserify-sign "^4.0.0" - create-ecdh "^4.0.0" - create-hash "^1.1.0" - create-hmac "^1.1.0" - diffie-hellman "^5.0.0" - inherits "^2.0.1" - pbkdf2 "^3.0.3" - public-encrypt "^4.0.0" - randombytes "^2.0.0" - randomfill "^1.0.3" - -css-color-names@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-1.0.1.tgz#6ff7ee81a823ad46e020fa2fd6ab40a887e2ba67" - integrity sha512-/loXYOch1qU1biStIFsHH8SxTmOseh1IJqFvy8IujXOm1h+QjUdDhkzOrR5HG8K8mlxREj0yfi8ewCHx0eMxzA== - -css-declaration-sorter@^6.0.3: - version "6.1.3" - resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.3.tgz#e9852e4cf940ba79f509d9425b137d1f94438dc2" - integrity sha512-SvjQjNRZgh4ULK1LDJ2AduPKUKxIqmtU7ZAyi47BTV+M90Qvxr9AB6lKlLbDUfXqI9IQeYA8LbAsCZPpJEV3aA== - dependencies: - timsort "^0.3.0" - -css-loader@5.2.7: - version "5.2.7" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.7.tgz#9b9f111edf6fb2be5dc62525644cbc9c232064ae" - integrity sha512-Q7mOvpBNBG7YrVGMxRxcBJZFL75o+cH2abNASdibkj/fffYD8qWbInZrD0S9ccI6vZclF3DsHE7njGlLtaHbhg== - dependencies: - icss-utils "^5.1.0" - loader-utils "^2.0.0" - postcss "^8.2.15" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.1.0" - schema-utils "^3.0.0" - semver "^7.3.5" - -css-select@^4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" - integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== - dependencies: - boolbase "^1.0.0" - css-what "^5.0.0" - domhandler "^4.2.0" - domutils "^2.6.0" - nth-check "^2.0.0" - -css-select@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" - integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= - dependencies: - boolbase "~1.0.0" - css-what "2.1" - domutils "1.5.1" - nth-check "~1.0.1" - -css-tree@^1.1.2, css-tree@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" - integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== - dependencies: - mdn-data "2.0.14" - source-map "^0.6.1" - -css-what@2.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" - integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg== - -css-what@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad" - integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg== - -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== - -cssfilter@0.0.10: - version "0.0.10" - resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae" - integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4= - -cssnano-preset-default@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.4.tgz#359943bf00c5c8e05489f12dd25f3006f2c1cbd2" - integrity sha512-sPpQNDQBI3R/QsYxQvfB4mXeEcWuw0wGtKtmS5eg8wudyStYMgKOQT39G07EbW1LB56AOYrinRS9f0ig4Y3MhQ== - dependencies: - css-declaration-sorter "^6.0.3" - cssnano-utils "^2.0.1" - postcss-calc "^8.0.0" - postcss-colormin "^5.2.0" - postcss-convert-values "^5.0.1" - postcss-discard-comments "^5.0.1" - postcss-discard-duplicates "^5.0.1" - postcss-discard-empty "^5.0.1" - postcss-discard-overridden "^5.0.1" - postcss-merge-longhand "^5.0.2" - postcss-merge-rules "^5.0.2" - postcss-minify-font-values "^5.0.1" - postcss-minify-gradients "^5.0.2" - postcss-minify-params "^5.0.1" - postcss-minify-selectors "^5.1.0" - postcss-normalize-charset "^5.0.1" - postcss-normalize-display-values "^5.0.1" - postcss-normalize-positions "^5.0.1" - postcss-normalize-repeat-style "^5.0.1" - postcss-normalize-string "^5.0.1" - postcss-normalize-timing-functions "^5.0.1" - postcss-normalize-unicode "^5.0.1" - postcss-normalize-url "^5.0.2" - postcss-normalize-whitespace "^5.0.1" - postcss-ordered-values "^5.0.2" - postcss-reduce-initial "^5.0.1" - postcss-reduce-transforms "^5.0.1" - postcss-svgo "^5.0.2" - postcss-unique-selectors "^5.0.1" - -cssnano-utils@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2" - integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ== - -cssnano@^5.0.2: - version "5.0.8" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.8.tgz#39ad166256980fcc64faa08c9bb18bb5789ecfa9" - integrity sha512-Lda7geZU0Yu+RZi2SGpjYuQz4HI4/1Y+BhdD0jL7NXAQ5larCzVn+PUGuZbDMYz904AXXCOgO5L1teSvgu7aFg== - dependencies: - cssnano-preset-default "^5.1.4" - is-resolvable "^1.1.0" - lilconfig "^2.0.3" - yaml "^1.10.2" - -csso@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529" - integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA== - dependencies: - css-tree "^1.1.2" - -cssom@0.3.x: - version "0.3.8" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" - integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== - -cssom@~0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.2.5.tgz#2682709b5902e7212df529116ff788cd5b254894" - integrity sha1-JoJwm1kC5yEt9SkRb/eIzVslSJQ= - -cssstyle@~0.2.3: - version "0.2.37" - resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54" - integrity sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ= - dependencies: - cssom "0.3.x" - -cyclist@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9" - integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk= - -d3-array@1, d3-array@^1.1.1, d3-array@^1.2.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" - integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw== - -d3-axis@1: - version "1.0.12" - resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-1.0.12.tgz#cdf20ba210cfbb43795af33756886fb3638daac9" - integrity sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ== - -d3-brush@1: - version "1.1.6" - resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-1.1.6.tgz#b0a22c7372cabec128bdddf9bddc058592f89e9b" - integrity sha512-7RW+w7HfMCPyZLifTz/UnJmI5kdkXtpCbombUSs8xniAyo0vIbrDzDwUJB6eJOgl9u5DQOt2TQlYumxzD1SvYA== - dependencies: - d3-dispatch "1" - d3-drag "1" - d3-interpolate "1" - d3-selection "1" - d3-transition "1" - -d3-chord@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-1.0.6.tgz#309157e3f2db2c752f0280fedd35f2067ccbb15f" - integrity sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA== - dependencies: - d3-array "1" - d3-path "1" - -d3-collection@1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/d3-collection/-/d3-collection-1.0.7.tgz#349bd2aa9977db071091c13144d5e4f16b5b310e" - integrity sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A== - -d3-color@1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a" - integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q== - -d3-contour@1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-1.3.2.tgz#652aacd500d2264cb3423cee10db69f6f59bead3" - integrity sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg== - dependencies: - d3-array "^1.1.1" - -d3-dispatch@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58" - integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA== - -d3-drag@1: - version "1.2.5" - resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-1.2.5.tgz#2537f451acd39d31406677b7dc77c82f7d988f70" - integrity sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w== - dependencies: - d3-dispatch "1" - d3-selection "1" - -d3-dsv@1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c" - integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g== - dependencies: - commander "2" - iconv-lite "0.4" - rw "1" - -d3-ease@1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2" - integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ== - -d3-fetch@1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-1.2.0.tgz#15ce2ecfc41b092b1db50abd2c552c2316cf7fc7" - integrity sha512-yC78NBVcd2zFAyR/HnUiBS7Lf6inSCoWcSxFfw8FYL7ydiqe80SazNwoffcqOfs95XaLo7yebsmQqDKSsXUtvA== - dependencies: - d3-dsv "1" - -d3-force@1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-1.2.1.tgz#fd29a5d1ff181c9e7f0669e4bd72bdb0e914ec0b" - integrity sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg== - dependencies: - d3-collection "1" - d3-dispatch "1" - d3-quadtree "1" - d3-timer "1" - -d3-format@1: - version "1.4.5" - resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4" - integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ== - -d3-geo@1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.12.1.tgz#7fc2ab7414b72e59fbcbd603e80d9adc029b035f" - integrity sha512-XG4d1c/UJSEX9NfU02KwBL6BYPj8YKHxgBEw5om2ZnTRSbIcego6dhHwcxuSR3clxh0EpE38os1DVPOmnYtTPg== - dependencies: - d3-array "1" - -d3-hierarchy@1: - version "1.1.9" - resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83" - integrity sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ== - -d3-interpolate@1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987" - integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA== - dependencies: - d3-color "1" - -d3-path@1: - version "1.0.9" - resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-1.0.9.tgz#48c050bb1fe8c262493a8caf5524e3e9591701cf" - integrity sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg== - -d3-polygon@1: - version "1.0.6" - resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-1.0.6.tgz#0bf8cb8180a6dc107f518ddf7975e12abbfbd38e" - integrity sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ== - -d3-quadtree@1: - version "1.0.7" - resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-1.0.7.tgz#ca8b84df7bb53763fe3c2f24bd435137f4e53135" - integrity sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA== - -d3-random@1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-1.1.2.tgz#2833be7c124360bf9e2d3fd4f33847cfe6cab291" - integrity sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ== - -d3-scale-chromatic@1: - version "1.5.0" - resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz#54e333fc78212f439b14641fb55801dd81135a98" - integrity sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg== - dependencies: - d3-color "1" - d3-interpolate "1" - -d3-scale@2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-2.2.2.tgz#4e880e0b2745acaaddd3ede26a9e908a9e17b81f" - integrity sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw== - dependencies: - d3-array "^1.2.0" - d3-collection "1" - d3-format "1" - d3-interpolate "1" - d3-time "1" - d3-time-format "2" - -d3-selection@1, d3-selection@^1.1.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c" - integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg== - -d3-shape@1: - version "1.3.7" - resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7" - integrity sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw== - dependencies: - d3-path "1" - -d3-time-format@2: - version "2.3.0" - resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-2.3.0.tgz#107bdc028667788a8924ba040faf1fbccd5a7850" - integrity sha512-guv6b2H37s2Uq/GefleCDtbe0XZAuy7Wa49VGkPVPMfLL9qObgBST3lEHJBMUp8S7NdLQAGIvr2KXk8Hc98iKQ== - dependencies: - d3-time "1" - -d3-time@1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-1.1.0.tgz#b1e19d307dae9c900b7e5b25ffc5dcc249a8a0f1" - integrity sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA== - -d3-timer@1: - version "1.0.10" - resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5" - integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw== - -d3-transition@1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398" - integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA== - dependencies: - d3-color "1" - d3-dispatch "1" - d3-ease "1" - d3-interpolate "1" - d3-selection "^1.1.0" - d3-timer "1" - -d3-voronoi@1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.4.tgz#dd3c78d7653d2bb359284ae478645d95944c8297" - integrity sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg== - -d3-zoom@1: - version "1.8.3" - resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a" - integrity sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ== - dependencies: - d3-dispatch "1" - d3-drag "1" - d3-interpolate "1" - d3-selection "1" - d3-transition "1" - -d3@^5.14, d3@^5.16.0: - version "5.16.0" - resolved "https://registry.yarnpkg.com/d3/-/d3-5.16.0.tgz#9c5e8d3b56403c79d4ed42fbd62f6113f199c877" - integrity sha512-4PL5hHaHwX4m7Zr1UapXW23apo6pexCgdetdJ5kTmADpG/7T9Gkxw0M0tf/pjoB63ezCCm0u5UaFYy2aMt0Mcw== - dependencies: - d3-array "1" - d3-axis "1" - d3-brush "1" - d3-chord "1" - d3-collection "1" - d3-color "1" - d3-contour "1" - d3-dispatch "1" - d3-drag "1" - d3-dsv "1" - d3-ease "1" - d3-fetch "1" - d3-force "1" - d3-format "1" - d3-geo "1" - d3-hierarchy "1" - d3-interpolate "1" - d3-path "1" - d3-polygon "1" - d3-quadtree "1" - d3-random "1" - d3-scale "2" - d3-scale-chromatic "1" - d3-selection "1" - d3-shape "1" - d3-time "1" - d3-time-format "2" - d3-timer "1" - d3-transition "1" - d3-voronoi "1" - d3-zoom "1" - -dagre-d3@^0.6.4: - version "0.6.4" - resolved "https://registry.yarnpkg.com/dagre-d3/-/dagre-d3-0.6.4.tgz#0728d5ce7f177ca2337df141ceb60fbe6eeb7b29" - integrity sha512-e/6jXeCP7/ptlAM48clmX4xTZc5Ek6T6kagS7Oz2HrYSdqcLZFLqpAfh7ldbZRFfxCZVyh61NEPR08UQRVxJzQ== - dependencies: - d3 "^5.14" - dagre "^0.8.5" - graphlib "^2.1.8" - lodash "^4.17.15" - -dagre@^0.8.5: - version "0.8.5" - resolved "https://registry.yarnpkg.com/dagre/-/dagre-0.8.5.tgz#ba30b0055dac12b6c1fcc247817442777d06afee" - integrity sha512-/aTqmnRta7x7MCCpExk7HQL2O4owCT2h8NT//9I1OQ9vt29Pa0BzSAkR5lwFUcQ7491yVi/3CXU9jQ5o0Mn2Sw== - dependencies: - graphlib "^2.1.8" - lodash "^4.17.15" - -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@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - -debug@3.1.0, debug@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" - integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g== - dependencies: - ms "2.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@^3.2.6, debug@^3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" - integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== - dependencies: - ms "^2.1.1" - -debug@^4.0.0, debug@^4.0.1, debug@^4.1.1, debug@^4.3.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - -debug@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - -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== - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= - -deep-equal@^2.0.3: - version "2.0.5" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.0.5.tgz#55cd2fe326d83f9cbf7261ef0e060b3f724c5cb9" - integrity sha512-nPiRgmbAtm1a3JsnLCf6/SLfXcjyN5v8L1TXzdCmHrXJ4hx+gW/w1YCcn7z8gJtSiDArZCgYtbao3QqLm/N1Sw== - dependencies: - call-bind "^1.0.0" - es-get-iterator "^1.1.1" - get-intrinsic "^1.0.1" - is-arguments "^1.0.4" - is-date-object "^1.0.2" - is-regex "^1.1.1" - isarray "^2.0.5" - object-is "^1.1.4" - object-keys "^1.1.1" - object.assign "^4.1.2" - regexp.prototype.flags "^1.3.0" - side-channel "^1.0.3" - which-boxed-primitive "^1.0.1" - which-collection "^1.0.1" - which-typed-array "^1.1.2" - -deep-extend@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" - integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== - -deep-freeze@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84" - integrity sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ= - -deep-is@^0.1.3: - version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" - integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== - -define-properties@^1.1.2, define-properties@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - dependencies: - object-keys "^1.0.12" - -define-property@^0.2.5: - version "0.2.5" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ== - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= - -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - -denque@^1.4.1, denque@^1.5.0: - version "1.5.1" - resolved "https://registry.yarnpkg.com/denque/-/denque-1.5.1.tgz#07f670e29c9a78f8faecb2566a1e2c11929c5cbf" - integrity sha512-XwE+iZ4D6ZUB7mfYRMb5wByE8L74HCn30FBN7sWnXksWc1LO1bPDl67pBR9o/kC4z/xSNAwkMYcGgqDV3BE3Hw== - -depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -depd@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - -des.js@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" - integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA== - dependencies: - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - -destroy@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= - -detect-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.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" - integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= - -"diff-match-patch@git+https://github.com/hackmdio/diff-match-patch.git": - version "1.1.1" - resolved "git+https://github.com/hackmdio/diff-match-patch.git#c2f8fb9d69aa9490b764850aa86ba442c93ccf78" - -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== - -diffie-hellman@^5.0.0: - version "5.0.3" - resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" - integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg== - dependencies: - bn.js "^4.1.0" - miller-rabin "^4.0.0" - randombytes "^2.0.0" - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - -doctrine@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== - dependencies: - esutils "^2.0.2" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" - integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== - dependencies: - esutils "^2.0.2" - -dom-converter@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" - integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== - dependencies: - utila "~0.4" - -dom-serializer@0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51" - integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g== - dependencies: - domelementtype "^2.0.1" - entities "^2.0.0" - -dom-serializer@^1.0.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" - integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" - -dom-serializer@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" - integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA== - dependencies: - domelementtype "^1.3.0" - entities "^1.1.1" - -domain-browser@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" - integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== - -domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" - integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== - -domelementtype@^2.0.1, domelementtype@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" - integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== - -domhandler@^2.3.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" - integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== - dependencies: - domelementtype "1" - -domhandler@^4.0.0, domhandler@^4.2.0: - version "4.2.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.2.tgz#e825d721d19a86b8c201a35264e226c678ee755f" - integrity sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w== - dependencies: - domelementtype "^2.2.0" - -domino@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.6.tgz#fe4ace4310526e5e7b9d12c7de01b7f485a57ffe" - integrity sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ== - -dompurify@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.1.tgz#a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a" - integrity sha512-xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw== - -domutils@1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" - integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= - dependencies: - dom-serializer "0" - domelementtype "1" - -domutils@^1.5.1: - version "1.7.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" - integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== - dependencies: - dom-serializer "0" - domelementtype "1" - -domutils@^2.5.2, domutils@^2.6.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== - dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - -dot-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" - integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -dottie@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dottie/-/dottie-2.0.2.tgz#cc91c0726ce3a054ebf11c55fbc92a7f266dd154" - integrity sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg== - -duplexify@^3.4.2, duplexify@^3.6.0: - version "3.7.1" - resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309" - integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g== - dependencies: - end-of-stream "^1.0.0" - inherits "^2.0.1" - readable-stream "^2.0.0" - stream-shift "^1.0.0" - -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= - -ejs@^3.0.0: - version "3.1.6" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" - integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== - dependencies: - jake "^10.6.1" - -electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.830: - version "1.3.836" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.836.tgz#823cb9c98f28c64c673920f1c90ea3826596eaf9" - integrity sha512-Ney3pHOJBWkG/AqYjrW0hr2AUCsao+2uvq9HUlRP8OlpSdk/zOHOUJP7eu0icDvePC9DlgffuelP4TnOJmMRUg== - -elliptic@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" - integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== - dependencies: - bn.js "^4.11.9" - brorand "^1.1.0" - hash.js "^1.0.0" - hmac-drbg "^1.0.1" - inherits "^2.0.4" - minimalistic-assert "^1.0.1" - minimalistic-crypto-utils "^1.0.1" - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== - -emoji-regex@^9.2.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" - integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== - -emojify.js@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/emojify.js/-/emojify.js-1.1.0.tgz#079fff223307c9007f570785e8e4935d5c398beb" - integrity sha1-B5//IjMHyQB/VweF6OSTXVw5i+s= - -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== - -enabled@2.0.x: - version "2.0.0" - resolved "https://registry.yarnpkg.com/enabled/-/enabled-2.0.0.tgz#f9dd92ec2d6f4bbc0d5d1e64e21d61cd4665e7c2" - integrity sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ== - -encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= - -end-of-stream@^1.0.0, 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" - -engine.io-client@~3.5.0: - version "3.5.2" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz#0ef473621294004e9ceebe73cef0af9e36f2f5fa" - integrity sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA== - dependencies: - component-emitter "~1.3.0" - component-inherit "0.0.3" - debug "~3.1.0" - engine.io-parser "~2.2.0" - has-cors "1.1.0" - indexof "0.0.1" - parseqs "0.0.6" - parseuri "0.0.6" - ws "~7.4.2" - xmlhttprequest-ssl "~1.6.2" - yeast "0.1.2" - -engine.io-parser@~2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7" - integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg== - dependencies: - after "0.8.2" - arraybuffer.slice "~0.0.7" - base64-arraybuffer "0.1.4" - blob "0.0.5" - has-binary2 "~1.0.2" - -engine.io@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b" - integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA== - dependencies: - accepts "~1.3.4" - base64id "2.0.0" - cookie "~0.4.1" - debug "~4.1.0" - engine.io-parser "~2.2.0" - ws "~7.4.2" - -enhanced-resolve@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" - integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== - dependencies: - graceful-fs "^4.1.2" - memory-fs "^0.5.0" - tapable "^1.0.0" - -enquirer@^2.3.5: - version "2.3.6" - resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" - integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== - dependencies: - ansi-colors "^4.1.1" - -entities@^1.1.1, entities@~1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== - -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== - -entities@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" - integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== - -envinfo@^7.7.3: - version "7.8.1" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" - integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== - -errno@^0.1.1, errno@^0.1.3, errno@~0.1.7: - version "0.1.8" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" - integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== - dependencies: - prr "~1.0.1" - -error-ex@^1.3.1: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2, es-abstract@^1.18.5: - version "1.18.6" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.6.tgz#2c44e3ea7a6255039164d26559777a6d978cb456" - integrity sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ== - dependencies: - call-bind "^1.0.2" - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - get-intrinsic "^1.1.1" - get-symbol-description "^1.0.0" - has "^1.0.3" - has-symbols "^1.0.2" - internal-slot "^1.0.3" - is-callable "^1.2.4" - is-negative-zero "^2.0.1" - is-regex "^1.1.4" - is-string "^1.0.7" - object-inspect "^1.11.0" - object-keys "^1.1.1" - object.assign "^4.1.2" - string.prototype.trimend "^1.0.4" - string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.1" - -es-get-iterator@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.2.tgz#9234c54aba713486d7ebde0220864af5e2b283f7" - integrity sha512-+DTO8GYwbMCwbywjimwZMHp8AuYXOS2JZFWoi2AlPOS3ebnII9w/NLpNZtA7A0YLaVDw+O7KFCeoIV7OPvM7hQ== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.0" - has-symbols "^1.0.1" - is-arguments "^1.1.0" - is-map "^2.0.2" - is-set "^2.0.2" - is-string "^1.0.5" - isarray "^2.0.5" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -es6-error@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" - integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== - -esbuild-loader@2.15.1: - version "2.15.1" - resolved "https://registry.yarnpkg.com/esbuild-loader/-/esbuild-loader-2.15.1.tgz#5a3940f5d20317f1a35720efa33e933f97c923e9" - integrity sha512-JRBL6uTeWplMbylNBt9gxLKMjD8wKnqGq786QV/cm/nPBSNA9/kC7/vNwCXTDPfYqHoWsjyfH7ub9ekN0kdAYQ== - dependencies: - esbuild "^0.12.21" - joycon "^3.0.1" - json5 "^2.2.0" - loader-utils "^2.0.0" - tapable "^2.2.0" - type-fest "^1.4.0" - webpack-sources "^2.2.0" - -esbuild@^0.12.21: - version "0.12.27" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.27.tgz#9bcfb837111c5e89b189188dde339515b213a724" - integrity sha512-G42siADcTdRU1qRBxhiIiVLG4gcEMyWV4CWfLBdSii+olCueZJHFRHc7EqQRnRvNkSQq88i0k1Oufw/YVueUWQ== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@1.0.3, escape-html@^1.0.3, escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= - -escape-string-regexp@4.0.0, 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, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -eslint-config-standard@16.0.3: - version "16.0.3" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" - integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== - -eslint-import-resolver-node@^0.3.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" - integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== - dependencies: - debug "^3.2.7" - resolve "^1.20.0" - -eslint-module-utils@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534" - integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q== - dependencies: - debug "^3.2.7" - pkg-dir "^2.0.0" - -eslint-plugin-es@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893" - integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ== - dependencies: - eslint-utils "^2.0.0" - regexpp "^3.0.0" - -eslint-plugin-import@2.24.2: - version "2.24.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.24.2.tgz#2c8cd2e341f3885918ee27d18479910ade7bb4da" - integrity sha512-hNVtyhiEtZmpsabL4neEj+6M5DCLgpYyG9nzJY8lZQeQXEn5UPW1DpUdsMHMXsq98dbNm7nt1w9ZMSVpfJdi8Q== - dependencies: - array-includes "^3.1.3" - array.prototype.flat "^1.2.4" - debug "^2.6.9" - doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.6.2" - find-up "^2.0.0" - has "^1.0.3" - is-core-module "^2.6.0" - minimatch "^3.0.4" - object.values "^1.1.4" - pkg-up "^2.0.0" - read-pkg-up "^3.0.0" - resolve "^1.20.0" - tsconfig-paths "^3.11.0" - -eslint-plugin-node@11.1.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d" - integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g== - dependencies: - eslint-plugin-es "^3.0.0" - eslint-utils "^2.0.0" - ignore "^5.1.1" - minimatch "^3.0.4" - resolve "^1.10.1" - semver "^6.1.0" - -eslint-plugin-promise@5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24" - integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng== - -eslint-plugin-standard@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz#0c3bf3a67e853f8bbbc580fb4945fbf16f41b7c5" - integrity sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ== - -eslint-scope@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" - integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - -eslint-utils@^2.0.0, eslint-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" - integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== - dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" - integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== - -eslint-visitor-keys@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" - integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== - -eslint@7.32.0: - version "7.32.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" - integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== - dependencies: - "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.3" - "@humanwhocodes/config-array" "^0.5.0" - ajv "^6.10.0" - chalk "^4.0.0" - cross-spawn "^7.0.2" - debug "^4.0.1" - doctrine "^3.0.0" - enquirer "^2.3.5" - escape-string-regexp "^4.0.0" - eslint-scope "^5.1.1" - eslint-utils "^2.1.0" - eslint-visitor-keys "^2.0.0" - espree "^7.3.1" - esquery "^1.4.0" - esutils "^2.0.2" - fast-deep-equal "^3.1.3" - file-entry-cache "^6.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.1.2" - globals "^13.6.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - is-glob "^4.0.0" - js-yaml "^3.13.1" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.4.1" - lodash.merge "^4.6.2" - minimatch "^3.0.4" - natural-compare "^1.4.0" - optionator "^0.9.1" - progress "^2.0.0" - regexpp "^3.1.0" - semver "^7.2.1" - strip-ansi "^6.0.0" - strip-json-comments "^3.1.0" - table "^6.0.9" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - -espree@^7.3.0, espree@^7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" - integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== - dependencies: - acorn "^7.4.0" - acorn-jsx "^5.3.1" - eslint-visitor-keys "^1.3.0" - -esprima@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== - -esquery@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" - integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== - dependencies: - estraverse "^5.1.0" - -esrecurse@^4.1.0, esrecurse@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" - integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== - dependencies: - estraverse "^5.2.0" - -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - -estraverse@^5.1.0, estraverse@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" - integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== - -esutils@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" - integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== - -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= - -eve-raphael@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/eve-raphael/-/eve-raphael-0.5.0.tgz#17c754b792beef3fa6684d79cf5a47c63c4cda30" - integrity sha1-F8dUt5K+7z+maE15z1pHxjxM2jA= - -eve@~0.5.1: - version "0.5.4" - resolved "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz#67d080b9725291d7e389e34c26860dd97f1debaa" - integrity sha1-Z9CAuXJSkdfjieNMJoYN2X8d66o= - -events@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" - integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ= - -events@^3.0.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" - integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== - dependencies: - md5.js "^1.3.4" - safe-buffer "^5.1.1" - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -exit-on-epipe@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692" - integrity sha512-h2z5mrROTxce56S+pnvAV890uu7ls7f1kEvVGJbw1OlFH3/mlJ5bkXu0KRyW94v37zzHPiUd55iLn3DA7TjWpw== - -expand-brackets@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b" - integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s= - dependencies: - is-posix-bracket "^0.1.0" - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expand-range@^1.8.1: - version "1.8.2" - resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337" - integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc= - dependencies: - fill-range "^2.1.0" - -exports-loader@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-1.1.1.tgz#88c9a6877ee6a5519d7c41a016bdd99148421e69" - integrity sha512-CmyhIR2sJ3KOfVsHjsR0Yvo+0lhRhRMAevCbB8dhTVLHsZPs0lCQTvRmR9YNvBXDBxUuhmCE2f54KqEjZUaFrg== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - source-map "^0.6.1" - -expose-loader@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-1.0.3.tgz#5686d3b78cac8831c4af11c3dc361563deb8a9c0" - integrity sha512-gP6hs3vYeWIqyoVfsApGQcgCEpbcI1xe+celwI31zeDhXz2q03ycBC1+75IlQUGaYvj6rAloFIe/NIBnEElLsQ== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - -express-session@^1.14.2: - version "1.17.2" - resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.17.2.tgz#397020374f9bf7997f891b85ea338767b30d0efd" - integrity sha512-mPcYcLA0lvh7D4Oqr5aNJFMtBMKPLl++OKKxkHzZ0U0oDq1rpKBnkR5f5vCHR26VeArlTOEF9td4x5IjICksRQ== - dependencies: - cookie "0.4.1" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~2.0.0" - on-headers "~1.0.2" - parseurl "~1.3.3" - safe-buffer "5.2.1" - uid-safe "~2.1.5" - -express@>=4.14: - version "4.17.1" - resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" - integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== - dependencies: - accepts "~1.3.7" - array-flatten "1.1.1" - body-parser "1.19.0" - content-disposition "0.5.3" - content-type "~1.0.4" - cookie "0.4.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "~1.1.2" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "~1.1.2" - fresh "0.5.2" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "~2.3.0" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.5" - qs "6.7.0" - range-parser "~1.2.1" - safe-buffer "5.1.2" - send "0.17.1" - serve-static "1.14.1" - setprototypeof "1.1.1" - statuses "~1.5.0" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4" - integrity sha1-WkdDU7nzNT3dgXbf03uRyDpG8dQ= - -extend@^3.0.0, extend@^3.0.2, 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== - -extglob@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" - integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE= - dependencies: - is-extglob "^1.0.0" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw== - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= - -fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" - integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== - -fast-glob@^3.1.1, fast-glob@^3.2.4: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - -fast-json-stable-stringify@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" - integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== - -fast-levenshtein@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= - -fast-safe-stringify@^2.0.4: - version "2.1.1" - resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" - integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== - -fast-xml-parser@^3.17.5, fast-xml-parser@^3.19.0: - version "3.20.0" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.20.0.tgz#b9ce9ddbc44d2cb7e38f846c5929c667bbf0936d" - integrity sha512-cMQwDJYVDjMPU56DviszewgMKuNzuf4NQSBuDf9RgZ6FKm5QEMxW05Za8lvnuL6moxoeZVUWBlL733WmovvV6g== - dependencies: - strnum "^1.0.3" - -fastest-levenshtein@^1.0.12: - version "1.0.12" - resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" - integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== - -fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== - dependencies: - reusify "^1.0.4" - -fault@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fault/-/fault-2.0.0.tgz#ad2198a6e28e344dcda76a7b32406b1039f0b707" - integrity sha512-JsDj9LFcoC+4ChII1QpXPA7YIaY8zmqPYw7h9j5n7St7a0BBKfNnwEBAUQRBx70o2q4rs+BeSNHk8Exm6xE7fQ== - dependencies: - format "^0.2.0" - -fecha@^4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.1.tgz#0a83ad8f86ef62a091e22bb5a039cd03d23eecce" - integrity sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q== - -figgy-pudding@^3.5.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" - integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== - -file-entry-cache@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" - integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== - dependencies: - flat-cache "^3.0.4" - -file-loader@6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d" - integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - -file-saver@2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" - integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA== - -file-type@^16.1.0: - version "16.5.3" - resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.3.tgz#474b7e88c74724046abb505e9b8ed4db30c4fc06" - integrity sha512-uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A== - dependencies: - readable-web-to-node-stream "^3.0.0" - strtok3 "^6.2.4" - token-types "^4.1.1" - -file-uri-to-path@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" - integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== - -filelist@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" - integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== - dependencies: - minimatch "^3.0.4" - -filename-regex@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26" - integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY= - -fill-range@^2.1.0: - version "2.2.4" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" - integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q== - dependencies: - is-number "^2.1.0" - isobject "^2.0.0" - randomatic "^3.0.0" - repeat-element "^1.1.2" - repeat-string "^1.5.2" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" - integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "~2.3.0" - parseurl "~1.3.3" - statuses "~1.5.0" - unpipe "~1.0.0" - -find-cache-dir@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" - integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8= - dependencies: - commondir "^1.0.1" - make-dir "^1.0.0" - pkg-dir "^2.0.0" - -find-cache-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" - integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== - dependencies: - commondir "^1.0.1" - make-dir "^2.0.0" - pkg-dir "^3.0.0" - -find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== - dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" - -find-up@5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" - integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== - dependencies: - locate-path "^6.0.0" - path-exists "^4.0.0" - -find-up@^2.0.0, find-up@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= - dependencies: - locate-path "^2.0.0" - -find-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" - integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== - dependencies: - locate-path "^3.0.0" - -find-up@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -flat-cache@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" - integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== - dependencies: - flatted "^3.1.0" - rimraf "^3.0.2" - -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== - -flatted@^3.1.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" - integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== - -flowchart.js@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/flowchart.js/-/flowchart.js-1.15.0.tgz#132ba2df14af0a65e67280026ef05a1ffd16569f" - integrity sha512-IyCVUFfHPLPgKLynw3NCkZ7CvKJdc/bAu0aHm+2AxKhtSBCiUC1kcTX1KautC3HOp1A2JS1IOcYxDTmcMkx5nQ== - dependencies: - raphael "2.3.0" - -flush-write-stream@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" - integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w== - dependencies: - inherits "^2.0.3" - readable-stream "^2.3.6" - -fn.name@1.x.x: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc" - integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw== - -follow-redirects@^1.14.0: - version "1.14.3" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e" - integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw== - -for-in@^1.0.1, for-in@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= - -for-own@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce" - integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4= - dependencies: - for-in "^1.0.1" - -foreach@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" - integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= - -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= - -fork-awesome@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/fork-awesome/-/fork-awesome-1.2.0.tgz#acd43f1e1f54510fa45209c31385b4fde3a95003" - integrity sha512-MNwTBnnudMIweHfDtTY8TeR5fxIAZ2w9o8ITn5XDySqdxa4k5AH8IuAMa89RVxDxgPNlosZxqkFKN5UmHXuYSw== - -form-data@1.0.0-rc3: - version "1.0.0-rc3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.0-rc3.tgz#d35bc62e7fbc2937ae78f948aaa0d38d90607577" - integrity sha1-01vGLn+8KTeuePlIqqDTjZBgdXc= - dependencies: - async "^1.4.0" - combined-stream "^1.0.5" - mime-types "^2.1.3" - -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" - -format@^0.2.0: - version "0.2.2" - resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b" - integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs= - -formidable@^1.0.17: - version "1.2.2" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9" - integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q== - -formidable@~1.0.14: - version "1.0.17" - resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.0.17.tgz#ef5491490f9433b705faa77249c99029ae348559" - integrity sha1-71SRSQ+UM7cF+qdyScmQKa40hVk= - -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= - dependencies: - map-cache "^0.2.2" - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= - -from2@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" - integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8= - dependencies: - inherits "^2.0.1" - readable-stream "^2.0.0" - -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-minipass@^1.2.7: - 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-readdir-recursive@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz#e32fc030a2ccee44a6b5371308da54be0b397d27" - integrity sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA== - -fs-write-stream-atomic@^1.0.8: - version "1.0.10" - resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9" - integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk= - dependencies: - graceful-fs "^4.1.2" - iferr "^0.1.5" - imurmurhash "^0.1.4" - readable-stream "1 || 2" - -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@^1.0.0, fsevents@^1.2.7: - version "1.2.13" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" - integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw== - dependencies: - bindings "^1.5.0" - nan "^2.12.1" - -fsevents@~2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" - integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== - -fstream@^1.0.0, fstream@^1.0.12: - 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" - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== - -functional-red-black-tree@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= - -gauge@~2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= - dependencies: - aproba "^1.0.3" - console-control-strings "^1.0.0" - has-unicode "^2.0.0" - object-assign "^4.1.0" - signal-exit "^3.0.0" - string-width "^1.0.1" - strip-ansi "^3.0.1" - wide-align "^1.1.0" - -generate-function@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f" - integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ== - dependencies: - is-property "^1.0.2" - -get-caller-file@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" - integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== - -get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-intrinsic@^1.0.1, get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" - integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== - dependencies: - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - -get-stream@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" - integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== - -get-symbol-description@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" - integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== - dependencies: - call-bind "^1.0.2" - get-intrinsic "^1.1.1" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= - -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" - -gist-embed@2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/gist-embed/-/gist-embed-2.6.0.tgz#1ea95703fa1fc2a1255419f6f06c67e9920649ab" - integrity sha1-HqlXA/ofwqElVBn28Gxn6ZIGSas= - -glob-base@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4" - integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q= - dependencies: - glob-parent "^2.0.0" - is-glob "^2.0.0" - -glob-parent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28" - integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg= - dependencies: - is-glob "^2.0.0" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob@7.1.7, glob@^7.0.0, glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: - version "7.1.7" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" - integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^13.6.0, globals@^13.9.0: - version "13.11.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7" - integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== - dependencies: - type-fest "^0.20.2" - -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== - -globby@^11.0.1: - version "11.0.4" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" - integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.1.1" - ignore "^5.1.4" - merge2 "^1.3.0" - slash "^3.0.0" - -graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.2.0: - version "4.2.8" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" - integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== - -graphlib@^2.1.8: - version "2.1.8" - resolved "https://registry.yarnpkg.com/graphlib/-/graphlib-2.1.8.tgz#5761d414737870084c92ec7b5dbcb0592c9d35da" - integrity sha512-jcLLfkpoVGmH7/InMC/1hIvOPSUh38oJtGhvrOFGzioE1DZ+0YW16RgmOJhHiuWTvGiJQ9Z1Ik43JvkRPRvE+A== - dependencies: - lodash "^4.17.15" - -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-bigints@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" - integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== - -has-binary2@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d" - integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw== - dependencies: - isarray "2.0.1" - -has-color@~0.1.0: - version "0.1.7" - resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f" - integrity sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8= - -has-cors@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" - integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== - -has-flag@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-5.0.1.tgz#5483db2ae02a472d1d0691462fc587d1843cd940" - integrity sha512-CsNUt5x9LUdx6hnk/E2SZLsDyvfqANZSUq4+D3D8RzDJ2M+HDTIkF60ibS1vHaK55vzgiZw1bEPFG9yH7l33wA== - -has-symbols@^1.0.1, has-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" - integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== - -has-tostringtag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" - integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== - dependencies: - has-symbols "^1.0.2" - -has-unicode@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= - -has-value@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= - -has-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -has@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== - dependencies: - function-bind "^1.1.1" - -hash-base@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" - integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== - dependencies: - inherits "^2.0.4" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" - -hash.js@^1.0.0, hash.js@^1.0.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" - integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== - dependencies: - inherits "^2.0.3" - minimalistic-assert "^1.0.1" - -hast-util-from-parse5@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/hast-util-from-parse5/-/hast-util-from-parse5-7.1.0.tgz#c129dd3a24dd8a867ab8a029ca47e27aa54864b7" - integrity sha512-m8yhANIAccpU4K6+121KpPP55sSl9/samzQSQGpb0mTExcNh2WlvjtMwSWFhg6uqD4Rr6Nfa8N6TMypQM51rzQ== - dependencies: - "@types/hast" "^2.0.0" - "@types/parse5" "^6.0.0" - "@types/unist" "^2.0.0" - hastscript "^7.0.0" - property-information "^6.0.0" - vfile "^5.0.0" - vfile-location "^4.0.0" - web-namespaces "^2.0.0" - -hast-util-is-element@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/hast-util-is-element/-/hast-util-is-element-2.1.1.tgz#863019a27400dc4f1aedfa4900627f42fd75c2b7" - integrity sha512-ag0fiZfRWsPiR1udvnSbaazJLGv8qd8E+/e3rW8rUZhbKG4HNJmFL4QkEceN+22BgE+uozXY30z/s+2dL6Z++g== - dependencies: - "@types/hast" "^2.0.0" - "@types/unist" "^2.0.0" - -hast-util-parse-selector@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/hast-util-parse-selector/-/hast-util-parse-selector-3.1.0.tgz#a519e27e8b61bd5a98fad494ed06131ce68d9c3f" - integrity sha512-AyjlI2pTAZEOeu7GeBPZhROx0RHBnydkQIXlhnFzDi0qfXTmGUWoCYZtomHbrdrheV4VFUlPcfJ6LMF5T6sQzg== - dependencies: - "@types/hast" "^2.0.0" - -hast-util-to-html@^8.0.0: - version "8.0.2" - resolved "https://registry.yarnpkg.com/hast-util-to-html/-/hast-util-to-html-8.0.2.tgz#3445497508e2157a3169864eb43fb6ee929d3cbe" - integrity sha512-ipLhUTMyyJi9F/LXaNDG9BrRdshP6obCfmUZYbE/+T639IdzqAOkKN4DyrEyID0gbb+rsC3PKf0XlviZwzomhw== - dependencies: - "@types/hast" "^2.0.0" - ccount "^2.0.0" - comma-separated-tokens "^2.0.0" - hast-util-is-element "^2.0.0" - hast-util-whitespace "^2.0.0" - html-void-elements "^2.0.0" - property-information "^6.0.0" - space-separated-tokens "^2.0.0" - stringify-entities "^4.0.0" - unist-util-is "^5.0.0" - -hast-util-whitespace@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/hast-util-whitespace/-/hast-util-whitespace-2.0.0.tgz#4fc1086467cc1ef5ba20673cb6b03cec3a970f1c" - integrity sha512-Pkw+xBHuV6xFeJprJe2BBEoDV+AvQySaz3pPDRUs5PNZEMQjpXJJueqrpcHIXxnWTcAGi/UOCgVShlkY6kLoqg== - -hastscript@^7.0.0: - version "7.0.2" - resolved "https://registry.yarnpkg.com/hastscript/-/hastscript-7.0.2.tgz#d811fc040817d91923448a28156463b2e40d590a" - integrity sha512-uA8ooUY4ipaBvKcMuPehTAB/YfFLSSzCwFSwT6ltJbocFUKH/GDHLN+tflq7lSRf9H86uOuxOFkh1KgIy3Gg2g== - dependencies: - "@types/hast" "^2.0.0" - comma-separated-tokens "^2.0.0" - hast-util-parse-selector "^3.0.0" - property-information "^6.0.0" - space-separated-tokens "^2.0.0" - -he@1.2.0, 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== - -helmet@^4.5.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/helmet/-/helmet-4.6.0.tgz#579971196ba93c5978eb019e4e8ec0e50076b4df" - integrity sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg== - -highlight.js@10.7.3: - version "10.7.3" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.3.tgz#697272e3991356e40c3cac566a74eef681756531" - integrity sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A== - -hmac-drbg@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= - dependencies: - hash.js "^1.0.3" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.1" - -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" - -hosted-git-info@^2.1.4: - version "2.8.9" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" - integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== - -html-minifier-terser@^5.0.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" - integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg== - dependencies: - camel-case "^4.1.1" - clean-css "^4.2.3" - commander "^4.1.1" - he "^1.2.0" - param-case "^3.0.3" - relateurl "^0.2.7" - terser "^4.6.3" - -html-void-elements@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/html-void-elements/-/html-void-elements-2.0.0.tgz#ea71bae0dd33de675cdda3c4ace1bc7584bb1071" - integrity sha512-4OYzQQsBt0G9bJ/nM9/DDsjm4+fVdzAaPJJcWk5QwA3GIAPxQEeOR0rsI8HbDHQz5Gta8pVvGnnTNSbZVEVvkQ== - -html-webpack-plugin@4.5.2: - version "4.5.2" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.5.2.tgz#76fc83fa1a0f12dd5f7da0404a54e2699666bc12" - integrity sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A== - dependencies: - "@types/html-minifier-terser" "^5.0.0" - "@types/tapable" "^1.0.5" - "@types/webpack" "^4.41.8" - html-minifier-terser "^5.0.1" - loader-utils "^1.2.3" - lodash "^4.17.20" - pretty-error "^2.1.1" - tapable "^1.1.3" - util.promisify "1.0.0" - -"htmlparser2@>= 3.1.5 <4", htmlparser2@^3.9.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" - integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== - dependencies: - domelementtype "^1.3.1" - domhandler "^2.3.0" - domutils "^1.5.1" - entities "^1.1.1" - inherits "^2.0.1" - readable-stream "^3.1.1" - -htmlparser2@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" - integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.0.0" - domutils "^2.5.2" - entities "^2.0.0" - -http-errors@1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" - integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -http-errors@~1.7.2: - version "1.7.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" - integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.1.1" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - -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" - -https-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -i18n@^0.13.0: - version "0.13.3" - resolved "https://registry.yarnpkg.com/i18n/-/i18n-0.13.3.tgz#5820f48d87a77cf14e064719bee9bc682ed550eb" - integrity sha512-QDmY2joBdKxj3wvk2LKyvZkjwGHta882kYHwEvx1WbwiPAet49kEU7cxzGfnrtWrfh4+7I07kBc0ZSjSlhnKyQ== - dependencies: - debug "^4.1.1" - make-plural "^6.2.2" - math-interval-parser "^2.0.1" - messageformat "^2.3.0" - mustache "^4.0.1" - sprintf-js "^1.1.2" - -iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.4: - version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - dependencies: - safer-buffer ">= 2.1.2 < 3" - -iconv-lite@^0.6.2, iconv-lite@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" - integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== - dependencies: - safer-buffer ">= 2.1.2 < 3.0.0" - -icss-utils@^5.0.0, icss-utils@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== - -ieee754@1.1.13: - version "1.1.13" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84" - integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg== - -ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" - integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - -iferr@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" - integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE= - -ignore-walk@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" - integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== - dependencies: - minimatch "^3.0.4" - -ignore@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" - integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== - -ignore@^5.0.0, ignore@^5.1.1, ignore@^5.1.4: - version "5.1.8" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" - integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== - -image-size@~0.5.0: - version "0.5.5" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" - integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w= - -import-fresh@^3.0.0, import-fresh@^3.2.1: - version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" - integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-local@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" - integrity sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA== - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - -import-meta-resolve@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/import-meta-resolve/-/import-meta-resolve-1.1.1.tgz#244fd542fd1fae73550d4f8b3cde3bba1d7b2b18" - integrity sha512-JiTuIvVyPaUg11eTrNDx5bgQ/yMKMZffc7YSjvQeSMXy58DO2SQ8BtAf3xteZvmzvjYh14wnqNjL8XVeDy2o9A== - dependencies: - builtins "^4.0.0" - -imports-loader@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-1.2.0.tgz#b06823d0bb42e6f5ff89bc893829000eda46693f" - integrity sha512-zPvangKEgrrPeqeUqH0Uhc59YqK07JqZBi9a9cQ3v/EKUIqrbJHY4CvUrDus2lgQa5AmPyXuGrWP8JJTqzE5RQ== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - source-map "^0.6.1" - strip-comments "^2.0.1" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= - -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -indexof@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" - integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10= - -infer-owner@^1.0.3, infer-owner@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== - -inflection@1.12.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" - integrity sha1-ogCTVlbW9fa8TcdQLhrstwMihBY= - -inflight@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - -inherits@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= - -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= - -ini@^1.3.5, ini@~1.3.0: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== - dependencies: - get-intrinsic "^1.1.0" - has "^1.0.3" - side-channel "^1.0.4" - -interpret@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" - integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== - -invariant@^2.2.2: - version "2.2.4" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== - dependencies: - loose-envify "^1.0.0" - -ionicons@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ionicons/-/ionicons-2.0.1.tgz#ca398113293ea870244f538f0aabbd4b5b209a3e" - integrity sha1-yjmBEyk+qHAkT1OPCqu9S1sgmj4= - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -is-absolute-url@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698" - integrity sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q== - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ== - dependencies: - kind-of "^6.0.0" - -is-alphabetical@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-2.0.0.tgz#ef6e2caea57c63450fffc7abb6cbdafc5eb96e96" - integrity sha512-5OV8Toyq3oh4eq6sbWTYzlGdnMT/DPI5I0zxUBxjiigQsZycpkKF3kskkao3JyYGuYDHvhgJF+DrjMQp9SX86w== - -is-alphanumerical@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-alphanumerical/-/is-alphanumerical-2.0.0.tgz#0fbfeb6a72d21d91143b3d182bf6cf5909ee66f6" - integrity sha512-t+2GlJ+hO9yagJ+jU3+HSh80VKvz/3cG2cxbGGm4S0hjKuhWQXgPVUVOZz3tqZzMjhmphZ+1TIJTlRZRoe6GCQ== - dependencies: - is-alphabetical "^2.0.0" - is-decimal "^2.0.0" - -is-arguments@^1.0.4, is-arguments@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" - integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-arrayish@^0.3.1: - version "0.3.2" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" - integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== - -is-bigint@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" - integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== - dependencies: - has-bigints "^1.0.1" - -is-binary-path@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898" - integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg= - dependencies: - binary-extensions "^1.0.0" - -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-bluebird@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-bluebird/-/is-bluebird-1.0.2.tgz#096439060f4aa411abee19143a84d6a55346d6e2" - integrity sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI= - -is-boolean-object@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" - integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w== - -is-buffer@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191" - integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ== - -is-callable@^1.1.4, is-callable@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" - integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== - -is-core-module@^2.2.0, is-core-module@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.6.0.tgz#d7553b2526fe59b92ba3e40c8df757ec8a709e19" - integrity sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ== - dependencies: - has "^1.0.3" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ== - dependencies: - kind-of "^6.0.0" - -is-date-object@^1.0.1, is-date-object@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" - integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== - dependencies: - has-tostringtag "^1.0.0" - -is-decimal@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-decimal/-/is-decimal-2.0.0.tgz#db1140337809fd043a056ae40a9bd1cdc563034c" - integrity sha512-QfrfjQV0LjoWQ1K1XSoEZkTAzSa14RKVMa5zg3SdAfzEmQzRM4+tbSFWb78creCeA9rNBzaZal92opi1TwPWZw== - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg== - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg== - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-dotfile@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1" - integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE= - -is-empty@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/is-empty/-/is-empty-1.2.0.tgz#de9bb5b278738a05a0b09a57e1fb4d4a341a9f6b" - integrity sha1-3pu1snhzigWgsJpX4ftNSjQan2s= - -is-equal-shallow@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534" - integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ= - dependencies: - is-primitive "^2.0.0" - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA== - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0" - integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA= - -is-extglob@^2.1.0, is-extglob@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-finite@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" - integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== - -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-fullwidth-code-point@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz#fae3167c729e7463f8461ce512b080a49268aa88" - integrity sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ== - -is-generator-function@^1.0.7: - version "1.0.10" - resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" - integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== - dependencies: - has-tostringtag "^1.0.0" - -is-glob@^2.0.0, is-glob@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863" - integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM= - dependencies: - is-extglob "^1.0.0" - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= - dependencies: - is-extglob "^2.1.0" - -is-glob@^4.0.0, 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-hexadecimal@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-2.0.0.tgz#8e1ec9f48fe3eabd90161109856a23e0907a65d5" - integrity sha512-vGOtYkiaxwIiR0+Ng/zNId+ZZehGfINwTzdrDqc6iubbnQWhnPuYymOzOKUDqa2cSl59yHnEh2h6MvRLQsyNug== - -is-map@^2.0.1, is-map@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" - integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== - -is-negative-zero@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" - integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== - -is-number-object@^1.0.4: - version "1.0.6" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" - integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== - dependencies: - has-tostringtag "^1.0.0" - -is-number@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f" - integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8= - dependencies: - kind-of "^3.0.2" - -is-number@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - dependencies: - kind-of "^3.0.2" - -is-number@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff" - integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ== - -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-plain-obj@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.0.0.tgz#06c0999fd7574edf5a906ba5644ad0feb3a84d22" - integrity sha512-NXRbBtUdBioI73y/HmOhogw/U5msYPC9DAtGkJXeFcFWSFZw0mCUsPxk/snTuJHzNKA8kLBK4rH97RMB1BfCXw== - -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - -is-posix-bracket@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" - integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q= - -is-primitive@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575" - integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU= - -is-property@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" - integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ= - -is-regex@^1.1.1, is-regex@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" - integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== - dependencies: - call-bind "^1.0.2" - has-tostringtag "^1.0.0" - -is-resolvable@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" - integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg== - -is-set@^2.0.1, is-set@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" - integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== - -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - -is-string@^1.0.5, is-string@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" - integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== - dependencies: - has-tostringtag "^1.0.0" - -is-svg@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-4.3.1.tgz#8c63ec8c67c8c7f0a8de0a71c8c7d58eccf4406b" - integrity sha512-h2CGs+yPUyvkgTJQS9cJzo9lYK06WgRiXUqBBHtglSzVKAuH4/oWsqk7LGfbSa1hGk9QcZ0SyQtVggvBA8LZXA== - dependencies: - fast-xml-parser "^3.19.0" - -is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" - integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== - dependencies: - has-symbols "^1.0.2" - -is-typed-array@^1.1.3, is-typed-array@^1.1.7: - version "1.1.8" - resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.8.tgz#cbaa6585dc7db43318bc5b89523ea384a6f65e79" - integrity sha512-HqH41TNZq2fgtGT8WHVFVJhBVGuY3AnP3Q36K8JKXUxSxRgk/d+7NjmwG2vo2mYmXK8UYZKu0qH8bVP5gEisjA== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-abstract "^1.18.5" - foreach "^2.0.5" - has-tostringtag "^1.0.0" - -is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - -is-weakmap@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.1.tgz#5008b59bdc43b698201d18f62b37b2ca243e8cf2" - integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA== - -is-weakset@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.1.tgz#e9a0af88dbd751589f5e50d80f4c98b780884f83" - integrity sha512-pi4vhbhVHGLxohUw7PhGsueT4vRGFoXhP7+RGN0jKIv9+8PWYCQTqtADngrxOm2g46hoH0+g8uZZBzMrvVGDmw== - -is-what@^3.12.0: - version "3.14.1" - resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" - integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA== - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -is-wsl@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d" - integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0= - -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, isarray@^1.0.0, isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isarray@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" - integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4= - -isarray@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" - integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== - -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= - -isobject@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -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= - -jake@^10.6.1: - version "10.8.2" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" - integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== - dependencies: - async "0.9.x" - chalk "^2.4.2" - filelist "^1.0.1" - minimatch "^3.0.4" - -jmespath@0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" - integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= - -joycon@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.0.1.tgz#9074c9b08ccf37a6726ff74a18485f85efcaddaf" - integrity sha512-SJcJNBg32dGgxhPtM0wQqxqV0ax9k/9TaUskGDSJkSFSQOEWWvQ3zzWdGQRIUry2j1zA5+ReH13t0Mf3StuVZA== - -jquery-mousewheel@3.1.13: - version "3.1.13" - resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5" - integrity sha1-BvAzXxbjU6aV5yBr9QUDy1I6buU= - -jquery-ui@1.12.1: - version "1.12.1" - resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.12.1.tgz#bcb4045c8dd0539c134bc1488cdd3e768a7a9e51" - integrity sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE= - -jquery@3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" - integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== - -js-cookie@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.1.tgz#9e39b4c6c2f56563708d7d31f6f5f21873a92414" - integrity sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw== - -"js-sequence-diagrams@git+https://github.com/hedgedoc/js-sequence-diagrams.git": - version "2.0.1" - resolved "git+https://github.com/hedgedoc/js-sequence-diagrams.git#bda0e49b6c2754f3c7158b1dfb9ccf26efc24b39" - dependencies: - lodash "4.17.x" - raphael "2.3.x" - snapsvg "0.5.x" - underscore "1.11.x" - webfontloader "~1.6.x" - -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== - -js-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@3.14.1, js-yaml@^3.13.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" - integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@~4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" - integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== - dependencies: - argparse "^2.0.1" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - -jsdom-nogyp@^0.8.3: - version "0.8.3" - resolved "https://registry.yarnpkg.com/jsdom-nogyp/-/jsdom-nogyp-0.8.3.tgz#924b3f03cfe487dfcdf6375e6324252ceb80d0cc" - integrity sha1-kks/A8/kh9/N9jdeYyQlLOuA0Mw= - dependencies: - cssom "~0.2.5" - cssstyle "~0.2.3" - htmlparser2 ">= 3.1.5 <4" - nwmatcher "~1.3.1" - request "2.x" - xmlhttprequest ">=1.5.0" - -jsesc@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= - -jsesc@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= - -json-edm-parser@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/json-edm-parser/-/json-edm-parser-0.1.2.tgz#1e60b0fef1bc0af67bc0d146dfdde5486cd615b4" - integrity sha1-HmCw/vG8CvZ7wNFG393lSGzWFbQ= - dependencies: - jsonparse "~1.2.0" - -json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - -json-parse-even-better-errors@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== - -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - -json-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-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= - -json-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-stream/-/json-stream-1.0.0.tgz#1a3854e28d2bbeeab31cc7ddf683d2ddc5652708" - integrity sha1-GjhU4o0rvuqzHMfd9oPS3cVlJwg= - -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= - -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== - dependencies: - minimist "^1.2.0" - -json5@^2.0.0, json5@^2.1.2, json5@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" - -jsonlint@1.6.3: - version "1.6.3" - resolved "https://registry.yarnpkg.com/jsonlint/-/jsonlint-1.6.3.tgz#cb5e31efc0b78291d0d862fbef05900adf212988" - integrity sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A== - dependencies: - JSV "^4.0.x" - nomnom "^1.5.x" - -jsonparse@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.2.0.tgz#5c0c5685107160e72fe7489bddea0b44c2bc67bd" - integrity sha1-XAxWhRBxYOcv50ib3eoLRMK8Z70= - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -keymaster@1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/keymaster/-/keymaster-1.6.2.tgz#e1ae54d0ea9488f9f60b66b668f02e9a1946c6eb" - integrity sha1-4a5U0OqUiPn2C2a2aPAumhlGxus= - -khroma@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/khroma/-/khroma-1.4.1.tgz#ad6a5b6a972befc5112ce5129887a1a83af2c003" - integrity sha512-+GmxKvmiRuCcUYDgR7g5Ngo0JEDeOsGdNONdU2zsiBQaK4z19Y2NvXqfEDE0ZiIrg45GTZyAnPLVsLZZACYm3Q== - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw== - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== - -klona@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0" - integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA== - -kuler@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/kuler/-/kuler-2.0.0.tgz#e2c570a3800388fb44407e851531c1d670b061b3" - integrity sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A== - -last-call-webpack-plugin@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz#9742df0e10e3cf46e5c0381c2de90d3a7a2d7555" - integrity sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w== - dependencies: - lodash "^4.17.5" - webpack-sources "^1.1.0" - -lazystream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4" - integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ= - dependencies: - readable-stream "^2.0.5" - -ldap-filter@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/ldap-filter/-/ldap-filter-0.3.3.tgz#2b14c68a2a9d4104dbdbc910a1ca85fd189e9797" - integrity sha1-KxTGiiqdQQTb28kQocqF/Riel5c= - dependencies: - assert-plus "^1.0.0" - -ldapauth-fork@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/ldapauth-fork/-/ldapauth-fork-5.0.1.tgz#18779a9c30371c5bbea02e3b6aaadb60819ad29c" - integrity sha512-EdELQz8zgPruqV2y88PAuAiZCgTaMjex/kEA2PIcOlPYFt75C9QFt5HGZKVQo8Sf/3Mwnr1AtiThHKcq+pRtEg== - dependencies: - "@types/ldapjs" "^1.0.9" - bcryptjs "^2.4.0" - ldapjs "^2.2.1" - lru-cache "^6.0.0" - -ldapjs@^2.2.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz#04136815fb1f21d692ac87fab5961a04d86e8b04" - integrity sha512-kf0tHHLrpwKaBAQOhYHXgdeh2PkFuCCxWgLb1MRn67ZQVo787D2pij3mmHVZx193GIdM8xcfi8HF6AIYYnj0fQ== - dependencies: - abstract-logging "^2.0.0" - asn1 "^0.2.4" - assert-plus "^1.0.0" - backoff "^2.5.0" - ldap-filter "^0.3.3" - once "^1.4.0" - vasync "^2.2.0" - verror "^1.8.1" - -less-loader@7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-7.3.0.tgz#f9d6d36d18739d642067a05fb5bd70c8c61317e5" - integrity sha512-Mi8915g7NMaLlgi77mgTTQvK022xKRQBIVDSyfl3ErTuBhmZBQab0mjeJjNNqGbdR+qrfTleKXqbGI4uEFavxg== - dependencies: - klona "^2.0.4" - loader-utils "^2.0.0" - schema-utils "^3.0.0" - -less@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/less/-/less-4.1.1.tgz#15bf253a9939791dc690888c3ff424f3e6c7edba" - integrity sha512-w09o8tZFPThBscl5d0Ggp3RcrKIouBoQscnOMgFH3n5V3kN/CXGHNfCkRPtxJk6nKryDXaV9aHLK55RXuH4sAw== - dependencies: - copy-anything "^2.0.1" - parse-node-version "^1.0.1" - tslib "^1.10.0" - optionalDependencies: - errno "^0.1.1" - graceful-fs "^4.1.2" - image-size "~0.5.0" - make-dir "^2.1.0" - mime "^1.4.1" - needle "^2.5.2" - source-map "~0.6.0" - -levn@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" - integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== - dependencies: - prelude-ls "^1.2.1" - type-check "~0.4.0" - -libnpmconfig@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/libnpmconfig/-/libnpmconfig-1.2.1.tgz#c0c2f793a74e67d4825e5039e7a02a0044dfcbc0" - integrity sha512-9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA== - dependencies: - figgy-pudding "^3.5.1" - find-up "^3.0.0" - ini "^1.3.5" - -lilconfig@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz#68f3005e921dafbd2a2afb48379986aa6d2579fd" - integrity sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg== - -lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - -linkify-it@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.2.tgz#f55eeb8bc1d3ae754049e124ab3bb56d97797fb8" - integrity sha512-gDBO4aHNZS6coiZCKVhSNh43F9ioIL4JwRjLZPkoLIY4yZFwg264Y5lu2x6rb1Js42Gh6Yqm2f6L2AJcnkzinQ== - dependencies: - uc.micro "^1.0.1" - -list.js@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/list.js/-/list.js-2.3.1.tgz#48961989ffe52b0505e352f7a521f819f51df7e7" - integrity sha512-jnmm7DYpKtH3DxtO1E2VNCC9Gp7Wrp/FWA2JxQrZUhVJ2RCQBd57pCN6W5w6jpsfWZV0PCAbTX2NOPgyFeeZZg== - dependencies: - string-natural-compare "^2.0.2" - -load-json-file@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" - integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= - dependencies: - graceful-fs "^4.1.2" - parse-json "^4.0.0" - pify "^3.0.0" - strip-bom "^3.0.0" - -load-plugin@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/load-plugin/-/load-plugin-4.0.1.tgz#9a239b0337064c9b8aac82b0c9f89b067db487c5" - integrity sha512-4kMi+mOSn/TR51pDo4tgxROHfBHXsrcyEYSGHcJ1o6TtRaP2PsRM5EwmYbj1uiLDvbfA/ohwuSWZJzqGiai8Dw== - dependencies: - import-meta-resolve "^1.0.0" - libnpmconfig "^1.0.0" - -loader-runner@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" - integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw== - -loader-utils@^1.0.2, loader-utils@^1.2.3: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" - integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^1.0.1" - -loader-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" - integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - -locate-path@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" - integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== - dependencies: - p-locate "^3.0.0" - path-exists "^3.0.0" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - -locate-path@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" - integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== - dependencies: - p-locate "^5.0.0" - -lodash.assignin@^4.0.9: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2" - integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI= - -lodash.bind@^4.1.4: - version "4.2.1" - resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35" - integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU= - -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - -lodash.defaults@^4.0.1, lodash.defaults@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" - integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw= - -lodash.difference@^4.5.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" - integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= - -lodash.filter@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace" - integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4= - -lodash.flatten@^4.2.0, lodash.flatten@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f" - integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8= - -lodash.foreach@^4.3.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53" - integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM= - -lodash.get@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= - -lodash.isplainobject@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" - integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs= - -lodash.map@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3" - integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM= - -lodash.memoize@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= - -lodash.merge@^4.4.0, lodash.merge@^4.6.2: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - -lodash.pick@^4.2.1: - version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" - integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= - -lodash.reduce@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b" - integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs= - -lodash.reject@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415" - integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= - -lodash.some@^4.4.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d" - integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0= - -lodash.truncate@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= - -lodash.union@^4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88" - integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg= - -lodash.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.17.x, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5: - version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== - -log-symbols@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - -logform@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2" - integrity sha512-N0qPlqfypFx7UHNn4B3lzS/b0uLqt2hmuoa+PpuXNYgozdJYAyauF5Ky0BWVjrxDlMWiT3qN4zPq3vVAfZy7Yg== - dependencies: - colors "^1.2.1" - fast-safe-stringify "^2.0.4" - fecha "^4.2.0" - ms "^2.1.1" - triple-beam "^1.3.0" - -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - -longest-streak@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/longest-streak/-/longest-streak-3.0.0.tgz#f127e2bded83caa6a35ac5f7a2f2b2f94b36f3dc" - integrity sha512-XhUjWR5CFaQ03JOP+iSDS9koy8T5jfoImCZ4XprElw3BXsSk4MpVYOLw/6LTDKZhO13PlAXnB5gS4MHQTpkSOw== - -loose-envify@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - -lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" - integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== - dependencies: - tslib "^2.0.3" - -lru-cache@^4.1.3: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - -lru-cache@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== - dependencies: - yallist "^3.0.2" - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -lutim@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/lutim/-/lutim-1.0.3.tgz#3a29d0f2731eed7097f2d7367defeaa2ae45d820" - integrity sha512-niTn8F4/SyxjXG2a1lXAS/t5Yox9DCOPfVff6Y5tfrBPkK/bnzp2bRIkSNF+X2PRxjfvev0jFmi9J6IX1IkC7A== - dependencies: - q "^1.5.1" - request "^2.88.0" - -"lz-string@git+https://github.com/hackmdio/lz-string.git": - version "1.4.4" - resolved "git+https://github.com/hackmdio/lz-string.git#efd1f64676264d6d8871b01f4f375fc6ef4f9022" - -make-dir@^1.0.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" - integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== - dependencies: - pify "^3.0.0" - -make-dir@^2.0.0, make-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" - integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== - dependencies: - pify "^4.0.1" - semver "^5.6.0" - -make-dir@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -make-plural@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-4.3.0.tgz#f23de08efdb0cac2e0c9ba9f315b0dff6b4c2735" - integrity sha512-xTYd4JVHpSCW+aqDof6w/MebaMVNTVYBZhbB/vi513xXdiPT92JMVCo0Jq8W2UZnzYRFeVbQiQ+I25l13JuKvA== - optionalDependencies: - minimist "^1.2.0" - -make-plural@^6.2.2: - version "6.2.2" - resolved "https://registry.yarnpkg.com/make-plural/-/make-plural-6.2.2.tgz#beb5fd751355e72660eeb2218bb98eec92853c6c" - integrity sha512-8iTuFioatnTTmb/YJjywkVIHLjcwkFD9Ms0JpxjEm9Mo8eQYkh1z+55dwv4yc1jQ8ftVBxWQbihvZL1DfzGGWA== - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - dependencies: - object-visit "^1.0.0" - -mariadb@^2.1.2: - version "2.5.4" - resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-2.5.4.tgz#c66daa35e2768b8c714c758453531c06ae4927f4" - integrity sha512-4vQgMRyBIN9EwSQG0vzjR9D8bscPH0dGPJt67qVlOkHSiSm0xUatg1Pft4o1LzORgeOW4PheiY/HBE9bYYmNCA== - dependencies: - "@types/geojson" "^7946.0.7" - "@types/node" "^14.14.28" - denque "^1.5.0" - iconv-lite "^0.6.3" - long "^4.0.0" - moment-timezone "^0.5.33" - please-upgrade-node "^3.2.0" - -markdown-it-abbr@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/markdown-it-abbr/-/markdown-it-abbr-1.0.4.tgz#d66b5364521cbb3dd8aa59dadfba2fb6865c8fd8" - integrity sha1-1mtTZFIcuz3Yqlna37ovtoZcj9g= - -markdown-it-container@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/markdown-it-container/-/markdown-it-container-3.0.0.tgz#1d19b06040a020f9a827577bb7dbf67aa5de9a5b" - integrity sha512-y6oKTq4BB9OQuY/KLfk/O3ysFhB3IMYoIWhGJEidXt1NQFocFK2sA2t0NYZAMyMShAGL6x5OPIbrmXPIqaN9rw== - -markdown-it-deflist@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz#50d7a56b9544cd81252f7623bd785e28a8dcef5c" - integrity sha512-3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg== - -markdown-it-emoji@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/markdown-it-emoji/-/markdown-it-emoji-2.0.0.tgz#3164ad4c009efd946e98274f7562ad611089a231" - integrity sha512-39j7/9vP/CPCKbEI44oV8yoPJTpvfeReTn/COgRhSpNrjWF3PfP/JUxxB0hxV6ynOY8KH8Y8aX9NMDdo6z+6YQ== - -markdown-it-footnote@^3.0.1: - version "3.0.3" - resolved "https://registry.yarnpkg.com/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz#e0e4c0d67390a4c5f0c75f73be605c7c190ca4d8" - integrity sha512-YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w== - -markdown-it-imsize@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/markdown-it-imsize/-/markdown-it-imsize-2.0.1.tgz#cca0427905d05338a247cb9ca9d968c5cddd5170" - integrity sha1-zKBCeQXQUziiR8ucqdloxc3dUXA= - -markdown-it-ins@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/markdown-it-ins/-/markdown-it-ins-3.0.1.tgz#c09356b917cf1dbf73add0b275d67ab8c73d4b4d" - integrity sha512-32SSfZqSzqyAmmQ4SHvhxbFqSzPDqsZgMHDwxqPzp+v+t8RsmqsBZRG+RfRQskJko9PfKC2/oxyOs4Yg/CfiRw== - -markdown-it-mark@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/markdown-it-mark/-/markdown-it-mark-3.0.1.tgz#51257db58787d78aaf46dc13418d99a9f3f0ebd3" - integrity sha512-HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A== - -markdown-it-mathjax@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/markdown-it-mathjax/-/markdown-it-mathjax-2.0.0.tgz#ae2b4f4c5c719a03f9e475c664f7b2685231d9e9" - integrity sha1-ritPTFxxmgP55HXGZPeyaFIx2ek= - -markdown-it-regexp@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/markdown-it-regexp/-/markdown-it-regexp-0.4.0.tgz#d64d713eecec55ce4cfdeb321750ecc099e2c2dc" - integrity sha1-1k1xPuzsVc5M/esyF1DswJniwtw= - -markdown-it-sub@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz#375fd6026eae7ddcb012497f6411195ea1e3afe8" - integrity sha1-N1/WAm6ufdywEkl/ZBEZXqHjr+g= - -markdown-it-sup@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/markdown-it-sup/-/markdown-it-sup-1.0.0.tgz#cb9c9ff91a5255ac08f3fd3d63286e15df0a1fc3" - integrity sha1-y5yf+RpSVawI8/09YyhuFd8KH8M= - -markdown-it@^12.0.0: - version "12.2.0" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.2.0.tgz#091f720fd5db206f80de7a8d1f1a7035fd0d38db" - integrity sha512-Wjws+uCrVQRqOoJvze4HCqkKl1AsSh95iFAeQDwnyfxM09divCBSXlDR1uTvyUP3Grzpn4Ru8GeCxYPM8vkCQg== - dependencies: - argparse "^2.0.1" - entities "~2.1.0" - linkify-it "^3.0.1" - mdurl "^1.0.1" - uc.micro "^1.0.5" - -marked@~2.1.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz#bd017cef6431724fd4b27e0657f5ceb14bff3753" - integrity sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA== - -math-interval-parser@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/math-interval-parser/-/math-interval-parser-2.0.1.tgz#e22cd6d15a0a7f4c03aec560db76513da615bed4" - integrity sha512-VmlAmb0UJwlvMyx8iPhXUDnVW1F9IrGEd9CIOmv+XL8AErCUUuozoDMrgImvnYt2A+53qVX/tPW6YJurMKYsvA== - -math-random@^1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.4.tgz#5dd6943c938548267016d4e34f057583080c514c" - integrity sha512-rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A== - -mathjax@2.7.9: - version "2.7.9" - resolved "https://registry.yarnpkg.com/mathjax/-/mathjax-2.7.9.tgz#d6b67955c173e7d719fcb2fc0288662884eb7d3d" - integrity sha512-NOGEDTIM9+MrsqnjPEjVGNx4q0GQxqm61yQwSK+/5S59i26wId5IC5gNu9/bu8+CCVl5p9G2IHcAl/wJa+5+BQ== - -mattermost@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/mattermost/-/mattermost-3.4.0.tgz#7e4958e1bc96c7da7bc5f179dd2c6ae5035a8857" - integrity sha1-fklY4byWx9p7xfF53Sxq5QNaiFc= - dependencies: - superagent "1.8.3" - -md5.js@1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d" - integrity sha1-6b296UogpawYsENA/Fdk1bCdkB0= - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - -md5.js@^1.3.4: - version "1.3.5" - resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" - integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - safe-buffer "^5.1.2" - -mdast-comment-marker@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mdast-comment-marker/-/mdast-comment-marker-2.0.0.tgz#1b97b8c01fc1ad0a213940e9dc50e787db349907" - integrity sha512-LQ4sf7vUzxz4mQQlzzBDgjaCJO5A0lkIAT9TyeNMfqaP31ooP1Qw9hprf7/V3NCo5FA1nvo5gbnfLVRY79QlDQ== - -mdast-util-from-markdown@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.0.0.tgz#c517313cd999ec2b8f6d447b438c5a9d500b89c9" - integrity sha512-uj2G60sb7z1PNOeElFwCC9b/Se/lFXuLhVKFOAY2EHz/VvgbupTQRNXPoZl7rGpXYL6BNZgcgaybrlSWbo7n/g== - dependencies: - "@types/mdast" "^3.0.0" - "@types/unist" "^2.0.0" - mdast-util-to-string "^3.0.0" - micromark "^3.0.0" - micromark-util-decode-numeric-character-reference "^1.0.0" - micromark-util-normalize-identifier "^1.0.0" - micromark-util-symbol "^1.0.0" - micromark-util-types "^1.0.0" - parse-entities "^3.0.0" - unist-util-stringify-position "^3.0.0" - -mdast-util-heading-style@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/mdast-util-heading-style/-/mdast-util-heading-style-2.0.0.tgz#19bcc14d96b4a6f24efbe1318409bd34af64bb7f" - integrity sha512-q9+WW2hJduW51LgV2r/fcU5wIt2GLFf0yYHxyi0f2aaxnC63ErBSOAJlhP6nbQ6yeG5rTCozbwOi4QNDPKV0zw== - dependencies: - "@types/mdast" "^3.0.0" - -mdast-util-to-markdown@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-1.2.1.tgz#33e93c2409f8c1be17b832f90978e29830af5435" - integrity sha512-yj0UexEfdH0Zqw9CztzC5+J6OZKgCY6K0ommn56SBlPKIV3NGqk1Wo/zw1Q0e/kHb50wmQ8O9cwbOl7vmaJjxg== - dependencies: - "@types/mdast" "^3.0.0" - "@types/unist" "^2.0.0" - longest-streak "^3.0.0" - mdast-util-to-string "^3.0.0" - parse-entities "^3.0.0" - unist-util-visit "^4.0.0" - zwitch "^2.0.0" - -mdast-util-to-string@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-3.1.0.tgz#56c506d065fbf769515235e577b5a261552d56e9" - integrity sha512-n4Vypz/DZgwo0iMHLQL49dJzlp7YtAJP+N07MZHpjPf/5XJuHUWstviF4Mn2jEiR/GNmtnRRqnwsXExk3igfFA== - -mdn-data@2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50" - integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow== - -mdurl@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" - integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4= - -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= - -memory-fs@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552" - integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI= - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -memory-fs@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c" - integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA== - dependencies: - errno "^0.1.3" - readable-stream "^2.0.1" - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -merge2@^1.3.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -mermaid@8.12.1: - version "8.12.1" - resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-8.12.1.tgz#6b55617bcfc970a7bf724e027368b281feb62539" - integrity sha512-0UCcSF0FLoNcPBsRF4f9OIV32t41fV18//z8o3S+FDz2PbDA1CRGKdQF9IX84VP4Tv9kcgJI/oqJdcBEtB/GPA== - dependencies: - "@braintree/sanitize-url" "^3.1.0" - d3 "^5.16.0" - dagre "^0.8.5" - dagre-d3 "^0.6.4" - dompurify "2.3.1" - graphlib "^2.1.8" - khroma "^1.4.1" - moment-mini "^2.24.0" - stylis "^4.0.10" - -messageformat-formatters@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/messageformat-formatters/-/messageformat-formatters-2.0.1.tgz#0492c1402a48775f751c9b17c0354e92be012b08" - integrity sha512-E/lQRXhtHwGuiQjI7qxkLp8AHbMD5r2217XNe/SREbBlSawe0lOqsFb7rflZJmlQFSULNLIqlcjjsCPlB3m3Mg== - -messageformat-parser@^4.1.2: - version "4.1.3" - resolved "https://registry.yarnpkg.com/messageformat-parser/-/messageformat-parser-4.1.3.tgz#b824787f57fcda7d50769f5b63e8d4fda68f5b9e" - integrity sha512-2fU3XDCanRqeOCkn7R5zW5VQHWf+T3hH65SzuqRvjatBK7r4uyFa5mEX+k6F9Bd04LVM5G4/BHBTUJsOdW7uyg== - -messageformat@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/messageformat/-/messageformat-2.3.0.tgz#de263c49029d5eae65d7ee25e0754f57f425ad91" - integrity sha512-uTzvsv0lTeQxYI2y1NPa1lItL5VRI8Gb93Y2K2ue5gBPyrbJxfDi/EYWxh2PKv5yO42AJeeqblS9MJSh/IEk4w== - dependencies: - make-plural "^4.3.0" - messageformat-formatters "^2.0.1" - messageformat-parser "^4.1.2" - -"meta-marked@git+https://github.com/hedgedoc/meta-marked": - version "0.4.5" - resolved "git+https://github.com/hedgedoc/meta-marked#6b3653c53a1727f697d0719626c55037b2f03753" - dependencies: - js-yaml "~4.1.0" - marked "~2.1.0" - -method-override@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/method-override/-/method-override-3.0.0.tgz#6ab0d5d574e3208f15b0c9cf45ab52000468d7a2" - integrity sha512-IJ2NNN/mSl9w3kzWB92rcdHpz+HjkxhDJWNDBqSlas+zQdP8wBiJzITPg08M/k2uVvMow7Sk41atndNtt/PHSA== - dependencies: - debug "3.1.0" - methods "~1.1.2" - parseurl "~1.3.2" - vary "~1.1.2" - -methods@~1.1.1, methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= - -micromark-core-commonmark@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.0.1.tgz#a64987cafe872e8b80bc8f2352a5d988586ac4f1" - integrity sha512-vEOw8hcQ3nwHkKKNIyP9wBi8M50zjNajtmI+cCUWcVfJS+v5/3WCh4PLKf7PPRZFUutjzl4ZjlHwBWUKfb/SkA== - dependencies: - micromark-factory-destination "^1.0.0" - micromark-factory-label "^1.0.0" - micromark-factory-space "^1.0.0" - micromark-factory-title "^1.0.0" - micromark-factory-whitespace "^1.0.0" - micromark-util-character "^1.0.0" - micromark-util-chunked "^1.0.0" - micromark-util-classify-character "^1.0.0" - micromark-util-html-tag-name "^1.0.0" - micromark-util-normalize-identifier "^1.0.0" - micromark-util-resolve-all "^1.0.0" - micromark-util-subtokenize "^1.0.0" - micromark-util-symbol "^1.0.0" - micromark-util-types "^1.0.1" - parse-entities "^3.0.0" - -micromark-factory-destination@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-1.0.0.tgz#fef1cb59ad4997c496f887b6977aa3034a5a277e" - integrity sha512-eUBA7Rs1/xtTVun9TmV3gjfPz2wEwgK5R5xcbIM5ZYAtvGF6JkyaDsj0agx8urXnO31tEO6Ug83iVH3tdedLnw== - dependencies: - micromark-util-character "^1.0.0" - micromark-util-symbol "^1.0.0" - micromark-util-types "^1.0.0" - -micromark-factory-label@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-1.0.0.tgz#b316ec479b474232973ff13b49b576f84a6f2cbb" - integrity sha512-XWEucVZb+qBCe2jmlOnWr6sWSY6NHx+wtpgYFsm4G+dufOf6tTQRRo0bdO7XSlGPu5fyjpJenth6Ksnc5Mwfww== - dependencies: - micromark-util-character "^1.0.0" - micromark-util-symbol "^1.0.0" - micromark-util-types "^1.0.0" - -micromark-factory-space@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-1.0.0.tgz#cebff49968f2b9616c0fcb239e96685cb9497633" - integrity sha512-qUmqs4kj9a5yBnk3JMLyjtWYN6Mzfcx8uJfi5XAveBniDevmZasdGBba5b4QsvRcAkmvGo5ACmSUmyGiKTLZew== - dependencies: - micromark-util-character "^1.0.0" - micromark-util-types "^1.0.0" - -micromark-factory-title@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-1.0.0.tgz#708f7a8044f34a898c0efdb4f55e4da66b537273" - integrity sha512-flvC7Gx0dWVWorXuBl09Cr3wB5FTuYec8pMGVySIp2ZlqTcIjN/lFohZcP0EG//krTptm34kozHk7aK/CleCfA== - dependencies: - micromark-factory-space "^1.0.0" - micromark-util-character "^1.0.0" - micromark-util-symbol "^1.0.0" - micromark-util-types "^1.0.0" - -micromark-factory-whitespace@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-1.0.0.tgz#e991e043ad376c1ba52f4e49858ce0794678621c" - integrity sha512-Qx7uEyahU1lt1RnsECBiuEbfr9INjQTGa6Err+gF3g0Tx4YEviPbqqGKNv/NrBaE7dVHdn1bVZKM/n5I/Bak7A== - dependencies: - micromark-factory-space "^1.0.0" - micromark-util-character "^1.0.0" - micromark-util-symbol "^1.0.0" - micromark-util-types "^1.0.0" - -micromark-util-character@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-1.1.0.tgz#d97c54d5742a0d9611a68ca0cd4124331f264d86" - integrity sha512-agJ5B3unGNJ9rJvADMJ5ZiYjBRyDpzKAOk01Kpi1TKhlT1APx3XZk6eN7RtSz1erbWHC2L8T3xLZ81wdtGRZzg== - dependencies: - micromark-util-symbol "^1.0.0" - micromark-util-types "^1.0.0" - -micromark-util-chunked@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-1.0.0.tgz#5b40d83f3d53b84c4c6bce30ed4257e9a4c79d06" - integrity sha512-5e8xTis5tEZKgesfbQMKRCyzvffRRUX+lK/y+DvsMFdabAicPkkZV6gO+FEWi9RfuKKoxxPwNL+dFF0SMImc1g== - dependencies: - micromark-util-symbol "^1.0.0" - -micromark-util-classify-character@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-1.0.0.tgz#cbd7b447cb79ee6997dd274a46fc4eb806460a20" - integrity sha512-F8oW2KKrQRb3vS5ud5HIqBVkCqQi224Nm55o5wYLzY/9PwHGXC01tr3d7+TqHHz6zrKQ72Okwtvm/xQm6OVNZA== - dependencies: - micromark-util-character "^1.0.0" - micromark-util-symbol "^1.0.0" - micromark-util-types "^1.0.0" - -micromark-util-combine-extensions@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-1.0.0.tgz#91418e1e74fb893e3628b8d496085639124ff3d5" - integrity sha512-J8H058vFBdo/6+AsjHp2NF7AJ02SZtWaVUjsayNFeAiydTxUwViQPxN0Hf8dp4FmCQi0UUFovFsEyRSUmFH3MA== - dependencies: - micromark-util-chunked "^1.0.0" - micromark-util-types "^1.0.0" - -micromark-util-decode-numeric-character-reference@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-1.0.0.tgz#dcc85f13b5bd93ff8d2868c3dba28039d490b946" - integrity sha512-OzO9AI5VUtrTD7KSdagf4MWgHMtET17Ua1fIpXTpuhclCqD8egFWo85GxSGvxgkGS74bEahvtM0WP0HjvV0e4w== - dependencies: - micromark-util-symbol "^1.0.0" - -micromark-util-encode@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-1.0.0.tgz#c409ecf751a28aa9564b599db35640fccec4c068" - integrity sha512-cJpFVM768h6zkd8qJ1LNRrITfY4gwFt+tziPcIf71Ui8yFzY9wG3snZQqiWVq93PG4Sw6YOtcNiKJfVIs9qfGg== - -micromark-util-html-tag-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-1.0.0.tgz#75737e92fef50af0c6212bd309bc5cb8dbd489ed" - integrity sha512-NenEKIshW2ZI/ERv9HtFNsrn3llSPZtY337LID/24WeLqMzeZhBEE6BQ0vS2ZBjshm5n40chKtJ3qjAbVV8S0g== - -micromark-util-normalize-identifier@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-1.0.0.tgz#4a3539cb8db954bbec5203952bfe8cedadae7828" - integrity sha512-yg+zrL14bBTFrQ7n35CmByWUTFsgst5JhA4gJYoty4Dqzj4Z4Fr/DHekSS5aLfH9bdlfnSvKAWsAgJhIbogyBg== - dependencies: - micromark-util-symbol "^1.0.0" - -micromark-util-resolve-all@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-1.0.0.tgz#a7c363f49a0162e931960c44f3127ab58f031d88" - integrity sha512-CB/AGk98u50k42kvgaMM94wzBqozSzDDaonKU7P7jwQIuH2RU0TeBqGYJz2WY1UdihhjweivStrJ2JdkdEmcfw== - dependencies: - micromark-util-types "^1.0.0" - -micromark-util-sanitize-uri@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.0.0.tgz#27dc875397cd15102274c6c6da5585d34d4f12b2" - integrity sha512-cCxvBKlmac4rxCGx6ejlIviRaMKZc0fWm5HdCHEeDWRSkn44l6NdYVRyU+0nT1XC72EQJMZV8IPHF+jTr56lAg== - dependencies: - micromark-util-character "^1.0.0" - micromark-util-encode "^1.0.0" - micromark-util-symbol "^1.0.0" - -micromark-util-subtokenize@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-1.0.0.tgz#6f006fa719af92776c75a264daaede0fb3943c6a" - integrity sha512-EsnG2qscmcN5XhkqQBZni/4oQbLFjz9yk3ZM/P8a3YUjwV6+6On2wehr1ALx0MxK3+XXXLTzuBKHDFeDFYRdgQ== - dependencies: - micromark-util-chunked "^1.0.0" - micromark-util-symbol "^1.0.0" - micromark-util-types "^1.0.0" - -micromark-util-symbol@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-1.0.0.tgz#91cdbcc9b2a827c0129a177d36241bcd3ccaa34d" - integrity sha512-NZA01jHRNCt4KlOROn8/bGi6vvpEmlXld7EHcRH+aYWUfL3Wc8JLUNNlqUMKa0hhz6GrpUWsHtzPmKof57v0gQ== - -micromark-util-types@^1.0.0, micromark-util-types@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-1.0.1.tgz#8bb8a092d93d326bd29fe29602799f2d0d922fd4" - integrity sha512-UT0ylWEEy80RFYzK9pEaugTqaxoD/j0Y9WhHpSyitxd99zjoQz7JJ+iKuhPAgOW2MiPSUAx+c09dcqokeyaROA== - -micromark@^3.0.0: - version "3.0.5" - resolved "https://registry.yarnpkg.com/micromark/-/micromark-3.0.5.tgz#d24792c8a06f201d5608c106dbfadef34c299684" - integrity sha512-QfjERBnPw0G9mxhOCkkbRP0n8SX8lIBLrEKeEVceviUukqVMv3hWE4AgNTOK/W6GWqtPvvIHg2Apl3j1Dxm6aQ== - dependencies: - "@types/debug" "^4.0.0" - debug "^4.0.0" - micromark-core-commonmark "^1.0.1" - micromark-factory-space "^1.0.0" - micromark-util-character "^1.0.0" - micromark-util-chunked "^1.0.0" - micromark-util-combine-extensions "^1.0.0" - micromark-util-decode-numeric-character-reference "^1.0.0" - micromark-util-encode "^1.0.0" - micromark-util-normalize-identifier "^1.0.0" - micromark-util-resolve-all "^1.0.0" - micromark-util-sanitize-uri "^1.0.0" - micromark-util-subtokenize "^1.0.0" - micromark-util-symbol "^1.0.0" - micromark-util-types "^1.0.1" - parse-entities "^3.0.0" - -micromatch@^2.1.5: - version "2.3.11" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" - integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU= - dependencies: - arr-diff "^2.0.0" - array-unique "^0.2.1" - braces "^1.8.2" - expand-brackets "^0.1.4" - extglob "^0.3.1" - filename-regex "^2.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.1" - kind-of "^3.0.2" - normalize-path "^2.0.1" - object.omit "^2.0.0" - parse-glob "^3.0.4" - regex-cache "^0.4.2" - -micromatch@^3.1.10, micromatch@^3.1.4: - version "3.1.10" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== - dependencies: - braces "^3.0.1" - picomatch "^2.2.3" - -"midi@git+https://github.com/paulrosen/MIDI.js.git#abcjs": - version "0.4.2" - resolved "git+https://github.com/paulrosen/MIDI.js.git#e593ffef81a0350f99448e3ab8111957145ff6b2" - -miller-rabin@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d" - integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA== - dependencies: - bn.js "^4.0.0" - brorand "^1.0.1" - -mime-db@1.49.0, "mime-db@>= 1.43.0 < 2": - version "1.49.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" - integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== - -mime-types@^2.1.12, mime-types@^2.1.14, mime-types@^2.1.27, mime-types@^2.1.3, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.32" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" - integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== - dependencies: - mime-db "1.49.0" - -mime@1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53" - integrity sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM= - -mime@1.6.0, mime@^1.4.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mini-css-extract-plugin@1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" - integrity sha512-WhDvO3SjGm40oV5y26GjMJYjd2UMqrLAGKy5YS2/3QKJy2F7jgynuHTir/tgUUOiNQu5saXHdc8reo7YuhhT4Q== - dependencies: - loader-utils "^2.0.0" - schema-utils "^3.0.0" - webpack-sources "^1.1.0" - -minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -minimalistic-crypto-utils@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= - -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.0.0, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - -minio@^7.0.19: - version "7.0.19" - resolved "https://registry.yarnpkg.com/minio/-/minio-7.0.19.tgz#ca47b68669e45237286709a8c06ecf89f992aa61" - integrity sha512-DOGKauWLdmj0/y2QKXdnrhqyzRFEnUteHi6q382uujg9TjSDrA84BiQVppS2Ew6V8Rcg+2IaRkF4GR34zw9sIA== - dependencies: - async "^3.1.0" - block-stream2 "^2.0.0" - es6-error "^4.1.1" - fast-xml-parser "^3.17.5" - json-stream "^1.0.0" - lodash "^4.17.21" - mime-types "^2.1.14" - mkdirp "^0.5.1" - querystring "0.2.0" - through2 "^3.0.1" - web-encoding "^1.1.5" - xml "^1.0.0" - xml2js "^0.4.15" - -minipass-collect@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" - integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== - dependencies: - minipass "^3.0.0" - -minipass-flush@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" - integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== - dependencies: - minipass "^3.0.0" - -minipass-pipeline@^1.2.2: - version "1.2.4" - resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" - integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== - dependencies: - minipass "^3.0.0" - -minipass@^2.6.0, 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, minipass@^3.1.1: - 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.3.3: - 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" - -mississippi@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022" - integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA== - dependencies: - concat-stream "^1.5.0" - duplexify "^3.4.2" - end-of-stream "^1.1.0" - flush-write-stream "^1.0.0" - from2 "^2.1.0" - parallel-transform "^1.1.0" - pump "^3.0.0" - pumpify "^1.3.3" - stream-each "^1.1.0" - through2 "^2.0.0" - -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA== - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5: - 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, mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - -mocha@9.1.1: - version "9.1.1" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.1.tgz#33df2eb9c6262434630510c5f4283b36efda9b61" - integrity sha512-0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA== - dependencies: - "@ungap/promise-all-settled" "1.1.2" - ansi-colors "4.1.1" - browser-stdout "1.3.1" - chokidar "3.5.2" - debug "4.3.1" - diff "5.0.0" - escape-string-regexp "4.0.0" - find-up "5.0.0" - glob "7.1.7" - growl "1.10.5" - he "1.2.0" - js-yaml "4.1.0" - log-symbols "4.1.0" - minimatch "3.0.4" - ms "2.1.3" - nanoid "3.1.23" - serialize-javascript "6.0.0" - strip-json-comments "3.1.1" - supports-color "8.1.1" - which "2.0.2" - wide-align "1.1.3" - workerpool "6.1.5" - yargs "16.2.0" - yargs-parser "20.2.4" - yargs-unparser "2.0.0" - -mock-require@3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/mock-require/-/mock-require-3.0.3.tgz#ccd544d9eae81dd576b3f219f69ec867318a1946" - integrity sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg== - dependencies: - get-caller-file "^1.0.2" - normalize-path "^2.1.1" - -moment-mini@^2.24.0: - version "2.24.0" - resolved "https://registry.yarnpkg.com/moment-mini/-/moment-mini-2.24.0.tgz#fa68d98f7fe93ae65bf1262f6abb5fb6983d8d18" - integrity sha512-9ARkWHBs+6YJIvrIp0Ik5tyTTtP9PoV0Ssu2Ocq5y9v8+NOOpWiRshAp8c4rZVWTOe+157on/5G+zj5pwIQFEQ== - -moment-timezone@^0.5.21, moment-timezone@^0.5.33: - version "0.5.33" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c" - integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w== - dependencies: - moment ">= 2.9.0" - -"moment@>= 2.9.0", moment@^2.17.1, moment@^2.24.0: - version "2.29.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" - integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== - -morgan@^1.7.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7" - integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ== - dependencies: - basic-auth "~2.0.1" - debug "2.6.9" - depd "~2.0.0" - on-finished "~2.3.0" - on-headers "~1.0.2" - -move-concurrently@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" - integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I= - dependencies: - aproba "^1.1.1" - copy-concurrently "^1.0.0" - fs-write-stream-atomic "^1.0.8" - mkdirp "^0.5.1" - rimraf "^2.5.4" - run-queue "^1.0.3" - -ms@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" - integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== - -ms@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== - -ms@2.1.3, ms@^2.1.1: - version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" - integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== - -mustache@^4.0.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/mustache/-/mustache-4.2.0.tgz#e5892324d60a12ec9c2a73359edca52972bf6f64" - integrity sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ== - -mysql2@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-2.3.0.tgz#600f5cc27e397dfb77b59eac93666434f88e8079" - integrity sha512-0t5Ivps5Tdy5YHk5NdKwQhe/4Qyn2pload+S+UooDBvsqngtzujG1BaTWBihQLfeKO3t3122/GtusBtmHEHqww== - dependencies: - denque "^1.4.1" - generate-function "^2.3.1" - iconv-lite "^0.6.2" - long "^4.0.0" - lru-cache "^6.0.0" - named-placeholders "^1.1.2" - seq-queue "^0.0.5" - sqlstring "^2.3.2" - -named-placeholders@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/named-placeholders/-/named-placeholders-1.1.2.tgz#ceb1fbff50b6b33492b5cf214ccf5e39cef3d0e8" - integrity sha512-wiFWqxoLL3PGVReSZpjLVxyJ1bRqe+KKJVbr4hGs1KWfTZTQyezHFBbuKj9hsizHyGV2ne7EMjHdxEGAybD5SA== - dependencies: - lru-cache "^4.1.3" - -nan@^2.12.1: - version "2.15.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" - integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== - -nanoid@3.1.23: - version "3.1.23" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" - integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== - -nanoid@^2.1.0: - version "2.1.11" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280" - integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA== - -nanoid@^3.1.23: - version "3.1.25" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.25.tgz#09ca32747c0e543f0e1814b7d3793477f9c8e152" - integrity sha512-rdwtIXaXCLFAQbnfqDRnI6jaRHp9fTcYBjtFKE8eezcZ7LuLjhUaQGNeMXf1HmRoCH32CLz6XwX0TtxEOS/A3Q== - -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA== - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= - -needle@^2.2.1, needle@^2.5.2: - version "2.9.1" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684" - integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - -negotiator@0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" - integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== - -neo-async@^2.5.0, neo-async@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -no-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" - integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== - dependencies: - lower-case "^2.0.2" - tslib "^2.0.3" - -node-addon-api@^3.0.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" - integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== - -node-fetch@^2.6.1: - version "2.6.2" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.2.tgz#986996818b73785e47b1965cc34eb093a1d464d0" - integrity sha512-aLoxToI6RfZ+0NOjmWAgn9+LEd30YCkJKFSyWacNZdEKTit/ZMcKjGkTRo8uWEsnIb/hfKecNPEbln02PdWbcA== - -node-forge@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3" - integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA== - -node-gyp-build@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3" - integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q== - -node-gyp@3.x: - version "3.8.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" - integrity sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA== - dependencies: - fstream "^1.0.0" - glob "^7.0.3" - graceful-fs "^4.1.2" - mkdirp "^0.5.0" - nopt "2 || 3" - npmlog "0 || 1 || 2 || 3 || 4" - osenv "0" - request "^2.87.0" - rimraf "2" - semver "~5.3.0" - tar "^2.0.0" - which "1" - -node-libs-browser@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425" - integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q== - dependencies: - assert "^1.1.1" - browserify-zlib "^0.2.0" - buffer "^4.3.0" - console-browserify "^1.1.0" - constants-browserify "^1.0.0" - crypto-browserify "^3.11.0" - domain-browser "^1.1.1" - events "^3.0.0" - https-browserify "^1.0.0" - os-browserify "^0.3.0" - path-browserify "0.0.1" - process "^0.11.10" - punycode "^1.2.4" - querystring-es3 "^0.2.0" - readable-stream "^2.3.3" - stream-browserify "^2.0.1" - stream-http "^2.7.2" - string_decoder "^1.0.0" - timers-browserify "^2.0.4" - tty-browserify "0.0.0" - url "^0.11.0" - util "^0.11.0" - vm-browserify "^1.0.1" - -node-pre-gyp@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.11.0.tgz#db1f33215272f692cd38f03238e3e9b47c5dd054" - integrity sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4" - -node-releases@^1.1.75: - version "1.1.75" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" - integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== - -nomnom@^1.5.x: - version "1.8.1" - resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7" - integrity sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc= - dependencies: - chalk "~0.4.0" - underscore "~1.6.0" - -"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" - -normalize-package-data@^2.3.2: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= - dependencies: - remove-trailing-separator "^1.0.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== - -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-bundled@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" - integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== - dependencies: - npm-normalize-package-bin "^1.0.1" - -npm-normalize-package-bin@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2" - integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - -npm-packlist@^1.1.6: - version "1.4.8" - resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" - integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - dependencies: - ignore-walk "^3.0.1" - npm-bundled "^1.0.1" - npm-normalize-package-bin "^1.0.1" - -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.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" - -nth-check@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125" - integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q== - dependencies: - boolbase "^1.0.0" - -nth-check@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg== - dependencies: - boolbase "~1.0.0" - -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= - -nwmatcher@~1.3.1: - version "1.3.9" - resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.3.9.tgz#8bab486ff7fa3dfd086656bbe8b17116d3692d2a" - integrity sha1-i6tIb/f6Pf0IZla76LFxFtNpLSo= - -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== - -oauth@0.9.x: - version "0.9.15" - resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1" - integrity sha1-vR/vr2hslrdUda7VGWQS/2DPucE= - -object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-inspect@^1.11.0, object-inspect@^1.9.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" - integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== - -object-is@^1.1.4: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= - dependencies: - isobject "^3.0.0" - -object.assign@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" - integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - has-symbols "^1.0.1" - object-keys "^1.1.1" - -object.getownpropertydescriptors@^2.0.3: - version "2.1.2" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz#1bd63aeacf0d5d2d2f31b5e393b03a7c601a23f7" - integrity sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" - -object.omit@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" - integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo= - dependencies: - for-own "^0.1.4" - is-extendable "^0.1.1" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= - dependencies: - isobject "^3.0.1" - -object.values@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" - integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.18.2" - -on-finished@~2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -one-time@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/one-time/-/one-time-1.0.0.tgz#e06bc174aed214ed58edede573b433bbf827cb45" - integrity sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g== - dependencies: - fn.name "1.x.x" - -onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -openid@2.x.x: - version "2.0.9" - resolved "https://registry.yarnpkg.com/openid/-/openid-2.0.9.tgz#7d2bc03ed4c6bf4ccd05b128e3b0b33b6680205f" - integrity sha512-LzsGBHUDU2FjW/aHjB99GXxuyEPVkFyU4Ub/df3K0hYGxD1qvYu7atPORLXddCufVkcZBpgbYxdLVG8uiY0fCA== - dependencies: - axios "^0.21.1" - qs "^6.5.2" - -optimize-css-assets-webpack-plugin@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-6.0.1.tgz#7719bceabba1f3891ec3ae04efb81a1cc99cd793" - integrity sha512-BshV2UZPfggZLdUfN3zFBbG4sl/DynUI+YCB6fRRDWaqO2OiWN8GPcp4Y0/fEV6B3k9Hzyk3czve3V/8B/SzKQ== - dependencies: - cssnano "^5.0.2" - last-call-webpack-plugin "^3.0.0" - postcss "^8.2.1" - -optionator@^0.9.1: - version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" - integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== - dependencies: - deep-is "^0.1.3" - fast-levenshtein "^2.0.6" - levn "^0.4.1" - prelude-ls "^1.2.1" - type-check "^0.4.0" - word-wrap "^1.2.3" - -os-browserify@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= - -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-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" - -output-file-sync@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76" - integrity sha1-0KM+7+YaIF+suQCS6CZZjVJFznY= - dependencies: - graceful-fs "^4.1.4" - mkdirp "^0.5.1" - object-assign "^4.1.0" - -p-limit@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" - integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== - dependencies: - p-try "^1.0.0" - -p-limit@^2.0.0, p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - -p-limit@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" - integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== - dependencies: - yocto-queue "^0.1.0" - -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= - dependencies: - p-limit "^1.1.0" - -p-locate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" - integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== - dependencies: - p-limit "^2.0.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - -p-locate@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" - integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== - dependencies: - p-limit "^3.0.2" - -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -packet-reader@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" - integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== - -pako@~1.0.5: - version "1.0.11" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" - integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== - -parallel-transform@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" - integrity sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg== - dependencies: - cyclist "^1.0.1" - inherits "^2.0.3" - readable-stream "^2.1.5" - -param-case@^3.0.3: - version "3.0.4" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" - integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== - dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== - dependencies: - callsites "^3.0.0" - -parse-asn1@^5.0.0, parse-asn1@^5.1.5: - version "5.1.6" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz#385080a3ec13cb62a62d39409cb3e88844cdaed4" - integrity sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw== - dependencies: - asn1.js "^5.2.0" - browserify-aes "^1.0.0" - evp_bytestokey "^1.0.0" - pbkdf2 "^3.0.3" - safe-buffer "^5.1.1" - -parse-entities@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/parse-entities/-/parse-entities-3.0.0.tgz#9ed6d6569b6cfc95ade058d683ddef239dad60dc" - integrity sha512-AJlcIFDNPEP33KyJLguv0xJc83BNvjxwpuUIcetyXUsLpVXAUCePJ5kIoYtEN2R1ac0cYaRu/vk9dVFkewHQhQ== - dependencies: - character-entities "^2.0.0" - character-entities-legacy "^2.0.0" - character-reference-invalid "^2.0.0" - is-alphanumerical "^2.0.0" - is-decimal "^2.0.0" - is-hexadecimal "^2.0.0" - -parse-glob@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c" - integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw= - dependencies: - glob-base "^0.3.0" - is-dotfile "^1.0.0" - is-extglob "^1.0.0" - is-glob "^2.0.0" - -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - -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" - -parse-node-version@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" - integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== - -parse5@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" - integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== - -parseqs@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5" - integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w== - -parseuri@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" - integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== - -parseurl@~1.3.2, parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -pascal-case@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" - integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= - -passport-dropbox-oauth2@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/passport-dropbox-oauth2/-/passport-dropbox-oauth2-1.1.0.tgz#77c737636e4841944dfb82dfc42c3d8ab782c10e" - integrity sha1-d8c3Y25IQZRN+4LfxCw9ireCwQ4= - dependencies: - passport-oauth "^1.0.0" - pkginfo "^0.2.3" - -passport-facebook@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/passport-facebook/-/passport-facebook-3.0.0.tgz#b16f7314128be55d020a2b75f574c194bd6d9805" - integrity sha512-K/qNzuFsFISYAyC1Nma4qgY/12V3RSLFdFVsPKXiKZt434wOvthFW1p7zKa1iQihQMRhaWorVE1o3Vi1o+ZgeQ== - dependencies: - passport-oauth2 "1.x.x" - -passport-github@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/passport-github/-/passport-github-1.1.0.tgz#8ce1e3fcd61ad7578eb1df595839e4aea12355d4" - integrity sha1-jOHj/NYa11eOsd9ZWDnkrqEjVdQ= - dependencies: - passport-oauth2 "1.x.x" - -passport-gitlab2@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/passport-gitlab2/-/passport-gitlab2-5.0.0.tgz#ea37e5285321c026a02671e87469cac28cce9b69" - integrity sha512-cXQMgM6JQx9wHVh7JLH30D8fplfwjsDwRz+zS0pqC8JS+4bNmc1J04NGp5g2M4yfwylH9kQRrMN98GxMw7q7cg== - dependencies: - passport-oauth2 "^1.4.0" - -passport-google-oauth20@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/passport-google-oauth20/-/passport-google-oauth20-2.0.0.tgz#0d241b2d21ebd3dc7f2b60669ec4d587e3a674ef" - integrity sha512-KSk6IJ15RoxuGq7D1UKK/8qKhNfzbLeLrG3gkLZ7p4A6DBCcv7xpyQwuXtWdpyR0+E0mwkpjY1VfPOhxQrKzdQ== - dependencies: - passport-oauth2 "1.x.x" - -passport-ldapauth@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/passport-ldapauth/-/passport-ldapauth-3.0.1.tgz#1432e8469de18bd46b5b39a46a866b416c1ddded" - integrity sha512-TRRx3BHi8GC8MfCT9wmghjde/EGeKjll7zqHRRfGRxXbLcaDce2OftbQrFG7/AWaeFhR6zpZHtBQ/IkINdLVjQ== - dependencies: - ldapauth-fork "^5.0.1" - passport-strategy "^1.0.0" - -passport-local@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/passport-local/-/passport-local-1.0.0.tgz#1fe63268c92e75606626437e3b906662c15ba6ee" - integrity sha1-H+YyaMkudWBmJkN+O5BmYsFbpu4= - dependencies: - passport-strategy "1.x.x" - -passport-oauth1@1.x.x: - version "1.2.0" - resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.2.0.tgz#5229d431781bf5b265bec86ce9a9cce58a756cf9" - integrity sha512-Sv2YWodC6jN12M/OXwmR4BIXeeIHjjbwYTQw4kS6tHK4zYzSEpxBgSJJnknBjICA5cj0ju3FSnG1XmHgIhYnLg== - dependencies: - oauth "0.9.x" - passport-strategy "1.x.x" - utils-merge "1.x.x" - -passport-oauth2@1.x.x, passport-oauth2@^1.4.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.0.tgz#5f599735e0ea40ea3027643785f81a3a9b4feb50" - integrity sha512-emXPLqLcVEcLFR/QvQXZcwLmfK8e9CqvMgmOFJxcNT3okSFMtUbRRKpY20x5euD+01uHsjjCa07DYboEeLXYiw== - dependencies: - base64url "3.x.x" - oauth "0.9.x" - passport-strategy "1.x.x" - uid2 "0.0.x" - utils-merge "1.x.x" - -passport-oauth@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/passport-oauth/-/passport-oauth-1.0.0.tgz#90aff63387540f02089af28cdad39ea7f80d77df" - integrity sha1-kK/2M4dUDwIImvKM2tOep/gNd98= - dependencies: - passport-oauth1 "1.x.x" - passport-oauth2 "1.x.x" - -passport-saml@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/passport-saml/-/passport-saml-3.1.2.tgz#34a0c2c423d729ce102e69fea9c22040910e6d43" - integrity sha512-EhD3/ofiz1vu7R72i4RskXk/dQG9GyDmXPdHJf5LYB+93B5kvKv5p+5lpZgO3z+Wf3eN0h/tGdGd6noyYdjY6g== - dependencies: - "@xmldom/xmldom" "^0.7.2" - debug "^4.3.1" - passport-strategy "^1.0.0" - xml-crypto "^2.1.3" - xml-encryption "^1.3.0" - xml2js "^0.4.23" - xmlbuilder "^15.1.1" - -passport-strategy@1.x.x, passport-strategy@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4" - integrity sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ= - -passport-twitter@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/passport-twitter/-/passport-twitter-1.0.4.tgz#01a799e1f760bf2de49f2ba5fba32282f18932d7" - integrity sha1-AaeZ4fdgvy3knyul+6MigvGJMtc= - dependencies: - passport-oauth1 "1.x.x" - xtraverse "0.1.x" - -passport.socketio@^3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/passport.socketio/-/passport.socketio-3.7.0.tgz#2ee5fafe9695d4281c8cddd3fe975ecd18e6726e" - integrity sha1-LuX6/paV1CgcjN3T/pdezRjmcm4= - dependencies: - xtend "^4.0.0" - -passport@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270" - integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg== - dependencies: - passport-strategy "1.x.x" - pause "0.0.1" - -path-browserify@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a" - integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ== - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= - -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= - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== - -path-parse@^1.0.6: - version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" - integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== - -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= - -path-type@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" - integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== - dependencies: - pify "^3.0.0" - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - -pause@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d" - integrity sha1-HUCLP9t2kjuVQ9lvtMnf1TXZy10= - -pbkdf2@^3.0.3: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" - integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== - dependencies: - create-hash "^1.1.2" - create-hmac "^1.1.4" - ripemd160 "^2.0.1" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - -pdfobject@^2.0.201604172: - version "2.2.6" - resolved "https://registry.yarnpkg.com/pdfobject/-/pdfobject-2.2.6.tgz#cb8a0b7697af88df8af017b5fd4a7a42abb6e031" - integrity sha512-3B8re2yWzBcI9Xa+QcRptw0ag5NQYyVHVxP1yEWW7aCm6ujvZa8z7/06uz/zZqsI2TDLzsED3yS4JEMwQdCGEg== - -peek-readable@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.0.1.tgz#9a045f291db254111c3412c1ce4fec27ddd4d202" - integrity sha512-7qmhptnR0WMSpxT5rMHG9bW/mYSR1uqaPFj2MHvT+y/aOUu6msJijpKt5SkTDKySwg65OWG2JwTMBlgcbwMHrQ== - -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= - -pg-connection-string@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" - integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== - -pg-hstore@^2.3.3: - version "2.3.4" - resolved "https://registry.yarnpkg.com/pg-hstore/-/pg-hstore-2.3.4.tgz#4425e3e2a3e15d2a334c35581186c27cf2e9b8dd" - integrity sha512-N3SGs/Rf+xA1M2/n0JBiXFDVMzdekwLZLAO0g7mpDY9ouX+fDI7jS6kTq3JujmYbtNSJ53TJ0q4G98KVZSM4EA== - dependencies: - underscore "^1.13.1" - -pg-int8@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c" - integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw== - -pg-pool@^3.4.1: - version "3.4.1" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c" - integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ== - -pg-protocol@^1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0" - integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ== - -pg-types@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3" - integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA== - dependencies: - pg-int8 "1.0.1" - postgres-array "~2.0.0" - postgres-bytea "~1.0.0" - postgres-date "~1.0.4" - postgres-interval "^1.1.0" - -pg@^8.2.1: - version "8.7.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz#9ea9d1ec225980c36f94e181d009ab9f4ce4c471" - integrity sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA== - dependencies: - buffer-writer "2.0.0" - packet-reader "1.0.0" - pg-connection-string "^2.5.0" - pg-pool "^3.4.1" - pg-protocol "^1.5.0" - pg-types "^2.1.0" - pgpass "1.x" - -pgpass@1.x: - version "1.0.4" - resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.4.tgz#85eb93a83800b20f8057a2b029bf05abaf94ea9c" - integrity sha512-YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w== - dependencies: - split2 "^3.1.1" - -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" - integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - -pify@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" - integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== - -pkg-dir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" - integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= - dependencies: - find-up "^2.1.0" - -pkg-dir@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3" - integrity sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw== - dependencies: - find-up "^3.0.0" - -pkg-dir@^4.1.0, pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" - integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= - dependencies: - find-up "^2.1.0" - -pkginfo@^0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.2.3.tgz#7239c42a5ef6c30b8f328439d9b9ff71042490f8" - integrity sha1-cjnEKl72wwuPMoQ52bn/cQQkkPg= - -pkginfo@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff" - integrity sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8= - -please-upgrade-node@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" - integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg== - dependencies: - semver-compare "^1.0.0" - -pluralize@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1" - integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA== - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= - -postcss-calc@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.0.0.tgz#a05b87aacd132740a5db09462a3612453e5df90a" - integrity sha512-5NglwDrcbiy8XXfPM11F3HeC6hoT9W7GUH/Zi5U/p7u3Irv4rHhdDcIZwG0llHXV4ftsBjpfWMXAnXNl4lnt8g== - dependencies: - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.0.2" - -postcss-colormin@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.0.tgz#2b620b88c0ff19683f3349f4cf9e24ebdafb2c88" - integrity sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw== - dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - colord "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-convert-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz#4ec19d6016534e30e3102fdf414e753398645232" - integrity sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-discard-comments@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe" - integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg== - -postcss-discard-duplicates@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d" - integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA== - -postcss-discard-empty@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8" - integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw== - -postcss-discard-overridden@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6" - integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q== - -postcss-merge-longhand@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz#277ada51d9a7958e8ef8cf263103c9384b322a41" - integrity sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw== - dependencies: - css-color-names "^1.0.1" - postcss-value-parser "^4.1.0" - stylehacks "^5.0.1" - -postcss-merge-rules@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz#d6e4d65018badbdb7dcc789c4f39b941305d410a" - integrity sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg== - dependencies: - browserslist "^4.16.6" - caniuse-api "^3.0.0" - cssnano-utils "^2.0.1" - postcss-selector-parser "^6.0.5" - vendors "^1.0.3" - -postcss-minify-font-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf" - integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-minify-gradients@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.2.tgz#7c175c108f06a5629925d698b3c4cf7bd3864ee5" - integrity sha512-7Do9JP+wqSD6Prittitt2zDLrfzP9pqKs2EcLX7HJYxsxCOwrrcLt4x/ctQTsiOw+/8HYotAoqNkrzItL19SdQ== - dependencies: - colord "^2.6" - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-minify-params@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz#371153ba164b9d8562842fdcd929c98abd9e5b6c" - integrity sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw== - dependencies: - alphanum-sort "^1.0.2" - browserslist "^4.16.0" - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - uniqs "^2.0.0" - -postcss-minify-selectors@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54" - integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og== - dependencies: - alphanum-sort "^1.0.2" - postcss-selector-parser "^6.0.5" - -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== - -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== - dependencies: - icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" - -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== - dependencies: - postcss-selector-parser "^6.0.4" - -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== - dependencies: - icss-utils "^5.0.0" - -postcss-normalize-charset@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0" - integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg== - -postcss-normalize-display-values@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd" - integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-positions@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5" - integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-normalize-repeat-style@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5" - integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-string@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0" - integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-normalize-timing-functions@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c" - integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-unicode@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37" - integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA== - dependencies: - browserslist "^4.16.0" - postcss-value-parser "^4.1.0" - -postcss-normalize-url@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz#ddcdfb7cede1270740cf3e4dfc6008bd96abc763" - integrity sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ== - dependencies: - is-absolute-url "^3.0.3" - normalize-url "^6.0.1" - postcss-value-parser "^4.1.0" - -postcss-normalize-whitespace@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a" - integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA== - dependencies: - postcss-value-parser "^4.1.0" - -postcss-ordered-values@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044" - integrity sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-reduce-initial@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz#9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946" - integrity sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw== - dependencies: - browserslist "^4.16.0" - caniuse-api "^3.0.0" - -postcss-reduce-transforms@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640" - integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA== - dependencies: - cssnano-utils "^2.0.1" - postcss-value-parser "^4.1.0" - -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5: - version "6.0.6" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" - integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-svgo@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.2.tgz#bc73c4ea4c5a80fbd4b45e29042c34ceffb9257f" - integrity sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A== - dependencies: - postcss-value-parser "^4.1.0" - svgo "^2.3.0" - -postcss-unique-selectors@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz#3be5c1d7363352eff838bd62b0b07a0abad43bfc" - integrity sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w== - dependencies: - alphanum-sort "^1.0.2" - postcss-selector-parser "^6.0.5" - uniqs "^2.0.0" - -postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" - integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== - -postcss@^8.2.1, postcss@^8.2.15: - version "8.3.6" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" - integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A== - dependencies: - colorette "^1.2.2" - nanoid "^3.1.23" - source-map-js "^0.6.2" - -postgres-array@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e" - integrity sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA== - -postgres-bytea@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/postgres-bytea/-/postgres-bytea-1.0.0.tgz#027b533c0aa890e26d172d47cf9ccecc521acd35" - integrity sha1-AntTPAqokOJtFy1Hz5zOzFIazTU= - -postgres-date@~1.0.4: - version "1.0.7" - resolved "https://registry.yarnpkg.com/postgres-date/-/postgres-date-1.0.7.tgz#51bc086006005e5061c591cee727f2531bf641a8" - integrity sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q== - -postgres-interval@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postgres-interval/-/postgres-interval-1.2.0.tgz#b460c82cb1587507788819a06aa0fffdb3544695" - integrity sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ== - dependencies: - xtend "^4.0.0" - -precond@0.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" - integrity sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw= - -prelude-ls@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" - integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== - -preserve@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" - integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks= - -pretty-error@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6" - integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw== - dependencies: - lodash "^4.17.20" - renderkid "^2.0.4" - -printj@~1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222" - integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ== - -prismjs@1.24.1: - version "1.24.1" - resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.24.1.tgz#c4d7895c4d6500289482fa8936d9cdd192684036" - integrity sha512-mNPsedLuk90RVJioIky8ANZEwYm5w9LcvCXrxHlwf4fNVSn8jEipMybMkWUyyF0JhnC+C4VcOVSBuHRKs1L5Ow== - -private@^0.1.6, 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= - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== - -process@^0.11.10: - version "0.11.10" - resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= - -progress@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -prom-client@^13.1.0: - version "13.2.0" - resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-13.2.0.tgz#99d13357912dd400f8911b77df19f7b328a93e92" - integrity sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ== - dependencies: - tdigest "^0.1.1" - -prometheus-api-metrics@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/prometheus-api-metrics/-/prometheus-api-metrics-3.2.0.tgz#3af90989271abb55b7e0405bdfcb161f403a361c" - integrity sha512-JekPhtIBLGX8HxD2EndvBsLU6ZQ1JVVqyHWVfm5CposUOqgBHXnUVFW6x5Ux2gykpdej/5LLM3dU9V8Ma7GfkA== - dependencies: - "@types/express" "^4.17.8" - "@types/express-serve-static-core" "^4.17.12" - "@types/koa" "^2.11.4" - debug "^3.2.6" - lodash.get "^4.4.2" - pkginfo "^0.4.1" - -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= - -property-information@^6.0.0: - version "6.0.1" - resolved "https://registry.yarnpkg.com/property-information/-/property-information-6.0.1.tgz#7c668d9f2b9cb63bc3e105d8b8dfee7221a17800" - integrity sha512-F4WUUAF7fMeF4/JUFHNBWDaKDXi2jbvqBW/y6o5wsf3j19wTZ7S60TmtB5HoBhtgw7NKQRMWuz5vk2PR0CygUg== - -proxy-addr@~2.0.5: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - -prr@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" - integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY= - -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= - -psl@^1.1.28: - version "1.8.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" - integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== - -public-encrypt@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" - integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q== - dependencies: - bn.js "^4.1.0" - browserify-rsa "^4.0.0" - create-hash "^1.1.0" - parse-asn1 "^5.0.0" - randombytes "^2.0.1" - safe-buffer "^5.1.2" - -pump@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909" - integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -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" - -pumpify@^1.3.3: - version "1.5.1" - resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce" - integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ== - dependencies: - duplexify "^3.6.0" - inherits "^2.0.3" - pump "^2.0.0" - -punycode@1.3.2: - version "1.3.2" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= - -punycode@^1.2.4: - version "1.4.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= - -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== - -q@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= - -qs@2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-2.3.3.tgz#e9e85adbe75da0bbe4c8e0476a086290f863b404" - integrity sha1-6eha2+ddoLvkyOBHaghikPhjtAQ= - -qs@6.7.0: - version "6.7.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" - integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== - -qs@^6.5.2: - version "6.10.1" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" - integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== - dependencies: - side-channel "^1.0.4" - -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== - -querystring-es3@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= - -querystring@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= - -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -random-bytes@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b" - integrity sha1-T2ih3Arli9P7lYSMMDJNt11kNgs= - -randomatic@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.1.tgz#b776efc59375984e36c537b2f51a1f0aff0da1ed" - integrity sha512-TuDE5KxZ0J461RVjrJZCJc+J+zCkTb1MbH9AQUq68sMhOMcy9jLcb3BrZKgp9q9Ncltdg4QVqWrH02W2EFFVYw== - dependencies: - is-number "^4.0.0" - kind-of "^6.0.0" - math-random "^1.0.1" - -randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, 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" - -randomcolor@^0.6.0: - version "0.6.2" - resolved "https://registry.yarnpkg.com/randomcolor/-/randomcolor-0.6.2.tgz#7a57362ae1a1278439aeed2c15e5deb8ea33f56d" - integrity sha512-Mn6TbyYpFgwFuQ8KJKqf3bqqY9O1y37/0jgSK/61PUxV4QfIMv0+K2ioq8DfOjkBslcjwSzRfIDEXfzA9aCx7A== - -randomfill@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458" - integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw== - dependencies: - randombytes "^2.0.5" - safe-buffer "^5.1.0" - -range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raphael@2.3.0, raphael@2.3.x: - version "2.3.0" - resolved "https://registry.yarnpkg.com/raphael/-/raphael-2.3.0.tgz#eabeb09dba861a1d4cee077eaafb8c53f3131f89" - integrity sha512-w2yIenZAQnp257XUWGni4bLMVxpUpcIl7qgxEgDIXtmSypYtlNxfXWpOBxs7LBTps5sDwhRnrToJrMUrivqNTQ== - dependencies: - eve-raphael "0.5.0" - -raw-body@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" - integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== - dependencies: - bytes "3.1.0" - http-errors "1.7.2" - iconv-lite "0.4.24" - unpipe "1.0.0" - -rc@^1.2.7: - version "1.2.8" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" - integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== - dependencies: - deep-extend "^0.6.0" - ini "~1.3.0" - minimist "^1.2.0" - strip-json-comments "~2.0.1" - -read-pkg-up@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" - integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= - dependencies: - find-up "^2.0.0" - read-pkg "^3.0.0" - -read-pkg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= - dependencies: - load-json-file "^4.0.0" - normalize-package-data "^2.3.2" - path-type "^3.0.0" - -"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@^2.3.7, readable-stream@~2.3.6: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@1.0.27-1: - version "1.0.27-1" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.27-1.tgz#6b67983c20357cefd07f0165001a16d710d91078" - integrity sha1-a2eYPCA1fO/QfwFlABoW1xDZEHg= - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - -"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readable-stream@~2.0.0: - version "2.0.6" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" - integrity sha1-j5A0HmilPMySh4jaz80Rs265t44= - dependencies: - 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" - -readable-web-to-node-stream@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz#5d52bb5df7b54861fd48d015e93a2cb87b3ee0bb" - integrity sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw== - dependencies: - readable-stream "^3.6.0" - -readdir-glob@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/readdir-glob/-/readdir-glob-1.1.1.tgz#f0e10bb7bf7bfa7e0add8baffdc54c3f7dbee6c4" - integrity sha512-91/k1EzZwDx6HbERR+zucygRFfiPl2zkIYZtv3Jjr6Mn7SkKcVct8aVO+sSRiGMc6fLf72du3d92/uY63YPdEA== - dependencies: - minimatch "^3.0.4" - -readdirp@^2.0.0, readdirp@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525" - integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ== - dependencies: - graceful-fs "^4.1.11" - micromatch "^3.1.10" - readable-stream "^2.0.2" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - -readline-sync@^1.4.7: - version "1.4.10" - resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b" - integrity sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw== - -rechoir@^0.7.0: - version "0.7.1" - resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" - integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== - dependencies: - resolve "^1.9.0" - -reduce-component@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/reduce-component/-/reduce-component-1.0.1.tgz#e0c93542c574521bea13df0f9488ed82ab77c5da" - integrity sha1-4Mk1QsV0UhvqE98PlIjtgqt3xdo= - -regenerate@^1.2.1: - version "1.4.2" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" - integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== - -regenerator-runtime@^0.10.5: - 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== - -regenerator-transform@^0.10.0: - version "0.10.1" - resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" - integrity sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q== - dependencies: - babel-runtime "^6.18.0" - babel-types "^6.19.0" - private "^0.1.6" - -regex-cache@^0.4.2: - version "0.4.4" - resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd" - integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ== - dependencies: - is-equal-shallow "^0.1.3" - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A== - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -regexp.prototype.flags@^1.3.0: - version "1.3.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" - integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -regexpp@^3.0.0, regexpp@^3.1.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" - integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== - -regexpu-core@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240" - integrity sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA= - dependencies: - regenerate "^1.2.1" - regjsgen "^0.2.0" - regjsparser "^0.1.4" - -regjsgen@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7" - integrity sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc= - -regjsparser@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c" - integrity sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw= - dependencies: - jsesc "~0.5.0" - -rehype-parse@^8.0.0: - version "8.0.3" - resolved "https://registry.yarnpkg.com/rehype-parse/-/rehype-parse-8.0.3.tgz#a1947132a08a930d0c2b6fd2b3dbcc137457c07a" - integrity sha512-RGw0CVt+0S6KdvpE8bbP2Db9WXclQcIX7A0ufM3QFqAhTo/ddJMQrrI2j3cijlRPZlGK8R3pRgC8U5HyV76IDw== - dependencies: - "@types/hast" "^2.0.0" - hast-util-from-parse5 "^7.0.0" - parse5 "^6.0.0" - unified "^10.0.0" - -rehype-stringify@^9.0.0: - version "9.0.2" - resolved "https://registry.yarnpkg.com/rehype-stringify/-/rehype-stringify-9.0.2.tgz#2d95e06e246abbee504cf2f54c8d12f27d7bfd8e" - integrity sha512-BuVA6lAEYtOpXO2xuHLohAzz8UNoQAxAqYRqh4QEEtU39Co+P1JBZhw6wXA9hMWp+JLcmrxWH8+UKcNSr443Fw== - dependencies: - "@types/hast" "^2.0.0" - hast-util-to-html "^8.0.0" - unified "^10.0.0" - -rehype@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/rehype/-/rehype-12.0.0.tgz#d5e80a206da2479b3564722bc2ba882e0f4240ec" - integrity sha512-gZcttmf9R5IYHb8AlI1rlmWqXS1yX0rSB/S5ZGJs8atfYZy2DobvH3Ic/gSzB+HL/+oOHPtBguw1TprfhxXBgQ== - dependencies: - "@types/hast" "^2.0.0" - rehype-parse "^8.0.0" - rehype-stringify "^9.0.0" - unified "^10.0.0" - -relateurl@^0.2.7: - version "0.2.7" - resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= - -remark-cli@10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/remark-cli/-/remark-cli-10.0.0.tgz#3b0e20f2ad3909f35c7a6fb3f721c82f6ff5beac" - integrity sha512-Yc5kLsJ5vgiQJl6xMLLJHqPac6OSAC5DOqKQrtmzJxSdJby2Jgr+OpIAkWQYwvbNHEspNagyoQnuwK2UCWg73g== - dependencies: - remark "^14.0.0" - unified-args "^9.0.0" - -remark-lint-blockquote-indentation@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-blockquote-indentation/-/remark-lint-blockquote-indentation-3.0.1.tgz#74591e6029c4c8c92bf0c1665e001b29a71522bd" - integrity sha512-CfjXeaomk3bxt1Y0Z4T/cKVoE+8lm5jw5C+jz8EieWNIziGNUlDxIAbMk1F1sO8EXc4LjkbTSq4zz8h1vOHkew== - dependencies: - "@types/mdast" "^3.0.0" - pluralize "^8.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-code-block-style@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-code-block-style/-/remark-lint-code-block-style-3.0.1.tgz#be4434e3e8007bd3324227da876d3c59e2e960d6" - integrity sha512-B6338x1UggrAMe4gdmk1No2L/OkK1d1uCelekj6cnl+Pi5/HLlSw3lXIaOTRNIXOccT1zMmNApA4sDZ5qsQWtw== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-definition-case@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-definition-case/-/remark-lint-definition-case-3.0.1.tgz#15b2260ed0281398944c09f460ec48cb31a12fdc" - integrity sha512-MsMpHnlb82nBP8yv16hECd2Laq8gw0cMAgxFT72cIYgdNa3B277o20XgtmkKk1i6BxpbJ/1zI9MoLXV60dQ3wQ== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-definition-spacing@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-definition-spacing/-/remark-lint-definition-spacing-3.0.1.tgz#2599dc8cef6eb555b116a9634a226d812795fd87" - integrity sha512-jtCUaZ+6KP4nNutBoiWoqBfa2sMsD4uvvFbuU5MOlzI0wlMmaeAq1pxWuNtkK+w8AEk/8CzfCUrLct5w65KSLQ== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-emphasis-marker@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-emphasis-marker/-/remark-lint-emphasis-marker-3.0.1.tgz#612d0126d99649484ad9a42ad854f3110ddc7536" - integrity sha512-5uwlHk4oDWDZIHSLkUoYBSrzzkpywy4J2kAy+CR5LW3HaV6YCFfm2/hAXiPIGCABH3KT35OoZZRoA8t4PJ51xw== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-fenced-code-flag@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-fenced-code-flag/-/remark-lint-fenced-code-flag-3.0.1.tgz#5282ece321f9e3e86dd7e1b30dbd50f0cdbb40e0" - integrity sha512-HsEhvalGxCauZO6OAnaVzIBycfaHLuyZxy1KlniWXQJKZ6EjRAsWwkZHYx9qfPl/ZW7zDG+xAoWTqdHjZW/BTg== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-fenced-code-marker@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-fenced-code-marker/-/remark-lint-fenced-code-marker-3.0.1.tgz#3b09baa8305f86f27c81e1f4eaffd4ac4e51e7b0" - integrity sha512-vFRjlzyxtG3zdvmlTn6cV1YiZAivQwOzYRNnH5KavC39EZHDxqjQl84QTXshgfCzFupvYCi6ykATIa7obgx9jg== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-file-extension@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-file-extension/-/remark-lint-file-extension-2.0.1.tgz#e6777c2a322270066aa3c249d2836d326ba3f91d" - integrity sha512-A2N6XoLPbYyRhgXyTI7WlW9Nb9QvXQNXG514hjHdNNd0cL+5P4JU6vivgZiYfViCzOLgsys6hwhXBSC9ZQ45tw== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - -remark-lint-final-definition@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-final-definition/-/remark-lint-final-definition-3.0.1.tgz#9439d9531369b6a8bbbb25e2d550d5fe19a9202b" - integrity sha512-bzha13GTKFnQ0h4ZvaHadK6HxM2eRJj/yj59aXyvJkHFNx7i0sQn1884t3yYM4ppdDmO+cCMMgsVo8DxE8ifFA== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-hard-break-spaces@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-hard-break-spaces/-/remark-lint-hard-break-spaces-3.0.1.tgz#aa5a968a6ecb609fddc0b3c73e578f4eb3fdf75a" - integrity sha512-CPjbfc9DcV4Qy3d8jyhh/QXsLD5uRtweb0d04p2MyzMDrqwXAq5X4MW3rId3JbVVl7o1AKXq1FdvqIMrh9Rpuw== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-heading-increment@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-heading-increment/-/remark-lint-heading-increment-3.0.1.tgz#12d264ea48b6db979433bf22b4145d116789361d" - integrity sha512-GDriIGIP+OaR+yZwTd+lKZhNBIdjqMsd+ByV7V8ekKJbbOh8/pXSwKr5Pv4UdvY+ISef5IrD/RnRMVuiorRfZA== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-visit "^4.0.0" - -remark-lint-heading-style@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-heading-style/-/remark-lint-heading-style-3.0.1.tgz#8727db87ceab53d33c7016750acf3358b321d15f" - integrity sha512-/9rsTE+coYdUgT/spxg4ioorG2W5XdabLHajKjTOOQ4ME8Wa5fXHMJ3WpK3Vnz8ZKP7WQwTTPsKWIHcy5d6C+w== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-heading-style "^2.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-visit "^4.0.0" - -remark-lint-link-title-style@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-link-title-style/-/remark-lint-link-title-style-3.0.1.tgz#9fbbc8329cf7c693d307764662cc644415b143fe" - integrity sha512-5CgzNZtuI2/5/RdHKo9+Ritab8CUWv4wfBhPWRvTZDRmy+7POnKClZaNoxWVoH0/+/JMmeQpe31dgbT1Wh2uZA== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - vfile-location "^4.0.0" - -remark-lint-list-item-content-indent@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-list-item-content-indent/-/remark-lint-list-item-content-indent-3.0.1.tgz#1357e559e69163386f9666b20efd2951e6222416" - integrity sha512-bRn7V/T1J9d/BaRNTfu695xO48n4Ul8udEzMrKWxfDfCgOLfsVtj3NQD0iGFpvJ9R6zB7GGPka+SEQlIxpT9FQ== - dependencies: - "@types/mdast" "^3.0.0" - pluralize "^8.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-list-item-indent@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-list-item-indent/-/remark-lint-list-item-indent-3.0.1.tgz#719ee34dec3f7b34cfd3fd2600806dc561fc748b" - integrity sha512-5/H5B2g6TTpJZiwMmBa/Drexwq5Dw50QoypTUgXwFETz91s7zvjy+IGGVoVv0L0LM0rCwblmgtLomqeWIyo9sA== - dependencies: - "@types/mdast" "^3.0.0" - pluralize "^8.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-list-item-spacing@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-list-item-spacing/-/remark-lint-list-item-spacing-4.0.1.tgz#41add9734076d23671d043db09e2cd9154cd7dd5" - integrity sha512-/Y03NjqtCodzTUwR0eFEn4h/9KJOCSzq981dEEPd56oGcpKgMI5ev4OqI3TyIAtdmJZ9SH87Yv4dXwO6VJ9FoQ== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-maximum-heading-length@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-maximum-heading-length/-/remark-lint-maximum-heading-length-3.0.1.tgz#0ab8071f5c2fbdf8a28d23022f74c59bfdfaac75" - integrity sha512-VVNi4KyX9BgL5pSC281TLutsY1JUARDvBmhE3afQ0eSfJbrXi4tGOSjlHXpAS4TJXf1WUQQ7ETmmKu795dJdaw== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-to-string "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-visit "^4.0.0" - -remark-lint-maximum-line-length@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-maximum-line-length/-/remark-lint-maximum-line-length-3.0.1.tgz#685871fd6581148a32ca38719f9f1eb16d78c30f" - integrity sha512-R4hiRRx46xa3NE/AY8IKzPTRVyq1ZWrtWVd2KfWwNHmj7a6ASjb75DPzGyckZ46UAQq9mSBPsgL5Rfhq5XmggA== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-auto-link-without-protocol@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-auto-link-without-protocol/-/remark-lint-no-auto-link-without-protocol-3.0.1.tgz#8a70874368521bb40689b5421d8279796199c493" - integrity sha512-FdbB9O4SegELBreglpOXhMyusKORPS0X7KrBY/V+tDo4+2sJHMEEdiN4RbK2ofWwRP7V+muZ5WrscLliuAExQg== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-to-string "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-blockquote-without-marker@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-blockquote-without-marker/-/remark-lint-no-blockquote-without-marker-5.0.1.tgz#31cb4264088b6db8c5a2824ab0a16f0ce37d5065" - integrity sha512-3aUFCV1BSqO15MuJ6fQept36An/vLo9VgAj1TRWk4Gsnaewbq7haT/m6eiYn5Ia8t2sSBbv4LKz1lwnj5nOVPQ== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - vfile-location "^4.0.0" - -remark-lint-no-consecutive-blank-lines@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-consecutive-blank-lines/-/remark-lint-no-consecutive-blank-lines-4.0.1.tgz#e9ff3613e25d42bd004e8ab065609a0393f16f2b" - integrity sha512-nvwglXFdR8ubTjSduK3cVdgBaKCH/DqV0kVkCKSQmLEl8NyozFH03VB/bhQDCrmSeNt6rYClBF0ppaHT27OmpA== - dependencies: - "@types/mdast" "^3.0.0" - "@types/unist" "^2.0.0" - pluralize "^8.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-duplicate-headings@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-duplicate-headings/-/remark-lint-no-duplicate-headings-3.0.1.tgz#9db2ba686606226178d6563a0213e83ac7a22c15" - integrity sha512-yUy6LwD58xXJgoEGAhLKeDvfCRTeaLiY8yAsY1khOTPsh9qc2JQFArG2DqmsDttm1rErDnFvggW44tAL6OQAHA== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-to-string "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-stringify-position "^3.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-emphasis-as-heading@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-emphasis-as-heading/-/remark-lint-no-emphasis-as-heading-3.0.1.tgz#0290da33cbce79b72ddf28f9878fccad64d3a0f2" - integrity sha512-jMsEhsC5s3gUgiNqTAKpQOATHa/6xM64X1YKq3D8RBOSqMHUrTDx2t9COa0MFqYzXmPQ5XfxZIkuW9QVBJPgCg== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-file-name-articles@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-articles/-/remark-lint-no-file-name-articles-2.0.1.tgz#1265a3dab489f5c07a1c3e8a2167124ef5bd030f" - integrity sha512-9kZ/ydzJlntswJjsQEbPPx0tc6uAPuowmG/3aOCSE+6CjJ+bCQZiVLL3VhjktNyzFxDGTDN6LlbVwiyIHEUMwA== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - -remark-lint-no-file-name-consecutive-dashes@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-consecutive-dashes/-/remark-lint-no-file-name-consecutive-dashes-2.0.1.tgz#cab34dce03381b15dac50188198c24303bde4e71" - integrity sha512-e9ei9KwQSRzUQeYHEhCKUMDeavFOIj46NtuyZxYtrklOcblvaZLAV133UcFHk5CimdUj3dzTtFZebHdpvu5omw== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - -remark-lint-no-file-name-irregular-characters@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-irregular-characters/-/remark-lint-no-file-name-irregular-characters-2.0.1.tgz#7188d6bca6618d667237ceb553bf7a19fb421dd1" - integrity sha512-TvhfKpsE0UhUr6iIvInR/PC42fpmLGt+uBLtx1HBgRCUqkQUra8Ep2rRMaxvFp2ms1xX/p0pDtSCkXRUeV2Pug== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - -remark-lint-no-file-name-mixed-case@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-mixed-case/-/remark-lint-no-file-name-mixed-case-2.0.1.tgz#2e200fdb19d8b3249ba3cddbddf35c52590b7c1a" - integrity sha512-NG86/vR3tWoL6xrllUkvfg0y7k0eiG0N3KZVHEyOl1zGeARWaR+NXj9vHHIEahStnZ3e7bAcmL2tj+K/tGohcg== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - -remark-lint-no-file-name-outer-dashes@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-file-name-outer-dashes/-/remark-lint-no-file-name-outer-dashes-2.0.1.tgz#536344895ab351d8712180dd63ade2f59849fcef" - integrity sha512-INp+0gW5T2j6+sHglmDmCLL7/goVKCryXyf+ZApB5oWYBpVr2fLnHEHTUmkbQkksxe7me+VsB+WW/KN1PXGrtw== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - -remark-lint-no-heading-punctuation@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-heading-punctuation/-/remark-lint-no-heading-punctuation-3.0.1.tgz#e21744d80e7f06cb9c984c0bd4e3f3a284b51afd" - integrity sha512-PFXctxVdi1XycSc2yav72l72mK6JVE6O+tzc9cbW84L7ZYR/Bedq+1HWEYup3mGSTpL4lhcYDk6NSL1oshj6xA== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-to-string "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-inline-padding@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-inline-padding/-/remark-lint-no-inline-padding-4.0.1.tgz#a89d4fd639e888ee97cac811b9c950f1787a08a5" - integrity sha512-UcjJ2XTf7kOmQo5mU/5AV+Gth1YYGcp+gYU4gS/CzdOLYstqsS/W+IN6ALJjEbdbtSyfWCElpxI4p/mW16Z90A== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-to-string "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-literal-urls@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-literal-urls/-/remark-lint-no-literal-urls-3.0.1.tgz#af87cc111f942a43edf2d2cc27d199b7785be141" - integrity sha512-3OAFcaZawfrFgZGrpuZlNPyuvfIURtUzDN7/Bl2X42ivqx4ih1OH9LtiBgz+J0g1DEWnC5ebOmDr7x6XLM76Fw== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-to-string "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-multiple-toplevel-headings@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-multiple-toplevel-headings/-/remark-lint-no-multiple-toplevel-headings-3.0.1.tgz#08e03c3b102748835bc7077fbec9b0543c8feff4" - integrity sha512-K62PKOOanFiFM4R0oHlo1PKWJa0dPPasQl28yzk6G2xZzqc5eJm5S3d0grU479jqEUbDQMaDQw282hO6WR/MbA== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-stringify-position "^3.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-shell-dollars@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-shell-dollars/-/remark-lint-no-shell-dollars-3.0.1.tgz#e9c092e07be2e308abd49b54c253010efb3e654c" - integrity sha512-QvnA8Ltj3FPaAqUu0DebKYv66LFndTk0fXVZ9rQWOjTEVIKImy9Dy59kVqwYMpCwZbJkpigu2bMl/7UG/BA0XA== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-shortcut-reference-image@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-image/-/remark-lint-no-shortcut-reference-image-3.0.1.tgz#3cef27ef939debd385d9d3ba21bfb8afd3e011b4" - integrity sha512-0o0YO88Atib0eWloy5ZbL2IZ1axMNysbJI5j58sxMjEwLq1JORtGOR9Z6aHsOccS5yseeenw5w3DoMLB9PtJtw== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-shortcut-reference-link@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-shortcut-reference-link/-/remark-lint-no-shortcut-reference-link-3.0.1.tgz#3104ed6b82c6234eb6187481243f1b3890a1d506" - integrity sha512-uXujnVm5LXLtGyJkTIbn/uxDRu507B9vC8TieiX6HX8OjVeDWUjtcVJOaqeyLJGjV0Ri1Y+AegMNWx5eDBHTDQ== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-visit "^4.0.0" - -remark-lint-no-table-indentation@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-no-table-indentation/-/remark-lint-no-table-indentation-4.0.1.tgz#13a41252021b245ca60bfbe5a578755421316e65" - integrity sha512-GYBX5P1Vj0gO7S7JLU2tpYR5rg9xbeccPQ0ZgHYK4d7T9FjDwfE1hrdvlha3k8s3CFKqQ7MC0OgQw/2IN413MA== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - vfile-location "^4.0.0" - -remark-lint-ordered-list-marker-style@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-style/-/remark-lint-ordered-list-marker-style-3.0.1.tgz#56f6a94d88dd8c74b8e444cd970bb3be6a575606" - integrity sha512-CGXvolLwfZIxG9hm4o7OXQXEEpu3r5oyTpYGteJDtOSrpVrBSqFKNq7lfhKYFQkcg2AMJYrH9XEexrYvAoUQOQ== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-ordered-list-marker-value@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-ordered-list-marker-value/-/remark-lint-ordered-list-marker-value-3.0.1.tgz#1296c0a758df6ea2e918769f013bff10ff5bd0d9" - integrity sha512-02tEsP+jKxZr7zhTVTbr6sThraTsUUKCmRdONBBwAFlK3bibZJYGMukjhR7rJtCbO/uHQqGX4VhEWPcOcCoaUg== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-rule-style@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-rule-style/-/remark-lint-rule-style-3.0.1.tgz#2473b4d8d866e6f27ef968d7071d2ed719ce999c" - integrity sha512-j1e60nfZJk0C6mvDZkiFwVu0b58f219ATlMNaZ9h8QdQhdxD/0kUnizJ7xW3wS4sHtCgkKGctAp04Ma0c+Dkhg== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-strong-marker@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-strong-marker/-/remark-lint-strong-marker-3.0.1.tgz#54119b529d152ea7294ac761e866a3a6244c4405" - integrity sha512-J5dJviBd747vXBkFuA2j/Ni7RjTg+Mg2GgXlPHtbgDnal51CdN2WXDmbVG/A98+3P18MlysvQ7KnBrSiiuGBpQ== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-table-cell-padding@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-table-cell-padding/-/remark-lint-table-cell-padding-4.0.1.tgz#0cfc515af12f4c2f123e8b5895a9ae635142f7e3" - integrity sha512-NdF0WHFOaMjeumRIrGHXVadwWkgnfJuMb96FGbf1HvSEv9l41PHkS1KTsL6Zoe1Cva57niAuarMv6xzcJqVjrA== - dependencies: - "@types/mdast" "^3.0.0" - "@types/unist" "^2.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-table-pipe-alignment@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-table-pipe-alignment/-/remark-lint-table-pipe-alignment-3.0.1.tgz#70517c20ca24e4da830f71e09c39aabab1e5382e" - integrity sha512-uTp5ntlkTy0xsNfD6udM5zyHvBD9d+X+lpzk9Teog34rB6ETGSBSdtzxT9kxoA3/cEiZs6ojyMGCOy0VDtGv6g== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-table-pipes@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-table-pipes/-/remark-lint-table-pipes-4.0.1.tgz#529d6d5569eed1129b912df3c748005cc2f82046" - integrity sha512-om6i8SMSjMsR/mYlx5cMSoxXK+EFI8/n73qCVx/RAhFCIsW4TFR+gYmgFTyLr5Mp4vqjV3uYBIR9Ucv6Johauw== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint-unordered-list-marker-style@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/remark-lint-unordered-list-marker-style/-/remark-lint-unordered-list-marker-style-3.0.1.tgz#f50b3359444d32363541bd26e30e091eb9b4d866" - integrity sha512-DPveL2hhkcY608Bkn/Hx+C7pxviufpYyRiu0CnfFxkbLBlMgVdvVIOGCCOlhbvKuGtozmH/RCRsdIfzjlkXiew== - dependencies: - "@types/mdast" "^3.0.0" - unified "^10.0.0" - unified-lint-rule "^2.0.0" - unist-util-generated "^2.0.0" - unist-util-position "^4.0.0" - unist-util-visit "^4.0.0" - -remark-lint@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/remark-lint/-/remark-lint-9.0.1.tgz#85ede987d24b7def9a6cea4a4d40c2035723eaec" - integrity sha512-q4VFsA7LEG4REJhR2P4A6CU9b4cCQL53845CX74Z4N/W0EgB9mm/GXpYzjbEqgkMPl5ctP8yp/vBYTNmjfUCtw== - dependencies: - "@types/mdast" "^3.0.0" - remark-message-control "^7.0.0" - unified "^10.1.0" - -remark-message-control@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/remark-message-control/-/remark-message-control-7.0.0.tgz#ba83d212fbde3e5e2adabd30697bf80b0b709ef7" - integrity sha512-KZySoC97TrMPYfIZ9vJ7wxvQwniy68K6WCY3vmSedDN5YuGfdVOpMj6sjaZQcqbWZV9n7BhrT70E3xaUTtk4hA== - dependencies: - "@types/mdast" "^3.0.0" - mdast-comment-marker "^2.0.0" - rehype "^12.0.0" - unified "^10.0.0" - unified-message-control "^4.0.0" - vfile "^5.0.0" - -remark-parse@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-10.0.0.tgz#65e2b2b34d8581d36b97f12a2926bb2126961cb4" - integrity sha512-07ei47p2Xl7Bqbn9H2VYQYirnAFJPwdMuypdozWsSbnmrkgA2e2sZLZdnDNrrsxR4onmIzH/J6KXqKxCuqHtPQ== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-from-markdown "^1.0.0" - unified "^10.0.0" - -remark-preset-lint-markdown-style-guide@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/remark-preset-lint-markdown-style-guide/-/remark-preset-lint-markdown-style-guide-5.0.1.tgz#a53018e4e44f4417b911968ee1ecc49aa3cff6a7" - integrity sha512-O/Es5sDhBcfwKu+9aQHs6Wj3NT3tb3bPGbSxw0cBaHdVAhNQV1+1yeQWzpoIk53vN5+7S4SeQwAx/Rsw1Youqw== - dependencies: - "@types/mdast" "^3.0.0" - remark-lint "^9.0.0" - remark-lint-blockquote-indentation "^3.0.0" - remark-lint-code-block-style "^3.0.0" - remark-lint-definition-case "^3.0.0" - remark-lint-definition-spacing "^3.0.0" - remark-lint-emphasis-marker "^3.0.0" - remark-lint-fenced-code-flag "^3.0.0" - remark-lint-fenced-code-marker "^3.0.0" - remark-lint-file-extension "^2.0.0" - remark-lint-final-definition "^3.0.0" - remark-lint-hard-break-spaces "^3.0.0" - remark-lint-heading-increment "^3.0.0" - remark-lint-heading-style "^3.0.0" - remark-lint-link-title-style "^3.0.0" - remark-lint-list-item-content-indent "^3.0.0" - remark-lint-list-item-indent "^3.0.0" - remark-lint-list-item-spacing "^4.0.0" - remark-lint-maximum-heading-length "^3.0.0" - remark-lint-maximum-line-length "^3.0.0" - remark-lint-no-auto-link-without-protocol "^3.0.0" - remark-lint-no-blockquote-without-marker "^5.0.0" - remark-lint-no-consecutive-blank-lines "^4.0.0" - remark-lint-no-duplicate-headings "^3.0.0" - remark-lint-no-emphasis-as-heading "^3.0.0" - remark-lint-no-file-name-articles "^2.0.0" - remark-lint-no-file-name-consecutive-dashes "^2.0.0" - remark-lint-no-file-name-irregular-characters "^2.0.0" - remark-lint-no-file-name-mixed-case "^2.0.0" - remark-lint-no-file-name-outer-dashes "^2.0.0" - remark-lint-no-heading-punctuation "^3.0.0" - remark-lint-no-inline-padding "^4.0.0" - remark-lint-no-literal-urls "^3.0.0" - remark-lint-no-multiple-toplevel-headings "^3.0.0" - remark-lint-no-shell-dollars "^3.0.0" - remark-lint-no-shortcut-reference-image "^3.0.0" - remark-lint-no-shortcut-reference-link "^3.0.0" - remark-lint-no-table-indentation "^4.0.0" - remark-lint-ordered-list-marker-style "^3.0.0" - remark-lint-ordered-list-marker-value "^3.0.0" - remark-lint-rule-style "^3.0.0" - remark-lint-strong-marker "^3.0.0" - remark-lint-table-cell-padding "^4.0.0" - remark-lint-table-pipe-alignment "^3.0.0" - remark-lint-table-pipes "^4.0.0" - remark-lint-unordered-list-marker-style "^3.0.0" - unified "^10.0.0" - -remark-stringify@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-10.0.0.tgz#7f23659d92b2d5da489e3c858656d7bbe045f161" - integrity sha512-3LAQqJ/qiUxkWc7fUcVuB7RtIT38rvmxfmJG8z1TiE/D8zi3JGQ2tTcTJu9Tptdpb7gFwU0whRi5q1FbFOb9yA== - dependencies: - "@types/mdast" "^3.0.0" - mdast-util-to-markdown "^1.0.0" - unified "^10.0.0" - -remark@^14.0.0: - version "14.0.1" - resolved "https://registry.yarnpkg.com/remark/-/remark-14.0.1.tgz#a97280d4f2a3010a7d81e6c292a310dcd5554d80" - integrity sha512-7zLG3u8EUjOGuaAS9gUNJPD2j+SqDqAFHv2g6WMpE5CU9rZ6e3IKDM12KHZ3x+YNje+NMAuN55yx8S5msGSx7Q== - dependencies: - "@types/mdast" "^3.0.0" - remark-parse "^10.0.0" - remark-stringify "^10.0.0" - unified "^10.0.0" - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= - -renderkid@^2.0.4: - version "2.0.7" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609" - integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ== - dependencies: - css-select "^4.1.3" - dom-converter "^0.2.0" - htmlparser2 "^6.1.0" - lodash "^4.17.21" - strip-ansi "^3.0.1" - -repeat-element@^1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" - integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== - -repeat-string@^1.5.2, repeat-string@^1.6.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= - -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.x, request@^2.86.0, request@^2.87.0, request@^2.88.0: - 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= - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg== - dependencies: - resolve-from "^5.0.0" - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= - -resolve@^1.10.0, resolve@^1.10.1, resolve@^1.20.0, resolve@^1.9.0: - version "1.20.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" - integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== - dependencies: - is-core-module "^2.2.0" - path-parse "^1.0.6" - -ret@~0.1.10: - version "0.1.15" - resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg== - -retry-as-promised@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/retry-as-promised/-/retry-as-promised-3.2.0.tgz#769f63d536bec4783549db0777cb56dadd9d8543" - integrity sha512-CybGs60B7oYU/qSQ6kuaFmRd9sTZ6oXSc0toqePvV74Ac6/IFZSI1ReFQmtCN+uvW1Mtqdwpvt/LGOiCBAY2Mg== - dependencies: - any-promise "^1.3.0" - -reusify@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - -reveal.js@3.9.2: - version "3.9.2" - resolved "https://registry.yarnpkg.com/reveal.js/-/reveal.js-3.9.2.tgz#7f63d3dfec338b6c313dcabdf006e8cf80e0b358" - integrity sha512-Dvv2oA9FrtOHE2DWj5js8pMRfwq++Wmvsn1EyAdYLC80lBjTphns+tPsB652Bnvep9AVviuVS/b4XoVY9rXHLA== - -rimraf@2, rimraf@^2.5.4, rimraf@^2.6.1, 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" - -ripemd160@^2.0.0, ripemd160@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" - integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - -run-parallel@^1.1.9: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - -run-queue@^1.0.0, run-queue@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47" - integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec= - dependencies: - aproba "^1.1.1" - -rw@1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" - integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q= - -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= - dependencies: - ret "~0.1.10" - -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - -sax@0.5.x: - version "0.5.8" - resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1" - integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE= - -sax@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" - integrity sha1-e45lYZCyKOgaZq6nSEgNgozS03o= - -sax@>=0.6.0, sax@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" - integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== - -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" - -schema-utils@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -scrypt-kdf@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/scrypt-kdf/-/scrypt-kdf-2.0.1.tgz#3355224c52d398331b2cbf2b70a7be26b52c53e6" - integrity sha512-dMhpgBVJPDWZP5erOCwTjI6oAO9hKhFAjZsdSQ0spaWJYHuA/wFNF2weQQfsyCIk8eNKoLfEDxr3zAtM+gZo0Q== - -select2@3.5.2-browserify: - version "3.5.2-browserify" - resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d" - integrity sha1-3E2v2jjWenNOipekbw01Ka4FOR0= - -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= - -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.6.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0, semver@^6.1.0, semver@^6.3.0: - version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^7.0.0, semver@^7.2.1, semver@^7.3.5: - version "7.3.5" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" - integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== - dependencies: - lru-cache "^6.0.0" - -semver@~5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - integrity sha1-myzl094C0XxgEq0yaqa00M9U+U8= - -send@0.17.1: - version "0.17.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" - integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== - dependencies: - debug "2.6.9" - depd "~1.1.2" - destroy "~1.0.4" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "~1.7.2" - mime "1.6.0" - ms "2.1.1" - on-finished "~2.3.0" - range-parser "~1.2.1" - statuses "~1.5.0" - -seq-queue@^0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e" - integrity sha1-1WgS4cAXpuTnw+Ojeh2m143TyT4= - -sequelize-pool@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/sequelize-pool/-/sequelize-pool-2.3.0.tgz#64f1fe8744228172c474f530604b6133be64993d" - integrity sha512-Ibz08vnXvkZ8LJTiUOxRcj1Ckdn7qafNZ2t59jYHMX1VIebTAOYefWdRYFt6z6+hy52WGthAHAoLc9hvk3onqA== - -sequelize@^5.21.1: - version "5.22.4" - resolved "https://registry.yarnpkg.com/sequelize/-/sequelize-5.22.4.tgz#4dbd8a1a735e98150880d43a95d45e9f46d151fa" - integrity sha512-xFQQ38HPg7EyDRDA+NdzMSRWbo9m6Z/RxpjnkBl3ggyQG+jRrup48x0jaw4Ox42h56wFnXOBC2NZOkTJfZeWCw== - dependencies: - bluebird "^3.5.0" - cls-bluebird "^2.1.0" - debug "^4.1.1" - dottie "^2.0.0" - inflection "1.12.0" - lodash "^4.17.15" - moment "^2.24.0" - moment-timezone "^0.5.21" - retry-as-promised "^3.2.0" - semver "^6.3.0" - sequelize-pool "^2.3.0" - toposort-class "^1.0.1" - uuid "^3.3.3" - validator "^10.11.0" - wkx "^0.4.8" - -serialize-javascript@6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - -serialize-javascript@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" - integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw== - dependencies: - randombytes "^2.1.0" - -serialize-javascript@^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" - -serve-static@1.14.1: - version "1.14.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" - integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.17.1" - -set-blocking@~2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw== - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setimmediate@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -setprototypeof@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" - integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== - -sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.11" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" - integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== - -shimmer@^1.1.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/shimmer/-/shimmer-1.2.1.tgz#610859f7de327b587efebf501fb43117f9aff337" - integrity sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw== - -shortid@2.2.16: - version "2.2.16" - resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.16.tgz#b742b8f0cb96406fd391c76bfc18a67a57fe5608" - integrity sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g== - dependencies: - nanoid "^2.1.0" - -side-channel@^1.0.3, side-channel@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" - integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== - dependencies: - call-bind "^1.0.0" - get-intrinsic "^1.0.2" - object-inspect "^1.9.0" - -signal-exit@^3.0.0, signal-exit@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" - integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== - -simple-swizzle@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" - integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= - dependencies: - is-arrayish "^0.3.1" - -slash@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55" - integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= - -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -slice-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" - integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== - dependencies: - ansi-styles "^4.0.0" - astral-regex "^2.0.0" - is-fullwidth-code-point "^3.0.0" - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw== - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ== - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg== - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -snapsvg@0.5.x: - version "0.5.1" - resolved "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz#0caf52c79189a290746fc446cc5e863f6bdddfe3" - integrity sha1-DK9Sx5GJopB0b8RGzF6GP2vd3+M= - dependencies: - eve "~0.5.1" - -socket.io-adapter@~1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" - integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== - -socket.io-client@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" - integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== - dependencies: - backo2 "1.0.2" - component-bind "1.0.0" - component-emitter "~1.3.0" - debug "~3.1.0" - engine.io-client "~3.5.0" - has-binary2 "~1.0.2" - indexof "0.0.1" - parseqs "0.0.6" - parseuri "0.0.6" - socket.io-parser "~3.3.0" - to-array "0.1.4" - -socket.io-parser@~3.3.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6" - integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg== - dependencies: - component-emitter "~1.3.0" - debug "~3.1.0" - isarray "2.0.1" - -socket.io-parser@~3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a" - integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A== - dependencies: - component-emitter "1.2.1" - debug "~4.1.0" - isarray "2.0.1" - -socket.io@^2.1.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2" - integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w== - dependencies: - debug "~4.1.0" - engine.io "~3.5.0" - has-binary2 "~1.0.2" - socket.io-adapter "~1.1.0" - socket.io-client "2.4.0" - socket.io-parser "~3.4.0" - -source-list-map@^2.0.0, source-list-map@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== - -source-map-js@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" - integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== - -source-map-resolve@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" - integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw== - dependencies: - atob "^2.1.2" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -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.5.12: - version "0.5.20" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9" - integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-url@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" - integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== - -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= - -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -source-map@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - -space-separated-tokens@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/space-separated-tokens/-/space-separated-tokens-2.0.1.tgz#43193cec4fb858a2ce934b7f98b7f2c18107098b" - integrity sha512-ekwEbFp5aqSPKaqeY1PGrlGQxPNaq+Cnx4+bE2D8sciBQrHpbwoBbawqTN2+6jPs9IdWxxiUcN0K2pkczD3zmw== - -spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.10" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" - integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== - -spin.js@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/spin.js/-/spin.js-4.1.1.tgz#567464a08620541e523da856cb5f67af2d0f48ad" - integrity sha512-3cjbjZBw8TmZmvzcmlXqArUpefJ1vGgQZ+dh1CdyDyxZZNxNmw+2Dq5jyoP/OCqQP+z78rWgSJX9m3uMuGaxxw== - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw== - dependencies: - extend-shallow "^3.0.0" - -split2@^3.1.1: - version "3.2.2" - resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f" - integrity sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg== - dependencies: - readable-stream "^3.0.0" - -sprintf-js@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - -sqlite3@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.0.2.tgz#00924adcc001c17686e0a6643b6cbbc2d3965083" - integrity sha512-1SdTNo+BVU211Xj1csWa8lV6KM0CtucDwRyA0VHl91wEH1Mgh7RxUpI4rVvG7OhHrzCSGaVyW5g8vKvlrk9DJA== - dependencies: - node-addon-api "^3.0.0" - node-pre-gyp "^0.11.0" - optionalDependencies: - node-gyp "3.x" - -sqlstring@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.2.tgz#cdae7169389a1375b18e885f2e60b3e460809514" - integrity sha512-vF4ZbYdKS8OnoJAWBmMxCQDkiEBkGQYU7UZPtL8flbDRSNkhaXvRJ279ZtI6M+zDaQovVU4tuRgzK5fVhvFAhg== - -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - -ssri@^6.0.1: - version "6.0.2" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" - integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== - dependencies: - figgy-pudding "^3.5.1" - -ssri@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== - dependencies: - minipass "^3.1.1" - -stable@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" - integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w== - -stack-trace@0.0.x: - version "0.0.10" - resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" - integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA= - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -"statuses@>= 1.5.0 < 2", statuses@~1.5.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= - -store@^2.0.12: - version "2.0.12" - resolved "https://registry.yarnpkg.com/store/-/store-2.0.12.tgz#8c534e2a0b831f72b75fc5f1119857c44ef5d593" - integrity sha1-jFNOKguDH3K3X8XxEZhXxE711ZM= - -stream-browserify@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" - integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg== - dependencies: - inherits "~2.0.1" - readable-stream "^2.0.2" - -stream-each@^1.1.0: - version "1.2.3" - resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae" - integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== - dependencies: - end-of-stream "^1.1.0" - stream-shift "^1.0.0" - -stream-http@^2.7.2: - version "2.8.3" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" - integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw== - dependencies: - builtin-status-codes "^3.0.0" - inherits "^2.0.1" - readable-stream "^2.3.6" - to-arraybuffer "^1.0.0" - xtend "^4.0.0" - -stream-shift@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" - integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== - -string-loader@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/string-loader/-/string-loader-0.0.1.tgz#496f3cccc990213e0dd5411499f9ac6a6a6f2ff8" - integrity sha1-SW88zMmQIT4N1UEUmfmsampvL/g= - -string-natural-compare@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/string-natural-compare/-/string-natural-compare-2.0.3.tgz#9dbe1dd65490a5fe14f7a5c9bc686fc67cb9c6e4" - integrity sha512-4Kcl12rNjc+6EKhY8QyDVuQTAlMWwRiNbsxnVwBUKFr7dYPQuXVrtNU4sEkjF9LHY0AY6uVbB3ktbkIH4LC+BQ== - -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2": - version "2.1.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" - integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== - dependencies: - is-fullwidth-code-point "^2.0.0" - strip-ansi "^4.0.0" - -string-width@^4.1.0, string-width@^4.2.0: - 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-width@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.0.1.tgz#0d8158335a6cfd8eb95da9b6b262ce314a036ffd" - integrity sha512-5ohWO/M4//8lErlUUtrFy3b11GtNOuMOU0ysKCDXFcfXuuvUXu95akgj/i8ofmaGdN0hCqyl6uu9i8dS/mQp5g== - dependencies: - emoji-regex "^9.2.2" - is-fullwidth-code-point "^4.0.0" - strip-ansi "^7.0.1" - -string.prototype.trimend@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" - integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -string.prototype.trimstart@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" - integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - -string@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/string/-/string-3.3.3.tgz#5ea211cd92d228e184294990a6cc97b366a77cb0" - integrity sha1-XqIRzZLSKOGEKUmQpsyXs2anfLA= - -string_decoder@^1.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.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -stringify-entities@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/stringify-entities/-/stringify-entities-4.0.1.tgz#f483c9ca8d7e029edec9863c5a37c1f1e7702c8d" - integrity sha512-gmMQxKXPWIO3NXNSPyWNhlYcBNGpPA/487D+9dLPnU4xBnIrnHdr8cv5rGJOS/1BRxEXRb7uKwg7BA36IWV7xg== - dependencies: - character-entities-html4 "^2.0.0" - character-entities-legacy "^2.0.0" - -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - -strip-ansi@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= - dependencies: - ansi-regex "^3.0.0" - -strip-ansi@^6.0.0: - 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-ansi@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2" - integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw== - dependencies: - ansi-regex "^6.0.1" - -strip-ansi@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991" - integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE= - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= - -strip-comments@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b" - integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw== - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - -strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" - integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== - -strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - -strnum@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.3.tgz#bbc438bcb35fbbfc9c1e82f73097665b6ec6959e" - integrity sha512-GVoRjsqAYZkAH16GDzfTuafuwKxzKdaaCQyLaWf37gOP1e2PPbAKWoME1OmO+c4RCKMfNrrPRDLFCNBFU45N/A== - -strtok3@^6.2.4: - version "6.2.4" - resolved "https://registry.yarnpkg.com/strtok3/-/strtok3-6.2.4.tgz#302aea64c0fa25d12a0385069ba66253fdc38a81" - integrity sha512-GO8IcFF9GmFDvqduIspUBwCzCbqzegyVKIsSymcMgiZKeCfrN9SowtUoi8+b59WZMAjIzVZic/Ft97+pynR3Iw== - dependencies: - "@tokenizer/token" "^0.3.0" - peek-readable "^4.0.1" - -stylehacks@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb" - integrity sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA== - dependencies: - browserslist "^4.16.0" - postcss-selector-parser "^6.0.4" - -stylis@^4.0.10: - version "4.0.10" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240" - integrity sha512-m3k+dk7QeJw660eIKRRn3xPF6uuvHs/FFzjX3HQ5ove0qYsiygoAhwn5a3IYKaZPo5LrYD0rfVmtv1gNY1uYwg== - -superagent@1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-1.8.3.tgz#2b7d70fcc870eda4f2a61e619dd54009b86547c3" - integrity sha1-K31w/Mhw7aTyph5hndVACbhlR8M= - dependencies: - component-emitter "~1.2.0" - cookiejar "2.0.6" - debug "2" - extend "3.0.0" - form-data "1.0.0-rc3" - formidable "~1.0.14" - methods "~1.1.1" - mime "1.3.4" - qs "2.3.3" - readable-stream "1.0.27-1" - reduce-component "1.0.1" - -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@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" - integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== - dependencies: - has-flag "^4.0.0" - -supports-color@^9.0.0: - version "9.0.2" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.0.2.tgz#50f082888e4b0a4e2ccd2d0b4f9ef4efcd332485" - integrity sha512-ii6tc8ImGFrgMPYq7RVAMKkhPo9vk8uA+D3oKbJq/3Pk2YSMv1+9dUAesa9UxMbxBTvxwKTQffBahNVNxEvM8Q== - dependencies: - has-flag "^5.0.0" - -svgo@^2.3.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.6.0.tgz#f7d3064a91b0804ea28a9dbfc3b36ba2ed4dd8d4" - integrity sha512-ATpRmynNSjP/5hSM4Ij4Pg3L+BCN6IBES7wRLh1ZtVxJB7Xn8omiGttLW6v6ZbqrV5pCVB3XfdbUoY8IpgIwvw== - dependencies: - "@trysound/sax" "0.2.0" - colorette "^1.3.0" - commander "^7.2.0" - css-select "^4.1.3" - css-tree "^1.1.3" - csso "^4.2.0" - stable "^0.1.8" - -table@^6.0.9: - version "6.7.1" - resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" - integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== - dependencies: - ajv "^8.0.1" - lodash.clonedeep "^4.5.0" - lodash.truncate "^4.4.2" - slice-ansi "^4.0.0" - string-width "^4.2.0" - strip-ansi "^6.0.0" - -tapable@^1.0.0, tapable@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" - integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== - -tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - -tar-stream@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" - integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ== - dependencies: - bl "^4.0.3" - end-of-stream "^1.4.1" - fs-constants "^1.0.0" - inherits "^2.0.3" - readable-stream "^3.1.1" - -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: - version "4.4.19" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" - integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== - dependencies: - chownr "^1.1.4" - fs-minipass "^1.2.7" - minipass "^2.9.0" - minizlib "^1.3.3" - mkdirp "^0.5.5" - safe-buffer "^5.2.1" - yallist "^3.1.1" - -tar@^6.0.2: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== - 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" - -tdigest@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021" - integrity sha1-Ljyyw56kSeVdHmzZEReszKRYgCE= - dependencies: - bintrees "1.0.1" - -terser-webpack-plugin@^1.4.3: - version "1.4.5" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b" - integrity sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw== - dependencies: - cacache "^12.0.2" - find-cache-dir "^2.1.0" - is-wsl "^1.1.0" - schema-utils "^1.0.0" - serialize-javascript "^4.0.0" - source-map "^0.6.1" - terser "^4.1.2" - webpack-sources "^1.4.0" - worker-farm "^1.7.0" - -terser@^4.1.2, terser@^4.6.3: - version "4.8.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" - integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== - dependencies: - commander "^2.20.0" - source-map "~0.6.1" - source-map-support "~0.5.12" - -text-hex@1.0.x: - version "1.0.0" - resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" - integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== - -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= - -through2@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" - integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== - dependencies: - readable-stream "~2.3.6" - xtend "~4.0.1" - -through2@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4" - integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ== - dependencies: - inherits "^2.0.4" - readable-stream "2 || 3" - -timers-browserify@^2.0.4: - version "2.0.12" - resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee" - integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ== - dependencies: - setimmediate "^1.0.4" - -timsort@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= - -to-array@0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" - integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= - -to-arraybuffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43" - integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M= - -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-object-path@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw== - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -to-vfile@^7.0.0: - version "7.2.2" - resolved "https://registry.yarnpkg.com/to-vfile/-/to-vfile-7.2.2.tgz#5976568397ef664bc8df210676d082478822afbf" - integrity sha512-7WL+coet3qyaYb5vrVrfLtOUHgNv9E1D5SIsyVKmHKcgZefy77WMQRk7FByqGKNInoHOlY6xkTGymo29AwjUKg== - dependencies: - is-buffer "^2.0.0" - vfile "^5.1.0" - -toidentifier@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" - integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== - -token-types@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/token-types/-/token-types-4.1.1.tgz#ef9e8c8e2e0ded9f1b3f8dbaa46a3228b113ba1a" - integrity sha512-hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w== - dependencies: - "@tokenizer/token" "^0.3.0" - ieee754 "^1.2.1" - -toobusy-js@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/toobusy-js/-/toobusy-js-0.5.1.tgz#5511f78f6a87a6a512d44fdb0efa13672217f659" - integrity sha1-VRH3j2qHpqUS1E/bDvoTZyIX9lk= - -toposort-class@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toposort-class/-/toposort-class-1.0.1.tgz#7ffd1f78c8be28c3ba45cd4e1a3f5ee193bd9988" - integrity sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg= - -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" - -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= - -triple-beam@^1.2.0, triple-beam@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" - integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== - -trough@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/trough/-/trough-2.0.2.tgz#94a3aa9d5ce379fc561f6244905b3f36b7458d96" - integrity sha512-FnHq5sTMxC0sk957wHDzRnemFnNBvt/gSY99HzK8F7UP5WAbvP70yX5bd7CjEQkN+TjdxwI7g7lJ6podqrG2/w== - -tsconfig-paths@^3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.11.0.tgz#954c1fe973da6339c78e06b03ce2e48810b65f36" - integrity sha512-7ecdYDnIdmv639mmDwslG6KQg1Z9STTz1j7Gcz0xa+nshh/gKDAHcPxRbWOsA3SPp0tXP2leTcY9Kw+NAkfZzA== - dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.1" - minimist "^1.2.0" - strip-bom "^3.0.0" - -tslib@^1.10.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" - integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== - -tslib@^2.0.3: - version "2.3.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" - integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== - -tty-browserify@0.0.0: - version "0.0.0" - resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" - integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= - -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" - -turndown@7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/turndown/-/turndown-7.1.1.tgz#96992f2d9b40a1a03d3ea61ad31b5a5c751ef77f" - integrity sha512-BEkXaWH7Wh7e9bd2QumhfAXk5g34+6QUmmWx+0q6ThaVOLuLUqsnkq35HQ5SBHSaxjSfSM7US5o4lhJNH7B9MA== - dependencies: - domino "^2.1.6" - -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-check@^0.4.0, type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - -type-fest@^0.20.2: - version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" - integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== - -type-fest@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" - integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== - -type-is@~1.6.17, type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - -typedarray@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= - -uc.micro@^1.0.1, uc.micro@^1.0.5: - version "1.0.6" - resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac" - integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== - -uid-safe@~2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a" - integrity sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA== - dependencies: - random-bytes "~1.0.0" - -uid2@0.0.x: - version "0.0.4" - resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.4.tgz#033f3b1d5d32505f5ce5f888b9f3b667123c0a44" - integrity sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA== - -umzug@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/umzug/-/umzug-2.3.0.tgz#0ef42b62df54e216b05dcaf627830a6a8b84a184" - integrity sha512-Z274K+e8goZK8QJxmbRPhl89HPO1K+ORFtm6rySPhFKfKc5GHhqdzD0SGhSWHkzoXasqJuItdhorSvY7/Cgflw== - dependencies: - bluebird "^3.7.2" - -unbox-primitive@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" - integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== - dependencies: - function-bind "^1.1.1" - has-bigints "^1.0.1" - has-symbols "^1.0.2" - which-boxed-primitive "^1.0.2" - -underscore@1.11.x: - version "1.11.0" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.11.0.tgz#dd7c23a195db34267186044649870ff1bab5929e" - integrity sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw== - -underscore@^1.12.1, underscore@^1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1" - integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g== - -underscore@~1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8" - integrity sha1-izixDKze9jM3uLJOT/htRa6lKag= - -unified-args@^9.0.0: - version "9.0.2" - resolved "https://registry.yarnpkg.com/unified-args/-/unified-args-9.0.2.tgz#0c14f555e73ee29c23f9a567942e29069f56e5a2" - integrity sha512-qSqryjoqfJSII4E4Z2Jx7MhXX2MuUIn6DsrlmL8UnWFdGtrWvEtvm7Rx5fKT5TPUz7q/Fb4oxwIHLCttvAuRLQ== - dependencies: - "@types/text-table" "^0.2.0" - camelcase "^6.0.0" - chalk "^4.0.0" - chokidar "^3.0.0" - fault "^2.0.0" - json5 "^2.0.0" - minimist "^1.0.0" - text-table "^0.2.0" - unified-engine "^9.0.0" - -unified-engine@^9.0.0: - version "9.0.4" - resolved "https://registry.yarnpkg.com/unified-engine/-/unified-engine-9.0.4.tgz#ee02b6a7f11e69a56f79cb8595065b8c3f02bda8" - integrity sha512-NFI+jC3DWZ23eBsWkOW2havz47DPG/DSyJEvBH+qA5cQHF6zlgiJYev7ksb/naOypZZ+cfhaCxCRo2BqrysYEw== - dependencies: - "@types/concat-stream" "^1.0.0" - "@types/debug" "^4.0.0" - "@types/is-empty" "^1.0.0" - "@types/js-yaml" "^4.0.0" - "@types/node" "^16.0.0" - "@types/unist" "^2.0.0" - concat-stream "^2.0.0" - debug "^4.0.0" - fault "^2.0.0" - glob "^7.0.0" - ignore "^5.0.0" - is-buffer "^2.0.0" - is-empty "^1.0.0" - is-plain-obj "^4.0.0" - js-yaml "^4.0.0" - load-plugin "^4.0.0" - parse-json "^5.0.0" - to-vfile "^7.0.0" - trough "^2.0.0" - unist-util-inspect "^7.0.0" - vfile-message "^3.0.0" - vfile-reporter "^7.0.0" - vfile-statistics "^2.0.0" - -unified-lint-rule@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unified-lint-rule/-/unified-lint-rule-2.0.1.tgz#85276c0d443dce7b76d65e4b8bcdc987323ec9e4" - integrity sha512-2RzZuuuWW+ifftM0zd/ZEng0Hb5lah+Zi+ZL/ybj8BrLO/TH2aQAMYvG+iC95aCg2FkWu/pcvVvHqsh2UMmzPg== - dependencies: - "@types/unist" "^2.0.0" - trough "^2.0.0" - unified "^10.0.0" - vfile "^5.0.0" - -unified-message-control@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/unified-message-control/-/unified-message-control-4.0.0.tgz#7cd313df526fc660f218b19a56377bb6957019a8" - integrity sha512-1b92N+VkPHftOsvXNOtkJm4wHlr+UDmTBF2dUzepn40oy9NxanJ9xS1RwUBTjXJwqr2K0kMbEyv1Krdsho7+Iw== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is "^5.0.0" - unist-util-visit "^3.0.0" - vfile "^5.0.0" - vfile-location "^4.0.0" - vfile-message "^3.0.0" - -unified@^10.0.0, unified@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/unified/-/unified-10.1.0.tgz#4e65eb38fc2448b1c5ee573a472340f52b9346fe" - integrity sha512-4U3ru/BRXYYhKbwXV6lU6bufLikoAavTwev89H5UxY8enDFaAT2VXmIXYNm6hb5oHPng/EXr77PVyDFcptbk5g== - dependencies: - "@types/unist" "^2.0.0" - bail "^2.0.0" - extend "^3.0.0" - is-buffer "^2.0.0" - is-plain-obj "^4.0.0" - trough "^2.0.0" - vfile "^5.0.0" - -union-value@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg== - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - -uniqs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" - integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= - -unique-filename@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" - integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ== - dependencies: - unique-slug "^2.0.0" - -unique-slug@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c" - integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w== - dependencies: - imurmurhash "^0.1.4" - -unist-util-generated@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.0.tgz#86fafb77eb6ce9bfa6b663c3f5ad4f8e56a60113" - integrity sha512-TiWE6DVtVe7Ye2QxOVW9kqybs6cZexNwTwSMVgkfjEReqy/xwGpAXb99OxktoWwmL+Z+Epb0Dn8/GNDYP1wnUw== - -unist-util-inspect@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/unist-util-inspect/-/unist-util-inspect-7.0.0.tgz#98426f0219e24d011a27e32539be0693d9eb973e" - integrity sha512-2Utgv78I7PUu461Y9cdo+IUiiKSKpDV5CE/XD6vTj849a3xlpDAScvSJ6cQmtFBGgAmCn2wR7jLuXhpg1XLlJw== - dependencies: - "@types/unist" "^2.0.0" - -unist-util-is@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-5.1.1.tgz#e8aece0b102fa9bc097b0fef8f870c496d4a6236" - integrity sha512-F5CZ68eYzuSvJjGhCLPL3cYx45IxkqXSetCcRgUXtbcm50X2L9oOWQlfUfDdAf+6Pd27YDblBfdtmsThXmwpbQ== - -unist-util-position@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/unist-util-position/-/unist-util-position-4.0.1.tgz#f8484b2da19a897a0180556d160c28633070dbb9" - integrity sha512-mgy/zI9fQ2HlbOtTdr2w9lhVaiFUHWQnZrFF2EUoVOqtAUdzqMtNiD99qA5a1IcjWVR8O6aVYE9u7Z2z1v0SQA== - -unist-util-stringify-position@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-3.0.0.tgz#d517d2883d74d0daa0b565adc3d10a02b4a8cde9" - integrity sha512-SdfAl8fsDclywZpfMDTVDxA2V7LjtRDTOFd44wUJamgl6OlVngsqWjxvermMYf60elWHbxhuRCZml7AnuXCaSA== - dependencies: - "@types/unist" "^2.0.0" - -unist-util-visit-parents@^4.0.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-4.1.1.tgz#e83559a4ad7e6048a46b1bdb22614f2f3f4724f2" - integrity sha512-1xAFJXAKpnnJl8G7K5KgU7FY55y3GcLIXqkzUj5QF/QVP7biUm0K0O2oqVkYsdjzJKifYeWn9+o6piAK2hGSHw== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is "^5.0.0" - -unist-util-visit-parents@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-5.0.0.tgz#5ae2440f8710a0c18a2b4ba0c4471d18e1090494" - integrity sha512-CVaLOYPM/EaFTYMytbaju3Tw4QI3DHnHFnL358FkEu0hZOzSm/hqBdVwOQDR60jF5ZzhB1tlZlRH0ll/yekZIQ== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is "^5.0.0" - -unist-util-visit@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-3.1.0.tgz#9420d285e1aee938c7d9acbafc8e160186dbaf7b" - integrity sha512-Szoh+R/Ll68QWAyQyZZpQzZQm2UPbxibDvaY8Xc9SUtYgPsDzx5AWSk++UUt2hJuow8mvwR+rG+LQLw+KsuAKA== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is "^5.0.0" - unist-util-visit-parents "^4.0.0" - -unist-util-visit@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-4.0.0.tgz#6e1f7e8e163921d20281354c38bfd3244b64580a" - integrity sha512-3HWTvrtU10/E7qgPznBfiOyG0TXj9W8c1GSfaI8L9GkaG1pLePiQPZ7E35a0R3ToQ/zcy4Im6aZ9WBgOTnv1MQ== - dependencies: - "@types/unist" "^2.0.0" - unist-util-is "^5.0.0" - unist-util-visit-parents "^5.0.0" - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -upath@^1.1.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" - integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== - -uri-js@^4.2.2: - version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" - integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - dependencies: - punycode "^2.1.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= - -url-loader@4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-4.1.1.tgz#28505e905cae158cf07c92ca622d7f237e70a4e2" - integrity sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA== - dependencies: - loader-utils "^2.0.0" - mime-types "^2.1.27" - schema-utils "^3.0.0" - -url@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64" - integrity sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ= - dependencies: - punycode "1.3.2" - querystring "0.2.0" - -url@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= - dependencies: - punycode "1.3.2" - querystring "0.2.0" - -use@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ== - -user-home@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" - integrity sha1-K1viOjK2Onyd640PKNSFcko98ZA= - -utf-8-validate@^5.0.1: - version "5.0.5" - resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.5.tgz#dd32c2e82c72002dc9f02eb67ba6761f43456ca1" - integrity sha512-+pnxRYsS/axEpkrrEpzYfNZGXp0IjC/9RIxwM5gntY4Koi8SHmUGSfxfWqxZdRxrtaoVstuOzUp/rbs3JSPELQ== - dependencies: - node-gyp-build "^4.2.0" - -util-deprecate@^1.0.1, util-deprecate@^1.0.2, 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.promisify@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030" - integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA== - dependencies: - define-properties "^1.1.2" - object.getownpropertydescriptors "^2.0.3" - -util@0.10.3: - version "0.10.3" - resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= - dependencies: - inherits "2.0.1" - -util@^0.11.0: - version "0.11.1" - resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61" - integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ== - dependencies: - inherits "2.0.3" - -util@^0.12.3: - version "0.12.4" - resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" - integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw== - dependencies: - inherits "^2.0.3" - is-arguments "^1.0.4" - is-generator-function "^1.0.7" - is-typed-array "^1.1.3" - safe-buffer "^5.1.2" - which-typed-array "^1.1.2" - -utila@~0.4: - version "0.4.0" - resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" - integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw= - -utils-merge@1.0.1, utils-merge@1.x.x: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= - -uuid@3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" - integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== - -uuid@^3.0.0, uuid@^3.3.2, uuid@^3.3.3: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - -uuid@^8.0.0: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" - integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== - -v8flags@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4" - integrity sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ= - dependencies: - user-home "^1.1.1" - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -validator@^10.11.0: - version "10.11.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-10.11.0.tgz#003108ea6e9a9874d31ccc9e5006856ccd76b228" - integrity sha512-X/p3UZerAIsbBfN/IwahhYaBbY68EN/UQBWHtsbXGT5bfrH/p4NQzUCG1kF/rtKaNpnJ7jAu6NGTdSNtyNIXMw== - -validator@^13.0.0: - version "13.6.0" - resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059" - integrity sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg== - -validator@~9.4.1: - version "9.4.1" - resolved "https://registry.yarnpkg.com/validator/-/validator-9.4.1.tgz#abf466d398b561cd243050112c6ff1de6cc12663" - integrity sha512-YV5KjzvRmSyJ1ee/Dm5UED0G+1L4GZnLN3w6/T+zZm8scVua4sOhYKWTUrKa0H/tMiJyO9QLHMPN+9mB/aMunA== - -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= - -vasync@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/vasync/-/vasync-2.2.0.tgz#cfde751860a15822db3b132bc59b116a4adaf01b" - integrity sha1-z951GGChWCLbOxMrxZsRakra8Bs= - dependencies: - verror "1.10.0" - -velocity-animate@1.5.2: - version "1.5.2" - resolved "https://registry.yarnpkg.com/velocity-animate/-/velocity-animate-1.5.2.tgz#5a351d75fca2a92756f5c3867548b873f6c32105" - integrity sha512-m6EXlCAMetKztO1ppBhGU1/1MR3IiEevO6ESq6rcrSQ3Q77xYSW13jkfXW88o4xMrkXJhy/U7j4wFR/twMB0Eg== - -vendors@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" - integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== - -verror@1.10.0, verror@^1.8.1: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -vfile-location@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-4.0.1.tgz#06f2b9244a3565bef91f099359486a08b10d3a95" - integrity sha512-JDxPlTbZrZCQXogGheBHjbRWjESSPEak770XwWPfw5mTc1v1nWGLB/apzZxsx8a0SJVfF8HK8ql8RD308vXRUw== - dependencies: - "@types/unist" "^2.0.0" - vfile "^5.0.0" - -vfile-message@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-3.0.2.tgz#db7eaebe7fecb853010f2ef1664427f52baf8f74" - integrity sha512-UUjZYIOg9lDRwwiBAuezLIsu9KlXntdxwG+nXnjuQAHvBpcX3x0eN8h+I7TkY5nkCXj+cWVp4ZqebtGBvok8ww== - dependencies: - "@types/unist" "^2.0.0" - unist-util-stringify-position "^3.0.0" - -vfile-reporter@^7.0.0: - version "7.0.2" - resolved "https://registry.yarnpkg.com/vfile-reporter/-/vfile-reporter-7.0.2.tgz#2b3bfafb428581e72073c4337acdf82912385356" - integrity sha512-1bYxpyhl8vhAICiKR59vYyZHIOWsF7P1nV6xjaz3ZWAyOQDQhR4DjlOZo14+PiV9oLEWIrolvGHs0/2Bnaw5Vw== - dependencies: - "@types/supports-color" "^8.0.0" - string-width "^5.0.0" - supports-color "^9.0.0" - unist-util-stringify-position "^3.0.0" - vfile-sort "^3.0.0" - vfile-statistics "^2.0.0" - -vfile-sort@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/vfile-sort/-/vfile-sort-3.0.0.tgz#ee13d3eaac0446200a2047a3b45d78fad6b106e6" - integrity sha512-fJNctnuMi3l4ikTVcKpxTbzHeCgvDhnI44amA3NVDvA6rTC6oKCFpCVyT5n2fFMr3ebfr+WVQZedOCd73rzSxg== - dependencies: - vfile-message "^3.0.0" - -vfile-statistics@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/vfile-statistics/-/vfile-statistics-2.0.0.tgz#f04ee3e3c666809a3c10c06021becd41ea9c8037" - integrity sha512-foOWtcnJhKN9M2+20AOTlWi2dxNfAoeNIoxD5GXcO182UJyId4QrXa41fWrgcfV3FWTjdEDy3I4cpLVcQscIMA== - dependencies: - vfile-message "^3.0.0" - -vfile@^5.0.0, vfile@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/vfile/-/vfile-5.1.0.tgz#18e78016f0f71e98d737d40f0fca921dc264a600" - integrity sha512-4o7/DJjEaFPYSh0ckv5kcYkJTHQgCKdL8ozMM1jLAxO9ox95IzveDPXCZp08HamdWq8JXTkClDvfAKaeLQeKtg== - dependencies: - "@types/unist" "^2.0.0" - is-buffer "^2.0.0" - unist-util-stringify-position "^3.0.0" - vfile-message "^3.0.0" - -visibilityjs@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/visibilityjs/-/visibilityjs-2.0.2.tgz#d7c466e922024bb6c413d2136d5567e71f5fdc2f" - integrity sha512-y5sN5oGvuXXcK6s8WupOymRcqEss7kusojpScRqkT+cTCIFjul+06uSMDPMByN9DIBv/sUUnvV8BplKjqelAfw== - -viz.js@1.8.2: - version "1.8.2" - resolved "https://registry.yarnpkg.com/viz.js/-/viz.js-1.8.2.tgz#d9cc04cd99f98ec986bf9054db76a6cbcdc5d97a" - integrity sha512-W+1+N/hdzLpQZEcvz79n2IgUE9pfx6JLdHh3Kh8RGvLL8P1LdJVQmi2OsDcLdY4QVID4OUy+FPelyerX0nJxIQ== - -vm-browserify@^1.0.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" - integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== - -watchpack-chokidar2@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz#38500072ee6ece66f3769936950ea1771be1c957" - integrity sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww== - dependencies: - chokidar "^2.1.8" - -watchpack@^1.7.4: - version "1.7.5" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" - integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== - dependencies: - graceful-fs "^4.1.2" - neo-async "^2.5.0" - optionalDependencies: - chokidar "^3.4.1" - watchpack-chokidar2 "^2.0.1" - -web-encoding@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/web-encoding/-/web-encoding-1.1.5.tgz#fc810cf7667364a6335c939913f5051d3e0c4864" - integrity sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA== - dependencies: - util "^0.12.3" - optionalDependencies: - "@zxing/text-encoding" "0.9.0" - -web-namespaces@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.0.tgz#1f6a2d7b5823329abaedeb6bdf09ef2fed35db13" - integrity sha512-dE7ELZRVWh0ceQsRgkjLgsAvwTuv3kcjSY/hLjqL0llleUlQBDjE9JkB9FCBY5F2mnFEwiyJoowl8+NVGHe8dw== - -webfontloader@~1.6.x: - version "1.6.28" - resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae" - integrity sha1-23hhKSU8tujq5UwvsF+HCvZnW64= - -webpack-cli@4.8.0: - version "4.8.0" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz#5fc3c8b9401d3c8a43e2afceacfa8261962338d1" - integrity sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw== - dependencies: - "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.0.4" - "@webpack-cli/info" "^1.3.0" - "@webpack-cli/serve" "^1.5.2" - colorette "^1.2.1" - commander "^7.0.0" - execa "^5.0.0" - fastest-levenshtein "^1.0.12" - import-local "^3.0.2" - interpret "^2.2.0" - rechoir "^0.7.0" - v8-compile-cache "^2.2.0" - webpack-merge "^5.7.3" - -webpack-merge@5.8.0, webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - -webpack-sources@^2.2.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd" - integrity sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA== - dependencies: - source-list-map "^2.0.1" - source-map "^0.6.1" - -webpack@4.46.0: - version "4.46.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542" - integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q== - dependencies: - "@webassemblyjs/ast" "1.9.0" - "@webassemblyjs/helper-module-context" "1.9.0" - "@webassemblyjs/wasm-edit" "1.9.0" - "@webassemblyjs/wasm-parser" "1.9.0" - acorn "^6.4.1" - ajv "^6.10.2" - ajv-keywords "^3.4.1" - chrome-trace-event "^1.0.2" - enhanced-resolve "^4.5.0" - eslint-scope "^4.0.3" - json-parse-better-errors "^1.0.2" - loader-runner "^2.4.0" - loader-utils "^1.2.3" - memory-fs "^0.4.1" - micromatch "^3.1.10" - mkdirp "^0.5.3" - neo-async "^2.6.1" - node-libs-browser "^2.2.1" - schema-utils "^1.0.0" - tapable "^1.1.3" - terser-webpack-plugin "^1.4.3" - watchpack "^1.7.4" - webpack-sources "^1.4.1" - -which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" - integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== - dependencies: - is-bigint "^1.0.1" - is-boolean-object "^1.1.0" - is-number-object "^1.0.4" - is-string "^1.0.5" - is-symbol "^1.0.3" - -which-collection@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.1.tgz#70eab71ebbbd2aefaf32f917082fc62cdcb70906" - integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A== - dependencies: - is-map "^2.0.1" - is-set "^2.0.1" - is-weakmap "^2.0.1" - is-weakset "^2.0.1" - -which-typed-array@^1.1.2: - version "1.1.7" - resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.7.tgz#2761799b9a22d4b8660b3c1b40abaa7739691793" - integrity sha512-vjxaB4nfDqwKI0ws7wZpxIlde1XrLX5uB0ZjpfshgmapJMD7jJWhZI+yToJTqaFByF0eNBcYxbjmCzoRP7CfEw== - dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" - es-abstract "^1.18.5" - foreach "^2.0.5" - has-tostringtag "^1.0.0" - is-typed-array "^1.1.7" - -which@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.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== - dependencies: - isexe "^2.0.0" - -wide-align@1.1.3, wide-align@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" - integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== - dependencies: - string-width "^1.0.2 || 2" - -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== - -winston-transport@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.4.0.tgz#17af518daa690d5b2ecccaa7acf7b20ca7925e59" - integrity sha512-Lc7/p3GtqtqPBYYtS6KCN3c77/2QCev51DvcJKbkFPQNoj1sinkGwLGFDxkXY9J6p9+EPnYs+D90uwbnaiURTw== - dependencies: - readable-stream "^2.3.7" - triple-beam "^1.2.0" - -winston@^3.1.0: - version "3.3.3" - resolved "https://registry.yarnpkg.com/winston/-/winston-3.3.3.tgz#ae6172042cafb29786afa3d09c8ff833ab7c9170" - integrity sha512-oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw== - dependencies: - "@dabh/diagnostics" "^2.0.2" - async "^3.1.0" - is-stream "^2.0.0" - logform "^2.2.0" - one-time "^1.0.0" - readable-stream "^3.4.0" - stack-trace "0.0.x" - triple-beam "^1.3.0" - winston-transport "^4.4.0" - -wkx@^0.4.8: - version "0.4.8" - resolved "https://registry.yarnpkg.com/wkx/-/wkx-0.4.8.tgz#a092cf088d112683fdc7182fd31493b2c5820003" - integrity sha512-ikPXMM9IR/gy/LwiOSqWlSL3X/J5uk9EO2hHNRXS41eTLXaUFEVw9fn/593jW/tE5tedNg8YjT5HkCa4FqQZyQ== - dependencies: - "@types/node" "*" - -word-wrap@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== - -worker-farm@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" - integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== - dependencies: - errno "~0.1.7" - -workerpool@6.1.5: - version "6.1.5" - resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581" - integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw== - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -ws@~7.4.2: - version "7.4.6" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c" - integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== - -wurl@2.5.4: - version "2.5.4" - resolved "https://registry.yarnpkg.com/wurl/-/wurl-2.5.4.tgz#6af35a6c623296c4a0c607c4651d01b8f4e3fdec" - integrity sha512-Vuo550m5YbqRcM/69zz3jVNsCUvFTWLRYQcYvnqNWQ4d0Bjg7aoaofbcsPTe4rM9A2/4xjd8uIf9viIUV9EMXQ== - -xml-crypto@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.3.tgz#6a7272b610ea3e4ea7f13e9e4876f1b20cbc32c8" - integrity sha512-MpXZwnn9JK0mNPZ5mnFIbNnQa+8lMGK4NtnX2FlJMfMWR60sJdFO9X72yO6ji068pxixzk53O7x0/iSKh6IhyQ== - dependencies: - "@xmldom/xmldom" "^0.7.0" - xpath "0.0.32" - -xml-encryption@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/xml-encryption/-/xml-encryption-1.3.0.tgz#4cad44a59bf8bdec76d7865ce0b89e13c09962f4" - integrity sha512-3P8C4egMMxSR1BmsRM+fG16a3WzOuUEQKS2U4c3AZ5v7OseIfdUeVkD8dwxIhuLryFZSRWUL5OP6oqkgU7hguA== - dependencies: - "@xmldom/xmldom" "^0.7.0" - escape-html "^1.0.3" - node-forge "^0.10.0" - xpath "0.0.32" - -xml2js@0.2.8: - version "0.2.8" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.2.8.tgz#9b81690931631ff09d1957549faf54f4f980b3c2" - integrity sha1-m4FpCTFjH/CdGVdUn69U9PmAs8I= - dependencies: - sax "0.5.x" - -xml2js@0.4.19: - version "0.4.19" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7" - integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q== - dependencies: - sax ">=0.6.0" - xmlbuilder "~9.0.1" - -xml2js@^0.4.15, xml2js@^0.4.23: - version "0.4.23" - resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66" - integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug== - dependencies: - sax ">=0.6.0" - xmlbuilder "~11.0.0" - -xml@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5" - integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU= - -xmlbuilder@^15.1.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" - integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== - -xmlbuilder@^9.0.7, xmlbuilder@~9.0.1: - version "9.0.7" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d" - integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0= - -xmlbuilder@~11.0.0: - version "11.0.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" - integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA== - -xmldom@0.1.x: - version "0.1.31" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff" - integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ== - -xmlhttprequest-ssl@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6" - integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q== - -xmlhttprequest@>=1.5.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" - integrity sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw= - -xpath@0.0.32: - version "0.0.32" - resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.32.tgz#1b73d3351af736e17ec078d6da4b8175405c48af" - integrity sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw== - -xss@^1.0.3: - version "1.0.9" - resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.9.tgz#3ffd565571ff60d2e40db7f3b80b4677bec770d2" - integrity sha512-2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ== - dependencies: - commander "^2.20.3" - cssfilter "0.0.10" - -xtend@^4.0.0, xtend@~4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" - integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - -xtraverse@0.1.x: - version "0.1.0" - resolved "https://registry.yarnpkg.com/xtraverse/-/xtraverse-0.1.0.tgz#b741bad018ef78d8a9d2e83ade007b3f7959c732" - integrity sha1-t0G60BjveNip0ug63gB7P3lZxzI= - dependencies: - xmldom "0.1.x" - -y18n@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" - integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= - -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: - 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== - -yaml@^1.10.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" - integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== - -yargs-parser@20.2.4: - version "20.2.4" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54" - integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA== - -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-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" - -yeast@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" - integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= - -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== - -zip-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79" - integrity sha512-zshzwQW7gG7hjpBlgeQP9RuyPGNxvJdzR8SUM3QhxCnLjWN2E7j3dOvpeDcQoETfHx0urRS7EtmVToql7YpU4A== - dependencies: - archiver-utils "^2.1.0" - compress-commons "^4.1.0" - readable-stream "^3.6.0" - -zwitch@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.2.tgz#91f8d0e901ffa3d66599756dde7f57b17c95dce1" - integrity sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA== diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json index 934cccd205..82b496f1bb 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.16.4", + "version": "0.16.6", "author": "Dessalines ", "license": "AGPL-3.0", "scripts": { @@ -34,7 +34,7 @@ "inferno-server": "^7.4.11", "isomorphic-cookie": "^1.2.4", "jwt-decode": "^3.1.2", - "markdown-it": "^13.0.0", + "markdown-it": "^13.0.1", "markdown-it-container": "^3.0.0", "markdown-it-footnote": "^3.0.3", "markdown-it-html5-embed": "^1.0.0", diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json index c22c821f5d..dbd90ace9f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/pin.json @@ -1,7 +1,7 @@ { - "version": "0.16.4", - "serverSha256": "sha256-xbxavlmRm7QTbrAjw6IMgQq8rEgyEHdcj11EhsOY+j0=", - "serverCargoSha256": "sha256-vDIaLpw0C6fnv0quH20qRN0I38Br338+MS9YzVfNizU=", - "uiSha256": "sha256-GZH/fSYLbxwigrr5LwAzxH4ElDVjTs8Tqqq+xYDFNCU", - "uiYarnDepsSha256": "sha256-BQs9UXUT/CcxJ7CdLksYGvGPGAaW7FLUAShLsbPC0jw=" + "version": "0.16.6", + "serverSha256": "sha256-nDmwn3moDFJtYNx/FY3uSpxCwE4Ni4udqF3MX3MNyYM=", + "serverCargoSha256": "sha256-f86UE7aVciHaTsK/jzABHEXBh2Pn6ErRBb52lW/f+1E=", + "uiSha256": "sha256-ZfD9QaycvjlFlbZNcMEf2bcrszYn8TWuPDYEhW+gITE=", + "uiYarnDepsSha256": "sha256-2NiDuqAyZeNn3c3XDeP2m5hHej4w4/gcabxfHgC8PV4=" } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix index 52dddc8183..65425eb96a 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/server.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { description = "🐀 Building a federated alternative to reddit in rust"; homepage = "https://join-lemmy.org/"; license = licenses.agpl3Only; - maintainers = with maintainers; [ happysalada ]; + maintainers = with maintainers; [ happysalada billewanick ]; mainProgram = "lemmy_server"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.sh b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.sh index ebe46e97a2..2df3f9e88d 100755 --- a/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.sh +++ b/third_party/nixpkgs/pkgs/servers/web-apps/lemmy/update.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env nix-shell -#! nix-shell -i oil -p jq sd nix-prefetch-github ripgrep moreutils +#! /usr/bin/env nix-shell +#! nix-shell -i oil -p oil jq sd nix-prefetch-github ripgrep moreutils # TODO set to `verbose` or `extdebug` once implemented in oil shopt --set xtrace diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix index aa371223cf..57b70abe46 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "4.5.0"; - sha256 = "sha256-OyjdzY+ENYxOTVjDLjj2unJbpaGODIH2I5Acmt45HDA="; + version = "4.10.1"; + sha256 = "sha256-TN2xy3YHhtuewmi7h9vtMKElRI8uWOvnYzG1RlIGT3U="; }; matomo-beta = { - version = "4.6.0"; + version = "4.11.0"; # `beta` examples: "b1", "rc1", null # when updating: use null if stable version is >= latest beta or release candidate - beta = "b2"; - sha256 = "sha256-7p/ZPtr5a/tBjrM27ILF3rNfxDIWuzWKCXNom3HlyL8="; + beta = "rc2"; + sha256 = "sha256-PYzv4OJYI4Zf7LMXQvX7fhvXryS6XPbmA0pTesF1vQ8="; }; }; common = pname: { version, sha256, beta ? null }: diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix index 2339c170f1..05175d8023 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/mediawiki/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "mediawiki"; - version = "1.37.2"; + version = "1.38.2"; - src = with lib; fetchurl { - url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-WD8HS8r87BfaUBQqVvW7/eXDNml31h2RLX5W/Mo72hs="; + src = fetchurl { + url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; + sha256 = "sha256-aX6zvb8x0JgQBmEzzHtcotlinHfuphzhagW8mXA9U6Y="; }; - prePatch = '' + postPatch = '' sed -i 's|$vars = Installer::getExistingLocalSettings();|$vars = null;|' includes/installer/CliInstaller.php ''; - phpConfig = writeText "LocalSettings.php" '' - - ''; - - installPhase = '' + installPhase = let + phpConfig = writeText "LocalSettings.php" '' + + ''; + in '' runHook preInstall mkdir -p $out/share/mediawiki @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = "https://www.mediawiki.org/"; platforms = platforms.all; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ ] ++ teams.c3d2.members; }; } diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix index 084c658321..c0bff844a2 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/netbox/default.nix @@ -17,13 +17,13 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "3.2.3"; + version = "3.2.7"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-mMTZKlGVjFPGJI4Ky+V3lPuMYS7tJb+zeDEzMeXdGoU="; + sha256 = "sha256-NIyAZZrq/Io8VyEG0TE5C3ugq+MPraJ45hi0Vx/b1OQ="; }; format = "other"; @@ -35,6 +35,7 @@ py.pkgs.buildPythonApplication rec { ]; propagatedBuildInputs = with py.pkgs; [ + bleach django_4 django-cors-headers django-debug-toolbar @@ -55,11 +56,11 @@ py.pkgs.buildPythonApplication rec { jinja2 markdown markdown-include - mkdocs-material netaddr pillow psycopg2 pyyaml + sentry-sdk social-auth-core social-auth-app-django svgwrite @@ -67,6 +68,22 @@ py.pkgs.buildPythonApplication rec { jsonschema ] ++ extraBuildInputs; + buildInputs = with py.pkgs; [ + mkdocs-material + mkdocs-material-extensions + mkdocstrings + mkdocstrings-python + ]; + + nativeBuildInputs = [ + py.pkgs.mkdocs + ]; + + postBuild = '' + PYTHONPATH=$PYTHONPATH:netbox/ + python -m mkdocs build + ''; + installPhase = '' mkdir -p $out/opt/netbox cp -r . $out/opt/netbox diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/nifi/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/nifi/default.nix index b53b53aaf5..fafff02010 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/nifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/nifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nifi"; - version = "1.16.1"; + version = "1.16.3"; src = fetchurl { - url = "https://dlcdn.apache.org/nifi/${version}/nifi-${version}-bin.tar.gz"; - sha256 = "sha256-wC+oKq8QGEKuD6B22Ny92NK0z3SBKmRoTEit3vAXJQs="; + url = "https://archive.apache.org/dist/nifi/${version}/nifi-${version}-bin.tar.gz"; + sha256 = "sha256-57ZtgK1Z8G/nX2rtf7osmymvE4RukGi7CIvCvRQNKuE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix index 89398a9edb..70cf53e725 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/rss-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2022-01-20"; + version = "2022-06-14"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "sha256-wQW6U24TMnRxQ9zxdq8cMzO0OGX/re065YDhl1AbwO8="; + sha256 = "sha256-yH+m65CIZokZSbnv1zfpKC/Qr/mPPC6dG49Zn62X0l4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix index 5327b48d51..3d65fe4631 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/searx/default.nix @@ -70,6 +70,6 @@ toPythonModule (buildPythonApplication rec { homepage = "https://github.com/searx/searx"; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc fpletz globin danielfullmer ]; + maintainers = with maintainers; [ matejc globin danielfullmer ]; }; }) diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix index 937f0ac48c..0ea20aca1f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix @@ -1,18 +1,17 @@ { lib , python3 -, python3Packages , fetchFromGitHub }: -python3Packages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "searxng"; - version = "unstable-2022-06-29"; + version = "unstable-2022-07-15"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "107006515ee9fe9cad9a6f6387db658953d32486"; - sha256 = "sha256-uV5XiOVuES9wuBx9S8WhM8jhuxRHlSMvW5Ki8WlDwfM="; + rev = "7bf4e8d12d1d0ee53bf71f7c3a4010ef936f25d9"; + sha256 = "sha256-Fuv9AoV9WnI6qMgj4Ve016RF8gaLXYgw89jRROcm/A8="; }; postPatch = '' @@ -23,7 +22,7 @@ python3Packages.buildPythonApplication rec { export SEARX_DEBUG="true"; ''; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python3.pkgs; [ babel certifi python-dateutil @@ -33,7 +32,6 @@ python3Packages.buildPythonApplication rec { jinja2 langdetect lxml - h2 pygments pyyaml redis @@ -42,7 +40,8 @@ python3Packages.buildPythonApplication rec { httpx httpx-socks markdown-it-py - ]; + ] ++ httpx.optional-dependencies.http2 + ++ httpx-socks.optional-dependencies.asyncio; # tests try to connect to network doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix index 0f0c03a595..8023da7747 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, lib, fetchFromGitHub, dataDir ? "/var/lib/snipe-it" }: +{ pkgs, stdenv, lib, fetchFromGitHub, dataDir ? "/var/lib/snipe-it", mariadb }: let package = (import ./composition.nix { @@ -13,18 +13,19 @@ let ln -s ${dataDir}/public/uploads $out/public/uploads ln -s ${dataDir}/bootstrap/cache $out/bootstrap/cache chmod +x $out/artisan + substituteInPlace config/database.php --replace "env('DB_DUMP_PATH', '/usr/local/bin')" "env('DB_DUMP_PATH', '${mariadb}/bin')" ''; }); in package.override rec { pname = "snipe-it"; - version = "6.0.7"; + version = "6.0.8"; src = fetchFromGitHub { owner = "snipe"; repo = pname; rev = "v${version}"; - sha256 = "09jvkz7j2qb79mjnyrz75015xpgf8l483yha3ma14pzk4pibn620"; + sha256 = "01pjrx1x4xy05k292mx3w0vw9q565jg2n80hma2ajw3iknmyk91k"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix index f94436c1f3..94672ffe6f 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix @@ -1,27 +1,24 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests -, oath-toolkit }: +, oath-toolkit +, enableActiveSync ? false +, libwbxml }: gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "5.5.0"; + version = "5.7.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "1kyfn3qw299qsyivbrm487h68va99rrb3gmhpgjpwqd2xdg9aypk"; + hash = "sha256-3Xy0y1sdixy4gXhzhP9mfWeaDmOVJty+X95xCyxayPE="; }; nativeBuildInputs = [ gnustep.make makeWrapper python3 ]; - buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ]; + buildInputs = [ gnustep.base sope openssl libmemcached curl libsodium libytnef libzip pkg-config openldap oath-toolkit ] + ++ lib.optional enableActiveSync libwbxml; - patches = [ - # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches - (fetchpatch { - url = "https://salsa.debian.org/debian/sogo/-/raw/120ac6390602c811908c7fcb212a79acbc7f7f28/debian/patches/0005-Remove-build-date.patch"; - sha256 = "151i8504kwdlcirgd0pbif7cxnb1q6jsp5j7dbh9p6zw2xgwkp25"; - }) - ]; + patches = lib.optional enableActiveSync ./enable-activesync.patch; postPatch = '' # Exclude NIX_ variables @@ -68,6 +65,8 @@ gnustep.stdenv.mkDerivation rec { for bin in $out/bin/*; do wrapProgram $bin --prefix LD_LIBRARY_PATH : $out/lib/sogo --prefix GNUSTEP_CONFIG_FILE : $out/share/GNUstep/GNUstep.conf done + + rmdir $out/nix ''; passthru.tests.sogo = nixosTests.sogo; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/enable-activesync.patch b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/enable-activesync.patch new file mode 100644 index 0000000000..2c2aba26a2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/enable-activesync.patch @@ -0,0 +1,21 @@ +--- a/ActiveSync/NSData+ActiveSync.m ++++ b/ActiveSync/NSData+ActiveSync.m +@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #import + #import + +-#include ++#include + + #define WBXMLDEBUG 0 + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -11,6 +11,7 @@ SUBPROJECTS = \ + UI \ + Tools \ + Tests/Unit \ ++ ActiveSync \ + + + include $(GNUSTEP_MAKEFILES)/aggregate.make diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix index 64ea04d1ef..c78459936c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/api.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "vikunja-api"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitea { domain = "kolaente.dev"; owner = "vikunja"; repo = "api"; rev = "v${version}"; - sha256 = "sha256-ngdtK8e4mLpbuY9OP1aHk99qPX/cKwnyhb/3ImTwF6M="; + sha256 = "sha256-1BxkQFiAqH+n8yzQn0+5cd/Z6oEBbGuK1pu1qt8CUbk="; }; nativeBuildInputs = @@ -24,7 +24,7 @@ buildGoModule rec { ''; in [ fakeGit mage ]; - vendorSha256 = "sha256-0MP04KpWX17Fa1WhLwF4yzIsDqGAeTUXxv81B+BTNe4="; + vendorSha256 = "fzk22B7KpXfGS+8GF6J3ydmFyvP7oelRuiF+IveYdg4="; # checks need to be disabled because of needed internet for some checks doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix index 161a65fa66..b46241931c 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/vikunja/frontend.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "vikunja-frontend"; - version = "0.18.1"; + version = "0.19.0"; src = fetchurl { url = "https://dl.vikunja.io/frontend/${pname}-${version}.zip"; - sha256 = "sha256-u4XA6Jqn+p2J0sB2KabwZY/lFwZakZEvUUh/enrhtN4="; + sha256 = "sha256-pdUNPfGgbSMyXcS2HKMekIiIzJ3GutHCs0gFVkHN9yc="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch b/third_party/nixpkgs/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch deleted file mode 100644 index e20acdb04a..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/virtlyst/add-admin-password-env.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/virtlyst.cpp b/src/virtlyst.cpp -index acd195d..8809e4f 100644 ---- a/src/virtlyst.cpp -+++ b/src/virtlyst.cpp -@@ -340,7 +340,8 @@ bool Virtlyst::createDB() - qCCritical(VIRTLYST) << "Error creating database" << query.lastError().text(); - return false; - } -- const QString password = QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex()); -+ const QString password = qEnvironmentVariable("VIRTLYST_ADMIN_PASSWORD", -+ QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex())); - query.bindValue(QStringLiteral(":password"), QString::fromLatin1( - CredentialPassword::createPassword(password.toUtf8(), QCryptographicHash::Sha256, 10000, 16, 16))); - if (!query.exec()) { diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix deleted file mode 100644 index d6a72916fa..0000000000 --- a/third_party/nixpkgs/pkgs/servers/web-apps/virtlyst/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, autoPatchelfHook -, qtbase, libvirt, cutelyst, grantlee }: - -stdenv.mkDerivation rec { - pname = "virtlyst"; - version = "1.2.0"; - - src = fetchFromGitHub { - owner = "cutelyst"; - repo = "Virtlyst"; - rev = "v${version}"; - sha256 = "1vgjai34hqppkpl0ryxkyhpm9dsx1chs3bii3wc3h40hl80n6dgy"; - }; - - nativeBuildInputs = [ cmake pkg-config autoPatchelfHook ]; - buildInputs = [ qtbase libvirt cutelyst grantlee ]; - - dontWrapQtApps = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - cp src/libVirtlyst${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib - cp -r ../root $out - - runHook postInstall - ''; - - patches = [ ./add-admin-password-env.patch ]; - - meta = with lib; { - description = "Web interface to manage virtual machines with libvirt"; - homepage = "https://github.com/cutelyst/Virtlyst"; - license = licenses.agpl3Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix index 0f47ec0dca..cf11bcf929 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wallabag/default.nix @@ -15,7 +15,7 @@ let pname = "wallabag"; - version = "2.5.0"; + version = "2.5.1"; in stdenv.mkDerivation { inherit pname version; @@ -23,7 +23,7 @@ stdenv.mkDerivation { # GitHub distribution does not include vendored files src = fetchurl { url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz"; - hash = "sha256-fE/4bVwImQ03wrfdrx6AlulO2xU1M2HIaSOGpTAb02E="; + hash = "sha256-vurjWI5Sh/SFPtxd5cHaaw7edcAzNub/duhOUF+Wshk="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix index 41b42f3762..cc13317b0b 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "6.0"; + version = "6.0.1"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-GIfzIj2wHW2Ijfd+oLO43eTGJDlhprSG0b7hvpMkvwg="; + sha256 = "sha256-9nhZaASqidfNySgIYpOEZOqyWurr/vqRrhdeFao+8FQ="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/webdav/default.nix b/third_party/nixpkgs/pkgs/servers/webdav/default.nix index 4a3aca9f6e..35744ba6e3 100644 --- a/third_party/nixpkgs/pkgs/servers/webdav/default.nix +++ b/third_party/nixpkgs/pkgs/servers/webdav/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "webdav"; - version = "4.1.1"; + version = "4.2.0"; src = fetchFromGitHub { owner = "hacdias"; repo = "webdav"; rev = "v${version}"; - sha256 = "0jnh1bhc98vcx2vm6hmgak6zwfc0rx898qcdjcca5y9dni4120aq"; + sha256 = "sha256-4rgDO1vItmmCRXRiO24MPa9IPzrsfzCWLH6hl6oKkxk="; }; - vendorSha256 = "19nhz6z8h4fxpy4gjx7zz69si499jak7qj9yb17x32lar5m88gvb"; + vendorSha256 = "sha256-az+EasmKitFPWD5JfKaSKZGok/n/dPmIv90RiL750KY="; meta = with lib; { description = "Simple WebDAV server"; diff --git a/third_party/nixpkgs/pkgs/servers/wishlist/default.nix b/third_party/nixpkgs/pkgs/servers/wishlist/default.nix index 942dd7aa96..33d63417d5 100644 --- a/third_party/nixpkgs/pkgs/servers/wishlist/default.nix +++ b/third_party/nixpkgs/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-J9Wd2CyQo8vzfE2jXQzbNA+oihG71F3ZQmEW/r0a72I=1"; + sha256 = "sha256-Q2/F4/bPhPmwkbc7dulx4jubwdwiwVWMNBclO2qf8rU="; }; - vendorSha256 = "sha256-5+wuavHLXwjtvwA9tSpdF2Zd8tw5FklzvaTeCZlA4WQ="; + vendorSha256 = "sha256-gmLPMar3ICZ14uxahQPkruKUoZbnvYAdu5IfO2pNEXM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix index fa07f437d7..ef5b58787f 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -15,6 +15,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -30,6 +31,7 @@ lib.makeScope newScope (self: with self; { sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -45,6 +47,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw xbitmaps libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -60,6 +63,7 @@ lib.makeScope newScope (self: with self; { sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -75,13 +79,14 @@ lib.makeScope newScope (self: with self; { sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobe100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-adobe-100dpi"; version = "1.0.3"; builder = ./builder.sh; @@ -90,14 +95,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobe75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-adobe-75dpi"; version = "1.0.3"; builder = ./builder.sh; @@ -106,14 +112,15 @@ lib.makeScope newScope (self: with self; { sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-adobe-utopia-100dpi"; version = "1.0.4"; builder = ./builder.sh; @@ -122,14 +129,15 @@ lib.makeScope newScope (self: with self; { sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontadobeutopia75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-adobe-utopia-75dpi"; version = "1.0.4"; builder = ./builder.sh; @@ -138,14 +146,15 @@ lib.makeScope newScope (self: with self; { sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontadobeutopiatype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-adobe-utopia-type1"; version = "1.0.4"; builder = ./builder.sh; @@ -154,8 +163,9 @@ lib.makeScope newScope (self: with self; { sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; @@ -170,13 +180,14 @@ lib.makeScope newScope (self: with self; { sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontarabicmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-arabic-misc"; version = "1.0.3"; builder = ./builder.sh; @@ -185,14 +196,15 @@ lib.makeScope newScope (self: with self; { sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbh100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-100dpi"; version = "1.0.3"; builder = ./builder.sh; @@ -201,14 +213,15 @@ lib.makeScope newScope (self: with self; { sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbh75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-75dpi"; version = "1.0.3"; builder = ./builder.sh; @@ -217,14 +230,15 @@ lib.makeScope newScope (self: with self; { sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-lucidatypewriter-100dpi"; version = "1.0.3"; builder = ./builder.sh; @@ -233,14 +247,15 @@ lib.makeScope newScope (self: with self; { sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontbhlucidatypewriter75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-lucidatypewriter-75dpi"; version = "1.0.3"; builder = ./builder.sh; @@ -249,14 +264,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbhttf = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-ttf"; version = "1.0.3"; builder = ./builder.sh; @@ -265,14 +281,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbhtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-bh-type1"; version = "1.0.3"; builder = ./builder.sh; @@ -281,14 +298,15 @@ lib.makeScope newScope (self: with self; { sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbitstream100dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bitstream-100dpi"; version = "1.0.3"; builder = ./builder.sh; @@ -297,14 +315,15 @@ lib.makeScope newScope (self: with self; { sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontbitstream75dpi = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-bitstream-75dpi"; version = "1.0.3"; builder = ./builder.sh; @@ -313,14 +332,15 @@ lib.makeScope newScope (self: with self; { sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontbitstreamtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-bitstream-type1"; version = "1.0.3"; builder = ./builder.sh; @@ -329,14 +349,15 @@ lib.makeScope newScope (self: with self; { sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontcronyxcyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-cronyx-cyrillic"; version = "1.0.3"; builder = ./builder.sh; @@ -345,14 +366,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontcursormisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-cursor-misc"; version = "1.0.3"; builder = ./builder.sh; @@ -361,14 +383,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontdaewoomisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-daewoo-misc"; version = "1.0.3"; builder = ./builder.sh; @@ -377,14 +400,15 @@ lib.makeScope newScope (self: with self; { sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontdecmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-dec-misc"; version = "1.0.3"; builder = ./builder.sh; @@ -393,14 +417,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontibmtype1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-ibm-type1"; version = "1.0.3"; builder = ./builder.sh; @@ -409,14 +434,15 @@ lib.makeScope newScope (self: with self; { sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontisasmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-isas-misc"; version = "1.0.3"; builder = ./builder.sh; @@ -425,14 +451,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontjismisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-jis-misc"; version = "1.0.3"; builder = ./builder.sh; @@ -441,14 +468,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmicromisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-micro-misc"; version = "1.0.3"; builder = ./builder.sh; @@ -457,14 +485,15 @@ lib.makeScope newScope (self: with self; { sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmisccyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-misc-cyrillic"; version = "1.0.3"; builder = ./builder.sh; @@ -473,14 +502,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontmiscethiopic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-misc-ethiopic"; version = "1.0.3"; builder = ./builder.sh; @@ -489,14 +519,15 @@ lib.makeScope newScope (self: with self; { sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontmiscmeltho = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-misc-meltho"; version = "1.0.3"; builder = ./builder.sh; @@ -505,14 +536,15 @@ lib.makeScope newScope (self: with self; { sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontmiscmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-misc-misc"; version = "1.1.2"; builder = ./builder.sh; @@ -521,14 +553,15 @@ lib.makeScope newScope (self: with self; { sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontmuttmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-mutt-misc"; version = "1.0.3"; builder = ./builder.sh; @@ -537,14 +570,15 @@ lib.makeScope newScope (self: with self; { sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, fontutil, mkfontscale }: stdenv.mkDerivation { + fontschumachermisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-schumacher-misc"; version = "1.1.2"; builder = ./builder.sh; @@ -553,14 +587,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf fontutil mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontscreencyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-screen-cyrillic"; version = "1.0.4"; builder = ./builder.sh; @@ -569,14 +604,15 @@ lib.makeScope newScope (self: with self; { sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontsonymisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-sony-misc"; version = "1.0.3"; builder = ./builder.sh; @@ -585,14 +621,15 @@ lib.makeScope newScope (self: with self; { sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontsunmisc = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-sun-misc"; version = "1.0.3"; builder = ./builder.sh; @@ -601,8 +638,9 @@ lib.makeScope newScope (self: with self; { sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; @@ -617,6 +655,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0r1s43ypy0a9z6hzdq5y02s2acj965rax4flwdyylvc54ppv86qs"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc freetype xorgproto ]; meta.platforms = lib.platforms.unix; @@ -632,13 +671,14 @@ lib.makeScope newScope (self: with self; { sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, bdftopcf, mkfontscale }: stdenv.mkDerivation { + fontwinitzkicyrillic = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, bdftopcf, mkfontscale }: stdenv.mkDerivation { pname = "font-winitzki-cyrillic"; version = "1.0.3"; builder = ./builder.sh; @@ -647,14 +687,15 @@ lib.makeScope newScope (self: with self; { sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config bdftopcf mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; # THIS IS A GENERATED FILE. DO NOT EDIT! - fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, mkfontscale }: stdenv.mkDerivation { + fontxfree86type1 = callPackage ({ stdenv, pkg-config, fetchurl, fontutil, mkfontscale }: stdenv.mkDerivation { pname = "font-xfree86-type1"; version = "1.0.4"; builder = ./builder.sh; @@ -663,8 +704,9 @@ lib.makeScope newScope (self: with self; { sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config mkfontscale ]; - buildInputs = [ ]; + buildInputs = [ fontutil ]; configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ]; meta.platforms = lib.platforms.unix; }) {}; @@ -679,6 +721,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -694,6 +737,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE xorgproto ]; meta.platforms = lib.platforms.unix; @@ -709,6 +753,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; @@ -724,6 +769,7 @@ lib.makeScope newScope (self: with self; { sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; @@ -739,6 +785,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; @@ -754,6 +801,7 @@ lib.makeScope newScope (self: with self; { sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xtrans ]; meta.platforms = lib.platforms.unix; @@ -769,6 +817,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xtrans ]; meta.platforms = lib.platforms.unix; @@ -784,6 +833,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libuuid xorgproto xtrans ]; meta.platforms = lib.platforms.unix; @@ -799,6 +849,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; @@ -814,6 +865,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0v7aj8q3rlchdyfwdna7n7vgpyzyir391dlv5rwy9fxagbikbyhw"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libxcb xtrans ]; meta.platforms = lib.platforms.unix; @@ -829,6 +881,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; @@ -844,6 +897,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXt ]; meta.platforms = lib.platforms.unix; @@ -859,6 +913,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; @@ -874,6 +929,7 @@ lib.makeScope newScope (self: with self; { sha256 = "13kg59r3086383g1dyhnwxanhp2frssh9062mrgn34nzlf7gkbkn"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto libXmu libXpm libXt ]; meta.platforms = lib.platforms.unix; @@ -889,6 +945,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu libXpm xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -904,6 +961,7 @@ lib.makeScope newScope (self: with self; { sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes ]; meta.platforms = lib.platforms.unix; @@ -919,6 +977,7 @@ lib.makeScope newScope (self: with self; { sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes libXrender ]; meta.platforms = lib.platforms.unix; @@ -934,6 +993,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXfixes ]; meta.platforms = lib.platforms.unix; @@ -949,6 +1009,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; @@ -964,6 +1025,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; @@ -979,6 +1041,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0k2v4i4r24y3kdr5ici1qqhp69djnja919xfqp54c2rylm6s5hd7"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; @@ -994,6 +1057,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; meta.platforms = lib.platforms.unix; @@ -1009,6 +1073,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0gmm20p3qq23pd2bhc5rsxil60wqvj9xi7l1nh55q8gp3hhnyz5a"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc xorgproto freetype xtrans zlib ]; meta.platforms = lib.platforms.unix; @@ -1024,6 +1089,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1pdbr6gzfvixc791pjf42i9gg8wvfq6cpq6sdca04h4i42mxmpjp"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ fontconfig freetype libX11 xorgproto libXrender ]; meta.platforms = lib.platforms.unix; @@ -1039,6 +1105,7 @@ lib.makeScope newScope (self: with self; { sha256 = "005sicls6faddkcj449858i9xz1nafy70y26frsk7iv1d9283l9f"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXfixes ]; meta.platforms = lib.platforms.unix; @@ -1054,6 +1121,7 @@ lib.makeScope newScope (self: with self; { sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1069,6 +1137,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -1084,6 +1153,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXau libXext ]; meta.platforms = lib.platforms.unix; @@ -1099,6 +1169,7 @@ lib.makeScope newScope (self: with self; { sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXext xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -1114,6 +1185,7 @@ lib.makeScope newScope (self: with self; { sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; @@ -1129,6 +1201,7 @@ lib.makeScope newScope (self: with self; { sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXrender ]; meta.platforms = lib.platforms.unix; @@ -1144,6 +1217,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; @@ -1159,6 +1233,7 @@ lib.makeScope newScope (self: with self; { sha256 = "049b7dk6hx47161hg47ryjrm6pwsp27r5pby05b0wqb1pcggprmn"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; @@ -1174,6 +1249,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0q1x7842r8rcn2m0q4q9f69h4qa097fyizs8brzx5ns62s7w1737"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE xorgproto libSM libX11 ]; meta.platforms = lib.platforms.unix; @@ -1189,6 +1265,7 @@ lib.makeScope newScope (self: with self; { sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXi ]; meta.platforms = lib.platforms.unix; @@ -1204,6 +1281,7 @@ lib.makeScope newScope (self: with self; { sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; @@ -1219,6 +1297,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXv ]; meta.platforms = lib.platforms.unix; @@ -1234,6 +1313,7 @@ lib.makeScope newScope (self: with self; { sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1249,6 +1329,7 @@ lib.makeScope newScope (self: with self; { sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1264,6 +1345,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1279,6 +1361,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext ]; meta.platforms = lib.platforms.unix; @@ -1294,6 +1377,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto zlib ]; meta.platforms = lib.platforms.unix; @@ -1309,6 +1393,7 @@ lib.makeScope newScope (self: with self; { sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ zlib ]; meta.platforms = lib.platforms.unix; @@ -1324,6 +1409,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -1339,6 +1425,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libxslt libpthreadstubs libXau xcbproto libXdmcp ]; meta.platforms = lib.platforms.unix; @@ -1354,6 +1441,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0acc7vrj5kfb19zvyl7f29rnsvx383dvwc19k70r8prm1lccxsr7"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config meson ninja ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -1369,6 +1457,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 ]; meta.platforms = lib.platforms.unix; @@ -1384,6 +1473,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1399,6 +1489,7 @@ lib.makeScope newScope (self: with self; { sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -1414,6 +1505,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1429,6 +1521,7 @@ lib.makeScope newScope (self: with self; { sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -1444,6 +1537,7 @@ lib.makeScope newScope (self: with self; { sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1459,6 +1553,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libfontenc freetype xorgproto zlib ]; meta.platforms = lib.platforms.unix; @@ -1474,6 +1569,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbfile libX11 libXext libXmu libXt ]; meta.platforms = lib.platforms.unix; @@ -1489,6 +1585,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1504,6 +1601,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = lib.platforms.unix; @@ -1519,6 +1617,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libXmu libXt ]; meta.platforms = lib.platforms.unix; @@ -1534,6 +1633,7 @@ lib.makeScope newScope (self: with self; { sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1549,6 +1649,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libX11 libXext libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -1564,6 +1665,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0w8ryfqylprz37zj9grl4jzdsqq67ibfwq5raj7vm1i7kmp2x08g"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -1579,6 +1681,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; @@ -1594,6 +1697,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXft libXmu xorgproto libXrender ]; meta.platforms = lib.platforms.unix; @@ -1609,6 +1713,7 @@ lib.makeScope newScope (self: with self; { sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXext libXmu xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1624,6 +1729,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb xcbutil ]; meta.platforms = lib.platforms.unix; @@ -1639,6 +1745,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -1654,6 +1761,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -1669,6 +1777,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -1684,6 +1793,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1699,6 +1809,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbutilimage xcbutilrenderutil xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1714,6 +1825,7 @@ lib.makeScope newScope (self: with self; { sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbproto xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1729,6 +1841,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xcbutil xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1744,6 +1857,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1759,6 +1873,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1774,6 +1889,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config m4 ]; buildInputs = [ gperf libxcb xorgproto ]; meta.platforms = lib.platforms.unix; @@ -1789,6 +1905,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXft libxkbfile libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; @@ -1804,6 +1921,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 ]; meta.platforms = lib.platforms.unix; @@ -1819,6 +1937,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXcomposite libXdamage libXext libXfixes libXrender ]; meta.platforms = lib.platforms.unix; @@ -1834,6 +1953,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -1849,6 +1969,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng libX11 libXcursor ]; meta.platforms = lib.platforms.unix; @@ -1864,6 +1985,7 @@ lib.makeScope newScope (self: with self; { sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXcursor ]; meta.platforms = lib.platforms.unix; @@ -1879,6 +2001,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; @@ -1894,6 +2017,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xorgproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ]; meta.platforms = lib.platforms.unix; @@ -1909,6 +2033,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libGL xorgproto libX11 ]; meta.platforms = lib.platforms.unix; @@ -1924,6 +2049,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1ql592pdhddhkipkrsxn929y9l2nn02a5fh2z3dx47kmzs5y006p"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXrandr ]; meta.platforms = lib.platforms.unix; @@ -1939,6 +2065,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1nxn443pfhddmwl59wplpjkslhlyfk307qx18nrimvvb2hipx8gq"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb libXext libXi libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; @@ -1954,6 +2081,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libevdev udev mtdev xorgserver ]; meta.platforms = lib.platforms.unix; @@ -1969,6 +2097,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -1984,6 +2113,7 @@ lib.makeScope newScope (self: with self; { sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -1999,6 +2129,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1xk9b05csndcgcj8kbb6fkwa3c7njzzxc6qvz9bvy77y2k2s63gq"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libinput xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2014,6 +2145,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2029,6 +2161,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libevdev libX11 libXi xorgserver libXtst ]; meta.platforms = lib.platforms.unix; @@ -2044,6 +2177,7 @@ lib.makeScope newScope (self: with self; { sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto udev xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2059,6 +2193,7 @@ lib.makeScope newScope (self: with self; { sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto ]; meta.platforms = lib.platforms.unix; @@ -2074,6 +2209,7 @@ lib.makeScope newScope (self: with self; { sha256 = "125dq85n46yqmnmr2hknxwcqicwlvz2b2phf0m963fpg9l1j6y30"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto mesa libGL libdrm udev xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2089,6 +2225,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2104,6 +2241,7 @@ lib.makeScope newScope (self: with self; { sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2119,6 +2257,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2134,6 +2273,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0gmymk8207fd9rjliq05l2gvx220h432rj3h75hv2ylr3k9vmp2b"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto mesa libGL libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2149,6 +2289,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2164,6 +2305,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2179,6 +2321,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2194,6 +2337,7 @@ lib.makeScope newScope (self: with self; { sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2209,6 +2353,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2224,6 +2369,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2239,6 +2385,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpciaccess xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2254,6 +2401,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2269,6 +2417,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2284,6 +2433,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = lib.platforms.unix; @@ -2299,6 +2449,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2314,6 +2465,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2329,6 +2481,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2344,6 +2497,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0rhs3z274jdzd82pcsl25xn8hmw6i4cxs2kwfnphpfhxbbkiq7wl"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2359,6 +2513,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2374,6 +2529,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2389,6 +2545,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver libXvMC ]; meta.platforms = lib.platforms.unix; @@ -2404,6 +2561,7 @@ lib.makeScope newScope (self: with self; { sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2419,6 +2577,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2434,6 +2593,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2449,6 +2609,7 @@ lib.makeScope newScope (self: with self; { sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2464,6 +2625,7 @@ lib.makeScope newScope (self: with self; { sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2479,6 +2641,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2494,6 +2657,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2509,6 +2673,7 @@ lib.makeScope newScope (self: with self; { sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2524,6 +2689,7 @@ lib.makeScope newScope (self: with self; { sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2539,6 +2705,7 @@ lib.makeScope newScope (self: with self; { sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2554,6 +2721,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2569,6 +2737,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2584,6 +2753,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2599,6 +2769,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2614,6 +2785,7 @@ lib.makeScope newScope (self: with self; { sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2629,6 +2801,7 @@ lib.makeScope newScope (self: with self; { sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2644,6 +2817,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0nf6ai74c60xk96kgr8q9mx6lrxm5id3765ws4d801irqzrj85hz"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2659,6 +2833,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm udev libpciaccess libX11 libXext xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2674,6 +2849,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2689,6 +2865,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgserver xorgproto ]; meta.platforms = lib.platforms.unix; @@ -2704,6 +2881,7 @@ lib.makeScope newScope (self: with self; { sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libdrm libpciaccess xorgserver ]; meta.platforms = lib.platforms.unix; @@ -2719,6 +2897,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libxkbfile fontconfig libXaw libXft libXmu xorgproto libXrender libXt ]; meta.platforms = lib.platforms.unix; @@ -2734,6 +2913,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; @@ -2749,6 +2929,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXfont2 xorgproto xtrans ]; meta.platforms = lib.platforms.unix; @@ -2764,6 +2945,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libFS xorgproto ]; meta.platforms = lib.platforms.unix; @@ -2779,6 +2961,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXxf86vm ]; meta.platforms = lib.platforms.unix; @@ -2794,6 +2977,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; @@ -2809,6 +2993,7 @@ lib.makeScope newScope (self: with self; { sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXau libXmu xorgproto ]; meta.platforms = lib.platforms.unix; @@ -2824,6 +3009,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; @@ -2839,6 +3025,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXext libXi libXinerama libXrandr ]; meta.platforms = lib.platforms.unix; @@ -2854,6 +3041,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0pmhshqinwqh5rip670l3szjpywky67hv232ql6gvdj489n0hlb8"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile xorgproto ]; meta.platforms = lib.platforms.unix; @@ -2869,6 +3057,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile ]; meta.platforms = lib.platforms.unix; @@ -2884,6 +3073,7 @@ lib.makeScope newScope (self: with self; { sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxkbfile xorgproto ]; meta.platforms = lib.platforms.unix; @@ -2899,6 +3089,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto libX11 libXaw libXt ]; meta.platforms = lib.platforms.unix; @@ -2914,6 +3105,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1g6kn7l0mixw50kgn7d97gwv1990c5rczr2x776q3xywss8dfzv5"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; @@ -2929,6 +3121,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; @@ -2944,6 +3137,7 @@ lib.makeScope newScope (self: with self; { sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config gettext ]; buildInputs = [ libX11 libXaw libXmu xorgproto libXt ]; meta.platforms = lib.platforms.unix; @@ -2959,6 +3153,7 @@ lib.makeScope newScope (self: with self; { sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb ]; meta.platforms = lib.platforms.unix; @@ -2974,6 +3169,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxcb ]; meta.platforms = lib.platforms.unix; @@ -2989,6 +3185,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; @@ -3004,6 +3201,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXaw libXmu libXt ]; meta.platforms = lib.platforms.unix; @@ -3019,6 +3217,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; @@ -3034,6 +3233,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; @@ -3049,6 +3249,7 @@ lib.makeScope newScope (self: with self; { sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libXaw libXt ]; meta.platforms = lib.platforms.unix; @@ -3064,6 +3265,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0233jyjxjkhlar03vp8l5sm3iq6354izm3crk41h5291pgap39vl"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -3079,6 +3281,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -3094,6 +3297,7 @@ lib.makeScope newScope (self: with self; { sha256 = "05d0kib351qmnlfimaznaw0220fr0ym7fx2gn9h2jqxxilxncbxa"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config python3 ]; buildInputs = [ libXt ]; meta.platforms = lib.platforms.unix; @@ -3109,6 +3313,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0sx18vsxr0dg9z7b9ph1gz6q4pmxc1n6b4sbb7i47578kc5vgiaw"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ xorgproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = lib.platforms.unix; @@ -3124,6 +3329,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -3139,6 +3345,7 @@ lib.makeScope newScope (self: with self; { sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; @@ -3154,6 +3361,7 @@ lib.makeScope newScope (self: with self; { sha256 = "18ckr8g1z50zkc01hprkpm1npwbq32yqib4b3l98c95z2q1yv4lv"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; @@ -3169,6 +3377,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0ql75s1n3dm2m3g1ilb9l6hqh15r0v709bgghpwazy3jknpnvivv"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXrandr libXrender ]; meta.platforms = lib.platforms.unix; @@ -3184,6 +3393,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1d78prd8sfszq2rwwlb32ksph4fymf988lp75aj8iysg44f06pag"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; @@ -3199,6 +3409,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; @@ -3214,6 +3425,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXext libXmu xorgproto libXxf86misc ]; meta.platforms = lib.platforms.unix; @@ -3229,6 +3441,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xbitmaps libXcursor libXmu xorgproto ]; meta.platforms = lib.platforms.unix; @@ -3244,6 +3457,7 @@ lib.makeScope newScope (self: with self; { sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libICE libSM libX11 libXaw libXt ]; meta.platforms = lib.platforms.unix; @@ -3259,6 +3473,7 @@ lib.makeScope newScope (self: with self; { sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXmu xorgproto ]; meta.platforms = lib.platforms.unix; @@ -3274,6 +3489,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ]; meta.platforms = lib.platforms.unix; @@ -3289,6 +3505,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libXt libXTrap ]; meta.platforms = lib.platforms.unix; @@ -3304,6 +3521,7 @@ lib.makeScope newScope (self: with self; { sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto libXv ]; meta.platforms = lib.platforms.unix; @@ -3319,6 +3537,7 @@ lib.makeScope newScope (self: with self; { sha256 = "06q36fh55r62ms0igfxsanrn6gv8lh794q1bw9xzw51p2qs2papv"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxkbfile libX11 xorgproto ]; meta.platforms = lib.platforms.unix; @@ -3334,6 +3553,7 @@ lib.makeScope newScope (self: with self; { sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 libxcb xorgproto ]; meta.platforms = lib.platforms.unix; @@ -3349,6 +3569,7 @@ lib.makeScope newScope (self: with self; { sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libX11 xorgproto ]; meta.platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 69ff9a7015..d236eb3cbc 100755 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -190,6 +190,7 @@ while (<>) { } if ($isFont) { + push @requires, "fontutil"; push @{$extraAttrs{$pkg}}, "configureFlags = [ \"--with-fontrootdir=\$(out)/lib/X11/fonts\" ];"; } @@ -293,10 +294,22 @@ foreach my $pkg (sort (keys %pkgURLs)) { my $nativeBuildInputsStr = join "", map { $_ . " " } @nativeBuildInputs; my $buildInputsStr = join "", map { $_ . " " } @buildInputs; + sub uniq { + my %seen; + my @res = (); + foreach my $s (@_) { + if (!defined $seen{$s}) { + $seen{$s} = 1; + push @res, $s; + } + } + return @res; + } + my @arguments = @buildInputs; push @arguments, @nativeBuildInputs; unshift @arguments, "stdenv", "pkg-config", "fetchurl"; - my $argumentsStr = join ", ", @arguments; + my $argumentsStr = join ", ", uniq @arguments; my $extraAttrsStr = ""; if (defined $extraAttrs{$pkg}) { @@ -314,6 +327,7 @@ foreach my $pkg (sort (keys %pkgURLs)) { sha256 = "$pkgHashes{$pkg}"; }; hardeningDisable = [ "bindnow" "relro" ]; + strictDeps = true; nativeBuildInputs = [ pkg-config $nativeBuildInputsStr]; buildInputs = [ $buildInputsStr];$extraAttrsStr meta.platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index 2cfd410a33..75a17a9ef3 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -42,7 +42,7 @@ self: super: }); encodings = super.encodings.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.mkfontscale ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.mkfontscale ]; }); editres = super.editres.overrideAttrs (attrs: { @@ -437,9 +437,6 @@ self: super: xf86inputvoid = brokenOnDarwin super.xf86inputvoid; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86inputvoid.x86_64-darwin xf86videodummy = brokenOnDarwin super.xf86videodummy; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videodummy.x86_64-darwin - xf86videosuncg6 = brokenOnDarwin super.xf86videosuncg6; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin - xf86videosunffb = brokenOnDarwin super.xf86videosunffb; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin - xf86videosunleo = brokenOnDarwin super.xf86videosunleo; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunleo.x86_64-darwin # Obsolete drivers that don't compile anymore. xf86videoark = super.xf86videoark.overrideAttrs (attrs: { meta = attrs.meta // { broken = true; }; }); @@ -463,8 +460,8 @@ self: super: }); xf86videoati = super.xf86videoati.overrideAttrs (attrs: { - NIX_CFLAGS_COMPILE = "-I${self.xorgserver.dev or self.xorgserver}/include/xorg"; - nativeBuildInputs = with self; attrs.nativeBuildInputs ++ [ autoreconfHook utilmacros ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; + buildInputs = attrs.buildInputs ++ [ self.utilmacros ]; patches = [ (fetchpatch { url = "https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/e0511968d04b42abf11bc0ffb387f143582bc144.patch"; @@ -474,7 +471,117 @@ self: super: }); xf86videonouveau = super.xf86videonouveau.overrideAttrs (attrs: { - nativeBuildInputs = with self; attrs.nativeBuildInputs ++ [ autoreconfHook utilmacros ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; + buildInputs = attrs.buildInputs ++ [ self.utilmacros ]; + }); + + xf86videoglint = super.xf86videoglint.overrideAttrs (attrs: { + nativeBuildInputs = attrs.nativeBuildInputs ++ [ autoreconfHook ]; + buildInputs = attrs.buildInputs ++ [ self.utilmacros ]; + # https://gitlab.freedesktop.org/xorg/driver/xf86-video-glint/-/issues/1 + meta = attrs.meta // { broken = true; }; + }); + + xf86videosuncg6 = super.xf86videosuncg6.overrideAttrs (attrs: { + meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosuncg6.x86_64-darwin + # https://gitlab.freedesktop.org/xorg/driver/xf86-video-suncg6/-/commit/14392504de04841fa2cbb5cdf8d9c9c7c4eb2ed8 + postPatch = '' + patch -p1 < + #include "gcstruct.h" + #include "cg6_regs.h" + EOF + ''; + }); + + xf86videosunffb = super.xf86videosunffb.overrideAttrs (attrs: { + meta = attrs.meta // { broken = isDarwin; }; # never worked: https://hydra.nixos.org/job/nixpkgs/trunk/xorg.xf86videosunffb.x86_64-darwin + # https://gitlab.freedesktop.org/xorg/driver/xf86-video-sunffb/-/commit/656dd83b489e7bdc72d6c1990025d20dea26dc22 + postPatch = '' + patch -p1 < + #include "gcstruct.h" + #include "leo_regs.h" + EOF + ''; + }); + + xf86videotrident = super.xf86videotrident.overrideAttrs (attrs: { + # https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/commit/07a5c4732f1c28ffcb873ee04500e3cb813c50b4 + postPatch = '' + patch -p1 <= 21.1.4; https://lists.x.org/archives/xorg/2022-July/061035.html + ++ [ + (fetchpatch { + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/f1070c01d616c5f21f939d5ebc533738779451ac.diff"; + sha256 = "5hcreV3ND8Lklvo7QMpB0VWQ2tifIamRlCr6J82qXt8="; + }) + (fetchpatch { + name = "CVE-2022-2319.diff"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/6907b6ea2b4ce949cb07271f5b678d5966d9df42.diff"; + sha256 = "gWXCalWj2SF4U7wSFGIgK396B0Fs3EtA/EL+34m3FWY="; + }) + (fetchpatch { + name = "CVE-2022-2320.diff"; + url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/dd8caf39e9e15d8f302e54045dd08d8ebf1025dc.diff"; + sha256 = "rBiiXQRreMvexW9vOKblcfCYzul+9La01EAhir4FND8="; + }) ]; buildInputs = commonBuildInputs ++ [ libdrm mesa ]; propagatedBuildInputs = attrs.propagatedBuildInputs or [] ++ [ libpciaccess libepoxy ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [ udev ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; prePatch = lib.optionalString stdenv.hostPlatform.isMusl '' export CFLAGS+=" -D__uid_t=uid_t -D__gid_t=gid_t" ''; @@ -821,7 +946,8 @@ self: super: }); xcursorthemes = super.xcursorthemes.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ self.xcursorgen self.xorgproto ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [ self.xcursorgen ]; + buildInputs = attrs.buildInputs ++ [ self.xorgproto ]; configureFlags = [ "--with-cursordir=$(out)/share/icons" ]; }); @@ -867,8 +993,8 @@ self: super: rev = "31486f40f8e8f8923ca0799aea84b58799754564"; sha256 = "sha256-nqT9VZDb2kAC72ot9UCdwEkM1uuP9NriJePulzrdZlM="; }; - buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman ]; - nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook self.utilmacros]; + buildInputs = attrs.buildInputs ++ [ self.libXScrnSaver self.libXfixes self.libXv self.pixman self.utilmacros ]; + nativeBuildInputs = attrs.nativeBuildInputs ++ [autoreconfHook ]; configureFlags = [ "--with-default-dri=3" "--enable-tools" ]; meta = attrs.meta // { diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix index 97414481a9..134e992a56 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/xwayland.nix @@ -42,12 +42,12 @@ , defaultFontPath ? "" }: stdenv.mkDerivation rec { - pname = "xwayland"; - version = "22.1.1"; + version = "22.1.3"; + src = fetchurl { url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; - sha256 = "sha256-9dDgujfhm7h8YvYdpZcL0gSTnyEgYglkvtTMhJW6plc="; + sha256 = "sha256-pxLre84yzZNN82gUtd0EaqZwiZwW/pjyr7ADV4+GocU="; }; depsBuildBuild = [ diff --git a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix index 607a9dc020..00a88b8073 100644 --- a/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xmpp/prosody/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { license = licenses.mit; homepage = "https://prosody.im"; platforms = platforms.linux; - maintainers = with maintainers; [ fpletz globin ]; + maintainers = with maintainers; [ globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix index 3140c0c2d2..1f6b3a106c 100644 --- a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/default.nix @@ -3,14 +3,14 @@ let package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package; in package.override rec { - version = "1.26.0"; + version = "1.27.0"; reconstructLock = true; src = pkgs.fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "eK1Hk+P4pVfv5tk5Nl9GvUjGfcrYO+6mipkqFd8uA74="; + sha256 = "8qkoVXHXlvVK5GROVNhTkN52g9RQ/CuAMtDLq0Fx3T0="; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix index ce5e95330f..121a0ea6f4 100644 --- a/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -13,85 +13,85 @@ let sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; }; - "@babel/code-frame-7.16.7" = { + "@babel/code-frame-7.18.6" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; - sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.17.10" = { + "@babel/compat-data-7.18.8" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.17.10"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz"; - sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"; + sha512 = "HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="; }; }; - "@babel/core-7.18.5" = { + "@babel/core-7.18.9" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.18.5"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.18.5.tgz"; - sha512 = "MGY8vg3DxMnctw0LdvSEojOsumc70g0t18gNyUdAZqB1Rpd1Bqo/svHGvt+UJ6JcGX+DIekGFDxxIWofBxLCnQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.18.9.tgz"; + sha512 = "1LIb1eL8APMy91/IMW+31ckrfBM4yCoLaVzoDhZUKSM4cu1L1nIidyxkCgzPAgrC5WEz36IPEr/eSeSF9pIn+g=="; }; }; - "@babel/generator-7.18.2" = { + "@babel/generator-7.18.9" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz"; - sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.9.tgz"; + sha512 = "wt5Naw6lJrL1/SGkipMiFxJjtyczUWTP38deiP1PO60HsBjDeKk08CGC3S8iVuvf0FmTdgKwU1KIXzSKL1G0Ug=="; }; }; - "@babel/helper-annotate-as-pure-7.16.7" = { + "@babel/helper-annotate-as-pure-7.18.6" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; - sha512 = "s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; + sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz"; - sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz"; + sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="; }; }; - "@babel/helper-compilation-targets-7.18.2" = { + "@babel/helper-compilation-targets-7.18.9" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz"; - sha512 = "s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz"; + sha512 = "tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg=="; }; }; - "@babel/helper-create-class-features-plugin-7.18.0" = { + "@babel/helper-create-class-features-plugin-7.18.9" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz"; - sha512 = "Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz"; + sha512 = "WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.17.12" = { + "@babel/helper-create-regexp-features-plugin-7.18.6" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz"; - sha512 = "b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"; + sha512 = "7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="; }; }; "@babel/helper-define-polyfill-provider-0.3.1" = { @@ -103,346 +103,346 @@ let sha512 = "J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA=="; }; }; - "@babel/helper-environment-visitor-7.18.2" = { + "@babel/helper-environment-visitor-7.18.9" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz"; - sha512 = "14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"; + sha512 = "3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg=="; }; }; - "@babel/helper-explode-assignable-expression-7.16.7" = { + "@babel/helper-explode-assignable-expression-7.18.6" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"; - sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"; + sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; }; }; - "@babel/helper-function-name-7.17.9" = { + "@babel/helper-function-name-7.18.9" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.17.9"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"; - sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.9.tgz"; + sha512 = "fJgWlZt7nxGksJS9a0XdSaI4XvpExnNIgRP+rVefWh5U7BL8pPuir6SJUmFKRfjWQ51OtWSzwOxhaH/EBWWc0A=="; }; }; - "@babel/helper-hoist-variables-7.16.7" = { + "@babel/helper-hoist-variables-7.18.6" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; - sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; + sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.17.7" = { + "@babel/helper-member-expression-to-functions-7.18.9" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.17.7"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz"; - sha512 = "thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"; + sha512 = "RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg=="; }; }; - "@babel/helper-module-imports-7.16.7" = { + "@babel/helper-module-imports-7.18.6" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; - sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; + sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.18.0" = { + "@babel/helper-module-transforms-7.18.9" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz"; - sha512 = "kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz"; + sha512 = "KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g=="; }; }; - "@babel/helper-optimise-call-expression-7.16.7" = { + "@babel/helper-optimise-call-expression-7.18.6" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; - sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; + sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; }; - "@babel/helper-plugin-utils-7.17.12" = { + "@babel/helper-plugin-utils-7.18.9" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz"; - sha512 = "JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz"; + sha512 = "aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w=="; }; }; - "@babel/helper-remap-async-to-generator-7.16.8" = { + "@babel/helper-remap-async-to-generator-7.18.6" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.8"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"; - sha512 = "fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.6.tgz"; + sha512 = "z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ=="; }; }; - "@babel/helper-replace-supers-7.18.2" = { + "@babel/helper-replace-supers-7.18.9" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz"; - sha512 = "XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"; + sha512 = "dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ=="; }; }; - "@babel/helper-simple-access-7.18.2" = { + "@babel/helper-simple-access-7.18.6" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz"; - sha512 = "7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; + sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { + "@babel/helper-skip-transparent-expression-wrappers-7.18.9" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.16.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"; - sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz"; + sha512 = "imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw=="; }; }; - "@babel/helper-split-export-declaration-7.16.7" = { + "@babel/helper-split-export-declaration-7.18.6" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; - sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; + sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-validator-identifier-7.16.7" = { + "@babel/helper-validator-identifier-7.18.6" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; - sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; + sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; }; }; - "@babel/helper-validator-option-7.16.7" = { + "@babel/helper-validator-option-7.18.6" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; - sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; + sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; }; - "@babel/helper-wrap-function-7.16.8" = { + "@babel/helper-wrap-function-7.18.6" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.16.8"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"; - sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz"; + sha512 = "I5/LZfozwMNbwr/b1vhhuYD+J/mU+gfGAj5td7l5Rv9WYmH6i3Om69WGKNmlIpsVW/mF6O5bvTKbvDQZVgjqOw=="; }; }; - "@babel/helpers-7.18.2" = { + "@babel/helpers-7.18.9" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz"; - sha512 = "j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz"; + sha512 = "Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ=="; }; }; - "@babel/highlight-7.17.12" = { + "@babel/highlight-7.18.6" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz"; - sha512 = "7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.18.5" = { + "@babel/parser-7.18.9" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.5"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.5.tgz"; - sha512 = "YZWVaglMiplo7v8f1oMQ5ZPQr0vn7HPeZXxXWsxXJRjGVrzUFn9OxFQl1sb5wzfootjA/yChhW84BV+383FSOw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.9.tgz"; + sha512 = "9uJveS9eY9DJ0t64YbIBZICtJy8a5QrDEVdiLCG97fVLpDTpGX7t8mMSb6OWw6Lrnjqj4O8zwjELX3dhoMgiBg=="; }; }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz"; - sha512 = "xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"; + sha512 = "Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz"; - sha512 = "/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz"; + sha512 = "AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.17.12" = { + "@babel/plugin-proposal-async-generator-functions-7.18.6" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz"; - sha512 = "RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz"; + sha512 = "WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w=="; }; }; - "@babel/plugin-proposal-class-properties-7.17.12" = { + "@babel/plugin-proposal-class-properties-7.18.6" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz"; - sha512 = "U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"; + sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-class-static-block-7.18.0" = { + "@babel/plugin-proposal-class-static-block-7.18.6" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz"; - sha512 = "t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"; + sha512 = "+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw=="; }; }; - "@babel/plugin-proposal-decorators-7.18.2" = { + "@babel/plugin-proposal-decorators-7.18.9" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.2.tgz"; - sha512 = "kbDISufFOxeczi0v4NQP3p5kIeW6izn/6klfWBrIIdGZZe4UpHR+QU03FAoWjGGd9SUXAwbw2pup1kaL4OQsJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.18.9.tgz"; + sha512 = "KD7zDNaD14CRpjQjVbV4EnH9lsKYlcpUrhZH37ei2IY+AlXrfAPy5pTmRUE4X6X1k8EsKXPraykxeaogqQvSGA=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.16.7" = { + "@babel/plugin-proposal-dynamic-import-7.18.6" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"; - sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"; + sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.17.12" = { + "@babel/plugin-proposal-export-namespace-from-7.18.9" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz"; - sha512 = "j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"; + sha512 = "k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA=="; }; }; - "@babel/plugin-proposal-json-strings-7.17.12" = { + "@babel/plugin-proposal-json-strings-7.18.6" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz"; - sha512 = "rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"; + sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.17.12" = { + "@babel/plugin-proposal-logical-assignment-operators-7.18.9" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz"; - sha512 = "EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz"; + sha512 = "128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz"; - sha512 = "ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"; + sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.16.7" = { + "@babel/plugin-proposal-numeric-separator-7.18.6" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz"; - sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; + sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.18.0" = { + "@babel/plugin-proposal-object-rest-spread-7.18.9" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz"; - sha512 = "nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz"; + sha512 = "kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { + "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"; - sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"; + sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.17.12" = { + "@babel/plugin-proposal-optional-chaining-7.18.9" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz"; - sha512 = "7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz"; + sha512 = "v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w=="; }; }; - "@babel/plugin-proposal-private-methods-7.17.12" = { + "@babel/plugin-proposal-private-methods-7.18.6" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz"; - sha512 = "SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"; + sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.17.12" = { + "@babel/plugin-proposal-private-property-in-object-7.18.6" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz"; - sha512 = "/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"; + sha512 = "9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.17.12" = { + "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz"; - sha512 = "Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"; + sha512 = "2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -481,13 +481,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.17.12" = { + "@babel/plugin-syntax-decorators-7.18.6" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.17.12.tgz"; - sha512 = "D1Hz0qtGTza8K2xGyEdVNCYLdVHukAcbQr4K3/s6r/esadyEriZovpJimQOpu8ju4/jV8dW/1xdaE0UpDroidw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.18.6.tgz"; + sha512 = "fqyLgjcxf/1yhyZ6A+yo1u9gJ7eleFQod2lkaUsF9DQ7sbbY3Ligym3L0+I2c0WmqNKDpoD9UTb1AKP3qRMOAQ=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -508,13 +508,13 @@ let sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; }; - "@babel/plugin-syntax-import-assertions-7.17.12" = { + "@babel/plugin-syntax-import-assertions-7.18.6" = { name = "_at_babel_slash_plugin-syntax-import-assertions"; packageName = "@babel/plugin-syntax-import-assertions"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz"; - sha512 = "n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz"; + sha512 = "/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ=="; }; }; "@babel/plugin-syntax-import-meta-7.10.4" = { @@ -607,319 +607,319 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.17.12" = { + "@babel/plugin-syntax-typescript-7.18.6" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz"; - sha512 = "TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz"; + sha512 = "mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA=="; }; }; - "@babel/plugin-transform-arrow-functions-7.17.12" = { + "@babel/plugin-transform-arrow-functions-7.18.6" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz"; - sha512 = "PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"; + sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.17.12" = { + "@babel/plugin-transform-async-to-generator-7.18.6" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz"; - sha512 = "J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"; + sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.16.7" = { + "@babel/plugin-transform-block-scoped-functions-7.18.6" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"; - sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; + sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.17.12" = { + "@babel/plugin-transform-block-scoping-7.18.9" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.17.12.tgz"; - sha512 = "jw8XW/B1i7Lqwqj2CbrViPcZijSxfguBWZP2aN59NHgxUyO/OcO1mfdCxH13QhN5LbWhPkX+f+brKGhZTiqtZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz"; + sha512 = "5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw=="; }; }; - "@babel/plugin-transform-classes-7.17.12" = { + "@babel/plugin-transform-classes-7.18.9" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.17.12.tgz"; - sha512 = "cvO7lc7pZat6BsvH6l/EGaI8zpl8paICaoGk+7x7guvtfak/TbIf66nYmJOH13EuG0H+Xx3M+9LQDtSvZFKXKw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz"; + sha512 = "EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g=="; }; }; - "@babel/plugin-transform-computed-properties-7.17.12" = { + "@babel/plugin-transform-computed-properties-7.18.9" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz"; - sha512 = "a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz"; + sha512 = "+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw=="; }; }; - "@babel/plugin-transform-destructuring-7.18.0" = { + "@babel/plugin-transform-destructuring-7.18.9" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz"; - sha512 = "Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz"; + sha512 = "p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA=="; }; }; - "@babel/plugin-transform-dotall-regex-7.16.7" = { + "@babel/plugin-transform-dotall-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"; - sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; + sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.17.12" = { + "@babel/plugin-transform-duplicate-keys-7.18.9" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz"; - sha512 = "EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"; + sha512 = "d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.16.7" = { + "@babel/plugin-transform-exponentiation-operator-7.18.6" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"; - sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; + sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; }; }; - "@babel/plugin-transform-for-of-7.18.1" = { + "@babel/plugin-transform-for-of-7.18.8" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.18.1"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz"; - sha512 = "+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; + sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; }; }; - "@babel/plugin-transform-function-name-7.16.7" = { + "@babel/plugin-transform-function-name-7.18.9" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.16.7"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"; - sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"; + sha512 = "WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ=="; }; }; - "@babel/plugin-transform-literals-7.17.12" = { + "@babel/plugin-transform-literals-7.18.9" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz"; - sha512 = "8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"; + sha512 = "IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.16.7" = { + "@babel/plugin-transform-member-expression-literals-7.18.6" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"; - sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; + sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; }; }; - "@babel/plugin-transform-modules-amd-7.18.0" = { + "@babel/plugin-transform-modules-amd-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz"; - sha512 = "h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; + sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.18.2" = { + "@babel/plugin-transform-modules-commonjs-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz"; - sha512 = "f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; + sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.18.0" = { + "@babel/plugin-transform-modules-systemjs-7.18.9" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.18.0"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.0.tgz"; - sha512 = "vwKpxdHnlM5tIrRt/eA0bzfbi7gUBLN08vLu38np1nZevlPySRe6yvuATJB5F/WPJ+ur4OXwpVYq9+BsxqAQuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz"; + sha512 = "zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A=="; }; }; - "@babel/plugin-transform-modules-umd-7.18.0" = { + "@babel/plugin-transform-modules-umd-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz"; - sha512 = "d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; + sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.17.12" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz"; - sha512 = "vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz"; + sha512 = "UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg=="; }; }; - "@babel/plugin-transform-new-target-7.17.12" = { + "@babel/plugin-transform-new-target-7.18.6" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz"; - sha512 = "CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; + sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; }; }; - "@babel/plugin-transform-object-super-7.16.7" = { + "@babel/plugin-transform-object-super-7.18.6" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"; - sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; + sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.17.12" = { + "@babel/plugin-transform-parameters-7.18.8" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.17.12"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz"; - sha512 = "6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; + sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; }; }; - "@babel/plugin-transform-property-literals-7.16.7" = { + "@babel/plugin-transform-property-literals-7.18.6" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"; - sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; + sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; }; }; - "@babel/plugin-transform-regenerator-7.18.0" = { + "@babel/plugin-transform-regenerator-7.18.6" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz"; - sha512 = "C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"; + sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="; }; }; - "@babel/plugin-transform-reserved-words-7.17.12" = { + "@babel/plugin-transform-reserved-words-7.18.6" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz"; - sha512 = "1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; + sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.7" = { + "@babel/plugin-transform-shorthand-properties-7.18.6" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; - sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; + sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; }; }; - "@babel/plugin-transform-spread-7.17.12" = { + "@babel/plugin-transform-spread-7.18.9" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz"; - sha512 = "9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz"; + sha512 = "39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA=="; }; }; - "@babel/plugin-transform-sticky-regex-7.16.7" = { + "@babel/plugin-transform-sticky-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"; - sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; + sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; }; }; - "@babel/plugin-transform-template-literals-7.18.2" = { + "@babel/plugin-transform-template-literals-7.18.9" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz"; - sha512 = "/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"; + sha512 = "S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.17.12" = { + "@babel/plugin-transform-typeof-symbol-7.18.9" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.17.12"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz"; - sha512 = "Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"; + sha512 = "SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw=="; }; }; - "@babel/plugin-transform-typescript-7.18.1" = { + "@babel/plugin-transform-typescript-7.18.6" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.18.1"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.1.tgz"; - sha512 = "F+RJmL479HJmC0KeqqwEGZMg1P7kWArLGbAKfEi9yPthJyMNjF+DjxFF/halfQvq1Q9GFM4TUbYDNV8xe4Ctqg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.6.tgz"; + sha512 = "ijHNhzIrLj5lQCnI6aaNVRtGVuUZhOXFLRVFs7lLrkXTHip4FKty5oAuQdk4tywG0/WjXmjTfQCWmuzrvFer1w=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.16.7" = { + "@babel/plugin-transform-unicode-escapes-7.18.6" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz"; - sha512 = "TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz"; + sha512 = "XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.16.7" = { + "@babel/plugin-transform-unicode-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"; - sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; + sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; }; }; - "@babel/preset-env-7.18.2" = { + "@babel/preset-env-7.18.9" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.18.2"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.2.tgz"; - sha512 = "PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.18.9.tgz"; + sha512 = "75pt/q95cMIHWssYtyfjVlvI+QEZQThQbKvR9xH+F/Agtw/s4Wfc2V9Bwd/P39VtixB7oWxGdH4GteTTwYJWMg=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -931,13 +931,13 @@ let sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; }; }; - "@babel/preset-typescript-7.17.12" = { + "@babel/preset-typescript-7.18.6" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz"; - sha512 = "S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.18.6.tgz"; + sha512 = "s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ=="; }; }; "@babel/runtime-7.18.3" = { @@ -949,31 +949,31 @@ let sha512 = "38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug=="; }; }; - "@babel/template-7.16.7" = { + "@babel/template-7.18.6" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"; - sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz"; + sha512 = "JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw=="; }; }; - "@babel/traverse-7.18.5" = { + "@babel/traverse-7.18.9" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.18.5"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.5.tgz"; - sha512 = "aKXj1KT66sBj0vVzk6rEeAO6Z9aiiQ68wfDgge3nHhA/my6xMM/7HGQUNumKZaoa2qUPQ5whJG9aAifsxUKfLA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.9.tgz"; + sha512 = "LcPAnujXGwBgv3/WHv01pHtb2tihcyW1XuL9wd7jqh1Z8AQkTd+QVjMrMijrln0T7ED3UXLIy36P9Ao7W75rYg=="; }; }; - "@babel/types-7.18.4" = { + "@babel/types-7.18.9" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.18.4"; + version = "7.18.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.18.4.tgz"; - sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.9.tgz"; + sha512 = "WwMLAg2MvJmt/rKEVQBBhIVffMmnilX4oe0sRe7iPOHIGsqpruFHHdrfj4O1CMMtgMtCU4oPafZjDPCRgO57Wg=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -1048,130 +1048,130 @@ let sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; }; - "@jest/console-28.1.1" = { + "@jest/console-28.1.3" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-28.1.1.tgz"; - sha512 = "0RiUocPVFEm3WRMOStIHbRWllG6iW6E3/gUPnf4lkrVFyXIIDeCe+vlKeYyFOMhB2EPE6FLFCNADSOOQMaqvyA=="; + url = "https://registry.npmjs.org/@jest/console/-/console-28.1.3.tgz"; + sha512 = "QPAkP5EwKdK/bxIr6C1I4Vs0rm2nHiANzj/Z5X2JQkrZo6IqvC4ldZ9K95tF0HdidhA8Bo6egxSzUFPYKcEXLw=="; }; }; - "@jest/core-28.1.1" = { + "@jest/core-28.1.3" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-28.1.1.tgz"; - sha512 = "3pYsBoZZ42tXMdlcFeCc/0j9kOlK7MYuXs2B1QbvDgMoW1K9NJ4G/VYvIbMb26iqlkTfPHo7SC2JgjDOk/mxXw=="; + url = "https://registry.npmjs.org/@jest/core/-/core-28.1.3.tgz"; + sha512 = "CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA=="; }; }; - "@jest/environment-28.1.1" = { + "@jest/environment-28.1.3" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-28.1.1.tgz"; - sha512 = "9auVQ2GzQ7nrU+lAr8KyY838YahElTX9HVjbQPPS2XjlxQ+na18G113OoBhyBGBtD6ZnO/SrUy5WR8EzOj1/Uw=="; + url = "https://registry.npmjs.org/@jest/environment/-/environment-28.1.3.tgz"; + sha512 = "1bf40cMFTEkKyEf585R9Iz1WayDjHoHqvts0XFYEqyKM3cFWDpeMoqKKTAF9LSYQModPUlh8FKptoM2YcMWAXA=="; }; }; - "@jest/expect-28.1.1" = { + "@jest/expect-28.1.3" = { name = "_at_jest_slash_expect"; packageName = "@jest/expect"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/expect/-/expect-28.1.1.tgz"; - sha512 = "/+tQprrFoT6lfkMj4mW/mUIfAmmk/+iQPmg7mLDIFOf2lyf7EBHaS+x3RbeR0VZVMe55IvX7QRoT/2aK3AuUXg=="; + url = "https://registry.npmjs.org/@jest/expect/-/expect-28.1.3.tgz"; + sha512 = "lzc8CpUbSoE4dqT0U+g1qODQjBRHPpCPXissXD4mS9+sWQdmmpeJ9zSH1rS1HEkrsMN0fb7nKrJ9giAR1d3wBw=="; }; }; - "@jest/expect-utils-28.1.1" = { + "@jest/expect-utils-28.1.3" = { name = "_at_jest_slash_expect-utils"; packageName = "@jest/expect-utils"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.1.tgz"; - sha512 = "n/ghlvdhCdMI/hTcnn4qV57kQuV9OTsZzH1TTCVARANKhl6hXJqLKUkwX69ftMGpsbpt96SsDD8n8LD2d9+FRw=="; + url = "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-28.1.3.tgz"; + sha512 = "wvbi9LUrHJLn3NlDW6wF2hvIMtd4JUl2QNVrjq+IBSHirgfrR3o9RnVtxzdEGO2n9JyIWwHnLfby5KzqBGg2YA=="; }; }; - "@jest/fake-timers-28.1.1" = { + "@jest/fake-timers-28.1.3" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.1.tgz"; - sha512 = "BY/3+TyLs5+q87rGWrGUY5f8e8uC3LsVHS9Diz8+FV3ARXL4sNnkLlIB8dvDvRrp+LUCGM+DLqlsYubizGUjIA=="; + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-28.1.3.tgz"; + sha512 = "D/wOkL2POHv52h+ok5Oj/1gOG9HSywdoPtFsRCUmlCILXNn5eIWmcnd3DIiWlJnpGvQtmajqBP95Ei0EimxfLw=="; }; }; - "@jest/globals-28.1.1" = { + "@jest/globals-28.1.3" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-28.1.1.tgz"; - sha512 = "dEgl/6v7ToB4vXItdvcltJBgny0xBE6xy6IYQrPJAJggdEinGxCDMivNv7sFzPcTITGquXD6UJwYxfJ/5ZwDSg=="; + url = "https://registry.npmjs.org/@jest/globals/-/globals-28.1.3.tgz"; + sha512 = "XFU4P4phyryCXu1pbcqMO0GSQcYe1IsalYCDzRNyhetyeyxMcIxa11qPNDpVNLeretItNqEmYYQn1UYz/5x1NA=="; }; }; - "@jest/reporters-28.1.1" = { + "@jest/reporters-28.1.3" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.1.tgz"; - sha512 = "597Zj4D4d88sZrzM4atEGLuO7SdA/YrOv9SRXHXRNC+/FwPCWxZhBAEzhXoiJzfRwn8zes/EjS8Lo6DouGN5Gg=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-28.1.3.tgz"; + sha512 = "JuAy7wkxQZVNU/V6g9xKzCGC5LVXx9FDcABKsSXp5MiKPEE2144a/vXTEDoyzjUpZKfVwp08Wqg5A4WfTMAzjg=="; }; }; - "@jest/schemas-28.0.2" = { + "@jest/schemas-28.1.3" = { name = "_at_jest_slash_schemas"; packageName = "@jest/schemas"; - version = "28.0.2"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/schemas/-/schemas-28.0.2.tgz"; - sha512 = "YVDJZjd4izeTDkij00vHHAymNXQ6WWsdChFRK86qck6Jpr3DCL5W3Is3vslviRlP+bLuMYRLbdp98amMvqudhA=="; + url = "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz"; + sha512 = "/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg=="; }; }; - "@jest/source-map-28.0.2" = { + "@jest/source-map-28.1.2" = { name = "_at_jest_slash_source-map"; packageName = "@jest/source-map"; - version = "28.0.2"; + version = "28.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/source-map/-/source-map-28.0.2.tgz"; - sha512 = "Y9dxC8ZpN3kImkk0LkK5XCEneYMAXlZ8m5bflmSL5vrwyeUpJfentacCUg6fOb8NOpOO7hz2+l37MV77T6BFPw=="; + url = "https://registry.npmjs.org/@jest/source-map/-/source-map-28.1.2.tgz"; + sha512 = "cV8Lx3BeStJb8ipPHnqVw/IM2VCMWO3crWZzYodSIkxXnRcXJipCdx1JCK0K5MsJJouZQTH73mzf4vgxRaH9ww=="; }; }; - "@jest/test-result-28.1.1" = { + "@jest/test-result-28.1.3" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.1.tgz"; - sha512 = "hPmkugBktqL6rRzwWAtp1JtYT4VHwv8OQ+9lE5Gymj6dHzubI/oJHMUpPOt8NrdVWSrz9S7bHjJUmv2ggFoUNQ=="; + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-28.1.3.tgz"; + sha512 = "kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg=="; }; }; - "@jest/test-sequencer-28.1.1" = { + "@jest/test-sequencer-28.1.3" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.1.tgz"; - sha512 = "nuL+dNSVMcWB7OOtgb0EGH5AjO4UBCt68SLP08rwmC+iRhyuJWS9MtZ/MpipxFwKAlHFftbMsydXqWre8B0+XA=="; + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-28.1.3.tgz"; + sha512 = "NIMPEqqa59MWnDi1kvXXpYbqsfQmSJsIbnd85mdVGkiDfQ9WQQTXOLsvISUfonmnBT+w85WEgneCigEEdHDFxw=="; }; }; - "@jest/transform-28.1.1" = { + "@jest/transform-28.1.3" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-28.1.1.tgz"; - sha512 = "PkfaTUuvjUarl1EDr5ZQcCA++oXkFCP9QFUkG0yVKVmNObjhrqDy0kbMpMebfHWm3CCDHjYNem9eUSH8suVNHQ=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-28.1.3.tgz"; + sha512 = "u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA=="; }; }; - "@jest/types-28.1.1" = { + "@jest/types-28.1.3" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-28.1.1.tgz"; - sha512 = "vRXVqSg1VhDnB8bWcmvLzmg0Bt9CRKVgHPXqYwvWMX3TvAjeO+nRuK6+VdTKCtWOvYlmkF/HqNAL/z+N3B53Kw=="; + url = "https://registry.npmjs.org/@jest/types/-/types-28.1.3.tgz"; + sha512 = "RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ=="; }; }; "@jridgewell/gen-mapping-0.1.1" = { @@ -1183,13 +1183,13 @@ let sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; }; }; - "@jridgewell/gen-mapping-0.3.1" = { + "@jridgewell/gen-mapping-0.3.2" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; - sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; }; }; "@jridgewell/resolve-uri-3.0.7" = { @@ -1409,13 +1409,13 @@ let sha512 = "bLye8Ub4vUFQGmkh8qEqehr7SE7EJs2yDs0h9jzuL5oKi+F34CFmWkEErO8GAOQ8YNn7p6b3GxUgs+0BrHHDZQ=="; }; }; - "@sinclair/typebox-0.23.5" = { + "@sinclair/typebox-0.24.20" = { name = "_at_sinclair_slash_typebox"; packageName = "@sinclair/typebox"; - version = "0.23.5"; + version = "0.24.20"; src = fetchurl { - url = "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.23.5.tgz"; - sha512 = "AFBVi/iT4g20DHoujvMH1aEDn8fGJh4xsRGCP6d8RpLPMqsNPvW01Jcn0QysXTsg++/xj25NmJsGyH9xug/wKg=="; + url = "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.20.tgz"; + sha512 = "kVaO5aEFZb33nPMTZBxiPEkY+slxiPtqC7QX8f9B3eGOMBvEfuMfxp9DSTTCsRJPumPKjrge4yagyssO4q6qzQ=="; }; }; "@sinonjs/commons-1.8.3" = { @@ -1544,13 +1544,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jest-28.1.3" = { + "@types/jest-28.1.6" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "28.1.3"; + version = "28.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-28.1.3.tgz"; - sha512 = "Tsbjk8Y2hkBaY/gJsataeb4q9Mubw9EOz7+4RjPkzD5KjTvHHs7cpws22InaoXxAVAhF5HfFbzJjo6oKWqSZLw=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-28.1.6.tgz"; + sha512 = "0RbGAFMfcBJKOmqRazM8L98uokwuwD5F8rHrv/ZMbrZBwVOWZUyPG6VFNscjYr/vjM3Vu4fRrCPbOs42AfemaQ=="; }; }; "@types/js-yaml-4.0.5" = { @@ -1697,76 +1697,76 @@ let sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; - "@typescript-eslint/eslint-plugin-5.29.0" = { + "@typescript-eslint/eslint-plugin-5.31.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.29.0"; + version = "5.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.29.0.tgz"; - sha512 = "kgTsISt9pM53yRFQmLZ4npj99yGl3x3Pl7z4eA66OuTzAGC4bQB5H5fuLwPnqTKU3yyrrg4MIhjF17UYnL4c0w=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.31.0.tgz"; + sha512 = "VKW4JPHzG5yhYQrQ1AzXgVgX8ZAJEvCz0QI6mLRX4tf7rnFfh5D8SKm0Pq6w5PyNfAWJk6sv313+nEt3ohWMBQ=="; }; }; - "@typescript-eslint/parser-5.29.0" = { + "@typescript-eslint/parser-5.31.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.29.0"; + version = "5.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.29.0.tgz"; - sha512 = "ruKWTv+x0OOxbzIw9nW5oWlUopvP/IQDjB5ZqmTglLIoDTctLlAJpAQFpNPJP/ZI7hTT9sARBosEfaKbcFuECw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.31.0.tgz"; + sha512 = "UStjQiZ9OFTFReTrN+iGrC6O/ko9LVDhreEK5S3edmXgR396JGq7CoX2TWIptqt/ESzU2iRKXAHfSF2WJFcWHw=="; }; }; - "@typescript-eslint/scope-manager-5.29.0" = { + "@typescript-eslint/scope-manager-5.31.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.29.0"; + version = "5.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.29.0.tgz"; - sha512 = "etbXUT0FygFi2ihcxDZjz21LtC+Eps9V2xVx09zFoN44RRHPrkMflidGMI+2dUs821zR1tDS6Oc9IXxIjOUZwA=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.31.0.tgz"; + sha512 = "8jfEzBYDBG88rcXFxajdVavGxb5/XKXyvWgvD8Qix3EEJLCFIdVloJw+r9ww0wbyNLOTYyBsR+4ALNGdlalLLg=="; }; }; - "@typescript-eslint/type-utils-5.29.0" = { + "@typescript-eslint/type-utils-5.31.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.29.0"; + version = "5.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.29.0.tgz"; - sha512 = "JK6bAaaiJozbox3K220VRfCzLa9n0ib/J+FHIwnaV3Enw/TO267qe0pM1b1QrrEuy6xun374XEAsRlA86JJnyg=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.31.0.tgz"; + sha512 = "7ZYqFbvEvYXFn9ax02GsPcEOmuWNg+14HIf4q+oUuLnMbpJ6eHAivCg7tZMVwzrIuzX3QCeAOqKoyMZCv5xe+w=="; }; }; - "@typescript-eslint/types-5.29.0" = { + "@typescript-eslint/types-5.31.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.29.0"; + version = "5.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.29.0.tgz"; - sha512 = "X99VbqvAXOMdVyfFmksMy3u8p8yoRGITgU1joBJPzeYa0rhdf5ok9S56/itRoUSh99fiDoMtarSIJXo7H/SnOg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.31.0.tgz"; + sha512 = "/f/rMaEseux+I4wmR6mfpM2wvtNZb1p9hAV77hWfuKc3pmaANp5dLAZSiE3/8oXTYTt3uV9KW5yZKJsMievp6g=="; }; }; - "@typescript-eslint/typescript-estree-5.29.0" = { + "@typescript-eslint/typescript-estree-5.31.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.29.0"; + version = "5.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.29.0.tgz"; - sha512 = "mQvSUJ/JjGBdvo+1LwC+GY2XmSYjK1nAaVw2emp/E61wEVYEyibRHCqm1I1vEKbXCpUKuW4G7u9ZCaZhJbLoNQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.31.0.tgz"; + sha512 = "3S625TMcARX71wBc2qubHaoUwMEn+l9TCsaIzYI/ET31Xm2c9YQ+zhGgpydjorwQO9pLfR/6peTzS/0G3J/hDw=="; }; }; - "@typescript-eslint/utils-5.29.0" = { + "@typescript-eslint/utils-5.31.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.29.0"; + version = "5.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.29.0.tgz"; - sha512 = "3Eos6uP1nyLOBayc/VUdKZikV90HahXE5Dx9L5YlSd/7ylQPXhLk1BYb29SDgnBnTp+jmSZUU0QxUiyHgW4p7A=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.31.0.tgz"; + sha512 = "kcVPdQS6VIpVTQ7QnGNKMFtdJdvnStkqS5LeALr4rcwx11G6OWb2HB17NMPnlRHvaZP38hL9iK8DdE9Fne7NYg=="; }; }; - "@typescript-eslint/visitor-keys-5.29.0" = { + "@typescript-eslint/visitor-keys-5.31.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.29.0"; + version = "5.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.29.0.tgz"; - sha512 = "Hpb/mCWsjILvikMQoZIE3voc9wtQcS0A9FUw3h8bhr9UxBdtI/tw1ZDZUOXHXLOVMedKCH5NxyzATwnU78bWCQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.31.0.tgz"; + sha512 = "ZK0jVxSjS4gnPirpVjXHz7mgdOsZUHzNYSfTw2yPa3agfbt9YfqaBiBZFSSxeBWnpWkzCxTfUpnzA3Vily/CSg=="; }; }; "acorn-8.7.1" = { @@ -1958,13 +1958,13 @@ let sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; - "babel-jest-28.1.1" = { + "babel-jest-28.1.3" = { name = "babel-jest"; packageName = "babel-jest"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.1.tgz"; - sha512 = "MEt0263viUdAkTq5D7upHPNxvt4n9uLUGa6pPz3WviNBMtOmStb1lIXS3QobnoqM+qnH+vr4EKlvhe8QcmxIYw=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-28.1.3.tgz"; + sha512 = "epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -1985,13 +1985,13 @@ let sha512 = "Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA=="; }; }; - "babel-plugin-jest-hoist-28.1.1" = { + "babel-plugin-jest-hoist-28.1.3" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.1.tgz"; - sha512 = "NovGCy5Hn25uMJSAU8FaHqzs13cFoOI4lhIujiepssjCKRsAo3TA734RDWSGxuFTsUJXerYOqQQodlxgmtqbzw=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz"; + sha512 = "Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q=="; }; }; "babel-plugin-polyfill-corejs2-0.3.1" = { @@ -2030,13 +2030,13 @@ let sha512 = "M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ=="; }; }; - "babel-preset-jest-28.1.1" = { + "babel-preset-jest-28.1.3" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.1.tgz"; - sha512 = "FCq9Oud0ReTeWtcneYf/48981aTfXYuB9gbU4rBNNJVBSQ6ssv7E6v/qvbBxtOWwZFXjLZwpg+W3q7J6vhH25g=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz"; + sha512 = "L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A=="; }; }; "balanced-match-1.0.2" = { @@ -2219,15 +2219,6 @@ let sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; }; }; - "charcodes-0.2.0" = { - name = "charcodes"; - packageName = "charcodes"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/charcodes/-/charcodes-0.2.0.tgz"; - sha512 = "Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ=="; - }; - }; "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; @@ -2237,13 +2228,13 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; - "ci-info-3.3.1" = { + "ci-info-3.3.2" = { name = "ci-info"; packageName = "ci-info"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/ci-info/-/ci-info-3.3.1.tgz"; - sha512 = "SXgeMX9VwDe7iFFaEWkA5AstuER9YKqy4EhHqr4DVqkwmD9rpVimkMKWHdjn30Ja45txyjhSn63lVX69eVCckg=="; + url = "https://registry.npmjs.org/ci-info/-/ci-info-3.3.2.tgz"; + sha512 = "xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg=="; }; }; "cjs-module-lexer-1.2.2" = { @@ -2444,13 +2435,13 @@ let sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; }; }; - "core-js-3.23.3" = { + "core-js-3.24.1" = { name = "core-js"; packageName = "core-js"; - version = "3.23.3"; + version = "3.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.23.3.tgz"; - sha512 = "oAKwkj9xcWNBAvGbT//WiCdOMpb9XQG92/Fe3ABFM/R16BsHgePG00mFOgKf7IsCtfj8tA1kHtf/VwErhriz5Q=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz"; + sha512 = "0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg=="; }; }; "core-js-compat-3.22.7" = { @@ -2813,13 +2804,13 @@ let sha512 = "TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="; }; }; - "eslint-8.18.0" = { + "eslint-8.20.0" = { name = "eslint"; packageName = "eslint"; - version = "8.18.0"; + version = "8.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.18.0.tgz"; - sha512 = "As1EfFMVk7Xc6/CvhssHUjsAQSkpfXvUGMFC3ce8JDe6WvqCgRrLOBQbVpsBFr1X1V+RACOadnzVvcUS5ni2bA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.20.0.tgz"; + sha512 = "d4ixhz5SKCa1D6SCPrivP7yYVi7nyD6A4vs6HIAul9ujBzcEmZVM3/0NN/yu5nKhmO1wjp5xQ46iRfmDGlOviA=="; }; }; "eslint-config-google-0.14.0" = { @@ -2831,13 +2822,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-26.5.3" = { + "eslint-plugin-jest-26.7.0" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "26.5.3"; + version = "26.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.5.3.tgz"; - sha512 = "sICclUqJQnR1bFRZGLN2jnSVsYOsmPYYnroGCIMVSvTS3y8XR3yjzy1EcTQmk6typ5pRgyIWzbjqxK6cZHEZuQ=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.7.0.tgz"; + sha512 = "/YNitdfG3o3cC6juZziAdkk6nfJt01jXVfj4AgaYVLs7bupHzRDL5K+eipdzhDXtQsiqaX1TzfwSuRlEgeln1A=="; }; }; "eslint-scope-5.1.1" = { @@ -2984,13 +2975,13 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-28.1.1" = { + "expect-28.1.3" = { name = "expect"; packageName = "expect"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-28.1.1.tgz"; - sha512 = "/AANEwGL0tWBwzLNOvO0yUdy2D52jVdNXppOqswC49sxMN2cPWsGCQdzuIf9tj6hHoBQzNvx75JUYuQAckPo3w=="; + url = "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz"; + sha512 = "eEh0xn8HlsuOBxFgIss+2mX85VAS4Qy3OSkjV7rlBWljtA4oWH37glVGyOZSZvErDT/yBywZdPGwCXuTvSG85g=="; }; }; "fast-deep-equal-3.1.3" = { @@ -3236,13 +3227,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.1.1" = { + "get-intrinsic-1.1.2" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.1"; + version = "1.1.2"; 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.2.tgz"; + sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; }; }; "get-package-type-0.1.0" = { @@ -3368,7 +3359,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; }; "has-flag-4.0.0" = { @@ -3695,67 +3686,67 @@ let sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; }; }; - "istanbul-reports-3.1.4" = { + "istanbul-reports-3.1.5" = { name = "istanbul-reports"; packageName = "istanbul-reports"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.4.tgz"; - sha512 = "r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw=="; + url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz"; + sha512 = "nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w=="; }; }; - "jest-28.1.1" = { + "jest-28.1.3" = { name = "jest"; packageName = "jest"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-28.1.1.tgz"; - sha512 = "qw9YHBnjt6TCbIDMPMpJZqf9E12rh6869iZaN08/vpOGgHJSAaLLUn6H8W3IAEuy34Ls3rct064mZLETkxJ2XA=="; + url = "https://registry.npmjs.org/jest/-/jest-28.1.3.tgz"; + sha512 = "N4GT5on8UkZgH0O5LUavMRV1EDEhNTL0KEfRmDIeZHSV7p2XgLoY9t9VDUgL6o+yfdgYHVxuz81G8oB9VG5uyA=="; }; }; - "jest-changed-files-28.0.2" = { + "jest-changed-files-28.1.3" = { name = "jest-changed-files"; packageName = "jest-changed-files"; - version = "28.0.2"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.0.2.tgz"; - sha512 = "QX9u+5I2s54ZnGoMEjiM2WeBvJR2J7w/8ZUmH2um/WLAuGAYFQcsVXY9+1YL6k0H/AGUdH8pXUAv6erDqEsvIA=="; + url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-28.1.3.tgz"; + sha512 = "esaOfUWJXk2nfZt9SPyC8gA1kNfdKLkQWyzsMlqq8msYSlNKfmZxfRgZn4Cd4MGVUF+7v6dBs0d5TOAKa7iIiA=="; }; }; - "jest-circus-28.1.1" = { + "jest-circus-28.1.3" = { name = "jest-circus"; packageName = "jest-circus"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.1.tgz"; - sha512 = "75+BBVTsL4+p2w198DQpCeyh1RdaS2lhEG87HkaFX/UG0gJExVq2skG2pT7XZEGBubNj2CytcWSPan4QEPNosw=="; + url = "https://registry.npmjs.org/jest-circus/-/jest-circus-28.1.3.tgz"; + sha512 = "cZ+eS5zc79MBwt+IhQhiEp0OeBddpc1n8MBo1nMB8A7oPMKEO+Sre+wHaLJexQUj9Ya/8NOBY0RESUgYjB6fow=="; }; }; - "jest-cli-28.1.1" = { + "jest-cli-28.1.3" = { name = "jest-cli"; packageName = "jest-cli"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.1.tgz"; - sha512 = "+sUfVbJqb1OjBZ0OdBbI6OWfYM1i7bSfzYy6gze1F1w3OKWq8ZTEKkZ8a7ZQPq6G/G1qMh/uKqpdWhgl11NFQQ=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-28.1.3.tgz"; + sha512 = "roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ=="; }; }; - "jest-config-28.1.1" = { + "jest-config-28.1.3" = { name = "jest-config"; packageName = "jest-config"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-28.1.1.tgz"; - sha512 = "tASynMhS+jVV85zKvjfbJ8nUyJS/jUSYZ5KQxLUN2ZCvcQc/OmhQl2j6VEL3ezQkNofxn5pQ3SPYWPHb0unTZA=="; + url = "https://registry.npmjs.org/jest-config/-/jest-config-28.1.3.tgz"; + sha512 = "MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ=="; }; }; - "jest-diff-28.1.1" = { + "jest-diff-28.1.3" = { name = "jest-diff"; packageName = "jest-diff"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.1.tgz"; - sha512 = "/MUUxeR2fHbqHoMMiffe/Afm+U8U4olFRJ0hiVG2lZatPJcnGxx292ustVu7bULhjV65IYMxRdploAKLbcrsyg=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz"; + sha512 = "8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw=="; }; }; "jest-docblock-28.1.1" = { @@ -3767,22 +3758,22 @@ let sha512 = "3wayBVNiOYx0cwAbl9rwm5kKFP8yHH3d/fkEaL02NPTkDojPtheGB7HZSFY4wzX+DxyrvhXz0KSCVksmCknCuA=="; }; }; - "jest-each-28.1.1" = { + "jest-each-28.1.3" = { name = "jest-each"; packageName = "jest-each"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-28.1.1.tgz"; - sha512 = "A042rqh17ZvEhRceDMi784ppoXR7MWGDEKTXEZXb4svt0eShMZvijGxzKsx+yIjeE8QYmHPrnHiTSQVhN4nqaw=="; + url = "https://registry.npmjs.org/jest-each/-/jest-each-28.1.3.tgz"; + sha512 = "arT1z4sg2yABU5uogObVPvSlSMQlDA48owx07BDPAiasW0yYpYHYOo4HHLz9q0BVzDVU4hILFjzJw0So9aCL/g=="; }; }; - "jest-environment-node-28.1.1" = { + "jest-environment-node-28.1.3" = { name = "jest-environment-node"; packageName = "jest-environment-node"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.1.tgz"; - sha512 = "2aV/eeY/WNgUUJrrkDJ3cFEigjC5fqT1+fCclrY6paqJ5zVPoM//sHmfgUUp7WLYxIdbPwMiVIzejpN56MxnNA=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-28.1.3.tgz"; + sha512 = "ugP6XOhEpjAEhGYvp5Xj989ns5cB1K6ZdjBYuS30umT4CQEETaxSiPcZ/E1kFktX4GkrcM4qu07IIlDYX1gp+A=="; }; }; "jest-get-type-28.0.2" = { @@ -3794,49 +3785,49 @@ let sha512 = "ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA=="; }; }; - "jest-haste-map-28.1.1" = { + "jest-haste-map-28.1.3" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.1.tgz"; - sha512 = "ZrRSE2o3Ezh7sb1KmeLEZRZ4mgufbrMwolcFHNRSjKZhpLa8TdooXOOFlSwoUzlbVs1t0l7upVRW2K7RWGHzbQ=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-28.1.3.tgz"; + sha512 = "3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA=="; }; }; - "jest-leak-detector-28.1.1" = { + "jest-leak-detector-28.1.3" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.1.tgz"; - sha512 = "4jvs8V8kLbAaotE+wFR7vfUGf603cwYtFf1/PYEsyX2BAjSzj8hQSVTP6OWzseTl0xL6dyHuKs2JAks7Pfubmw=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-28.1.3.tgz"; + sha512 = "WFVJhnQsiKtDEo5lG2mM0v40QWnBM+zMdHHyJs8AWZ7J0QZJS59MsyKeJHWhpBZBH32S48FOVvGyOFT1h0DlqA=="; }; }; - "jest-matcher-utils-28.1.1" = { + "jest-matcher-utils-28.1.3" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.1.tgz"; - sha512 = "NPJPRWrbmR2nAJ+1nmnfcKKzSwgfaciCCrYZzVnNoxVoyusYWIjkBMNvu0RHJe7dNj4hH3uZOPZsQA+xAYWqsw=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz"; + sha512 = "kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw=="; }; }; - "jest-message-util-28.1.1" = { + "jest-message-util-28.1.3" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.1.tgz"; - sha512 = "xoDOOT66fLfmTRiqkoLIU7v42mal/SqwDKvfmfiWAdJMSJiU+ozgluO7KbvoAgiwIrrGZsV7viETjc8GNrA/IQ=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-28.1.3.tgz"; + sha512 = "PFdn9Iewbt575zKPf1286Ht9EPoJmYT7P0kY+RibeYZ2XtOr53pDLEFoTWXbd1h4JiGiWpTBC84fc8xMXQMb7g=="; }; }; - "jest-mock-28.1.1" = { + "jest-mock-28.1.3" = { name = "jest-mock"; packageName = "jest-mock"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.1.tgz"; - sha512 = "bDCb0FjfsmKweAvE09dZT59IMkzgN0fYBH6t5S45NoJfd2DHkS3ySG2K+hucortryhO3fVuXdlxWcbtIuV/Skw=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-28.1.3.tgz"; + sha512 = "o3J2jr6dMMWYVH4Lh/NKmDXdosrsJgi4AviS8oXLujcjpCMBb1FMsblDnOXKZKfSiHLxYub1eS0IHuRXsio9eA=="; }; }; "jest-pnp-resolver-1.2.2" = { @@ -3857,85 +3848,85 @@ let sha512 = "4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw=="; }; }; - "jest-resolve-28.1.1" = { + "jest-resolve-28.1.3" = { name = "jest-resolve"; packageName = "jest-resolve"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.1.tgz"; - sha512 = "/d1UbyUkf9nvsgdBildLe6LAD4DalgkgZcKd0nZ8XUGPyA/7fsnaQIlKVnDiuUXv/IeZhPEDrRJubVSulxrShA=="; + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-28.1.3.tgz"; + sha512 = "Z1W3tTjE6QaNI90qo/BJpfnvpxtaFTFw5CDgwpyE/Kz8U/06N1Hjf4ia9quUhCh39qIGWF1ZuxFiBiJQwSEYKQ=="; }; }; - "jest-resolve-dependencies-28.1.1" = { + "jest-resolve-dependencies-28.1.3" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.1.tgz"; - sha512 = "p8Y150xYJth4EXhOuB8FzmS9r8IGLEioiaetgdNGb9VHka4fl0zqWlVe4v7mSkYOuEUg2uB61iE+zySDgrOmgQ=="; + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-28.1.3.tgz"; + sha512 = "qa0QO2Q0XzQoNPouMbCc7Bvtsem8eQgVPNkwn9LnS+R2n8DaVDPL/U1gngC0LTl1RYXJU0uJa2BMC2DbTfFrHA=="; }; }; - "jest-runner-28.1.1" = { + "jest-runner-28.1.3" = { name = "jest-runner"; packageName = "jest-runner"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.1.tgz"; - sha512 = "W5oFUiDBgTsCloTAj6q95wEvYDB0pxIhY6bc5F26OucnwBN+K58xGTGbliSMI4ChQal5eANDF+xvELaYkJxTmA=="; + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-28.1.3.tgz"; + sha512 = "GkMw4D/0USd62OVO0oEgjn23TM+YJa2U2Wu5zz9xsQB1MxWKDOlrnykPxnMsN0tnJllfLPinHTka61u0QhaxBA=="; }; }; - "jest-runtime-28.1.1" = { + "jest-runtime-28.1.3" = { name = "jest-runtime"; packageName = "jest-runtime"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.1.tgz"; - sha512 = "J89qEJWW0leOsqyi0D9zHpFEYHwwafFdS9xgvhFHtIdRghbadodI0eA+DrthK/1PebBv3Px8mFSMGKrtaVnleg=="; + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-28.1.3.tgz"; + sha512 = "NU+881ScBQQLc1JHG5eJGU7Ui3kLKrmwCPPtYsJtBykixrM2OhVQlpMmFWJjMyDfdkGgBMNjXCGB/ebzsgNGQw=="; }; }; - "jest-snapshot-28.1.1" = { + "jest-snapshot-28.1.3" = { name = "jest-snapshot"; packageName = "jest-snapshot"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.1.tgz"; - sha512 = "1KjqHJ98adRcbIdMizjF5DipwZFbvxym/kFO4g4fVZCZRxH/dqV8TiBFCa6rqic3p0karsy8RWS1y4E07b7P0A=="; + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-28.1.3.tgz"; + sha512 = "4lzMgtiNlc3DU/8lZfmqxN3AYD6GGLbl+72rdBpXvcV+whX7mDrREzkPdp2RnmfIiWBg1YbuFSkXduF2JcafJg=="; }; }; - "jest-util-28.1.1" = { + "jest-util-28.1.3" = { name = "jest-util"; packageName = "jest-util"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-28.1.1.tgz"; - sha512 = "FktOu7ca1DZSyhPAxgxB6hfh2+9zMoJ7aEQA759Z6p45NuO8mWcqujH+UdHlCm/V6JTWwDztM2ITCzU1ijJAfw=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-28.1.3.tgz"; + sha512 = "XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ=="; }; }; - "jest-validate-28.1.1" = { + "jest-validate-28.1.3" = { name = "jest-validate"; packageName = "jest-validate"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.1.tgz"; - sha512 = "Kpf6gcClqFCIZ4ti5++XemYJWUPCFUW+N2gknn+KgnDf549iLul3cBuKVe1YcWRlaF8tZV8eJCap0eECOEE3Ug=="; + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-28.1.3.tgz"; + sha512 = "SZbOGBWEsaTxBGCOpsRWlXlvNkvTkY0XxRfh7zYmvd8uL5Qzyg0CHAXiXKROflh801quA6+/DsT4ODDthOC/OA=="; }; }; - "jest-watcher-28.1.1" = { + "jest-watcher-28.1.3" = { name = "jest-watcher"; packageName = "jest-watcher"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.1.tgz"; - sha512 = "RQIpeZ8EIJMxbQrXpJQYIIlubBnB9imEHsxxE41f54ZwcqWLysL/A0ZcdMirf+XsMn3xfphVQVV4EW0/p7i7Ug=="; + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-28.1.3.tgz"; + sha512 = "t4qcqj9hze+jviFPUN3YAtAEeFnr/azITXQEMARf5cMwKY2SMBRnCQTXLixTl20OR6mLh9KLMrgVJgJISym+1g=="; }; }; - "jest-worker-28.1.1" = { + "jest-worker-28.1.3" = { name = "jest-worker"; packageName = "jest-worker"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.1.tgz"; - sha512 = "Au7slXB08C6h+xbJPp7VIb6U0XX5Kc9uel/WFc6/rcTzGiaVCBRngBExSYuXSLFPULPSYU3cJ3ybS988lNFQhQ=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz"; + sha512 = "CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g=="; }; }; "js-sdsl-2.1.4" = { @@ -3980,7 +3971,7 @@ let version = "0.5.0"; src = fetchurl { url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; }; }; "jsesc-2.5.2" = { @@ -4334,13 +4325,13 @@ let sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; }; - "moment-2.29.3" = { + "moment-2.29.4" = { name = "moment"; packageName = "moment"; - version = "2.29.3"; + version = "2.29.4"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz"; - sha512 = "c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"; + sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; }; "mqtt-4.3.7" = { @@ -4595,6 +4586,15 @@ let sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; + "p-limit-3.1.0" = { + name = "p-limit"; + packageName = "p-limit"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"; + sha512 = "TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ=="; + }; + }; "p-locate-4.1.0" = { name = "p-locate"; packageName = "p-locate"; @@ -4748,13 +4748,13 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-28.1.1" = { + "pretty-format-28.1.3" = { name = "pretty-format"; packageName = "pretty-format"; - version = "28.1.1"; + version = "28.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.1.tgz"; - sha512 = "wwJbVTGFHeucr5Jw2bQ9P+VYHyLdAqedFLEkdQUVaBF/eiidDwH5OpilINq4mEfhbCjLnirt6HTTDhv1HaTIQw=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz"; + sha512 = "8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q=="; }; }; "process-nextick-args-2.0.1" = { @@ -4973,13 +4973,13 @@ let sha512 = "pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg=="; }; }; - "regexpu-core-5.0.1" = { + "regexpu-core-5.1.0" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz"; - sha512 = "CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz"; + sha512 = "bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA=="; }; }; "regjsgen-0.6.0" = { @@ -5603,15 +5603,6 @@ let sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; }; }; - "throat-6.0.1" = { - name = "throat"; - packageName = "throat"; - version = "6.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz"; - sha512 = "8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w=="; - }; - }; "tmp-0.2.1" = { name = "tmp"; packageName = "tmp"; @@ -5846,13 +5837,13 @@ let sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; }; - "v8-to-istanbul-9.0.0" = { + "v8-to-istanbul-9.0.1" = { name = "v8-to-istanbul"; packageName = "v8-to-istanbul"; - version = "9.0.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.0.tgz"; - sha512 = "HcvgY/xaRm7isYmyx+lFKA4uQmfUbN0J4M0nNItvzTvH/iQ9kW5j/t4YSR+Ge323/lrgDAWJoF46tzGQHwBHFw=="; + url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz"; + sha512 = "74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w=="; }; }; "validate.io-array-1.0.6" = { @@ -5936,22 +5927,22 @@ let sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; }; - "winston-3.8.0" = { + "winston-3.8.1" = { name = "winston"; packageName = "winston"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.8.0.tgz"; - sha512 = "Iix1w8rIq2kBDkGvclO0db2CVOHYVamCIkVWcUbs567G9i2pdB+gvqLgDgxx4B4HXHYD6U4Zybh6ojepUOqcFQ=="; + url = "https://registry.npmjs.org/winston/-/winston-3.8.1.tgz"; + sha512 = "r+6YAiCR4uI3N8eQNOg8k3P3PqwAm20cLKlzVD9E66Ch39+LZC+VH1UKf9JemQj2B3QoUHfKD7Poewn0Pr3Y1w=="; }; }; - "winston-syslog-2.5.0" = { + "winston-syslog-2.6.0" = { name = "winston-syslog"; packageName = "winston-syslog"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston-syslog/-/winston-syslog-2.5.0.tgz"; - sha512 = "tTMwijNAuZov5xDv3EB/QojvELcigF2YtadgEqoPWlRiV1fTvvLPNGxCNRzi6u3FNOJeZ2Qxjmjqn7ZcUxvp8Q=="; + url = "https://registry.npmjs.org/winston-syslog/-/winston-syslog-2.6.0.tgz"; + sha512 = "3auiQmb5TvDPZ26RqZwGVckV0x5ro//5ycvYtfnJ5enAs7Y+aOdjUa+cO2pCYNexTsJg0Otktv4ccY5HgNgC0w=="; }; }; "winston-transport-4.5.0" = { @@ -6008,13 +5999,13 @@ let sha512 = "ri1Id1WinAX5Jqn9HejiGb8crfRio0Qgu8+MtL36rlTA6RLsMdWt1Az/19A2Qij6uSHUMphEFaTKa4WG+UNHNw=="; }; }; - "ws-8.8.0" = { + "ws-8.8.1" = { name = "ws"; packageName = "ws"; - version = "8.8.0"; + version = "8.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz"; - sha512 = "JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ=="; + url = "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz"; + sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA=="; }; }; "xtend-4.0.2" = { @@ -6062,113 +6053,122 @@ let sha512 = "9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg=="; }; }; - "zigbee-herdsman-0.14.40" = { + "yocto-queue-0.1.0" = { + name = "yocto-queue"; + packageName = "yocto-queue"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"; + sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q=="; + }; + }; + "zigbee-herdsman-0.14.46" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.14.40"; + version = "0.14.46"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.40.tgz"; - sha512 = "3ubz5awyiHSTCGlb5WXk5uNefa9xEhRcAWbKqXnQTfDlJpIIquOa08t0g3reUq+u4WM3GWOmFOcqIwe5hrTUrw=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.46.tgz"; + sha512 = "i05yGfbe7xZv7dazBz1bZMHaMG7m5MMXr8u7huHuItyIgUysdY1fePVFQCoQOEKtDiPPbyXSJ/nzj157Trb9Cg=="; }; }; - "zigbee-herdsman-converters-14.0.559" = { + "zigbee-herdsman-converters-14.0.583" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "14.0.559"; + version = "14.0.583"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.559.tgz"; - sha512 = "MJhsKZBXtzwenleFWI7UUydHWflSm5DA/+lKxYw26UAdXpsZ3V9Jw0aUpFdu1KNbKNvFei/DafTICy7Y6oPYTQ=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.583.tgz"; + sha512 = "yHaMj8hvaXgQ1gQ+IT2adg53AgI+gB7FgrvSxxBOYqq1v6/GJQKFIju0d3YiYoFMvQ7P2I5GNcKJz6yKK3wotg=="; }; }; - "zigbee2mqtt-frontend-0.6.103" = { + "zigbee2mqtt-frontend-0.6.107" = { name = "zigbee2mqtt-frontend"; packageName = "zigbee2mqtt-frontend"; - version = "0.6.103"; + version = "0.6.107"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.103.tgz"; - sha512 = "HQcZcfBUgGYbiyOkabumqa6rg60T3IGFiJRT4qI8m/XhohFTrn31NQY8b0eSWJn/udXTztkDZZ1l95Dx1Ldlaw=="; + url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.107.tgz"; + sha512 = "/s9Ec2DnOPTH7+zOnebQdkC/9pDZ1H+kvOZhN2/V9yrwAXQHJm9A0RVhY/ErSk0Ecl/gR9jw1Dvn9bEmtK3Kuw=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.26.0"; + version = "1.27.0"; src = ./.; dependencies = [ sources."@ampproject/remapping-2.2.0" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.17.10" - (sources."@babel/core-7.18.5" // { + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" + (sources."@babel/core-7.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.18.2" // { + (sources."@babel/generator-7.18.9" // { dependencies = [ - sources."@jridgewell/gen-mapping-0.3.1" + sources."@jridgewell/gen-mapping-0.3.2" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.18.2" // { + sources."@babel/helper-annotate-as-pure-7.18.6" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" + (sources."@babel/helper-compilation-targets-7.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.0" - sources."@babel/helper-create-regexp-features-plugin-7.17.12" + sources."@babel/helper-create-class-features-plugin-7.18.9" + sources."@babel/helper-create-regexp-features-plugin-7.18.6" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-explode-assignable-expression-7.16.7" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.17.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-remap-async-to-generator-7.16.8" - sources."@babel/helper-replace-supers-7.18.2" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.5" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-async-generator-functions-7.17.12" - sources."@babel/plugin-proposal-class-properties-7.17.12" - sources."@babel/plugin-proposal-class-static-block-7.18.0" - sources."@babel/plugin-proposal-decorators-7.18.2" - sources."@babel/plugin-proposal-dynamic-import-7.16.7" - sources."@babel/plugin-proposal-export-namespace-from-7.17.12" - sources."@babel/plugin-proposal-json-strings-7.17.12" - sources."@babel/plugin-proposal-logical-assignment-operators-7.17.12" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" - sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.18.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" - sources."@babel/plugin-proposal-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-private-methods-7.17.12" - sources."@babel/plugin-proposal-private-property-in-object-7.17.12" - sources."@babel/plugin-proposal-unicode-property-regex-7.17.12" + sources."@babel/helper-environment-visitor-7.18.9" + sources."@babel/helper-explode-assignable-expression-7.18.6" + sources."@babel/helper-function-name-7.18.9" + 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.18.9" + sources."@babel/helper-optimise-call-expression-7.18.6" + sources."@babel/helper-plugin-utils-7.18.9" + sources."@babel/helper-remap-async-to-generator-7.18.6" + sources."@babel/helper-replace-supers-7.18.9" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-skip-transparent-expression-wrappers-7.18.9" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helper-wrap-function-7.18.6" + sources."@babel/helpers-7.18.9" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.9" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-async-generator-functions-7.18.6" + sources."@babel/plugin-proposal-class-properties-7.18.6" + sources."@babel/plugin-proposal-class-static-block-7.18.6" + sources."@babel/plugin-proposal-decorators-7.18.9" + sources."@babel/plugin-proposal-dynamic-import-7.18.6" + sources."@babel/plugin-proposal-export-namespace-from-7.18.9" + sources."@babel/plugin-proposal-json-strings-7.18.6" + sources."@babel/plugin-proposal-logical-assignment-operators-7.18.9" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" + sources."@babel/plugin-proposal-numeric-separator-7.18.6" + sources."@babel/plugin-proposal-object-rest-spread-7.18.9" + sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.18.9" + sources."@babel/plugin-proposal-private-methods-7.18.6" + sources."@babel/plugin-proposal-private-property-in-object-7.18.6" + sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-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.17.12" + sources."@babel/plugin-syntax-decorators-7.18.6" 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.17.12" + sources."@babel/plugin-syntax-import-assertions-7.18.6" sources."@babel/plugin-syntax-import-meta-7.10.4" sources."@babel/plugin-syntax-json-strings-7.8.3" sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" @@ -6179,51 +6179,51 @@ let 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.17.12" - sources."@babel/plugin-transform-arrow-functions-7.17.12" - sources."@babel/plugin-transform-async-to-generator-7.17.12" - sources."@babel/plugin-transform-block-scoped-functions-7.16.7" - sources."@babel/plugin-transform-block-scoping-7.17.12" - sources."@babel/plugin-transform-classes-7.17.12" - sources."@babel/plugin-transform-computed-properties-7.17.12" - sources."@babel/plugin-transform-destructuring-7.18.0" - sources."@babel/plugin-transform-dotall-regex-7.16.7" - sources."@babel/plugin-transform-duplicate-keys-7.17.12" - sources."@babel/plugin-transform-exponentiation-operator-7.16.7" - sources."@babel/plugin-transform-for-of-7.18.1" - sources."@babel/plugin-transform-function-name-7.16.7" - sources."@babel/plugin-transform-literals-7.17.12" - sources."@babel/plugin-transform-member-expression-literals-7.16.7" - sources."@babel/plugin-transform-modules-amd-7.18.0" - sources."@babel/plugin-transform-modules-commonjs-7.18.2" - sources."@babel/plugin-transform-modules-systemjs-7.18.0" - sources."@babel/plugin-transform-modules-umd-7.18.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.12" - sources."@babel/plugin-transform-new-target-7.17.12" - sources."@babel/plugin-transform-object-super-7.16.7" - sources."@babel/plugin-transform-parameters-7.17.12" - sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-regenerator-7.18.0" - sources."@babel/plugin-transform-reserved-words-7.17.12" - sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/plugin-transform-spread-7.17.12" - sources."@babel/plugin-transform-sticky-regex-7.16.7" - sources."@babel/plugin-transform-template-literals-7.18.2" - sources."@babel/plugin-transform-typeof-symbol-7.17.12" - sources."@babel/plugin-transform-typescript-7.18.1" - sources."@babel/plugin-transform-unicode-escapes-7.16.7" - sources."@babel/plugin-transform-unicode-regex-7.16.7" - (sources."@babel/preset-env-7.18.2" // { + sources."@babel/plugin-syntax-typescript-7.18.6" + sources."@babel/plugin-transform-arrow-functions-7.18.6" + sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-block-scoped-functions-7.18.6" + sources."@babel/plugin-transform-block-scoping-7.18.9" + sources."@babel/plugin-transform-classes-7.18.9" + sources."@babel/plugin-transform-computed-properties-7.18.9" + sources."@babel/plugin-transform-destructuring-7.18.9" + sources."@babel/plugin-transform-dotall-regex-7.18.6" + sources."@babel/plugin-transform-duplicate-keys-7.18.9" + sources."@babel/plugin-transform-exponentiation-operator-7.18.6" + sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-function-name-7.18.9" + sources."@babel/plugin-transform-literals-7.18.9" + sources."@babel/plugin-transform-member-expression-literals-7.18.6" + sources."@babel/plugin-transform-modules-amd-7.18.6" + sources."@babel/plugin-transform-modules-commonjs-7.18.6" + sources."@babel/plugin-transform-modules-systemjs-7.18.9" + sources."@babel/plugin-transform-modules-umd-7.18.6" + sources."@babel/plugin-transform-named-capturing-groups-regex-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.18.8" + sources."@babel/plugin-transform-property-literals-7.18.6" + sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-reserved-words-7.18.6" + sources."@babel/plugin-transform-shorthand-properties-7.18.6" + sources."@babel/plugin-transform-spread-7.18.9" + 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.18.6" + sources."@babel/plugin-transform-unicode-escapes-7.18.6" + sources."@babel/plugin-transform-unicode-regex-7.18.6" + (sources."@babel/preset-env-7.18.9" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-7.17.12" + sources."@babel/preset-typescript-7.18.6" sources."@babel/runtime-7.18.3" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.5" - sources."@babel/types-7.18.4" + sources."@babel/template-7.18.6" + sources."@babel/traverse-7.18.9" + sources."@babel/types-7.18.9" sources."@bcoe/v8-coverage-0.2.3" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" @@ -6244,7 +6244,7 @@ let ]; }) sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-28.1.1" // { + (sources."@jest/console-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6254,7 +6254,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-28.1.1" // { + (sources."@jest/core-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6264,12 +6264,12 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/environment-28.1.1" - sources."@jest/expect-28.1.1" - sources."@jest/expect-utils-28.1.1" - sources."@jest/fake-timers-28.1.1" - sources."@jest/globals-28.1.1" - (sources."@jest/reporters-28.1.1" // { + sources."@jest/environment-28.1.3" + sources."@jest/expect-28.1.3" + sources."@jest/expect-utils-28.1.3" + sources."@jest/fake-timers-28.1.3" + sources."@jest/globals-28.1.3" + (sources."@jest/reporters-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6279,11 +6279,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/schemas-28.0.2" - sources."@jest/source-map-28.0.2" - sources."@jest/test-result-28.1.1" - sources."@jest/test-sequencer-28.1.1" - (sources."@jest/transform-28.1.1" // { + sources."@jest/schemas-28.1.3" + sources."@jest/source-map-28.1.2" + sources."@jest/test-result-28.1.3" + sources."@jest/test-sequencer-28.1.3" + (sources."@jest/transform-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6293,7 +6293,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/types-28.1.1" // { + (sources."@jest/types-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6334,7 +6334,7 @@ let sources."@serialport/parser-ready-9.2.4" sources."@serialport/parser-regex-9.2.4" sources."@serialport/stream-9.2.4" - sources."@sinclair/typebox-0.23.5" + sources."@sinclair/typebox-0.24.20" sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-9.1.2" sources."@types/babel__core-7.1.19" @@ -6349,7 +6349,7 @@ let 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/jest-28.1.3" + sources."@types/jest-28.1.6" sources."@types/js-yaml-4.0.5" sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" @@ -6366,14 +6366,14 @@ let sources."@types/ws-8.5.3" sources."@types/yargs-17.0.10" sources."@types/yargs-parser-21.0.0" - sources."@typescript-eslint/eslint-plugin-5.29.0" - sources."@typescript-eslint/parser-5.29.0" - sources."@typescript-eslint/scope-manager-5.29.0" - sources."@typescript-eslint/type-utils-5.29.0" - sources."@typescript-eslint/types-5.29.0" - sources."@typescript-eslint/typescript-estree-5.29.0" - sources."@typescript-eslint/utils-5.29.0" - sources."@typescript-eslint/visitor-keys-5.29.0" + sources."@typescript-eslint/eslint-plugin-5.31.0" + sources."@typescript-eslint/parser-5.31.0" + sources."@typescript-eslint/scope-manager-5.31.0" + sources."@typescript-eslint/type-utils-5.31.0" + sources."@typescript-eslint/types-5.31.0" + sources."@typescript-eslint/typescript-estree-5.31.0" + sources."@typescript-eslint/utils-5.31.0" + sources."@typescript-eslint/visitor-keys-5.31.0" sources."acorn-8.7.1" sources."acorn-jsx-5.3.2" sources."agent-base-6.0.2" @@ -6395,7 +6395,7 @@ let sources."async-3.2.3" sources."asynckit-0.4.0" sources."axios-0.27.2" - (sources."babel-jest-28.1.1" // { + (sources."babel-jest-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6407,7 +6407,7 @@ let }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" - sources."babel-plugin-jest-hoist-28.1.1" + sources."babel-plugin-jest-hoist-28.1.3" (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" @@ -6416,7 +6416,7 @@ let sources."babel-plugin-polyfill-corejs3-0.5.2" sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-preset-current-node-syntax-1.0.1" - sources."babel-preset-jest-28.1.1" + sources."babel-preset-jest-28.1.3" sources."balanced-match-1.0.2" sources."base64-js-1.5.1" sources."bind-decorator-1.0.11" @@ -6435,9 +6435,8 @@ let sources."caniuse-lite-1.0.30001344" sources."chalk-2.4.2" sources."char-regex-1.0.2" - sources."charcodes-0.2.0" sources."chownr-1.1.4" - sources."ci-info-3.3.1" + sources."ci-info-3.3.2" sources."cjs-module-lexer-1.2.2" sources."classnames-2.3.1" sources."cliui-7.0.4" @@ -6467,7 +6466,7 @@ let }) sources."console-control-strings-1.1.0" sources."convert-source-map-1.8.0" - sources."core-js-3.23.3" + sources."core-js-3.24.1" (sources."core-js-compat-3.22.7" // { dependencies = [ sources."semver-7.0.0" @@ -6509,7 +6508,7 @@ let sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" - (sources."eslint-8.18.0" // { + (sources."eslint-8.20.0" // { dependencies = [ sources."ajv-6.12.6" sources."ansi-styles-4.3.0" @@ -6527,7 +6526,7 @@ let ]; }) sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-26.5.3" + sources."eslint-plugin-jest-26.7.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -6553,7 +6552,7 @@ let sources."execa-5.1.1" sources."exit-0.1.2" sources."expand-template-2.0.3" - sources."expect-28.1.1" + sources."expect-28.1.3" sources."fast-deep-equal-3.1.3" (sources."fast-glob-3.2.11" // { dependencies = [ @@ -6597,7 +6596,7 @@ let }) sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.1" + sources."get-intrinsic-1.1.2" sources."get-package-type-0.1.0" sources."get-stream-6.0.1" sources."git-last-commit-1.0.1" @@ -6656,10 +6655,25 @@ let ]; }) sources."istanbul-lib-source-maps-4.0.1" - sources."istanbul-reports-3.1.4" - sources."jest-28.1.1" - sources."jest-changed-files-28.0.2" - (sources."jest-circus-28.1.1" // { + sources."istanbul-reports-3.1.5" + sources."jest-28.1.3" + (sources."jest-changed-files-28.1.3" // { + dependencies = [ + sources."p-limit-3.1.0" + ]; + }) + (sources."jest-circus-28.1.3" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.2" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."p-limit-3.1.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."jest-cli-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6669,7 +6683,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-cli-28.1.1" // { + (sources."jest-config-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6679,17 +6693,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-config-28.1.1" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."has-flag-4.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-diff-28.1.1" // { + (sources."jest-diff-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6700,7 +6704,7 @@ let ]; }) sources."jest-docblock-28.1.1" - (sources."jest-each-28.1.1" // { + (sources."jest-each-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6710,11 +6714,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-node-28.1.1" + sources."jest-environment-node-28.1.3" sources."jest-get-type-28.0.2" - sources."jest-haste-map-28.1.1" - sources."jest-leak-detector-28.1.1" - (sources."jest-matcher-utils-28.1.1" // { + sources."jest-haste-map-28.1.3" + sources."jest-leak-detector-28.1.3" + (sources."jest-matcher-utils-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6724,7 +6728,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-28.1.1" // { + (sources."jest-message-util-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6734,10 +6738,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-mock-28.1.1" + sources."jest-mock-28.1.3" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-28.0.2" - (sources."jest-resolve-28.1.1" // { + (sources."jest-resolve-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6747,19 +6751,20 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-28.1.1" - (sources."jest-runner-28.1.1" // { + sources."jest-resolve-dependencies-28.1.3" + (sources."jest-runner-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."p-limit-3.1.0" sources."source-map-support-0.5.13" sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-28.1.1" // { + (sources."jest-runtime-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6769,7 +6774,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-snapshot-28.1.1" // { + (sources."jest-snapshot-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6779,7 +6784,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-util-28.1.1" // { + (sources."jest-util-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6789,7 +6794,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-validate-28.1.1" // { + (sources."jest-validate-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."camelcase-6.3.0" @@ -6800,7 +6805,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-28.1.1" // { + (sources."jest-watcher-28.1.3" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6810,7 +6815,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-28.1.1" // { + (sources."jest-worker-28.1.3" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -6865,7 +6870,7 @@ let sources."mixin-deep-2.0.1" sources."mkdir-recursive-0.4.0" sources."mkdirp-classic-0.5.3" - sources."moment-2.29.3" + sources."moment-2.29.4" (sources."mqtt-4.3.7" // { dependencies = [ sources."ws-7.5.8" @@ -6913,7 +6918,7 @@ let sources."pkg-dir-4.2.0" sources."prebuild-install-7.1.0" sources."prelude-ls-1.2.1" - (sources."pretty-format-28.1.1" // { + (sources."pretty-format-28.1.3" // { dependencies = [ sources."ansi-styles-5.2.0" ]; @@ -6952,7 +6957,7 @@ let sources."regenerator-runtime-0.13.9" sources."regenerator-transform-0.15.0" sources."regexpp-3.2.0" - sources."regexpu-core-5.0.1" + sources."regexpu-core-5.1.0" sources."regjsgen-0.6.0" (sources."regjsparser-0.8.4" // { dependencies = [ @@ -7041,7 +7046,6 @@ let sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" - sources."throat-6.0.1" sources."tmp-0.2.1" sources."tmpl-1.0.5" sources."to-fast-properties-2.0.0" @@ -7067,7 +7071,7 @@ let sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - sources."v8-to-istanbul-9.0.0" + sources."v8-to-istanbul-9.0.1" sources."validate.io-array-1.0.6" sources."validate.io-function-1.0.2" sources."validate.io-integer-1.0.5" @@ -7077,8 +7081,8 @@ let sources."warning-4.0.3" sources."which-2.0.2" sources."wide-align-1.1.5" - sources."winston-3.8.0" - sources."winston-syslog-2.5.0" + sources."winston-3.8.1" + sources."winston-syslog-2.6.0" sources."winston-transport-4.5.0" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { @@ -7090,15 +7094,16 @@ let }) sources."wrappy-1.0.2" sources."write-file-atomic-4.0.1" - sources."ws-8.8.0" + sources."ws-8.8.1" sources."xtend-4.0.2" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yargs-17.5.1" sources."yargs-parser-21.0.1" - sources."zigbee-herdsman-0.14.40" - sources."zigbee-herdsman-converters-14.0.559" - sources."zigbee2mqtt-frontend-0.6.103" + sources."yocto-queue-0.1.0" + sources."zigbee-herdsman-0.14.46" + sources."zigbee-herdsman-converters-14.0.583" + sources."zigbee2mqtt-frontend-0.6.107" ]; buildInputs = globalBuildInputs; meta = { diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix index 75ded461ea..d73afa7e2a 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # - ignore test_screen because it assumes vt terminals exist checkPhase = '' pytest . \ - ${lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ + ${lib.optionalString stdenv.hostPlatform.isAarch "--ignore=test/t/test_gcc.py"} \ --ignore=test/t/test_chsh.py \ --ignore=test/t/test_ether_wake.py \ --ignore=test/t/test_ifdown.py \ diff --git a/third_party/nixpkgs/pkgs/shells/bash/blesh/default.nix b/third_party/nixpkgs/pkgs/shells/bash/blesh/default.nix new file mode 100644 index 0000000000..f342f40854 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/bash/blesh/default.nix @@ -0,0 +1,58 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, git +, bashInteractive +, glibcLocales +, runtimeShell +}: + +stdenvNoCC.mkDerivation rec { + name = "blesh"; + version = "unstable-2022-07-24"; + + src = fetchFromGitHub { + owner = "akinomyoga"; + repo = "ble.sh"; + rev = "0b95d5d900b79a63e7f0834da5aa7276b8332a44"; + hash = "sha256-s/RQKcAFcCUB3Xd/4uOsIgigOE0lCCeVC9K3dfnP/EQ="; + fetchSubmodules = true; + leaveDotGit = true; + }; + + nativeBuildInputs = [ git ]; + + doCheck = true; + checkInputs = [ bashInteractive glibcLocales ]; + preCheck = "export LC_ALL=en_US.UTF-8"; + + installFlags = [ "INSDIR=$(out)/share" ]; + postInstall = '' + mkdir -p "$out/bin" + cat <"$out/bin/blesh-share" + #!${runtimeShell} + # Run this script to find the ble.sh shared folder + # where all the shell scripts are living. + echo "$out/share/ble.sh" + EOF + chmod +x "$out/bin/blesh-share" + + mkdir -p "$out/share/lib" + cat <"$out/share/lib/_package.sh" + _ble_base_package_type=nix + + function ble/base/package:nix/update { + echo "Ble.sh is installed by Nix. You can update it there." >/dev/stderr + return 1 + } + EOF + ''; + + meta = with lib; { + homepage = "https://github.com/akinomyoga/ble.sh"; + description = "Bash Line Editor -- a full-featured line editor written in pure Bash"; + license = licenses.bsd3; + maintainers = with maintainers; [ aiotter ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/fish/default.nix b/third_party/nixpkgs/pkgs/shells/fish/default.nix index f2a6492e25..4f53883cb7 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/default.nix @@ -25,6 +25,7 @@ , runCommand , writeText , nixosTests +, nix-update-script , useOperatingSystemEtc ? true # An optional string containing Fish code that initializes the environment. # This is run at the very beginning of initialization. If it sets $NIX_PROFILES @@ -134,7 +135,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -144,7 +145,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KR5Ox8bD/qVNwa7QV849QrNW+m9whlYnssffzsrv0hA="; + sha256 = "sha256-ptRbPcWkXdMXcuf439/sq8BjmG6PZ9YL18pgzIHbaSg="; }; # Fix FHS paths in tests @@ -287,7 +288,7 @@ let homepage = "https://fishshell.com/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ cole-h ]; + maintainers = with maintainers; [ cole-h winter srapenne ]; }; passthru = { @@ -326,6 +327,7 @@ let ${fish}/bin/fish ${fishScript} && touch $out ''; }; + updateScript = nix-update-script { attrPath = pname; }; }; }; in diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/autopair-fish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/autopair-fish.nix new file mode 100644 index 0000000000..292d492f20 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/autopair-fish.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "autopair.fish"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "jorgebucaran"; + repo = pname; + rev = version; + sha256 = "sha256-s1o188TlwpUQEN3X5MxUlD/2CFCpEkWu83U9O+wg3VU="; + }; + + meta = with lib; { + description = "Auto-complete matching pairs in the Fish command line."; + homepage = "https://github.com/jorgebucaran/autopair.fish"; + license = licenses.mit; + maintainers = with maintainers; [ thehedgeh0g ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix index 1adf040d64..0cc6eb6b89 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix @@ -2,6 +2,8 @@ lib.makeScope newScope (self: with self; { + autopair-fish = callPackage ./autopair-fish.nix { }; + buildFishPlugin = callPackage ./build-fish-plugin.nix { }; clownfish = callPackage ./clownfish.nix { }; diff --git a/third_party/nixpkgs/pkgs/shells/liquidprompt/default.nix b/third_party/nixpkgs/pkgs/shells/liquidprompt/default.nix index 4f06225e94..47e2e72c7a 100644 --- a/third_party/nixpkgs/pkgs/shells/liquidprompt/default.nix +++ b/third_party/nixpkgs/pkgs/shells/liquidprompt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "2.0.4"; + version = "2.1.2"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ntCfXJUOQqL63HWoG+WJr9a+qB16AaL5zf58039t7GU="; + sha256 = "sha256-7mnrXLqnCdOuS2aRs4tVLfO8SRFrqZHNM40gWE/CVFI="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/oil/default.nix b/third_party/nixpkgs/pkgs/shells/oil/default.nix index d1a8c9650f..57b5d085c3 100644 --- a/third_party/nixpkgs/pkgs/shells/oil/default.nix +++ b/third_party/nixpkgs/pkgs/shells/oil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - hash = "sha256-5eAK53aFLEEjPvwKMQIZloUjSFaAcU0tzsUAr2PQAgg="; + hash = "sha256-1zwGfM17SWWIvQ19cSbIfiLRaq+Ee1r94GPJWJEPoP8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/shells/rush/default.nix b/third_party/nixpkgs/pkgs/shells/rush/default.nix index 02b33d403f..6e7e256561 100644 --- a/third_party/nixpkgs/pkgs/shells/rush/default.nix +++ b/third_party/nixpkgs/pkgs/shells/rush/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rush"; - version = "2.2"; + version = "2.3"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-ld5TdpF7siprQCbhE4oxYhH40x3QZ5NCQlD3zRaNmM0="; + sha256 = "sha256-57gBYfZsKdK1moXBC52KgxKv/MIeQK6tDu+fznXLZ+Y="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/xonsh/default.nix b/third_party/nixpkgs/pkgs/shells/xonsh/default.nix index 4fa5d9b087..ed11f0828d 100644 --- a/third_party/nixpkgs/pkgs/shells/xonsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.11.0"; + version = "0.13.0"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "sha256-jfxQMEVABTOhx679V0iGVX9RisuY42lSdztYXMLwdcw="; + sha256 = "sha256-8X/+mQrwJ0yaUHRKdoY3G0P8kq22hYfRK+7WRl/zamc="; }; LC_ALL = "en_US.UTF-8"; @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { ]; postInstall = '' - wrapProgram $out/bin/xon.sh \ + wrapProgram $out/bin/xonsh \ $makeWrapperArgs ''; @@ -49,6 +49,8 @@ python3Packages.buildPythonApplication rec { "test_colorize_file" "test_loading_correctly" "test_no_command_path_completion" + "test_bsd_man_page_completions" + "test_xonsh_activator" # fails on non-interactive shells "test_capture_always" "test_casting" @@ -56,9 +58,14 @@ python3Packages.buildPythonApplication rec { "test_dirty_working_directory" "test_man_completion" "test_vc_get_branch" + "test_bash_and_is_alias_is_only_functional_alias" ]; disabledTestPaths = [ + # fails on sandbox + "tests/completers/test_command_completers.py" + "tests/test_ptk_highlight.py" + "tests/test_ptk_shell.py" # fails on non-interactive shells "tests/prompt/test_gitstatus.py" "tests/completers/test_bash_completer.py" diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index b631c54b07..36f2b04eab 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/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 = "2022-07-12"; + version = "2022-07-26"; pname = "oh-my-zsh"; - rev = "249c708ed3a4a7a63d16a6e911a46b6fb9623cbd"; + rev = "bb6c14cdfd0b7d543d0d9c2e5f0c0a9409a82084"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "zBLgAS96uovLIrKLoVSjRJKeoRkGWu6TQqsvoYokLV4="; + sha256 = "jlQKnF5vZp7ARVXtV/WEnTIV0m5FwqTj83igDyMyTTQ="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix index 7dfbb14eec..e5187658ee 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "3.16.4"; + version = "3.16.7"; src = fetchFromGitHub { owner = "denysdovhan"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4G1+K6ENLwChtivR7Ura0vl6Ph9Wae3SOXCW1pNbgHI="; + sha256 = "sha256-dMP7mDzb0xLCP2l9j4SOP47bcpuBNSoXsDecVOvZaL8="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix index e46a5cf727..88b6b98117 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "zsh-nix-shell"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; rev = "v${version}"; - sha256 = "sha256-719lVo6p55G1tt3+6nMhZ904nyvlq0Q5exb0il36/Aw="; + sha256 = "sha256-IT3wpfw8zhiNQsrw59lbSWYh0NQ1CUdUtFzRzHlURH0="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix index bbc15bad26..ff56f1de02 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix @@ -683,7 +683,7 @@ rec { __stdenvImpureHostDeps = commonImpureHostDeps; __extraImpureHostDeps = commonImpureHostDeps; - initialPath = import ../common-path.nix { inherit pkgs; }; + initialPath = import ../generic/common-path.nix { inherit pkgs; }; shell = "${pkgs.bash}/bin/bash"; cc = pkgs."${finalLlvmPackages}".libcxxClang; diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix index da4a94e34b..5e549e4828 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -105,16 +105,16 @@ in rec { mkdir $out/include cp -rd ${llvmPackages.libcxx.dev}/include/c++ $out/include + # copy .tbd assembly utils + cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin + cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib + + # copy package extraction tools + cp -d ${pkgs.pbzx}/bin/pbzx $out/bin + cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib + cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib + ${lib.optionalString targetPlatform.isAarch64 '' - # copy .tbd assembly utils - cp -d ${pkgs.darwin.rewrite-tbd}/bin/rewrite-tbd $out/bin - cp -d ${lib.getLib pkgs.libyaml}/lib/libyaml*.dylib $out/lib - - # copy package extraction tools - cp -d ${pkgs.pbzx}/bin/pbzx $out/bin - cp -d ${lib.getLib pkgs.xar}/lib/libxar*.dylib $out/lib - cp -d ${pkgs.bzip2.out}/lib/libbz2*.dylib $out/lib - # copy sigtool cp -d ${pkgs.darwin.sigtool}/bin/sigtool $out/bin cp -d ${pkgs.darwin.sigtool}/bin/codesign $out/bin diff --git a/third_party/nixpkgs/pkgs/stdenv/default.nix b/third_party/nixpkgs/pkgs/stdenv/default.nix index 25a593c674..7a2ad665e0 100644 --- a/third_party/nixpkgs/pkgs/stdenv/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/default.nix @@ -38,28 +38,10 @@ let in if crossSystem != localSystem || crossOverlays != [] then stagesCross else if config ? replaceStdenv then stagesCustom - else { # switch - i686-linux = stagesLinux; - x86_64-linux = stagesLinux; - armv5tel-linux = stagesLinux; - armv6l-linux = stagesLinux; - armv6m-linux = stagesLinux; - armv7a-linux = stagesLinux; - armv7l-linux = stagesLinux; - armv7r-linux = stagesLinux; - armv7m-linux = stagesLinux; - armv8a-linux = stagesLinux; - armv8r-linux = stagesLinux; - armv8m-linux = stagesLinux; - aarch64-linux = stagesLinux; - mipsel-linux = stagesLinux; - mips64el-linux = stagesLinux; - powerpc-linux = /* stagesLinux */ stagesNative; - powerpc64-linux = stagesLinux; - powerpc64le-linux = stagesLinux; - riscv64-linux = stagesLinux; - x86_64-darwin = stagesDarwin; - aarch64-darwin = stagesDarwin; + else if localSystem.isLinux then stagesLinux + else if localSystem.isDarwin then stagesDarwin + else # misc special cases + { # switch x86_64-solaris = stagesNix; i686-cygwin = stagesNative; x86_64-cygwin = stagesNative; diff --git a/third_party/nixpkgs/pkgs/stdenv/common-path.nix b/third_party/nixpkgs/pkgs/stdenv/generic/common-path.nix similarity index 100% rename from third_party/nixpkgs/pkgs/stdenv/common-path.nix rename to third_party/nixpkgs/pkgs/stdenv/generic/common-path.nix diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix index 5f49aca5aa..4fa9ad6de2 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix @@ -11,6 +11,7 @@ argsStdenv@{ name ? "stdenv", preHook ? "", initialPath , shell , allowedRequisites ? null, extraAttrs ? {}, overrides ? (self: super: {}), config +, disallowedRequisites ? [] , # The `fetchurl' to use for downloading curl and its dependencies # (see all-packages.nix). @@ -97,6 +98,7 @@ let } // { inherit name; + inherit disallowedRequisites; # Nix itself uses the `system` field of a derivation to decide where to # build it. This is a bit confusing for cross compilation. diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix index bde8735642..73030e7d94 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/make-derivation.nix @@ -178,7 +178,7 @@ let # Except when: # - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries. # - static armv7l, where compilation fails. - !((stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) && stdenv.hostPlatform.isStatic) + !(stdenv.hostPlatform.isAarch && stdenv.hostPlatform.isStatic) then supportedHardeningFlags else lib.remove "pie" supportedHardeningFlags; enabledHardeningOptions = @@ -330,6 +330,74 @@ else let ++ optional (elem "host" configurePlatforms) "--host=${stdenv.hostPlatform.config}" ++ optional (elem "target" configurePlatforms) "--target=${stdenv.targetPlatform.config}"; + cmakeFlags = + let + explicitFlags = + if lib.isString cmakeFlags then lib.warn + "String 'cmakeFlags' is deprecated and will be removed in release 23.05. Please use a list of strings. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" + [cmakeFlags] + else if cmakeFlags == null then + lib.warn + "Null 'cmakeFlags' is deprecated and will be removed in release 23.05. Please use a empty list instead '[]'. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" + [] + else + cmakeFlags; + + crossFlags = [ + "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" (lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}" + ] ++ lib.optionals (stdenv.hostPlatform.uname.processor != null) [ + "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" + ] ++ lib.optionals (stdenv.hostPlatform.uname.release != null) [ + "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.uname.release}" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" + ] ++ lib.optionals (stdenv.buildPlatform.uname.system != null) [ + "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" + ] ++ lib.optionals (stdenv.buildPlatform.uname.processor != null) [ + "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" + ] ++ lib.optionals (stdenv.buildPlatform.uname.release != null) [ + "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}" + ]; + in + explicitFlags ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) crossFlags; + + mesonFlags = + let + explicitFlags = + if lib.isString mesonFlags then lib.warn + "String 'mesonFlags' is deprecated and will be removed in release 23.05. Please use a list of strings. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" + [mesonFlags] + else if mesonFlags == null then + lib.warn + "Null 'mesonFlags' is deprecated and will be removed in release 23.05. Please use a empty list instead '[]'. Derivation name: ${derivationArg.name}, file: ${pos.file or "unknown file"}" + [] + else + mesonFlags; + + # 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; + + crossFile = builtins.toFile "cross-file.conf" '' + [properties] + needs_exe_wrapper = true + + [host_machine] + system = '${stdenv.targetPlatform.parsed.kernel.name}' + cpu_family = '${cpuFamily stdenv.targetPlatform}' + cpu = '${stdenv.targetPlatform.parsed.cpu.name}' + endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} + + [binaries] + llvm-config = 'llvm-config-native' + ''; + crossFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; + in crossFlags ++ explicitFlags; + inherit patches; inherit doCheck doInstallCheck; @@ -341,42 +409,6 @@ else let # most people won't care about these anyways outputHashAlgo = attrs.outputHashAlgo or "sha256"; outputHashMode = attrs.outputHashMode or "recursive"; - } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { - cmakeFlags = - (/**/ if lib.isString cmakeFlags then [cmakeFlags] - else if cmakeFlags == null then [] - else cmakeFlags) - ++ [ "-DCMAKE_SYSTEM_NAME=${lib.findFirst lib.isString "Generic" ( - lib.optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}"] - ++ lib.optional (stdenv.hostPlatform.uname.processor != null) "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" - ++ lib.optional (stdenv.hostPlatform.uname.release != null) "-DCMAKE_SYSTEM_VERSION=${stdenv.hostPlatform.uname.release}" - ++ lib.optional (stdenv.hostPlatform.isDarwin) "-DCMAKE_OSX_ARCHITECTURES=${stdenv.hostPlatform.darwinArch}" - ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" - ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" - ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"; - - mesonFlags = if mesonFlags == null then null 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; - crossFile = builtins.toFile "cross-file.conf" '' - [properties] - needs_exe_wrapper = true - - [host_machine] - system = '${stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${cpuFamily stdenv.targetPlatform}' - cpu = '${stdenv.targetPlatform.parsed.cpu.name}' - endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} - - [binaries] - llvm-config = 'llvm-config-native' - ''; - in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (enableParallelBuilding) { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != [] || stdenv.hostPlatform.isMusl) { diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh index de8d13160f..0ba8d10182 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh +++ b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh @@ -771,9 +771,18 @@ substitute() { } substituteInPlace() { - local fileName="$1" - shift - substitute "$fileName" "$fileName" "$@" + local -a fileNames=() + for arg in "$@"; do + if [[ "$arg" = "--"* ]]; then + break + fi + fileNames+=("$arg") + shift + done + + for file in "${fileNames[@]}"; do + substitute "$file" "$file" "$@" + done } _allFlags() { diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix index 3670f8d8c2..7c0209b33a 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix @@ -356,9 +356,6 @@ in # stage5.gcc -> stage4.coreutils -> stage3.glibc -> bootstrap gmp = lib.makeOverridable (super.gmp.override { stdenv = self.stdenv; }).overrideAttrs (a: { pname = "${a.pname}-stage4"; }); - # coreutils gets rebuilt both here and also in the final stage; we rename this one to avoid confusion - coreutils = super.coreutils.overrideAttrs (a: { pname = "${a.pname}-stage4"; }); - gcc = lib.makeOverridable (import ../../build-support/cc-wrapper) { nativeTools = false; nativeLibc = false; @@ -400,7 +397,7 @@ in preHook = commonPreHook; initialPath = - ((import ../common-path.nix) {pkgs = prevStage;}); + ((import ../generic/common-path.nix) {pkgs = prevStage;}); extraNativeBuildInputs = [ prevStage.patchelf ] ++ # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64. @@ -424,6 +421,8 @@ in shellPackage = prevStage.bash; }; + disallowedRequisites = [ bootstrapTools.out ]; + # Mainly avoid reference to bootstrap tools allowedRequisites = with prevStage; with lib; # Simple executable tools diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/third_party/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 2665330206..d9105c8c44 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -23,6 +23,7 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; { riscv64 = riscv64; mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32; mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64; + mipsel-linux-gnu = mipsel-linux-gnu; powerpc64 = ppc64; powerpc64-musl = ppc64-musl; powerpc64le = powernv; diff --git a/third_party/nixpkgs/pkgs/stdenv/nix/default.nix b/third_party/nixpkgs/pkgs/stdenv/nix/default.nix index 2fb19992bc..e9e9936ccd 100644 --- a/third_party/nixpkgs/pkgs/stdenv/nix/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/nix/default.nix @@ -21,7 +21,7 @@ bootStages ++ [ export NIX_IGNORE_LD_THROUGH_GCC=1 ''; - initialPath = (import ../common-path.nix) { pkgs = prevStage; }; + initialPath = (import ../generic/common-path.nix) { pkgs = prevStage; }; cc = import ../../build-support/cc-wrapper { inherit lib; diff --git a/third_party/nixpkgs/pkgs/tools/X11/bumblebee/default.nix b/third_party/nixpkgs/pkgs/tools/X11/bumblebee/default.nix index 534099ea5a..914972d91a 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/bumblebee/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/bumblebee/default.nix @@ -132,10 +132,13 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/Bumblebee-Project/Bumblebee"; description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; - platforms = platforms.linux; + homepage = "https://github.com/Bumblebee-Project/Bumblebee"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; + platforms = platforms.linux; + # linking fails with multiple error of type: + # multiple definition of `bb_pm_method_string'; src/module.o:(.bss+0x0): first defined here + broken = true; # Added 03-08-2022 }; } diff --git a/third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix b/third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix index 85f196b460..619bd55b6f 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/caffeine-ng/default.nix @@ -1,53 +1,85 @@ -{ gdk-pixbuf, glib, gobject-introspection, gtk3, lib, libnotify, - procps, xset, xautolock, xscreensaver, python3Packages, wrapGAppsHook +{ buildPythonApplication +, fetchPypi +, gobject-introspection +, gtk3 +, lib +, libappindicator-gtk3 +, libnotify +, click +, dbus-python +, ewmh +, pulsectl +, pygobject3 +, pyxdg +, setproctitle +, python3 +, procps +, xset +, xautolock +, xscreensaver +, xfce +, glib +, setuptools-scm +, wrapGAppsHook }: -python3Packages.buildPythonApplication rec { +let + click_7 = click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); +in buildPythonApplication rec { pname = "caffeine-ng"; - version = "3.5.1"; + version = "4.0.2"; - src = python3Packages.fetchPypi{ + src = fetchPypi { inherit pname version; - sha256="0akzldqvxnqngpj1s6y2phgj7ch8wfm02j6z2drqvsbvaadw0jbm"; + sha256 = "sha256-umIjXJ0et6Pi5Ejj96Q+ZhiKS+yj7bsgb4uQW6Ym6rU="; }; - nativeBuildInputs = [ wrapGAppsHook glib ]; + nativeBuildInputs = [ wrapGAppsHook glib gobject-introspection setuptools-scm ]; + buildInputs = [ - gdk-pixbuf gobject-introspection libnotify gtk3 - python3Packages.setuptools-scm + libappindicator-gtk3 + libnotify + gobject-introspection + gtk3 ]; - pythonPath = with python3Packages; [ - dbus-python docopt ewmh pygobject3 pyxdg - setproctitle pulsectl + + pythonPath = [ + click_7 + dbus-python + ewmh + pulsectl + pygobject3 + pyxdg + setproctitle ]; doCheck = false; # There are no tests. - postPatch = '' - substituteInPlace caffeine/inhibitors.py \ - --replace 'os.system("xset' 'os.system("${xset}/bin/xset' \ - --replace 'os.system("xautolock' 'os.system("${xautolock}/bin/xautolock' \ - --replace 'os.system("pgrep' 'os.system("${procps}/bin/pgrep' \ - --replace 'os.system("xscreensaver-command' 'os.system("${xscreensaver}/bin/xscreensaver-command' - ''; - postInstall = '' - mkdir -p $out/share cp -r share $out/ - cp -r caffeine/assets/icons $out/share/icons + cp -r caffeine/assets/icons $out/share/ + # autostart file - cp -r $out/lib/python*/site-packages/etc $out/etc/ + ln -s $out/${python3.sitePackages}/etc $out/etc + glib-compile-schemas --strict $out/share/glib-2.0/schemas - for i in $(find $out -name "*.desktop"); do - substituteInPlace $i --replace /usr $out - done + + gappsWrapperArgs+=( + --prefix PATH : ${lib.makeBinPath [ procps xautolock xscreensaver xfce.xfconf xset ]} + ) ''; meta = with lib; { mainProgram = "caffeine"; maintainers = with maintainers; [ marzipankaiser ]; description = "Status bar application to temporarily inhibit screensaver and sleep mode"; - homepage = "https://github.com/caffeine-ng/caffeine-ng"; + homepage = "https://codeberg.org/WhyNotHugo/caffeine-ng"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix index 50d7af80a0..e43e4e1947 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/opentabletdriver/default.nix @@ -56,6 +56,8 @@ buildDotnetModule rec { udev ]; + buildInputs = runtimeDeps; + doCheck = true; testProjectFile = "OpenTabletDriver.Tests/OpenTabletDriver.Tests.csproj"; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix index 3970a4f487..c267a8386b 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "xdg-user-dirs"; - version = "0.17"; + version = "0.18"; src = fetchurl { url = "https://user-dirs.freedesktop.org/releases/xdg-user-dirs-${version}.tar.gz"; - sha256 = "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra"; + sha256 = "sha256-7G8G10lc26N6cyA5+bXhV4vLKWV2/eDaQO2y9SIg3zw="; }; nativeBuildInputs = [ makeWrapper libxslt docbook_xsl ]; diff --git a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix index 5d0170ec73..b478ab4886 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xpra/default.nix @@ -89,6 +89,7 @@ in buildPythonApplication rec { INCLUDE_DIRS = "${pam}/include"; nativeBuildInputs = [ + gobject-introspection pkg-config wrapGAppsHook pandoc @@ -119,7 +120,6 @@ in buildPythonApplication rec { ffmpeg gdk-pixbuf glib - gobject-introspection gtk3 librsvg libvpx diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix index a05ef18dc9..051a3a0d0f 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xwallpaper"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "stoeckmann"; repo = "xwallpaper"; rev = "v${version}"; - sha256 = "sha256-O4VynpP3VJY/p6+NLUuKetwoMfbp93aXTiRoQJkgW+c="; + sha256 = "sha256-onxneLmXs1rYwpTzcnn+rbDboWVoEQgtGMHx/bMPRa8="; }; nativeBuildInputs = [ pkg-config autoreconfHook installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix index 0c12e54d25..af0d06b1b6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-nuke/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "aws-nuke"; - version = "2.17.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "rebuy-de"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e5EtIRIM0Gz2BXGaZx3jiO+MNdD1Eh9h7U+aZSBVFGc="; + sha256 = "sha256-4G+/VNTp5Bb1TAcqb//LUvwEGDrXRNNka4X52jCH+Rs="; }; - vendorSha256 = "sha256-tRFYZ0GBJDumvfOYMJDcYqTlTn5do3trZ1gXafuDVi4="; + vendorSha256 = "sha256-p+pcVvu+d/scel8VVCFqZccwfOTOyKeud3gKLqpWE1g="; preBuild = '' if [ "x$outputHashAlgo" != "x" ]; then diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index 4fcd39a8c4..df3953b030 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -35,17 +35,17 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.22.88"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.25.42"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-fwbejwcT4piC8Zr6+ubxMd+TuF9O4icOentI2GlhYrc="; + hash = "sha256-5DH3Ik0DHmHfZ+XfFjmC2CL5WRoA9ENgzDeYfCgwtTI="; }; # https://github.com/aws/aws-cli/issues/4837 postPatch = '' substituteInPlace setup.py \ - --replace "docutils>=0.10,<0.16" "docutils>=0.10" \ + --replace "docutils>=0.10,<0.17" "docutils>=0.10" \ --replace "rsa>=3.1.2,<4.8" "rsa<5,>=3.1.2" ''; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix index d772d1d16e..caae3f5503 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli2/default.nix @@ -15,27 +15,19 @@ let sha256 = "sha256-Yx3I3RD57Nx6Cvm4moc5zmMbdsHeYiMghDfbQUor38E="; }; }); - jmespath = super.jmespath.overridePythonAttrs (oldAttrs: rec { - version = "0.10.0"; - src = self.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "sha256-uF0FZ7hmYUmpMXJxLmiSBzQzPAzn6Jt4s+mH9x5e1Pk="; - }; - }); }; }; in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.7.9"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.7.20"; # N.B: if you change this, check if overrides are still up-to-date src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = version; - sha256 = "sha256-6JlBgcHpR2ZfrljS+flxaog/KZQLvPUacJGLMQNsZ5Y="; + sha256 = "sha256-o6rs9OMP3154WApboSqUfVn3TRxap0htHczyjAMQe2I="; }; propagatedBuildInputs = [ @@ -71,6 +63,7 @@ with py.pkgs; buildPythonApplication rec { --replace "docutils>=0.10,<0.16" "docutils" \ --replace "ruamel.yaml>=0.15.0,<0.16.0" "ruamel.yaml" \ --replace "wcwidth<0.2.0" "wcwidth" \ + --replace "prompt-toolkit>=3.0.24,<3.0.29" "prompt-toolkit~=3.0" \ --replace "distro>=1.5.0,<1.6.0" "distro" ''; @@ -101,6 +94,6 @@ with py.pkgs; buildPythonApplication rec { changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; - maintainers = with maintainers; [ bhipple davegallant bryanasdev000 ]; + maintainers = with maintainers; [ bhipple davegallant bryanasdev000 devusb ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/certigo/default.nix b/third_party/nixpkgs/pkgs/tools/admin/certigo/default.nix index d2914dbf95..792fed6e35 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/certigo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/certigo/default.nix @@ -1,31 +1,17 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "certigo"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "square"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XGR6xIXdFLnJTFd+mJneRb/WkLmi0Jscta9Bj3paM1M="; + sha256 = "sha256-+j1NeQJPDwQxXVYnHNmL49Li2IMH+9ehS0HSM3kqyxU="; }; - patches = [ - (fetchpatch { - name = "backport_TestConnect-Apple-Fixes.patch"; - url = "https://github.com/square/certigo/commit/5332ac7ca20bdea63657cc8319e8b8fda4326938.patch"; - sha256 = "sha256-mSNuiui2dxkXnCrXJ/asIzC8F1mtPecOVOIu6mE5jq4="; - }) - - (fetchpatch { - name = "backport_TestConnect-Expected-CipherSuite-Fixes.patch"; - url = "https://github.com/square/certigo/commit/7ef0417bde4aafc69cbb72f0dd6d3577a56054a1.patch"; - sha256 = "sha256-TUQ8B23HKheaPUjj4NkvjmZBAAhDNTyo2c8jf4qukds="; - }) - ]; - - vendorSha256 = "sha256-qS/tIi6umSuQcl43SI4LyL0k5eWfRWs7kVybRPGKcbs="; + vendorSha256 = "sha256-G9YpMF4qyL8eJPnai81ihVTDK9E4meKxdpk+rjISnIM="; meta = with lib; { description = "A utility to examine and validate certificates in a variety of formats"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix new file mode 100644 index 0000000000..c58adf042d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix @@ -0,0 +1,47 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, copilot-cli }: + +buildGoModule rec { + pname = "copilot-cli"; + version = "1.20.0"; + + src = fetchFromGitHub { + owner = "aws"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-l6XFaM5eShXrpuZgTfzceNu8U7Z5WnKBi/qoimj/8HM="; + }; + + vendorSha256 = "sha256-AXwiccfSxeX0NDIODEK+JvVjhcBNNpnZnLKGlDPWy48="; + + nativeBuildInputs = [ installShellFiles ]; + + # follow LINKER_FLAGS in Makefile + ldflags = [ + "-s" + "-w" + "-X github.com/aws/copilot-cli/internal/pkg/version.Version=${version}" + "-X github.com/aws/copilot-cli/internal/pkg/cli.binaryS3BucketPath=https://ecs-cli-v2-release.s3.amazonaws.com" + ]; + + subPackages = [ "./cmd/copilot" ]; + + postInstall = '' + installShellCompletion --cmd copilot \ + --bash <($out/bin/copilot completion bash) \ + --fish <($out/bin/copilot completion fish) \ + --zsh <($out/bin/copilot completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = copilot-cli; + command = "copilot version"; + }; + + meta = with lib; { + description = "Build, Release and Operate Containerized Applications on AWS."; + homepage = "https://github.com/aws/copilot-cli"; + changelog = "https://github.com/aws/copilot-cli/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ jiegec ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/cw/default.nix b/third_party/nixpkgs/pkgs/tools/admin/cw/default.nix new file mode 100644 index 0000000000..413fad40dc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/cw/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib, stdenv }: + +buildGoModule rec { + pname = "cw"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "lucagrulla"; + repo = "cw"; + rev = "v${version}"; + sha256 = "sha256-JsWwvVEr7kSjUy0S6wVcn24Xyo4OHr5/uqmnjw6v+RI="; + }; + + vendorSha256 = "sha256-8L4q0IAvmNk5GCAC5agNfWFtokIkddO1Dec4m6/sWfg="; + + meta = with lib; { + description = "The best way to tail AWS CloudWatch Logs from your terminal"; + homepage = "https://github.com/lucagrulla/cw"; + license = licenses.asl20; + maintainers = with maintainers; [ onthestairs ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix index 812b5e715b..52fb994466 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.105.0"; + version = "0.107.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "sha256-ur9gMo/GR24mSWyNj+2uJJkp1neNMHrPk07l9rjrd1M="; + sha256 = "sha256-B7H5wtnnSq9Npl2Eshjp4gzAKT+V9Cp/oJzs6+Rd3t0="; }; - vendorSha256 = "sha256-mwQahKRHR9cy2Yb4IGCIRtA0j38QJoPKNtpS/T4ndC4="; + vendorSha256 = "sha256-O5KtyC+zx+7rsIpqeKUqDLRYxw58clKSbqbWnil0x1E="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock index 5c5edfbe06..6f8de9b9a3 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock @@ -8,20 +8,20 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.603.0) - aws-sdk-core (3.131.2) + aws-partitions (1.608.0) + aws-sdk-core (3.131.3) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.57.0) + aws-sdk-kms (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.207.0) + fastlane (2.208.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -106,7 +106,7 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.24.0) + google-apis-androidpublisher_v3 (0.25.0) google-apis-core (>= 0.7, < 2.a) google-apis-core (0.7.0) addressable (~> 2.5, >= 2.5.1) @@ -121,7 +121,7 @@ GEM google-apis-core (>= 0.7, < 2.a) google-apis-playcustomapp_v1 (0.10.0) google-apis-core (>= 0.7, < 2.a) - google-apis-storage_v1 (0.17.0) + google-apis-storage_v1 (0.18.0) google-apis-core (>= 0.7, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) diff --git a/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix b/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix index 882b607df1..45df8e9385 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i1ci3jibkqizr2ms31grj0j9ymhfq8rx7dn6nr10x6arv0db31z"; + sha256 = "0qym8s8msgpm0ybx34i0nmr8hvmvxn6x785kxymq7cf63hbpf2a0"; type = "gem"; }; - version = "1.603.0"; + version = "1.608.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "164abp3cvmvfa2qsgzbxvkafbhwbgn3qwknp0amwmxw5nwvz8p3s"; + sha256 = "1ri89cvl1wj3w64wx6l57fnv3w2mpgn03rfhpn2l7nl5lhn2d5x2"; type = "gem"; }; - version = "3.131.2"; + version = "3.131.3"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m8vwm4cakfv3i4f723a6id07myx18fpdbq8ypa2j7r5njwxpmzz"; + sha256 = "1p2dbmb1vl8vk2xchrrsp2sxa95ya5w7ll1jlw89yyhls3l2l1ag"; type = "gem"; }; - version = "1.57.0"; + version = "1.58.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -89,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; + sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; babosa = { groups = ["default"]; @@ -368,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qfjqscldva6njrggs3cyvsdnbcz4rvdi69lp7h5rl74y0mr07ak"; + sha256 = "00wv58qhf6kywqzj6ynlgh718h43269c93jfh24h0jknb9gkq8wa"; type = "gem"; }; - version = "2.207.0"; + version = "2.208.0"; }; gh_inspector = { groups = ["default"]; @@ -389,10 +389,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vswj47jc5k3x8frywsq295wfngfm8rgmb5i8z7bksxlcc4iysag"; + sha256 = "0psz3w8c95ashk5hlfvn5l32mg111z7fv07ngvvgm5mkw6wksh4d"; type = "gem"; }; - version = "0.24.0"; + version = "0.25.0"; }; google-apis-core = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; @@ -433,10 +433,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19ccrdgb34w49l62p28yy5qrgwgb4wxs9q3mnb2d334q4q3wsk9f"; + sha256 = "00jq03n0ff20rv4smjgx7ggv70crh2whpj5p6jmlb41nim267fvz"; type = "gem"; }; - version = "0.17.0"; + version = "0.18.0"; }; google-cloud-core = { dependencies = ["google-cloud-env" "google-cloud-errors"]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix index f4c4b0facd..0f649a6948 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix @@ -9,6 +9,7 @@ , glib , pkg-config , cyrus_sasl +, pulseaudioSupport ? stdenv.isLinux , libpulseaudio , libgcrypt , gtk3 @@ -51,8 +52,13 @@ stdenv.mkDerivation rec { glib libgcrypt cyrus_sasl - libpulseaudio gtk3 + ] ++ lib.optionals pulseaudioSupport [ + libpulseaudio + ]; + + mesonFlags = lib.optionals (!pulseaudioSupport) [ + "-Dpulseaudio=disabled" ]; passthru = { @@ -67,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/gtk-vnc"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin offline ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/hedgedoc-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/hedgedoc-cli/default.nix new file mode 100644 index 0000000000..8f68e50ebc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/hedgedoc-cli/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, wget, jq, curl }: + +let + version = "1.0"; +in +stdenv.mkDerivation { + pname = "hedgedoc-cli"; + inherit version; + + src = fetchFromGitHub { + owner = "hedgedoc"; + repo = "cli"; + rev = "v${version}"; + sha256 = "uz+lkRRUTRr8WR295esNEbgjlZ/Em7mBk6Nx0BWLfg4="; + }; + + buildInputs = [ + wget + jq + curl + ]; + + installPhase = '' + runHook preInstall + install -Dm0755 -t $out/bin $src/bin/codimd + ln -s $out/bin/codimd $out/bin/hedgedoc-cli + runHook postInstall + ''; + + checkPhase = '' + hedgedoc-cli help + ''; + + meta = with lib; { + description = "Hedgedoc CLI"; + homepage = "https://github.com/hedgedoc/cli"; + license = licenses.agpl3; + maintainers = with maintainers; [ drupol ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix b/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix index ecaef00a77..a48d2eeb02 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix @@ -4,11 +4,11 @@ with python3Packages; buildPythonApplication rec { pname = "iredis"; - version = "1.12.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "c3031094db0aa03d48b6f9be750e32d3e901942a96cc05283029086cb871cd81"; + sha256 = "sha256-nLwu47wV5QqgtiyiN9bbKzjlZdgd6Qt5KjBlipwRW1Q="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix new file mode 100644 index 0000000000..8bf7544fdb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/kics/default.nix @@ -0,0 +1,37 @@ +{ stdenv, buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "kics"; + version = "1.5.13"; + + src = fetchFromGitHub { + owner = "Checkmarx"; + repo = "kics"; + rev = "v${version}"; + sha256 = "sha256-+trrtcK0zIjgl8SzURbvaabB/RtDKMEYyU8ZttD0hOs="; + }; + + vendorSha256 = "sha256-/hoyT/PJ/nEQFg/1CJTb4lwOQ8ZYZtuHQeQUpPZepvc="; + + subPackages = [ "cmd/console" ]; + + postInstall = '' + mv $out/bin/console $out/bin/kics + ''; + + ldflags = [ + "-s" "-w" + "-X github.com/Checkmarx/kics/internal/constant.SCMCommits=${version}" + "-X github.com/Checkmarx/kics/internal/constants.Version=${version}" + ]; + + meta = with lib; { + description = '' + Find security vulnerabilities, compliance issues, and infrastructure misconfigurations early in the development + cycle of your infrastructure-as-code with KICS by Checkmarx. + ''; + homepage = "https://github.com/Checkmarx/kics"; + license = licenses.asl20; + maintainers = with maintainers; [ patryk4815 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix index 00566f174c..5d565b2188 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "4.6.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FisQS/qbl7f4aszc2Ft6nmuHNrDreOQdN0jrWMOvaAk="; + sha256 = "sha256-OYzk5SQQW3360hc/52bYoW3JJDGk/NRUF8IzIjtWlpc="; }; - vendorSha256 = "sha256-cLM4YGguQf7lO5PUPmd/at1Aqrp9m8zFG6GWqcduJmw="; + vendorSha256 = "sha256-FtlVYeW5ac/qOn1WFqbhix8xw/ARol+k3uiyH/dBQbk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index 1484f97b93..a3a64d361c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { pname = "lxd"; - version = "5.3"; + version = "5.4"; goPackagePath = "github.com/lxc/lxd"; @@ -20,7 +20,7 @@ buildGoPackage rec { "https://linuxcontainers.org/downloads/lxd/lxd-${version}.tar.gz" "https://github.com/lxc/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz" ]; - sha256 = "sha256-DRdKCfp0nL3lg5O/Wm7vX2grO/DBuyhHRi85XI5laZU="; + sha256 = "sha256-4jS2fFB30F4i+VjjJWvZHyYkUFRZk9Cq8bTOK9uZOTo="; }; postPatch = '' @@ -62,7 +62,7 @@ buildGoPackage rec { homepage = "https://linuxcontainers.org/lxd/"; changelog = "https://github.com/lxc/lxd/releases/tag/lxd-${version}"; license = licenses.asl20; - maintainers = with maintainers; [ fpletz marsam ]; + maintainers = with maintainers; [ marsam ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix index 58bba70e90..dadd798249 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix @@ -10,11 +10,11 @@ let pname = "pgadmin"; - version = "6.11"; + version = "6.12"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "sha256-1MvvQvVoWiV5hhgJUcAHbMyZzkADunLtwmszaO4EeCA="; + sha256 = "sha256-cO7GdZDfJ0pq1jpMyrVy0UM49WhrKOIJOmMJauSkbyo="; }; yarnDeps = mkYarnModules { @@ -32,7 +32,7 @@ let flask_login flask_mail flask_migrate - flask_sqlalchemy + flask-sqlalchemy flask-wtf flask-compress passlib @@ -72,7 +72,7 @@ let azure-identity ]; - # override necessary on pgadmin4 6.11 + # override necessary on pgadmin4 6.12 pythonPackages = python3.pkgs.overrideScope (final: prev: rec { werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { version = "2.0.3"; @@ -110,17 +110,7 @@ pythonPackages.buildPythonApplication rec { patchShebangs . # relax dependencies - substituteInPlace requirements.txt \ - --replace "eventlet==0.33.0" "eventlet>=0.33.0" \ - --replace "psycopg2==2.9.*" "psycopg2>=2.9" \ - --replace "cryptography==3.*" "cryptography>=3.0" \ - --replace "requests==2.25.*" "requests>=2.25.0" \ - --replace "boto3==1.20.*" "boto3>=1.20" \ - --replace "botocore==1.23.*" "botocore>=1.23" \ - --replace "pytz==2021.*" "pytz" \ - --replace "Werkzeug==2.0.3" "werkzeug>=2.*" \ - --replace "azure-identity==1.9.0" "azure-identity==1.*" \ - --replace "azure-mgmt-resource==21.0.0" "azure-mgmt-resource==21.*" + 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" \ diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch index 0b1cb8f95e..13f7d5069c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch @@ -1,9 +1,3 @@ -From 391433d020da52fba28ad08beb2cc85ffd852044 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= -Date: Wed, 23 Feb 2022 14:40:11 +0100 -Subject: [PATCH] Expose setup.py as pgadmin4-setup - ---- pkg/pip/setup_pip.py | 5 ++++- web/setup.py | 14 ++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) @@ -25,41 +19,42 @@ index 5592d1b04..131eaa1ed 100644 ) diff --git a/web/setup.py b/web/setup.py -index 5f4257e86..df970f049 100644 +index 2204ffb..d5fda9f 100644 --- a/web/setup.py +++ b/web/setup.py -@@ -32,6 +32,10 @@ from pgadmin import create_app - from pgadmin.utils import clear_database_servers, dump_database_servers,\ - load_database_servers - -+# Configuration settings -+import config -+from pgadmin.model import SCHEMA_VERSION -+from pgadmin.setup import db_upgrade, create_app_data_directory - - def dump_servers(args): - """Dump the server groups and servers. -@@ -139,12 +143,7 @@ def clear_servers(): +@@ -14,7 +14,6 @@ import argparse + import os + import sys + import builtins +-import config + + # Grab the SERVER_MODE if it's been set by the runtime + if 'SERVER_MODE' in globals(): +@@ -91,6 +90,9 @@ def load_servers(args): + def setup_db(app): + """Setup the configuration database.""" + ++ # here we need an additional import, since the call to setup_db changed ++ # https://redmine.postgresql.org/projects/pgadmin4/repository/2/revisions/3a69d50458f57d19948b867aec55c55d635a36e5/diff/web/setup.py ++ import config + create_app_data_directory(config) + + print("pgAdmin 4 - Application Initialisation") +@@ -139,8 +141,9 @@ def clear_servers(): clear_database_servers(load_user, True) - - + + -if __name__ == '__main__': -- # Configuration settings -- import config -- from pgadmin.model import SCHEMA_VERSION -- from pgadmin.setup import db_upgrade, create_app_data_directory -- +def main(): + # Configuration settings ++ import config parser = argparse.ArgumentParser(description='Setup the pgAdmin config DB') - + exp_group = parser.add_argument_group('Dump server config') -@@ -194,3 +193,6 @@ if __name__ == '__main__': - print(str(e)) +@@ -191,3 +194,6 @@ if __name__ == '__main__': else: - setup_db() + app = create_app() + setup_db(app) + +if __name__ == '__main__': + main() --- -2.35.1 - diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json index 60eef375e5..bdcbe761b7 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json @@ -70,7 +70,7 @@ "webpack": "^5.21.2", "webpack-bundle-analyzer": "^4.4.0", "webpack-cli": "^4.5.0", - "yarn-audit-html": "^3.0.1" + "yarn-audit-html": "^4.0.0" }, "dependencies": { "@babel/plugin-proposal-class-properties": "^7.10.4", @@ -111,12 +111,12 @@ "closest": "^0.0.1", "codemirror": "^5.59.2", "context-menu": "^2.0.0", + "convert-units": "^2.3.4", "css-loader": "^5.0.1", "cssnano": "^5.0.2", "dagre": "^0.8.4", "date-fns": "^2.24.0", "diff-arrays-of-objects": "^1.1.8", - "dropzone": "^5.9.3", "html2canvas": "^1.0.0-rc.7", "immutability-helper": "^3.0.0", "imports-loader": "^2.0.0", @@ -124,7 +124,7 @@ "ip-address": "^7.1.0", "jquery": "^3.6.0", "jquery-contextmenu": "^2.9.2", - "jquery-ui": "^1.13.0", + "jquery-ui": "^1.13.2", "json-bignumber": "^1.0.1", "jsoneditor": "^9.5.4", "jsoneditor-react": "^3.1.1", @@ -132,7 +132,7 @@ "leaflet": "^1.5.1", "lodash": "4.*", "ml-matrix": "^6.5.0", - "moment": "^2.29.3", + "moment": "^2.29.4", "moment-timezone": "^0.5.34", "mousetrap": "^1.6.3", "notificar": "^1.0.1", @@ -150,6 +150,7 @@ "react-data-grid": "git+https://github.com/adityatoshniwal/react-data-grid.git/#8d9bc16ddd7c419acfbbd1c1cc2b70eb9f5b453c", "react-dom": "^17.0.1", "react-draggable": "^4.4.4", + "react-dropzone": "^14.2.1", "react-leaflet": "^3.2.2", "react-rnd": "^10.3.5", "react-router-dom": "^6.2.2", @@ -165,7 +166,6 @@ "socket.io-client": "^4.0.0", "split.js": "^1.5.10", "styled-components": "^5.2.1", - "tablesorter": "^2.31.2", "tempusdominus-bootstrap-4": "^5.1.2", "tempusdominus-core": "^5.19.3", "underscore": "^1.13.1", diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock index 182e681f91..df627ad863 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock @@ -2098,10 +2098,10 @@ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5" integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg== -"@gar/promisify@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz#30aa825f11d438671d585bd44e7fd564535fc210" - integrity sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw== +"@gar/promisify@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" + integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== "@humanwhocodes/config-array@^0.5.0": version "0.5.0" @@ -2131,11 +2131,11 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/gen-mapping@^0.3.0": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9" - integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg== + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== dependencies: - "@jridgewell/set-array" "^1.0.0" + "@jridgewell/set-array" "^1.0.1" "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" @@ -2144,11 +2144,19 @@ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72" integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg== -"@jridgewell/set-array@^1.0.0": +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== +"@jridgewell/source-map@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" + integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== + dependencies: + "@jridgewell/gen-mapping" "^0.3.0" + "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/sourcemap-codec@^1.4.10": version "1.4.13" resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" @@ -2277,18 +2285,18 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@npmcli/fs@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz#589612cfad3a6ea0feafcb901d29c63fd52db09f" - integrity sha512-8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ== +"@npmcli/fs@^2.1.0": + version "2.1.1" + resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.1.tgz#c0c480b03450d8b9fc086816a50cb682668a48bf" + integrity sha512-1Q0uzx6c/NVNGszePbr5Gc2riSU1zLpNlo/1YWntH+eaPmMgBssAW0qXofCVkpdj3ce4swZtlDYQu+NKiYcptg== dependencies: - "@gar/promisify" "^1.0.1" + "@gar/promisify" "^1.1.3" semver "^7.3.5" -"@npmcli/move-file@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674" - integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg== +"@npmcli/move-file@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz#417f585016081a0184cef3e38902cd917a9bbd02" + integrity sha512-UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg== dependencies: mkdirp "^1.0.4" rimraf "^3.0.2" @@ -2500,10 +2508,10 @@ dependencies: tippy.js "^6.3.1" -"@tootallnate/once@1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" - integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== "@trysound/sax@0.2.0": version "0.2.0" @@ -2640,19 +2648,19 @@ dependencies: "@types/react" "*" -"@vusion/webfonts-generator@^0.7.2": - version "0.7.3" - resolved "https://registry.yarnpkg.com/@vusion/webfonts-generator/-/webfonts-generator-0.7.3.tgz#f940348b6251edfba4b2961097f44a391670e63d" - integrity sha512-0qDx8stMupH3s4WDVw2y347XEMvR+OSZIOYEdoD9YIw7ZRq9GA+B2GtR7KPPoGHbzWWR+VGkzplPO5tfukewiw== +"@vusion/webfonts-generator@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@vusion/webfonts-generator/-/webfonts-generator-0.8.0.tgz#3ff41b9ec4b83decd87650637ee050741741e794" + integrity sha512-1q17CF6umBEjlAtO37TzRw3aOCCAyFX+T4HPG70BmM6qx8s6H4/LQOa8eHFZq/oiMuMyd0FehKgUt/pqYlIMWA== dependencies: handlebars "^4.0.11" mkdirp "^1.0.4" q "^1.1.2" - svg2ttf "^5.0.0" - svgicons2svgfont "^9.0.3" - ttf2eot "^2.0.0" - ttf2woff "^2.0.1" - ttf2woff2 "^4.0.1" + svg2ttf "^6.0.3" + svgicons2svgfont "^10.0.4" + ttf2eot "^3.0.0" + ttf2woff "^3.0.0" + ttf2woff2 "^4.0.4" underscore "^1.9.1" url-join "^4.0.0" @@ -2809,6 +2817,11 @@ react-test-renderer "^17.0.0" semver "^5.7.0" +"@xmldom/xmldom@^0.7.2": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d" + integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -2822,7 +2835,7 @@ FileSaver@^0.10.0: version "0.10.0" resolved "https://registry.yarnpkg.com/FileSaver/-/FileSaver-0.10.0.tgz#7def3889944458042ef5df2e9064c88e3d2281c7" - integrity sha1-fe84iZREWAQu9d8ukGTIjj0igcc= + integrity sha512-W+syaSPuxeh8yRPinETA4RlBO0ZuyM8IQIln8Y/pYZ136+pxqr64/JRx8rDm3uVqvgQ4xIHgAmZoepujBT1mvg== JSONStream@^1.0.3: version "1.3.5" @@ -2889,6 +2902,11 @@ acorn@^8.0.4, acorn@^8.4.1: resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2" integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q== +acorn@^8.5.0: + version "8.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30" + integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A== + agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -2896,10 +2914,10 @@ agent-base@6, agent-base@^6.0.2: dependencies: debug "4" -agentkeepalive@^4.1.3: - version "4.1.4" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz#d928028a4862cb11718e55227872e842a44c945b" - integrity sha512-+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ== +agentkeepalive@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" + integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== dependencies: debug "^4.1.0" depd "^1.1.2" @@ -2941,7 +2959,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.5.2: ajv@^5.0.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" - integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU= + integrity sha512-Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw== dependencies: co "^4.6.0" fast-deep-equal "^1.0.0" @@ -2985,7 +3003,7 @@ ajv@^8.8.2: alphanum-sort@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" - integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= + integrity sha512-0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ== ansi-colors@^4.1.1: version "4.1.1" @@ -2995,7 +3013,7 @@ ansi-colors@^4.1.1: 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= + integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== ansi-regex@^5.0.1: version "5.0.1" @@ -3005,7 +3023,7 @@ ansi-regex@^5.0.1: 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= + integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA== ansi-styles@^3.2.1: version "3.2.1" @@ -3037,20 +3055,20 @@ anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -aproba@^1.0.3: - version "1.2.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" - integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +"aproba@^1.0.3 || ^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" + integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== -are-we-there-yet@~1.1.2: - version "1.1.7" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz#b15474a932adab4ff8a50d9adfa7e4e926f21146" - integrity sha512-nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g== +are-we-there-yet@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d" + integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw== dependencies: delegates "^1.0.0" - readable-stream "^2.0.6" + readable-stream "^3.6.0" -argparse@^1.0.6, argparse@^1.0.7: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== @@ -3112,16 +3130,6 @@ array.prototype.flat@^1.2.3: define-properties "^1.1.3" es-abstract "^1.19.0" -array.prototype.flatmap@1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9" - integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - function-bind "^1.1.1" - array.prototype.flatmap@^1.2.4: version "1.2.5" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.5.tgz#908dc82d8a406930fdf38598d51e7411d18d4446" @@ -3183,11 +3191,6 @@ astral-regex@^2.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async@0.9.x: - version "0.9.2" - resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d" - integrity sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0= - async@^2.1.4: version "2.6.4" resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221" @@ -3200,6 +3203,16 @@ async@^3.2.0: resolved "https://registry.yarnpkg.com/async/-/async-3.2.2.tgz#2eb7671034bb2194d45d30e31e24ec7e7f9670cd" integrity sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g== +async@^3.2.3: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== + +attr-accept@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz#646613809660110749e92f2c10833b70968d929b" + integrity sha512-7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg== + autoprefixer@^10.2.4: version "10.4.0" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.0.tgz#c3577eb32a1079a440ec253e404eaf1eb21388c8" @@ -3236,7 +3249,7 @@ axios@^0.21.1: 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= + integrity sha512-XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g== dependencies: chalk "^1.1.3" esutils "^2.0.2" @@ -3269,7 +3282,7 @@ babel-loader@^8.1.0: 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= + integrity sha512-Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w== dependencies: babel-runtime "^6.22.0" @@ -3366,12 +3379,12 @@ babel-plugin-polyfill-regenerator@^0.3.0: babel-plugin-syntax-jsx@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= + integrity sha512-qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw== babel-runtime@^6.22.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= + integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== dependencies: core-js "^2.4.0" regenerator-runtime "^0.11.0" @@ -3379,7 +3392,7 @@ babel-runtime@^6.22.0, babel-runtime@^6.26.0: babel-template@^6.16.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02" - integrity sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI= + integrity sha512-PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg== dependencies: babel-runtime "^6.26.0" babel-traverse "^6.26.0" @@ -3390,7 +3403,7 @@ babel-template@^6.16.0: babel-traverse@^6.18.0, 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= + integrity sha512-iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA== dependencies: babel-code-frame "^6.26.0" babel-messages "^6.23.0" @@ -3405,7 +3418,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.26.0: babel-types@^6.18.0, 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= + integrity sha512-zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g== dependencies: babel-runtime "^6.26.0" esutils "^2.0.2" @@ -3425,7 +3438,7 @@ babylon@^6.18.0: "backbone@1.1.2 || 1.2.3 || ~1.3.2": version "1.3.3" resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz#4cc80ea7cb1631ac474889ce40f2f8bc683b2999" - integrity sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk= + integrity sha512-aK+k3TiU4tQDUrRCymDDE7XDFnMVuyE6zbZ4JX7mb4pJbQTVOH997/kyBzb8wB2s5Y/Oh7EUfj+sZhwRPxWwow== dependencies: underscore ">=1.8.3" @@ -3439,19 +3452,19 @@ backbone@1.4.0: backbone@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.2.3.tgz#c22cfd07fc86ebbeae61d18929ed115e999d65b9" - integrity sha1-wiz9B/yG676uYdGJKe0RXpmdZbk= + integrity sha512-1/eXj4agG79UDN7TWnZXcGD6BJrBwLZKCX7zYcBIy9jWf4mrtVkw7IE1VOYFnrKahsmPF9L55Tib9IQRvk027w== dependencies: underscore ">=1.7.0" backform@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/backform/-/backform-0.2.0.tgz#b14cb8deb08c863fc595a2bc505066e32a2ad4ce" - integrity sha1-sUy43rCMhj/FlaK8UFBm4yoq1M4= + integrity sha512-QYwlItiVqb4CDELHyBC+TM4UcoG6Mw/al+PUDUVbQ7OJojpQHaa2TV8uJHhMR6o/Xq4FGt+52qIZLp36dletfw== backgrid-filter@^0.3.7: version "0.3.7" resolved "https://registry.yarnpkg.com/backgrid-filter/-/backgrid-filter-0.3.7.tgz#d4b19d0e707013d7f181f9e8c7febb4997d56f03" - integrity sha1-1LGdDnBwE9fxgfnox/67SZfVbwM= + integrity sha512-HKWOXXd/dES5Ll3R1+vsfPYO7yVQ0V4+h8cPirFqci4oKTyyZVJupXM2fINhqm0On9dvHijHje8h4X+Wg621gw== dependencies: backbone "~1.2.3" backgrid "~0.3.7" @@ -3461,12 +3474,12 @@ backgrid-filter@^0.3.7: backgrid-select-all@^0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/backgrid-select-all/-/backgrid-select-all-0.3.5.tgz#143a800e5d95ff2ae5a84d78bf4fba41f9481e94" - integrity sha1-FDqADl2V/yrlqE14v0+6QflIHpQ= + integrity sha512-bwMQi5d8AnBSZDiV4nWrXcOSmEODbxB6/70mSHG8cGoDfjgW5X7mLiXlmlgEP3VsA1avFD6VvCvpAKZ4BS5f9Q== backgrid@~0.3.7: version "0.3.8" resolved "https://registry.yarnpkg.com/backgrid/-/backgrid-0.3.8.tgz#7d26816742d72c859cad39b13f19c9f27baffed7" - integrity sha1-fSaBZ0LXLIWcrTmxPxnJ8nuv/tc= + integrity sha512-Klzo941ahoj8Kqd0tRsau+VfXddV3YnQTwb6wVwIaaQxoJ9ORykQy2MNit1MUBnZO6IValYJPvCQyvZhnV6Lfg== dependencies: backbone "1.1.2 || 1.2.3 || ~1.3.2" underscore "^1.8.0" @@ -3474,7 +3487,7 @@ backgrid@~0.3.7: backo2@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" - integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= + integrity sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA== balanced-match@^1.0.0: version "1.0.2" @@ -3557,7 +3570,7 @@ body-parser@^1.19.0: boolbase@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= + integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== bootstrap-datepicker@^1.8.0: version "1.9.0" @@ -3589,10 +3602,17 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== + dependencies: + balanced-match "^1.0.0" + brace@^0.11.1: version "0.11.1" resolved "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz#4896fcc9d544eef45f4bb7660db320d3b379fe58" - integrity sha1-SJb8ydVE7vRfS7dmDbMg07N5/lg= + integrity sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q== braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: version "3.0.2" @@ -3604,7 +3624,7 @@ braces@^3.0.1, braces@^3.0.2, braces@~3.0.2: brorand@^1.0.1, brorand@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" - integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= + integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w== browser-pack@^6.0.1: version "6.1.0" @@ -3789,7 +3809,7 @@ buffer-from@^1.0.0: buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= + integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ== buffer@^6.0.3: version "6.0.3" @@ -3817,41 +3837,41 @@ bufferstreams@^3.0.0: builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" - integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= + integrity sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ== bytes@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@^15.2.0: - version "15.3.0" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb" - integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ== +cacache@^16.1.0: + version "16.1.1" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.1.tgz#4e79fb91d3efffe0630d5ad32db55cc1b870669c" + integrity sha512-VDKN+LHyCQXaaYZ7rA/qtkURU+/yYhviUdvqEv2LT6QPZU8jpyzEkEVAcKlKLt5dJ5BRp11ym8lo3NKLluEPLg== dependencies: - "@npmcli/fs" "^1.0.0" - "@npmcli/move-file" "^1.0.1" + "@npmcli/fs" "^2.1.0" + "@npmcli/move-file" "^2.0.0" chownr "^2.0.0" - fs-minipass "^2.0.0" - glob "^7.1.4" + fs-minipass "^2.1.0" + glob "^8.0.1" infer-owner "^1.0.4" - lru-cache "^6.0.0" - minipass "^3.1.1" + lru-cache "^7.7.1" + minipass "^3.1.6" minipass-collect "^1.0.2" minipass-flush "^1.0.5" - minipass-pipeline "^1.2.2" - mkdirp "^1.0.3" + minipass-pipeline "^1.2.4" + mkdirp "^1.0.4" p-map "^4.0.0" promise-inflight "^1.0.1" rimraf "^3.0.2" - ssri "^8.0.1" - tar "^6.0.2" + ssri "^9.0.0" + tar "^6.1.11" unique-filename "^1.1.1" cached-path-relative@^1.0.0, cached-path-relative@^1.0.2: version "1.1.0" resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz#865576dfef39c0d6a7defde794d078f5308e3ef3" - integrity "sha1-hlV23+85wNan3v3nlNB49TCOPvM= sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA==" + integrity sha512-WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA== call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" @@ -3889,7 +3909,7 @@ camelcase@^6.3.0: camelize@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz#164a5483e630fa4321e5af07020e531831b2609b" - integrity sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs= + integrity sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg== caniuse-api@^3.0.0: version "3.0.0" @@ -3903,7 +3923,7 @@ caniuse-api@^3.0.0: caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001274, caniuse-lite@^1.0.30001286: version "1.0.30001338" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz#b5dd7a7941a51a16480bdf6ff82bded1628eec0d" integrity sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ== caniuse-lite@^1.0.30001332: @@ -3914,7 +3934,7 @@ caniuse-lite@^1.0.30001332: chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= + integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A== dependencies: ansi-styles "^2.2.1" escape-string-regexp "^1.0.2" @@ -3922,7 +3942,7 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.4.2: +chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3931,7 +3951,7 @@ chalk@^2.0.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -4059,7 +4079,7 @@ clone-deep@^4.0.1: closest@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/closest/-/closest-0.0.1.tgz#26da6f80b3e0e17e71f80f12782819e9f653495c" - integrity sha1-JtpvgLPg4X5x+A8SeCgZ6fZTSVw= + integrity sha512-HafRXTAiWp5nf6kxOy2EoIGSsJMn0zew9E5zp3Dy/8CXdp8GvVjZn1TSMEVdDxSP/acXZcWJWiIgF83Di7M1Ew== dependencies: matches-selector "0.0.1" @@ -4071,12 +4091,7 @@ clsx@^1.0.2, clsx@^1.0.4, clsx@^1.1.0, clsx@^1.1.1: co@^4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= - -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= + integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ== codemirror@^5.59.2: version "5.63.3" @@ -4100,13 +4115,18 @@ color-convert@^2.0.1: color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-support@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" + integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== + colord@^2.9.1: version "2.9.1" resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.1.tgz#c961ea0efeb57c9f0f4834458f26cb9cc4a3f90e" @@ -4120,7 +4140,7 @@ colorette@^2.0.14: combine-source-map@^0.8.0, combine-source-map@~0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz#a58d0df042c186fcf822a8e8015f5450d2d79a8b" - integrity sha1-pY0N8ELBhvz4IqjoAV9UUNLXmos= + integrity sha512-UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg== dependencies: convert-source-map "~1.1.0" inline-source-map "~0.6.0" @@ -4132,25 +4152,20 @@ commander@^2.19.0, commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== - commander@^7.0.0, commander@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== -commander@^8.2.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.3.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c" + integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw== commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= + integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== component-emitter@~1.3.0: version "1.3.0" @@ -4160,7 +4175,7 @@ component-emitter@~1.3.0: concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: version "1.6.2" @@ -4187,15 +4202,15 @@ console-browserify@^1.1.0: resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336" integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA== -console-control-strings@^1.0.0, console-control-strings@~1.1.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= + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== constants-browserify@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" - integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= + integrity sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ== content-type@~1.0.4: version "1.0.4" @@ -4219,7 +4234,15 @@ convert-source-map@^1.5.0, convert-source-map@^1.7.0, convert-source-map@^1.8.0: convert-source-map@~1.1.0: version "1.1.3" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860" - integrity sha1-SCnId+n+SbMWHzvzZziI4gRpmGA= + integrity sha512-Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg== + +convert-units@^2.3.4: + version "2.3.4" + resolved "https://registry.yarnpkg.com/convert-units/-/convert-units-2.3.4.tgz#a279f4b3cb9b5d5094beba61abc742dcb46a180d" + integrity sha512-ERHfdA0UhHJp1IpwE6PnFJx8LqG7B1ZjJ20UvVCmopEnVCfER68Tbe3kvN63dLbYXDA2xFWRE6zd4Wsf0w7POg== + dependencies: + lodash.foreach "2.3.x" + lodash.keys "2.3.x" cookie@~0.4.1: version "0.4.1" @@ -4368,7 +4391,7 @@ crypto-browserify@^3.0.0: css-color-keywords@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" - integrity sha1-/qJhbcZ2spYmhrOvjb2+GAskTgU= + integrity sha512-FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg== css-color-names@^1.0.1: version "1.0.1" @@ -4531,7 +4554,7 @@ csstype@^3.0.2: resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b" integrity sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw== -cubic2quad@^1.0.0: +cubic2quad@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/cubic2quad/-/cubic2quad-1.2.1.tgz#2442260b72c02ee4b6a2fe998fcc1c4073622286" integrity sha512-wT5Y7mO8abrV16gnssKdmIhIbA9wSkeMzhh27jAguKrV82i24wER0vL5TGhUJ9dbJNDcigoRZ0IAHFEEEI4THQ== @@ -4539,7 +4562,7 @@ cubic2quad@^1.0.0: custom-event@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425" - integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU= + integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg== dagre@^0.8.4: version "0.8.5" @@ -4571,24 +4594,17 @@ debug@2.6.9, debug@^2.6.8: dependencies: ms "2.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" - integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== - dependencies: - ms "2.1.2" - -debug@^4.3.3, debug@~4.3.2: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity "sha1-BCZuC3CpjURi5uKI44JZITMytmQ= sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==" +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.3, debug@~4.3.1, debug@~4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" decamelize-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" - integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= + integrity sha512-ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg== dependencies: decamelize "^1.1.0" map-obj "^1.0.0" @@ -4596,7 +4612,7 @@ decamelize-keys@^1.1.0: decamelize@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= + integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== decamelize@^5.0.0: version "5.0.1" @@ -4611,7 +4627,7 @@ deep-diff@^1.0.2: deep-equal-ident@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/deep-equal-ident/-/deep-equal-ident-1.1.1.tgz#06f4b89e53710cd6cea4a7781c7a956642de8dc9" - integrity sha1-BvS4nlNxDNbOpKd4HHqVZkLejck= + integrity sha512-aWv7VhTl/Lju1zenOD3E1w8PpUVrTDbwXCHtbSNr+p/uadr49Y1P1ld0W3Pl6gbvIbiRjoCVsqw70UupCNGh6g== dependencies: lodash.isequal "^3.0" @@ -4635,17 +4651,17 @@ define-properties@^1.1.3: defined@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" - integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= + integrity sha512-Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ== delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== deps-sort@^2.0.1: version "2.0.1" @@ -4668,7 +4684,7 @@ des.js@^1.0.0: 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= + integrity sha512-BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A== dependencies: repeating "^2.0.0" @@ -4684,7 +4700,7 @@ detective@^5.2.0: di@^0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c" - integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw= + integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA== diff-arrays-of-objects@^1.1.8: version "1.1.9" @@ -4713,7 +4729,7 @@ dir-glob@^3.0.1: discontinuous-range@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" - integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo= + integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ== doctrine@^2.1.0: version "2.1.0" @@ -4745,7 +4761,7 @@ dom-helpers@^5.0.1: dom-serialize@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b" - integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs= + integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ== dependencies: custom-event "~1.0.0" ent "~2.2.0" @@ -4787,15 +4803,10 @@ domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0: domelementtype "^2.2.0" domhandler "^4.2.0" -dropzone@^5.9.3: - version "5.9.3" - resolved "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz#b3070ae090fa48cbc04c17535635537ca72d70d6" - integrity sha512-Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA== - duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1" - integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= + integrity sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA== dependencies: readable-stream "^2.0.2" @@ -4807,14 +4818,14 @@ duplexer@^0.1.2: ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== -ejs@~3.1.6: - version "3.1.6" - resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" - integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== +ejs@~3.1.8: + version "3.1.8" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" + integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== dependencies: - jake "^10.6.1" + jake "^10.8.5" electron-to-chromium@^1.3.886: version "1.3.889" @@ -4857,9 +4868,9 @@ emojis-list@^3.0.0: encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -encoding@^0.1.12: +encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -4922,7 +4933,7 @@ enquirer@^2.3.5: ent@~2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" - integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= + integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA== entities@^2.0.0: version "2.2.0" @@ -5013,7 +5024,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.18.0-next.1, es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1: +es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1: version "1.19.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== @@ -5066,12 +5077,12 @@ escalade@^3.1.1: escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== escape-string-regexp@^4.0.0: version "4.0.0" @@ -5225,7 +5236,7 @@ esutils@^2.0.2: eve@~0.5.1: version "0.5.4" resolved "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz#67d080b9725291d7e389e34c26860dd97f1debaa" - integrity sha1-Z9CAuXJSkdfjieNMJoYN2X8d66o= + integrity sha512-aqprQ9MAOh1t66PrHxDFmMXPlgNO6Uv1uqvxmwjprQV50jaQ2RqO7O1neY4PJwC+hMnkyMDphu2AQPOPZdjQog== eventemitter3@^4.0.0: version "4.0.7" @@ -5275,7 +5286,7 @@ extend@^3.0.0: fast-deep-equal@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614" - integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ= + integrity sha512-fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw== fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" @@ -5312,7 +5323,7 @@ fast-json-stable-stringify@^2.0.0: fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fast-memoize@^2.5.1: version "2.5.2" @@ -5343,6 +5354,13 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +file-selector@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/file-selector/-/file-selector-0.6.0.tgz#fa0a8d9007b829504db4d07dd4de0310b65287dc" + integrity sha512-QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw== + dependencies: + tslib "^2.4.0" + file-type@^12.0.0: version "12.4.2" resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz#a344ea5664a1d01447ee7fb1b635f72feb6169d9" @@ -5354,16 +5372,16 @@ file-uri-to-path@1.0.0: integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== filelist@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz#80202f21462d4d1c2e214119b1807c1bc0380e5b" - integrity sha512-z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== dependencies: - minimatch "^3.0.4" + minimatch "^5.0.1" filename-reserved-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" - integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik= + integrity sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ== fill-range@^7.0.1: version "7.0.1" @@ -5436,12 +5454,12 @@ flatted@^3.2.4: follow-redirects@^1.0.0, follow-redirects@^1.14.0: version "1.14.8" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" - integrity "sha1-AWmW+5oRoQBWY5ixxoOTN9e/qPw= sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==" + integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== foreach@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" - integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k= + integrity sha512-ZBbtRiapkZYLsqoPyZOR+uPfto0GRMNQN1GwzZtZt7iZvPPbDDQV0JF5Hx4o/QFQ5c0vyuoZ98T8RSBbopzWtA== fraction.js@^4.1.1: version "4.1.1" @@ -5457,7 +5475,7 @@ fs-extra@^10.0.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-minipass@^2.0.0: +fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== @@ -5467,7 +5485,7 @@ fs-minipass@^2.0.0: fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@~2.3.2: version "2.3.2" @@ -5492,26 +5510,26 @@ function.prototype.name@^1.1.2, function.prototype.name@^1.1.3: functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== functions-have-names@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.2.tgz#98d93991c39da9361f8e50b337c4f6e41f120e21" integrity sha512-bLgc3asbWdwPbx2mNk2S49kmJCuQeu0nfmaOgbs8WIyzzkw3r4htszdIi9Q9EMezDPTYuJx2wvjZ/EwgAthpnA== -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= +gauge@^4.0.3: + version "4.0.4" + resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" + integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== dependencies: - aproba "^1.0.3" - 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" + aproba "^1.0.3 || ^2.0.0" + color-support "^1.1.3" + console-control-strings "^1.1.0" + has-unicode "^2.0.1" + signal-exit "^3.0.7" + string-width "^4.2.3" + strip-ansi "^6.0.1" + wide-align "^1.1.5" gensync@^1.0.0-beta.2: version "1.0.0-beta.2" @@ -5579,6 +5597,17 @@ glob@^7.1.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: once "^1.3.0" path-is-absolute "^1.0.0" +glob@^8.0.1: + version "8.0.3" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" + integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^5.0.1" + once "^1.3.0" + globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" @@ -5678,7 +5707,7 @@ hard-rejection@^2.1.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= + integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg== dependencies: ansi-regex "^2.0.0" @@ -5690,12 +5719,12 @@ has-bigints@^1.0.1: has-cors@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39" - integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk= + integrity sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA== has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has-flag@^4.0.0: version "4.0.0" @@ -5714,10 +5743,10 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" -has-unicode@^2.0.0: +has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== has@^1.0.0, has@^1.0.3: version "1.0.3" @@ -5746,12 +5775,12 @@ hash.js@^1.0.0, hash.js@^1.0.3: hat@^0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a" - integrity sha1-uwFKnmSzeIrtgAWRdBPU/z1QLYo= + integrity sha512-zpImx2GoKXy42fVDSEad2BPKuSQdLcqsCYa48K3zHSzM/ugWuYjLDr8IXxpVuL7uCLHw56eaiLxCRthhOzf5ug== heap@0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.5.tgz#713b65590ebcc40fcbeeaf55e851694092b39af1" - integrity sha1-cTtlWQ68xA/L7q9V6FFpQJKzmvE= + integrity sha512-G7HLD+WKcrOyJP5VQwYZNC3Z6FcQ7YYjEFiFoIj8PfEr73mu421o8B1N5DKUcc8K37EsJ2XXWA8DtrDz/2dReg== history@^5.2.0: version "5.3.0" @@ -5763,7 +5792,7 @@ history@^5.2.0: hmac-drbg@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" - integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= + integrity sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg== dependencies: hash.js "^1.0.3" minimalistic-assert "^1.0.0" @@ -5825,7 +5854,7 @@ html2canvas@^1.0.0-rc.7: htmlescape@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" - integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E= + integrity sha512-eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg== htmlparser2@6.1.0, htmlparser2@^6.1.0: version "6.1.0" @@ -5853,12 +5882,12 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-proxy-agent@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" - integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== dependencies: - "@tootallnate/once" "1" + "@tootallnate/once" "2" agent-base "6" debug "4" @@ -5874,12 +5903,12 @@ http-proxy@^1.18.1: https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" - integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= + integrity sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg== https-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" - integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== dependencies: agent-base "6" debug "4" @@ -5892,7 +5921,7 @@ human-signals@^2.1.0: humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== dependencies: ms "^2.0.0" @@ -5997,7 +6026,7 @@ imports-loader@^2.0.0: imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== indent-string@^4.0.0: version "4.0.0" @@ -6017,7 +6046,7 @@ infer-owner@^1.0.4: inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" @@ -6030,17 +6059,17 @@ inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1" - integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE= + integrity sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA== inherits@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== inline-source-map@~0.6.0: version "0.6.2" resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5" - integrity sha1-+Tk0ccGKedFyT4Y/o4tYY3Ct4qU= + integrity sha512-0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA== dependencies: source-map "~0.5.3" @@ -6099,10 +6128,10 @@ ip-address@^7.1.0: jsbn "1.1.0" sprintf-js "1.1.2" -ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== is-absolute-url@^3.0.3: version "3.0.3" @@ -6125,7 +6154,7 @@ is-arguments@^1.0.4: is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= + integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== is-bigint@^1.0.1: version "1.0.4" @@ -6198,20 +6227,13 @@ is-docker@^2.1.1: is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-finite@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3" integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w== -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" @@ -6234,12 +6256,12 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1: is-in-browser@^1.0.2, is-in-browser@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835" - integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU= + integrity sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g== is-lambda@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== is-negative-zero@^2.0.1: version "2.0.1" @@ -6261,7 +6283,7 @@ is-number@^7.0.0: is-plain-obj@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= + integrity sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg== is-plain-object@^2.0.4: version "2.0.4" @@ -6310,7 +6332,7 @@ is-string@^1.0.5, is-string@^1.0.7: is-subset@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" - integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY= + integrity sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw== is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" @@ -6347,12 +6369,12 @@ is-weakref@^1.0.1: 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= + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== isbinaryfile@^4.0.8: version "4.0.8" @@ -6362,12 +6384,12 @@ isbinaryfile@^4.0.8: isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== isobject@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= + integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== istanbul-instrumenter-loader@^3.0.1: version "3.0.1" @@ -6438,13 +6460,13 @@ istanbul-reports@^3.0.0: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jake@^10.6.1: - version "10.8.2" - resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" - integrity sha512-eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A== +jake@^10.8.5: + version "10.8.5" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" + integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== dependencies: - async "0.9.x" - chalk "^2.4.2" + async "^3.2.3" + chalk "^4.0.2" filelist "^1.0.1" minimatch "^3.0.4" @@ -6463,7 +6485,7 @@ jasmine-enzyme@^7.1.2: javascript-natural-sort@^0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz#f9e2303d4507f6d74355a73664d1440fb5a0ef59" - integrity sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k= + integrity sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw== jest-worker@^27.0.2, jest-worker@^27.0.6: version "27.3.1" @@ -6477,7 +6499,7 @@ jest-worker@^27.0.2, jest-worker@^27.0.6: jmespath@^0.15.0: version "0.15.0" resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217" - integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc= + integrity sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w== jquery-contextmenu@^2.6.4, jquery-contextmenu@^2.9.2: version "2.9.2" @@ -6486,14 +6508,14 @@ jquery-contextmenu@^2.6.4, jquery-contextmenu@^2.9.2: dependencies: jquery "^3.5.0" -jquery-ui@>=1.8.0, jquery-ui@^1.13.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz#ab5ac65f37ca093c51b3478c4097f55bbc008f36" - integrity sha512-Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw== +jquery-ui@>=1.8.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.2.6, "jquery@>=1.7.1 <4.0.0", jquery@>=1.8.0, "jquery@>=1.8.0 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.5.1, jquery@^3.6.0: +"jquery@>=1.7.1 <4.0.0", jquery@>=1.8.0, "jquery@>=1.8.0 <4.0.0", jquery@^3.3.1, jquery@^3.5.0, jquery@^3.5.1, jquery@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== @@ -6501,7 +6523,7 @@ jquery@>=1.2.6, "jquery@>=1.7.1 <4.0.0", jquery@>=1.8.0, "jquery@>=1.8.0 <4.0.0" js-string-escape@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" - integrity sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8= + integrity sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg== "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" @@ -6511,7 +6533,7 @@ js-string-escape@^1.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= + integrity sha512-RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg== js-yaml@^3.13.1: version "3.14.1" @@ -6524,12 +6546,12 @@ js-yaml@^3.13.1: jsbn@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" - integrity sha1-sBMHyym2GKHtJux56RH4A8TaAEA= + integrity sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A== jsesc@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b" - integrity sha1-RsP+yMGJKxKwgz25vHYiF226s0s= + integrity sha512-Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA== jsesc@^2.5.1: version "2.5.2" @@ -6539,7 +6561,7 @@ jsesc@^2.5.1: jsesc@~0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" - integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= + integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== json-bignumber@^1.0.1: version "1.0.2" @@ -6561,7 +6583,7 @@ json-parse-even-better-errors@^2.3.0: json-schema-traverse@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340" - integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A= + integrity sha512-4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA== json-schema-traverse@^0.4.1: version "0.4.1" @@ -6581,7 +6603,7 @@ json-source-map@^0.6.1: json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json5@^1.0.1: version "1.0.1" @@ -6636,7 +6658,7 @@ jsonfile@^6.0.1: jsonparse@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" - integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== jsonrepair@^2.2.1: version "2.2.1" @@ -6777,7 +6799,7 @@ karma-jasmine@^4.0.1: karma-requirejs@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz#fddae2cb87d7ebc16fb0222893564d7fee578798" - integrity sha1-/driy4fX68FvsCIok1ZNf+5Xh5g= + integrity sha512-MHTOYKdwwJBkvYid0TaYvBzOnFH3TDtzo6ie5E4o9SaUSXXsfMRLa/whUz6efVIgTxj1xnKYasNn/XwEgJeB/Q== karma-source-map-support@^1.4.0: version "1.4.0" @@ -6871,7 +6893,7 @@ lilconfig@^2.0.3: lines-and-columns@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= + integrity sha512-8ZmlJFVK9iCmtLz19HpSsR8HaAMWBT284VMNednLwlIMDP2hJDCIhUp0IZ2xUcZ+Ob6BM0VvCSJwzASDM45NLQ== loader-runner@^4.2.0: version "4.2.0" @@ -6910,10 +6932,48 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +lodash._basebind@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._basebind/-/lodash._basebind-2.3.0.tgz#2b5bc452a0e106143b21869f233bdb587417d248" + integrity sha512-SHqM7YCuJ+BeGTs7lqpWnmdHEeF4MWxS3dksJctHFNxR81FXPOzA4bS5Vs5CpcGTkBpM8FCl+YEbQEblRw8ABg== + dependencies: + lodash._basecreate "~2.3.0" + lodash._setbinddata "~2.3.0" + lodash.isobject "~2.3.0" + +lodash._basecreate@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-2.3.0.tgz#9b88a86a4dcff7b7f3c61d83a2fcfc0671ec9de0" + integrity sha512-vwZaWldZwS2y9b99D8i9+WtgiZXbHKsBsMrpxJEqTsNW20NhJo5W8PBQkeQO9CmxuqEYn8UkMnfEM2MMT4cVrw== + dependencies: + lodash._renative "~2.3.0" + lodash.isobject "~2.3.0" + lodash.noop "~2.3.0" + +lodash._basecreatecallback@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._basecreatecallback/-/lodash._basecreatecallback-2.3.0.tgz#37b2ab17591a339e988db3259fcd46019d7ac362" + integrity sha512-Ev+pDzzfVfgbiucpXijconLGRBar7/+KNCf05kSnk4CmdDVhAy1RdbU9efCJ/o9GXI08JdUGwZ+5QJ3QX3kj0g== + dependencies: + lodash._setbinddata "~2.3.0" + lodash.bind "~2.3.0" + lodash.identity "~2.3.0" + lodash.support "~2.3.0" + +lodash._basecreatewrapper@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.3.0.tgz#aa0c61ad96044c3933376131483a9759c3651247" + integrity sha512-YLycQ7k8AB9Wc1EOvLNxuRWcqipDkMXq2GCgnLWQR6qtgTb3gY3LELzEpnFshrEO4LOLs+R2EpcY+uCOZaLQ8Q== + dependencies: + lodash._basecreate "~2.3.0" + lodash._setbinddata "~2.3.0" + lodash._slice "~2.3.0" + lodash.isobject "~2.3.0" + lodash._baseisequal@^3.0.0: version "3.0.7" resolved "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz#d8025f76339d29342767dcc887ce5cb95a5b51f1" - integrity sha1-2AJfdjOdKTQnZ9zIh85cuVpbUfE= + integrity sha512-U+3GsNEZj9ebI03ncLC2pLmYVjgtYZEwdkAPO7UGgtGvAz36JVFPAQUufpSaVL93Cz5arc6JGRKZRhaOhyVJYA== dependencies: lodash.isarray "^3.0.0" lodash.istypedarray "^3.0.0" @@ -6922,42 +6982,112 @@ lodash._baseisequal@^3.0.0: lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= + integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ== + +lodash._createwrapper@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._createwrapper/-/lodash._createwrapper-2.3.0.tgz#d1aae1102dadf440e8e06fc133a6edd7fe146075" + integrity sha512-XjaI/rzg9W+WO4WJDQ+PRlHD5sAMJ1RhJLuT65cBxLCb1kIYs4U20jqvTDGAWyVT3c34GYiLd9AreHYuB/8yJA== + dependencies: + lodash._basebind "~2.3.0" + lodash._basecreatewrapper "~2.3.0" + lodash.isfunction "~2.3.0" lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= + integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA== + +lodash._objecttypes@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.3.0.tgz#6a3ea3987dd6eeb8021b2d5c9c303549cc2bae1e" + integrity sha512-jbA6QyHt9cw3BzvbWzIcnU3Z12jSneT6xBgz3Y782CJsN1tV5aTBKrFo2B4AkeHBNaxSrbPYZZpi1Lwj3xjdtg== + +lodash._renative@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._renative/-/lodash._renative-2.3.0.tgz#77d8edd4ced26dd5971f9e15a5f772e4e317fbd3" + integrity sha512-v44MRirqYqZGK/h5UKoVqXWF2L+LUiLTU+Ogu5rHRVWJUA1uWIlHaMpG8f/OA8j++BzPMQij9+erXHtgFcbuwg== + +lodash._setbinddata@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._setbinddata/-/lodash._setbinddata-2.3.0.tgz#e5610490acd13277d59858d95b5f2727f1508f04" + integrity sha512-xMFfbF7dL+sFtrdE49uHFmfpBAEwlFtfgMp86nQRlAF6aizYL+3MTbnYMKJSkP1W501PhsgiBED5kBbZd8kR2g== + dependencies: + lodash._renative "~2.3.0" + lodash.noop "~2.3.0" + +lodash._shimkeys@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.3.0.tgz#611f93149e3e6c721096b48769ef29537ada8ba9" + integrity sha512-9Iuyi7TiWMGa/9+2rqEE+Zwye4b/U2w7Saw6UX1h6Xs88mEER+uz9FZcEBPKMVKsad9Pw5GNAcIBRnW2jNpneQ== + dependencies: + lodash._objecttypes "~2.3.0" + +lodash._slice@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash._slice/-/lodash._slice-2.3.0.tgz#147198132859972e4680ca29a5992c855669aa5c" + integrity sha512-7C61GhzRUv36gTafr+RIb+AomCAYsSATEoK4OP0VkNBcwvsM022Z22AVgqjjzikeNO1U29LzsJZDvLbiNPUYvA== + +lodash.bind@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-2.3.0.tgz#c2a8e18b68e5ecc152e2b168266116fea5b016cc" + integrity sha512-goakyOo+FMN8lttMPnZ0UNlr5RlzX4IrUXyTJPT2A0tGCMXySupond9wzvDqTvVmYTcQjIKGrj8naJDS2xWAlQ== + dependencies: + lodash._createwrapper "~2.3.0" + lodash._renative "~2.3.0" + lodash._slice "~2.3.0" lodash.debounce@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" - integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168= + integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== lodash.escape@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" - integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg= + integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw== lodash.flattendeep@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" - integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= + integrity sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ== + +lodash.foreach@2.3.x: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-2.3.0.tgz#083404c91e846ee77245fdf9d76519c68b2af168" + integrity sha512-yLnyptVRJd0//AbGp480grgQG9iaDIV5uOgSbpurRy1dYybPbjNTLQ3FyLEQ84buVLPG7jyaiyvpzgfOutRB3Q== + dependencies: + lodash._basecreatecallback "~2.3.0" + lodash.forown "~2.3.0" + +lodash.forown@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.forown/-/lodash.forown-2.3.0.tgz#24fb4aaf800d45fc2dc60bfec3ce04c836a3ad7f" + integrity sha512-dUnCsuQTtq3Y7bxPNoEEqjJjPL2ftLtcz2PTeRKvhbpdM514AvnqCjewHGsm/W+dwspIwa14KoWEZeizJ7smxA== + dependencies: + lodash._basecreatecallback "~2.3.0" + lodash._objecttypes "~2.3.0" + lodash.keys "~2.3.0" + +lodash.identity@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.identity/-/lodash.identity-2.3.0.tgz#6b01a210c9485355c2a913b48b6711219a173ded" + integrity sha512-NYJ2r2cwy3tkx/saqbIZEX6oQUzjWTnGRu7d/zmBjMCZos3eHBxCpbvWFWSetv8jFVrptsp6EbWjzNgBKhUoOA== lodash.isarguments@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a" - integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo= + integrity sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg== lodash.isarray@^3.0.0: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55" - integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U= + integrity sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ== lodash.isequal@^3.0: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-3.0.4.tgz#1c35eb3b6ef0cd1ff51743e3ea3cf7fdffdacb64" - integrity sha1-HDXrO27wzR/1F0Pj6jz3/f/ay2Q= + integrity sha512-Bsu5fP9Omd+HBk2Dz8qp4BHbC+83DBykZ87Lz1JmPKTVNy4Q0XQVtUrbfXVAK/udQrWNcGStcKSA9yj/Zkm3TQ== dependencies: lodash._baseisequal "^3.0.0" lodash._bindcallback "^3.0.0" @@ -6965,17 +7095,38 @@ lodash.isequal@^3.0: lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= + integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ== + +lodash.isfunction@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-2.3.0.tgz#6b2973e47a647cf12e70d676aea13643706e5267" + integrity sha512-X5lteBYlCrVO7Qc00fxP8W90fzRp6Ax9XcHANmU3OsZHdSyIVZ9ZlX5QTTpRq8aGY+9I5Rmd0UTzTIIyWPugEQ== + +lodash.isobject@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.3.0.tgz#2e16d3fc583da9831968953f2d8e6d73434f6799" + integrity sha512-jo1pfV61C4TE8BfEzqaHj6EIKiSkFANJrB6yscwuCJMSRw5tbqjk4Gv7nJzk4Z6nFKobZjGZ8Qd41vmnwgeQqQ== + dependencies: + lodash._objecttypes "~2.3.0" lodash.istypedarray@^3.0.0: version "3.0.6" resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62" - integrity sha1-yaR3SYYHUB2OhJTSg7h8OSgc72I= + integrity sha512-lGWJ6N8AA3KSv+ZZxlTdn4f6A7kMfpJboeyvbFdE7IU9YAgweODqmOgdUHOA+c6lVWeVLysdaxciFXi+foVsWw== + +lodash.keys@2.3.x, lodash.keys@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.3.0.tgz#b350f4f92caa9f45a4a2ecf018454cf2f28ae253" + integrity sha512-c0UW0ffqMxSCtoVbmVt2lERJLkEqgoOn2ejPsWXzr0ZrqRbl3uruGgwHzhtqXxi6K/ei3Ey7zimOqSwXgzazPg== + dependencies: + lodash._renative "~2.3.0" + lodash._shimkeys "~2.3.0" + lodash.isobject "~2.3.0" lodash.keys@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a" - integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo= + integrity sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ== dependencies: lodash._getnative "^3.0.0" lodash.isarguments "^3.0.0" @@ -6984,27 +7135,39 @@ lodash.keys@^3.0.0: lodash.memoize@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= + integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== lodash.memoize@~3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" - integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8= + integrity sha512-eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A== lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.noop@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.noop/-/lodash.noop-2.3.0.tgz#3059d628d51bbf937cd2a0b6fc3a7f212a669c2c" + integrity sha512-NpSm8HRm1WkBBWHUveDukLF4Kfb5P5E3fjHc9Qre9A11nNubozLWD2wH3UBTZbu+KSuX8aSUvy9b+PUyEceJ8g== + +lodash.support@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/lodash.support/-/lodash.support-2.3.0.tgz#7eaf038af4f0d6aab776b44aa6dcfc80334c9bfd" + integrity sha512-etc7VWbB0U3Iya8ixj2xy4sDBN3jvPX7ODi8iXtn4KkkjNpdngrdc7Vlt5jub/Vgqx6/dWtp7Ml9awhCQPYKGQ== + dependencies: + lodash._renative "~2.3.0" + lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== 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= + integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== lodash@4, lodash@4.*, lodash@^4.14.1, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" @@ -7036,10 +7199,15 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +lru-cache@^7.7.1: + version "7.13.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.1.tgz#267a81fbd0881327c46a81c5922606a2cfe336c4" + integrity sha512-CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ== + lunr@^0.7.0: version "0.7.2" resolved "https://registry.yarnpkg.com/lunr/-/lunr-0.7.2.tgz#79a30e932e216cba163541ee37a3607c12cd7281" - integrity sha1-eaMOky4hbLoWNUHuN6NgfBLNcoE= + integrity sha512-qXxxSzrWOhFu4EhyvYqCGMv1nJsTy5OGQN3GtClGbRSaqJ/1XASk41nF2jjxzKTS8kjU0QybhOgGgGo6HUZqSQ== make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" @@ -7048,47 +7216,47 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: dependencies: semver "^6.0.0" -make-fetch-happen@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968" - integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg== +make-fetch-happen@^10.0.3: + version "10.2.0" + resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.0.tgz#0bde3914f2f82750b5d48c6d2294d2c74f985e5b" + integrity sha512-OnEfCLofQVJ5zgKwGk55GaqosqKjaR6khQlJY3dBAA+hM25Bc5CmX5rKUfVut+rYA3uidA7zb7AvcglU87rPRg== dependencies: - agentkeepalive "^4.1.3" - cacache "^15.2.0" + agentkeepalive "^4.2.1" + cacache "^16.1.0" http-cache-semantics "^4.1.0" - http-proxy-agent "^4.0.1" + http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" is-lambda "^1.0.1" - lru-cache "^6.0.0" - minipass "^3.1.3" + lru-cache "^7.7.1" + minipass "^3.1.6" minipass-collect "^1.0.2" - minipass-fetch "^1.3.2" + minipass-fetch "^2.0.3" minipass-flush "^1.0.5" minipass-pipeline "^1.2.4" - negotiator "^0.6.2" + negotiator "^0.6.3" promise-retry "^2.0.1" - socks-proxy-agent "^6.0.0" - ssri "^8.0.0" + socks-proxy-agent "^7.0.0" + ssri "^9.0.0" map-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= + integrity sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg== map-obj@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== -marked@^3.0.7: - version "3.0.8" - resolved "https://registry.yarnpkg.com/marked/-/marked-3.0.8.tgz#2785f0dc79cbdc6034be4bb4f0f0a396bd3f8aeb" - integrity sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw== +marked@^4.0.17: + version "4.0.18" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.0.18.tgz#cd0ac54b2e5610cfb90e8fd46ccaa8292c9ed569" + integrity sha512-wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw== matches-selector@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/matches-selector/-/matches-selector-0.0.1.tgz#1df5262243ae341c1a0804dd302048267ac713bb" - integrity sha1-HfUmIkOuNBwaCATdMCBIJnrHE7s= + integrity sha512-Bm8wuvuNGPY3j1Mo23PxieRQAmQQe2qVcqgmpHOp1BEBNgb4dqzn2Dcgu5bYltMosjGi6LD7GPW72zboSdyJQg== md5.js@^1.3.4: version "1.3.5" @@ -7107,7 +7275,7 @@ mdn-data@2.0.14: media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== "memoize-one@>=3.1.1 <6", memoize-one@^5.0.0: version "5.2.1" @@ -7145,7 +7313,7 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: microbuffer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/microbuffer/-/microbuffer-1.0.0.tgz#8b3832ed40c87d51f47bb234913a698a756d19d2" - integrity sha1-izgy7UDIfVH0e7I0kTppinVtGdI= + integrity sha512-O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA== micromatch@^4.0.4: version "4.0.4" @@ -7212,7 +7380,7 @@ minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" - integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= + integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg== minimatch@^3.0.0, minimatch@^3.0.4: version "3.0.4" @@ -7221,6 +7389,13 @@ minimatch@^3.0.0, minimatch@^3.0.4: dependencies: 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== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -7233,7 +7408,7 @@ minimist-options@4.1.0: minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" - integrity "sha1-hjelt1nqDW6YcCz7OpKDMjyTr0Q= sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass-collect@^1.0.2: version "1.0.2" @@ -7242,16 +7417,16 @@ minipass-collect@^1.0.2: dependencies: minipass "^3.0.0" -minipass-fetch@^1.3.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6" - integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw== +minipass-fetch@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz#ca1754a5f857a3be99a9271277246ac0b44c3ff8" + integrity sha512-H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg== dependencies: - minipass "^3.1.0" + minipass "^3.1.6" minipass-sized "^1.0.3" - minizlib "^2.0.0" + minizlib "^2.1.2" optionalDependencies: - encoding "^0.1.12" + encoding "^0.1.13" minipass-flush@^1.0.5: version "1.0.5" @@ -7260,7 +7435,7 @@ minipass-flush@^1.0.5: dependencies: minipass "^3.0.0" -minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4: +minipass-pipeline@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== @@ -7274,14 +7449,14 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: - version "3.1.5" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz#71f6251b0a33a49c01b3cf97ff77eda030dff732" - integrity sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw== +minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: + version "3.3.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" + integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== dependencies: yallist "^4.0.0" -minizlib@^2.0.0, minizlib@^2.1.1: +minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== @@ -7362,24 +7537,17 @@ module-deps@^6.2.3: through2 "^2.0.0" xtend "^4.0.0" -moment-timezone@^0.5.31: - version "0.5.33" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz#b252fd6bb57f341c9b59a5ab61a8e51a73bbd22c" - integrity sha512-PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w== - dependencies: - moment ">= 2.9.0" - -moment-timezone@^0.5.34: +moment-timezone@^0.5.31, moment-timezone@^0.5.34: version "0.5.34" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.34.tgz#a75938f7476b88f155d3504a9343f7519d9a405c" integrity sha512-3zAEHh2hKUs3EXLESx/wsgw6IQdusOT8Bxm3D9UrHPQR7zlMmzwybC8zHEM1tQ4LJwP7fcxrWr8tuBg05fFCbg== dependencies: moment ">= 2.9.0" -"moment@>= 2.9.0", moment@^2.29.0, moment@^2.29.3, moment@~2.29.2: - version "2.29.3" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3" - integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw== +"moment@>= 2.9.0", moment@^2.29.0, moment@^2.29.4, moment@~2.29.2: + version "2.29.4" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== moo@^0.5.0: version "0.5.1" @@ -7394,32 +7562,27 @@ mousetrap@^1.6.3: ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== -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== - nan@^2.14.2: - version "2.15.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" - integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== + version "2.16.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" + integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== nanoid@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c" - integrity "sha1-YmZ1Itpmc5ccypFqbT7/P0Ff+Aw= sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==" + integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA== nanoid@^3.1.30: version "3.3.2" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557" - integrity "sha1-yJYi+vtDgc0iFCHGnsWFR6HuxVc= sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==" + integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA== nanopop@^2.1.0: version "2.1.0" @@ -7429,7 +7592,7 @@ nanopop@^2.1.0: natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== nearley@^2.7.10: version "2.20.1" @@ -7444,31 +7607,36 @@ nearley@^2.7.10: neatequal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/neatequal/-/neatequal-1.0.0.tgz#2ee1211bc9fa6e4c55715fd210bb05602eb1ae3b" - integrity sha1-LuEhG8n6bkxVcV/SELsFYC6xrjs= + integrity sha512-sVt5awO4a4w24QmAthdrCPiVRW3naB8FGLdyadin01BH+6BzNPEBwGrpwCczQvPlULS6uXTItTe1PJ5P0kYm7A== dependencies: varstream "^0.3.2" -negotiator@0.6.2, negotiator@^0.6.2: +negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== +negotiator@^0.6.3: + version "0.6.3" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" + integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== + neo-async@^2.6.0, neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -node-gyp@^8.1.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.0.tgz#6e1112b10617f0f8559c64b3f737e8109e5a8338" - integrity sha512-Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q== +node-gyp@^9.0.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz#c8d8e590678ea1f7b8097511dedf41fc126648f8" + integrity sha512-HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g== dependencies: env-paths "^2.2.0" glob "^7.1.4" graceful-fs "^4.2.6" - make-fetch-happen "^9.1.0" + make-fetch-happen "^10.0.3" nopt "^5.0.0" - npmlog "^4.1.2" + npmlog "^6.0.0" rimraf "^3.0.2" semver "^7.3.5" tar "^6.1.2" @@ -7509,7 +7677,7 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: normalize-range@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= + integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA== normalize-url@^6.0.1: version "6.1.0" @@ -7536,15 +7704,15 @@ npm-run-path@^4.0.1: dependencies: path-key "^3.0.0" -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== +npmlog@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" + integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== dependencies: - are-we-there-yet "~1.1.2" - console-control-strings "~1.1.0" - gauge "~2.7.3" - set-blocking "~2.0.0" + are-we-there-yet "^3.0.0" + console-control-strings "^1.1.0" + gauge "^4.0.3" + set-blocking "^2.0.0" nth-check@^2.0.0: version "2.0.1" @@ -7553,15 +7721,10 @@ nth-check@^2.0.0: dependencies: boolbase "^1.0.0" -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - -object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-inspect@^1.11.0, object-inspect@^1.7.0, object-inspect@^1.9.0: version "1.11.0" @@ -7629,14 +7792,14 @@ object.values@^1.1.1, object.values@^1.1.4: on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== dependencies: ee-first "1.1.1" once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" @@ -7667,12 +7830,12 @@ optionator@^0.9.1: os-browserify@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" - integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc= + integrity sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A== os-shim@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917" - integrity sha1-a2LDeRz3kJ6jXtRuF2WLtBfLORc= + integrity sha512-jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A== p-limit@^2.2.0: version "2.3.0" @@ -7717,7 +7880,7 @@ p-pipe@^3.0.0: p-reduce@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" - integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo= + integrity sha512-3Tx1T3oM1xO/Y8Gj0sWyE78EIJZ+t+aEmXUdvQgvGmSMri7aPTHoovbXEreWKkL5j21Er60XAWLTzKbAKYOujQ== p-series@^1.0.0, p-series@^1.1.0: version "1.1.0" @@ -7747,7 +7910,7 @@ parent-module@^1.0.0: parents@^1.0.0, parents@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751" - integrity sha1-/t1NK/GTp3dF/nHjcdc8MwfZx1E= + integrity sha512-mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg== dependencies: path-platform "~0.11.15" @@ -7819,7 +7982,7 @@ path-fx@^2.0.0, path-fx@^2.1.1: 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= + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" @@ -7834,7 +7997,7 @@ path-parse@^1.0.6: path-platform@~0.11.15: version "0.11.15" resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2" - integrity sha1-6GQhf3TDaFDwhSt43Hv31KVyG/I= + integrity sha512-Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg== path-type@^4.0.0: version "4.0.0" @@ -7844,7 +8007,7 @@ path-type@^4.0.0: pathfinding@^0.4.18: version "0.4.18" resolved "https://registry.yarnpkg.com/pathfinding/-/pathfinding-0.4.18.tgz#a9990f6fa22b7ef196e5651b049165403a045fe8" - integrity sha1-qZkPb6IrfvGW5WUbBJFlQDoEX+g= + integrity sha512-R0TGEQ9GRcFCDvAWlJAWC+KGJ9SLbW4c0nuZRcioVlXVTlw+F5RvXQ8SQgSqI9KXWC1ew95vgmIiyaWTlCe9Ag== dependencies: heap "0.2.5" @@ -7867,7 +8030,7 @@ pbkdf2@^3.0.3: 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= + integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== "pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#07cc449e1d89ecc8cce3679d8cff5a35f1db67ee": version "1.0.0" @@ -7903,7 +8066,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: picomodal@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/picomodal/-/picomodal-3.0.0.tgz#facd30f4fbf34a809c1e04ea525f004f399c0b82" - integrity sha1-+s0w9PvzSoCcHgTqUl8ATzmcC4I= + integrity sha512-FoR3TDfuLlqUvcEeK5ifpKSVVns6B4BQvc8SDF6THVMuadya6LLtji0QgUDSStw0ZR2J7I6UGi5V2V23rnPWTw== pkg-dir@^4.1.0, pkg-dir@^4.2.0: version "4.2.0" @@ -8192,7 +8355,7 @@ postcss@^8.2.15, postcss@^8.3.5: precond@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz#aa9591bcaa24923f1e0f4849d240f47efc1075ac" - integrity sha1-qpWRvKokkj8eD0hJ0kD0fvwQdaw= + integrity sha512-QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ== prelude-ls@^1.2.1: version "1.2.1" @@ -8207,7 +8370,7 @@ process-nextick-args@~2.0.0: process@^0.11.10, process@~0.11.0: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" - integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI= + integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== progress@^2.0.0: version "2.0.3" @@ -8217,7 +8380,7 @@ progress@^2.0.0: promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= + integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== promise-retry@^2.0.1: version "2.0.1" @@ -8245,6 +8408,15 @@ prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: object-assign "^4.1.1" react-is "^16.8.1" +prop-types@^15.8.1: + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.13.1" + public-encrypt@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0" @@ -8260,12 +8432,12 @@ public-encrypt@^4.0.0: punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" - integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0= + integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw== punycode@^1.3.2: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" - integrity sha1-wNWmOycYgArY4esPpSachN1BhF4= + integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ== punycode@^2.1.0: version "2.1.1" @@ -8275,7 +8447,7 @@ punycode@^2.1.0: q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" - integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= + integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== qjobs@^1.2.0: version "1.2.0" @@ -8290,12 +8462,12 @@ qs@6.7.0: querystring-es3@~0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" - integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM= + integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA== querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" - integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA= + integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g== queue-microtask@^1.2.2: version "1.2.3" @@ -8317,7 +8489,7 @@ raf@^3.4.1: railroad-diagrams@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" - integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234= + integrity sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A== randexp@0.4.6: version "0.4.6" @@ -8554,6 +8726,15 @@ react-draggable@^4.4.4: clsx "^1.1.1" prop-types "^15.6.0" +react-dropzone@^14.2.1: + version "14.2.1" + resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.1.tgz#aad17e06290723358398a7be76fb38ecf6d77c1a" + integrity sha512-jzX6wDtAjlfwZ+Fbg+G17EszWUkQVxhMTWMfAC9qSUq7II2pKglHA8aarbFKl0mLpRPDaNUcy+HD/Sf4gkf76Q== + dependencies: + attr-accept "^2.2.2" + file-selector "^0.6.0" + prop-types "^15.8.1" + react-input-autosize@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/react-input-autosize/-/react-input-autosize-3.0.0.tgz#6b5898c790d4478d69420b55441fcc31d5c50a85" @@ -8696,7 +8877,7 @@ react@^17.0.1: read-only-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0" - integrity sha1-JyT9aoET1zdkrCiNQ4YnDB2/F/A= + integrity sha512-3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w== dependencies: readable-stream "^2.0.2" @@ -8722,14 +8903,14 @@ read-pkg@^6.0.0: readable-stream@^1.0.33: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ== dependencies: core-util-is "~1.0.0" inherits "~2.0.1" isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@~2.3.6: +readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -8776,7 +8957,7 @@ redent@^4.0.0: reflect.ownkeys@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" - integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA= + integrity sha512-qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg== regenerate-unicode-properties@^10.0.1: version "10.0.1" @@ -8885,7 +9066,7 @@ regjsparser@^0.8.2: repeating@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda" - integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo= + integrity sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A== dependencies: is-finite "^1.0.0" @@ -8897,7 +9078,7 @@ replace-ext@^1.0.0: require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== require-from-string@^2.0.2: version "2.0.2" @@ -8907,7 +9088,7 @@ require-from-string@^2.0.2: requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= + integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== resize-observer-polyfill@^1.5.1: version "1.5.1" @@ -8955,7 +9136,7 @@ ret@~0.1.10: retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== reusify@^1.0.4: version "1.0.4" @@ -8992,7 +9173,7 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: rst-selector-parser@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" - integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE= + integrity sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA== dependencies: lodash.flattendeep "^4.4.0" nearley "^2.7.10" @@ -9068,7 +9249,7 @@ scheduler@^0.20.2: schema-utils@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf" - integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8= + integrity sha512-QaVYBaD9U8scJw2EBWnCBY+LJ0AD+/2edTaigDs0XLDLBfJmSUK9KGqktg1rb32U3z4j/XwvFwHHH1YfbYFd7Q== dependencies: ajv "^5.0.0" @@ -9119,13 +9300,20 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.4, semver@^7.3.5: +semver@^7.2.1, semver@^7.3.4: version "7.3.5" resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" +semver@^7.3.5: + version "7.3.7" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f" + integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g== + dependencies: + lru-cache "^6.0.0" + serialize-javascript@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" @@ -9140,10 +9328,10 @@ serialize-javascript@^6.0.0: dependencies: randombytes "^2.1.0" -set-blocking@~2.0.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= + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== setprototypeof@1.1.1: version "1.1.1" @@ -9197,7 +9385,7 @@ shell-quote@^1.6.1: shim-loader@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/shim-loader/-/shim-loader-1.0.1.tgz#2583a6d2aa938897c2a41658bcef73ec87d3aa5e" - integrity sha1-JYOm0qqTiJfCpBZYvO9z7IfTql4= + integrity sha512-O7amY2FR6Mmu0LRair5uLc/NG/sHFw/ulOf9s4iJfW/4KBSQdyqz9iZmOf57QG7xbKISHHPttMsVZWqQ/0vxpw== dependencies: loader-utils "^1.1.0" lodash "^4.14.1" @@ -9213,10 +9401,10 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.3: - version "3.0.5" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" - integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== +signal-exit@^3.0.3, signal-exit@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" + integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== simple-concat@^1.0.0: version "1.0.1" @@ -9258,7 +9446,7 @@ slice-ansi@^4.0.0: jquery ">=1.8.0" jquery-ui ">=1.8.0" -smart-buffer@^4.1.0: +smart-buffer@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== @@ -9266,14 +9454,14 @@ smart-buffer@^4.1.0: snapsvg-cjs@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/snapsvg-cjs/-/snapsvg-cjs-0.0.6.tgz#3b2f56af2573d3d364c3ed5bf8885745f4d2dde1" - integrity sha1-Oy9WryVz09Nkw+1b+IhXRfTS3eE= + integrity sha512-7NNvoGrc3BQvWz5rWK1DsD5/Vni4STswz5B3JrBADboQWcN8OBVGjYVJFPT5JkUXb2iVnEflZANhufEpEcTHXw== dependencies: snapsvg "0.5.1" snapsvg@0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz#0caf52c79189a290746fc446cc5e863f6bdddfe3" - integrity sha1-DK9Sx5GJopB0b8RGzF6GP2vd3+M= + integrity sha512-CjwWYsL7+CCk1vCk9BBKGYS4WJVDfJAOMWU+Zhzf8wf6pAm/xT34wnpaMPAgcgCNkxuU6OkQPPd8wGuRCY9aNw== dependencies: eve "~0.5.1" @@ -9323,27 +9511,27 @@ socket.io@^4.2.0: socket.io-adapter "~2.3.3" socket.io-parser "~4.0.4" -socks-proxy-agent@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz#869cf2d7bd10fea96c7ad3111e81726855e285c3" - integrity sha512-57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg== +socks-proxy-agent@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" + integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== dependencies: agent-base "^6.0.2" - debug "^4.3.1" - socks "^2.6.1" + debug "^4.3.3" + socks "^2.6.2" -socks@^2.6.1: - version "2.6.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e" - integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA== +socks@^2.6.2: + version "2.7.0" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz#f9225acdb841e874dca25f870e9130990f3913d0" + integrity sha512-scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA== dependencies: - ip "^1.1.5" - smart-buffer "^4.1.0" + ip "^2.0.0" + smart-buffer "^4.2.0" source-list-map@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz#9889019d1024cce55cdc069498337ef6186a11a1" - integrity sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE= + integrity sha512-FqR2O+cX+toUD3ULVIgTtiqYIqPnA62ehJD47mf4LG1PZCB+xmIa3gcTEhegGbP22aRPh88dJSdgDIolrvSxBQ== source-list-map@^2.0.0: version "2.0.1" @@ -9374,18 +9562,13 @@ source-map-support@~0.5.20: source-map@^0.5.0, source-map@^0.5.7, source-map@~0.5.3: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ== source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@~0.7.2: - version "0.7.3" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== - spdx-correct@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" @@ -9425,12 +9608,12 @@ sprintf-js@1.1.2: sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -ssri@^8.0.0, ssri@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" - integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== +ssri@^9.0.0: + version "9.0.1" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" + integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== dependencies: minipass "^3.1.1" @@ -9442,7 +9625,7 @@ stable@^0.1.8: "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== stream-browserify@^3.0.0: version "3.0.0" @@ -9455,7 +9638,7 @@ stream-browserify@^3.0.0: stream-combiner2@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe" - integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4= + integrity sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw== dependencies: duplexer2 "~0.1.0" readable-stream "^2.0.2" @@ -9487,15 +9670,6 @@ streamroller@^3.0.2: debug "^4.1.1" fs-extra "^10.0.0" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" @@ -9505,16 +9679,6 @@ string-width@^1.0.1: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string.fromcodepoint@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz#8d978333c0bc92538f50f383e4888f3e5619d653" - integrity sha1-jZeDM8C8klOPUPOD5IiPPlYZ1lM= - -string.prototype.codepointat@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc" - integrity sha512-2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg== - string.prototype.matchall@^4.0.5: version "4.0.6" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" @@ -9564,7 +9728,7 @@ string_decoder@^1.1.1: 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= + integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ== string_decoder@~1.1.1: version "1.1.1" @@ -9573,10 +9737,10 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: +strip-ansi@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== dependencies: ansi-regex "^2.0.0" @@ -9663,14 +9827,14 @@ stylis@^4.0.10, stylis@^4.0.7: subarg@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2" - integrity sha1-9izxdYHplrSPyWVpn1TAauJouNI= + integrity sha512-RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg== dependencies: minimist "^1.1.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= + integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g== supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" @@ -9698,38 +9862,35 @@ svg-parser@^2.0.2: resolved "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.4.tgz#fdc2e29e13951736140b76cb122c8ee6630eb6b5" integrity sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ== -svg-pathdata@^5.0.2: - version "5.0.5" - resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-5.0.5.tgz#65e8d765642ba15fe15434444087d082bc526b29" - integrity sha512-TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow== +svg-pathdata@^6.0.0: + version "6.0.3" + resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz#80b0e0283b652ccbafb69ad4f8f73e8d3fbf2cac" + integrity sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw== -svg2ttf@^5.0.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-5.2.0.tgz#75c9b8d3c799a91c893ef7bdbfa72d8e00a48a5c" - integrity sha512-CzxPnSm2/CrMnJuKlXVllOx+q9wuarbIMi4Vf14eJoeESRqAOxVZiH0Ias71mhyXYGgz88A4T/E8fN/Y8eXoYA== +svg2ttf@^6.0.3: + version "6.0.3" + resolved "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-6.0.3.tgz#7b92978ff124b2a583d21e1208b9675e245e56d1" + integrity sha512-CgqMyZrbOPpc+WqH7aga4JWkDPso23EgypLsbQ6gN3uoPWwwiLjXvzgrwGADBExvCRJrWFzAeK1bSoSpE7ixSQ== dependencies: + "@xmldom/xmldom" "^0.7.2" argparse "^2.0.1" - cubic2quad "^1.0.0" + cubic2quad "^1.2.1" lodash "^4.17.10" microbuffer "^1.0.0" svgpath "^2.1.5" - xmldom "~0.5.0" -svgicons2svgfont@^9.0.3: - version "9.2.0" - resolved "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-9.2.0.tgz#9ff1b643891891eb52ab1bd764b468e2d06ded80" - integrity sha512-mWeiuob7L2ZTcnAEP4JvSQ1pnIsGjV16ykQ0fCiiXqoUAQ/iNsDvBc601ojjfP89eCPtr3IVZ9mDxYpdxYO3xQ== +svgicons2svgfont@^10.0.4: + version "10.0.6" + resolved "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-10.0.6.tgz#2901f9016244049674d3b3178c36471994a30c0a" + integrity sha512-fUgQEVg3XwTbOHvlXahHGqCet5Wvfo1bV4DCvbSRvjsOCPCRunYbG4dUJCPegps37BMph3eOrfoobhH5AWuC6A== dependencies: - array.prototype.flatmap "1.2.4" - commander "^4.0.1" + commander "^7.2.0" geometry-interfaces "^1.1.4" glob "^7.1.6" neatequal "^1.0.0" readable-stream "^3.4.0" sax "^1.2.4" - string.fromcodepoint "^0.2.1" - string.prototype.codepointat "^0.2.1" - svg-pathdata "^5.0.2" + svg-pathdata "^6.0.0" svgo-loader@^2.2.0: version "2.2.2" @@ -9753,9 +9914,9 @@ svgo@^2.5.0, svgo@^2.7.0: stable "^0.1.8" svgpath@^2.1.5: - version "2.3.1" - resolved "https://registry.yarnpkg.com/svgpath/-/svgpath-2.3.1.tgz#b102334bebd2244b4818460ba2ebad52716a0d43" - integrity sha512-wNz6lCoj+99GMoyU7SozTfPqiLHz6WcJYZ30Z+F4lF/gPtxWHBCpZ4DhoDI0+oZ0dObKyYsJdSPGbL2mJq/qCg== + version "2.5.0" + resolved "https://registry.yarnpkg.com/svgpath/-/svgpath-2.5.0.tgz#d57434641d9aa9abae02a4038ebf281fa3005b10" + integrity sha512-o/vohwqjUO9nDAh4rcjE3KaW/v//At8UJu2LJMybXidf5QLQLVA4bxH0//4YCsr+1H4Gw1Wi/Jc62ynzSBYidw== syntax-error@^1.1.1: version "1.4.0" @@ -9775,19 +9936,12 @@ table@^6.0.9: string-width "^4.2.3" strip-ansi "^6.0.1" -tablesorter@^2.31.2: - version "2.31.3" - resolved "https://registry.yarnpkg.com/tablesorter/-/tablesorter-2.31.3.tgz#94c33234ba0e5d9efc5ba4e48651010a396c8b64" - integrity sha512-ueEzeKiMajDcCWnUoT1dOeNEaS1OmPh9+8J0O2Sjp3TTijMygH74EA9QNJiNkLJqULyNU0RhbKY26UMUq9iurA== - dependencies: - jquery ">=1.2.6" - tapable@^2.1.1, tapable@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -tar@^6.0.2, tar@^6.1.2: +tar@^6.1.11, tar@^6.1.2: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== @@ -9832,12 +9986,13 @@ terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.1.3: terser "^5.7.2" terser@^5.7.2: - version "5.9.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351" - integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ== + version "5.14.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10" + integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA== dependencies: + "@jridgewell/source-map" "^0.3.2" + acorn "^8.5.0" commander "^2.20.0" - source-map "~0.7.2" source-map-support "~0.5.20" text-segmentation@^1.0.2: @@ -9850,7 +10005,7 @@ text-segmentation@^1.0.2: text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== through2@^2.0.0: version "2.0.5" @@ -9863,19 +10018,19 @@ through2@^2.0.0: "through@>=2.2.7 <3": version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== timers-browserify@^1.0.1: version "1.4.2" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" - integrity sha1-ycWLV1voQHN1y14kYtrO50NZ9B0= + integrity sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q== dependencies: process "~0.11.0" timsort@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" - integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= + integrity sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A== tiny-emitter@^2.0.2: version "2.1.0" @@ -9904,12 +10059,12 @@ tmp@^0.2.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= + integrity sha512-lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og== to-fast-properties@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== to-regex-range@^5.0.1: version "5.0.1" @@ -9936,7 +10091,7 @@ trim-newlines@^4.0.2: 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= + integrity sha512-WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw== tslib@2.3.0: version "2.3.0" @@ -9948,31 +10103,34 @@ tslib@^2.2.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== -ttf2eot@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-2.0.0.tgz#8e6337a585abd1608a0c84958ab483ce69f6654b" - integrity sha1-jmM3pYWr0WCKDISVirSDzmn2ZUs= - dependencies: - argparse "^1.0.6" - microbuffer "^1.0.0" +tslib@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== -ttf2woff2@^4.0.1: - version "4.0.4" - resolved "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.4.tgz#a995856dc0cc6f4b12ea38c5de7ab289b645ef26" - integrity sha512-pdt/q89D6VmWToUkiwrUo/OrQtmHGr2iBl3GQriHE6xq0cnteb8gJF8UitOdXmFTX8ajKgb3HMGKpKAsCJM61g== +ttf2eot@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-3.1.0.tgz#c8971af7c68c5b996d8cfdb8847cdadfbf195e05" + integrity sha512-aHTbcYosNHVqb2Qtt9Xfta77ae/5y0VfdwNLUS6sGBeGr22cX2JDMo/i5h3uuOf+FAD3akYOr17+fYd5NK8aXw== + dependencies: + argparse "^2.0.1" + +ttf2woff2@^4.0.4: + version "4.0.5" + resolved "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.5.tgz#c7c87242938e9e2ed37fe5f477dd21acdb88fbfd" + integrity sha512-zpoU0NopfjoyVqkFeQ722SyKk/n607mm5OHxuDS/wCCSy82B8H3hHXrezftA2KMbKqfJIjie2lsJHdvPnBGbsw== dependencies: bindings "^1.5.0" bufferstreams "^3.0.0" nan "^2.14.2" - node-gyp "^8.1.0" + node-gyp "^9.0.0" -ttf2woff@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-2.0.2.tgz#09a7cee59abd3c15282b57ed84ac7c7770749f1f" - integrity sha512-X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA== +ttf2woff@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-3.0.0.tgz#bd0fc0157e428b7a9a30340f78adf72fb741962a" + integrity sha512-OvmFcj70PhmAsVQKfC15XoKH55cRWuaRzvr2fpTNhTNer6JBpG8n6vOhRrIgxMjcikyYt88xqYXMMVapJ4Rjvg== dependencies: - argparse "^1.0.6" - microbuffer "^1.0.0" + argparse "^2.0.1" pako "^1.0.0" tty-browserify@0.0.1: @@ -10008,7 +10166,7 @@ type-is@~1.6.17: typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" - integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= + integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== typescript@^3.2.2: version "3.9.10" @@ -10021,9 +10179,9 @@ ua-parser-js@^0.7.30: integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ== uglify-js@^3.1.4: - version "3.14.3" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz#c0f25dfea1e8e5323eccf59610be08b6043c15cf" - integrity sha512-mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g== + version "3.16.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.16.2.tgz#0481e1dbeed343ad1c2ddf3c6d42e89b7a6d4def" + integrity sha512-AaQNokTNgExWrkEYA24BTNMSjyqEXPSfhqoS0AxmHkCJ4U+Dyy5AvbGV/sqxuxficEfGGoX3zWw9R7QpLFfEsg== umd@^3.0.0: version "3.0.3" @@ -10043,7 +10201,7 @@ unbox-primitive@^1.0.1: unc-path-regex@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa" - integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo= + integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg== undeclared-identifiers@^1.1.2: version "1.1.3" @@ -10110,7 +10268,7 @@ unicode-property-aliases-ecmascript@^2.0.0: uniqs@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" - integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= + integrity sha512-mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ== unique-filename@^1.1.1: version "1.1.1" @@ -10134,7 +10292,7 @@ universalify@^2.0.0: unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== uri-js@^4.2.2: version "4.4.1" @@ -10160,7 +10318,7 @@ url-loader@^1.1.2: url@~0.11.0: version "0.11.0" resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1" - integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE= + integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ== dependencies: punycode "1.3.2" querystring "0.2.0" @@ -10168,12 +10326,12 @@ url@~0.11.0: util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" - integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk= + integrity sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ== dependencies: inherits "2.0.1" @@ -10192,7 +10350,7 @@ util@~0.12.0: utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== utrie@^1.0.1: version "1.0.1" @@ -10209,7 +10367,7 @@ v8-compile-cache@^2.0.3: valid-filename@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/valid-filename/-/valid-filename-2.0.1.tgz#0768d6f364b1ed3bdf68f0d15abffb0d9d6cecaf" - integrity sha1-B2jW82Sx7TvfaPDRWr/7DZ1s7K8= + integrity sha512-7eF/iUZ5SPd3FighoKgatSjXDJ25Vopo/6yvEKGyX4FIeZVHcLjHmyvbQ1WdFD9RQZ9PoBA7nrSxxAz/oC64SQ== dependencies: filename-reserved-regex "^2.0.0" @@ -10231,14 +10389,14 @@ vanilla-picker@^2.11.2: varstream@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz#18ac6494765f3ff1a35ad9a4be053bec188a5de1" - integrity sha1-GKxklHZfP/GjWtmkvgU77BiKXeE= + integrity sha512-OpR3Usr9dGZZbDttlTxdviGdxiURI0prX68+DuaN/JfIDbK9ZOmREKM6PgmelsejMnhgjXmEEEgf+E4NbsSqMg== dependencies: readable-stream "^1.0.33" vary@^1: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== vendors@^1.0.3: version "1.0.4" @@ -10253,7 +10411,7 @@ vm-browserify@^1.0.0: void-elements@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" - integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= + integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung== watchpack@^2.2.0: version "2.2.0" @@ -10273,11 +10431,11 @@ watchpack@^2.2.0: jquery-contextmenu "^2.6.4" webfonts-loader@^7.3.0: - version "7.3.0" - resolved "https://registry.yarnpkg.com/webfonts-loader/-/webfonts-loader-7.3.0.tgz#a720fd919aad090ddb56252384035aa6fb882d99" - integrity sha512-vnqy8inrc5mvVXmyehCAZLy+yW1ir9MerPmklt3+2BL5f1QiD1HXtC/owyoQbjlWE6XAN+ev3JCJzaMoC+nuJg== + version "7.5.2" + resolved "https://registry.yarnpkg.com/webfonts-loader/-/webfonts-loader-7.5.2.tgz#9cdf86db9a24d07c6f9ad2fb59e7fa1e20fcfebb" + integrity sha512-XUCqaPZwWrQyTk7zWuHnxVy+ZDdKexAqPJm02dpQwN/zIaHdsGFohLVb09onRRsHRai49b7SZLDVaTxJY8wLsA== dependencies: - "@vusion/webfonts-generator" "^0.7.2" + "@vusion/webfonts-generator" "^0.8.0" glob "^7.1.6" loader-utils "^2.0.0" @@ -10332,7 +10490,7 @@ webpack-merge@^5.7.3: webpack-sources@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb" - integrity sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s= + integrity sha512-iqanNZjOHLdPn/R0e/nKVn90dm4IsUMxKam0MZD1btWhFub/Cdo1nWdMio6yEqBc0F8mEieOjc+jfBSXwna94Q== dependencies: source-list-map "^1.1.1" source-map "~0.5.3" @@ -10417,7 +10575,7 @@ which@^2.0.1, which@^2.0.2: dependencies: isexe "^2.0.0" -wide-align@^1.1.0: +wide-align@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== @@ -10444,7 +10602,7 @@ word-wrap@^1.2.3: wordwrap@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= + integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q== wrap-ansi@^7.0.0: version "7.0.0" @@ -10458,7 +10616,7 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== ws@^7.3.1: version "7.5.5" @@ -10470,11 +10628,6 @@ ws@~8.2.3: resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== -xmldom@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e" - integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA== - xmlhttprequest-ssl@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" @@ -10538,19 +10691,19 @@ yargs@^16.1.1: y18n "^5.0.5" yargs-parser "^20.2.2" -yarn-audit-html@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-3.0.1.tgz#222de37f2233f95a37b651efc2ac52e53a666a03" - integrity sha512-tdtbJyKD7lhGS3f1df/boxhNrnEfmjVCyjHGc/9WebZ3gHvF/dxyLDPOzio1vpJRczaYqW3WVF6M1Srgt1O2yQ== +yarn-audit-html@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-4.0.0.tgz#dc04c9cf83e758fd6d9efad8c96df1fc8c4bf30c" + integrity sha512-PZW+M6b6BW4hBU6AuUnxFSOVOq6Gnrh+krBdzcX3OjWNqiDh8ovhiB6pTYEeR13jL8J9VXk/1POn2XljicWZNA== dependencies: - commander "^8.2.0" - ejs "~3.1.6" - marked "^3.0.7" + commander "^9.3.0" + ejs "~3.1.8" + marked "^4.0.17" yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" - integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= + integrity sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg== yocto-queue@^0.1.0: version "0.1.0" diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix index 13bd759ccc..3e2513dd2c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix @@ -1898,11 +1898,11 @@ }; } { - name = "_gar_promisify___promisify_1.1.2.tgz"; + name = "_gar_promisify___promisify_1.1.3.tgz"; path = fetchurl { - name = "_gar_promisify___promisify_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.2.tgz"; - sha512 = "82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw=="; + name = "_gar_promisify___promisify_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz"; + sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw=="; }; } { @@ -1938,11 +1938,11 @@ }; } { - name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; + name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; path = fetchurl { - name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; - sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; + name = "_jridgewell_gen_mapping___gen_mapping_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; }; } { @@ -1961,6 +1961,14 @@ sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; }; } + { + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + path = fetchurl { + name = "_jridgewell_source_map___source_map_0.3.2.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz"; + sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; + }; + } { name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; path = fetchurl { @@ -2066,19 +2074,19 @@ }; } { - name = "_npmcli_fs___fs_1.0.0.tgz"; + name = "_npmcli_fs___fs_2.1.1.tgz"; path = fetchurl { - name = "_npmcli_fs___fs_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.0.0.tgz"; - sha512 = "8ltnOpRR/oJbOp8vaGUnipOi3bqkcW+sLHFlyXIr08OGHmVJLB1Hn7QtGXbYcpVtH1gAYZTlmDXtE4YV0+AMMQ=="; + name = "_npmcli_fs___fs_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.1.tgz"; + sha512 = "1Q0uzx6c/NVNGszePbr5Gc2riSU1zLpNlo/1YWntH+eaPmMgBssAW0qXofCVkpdj3ce4swZtlDYQu+NKiYcptg=="; }; } { - name = "_npmcli_move_file___move_file_1.1.2.tgz"; + name = "_npmcli_move_file___move_file_2.0.0.tgz"; path = fetchurl { - name = "_npmcli_move_file___move_file_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz"; - sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; + name = "_npmcli_move_file___move_file_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.0.tgz"; + sha512 = "UR6D5f4KEGWJV6BGPH3Qb2EtgH+t+1XQ1Tt85c7qicN6cezzuHPdZwwAxqZr4JLtnQu0LZsTza/5gmNmSl8XLg=="; }; } { @@ -2322,11 +2330,11 @@ }; } { - name = "_tootallnate_once___once_1.1.2.tgz"; + name = "_tootallnate_once___once_2.0.0.tgz"; path = fetchurl { - name = "_tootallnate_once___once_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz"; - sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; + name = "_tootallnate_once___once_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz"; + sha512 = "XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A=="; }; } { @@ -2506,11 +2514,11 @@ }; } { - name = "_vusion_webfonts_generator___webfonts_generator_0.7.3.tgz"; + name = "_vusion_webfonts_generator___webfonts_generator_0.8.0.tgz"; path = fetchurl { - name = "_vusion_webfonts_generator___webfonts_generator_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/@vusion/webfonts-generator/-/webfonts-generator-0.7.3.tgz"; - sha512 = "0qDx8stMupH3s4WDVw2y347XEMvR+OSZIOYEdoD9YIw7ZRq9GA+B2GtR7KPPoGHbzWWR+VGkzplPO5tfukewiw=="; + name = "_vusion_webfonts_generator___webfonts_generator_0.8.0.tgz"; + url = "https://registry.yarnpkg.com/@vusion/webfonts-generator/-/webfonts-generator-0.8.0.tgz"; + sha512 = "1q17CF6umBEjlAtO37TzRw3aOCCAyFX+T4HPG70BmM6qx8s6H4/LQOa8eHFZq/oiMuMyd0FehKgUt/pqYlIMWA=="; }; } { @@ -2665,6 +2673,14 @@ sha512 = "WZr8i4C6WVDV7Mb8sbm7GdlEPmk1f+xOMjUKThqrkWgwsfvu90zJyyX54wyAvsS91sjtKZ0JipGj2cJnEDaxPA=="; }; } + { + name = "_xmldom_xmldom___xmldom_0.7.5.tgz"; + path = fetchurl { + name = "_xmldom_xmldom___xmldom_0.7.5.tgz"; + url = "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz"; + sha512 = "V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A=="; + }; + } { name = "_xtuc_ieee754___ieee754_1.2.0.tgz"; path = fetchurl { @@ -2686,7 +2702,7 @@ path = fetchurl { name = "FileSaver___FileSaver_0.10.0.tgz"; url = "https://registry.yarnpkg.com/FileSaver/-/FileSaver-0.10.0.tgz"; - sha1 = "fe84iZREWAQu9d8ukGTIjj0igcc="; + sha512 = "W+syaSPuxeh8yRPinETA4RlBO0ZuyM8IQIln8Y/pYZ136+pxqr64/JRx8rDm3uVqvgQ4xIHgAmZoepujBT1mvg=="; }; } { @@ -2777,6 +2793,14 @@ sha512 = "yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q=="; }; } + { + name = "acorn___acorn_8.7.1.tgz"; + path = fetchurl { + name = "acorn___acorn_8.7.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz"; + sha512 = "Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A=="; + }; + } { name = "agent_base___agent_base_6.0.2.tgz"; path = fetchurl { @@ -2786,11 +2810,11 @@ }; } { - name = "agentkeepalive___agentkeepalive_4.1.4.tgz"; + name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; path = fetchurl { - name = "agentkeepalive___agentkeepalive_4.1.4.tgz"; - url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.1.4.tgz"; - sha512 = "+V/rGa3EuU74H6wR04plBb7Ks10FbtUQgRj/FQOG7uUIEuaINI+AiqJR1k6t3SVNs7o7ZjIdus6706qqzVq8jQ=="; + name = "agentkeepalive___agentkeepalive_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz"; + sha512 = "Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA=="; }; } { @@ -2830,7 +2854,7 @@ path = fetchurl { name = "ajv___ajv_5.5.2.tgz"; url = "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz"; - sha1 = "c7Xuyj+rZT49P5Qis0GtQiBdyWU="; + sha512 = "Ajr4IcMXq/2QmMkEmSvxqfLN5zGmJ92gHXAeOXq1OekoH2rfDNsgdDoL2f7QaRCy7G/E6TpxBVdRuNraMztGHw=="; }; } { @@ -2878,7 +2902,7 @@ path = fetchurl { name = "alphanum_sort___alphanum_sort_1.0.2.tgz"; url = "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz"; - sha1 = "l6ERlkmyEa0zaR2fn0hqjsn74KM="; + sha512 = "0FcBfdcmaumGPQ0qPn7Q5qTgz/ooXgIyp1rf8ik5bGX8mpE2YHjC0P/eyQvxu1GURYQgq9ozf2mteQ5ZD9YiyQ=="; }; } { @@ -2894,7 +2918,7 @@ path = fetchurl { name = "ansi_regex___ansi_regex_2.1.1.tgz"; url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "w7M6te42DYbg5ijwRorn7yfWVN8="; + sha512 = "TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA=="; }; } { @@ -2910,7 +2934,7 @@ path = fetchurl { name = "ansi_styles___ansi_styles_2.2.1.tgz"; url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz"; - sha1 = "tDLdM1i2NM914eRmQ2gkBTPB3b4="; + sha512 = "kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA=="; }; } { @@ -2946,19 +2970,19 @@ }; } { - name = "aproba___aproba_1.2.0.tgz"; + name = "aproba___aproba_2.0.0.tgz"; path = fetchurl { - name = "aproba___aproba_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz"; - sha512 = "Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw=="; + name = "aproba___aproba_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz"; + sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; } { - name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; + name = "are_we_there_yet___are_we_there_yet_3.0.0.tgz"; path = fetchurl { - name = "are_we_there_yet___are_we_there_yet_1.1.7.tgz"; - url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.7.tgz"; - sha512 = "nxwy40TuMiUGqMyRHgCSWZ9FM4VAoRP4xUYSTv5ImRog+h9yISPbVH7H8fASCIzYn9wlEv4zvFL7uKDMCFQm3g=="; + name = "are_we_there_yet___are_we_there_yet_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz"; + sha512 = "0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw=="; }; } { @@ -3025,14 +3049,6 @@ sha512 = "KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg=="; }; } - { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; - path = fetchurl { - name = "array.prototype.flatmap___array.prototype.flatmap_1.2.4.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz"; - sha512 = "r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q=="; - }; - } { name = "array.prototype.flatmap___array.prototype.flatmap_1.2.5.tgz"; path = fetchurl { @@ -3097,14 +3113,6 @@ sha512 = "Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="; }; } - { - name = "async___async_0.9.2.tgz"; - path = fetchurl { - name = "async___async_0.9.2.tgz"; - url = "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz"; - sha1 = "rqdNXmHB+JlhO/ZL2mbUx48v0X0="; - }; - } { name = "async___async_2.6.4.tgz"; path = fetchurl { @@ -3121,6 +3129,22 @@ sha512 = "H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="; }; } + { + name = "async___async_3.2.4.tgz"; + path = fetchurl { + name = "async___async_3.2.4.tgz"; + url = "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz"; + sha512 = "iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="; + }; + } + { + name = "attr_accept___attr_accept_2.2.2.tgz"; + path = fetchurl { + name = "attr_accept___attr_accept_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/attr-accept/-/attr-accept-2.2.2.tgz"; + sha512 = "7prDjvt9HmqiZ0cl5CRjtS84sEyhsHP2coDkaZKRKVfCDo9s7iw7ChVmar78Gu9pC4SoR/28wFu/G5JJhTnqEg=="; + }; + } { name = "autoprefixer___autoprefixer_10.4.0.tgz"; path = fetchurl { @@ -3158,7 +3182,7 @@ path = fetchurl { name = "babel_code_frame___babel_code_frame_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz"; - sha1 = "Y/1D99weO7fONZR9uP42mj9Yx0s="; + sha512 = "XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g=="; }; } { @@ -3182,7 +3206,7 @@ path = fetchurl { name = "babel_messages___babel_messages_6.23.0.tgz"; url = "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz"; - sha1 = "8830cDhYA1sqKVHG7F7fbGLyYw4="; + sha512 = "Bl3ZiA+LjqaMtNYopA9TYE9HP1tQ+E5dLxE0XrAzcIJeK2UqF0/EaqXwBn9esd4UmTfEab+P+UYQ1GnioFIb/w=="; }; } { @@ -3270,7 +3294,7 @@ path = fetchurl { name = "babel_plugin_syntax_jsx___babel_plugin_syntax_jsx_6.18.0.tgz"; url = "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz"; - sha1 = "CvMqmm4Tyno/1QaeYtew9Y0NiUY="; + sha512 = "qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw=="; }; } { @@ -3278,7 +3302,7 @@ path = fetchurl { name = "babel_runtime___babel_runtime_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz"; - sha1 = "llxwWGaOgrVde/4E/yM3vItWR/4="; + sha512 = "ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g=="; }; } { @@ -3286,7 +3310,7 @@ path = fetchurl { name = "babel_template___babel_template_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz"; - sha1 = "3gPi0WOWsGn0bdn/+FIfsaDjXgI="; + sha512 = "PCOcLFW7/eazGUKIoqH97sO9A2UYMahsn/yRQ7uOk37iutwjq7ODtcTNF+iFDSHNfkctqsLRjLP7URnOx0T1fg=="; }; } { @@ -3294,7 +3318,7 @@ path = fetchurl { name = "babel_traverse___babel_traverse_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz"; - sha1 = "RqnL1+3MYsjlwGTi0tjQ9ANXZu4="; + sha512 = "iSxeXx7apsjCHe9c7n8VtRXGzI2Bk1rBSOJgCCjfyXb6v1aCqE1KSEpq/8SXuVN8Ka/Rh1WDTF0MDzkvTA4MIA=="; }; } { @@ -3302,7 +3326,7 @@ path = fetchurl { name = "babel_types___babel_types_6.26.0.tgz"; url = "https://registry.yarnpkg.com/babel-types/-/babel-types-6.26.0.tgz"; - sha1 = "o7Bz+Uq0nrb6Vc1lInozQ4BjJJc="; + sha512 = "zhe3V/26rCWsEZK8kZN+HaQj5yQ1CilTObixFzKW1UWjqG7618Twz6YEsCnjfg5gBcJh02DrpCkS9h98ZqDY+g=="; }; } { @@ -3326,7 +3350,7 @@ path = fetchurl { name = "backbone___backbone_1.3.3.tgz"; url = "https://registry.yarnpkg.com/backbone/-/backbone-1.3.3.tgz"; - sha1 = "TMgOp8sWMaxHSInOQPL4vGg7KZk="; + sha512 = "aK+k3TiU4tQDUrRCymDDE7XDFnMVuyE6zbZ4JX7mb4pJbQTVOH997/kyBzb8wB2s5Y/Oh7EUfj+sZhwRPxWwow=="; }; } { @@ -3342,7 +3366,7 @@ path = fetchurl { name = "backbone___backbone_1.2.3.tgz"; url = "https://registry.yarnpkg.com/backbone/-/backbone-1.2.3.tgz"; - sha1 = "wiz9B/yG676uYdGJKe0RXpmdZbk="; + sha512 = "1/eXj4agG79UDN7TWnZXcGD6BJrBwLZKCX7zYcBIy9jWf4mrtVkw7IE1VOYFnrKahsmPF9L55Tib9IQRvk027w=="; }; } { @@ -3350,7 +3374,7 @@ path = fetchurl { name = "backform___backform_0.2.0.tgz"; url = "https://registry.yarnpkg.com/backform/-/backform-0.2.0.tgz"; - sha1 = "sUy43rCMhj/FlaK8UFBm4yoq1M4="; + sha512 = "QYwlItiVqb4CDELHyBC+TM4UcoG6Mw/al+PUDUVbQ7OJojpQHaa2TV8uJHhMR6o/Xq4FGt+52qIZLp36dletfw=="; }; } { @@ -3358,7 +3382,7 @@ path = fetchurl { name = "backgrid_filter___backgrid_filter_0.3.7.tgz"; url = "https://registry.yarnpkg.com/backgrid-filter/-/backgrid-filter-0.3.7.tgz"; - sha1 = "1LGdDnBwE9fxgfnox/67SZfVbwM="; + sha512 = "HKWOXXd/dES5Ll3R1+vsfPYO7yVQ0V4+h8cPirFqci4oKTyyZVJupXM2fINhqm0On9dvHijHje8h4X+Wg621gw=="; }; } { @@ -3366,7 +3390,7 @@ path = fetchurl { name = "backgrid_select_all___backgrid_select_all_0.3.5.tgz"; url = "https://registry.yarnpkg.com/backgrid-select-all/-/backgrid-select-all-0.3.5.tgz"; - sha1 = "FDqADl2V/yrlqE14v0+6QflIHpQ="; + sha512 = "bwMQi5d8AnBSZDiV4nWrXcOSmEODbxB6/70mSHG8cGoDfjgW5X7mLiXlmlgEP3VsA1avFD6VvCvpAKZ4BS5f9Q=="; }; } { @@ -3374,7 +3398,7 @@ path = fetchurl { name = "backgrid___backgrid_0.3.8.tgz"; url = "https://registry.yarnpkg.com/backgrid/-/backgrid-0.3.8.tgz"; - sha1 = "fSaBZ0LXLIWcrTmxPxnJ8nuv/tc="; + sha512 = "Klzo941ahoj8Kqd0tRsau+VfXddV3YnQTwb6wVwIaaQxoJ9ORykQy2MNit1MUBnZO6IValYJPvCQyvZhnV6Lfg=="; }; } { @@ -3382,7 +3406,7 @@ path = fetchurl { name = "backo2___backo2_1.0.2.tgz"; url = "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz"; - sha1 = "MasayLEpNjRj41s+u2n038+6eUc="; + sha512 = "zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA=="; }; } { @@ -3494,7 +3518,7 @@ path = fetchurl { name = "boolbase___boolbase_1.0.0.tgz"; url = "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz"; - sha1 = "aN/1++YMUes3cl6p4+0xDcwed24="; + sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="; }; } { @@ -3537,12 +3561,20 @@ sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; } + { + name = "brace_expansion___brace_expansion_2.0.1.tgz"; + path = fetchurl { + name = "brace_expansion___brace_expansion_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz"; + sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; + }; + } { name = "brace___brace_0.11.1.tgz"; path = fetchurl { name = "brace___brace_0.11.1.tgz"; url = "https://registry.yarnpkg.com/brace/-/brace-0.11.1.tgz"; - sha1 = "SJb8ydVE7vRfS7dmDbMg07N5/lg="; + sha512 = "Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q=="; }; } { @@ -3558,7 +3590,7 @@ path = fetchurl { name = "brorand___brorand_1.1.0.tgz"; url = "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz"; - sha1 = "EsJe/kCkXjwyPrhnWgoM5XsiNx8="; + sha512 = "cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w=="; }; } { @@ -3678,7 +3710,7 @@ path = fetchurl { name = "buffer_xor___buffer_xor_1.0.3.tgz"; url = "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz"; - sha1 = "JuYe0UIvtw3ULm42cp7VHYVf6Nk="; + sha512 = "571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="; }; } { @@ -3710,7 +3742,7 @@ path = fetchurl { name = "builtin_status_codes___builtin_status_codes_3.0.0.tgz"; url = "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"; - sha1 = "hZgoeOIbmOHGZCXgPQF0eI9Wnug="; + sha512 = "HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ=="; }; } { @@ -3722,11 +3754,11 @@ }; } { - name = "cacache___cacache_15.3.0.tgz"; + name = "cacache___cacache_16.1.1.tgz"; path = fetchurl { - name = "cacache___cacache_15.3.0.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz"; - sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ=="; + name = "cacache___cacache_16.1.1.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-16.1.1.tgz"; + sha512 = "VDKN+LHyCQXaaYZ7rA/qtkURU+/yYhviUdvqEv2LT6QPZU8jpyzEkEVAcKlKLt5dJ5BRp11ym8lo3NKLluEPLg=="; }; } { @@ -3734,7 +3766,7 @@ path = fetchurl { name = "cached_path_relative___cached_path_relative_1.1.0.tgz"; url = "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.1.0.tgz"; - sha1 = "hlV23+85wNan3v3nlNB49TCOPvM="; + sha512 = "WF0LihfemtesFcJgO7xfOoOcnWzY/QHR4qeDqV44jPU3HTI54+LnfXK3SA27AVVGCdZFgjjFFaqUA9Jx7dMJZA=="; }; } { @@ -3782,7 +3814,7 @@ path = fetchurl { name = "camelize___camelize_1.0.0.tgz"; url = "https://registry.yarnpkg.com/camelize/-/camelize-1.0.0.tgz"; - sha1 = "FkpUg+Yw+kMh5a8HAg5TGDGyYJs="; + sha512 = "W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg=="; }; } { @@ -3794,10 +3826,10 @@ }; } { - name = "https___registry.npmjs.org_caniuse_lite___caniuse_lite_1.0.30001338.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001338.tgz"; path = fetchurl { - name = "https___registry.npmjs.org_caniuse_lite___caniuse_lite_1.0.30001338.tgz"; - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001338.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz"; sha512 = "1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ=="; }; } @@ -3814,7 +3846,7 @@ path = fetchurl { name = "chalk___chalk_1.1.3.tgz"; url = "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz"; - sha1 = "qBFcVeSnAv5NFQq9OHKCKn4J/Jg="; + sha512 = "U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A=="; }; } { @@ -3950,7 +3982,7 @@ path = fetchurl { name = "closest___closest_0.0.1.tgz"; url = "https://registry.yarnpkg.com/closest/-/closest-0.0.1.tgz"; - sha1 = "JtpvgLPg4X5x+A8SeCgZ6fZTSVw="; + sha512 = "HafRXTAiWp5nf6kxOy2EoIGSsJMn0zew9E5zp3Dy/8CXdp8GvVjZn1TSMEVdDxSP/acXZcWJWiIgF83Di7M1Ew=="; }; } { @@ -3966,15 +3998,7 @@ path = fetchurl { name = "co___co_4.6.0.tgz"; url = "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz"; - sha1 = "bqa989hTrlTMuOR7+gvz+QMfsYQ="; - }; - } - { - name = "code_point_at___code_point_at_1.1.0.tgz"; - path = fetchurl { - name = "code_point_at___code_point_at_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "DQcLTQQ6W+ozovGkDi7bPZpMz3c="; + sha512 = "QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ=="; }; } { @@ -4006,7 +4030,7 @@ path = fetchurl { name = "color_name___color_name_1.1.3.tgz"; url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz"; - sha1 = "p9BVi9icQveV3UIyj3QIMcpTvCU="; + sha512 = "72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="; }; } { @@ -4017,6 +4041,14 @@ sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; } + { + name = "color_support___color_support_1.1.3.tgz"; + path = fetchurl { + name = "color_support___color_support_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz"; + sha512 = "qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg=="; + }; + } { name = "colord___colord_2.9.1.tgz"; path = fetchurl { @@ -4038,7 +4070,7 @@ path = fetchurl { name = "combine_source_map___combine_source_map_0.8.0.tgz"; url = "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.8.0.tgz"; - sha1 = "pY0N8ELBhvz4IqjoAV9UUNLXmos="; + sha512 = "UlxQ9Vw0b/Bt/KYwCFqdEwsQ1eL8d1gibiFb7lxQJFdvTgc2hIZi6ugsg+kyhzhPV+QEpUiEIwInIAIrgoEkrg=="; }; } { @@ -4049,14 +4081,6 @@ sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="; }; } - { - name = "commander___commander_4.1.1.tgz"; - path = fetchurl { - name = "commander___commander_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz"; - sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; - }; - } { name = "commander___commander_7.2.0.tgz"; path = fetchurl { @@ -4066,11 +4090,11 @@ }; } { - name = "commander___commander_8.3.0.tgz"; + name = "commander___commander_9.4.0.tgz"; path = fetchurl { - name = "commander___commander_8.3.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz"; - sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; + name = "commander___commander_9.4.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz"; + sha512 = "sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw=="; }; } { @@ -4078,7 +4102,7 @@ path = fetchurl { name = "commondir___commondir_1.0.1.tgz"; url = "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz"; - sha1 = "3dgA2gxmEnOTzKWVDqloo6rxJTs="; + sha512 = "W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="; }; } { @@ -4094,7 +4118,7 @@ path = fetchurl { name = "concat_map___concat_map_0.0.1.tgz"; url = "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "2Klr13/Wjfd5OnMDajug1UBdR3s="; + sha512 = "/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="; }; } { @@ -4126,7 +4150,7 @@ path = fetchurl { name = "console_control_strings___console_control_strings_1.1.0.tgz"; url = "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz"; - sha1 = "PXz0Rk22RG6mRL9LOVB/mFEAjo4="; + sha512 = "ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ=="; }; } { @@ -4134,7 +4158,7 @@ path = fetchurl { name = "constants_browserify___constants_browserify_1.0.0.tgz"; url = "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz"; - sha1 = "wguW2MYXdIqvHBYCF2DNJ/y4y3U="; + sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="; }; } { @@ -4166,7 +4190,15 @@ path = fetchurl { name = "convert_source_map___convert_source_map_1.1.3.tgz"; url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz"; - sha1 = "SCnId+n+SbMWHzvzZziI4gRpmGA="; + sha512 = "Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg=="; + }; + } + { + name = "convert_units___convert_units_2.3.4.tgz"; + path = fetchurl { + name = "convert_units___convert_units_2.3.4.tgz"; + url = "https://registry.yarnpkg.com/convert-units/-/convert-units-2.3.4.tgz"; + sha512 = "ERHfdA0UhHJp1IpwE6PnFJx8LqG7B1ZjJ20UvVCmopEnVCfER68Tbe3kvN63dLbYXDA2xFWRE6zd4Wsf0w7POg=="; }; } { @@ -4302,7 +4334,7 @@ path = fetchurl { name = "css_color_keywords___css_color_keywords_1.0.0.tgz"; url = "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz"; - sha1 = "/qJhbcZ2spYmhrOvjb2+GAskTgU="; + sha512 = "FyyrDHZKEjXDpNJYvVsV960FiqQyXc/LlYmsxl2BcdMb2WPx0OGRVgTg55rPSyLSNMqP52R9r8geSp7apN3Ofg=="; }; } { @@ -4454,7 +4486,7 @@ path = fetchurl { name = "custom_event___custom_event_1.0.1.tgz"; url = "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz"; - sha1 = "XQKkaFCt8bSjF5RqOSj8y1v9BCU="; + sha512 = "GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg=="; }; } { @@ -4498,19 +4530,11 @@ }; } { - name = "debug___debug_4.3.2.tgz"; + name = "debug___debug_4.3.4.tgz"; path = fetchurl { - name = "debug___debug_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz"; - sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw=="; - }; - } - { - name = "debug___debug_4.3.3.tgz"; - path = fetchurl { - name = "debug___debug_4.3.3.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz"; - sha1 = "BCZuC3CpjURi5uKI44JZITMytmQ="; + name = "debug___debug_4.3.4.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; }; } { @@ -4518,7 +4542,7 @@ path = fetchurl { name = "decamelize_keys___decamelize_keys_1.1.0.tgz"; url = "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz"; - sha1 = "0XGoeTMlKAfrPLYdwcFEXQeN8tk="; + sha512 = "ocLWuYzRPoS9bfiSdDd3cxvrzovVMZnRDVEzAs+hWIVXGDbHxWMECij2OBuyB/An0FFW/nLuq6Kv1i/YC5Qfzg=="; }; } { @@ -4526,7 +4550,7 @@ path = fetchurl { name = "decamelize___decamelize_1.2.0.tgz"; url = "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "9lNNFRSCabIDUue+4m9QH5oZEpA="; + sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; } { @@ -4550,7 +4574,7 @@ path = fetchurl { name = "deep_equal_ident___deep_equal_ident_1.1.1.tgz"; url = "https://registry.yarnpkg.com/deep-equal-ident/-/deep-equal-ident-1.1.1.tgz"; - sha1 = "BvS4nlNxDNbOpKd4HHqVZkLejck="; + sha512 = "aWv7VhTl/Lju1zenOD3E1w8PpUVrTDbwXCHtbSNr+p/uadr49Y1P1ld0W3Pl6gbvIbiRjoCVsqw70UupCNGh6g=="; }; } { @@ -4582,7 +4606,7 @@ path = fetchurl { name = "defined___defined_1.0.0.tgz"; url = "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz"; - sha1 = "yY2bzvdWdBiOEQlpFRGZ45sfppM="; + sha512 = "Y2caI5+ZwS5c3RiNDJ6u53VhQHv+hHKwhkI1iHvceKUHw9Df6EK2zRLfjejRgMuCuxK7PfSWIMwWecceVvThjQ=="; }; } { @@ -4590,7 +4614,7 @@ path = fetchurl { name = "delegates___delegates_1.0.0.tgz"; url = "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"; - sha1 = "hMbhWbgZBP3KWaDvRM2HDTElD5o="; + sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ=="; }; } { @@ -4598,7 +4622,7 @@ path = fetchurl { name = "depd___depd_1.1.2.tgz"; url = "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz"; - sha1 = "m81S4UwJd2PnSbJ0xDRu0uVgtak="; + sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; }; } { @@ -4622,7 +4646,7 @@ path = fetchurl { name = "detect_indent___detect_indent_4.0.0.tgz"; url = "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz"; - sha1 = "920GQ1LN9Docts5hnE7jqUdd4gg="; + sha512 = "BDKtmHlOzwI7iRuEkhzsnPoi5ypEhWAJB5RvHWe1kMr06js3uK5B3734i3ui5Yd+wOJV1cpE4JnivPD283GU/A=="; }; } { @@ -4638,7 +4662,7 @@ path = fetchurl { name = "di___di_0.0.1.tgz"; url = "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz"; - sha1 = "gGZJMmzqp8qjMG112YXqJ0i6kTw="; + sha512 = "uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA=="; }; } { @@ -4670,7 +4694,7 @@ path = fetchurl { name = "discontinuous_range___discontinuous_range_1.0.0.tgz"; url = "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz"; - sha1 = "44Mx8IRLukm5qctxx3FYWqsbxlo="; + sha512 = "c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="; }; } { @@ -4710,7 +4734,7 @@ path = fetchurl { name = "dom_serialize___dom_serialize_2.2.1.tgz"; url = "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz"; - sha1 = "ViromZ9Evl6jB29UGdzVnrQ6yVs="; + sha512 = "Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ=="; }; } { @@ -4753,20 +4777,12 @@ sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; }; } - { - name = "dropzone___dropzone_5.9.3.tgz"; - path = fetchurl { - name = "dropzone___dropzone_5.9.3.tgz"; - url = "https://registry.yarnpkg.com/dropzone/-/dropzone-5.9.3.tgz"; - sha512 = "Azk8kD/2/nJIuVPK+zQ9sjKMRIpRvNyqn9XwbBHNq+iNuSccbJS6hwm1Woy0pMST0erSo0u4j+KJaodndDk4vA=="; - }; - } { name = "duplexer2___duplexer2_0.1.4.tgz"; path = fetchurl { name = "duplexer2___duplexer2_0.1.4.tgz"; url = "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz"; - sha1 = "ixLauHjA1p4+eJEFFmKjL8a93ME="; + sha512 = "asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA=="; }; } { @@ -4782,15 +4798,15 @@ path = fetchurl { name = "ee_first___ee_first_1.1.1.tgz"; url = "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "WQxhFWsK4vTwJVcyoViyZrxWsh0="; + sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; } { - name = "ejs___ejs_3.1.6.tgz"; + name = "ejs___ejs_3.1.8.tgz"; path = fetchurl { - name = "ejs___ejs_3.1.6.tgz"; - url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.6.tgz"; - sha512 = "9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw=="; + name = "ejs___ejs_3.1.8.tgz"; + url = "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz"; + sha512 = "/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ=="; }; } { @@ -4846,7 +4862,7 @@ path = fetchurl { name = "encodeurl___encodeurl_1.0.2.tgz"; url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "rT/0yG7C0CkyL1oCw6mmBslbP1k="; + sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; } { @@ -4902,7 +4918,7 @@ path = fetchurl { name = "ent___ent_2.2.0.tgz"; url = "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz"; - sha1 = "6WQhkyWiHQX0RGai9obtbOX13R0="; + sha512 = "GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA=="; }; } { @@ -5030,7 +5046,7 @@ path = fetchurl { name = "escape_html___escape_html_1.0.3.tgz"; url = "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "Aljq5NPQwJdN4cFpGI7wBR0dGYg="; + sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; }; } { @@ -5038,7 +5054,7 @@ path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "G2HAViGQqN/2rjuyzwIAyhMLhtQ="; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; } { @@ -5174,7 +5190,7 @@ path = fetchurl { name = "eve___eve_0.5.4.tgz"; url = "https://registry.yarnpkg.com/eve/-/eve-0.5.4.tgz"; - sha1 = "Z9CAuXJSkdfjieNMJoYN2X8d66o="; + sha512 = "aqprQ9MAOh1t66PrHxDFmMXPlgNO6Uv1uqvxmwjprQV50jaQ2RqO7O1neY4PJwC+hMnkyMDphu2AQPOPZdjQog=="; }; } { @@ -5230,7 +5246,7 @@ path = fetchurl { name = "fast_deep_equal___fast_deep_equal_1.1.0.tgz"; url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz"; - sha1 = "wFNHeBfIa1HaqFPIHgWbcz0CNhQ="; + sha512 = "fueX787WZKCV0Is4/T2cyAdM4+x1S3MXXOAhavE1ys/W42SHAPacLTQhucja22QBYrfGw50M2sRiXPtTGv9Ymw=="; }; } { @@ -5270,7 +5286,7 @@ path = fetchurl { name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; url = "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "PYpcZog6FqMMqGQ+hR8Zuqd5eRc="; + sha512 = "DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw=="; }; } { @@ -5313,6 +5329,14 @@ sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg=="; }; } + { + name = "file_selector___file_selector_0.6.0.tgz"; + path = fetchurl { + name = "file_selector___file_selector_0.6.0.tgz"; + url = "https://registry.yarnpkg.com/file-selector/-/file-selector-0.6.0.tgz"; + sha512 = "QlZ5yJC0VxHxQQsQhXvBaC7VRJ2uaxTf+Tfpu4Z/OcVQJVpZO+DGU0rkoVW5ce2SccxugvpBJoMvUs59iILYdw=="; + }; + } { name = "file_type___file_type_12.4.2.tgz"; path = fetchurl { @@ -5330,11 +5354,11 @@ }; } { - name = "filelist___filelist_1.0.2.tgz"; + name = "filelist___filelist_1.0.4.tgz"; path = fetchurl { - name = "filelist___filelist_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.2.tgz"; - sha512 = "z7O0IS8Plc39rTCq6i6iHxk43duYOn8uFJiWSewIq0Bww1RNybVHSCjahmcC87ZqAm4OTvFzlzeGu3XAzG1ctQ=="; + name = "filelist___filelist_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz"; + sha512 = "w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q=="; }; } { @@ -5342,7 +5366,7 @@ path = fetchurl { name = "filename_reserved_regex___filename_reserved_regex_2.0.0.tgz"; url = "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"; - sha1 = "q/c9+rc10EVECr/qLZHzieu/oik="; + sha512 = "lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ=="; }; } { @@ -5422,7 +5446,7 @@ path = fetchurl { name = "follow_redirects___follow_redirects_1.14.8.tgz"; url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz"; - sha1 = "AWmW+5oRoQBWY5ixxoOTN9e/qPw="; + sha512 = "1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA=="; }; } { @@ -5430,7 +5454,7 @@ path = fetchurl { name = "foreach___foreach_2.0.5.tgz"; url = "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz"; - sha1 = "C+4AUBiusmDQo6865ljdATbsG5k="; + sha512 = "ZBbtRiapkZYLsqoPyZOR+uPfto0GRMNQN1GwzZtZt7iZvPPbDDQV0JF5Hx4o/QFQ5c0vyuoZ98T8RSBbopzWtA=="; }; } { @@ -5462,7 +5486,7 @@ path = fetchurl { name = "fs.realpath___fs.realpath_1.0.0.tgz"; url = "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "FQStJSMVjKpA20onh8sBQRmU6k8="; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; } { @@ -5494,7 +5518,7 @@ path = fetchurl { name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; - sha1 = "GwqzvVU7Kg1jmdKcDj6gslIHgyc="; + sha512 = "dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g=="; }; } { @@ -5506,11 +5530,11 @@ }; } { - name = "gauge___gauge_2.7.4.tgz"; + name = "gauge___gauge_4.0.4.tgz"; path = fetchurl { - name = "gauge___gauge_2.7.4.tgz"; - url = "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz"; - sha1 = "LANAXHU4w51+s3sxcCLjJfsBi/c="; + name = "gauge___gauge_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz"; + sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg=="; }; } { @@ -5593,6 +5617,14 @@ sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; }; } + { + name = "glob___glob_8.0.3.tgz"; + path = fetchurl { + name = "glob___glob_8.0.3.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz"; + sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; + }; + } { name = "globals___globals_11.12.0.tgz"; path = fetchurl { @@ -5694,7 +5726,7 @@ path = fetchurl { name = "has_ansi___has_ansi_2.0.0.tgz"; url = "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "NPUEnOHs3ysGSa8+8k5F7TVBbZE="; + sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg=="; }; } { @@ -5710,7 +5742,7 @@ path = fetchurl { name = "has_cors___has_cors_1.1.0.tgz"; url = "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz"; - sha1 = "XkdHk/fqmEPRu5nCPu9J/xJv/zk="; + sha512 = "g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA=="; }; } { @@ -5718,7 +5750,7 @@ path = fetchurl { name = "has_flag___has_flag_3.0.0.tgz"; url = "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "tdRU3CGZriJWmfNGfloH87lVuv0="; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; } { @@ -5750,7 +5782,7 @@ path = fetchurl { name = "has_unicode___has_unicode_2.0.1.tgz"; url = "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz"; - sha1 = "4Ob+aijPUROIVeCG0Wkedx3iqLk="; + sha512 = "8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ=="; }; } { @@ -5782,7 +5814,7 @@ path = fetchurl { name = "hat___hat_0.0.3.tgz"; url = "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz"; - sha1 = "uwFKnmSzeIrtgAWRdBPU/z1QLYo="; + sha512 = "zpImx2GoKXy42fVDSEad2BPKuSQdLcqsCYa48K3zHSzM/ugWuYjLDr8IXxpVuL7uCLHw56eaiLxCRthhOzf5ug=="; }; } { @@ -5790,7 +5822,7 @@ path = fetchurl { name = "heap___heap_0.2.5.tgz"; url = "https://registry.yarnpkg.com/heap/-/heap-0.2.5.tgz"; - sha1 = "cTtlWQ68xA/L7q9V6FFpQJKzmvE="; + sha512 = "G7HLD+WKcrOyJP5VQwYZNC3Z6FcQ7YYjEFiFoIj8PfEr73mu421o8B1N5DKUcc8K37EsJ2XXWA8DtrDz/2dReg=="; }; } { @@ -5806,7 +5838,7 @@ path = fetchurl { name = "hmac_drbg___hmac_drbg_1.0.1.tgz"; url = "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "0nRXAQJabHdabFRXk+1QL8DGSaE="; + sha512 = "Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg=="; }; } { @@ -5870,7 +5902,7 @@ path = fetchurl { name = "htmlescape___htmlescape_1.1.1.tgz"; url = "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz"; - sha1 = "OgPtwiFLyjtmQko+eVk0lQnLA1E="; + sha512 = "eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg=="; }; } { @@ -5898,11 +5930,11 @@ }; } { - name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; path = fetchurl { - name = "http_proxy_agent___http_proxy_agent_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"; - sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; + name = "http_proxy_agent___http_proxy_agent_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"; + sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w=="; }; } { @@ -5918,15 +5950,15 @@ path = fetchurl { name = "https_browserify___https_browserify_1.0.0.tgz"; url = "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz"; - sha1 = "7AbBDgo0wPL68Zn3/X/Hj//QPHM="; + sha512 = "J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="; }; } { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; path = fetchurl { - name = "https_proxy_agent___https_proxy_agent_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + name = "https_proxy_agent___https_proxy_agent_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; } { @@ -5942,7 +5974,7 @@ path = fetchurl { name = "humanize_ms___humanize_ms_1.2.1.tgz"; url = "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz"; - sha1 = "xG4xWaKT9riW2ikxbYtv6Lt5u+0="; + sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ=="; }; } { @@ -6062,7 +6094,7 @@ path = fetchurl { name = "imurmurhash___imurmurhash_0.1.4.tgz"; url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "khi5srkoojixPcT7a21XbyMUU+o="; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; }; } { @@ -6094,7 +6126,7 @@ path = fetchurl { name = "inflight___inflight_1.0.6.tgz"; url = "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz"; - sha1 = "Sb1jMdfQLQwJvJEKEHW6gWW1bfk="; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; } { @@ -6110,7 +6142,7 @@ path = fetchurl { name = "inherits___inherits_2.0.1.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz"; - sha1 = "sX0I0ya0Qj5Wjv9xn5GwscvfafE="; + sha512 = "8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="; }; } { @@ -6118,7 +6150,7 @@ path = fetchurl { name = "inherits___inherits_2.0.3.tgz"; url = "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz"; - sha1 = "Yzwsg+PaQqUC9SRmAiSA9CCCYd4="; + sha512 = "x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="; }; } { @@ -6126,7 +6158,7 @@ path = fetchurl { name = "inline_source_map___inline_source_map_0.6.2.tgz"; url = "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz"; - sha1 = "+Tk0ccGKedFyT4Y/o4tYY3Ct4qU="; + sha512 = "0mVWSSbNDvedDWIN4wxLsdPM4a7cIPcpyMxj3QZ406QRwQ6ePGB1YIHxVPjqpcUGbWQ5C+nHTwGNWAGvt7ggVA=="; }; } { @@ -6186,11 +6218,11 @@ }; } { - name = "ip___ip_1.1.5.tgz"; + name = "ip___ip_2.0.0.tgz"; path = fetchurl { - name = "ip___ip_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz"; - sha1 = "vd7XARQpCCjAoDnnLvJfWq7ENUo="; + name = "ip___ip_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz"; + sha512 = "WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="; }; } { @@ -6222,7 +6254,7 @@ path = fetchurl { name = "is_arrayish___is_arrayish_0.2.1.tgz"; url = "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "d8mYQFJ6qOyxqLppe4BkWnqSap0="; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; }; } { @@ -6318,7 +6350,7 @@ path = fetchurl { name = "is_extglob___is_extglob_2.1.1.tgz"; url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "qIwCU1eR8C7TfHahueqXc8gz+MI="; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; } { @@ -6329,14 +6361,6 @@ sha512 = "cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w=="; }; } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "754xOG8DGn8NZDr4L95QxFfvAMs="; - }; - } { name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; path = fetchurl { @@ -6366,7 +6390,7 @@ path = fetchurl { name = "is_in_browser___is_in_browser_1.1.3.tgz"; url = "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz"; - sha1 = "Vv9NtoOgeMYILrldrX3GLh0E+DU="; + sha512 = "FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g=="; }; } { @@ -6374,7 +6398,7 @@ path = fetchurl { name = "is_lambda___is_lambda_1.0.1.tgz"; url = "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz"; - sha1 = "PZh3iZ5qU+/AFgUEzeFfgubwYdU="; + sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ=="; }; } { @@ -6406,7 +6430,7 @@ path = fetchurl { name = "is_plain_obj___is_plain_obj_1.1.0.tgz"; url = "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "caUMhCnfync8kqOQpKA7OfzVHT4="; + sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; }; } { @@ -6470,7 +6494,7 @@ path = fetchurl { name = "is_subset___is_subset_0.1.1.tgz"; url = "https://registry.yarnpkg.com/is-subset/-/is-subset-0.1.1.tgz"; - sha1 = "ilkRfZMt4d4A8kX83TnOQ/HpOaY="; + sha512 = "6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw=="; }; } { @@ -6510,7 +6534,7 @@ path = fetchurl { name = "isarray___isarray_0.0.1.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz"; - sha1 = "ihis/Kmo9Bd+Cav8YDiTmwXR7t8="; + sha512 = "D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="; }; } { @@ -6518,7 +6542,7 @@ path = fetchurl { name = "isarray___isarray_1.0.0.tgz"; url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; - sha1 = "u5NdSFgsuhaMBoNJV6VKPgcSTxE="; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; } { @@ -6534,7 +6558,7 @@ path = fetchurl { name = "isexe___isexe_2.0.0.tgz"; url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; - sha1 = "6PvzdNxVb/iUehDcsFctYz8s+hA="; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; } { @@ -6542,7 +6566,7 @@ path = fetchurl { name = "isobject___isobject_3.0.1.tgz"; url = "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"; - sha1 = "TkMekrEalzFjaqH5yNHMvP2reN8="; + sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; }; } { @@ -6610,11 +6634,11 @@ }; } { - name = "jake___jake_10.8.2.tgz"; + name = "jake___jake_10.8.5.tgz"; path = fetchurl { - name = "jake___jake_10.8.2.tgz"; - url = "https://registry.yarnpkg.com/jake/-/jake-10.8.2.tgz"; - sha512 = "eLpKyrfG3mzvGE2Du8VoPbeSkRry093+tyNjdYaBbJS9v17knImYGNXQCUV0gLxQtF82m3E8iRb/wdSQZLoq7A=="; + name = "jake___jake_10.8.5.tgz"; + url = "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz"; + sha512 = "sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw=="; }; } { @@ -6638,7 +6662,7 @@ path = fetchurl { name = "javascript_natural_sort___javascript_natural_sort_0.7.1.tgz"; url = "https://registry.yarnpkg.com/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz"; - sha1 = "+eIwPUUH9tdDVac2ZNFED7Wg71k="; + sha512 = "nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="; }; } { @@ -6654,7 +6678,7 @@ path = fetchurl { name = "jmespath___jmespath_0.15.0.tgz"; url = "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz"; - sha1 = "o/Iiqarp+Wb10nx5ZRDigJF2Qhc="; + sha512 = "+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w=="; }; } { @@ -6666,11 +6690,11 @@ }; } { - name = "jquery_ui___jquery_ui_1.13.0.tgz"; + name = "jquery_ui___jquery_ui_1.13.2.tgz"; path = fetchurl { - name = "jquery_ui___jquery_ui_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.0.tgz"; - sha512 = "Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw=="; + 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=="; }; } { @@ -6686,7 +6710,7 @@ path = fetchurl { name = "js_string_escape___js_string_escape_1.0.1.tgz"; url = "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz"; - sha1 = "4mJbrbwNZ8dTPp7cEGjFh65BN+8="; + sha512 = "Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg=="; }; } { @@ -6702,7 +6726,7 @@ path = fetchurl { name = "js_tokens___js_tokens_3.0.2.tgz"; url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz"; - sha1 = "mGbfOVECEw449/mWvOtlRDIJwls="; + sha512 = "RjTcuD4xjtthQkaWH7dFlH85L+QaVtSoOyGdZ3g6HFhS9dFNDfLyqgm2NFe2X6cQpeFmt0452FJjFG5UameExg=="; }; } { @@ -6718,7 +6742,7 @@ path = fetchurl { name = "jsbn___jsbn_1.1.0.tgz"; url = "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz"; - sha1 = "sBMHyym2GKHtJux56RH4A8TaAEA="; + sha512 = "4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A=="; }; } { @@ -6726,7 +6750,7 @@ path = fetchurl { name = "jsesc___jsesc_1.3.0.tgz"; url = "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz"; - sha1 = "RsP+yMGJKxKwgz25vHYiF226s0s="; + sha512 = "Mke0DA0QjUWuJlhsE0ZPPhYiJkRap642SmI/4ztCFaUs6V2AiH1sfecc+57NgaryfAA2VR3v6O+CSjC1jZJKOA=="; }; } { @@ -6742,7 +6766,7 @@ path = fetchurl { name = "jsesc___jsesc_0.5.0.tgz"; url = "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "597mbjXW/Bb3EP6R1c9p9w8IkR0="; + sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; }; } { @@ -6774,7 +6798,7 @@ path = fetchurl { name = "json_schema_traverse___json_schema_traverse_0.3.1.tgz"; url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz"; - sha1 = "NJptRMU6Ud6JtAgFxdXlm0F9M0A="; + sha512 = "4JD/Ivzg7PoW8NzdrBSr3UFwC9mHgvI7Z6z3QGBsSHgKaRTUDmyZAAKJo2UbG1kUVfS9WS8bi36N49U1xw43DA=="; }; } { @@ -6806,7 +6830,7 @@ path = fetchurl { name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; - sha1 = "nbe1lJatPzz+8wp1FC0tkwrXJlE="; + sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw=="; }; } { @@ -6862,7 +6886,7 @@ path = fetchurl { name = "jsonparse___jsonparse_1.3.1.tgz"; url = "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz"; - sha1 = "P02uSpH6wxX3EGL4UhzCOfE2YoA="; + sha512 = "POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg=="; }; } { @@ -7006,7 +7030,7 @@ path = fetchurl { name = "karma_requirejs___karma_requirejs_1.1.0.tgz"; url = "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz"; - sha1 = "/driy4fX68FvsCIok1ZNf+5Xh5g="; + sha512 = "MHTOYKdwwJBkvYid0TaYvBzOnFH3TDtzo6ie5E4o9SaUSXXsfMRLa/whUz6efVIgTxj1xnKYasNn/XwEgJeB/Q=="; }; } { @@ -7094,7 +7118,7 @@ path = fetchurl { name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; - sha1 = "HADHQ7QzzQpOgHWPe2SldEDZ/wA="; + sha512 = "8ZmlJFVK9iCmtLz19HpSsR8HaAMWBT284VMNednLwlIMDP2hJDCIhUp0IZ2xUcZ+Ob6BM0VvCSJwzASDM45NLQ=="; }; } { @@ -7137,12 +7161,44 @@ sha512 = "iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw=="; }; } + { + name = "lodash._basebind___lodash._basebind_2.3.0.tgz"; + path = fetchurl { + name = "lodash._basebind___lodash._basebind_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._basebind/-/lodash._basebind-2.3.0.tgz"; + sha512 = "SHqM7YCuJ+BeGTs7lqpWnmdHEeF4MWxS3dksJctHFNxR81FXPOzA4bS5Vs5CpcGTkBpM8FCl+YEbQEblRw8ABg=="; + }; + } + { + name = "lodash._basecreate___lodash._basecreate_2.3.0.tgz"; + path = fetchurl { + name = "lodash._basecreate___lodash._basecreate_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._basecreate/-/lodash._basecreate-2.3.0.tgz"; + sha512 = "vwZaWldZwS2y9b99D8i9+WtgiZXbHKsBsMrpxJEqTsNW20NhJo5W8PBQkeQO9CmxuqEYn8UkMnfEM2MMT4cVrw=="; + }; + } + { + name = "lodash._basecreatecallback___lodash._basecreatecallback_2.3.0.tgz"; + path = fetchurl { + name = "lodash._basecreatecallback___lodash._basecreatecallback_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._basecreatecallback/-/lodash._basecreatecallback-2.3.0.tgz"; + sha512 = "Ev+pDzzfVfgbiucpXijconLGRBar7/+KNCf05kSnk4CmdDVhAy1RdbU9efCJ/o9GXI08JdUGwZ+5QJ3QX3kj0g=="; + }; + } + { + name = "lodash._basecreatewrapper___lodash._basecreatewrapper_2.3.0.tgz"; + path = fetchurl { + name = "lodash._basecreatewrapper___lodash._basecreatewrapper_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._basecreatewrapper/-/lodash._basecreatewrapper-2.3.0.tgz"; + sha512 = "YLycQ7k8AB9Wc1EOvLNxuRWcqipDkMXq2GCgnLWQR6qtgTb3gY3LELzEpnFshrEO4LOLs+R2EpcY+uCOZaLQ8Q=="; + }; + } { name = "lodash._baseisequal___lodash._baseisequal_3.0.7.tgz"; path = fetchurl { name = "lodash._baseisequal___lodash._baseisequal_3.0.7.tgz"; url = "https://registry.yarnpkg.com/lodash._baseisequal/-/lodash._baseisequal-3.0.7.tgz"; - sha1 = "2AJfdjOdKTQnZ9zIh85cuVpbUfE="; + sha512 = "U+3GsNEZj9ebI03ncLC2pLmYVjgtYZEwdkAPO7UGgtGvAz36JVFPAQUufpSaVL93Cz5arc6JGRKZRhaOhyVJYA=="; }; } { @@ -7150,7 +7206,15 @@ path = fetchurl { name = "lodash._bindcallback___lodash._bindcallback_3.0.1.tgz"; url = "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"; - sha1 = "5THCdkTPi1epnhftlbNcdIeJOS4="; + sha512 = "2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ=="; + }; + } + { + name = "lodash._createwrapper___lodash._createwrapper_2.3.0.tgz"; + path = fetchurl { + name = "lodash._createwrapper___lodash._createwrapper_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._createwrapper/-/lodash._createwrapper-2.3.0.tgz"; + sha512 = "XjaI/rzg9W+WO4WJDQ+PRlHD5sAMJ1RhJLuT65cBxLCb1kIYs4U20jqvTDGAWyVT3c34GYiLd9AreHYuB/8yJA=="; }; } { @@ -7158,7 +7222,55 @@ path = fetchurl { name = "lodash._getnative___lodash._getnative_3.9.1.tgz"; url = "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz"; - sha1 = "VwvH3t5G1hzc3mh9ZdPuy6o6r/U="; + sha512 = "RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA=="; + }; + } + { + name = "lodash._objecttypes___lodash._objecttypes_2.3.0.tgz"; + path = fetchurl { + name = "lodash._objecttypes___lodash._objecttypes_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._objecttypes/-/lodash._objecttypes-2.3.0.tgz"; + sha512 = "jbA6QyHt9cw3BzvbWzIcnU3Z12jSneT6xBgz3Y782CJsN1tV5aTBKrFo2B4AkeHBNaxSrbPYZZpi1Lwj3xjdtg=="; + }; + } + { + name = "lodash._renative___lodash._renative_2.3.0.tgz"; + path = fetchurl { + name = "lodash._renative___lodash._renative_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._renative/-/lodash._renative-2.3.0.tgz"; + sha512 = "v44MRirqYqZGK/h5UKoVqXWF2L+LUiLTU+Ogu5rHRVWJUA1uWIlHaMpG8f/OA8j++BzPMQij9+erXHtgFcbuwg=="; + }; + } + { + name = "lodash._setbinddata___lodash._setbinddata_2.3.0.tgz"; + path = fetchurl { + name = "lodash._setbinddata___lodash._setbinddata_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._setbinddata/-/lodash._setbinddata-2.3.0.tgz"; + sha512 = "xMFfbF7dL+sFtrdE49uHFmfpBAEwlFtfgMp86nQRlAF6aizYL+3MTbnYMKJSkP1W501PhsgiBED5kBbZd8kR2g=="; + }; + } + { + name = "lodash._shimkeys___lodash._shimkeys_2.3.0.tgz"; + path = fetchurl { + name = "lodash._shimkeys___lodash._shimkeys_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._shimkeys/-/lodash._shimkeys-2.3.0.tgz"; + sha512 = "9Iuyi7TiWMGa/9+2rqEE+Zwye4b/U2w7Saw6UX1h6Xs88mEER+uz9FZcEBPKMVKsad9Pw5GNAcIBRnW2jNpneQ=="; + }; + } + { + name = "lodash._slice___lodash._slice_2.3.0.tgz"; + path = fetchurl { + name = "lodash._slice___lodash._slice_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash._slice/-/lodash._slice-2.3.0.tgz"; + sha512 = "7C61GhzRUv36gTafr+RIb+AomCAYsSATEoK4OP0VkNBcwvsM022Z22AVgqjjzikeNO1U29LzsJZDvLbiNPUYvA=="; + }; + } + { + name = "lodash.bind___lodash.bind_2.3.0.tgz"; + path = fetchurl { + name = "lodash.bind___lodash.bind_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-2.3.0.tgz"; + sha512 = "goakyOo+FMN8lttMPnZ0UNlr5RlzX4IrUXyTJPT2A0tGCMXySupond9wzvDqTvVmYTcQjIKGrj8naJDS2xWAlQ=="; }; } { @@ -7166,7 +7278,7 @@ path = fetchurl { name = "lodash.debounce___lodash.debounce_4.0.8.tgz"; url = "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; - sha1 = "gteb/zCmfEAF/9XiUVMArZyk168="; + sha512 = "FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="; }; } { @@ -7174,7 +7286,7 @@ path = fetchurl { name = "lodash.escape___lodash.escape_4.0.1.tgz"; url = "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz"; - sha1 = "yQRGkMIeBClL6qUXcS/e0fqI3pg="; + sha512 = "nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw=="; }; } { @@ -7182,7 +7294,31 @@ path = fetchurl { name = "lodash.flattendeep___lodash.flattendeep_4.4.0.tgz"; url = "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; - sha1 = "+wMJF/hqMTTlvJvsDWngAT3f7bI="; + sha512 = "uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ=="; + }; + } + { + name = "lodash.foreach___lodash.foreach_2.3.0.tgz"; + path = fetchurl { + name = "lodash.foreach___lodash.foreach_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-2.3.0.tgz"; + sha512 = "yLnyptVRJd0//AbGp480grgQG9iaDIV5uOgSbpurRy1dYybPbjNTLQ3FyLEQ84buVLPG7jyaiyvpzgfOutRB3Q=="; + }; + } + { + name = "lodash.forown___lodash.forown_2.3.0.tgz"; + path = fetchurl { + name = "lodash.forown___lodash.forown_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.forown/-/lodash.forown-2.3.0.tgz"; + sha512 = "dUnCsuQTtq3Y7bxPNoEEqjJjPL2ftLtcz2PTeRKvhbpdM514AvnqCjewHGsm/W+dwspIwa14KoWEZeizJ7smxA=="; + }; + } + { + name = "lodash.identity___lodash.identity_2.3.0.tgz"; + path = fetchurl { + name = "lodash.identity___lodash.identity_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.identity/-/lodash.identity-2.3.0.tgz"; + sha512 = "NYJ2r2cwy3tkx/saqbIZEX6oQUzjWTnGRu7d/zmBjMCZos3eHBxCpbvWFWSetv8jFVrptsp6EbWjzNgBKhUoOA=="; }; } { @@ -7190,7 +7326,7 @@ path = fetchurl { name = "lodash.isarguments___lodash.isarguments_3.1.0.tgz"; url = "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"; - sha1 = "L1c9hcaiQon/AGY7SRwdM4/zRYo="; + sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg=="; }; } { @@ -7198,7 +7334,7 @@ path = fetchurl { name = "lodash.isarray___lodash.isarray_3.0.4.tgz"; url = "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz"; - sha1 = "eeTriMNqgSKvhvhEqpvNhRtfu1U="; + sha512 = "JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ=="; }; } { @@ -7206,7 +7342,7 @@ path = fetchurl { name = "lodash.isequal___lodash.isequal_3.0.4.tgz"; url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-3.0.4.tgz"; - sha1 = "HDXrO27wzR/1F0Pj6jz3/f/ay2Q="; + sha512 = "Bsu5fP9Omd+HBk2Dz8qp4BHbC+83DBykZ87Lz1JmPKTVNy4Q0XQVtUrbfXVAK/udQrWNcGStcKSA9yj/Zkm3TQ=="; }; } { @@ -7214,7 +7350,23 @@ path = fetchurl { name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; url = "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz"; - sha1 = "QVxEePK8wwEgwizhDtMib30+GOA="; + sha512 = "pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="; + }; + } + { + name = "lodash.isfunction___lodash.isfunction_2.3.0.tgz"; + path = fetchurl { + name = "lodash.isfunction___lodash.isfunction_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-2.3.0.tgz"; + sha512 = "X5lteBYlCrVO7Qc00fxP8W90fzRp6Ax9XcHANmU3OsZHdSyIVZ9ZlX5QTTpRq8aGY+9I5Rmd0UTzTIIyWPugEQ=="; + }; + } + { + name = "lodash.isobject___lodash.isobject_2.3.0.tgz"; + path = fetchurl { + name = "lodash.isobject___lodash.isobject_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.3.0.tgz"; + sha512 = "jo1pfV61C4TE8BfEzqaHj6EIKiSkFANJrB6yscwuCJMSRw5tbqjk4Gv7nJzk4Z6nFKobZjGZ8Qd41vmnwgeQqQ=="; }; } { @@ -7222,7 +7374,15 @@ path = fetchurl { name = "lodash.istypedarray___lodash.istypedarray_3.0.6.tgz"; url = "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz"; - sha1 = "yaR3SYYHUB2OhJTSg7h8OSgc72I="; + sha512 = "lGWJ6N8AA3KSv+ZZxlTdn4f6A7kMfpJboeyvbFdE7IU9YAgweODqmOgdUHOA+c6lVWeVLysdaxciFXi+foVsWw=="; + }; + } + { + name = "lodash.keys___lodash.keys_2.3.0.tgz"; + path = fetchurl { + name = "lodash.keys___lodash.keys_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-2.3.0.tgz"; + sha512 = "c0UW0ffqMxSCtoVbmVt2lERJLkEqgoOn2ejPsWXzr0ZrqRbl3uruGgwHzhtqXxi6K/ei3Ey7zimOqSwXgzazPg=="; }; } { @@ -7230,7 +7390,7 @@ path = fetchurl { name = "lodash.keys___lodash.keys_3.1.2.tgz"; url = "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz"; - sha1 = "TbwEcrFWvlCgsoaFXRvQsMZWCYo="; + sha512 = "CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ=="; }; } { @@ -7238,7 +7398,7 @@ path = fetchurl { name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha1 = "vMbEmkKihA7Zl/Mj6tpezRguC/4="; + sha512 = "t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="; }; } { @@ -7246,7 +7406,7 @@ path = fetchurl { name = "lodash.memoize___lodash.memoize_3.0.4.tgz"; url = "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz"; - sha1 = "LcvSwofLwKVcxCMovQxzYVDVPj8="; + sha512 = "eDn9kqrAmVUC1wmZvlQ6Uhde44n+tXpqPrN8olQJbttgh0oKclk+SF54P47VEGE9CEiMeRwAP8BaM7UHvBkz2A=="; }; } { @@ -7257,12 +7417,28 @@ sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; } + { + name = "lodash.noop___lodash.noop_2.3.0.tgz"; + path = fetchurl { + name = "lodash.noop___lodash.noop_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.noop/-/lodash.noop-2.3.0.tgz"; + sha512 = "NpSm8HRm1WkBBWHUveDukLF4Kfb5P5E3fjHc9Qre9A11nNubozLWD2wH3UBTZbu+KSuX8aSUvy9b+PUyEceJ8g=="; + }; + } + { + name = "lodash.support___lodash.support_2.3.0.tgz"; + path = fetchurl { + name = "lodash.support___lodash.support_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.support/-/lodash.support-2.3.0.tgz"; + sha512 = "etc7VWbB0U3Iya8ixj2xy4sDBN3jvPX7ODi8iXtn4KkkjNpdngrdc7Vlt5jub/Vgqx6/dWtp7Ml9awhCQPYKGQ=="; + }; + } { name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; path = fetchurl { name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha1 = "WjUNoLERO4N+z//VgSy+WNbq4ZM="; + sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="; }; } { @@ -7270,7 +7446,7 @@ path = fetchurl { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; url = "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "0CJTc662Uq3BvILklFM5qEJ1R3M="; + sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; }; } { @@ -7305,12 +7481,20 @@ sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; } + { + name = "lru_cache___lru_cache_7.13.1.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_7.13.1.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.13.1.tgz"; + sha512 = "CHqbAq7NFlW3RSnoWXLJBxCWaZVBrfa9UEHId2M3AW8iEBurbqduNexEUCGc3SHc6iCYXNJCDi903LajSVAEPQ=="; + }; + } { name = "lunr___lunr_0.7.2.tgz"; path = fetchurl { name = "lunr___lunr_0.7.2.tgz"; url = "https://registry.yarnpkg.com/lunr/-/lunr-0.7.2.tgz"; - sha1 = "eaMOky4hbLoWNUHuN6NgfBLNcoE="; + sha512 = "qXxxSzrWOhFu4EhyvYqCGMv1nJsTy5OGQN3GtClGbRSaqJ/1XASk41nF2jjxzKTS8kjU0QybhOgGgGo6HUZqSQ=="; }; } { @@ -7322,11 +7506,11 @@ }; } { - name = "make_fetch_happen___make_fetch_happen_9.1.0.tgz"; + name = "make_fetch_happen___make_fetch_happen_10.2.0.tgz"; path = fetchurl { - name = "make_fetch_happen___make_fetch_happen_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz"; - sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg=="; + name = "make_fetch_happen___make_fetch_happen_10.2.0.tgz"; + url = "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.0.tgz"; + sha512 = "OnEfCLofQVJ5zgKwGk55GaqosqKjaR6khQlJY3dBAA+hM25Bc5CmX5rKUfVut+rYA3uidA7zb7AvcglU87rPRg=="; }; } { @@ -7334,7 +7518,7 @@ path = fetchurl { name = "map_obj___map_obj_1.0.1.tgz"; url = "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "2TPOuSBdgr3PSIb2dCvcK03qFG0="; + sha512 = "7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg=="; }; } { @@ -7346,11 +7530,11 @@ }; } { - name = "marked___marked_3.0.8.tgz"; + name = "marked___marked_4.0.18.tgz"; path = fetchurl { - name = "marked___marked_3.0.8.tgz"; - url = "https://registry.yarnpkg.com/marked/-/marked-3.0.8.tgz"; - sha512 = "0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw=="; + name = "marked___marked_4.0.18.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-4.0.18.tgz"; + sha512 = "wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw=="; }; } { @@ -7358,7 +7542,7 @@ path = fetchurl { name = "matches_selector___matches_selector_0.0.1.tgz"; url = "https://registry.yarnpkg.com/matches-selector/-/matches-selector-0.0.1.tgz"; - sha1 = "HfUmIkOuNBwaCATdMCBIJnrHE7s="; + sha512 = "Bm8wuvuNGPY3j1Mo23PxieRQAmQQe2qVcqgmpHOp1BEBNgb4dqzn2Dcgu5bYltMosjGi6LD7GPW72zboSdyJQg=="; }; } { @@ -7382,7 +7566,7 @@ path = fetchurl { name = "media_typer___media_typer_0.3.0.tgz"; url = "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "hxDXrwqmJvj/+hzgAWhUUmMlV0g="; + sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; } { @@ -7422,7 +7606,7 @@ path = fetchurl { name = "microbuffer___microbuffer_1.0.0.tgz"; url = "https://registry.yarnpkg.com/microbuffer/-/microbuffer-1.0.0.tgz"; - sha1 = "izgy7UDIfVH0e7I0kTppinVtGdI="; + sha512 = "O/SUXauVN4x6RaEJFqSPcXNtLFL+QzJHKZlyDVYFwcDDRVca3Fa/37QXXC+4zAGGa4YhHrHxKXuuHvLDIQECtA=="; }; } { @@ -7510,7 +7694,7 @@ path = fetchurl { name = "minimalistic_crypto_utils___minimalistic_crypto_utils_1.0.1.tgz"; url = "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "9sAMHAsIIkblxNmd+4x8CDsrWCo="; + sha512 = "JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="; }; } { @@ -7521,6 +7705,14 @@ sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; } + { + name = "minimatch___minimatch_5.1.0.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 = "minimist_options___minimist_options_4.1.0.tgz"; path = fetchurl { @@ -7534,7 +7726,7 @@ path = fetchurl { name = "minimist___minimist_1.2.6.tgz"; url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz"; - sha1 = "hjelt1nqDW6YcCz7OpKDMjyTr0Q="; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; }; } { @@ -7546,11 +7738,11 @@ }; } { - name = "minipass_fetch___minipass_fetch_1.4.1.tgz"; + name = "minipass_fetch___minipass_fetch_2.1.0.tgz"; path = fetchurl { - name = "minipass_fetch___minipass_fetch_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz"; - sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw=="; + name = "minipass_fetch___minipass_fetch_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.0.tgz"; + sha512 = "H9U4UVBGXEyyWJnqYDCLp1PwD8XIkJ4akNHp1aGVI+2Ym7wQMlxDKi4IB4JbmyU+pl9pEs/cVrK6cOuvmbK4Sg=="; }; } { @@ -7578,11 +7770,11 @@ }; } { - name = "minipass___minipass_3.1.5.tgz"; + name = "minipass___minipass_3.3.4.tgz"; path = fetchurl { - name = "minipass___minipass_3.1.5.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.5.tgz"; - sha512 = "+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw=="; + name = "minipass___minipass_3.3.4.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz"; + sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; }; } { @@ -7665,14 +7857,6 @@ sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA=="; }; } - { - name = "moment_timezone___moment_timezone_0.5.33.tgz"; - path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.33.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.33.tgz"; - sha512 = "PTc2vcT8K9J5/9rDEPe5czSIKgLoGsH8UNpA4qZTVw0Vd/Uz19geE9abbIOQKaAQFcnQ3v5YEXrbSc5BpshH+w=="; - }; - } { name = "moment_timezone___moment_timezone_0.5.34.tgz"; path = fetchurl { @@ -7682,11 +7866,11 @@ }; } { - name = "moment___moment_2.29.3.tgz"; + name = "moment___moment_2.29.4.tgz"; path = fetchurl { - name = "moment___moment_2.29.3.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz"; - sha512 = "c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="; + name = "moment___moment_2.29.4.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz"; + sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; } { @@ -7710,7 +7894,7 @@ path = fetchurl { name = "ms___ms_2.0.0.tgz"; url = "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz"; - sha1 = "VgiurfwAvmwpAd9fmGF4jeDVl8g="; + sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; }; } { @@ -7722,19 +7906,11 @@ }; } { - name = "ms___ms_2.1.3.tgz"; + name = "nan___nan_2.16.0.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 = "nan___nan_2.15.0.tgz"; - path = fetchurl { - name = "nan___nan_2.15.0.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz"; - sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ=="; + name = "nan___nan_2.16.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz"; + sha512 = "UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA=="; }; } { @@ -7742,7 +7918,7 @@ path = fetchurl { name = "nanoid___nanoid_3.2.0.tgz"; url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz"; - sha1 = "YmZ1Itpmc5ccypFqbT7/P0Ff+Aw="; + sha512 = "fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA=="; }; } { @@ -7750,7 +7926,7 @@ path = fetchurl { name = "nanoid___nanoid_3.3.2.tgz"; url = "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz"; - sha1 = "yJYi+vtDgc0iFCHGnsWFR6HuxVc="; + sha512 = "CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA=="; }; } { @@ -7766,7 +7942,7 @@ path = fetchurl { name = "natural_compare___natural_compare_1.4.0.tgz"; url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; - sha1 = "Sr6/7tdUHywnrPspvbvRXI1bpPc="; + sha512 = "OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="; }; } { @@ -7782,7 +7958,7 @@ path = fetchurl { name = "neatequal___neatequal_1.0.0.tgz"; url = "https://registry.yarnpkg.com/neatequal/-/neatequal-1.0.0.tgz"; - sha1 = "LuEhG8n6bkxVcV/SELsFYC6xrjs="; + sha512 = "sVt5awO4a4w24QmAthdrCPiVRW3naB8FGLdyadin01BH+6BzNPEBwGrpwCczQvPlULS6uXTItTe1PJ5P0kYm7A=="; }; } { @@ -7793,6 +7969,14 @@ sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; }; } + { + name = "negotiator___negotiator_0.6.3.tgz"; + path = fetchurl { + name = "negotiator___negotiator_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz"; + sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="; + }; + } { name = "neo_async___neo_async_2.6.2.tgz"; path = fetchurl { @@ -7802,11 +7986,11 @@ }; } { - name = "node_gyp___node_gyp_8.4.0.tgz"; + name = "node_gyp___node_gyp_9.1.0.tgz"; path = fetchurl { - name = "node_gyp___node_gyp_8.4.0.tgz"; - url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.0.tgz"; - sha512 = "Bi/oCm5bH6F+FmzfUxJpPaxMEyIhszULGR3TprmTeku8/dMFcdTcypk120NeZqEt54r1BrgEKtm2jJiuIKE28Q=="; + name = "node_gyp___node_gyp_9.1.0.tgz"; + url = "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.1.0.tgz"; + sha512 = "HkmN0ZpQJU7FLbJauJTHkHlSVAXlNGDAzH/VYFZGDOnFyn/Na3GlNJfkudmufOdS6/jNFhy88ObzL7ERz9es1g=="; }; } { @@ -7854,7 +8038,7 @@ path = fetchurl { name = "normalize_range___normalize_range_0.1.2.tgz"; url = "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz"; - sha1 = "LRDAa9/TEuqXd2laTShDlFa3WUI="; + sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; }; } { @@ -7890,11 +8074,11 @@ }; } { - name = "npmlog___npmlog_4.1.2.tgz"; + name = "npmlog___npmlog_6.0.2.tgz"; path = fetchurl { - name = "npmlog___npmlog_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz"; - sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; + name = "npmlog___npmlog_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz"; + sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg=="; }; } { @@ -7905,20 +8089,12 @@ sha512 = "it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w=="; }; } - { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - path = fetchurl { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "CXtgK1NCKlIsGvuHkDGDNpQaAR0="; - }; - } { name = "object_assign___object_assign_4.1.1.tgz"; path = fetchurl { name = "object_assign___object_assign_4.1.1.tgz"; url = "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "IQmtx5ZYh8/AXLvUQsrIv7s2CGM="; + sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; } { @@ -7990,7 +8166,7 @@ path = fetchurl { name = "on_finished___on_finished_2.3.0.tgz"; url = "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "IPEzZIGwg811M3mSoWlxqi2QaUc="; + sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="; }; } { @@ -7998,7 +8174,7 @@ path = fetchurl { name = "once___once_1.4.0.tgz"; url = "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz"; - sha1 = "WDsap3WWHUsROsF9nFC6753Xa9E="; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; } { @@ -8030,7 +8206,7 @@ path = fetchurl { name = "os_browserify___os_browserify_0.3.0.tgz"; url = "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz"; - sha1 = "hUNzx/XCMVkU/Jv8a9gjj92h7Cc="; + sha512 = "gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="; }; } { @@ -8038,7 +8214,7 @@ path = fetchurl { name = "os_shim___os_shim_0.1.3.tgz"; url = "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz"; - sha1 = "a2LDeRz3kJ6jXtRuF2WLtBfLORc="; + sha512 = "jd0cvB8qQ5uVt0lvCIexBaROw1KyKm5sbulg2fWOHjETisuCzWyt+eTZKEMs8v6HwzoGs8xik26jg7eCM6pS+A=="; }; } { @@ -8094,7 +8270,7 @@ path = fetchurl { name = "p_reduce___p_reduce_1.0.0.tgz"; url = "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz"; - sha1 = "GMKw3ZNqRpClKfgjH1ig/bakffo="; + sha512 = "3Tx1T3oM1xO/Y8Gj0sWyE78EIJZ+t+aEmXUdvQgvGmSMri7aPTHoovbXEreWKkL5j21Er60XAWLTzKbAKYOujQ=="; }; } { @@ -8134,7 +8310,7 @@ path = fetchurl { name = "parents___parents_1.0.1.tgz"; url = "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz"; - sha1 = "/t1NK/GTp3dF/nHjcdc8MwfZx1E="; + sha512 = "mXKF3xkoUt5td2DoxpLmtOmZvko9VfFpwRwkKDHSNvgmpLAeBo18YDhcPbBzJq+QLCHMbGOfzia2cX4U+0v9Mg=="; }; } { @@ -8222,7 +8398,7 @@ path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; url = "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "F0uSaHNVNP+8es5r9TpanhtcX18="; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; } { @@ -8246,7 +8422,7 @@ path = fetchurl { name = "path_platform___path_platform_0.11.15.tgz"; url = "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz"; - sha1 = "6GQhf3TDaFDwhSt43Hv31KVyG/I="; + sha512 = "Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg=="; }; } { @@ -8262,7 +8438,7 @@ path = fetchurl { name = "pathfinding___pathfinding_0.4.18.tgz"; url = "https://registry.yarnpkg.com/pathfinding/-/pathfinding-0.4.18.tgz"; - sha1 = "qZkPb6IrfvGW5WUbBJFlQDoEX+g="; + sha512 = "R0TGEQ9GRcFCDvAWlJAWC+KGJ9SLbW4c0nuZRcioVlXVTlw+F5RvXQ8SQgSqI9KXWC1ew95vgmIiyaWTlCe9Ag=="; }; } { @@ -8286,7 +8462,7 @@ path = fetchurl { name = "performance_now___performance_now_2.1.0.tgz"; url = "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "Ywn04OX6kT7BxpMHrjZLSzd8nns="; + sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; } { @@ -8326,7 +8502,7 @@ path = fetchurl { name = "picomodal___picomodal_3.0.0.tgz"; url = "https://registry.yarnpkg.com/picomodal/-/picomodal-3.0.0.tgz"; - sha1 = "+s0w9PvzSoCcHgTqUl8ATzmcC4I="; + sha512 = "FoR3TDfuLlqUvcEeK5ifpKSVVns6B4BQvc8SDF6THVMuadya6LLtji0QgUDSStw0ZR2J7I6UGi5V2V23rnPWTw=="; }; } { @@ -8638,7 +8814,7 @@ path = fetchurl { name = "precond___precond_0.2.3.tgz"; url = "https://registry.yarnpkg.com/precond/-/precond-0.2.3.tgz"; - sha1 = "qpWRvKokkj8eD0hJ0kD0fvwQdaw="; + sha512 = "QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ=="; }; } { @@ -8662,7 +8838,7 @@ path = fetchurl { name = "process___process_0.11.10.tgz"; url = "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz"; - sha1 = "czIwDoQBYb2j5podHZGn1LwW8YI="; + sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="; }; } { @@ -8678,7 +8854,7 @@ path = fetchurl { name = "promise_inflight___promise_inflight_1.0.1.tgz"; url = "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha1 = "mEcocL8igTL8vdhoEputEsPAKeM="; + sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; }; } { @@ -8705,6 +8881,14 @@ sha512 = "8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ=="; }; } + { + name = "prop_types___prop_types_15.8.1.tgz"; + path = fetchurl { + name = "prop_types___prop_types_15.8.1.tgz"; + url = "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz"; + sha512 = "oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg=="; + }; + } { name = "public_encrypt___public_encrypt_4.0.3.tgz"; path = fetchurl { @@ -8718,7 +8902,7 @@ path = fetchurl { name = "punycode___punycode_1.3.2.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"; - sha1 = "llOgNvt8HuQjQvIyXM7v6jkmxI0="; + sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; }; } { @@ -8726,7 +8910,7 @@ path = fetchurl { name = "punycode___punycode_1.4.1.tgz"; url = "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz"; - sha1 = "wNWmOycYgArY4esPpSachN1BhF4="; + sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; } { @@ -8742,7 +8926,7 @@ path = fetchurl { name = "q___q_1.5.1.tgz"; url = "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"; - sha1 = "fjL3W0E4EpHQRhHxvxQQmsAGUdc="; + sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; }; } { @@ -8766,7 +8950,7 @@ path = fetchurl { name = "querystring_es3___querystring_es3_0.2.1.tgz"; url = "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz"; - sha1 = "nsYfeQSYdXB9aUFFlv2Qek1xHnM="; + sha512 = "773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA=="; }; } { @@ -8774,7 +8958,7 @@ path = fetchurl { name = "querystring___querystring_0.2.0.tgz"; url = "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz"; - sha1 = "sgmEkgO7Jd+CDadW50cAWHhSFiA="; + sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="; }; } { @@ -8806,7 +8990,7 @@ path = fetchurl { name = "railroad_diagrams___railroad_diagrams_1.0.0.tgz"; url = "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz"; - sha1 = "635iZ1SN3t+4mcG5Dlc3RVnN234="; + sha512 = "cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="; }; } { @@ -9017,6 +9201,14 @@ sha512 = "6e0WdcNLwpBx/YIDpoyd2Xb04PB0elrDrulKUgdrIlwuYvxh5Ok9M+F8cljm8kPXXs43PmMzek9RrB1b7mLMqA=="; }; } + { + name = "react_dropzone___react_dropzone_14.2.1.tgz"; + path = fetchurl { + name = "react_dropzone___react_dropzone_14.2.1.tgz"; + url = "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.1.tgz"; + sha512 = "jzX6wDtAjlfwZ+Fbg+G17EszWUkQVxhMTWMfAC9qSUq7II2pKglHA8aarbFKl0mLpRPDaNUcy+HD/Sf4gkf76Q=="; + }; + } { name = "react_input_autosize___react_input_autosize_3.0.0.tgz"; path = fetchurl { @@ -9174,7 +9366,7 @@ path = fetchurl { name = "read_only_stream___read_only_stream_2.0.0.tgz"; url = "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz"; - sha1 = "JyT9aoET1zdkrCiNQ4YnDB2/F/A="; + sha512 = "3ALe0bjBVZtkdWKIcThYpQCLbBMd/+Tbh2CDSrAIDO3UsZ4Xs+tnyjv2MjCOMMgBG+AsUOeuP1cgtY1INISc8w=="; }; } { @@ -9198,7 +9390,7 @@ path = fetchurl { name = "readable_stream___readable_stream_1.1.14.tgz"; url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "fPTFTvZI44EwhMY23SB54WbAgdk="; + sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; }; } { @@ -9246,7 +9438,7 @@ path = fetchurl { name = "reflect.ownkeys___reflect.ownkeys_0.2.0.tgz"; url = "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz"; - sha1 = "dJrO7H8/34tj+SegSAnpDFwLNGA="; + sha512 = "qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg=="; }; } { @@ -9374,7 +9566,7 @@ path = fetchurl { name = "repeating___repeating_2.0.1.tgz"; url = "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz"; - sha1 = "UhTFOpJtNVJwdSf7q0FdvAjQbdo="; + sha512 = "ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A=="; }; } { @@ -9390,7 +9582,7 @@ path = fetchurl { name = "require_directory___require_directory_2.1.1.tgz"; url = "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "jGStX9MNqxyXbiNE/+f3kqam30I="; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; }; } { @@ -9406,7 +9598,7 @@ path = fetchurl { name = "requires_port___requires_port_1.0.0.tgz"; url = "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "kl0mAdOaxIXgkc8NpcbmlNw9yv8="; + sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; } { @@ -9470,7 +9662,7 @@ path = fetchurl { name = "retry___retry_0.12.0.tgz"; url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; - sha1 = "G0KmJmoh8HQh0bC1S33BZ7AcATs="; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; }; } { @@ -9518,7 +9710,7 @@ path = fetchurl { name = "rst_selector_parser___rst_selector_parser_2.2.3.tgz"; url = "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz"; - sha1 = "gbIw6i/MYGbInjRy3nlChdmwPZE="; + sha512 = "nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA=="; }; } { @@ -9606,7 +9798,7 @@ path = fetchurl { name = "schema_utils___schema_utils_0.3.0.tgz"; url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.3.0.tgz"; - sha1 = "9YdyIs4+kx7a4DnxfrNxbnE3+M8="; + sha512 = "QaVYBaD9U8scJw2EBWnCBY+LJ0AD+/2edTaigDs0XLDLBfJmSUK9KGqktg1rb32U3z4j/XwvFwHHH1YfbYFd7Q=="; }; } { @@ -9673,6 +9865,14 @@ sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; } + { + name = "semver___semver_7.3.7.tgz"; + path = fetchurl { + name = "semver___semver_7.3.7.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; + }; + } { name = "serialize_javascript___serialize_javascript_5.0.1.tgz"; path = fetchurl { @@ -9694,7 +9894,7 @@ path = fetchurl { name = "set_blocking___set_blocking_2.0.0.tgz"; url = "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "BF+XgtARrppoA93TgrJDkrPYkPc="; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; } { @@ -9766,7 +9966,7 @@ path = fetchurl { name = "shim_loader___shim_loader_1.0.1.tgz"; url = "https://registry.yarnpkg.com/shim-loader/-/shim-loader-1.0.1.tgz"; - sha1 = "JYOm0qqTiJfCpBZYvO9z7IfTql4="; + sha512 = "O7amY2FR6Mmu0LRair5uLc/NG/sHFw/ulOf9s4iJfW/4KBSQdyqz9iZmOf57QG7xbKISHHPttMsVZWqQ/0vxpw=="; }; } { @@ -9778,11 +9978,11 @@ }; } { - name = "signal_exit___signal_exit_3.0.5.tgz"; + name = "signal_exit___signal_exit_3.0.7.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz"; - sha512 = "KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ=="; + name = "signal_exit___signal_exit_3.0.7.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz"; + sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; } { @@ -9854,7 +10054,7 @@ path = fetchurl { name = "snapsvg_cjs___snapsvg_cjs_0.0.6.tgz"; url = "https://registry.yarnpkg.com/snapsvg-cjs/-/snapsvg-cjs-0.0.6.tgz"; - sha1 = "Oy9WryVz09Nkw+1b+IhXRfTS3eE="; + sha512 = "7NNvoGrc3BQvWz5rWK1DsD5/Vni4STswz5B3JrBADboQWcN8OBVGjYVJFPT5JkUXb2iVnEflZANhufEpEcTHXw=="; }; } { @@ -9862,7 +10062,7 @@ path = fetchurl { name = "snapsvg___snapsvg_0.5.1.tgz"; url = "https://registry.yarnpkg.com/snapsvg/-/snapsvg-0.5.1.tgz"; - sha1 = "DK9Sx5GJopB0b8RGzF6GP2vd3+M="; + sha512 = "CjwWYsL7+CCk1vCk9BBKGYS4WJVDfJAOMWU+Zhzf8wf6pAm/xT34wnpaMPAgcgCNkxuU6OkQPPd8wGuRCY9aNw=="; }; } { @@ -9906,19 +10106,19 @@ }; } { - name = "socks_proxy_agent___socks_proxy_agent_6.1.0.tgz"; + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; path = fetchurl { - name = "socks_proxy_agent___socks_proxy_agent_6.1.0.tgz"; - url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.0.tgz"; - sha512 = "57e7lwCN4Tzt3mXz25VxOErJKXlPfXmkMLnk310v/jwW20jWRVcgsOit+xNkN3eIEdB47GwnfAEBLacZ/wVIKg=="; + name = "socks_proxy_agent___socks_proxy_agent_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"; + sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww=="; }; } { - name = "socks___socks_2.6.1.tgz"; + name = "socks___socks_2.7.0.tgz"; path = fetchurl { - name = "socks___socks_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz"; - sha512 = "kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA=="; + name = "socks___socks_2.7.0.tgz"; + url = "https://registry.yarnpkg.com/socks/-/socks-2.7.0.tgz"; + sha512 = "scnOe9y4VuiNUULJN72GrM26BNOjVsfPXI+j+98PkyEfsIXroa5ofyjT+FzGvn/xHs73U2JtoBYAVx9Hl4quSA=="; }; } { @@ -9926,7 +10126,7 @@ path = fetchurl { name = "source_list_map___source_list_map_1.1.2.tgz"; url = "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.2.tgz"; - sha1 = "mIkBnRAkzOVc3AaUmDN+9hhqEaE="; + sha512 = "FqR2O+cX+toUD3ULVIgTtiqYIqPnA62ehJD47mf4LG1PZCB+xmIa3gcTEhegGbP22aRPh88dJSdgDIolrvSxBQ=="; }; } { @@ -9966,7 +10166,7 @@ path = fetchurl { name = "source_map___source_map_0.5.7.tgz"; url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; - sha1 = "igOdLRAh0i0eoUyA2OpGi6LvP8w="; + sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; }; } { @@ -9977,14 +10177,6 @@ sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; } - { - name = "source_map___source_map_0.7.3.tgz"; - path = fetchurl { - name = "source_map___source_map_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz"; - sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; - }; - } { name = "spdx_correct___spdx_correct_3.1.1.tgz"; path = fetchurl { @@ -10038,15 +10230,15 @@ path = fetchurl { name = "sprintf_js___sprintf_js_1.0.3.tgz"; url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "BOaSb2YolTVPPdAVIDYzuFcpfiw="; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; } { - name = "ssri___ssri_8.0.1.tgz"; + name = "ssri___ssri_9.0.1.tgz"; path = fetchurl { - name = "ssri___ssri_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz"; - sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ=="; + name = "ssri___ssri_9.0.1.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz"; + sha512 = "o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q=="; }; } { @@ -10062,7 +10254,7 @@ path = fetchurl { name = "statuses___statuses_1.5.0.tgz"; url = "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"; - sha1 = "Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="; + sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; }; } { @@ -10078,7 +10270,7 @@ path = fetchurl { name = "stream_combiner2___stream_combiner2_1.1.1.tgz"; url = "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz"; - sha1 = "+02KFCDqNidk4hrUeAOXvry0HL4="; + sha512 = "3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw=="; }; } { @@ -10105,14 +10297,6 @@ sha512 = "ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA=="; }; } - { - name = "string_width___string_width_1.0.2.tgz"; - path = fetchurl { - name = "string_width___string_width_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha1 = "EYvfW4zcUaKn5w0hHgfisLmxB9M="; - }; - } { name = "string_width___string_width_4.2.3.tgz"; path = fetchurl { @@ -10121,22 +10305,6 @@ sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="; }; } - { - name = "string.fromcodepoint___string.fromcodepoint_0.2.1.tgz"; - path = fetchurl { - name = "string.fromcodepoint___string.fromcodepoint_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/string.fromcodepoint/-/string.fromcodepoint-0.2.1.tgz"; - sha1 = "jZeDM8C8klOPUPOD5IiPPlYZ1lM="; - }; - } - { - name = "string.prototype.codepointat___string.prototype.codepointat_0.2.1.tgz"; - path = fetchurl { - name = "string.prototype.codepointat___string.prototype.codepointat_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz"; - sha512 = "2cBVCj6I4IOvEnjgO/hWqXjqBGsY+zwPmHl12Srk9IXSZ56Jwwmy+66XO5Iut/oQVR7t5ihYdLB0GMa4alEUcg=="; - }; - } { name = "string.prototype.matchall___string.prototype.matchall_4.0.6.tgz"; path = fetchurl { @@ -10182,7 +10350,7 @@ path = fetchurl { name = "string_decoder___string_decoder_0.10.31.tgz"; url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="; + sha512 = "ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="; }; } { @@ -10198,7 +10366,7 @@ path = fetchurl { name = "strip_ansi___strip_ansi_3.0.1.tgz"; url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "ajhfuIU9lS1f8F0Oiq+UJ43GPc8="; + sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; }; } { @@ -10294,7 +10462,7 @@ path = fetchurl { name = "subarg___subarg_1.0.0.tgz"; url = "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz"; - sha1 = "9izxdYHplrSPyWVpn1TAauJouNI="; + sha512 = "RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg=="; }; } { @@ -10302,7 +10470,7 @@ path = fetchurl { name = "supports_color___supports_color_2.0.0.tgz"; url = "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "U10EXOa2Nj+kARcIRimZXp3zJMc="; + sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="; }; } { @@ -10338,27 +10506,27 @@ }; } { - name = "svg_pathdata___svg_pathdata_5.0.5.tgz"; + name = "svg_pathdata___svg_pathdata_6.0.3.tgz"; path = fetchurl { - name = "svg_pathdata___svg_pathdata_5.0.5.tgz"; - url = "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-5.0.5.tgz"; - sha512 = "TAAvLNSE3fEhyl/Da19JWfMAdhSXTYeviXsLSoDT1UM76ADj5ndwAPX1FKQEgB/gFMPavOy6tOqfalXKUiXrow=="; + name = "svg_pathdata___svg_pathdata_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz"; + sha512 = "qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw=="; }; } { - name = "svg2ttf___svg2ttf_5.2.0.tgz"; + name = "svg2ttf___svg2ttf_6.0.3.tgz"; path = fetchurl { - name = "svg2ttf___svg2ttf_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-5.2.0.tgz"; - sha512 = "CzxPnSm2/CrMnJuKlXVllOx+q9wuarbIMi4Vf14eJoeESRqAOxVZiH0Ias71mhyXYGgz88A4T/E8fN/Y8eXoYA=="; + name = "svg2ttf___svg2ttf_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/svg2ttf/-/svg2ttf-6.0.3.tgz"; + sha512 = "CgqMyZrbOPpc+WqH7aga4JWkDPso23EgypLsbQ6gN3uoPWwwiLjXvzgrwGADBExvCRJrWFzAeK1bSoSpE7ixSQ=="; }; } { - name = "svgicons2svgfont___svgicons2svgfont_9.2.0.tgz"; + name = "svgicons2svgfont___svgicons2svgfont_10.0.6.tgz"; path = fetchurl { - name = "svgicons2svgfont___svgicons2svgfont_9.2.0.tgz"; - url = "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-9.2.0.tgz"; - sha512 = "mWeiuob7L2ZTcnAEP4JvSQ1pnIsGjV16ykQ0fCiiXqoUAQ/iNsDvBc601ojjfP89eCPtr3IVZ9mDxYpdxYO3xQ=="; + name = "svgicons2svgfont___svgicons2svgfont_10.0.6.tgz"; + url = "https://registry.yarnpkg.com/svgicons2svgfont/-/svgicons2svgfont-10.0.6.tgz"; + sha512 = "fUgQEVg3XwTbOHvlXahHGqCet5Wvfo1bV4DCvbSRvjsOCPCRunYbG4dUJCPegps37BMph3eOrfoobhH5AWuC6A=="; }; } { @@ -10378,11 +10546,11 @@ }; } { - name = "svgpath___svgpath_2.3.1.tgz"; + name = "svgpath___svgpath_2.5.0.tgz"; path = fetchurl { - name = "svgpath___svgpath_2.3.1.tgz"; - url = "https://registry.yarnpkg.com/svgpath/-/svgpath-2.3.1.tgz"; - sha512 = "wNz6lCoj+99GMoyU7SozTfPqiLHz6WcJYZ30Z+F4lF/gPtxWHBCpZ4DhoDI0+oZ0dObKyYsJdSPGbL2mJq/qCg=="; + name = "svgpath___svgpath_2.5.0.tgz"; + url = "https://registry.yarnpkg.com/svgpath/-/svgpath-2.5.0.tgz"; + sha512 = "o/vohwqjUO9nDAh4rcjE3KaW/v//At8UJu2LJMybXidf5QLQLVA4bxH0//4YCsr+1H4Gw1Wi/Jc62ynzSBYidw=="; }; } { @@ -10401,14 +10569,6 @@ sha512 = "5DkIxeA7XERBqMwJq0aHZOdMadBx4e6eDoFRuyT5VR82J0Ycg2DwM6GfA/EQAhJ+toRTaS1lIdSQCqgrmhPnlw=="; }; } - { - name = "tablesorter___tablesorter_2.31.3.tgz"; - path = fetchurl { - name = "tablesorter___tablesorter_2.31.3.tgz"; - url = "https://registry.yarnpkg.com/tablesorter/-/tablesorter-2.31.3.tgz"; - sha512 = "ueEzeKiMajDcCWnUoT1dOeNEaS1OmPh9+8J0O2Sjp3TTijMygH74EA9QNJiNkLJqULyNU0RhbKY26UMUq9iurA=="; - }; - } { name = "tapable___tapable_2.2.1.tgz"; path = fetchurl { @@ -10450,11 +10610,11 @@ }; } { - name = "terser___terser_5.9.0.tgz"; + name = "terser___terser_5.14.2.tgz"; path = fetchurl { - name = "terser___terser_5.9.0.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz"; - sha512 = "h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ=="; + name = "terser___terser_5.14.2.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz"; + sha512 = "oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA=="; }; } { @@ -10470,7 +10630,7 @@ path = fetchurl { name = "text_table___text_table_0.2.0.tgz"; url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; - sha1 = "f17oI66AUgfACvLfSoTsP8+lcLQ="; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; } { @@ -10486,7 +10646,7 @@ path = fetchurl { name = "through___through_2.3.8.tgz"; url = "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"; - sha1 = "DdTJ/6q8NXlgsbckEV1+Doai4fU="; + sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; }; } { @@ -10494,7 +10654,7 @@ path = fetchurl { name = "timers_browserify___timers_browserify_1.4.2.tgz"; url = "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz"; - sha1 = "ycWLV1voQHN1y14kYtrO50NZ9B0="; + sha512 = "PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q=="; }; } { @@ -10502,7 +10662,7 @@ path = fetchurl { name = "timsort___timsort_0.3.0.tgz"; url = "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz"; - sha1 = "QFQRqOfmM5/mTbmiNN4R3DHgK9Q="; + sha512 = "qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="; }; } { @@ -10542,7 +10702,7 @@ path = fetchurl { name = "to_fast_properties___to_fast_properties_1.0.3.tgz"; url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.3.tgz"; - sha1 = "uDVx+k2MJbguIxsG46MFXeTKGkc="; + sha512 = "lxrWP8ejsq+7E3nNjwYmUBMAgjMTZoTI+sdBOpvNyijeDLa29LUn9QaoXAHv4+Z578hbmHHJKZknzxVtvo77og=="; }; } { @@ -10550,7 +10710,7 @@ path = fetchurl { name = "to_fast_properties___to_fast_properties_2.0.0.tgz"; url = "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "3F5pjL0HkmW8c+A3doGk5Og/YW4="; + sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; }; } { @@ -10590,7 +10750,7 @@ path = fetchurl { name = "trim_right___trim_right_1.0.1.tgz"; url = "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz"; - sha1 = "yy4SAwZ+DI3h9hQJS5/kVwTqYAM="; + sha512 = "WZGXGstmCWgeevgTL54hrCuw1dyMQIzWy7ZfqRJfSmJZBwklI15egmQytFP6bPidmw3M8d5yEowl1niq4vmqZw=="; }; } { @@ -10610,27 +10770,35 @@ }; } { - name = "ttf2eot___ttf2eot_2.0.0.tgz"; + name = "tslib___tslib_2.4.0.tgz"; path = fetchurl { - name = "ttf2eot___ttf2eot_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-2.0.0.tgz"; - sha1 = "jmM3pYWr0WCKDISVirSDzmn2ZUs="; + name = "tslib___tslib_2.4.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz"; + sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; }; } { - name = "ttf2woff2___ttf2woff2_4.0.4.tgz"; + name = "ttf2eot___ttf2eot_3.1.0.tgz"; path = fetchurl { - name = "ttf2woff2___ttf2woff2_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.4.tgz"; - sha512 = "pdt/q89D6VmWToUkiwrUo/OrQtmHGr2iBl3GQriHE6xq0cnteb8gJF8UitOdXmFTX8ajKgb3HMGKpKAsCJM61g=="; + name = "ttf2eot___ttf2eot_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/ttf2eot/-/ttf2eot-3.1.0.tgz"; + sha512 = "aHTbcYosNHVqb2Qtt9Xfta77ae/5y0VfdwNLUS6sGBeGr22cX2JDMo/i5h3uuOf+FAD3akYOr17+fYd5NK8aXw=="; }; } { - name = "ttf2woff___ttf2woff_2.0.2.tgz"; + name = "ttf2woff2___ttf2woff2_4.0.5.tgz"; path = fetchurl { - name = "ttf2woff___ttf2woff_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-2.0.2.tgz"; - sha512 = "X68badwBjAy/+itU49scLjXUL094up+rHuYk+YAOTTBYSUMOmLZ7VyhZJuqQESj1gnyLAC2/5V8Euv+mExmyPA=="; + name = "ttf2woff2___ttf2woff2_4.0.5.tgz"; + url = "https://registry.yarnpkg.com/ttf2woff2/-/ttf2woff2-4.0.5.tgz"; + sha512 = "zpoU0NopfjoyVqkFeQ722SyKk/n607mm5OHxuDS/wCCSy82B8H3hHXrezftA2KMbKqfJIjie2lsJHdvPnBGbsw=="; + }; + } + { + name = "ttf2woff___ttf2woff_3.0.0.tgz"; + path = fetchurl { + name = "ttf2woff___ttf2woff_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/ttf2woff/-/ttf2woff-3.0.0.tgz"; + sha512 = "OvmFcj70PhmAsVQKfC15XoKH55cRWuaRzvr2fpTNhTNer6JBpG8n6vOhRrIgxMjcikyYt88xqYXMMVapJ4Rjvg=="; }; } { @@ -10678,7 +10846,7 @@ path = fetchurl { name = "typedarray___typedarray_0.0.6.tgz"; url = "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "hnrHTjhkGHsdPUfZlqeOxciDB3c="; + sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; } { @@ -10698,11 +10866,11 @@ }; } { - name = "uglify_js___uglify_js_3.14.3.tgz"; + name = "uglify_js___uglify_js_3.16.2.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.14.3.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.3.tgz"; - sha512 = "mic3aOdiq01DuSVx0TseaEzMIVqebMZ0Z3vaeDhFEh9bsc24hV1TFvN74reA2vs08D0ZWfNjAcJ3UbVLaBss+g=="; + name = "uglify_js___uglify_js_3.16.2.tgz"; + url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.16.2.tgz"; + sha512 = "AaQNokTNgExWrkEYA24BTNMSjyqEXPSfhqoS0AxmHkCJ4U+Dyy5AvbGV/sqxuxficEfGGoX3zWw9R7QpLFfEsg=="; }; } { @@ -10726,7 +10894,7 @@ path = fetchurl { name = "unc_path_regex___unc_path_regex_0.1.2.tgz"; url = "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz"; - sha1 = "5z3T17DXxe2G+6xrCufYxqadUPo="; + sha512 = "eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg=="; }; } { @@ -10814,7 +10982,7 @@ path = fetchurl { name = "uniqs___uniqs_2.0.0.tgz"; url = "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz"; - sha1 = "/+3ks2slKQaW5uFl1KWe25mOawI="; + sha512 = "mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ=="; }; } { @@ -10846,7 +11014,7 @@ path = fetchurl { name = "unpipe___unpipe_1.0.0.tgz"; url = "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "sr9O6FFKrmFltIF4KdIbLvSZBOw="; + sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; }; } { @@ -10878,7 +11046,7 @@ path = fetchurl { name = "url___url_0.11.0.tgz"; url = "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz"; - sha1 = "ODjpfPxgUh63PFJajlW/3Z4uKPE="; + sha512 = "kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ=="; }; } { @@ -10886,7 +11054,7 @@ path = fetchurl { name = "util_deprecate___util_deprecate_1.0.2.tgz"; url = "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; } { @@ -10894,7 +11062,7 @@ path = fetchurl { name = "util___util_0.10.3.tgz"; url = "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz"; - sha1 = "evsa/lCAUkZInj23/g7TeTNqwPk="; + sha512 = "5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ=="; }; } { @@ -10910,7 +11078,7 @@ path = fetchurl { name = "utils_merge___utils_merge_1.0.1.tgz"; url = "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "n5VxD1CiZ5R7LMwSR0HBAoQn5xM="; + sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; }; } { @@ -10934,7 +11102,7 @@ path = fetchurl { name = "valid_filename___valid_filename_2.0.1.tgz"; url = "https://registry.yarnpkg.com/valid-filename/-/valid-filename-2.0.1.tgz"; - sha1 = "B2jW82Sx7TvfaPDRWr/7DZ1s7K8="; + sha512 = "7eF/iUZ5SPd3FighoKgatSjXDJ25Vopo/6yvEKGyX4FIeZVHcLjHmyvbQ1WdFD9RQZ9PoBA7nrSxxAz/oC64SQ=="; }; } { @@ -10958,7 +11126,7 @@ path = fetchurl { name = "varstream___varstream_0.3.2.tgz"; url = "https://registry.yarnpkg.com/varstream/-/varstream-0.3.2.tgz"; - sha1 = "GKxklHZfP/GjWtmkvgU77BiKXeE="; + sha512 = "OpR3Usr9dGZZbDttlTxdviGdxiURI0prX68+DuaN/JfIDbK9ZOmREKM6PgmelsejMnhgjXmEEEgf+E4NbsSqMg=="; }; } { @@ -10966,7 +11134,7 @@ path = fetchurl { name = "vary___vary_1.1.2.tgz"; url = "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"; - sha1 = "IpnwLG3tMNSllhsLn3RSShj2NPw="; + sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; }; } { @@ -10990,7 +11158,7 @@ path = fetchurl { name = "void_elements___void_elements_2.0.1.tgz"; url = "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz"; - sha1 = "wGavtYK7HLQSjWDqkjkulNXp2+w="; + sha512 = "qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung=="; }; } { @@ -11018,11 +11186,11 @@ ''; } { - name = "webfonts_loader___webfonts_loader_7.3.0.tgz"; + name = "webfonts_loader___webfonts_loader_7.5.2.tgz"; path = fetchurl { - name = "webfonts_loader___webfonts_loader_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/webfonts-loader/-/webfonts-loader-7.3.0.tgz"; - sha512 = "vnqy8inrc5mvVXmyehCAZLy+yW1ir9MerPmklt3+2BL5f1QiD1HXtC/owyoQbjlWE6XAN+ev3JCJzaMoC+nuJg=="; + name = "webfonts_loader___webfonts_loader_7.5.2.tgz"; + url = "https://registry.yarnpkg.com/webfonts-loader/-/webfonts-loader-7.5.2.tgz"; + sha512 = "XUCqaPZwWrQyTk7zWuHnxVy+ZDdKexAqPJm02dpQwN/zIaHdsGFohLVb09onRRsHRai49b7SZLDVaTxJY8wLsA=="; }; } { @@ -11062,7 +11230,7 @@ path = fetchurl { name = "webpack_sources___webpack_sources_0.2.3.tgz"; url = "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz"; - sha1 = "F8Yr+vE8cH+dAsR54Nzd6DgGl/s="; + sha512 = "iqanNZjOHLdPn/R0e/nKVn90dm4IsUMxKam0MZD1btWhFub/Cdo1nWdMio6yEqBc0F8mEieOjc+jfBSXwna94Q=="; }; } { @@ -11158,7 +11326,7 @@ path = fetchurl { name = "wordwrap___wordwrap_1.0.0.tgz"; url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "J1hIEIkUVqQXHI0CJkQa3pDLyus="; + sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q=="; }; } { @@ -11174,7 +11342,7 @@ path = fetchurl { name = "wrappy___wrappy_1.0.2.tgz"; url = "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "tSQ9jz7BqjXxNkYFvA0QNuMKtp8="; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; } { @@ -11193,14 +11361,6 @@ sha512 = "wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA=="; }; } - { - name = "xmldom___xmldom_0.5.0.tgz"; - path = fetchurl { - name = "xmldom___xmldom_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz"; - sha512 = "Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="; - }; - } { name = "xmlhttprequest_ssl___xmlhttprequest_ssl_2.0.0.tgz"; path = fetchurl { @@ -11290,11 +11450,11 @@ }; } { - name = "yarn_audit_html___yarn_audit_html_3.0.1.tgz"; + name = "yarn_audit_html___yarn_audit_html_4.0.0.tgz"; path = fetchurl { - name = "yarn_audit_html___yarn_audit_html_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-3.0.1.tgz"; - sha512 = "tdtbJyKD7lhGS3f1df/boxhNrnEfmjVCyjHGc/9WebZ3gHvF/dxyLDPOzio1vpJRczaYqW3WVF6M1Srgt1O2yQ=="; + name = "yarn_audit_html___yarn_audit_html_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-4.0.0.tgz"; + sha512 = "PZW+M6b6BW4hBU6AuUnxFSOVOq6Gnrh+krBdzcX3OjWNqiDh8ovhiB6pTYEeR13jL8J9VXk/1POn2XljicWZNA=="; }; } { @@ -11302,7 +11462,7 @@ path = fetchurl { name = "yeast___yeast_0.1.2.tgz"; url = "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz"; - sha1 = "AI4G2AlDIMNy28L47XagymyKxBk="; + sha512 = "8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg=="; }; } { diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index 6f907badde..fd180d4e99 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.12.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XR6HhMu5AN1vkR3YtDlogTN9/aEExFQtATyKUqWjyAM="; + sha256 = "sha256-O5q+T6GO03Wf26CLyEgS45h7O38HsVZ+EJi8TgFcNaI="; }; - cargoSha256 = "sha256-U1ewV/t66jrFRMdu5ddPWyg08C2IGFr6rudPFRIkPsg="; + cargoSha256 = "sha256-JZsDKeiF/Mg4P6dLaN+8+TLHnCsB97d9TDn4cSdzZZE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix index cecb05b06f..49f7ee8835 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/data.nix @@ -1,60 +1,60 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.35.2"; + version = "3.37.2"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-linux-x64.tar.gz"; - sha256 = "0139r4l80i9mww7bjqk2j04lll0hl9xkc0irqq4ly65py6g3hh60"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-linux-x64.tar.gz"; + sha256 = "0zdln1zw92brg17dbcwms3ak3sigj1s3x52vk41maqikxcjza1k5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-linux-amd64.tar.gz"; - sha256 = "0slbk34mx8bkvadlddi32j7pml3576gx0y8rjrsbgpy6xd6a4v5j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-linux-amd64.tar.gz"; + sha256 = "1zyd967mgk2bk7kazj6ds4yqmnpc3nh3j40a4zlrjpj03njjmv9i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-linux-amd64.tar.gz"; - sha256 = "1xsrskiw91izjvj1xqfhaf4728vl28wcq4dsinh232g7gfm862r3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-linux-amd64.tar.gz"; + sha256 = "0anmkwqwwnk44069d01crrj3y73nrwa5hknxc8fh3x1vwc2jzvfc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-linux-amd64.tar.gz"; - sha256 = "0vxcc3hh3vqhfn6gx8fwarxiyah3yk86hza88p04qhymwfay0fry"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-linux-amd64.tar.gz"; + sha256 = "1by8qg9yrm2l0i7hkmgan26hhcjjvbyifyhfcq69d32n20i32ksv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-linux-amd64.tar.gz"; - sha256 = "05a9vf1g9nnvwmsm6y5rn0b0asjb253b7mph137g08m12ajm2fxv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-linux-amd64.tar.gz"; + sha256 = "1wjk0033xh1nhq2b76nsxb43jfraf1jm257m3z1gqzyqpjnpc2cp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.9.0-linux-amd64.tar.gz"; - sha256 = "01sgghfnd6wgvx2h4i69asbjshscbw9g4yl15ar5w178dp17p44n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-linux-amd64.tar.gz"; + sha256 = "18ds6znrr96qhg01c3ldk5l5a16d6f09gn1h2ln3lhxygxjjjzda"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-linux-amd64.tar.gz"; - sha256 = "0zwqyhhkhblg1bf7ywsy0r6z85wf07vsdw4za19x7pwgjyairg2w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-linux-amd64.tar.gz"; + sha256 = "1fcvi8ms400qlmgzcniw5pvj46si2rk4jzn57vr5a96qyy1qrpsy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-linux-amd64.tar.gz"; - sha256 = "1zjkgdx03zf55w9akw7ddscvk3agzhdsdjpkiq0irhjyf8ycf43q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-linux-amd64.tar.gz"; + sha256 = "0ail3jy9msc8ximkm1i47zca36vrrw99p9qsnp37gp9y6nr2z65y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-amd64.tar.gz"; - sha256 = "1z8f287mm2mqfa76021fp5a1bj9045iwxcy8xs1ygh48b1890j49"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-linux-amd64.tar.gz"; + sha256 = "01i43wi9h5693px5mvg55xim6hbf85nzi1maz0p7ys5sicglzng4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-linux-amd64.tar.gz"; - sha256 = "0lz9nv12a3ppazs9hlvn4pfpbh4lhbrq81wmghx12brd6pv5l22g"; + 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-cloudflare-v4.8.0-linux-amd64.tar.gz"; - sha256 = "1pvczhjhwabfr00nab0x7liyciwbgg7lgb90z9jf3g2pxrlnf6z0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-linux-amd64.tar.gz"; + sha256 = "0fhbp72nr3pjzkw3iq495h1p7lp6h02rw8hbnm0jqlz32i68z07b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-amd64.tar.gz"; sha256 = "0a5nav53dg3j4rrx7747a7bk90krfg9fxj0kw0wahcnjijbv1255"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.9.0-linux-amd64.tar.gz"; - sha256 = "1gypzjjdadw4cpzxz77h06l2fjq9arddh22m1ibp9bwy8ql9k0kq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.10.0-linux-amd64.tar.gz"; + sha256 = "1y9kpr1kafjp8hvrvpx0mp6i23sf2m5f229kw5hr1h718pnkymwc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-linux-amd64.tar.gz"; @@ -69,32 +69,32 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.4-linux-amd64.tar.gz"; - sha256 = "0qi0gz3dylmcm4wj5ld79ris9lvq00fx54vds36q8wwikawyil00"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.0.0-linux-amd64.tar.gz"; + sha256 = "1f2ivpqd6vhwq6pz1gh69fdzh7qh4sicnlwmmqspvw5wl1zxi42p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-linux-amd64.tar.gz"; - sha256 = "18zljx3fhkaai04h49j10vyczgl1wpzjai7qs6xk3vx1zpmmddlm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-linux-amd64.tar.gz"; + sha256 = "0y07fifkgnxdl9fqvx9y5mm19fkkp7gfv9z7mspn7s9qf1c9bjzz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-linux-amd64.tar.gz"; - sha256 = "0iy324r7l1xca8mpidbhbsqlpxfsl50hmbxxs3bbbf8k3xxcamlm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-linux-amd64.tar.gz"; + sha256 = "0ckwvnidp6n7rvccs36966fab0mg6rk5y0ip7l806r7bx7w61aaj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-linux-amd64.tar.gz"; - sha256 = "17v460kbghvrvhxgckzg2bq556amy5hwmks4m1idkcz8akh6vlni"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-linux-amd64.tar.gz"; + sha256 = "0fhwi0d136zmppcq1mbf8hnsk9l28vk1qs30fs2p045qdadbzjg9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.20.0-linux-amd64.tar.gz"; - sha256 = "0lbda2cdbn5jhivydxh8fgwxjnmdr8hskdh3hm1ss095kq56b8i9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-linux-amd64.tar.gz"; + sha256 = "17lr9cf0fgw063y9zx87m54h8fzq0iiagm8b90264csdk2gppqdq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-linux-amd64.tar.gz"; - sha256 = "1gfiiwgb51ylwns3mqgnbgm2knrdzvy9r9v23yx0z03ba189d3m9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-linux-amd64.tar.gz"; + sha256 = "1af284q58vvrzny91f0x3cmam5nwipvcpn6m4sxvyb8a35h08w4d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-linux-amd64.tar.gz"; - sha256 = "1d355rsp56npfgdkyzmpr8702lgdnc92f2k7r2ajfqp26ga1hmhk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-linux-amd64.tar.gz"; + sha256 = "192f1nn5xyfld26llcg11708bgc1dfq0nsl90cgywy05fx65p1py"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-linux-amd64.tar.gz"; @@ -117,24 +117,24 @@ sha256 = "08wyx9j5q9pn1jya849wg35v2d7kagzj77h8qr94j8w7agf6ds2a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.0-linux-amd64.tar.gz"; - sha256 = "0h3a9nywj0a3ib425274nf19xb9bmk012w1kjv240hnhcnrgg1kp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-linux-amd64.tar.gz"; + sha256 = "1jk6kjqkm1x1jmx3bfsskirk6if97c5pg0b0jxn0v36j09x6k3as"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-linux-amd64.tar.gz"; - sha256 = "1i32f640iwzmqmvwyzb9grbdypcgi4m7jj23w8yb4m0cyryf221q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-linux-amd64.tar.gz"; + sha256 = "0n1chk9dnr8yrbfgcvhgfd6cl7yqh8cvwflwrcr5k7lym6hnd06b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-linux-amd64.tar.gz"; - sha256 = "1q7dqly6cz4vdsjlq522i2dgyb4nl1321jrx5jqxpcrsix5m83wz"; + 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-sumologic-v0.7.1-linux-amd64.tar.gz"; sha256 = "0p1vh1hp90niqdr3scmh4pwb177lv6d3nqp6apcjabsg5w5nmim9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-linux-amd64.tar.gz"; - sha256 = "1bmvxcwqgc2861zkrkfdasxr03ppbh7ffavh1agw53c8vy0f2shk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-linux-amd64.tar.gz"; + sha256 = "1xmndvg43gqbml5m5a8ky7ymkpkwbif4gxq2af3vvdi9gpn38biq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-linux-amd64.tar.gz"; @@ -163,56 +163,56 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-darwin-x64.tar.gz"; - sha256 = "1qcqc0lsb1wdgn203kj4z86blqwkcxfx7wijznfvvpjd4rg4k0wx"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-darwin-x64.tar.gz"; + sha256 = "1z0s2wnspfgcn5qhfi40mrjlw59cv1kq5a86nrf4lg42rr04kk43"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-darwin-amd64.tar.gz"; - sha256 = "1dhbqwy991h5h6w5zj3m0wbf99gvk8q4ykzc7ws0cbfk6szy052w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-darwin-amd64.tar.gz"; + sha256 = "0pd34fs95vml7a87zvdb2ap476bd8mh0qgy0p0ppcv50yv3jwp79"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-darwin-amd64.tar.gz"; - sha256 = "0xnlj48lgjhb3cf0yp958j7js5akxygd6034r4fa26kzhqq6rnl6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-darwin-amd64.tar.gz"; + sha256 = "156qwg2isv1dflij4y1w3kb31wkn3g0q0ajcy753d7vn8dmwycxr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-darwin-amd64.tar.gz"; - sha256 = "1dnr6b8md6chip5smhzx3i8b3av3n1qlvv8jdas2yxlsynj3vf3s"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-darwin-amd64.tar.gz"; + sha256 = "0yp1akw598c6p3997d0j7c7a1qc1qczjd0r5lr2krkqdak4vzfzn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-darwin-amd64.tar.gz"; - sha256 = "1clh35pm87bbad49m8gb7ycbzxvncjpdqy8rsjm7kg99dywwm4yd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-darwin-amd64.tar.gz"; + sha256 = "0cmnwx65s345775zwkmnkl8wr9cjc9iwmylsmjxn4jyqvy22jhj5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.9.0-darwin-amd64.tar.gz"; - sha256 = "0fxr55qdll5bxx5hz80na2zhcfds231kycbpd7ahsxf3yfvwppm9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-darwin-amd64.tar.gz"; + sha256 = "1vxmvfdybi6pp3czqwkhcvr63n5pym4x44sbzhhs4i8mj3m5sfrr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-darwin-amd64.tar.gz"; - sha256 = "1m2nyxq0cvj7rzy46nd9arg6rj0p7palpg6yj0730p73cpszmpwm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-darwin-amd64.tar.gz"; + sha256 = "1vmvqr07k865wizw4z9zcrs40s3rfa46nk0imisg51hyajp7gf9b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-darwin-amd64.tar.gz"; - sha256 = "1np3hq3hmdxgbz86mp2cihyyp2b1ax8d9wv994q1ahvkv74bapdz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-darwin-amd64.tar.gz"; + sha256 = "14j2xn6kaw5rm3fcxb6v29b78sgfq7drqi2clnag6b3iggq4spji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-amd64.tar.gz"; - sha256 = "1shc7m4xlsmcjnrlbi2jyvmnvf9bg1cs6knfkl82jfs65ya5iidf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-darwin-amd64.tar.gz"; + sha256 = "0575vcgz00i72ip45y98ikrvqlry8rchwypdiynd0bagfpj297jz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-darwin-amd64.tar.gz"; - sha256 = "1r71n40wif8rb4gzfy2k7bzafpsfl9vabfvj4s08d0k1pqbv9pz9"; + 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-cloudflare-v4.8.0-darwin-amd64.tar.gz"; - sha256 = "19mj3bfiadlmfd606pa98n4wk02816n0l5klp08hdl7nzhq4s46z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-darwin-amd64.tar.gz"; + sha256 = "0ipfaq8bv4z63krrbday20nv5968k3gs8srkj9vfaw8nmzf6p4n5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-amd64.tar.gz"; sha256 = "0pvq5mwl8scsyvkqgy32v1qs4060w0m12z0f1cw0aw34wd3zs67a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.9.0-darwin-amd64.tar.gz"; - sha256 = "00gnqfbmqa731n0g6qzvhkq240x7pbfqh6hppprrzxcxr4i25qkh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.10.0-darwin-amd64.tar.gz"; + sha256 = "097357wf3bcywyy46y6prl2q4dcfdhm299hhfjvn3vv610a04c3d"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-darwin-amd64.tar.gz"; @@ -227,32 +227,32 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.4-darwin-amd64.tar.gz"; - sha256 = "0zjap38frc6d5r2y7a4k5arvdc9fhh4bnr0swzqm5k9vxza3vfq8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.0.0-darwin-amd64.tar.gz"; + sha256 = "0mq9xak9m6qw6wzd33b20dapqandi23hid79ysry179p8hjg0dgy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-darwin-amd64.tar.gz"; - sha256 = "0aq09v80rbha7qzrl0kh7wmqf8g8pfvgy4id28gbd9ln40xs6dnv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-darwin-amd64.tar.gz"; + sha256 = "00hcah3rjd4x7xi2alpxd1f1bx380ipcmqdwvig81cr6bq3mpfr3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-darwin-amd64.tar.gz"; - sha256 = "057q1cxcs0iwrmxps8x87zvjbp2ms56pwmfjl0kz12gr2rzzavab"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-darwin-amd64.tar.gz"; + sha256 = "0nfa7ygc39g7ayl1gl3kazmhdxmjq8g41ql8vxqcxv6zp5d6b32l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-darwin-amd64.tar.gz"; - sha256 = "08b6p6gliay66bd7687kjc9n3n7xdgbrrcnbjbqi7a3am14mf5p6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-darwin-amd64.tar.gz"; + sha256 = "1s8mk8v5x3z6szdqn9c74cpgfqx46whj2nm78mjbqbs7rh9vgw1f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.20.0-darwin-amd64.tar.gz"; - sha256 = "0vsgjl6hzznh12dwbwqgdb2wdpa4nhhj0kfa1y49553mk8zsymgh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-darwin-amd64.tar.gz"; + sha256 = "084qvn4lwn7ss84sb9c7bxpxal4x65d6y3vgn4hbnvvarsmvn6zs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-darwin-amd64.tar.gz"; - sha256 = "11r73jfqkc0wgdf66zp6pmgq5packlm4dkjp12a00z6l2s4f0w4h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-darwin-amd64.tar.gz"; + sha256 = "0gswf93qapcwc3dv617gjdyhn9w5hhzdcs3w31sqrlzfa2sb790p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-darwin-amd64.tar.gz"; - sha256 = "16rd9v0raxskv6hk5dn9lr3b2vcy9k6f87dda0vsbwx4ssc018yd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-darwin-amd64.tar.gz"; + sha256 = "1ii5sjilczp6bdrz050prg5chbpd49znk1hjzzp2kbsxcf319rsq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-darwin-amd64.tar.gz"; @@ -275,24 +275,24 @@ sha256 = "0d1w1zak2ma701w26va74ahi3lmsjywsk2x84ds4l4mj8ckpl2va"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.0-darwin-amd64.tar.gz"; - sha256 = "043zi2khq6bdp19njw7nz1rkx5ddxx5w51qac7lym7pdfx1pvd4i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-darwin-amd64.tar.gz"; + sha256 = "0s4jpy4csjvqk9l7xjypbnpbnlx53p1sm6pyw5drddah8aaj47vx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-darwin-amd64.tar.gz"; - sha256 = "0zk63fijhkafwhm5qrwn6n3qq0jvz9vqxg0zy8dq96kp141inp0v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-darwin-amd64.tar.gz"; + sha256 = "0nfpqp6yyhyckhz38z4g07g4znj3c738rgd1daprmdyl6yifvi72"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-darwin-amd64.tar.gz"; - sha256 = "0izydcxyk30qrxnbvfqs2y6znyxz64njfalkghqwv8j7fzc5pv5s"; + 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-sumologic-v0.7.1-darwin-amd64.tar.gz"; sha256 = "0y1lcafl477ja9kib00zprz7gamfx821mdj5nyiyjkggwylp0lwl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-darwin-amd64.tar.gz"; - sha256 = "1f2danvjdfqdivw6kjj2jj3qgx5jfjxwc21ziqy8kyzgvqfykxvj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-darwin-amd64.tar.gz"; + sha256 = "0h7jnrflm4p17jgan2i8g3clkrl5arkw7rd1wml80azhi6626qh1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-darwin-amd64.tar.gz"; @@ -321,56 +321,56 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-linux-arm64.tar.gz"; - sha256 = "19pc892kkgccsddnlq4n1cgvfsqciqnba05ypkn4gvxr8rm2xia0"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-linux-arm64.tar.gz"; + sha256 = "10ll8axayljsjkq9lzr34dgii5fjckvdm7pp0wmwdhx2xfh9kmcg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-linux-arm64.tar.gz"; - sha256 = "0y5p6bgs8ngz1fh9695rnz3rciqixkaivqh5j9j0fcklfmr6i6dc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-linux-arm64.tar.gz"; + sha256 = "0ps22ngimrbgh24gm66h0jgs1bfafbizknxbpxrwavyrc26nhgy9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-linux-arm64.tar.gz"; - sha256 = "0vn6rdqfl79p666v2h72dsqgwqfag5k3hh4abb7hdz2kzqrl7l9k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-linux-arm64.tar.gz"; + sha256 = "16jkz0qrp2pvz60388n97bf59idmfv5j0hg0dzp78j1dhpy1aqnn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-linux-arm64.tar.gz"; - sha256 = "0a4daij35nwpqqkn7nr8993x02awas36jrazfqjc5pnir3nwdp3b"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-linux-arm64.tar.gz"; + sha256 = "1bnsfbqq6gcdkxfz83x7chhi4z760zslvqw1a9nikcsdl54qk5bc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-linux-arm64.tar.gz"; - sha256 = "1i1qnpg722cjj5z208yx2r0yswrir2bqy8fzdgmlwl0ffm8v3f47"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-linux-arm64.tar.gz"; + sha256 = "062f4f6n7x83gi4hzd0ixnqm7yar93hhg53lw4wkmad8c9cq93kv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.9.0-linux-arm64.tar.gz"; - sha256 = "126hqi44avcw21q8niyagb86p191ci78089sfig56irzkykc7gsy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-linux-arm64.tar.gz"; + sha256 = "1vmf5fdv3n6cgwhb4i2mgv445bk4zhzcwxgivpgdnddc5dfy3ixj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-linux-arm64.tar.gz"; - sha256 = "0dag8fnzd0bzc1jakqxr3r3mdhj7196hxmh39wyfkh2wnpxcschd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-linux-arm64.tar.gz"; + sha256 = "0ar7kbxsfn64bx5n8hf11vx3779jklc75c4fy39c2j552k03444m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-linux-arm64.tar.gz"; - sha256 = "1isysrvqc6lh5ikmp3snvny0jldykp0ir7yd5fr7vwn5lmk7a8cw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-linux-arm64.tar.gz"; + sha256 = "01x3milrkkfa8yrbzbh0pild7qn73q6ayr0i4908b9na8ia247dz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-linux-arm64.tar.gz"; - sha256 = "0w55pk3ham08lrg3vq0hg3p23qipz21ln01g61xd0cpl79aysbq4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-linux-arm64.tar.gz"; + sha256 = "1cxnwqkzz725i03pdmxqhlfasja1z5hjf9cxkbwyyhli8zpy3grb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-linux-arm64.tar.gz"; - sha256 = "11v3zggzkpvs8iscd45ng3s0x3959i00rlpfn17sxpvdmcjhs6nr"; + 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-cloudflare-v4.8.0-linux-arm64.tar.gz"; - sha256 = "0xnz9mvvm44msk33zqwxzybgglqnn4gggxcfclg4dqr9vgb6wk7v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-linux-arm64.tar.gz"; + sha256 = "0ikjbbhfb84b2zwm3wi6ffav5dfhgdkr9ks58i3xicrbc3swarfc"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-arm64.tar.gz"; sha256 = "085flnzp062p6ankfl77p1y7n8ijrhmknnb4r46x6b3lrw891pgd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.9.0-linux-arm64.tar.gz"; - sha256 = "01hf8ycb6w3ny3ccfimxj1l96m0jzjp7f1r0xm9an8i59d3wslx8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.10.0-linux-arm64.tar.gz"; + sha256 = "0ykrfa4r7xhjbpbm8mnc2ry58a3h7zynbn8gxnspg0493znx1lva"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-linux-arm64.tar.gz"; @@ -385,32 +385,32 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.4-linux-arm64.tar.gz"; - sha256 = "1w03vj5an0mkb9cawkz94xxj9d2yp2zvr67nnwvmdgaj6kwb9by8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.0.0-linux-arm64.tar.gz"; + sha256 = "0i32s062nmayj5dxl4ridblkz8h7rrvxdid16880m8x992apdrrs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-linux-arm64.tar.gz"; - sha256 = "1if44ng79r16j906hpniwh007ngixm3j7li318xdpshm28hkjiqx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-linux-arm64.tar.gz"; + sha256 = "1cw37b2kwjvnjmaxdn0k0i8dqhl1kksm1nhp3k70349mz3lvrksc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-linux-arm64.tar.gz"; - sha256 = "0sg8wfvh91144h8k4k97zfb63xadvj44qvp4lq823kcr8c37f0bj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-linux-arm64.tar.gz"; + sha256 = "0z94s45rbm42x89dp7a70p2l646sqwvm5wkhaz19mggd8p5d4p01"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-linux-arm64.tar.gz"; - sha256 = "0i6qxrdijf653nj6yqhdikbj3spzzwr5rbgngkc0v7yxkphlzlnj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-linux-arm64.tar.gz"; + sha256 = "1ih70j8qsq8wamj9zdf1fvqj7laadpl2i79gr74k5f3xsf2rgsim"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.20.0-linux-arm64.tar.gz"; - sha256 = "1rnz5cli8q59wwdvadd08kf51nl5rmrlkch9szc3yk92i79kl6wg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-linux-arm64.tar.gz"; + sha256 = "18kkxjgm0ivrbgypk34jajlidslbf1bvlnhlcgjxjwbgl7f48krs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-linux-arm64.tar.gz"; - sha256 = "1vrz3pm14i5zdmk3yibny2sghxk8kzwb2qi77mjbiyfhbvciy97q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-linux-arm64.tar.gz"; + sha256 = "02hmd5kdg34xrvmximxza5n9bb7i14c2d19pr0gf4gx6f6hg8yw2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-linux-arm64.tar.gz"; - sha256 = "1kqyvzd6h8ymwv3j08lcirv9dpnvyj1l7vfxgmxd2yny50jh7vfp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-linux-arm64.tar.gz"; + sha256 = "07gssf982y6plabw951cycwyfi42swkpv8h5044j8avg764fnmpy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-linux-arm64.tar.gz"; @@ -433,24 +433,24 @@ sha256 = "0lky1gchcmjn6nxlasjqviq89hi2k9fi8lx7ac7hy6x6b7wl40sf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.0-linux-arm64.tar.gz"; - sha256 = "13i481a9xj9aw1mi8j3sw4m69kfcaqdl1cj9w4silqwyqk4gzmyd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-linux-arm64.tar.gz"; + sha256 = "0v5kqps6p6b9j8sv9f01i1dx8hsv8mshn45y1km8vm4i6vkcanqc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-linux-arm64.tar.gz"; - sha256 = "0pbjmj6hbwgfcjlc9pvhljvwm5cs2a24gmp4rl30wg7lxrcjgyl3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-linux-arm64.tar.gz"; + sha256 = "0vkik9dghpk8jn07w57023vgfllw9zszl6j5szjfbxd15idq4ihs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-linux-arm64.tar.gz"; - sha256 = "1y99pryvp2jg26s7zivmmpkpw88lxc2r905yv7ffhzb6mfq79zvr"; + 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-sumologic-v0.7.1-linux-arm64.tar.gz"; sha256 = "1fdg6sl2rchmzcsxyfbml33cq34slpf6bbr4s2cx7k2bwfvc8wwl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-linux-arm64.tar.gz"; - sha256 = "170k5xchwm53r7k3483rmv0hbf4nxk31yq7fxz6qfp05yk05d74a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-linux-arm64.tar.gz"; + sha256 = "14mhn1497gnbywk0z5ism303q3d8vd784i28fsf9xbzyhw58ci09"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-linux-arm64.tar.gz"; @@ -479,56 +479,56 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.35.2-darwin-arm64.tar.gz"; - sha256 = "1y4irj8jijm1wpynzihpg4sg6qwiznb4j89cmcfcw8prfzhsxcmh"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.37.2-darwin-arm64.tar.gz"; + sha256 = "1727qhjcpjjbdi9bz1ja3npzkmwrgvl2gpzfky158ywzhjdk7a1b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.0.0-darwin-arm64.tar.gz"; - sha256 = "1g4m9hrdgzczikrzz6b2irx9945k97ckwmg1m5b4ikgi6hxaycx1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.2.0-darwin-arm64.tar.gz"; + sha256 = "0pk2ql1pcnypl3w6ypiq1pz5rxbc8b1h1gsgq0rkz7hf2y4k40m0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v2.9.0-darwin-arm64.tar.gz"; - sha256 = "14qf3y7nz4dd6qf9fq49f90415dn5hcjymm86rmcgyw1w1dkjpqi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v3.0.0-darwin-arm64.tar.gz"; + sha256 = "050p3lizllnszdf9w55wq9dsn8acbvfn5gh0qpyw7kknf67xjz77"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.22.0-darwin-arm64.tar.gz"; - sha256 = "1xiiavc4c6lbgrabfypw1yhmksq0azfwl699yd0pn6vs3daav0n7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.26.0-darwin-arm64.tar.gz"; + sha256 = "0dc6iwzkvlpr64qbmhym477pwrq6zqg8bh9ln4z17vyx6x3apg7n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.3.2-darwin-arm64.tar.gz"; - sha256 = "028h8yqj9xb048hy9j5j2jdgqipfcra5rrwdaa76k0vxhdk7514v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v2.5.0-darwin-arm64.tar.gz"; + sha256 = "1w62rxxjy2f9c7kjqmnlhmahji31ikg8rd89qyfxz07bc55r1cq5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.9.0-darwin-arm64.tar.gz"; - sha256 = "12dx70f5fiy2qvd4cmkxk2ph2dq19sc2a9rxhfxqn1bjjs8ifh2j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v2.11.0-darwin-arm64.tar.gz"; + sha256 = "11xzhm0qpm3xm5qja2vpzn4q782bcc31lqs2jl48rwrh9nhs0crz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.9.2-darwin-arm64.tar.gz"; - sha256 = "0wa2w12xaxpmnbf6gc01kj0dnwdc5bhg9295yskfvwq701g77n3k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.10.0-darwin-arm64.tar.gz"; + sha256 = "0m3m5z3ldnxf44lz0ywjrhkf22hq0bxldrdhm4gpr8kfc2dy354a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.25.0-darwin-arm64.tar.gz"; - sha256 = "12nbwv4y44w8phf2nf30fhn0mgcq8vyw7gj8riaq1ris794mns95"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.14.0-darwin-arm64.tar.gz"; + sha256 = "1jgffcn8cpz9zvzqgylqkj7m5rybxcn9njp440iag403i8hmb34x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.4.0-darwin-arm64.tar.gz"; - sha256 = "0ivwpfhknhyidpafm2347g1pair7vk055ajhhyg631vizx53hrr9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.26.1-darwin-arm64.tar.gz"; + sha256 = "0ib3a6y3c4hlyicv4v2vg5cs88bb34w58yxjffw00ljyxb66csy2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.11.0-darwin-arm64.tar.gz"; - sha256 = "1hacxf3w4jlddvgqxgqi72dj4qwh00xx6kl073kjnyxhvnx9qpnd"; + 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-cloudflare-v4.8.0-darwin-arm64.tar.gz"; - sha256 = "0vhc7ww2phca0b2bn79xjqddp217c38zir6vdhgsg41nxxs081a5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v4.9.0-darwin-arm64.tar.gz"; + sha256 = "0z1c0di0p35hn30di2vv93rzdfzqrswy4gg35ngqq4h1bwn7lszi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-arm64.tar.gz"; sha256 = "11b8dr2ycn3p4k06y2f4pj19hy7zpq0glh8npqixmvn66flp3wa7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.9.0-darwin-arm64.tar.gz"; - sha256 = "0p1zvwi53gxsl13cw3n7iiy9ndcd5v0w8y7i4kshlnjrsxc10x42"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.10.0-darwin-arm64.tar.gz"; + sha256 = "1vgck2nwargd7rrmfgxd2j9qahhalas5fsad8szwj83anxi6r1jn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.14.0-darwin-arm64.tar.gz"; @@ -543,32 +543,32 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v4.0.4-darwin-arm64.tar.gz"; - sha256 = "06m4cn4v6hcqlk7pq50zd8dg5bg4zjh28r3466k532d3jvl99vr9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v5.0.0-darwin-arm64.tar.gz"; + sha256 = "11frjymm7k2lgrdiwjsa5hcak1z3mdjjfmzdz6a0sv84bqlxjj0j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.29.0-darwin-arm64.tar.gz"; - sha256 = "08gna75da1pz7da6kkq9mwm2w549sxini4102fwabyq5ky2kjwnb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.32.0-darwin-arm64.tar.gz"; + sha256 = "0mzw1vgl5c9f1m03j813n68ffmy95hzc27kxslb51cghxgld1pbj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.13.0-darwin-arm64.tar.gz"; - sha256 = "0y37z57bfjw2kkv4m6az3kf6pbsppgha4hskklhhcgfxac7ymc9m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v4.14.0-darwin-arm64.tar.gz"; + sha256 = "1g6zdcdwzpg2xwa275j9alj3vhip2s4sznr79yswgl0hzfmv8xsr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.0-darwin-arm64.tar.gz"; - sha256 = "1gvzjf5mp3iy43srvx3blxfwcg20gqbqvycysnl2p8g8sg3scx5f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v4.7.1-darwin-arm64.tar.gz"; + sha256 = "0nz0frfnrpancc2vd9i263ck0h29p5fs04gjp4lfxcb7hwij8idg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.20.0-darwin-arm64.tar.gz"; - sha256 = "0m8aafbpvg6gkz660b2qa5f3ax4r3aql8j6r8s10d5aga657dqp3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.22.0-darwin-arm64.tar.gz"; + sha256 = "0wbpz9yljwsj4bhi6n39klrpkmirdixi04yhr58m7crmj0if9bki"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.8.0-darwin-arm64.tar.gz"; - sha256 = "058f1j40ar4xh860c3qrm0qaagm69fdmbw14avvrhsmw245cyyzc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.10.0-darwin-arm64.tar.gz"; + sha256 = "0zsr560dc4wz4vhc8nbkd9171l0n926rv80gicg2x54bab1kmd9g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.19.4-darwin-arm64.tar.gz"; - sha256 = "17g9y1riss0ibyxwcxk89q3hi5wszaizwarg77cqajycz9887g37"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v3.20.2-darwin-arm64.tar.gz"; + sha256 = "03yw4lkb818nanjrjd9k0n12fgrx8nj0cqjr6c0sw0xkv1lbfcgb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v3.9.0-darwin-arm64.tar.gz"; @@ -591,24 +591,24 @@ sha256 = "0im3ydgkm4vjia17c03szv1i77jq7abczq0a023k0kw8r3dgd8xc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.0-darwin-arm64.tar.gz"; - sha256 = "1hgqybvag1mlj3hikjgx9pn2hr4r3bag0lv3l9qnjdzkmdcy248j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.8.1-darwin-arm64.tar.gz"; + sha256 = "0gc9zjf41l44d33jj1y4py1m7l6rgs21w1v0a8kjamdxvfabyzv3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.10.0-darwin-arm64.tar.gz"; - sha256 = "05ng5n0lqkc2f8i9vnlm20d2m6hw8in2r3nshmg58hscfzx70iiq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.12.0-darwin-arm64.tar.gz"; + sha256 = "1jmc5d4arkh6x6nc4j0qkms9p9l4vawz1ajwil51xshaj82k2vwg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.21.0-darwin-arm64.tar.gz"; - sha256 = "08cf7265rh8h9qcgdh1agqxqx78fw59kz6081rl81iv4p9bjw1yy"; + 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-sumologic-v0.7.1-darwin-arm64.tar.gz"; sha256 = "1k52qh6z068s2np1gcg7wp8vvw5rig8c877m8x9qq5xy72w3mzgg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.0-darwin-arm64.tar.gz"; - sha256 = "1fwhq1rv5a79zcbkzbgkwn5f2vdqn8fx344j7v03znx0n36qpnl6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.10.2-darwin-arm64.tar.gz"; + sha256 = "19qpzjrdhjqwz0zr0yj4f34fgwwa7r8fm548ymdfx9a6x3k9a1yb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v4.6.0-darwin-arm64.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix index 02e1bb29c0..71c61d7a05 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper }: +{ lib, stdenv, fetchurl, autoPatchelfHook, makeWrapper, installShellFiles }: with lib; @@ -15,13 +15,17 @@ in stdenv.mkDerivation { srcs = map (x: fetchurl x) data.pulumiPkgs.${stdenv.hostPlatform.system}; installPhase = '' - mkdir -p $out/bin - cp * $out/bin/ + install -D -t $out/bin/ * '' + optionalString stdenv.isLinux '' wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" + '' + '' + installShellCompletion --cmd pulumi \ + --bash <($out/bin/pulumi completion bash) \ + --fish <($out/bin/pulumi completion fish) \ + --zsh <($out/bin/pulumi completion zsh) ''; - nativeBuildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = [ installShellFiles ] ++ optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; meta = { homepage = "https://pulumi.io/"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh index 8de0f40c1e..a0e315d4e5 100755 --- a/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh +++ b/third_party/nixpkgs/pkgs/tools/admin/pulumi/update.sh @@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.35.2" +VERSION="3.37.2" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. diff --git a/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock index ff3a8eda88..d5c402330b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/Gemfile.lock @@ -5,19 +5,19 @@ GEM addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) aws-eventstream (1.2.0) - aws-partitions (1.516.0) - aws-sdk-core (3.121.2) + aws-partitions (1.607.0) + aws-sdk-core (3.131.2) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-ec2 (1.271.0) - aws-sdk-core (~> 3, >= 3.121.2) + jmespath (~> 1, >= 1.6.1) + aws-sdk-ec2 (1.322.0) + aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.4.0) + aws-sigv4 (1.5.0) aws-eventstream (~> 1, >= 1.0.2) bindata (2.4.10) - bolt (3.19.0) + bolt (3.24.0) CFPropertyList (~> 2.2) addressable (~> 2.5) aws-sdk-ec2 (~> 1) @@ -28,7 +28,7 @@ GEM logging (~> 2.2) minitar (~> 0.6) net-scp (~> 1.2) - net-ssh (>= 4.0) + net-ssh (>= 4.0, < 7.0) net-ssh-krb (~> 0.5) orchestrator_client (~> 0.5) puppet (>= 6.18.0) @@ -37,25 +37,46 @@ GEM puppetfile-resolver (~> 0.5) r10k (~> 3.10) ruby_smb (~> 1.0) - terminal-table (~> 1.8) + terminal-table (~> 3.0) winrm (~> 2.0) winrm-fs (~> 1.3) builder (3.2.4) colored2 (3.1.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) connection_pool (2.2.5) - cri (2.15.10) - deep_merge (1.2.1) + cri (2.15.11) + deep_merge (1.2.2) erubi (1.10.0) - facter (4.2.5) + facter (4.2.10) hocon (~> 1.3) thor (>= 1.0.1, < 2.0) - faraday (0.17.4) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.14.0) - faraday (>= 0.7.4, < 1.0) + faraday (1.10.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.0) + faraday (~> 1.0) fast_gettext (1.1.2) - ffi (1.15.4) + ffi (1.15.5) gettext (3.2.9) locale (>= 2.0.5) text (>= 1.3.0) @@ -65,27 +86,28 @@ GEM locale gssapi (1.3.1) ffi (>= 1.0.1) - gyoku (1.3.1) + gyoku (1.4.0) builder (>= 2.1.2) - hiera (3.7.0) - hiera-eyaml (3.2.2) + rexml (~> 3.0) + hiera (3.9.0) + hiera-eyaml (3.3.0) highline optimist highline (2.0.3) hocon (1.3.1) httpclient (2.8.3) - jmespath (1.4.0) + jmespath (1.6.1) jwt (2.2.3) little-plugger (1.1.4) locale (2.1.3) log4r (1.1.10) - logging (2.3.0) + logging (2.3.1) little-plugger (~> 1.1) multi_json (~> 1.14) minitar (0.9) molinillo (0.8.0) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.2.3) net-http-persistent (4.0.1) connection_pool (~> 2.2) net-scp (1.2.1) @@ -96,15 +118,15 @@ GEM net-ssh (>= 2.0) nori (2.6.0) optimist (3.0.1) - orchestrator_client (0.5.2) - faraday - net-http-persistent - public_suffix (4.0.6) - puppet (7.12.0) + orchestrator_client (0.6.1) + faraday (~> 1.4) + net-http-persistent (~> 4.0) + public_suffix (4.0.7) + puppet (7.17.0) concurrent-ruby (~> 1.0) deep_merge (~> 1.0) facter (> 2.0.1, < 5) - fast_gettext (~> 1.1) + fast_gettext (>= 1.1, < 3) hiera (>= 3.2.1, < 4) locale (~> 2.1) multi_json (~> 1.10) @@ -113,29 +135,31 @@ GEM semantic_puppet (~> 1.0) puppet-resource_api (1.8.14) hocon (>= 1.0) - puppet-strings (2.8.0) + puppet-strings (2.9.0) rgen yard (~> 0.9.5) - puppet_forge (2.3.4) - faraday (>= 0.9.0, < 0.18.0, != 0.13.1) - faraday_middleware (>= 0.9.0, < 0.15.0) - gettext-setup (~> 0.11) + puppet_forge (3.2.0) + faraday (~> 1.3) + faraday_middleware (~> 1.0) minitar semantic_puppet (~> 1.0) - puppetfile-resolver (0.5.0) + puppetfile-resolver (0.6.1) molinillo (~> 0.6) semantic_puppet (~> 1.0) - r10k (3.12.1) + r10k (3.15.0) colored2 (= 3.1.2) - cri (= 2.15.10) - fast_gettext (~> 1.1.0) - gettext (>= 3.0.2, < 3.3.0) + cri (>= 2.15.10) + fast_gettext (>= 1.1.0, < 3.0.0) + gettext (>= 3.0.2, < 4.0.0) gettext-setup (~> 0.24) jwt (~> 2.2.3) log4r (= 1.1.10) + minitar (~> 0.9) multi_json (~> 1.10) - puppet_forge (~> 2.3.0) + puppet_forge (>= 2.3.0) + rexml (3.2.5) rgen (0.9.0) + ruby2_keywords (0.0.5) ruby_smb (1.1.0) bindata rubyntlm @@ -144,12 +168,13 @@ GEM rubyzip (2.3.2) scanf (1.0.0) semantic_puppet (1.0.4) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) text (1.3.1) - thor (1.1.0) - unicode-display_width (1.8.0) - windows_error (0.1.2) + thor (1.2.1) + unicode-display_width (2.2.0) + webrick (1.7.0) + windows_error (0.1.4) winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) @@ -164,7 +189,8 @@ GEM logging (>= 1.6.1, < 3.0) rubyzip (~> 2.0) winrm (~> 2.0) - yard (0.9.26) + yard (0.9.28) + webrick (~> 1.7.0) PLATFORMS ruby @@ -173,4 +199,4 @@ DEPENDENCIES bolt BUNDLED WITH - 2.1.4 + 2.3.9 diff --git a/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/default.nix index 0ad9dc5ec8..7752ddb280 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/default.nix @@ -1,13 +1,36 @@ -{ bundlerApp, makeWrapper }: +{ lib, bundlerApp, makeWrapper, bundlerUpdateScript, puppet-bolt, testers }: bundlerApp { pname = "bolt"; + gemdir = ./.; exes = [ "bolt" ]; buildInputs = [ makeWrapper ]; + gemConfig.bolt = attrs: { + # scripts in libexec will be executed by remote host, + # so shebangs should remain unchanged + dontPatchShebangs = true; + }; + postBuild = '' # Set BOLT_GEM=1 to remove warning wrapProgram $out/bin/bolt --set BOLT_GEM 1 ''; + + passthru = { + tests.version = testers.testVersion { + package = puppet-bolt; + version = (import ./gemset.nix).bolt.version; + }; + updateScript = bundlerUpdateScript "puppet-bolt"; + }; + + meta = with lib; { + description = "Execute commands remotely over SSH and WinRM"; + homepage = "https://github.com/puppetlabs/bolt"; + license = licenses.asl20; + maintainers = with maintainers; [ uvnikita ]; + platforms = platforms.unix; + }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix b/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix index 12126edfc8..fc02ba3961 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/puppet/puppet-bolt/gemset.nix @@ -25,10 +25,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx44f1hc41712k8fqmzrbpqs2j9yl0msdqcmmfp0pirkbqw6ri0"; + sha256 = "0af0fv57wgnzn4sjbhwd504dina62i60by3npl14ad4bc2aw7pnc"; type = "gem"; }; - version = "1.516.0"; + version = "1.607.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -36,10 +36,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d44wgbzlwc6gb2ql9cayljdwhlvz9byp2grk0n9favb7rq42fwc"; + sha256 = "164abp3cvmvfa2qsgzbxvkafbhwbgn3qwknp0amwmxw5nwvz8p3s"; type = "gem"; }; - version = "3.121.2"; + version = "3.131.2"; }; aws-sdk-ec2 = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k85khm2c53y2sq29c9rg5kmjm1fnw2glgpjsl6hbh8cq3ciaain"; + sha256 = "1c56an4cmvr1ync8pif588b4alvv8zfchna092xjbdzx4ip1yrfg"; type = "gem"; }; - version = "1.271.0"; + version = "1.322.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -58,10 +58,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wh1y79v0s4zgby2m79bnifk65hwf5pvk2yyrxzn2jkjjq8f8fqa"; + sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; bindata = { groups = ["default"]; @@ -79,10 +79,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmknsa10zazwba1mi19awywk14vj0danppx1hqzmmrpp0af98if"; + sha256 = "0jshg2b2j24zgkh2nldwjqxm43dz9val6scxsjvq5kg3bwkdrby8"; type = "gem"; }; - version = "3.19.0"; + version = "3.24.0"; }; builder = { groups = ["default"]; @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + sha256 = "0s4fpn3mqiizpmpy2a24k4v365pv75y50292r8ajrv4i1p5b2k14"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.10"; }; connection_pool = { groups = ["default"]; @@ -139,20 +139,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h45kw2s4bjwgbfsrncs30av0j4zjync3wmcc6lpdnzbcxs7yms2"; + sha256 = "1bhsgnjav94mz5vf3305gxz1g34gm9kxvnrn1dkz530r8bpj0hr5"; type = "gem"; }; - version = "2.15.10"; + version = "2.15.11"; }; deep_merge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q3picw7zx1xdkybmrnhmk2hycxzaa0jv4gqrby1s90dy5n7fmsb"; + sha256 = "0fjn4civid68a3zxnbgyjj6krs3l30dy8b4djpg6fpzrsyix7kl3"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; erubi = { groups = ["default"]; @@ -170,21 +170,122 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mhq4rmyc60ijzw6f6sbphyb76vlwcgbaqyqw6y7wb8qdisn19wc"; + sha256 = "16xwli99vqj5329wzmf0ifzikllrym46scm9xp28syfygsrz39j0"; type = "gem"; }; - version = "4.2.5"; + version = "4.2.10"; }; faraday = { + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00palwawk897p5gypw5wjrh93d4p0xz2yl9w93yicb4kq7amh8d4"; + type = "gem"; + }; + version = "1.10.0"; + }; + faraday-em_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-multipart = { dependencies = ["multipart-post"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "172dirvq89zk57rv42n00rhbc2qwv1w20w4zjm6zvfqz4rdpnrqi"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "0.17.4"; + version = "1.0.4"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-retry = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; }; faraday_middleware = { dependencies = ["faraday"]; @@ -192,10 +293,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc"; + sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; type = "gem"; }; - version = "0.14.0"; + version = "1.2.0"; }; fast_gettext = { groups = ["default"]; @@ -212,10 +313,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; type = "gem"; }; - version = "1.15.4"; + version = "1.15.5"; }; gettext = { dependencies = ["locale" "text"]; @@ -251,25 +352,25 @@ version = "1.3.1"; }; gyoku = { - dependencies = ["builder"]; + dependencies = ["builder" "rexml"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; + sha256 = "1kd2q59xpm39hpvmmvyi6g3f1fr05xjbnxwkrdqz4xy7hirqi79q"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; hiera = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g1bagbb4lvs334gpqyylvcrs7h6q2kn1h162dnvhzqa4rzxap8a"; + sha256 = "01kh882rp9xdy2cx2avax79ywpfxqhnwsn05cxwyiqrhfkk36p4x"; type = "gem"; }; - version = "3.7.0"; + version = "3.9.0"; }; hiera-eyaml = { dependencies = ["highline" "optimist"]; @@ -277,10 +378,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fqn73wdh0ar63f863bda3wj1ii5p8gc3vqzv39l2cwkax6vcqgj"; + sha256 = "1iydhxavcniprqly7ad8c2413jwvrdf7zjmzl3xxlnkmq9900zf9"; type = "gem"; }; - version = "3.2.2"; + version = "3.3.0"; }; highline = { groups = ["default"]; @@ -317,10 +418,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d4wac0dcd1jf6kc57891glih9w57552zgqswgy74d1xhgnk0ngf"; + sha256 = "1mnvb80cdg7fzdcs3xscv21p28w4igk5sj5m7m81xp8v2ks87jj0"; type = "gem"; }; - version = "1.4.0"; + version = "1.6.1"; }; jwt = { groups = ["default"]; @@ -368,10 +469,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; + sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; minitar = { groups = ["default"]; @@ -408,10 +509,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.3"; }; net-http-persistent = { dependencies = ["connection_pool"]; @@ -482,20 +583,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1a0yd89bflsgn7apai7ar76h39jbk56pbhd86x68wnwfbib32nmc"; + sha256 = "1lfispcl4sr1c7am22j55sj5xvsky422b3bh7645j3n12zqg7pp2"; type = "gem"; }; - version = "0.5.2"; + version = "0.6.1"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xqcgkl7bwws1qrlnmxgh8g4g9m10vg60bhlw40fplninb3ng6d9"; + sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; type = "gem"; }; - version = "4.0.6"; + version = "4.0.7"; }; puppet = { dependencies = ["concurrent-ruby" "deep_merge" "facter" "fast_gettext" "hiera" "locale" "multi_json" "puppet-resource_api" "scanf" "semantic_puppet"]; @@ -503,10 +604,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02d9rqbqlmdbw6zh89zwh27ra6pqspcv5afqbpj1yrvg1k6cliri"; + sha256 = "1lfpmfjc95a7s19h1q0hwjcm6gzgiaxklpayxy32p8c2hzwzjk00"; type = "gem"; }; - version = "7.12.0"; + version = "7.17.0"; }; puppet-resource_api = { dependencies = ["hocon"]; @@ -525,21 +626,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pfxccfyl7i565x95kbaz574scrd5vrrlhx3x5kbcpalps9b06b1"; + sha256 = "0w3rc5swdin44an1l5jgnljv46yflcd2d2zvakd54nvdh0r30ypx"; type = "gem"; }; - version = "2.8.0"; + version = "2.9.0"; }; puppet_forge = { - dependencies = ["faraday" "faraday_middleware" "gettext-setup" "minitar" "semantic_puppet"]; + dependencies = ["faraday" "faraday_middleware" "minitar" "semantic_puppet"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jp9jczc11vxr6y57lxhxxd59vqa763h4qbsbjh1j0yhfagcv877"; + sha256 = "03aaznd1gyf3wpqg34y32zfj2yxf67r85m6zfz05pv9ijizrmdnj"; type = "gem"; }; - version = "2.3.4"; + version = "3.2.0"; }; puppetfile-resolver = { dependencies = ["molinillo" "semantic_puppet"]; @@ -547,21 +648,31 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1npaafsafvi2mhcz76gycnshxwrrqq33fl2493v7grq6jw0bsann"; + sha256 = "0d36nzdlb7gvsikbvkm840qd5xglyph6ry395ynch6g75vlkr5xi"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.1"; }; r10k = { - dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "jwt" "log4r" "multi_json" "puppet_forge"]; + dependencies = ["colored2" "cri" "fast_gettext" "gettext" "gettext-setup" "jwt" "log4r" "minitar" "multi_json" "puppet_forge"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05qwvwgh08g5pw1cxikb7hpg0ia6nisva1gwpj0d9gb9wacml2qh"; + sha256 = "0hdlq01186w9bx270iyyk10w6jccxc4f0dx7kxgg6lnl1rsnkd4i"; type = "gem"; }; - version = "3.12.1"; + version = "3.15.0"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; }; rgen = { groups = ["default"]; @@ -573,6 +684,16 @@ }; version = "0.9.0"; }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; ruby_smb = { dependencies = ["bindata" "rubyntlm" "windows_error"]; groups = ["default"]; @@ -630,10 +751,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1512cngw35hsmhvw4c05rscihc59mnj09m249sm9p3pik831ydqk"; + sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr"; type = "gem"; }; - version = "1.8.0"; + version = "3.0.2"; }; text = { groups = ["default"]; @@ -650,30 +771,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.1"; }; unicode-display_width = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1204c1jx2g89pc25qk5150mk7j5k90692i7ihgfzqnad6qni74h2"; + sha256 = "1nlfck6z986fngp0r74maswmyb1rcksc8xc3mfpw9cj23c3s8zwn"; type = "gem"; }; - version = "1.8.0"; + version = "2.2.0"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; + type = "gem"; + }; + version = "1.7.0"; }; windows_error = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kbcv9j5sc7pvjzf1dkp6h69i6lmj205zyy2arxcfgqg11bsz2kp"; + sha256 = "0zmm2if81ia33hp18h8yrgnpgcdyrxziyf185r0zx8qy7n8mlchl"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.4"; }; winrm = { dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; @@ -698,13 +829,14 @@ version = "1.3.5"; }; yard = { + dependencies = ["webrick"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qzr5j1a1cafv81ib3i51qyl8jnmwdxlqi3kbiraldzpbjh4ln9h"; + sha256 = "0p1if8g9ww6hlpfkphqv3y1z0rbqnnrvb38c5qhnala0f8qpw6yk"; type = "gem"; }; - version = "0.9.26"; + version = "0.9.28"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix b/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix index b1d22d5ee3..f7a8f7ca92 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/realvnc-vnc-viewer/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "realvnc-vnc-viewer"; - version = "6.22.207"; + version = "6.22.515"; src = { "x86_64-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x64.rpm"; - sha256 = "0jybfqj1svkb297ahyp07xf4b8qyb5h1l2kp50a50ivb6flqd3jr"; + sha256 = "1l9kfmb1695pv2v9hm8z5yr7y5yhadbbs61s4yf9ksvvfypzwrpn"; }; "i686-linux" = fetchurl { url = "https://www.realvnc.com/download/file/viewer.files/VNC-Viewer-${version}-Linux-x86.rpm"; - sha256 = "06jmkd474nql6p3hnqwnwj5ac29m2021flnvf44mfhrhaa5wnpz6"; + sha256 = "15fi1siwbsxmy7qi6f8r8ym346a8mx3kqcp9mvwvx39wm3ija6dh"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "VNC remote desktop client software by RealVNC"; homepage = "https://www.realvnc.com/en/connect/download/viewer/"; + mainProgram = "vncviewer"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = { fullName = "VNC Connect End User License Agreement"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix b/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix index 11a18dc199..b8950707de 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/sec/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sec"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "simple-evcorr"; repo = "sec"; rev = version; - sha256 = "sha256-WYSlIRhDBIDaza92VqCQcdMNicuRUX2IKY5CJyhswdI="; + sha256 = "sha256-DKbh6q0opf749tbGsDMVuI5G2UV7faCHUfddH3SGOpo="; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix index 8ed36c0290..141496eaa6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.9.0"; + version = "1.10.3"; src = fetchFromGitHub { owner = "stripe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OKCrz+A+y9XmYKsN5wsrcpDeBLMlalVULib/1FCKqhM="; + sha256 = "sha256-jos6SZ2ZkUeWOM0ALlsc5a+5kcullNF/2AknTQpRnIc="; }; vendorSha256 = "sha256-1c+YtfRy1ey0z117YHHkrCnpb7g+DmM+LR1rjn1YwMQ="; diff --git a/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix index 907516ce36..43d370e6c9 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trinsic-cli/default.nix @@ -2,11 +2,11 @@ rustPlatform.buildRustPackage rec { pname = "trinsic-cli"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/trinsic-id/sdk/releases/download/v${version}/trinsic-cli-vendor-${version}.tar.gz"; - sha256 = "sha256-Z9orGhxbu/ehyaYhY35lYWcZQWNVk+zLSoqwAZwnpLY="; + sha256 = "sha256-lLfsZXVecXisiTyZqbWB7hbn4iQOTsrQxe7F+YnCSFU="; }; cargoVendorDir = "vendor"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index 6515088c39..64a1f901be 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "trivy"; - version = "0.29.2"; + version = "0.30.4"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IZ94kYnZ1iNX4sgYF/XvRNvycXJ4fNmRwFgSpYcSopU="; + sha256 = "sha256-sdGRZ0ljNnb5esXKqtheHbsEimCbN9JPaY8nNNdQhg4="; }; - vendorSha256 = "sha256-C1dOeVt+ocqj3s3tSXn8B/vHTRRWj8XU5RWmlQ0lZdA="; + vendorSha256 = "sha256-GJobvLi73Ucpi8iO8vJxiRBFB3/OouZUKhmY/VkQjNY="; excludedPackages = "misc"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix b/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix index b47560c44b..45f897afbe 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/uacme/default.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "uacme"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "ndilieto"; repo = "uacme"; rev = "v${version}"; - hash = "sha256-QCI34B/C4vZ3hNnp06NIScY03RTZ0EZBl2HPnQjjtnc="; + hash = "sha256-mbH5Z/ieV4fiLCLWag1aLPNA89sexd5upNF3KHTfhKM="; }; configureFlags = [ "--with-openssl" ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix b/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix index 628377d7f6..f215deacac 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wander"; - version = "0.5.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B+mMC5XGUTNTcxwKhvSSc7QbsLkg8qu7/jJf5U/q6s8="; + sha256 = "sha256-aQqJDUDYHoUZ6ixnY3lmFOx29QpRRke5XHFIpsA+Bnw="; }; - vendorSha256 = "sha256-gWQ8GbtghhCRq6tOU6qmWBuponmfUkUDAk3+dPtmMiE="; + vendorSha256 = "sha256-T+URnRLumXFz48go9TN0Wha99T03OWGfDK7cQ+zKeRI="; meta = with lib; { description = "Terminal app/TUI for HashiCorp Nomad"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix b/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix index 24f28dbd27..27e41c0302 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/winbox/default.nix @@ -14,15 +14,15 @@ let inherit (lib) last splitString; pname = "winbox"; - version = "3.35"; + version = "3.37"; name = "${pname}-${version}"; executable = fetchurl (if use64 then { - url = "https://download.mikrotik.com/winbox/${version}/${pname}64.exe"; - sha256 = "0jigjs4paci6h897hl1046ks5f812jfb2ihnp78lbah0294shjnj"; + url = "https://download.mikrotik.com/winbox/${version}/winbox64.exe"; + sha256 = "0fbl0i5ga9afg8mklm9xqidcr388sca00slj401npwh9b3j9drmb"; } else { - url = "https://download.mikrotik.com/winbox/${version}/${pname}.exe"; - sha256 = "1a3cjhvh2z4n767aqqkv3a7wlda34ssgx9acigdcszgvbksbav1f"; + url = "https://download.mikrotik.com/winbox/${version}/winbox.exe"; + sha256 = "1zla30bc755x5gfv9ff1bgjvpsjmg2d7jsjxnwwy679fry4n4cwl"; }); # This is from the winbox AUR package: # https://aur.archlinux.org/cgit/aur.git/tree/winbox64?h=winbox64&id=8edd93792af84e87592e8645ca09e9795931e60e diff --git a/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix index 4f41a09304..150230f775 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/7zz/default.nix @@ -2,9 +2,9 @@ , lib , fetchurl - # Only used for x86/x86_64 + # Only used for Linux's x86/x86_64 , uasm -, useUasm ? stdenv.hostPlatform.isx86 +, useUasm ? (stdenv.isLinux && stdenv.hostPlatform.isx86) # RAR code is under non-free unRAR license # see the meta.license section below for more details @@ -16,23 +16,23 @@ }: let - inherit (stdenv.hostPlatform) system; - platformSuffix = { - aarch64-linux = "_arm64"; - i686-linux = "_x86"; - x86_64-linux = "_x64"; - }.${system} or - (builtins.trace "`platformSuffix` not available for `${system}.` Making a generic `7zz` build." ""); + makefile = { + aarch64-darwin = "../../cmpl_mac_arm64.mak"; + x86_64-darwin = "../../cmpl_mac_x64.mak"; + aarch64-linux = "../../cmpl_gcc_arm64.mak"; + i686-linux = "../../cmpl_gcc_x86.mak"; + x86_64-linux = "../../cmpl_gcc_x64.mak"; + }.${stdenv.hostPlatform.system} or "../../cmpl_gcc.mak"; # generic build in stdenv.mkDerivation rec { pname = "7zz"; - version = "22.00"; + version = "22.01"; src = fetchurl { url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] version}-src.tar.xz"; hash = { - free = "sha256-QzGZgPxHobGwstFfVRtb4V+hqMM7dMIy2/EZcJ2aZe8="; - unfree = "sha256-QJafYB6Gr/Saqgug31zm/Tl89+JoOoS1kbAIHkYe9nU="; + free = "sha256-mp3cFXOEiVptkUdD1+X8XxwoJhBGs+Ns5qk3HBByfLg="; + unfree = "sha256-OTCYcwxwBCOSr4CJF+dllF3CQ33ueq48/MSWbrkg+8U="; }.${if enableUnfree then "unfree" else "free"}; downloadToTemp = (!enableUnfree); # remove the unRAR related code from the src drv @@ -51,27 +51,40 @@ stdenv.mkDerivation rec { ''; }; - sourceRoot = "CPP/7zip/Bundles/Alone2"; + sourceRoot = "."; + + patches = [ ./fix-build-on-darwin.patch ]; + patchFlags = [ "-p0" ]; + + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + "-Wno-deprecated-copy-dtor" + ]; + + inherit makefile; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++" - ] ++ - lib.optionals useUasm [ "MY_ASM=uasm" ] ++ + ] + ++ lib.optionals useUasm [ "MY_ASM=uasm" ] + # We need at minimum 10.13 here because of utimensat, however since + # we need a bump anyway, let's set the same minimum version as the one in + # 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" ]; - - makefile = "../../cmpl_gcc${platformSuffix}.mak"; + ++ lib.optionals (!enableUnfree) [ "DISABLE_RAR_COMPRESS=true" ]; nativeBuildInputs = lib.optionals useUasm [ uasm ]; enableParallelBuilding = true; + preBuild = "cd CPP/7zip/Bundles/Alone2"; + installPhase = '' runHook preInstall - install -Dm555 -t $out/bin b/g${platformSuffix}/7zz + install -Dm555 -t $out/bin b/*/7zz install -Dm444 -t $out/share/doc/${pname} ../../../../DOC/*.txt runHook postInstall @@ -96,7 +109,7 @@ stdenv.mkDerivation rec { # the unRAR compression code is disabled by default lib.optionals enableUnfree [ unfree ]; maintainers = with maintainers; [ anna328p peterhoeg jk ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "7zz"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch b/third_party/nixpkgs/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch new file mode 100644 index 0000000000..9d8ee7f9bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/archivers/7zz/fix-build-on-darwin.patch @@ -0,0 +1,24 @@ +diff -Naur CPP/7zip/Common/FileStreams.cpp CPP/7zip/Common/FileStreams.cpp +--- CPP/7zip/Common/FileStreams.cpp ++++ CPP/7zip/Common/FileStreams.cpp +@@ -12,7 +12,7 @@ + #include + + // for major()/minor(): +-#if defined(__FreeBSD__) || defined(BSD) ++#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) + #include + #else + #include +diff -Naur CPP/7zip/UI/Common/UpdateCallback.cpp CPP/7zip/UI/Common/UpdateCallback.cpp +--- CPP/7zip/UI/Common/UpdateCallback.cpp ++++ CPP/7zip/UI/Common/UpdateCallback.cpp +@@ -9,7 +9,7 @@ + // #include + + // for major()/minor(): +-#if defined(__FreeBSD__) || defined(BSD) ++#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) + #include + #else + #include diff --git a/third_party/nixpkgs/pkgs/tools/archivers/7zz/update.sh b/third_party/nixpkgs/pkgs/tools/archivers/7zz/update.sh index bbc9804799..1a6d38ea60 100755 --- a/third_party/nixpkgs/pkgs/tools/archivers/7zz/update.sh +++ b/third_party/nixpkgs/pkgs/tools/archivers/7zz/update.sh @@ -1,13 +1,14 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p coreutils gnused curl jq +#! nix-shell -i bash -p coreutils gnused curl jq nix-prefetch set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" DRV_DIR="$PWD" OLD_VERSION="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" - -NEW_VERSION="$(curl "https://sourceforge.net/projects/sevenzip/best_release.json" | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)" +# The best_release.json is not always up-to-date +# In those cases you can force the version by calling `./update.sh ` +NEW_VERSION="${1:-$(curl 'https://sourceforge.net/projects/sevenzip/best_release.json' | jq '.platform_releases.linux.filename' -r | cut -d/ -f3)}" echo "comparing versions $OLD_VERSION => $NEW_VERSION" if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then diff --git a/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix index 2f2581f04a..6577d2ee0e 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/unzip/default.nix @@ -42,6 +42,10 @@ stdenv.mkDerivation rec { name = "CVE-2019-13232-3.patch"; sha256 = "1jvs7dkdqs97qnsqc6hk088alhv8j4c638k65dbib9chh40jd7pf"; }) + (fetchurl { + url = "https://sources.debian.org/data/main/u/unzip/6.0-26/debian/patches/06-initialize-the-symlink-flag.patch"; + sha256 = "1h00djdvgjhwfb60wl4qrxbyfsbbnn1qw6l2hkldnif4m8f8r1zj"; + }) ] ++ lib.optional enableNLS (fetchurl { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/unzip/files/unzip-6.0-natspec.patch?id=56bd759df1d0c750a065b8c845e93d5dfa6b549d"; @@ -60,7 +64,10 @@ stdenv.mkDerivation rec { "generic" "D_USE_BZ2=-DUSE_BZIP2" "L_BZ2=-lbz2" - ]; + ] + # `lchmod` is not available on Linux, so we remove it to fix "not supported" errors (when the zip file contains symlinks). + # Alpine (musl) and Debian (glibc) also add this flag. + ++ lib.optionals stdenv.isLinux [ "LOCAL_UNZIP=-DNO_LCHMOD" ]; preConfigure = '' sed -i -e 's@CF="-O3 -Wall -I. -DASM_CRC $(LOC)"@CF="-O3 -Wall -I. -DASM_CRC -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(LOC)"@' unix/Makefile diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index 17b83a0913..b5b484159c 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.06.14"; + version = "2022.08.01"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-dmd0iPRKm5/GNz3VJ9pJgYiCSTENB0ZAOt3rLjujlYs="; + hash = "sha256-qFk/Rij7P17ZlJFjsrW8snp2anCGjqxfytzopIyHLL0="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix index 7927c5859f..968544f279 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/common.nix @@ -23,6 +23,10 @@ , version , pluginOverrides ? { } , disableAllPlugins ? false + + # tests +, runCommand +, beets }@inputs: let inherit (lib) attrNames attrValues concatMap; @@ -63,6 +67,11 @@ python3Packages.buildPythonApplication rec { unidecode ] ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins)); + # see: https://github.com/NixOS/nixpkgs/issues/56943#issuecomment-1131643663 + nativeBuildInputs = [ + gobject-introspection + ]; + buildInputs = [ ] ++ (with gst_all_1; [ gst-plugins-base @@ -137,6 +146,26 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + + passthru.plugins = allPlugins; + + passthru.tests.gstreamer = runCommand "beets-gstreamer-test" { + meta.timeout = 60; + } + '' + set -euo pipefail + export HOME=$(mktemp -d) + mkdir $out + + cat << EOF > $out/config.yaml +replaygain: + backend: gstreamer +EOF + + echo $out/config.yaml + ${beets}/bin/beet -c $out/config.yaml > /dev/null + ''; + meta = with lib; { description = "Music tagger and library organizer"; homepage = "https://beets.io"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/darkice/default.nix b/third_party/nixpkgs/pkgs/tools/audio/darkice/default.nix index bc3bcbe4ef..73c71ee6f1 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/darkice/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/darkice/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://darkice.org/"; description = "Live audio streamer"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ ikervagyok fpletz ]; + maintainers = with lib.maintainers; [ ikervagyok ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix b/third_party/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix index 3a66791932..294b2cc7b9 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/headsetcontrol/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "headsetcontrol"; - version = "2.6"; + version = "2.6.1"; src = fetchFromGitHub { owner = "Sapd"; repo = "HeadsetControl"; rev = version; - sha256 = "0a7zimzi71416pmn6z0l1dn1c2x8p702hkd0k6da9rsznff85a88"; + sha256 = "sha256-SVOcRzR52RYZsk/OWAr1/s+Nm6x48OxG0TF7yQ+Kb94="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/audio/nanotts/default.nix b/third_party/nixpkgs/pkgs/tools/audio/nanotts/default.nix index d05fdf6c52..85f786d208 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/nanotts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/nanotts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt, alsaLib }: +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, popt, alsa-lib }: stdenv.mkDerivation { pname = "nano-tts"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { strictDeps = true; nativeBuildInputs = [ autoconf automake libtool ]; - buildInputs = [ popt alsaLib ]; + buildInputs = [ popt alsa-lib ]; patchPhase = '' substituteInPlace "src/main.cpp" --replace "/usr/share/pico/lang" "$out/share/lang" diff --git a/third_party/nixpkgs/pkgs/tools/audio/volumeicon/default.nix b/third_party/nixpkgs/pkgs/tools/audio/volumeicon/default.nix index 4d726cbd2a..00690d0163 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/volumeicon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/volumeicon/default.nix @@ -1,24 +1,36 @@ -{ pkgs, fetchurl, lib, stdenv, gtk3, pkg-config, intltool, alsa-lib }: +{ fetchFromGitHub, lib, stdenv +, autoreconfHook, intltool, pkg-config +, gtk3, alsa-lib +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "volumeicon"; version = "0.5.1"; - src = fetchurl { - url = "http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.5.1.tar.gz"; - sha256 = "182xl2w8syv6ky2h2bc9imc6ap8pzh0p7rp63hh8nw0xm38c3f14"; + src = fetchFromGitHub { + owner = "Maato"; + repo = "volumeicon"; + rev = version; + hash = "sha256-zYKC7rOoLf08rV4B43TrGNBcXfSBFxWZCe9bQD9JzaA"; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk3 intltool alsa-lib ]; + nativeBuildInputs = [ + autoreconfHook + intltool + pkg-config + ]; + + buildInputs = [ + gtk3 + alsa-lib + ]; meta = with lib; { description = "A lightweight volume control that sits in your systray"; - homepage = "http://softwarebakery.com/maato/volumeicon.html"; - platforms = pkgs.lib.platforms.linux; + homepage = "http://nullwise.com/volumeicon.html"; + platforms = platforms.linux; maintainers = with maintainers; [ bobvanderlinden ]; - license = pkgs.lib.licenses.gpl3; + license = licenses.gpl3; }; - } diff --git a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix index 46f841c8f5..d6ab926c0c 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -19,13 +19,13 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.20"; + version = "0.8.23"; src = fetchFromGitLab { owner = "duplicity"; repo = "duplicity"; rev = "rel.${version}"; - sha256 = "13ghra0myq6h6yx8qli55bh8dg91nf1hpd8l7d7xamgrw6b188sm"; + sha256 = "0my015zc8751smjgbsysmca7hvdm96cjw5zilqn3zq971nmmrksb"; }; patches = [ @@ -35,13 +35,6 @@ pythonPackages.buildPythonApplication rec { # Our Python infrastructure runs test in installCheckPhase so we need # to make the testing code stop assuming it is run from the source directory. ./use-installed-scripts-in-test.patch - - # https://gitlab.com/duplicity/duplicity/-/merge_requests/64 - # remove on next release - (fetchpatch { - url = "https://gitlab.com/duplicity/duplicity/-/commit/5c229a9b42f67257c747fbc0022c698fec405bbc.patch"; - sha256 = "05v931rnawfv11cyxj8gykmal8rj5vq2ksdysyr2mb4sl81mi7v0"; - }) ] ++ lib.optionals stdenv.isLinux [ # Broken on Linux in Nix' build environment ./linux-disable-timezone-test.patch diff --git a/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix b/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix index 3b7e0a9a60..c904a49cd4 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/grab-site/default.nix @@ -18,13 +18,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "grab-site"; - version = "2.2.2"; + version = "2.2.7"; src = fetchFromGitHub { rev = version; owner = "ArchiveTeam"; repo = "grab-site"; - sha256 = "0af53g703kqpxa6bn72mb2l5l0qrjknq5wqwl4wryyscdp4xabx4"; + sha256 = "sha256-tf8GyFjya3+TVc2VjlY6ztfjCJgof6tg4an18pz+Ig8="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix index 85e9ac6f36..4caafcae67 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/percona-xtrabackup/generic.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { "-DWITH_ZLIB=system" "-DWITH_VALGRIND=ON" "-DWITH_MAN_PAGES=OFF" - "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build. ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix index 6a0f1d2d00..9208e286c9 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueberry/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "blueberry"; - version = "1.4.7"; + version = "1.4.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-ziAdLFSZS8bh+OBSYLqxJ3g7mgFai/psvlBw3Qt17w0="; + sha256 = "sha256-MyIjcTyKn1aC2th6fCOw4cIqrRKatk2s4QD5R9cm83A="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools - cinnamon.xapps + cinnamon.xapp gnome.gnome-bluetooth_1_0 python3Packages.python util-linux diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix index 4b675c646f..45f5e5ce0b 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "blueman"; - version = "2.3"; + version = "2.3.2"; src = fetchurl { url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-M7pgl9M08XmJwIlPeCRrXgHTFJn5CoZOuTtc5WJv2uo="; + sha256 = "sha256-hM99f9Fzh1HHfgYF9y5M3UtyMHindo/j81MJmToDUK4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix index 9687b1da1e..56318b7f4a 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bluetuith"; - version = "0.0.3"; + version = "0.0.7"; src = fetchFromGitHub { owner = "darkhz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7JqpF9iga6RO+/r2JK0N9gjieVRUNkHhGNsfVFfKfRY="; + sha256 = "sha256-3rN82Ywr7iJk3f+RvyqPRirDUQuRksAFf5TzCXk8fgo="; }; - vendorSha256 = "sha256-MsVrhEG2DOFJAXvt5rvfctGUbb3hQsBJ7cjOSzWA+bc="; + vendorSha256 = "sha256-/CEQfpE5ENpfWQ0OvMaG9rZ/4BtFm21JkqDZtHwzqNU="; ldflags = [ "-s" "-w" ]; diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix index a108d55c6b..6164a39ac7 100644 --- a/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { homepage = src.meta.homepage; license = licenses.mit; platforms = platforms.linux; - maintainers = [ maintainers.oxij maintainers.lheckemann ]; + maintainers = [ maintainers.oxij ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/compression/bzip2/CVE-2016-3189.patch b/third_party/nixpkgs/pkgs/tools/compression/bzip2/CVE-2016-3189.patch deleted file mode 100644 index eff324b325..0000000000 --- a/third_party/nixpkgs/pkgs/tools/compression/bzip2/CVE-2016-3189.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/bzip2recover.c b/bzip2recover.c -index f9de049..252c1b7 100644 ---- a/bzip2recover.c -+++ b/bzip2recover.c -@@ -457,6 +457,7 @@ Int32 main ( Int32 argc, Char** argv ) - bsPutUChar ( bsWr, 0x50 ); bsPutUChar ( bsWr, 0x90 ); - bsPutUInt32 ( bsWr, blockCRC ); - bsClose ( bsWr ); -+ outFile = NULL; - } - if (wrBlock >= rbCtr) break; - wrBlock++; diff --git a/third_party/nixpkgs/pkgs/tools/compression/bzip2/cve-2019-12900.patch b/third_party/nixpkgs/pkgs/tools/compression/bzip2/cve-2019-12900.patch deleted file mode 100644 index bf3d13a7a6..0000000000 --- a/third_party/nixpkgs/pkgs/tools/compression/bzip2/cve-2019-12900.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://gitlab.com/federicomenaquintero/bzip2/commit/74de1e2e6ffc9d -diff --git a/decompress.c b/decompress.c ---- a/decompress.c -+++ b/decompress.c -@@ -287,7 +287,7 @@ - GET_BITS(BZ_X_SELECTOR_1, nGroups, 3); - if (nGroups < 2 || nGroups > 6) RETURN(BZ_DATA_ERROR); - GET_BITS(BZ_X_SELECTOR_2, nSelectors, 15); -- if (nSelectors < 1) RETURN(BZ_DATA_ERROR); -+ if (nSelectors < 1 || nSelectors > BZ_MAX_SELECTORS) RETURN(BZ_DATA_ERROR); - for (i = 0; i < nSelectors; i++) { - j = 0; - while (True) { diff --git a/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix b/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix index 3dd3632711..3b48195d11 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/bzip2/default.nix @@ -10,34 +10,38 @@ stdenv.mkDerivation rec { pname = "bzip2"; - version = "1.0.6.0.2"; + version = "1.0.8"; - /* We use versions patched to use autotools style properly, - saving lots of trouble. */ src = fetchurl { - urls = map - (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${pname}-${version}.tar.gz") - [ - "http://ftp.uni-kl.de/pub/linux/suse" - "ftp://ftp.hs.uni-hamburg.de/pub/mirrors/suse" - "ftp://ftp.mplayerhq.hu/pub/linux/suse" - "http://ftp.suse.com/pub" # the original patched version but slow - ]; - sha256 = "sha256-FnhwNy4OHe8d5M6iYCClkxzcB/EHXg0veXwv43ZlxbA="; + url = "https://sourceware.org/pub/bzip2/bzip2-${version}.tar.gz"; + sha256 = "sha256-q1oDF27hBtPw+pDjgdpHjdrkBZGBU8yiSOaCzQxKImk="; }; + patchFlags = ["-p0"]; + + patches = [ + (fetchurl { + url = "https://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6.2-autoconfiscated.patch"; + sha256 = "sha256-QMufl6ffJVVVVZespvkCbFpB6++R1lnq1687jEsUjr0="; + }) + ]; + # Fix up hardcoded version from the above patch, e.g. seen in bzip2.pc or libbz2.so.1.0.N + postPatch = '' + patch <<-EOF + --- configure.ac + +++ configure.ac + @@ -3,3 +3,3 @@ + -AC_INIT([bzip2], [1.0.6], [Julian Seward ]) + +AC_INIT([bzip2], [${version}], [Julian Seward ]) + BZIP2_LT_CURRENT=1 + -BZIP2_LT_REVISION=6 + +BZIP2_LT_REVISION=${lib.versions.patch version} + EOF + ''; + strictDeps = true; nativeBuildInputs = [ autoreconfHook ]; - patches = [ - ./CVE-2016-3189.patch - ./cve-2019-12900.patch - ]; - - postPatch = '' - sed -i -e '//s|\\|/|' bzip2.c - ''; - outputs = [ "bin" "dev" "out" "man" ]; configureFlags = diff --git a/third_party/nixpkgs/pkgs/tools/compression/crabz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/crabz/default.nix index 5eafb3f561..67c4cffbc3 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/crabz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/crabz/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "crabz"; - version = "0.7.2"; + version = "0.7.5"; src = fetchFromGitHub { owner = "sstadick"; repo = pname; rev = "v${version}"; - sha256 = "0ch9cqarsakihg9ymbdm0ka6wz77z84n4g6cdlcskczc5g3b9gp9"; + sha256 = "sha256-9PZbrdgHX7zOftecvsyVjYUkBlFEt20lYtLSkFcb8dg="; }; - cargoSha256 = "sha256-nrCYlhq/f8gk3NmltAg+xppRJ533ooEpetWvaF2vmP0="; + cargoSha256 = "sha256-tT6RCL5pOAMZw7cQr0BCAde9Y/1FeBBLXF6uXfM1I0A="; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/heatshrink/default.nix b/third_party/nixpkgs/pkgs/tools/compression/heatshrink/default.nix new file mode 100644 index 0000000000..290e2dc9d8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/compression/heatshrink/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenv +, fetchFromGitHub +}: + +stdenv.mkDerivation rec { + pname = "heatshrink"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "atomicobject"; + repo = "heatshrink"; + rev = "v${version}"; + hash = "sha256-Nm9/+JFMDXY1N90hmNFGh755V2sXSRQ4VBN9f8TcsGk="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + preInstall = '' + mkdir -p $out/{bin,lib,include} + ''; + + doCheck = true; + checkTarget = "test"; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + echo "Hello world" | \ + $out/bin/heatshrink -e - | \ + $out/bin/heatshrink -d - | \ + grep "Hello world" + runHook postInstallCheck + ''; + + meta = with lib; { + description = "A data compression/decompression library for embedded/real-time systems"; + homepage = "https://github.com/atomicobject/heatshrink"; + license = licenses.isc; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix index 0bff5110c9..87d499614b 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -41,6 +41,8 @@ stdenv.mkDerivation rec { tests/playTests.sh ''; + LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; + cmakeFlags = lib.attrsets.mapAttrsToList (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { BUILD_SHARED = !static; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix index c523255ddb..5364b62c29 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/aefs/default.nix @@ -1,21 +1,22 @@ -{ lib, stdenv, fetchurl, fetchpatch, fuse }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, fuse +, git +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "aefs"; - version = "0.4pre259-8843b7c"; + version = "unstable-2015-05-06"; - src = fetchurl { - url = "http://tarballs.nixos.org/aefs-${version}.tar.bz2"; - sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq"; + src = fetchFromGitHub { + owner = "edolstra"; + repo = "aefs"; + rev = "e7a9bf8cfa9166668fe1514cc1afd31fc4e10e9a"; + hash = "sha256-a3YQWxJ7+bYhf1W1kdIykV8U1R4dcDZJ7K3NvNxbF0s="; }; - patches = [ - (fetchpatch { - url = "https://github.com/edolstra/aefs/commit/15d8df8b8d5dc1ee20d27a86c4d23163a67f3123.patch"; - sha256 = "0k36hsyvf8a0ji2hpghgqff2fncj0pllxn8p0rs0aj4h7j2vp4iv"; - }) - ]; - # autoconf's AC_CHECK_HEADERS and AC_CHECK_LIBS fail to detect libfuse on # Darwin if FUSE_USE_VERSION isn't set at configure time. # @@ -26,13 +27,16 @@ stdenv.mkDerivation rec { # $ grep -R FUSE_USE_VERSION configureFlags = lib.optional stdenv.isDarwin "CPPFLAGS=-DFUSE_USE_VERSION=26"; + nativeBuildInputs = [ autoreconfHook git ]; + buildInputs = [ fuse ]; meta = with lib; { homepage = "https://github.com/edolstra/aefs"; description = "A cryptographic filesystem implemented in userspace using FUSE"; - platforms = platforms.unix; maintainers = [ maintainers.eelco ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; + platforms = platforms.unix; + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/apfsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/apfsprogs/default.nix index a9f9a746d9..bbda1721cc 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/apfsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/apfsprogs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "apfsprogs"; - version = "unstable-2022-02-23"; + version = "unstable-2022-07-21"; src = fetchFromGitHub { owner = "linux-apfs"; repo = "apfsprogs"; - rev = "5bce5c7f42843dfbbed90767640e748062e23dd2"; - sha256 = "sha256-0N+aC5paP6ZoXUD7A9lLnF2onbOJU+dqZ8oKs+dCUcg="; + rev = "8c5340bcc0a261ffe6e5ed85a1742fb60ee982f3"; + sha256 = "sha256-cDxXWfXl1VxdpKBcU00ULWlidzg6kQFG4AGEu5DBCaw="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index db02bedf7f..73e9dd1f01 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -184,8 +184,6 @@ in rec { substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" substituteInPlace src/common/module.c --replace "/bin/grep" "grep" - # for pybind/rgw to find internal dep - export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" # install target needs to be in PYTHONPATH for "*.pth support" check to succeed # set PYTHONPATH, so the build system doesn't silently skip installing ceph-volume and others export PYTHONPATH=${ceph-python-env}/${sitePackages}:$lib/${sitePackages}:$out/${sitePackages} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix new file mode 100644 index 0000000000..22b29b5ed2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix @@ -0,0 +1,103 @@ +{ lib +, fetchFromGitHub +, stdenv +, substituteAll + +, bison +, boost +, cmake +, double-conversion +, fmt_8 +, fuse3 +, gflags +, glog +, gtest +, jemalloc +, libarchive +, libevent +, libunwind +, lz4 +, openssl +, pkg-config +, ronn +, xxHash +, zstd +}: + +stdenv.mkDerivation rec { + pname = "dwarfs"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "mhx"; + repo = "dwarfs"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-bGJkgcq8JxueRTX08QpJv1A0O5wXbiIgUY7BrY0Ln/M="; + }; + + patches = with lib.versions; [ + (substituteAll { + src = ./version_info.patch; + + gitRev = "v${version}"; + gitDesc = "v${version}"; + gitBranch = "v${version}"; + gitId = "v${version}"; # displayed as version number + + versionMajor = major version; + versionMinor = minor version; + versionPatch = patch version; + }) + ]; + + cmakeFlags = [ + "-DPREFER_SYSTEM_ZSTD=ON" + "-DPREFER_SYSTEM_XXHASH=ON" + "-DPREFER_SYSTEM_GTEST=ON" + + # may be added under an option in the future + # "-DWITH_LEGACY_FUSE=ON" + "-DWITH_TESTS=ON" + ]; + + nativeBuildInputs = [ + bison + cmake + pkg-config + ronn + ]; + + buildInputs = [ + # dwarfs + boost + fmt_8 + fuse3 + jemalloc + libarchive + lz4 + xxHash + zstd + + # folly + double-conversion + glog + libevent + libunwind + openssl + ]; + + doCheck = true; + checkInputs = [ gtest ]; + # this fails inside of the sandbox due to missing access + # to the FUSE device + GTEST_FILTER = "-tools.everything"; + + meta = with lib; { + description = "A fast high compression read-only file system"; + homepage = "https://github.com/mhx/dwarfs"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ keksbg ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/version_info.patch b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/version_info.patch new file mode 100644 index 0000000000..59936302ac --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/dwarfs/version_info.patch @@ -0,0 +1,40 @@ +diff --git a/include/dwarfs/version.h b/include/dwarfs/version.h +new file mode 100755 +index 0000000..9b12c59 +--- /dev/null ++++ b/include/dwarfs/version.h +@@ -0,0 +1,16 @@ ++// autogenerated code, do not modify ++ ++#pragma once ++ ++#define PRJ_VERSION_MAJOR @versionMajor@ ++#define PRJ_VERSION_MINOR @versionMinor@ ++#define PRJ_VERSION_PATCH @versionPatch@ ++ ++namespace dwarfs { ++ ++extern char const* PRJ_GIT_REV; ++extern char const* PRJ_GIT_DESC; ++extern char const* PRJ_GIT_BRANCH; ++extern char const* PRJ_GIT_ID; ++ ++} // namespace dwarfs +diff --git a/src/dwarfs/version.cpp b/src/dwarfs/version.cpp +new file mode 100755 +index 0000000..3af0215 +--- /dev/null ++++ b/src/dwarfs/version.cpp +@@ -0,0 +1,12 @@ ++// autogenerated code, do not modify ++ ++#include "dwarfs/version.h" ++ ++namespace dwarfs { ++ ++char const* PRJ_GIT_REV = "@gitRev@"; ++char const* PRJ_GIT_DESC = "@gitDesc@"; ++char const* PRJ_GIT_BRANCH = "@gitBranch@"; ++char const* PRJ_GIT_ID = "@gitId@"; ++ ++} // namespace dwarfs diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix index dc0b902bf3..ecd77781d3 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/genext2fs/default.nix @@ -1,22 +1,32 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, libarchive }: stdenv.mkDerivation rec { pname = "genext2fs"; - version = "1.4.1"; + version = "1.5.0"; - src = fetchurl { - url = "mirror://sourceforge/genext2fs/genext2fs-${version}.tar.gz"; - sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; + src = fetchFromGitHub { + owner = "bestouff"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-9LAU5XuCwwEhU985MzZ2X+YYibvyECULQSn9X2jdj5I="; }; - # https://sourceforge.net/p/genext2fs/bugs/2/ - # Will be fixed in the next release, whenever this happens - postPatch = '' - sed -e 's@4 [*] (EXT2_TIND_BLOCK+1)@-1+&@' -i genext2fs.c + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ + libarchive + ]; + + configureFlags = [ + "--enable-libarchive" + ]; + + doCheck = true; + checkPhase = '' + ./test.sh ''; meta = with lib; { - homepage = "http://genext2fs.sourceforge.net/"; + homepage = "https://github.com/bestouff/genext2fs"; description = "A tool to generate ext2 filesystem images without requiring root privileges"; license = licenses.gpl2; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix index e25c50e095..125fb01d88 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/default.nix @@ -65,6 +65,17 @@ in stdenv.mkDerivation rec { }; inherit buildInputs propagatedBuildInputs; + patches = [ + # Upstream invokes `openssl version -d` to derive the canonical system path + # for certificates, which resolves to a nix store path, so this patch + # statically sets the configure.ac value. There's probably a less-brittle + # way to do this! (this will likely fail on a version bump) + # References: + # - https://github.com/gluster/glusterfs/issues/3234 + # - https://github.com/gluster/glusterfs/commit/a7dc43f533ad4b8ff68bf57704fefc614da65493 + ./ssl_cert_path.patch + ]; + postPatch = '' sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am substituteInPlace libglusterfs/src/glusterfs/lvm-defaults.h \ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch new file mode 100644 index 0000000000..5964e14787 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/glusterfs/ssl_cert_path.patch @@ -0,0 +1,23 @@ +diff --git a/configure.ac b/configure.ac +index fb8db11e9e..4c40683057 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -766,14 +766,10 @@ AS_IF([test "x$enable_fuse_notifications" != "xno"], [ + + dnl Find out OpenSSL trusted certificates path + AC_MSG_CHECKING([for OpenSSL trusted certificates path]) +-SSL_CERT_PATH=$(openssl version -d | sed -e 's|OPENSSLDIR: "\(.*\)".*|\1|') +-if test -d $SSL_CERT_PATH 1>/dev/null 2>&1; then +- AC_MSG_RESULT([$SSL_CERT_PATH]) +- AC_DEFINE_UNQUOTED(SSL_CERT_PATH, ["$SSL_CERT_PATH"], [Path to OpenSSL trusted certificates.]) +- AC_SUBST(SSL_CERT_PATH) +-else +- AC_MSG_ERROR([Unable to detect path to OpenSSL trusted certificates]) +-fi ++SSL_CERT_PATH=/etc/ssl ++AC_MSG_RESULT([$SSL_CERT_PATH]) ++AC_DEFINE_UNQUOTED(SSL_CERT_PATH, ["$SSL_CERT_PATH"], [Path to OpenSSL trusted certificates.]) ++AC_SUBST(SSL_CERT_PATH) + + AC_CHECK_LIB([ssl], TLS_method, [HAVE_OPENSSL_1_1="yes"], [HAVE_OPENSSL_1_1="no"]) + if test "x$HAVE_OPENSSL_1_1" = "xyes"; then diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix index 51f0e039df..efcb1241b6 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/httm/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "httm"; - version = "0.12.2"; + version = "0.14.8"; src = fetchFromGitHub { owner = "kimono-koans"; repo = pname; rev = version; - sha256 = "gly3P4b6MlhJA/Qre6S0iFGBaY0Hi/u4hzlirdTdZoc="; + sha256 = "sha256-PakfSEQCp4LG7mInJvPKFnpRqI7HVr5BxEOM2TronXQ="; }; - cargoSha256 = "fq4RVJT6u2ST4Nu9zAnfcXZQqWe8gdC4cFwrJzFums4="; + cargoSha256 = "sha256-hCoStHD+RG700IBXMV4I007mzFvaKk/bVpnte3cigYk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/kdiskmark/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/kdiskmark/default.nix new file mode 100644 index 0000000000..b12da3eade --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/kdiskmark/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, lib +, wrapQtAppsHook +, qtbase +, qttools +, fio +, cmake +, kauth +, extra-cmake-modules +, fetchFromGitHub +}: +stdenv.mkDerivation rec { + name = "kdiskmark"; + version = "2.3.0"; + + src = fetchFromGitHub { + owner = "jonmagon"; + repo = "kdiskmark"; + rev = version; + sha256 = "sha256-9ufRxEbqwcRs+m/YW8D3+1USCJNZEaOUZRec7gvgmtA="; + }; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + buildInputs = [ + qtbase + qttools + extra-cmake-modules + kauth + ]; + + postInstall = '' + # so that kdiskmark can be used as unpriviledged user even on non-kde + # (where kauth is not in environment.systemPackages) + ln -s ${kauth}/share/dbus-1/system.d/org.kde.kf5auth.conf $out/share/dbus-1/system.d/00-kdiskmark-needs-org.kde.kf5auth.conf + ''; + + qtWrapperArgs = + [ "--prefix" "PATH" ":" (lib.makeBinPath [ fio ]) ]; + + meta = with lib; { + description = "HDD and SSD benchmark tool with a friendly graphical user interface"; + longDescription = '' + If kdiskmark is not run as root it can rely on polkit to get the necessary + privileges. In this case you must install it with `environment.systemPackages` + on NixOS, nix-env will not work. + ''; + homepage = "https://github.com/JonMagon/KDiskMark"; + maintainers = [ maintainers.symphorien ]; + license = licenses.gpl3Only; + platforms = platforms.linux; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix index fe2047a6f1..fbb1532f3e 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "nilfs-utils"; - version = "2.2.8"; + version = "2.2.9"; src = fetchFromGitHub { owner = "nilfs-dev"; repo = pname; rev = "v${version}"; - sha256 = "094mw7dsyppyiyzfdnf3f5hlkrh4bidk1kvvpn1kcvw5vn2xpfk7"; + sha256 = "sha256-XqViUvPj2BHO3bGs9xBO3VpRq9XqnwBptHvMwBOntqo="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix index fe0ae20f55..018621b801 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { "--enable-extras" "--with-mount-helper=${mount}/bin/mount" "--with-umount-helper=${mount}/bin/umount" + ] ++ lib.optionals stdenv.isLinux [ "--with-modprobe-helper=${kmod}/bin/modprobe" ]; diff --git a/third_party/nixpkgs/pkgs/tools/games/gamemode/default.nix b/third_party/nixpkgs/pkgs/tools/games/gamemode/default.nix index e9fdec5922..e2aeea8377 100644 --- a/third_party/nixpkgs/pkgs/tools/games/gamemode/default.nix +++ b/third_party/nixpkgs/pkgs/tools/games/gamemode/default.nix @@ -10,38 +10,30 @@ , inih , systemd , appstream +, makeWrapper +, findutils +, gawk +, procps }: stdenv.mkDerivation rec { pname = "gamemode"; - version = "1.6.1"; + version = "1.7"; src = fetchFromGitHub { owner = "FeralInteractive"; repo = pname; rev = version; - sha256 = "sha256-P00OnZiPZyxBu9zuG+3JNorXHBhJZy+cKPjX+duZrJ0="; + sha256 = "sha256-DIFcmWFkoZOklo1keYcCl6n2GJgzWKC8usHFcJmfarU="; }; outputs = [ "out" "dev" "lib" "man" "static" ]; patches = [ - # Run executables from PATH instead of /usr/bin - # See https://github.com/FeralInteractive/gamemode/pull/323 - (fetchpatch { - url = "https://github.com/FeralInteractive/gamemode/commit/be44b7091baa33be6dda60392e4c06c2f398ee72.patch"; - sha256 = "TlDUETs4+N3pvrVd0FQGlGmC+6ByhJ2E7gKXa7suBtE="; - }) - - # Fix loading shipped config when using a prefix other than /usr - # See https://github.com/FeralInteractive/gamemode/pull/324 - (fetchpatch { - url = "https://github.com/FeralInteractive/gamemode/commit/b29aa903ce5acc9141cfd3960c98ccb047eca872.patch"; - sha256 = "LwBzBJQ7dfm2mFVSOSPjJP+skgV5N6h77i66L1Sq+ZM="; - }) - # Add @libraryPath@ template variable to fix loading the PRELOAD library ./preload-nix-workaround.patch + # Do not install systemd sysusers configuration + ./no-install-systemd-sysusers.patch ]; postPatch = '' @@ -55,6 +47,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ + makeWrapper meson ninja pkg-config @@ -85,13 +78,20 @@ stdenv.mkDerivation rec { moveToOutput lib/*.a "$static" ''; - # Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since - # they use dlopen to load libgamemode. Can't use makeWrapper since - # it would break the security wrapper in the NixOS module. postFixup = '' + # Add $lib/lib to gamemoded & gamemode-simulate-game's rpath since + # they use dlopen to load libgamemode. Can't use makeWrapper since + # it would break the security wrapper in the NixOS module. for bin in "$out/bin/gamemoded" "$out/bin/gamemode-simulate-game"; do patchelf --set-rpath "$lib/lib:$(patchelf --print-rpath "$bin")" "$bin" done + + wrapProgram "$out/bin/gamemodelist" \ + --prefix PATH : ${lib.makeBinPath [ + findutils + gawk + procps + ]} ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch b/third_party/nixpkgs/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch new file mode 100644 index 0000000000..27aa1d4d71 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/games/gamemode/no-install-systemd-sysusers.patch @@ -0,0 +1,16 @@ +diff --git i/data/meson.build w/data/meson.build +index 6fb82d8..2e9e170 100644 +--- i/data/meson.build ++++ w/data/meson.build +@@ -21,11 +21,6 @@ if sd_bus_provider == 'systemd' + configuration: data_conf, + install_dir: path_systemd_unit_dir, + ) +- # Install the sysusers.d file +- install_data( +- files('gamemode.conf'), +- install_dir: path_systemd_sysusers_dir, +- ) + endif + + # Install the D-BUS service file diff --git a/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix b/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix new file mode 100644 index 0000000000..039e46f719 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/games/scarab/default.nix @@ -0,0 +1,79 @@ +{ lib +, buildDotnetModule +, fetchFromGitHub +, dotnetCorePackages +, glibc +, zlib +, libX11 +, libICE +, libSM +, fontconfig +, gtk3 +, copyDesktopItems +, graphicsmagick +, wrapGAppsHook +, makeDesktopItem +}: + +buildDotnetModule rec { + pname = "scarab"; + version = "1.19.0.0"; + + src = fetchFromGitHub { + owner = "fifty-six"; + repo = pname; + rev = "v${version}"; + sha256 = "10pmzy7nhcam0686kpn64cgar59shzzy5k7j3vrgmnm27zgkr22v"; + }; + + nugetDeps = ./deps.nix; + projectFile = "Scarab.sln"; + executables = [ "Scarab" ]; + + runtimeDeps = [ + glibc + zlib + libX11 + libICE + libSM + fontconfig + gtk3 + ]; + + buildInputs = [ + gtk3 + ]; + + nativeBuildInputs = [ + copyDesktopItems + graphicsmagick + wrapGAppsHook + ]; + + postFixup = '' + # Icon for the desktop file + mkdir -p $out/share/icons/hicolor/256x256/apps/ + gm convert $src/Scarab/Assets/omegamaggotprime.ico $out/share/icons/hicolor/256x256/apps/scarab.png + ''; + + desktopItems = [(makeDesktopItem { + desktopName = "Scarab"; + name = "scarab"; + exec = "Scarab"; + icon = "scarab"; + comment = meta.description; + type = "Application"; + categories = [ "Game" ]; + })]; + + meta = with lib; { + description = "Hollow Knight mod installer and manager"; + homepage = "https://github.com/fifty-six/Scarab"; + downloadPage = "https://github.com/fifty-six/Scarab/releases"; + changelog = "https://github.com/fifty-six/Scarab/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ huantian ]; + mainProgram = "Scarab"; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/games/scarab/deps.nix b/third_party/nixpkgs/pkgs/tools/games/scarab/deps.nix new file mode 100644 index 0000000000..bfef60b66d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/games/scarab/deps.nix @@ -0,0 +1,225 @@ +{ fetchNuGet }: [ + (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.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.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 = "coverlet.collector"; version = "1.3.0"; sha256 = "0k65d9hag6d59w1ixf4n5ihcphp04vrjmd99x5nhga81w1k9i20y"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.1.1"; sha256 = "14xcqkw87zbjljy1pb727kwq5a4dfmsf5vg99fq0xxb71q828nvh"; }) + (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 = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) + (fetchNuGet { pname = "MessageBox.Avalonia"; version = "1.8.1-night"; sha256 = "1gcbqj0a10m8cxg6p1jmj19c8y34pbh9h3h08c50z348f3cyvrlx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.7.1"; sha256 = "1farw63445cdyciplfs6l9j1gayxw16rkzmrwsiswfyjhqz70xd4"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "6.0.0-preview.5.21301.5"; sha256 = "1ibsp938w6788jpjzk5813sma3ljda4hwy8xx3nabjwqps187pk3"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-preview.5.21301.5"; sha256 = "146baaxblq1zfs3za7avpsay1v7d8m3ds067hza98y0yawvj5sd2"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.7.1"; sha256 = "0yqxipj74ax2n76w9ccydppx78ym8m5fda88qnvj4670qjvl0kf8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0fjbjh7yxqc9h47ix37y963xi9f9y99jvl26cw3x3kvjlb8x0bgj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.7.1"; sha256 = "0s9dyh99gzdpk1i5v468i2r9m6i3jrr41r394pwdwiajsz99kay0"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.7.1"; sha256 = "1xik06rxn9ps83in0zn9vcl2ibv3acmdqvrx07qq89lxj1sgqlhs"; }) + (fetchNuGet { pname = "Microsoft.Toolkit.HighPerformance"; version = "7.1.2"; sha256 = "18l950mq0l8s1z771l9p332ni7jryidjh4hi9p37l6p8frcnccxb"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "PropertyChanged.SourceGenerator"; version = "1.0.1"; sha256 = "1dbsqi5jfyvhxbz62s4w70kyh31agbhjj4vwcira3pv8kavq83gb"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "13.2.10"; sha256 = "0x4pk45wipzsjzkv23as8l0sdds665l9404gaix8c0z2n24s76gg"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "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 = "12.1.4"; sha256 = "0s2whs849fs0zk9qk4384m9sdz3c9dzb53w43pdag22znq3h0cyp"; }) + (fetchNuGet { pname = "Splat.Microsoft.Extensions.DependencyInjection"; version = "12.1.4"; sha256 = "1j49l2ykqxs0icil5f43sci2ypv8pwcvvxza2cmimr3jq154bmsy"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "13.2.43"; sha256 = "0x6b9avb291dciay29dr67qgx22fkyj55gvnqhw4yw6iai4fyp1a"; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "16.1.15"; sha256 = "03pvy7vfh7qz03ahp0d1xcfy6dwj54c2xlf563rvqlriyzx26i6x"; }) + (fetchNuGet { pname = "System.IO.Abstractions.TestingHelpers"; version = "13.2.43"; sha256 = "0fy9qjc9mky3sbhdxnfb4s3c868pwsxpx9pf8lhpdyb56yzvlpl3"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0-preview.5.21301.5"; sha256 = "1ibndmjwyihqv7302pjbhsb02sqkpfx87pxm4978jwqg5vq0r4cb"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (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 = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) + (fetchNuGet { pname = "xunit"; version = "2.4.1"; sha256 = "0xf3kaywpg15flqaqfgywqyychzk15kz0kz34j21rcv78q9ywq20"; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "0.10.0"; sha256 = "15n02q3akyqbvkp8nq75a8rd66d4ax0rx8fhdcn8j78pi235jm7j"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.4.1"; sha256 = "1imynzh80wxq2rp9sc4gxs4x1nriil88f72ilhj5q0m44qqmqpc6"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.4.1"; sha256 = "1nnb3j4kzmycaw1g76ii4rfqkvg6l8gqh18falwp8g28h802019a"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.4.1"; sha256 = "103qsijmnip2pnbhciqyk2jyhdm6snindg5z2s57kqf5pcx9a050"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.4.1"; sha256 = "1pbilxh1gp2ywm5idfl0klhl4gb16j86ib4x83p8raql1dv88qia"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.3"; sha256 = "0j1d0rbcm7pp6dypi61sjxp8l22sv261252z55b243l39jgv2rp3"; }) +] diff --git a/third_party/nixpkgs/pkgs/tools/games/steam-rom-manager/default.nix b/third_party/nixpkgs/pkgs/tools/games/steam-rom-manager/default.nix new file mode 100644 index 0000000000..b39e87fbe9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/games/steam-rom-manager/default.nix @@ -0,0 +1,28 @@ +{ lib, appimageTools, fetchurl }: + +appimageTools.wrapType2 rec { + name = "steam-rom-manager"; + version = "2.3.40"; + + src = fetchurl { + url = "https://github.com/SteamGridDB/steam-rom-manager/releases/download/v${version}/Steam-ROM-Manager-${version}.AppImage"; + sha256 = "sha256-qm7F1/+3iVtsxSAptbhiI5sEHR0B9vo7AdEPy1/PANU="; + }; + + extraInstallCommands = let + appimageContents = appimageTools.extract { inherit name src; }; + in '' + install -m 444 -D ${appimageContents}/${name}.desktop -t $out/share/applications + substituteInPlace $out/share/applications/${name}.desktop \ + --replace 'Exec=AppRun' 'Exec=${name}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with lib; { + description = "An app for managing ROMs in Steam"; + homepage = "https://github.com/SteamGridDB/steam-rom-manager"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ squarepear ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix index ec7832de26..1e5cd1cc12 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "3.1.0-dev-20220627"; + version = "3.1.0-dev-20220713"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-gJ7vz95KqmTQp+sf1q99Sk7aYooLHVAyYliKzfM/fWU="; + sha256 = "sha256-ch3crmvueXk4xJ4LjG4MrYkaCTd+41INAz+/ClI+Mpw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix index 4e1948ce87..c6b4a2c222 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/amber/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , cmake , pkg-config +, cctools , python3 , vulkan-headers , vulkan-loader @@ -63,6 +64,8 @@ stdenv.mkDerivation rec { cmake pkg-config python3 + ] ++ lib.optionals stdenv.isDarwin [ + cctools ]; # Tests are disabled so we do not have to pull in googletest and more dependencies diff --git a/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix index bfc87f20bb..31102443d8 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/directx-shader-compiler/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "directx-shader-compiler"; - version = "1.6.2112"; + version = "1.7.2207"; # Put headers in dev, there are lot of them which aren't necessary for # using the compiler binary. @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { owner = "microsoft"; repo = "DirectXShaderCompiler"; rev = "v${version}"; - hash = "sha256-+oh7oWJCE0CLehnqpE2J9aIfMFbtfLAKwI9ETmCg/TA="; + hash = "sha256-yvhraZPJ6ocsg7/22/AzDbl/Rz7qXRQiXBxE1zB1QPA="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifski/cargo.lock-fix-missing-dependency.patch b/third_party/nixpkgs/pkgs/tools/graphics/gifski/cargo.lock-fix-missing-dependency.patch new file mode 100644 index 0000000000..bfccf45b6d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/gifski/cargo.lock-fix-missing-dependency.patch @@ -0,0 +1,12 @@ +diff --git c/Cargo.lock i/Cargo.lock +index 9b8929c..8e1e923 100644 +--- c/Cargo.lock ++++ i/Cargo.lock +@@ -303,6 +303,7 @@ dependencies = [ + "lodepng", + "loop9", + "natord", ++ "num-traits", + "pbr", + "quick-error", + "resize", diff --git a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix index bf3cbf420b..ffd60b5b77 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -2,21 +2,25 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-TD6MSZfvJ8fLJxvDh4fc4Dij5t4WSH2/i9Jz7eBmlME="; + sha256 = "sha256-cycgrQ1f0x1tPziQCRyqWinG8v0SVYW3LpFsxhZpQhE="; }; - cargoSha256 = "sha256-kG0svhytDzm2dc//8WTFm1sI3WS0Ny9yhYTSMoXnt8I="; + cargoPatches = [ ./cargo.lock-fix-missing-dependency.patch ]; - nativeBuildInputs = [ pkg-config ]; + cargoSha256 = "sha256-qJ+awu+Ga3fdxaDKdSzCcdyyuKCheb87qT7tX1dL1zo="; + + nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; + + # error: the crate `gifski` is compiled with the panic strategy `abort` which is incompatible with this crate's strategy of `unwind` + doCheck = !stdenv.isDarwin; meta = with lib; { - broken = stdenv.isDarwin; description = "GIF encoder based on libimagequant (pngquant)"; homepage = "https://gif.ski/"; license = licenses.agpl3; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix index 5798ec5691..96a7ffb2ed 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/graphviz/default.nix @@ -27,16 +27,15 @@ let inherit (lib) optional optionals optionalString; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "graphviz"; - version = "3.0.0"; + version = "5.0.0"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; - # use rev as tags have disappeared before - rev = "24cf7232bb8728823466e0ef536862013893e567"; - sha256 = "sha256-qqrpCJ9WP8wadupp4YRJMMaSCeFIDuFDQvEOpbG/wGM="; + rev = version; + sha256 = "sha256-vDqVJJg2ezYGZPp7UtpvWfCypLBqRrr0aPMSyEN+IQo="; }; nativeBuildInputs = [ @@ -88,7 +87,6 @@ stdenv.mkDerivation { preAutoreconf = "./autogen.sh"; postFixup = optionalString withXorg '' - substituteInPlace $out/bin/dotty --replace '`which lefty`' $out/bin/lefty substituteInPlace $out/bin/vimdot \ --replace '"/usr/bin/vi"' '"$(command -v vi)"' \ --replace '"/usr/bin/vim"' '"$(command -v vim)"' \ diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix index cdbe39ee38..26c1b99216 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix @@ -5,29 +5,33 @@ , substituteAll , coreutils , curl -, gawk , glxinfo , gnugrep , gnused -, lsof , xdg-utils , dbus , hwdata , libX11 , mangohud32 , vulkan-headers +, appstream , glslang , makeWrapper +, Mako , meson , ninja , pkg-config -, python3Packages , unzip , vulkan-loader , libXNVCtrl , wayland , spdlog +, glew +, glfw +, nlohmann_json +, xorg , addOpenGLRunpath +, gamescopeSupport ? true # build mangoapp and mangohudctl }: let @@ -37,24 +41,24 @@ let src = fetchFromGitHub { owner = "ocornut"; repo = "imgui"; - rev = "v${version}"; - hash = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-rRkayXk3xz758v6vlMSaUu5fui6NR8Md3njhDB0gJ18="; }; patch = fetchurl { url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch"; - hash = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18="; + sha256 = "sha256-bQC0QmkLalxdj4mDEdqvvOFtNwz2T1MpTDuMXGYeQ18="; }; }; in stdenv.mkDerivation rec { pname = "mangohud"; - version = "0.6.7-1"; + version = "0.6.8"; src = fetchFromGitHub { owner = "flightlessmango"; repo = "MangoHud"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; - sha256 = "sha256-60cZYo+d679KRggLBGbpLYM5Iu1XySEEGp+MxZs6wF0="; + sha256 = "sha256-jfmgN90kViHa7vMOjo2x4bNY2QbLk93uYEvaA4DxYvg="; }; outputs = [ "out" "doc" "man" ]; @@ -75,11 +79,9 @@ in stdenv.mkDerivation rec { path = lib.makeBinPath [ coreutils curl - gawk glxinfo gnugrep gnused - lsof xdg-utils ]; @@ -105,16 +107,20 @@ in stdenv.mkDerivation rec { "-Dvulkan_datadir=${vulkan-headers}/share" "-Dwith_wayland=enabled" "-Duse_system_spdlog=enabled" + ] ++ lib.optionals gamescopeSupport [ + "-Dmangoapp_layer=true" + "-Dmangoapp=true" + "-Dmangohudctl=true" ]; nativeBuildInputs = [ + appstream glslang makeWrapper + Mako meson ninja pkg-config - python3Packages.Mako - python3Packages.python unzip vulkan-loader ]; @@ -125,6 +131,12 @@ in stdenv.mkDerivation rec { libXNVCtrl wayland spdlog + ] ++ lib.optionals gamescopeSupport [ + glew + glfw + nlohmann_json + vulkan-headers + xorg.libXrandr ]; # Support 32bit Vulkan applications by linking in 32bit Vulkan layer @@ -140,6 +152,12 @@ in stdenv.mkDerivation rec { wrapProgram "$out/bin/mangohud" \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ addOpenGLRunpath.driverLink ]} \ --prefix XDG_DATA_DIRS : "$out/share" + '' + lib.optionalString (gamescopeSupport) '' + if [[ -e "$out/bin/mangoapp" ]]; then + wrapProgram "$out/bin/mangoapp" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ addOpenGLRunpath.driverLink ]} \ + --prefix XDG_DATA_DIRS : "$out/share" + fi ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch index 379e1dd7ba..0416008a99 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch +++ b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/hardcode-dependencies.patch @@ -1,15 +1,3 @@ -From 56a191f6db6d530c2bc89d9d3395b4c9768d108f Mon Sep 17 00:00:00 2001 -From: Atemu -Date: Tue, 17 May 2022 16:58:08 +0200 -Subject: [PATCH 1/2] hardcode dependencies - ---- - src/dbus.cpp | 2 +- - src/loaders/loader_x11.cpp | 2 +- - src/logging.cpp | 7 +++++++ - src/pci_ids.cpp | 6 ++---- - 4 files changed, 11 insertions(+), 6 deletions(-) - diff --git a/src/dbus.cpp b/src/dbus.cpp index 3b3cccb..1405725 100644 --- a/src/dbus.cpp @@ -34,21 +22,18 @@ index 4db6f78..c60d08c 100644 -std::shared_ptr g_x11(new libx11_loader("libX11.so.6")); +std::shared_ptr g_x11(new libx11_loader("@libX11@/lib/libX11.so.6")); diff --git a/src/logging.cpp b/src/logging.cpp -index b27f21e..48f5e03 100644 +index 1668226..f0c8df5 100644 --- a/src/logging.cpp +++ b/src/logging.cpp -@@ -22,7 +22,14 @@ string exec(string command) { +@@ -24,7 +24,11 @@ string exec(string command) { #endif std::array buffer; std::string result; + + char* originalPath = getenv("PATH"); + setenv("PATH", "@path@", 1); -+ std::unique_ptr pipe(popen(command.c_str(), "r"), pclose); -+ + setenv("PATH", originalPath, 1); -+ if (!pipe) { return "popen failed!"; } @@ -70,6 +55,3 @@ index feec222..6baa707 100644 } std::string line; --- -2.36.0 - diff --git a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch index f4f2e112d9..03af397fae 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch +++ b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/opengl32-nix-workaround.patch @@ -1,24 +1,12 @@ -From 1ac93cbf0eed951af6967a81f731a0f418ea0b3d Mon Sep 17 00:00:00 2001 -From: Atemu -Date: Tue, 17 May 2022 16:58:45 +0200 -Subject: [PATCH 2/2] opengl32 nix workaround - ---- - bin/mangohud.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/bin/mangohud.in b/bin/mangohud.in -index 8ec21de..f65304a 100755 +index e13da99..086443c 100755 --- a/bin/mangohud.in +++ b/bin/mangohud.in @@ -23,6 +23,6 @@ fi # figure out whether the 32 or 64 bit version should be used, and will search # for it in the correct directory - LD_PRELOAD="${LD_PRELOAD}:${MANGOHUD_LIB_NAME}" --LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@" -+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@ld_libdir_mangohud@:@mangohud32@/lib/mangohud" + LD_PRELOAD="${LD_PRELOAD}${LD_PRELOAD:+:}${MANGOHUD_LIB_NAME}" +-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@ld_libdir_mangohud@" ++LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}@ld_libdir_mangohud@:@mangohud32@/lib/mangohud" exec env MANGOHUD=1 LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" LD_PRELOAD="${LD_PRELOAD}" "$@" --- -2.36.0 - diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pdftoipe/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pdftoipe/default.nix index 950e82e386..763a136680 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pdftoipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pdftoipe/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , pkg-config , poppler +, fetchpatch }: stdenv.mkDerivation rec { @@ -15,6 +16,18 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "jlrjrjzZQo79CKMySayhCm1dqLh89wOQuXrXa2aqc0k="; }; + + patches = [ + # Fix build with poppler > 22.03.0 + # https://github.com/otfried/ipe-tools/pull/48 + (fetchpatch { + url = "https://github.com/otfried/ipe-tools/commit/14335180432152ad094300d0afd00d8e390469b2.patch"; + sha256 = "sha256-V3FmwG3bR6io/smxjasFJ5K0/u8RSFfdUX41ClGXhFc="; + stripLen = 1; + name = "poppler_fix_build.patch"; + }) + ]; + sourceRoot = "source/pdftoipe"; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix index 6e2517becc..c8c1bd8d95 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pikchr/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation { pname = "pikchr"; # To update, use the last check-in in https://pikchr.org/home/timeline?r=trunk - version = "unstable-2022-01-30"; + version = "unstable-2022-06-20"; src = fetchurl { - url = "https://pikchr.org/home/tarball/5db3aa1d294dcd16/pikchr.tar.gz"; - sha256 = "sha256-xnT2oOx4LK9CElXeAuQIKlu6WvMB8Nv5+2kBzWQ5Gpc="; + url = "https://pikchr.org/home/tarball/d9ee756594b6eb64/pikchr.tar.gz"; + sha256 = "sha256-ML+gymFrBay1kly7NYsxo0I1qNMoZPzNI3ClBTrWlHw="; }; # can't open generated html files diff --git a/third_party/nixpkgs/pkgs/tools/graphics/pixel2svg/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/pixel2svg/default.nix index 630e896ee7..8e5e866249 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/pixel2svg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/pixel2svg/default.nix @@ -15,6 +15,6 @@ python310Packages.buildPythonPackage rec { homepage = "https://florian-berger.de/en/software/pixel2svg/"; description = "Converts pixel art to SVG - pixel by pixel"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix index d66a06b7ee..b41f2cc49d 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ vulkan-headers vulkan-loader glslang libgcc libwebp ncnn ]; + buildInputs = [ vulkan-headers vulkan-loader glslang libwebp ncnn ] + ++ lib.optional (!stdenv.isDarwin) libgcc; postPatch = '' substituteInPlace main.cpp --replace REPLACE_MODELS $out/share/models diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 072327de01..64ddc3e3f4 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.12.2"; + version = "8.13.0"; outputs = [ "bin" "out" "man" "dev" ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-ffDJJWe/SzG+lppXEiyfXXL5KLdZgnMjv1SYnuYnh4c="; + sha256 = "sha256-N2jq68Vs/D+lZcIJVdjBLVaz2gK/TwqKeNfHUWdS3NA="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix index b0b9c9b07b..5ace5af97e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vkBasalt/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "vkBasalt"; - version = "0.3.2.5"; + version = "0.3.2.6"; src = fetchFromGitHub { owner = "DadSchoorse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1UHxPtpmkDNOJwKXVlRN2lpvRm4XPHNwxOBpEikXxqA="; + sha256 = "sha256-wk/bmbwdE1sBZPlD+EqXfQWDITIfCelTpoFBtNtZV8Q="; }; nativeBuildInputs = [ glslang meson ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix new file mode 100644 index 0000000000..7b6a43b433 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-caps-viewer/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, qmake +, vulkan-loader +, wrapQtAppsHook +, withX11 ? true +, qtx11extras +}: + +stdenv.mkDerivation rec { + pname = "vulkan-caps-viewer"; + version = "3.24"; + + src = fetchFromGitHub { + owner = "SaschaWillems"; + repo = "VulkanCapsViewer"; + rev = "${version}"; + hash = "sha256-BSydAPZ74rGzW4UA/aqL2K/86NTK/eZqc3MZUbdq7iU="; + # Note: this derivation strictly requires vulkan-header to be the same it was developed against. + # To help they put in a git-submodule. + # It works with older vulkan-loaders. + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + vulkan-loader + ] ++ lib.lists.optionals withX11 [ qtx11extras ]; + + patchPhase = '' + substituteInPlace vulkanCapsViewer.pro \ + --replace '/usr/' "/" + ''; + + qmakeFlags = [ + "DEFINES+=wayland" + "CONFIG+=release" + ] ++ lib.lists.optionals withX11 [ "DEFINES+=X11" ]; + + installFlags = [ "INSTALL_ROOT=$(out)" ]; + + meta = with lib; { + mainProgram = "vulkanCapsViewer"; + description = "Vulkan hardware capability viewer"; + longDescription = '' + 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; + maintainers = with maintainers; [ pedrohlc ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 8d8ae6e71e..d8cb710b29 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -30,6 +30,11 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib" ''; + cmakeFlags = [ + # file RPATH_CHANGE could not write new RPATH + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; + meta = { description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV"; homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix index 737f713221..ab5eac2731 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, vulkan-loader }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, makeWrapper, vulkan-loader, QuartzCore }: rustPlatform.buildRustPackage rec { pname = "wgpu-utils"; @@ -18,6 +18,8 @@ rustPlatform.buildRustPackage rec { makeWrapper ]; + buildInputs = lib.optional stdenv.isDarwin QuartzCore; + # Tests fail, as the Nix sandbox doesn't provide an appropriate adapter (e.g. Vulkan). doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix index 3c2b446a8e..6f41f2826b 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/wkhtmltopdf-bin/default.nix @@ -1,28 +1,80 @@ -{ stdenv, lib, fetchurl, wkhtmltopdf, xar, cpio }: +{ lib +, autoPatchelfHook +, cpio +, freetype +, zlib +, openssl +, dpkg +, fetchurl +, gcc-unwrapped +, libjpeg8 +, libpng +, fontconfig +, stdenv +, wkhtmltopdf +, xar +, xorg +}: -stdenv.mkDerivation rec { +let + darwinAttrs = rec { + version = "0.12.6-2"; + src = fetchurl { + url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.macos-cocoa.pkg"; + sha256 = "sha256-gaZrd7UI/t6NvKpnEnIDdIN2Vos2c6F/ZhG21R6YlPg="; + }; - pname = "wkhtmltopdf-bin"; - version = "0.12.6-1"; - sha256 = "1db59kdprzpmvdj1bg47lmfgi3zlvzvqif11sbym9hw61xy6gp3d"; - src = fetchurl { - url = - "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.macos-cocoa.pkg"; - inherit sha256; + nativeBuildInputs = [ xar cpio ]; + + unpackPhase = '' + xar -xf $src + zcat Payload | cpio -i + tar -xf usr/local/share/wkhtmltox-installer/wkhtmltox.tar.gz + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r bin include lib share $out/ + runHook postInstall + ''; }; - buildInputs = [ xar cpio ]; + linuxAttrs = rec { + version = "0.12.6-3"; + src = fetchurl { + url = "https://github.com/wkhtmltopdf/packaging/releases/download/${version}/wkhtmltox-${version}.archlinux-x86_64.pkg.tar.xz"; + sha256 = "sha256-6Ewu8sPRbqvYWj27mBlQYpEN+mb+vKT46ljrdEUxckI="; + }; - unpackPhase = '' - xar -xf $src - zcat Payload | cpio -i - tar -xf usr/local/share/wkhtmltox-installer/wkhtmltox.tar.gz - ''; + nativeBuildInputs = [ autoPatchelfHook ]; - installPhase = '' - mkdir -p $out - cp -r bin include lib share $out/ - ''; + buildInputs = [ + xorg.libXext + xorg.libXrender + + freetype + openssl + zlib + + (lib.getLib fontconfig) + (lib.getLib gcc-unwrapped) + (lib.getLib libjpeg8) + (lib.getLib libpng) + ]; + + unpackPhase = "tar -xf $src"; + + installPhase = '' + runHook preInstall + mkdir -p $out + cp -r usr/bin usr/include usr/lib usr/share $out/ + runHook postInstall + ''; + }; +in +stdenv.mkDerivation ({ + pname = "wkhtmltopdf-bin"; dontStrip = true; @@ -45,7 +97,10 @@ stdenv.mkDerivation rec { There is also a C library, if you're into that kind of thing. ''; license = licenses.gpl3Plus; - maintainers = with maintainers; [ nbr ]; - platforms = [ "x86_64-darwin" ]; + maintainers = with maintainers; [ nbr kalbasit ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }; } +// lib.optionalAttrs (stdenv.hostPlatform.isDarwin) darwinAttrs +// lib.optionalAttrs (stdenv.hostPlatform.isLinux) linuxAttrs +) diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/emote/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/emote/default.nix index b51c058bd0..21d50d76d4 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/emote/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/emote/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook, gobject-introspection, gtk3, keybinder3, xdotool, pango, gdk-pixbuf, atk, librsvg }: +{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook, gobject-introspection, gtk3, keybinder3, xdotool, pango, gdk-pixbuf, atk }: python3Packages.buildPythonApplication rec { pname = "emote"; @@ -23,18 +23,19 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ wrapGAppsHook gobject-introspection + ]; + + buildInputs = [ + atk + gdk-pixbuf + gtk3 keybinder3 pango - gdk-pixbuf - atk ]; propagatedBuildInputs = [ python3Packages.manimpango python3Packages.pygobject3 - gtk3 - xdotool - librsvg ]; postInstall = '' @@ -45,16 +46,19 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + --prefix PATH : ${lib.makeBinPath [ xdotool ]} + ) ''; doCheck = false; meta = with lib; { - description = "A modern emoji picker for Linux"; + description = "Modern emoji picker for Linux"; homepage = "https://github.com/tom-james-watson/emote"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ emilytrau ]; + maintainers = with maintainers; [ emilytrau SuperSandro2000 ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix index a2ff8c4b10..0e323ffeb1 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "keyd"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "rvaiya"; repo = "keyd"; rev = "v" + version; - hash = "sha256-p0f8iGT4QtyWAnlcG4SfOhD94ySNNkQrnVjnGCmQwAk="; + hash = "sha256-QWr+xog16MmybhQlEWbskYa/dypb9Ld54MOdobTbyMo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix index 4b5db58c64..d91a52ddd3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/3mux/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, makeWrapper }: buildGoModule rec { pname = "3mux"; @@ -11,9 +11,18 @@ buildGoModule rec { sha256 = "sha256-QT4QXTlJf2NfTqXE4GF759EoW6Ri12lxDyodyEFc+ag="; }; + patches = [ + # Fix the build for Darwin when building with Go 1.18. + (fetchpatch { + name = "darwin-go-1.18-fix.patch"; + url = "https://github.com/aaronjanse/3mux/pull/127/commits/91aed826c50f75a5175b63c72a1fb6a4ad57a008.patch"; + sha256 = "sha256-MOPAyWAYYWrlCCgw1rBaNmHZO9oTIpIQwLJcs0aY/m8="; + }) + ]; + nativeBuildInputs = [ makeWrapper ]; - vendorSha256 = "sha256-tbziQZIA1+b+ZtvA/865c8YQxn+r8HQy6Pqaac2kwcU="; + vendorSha256 = "sha256-qt8MYnvbZMuU1VwdSij6+x4N0r10c1R5Gcm+jDt76uc="; # This is a package used for internally testing 3mux. It's meant for # use by 3mux maintainers/contributors only. diff --git a/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix index 21e0143ef1..48fe07fff7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/audible-cli/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "audible-cli"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "mkb79"; repo = pname; - rev = "v${version}"; - sha256 = "1dalil8aaywdshf48d45ap4mgzxbyzhklr8nga7qhpwi22w84cgz"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-KPuAY/QMO2029tD4DMGCwmKuqpnxXAALYT+wE1ApfsI="; }; propagatedBuildInputs = with python3Packages; [ aiofiles audible click httpx pillow tabulate toml tqdm packaging setuptools questionary ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix index 4ad66a98ad..36fd90273f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/barman/default.nix @@ -4,13 +4,13 @@ }: python3Packages.buildPythonApplication rec { pname = "barman"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = pname; - rev = "release/${version}"; - sha256 = "sha256-WLKtra1kNxvm4iO3NEhMNCSioHL9I8GIgkbtu95IyTQ="; + rev = "refs/tags/release/${version}"; + sha256 = "sha256-e6euOtvJx+xUq5pWmWK6l7nv/twOa+0OABUTYvMd8Ow="; }; checkInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/bash_unit/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bash_unit/default.nix index a64a457cdf..4a72557f9a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bash_unit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bash_unit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bash_unit"; - version = "1.9.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "pgrange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TtpVldIAqyv+apXmbI+1L0NgZxoKdc6Ffrl4WOqRI9c="; + sha256 = "sha256-ekkyyp280YRXMuNXbiV78Hrfd/zk2nESE1bRCpUP1eE="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix index 41afb16a6f..a5ac320d96 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.208"; + version = "1.209"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0s57k2f11xkp8dddihkmvjj91s9chsny76qgk7nxq8svdwrv980g"; + sha256 = "sha256-xLdn5MANZVvU+Vl3yaHDaNZCd48KaMY4UzuI/jc7jEQ="; }; nativeBuildInputs = [ dpkg ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/bsp-layout/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bsp-layout/default.nix index 48f68bebe6..e5a78adcad 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bsp-layout/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bsp-layout/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "phenax"; repo = pname; - rev = "181d38443778e81df2d4bc3639063c3ae608f9c7"; - sha256 = "sha256-4NKI+OnOTYGaJnaPvSoXGJdSSzMo9AjYRLOomp9onoo="; + rev = "9d60fc271454ea1bfca598575207a06d8d172d3e"; + sha256 = "sha256-7bBVWJdgAnXLWzjQGZxVqhku2rsxX2kMxU4xkI9/DHE="; }; nativeBuildInputs = [ makeWrapper git bc ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 7fc8f0ad14..fef8750085 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.18.1"; + version = "2.20.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "sha256-eRlEhtpUBZBS3fNrkkXPiktPyGQ2K8MFwsDVo3DUb+o="; + sha256 = "sha256-02YPLWuwMBvjIrkkZWlOmoASJ0El0YcQhVnt8wfpMaY="; }; - vendorSha256 = "sha256-u+iFnBzlaa+7heQEI18WWD45TSxEpIY73ZrxjLx84Ic="; + vendorSha256 = "sha256-CJZiItzpk5vQBeKvarfHFsW2ek2yn7z6+CAlDPXdNyI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/colord/default.nix b/third_party/nixpkgs/pkgs/tools/misc/colord/default.nix index f3d7503b9c..77d06a6848 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/colord/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/colord/default.nix @@ -18,7 +18,7 @@ , ninja , vala , libgudev -, wrapGAppsHook +, wrapGAppsNoGuiHook , shared-mime-info , sane-backends , docbook_xsl @@ -26,6 +26,7 @@ , docbook_xml_dtd_412 , gtk-doc , libxslt +, enableDaemon ? !stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { "-Dlibcolordcompat=true" "-Dsane=true" "-Dvapi=true" + "-Ddaemon=${lib.boolToString enableDaemon}" "-Ddaemon_user=colord" ]; @@ -72,7 +74,7 @@ stdenv.mkDerivation rec { pkg-config shared-mime-info vala - wrapGAppsHook + wrapGAppsNoGuiHook ]; buildInputs = [ @@ -83,10 +85,11 @@ stdenv.mkDerivation rec { gusb lcms2 libgudev - polkit sane-backends sqlite systemd + ] ++ lib.optionals enableDaemon [ + polkit ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/colorpanes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/colorpanes/default.nix index 7028232c36..e89dc66897 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/colorpanes/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/colorpanes/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "papojari"; + owner = "annaaurora"; repo = pname; rev = "v${version}"; sha256 = "qaOH+LXNDq+utwyI1yzHWNt25AvdAXCTAziGV9ElroU="; @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Panes in the 8 bright terminal colors with shadows of the respective darker color"; - homepage = "https://codeberg.org/papojari/colorpanes"; + homepage = "https://codeberg.org/annaaurora/colorpanes"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/convimg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/convimg/default.nix index 38c20ca4e8..e82eb04196 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/convimg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/convimg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convimg"; - version = "8.9"; + version = "8.10.2"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JTKyOjeiu6FAUrDPDAwLBVgZwmNY11wHonqEV1ukRpw="; + sha256 = "sha256-mXwgTltYSBgBm2z1gDRCFqJbRoEuDbQAIoDlr2Kjmi0="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 5b8c1c38c5..90fd78ed04 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -123,7 +123,12 @@ stdenv.mkDerivation rec { # TODO(19b98110126fde7cbb1127af7e3fe1568eacad3d): Needed for fstatfs() I # don't know why it is not properly detected cross building with glibc. "fu_cv_sys_stat_statfs2_bsize=yes" - ]; + ] + # /proc/uptime is available on Linux and produces accurate results even if + # the boot time is set to the epoch because the system has no RTC. We + # explicitly enable it for cases where it can't be detected automatically, + # such as when cross-compiling. + ++ optional stdenv.hostPlatform.isLinux "gl_cv_have_proc_uptime=yes"; # The tests are known broken on Cygwin # (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19025), diff --git a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix index 1bbcaf1f34..06127a62df 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/czkawka/default.nix @@ -7,26 +7,31 @@ , pango , gdk-pixbuf , atk -, gtk3 +, gtk4 +, wrapGAppsHook +, gobject-introspection +, xvfb-run , testers , czkawka }: rustPlatform.buildRustPackage rec { pname = "czkawka"; - version = "4.1.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; rev = version; - sha256 = "sha256-N7fCYcjhYlFVkvWdFpR5cu98Vy+jStlBkR/vz/k1lLY="; + sha256 = "sha256-ochHohwCOKCF9kiiMxMIaJXaHUWNbq7pIh+VNRKQlcg="; }; - cargoSha256 = "sha256-4L7OjJ26Qpl5YuHil7JEYU8xWH65jiyFz0a/ufr7wYQ="; + cargoSha256 = "sha256-ap8OpaLs1jZtEHbXVZyaGj3gvblWtyHmYrHiHvZKhfs="; nativeBuildInputs = [ pkg-config + wrapGAppsHook + gobject-introspection ]; buildInputs = [ @@ -35,9 +40,19 @@ rustPlatform.buildRustPackage rec { pango gdk-pixbuf atk - gtk3 + gtk4 ]; + checkInputs = [ + xvfb-run + ]; + + checkPhase = '' + runHook preCheck + xvfb-run cargo test + runHook postCheck + ''; + passthru.tests.version = testers.testVersion { package = czkawka; command = "czkawka_cli --version"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dabet/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dabet/default.nix index 13a63b392c..3440a6e561 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dabet/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dabet/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitea { domain = "codeberg.org"; - owner = "papojari"; + owner = "annaaurora"; repo = pname; rev = "v${version}"; sha256 = "sha256-B5z2RUkvztnGCKeVsjp/yzrI8m/6mjBB0DS1yhFZhM4="; @@ -16,9 +16,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Print the duration between two times"; - homepage = "https://codeberg.org/papojari/dabet"; + homepage = "https://codeberg.org/annaaurora/dabet"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/datamash/default.nix b/third_party/nixpkgs/pkgs/tools/misc/datamash/default.nix index 25f814e5f3..15cd8234a5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/datamash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/datamash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "datamash"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1cxdlhgz3wzjqlq8bgwad93fgqymk2abbldfzw1ffnhcp4mmjjjp"; + sha256 = "sha256-etl+jH72Ft0DqlvWeuJMSIJy2z59H1d0FhwYt18p9v0="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index 9ee56a2d50..c386f7b260 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ddcutil"; - version = "1.2.2"; + version = "1.3.0"; src = fetchFromGitHub { owner = "rockowitz"; repo = "ddcutil"; rev = "v${version}"; - sha256 = "0hbd2ybpqmm96icg387vr57dqkdbc20vyimqjq5yx0sdlp4ikzi7"; + sha256 = "sha256-Di/feEQOHNhU3y/HwXQoOnu+gPQYP2Oedf1CPt8gHJ0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/debootstrap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/debootstrap/default.nix index 4efa6f6992..b8d099795e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/debootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/debootstrap/default.nix @@ -16,14 +16,14 @@ let binPath = lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.126"; + version = "1.0.127"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; rev = version; - sha256 = "0hfx6k86kby4xf0xqskpllq00g159j4khh66hfi6dhcdb91dgyd7"; + sha256 = "sha256-KKH9F0e4HEO2FFh1/V5UIY5C95ZOUm4nUhVUGqpZWaI="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/didu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/didu/default.nix new file mode 100644 index 0000000000..8a29cdb2d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/didu/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitea }: + +rustPlatform.buildRustPackage rec { + pname = "didu"; + version = "2.5.2"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "annaaurora"; + repo = pname; + rev = "v${version}"; + sha256 = "szYWRN1NZbfpshipwMMJSWJw/NG4w7I+aqwtmqpT0R0="; + }; + + cargoSha256 = "O1kkfrwv7xiOh3wCV/ce6cqpkMPRRzcXOFESYMAhiKA="; + + meta = with lib; { + description = "Duration conversion between units"; + homepage = "https://codeberg.org/annaaurora/didu"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ annaaurora ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index d12b6ecf66..72a72b3437 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, python3Packages, docutils, help2man, installShellFiles -, abootimg, acl, apksigner, apktool, binutils-unwrapped, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc +, abootimg, acl, apksigner, apktool, binutils-unwrapped-all-targets, bzip2, cbfstool, cdrkit, colord, colordiff, coreutils, cpio, db, diffutils, dtc , e2fsprogs, enjarify, file, findutils, fontforge-fonttools, ffmpeg, fpc, gettext, ghc, ghostscriptX, giflib, gnumeric, gnupg, gnutar , gzip, hdf5, imagemagick, jdk, libarchive, libcaca, llvm, lz4, mono, ocaml, oggvideotools, openssh, openssl, pdftk, pgpdump, poppler_utils, procyon, qemu, R , radare2, sng, sqlite, squashfsTools, tcpdump, ubootTools, odt2txt, unzip, wabt, xmlbeans, xxd, xz, zip, zstd @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { # # Still missing these tools: docx2txt lipo otool r2pipe pythonPath = [ - binutils-unwrapped bzip2 colordiff coreutils cpio db diffutils + binutils-unwrapped-all-targets bzip2 colordiff coreutils cpio db diffutils e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip libarchive lz4 openssl pgpdump sng sqlite squashfsTools unzip xxd xz zip zstd diff --git a/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix index a160fb8b1c..20699c5284 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dotter/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.12.11"; + version = "0.12.13"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-7K0p20FqaYFzOmUAeq1ousAPCeqE4AZoARF3UY4p4bY="; + hash = "sha256-j3Dj43AbD0V5pZ6mM1uvPsqWAVJrmWyWvwC5NK1cRRY="; }; - cargoHash = "sha256-BN6cdRmhvMjYQlaEa840+syuVKKUQ59TPMKicm40MTk="; + cargoHash = "sha256-HPs55JBbYObunU0cSm/7lsu/DOk4ne9Ea9MCRJ427zo="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix index b5fe5074d7..d630c94127 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/duc/default.nix @@ -8,13 +8,13 @@ assert enableCairo -> cairo != null && pango != null; stdenv.mkDerivation rec { pname = "duc"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "zevv"; repo = "duc"; rev = version; - sha256 = "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52"; + sha256 = "sha256-ZLNsyp82UnsveEfDKzH8WfRh/Y/PQlXq8Ma+jIZl9Gk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/eget/default.nix b/third_party/nixpkgs/pkgs/tools/misc/eget/default.nix new file mode 100644 index 0000000000..86a0feb2bc --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/eget/default.nix @@ -0,0 +1,48 @@ +{ lib +, fetchFromGitHub +, buildGoModule +, pandoc +, installShellFiles +, nix-update-script +, testers +, eget +}: + +buildGoModule rec { + pname = "eget"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "zyedidia"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-b1KQjYs9chx724HSSHhaMTQQBzTXx+ssrxNButJE6L0="; + }; + + vendorSha256 = "sha256-axJqi41Fj+MJnaLzSOnSws9/c/0dSkUAtaWkVXNmFxI="; + + ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; + + nativeBuildInputs = [ pandoc installShellFiles ]; + + postInstall = '' + pandoc man/eget.md -s -t man -o eget.1 + installManPage eget.1 + ''; + + passthru = { + updateScript = nix-update-script { attrPath = pname; }; + tests.version = testers.testVersion { + package = eget; + command = "eget -v"; + version = "v${version}"; + }; + }; + + meta = with lib; { + description = "Easily install prebuilt binaries from GitHub"; + homepage = "https://github.com/zyedidia/eget"; + license = licenses.mit; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/elfcat/Cargo.lock b/third_party/nixpkgs/pkgs/tools/misc/elfcat/Cargo.lock new file mode 100644 index 0000000000..b6e39fd5ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/elfcat/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "elfcat" +version = "0.1.8" diff --git a/third_party/nixpkgs/pkgs/tools/misc/elfcat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/elfcat/default.nix index da3316da0e..e2dec357d6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/elfcat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/elfcat/default.nix @@ -2,16 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "elfcat"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "ruslashev"; repo = pname; rev = version; - sha256 = "sha256-qmyD9BkD00yAQxmkgP2g5uvv/U7D/hUkCMJq44MI4YI="; + sha256 = "sha256-NzFKNCCPWBj/fhaEJF34nyeyvLMeQwIcQgTlYc6mgYo="; }; - cargoSha256 = null; + # There is no dependency to vendor in this project. + cargoLock.lockFile = ./Cargo.lock; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries."; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix index e257d2ad4c..0f8aecc5b1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fclones/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GimCHMUUjD1q5CfKXKtucIs/HLIJZnIbp+wtN+/jjhY="; + sha256 = "sha256-SmYRhOxyptY/DVc+JRT9Yn52WRHOS0B5tfmrqp05hxE="; }; - cargoSha256 = "sha256-/qSaPvI4K9AinewMlsCp2funJrZtwvoBUQ6816NQ8zw="; + cargoSha256 = "sha256-chiKNVZg6sUN9s1fhWCk64UOsw0nXkrjopfkAFbZbwI="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit diff --git a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix index afdc719a5e..cb09016b44 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eYCFX3JVsTnmVzHQd9JU6BT80kS0LTjVwVcfNJink1M="; + sha256 = "sha256-6zYz6DMnYSGyDXqP5K8bKauy23YA2tzBmGk72f5+bgY="; }; - cargoSha256 = "sha256-+N8/ZKj1Ht2lkTYSEm/lrLtopBQqc82gIFiLzJ6NogU="; + cargoSha256 = "sha256-ydt2YGx5WWk42Vq4RXhiRf6kIne7Q/6XwIu+HEnhDVw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fsrx/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fsrx/default.nix index 151d1eefa5..ad1ad389f1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fsrx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fsrx/default.nix @@ -1,23 +1,19 @@ -{ lib, fetchFromGitHub, rustPlatform, gitUpdater, testers, fsrx }: +{ lib, fetchFromGitHub, rustPlatform, testers, fsrx }: rustPlatform.buildRustPackage rec { pname = "fsrx"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { - owner = "coloradocolby"; + owner = "thatvegandev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pKdxYO8Rhck3UYxqiWHDlrlPS4cAPe5jLUu5Dajop/k="; + sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA="; }; - cargoSha256 = "sha256-5h+ou9FLCG/WWMEQPsCTa1q+PovxUJs+6lzQ0L2bKIs="; + cargoSha256 = "sha256-bRStmz2sJnhCKpvoQfc/ZP9B2ZdNHYNEHd+wZErdS1Y="; passthru = { - updateScript = gitUpdater { - inherit pname version; - rev-prefix = "v"; - }; tests.version = testers.testVersion { package = fsrx; }; @@ -25,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A flow state reader in the terminal"; - homepage = "https://github.com/coloradocolby/fsrx"; + homepage = "https://github.com/thatvegandev/fsrx"; license = licenses.mit; maintainers = with maintainers; [ MoritzBoehme ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index 5195af2774..850b4fe920 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fzf"; - version = "0.30.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "sha256-7E6fj/Sjew+zz+iMFkiSJjVn2rymKRvZtEJZH65INxk="; + sha256 = "sha256-gtRMoUEQEVoQXtA2PnVMLqrENUh5Jv8QiolqmeX5naQ="; }; - vendorSha256 = "sha256-omvCzM5kH3nAE57S33NV0OFRJmU+Ty7hhriaG/Dc0o0="; + vendorSha256 = "sha256-3ry93xV3KKtFoFGt2yxzMd4jx3QG2+8TBrEEywj7HPQ="; outputs = [ "out" "man" ]; @@ -34,8 +34,6 @@ buildGoModule rec { # Has a sneaky dependency on perl # Include first args to make sure we're patching the right thing - substituteInPlace shell/key-bindings.zsh \ - --replace " perl -ne " " ${perl}/bin/perl -ne " substituteInPlace shell/key-bindings.bash \ --replace " perl -n " " ${perl}/bin/perl -n " ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix b/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix new file mode 100644 index 0000000000..364cf2aca8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/getoptions/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchFromGitHub, shellcheck, shellspec, busybox-sandbox-shell, ksh, mksh, yash, zsh }: + +stdenvNoCC.mkDerivation rec { + pname = "getoptions"; + version = "3.3.0"; + + src = fetchFromGitHub { + owner = "ko1nksm"; + repo = "getoptions"; + rev = "v${version}"; + hash = "sha256-kUQ0dPjPr/A/btgFQu13ZLklnI284Ij74hCYbGgzF3A="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + doCheck = true; + + checkInputs = [ shellcheck shellspec busybox-sandbox-shell ksh mksh yash zsh ]; + + preCheck = '' + sed -i '/shellspec -s posh/d' Makefile + ''; + + checkTarget = "check testall"; + + meta = with lib; { + description = "An elegant option/argument parser for shell scripts (full support for bash and all POSIX shells)"; + homepage = "https://github.com/ko1nksm/getoptions"; + license = licenses.cc0; + platforms = platforms.all; + maintainers = with maintainers; [ matrss ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix new file mode 100644 index 0000000000..2dcf9dfea4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/gh-dash/default.nix @@ -0,0 +1,28 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "gh-dash"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "dlvhdr"; + repo = "gh-dash"; + rev = "v${version}"; + sha256 = "sha256-y7PJ8BDTiip6cjKQ3CVIcf3LwlGsEj3DHn3EOtCGa4A="; + }; + + vendorSha256 = "sha256-Hk/sBUI2XYB+ZHfuGUR3muEzUtVsGR28EkRD1jKg0Ss="; + + ldflags = [ "-s" "-w" ]; + + meta = { + description = "gh extension to display a dashboard with pull requests and issues"; + homepage = "https://github.com/dlvhdr/gh-dash"; + changelog = "https://github.com/dlvhdr/gh-dash/releases/tag/${src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ amesgen ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix index 948132416a..5692ac812d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gh-ost"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "github"; repo = "gh-ost"; rev = "v${version}"; - sha256 = "sha256-HtLtwqPijOE19iJ2AUNAnyc2ujLPeH43HSg3QRBbKEg="; + sha256 = "sha256-FTWKbZ/32cr/BUI+jtV0HYlWDFz+R2YQd6ZSzilDj64="; }; goPackagePath = "github.com/github/gh-ost"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix index 20942f4e3c..c2d422fe9a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.6"; + version = "1.6.2"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+42jTYYJyj+6ZRCfkgVwpyTS2lXdThlGHKD2iSoZkEI="; + sha256 = "sha256-Ie+66zfw11dzUgAHSRtJA09nWSSvyHZ0ygkVL4aZO14="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 7ba3de825f..94a32cbb79 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-v9/zy7wHqZexaIn3iVDvr3RQNGncnNqqcl88kNDBAfQ="; + sha256 = "sha256-+xrjIef8ToN07sfgZt/R5ZfCJ68v9293dSfaOwh1kmI="; }; vendorSha256 = "sha256-sJHq2ZSeCpUXhcF5HZQxIE0Jkutnc/m86NcaDNs7a7A="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix index 04f588081f..c544a70d86 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotify-cli"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "gotify"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-X41m7bCilDgnTMJy3ISz8g7dAtaz/lphwaCPZDGMDXk="; + sha256 = "sha256-dkG2dzt2PvIio+1/yx8Ihui6WjwvbBHlhJcoXADZBl4="; }; - vendorSha256 = "sha256-DvpdmURhOxDVFJiRtTGVw6u6y+s5XteT1owmdBJcKHA="; + vendorSha256 = "sha256-0Utc1rGaFpDXhxMZ8bwMCYbfAyqNiQKtyqZMdhBujMs="; postInstall = '' mv $out/bin/cli $out/bin/gotify diff --git a/third_party/nixpkgs/pkgs/tools/misc/gpick/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gpick/default.nix index 0d39bb810b..8edb12684c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gpick/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gpick/default.nix @@ -1,4 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, glib, boost, pkg-config, gtk3, ragel, lua, lib }: +{ stdenv +, fetchFromGitHub +, cmake +, glib +, wrapGAppsHook +, boost +, pkg-config +, gtk3 +, ragel +, lua +, lib +}: stdenv.mkDerivation rec { pname = "gpick"; @@ -11,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-Z67EJRtKJZLoTUtdMttVTLkzTV2F5rKZ96vaothLiFo="; }; - nativeBuildInputs = [ cmake pkg-config ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; buildInputs = [ boost gtk3 ragel lua ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix b/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix index 62c216adcb..f3482ab613 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grex/default.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.3.0"; - - cargoSha256 = "sha256-zNwTk4RcTv2dGbKWelOPSvasBmj7tnjLhQ0DZhZ9hxk="; + version = "1.4.0"; src = fetchFromGitHub { owner = "pemistahl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NMz35jgd7XPemVdA8nol2H6cgWD3yEPh0FEMPw8kgKQ="; + sha256 = "sha256-iKrsiHGXaZ4OXkS28+6r0AhPZsb22fDVbDA2QjaVVTw="; }; + cargoSha256 = "sha256-J+kz4aj6CXm0QsMQfPwK+30EtQOtfpCwp821DLhpVCI="; + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index 3849e26a01..4b4141566c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { # Pull upstream patch to fix linkage against binutils-2.36. (fetchpatch { - name = "binutils-2.36"; + name = "binutils-2.36.patch"; url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=b98275138bf4fc250a1c362dfd2c8b1cf2421701"; sha256 = "001m058bsl2pcb0ii84jfm5ias8zgzabrfy6k2cc9w6w1y51ii82"; }) diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix index 606f06d340..051e98862b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hdf4/default.nix @@ -88,12 +88,6 @@ stdenv.mkDerivation rec { doCheck = true; - preCheck = '' - export LD_LIBRARY_PATH=$(pwd)/bin - '' + lib.optionalString (stdenv.isDarwin) '' - export DYLD_LIBRARY_PATH=$(pwd)/bin - ''; - excludedTests = lib.optionals stdenv.isDarwin [ "MFHDF_TEST-hdftest" "MFHDF_TEST-hdftest-shared" diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix index d342822590..76efc76678 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hdf5/default.nix @@ -25,7 +25,7 @@ assert !cppSupport || !mpiSupport; let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - version = "1.12.1"; + version = "1.12.2"; pname = "hdf5" + lib.optionalString cppSupport "-cpp" + lib.optionalString fortranSupport "-fortran" @@ -34,7 +34,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-qvn1MrPtqD09Otyfi0Cpt2MVIhj6RTScO8d1Asofjxw="; + sha256 = "sha256-Goi742ITos6gyDlyAaRZZD5xVcnckeBiZ1s/sH7jiv4="; }; passthru = { @@ -74,8 +74,6 @@ stdenv.mkDerivation rec { ++ optionals threadsafe [ "--enable-threadsafe" "--disable-hl" ]; patches = [ - ./bin-mv.patch - # Avoid non-determinism in autoconf build system: # - build time # - build user diff --git a/third_party/nixpkgs/pkgs/tools/misc/hyfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hyfetch/default.nix new file mode 100644 index 0000000000..80582524ee --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/hyfetch/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchFromGitHub, typing-extensions, setuptools }: + +buildPythonPackage rec { + pname = "HyFetch"; + version = "1.3.0"; + + src = fetchFromGitHub { + repo = "hyfetch"; + owner = "hykilpikonna"; + rev = version; + sha256 = "sha256-8Mp3MV9HVzXzT/W6F/lD34tT0uOgqyydg31PlR3sMUA="; + }; + + # TODO: Remove with next release bump since it has been fixed upstream (hykilpikonna/hyfetch@d797a8c) + postPatch = '' + chmod +x neofetch + ''; + + propagatedBuildInputs = [ + typing-extensions + setuptools + ]; + + meta = with lib; { + description = "neofetch with pride flags <3"; + longDescription = '' + HyFetch is a command-line system information tool fork of neofetch. + HyFetch displays information about your system next to your OS logo + in ASCII representation. The ASCII representation is then colored in + the pattern of the pride flag of your choice. The main purpose of + HyFetch is to be used in screenshots to show other users what + operating system or distribution you are running, what theme or + icon set you are using, etc. + ''; + homepage = "https://github.com/hykilpikonna/HyFetch"; + license = licenses.mit; + mainProgram = "hyfetch"; + maintainers = with maintainers; [ yisuidenghua ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix index 1a5cc30264..897c1bdf50 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/hyperfine/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.13.0"; + version = "1.14.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1TWaLw1JxUE8RjPVVTldCbMSArNb+uhXM865iuJaJUo="; + sha256 = "sha256-3DDgh/0iD1LJEPjicLtHcs9PMso/Wv+3vlkWfdJlpIM="; }; - cargoSha256 = "sha256-kzDjxWMXie6qjherzdXvHxrS4i8FAXcKiuk/+wbMkAA="; + cargoSha256 = "sha256-VkB6KJUi5PACpjrK/OJ5tmroJJVnDxhZAQzSWkrtuCU="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix index 172bcc074a..aa77f6b4a3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.0"; + version = "0.10.9"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-soMATF2lVFFwdKjqm7YiQ66MsjOk2pyrohFlHMMGiW0="; + sha256 = "sha256-qDMGeuNY/Y7A6ZGd6giztQrx4psUAjOamUbC0Z4H80k="; }; - vendorSha256 = "sha256-gPNQQQvHQch4Qa4c6OtS26lohhigzspB5M5H4NvvJY0="; + vendorSha256 = "sha256-ccoFTg5OYpaagyzb2lJLr6WlTO/L4YevXK09gZOELOw="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix index dacc3416c9..03efc1b664 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ipxe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, unstableGitUpdater +{ stdenv, lib, fetchFromGitHub, unstableGitUpdater, buildPackages , gnu-efi, mtools, openssl, perl, xorriso, xz , syslinux ? null , embedScript ? null @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { version = "unstable-2022-04-06"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + strictDeps = true; src = fetchFromGitHub { owner = "ipxe"; @@ -51,6 +54,7 @@ stdenv.mkDerivation rec { makeFlags = [ "ECHO_E_BIN_ECHO=echo" "ECHO_E_BIN_ECHO_E=echo" # No /bin/echo here. + "CROSS=${stdenv.cc.targetPrefix}" ] ++ lib.optional (embedScript != null) "EMBED=${embedScript}"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ix/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ix/default.nix index 95b53c3b6c..e3fc85406e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ix/default.nix @@ -1,30 +1,36 @@ -{ lib, stdenv, fetchurl, makeWrapper, curl }: +{ lib, resholve, fetchurl, bash, curl }: -stdenv.mkDerivation { +resholve.mkDerivation { pname = "ix"; version = "20190815"; src = fetchurl { url = "http://ix.io/client"; - sha256 = "0xc2s4s1aq143zz8lgkq5k25dpf049dw253qxiav5k7d7qvzzy57"; + hash = "sha256-p/j/Nz7tzLJV7HgUwVsiwN1WxCx4Por+HyRgFTTRgnU="; }; - nativeBuildInputs = [ makeWrapper ]; - dontUnpack = true; installPhase = '' - install -Dm +x $src $out/bin/ix + runHook preInstall + + install -Dm555 $src $out/bin/ix + substituteInPlace $out/bin/ix \ + --replace '$echo ' "" + + runHook postInstall ''; - postFixup = '' - wrapProgram $out/bin/ix --prefix PATH : "${lib.makeBinPath [ curl ]}" - ''; + solutions.default = { + scripts = [ "bin/ix" ]; + interpreter = "${lib.getExe bash}"; + inputs = [ curl ]; + }; meta = with lib; { homepage = "http://ix.io"; description = "Command line pastebin"; - maintainers = with maintainers; [ asymmetric ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/kalker/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kalker/default.nix index b4a84adb45..8e976bb063 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/kalker/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/kalker/default.nix @@ -6,16 +6,16 @@ }: rustPlatform.buildRustPackage rec { pname = "kalker"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "PaddiM8"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NnX4+VmV4oZg/8Z3ZCWHGZ6dqDfvH30XErnrvKMxyls="; + sha256 = "sha256-D7FlX72fcbeVtQ/OtK2Y3P1hZ5Bmowa04up5rTTXDDU="; }; - cargoSha256 = "sha256-nSLbe3EhcLYylvyzOWuLIehBnD6mMofsNpFQVEybV8k="; + cargoSha256 = "sha256-r20kQG6YeNGGb7ovYaAx+4DGijZSmf5YoIYh3z5zOpk="; buildInputs = [ gmp mpfr libmpc ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ksnip/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ksnip/default.nix index 788f4b75b4..a106869233 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ksnip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ksnip/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ksnip"; - version = "1.9.2"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ksnip"; repo = "ksnip"; rev = "v${version}"; - sha256 = "sha256-4EIb1cHmScnFN7IralBR5hnvPBCHNQRcTWEWYezoOcQ="; + sha256 = "sha256-a5mS2mrbs0CyZ83hwwFdherq6kMS93ItQIDKu1AjnN4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix index 26627500e8..0d7da5546e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/libgen-cli/default.nix @@ -1,16 +1,17 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: + buildGoModule rec { pname = "libgen-cli"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "ciehanski"; repo = pname; rev = "v${version}"; - sha256 = "15nzdwhmgpm36dqx7an5rjl5sw2r4p66qn2y3jzl6fc0y7224ns1"; + sha256 = "sha256-Ga9C4h1dcjIdsLJLgZ9s1Fnq4ejI5q0gUtapg/FpLcM="; }; - vendorSha256 = "0smb83mq711b2pby57ijcllccn7y2l10zb4fbf779xibb2g09608"; + vendorSha256 = "sha256-uHu0BfF26COL/S/yswdcVJVYwozl8Pl3RXHSctYQi+s="; doCheck = false; @@ -18,11 +19,13 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; + ldflags = [ "-s" "-w" ]; + postInstall = '' - for shell in bash zsh; do - $out/bin/libgen-cli completion $shell > libgen-cli.$shell || : - installShellCompletion libgen-cli.$shell - done + installShellCompletion --cmd libgen-cli \ + --bash <($out/bin/libgen-cli completion bash) \ + --fish <($out/bin/libgen-cli completion fish) \ + --zsh <($out/bin/libgen-cli completion zsh) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/lottieconverter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lottieconverter/default.nix index ad2721c36e..e7ee6e9b74 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lottieconverter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lottieconverter/default.nix @@ -1,34 +1,42 @@ -{ lib, stdenv, fetchFromGitHub, libpng, rlottie, zlib }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, libpng +, rlottie +, giflib +}: -stdenv.mkDerivation rec { - pname = "LottieConverter"; - version = "0.1.1"; +stdenv.mkDerivation (finalAttrs: { + pname = "lottieconverter"; + version = "0.2"; src = fetchFromGitHub { owner = "sot-tech"; - repo = pname; - rev = "r${version}"; - hash = "sha256-lAGzh6B2js2zDuN+1U8CZnse09RJGZRXbtmsheGKuYU="; + repo = finalAttrs.pname; + rev = "r${finalAttrs.version}"; + hash = "sha256-oCFQsOQbWzmzClaTOeuEtGo7uXoKYtaJuSLLgqAQP1M="; }; - buildInputs = [ libpng rlottie zlib ]; - makeFlags = [ "CONF=Release" ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libpng rlottie giflib ]; + + cmakeFlags = [ + "-DSYSTEM_RL=1" + "-DSYSTEM_GL=1" + ]; installPhase = '' runHook preInstall - - mkdir -p $out/bin - cp -v dist/Release/GNU-Linux/lottieconverter $out/bin/ - + install -Dm755 lottieconverter "$out/bin/lottieconverter" runHook postInstall ''; meta = with lib; { homepage = "https://github.com/sot-tech/LottieConverter/"; description = "Lottie converter utility"; - license = licenses.lgpl21Plus; + license = licenses.bsd3; platforms = platforms.all; - maintainers = with maintainers; [ CRTified ]; - broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/lottieconverter.x86_64-darwin + maintainers = with maintainers; [ CRTified nickcao ]; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix b/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix index 4c9d5a6da8..1273e8c63e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "massren"; - version = "1.5.4"; + version = "1.5.6"; src = fetchFromGitHub { owner = "laurent22"; repo = "massren"; rev = "v${version}"; - sha256 = "1bn6qy30kpxi3rkr3bplsc80xnhj0hgfl0qaczbg3zmykfmsl3bl"; + sha256 = "sha256-17y+vmspvZKKRRaEwzP3Zya4r/z+2aSGG6oNZiA8D64="; }; goPackagePath = "github.com/laurent22/massren"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix index bb7ccb375b..bdefd4a1b2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "sha256-k8Z/CS1vbnQvoddos7Y0KcM1zB8QDAbXaROjNCyPEN0="; + sha256 = "sha256-rim2ndXjoqIn5P60D5+FFuq0CDAOf29xCJ7rfemMzVU="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoSha256 = "sha256-2SKgzVJdtzH9poHx/NJba6+lj/C0PBcEgI/2ITO18Bk="; + cargoSha256 = "sha256-W1SPunH4fgam1JDI+JnLoAKCwx1RLY2JotNSyZAQoSY="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/melody/default.nix b/third_party/nixpkgs/pkgs/tools/misc/melody/default.nix index f483b69926..99b6ec2fc6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/melody/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/melody/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "melody"; - version = "0.18.0"; + version = "0.18.1"; src = fetchCrate { pname = "melody_cli"; inherit version; - sha256 = "1shd5m9sj9ybjzq26ipggfbc22lyzkdzq2kirgfvdk16m5r3jy2v"; + sha256 = "sha256-Az1pGRty7wAC5fN7RlO/etaW5w5TrsO6VVXv5M7NUfU="; }; - cargoSha256 = "0wz696zz7gm36dy3lxxwsiriqxk0nisdwybvknn9a38rvzd6jjbm"; + cargoSha256 = "sha256-EhPrARdDnwdxfK1JHuuHVrxSDZhuE+kTBQr45JxluUA="; meta = with lib; { description = "Language that compiles to regular expressions"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix index d8538dfea7..127d8d9f1a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.19.4"; + version = "0.20.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - hash = "sha256-vpLa0ipRV+JZoRa7jKn9ZNITvoQ8ABG2Qw1SyMZayK0="; + hash = "sha256-56XP8e05rdslkrjmHRuYszqcBFZ7xCuj74mfGS9jznQ="; }; - cargoSha256 = "sha256-zBBU55VlXWYISMbKv07UfOPZ3vWRlpp4estuCcDBDDY="; + cargoSha256 = "sha256-NZ2/N09LFAvXFGpJj4kx7jpt1G6akXsrVe6XqQPCN9g="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/misc/mktorrent/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mktorrent/default.nix index 089caac788..36aee2034c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mktorrent/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mktorrent/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitHub, openssl}: +{ lib, stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { pname = "mktorrent"; @@ -19,10 +19,11 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; - meta = { - homepage = "https://github.com/pobrn/mktorrent/wiki"; - license = lib.licenses.gpl2Plus; + meta = with lib; { description = "Command line utility to create BitTorrent metainfo files"; - maintainers = with lib.maintainers; [Profpatsch]; + homepage = "https://github.com/pobrn/mktorrent/wiki"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ Profpatsch winter ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix new file mode 100644 index 0000000000..8e8854a5e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix @@ -0,0 +1,29 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "mloader"; + version = "1.1.9"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "81e4dc7117999d502e3345f8e32df8b16cca226b8b508976dde2de81a4cc2b19"; + }; + + propagatedBuildInputs = with python3Packages; [ + click + protobuf + requests + ]; + + # No tests in repository + doCheck = false; + + pythonImportsCheck = [ "mloader" ]; + + meta = with lib; { + description = "Command-line tool to download manga from mangaplus"; + homepage = "https://github.com/hurlenko/mloader"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/mmctl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mmctl/default.nix index 2040d18e5f..4a648e2310 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mmctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mmctl/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "mmctl"; - version = "7.0.1"; + version = "7.1.2"; src = fetchFromGitHub { owner = "mattermost"; repo = "mmctl"; rev = "v${version}"; - sha256 = "sha256-xNj8aM3hpcvxwXCdFCfkXDBagIdCjcjWLGNp43KsV10="; + sha256 = "sha256-wqX6HVcI8PTE0gFYh03oxWRQ1Tzs/Z9V2cG9qu1MsLA="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index 9d0e9f62b5..d9c5c2a04b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.32.2"; + version = "1.32.6"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,10 +82,12 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-ceQp4EiLEWy8niGC0uUdWJrvmdt9Ijt29YdLt7vtcyY="; + sha256 = "sha256-lrdDy8wtkIBQC/OPdSoKmOFIuajKeu1qtyRHOLZSSVI="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; + # NOTE While MongoDB Compass is available to darwin, I do not have resources to test it + # Feel free to make a PR adding support if desired in stdenv.mkDerivation { pname = "mongodb-compass"; @@ -128,7 +130,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "The GUI for MongoDB"; maintainers = with maintainers; [ bryanasdev000 ]; - homepage = "https://www.mongodb.com/products/compass"; + homepage = "https://github.com/mongodb-js/compass"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.sspl; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix index 45e9a08a35..f84dd4368d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mongo-tools"; - version = "100.5.3"; + version = "100.5.4"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-tools"; rev = version; - sha256 = "sha256-8RkpBCFVxKVsu4h2z+rhlwvYfbSDHZUg8erO4+2GRbw="; + sha256 = "sha256-/DbsQh0VinI71ev47hGKfB4PaBlzcOyGHRlmDzW0j7s="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mprime/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mprime/default.nix index 3189e41de8..159159ce90 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mprime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mprime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, curl, hwloc, gmp }: +{ stdenv, lib, fetchurl, unzip, boost, curl, hwloc, gmp }: let throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -18,11 +18,11 @@ in stdenv.mkDerivation rec { pname = "mprime"; - version = "29.8b7"; + version = "30.8b15"; src = fetchurl { url = "https://www.mersenne.org/ftp_root/gimps/p95v${lib.replaceStrings ["."] [""] version}.source.zip"; - sha256 = "0x5dk2dcppfnq17n79297lmn6p56rd66cbwrh1ds4l8r4hmwsjaj"; + hash = "sha256-CNYorZStHV0aESGX9LfLZ4oD5PFR2UOFLN1MiLaKw58="; }; postPatch = '' @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ unzip ]; - buildInputs = [ curl hwloc gmp ]; + buildInputs = [ boost curl hwloc gmp ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix index f5e31ed2d3..53afa9f4db 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.14.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FNV4X9/BdnfFGKVJXNpCJLdr3Y29LrGi+zUuQ07xUbE="; + sha256 = "sha256-vdgAil/88fl5/UhsbbAWrxh/YUiGbyXj4pqZFv4YwHc="; }; - vendorSha256 = "sha256-5nt9YHMgaRpkFdOnBTU4gSdOtB3h9Cj5CCUjx9PJ/m8="; + vendorSha256 = "sha256-qb0auYQJHnpGafonWoYq3tax6uLdOCIdz+oZ7I6bytk="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix index 422e315fc9..1977cef481 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "6.10.1"; + version = "6.11.2"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "00c0k12yc2vqx0am1mhcjbn7fh3dab2zixslyh1smzcww275rk59"; + sha256 = "sha256-FHyI9Bwci2spMz5DiSyVsJ5Vz1t/NJ3gsg13fBbanpc="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ncdu_2/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ncdu/1.nix similarity index 62% rename from third_party/nixpkgs/pkgs/tools/misc/ncdu_2/default.nix rename to third_party/nixpkgs/pkgs/tools/misc/ncdu/1.nix index 0cfb78bcf0..d1c185c0f2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ncdu_2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ncdu/1.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, fetchurl, zig, ncurses }: +{ lib, stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "ncdu"; - version = "2.1.2"; + version = "1.17"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-ng1u8DYYo8MWcmv0khe37+Rc7HWLLJF86JLe10Myxtw="; + sha256 = "sha256-gQdFqO0as3iMh9OupMwaFO327iJvdkvMOD4CS6Vq2/E="; }; - XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv - - nativeBuildInputs = [ - zig - ]; - buildInputs = [ ncurses ]; - PREFIX = placeholder "out"; - meta = with lib; { description = "Disk usage analyzer with an ncurses interface"; homepage = "https://dev.yorhel.nl/ncdu"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix index d1c185c0f2..0cfb78bcf0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix @@ -1,16 +1,24 @@ -{ lib, stdenv, fetchurl, ncurses }: +{ lib, stdenv, fetchurl, zig, ncurses }: stdenv.mkDerivation rec { pname = "ncdu"; - version = "1.17"; + version = "2.1.2"; src = fetchurl { url = "https://dev.yorhel.nl/download/${pname}-${version}.tar.gz"; - sha256 = "sha256-gQdFqO0as3iMh9OupMwaFO327iJvdkvMOD4CS6Vq2/E="; + sha256 = "sha256-ng1u8DYYo8MWcmv0khe37+Rc7HWLLJF86JLe10Myxtw="; }; + XDG_CACHE_HOME="Cache"; # FIXME This should be set in stdenv + + nativeBuildInputs = [ + zig + ]; + buildInputs = [ ncurses ]; + PREFIX = placeholder "out"; + meta = with lib; { description = "Disk usage analyzer with an ncurses interface"; homepage = "https://dev.yorhel.nl/ncdu"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix index 9a6d03c6dc..806655ffe9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/neofetch/default.nix @@ -25,6 +25,12 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-F6Q4dUtfmR28VxLbITiLFJ44FjG4T1Cvuz3a0nLisMs="; name = "update_old_nixos_logo.patch"; }) + # https://github.com/dylanaraps/neofetch/pull/2157 + (fetchpatch { + url = "https://github.com/dylanaraps/neofetch/commit/de253afcf41bab441dc58d34cae654040cab7451.patch"; + sha256 = "sha256-3i7WnCWNfsRjbenTULmKHft5o/o176imzforNmuoJwo="; + name = "improve_detect_nixos_version.patch"; + }) ]; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix index 15c80f1e68..e4e34d1fb6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { pname = "nix-direnv"; - version = "2.1.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-direnv"; rev = version; - sha256 = "sha256-PANJTaGdMvIPglgQCOs+fJc20ZnnHXx7rBdyoA4rQ0A="; + sha256 = "sha256-6UvOnFmohdhFenpEangbLLEdE0PeessRJjiO0mcydWI="; }; # Substitute instead of wrapping because the resulting file is diff --git a/third_party/nixpkgs/pkgs/tools/misc/nomino/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nomino/default.nix index d30d40527e..c8dcfd3130 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/nomino/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/nomino/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "yaa110"; repo = pname; rev = version; - sha256 = "1nnyz4gkwrc2zccw0ir5kvmiyyv3r0vxys9r7j4cf0ymngal5kwp"; + sha256 = "sha256-+bnEuSro3/t9aXu2WpwsaqHqB+poSXsVbna01a7pnKo="; }; - cargoSha256 = "0501w3124vkipb1rnksjaizkghw3jf3nmmmmf3zprmcaim1b4szg"; + cargoSha256 = "sha256-IKsA8btCmKnZfRIwS4QdxJMi1As6SNbTI7ibOL7M+5U="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix index c964a8872f..ac3ff7a59b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/noti/default.nix @@ -1,7 +1,13 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub -, Cocoa ? null }: +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, fetchurl +, Cocoa +, installShellFiles +}: -buildGoPackage rec { +buildGoModule rec { pname = "noti"; version = "3.5.0"; @@ -12,17 +18,29 @@ buildGoPackage rec { sha256 = "12r9wawwl6x0rfv1kahwkamfa0pjq24z60az9pn9nsi2z1rrlwkd"; }; + patches = [ + # update golang.org/x/sys to fix building on aarch64-darwin + # using fetchurl because fetchpatch breaks the patch + (fetchurl { + url = "https://github.com/variadico/noti/commit/a90bccfdb2e6a0adc2e92f9a4e7be64133832ba9.patch"; + sha256 = "sha256-vSAwuAR9absMSFqGOlzmRZoOGC/jpkmh8CMCVjeleUo="; + }) + ]; + + vendorSha256 = null; + + nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optional stdenv.isDarwin Cocoa; - goPackagePath = "github.com/variadico/noti"; - ldflags = [ - "-X ${goPackagePath}/internal/command.Version=${version}" + "-s" + "-w" + "-X github.com/variadico/noti/internal/command.Version=${version}" ]; postInstall = '' - install -Dm444 -t $out/share/man/man1 $src/docs/man/*.1 - install -Dm444 -t $out/share/man/man5 $src/docs/man/*.5 + installManPage docs/man/* ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix index d905c92438..8bee0c304f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ntfy/default.nix @@ -46,6 +46,13 @@ in python.pkgs.buildPythonApplication rec { url = "https://github.com/dschep/ntfy/commit/2346e7cfdca84c8f1afc7462a92145c1789deb3e.patch"; sha256 = "13k7jbsdx0jx7l5s8whirric76hml5bznkfcxab5xdp88q52kpk7"; }) + # Add compatibility with emoji 2.0 + # https://github.com/dschep/ntfy/pull/250 + (fetchpatch { + name = "ntfy-Add-compatibility-with-emoji-2.0.patch"; + url = "https://github.com/dschep/ntfy/commit/4128942bb7a706117e7154a50a73b88f531631fe.patch"; + sha256 = "sha256-V8dIy/K957CPFQQS1trSI3gZOjOcVNQLgdWY7g17bRw="; + }) ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 88a1e71d90..19b8681b34 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.51.0"; + version = "0.57.2"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-lMTOJFGuJhdXOvCk70Bee97Vb0HBCDnOLeK2q7S4hW8="; + sha256 = "sha256-g0NnEo1M3PtQH2n0UcECC7l9laLx3UrduR4X4aZvnuA="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-G3sIWkYKYnqDmmwspQNw+8yU/SWBBr8KX7Osae9mXe4="; + vendorSha256 = "sha256-fq85frUmZxH8ekFuxyTjnY22Sb1Ts7nahcgI6ArGY4A="; subPackages = [ "cmd/otelcontribcol" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix index 35ae2ca3f1..a32512157c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.51.0"; + version = "0.58.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-XCOyvFWvgGxjuOdyFk4Rh+HO8GBdRfWcR73h+7lF+8E="; + sha256 = "sha256-qWRuVzRFuUBfnBkc6KDWTkPahk980KLdRqUnPbKJjpU="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorSha256 = "sha256-BAcJpiO6jFKcjtbBA9LDad1ifDpb47nWOylH8dDBUN0="; + vendorSha256 = "sha256-iK4oXNZe4/4/Yh9/Rq3St9MmeqEq6bVu8sTh4rdMi0c="; preBuild = '' # set the build version, can't be done via ldflags diff --git a/third_party/nixpkgs/pkgs/tools/misc/os-prober/default.nix b/third_party/nixpkgs/pkgs/tools/misc/os-prober/default.nix index 7fdbbc1fae..b38cb81748 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/os-prober/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/os-prober/default.nix @@ -11,14 +11,14 @@ lvm2 # lvs }: stdenv.mkDerivation rec { - version = "1.79"; + version = "1.81"; pname = "os-prober"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = pname; rev = version; - sha256 = "sha256-ntwH5TIA18IOgYPkHMLU0EVykkHs6Z0wseYEPsU0KvQ="; + sha256 = "sha256-3FXfGadIcmKp4qn6ZDcOSQHYsUNP2ObL1cJesNle+8A="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix index 189f549e17..cf0ab2776b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { homepage = "https://libosinfo.org/"; changelog = "https://gitlab.com/libosinfo/osinfo-db-tools/-/blob/v${version}/NEWS"; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix index 6da0de81cd..06176efb01 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , fetchpatch , substituteAll @@ -41,13 +42,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2022.2"; + version = "2022.5"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "sha256-duL1tXhNjLaG6QvjL87LtWxsaoJOA3ShpoILV3EDZ2s="; + sha256 = "sha256-kUxNmTvBEdfdMK6XIbb/6KtW6x/W6BsJewn0AMwbBT8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/outils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/outils/default.nix new file mode 100644 index 0000000000..065d641f4f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/outils/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, lib }: + +stdenv.mkDerivation rec { + pname = "outils"; + version = "0.10"; + + src = fetchFromGitHub { + owner = "leahneukirchen"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-xYjILa0Km57q/xNP+M34r29WLGC15tzUNoUgPzQTtIs="; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + homepage = "https://github.com/leahneukirchen/outils"; + description = "Port of OpenBSD-exclusive tools such as `calendar`, `vis`, and `signify`"; + license = with licenses; [ + beerware + bsd2 + bsd3 + bsdOriginal + isc + mit + publicDomain + ]; + platforms = platforms.linux; + maintainers = with maintainers; [ somasis ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix b/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix index 7271074cc0..eda2619bca 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "08wh9i0pk7qq2az0nd8g8gqlzwril49qffi0zcrmn7r0nx44cdjm"; + sha256 = "sha256-qx/Uz/X9ZJ4ebV+OMtXVoReh61YAp9iRcJmywGfKiUw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/partition-manager/default.nix b/third_party/nixpkgs/pkgs/tools/misc/partition-manager/default.nix index 851179c8d8..e4691100da 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/partition-manager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/partition-manager/default.nix @@ -41,11 +41,11 @@ let in mkDerivation rec { pname = "partitionmanager"; # NOTE: When changing this version, also change the version of `kpmcore`. - version = "22.04.0"; + version = "22.04.3"; src = fetchurl { url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-eChn3OkdLHC9pedDBBwszTeTj2l7ky2W79INqvjrkBo="; + hash = "sha256-wt5iQC8Ok6Ey4JJEipz8rk5UxS8kCKRmQZnQAm0WhOg="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/patdiff/default.nix b/third_party/nixpkgs/pkgs/tools/misc/patdiff/default.nix deleted file mode 100644 index 2e84d0015d..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/patdiff/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ ocamlPackages }: - -with ocamlPackages; - -janePackage { - pname = "patdiff"; - hash = "0623a7n5r659rkxbp96g361mvxkcgc6x9lcbkm3glnppplk5kxr9"; - propagatedBuildInputs = [ core_unix patience_diff ocaml_pcre ]; - meta = { - description = "File Diff using the Patience Diff algorithm"; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/misc/perccli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/perccli/default.nix new file mode 100644 index 0000000000..517fffead5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/perccli/default.nix @@ -0,0 +1,37 @@ +{ lib +, stdenvNoCC +, fetchurl +, rpmextract +}: +stdenvNoCC.mkDerivation rec { + pname = "perccli"; + version = "7.1910.00"; + + src = fetchurl { + url = "https://dl.dell.com/FOLDER07815522M/1/PERCCLI_${version}_A12_Linux.tar.gz"; + sha256 = "sha256-Gt/kr5schR/IzFmnhXO57gjZpOJ9NSnPX/Sj7zo8Qjk="; + # Dell seems to block "uncommon" user-agents, such as Nixpkgs's custom one. + # Sending no user-agent at all seems to be fine though. + curlOptsList = [ "--user-agent" "" ]; + }; + + nativeBuildInputs = [ rpmextract ]; + + buildCommand = '' + tar xf $src + rpmextract PERCCLI_*_Linux/perccli-*.noarch.rpm + install -D ./opt/MegaRAID/perccli/perccli64 $out/bin/perccli64 + ln -s perccli64 $out/bin/perccli + + # Not needed because the binary is statically linked + #eval fixupPhase + ''; + + meta = with lib; { + description = "Perccli Support for PERC RAID controllers"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ panicgh ]; + platforms = with platforms; intersectLists x86_64 linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index 41e6694267..99b5231f82 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pgmetrics"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "rapidloop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VDobaU+zY1ubVBrb/pdKKfSWCYTRDz1ssqZ0Fsv0KBc="; + sha256 = "sha256-Cvx3Lc4FH6RX9UrjX7L3FSt+CcAWieBRTFT1CsLkdFg="; }; vendorSha256 = "sha256-aE/TZ0QlGYvuMVZDntXmYkUKos5NTI/ncRPp9A4CScY="; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix index 060f3a3e23..d034345220 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pipe-rename/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "pipe-rename"; - version = "1.4.1"; + version = "1.5.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-3Jl/G1QqcChwkI5n1zQLBgGxT2CYdh3XdMHkF+V5SG4="; + sha256 = "sha256-NTAZy2ERxznRVld1WzYBchJakOIfs5uJr3yRNt81rMg="; }; - cargoSha256 = "sha256-y5BsdkHrjJHNO66MQTbvA6kKx6tLP7jNk5UmAmslz14="; + cargoSha256 = "sha256-6Rv3rVQEvxdrEp5plhf9NAxpXOD4szwFGU5M6tvakzk="; checkInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix index bf81a4ad90..5727d5466c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl }: let - version = "1.2022.2"; + version = "1.2022.6"; 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-h4ulXzZ5L+VPhk2CnZQNxfnEJzWT3B9TNvDEWt4o9Hk="; + sha256 = "sha256-/dl3ZqvHcr92jhg2QDqOPCOuvpjV/9Qrw8pbsOXKZkU="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix index 14ef1b3358..7692c413b0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2022.5"; + version = "1.2022.6"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-Mi5aH5tlbo8qDj91ZTglFCKETcbXPfTQsBnhYOHrXpQ="; + sha256 = "sha256-J3EfNwDYQ2CO5qWH37wMKtdLStGjHu75wfEMX5Y2NeE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/plowshare/default.nix b/third_party/nixpkgs/pkgs/tools/misc/plowshare/default.nix index 1d15db0204..b5396f130f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/plowshare/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/plowshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_78 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, recode, spidermonkey_102 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { make PREFIX="$out" install for fn in plow{del,down,list,mod,probe,up}; do - wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_78 ]}" + wrapProgram "$out/bin/$fn" --prefix PATH : "${lib.makeBinPath [ curl recode spidermonkey_102 ]}" done ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pls/default.nix index a72b4e44aa..78501bbf48 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pls/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pls/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "pls"; - version = "5.2.0"; + version = "5.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dhruvkb"; repo = "pls"; rev = version; - sha256 = "sha256-nmADeOVS5qdWsun36eKmeT4kYml0sTXYNa+YUiyNGQY="; + sha256 = "sha256-MtbOrdMTwnKRGlmiisHuGvQ6ScWbAAV8100ruO0MRvM="; }; nativeBuildInputs = [ python3.pkgs.poetry-core ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix index 0c09368277..ed6c4c957a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pmbootstrap/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "pmbootstrap"; - version = "1.43.0"; + version = "1.45.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4bPxWmzlyVZrkq9qs/5t+ZOsVDkAAwYc6Mc4een4Qnw="; + sha256 = "sha256-75ZFzhRsczkwhiUl1upKjSvmqN0RkXaM8cKr4zLgi4w="; }; repo = fetchFromGitLab { @@ -15,7 +15,7 @@ buildPythonApplication rec { owner = "postmarketOS"; repo = pname; rev = version; - sha256 = "sha256-jbTzPGrRVisLG7f4NspkDVB8NYSyyInHkhSUPO3dgU0="; + sha256 = "sha256-tG1+vUJW9JIdYpcRn8J0fCIZh29hYo8wSlBKwTUxyMU="; }; pmb_test = "${repo}/test"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pouf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pouf/default.nix index 06a1e37836..d9a4004110 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pouf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pouf/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "pouf"; - version = "0.4.3"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mothsart"; repo = pname; rev = version; - sha256 = "1dgk2g13hz64vdx9sqkixl0321cnfnhrm7hxp68vwfcfx3gvfjv8"; + sha256 = "1zz91r37d6nqvdy29syq853krqdkigiqihwz7ww9kvagfvzvdh13"; }; - cargoSha256 = "0ipyc9l9kr7izh3dmvczq1i7al56yiaz20yaarz8bpsfcrmgwy3s"; + cargoSha256 = "1ikm9fqi37jznln2xsyzfm625lv8kwjzanpm3wglx2s1k1jkmcy9"; postInstall = "make PREFIX=$out copy-data"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix index 04021e40b7..81cb81829a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pubs/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch , python3 }: @@ -14,6 +15,19 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-U/9MLqfXrzYVGttFSafw4pYDy26WgdsJMCxciZzO1pw="; }; + patches = [ + # https://github.com/pubs/pubs/pull/278 + (fetchpatch { + url = "https://github.com/pubs/pubs/commit/9623d2c3ca8ff6d2bb7f6c8d8624f9a174d831bc.patch"; + hash = "sha256-6qoufKPv3k6C9BQTZ2/175Nk7zWPh89vG+zebx6ZFOk="; + }) + # https://github.com/pubs/pubs/pull/279 + (fetchpatch { + url = "https://github.com/pubs/pubs/commit/05e214eb406447196c77c8aa3e4658f70e505f23.patch"; + hash = "sha256-UBkKiYaG6y6z8lsRpdcsaGsoklv6qj07KWdfkQcVl2g="; + }) + ]; + propagatedBuildInputs = with python3.pkgs; [ pyyaml bibtexparser diff --git a/third_party/nixpkgs/pkgs/tools/misc/qflipper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qflipper/default.nix index 4f6338d09f..3a711a1be3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/qflipper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/qflipper/default.nix @@ -23,8 +23,8 @@ }: let pname = "qFlipper"; - version = "1.0.2"; - sha256 = "sha256-CJQOEUwYPNd4x+uBINrxeYVITtYrsEFaYLHQh2l12kA="; + version = "1.1.1"; + sha256 = "sha256-X29iurCloH//7soHd+trPTjhOe9S6ixFts5KldATlwA="; timestamp = "99999999999"; commit = "nix-${version}"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rcm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rcm/default.nix index 6eea6fe7be..bd03b591b1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rcm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rcm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "rcm"; - version = "1.3.4"; + version = "1.3.5"; src = fetchurl { url = "https://thoughtbot.github.io/rcm/dist/rcm-${version}.tar.gz"; - sha256 = "sha256-mxGuN0Sc9NI07G0TSEeb/tMlPauhH36ed0BZhltmwko="; + sha256 = "sha256-JHQefybxagSTJLqoavcARDxCgeLN4JlynXTE1LKevi0="; }; patches = [ ./fix-rcmlib-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix b/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix index da2a969aaf..a397e318a2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix @@ -16,11 +16,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "04.00.00"; + version = "04.00.02"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-I7bmsO3EAUnmo2KoIy5myxXuZB8tzs5kCEXpG550x8Y="; + sha256 = "sha256-8Yrdu3IMN1yD+zlAAlEW688EVqNYZQhkKzxtsAKtd3Q="; }; propagatedBuildInputs = tclLibraries; diff --git a/third_party/nixpkgs/pkgs/tools/misc/reredirect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/reredirect/default.nix index eb1c90324e..479c8ac28e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/reredirect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/reredirect/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "reredirect"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "jerome-pouiller"; repo = "reredirect"; rev = "v${version}"; - sha256 = "0aqzs940kwvw80lhkszx8spcdh9ilsx5ncl9vnp611hwlryfw7kk"; + sha256 = "sha256-RHRamDo7afnJ4DlOVAqM8lQAC60YESGSMKa8Io2vcX0="; }; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix index e7025217e3..2e6a050457 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2022.3"; + version = "2022.12"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-ERDaCLj/qvyzAxmpUfFsCx9fsDjlhQ19PRyUTVZ2Z2w="; + sha256 = "sha256-kl9TwrvrIdF/R4NIVXUP2WYDflwB6BE+0j9Rum9jTXY="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix index c0e85340c8..cdfc1b89e6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix @@ -2,22 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "sanctity"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitea { domain = "codeberg.org"; - owner = "papojari"; + owner = "annaaurora"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rK4em0maJQS50zPfnuFSxRoXUuFCaw9ZOfmgf70Sdac="; + sha256 = "sha256-y6xj4A5SHcW747aFE9TfuurNnuUxjTUeKJmzxeiWqVc="; }; - cargoSha256 = "sha256-IQp/sSVgKY1j6N+UcifEi74dg/PkZJoeqLekeLc/vMU="; + cargoSha256 = "sha256-co58YBeFjP9DKzxDegQI7txuJ1smqJxdlRLae+Ppwh0="; meta = with lib; { description = "Test the 16 terminal colors in all combinations"; - homepage = "https://codeberg.org/papojari/sanctity"; + homepage = "https://codeberg.org/annaaurora/sanctity"; license = licenses.lgpl3Only; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix new file mode 100644 index 0000000000..5f9cb2e3af --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix @@ -0,0 +1,33 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "scdl"; + version = "2.7.2"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "7d6212591a5bccf017424f732535475fb9ae3bab26a4fb5bc36064962d33f8e0"; + }; + + propagatedBuildInputs = with python3Packages; [ + docopt + mutagen + termcolor + requests + clint + pathvalidate + soundcloud-v2 + ]; + + # No tests in repository + doCheck = false; + + pythonImportsCheck = [ "scdl" ]; + + meta = with lib; { + description = "Download Music from Souncloud"; + homepage = "https://github.com/flyingrub/scdl"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix index 614dc30ed8..9493636a0d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sfeed/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "sfeed"; - version = "1.4"; + version = "1.5"; src = fetchgit { url = "git://git.codemadness.org/sfeed"; rev = version; - sha256 = "sha256-fn+PE0WwBdllsO1gXbM2Ftdrl8ua/v50Ny4C/J4OK8Q="; + sha256 = "sha256-OF6xVzvTMbe8Yo64MIg7Cs91XtTBD5GtwAKUbQGYffA="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sfz/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sfz/default.nix new file mode 100644 index 0000000000..11b209a7cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/sfz/default.nix @@ -0,0 +1,25 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "sfz"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "weihanglo"; + repo = pname; + rev = "v${version}"; + hash = "sha256-XY1xsQgXzmX8jmDDLIivXeW9MsNA/pVtYapcBkBhldE="; + }; + + cargoSha256 = "sha256-w3HKnCAPSVgx4mqNB7Q0sMCDC4U+4fdIUUwJFz19XdI="; + + # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context + doCheck = false; + + meta = with lib; { + description = "Simple static file serving command-line tool written in Rust"; + homepage = "https://github.com/weihanglo/sfz"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix index f1e44851dc..e11ec730a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sharedown/default.nix @@ -55,9 +55,7 @@ stdenvNoCC.mkDerivation rec { name = "${pname}-modules-${version}"; inherit pname version; - yarnFlags = yarn2nix-moretea.defaultYarnFlags ++ [ - "--production" - ]; + yarnFlags = [ "--production" ]; pkgConfig = { keytar = { diff --git a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix b/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix index e7a3970963..80947ee06a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/skim/default.nix @@ -39,6 +39,7 @@ rustPlatform.buildRustPackage rec { description = "Command-line fuzzy finder written in Rust"; homepage = "https://github.com/lotabout/skim"; license = licenses.mit; + mainProgram = "sk"; maintainers = with maintainers; [ dywedir ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix b/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix index 69fa8d6945..d0736761ba 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix @@ -1,6 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config -, glew, glm, libGLU, libGL, libX11, libXext, libXrender, icu -, cppcheck +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, glew +, glm +, libGLU +, libGL +, libX11 +, libXext +, libXrender +, icu +, libSM }: stdenv.mkDerivation rec { @@ -14,17 +25,28 @@ stdenv.mkDerivation rec { sha256 = "sha256-LdBQxw8K8WWSfm4E2QpK4GYTuYvI+FX5gLOouVFSU/U="; }; - nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ glew glm libGLU libGL libX11 libXext libXrender icu ] - ++ lib.optional doCheck cppcheck; + nativeBuildInputs = [ + cmake + pkg-config + ]; - doCheck = false; + buildInputs = [ + glew + glm + libGLU + libGL + libX11 + libXext + libXrender + icu + libSM + ]; meta = with lib; { inherit (src.meta) homepage; description = "Queries a selection from the user and prints to stdout"; platforms = lib.platforms.linux; - license = lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix index 3ee4de082b..a56978e072 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "0.9.19"; + version = "1.0.0"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "sha256-0ZA8Op1IMZMJ7g1waK2uOYOCDfqPfiqnnjopGtBW1w8="; + sha256 = "sha256-jmQ5QLsy0T2ytq1xYJkLBlEw5NxVTsAN+wckyV+68zg="; }; buildInputs = [ ncurses ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/sta/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sta/default.nix index 6056fcfa49..696b79447a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/sta/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/sta/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation { pname = "sta"; - version = "unstable-2020-05-10"; + version = "unstable-2021-11-30"; src = fetchFromGitHub { owner = "simonccarter"; repo = "sta"; - rev = "566e3a77b103aa27a5f77ada8e068edf700f26ef"; - sha256 = "1v20di90ckl405rj5pn6lxlpxh2m2b3y9h2snjvk0k9sihk7w7d5"; + rev = "94559e3dfa97d415e3f37b1180b57c17c7222b4f"; + sha256 = "sha256-AiygCfBze7J1Emy6mc27Dim34eLR7VId9wodUZapIL4="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/starfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starfetch/default.nix index 3dfff1400e..f5e7bf7412 100755 --- a/third_party/nixpkgs/pkgs/tools/misc/starfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/starfetch/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Haruno19/starfetch"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix index 43a184a994..42fb4a451f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/steampipe/default.nix @@ -2,24 +2,28 @@ buildGoModule rec { pname = "steampipe"; - version = "0.15.0"; + version = "0.15.3"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-ly64p8shbhixLbK9hpDNYhmBKoAt4iXB//pdFSIYZMc="; + sha256 = "sha256-7TIEdT+s6Am2hPiMPKH+YioNfsCmLVZg6BQiO94Xiu0="; }; - vendorSha256 = "sha256-/VU8VNDqU7CMm/lIBqTChyUWP4svVCgsw0CBcp/u+U0="; + vendorSha256 = "sha256-x57IvMKSE2F5bGTC8ao+wLJmYlz8nMh4SoMhtGlwQyE="; proxyVendor = true; + patchPhase = '' + # 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"'; + ''; + nativeBuildInputs = [ installShellFiles ]; - ldflags = [ - "-s" - "-w" - ]; + ldflags = [ "-s" "-w" ]; postInstall = '' INSTALL_DIR=$(mktemp -d) @@ -30,7 +34,6 @@ buildGoModule rec { ''; meta = with lib; { - broken = stdenv.isDarwin; homepage = "https://steampipe.io/"; description = "select * from cloud;"; license = licenses.agpl3; diff --git a/third_party/nixpkgs/pkgs/tools/misc/storcli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/storcli/default.nix new file mode 100644 index 0000000000..03300f46f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/storcli/default.nix @@ -0,0 +1,35 @@ +{ lib +, stdenvNoCC +, fetchurl +, rpmextract +, unzip +}: +stdenvNoCC.mkDerivation rec { + pname = "storcli"; + version = "7.2106.00"; + + src = fetchurl { + url = "https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/00${version}00.0000_Unified_StorCLI.zip"; + sha256 = "sha256-sRMpNXCdcysliVQwRE/1yAeU/cp+y0f2F8BPiWyotxQ="; + }; + + nativeBuildInputs = [ rpmextract unzip ]; + + buildCommand = '' + unzip $src + rpmextract Unified_storcli_all_os/Linux/storcli-*.noarch.rpm + install -D ./opt/MegaRAID/storcli/storcli64 $out/bin/storcli64 + ln -s storcli64 $out/bin/storcli + + # Not needed because the binary is statically linked + #eval fixupPhase + ''; + + meta = with lib; { + description = "Storage Command Line Tool"; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.unfree; + maintainers = with maintainers; [ panicgh ]; + platforms = with platforms; intersectLists x86_64 linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix b/third_party/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix index 8fff712c32..8c5a3b7e94 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/swaglyrics/default.nix @@ -16,6 +16,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-O48T1WsUIVnNQb8gmzSkFFHTOiFOKVSAEYhF9zUqZz0="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "==" ">=" + ''; + propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 colorama @@ -35,13 +40,6 @@ python3.pkgs.buildPythonApplication rec { ncurses ]; - preConfigure = '' - substituteInPlace setup.py \ - --replace 'beautifulsoup4==4.9.3' 'beautifulsoup4>=4.9.3' \ - --replace 'unidecode==1.2.0' 'unidecode>=1.2.0' \ - --replace 'flask==2.0.1' 'flask>=2.0.1' - ''; - preBuild = '' export HOME=$(mktemp -d) ''; @@ -64,6 +62,5 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/SwagLyrics/SwagLyrics-For-Spotify"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/taoup/default.nix b/third_party/nixpkgs/pkgs/tools/misc/taoup/default.nix index df61794185..f63e6f7a02 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/taoup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/taoup/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "taoup"; - version = "1.1.16"; + version = "1.1.17"; src = fetchFromGitHub { owner = "globalcitizen"; repo = pname; rev = "v${version}"; - hash = "sha256-LNS4m7Er4dQKYDuHMF/5mAi4yGcYzppxfqVKFOT6I/s="; + hash = "sha256-awVom/X9R//w8yYaIwjm5RFYsptySl+PkArF1wP/LAc="; }; buildInputs = [ rubyEnv bash ncurses ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tere/brokentest.patch b/third_party/nixpkgs/pkgs/tools/misc/tere/brokentest.patch new file mode 100644 index 0000000000..f5b9eb741e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/tere/brokentest.patch @@ -0,0 +1,19 @@ +diff --git a/src/app_state.rs b/src/app_state.rs +index e44acb6..713642a 100644 +--- a/src/app_state.rs ++++ b/src/app_state.rs +@@ -1272,7 +1272,7 @@ mod tests { + assert_eq!(s.cursor_pos, 1); + assert_eq!(s.scroll_pos, 2); + } +- ++ /* + #[test] + fn test_advance_search_with_filter_search_and_scrolling2() { + let mut s = create_test_state_with_buf( +@@ -1302,4 +1302,5 @@ mod tests { + assert_eq!(s.cursor_pos, 1); + assert_eq!(s.scroll_pos, 0); + } ++ */ + } diff --git a/third_party/nixpkgs/pkgs/tools/misc/tere/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tere/default.nix new file mode 100644 index 0000000000..e1dac5a6bf --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/tere/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "tere"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "mgunyho"; + repo = "tere"; + rev = "v${version}"; + sha256 = "BD7onBkFyo/JAw/neqL9N9nBYSxoMrmaG6egeznV9Xs="; + }; + + cargoSha256 = "gAq9ULQ2YFPmn4IsHaYrC0L7NqbPUWqXSb45ZjlMXEs="; + + # This test confirmed not working. + # https://github.com/mgunyho/tere/issues/44 + cargoPatches = [ ./brokentest.patch ]; + + meta = with lib; { + description = "A faster alternative to cd + ls"; + homepage = "https://github.com/mgunyho/tere"; + license = licenses.eupl12; + maintainers = with maintainers; [ ProducerMatt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix index 87d6dcfb0c..13f741c544 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/thefuck/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { checkInputs = [ go mock pytestCheckHook pytest-mock ]; - disabledTests = lib.optional stdenv.isDarwin [ + disabledTests = lib.optionals stdenv.isDarwin [ "test_settings_defaults" "test_from_file" "test_from_env" diff --git a/third_party/nixpkgs/pkgs/tools/misc/time-decode/default.nix b/third_party/nixpkgs/pkgs/tools/misc/time-decode/default.nix index 5dcc64cf1c..28fcaea73e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/time-decode/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/time-decode/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "time-decode"; - version = "4.0.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "digitalsleuth"; repo = "time_decode"; rev = "refs/tags/v${version}"; - sha256 = "sha256-J5mgAEANAKKbzRMX/LIpdlnP8GkOXFEOmhEO495Z0p4="; + sha256 = "sha256-79TReAEHvLldp0n3jTvws3mFE/1O1h6TocjMHrurwt4="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/tldr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tldr/default.nix index 698236ada1..bd521238ca 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tldr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tldr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tldr"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "tldr-pages"; repo = "tldr-cpp-client"; rev = "v${version}"; - sha256 = "sha256-ZNUW2PebRUDLcZ2/dXClXqf8NUjgw6N73h32PJ8iwmM="; + sha256 = "sha256-xim5SB9/26FMjLqhiV+lj+Rm5Tk5luSIqwyYb3kXoFY="; }; buildInputs = [ curl libzip ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix index c248546fdb..239f3cc2e7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "3.0.1"; - source.sha256 = "1vm96iyzbcy1388b3zyqivfhs4p63v87mp5qwlr4s8i2haq62xyf"; + version = "3.0.5"; + source.sha256 = "1ycsx9mvl0jsds4igi6avxclsyl5lndh1mpj2ykvzfz26wdddg6p"; erubis = buildRubyGem rec { inherit ruby; @@ -23,8 +23,8 @@ buildRubyGem rec { inherit ruby; name = "ruby${ruby.version}-${gemName}-${version}"; gemName = "thor"; - version = "1.0.1"; - source.sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + version = "1.2.1"; + source.sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; }; xdg = buildRubyGem rec { diff --git a/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix index 41ee4ead7b..926b27c905 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/topicctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "topicctl"; - version = "1.3.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-hbsVk82iTZGVvypZHhUk/By0sSQxmZQBog2/3qKE94s="; + sha256 = "sha256-7dw1UldffSCoJYhICb7v7XWQdXerSkrKonNNio0PkTQ="; }; - vendorSha256 = "sha256-i1ir/aT/jaK//rmH9k/eK4LIRh0OmEytc0mGO7IrpqI="; + vendorSha256 = "sha256-P3o4P6CUDB0jIpmgxgYL7D6TJuaWQBCprsE4NLTLELY="; ldflags = [ "-X main.BuildVersion=${version}" diff --git a/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix index f86ad7a909..b84aa08464 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/trillian/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "trillian"; - version = "1.4.0"; - vendorSha256 = "sha256-n5PD3CGgNGrqSYLJS+3joGFNue2fF/tdimC6CtO15yU="; + version = "1.4.2"; + vendorSha256 = "sha256-/5IBb/cYY6o49WmG7LmLZ4AwOjZ54Uy9bALb1pn0qGo="; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c7Sii6GMWZOeD46OwdkXU/wt9zY+EyPSnahYPJQKJcA="; + sha256 = "sha256-7R/E9BXPla90Q7LEOtLBMz2LKok7gsAnXrfJ1E8urf4="; }; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix index e667c988ca..d91f5fa365 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/txr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "txr"; - version = "275"; + version = "278"; src = fetchurl { url = "http://www.kylheku.com/cgit/txr/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "sha256-HmykTyh5F49CBa1w7o/HV6Q5Lsx1Qkxe0JBHQdGxVB4="; + sha256 = "sha256-RwPdDQGFL851eegQfMb8xHxC8AP39heSIALXjp/5/cw="; }; buildInputs = [ libffi ]; @@ -44,6 +44,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; homepage = "http://nongnu.org/txr"; maintainers = with lib.maintainers; [ dtzWill ]; - platforms = platforms.linux; # Darwin fails although it should work AFAIK + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix index b3da0f7d73..cfe1c570c7 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/upterm/default.nix @@ -7,22 +7,24 @@ buildGoModule rec { pname = "upterm"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "owenthereal"; repo = "upterm"; rev = "v${version}"; - hash = "sha256-JcUFsj7+Hu++izyxozttyxTGW51vBfgNSvAa/AIrsvs="; + hash = "sha256-ywwqX4aw9vc2kptYZisArTpdz7Cf49Z0jMdP90KXejs="; }; vendorSha256 = null; + subPackages = [ "cmd/upterm" "cmd/uptermd" ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $out/bin/gendoc - rm $out/bin/gendoc + # force go to build for build arch rather than host arch during cross-compiling + CGO_ENABLED=0 GOOS= GOARCH= go run cmd/gendoc/main.go installManPage etc/man/man*/* installShellCompletion --bash --name upterm.bash etc/completion/upterm.bash_completion.sh installShellCompletion --zsh --name _upterm etc/completion/upterm.zsh_completion diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix index 0fe8734d4c..08617255a2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -24,13 +24,13 @@ , features ? ([ "sinks" "sources" "transforms" "vrl-cli" ] # the second feature flag is passed to the rdkafka dependency # building on linux fails without this feature flag (both x86_64 and AArch64) - ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ] + ++ lib.optionals enableKafka [ "rdkafka/gssapi-vendored" ] ++ lib.optional stdenv.targetPlatform.isUnix "unix") }: let pname = "vector"; - version = "0.23.0"; + version = "0.22.3"; in rustPlatform.buildRustPackage { inherit pname version; @@ -39,10 +39,10 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y1RysuCWvdbqckW54r1uH/K9YTuAZk8T4M3HRGFm0EM="; + sha256 = "sha256-62oPttkdahTeMsd9lpd9/tc95kluVJuWxzP94i+gWhA="; }; - cargoSha256 = "sha256-VBmJfRCwSv3t5DPzVj92ajGYk5Ju8xqr4v7IDU17498="; + cargoSha256 = "sha256-WWX47pbva7ZmPR6hBstJ5VqOwu3mkhhsHK3LHHqQjDE="; nativeBuildInputs = [ pkg-config cmake perl ]; buildInputs = [ oniguruma openssl protobuf rdkafka zstd ] ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/vimv-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vimv-rs/default.nix index 6f20ad2777..2a0b51b03f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vimv-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vimv-rs/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "vimv-rs"; - version = "1.7.5"; + version = "1.7.7"; src = fetchCrate { inherit version; crateName = "vimv"; - sha256 = "sha256-VOHQLdwJ6c8KB/IjMDZe9/pNHmLuouNggIK8uJPu+NQ="; + sha256 = "sha256-Y8xFoI/1zpaeT9jMuOME/g2vTLenhNSwGepncc1Ji+0="; }; - cargoHash = "sha256-qXT44h4f4Zw1bi/gblczxehA6hqLLjQBpSwVpYd0PE4="; + cargoHash = "sha256-yJHOeIjbWQTxLkkVv+YALrAhP5HBZpmbPDiLd+/bWZA="; buildInputs = lib.optionals stdenv.isDarwin [ Foundation ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix b/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix index d54e906f34..a7ba390b10 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/watchexec/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, Foundation, installShellFiles, libiconv }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Cocoa, AppKit, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.19.0"; + version = "1.20.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "cli-v${version}"; - sha256 = "sha256-Zqu6Qor7kHSeOFyHjcrl6RhB8gL9pljHt7hEd6/0Kss="; + sha256 = "sha256-x1weerTOpD4g1Fbm5erbS4S87ZjygF2X3MyyXl+9DXw="; }; - cargoSha256 = "sha256-XwgoYaqgDkNggzi2TL/JPfh8LSFSzSWOVMbkmhXX73I="; + cargoSha256 = "sha256-hyPIdMVUXc03B8opcqq7y0wS1rqCfOQ1W5M8jDUqr0k="; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Foundation libiconv ]; + buildInputs = lib.optionals stdenv.isDarwin [ Cocoa AppKit ]; + + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit"; checkFlags = [ "--skip=help" "--skip=help_short" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/wayshot/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wayshot/default.nix new file mode 100644 index 0000000000..659ad3add4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/wayshot/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "wayshot"; + version = "1.1.9"; + + src = fetchFromGitHub { + owner = "waycrate"; + repo = pname; + rev = version; + hash = "sha256-4tzL/9p/qBCSWX+O7wZlKi9qb7mIt+hoxcQY7cWlFoU="; + }; + + cargoHash = "sha256-/FAI2VUoyQ1+3CuA7sEpeF5oeJdGB9CRZEp1leLnTh4="; + + meta = with lib; { + description = "A native, blazing-fast screenshot tool for wlroots based compositors such as sway and river"; + homepage = "https://github.com/waycrate/wayshot"; + license = licenses.bsd2; + maintainers = [ maintainers.dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/wsl-open/default.nix b/third_party/nixpkgs/pkgs/tools/misc/wsl-open/default.nix index 2b5808e3be..e89ef91b4f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/wsl-open/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/wsl-open/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wsl-open"; - version = "2.1.1"; + version = "2.2.1"; src = fetchFromGitHub { owner = "4U6U57"; repo = "wsl-open"; rev = "v${version}"; - sha256 = "1mwak846zh47p3pp4q5f54cw8d9qk61zn43q81j2pkcm35mv9lzg"; + sha256 = "sha256-amqkDXdgIqGjRZMkltwco0UAI++G0RY/MxLXwtlxogE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/xstow/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xstow/default.nix index b57b546f94..079f4e6757 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/xstow/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/xstow/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, fetchurl, ncurses }: stdenv.mkDerivation rec { pname = "xstow"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { url = "http://downloads.sourceforge.net/sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "6f041f19a5d71667f6a9436d56f5a50646b6b8c055ef5ae0813dcecb35a3c6ef"; + sha256 = "sha256-wXQ5XSmogAt1torfarrqIU4nBYj69MGM/HBYqeIE+dw="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix index 7db1d1d121..2decd1c6c1 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "11.0"; + version = "12.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "sha256-I+3euq3qel9VCDVf0Bd4XdMOCt+g/CYlnnje50lbRr8="; + sha256 = "sha256-Lp7KHASUYx3pKKCNTDGyOZslSiKFl9EGulR2yjfha9k="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/yank/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yank/default.nix index dbbe14cf38..9579b3fa3f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yank/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yank/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yank"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "mptre"; repo = "yank"; rev = "v${version}"; - sha256 = "1izygx7f1z35li74i2cwca0p28c3v8fbr7w72dwpiqdaiwywa8xc"; + sha256 = "sha256-sZiZki2Zl0Tfmls5KrLGxT94Bdf9TA9EwoaLoFOX9B4="; }; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix b/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix index 32d5b5712d..bc4e6b7a46 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/you-get/default.nix @@ -7,7 +7,7 @@ python3.pkgs.buildPythonApplication rec { pname = "you-get"; - version = "0.4.1612"; + version = "0.4.1620"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "sha256-lKEztwwn1pnALuwDiA1Ik9+XCVyO+UMobv+hXu0mn5w="; + sha256 = "sha256-wCDaT9Nz1ZiSsqFwX1PXHq6QF6fjLRI9wwvvWxcmYOY="; }; patches = [ @@ -39,6 +39,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A tiny command line utility to download media contents from the web"; homepage = "https://you-get.org"; + changelog = "https://github.com/soimort/you-get/raw/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ryneeverett ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix index 069f4e13af..eef90d17d6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,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 = "2022.07.18"; + version = "2022.8.8"; src = fetchPypi { - inherit pname; - version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-DnuB/GrI0bfT//p5+QRMpBY3hEIlgsmjWTMF2ipp7AI="; + inherit pname version; + sha256 = "sha256-Fcq2Em4SrxETQhOAbmpc+X0cYiHhSKomGN3UKTmjCo0="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; @@ -57,7 +56,6 @@ buildPythonPackage rec { 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)"; - changelog = "https://github.com/yt-dlp/yt-dlp/raw/${version}/Changelog.md"; longDescription = '' yt-dlp is a youtube-dl fork based on the now inactive youtube-dlc. diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix index 1dddd4b64c..c199473179 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - hash = "sha256-IQ6YIHcFriqLAGoB8QhvWiYkI7Aq4RL12TL3c/N+YqE="; + hash = "sha256-nci2VXto9LptfNHBmLGxfMXQnzbVP1+GlvllOqWFGKU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 0a5ccda2ce..a193075633 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -1,6 +1,7 @@ { lib , mkDerivation , fetchurl +, imagemagick , pcsclite , pyotherside , python3 @@ -24,6 +25,7 @@ mkDerivation rec { nativeBuildInputs = [ python3.pkgs.wrapPython qmake + imagemagick ]; postPatch = '' @@ -43,10 +45,25 @@ mkDerivation rec { ]; postInstall = '' - install -Dt $out/share/applications resources/ykman-gui.desktop - install -Dt $out/share/ykman-gui/icons resources/icons/*.{icns,ico,png,xpm} - substituteInPlace $out/share/applications/ykman-gui.desktop \ - --replace 'Exec=ykman-gui' "Exec=$out/bin/ykman-gui" + # Desktop files + install -D -m0644 resources/ykman-gui.desktop "$out/share/applications/ykman-gui.desktop" + substituteInPlace "$out/share/applications/ykman-gui.desktop" \ + --replace Exec=ykman-gui "Exec=$out/bin/ykman-gui" + + # Icons + install -Dt $out/share/ykman-gui/icons resources/icons/*.{icns,ico} + install -D -m0644 resources/icons/ykman.png "$out/share/icons/hicolor/128x128/apps/ykman.png" + ln -s -- "$out/share/icons/hicolor/128x128/apps/ykman.png" "$out/share/icons/hicolor/128x128/apps/ykman-gui.png" + for SIZE in 16 24 32 48 64 96; do + # set modify/create for reproducible builds + convert -scale ''${SIZE} +set date:create +set date:modify \ + resources/icons/ykman.png ykman.png + + imageFolder="$out/share/icons/hicolor/''${SIZE}x''${SIZE}/apps" + install -D -m0644 ykman.png "$imageFolder/ykman.png" + ln -s -- "$imageFolder/ykman.png" "$imageFolder/ykman-gui.png" + done + unset SIZE imageFolder ''; qtWrapperArgs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix index 16d126e4dd..5210c6b2a4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "z-lua"; - version = "1.8.14"; + version = "1.8.16"; src = fetchFromGitHub { owner = "skywind3000"; repo = "z.lua"; rev = version; - sha256 = "sha256-Jy5fcXqXbuJTOAP8vpZjN0qmDR/cVACztcIxl4aXNKs="; + sha256 = "sha256-VVJXBVENXlJXVj831Hx4sa7AzGHXpsui6tga9uA6ZnE="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix index a97402e7ba..ac4d926a2e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zellij/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "zellij"; - version = "0.30.0"; + version = "0.31.1"; src = fetchFromGitHub { owner = "zellij-org"; repo = "zellij"; rev = "v${version}"; - sha256 = "sha256-T2mkkE7z6AhHnn/77HcrvbY+32EOwE8jjh+veVOE1CY="; + sha256 = "sha256-8ISOyfLNtLW244HkCOpB38fhafnxRaOBBezpVz4Mb2o="; }; - cargoSha256 = "sha256-XTaQbMK7R43CE03niUaBzlYN4xRo7pUFdNYvUeA+MwA="; + cargoSha256 = "sha256-lBmJL7p7mqfly6CmZBFR2FFD4QlAccCAYU251HuI9jY="; nativeBuildInputs = [ mandown diff --git a/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix index ec0ca52535..0c5cd2949d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/aardvark-dns/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "aardvark-dns"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m2uKTVRonnun+/V69RcPWkkRtDcoaiulMCQz0/CAdCw="; + sha256 = "sha256-HxikpGeQlwulSedFCwWLADHKMlFrsgC7bMoZ1OxGCUE="; }; - cargoHash = "sha256-Z/OZgWlpwcdqns26ojTLPQBVNrwU/i86tZVx19sRUTw="; + cargoHash = "sha256-uP9caaOdFWs73T8icHE9uXNo63NdZrQ5afXFb4Iy1+I="; meta = with lib; { description = "Authoritative dns server for A/AAAA container records"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/acme-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/acme-client/default.nix index 427bcd6223..ba47d930cf 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/acme-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/acme-client/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "acme-client"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://data.wolfsden.cz/sources/acme-client-${version}.tar.gz"; - hash = "sha256-rIeWZSOT+nPzLf2mDtOkN/wmCGffG4H6PCQb2Vxbxxk="; + hash = "sha256-lMCDis4CZQF6YwZGzdWD92/S1yT2cEAXXlTAipYYxro="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix index 2effd55085..b0528a8808 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix @@ -109,13 +109,13 @@ let in stdenv.mkDerivation rec { pname = "airgeddon"; - version = "11.01"; + version = "11.02"; src = fetchFromGitHub { owner = "v1s1t0r1sh3r3"; repo = "airgeddon"; rev = "v${version}"; - sha256 = "3TjaLEcerRk69Ys4kj7vOMCRUd0ifFJzL4MB5ifoK68="; + hash = "sha256-k3xQndF1m3fnn7nCb2T/wGxbUPJ83wOV33Ky0FbToVg="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix b/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix index 28caace102..5714a75e50 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/babeld/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "http://www.irif.fr/~jch/software/babel/"; description = "Loop-avoiding distance-vector routing protocol"; license = licenses.mit; - maintainers = with maintainers; [ fpletz hexa ]; + maintainers = with maintainers; [ hexa ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix index e429b5a8cd..b3dfc96263 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-EFxINRFrcNXGtXpNqvBIN6pE1kG3OdeDIHYOsG2celI="; + sha256 = "sha256-yIggx2rSi2/AVw5W9fvKQORD4TaK05TeQtErVEmcHUw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix index 4e20b2f463..8d3f17268b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "boringtun"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "boringtun-cli-${version}"; - sha256 = "sha256-s7Nl95VShBMD4Zid2LeRPftSx5R2G+4tHBXgrC1I7vU="; + sha256 = "sha256-PY7yqBNR4CYh8Y/vk4TYxxJnnv0eig8sjXp4dR4CX04="; }; - cargoSha256 = "sha256-308zydrhOZS5h16DEp9ctrhtB2bv9Tmwutgj5+uc4Lw="; + cargoSha256 = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix b/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix index 8871f4081e..aaf9b15c85 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/checkip/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "checkip"; - version = "0.38.5"; + version = "0.40.1"; src = fetchFromGitHub { owner = "jreisinger"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZwrwBWhji/moT1dQBCkMP5DI+xEfE6dGtZerFubobjc="; + sha256 = "sha256-SPfr88ZEIFlbU4ofuxb2I42L7FR4EXbckCVylEQHfN4="; }; - vendorSha256 = "sha256-cahrJvPSemlEpaQ1s4bbi1yp0orTDGOoanqXDVVIpjQ="; + vendorSha256 = "sha256-bFhSMjm9rqUUbCV9keeXm+yhzQMKrYKs1DbCt53J8aM="; # Requires network doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch b/third_party/nixpkgs/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch deleted file mode 100644 index c68f9f1d84..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/7.83.1-quiche-support-ca-fallback.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/lib/vquic/quiche.c b/lib/vquic/quiche.c -index bfdc966a85ea..e4bea4d677be 100644 ---- a/lib/vquic/quiche.c -+++ b/lib/vquic/quiche.c -@@ -201,23 +201,31 @@ static SSL_CTX *quic_ssl_ctx(struct Curl_easy *data) - - { - struct connectdata *conn = data->conn; -- const char * const ssl_cafile = conn->ssl_config.CAfile; -- const char * const ssl_capath = conn->ssl_config.CApath; -- - if(conn->ssl_config.verifypeer) { -- SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); -- /* tell OpenSSL where to find CA certificates that are used to verify -- the server's certificate. */ -- if(!SSL_CTX_load_verify_locations(ssl_ctx, ssl_cafile, ssl_capath)) { -- /* Fail if we insist on successfully verifying the server. */ -- failf(data, "error setting certificate verify locations:" -- " CAfile: %s CApath: %s", -- ssl_cafile ? ssl_cafile : "none", -- ssl_capath ? ssl_capath : "none"); -- return NULL; -+ const char * const ssl_cafile = conn->ssl_config.CAfile; -+ const char * const ssl_capath = conn->ssl_config.CApath; -+ if(ssl_cafile || ssl_capath) { -+ SSL_CTX_set_verify(ssl_ctx, SSL_VERIFY_PEER, NULL); -+ /* tell OpenSSL where to find CA certificates that are used to verify -+ the server's certificate. */ -+ if(!SSL_CTX_load_verify_locations(ssl_ctx, ssl_cafile, ssl_capath)) { -+ /* Fail if we insist on successfully verifying the server. */ -+ failf(data, "error setting certificate verify locations:" -+ " CAfile: %s CApath: %s", -+ ssl_cafile ? ssl_cafile : "none", -+ ssl_capath ? ssl_capath : "none"); -+ return NULL; -+ } -+ infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none"); -+ infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none"); - } -- infof(data, " CAfile: %s", ssl_cafile ? ssl_cafile : "none"); -- infof(data, " CApath: %s", ssl_capath ? ssl_capath : "none"); -+#ifdef CURL_CA_FALLBACK -+ else { -+ /* verifying the peer without any CA certificates won't work so -+ use openssl's built-in default as fallback */ -+ SSL_CTX_set_default_verify_paths(ssl_ctx); -+ } -+#endif - } - } - return ssl_ctx; diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/atomic.patch b/third_party/nixpkgs/pkgs/tools/networking/curl/atomic.patch new file mode 100644 index 0000000000..77ee610fc1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/atomic.patch @@ -0,0 +1,30 @@ +From 50efb0822aa0e0ab165158dd0a26e65a2290e6d2 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 28 Jun 2022 09:00:25 +0200 +Subject: [PATCH] easy_lock: switch to using atomic_int instead of bool + +To work with more compilers without requiring separate libs to +link. Like with gcc-12 for RISC-V on Linux. + +Reported-by: Adam Sampson +Fixes #9055 +Closes #9061 +--- + lib/easy_lock.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/easy_lock.h b/lib/easy_lock.h +index 07c85c5ffdd19..9c11bc50c5f20 100644 +--- a/lib/easy_lock.h ++++ b/lib/easy_lock.h +@@ -40,8 +40,8 @@ + #include + #endif + +-#define curl_simple_lock atomic_bool +-#define CURL_SIMPLE_LOCK_INIT false ++#define curl_simple_lock atomic_int ++#define CURL_SIMPLE_LOCK_INIT 0 + + static inline void curl_simple_lock_lock(curl_simple_lock *lock) + { diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix index cc7fd0c3a8..a62b6c8e27 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -33,6 +33,8 @@ , ocamlPackages , phpExtensions , python3 +, tests +, fetchpatch }: # Note: this package is used for bootstrapping fetchurl, and thus @@ -44,23 +46,22 @@ assert !(gnutlsSupport && opensslSupport); assert !(gnutlsSupport && wolfsslSupport); assert !(opensslSupport && wolfsslSupport); -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "7.83.1"; + version = "7.84.0"; src = fetchurl { urls = [ - "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" - "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" + "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" ]; - sha256 = "sha256-9Tmjb7RKgmDsXZd+Tg290u7intkPztqpvDyfeKETv/A="; + sha256 = "sha256-cC+ybnMZCjvXcHGqFG9Qe5gXzE384hjSq4fwDNO8BZ0="; }; patches = [ ./7.79.1-darwin-no-systemconfiguration.patch - # quiche: support ca-fallback - # https://github.com/curl/curl/commit/fdb5e21b4dd171a96cf7c002ee77bb08f8e58021 - ./7.83.1-quiche-support-ca-fallback.patch + ./sched.patch + ./atomic.patch ] ++ lib.optional patchNetrcRegression ./netrc-regression.patch; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -135,7 +136,10 @@ stdenv.mkDerivation rec { CXX = "${stdenv.cc.targetPrefix}c++"; CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; - doCheck = true; + # takes 14 minutes on a 24 core and because many other packages depend on curl + # they cannot be run concurrently and are a bottleneck + # tests are available in passthru.tests.withCheck + doCheck = false; preCheck = '' patchShebangs tests/ '' + lib.optionalString stdenv.isDarwin '' @@ -160,16 +164,23 @@ stdenv.mkDerivation rec { ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4.4.0 ''; - passthru = { + passthru = let + useThisCurl = attr: attr.override { curl = finalAttrs.finalPackage; }; + in { inherit opensslSupport openssl; tests = { - inherit curlpp coeurl; - haskell-curl = haskellPackages.curl; - ocaml-curly = ocamlPackages.curly; - php-curl = phpExtensions.curl; - pycurl = python3.pkgs.pycurl; + withCheck = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); + fetchpatch = tests.fetchpatch.simple.override { fetchpatch = fetchpatch.override { fetchurl = useThisCurl fetchurl; }; }; + curlpp = useThisCurl curlpp; + coeurl = useThisCurl coeurl; + haskell-curl = useThisCurl haskellPackages.curl; + ocaml-curly = useThisCurl ocamlPackages.curly; + pycurl = useThisCurl python3.pkgs.pycurl; + php-curl = useThisCurl phpExtensions.curl; + # error: attribute 'override' missing # Additional checking with support http3 protocol. - inherit (nixosTests) nginx-http3; + # nginx-http3 = useThisCurl nixosTests.nginx-http3; + nginx-http3 = nixosTests.nginx-http3; }; }; @@ -182,4 +193,4 @@ stdenv.mkDerivation rec { # Fails to link against static brotli or gss broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport); }; -} +}) diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/sched.patch b/third_party/nixpkgs/pkgs/tools/networking/curl/sched.patch new file mode 100644 index 0000000000..33f08fa42f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/sched.patch @@ -0,0 +1,26 @@ +From e2e7f54b7bea521fa8373095d0f43261a720cda0 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Mon, 27 Jun 2022 08:46:21 +0200 +Subject: [PATCH] easy_lock.h: include sched.h if available to fix build + +Patched-by: Harry Sintonen + +Closes #9054 +--- + lib/easy_lock.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/lib/easy_lock.h b/lib/easy_lock.h +index 819f50ce815b8..1f54289ceb2d3 100644 +--- a/lib/easy_lock.h ++++ b/lib/easy_lock.h +@@ -36,6 +36,9 @@ + + #elif defined (HAVE_ATOMIC) + #include ++#if defined(HAVE_SCHED_YIELD) ++#include ++#endif + + #define curl_simple_lock atomic_bool + #define CURL_SIMPLE_LOCK_INIT false diff --git a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index 1cd1918e3c..81c721a20a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { homepage = "https://roy.marples.name/projects/dhcpcd"; platforms = platforms.linux; license = licenses.bsd2; - maintainers = with maintainers; [ eelco fpletz ]; + maintainers = with maintainers; [ eelco ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix index e222ae9a40..22365b5cfa 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsmonster/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "dnsmonster"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "mosajjal"; repo = pname; rev = "v${version}"; - hash = "sha256-1tYC76g3GOqMaosAYYXOrOKTdW7muPTaeeLzGUsjogE="; + hash = "sha256-5+ivBnpE4odmm7N1FVJcKw5VlEkPiGOadsFy4Vq6gVo="; }; - vendorSha256 = "sha256-2gWifzBjAx+c/if6ZZQ/s73oPPTY9eJfHYL4F/058h0="; + vendorSha256 = "sha256-WCgaf34l+4dq79STBtUp1wX02ldKuTYvB+op/UTAtNQ="; buildInputs = [ libpcap diff --git a/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix b/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix index e2b2f9ca43..5fb8fc3399 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/drill/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "drill"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "fcsonline"; repo = pname; rev = version; - sha256 = "sha256-fUfN5410JjxEZAT7Xp7ac6wqsmuxNiRn4bJsc7njZc4="; + sha256 = "sha256-J4zg5mAZ/xXKxBbEYYZRNjlbyUD/SDD/LSu43FrCbBE="; }; - cargoSha256 = "sha256-MwSbGB5luzraUxvOxj65gML3alYRxhWwJq9D2aX4SdA="; + cargoSha256 = "sha256-N0Rj6n8mQHZR4/4m1FHcqCKDqG7GeVxUs2XN0oxQVqQ="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix b/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix index 9fe04ee70d..80d68c7ccd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/edgedb/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "unstable-2022-06-27"; + version = "2.0.1"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; - rev = "3c65c8bf0a09988356ad477d0ae234182f809b0a"; - sha256 = "sha256-UqoRa5ZbPJEHo9wyyygrN1ssorgY3cLw/mMrCDXr4gw="; + rev = "v${version}"; + sha256 = "sha256-U+fF0t+dj8wUfCviNu/zcoz3lhMXcQlDgz8B3gB+EJI="; }; - cargoSha256 = "sha256-6HJkkem44+dat5bmVEM+7GSJFjCz1dYZeRIPEoEwNlI="; + cargoSha256 = "sha256-Pm3PBg7sbFwLHaozfsbQbPd4gmcMUHxmGT4AsQRDX0g="; nativeBuildInputs = [ makeWrapper pkg-config perl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix b/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix index a294267bef..9c5c8efa5a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/eggdrop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "eggdrop"; - version = "1.9.1"; + version = "1.9.3"; src = fetchFromGitHub { owner = "eggheads"; repo = "eggdrop"; rev = "v${version}"; - sha256 = "sha256-vh8nym7aYeTRUQ7FBZRy4ToG2ajwRDhzi4jNiJQOEyQ="; + sha256 = "sha256-BYPDIPn1nuVhnPjs2vZ6KC6pjBVYDWsRjB8c1Z6UUdE="; }; buildInputs = [ tcl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix index 36623c021f..9136b81a00 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/flannel/default.nix @@ -4,7 +4,7 @@ with lib; buildGoModule rec { pname = "flannel"; - version = "0.18.0"; + version = "0.19.1"; rev = "v${version}"; vendorSha256 = null; @@ -13,7 +13,7 @@ buildGoModule rec { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-cxdbXhj79xp5jT5xY3cIzt5XYndPC+TWIrxBjAvbP0g="; + sha256 = "sha256-pWi4JKBfIb6c4fh0EAPf86B4axrDzOPM+ZWquFd6mTk="; }; ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix index 864893b146..682cb3a554 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/frp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frp"; - version = "0.43.0"; + version = "0.44.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ked1emPx9pOz54s4ViutY41s7sQG+IjX/eZJkX15IGo="; + sha256 = "sha256-DH+MOMsDdW+GGrxhkXhC+5D+2IsAZwByd0FjNT+i+og="; }; vendorSha256 = "sha256-5ljUbEvynNo1AxGpJq9B0bTFgzVfgVZbsqXcPBERLMI="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix b/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix index acda428875..e35abc33ca 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/globalprotect-openconnect/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "globalprotect-openconnect"; - version = "1.4.5"; + version = "1.4.8"; src = fetchFromGitHub { owner = "yuezk"; repo = "GlobalProtect-openconnect"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-9wRe7pJiosk2b0FKhHKpG6P2QPuBo8bVi6rnUMIkG6I="; + sha256 = "sha256-PQAlGeHVayImKalCNv2SwPcxD0ts4BVSqeo1hKYmnMA="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix index 8789ae6fa1..3e22f24714 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "3.0.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-gyaAtFJubvDiz5b7lk6vmPHIqr9ccWK3N2iy4LvYiMg="; + sha256 = "sha256-iFtoxEjb+Wk8E2oj1SjSRNwxg20//0LgFtjMq9qJOEQ="; }; - vendorSha256 = "sha256-RSsvFD3RvYKxdwPDGG3YHVUzKLgwReZkoVabH5KWXMA="; + vendorSha256 = "sha256-FxfER3THsA7NRuQKEdWQxgUN0SiNI00hGUMVD+3BaG4="; postConfigure = '' export CGO_ENABLED=0 diff --git a/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix index 2c73a6ea9d..068baff54d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/godns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "godns"; - version = "2.8.4"; + version = "2.8.8"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "v${version}"; - sha256 = "sha256-P3jmpyk53+N/7BhPfLmCiXOoGJv35eZcvrxGqejYin8="; + sha256 = "sha256-2vjOxbfCBNBNlEUOXmmWEJYxM2aeEi3yIbJ1XsFmNNw="; }; vendorSha256 = "sha256-PGqknRGtN0XRGPnAsWzQrlJZG5BzQIhlSysGefkxysE="; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix index 89d07b8516..4d320779b6 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - sha256 = "sha256-/CH9cSOkgXxdxSN1G4Jg404KOHEYhnsSCK4QB6Zdk+A="; + sha256 = "sha256-hAUmRUMhP3rD1k6UhIN94/Kt+OjaytUTM3XIcrvasco="; }; - cargoSha256 = "sha256-2knD3MwrJKvbdovh6bd81GqHHqeAG1OFzXsLB4eO0Do="; + cargoSha256 = "sha256-SqQsKTS3psF/xfwyBRQB9c3/KIZU1fpyqVy9fh4Rqkk="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix index f6828470fc..704d39099d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grpcui"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "fullstorydev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XDVt5fml2zYXOcZYXnxxGu4uaUA75DnRlFkbcc6tDag="; + sha256 = "sha256-9rKZFbRJn/Rv/9vznBujEt0bSCvx9eLKADoYc4pXBeY="; }; - vendorSha256 = "sha256-jHNjvh4rpZdQ/RC9gN3KXnuOLkJX8Ow5GV+Qwfyvx1o="; + vendorSha256 = "sha256-DTLguUSFgGOF+okHQdFxL944NA+WPWT1zaeu38p1p0M="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpcurl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpcurl/default.nix index 40c28a2a1d..7df4c51f03 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpcurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpcurl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "grpcurl"; - version = "1.8.6"; + version = "1.8.7"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcurl"; rev = "v${version}"; - sha256 = "sha256-dS9r738y0B+p2eoo1NV54OEeRzsj9fOs09NB3HRKmJY="; + sha256 = "sha256-03Uo40kz9CNK3lC91J8smDlviRNQymP95DWmIMwZF/E="; }; subPackages = [ "cmd/grpcurl" ]; - vendorSha256 = "sha256-3f/GcOonE46GjCztjShRsisS/QGPjM4IJelZ8jAiSWU="; + vendorSha256 = "sha256-xe3xb1+qa53Xph+CLcUqxJYeD9d4kBaY6SJfc7bhjQY="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix index f7a6ee5b3c..f87ccef5cd 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gvproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gvproxy"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "containers"; repo = "gvisor-tap-vsock"; rev = "v${version}"; - sha256 = "sha256-xoPqgt/d0RyDqkRY+ZhP02nKr3uEu8be0Go2H7JRg3k="; + sha256 = "sha256-mU5uJ/RnVAbL7M1lcBZKjGvfc2WfbJGyZB+65GrAr5M="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix index c5eef48192..ef40e46736 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -11,11 +11,11 @@ assert usePcre -> pcre != null; stdenv.mkDerivation rec { pname = "haproxy"; - version = "2.5.5"; + version = "2.6.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "sha256-BjxIRc2y128pLvRNnAEXqFPY0Qrl2WFbQGsUpNdP5Lk="; + sha256 = "sha256-+bfcBuAusTtdlNxm4IZKcUruKvnfqxD6NT/58fUsggI="; }; buildInputs = [ openssl zlib ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix index 31c4488f85..f02623329c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/httplz/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.12.4"; + version = "1.12.5"; src = fetchCrate { inherit version; pname = "https"; - sha256 = "sha256-4+iIFLtPVs4PHOzfXfretCuZ0iBcqMVNnYFjEVhvBjk="; + sha256 = "sha256-+nCqMTLrBYNQvoKo1PzkyzRCkKdlE88+NYoJcIlAJts="; }; - cargoSha256 = "sha256-VOzMf9hOrAEGwtW9h8CnG/Df2KgEVhNqqdL762Gs2dE="; + cargoSha256 = "sha256-odiVIfNJPpagoASnYvdOosHXa37gbQM8Zmvtnao0pAs="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/networking/hysteria/default.nix b/third_party/nixpkgs/pkgs/tools/networking/hysteria/default.nix new file mode 100644 index 0000000000..6807b509ad --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/hysteria/default.nix @@ -0,0 +1,29 @@ +{ lib +, fetchFromGitHub +, buildGoModule +}: +buildGoModule rec { + pname = "hysteria"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "HyNetwork"; + repo = "hysteria"; + rev = "v${version}"; + sha256 = "sha256-V+umf7+qRANSNsMrU1Vij3ni6ayq/d41xSy3o+7sEHQ="; + }; + + vendorSha256 = "sha256-oxCZ4+E3kffHr8ca9BKCSYcSWQ8jwpzrFs0fvCvZyJE="; + proxyVendor = true; + + # Network required + doCheck = false; + + meta = with lib; { + description = "A feature-packed proxy & relay utility optimized for lossy, unstable connections"; + homepage = "https://github.com/HyNetwork/hysteria"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ oluceps ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 01328f66a4..ab245540c9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -10,13 +10,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.41.0"; + version = "2.42.1"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "sha256-fQqbZYb0brGmGf7Yc/2Zd5BZ+YOkGYC3o9uhShYdAE4="; + sha256 = "sha256-q44r+PVGxeoElVfthUh++X8EhxbzqJwjC/r5TD+89WA="; }; buildInputs = with lib; [ boost zlib openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/ipfetch/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ipfetch/default.nix index a8b354ec9e..29a37a1004 100755 --- a/third_party/nixpkgs/pkgs/tools/networking/ipfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ipfetch/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { description = "Neofetch but for ip adresses"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ papojari ]; + maintainers = with maintainers; [ annaaurora ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix index f8aab39470..62166f9976 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "kapp"; - version = "0.46.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-kapp"; rev = "v${version}"; - sha256 = "sha256-Z0BjwzTdKHAeETHya6M5OcsIIY//y6dDbbyZe/irCAY="; + sha256 = "sha256-TfTnq6cGlCm8Fv/pf6wAFrxbW2CJyZFze+woxy70OzA="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix index c58989aade..f08c1eb1e8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "2.0.2"; # only even minor versions are stable + version = "2.2.0"; # only even minor versions are stable src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-jSghO9yOK7hwo4OzCsHlPVTh66Q9L4blFRsItmqmzzI="; + sha256 = "sha256-2n2QymKncmAtrG535QcxkDhCKJWtaO6xQvFIfWfVMdI="; }; patches = [ ./dont-create-var.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix index 29ca996154..f4830ad408 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.13"; + version = "1.0.14"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "sha256-1jmCf9iidyDRv9lLxS7KJK9j3cw8nS2mB4h3iInYRwE="; + sha256 = "sha256-p0gZIU8Ral28QHo9SQyqAbpAGiSVF6yCajdAWcEtEug="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix index 5e788638e6..c27bb2a9ba 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lychee/default.nix @@ -1,26 +1,29 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config , openssl +, Security }: rustPlatform.buildRustPackage rec { pname = "lychee"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "lycheeverse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XjG4u0z3u89Wg2lrcD3T0OqNMgLxmKO1e1zYlGd3dqQ="; + sha256 = "sha256-2osBY7hO0v6fnKrOCYTbO45Ja0UHMoaXZeR1QIp2fT8="; }; - cargoSha256 = "sha256-aXxhKH0dB6VpXfoWJwXBjsxGFcK071MZfCoi4z9uHdc="; + cargoSha256 = "sha256-j+Pykcg9ezLJl4wH31tiLqmAkvQd9go+6wyUmBRTgTs="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; # Disabled because they currently fail doCheck = false; @@ -30,6 +33,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/lycheeverse/lychee"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ tuxinaut ]; - platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 9ca4dfa27b..e01cddab88 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2022-05-09T04-08-26Z"; + version = "2022-08-05T08-01-28Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-a7zpvumsMijMmJthg4EZgOUymDC4GrbDjAwN4sXxE6g="; + sha256 = "sha256-XtRpRp5KtqM+VwaouzbcjoiwuUDo4NtgaQ/bsCmwP58="; }; - vendorSha256 = "sha256-OkcQxTDKhuFCjNs5TNBBMde+M6vCfPSR5IuVbCaqWJg="; + vendorSha256 = "sha256-0WljjAgL//PqooHwAusMQwJpLRYzjpDUNcrmCHUGyNs="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix index c9d56044b0..76459d6d82 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/modemmanager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "modemmanager"; - version = "1.18.6"; + version = "1.18.10"; src = fetchurl { url = "https://www.freedesktop.org/software/ModemManager/ModemManager-${version}.tar.xz"; - sha256 = "sha256-1PgEsxz1BCOcXx1Jc8YglcAMuh7pq7UDcY2sbRRqRwo="; + sha256 = "sha256-FiVfginu6y3+y43RNwNg1G8QFeyF5vulwcvZ9DcdZes="; }; nativeBuildInputs = [ vala gobject-introspection gettext pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix index 3a652cca24..e963abc9b1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix @@ -1,17 +1,15 @@ { buildGoModule +, cmake , fetchFromGitHub -, fetchpatch , go , lib , pkg-config , polkit , python3 -, qmake +, qt5compat , qtbase , qtcharts -, qtgraphicaleffects , qtnetworkauth -, qtquickcontrols2 , qttools , qtwebsockets , rustPlatform @@ -22,50 +20,18 @@ }: let - glean_parser_4_1_1 = python3.pkgs.buildPythonPackage rec { - pname = "glean_parser"; - version = "4.1.1"; - src = python3.pkgs.fetchPypi { - inherit pname version; - hash = "sha256-4noazRqjjJNI2kTO714kSp70jZpWmqHWR2vnkgAftLE="; - }; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; - propagatedBuildInputs = with python3.pkgs; [ - appdirs - click - diskcache - jinja2 - jsonschema - pyyaml - setuptools - yamllint - ]; - postPatch = '' - substituteInPlace setup.py --replace '"pytest-runner", ' "" - ''; - doCheck = false; - }; - pname = "mozillavpn"; - version = "2.8.3"; + version = "2.9.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-eKgoRE/JDEQEFp7xYY60ARDgw/n5VoZpD/Gb/CWzHuo="; + hash = "sha256-arz8hTgQfPFSZesSddcnZoyLfoLQsQT8LIsl+3ZfA0M="; }; - patches = [ - # Rust bridge: Add Cargo.lock file - (fetchpatch { - url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/05c9a366cf9dc4e378485c8e9d494f77c35dbb8c.patch"; - hash = "sha256-fG+SATbJpGqpCFXSWEiBo4dYx6RLtJYR0yTdBqN6Fww="; - }) - ]; - netfilter-go-modules = (buildGoModule { - inherit pname version src patches; + inherit pname version src; vendorSha256 = "KFYMim5U8WlJHValvIBQgEN+17SDv0JVbH03IiyfDc0="; modRoot = "linux/netfilter"; }).go-modules; @@ -74,25 +40,25 @@ let in stdenv.mkDerivation { - inherit pname version src patches cargoRoot; + inherit pname version src cargoRoot; buildInputs = [ polkit + qt5compat qtbase qtcharts - qtgraphicaleffects qtnetworkauth - qtquickcontrols2 qtwebsockets ]; nativeBuildInputs = [ - glean_parser_4_1_1 + cmake go pkg-config python3 + python3.pkgs.glean-parser + python3.pkgs.lxml python3.pkgs.pyyaml - qmake - qttools + python3.pkgs.setuptools rustPlatform.cargoSetupHook rustPlatform.rust.cargo which @@ -100,29 +66,33 @@ stdenv.mkDerivation { ]; cargoDeps = rustPlatform.fetchCargoTarball { - inherit src patches; + inherit src; name = "${pname}-${version}"; preBuild = "cd ${cargoRoot}"; - hash = "sha256-C0wPmGVXbhUs0IzeIMZD6724P0XTOzeK1bzrnUMPlWo="; + hash = "sha256-lJfDLyoVDSFiZyWcBTI085MorWHPcNW4i7ua1+Ip3rA="; }; 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 - ''; - preBuild = '' + 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 \ + --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" + ln -s '${netfilter-go-modules}' linux/netfilter/vendor - python3 scripts/utils/generate_glean.py - python3 scripts/utils/import_languages.py --qt_path '${lib.getDev qttools}/bin' ''; - qmakeFlags = [ - "USRPATH=$(out)" - "ETCPATH=$(out)/etc" - "CONFIG-=debug" # https://github.com/mozilla-mobile/mozilla-vpn-client/pull/3539 + cmakeFlags = [ + "-DQT_LCONVERT_EXECUTABLE=${qttools.dev}/bin/lconvert" + "-DQT_LUPDATE_EXECUTABLE=${qttools.dev}/bin/lupdate" + "-DQT_LRELEASE_EXECUTABLE=${qttools.dev}/bin/lrelease" ]; + qtWrapperArgs = [ "--prefix" "PATH" ":" (lib.makeBinPath [ wireguard-tools ]) ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix index f711b18671..bbaa588545 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.8.6"; + version = "1.8.8"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = "v${version}"; - sha256 = "u3MN7MrfHt/ylxDoNnfwnAOKdOAbVZwvIukje0EYgOo="; + hash = "sha256-kgskeQM6zESkjDWmgGqhZlGnH8naZ5k0sw+70ZzW2/E="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix index 617f4de047..e4b9cedaff 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/mubeng/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "mubeng"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "kitabisa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qEIPu4miZpWL19N36DsKMbckXbHDTTZjp2ccZrV3LFc="; + sha256 = "sha256-z81/WbqhMJPliT5rrW4UY8gseV7R2UDQIUOjZuUgLTI="; }; - vendorSha256 = "sha256-sAcDyGNOSm+BnsYyrR2x1vkGo6ZEykhkF7L9lzPrD+o="; + vendorSha256 = "sha256-CjAFntwpHvUOaaLHDOT9Dctptv5EFW62X8XWT4SvT2A="; ldflags = [ "-s" "-w" "-X ktbs.dev/mubeng/common.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix index e0679c089b..66b2706204 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests, linuxHeaders }: +{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests, linuxHeaders, gnutls }: stdenv.mkDerivation rec { pname = "nbd"; @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-aHcVbSOnsz917uidL1wskcVCr8PNy2Nt6lqIU5pY0Qw="; }; - buildInputs = [ glib linuxHeaders ]; + buildInputs = [ glib gnutls ] + ++ lib.optionals stdenv.isLinux [ linuxHeaders ]; nativeBuildInputs = [ pkg-config which bison ]; @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { cp README.md "$out/share/doc/nbd-${version}/" ''; - doCheck = true; + doCheck = !stdenv.isDarwin; passthru.tests = { test = nixosTests.nbd; @@ -30,9 +31,9 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.optionalString stdenv.isLinux "-lrt -lpthread"; meta = { - homepage = "http://nbd.sourceforge.net"; + homepage = "https://nbd.sourceforge.io/"; description = "Map arbitrary files as block devices over the network"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix index fba769d2a5..29136e3ce4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/netavark/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "netavark"; - version = "1.0.3"; + version = "1.1.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M0jsCwle57YM0RO1hGMju5+8XvHPWc8tJqKWJL/sFsg="; + sha256 = "sha256-NZt62oTD7yFO1+HTuyp+wEd2PuUwtsIrMPHwjfmz3aI="; }; - cargoHash = "sha256-zTgHjDZdsseUpB5Xqn9yE5T6Tgqx22pQKQLlUtZq+lc="; + cargoHash = "sha256-l+y3mkV6uZJed2nuXNWXDr6Q1UhV0YlfRhpE7rvTRrE="; nativeBuildInputs = [ installShellFiles mandown ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix index 97a029d353..2d4e11f5b9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/default.nix @@ -34,6 +34,7 @@ , iputils , kmod , jansson +, elfutils , gtk-doc , libxslt , docbook_xsl @@ -43,14 +44,16 @@ , openconnect , curl , meson +, mesonEmulatorHook , ninja , libpsl , mobile-broadband-provider-info , runtimeShell +, buildPackages }: let - pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); + pythonForDocs = python3.pythonForBuild.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "networkmanager"; @@ -102,7 +105,9 @@ stdenv.mkDerivation rec { "-Ddhcpcanon=no" # Miscellaneous - "-Ddocs=true" + # almost cross-compiles, however fails with + # ** (process:9234): WARNING **: Failed to load shared library '/nix/store/...-networkmanager-aarch64-unknown-linux-gnu-1.38.2/lib/libnm.so.0' referenced by the typelib: /nix/store/...-networkmanager-aarch64-unknown-linux-gnu-1.38.2/lib/libnm.so.0: cannot open shared object file: No such file or directory + "-Ddocs=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" # We don't use firewalld in NixOS "-Dfirewalld_zone=false" "-Dtests=no" @@ -138,6 +143,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + gobject-introspection systemd libselinux audit @@ -150,12 +156,12 @@ stdenv.mkDerivation rec { mobile-broadband-provider-info bluez5 dnsmasq - gobject-introspection modemmanager readline newt libsoup jansson + dbus # used to get directory paths with pkg-config during configuration ]; propagatedBuildInputs = [ gnutls libgcrypt ]; @@ -167,7 +173,7 @@ stdenv.mkDerivation rec { pkg-config vala gobject-introspection - dbus + elfutils # used to find jansson soname # Docs gtk-doc libxslt @@ -176,6 +182,8 @@ stdenv.mkDerivation rec { docbook_xml_dtd_42 docbook_xml_dtd_43 pythonForDocs + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ]; doCheck = false; # requires /sys, the net @@ -183,6 +191,10 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs ./tools patchShebangs libnm/generate-setting-docs.py + + # TODO: submit upstream + substituteInPlace meson.build \ + --replace "'vala', req" "'vala', native: false, req" ''; preBuild = '' @@ -194,6 +206,11 @@ stdenv.mkDerivation rec { ln -s $PWD/src/libnm-client-impl/libnm.so.0 ${placeholder "out"}/lib/libnm.so.0 ''; + postFixup = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + cp -r ${buildPackages.networkmanager.devdoc} $devdoc + cp -r ${buildPackages.networkmanager.man} $man + ''; + passthru = { updateScript = gnome.updateScript { packageName = "NetworkManager"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix index 6ba996401a..238c0c364f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nss-mdns/default.nix @@ -1,14 +1,17 @@ -{ fetchurl, lib, stdenv, fetchpatch }: +{ fetchurl, lib, autoreconfHook, pkg-config, stdenv, fetchpatch, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "nss-mdns"; - version = "0.10"; + version = "v0.15.1"; - src = fetchurl { - url = "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-${version}.tar.gz"; - sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y"; + src = fetchFromGitHub { + owner = "lathiat"; + repo = pname; + rev = version; + hash = "sha256-iRaf9/gu9VkGi1VbGpxvC5q+0M8ivezCz/oAKEg5V1M="; }; + buildInputs = [ autoreconfHook pkg-config ]; # Note: Although `nss-mdns' works by talking to `avahi-daemon', it # doesn't depend on the Avahi libraries. Instead, it contains # hand-written D-Bus code to talk to the Avahi daemon. @@ -21,15 +24,6 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; - patches = [ - # Provide compat definition for libc lacking (e.g. musl) - (fetchpatch { - url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; - sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; - }) - ]; - - meta = { description = "The mDNS Name Service Switch (NSS) plug-in"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix index 315a4b6084..ddf3e54368 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oha/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "0.5.0"; + version = "0.5.3"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-wCoBlbi4/EiTAA1xiZ/taVrokE0ECf8STAlA1sk/pm0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-P21rANxgreXu8vA1vsFCSkh1Irs67r3s33XT1dMFD7I="; }; - cargoSha256 = "sha256-tcORdyxGViUhKbtxVJaZ1G3uUpyr1pRLu5j8v52lMg8="; + cargoSha256 = "sha256-l6xQbZVrWF8Uw27datqvv9B3LoPtoaCnumo0gIjKdaA="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; @@ -24,6 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "HTTP load generator inspired by rakyll/hey with tui animation"; homepage = "https://github.com/hatoo/oha"; + changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix index 8ae015102b..ea7a145632 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ooniprobe-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ooniprobe-cli"; - version = "3.15.1"; + version = "3.15.3"; src = fetchFromGitHub { owner = "ooni"; repo = "probe-cli"; rev = "v${version}"; - hash = "sha256-s1q9QgdbLmMaEV2ovGRKWHRhUFvbTHhFvo7ALdhUG4Y="; + hash = "sha256-21D/1ImKOr9+GeSrIRCUGCcALU0WPohrnz1qqUXLy1A="; }; - vendorSha256 = "sha256-h06WoKykuVzNgco74YbpSP+1nu/bOEf2mT4rUEX8MxU="; + vendorSha256 = "sha256-tZHBcVTCll3dSfQnQDfo9z3ALAykRmFvH7vjLLtQHDc="; subPackages = [ "cmd/ooniprobe" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix index 96c509e47f..9930f1f1fe 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/daemon.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "opensnitch"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "v${version}"; - sha256 = "sha256-8IfupmQb1romGEvv/xqFkYhp0gGoY4ZEllX6rZYIkqw="; + sha256 = "sha256-MF7K3WasG1xLdw1kWz6xVYrdfuZW5GUq6dlS0pPOkHI="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix index 3650792e18..dc1c6fa765 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/opensnitch/ui.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication rec { pname = "opensnitch-ui"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "refs/tags/v${version}"; - sha256 = "sha256-8IfupmQb1romGEvv/xqFkYhp0gGoY4ZEllX6rZYIkqw="; + sha256 = "sha256-MF7K3WasG1xLdw1kWz6xVYrdfuZW5GUq6dlS0pPOkHI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix index 4245d06a1c..ebe2604f4e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -21,7 +21,7 @@ , pam , libredirect , etcDir ? null -, withKerberos ? !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) +, withKerberos ? true , libkrb5 , libfido2 , hostname diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index f50920186d..a47483a11f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ appdirs beautifulsoup4 characteristic distro eliot fixtures foolscap future html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark - service-identity simplejson sphinx_rtd_theme testtools treq twisted zfec + service-identity simplejson sphinx-rtd-theme testtools treq twisted zfec zope_interface ] ++ twisted.optional-dependencies.tls ++ twisted.optional-dependencies.conch; diff --git a/third_party/nixpkgs/pkgs/tools/networking/pathvector/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pathvector/default.nix index 91cb5489f0..4ca1504070 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pathvector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pathvector/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pathvector"; - version = "5.12.0"; + version = "6.0.2"; src = fetchFromGitHub { owner = "natesales"; repo = "pathvector"; rev = "v${version}"; - sha256 = "sha256-RdUZkkALEdyq+YKtgGE/P8eTX2v3fdYHF1wpZEyfkgY="; + sha256 = "sha256-Rr7SVvi2K20qFTd4Gd2BzBTVIa/lCeBAJHLZ6iV2aSw="; }; - vendorSha256 = "sha256-oxLMfmHLaOQwpRYwnHRQY0mIV5/fZ65RDgKVs0Kzd2Q="; + vendorSha256 = "sha256-bqfYILEGgbnla7EUrzjIO2mMAuL6e4WI2OHUwOr6i+g="; CGO_ENABLED = 0; diff --git a/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix b/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix index 9b1c3d005b..284159dfc9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/phodav/default.nix @@ -1,9 +1,17 @@ -{ lib, stdenv, fetchurl -, pkg-config, libsoup, meson, ninja }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, pkg-config +, libsoup +, meson +, ninja +}: let version = "2.5"; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "phodav"; inherit version; @@ -12,6 +20,17 @@ in stdenv.mkDerivation rec { 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" @@ -19,6 +38,8 @@ in stdenv.mkDerivation rec { "-Dudev=disabled" ]; + NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-lintl"; + nativeBuildInputs = [ libsoup pkg-config meson ninja ]; outputs = [ "out" "dev" "lib" ]; @@ -27,7 +48,7 @@ in stdenv.mkDerivation rec { description = "WebDav server implementation and library using libsoup"; homepage = "https://wiki.gnome.org/phodav"; license = licenses.lgpl21; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + maintainers = with maintainers; [ wegank ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/pixiewps/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pixiewps/default.nix index 561daacfd5..82d420755d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/pixiewps/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/pixiewps/default.nix @@ -2,23 +2,21 @@ stdenv.mkDerivation rec { pname = "pixiewps"; - version = "1.2.2"; + version = "1.4.2"; src = fetchFromGitHub { - owner = "wiire"; + owner = "wiire-a"; repo = "pixiewps"; rev = "v${version}"; - sha256 = "09znnj7p8cks7zxzklkdm4zy2qnp92vhngm9r0zfgawnl2b4r2aw"; + sha256 = "sha256-cJ20Gp6YaSdgUXK/ckK5Yv0rGbGXuFMP5zKZG0c4oOY="; }; preBuild = '' - cd src - substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out" - substituteInPlace Makefile --replace "/local" "" + substituteInPlace Makefile --replace "/usr/local" "$out" ''; meta = { description = "An offline WPS bruteforce utility"; - homepage = "https://github.com/wiire/pixiewps"; + homepage = "https://github.com/wiire-a/pixiewps"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.nico202 ]; platforms = lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix b/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix index dabe0b40d2..4b8dbcdfe0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/proxify/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "proxify"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "proxify"; rev = "v${version}"; - sha256 = "sha256-g6HYwcQ4zAPLdu2o7oS1uWyFMp5FpGuJVXPtfAqYHJc="; + sha256 = "sha256-6YsduuiPgwxcSkqEcMxEhubte87IxWV9Qa1Vyv0Pd5w="; }; - vendorSha256 = "sha256-JJhxVfvcqOW6zvg+m8lIcrRgxIStFKXMuWo1BMmIv+o="; + vendorSha256 = "sha256-ewPimn70cheToU33g3p9s0MHxQdbKiqhGReKLgiHOSI="; meta = with lib; { description = "Proxy tool for HTTP/HTTPS traffic capture"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/quicktun/default.nix b/third_party/nixpkgs/pkgs/tools/networking/quicktun/default.nix index e9fa828af5..b997aad0c2 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/quicktun/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/quicktun/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { broken = stdenv.isDarwin; description = "Very simple, yet secure VPN software"; homepage = "http://wiki.ucis.nl/QuickTun"; - maintainers = [ maintainers.fpletz ]; + maintainers = [ ]; platforms = platforms.unix; license = licenses.bsd2; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/s5cmd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/s5cmd/default.nix index f7847f324c..c1f411bac4 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/s5cmd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/s5cmd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "s5cmd"; - version = "1.4.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "peak"; repo = "s5cmd"; rev = "v${version}"; - sha256 = "sha256-12bKMZ6SMPsqLqaBTVxCxvs7PZ0CKimI9wlqvWZ/bgY="; + sha256 = "sha256-9G0GSMNLYeIrbq7zctM3OCRcEZF1giEt+u5g3lTX96M="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix index 0584184a67..3ad9161c71 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -20,7 +20,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt ]; - cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" ]; + cmakeFlags = [ "-DWITH_STATIC=OFF" "-DCMAKE_BUILD_WITH_INSTALL_NAME_DIR=ON" + # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/ + "-DCMAKE_SKIP_BUILD_RPATH=ON" + ]; postInstall = '' cp lib/* $out/lib diff --git a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix b/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix index d22a0bf5c5..b8b70d861e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/siege/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "siege"; - version = "4.1.3"; + version = "4.1.5"; src = fetchurl { url = "http://download.joedog.org/siege/${pname}-${version}.tar.gz"; - hash = "sha256-IlC8qPylOfGk5Mvluomv0yxHObL7xgx8phaNmngveQo="; + hash = "sha256-B235/Nt/Y8Rtb2YazCzMhAWTeunK5JCrip14qdLnuMs="; }; NIX_LDFLAGS = lib.optionalString stdenv.isLinux [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/sipexer/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sipexer/default.nix new file mode 100644 index 0000000000..b8646270f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/sipexer/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "sipexer"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "miconda"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-cM40hxHMBH0wT1prSRipAZscSBxkZX7riwCrnLQUT0k="; + }; + + vendorSha256 = "sha256-q2uNqKZc6Zye7YimPDrg40o68Fo4ux4fygjVjJdhqQU="; + + meta = with lib; { + description = "Modern and flexible SIP CLI tool"; + homepage = "https://github.com/miconda/sipexer"; + changelog = "https://github.com/miconda/sipexer/releases/tag/v${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix index 41eaf4a5f5..c334cb755b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sish/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "sish"; - version = "2.1.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "antoniomika"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0rUQRul6es+m8JFGXChrygwU5fBi6RiYhoD1dQHpG3s="; + sha256 = "sha256-phnPs9mpheIOP0uZZ1Uoo7oRXl09Z+0q54v16YUYNUc="; }; - vendorSha256 = "sha256-GoiwpYELleD5tltQgRPGQU725h/uHe8tXqH4tIY//uE="; + vendorSha256 = "sha256-Ohdl99h/5epbONaYeGSC02evWcGe+8FtZ53RXHHsMpg="; meta = with lib; { description = "HTTP(S)/WS(S)/TCP Tunnels to localhost"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix index 9763d52d0b..691ea6e8a3 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/smartdns/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "smartdns"; - version = "36.1"; + version = "37"; src = fetchFromGitHub { owner = "pymumu"; repo = pname; rev = "Release${version}"; - sha256 = "sha256-5pAt7IjgbCCGaHeSoQvuoc6KPD9Yn5iXL1CAawgBeY0="; + sha256 = "sha256-zmcLXhqgwP9SKTyUUhOehQRJk6uX7iwgu9WP2TVhsR8="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/snowflake/default.nix b/third_party/nixpkgs/pkgs/tools/networking/snowflake/default.nix index fb343fac5a..5f42f91254 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/snowflake/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/snowflake/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "snowflake"; - version = "2.2.0"; + version = "2.3.0"; src = fetchgit { url = "https://git.torproject.org/pluggable-transports/${pname}"; rev = "v${version}"; - sha256 = "0iazamrfixv6yxc5m49adm97biq93pn6hwwpbh8yq558hrc6bh70"; + sha256 = "sha256-LQ9QIdj3id6bEzAItMGc3pJFylNP4har79VKUa9qo20="; }; - vendorSha256 = "1v7cpg3kny0vqmdbgcc7i61wi5gx5wvrv0hmjykjrqgrvyq764c1"; + vendorSha256 = "sha256-a2Ng+D1I0v5odChM6XVVnNwea/0SOTOmdm2dqKaSU3s="; meta = with lib; { description = "System to defeat internet censorship"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/spoofer/default.nix b/third_party/nixpkgs/pkgs/tools/networking/spoofer/default.nix index c28293c570..37a37be906 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/spoofer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/spoofer/default.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "spoofer"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { url = "https://www.caida.org/projects/spoofer/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-6ov1dZbxmBRIhfIzUaxiaHUeiU6SbNKhiQX1W4lmhD8="; + sha256 = "sha256-npSBC4uE22AF14vR2xPX9MEwflDCiCTifgYpxav9MXw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix index 77f86458ad..b297f2565f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sstp-client"; - version = "1.0.16"; + version = "1.0.17"; src = fetchurl { url = "mirror://sourceforge/sstp-client/sstp-client/sstp-client-${version}.tar.gz"; - sha256 = "sha256-r74U/RIveHX0+tDtmC0XRRNtLmbMNrl/cu8aERF4TKE="; + sha256 = "sha256-Kd07nHERrWmDzWY9Wi8Gnh+KlakTqryOFmlwFGZXkl0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix index 560457bdaa..6c6dffbef1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/strongswan/default.nix @@ -18,13 +18,13 @@ with lib; stdenv.mkDerivation rec { pname = "strongswan"; - version = "5.9.5"; # Make sure to also update when upgrading! + version = "5.9.7"; # Make sure to also update when upgrading! src = fetchFromGitHub { owner = "strongswan"; repo = "strongswan"; rev = version; - sha256 = "sha256-Jx0Wd/xgkl/WrBfcEvZPogPAQp0MW9HE+AQR2anP5Vo="; + sha256 = "sha256-4FOeY3a6DyftrbFtBqtY0nLxdIXPnY91wMAVIBm/KvY="; }; dontPatchELF = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix index b8737724cc..f9c33298fc 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/stunnel/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchurl, openssl, nixosTests }: stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.64"; + version = "5.65"; src = fetchurl { url = "https://www.stunnel.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-7r5T7RFrpDsueGdisMK5FRHnt0hXrUdlgk5xmeb6+IM="; - # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", + sha256 = "60c500063bd1feff2877f5726e38278c086f96c178f03f09d264a2012d6bf7fc"; + # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; @@ -28,6 +28,10 @@ stdenv.mkDerivation rec { "localstatedir=\${TMPDIR}" ]; + passthru.tests = { + stunnel = nixosTests.stunnel; + }; + meta = { description = "Universal tls/ssl wrapper"; homepage = "https://www.stunnel.org/"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix index 5433fb6774..bc05f3d998 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.5.1"; + version = "2.5.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t5bIIb31gb6f7hVeiTmMut0wXl40/Du4W9lnB49jlFA="; + sha256 = "sha256-IAFV8yDgA7ZGGZwdEWxiggIheAN4nH5UFfXQv8IjpwQ="; }; - vendorSha256 = "sha256-lyqjODNk7R6mvSl/I1zFgXvs4m60D4gwfgJ6ocoOHhc="; + vendorSha256 = "sha256-mE2yFGRAgi9RAzt08abbeAuAvmwBFMiAJuMZCDChg3Y="; modRoot = "./v2"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix b/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix index 568e344065..c6f18b26b8 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix @@ -9,23 +9,26 @@ rustPlatform.buildRustPackage rec { pname = "suckit"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "skallwar"; repo = pname; rev = "v${version}"; - sha256 = "0wr03yvrqa9p6m127fl4hcf9057i11zld898qz4kbdyiynpi0166"; + sha256 = "sha256-M4/vD1sVny7hAf4h56Z2xy7yuCqH/H3qHYod6haZOs0="; }; - cargoSha256 = "sha256-6otIWAAf9pI4A8kxK3dyOVpkw+SJ3/YAvTahDSXMWNc="; + cargoSha256 = "sha256-JsH7TL9iITawuECm1hzs5oXFtnoUqLT4ug2CafoO2ao="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; # requires internet access - checkFlags = [ "--skip=test_download_url" ]; + checkFlags = [ + "--skip=test_download_url" + "--skip=test_external_download" + ]; meta = with lib; { description = "Recursively visit and download a website's content to your disk"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix index 224b71f63d..d1443ddd20 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/swagger-codegen3/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "3.0.33"; + version = "3.0.34"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-1oGir5F3wgwRQxz3eXI58wMIKYwvtHrRW4VJh0hIVyE="; + sha256 = "sha256-C6uSqb8o6hcK7r7NxlHckMBcdMf2APK4FYRpQFMaE9Y="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix index 693c43843c..83449c3830 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "telepresence2"; - version = "2.5.4"; + version = "2.6.4"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - sha256 = "sha256-v6E1v89cVL4N8eKJ5pKU6BwQWZF5lLs4VLGhUS5J1rA="; + sha256 = "sha256-AZW58L0971GVnvafecHfVg3MWr/xGHi4ptycXcV63Fg="; }; # The Helm chart is go:embed'ed as a tarball in the binary. @@ -21,7 +21,7 @@ buildGoModule rec { go run ./build-aux/package_embedded_chart/main.go ${src.rev} ''; - vendorSha256 = "sha256-RDXP7faijMujAV19l9NmI4xk0Js6DE5YZoHRo2GHyoU="; + vendorSha256 = "sha256-aa40+6cjpA6/bqpFiqayCkX0PBToPmsp99ykv6e7Huc="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" @@ -31,7 +31,7 @@ buildGoModule rec { meta = with lib; { description = "Local development against a remote Kubernetes or OpenShift cluster"; - homepage = "https://www.getambassador.io/docs/telepresence/2.1/quick-start/"; + homepage = "https://telepresence.io"; license = licenses.asl20; maintainers = with maintainers; [ mausch ]; mainProgram = "telepresence"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix index 31ff5235aa..4f22a8221d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.35.2"; + version = "0.35.9"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QCCDZ0zsAqV7tvlBeyTpN5iz/jBc50oBgrmUB/R5wCY="; + sha256 = "sha256-3tggW+M3vZChDT1g77W5M3hchEN6pTSVvkrZda6ZTCY="; }; - vendorSha256 = "sha256-h4sNfV8B+WGgfVPDmWVNek7fQo5qZ3+VGkx4VSw4QF8="; + vendorSha256 = "sha256-/enY0qERFzAIJNcuw1djRGoAcmtz7R5Ikvlts0f7rLc="; subPackages = [ "cmd/tendermint" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/termscp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/termscp/default.nix index 4a497a767f..7fbf30614e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/termscp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/termscp/default.nix @@ -5,6 +5,8 @@ , openssl , pkg-config , rustPlatform +, AppKit +, Cocoa , Foundation , Security , stdenv @@ -12,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "termscp"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "veeso"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7T3VmcI9CWrKROQ0U2du2d8e0A6XnOxpd8Zl0T4w+KQ="; + sha256 = "sha256-iazp3Qx2AivuL+S1Ma/64BLJtE46tc33dq5qsgw+a6Q="; }; - cargoSha256 = "sha256-WuoN7b9Fw2Op8tck4ek8gyufInlbPkDHHtLAsbG1NLE="; + cargoSha256 = "sha256-FBW3Hl67Efnc/sNGM1LQw6msWHCYRj3KwfmSD2lpbUc="; nativeBuildInputs = [ pkg-config @@ -32,10 +34,16 @@ rustPlatform.buildRustPackage rec { libssh openssl ] ++ lib.optional stdenv.isDarwin [ + AppKit + Cocoa Foundation Security ]; + NIX_CFLAGS_COMPILE = lib.optionals stdenv.isDarwin [ + "-framework" "AppKit" + ]; + # Requires network access doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix b/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix index 5bd1858c19..173d2432a7 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tinc/pre.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage="http://www.tinc-vpn.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz lassulus mic92 ]; + maintainers = with maintainers; [ lassulus mic92 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix index 36518357e6..a5aacf1381 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/tinyssh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tinyssh"; - version = "20220311"; + version = "20220801"; src = fetchFromGitHub { owner = "janmojzis"; repo = "tinyssh"; rev = version; - sha256 = "sha256-+lmPPc2UsNtOfuheWEZHAzmKBilNQ3kNh8ixzDnRjRc="; + sha256 = "sha256-y01Uq7SyIsFX3KL3V+fF6x3ukrUTuijxwwhPBE3ehI0="; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/tools/networking/vopono/default.nix b/third_party/nixpkgs/pkgs/tools/networking/vopono/default.nix index c812a35bfe..f14d61a94e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/vopono/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.10.0"; + version = "0.10.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-89Mzn2knClBJwVlCglR5BOOo5dXRP1Gqp/mmwHvwM3c="; + sha256 = "sha256-JwtiqY56Cn2oY5lRz/oxmQe2rw4spFvCOp1zKKuVsys="; }; - cargoHash = "sha256-8m/zlmeYcYCxycP9W6eweRJ2Vf/8+GSYf+NNz3NtnIw="; + cargoHash = "sha256-NvdgyFlZ2udoWikJI7kzY14rfQi0KxpI2/P0+O5dqVA="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix index e0fdbdff0b..99fc6565b1 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -1,8 +1,9 @@ { lib, stdenv, fetchurl, gettext, pkg-config, perlPackages , libidn2, zlib, pcre, libuuid, libiconv, libintl , python3, lzip -, libpsl ? null -, openssl ? null }: +, withLibpsl ? false, libpsl +, withOpenssl ? true, openssl +}: stdenv.mkDerivation rec { pname = "wget"; @@ -31,12 +32,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext pkg-config perlPackages.perl lzip libiconv libintl ]; buildInputs = [ libidn2 zlib pcre libuuid ] ++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ] - ++ lib.optional (openssl != null) openssl - ++ lib.optional (libpsl != null) libpsl + ++ lib.optional withOpenssl openssl + ++ lib.optional withLibpsl libpsl ++ lib.optional stdenv.isDarwin perlPackages.perl; configureFlags = [ - (lib.withFeatureAs (openssl != null) "ssl" "openssl") + (lib.withFeatureAs withOpenssl "ssl" "openssl") ] ++ lib.optionals stdenv.isDarwin [ # https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html "--without-included-regex" @@ -46,18 +47,14 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; - longDescription = '' GNU Wget is a free software package for retrieving files using HTTP, HTTPS and FTP, the most widely-used Internet protocols. It is a non-interactive commandline tool, so it may easily be called from scripts, cron jobs, terminals without X-Windows support, etc. ''; - license = licenses.gpl3Plus; - homepage = "https://www.gnu.org/software/wget/"; - maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix b/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix index 7e9e20dd3b..b87991003c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.12"; + version = "5.5.13"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "sha256-UJy71VKEKPYfRXZB2lJiy6Ua6BkGW9Uz0zXciZC4oJE="; + sha256 = "sha256-Qd1tPRKbiTNmsOdawxQhJO1ykEA1VdAAXeBPPVlXwvI="; }; nativeBuildInputs = [ perl gettext pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix index 17e9f660ac..dda45fbce5 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/xrootd/default.nix @@ -16,6 +16,9 @@ , voms , zlib , enableTests ? true + # If not null, the builder will + # move "$out/etc" to "$out/etc.orig" and symlink "$out/etc" to externalEtc. +, externalEtc ? "/etc" }: stdenv.mkDerivation rec { @@ -68,10 +71,31 @@ stdenv.mkDerivation rec { sed -i 's/set\((\s*CMAKE_INSTALL_[A-Z_]\+DIR\s\+"[^"]\+"\s*)\)/define_default\1/g' cmake/XRootDOSDefs.cmake ''; + # https://github.com/xrootd/xrootd/blob/master/packaging/rhel/xrootd.spec.in#L665-L675= + postInstall = '' + mkdir -p "$out/lib/tmpfiles.d" + install -m 644 -T ../packaging/rhel/xrootd.tmpfiles "$out/lib/tmpfiles.d/xrootd.conf" + mkdir -p "$out/etc/xrootd" + install -m 644 -t "$out/etc/xrootd" ../packaging/common/*.cfg + install -m 644 -t "$out/etc/xrootd" ../packaging/common/client.conf + mkdir -p "$out/etc/xrootd/client.plugins.d" + install -m 644 -t "$out/etc/xrootd/client.plugins.d" ../packaging/common/client-plugin.conf.example + mkdir -p "$out/etc/logrotate.d" + install -m 644 -T ../packaging/common/xrootd.logrotate "$out/etc/logrotate.d/xrootd" + '' + lib.optionalString stdenv.isLinux '' + mkdir -p "$out/lib/systemd/system" + install -m 644 -t "$out/lib/systemd/system" ../packaging/common/*.service ../packaging/common/*.socket + ''; + cmakeFlags = lib.optionals enableTests [ "-DENABLE_TESTS=TRUE" ]; + postFixup = lib.optionalString (externalEtc != null) '' + mv "$out"/etc{,.orig} + ln -s ${lib.escapeShellArg externalEtc} "$out/etc" + ''; + meta = with lib; { description = "High performance, scalable fault tolerant data access"; homepage = "https://xrootd.slac.stanford.edu"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix index 028c50a352..ccd6009a6a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ytcc/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "ytcc"; - version = "2.5.5"; + version = "2.6.0"; src = fetchFromGitHub { owner = "woefe"; repo = "ytcc"; rev = "v${version}"; - sha256 = "sha256-DjyVcjU2dVku5ademm6DygMnzWHB7iMqPfU56BBjAwU="; + sha256 = "sha256-NTG7CtmlJzrhgr/JRSQ1jjSpJEm+PlF67PlEbPNihFE="; }; nativeBuildInputs = [ gettext installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix index ffbb5e0882..fa4495647c 100644 --- a/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix +++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-generators/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "nixos-generators"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixos-generators"; rev = version; - sha256 = "sha256-dpim9Mtd57Yj6qt7p7UKwjWm6NnOU3S7jaEyEscSyPE="; + sha256 = "sha256-WecDwDY/hEcDQYzFnccCNa+5Umht0lfjx/d1qGDy/rQ="; }; nativeBuildInputs = [ makeWrapper ]; installFlags = [ "PREFIX=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix new file mode 100644 index 0000000000..9f18772466 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/apkg/default.nix @@ -0,0 +1,49 @@ +{ lib, fetchFromGitLab, python3Packages +, gitMinimal, rpm, dpkg, fakeroot +}: + +python3Packages.buildPythonApplication rec { + pname = "apkg"; + version = "0.4.0"; + + src = fetchFromGitLab { + domain = "gitlab.nic.cz"; + owner = "packaging"; + repo = pname; + rev = "v${version}"; + sha256 = "duZz2Kwjgek5pMJTDH8gMZAZ13uFwaIYT5E1brW7I7U="; + }; + + propagatedBuildInputs = with python3Packages; [ + # copy&pasted requirements.txt (almost exactly) + beautifulsoup4 # upstream version detection + blessings # terminal colors + build # apkg distribution + cached-property # @cached_property for python <= 3.7 + click # nice CLI framework + distro # current distro detection + jinja2 # templating + packaging # version parsing + requests # HTTP for humans™ + setuptools # required by minver + toml # config files + ]; + + makeWrapperArgs = [ # deps for `srcpkg` operation for other distros; could be optional + "--prefix" "PATH" ":" (lib.makeBinPath [ gitMinimal rpm dpkg fakeroot ]) + ]; + + checkInputs = with python3Packages; [ pytest ]; + checkPhase = '' + runHook preCheck + py.test # inspiration: .gitlab-ci.yml + runHook postCheck + ''; + + meta = with lib; { + description = "Upstream packaging automation tool"; + homepage = "https://pkg.labs.nic.cz/pages/apkg"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.vcunat /* close to upstream */ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix index 550f010d75..352bf98a70 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/apt/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { pname = "apt"; - version = "2.4.4"; + version = "2.5.2"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${version}.tar.xz"; - hash = "sha256-1tg9Ei3dfMg7LC+DmlWUDBOrk+XPYCSgENamtBENzw4="; + hash = "sha256-zFw3TCgxyeOQ2cXwgCmoHDyit3irwN0UJsgcZXYo/p0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/deploy-rs/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/deploy-rs/default.nix new file mode 100644 index 0000000000..63c70facb9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/deploy-rs/default.nix @@ -0,0 +1,24 @@ +{ stdenv, lib, fetchFromGitHub, rustPlatform, CoreServices, SystemConfiguration }: + +rustPlatform.buildRustPackage rec { + pname = "deploy-rs"; + version = "unstable-2022-08-05"; + + src = fetchFromGitHub { + owner = "serokell"; + repo = "deploy-rs"; + rev = "41f15759dd8b638e7b4f299730d94d5aa46ab7eb"; + sha256 = "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM="; + }; + + cargoHash = "sha256-IXmcpYcWmTGBVNwNCk1TMDOcLxkZytlEIILknUle3Rg="; + + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices SystemConfiguration ]; + + meta = with lib; { + description = " A simple multi-profile Nix-flake deploy tool. "; + homepage = "https://github.com/serokell/deploy-rs"; + license = licenses.mpl20; + maintainers = [ maintainers.teutat3s ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix index 7176d7f608..6ef5467d9e 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/libdnf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libdnf"; - version = "0.66.0"; + version = "0.67.0"; src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; rev = version; - sha256 = "sha256-fQyNm51roz6wn9QAE8/ZIrutyWP45xiKVHzn8n0LcwE="; + sha256 = "sha256-ajYrR4MBHjGWaQwFmLSmZkazY93b05Ur4/E+mb/By9E="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index 1a9013b456..60620c9ba2 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.15.1"; + version = "2.17.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-D/1psEpOoDiA/dpnUc9sUaOq8Dk5QEImIWEp08FyV7o="; + sha256 = "sha256-+X68HW5pfJtMWmUoOgI1yHn5rfOVMKQaGL0/MQtMDQM="; }; - vendorSha256 = "sha256-guJgLjmB29sOLIzs2+gKNp0WTWC3zS9Sb5DD5IistKY="; + vendorSha256 = "sha256-KR1DgF41fjrCX4bn82kZ49xImQQitIyMSjlBPuNkF8c="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix index 4fa52a64d1..c2e9febea6 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/common.nix @@ -213,7 +213,7 @@ self = stdenv.mkDerivation { passthru = { inherit aws-sdk-cpp boehmgc; - perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; }); + perl-bindings = perl.pkgs.toPerlModule (callPackage ./nix-perl.nix { nix = self; inherit Security; }); }; }; in self diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix index 302d123a87..3c44dbdbe1 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/nix-perl.nix @@ -1,4 +1,5 @@ { stdenv +, lib , perl , pkg-config , curl @@ -8,6 +9,7 @@ , autoreconfHook , autoconf-archive , nlohmann_json +, Security }: stdenv.mkDerivation { @@ -16,6 +18,8 @@ stdenv.mkDerivation { postUnpack = "sourceRoot=$sourceRoot/perl"; + buildInputs = lib.optional (stdenv.isDarwin) Security; + # This is not cross-compile safe, don't have time to fix right now # but noting for future travellers. nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix index 1853c08016..2fbdebebb1 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/opkg/default.nix @@ -2,11 +2,11 @@ , autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.5"; + version = "0.6.0"; pname = "opkg"; src = fetchurl { url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz"; - sha256 = "sha256-oSFKdfo0+5Io242kcwjg5xGxyT/Yk4zxZMEP0o61Dx4="; + sha256 = "sha256-VoRHIu/yN9rxSqbmgUNvMkUhPFWQ7QzaN6ed9jf/Okw="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix index 3deda8d7c5..dce0b2a942 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/rpm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages -, sqlite, zstd, fetchpatch +, sqlite, zstd, fetchpatch, libcap }: stdenv.mkDerivation rec { @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ cpio zlib zstd bzip2 file libarchive libgcrypt nspr nss db xz python lua sqlite ] - ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp + ++ lib.optional stdenv.isLinux libcap; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements propagatedBuildInputs = [ popt nss db bzip2 libarchive libbfd ] @@ -35,7 +36,7 @@ stdenv.mkDerivation rec { "--enable-zstd" "--localstatedir=/var" "--sharedstatedir=/com" - ]; + ] ++ lib.optional stdenv.isLinux "--with-cap"; patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fix build for macOS aarch64 (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/tools/package-management/wapm/cli/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/wapm/cli/default.nix new file mode 100644 index 0000000000..b71bb166ea --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/package-management/wapm/cli/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, libiconv +, openssl +, rustPlatform +, Security +, stdenv +, SystemConfiguration +}: + +rustPlatform.buildRustPackage rec { + pname = "wapm-cli"; + version = "0.5.5"; + + src = fetchFromGitHub { + owner = "wasmerio"; + repo = "wapm-cli"; + rev = "v${version}"; + sha256 = "sha256-BKBd1tJwV4VOjRnAx/spQy3LIXzujrO2SS5eA1uybNA="; + }; + + cargoSha256 = "sha256-dv04AXOnzizjq/qx3qy524ylQHgE4gIBgeYI+2IRTug="; + + buildInputs = [ libiconv openssl ] + ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + + doCheck = false; + + meta = with lib; { + description = "A package manager for WebAssembly modules"; + homepage = "https://docs.wasmer.io/ecosystem/wapm"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.lucperkins ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix index 2c3861d60b..990534b13d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-xze8Frxy9Rv01yz0L8GkEaXUoLlpODv3pEat1HnDIOs="; + sha256 = "sha256-3zlpmOGCjox8dVItVxyQloPgC0+dYw57pFFBySAXC5g="; }; - cargoSha256 = "sha256-yCQLSLxEziDQGDNtP7pmXlTImSKzr/O/5sITMHVJg8E="; + cargoSha256 = "sha256-LvhSgJQyPyTSD1koXBXYaC6I5njZavgQK4WaW5/b9g4="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/atomic-operator/default.nix b/third_party/nixpkgs/pkgs/tools/security/atomic-operator/default.nix index c4e07b4d34..b385cce380 100644 --- a/third_party/nixpkgs/pkgs/tools/security/atomic-operator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/atomic-operator/default.nix @@ -12,9 +12,14 @@ python3.pkgs.buildPythonApplication rec { owner = "swimlane"; repo = pname; rev = version; - hash = "sha256-fO8bvzeMdJVWlhpzdTmJo9mrT6iorsLqr/GPF9gvE70="; + hash = "sha256-DyNqu3vndyLkmfybCfTbgxk3t/ALg7IAkAMg4kBkH7Q="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "charset_normalizer~=2.0.0" "charset_normalizer" + ''; + propagatedBuildInputs = with python3.pkgs; [ attrs certifi diff --git a/third_party/nixpkgs/pkgs/tools/security/b2sum/default.nix b/third_party/nixpkgs/pkgs/tools/security/b2sum/default.nix index bf415e7554..e5de613bee 100644 --- a/third_party/nixpkgs/pkgs/tools/security/b2sum/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/b2sum/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { license = with licenses; [ asl20 cc0 openssl ]; maintainers = with maintainers; [ kirelagin ]; # "This code requires at least SSE2." - platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; + platforms = [ "x86_64-linux" "i686-linux" ] ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/beyond-identity/default.nix b/third_party/nixpkgs/pkgs/tools/security/beyond-identity/default.nix index 15a8ab3882..eec53d3bf9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/beyond-identity/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/beyond-identity/default.nix @@ -5,7 +5,7 @@ let pname = "beyond-identity"; - version = "2.49.0-0"; + version = "2.60.0-0"; libPath = lib.makeLibraryPath ([ glib glibc openssl tpm2-tss gtk3 gnome.gnome-keyring polkit polkit_gnome ]); meta = with lib; { description = "Passwordless MFA identities for workforces, customers, and developers"; @@ -22,7 +22,7 @@ let src = fetchurl { url = "https://packages.beyondidentity.com/public/linux-authenticator/deb/ubuntu/pool/focal/main/b/be/${pname}_${version}/${pname}_${version}_amd64.deb"; - sha512 = "sha512-+9vwH1r5WW+MqyiwsAFInboaM7o2dc7zvRaKwHC/o2LOBugvUHmUzmZ6uSHilc9zQ5FcHUIIglhkASbFtsvPeA=="; + sha512 = "sha512-JrHLf7KkJVbJLxx54OTvOSaIzY3+hjX+bpkeBHKX23YriCJssUUvEP6vlbI4r6gjMMFMhW92k0iikAgD1Tr4ug=="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix index 9ae5da8649..842eb758c3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "bitwarden"; - version = "2022.5.1"; + version = "2022.8.1"; src = fetchurl { url = "https://github.com/bitwarden/clients/releases/download/desktop-v${version}/Bitwarden-${version}-amd64.deb"; - sha256 = "sha256-L6Mow4wC5PlpR9IYXOztW4FyGDq9wWEuV2PvzQ7M/rU="; + sha256 = "sha256-MmhHs1Gp6H1CkLO/yCBhsF0KMiYXz37D6QP26fS+/u0="; }; desktopItem = makeDesktopItem { diff --git a/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix b/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix index d7f8e30e18..200cd96c23 100644 --- a/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "brutespray"; - version = "1.7.0"; + version = "1.8"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0lkm3fvx35ml5jh4ykjr2srq8qfajkmxwp4qfcn9xi58khk3asq3"; + sha256 = "sha256-hlFp2ZQnoydxF2NBCjSKtmNzMj9V14AKrNYKMF/8m70="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix b/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix index 22106727e3..7d6122fe5f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,24 +2,23 @@ let pname = "buttercup-desktop"; - version = "2.14.2"; - name = "${pname}-${version}"; + version = "2.16.0"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-ZZaolebDGqRk4BHP5PxFxBsMgOQAxUoIMTlhxM58k0Y="; + sha256 = "sha256-o6KdbwD0VdCTYLEfar7Jt7MRZUayGHyasnmtU8Cqg3E="; }; - appimageContents = appimageTools.extractType2 { inherit name src; }; + appimageContents = appimageTools.extractType2 { inherit pname src version; }; in appimageTools.wrapType2 { - inherit name src; + inherit pname src version; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; extraInstallCommands = '' - mv $out/bin/${name} $out/bin/buttercup-desktop + mv $out/bin/${pname}-${version} $out/bin/${pname} install -m 444 -D ${appimageContents}/buttercup.desktop -t $out/share/applications substituteInPlace $out/share/applications/buttercup.desktop \ - --replace 'Exec=AppRun' 'Exec=buttercup-desktop' + --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/chain-bench/default.nix b/third_party/nixpkgs/pkgs/tools/security/chain-bench/default.nix index 097f5783e1..9b9801159c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/chain-bench/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/chain-bench/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "chain-bench"; - version = "0.1.0"; + version = "0.1.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8KsEjVZJtQ4oj4UVM2TRzAOPUeUWKVwPM+8zLzsvLq0="; + sha256 = "sha256-qNprOxp8PKV5nld4uDGH0I0KG0r5sH7vr6It62J8RXc="; }; - vendorSha256 = "sha256-UWm6Bg6E6Vo6giztkPqCLaM7BBxJ+qmlXlYat3xlSYM="; + vendorSha256 = "sha256-54q486c/uUpatLQ3/FiVZxqu9NCkzcf8yQUZnAtrqYg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix index 86d729f95d..16cd827b8f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/clamav/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "clamav"; - version = "0.105.0"; + version = "0.105.1"; src = fetchurl { url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz"; - sha256 = "sha256-JwIDpUxFgEnbVPzZNoP/Wy2xkVHzY8SOgs7O/d4rNdQ="; + sha256 = "sha256-0rwWN024iablpqxA+MbnACVKA5rKpTaIWgnu6kuFKfY="; }; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://www.clamav.net"; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; - maintainers = with maintainers; [ robberer qknight fpletz globin ]; + maintainers = with maintainers; [ robberer qknight globin ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix b/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix index 753fd8a639..6cfd103478 100644 --- a/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/clevis/default.nix @@ -1,6 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, asciidoc -, makeWrapper, jansson, jose, cryptsetup, curl, libpwquality, luksmeta -, coreutils, tpm2-tools +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, asciidoc +, makeWrapper +, jansson +, jose +, cryptsetup +, curl +, libpwquality +, luksmeta +, coreutils +, tpm2-tools +, gnugrep +, gnused }: stdenv.mkDerivation rec { @@ -24,7 +39,7 @@ stdenv.mkDerivation rec { postInstall = '' # We wrap the main clevis binary entrypoint but not the sub-binaries. wrapProgram $out/bin/clevis \ - --prefix PATH ':' "${tpm2-tools}/bin:${jose}/bin:${placeholder "out"}/bin" + --prefix PATH ':' "${lib.makeBinPath [tpm2-tools jose cryptsetup libpwquality luksmeta gnugrep gnused coreutils]}:${placeholder "out"}/bin" ''; nativeBuildInputs = [ meson ninja pkg-config asciidoc makeWrapper ]; @@ -35,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "Automated Encryption Framework"; homepage = "https://github.com/latchset/clevis"; - maintainers = with lib.maintainers; [ fpletz ]; + maintainers = with lib.maintainers; [ ]; license = lib.licenses.gpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/cliam/default.nix b/third_party/nixpkgs/pkgs/tools/security/cliam/default.nix index 7b7ee342a1..8ae75142ba 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cliam/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cliam/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cliam"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "securisec"; repo = pname; rev = version; - hash = "sha256-bq7u6pknokyY4WwO1qMYPuY86UZlDgeYEa1AJpk8d+4="; + hash = "sha256-TEpAY1yY5AFTg5yUZMvTFdZiQ7yBi0rjYgCCksiMfDU="; }; - vendorSha256 = "sha256-aGBA97EvIUv9myqcrtltiVxh1/0VtrQy2j9GU6r197g="; + vendorSha256 = "sha256-VCai9rxpnlpviN5W/VIRcNGvPljE2gbFnxA1OKhVElk="; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix index 99f8c72893..c698fa4fa9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.9.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-l+jM0GCjaqbaoIcjUgnIZJqSGIsirWMwJWPrilBdps8="; + sha256 = "sha256-DMNjzTor22uyTzieWsni9wvscfU7uCFuf3AXOYP4LRo="; }; buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite) @@ -16,11 +16,10 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorSha256 = "sha256-mZeCQOnAVZrJmi9F+y7QPPXXl48f7HAjJCmri01hYew="; + vendorSha256 = "sha256-onRfo3ZK/+uEa0xR7P9IlEsd2aXy9foJjZl0UBO/cbs="; subPackages = [ "cmd/cosign" - "cmd/cosign/webhook" "cmd/sget" ]; @@ -33,19 +32,12 @@ buildGoModule rec { "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" ]; - postBuild = '' - # cmd/cosign/webhook should be called cosigned - mv $GOPATH/bin/{webhook,cosigned} - ''; - preCheck = '' # test all paths unset subPackages - rm cmd/cosign/cli/fulcio/fulcioroots/fulcioroots_test.go # Require network access - rm pkg/cosign/kubernetes/webhook/validator_test.go # Require network access rm pkg/cosign/tlog_test.go # Require network access - rm pkg/cosign/tuf/client_test.go # Require network access + rm pkg/cosign/verify_test.go # Require network access ''; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/crackmapexec/default.nix b/third_party/nixpkgs/pkgs/tools/security/crackmapexec/default.nix index f88563498b..9646f3a7ca 100644 --- a/third_party/nixpkgs/pkgs/tools/security/crackmapexec/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/crackmapexec/default.nix @@ -1,19 +1,18 @@ { lib , fetchFromGitHub -, fetchpatch , python3 }: python3.pkgs.buildPythonApplication rec { pname = "crackmapexec"; - version = "5.2.2"; + version = "5.3.0"; format = "pyproject"; src = fetchFromGitHub { owner = "byt3bl33d3r"; repo = "CrackMapExec"; rev = "v${version}"; - hash = "sha256-IgD8RjwVEoEXmnHU3DR3wzUdJDWIbFw9sES5qYg30a8="; + hash = "sha256-wPS1PCvR9Ffp0r9lZZkFATt+i+eR5ap16HzLWDZbJKI="; }; nativeBuildInputs = with python3.pkgs; [ @@ -23,6 +22,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ aioconsole + aardwolf beautifulsoup4 dsinternals impacket @@ -40,21 +40,13 @@ python3.pkgs.buildPythonApplication rec { xmltodict ]; - patches = [ - # Switch to poetry-core, https://github.com/byt3bl33d3r/CrackMapExec/pull/580 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/byt3bl33d3r/CrackMapExec/commit/e5c6c2b5c7110035b34ea7a080defa6d42d21dd4.patch"; - hash = "sha256-5SpoQD+uSYLM6Rdq0/NTbyEv4RsBUuawNNsknS71I9M="; - }) - ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '{ git = "https://github.com/mpgn/impacket.git", branch = "master" }' '"x"' + ''; pythonRelaxDeps = true; - pythonRemoveDeps = [ - "bs4" - ]; - # Project has no tests doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/credential-detector/default.nix b/third_party/nixpkgs/pkgs/tools/security/credential-detector/default.nix index 1e3497b0ca..e4ef8a6e90 100644 --- a/third_party/nixpkgs/pkgs/tools/security/credential-detector/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/credential-detector/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "credential-detector"; - version = "1.7.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "ynori7"; repo = pname; rev = "v${version}"; - sha256 = "1g5ja32rsf1b7y9gvmy29qz2ymyyvgh53wzd6vvknfla1df0slab"; + sha256 = "sha256-zUQRzlp/7gZhCm5JYu9kYxcoFjDldCYKarRorOHa3E0="; }; - vendorSha256 = "1mn3sysvdz4b94804gns1yssk2q08djq3kq3cd1h7gm942zwrnq4"; + vendorSha256 = "sha256-VWmfATUbfnI3eJbFTUp6MR1wGESuI15PHZWuon5M5rg="; meta = with lib; { description = "Tool to detect potentially hard-coded credentials"; diff --git a/third_party/nixpkgs/pkgs/tools/security/crlfsuite/default.nix b/third_party/nixpkgs/pkgs/tools/security/crlfsuite/default.nix index 79e69896e3..409db7195c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/crlfsuite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/crlfsuite/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "crlfsuite"; - version = "2.1.1"; + version = "2.1.2"; format = "setuptools"; src = fetchFromGitHub { owner = "Nefcore"; repo = "CRLFsuite"; rev = "refs/tags/v${version}"; - sha256 = "sha256-wWXqeQ6rq4yMG1V9f9JGE91Se8VuU8gpahmYyNTtkmo="; + sha256 = "sha256-Olwt19HauTG2HuG4Pro0ImVbQtWqCgx9gV+2RtePT/8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix b/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix index 7e8d8ca4bf..19387045e7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cryptomator/default.nix @@ -6,13 +6,13 @@ let pname = "cryptomator"; - version = "1.6.10"; + version = "1.6.13"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - sha256 = "sha256-klNkMCgXC0gGqNV7S5EObHYCcgN4SayeNHXF9bq+20s="; + sha256 = "sha256-xQxCSWbovdecTFWFDFu2K+lbA6+bSV2l2kk+R/hFcQ0="; }; # perform fake build to make a fixed-output derivation out of the files downloaded from maven central (120MB) @@ -37,7 +37,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-biQBP0rV94+Hoqte36Xmzm1XWtWC+1ne5lgpUj0GPak="; + outputHash = "sha256-SFiYHUH1Et7/SgciIvLcQGh54Z3fDVp22jSvDavXPjE="; doCheck = false; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/davtest/default.nix b/third_party/nixpkgs/pkgs/tools/security/davtest/default.nix new file mode 100644 index 0000000000..d4a7b6068c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/davtest/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, perl, perlPackages, fetchurl }: + +stdenv.mkDerivation rec { + pname = "davtest"; + version = "1.0"; + + src = fetchurl { + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/davtest/davtest-${version}.tar.bz2"; + sha256 = "0kigcgv1bbnan9yr5481s4b9islmvzl2arpg1ig1i39sxrna06y7"; + }; + + postPatch = '' + substituteInPlace davtest.pl \ + --replace "backdoors/" "$out/share/davtest/backdoors/" \ + --replace "tests/" "$out/share/davtest/tests/" + ''; + + buildInputs = [ + (perl.withPackages (p: with p; [ HTTPDAV ])) + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 davtest.pl $out/bin/davtest.pl + mkdir -p $out/share/davtest + cp -r backdoors/ tests/ $out/share/davtest/ + + runHook postInstall + ''; + + meta = with lib; { + description = "Tests WebDAV servers by uploading test files, and then optionally testing for command execution or other actions directly on the target"; + homepage = "https://code.google.com/p/davtest/"; + mainProgram = "davtest.pl"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix b/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix index 73e4f79cab..3b9fa39c60 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dnsrecon/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "1.1.1"; + version = "1.1.2"; format = "setuptools"; src = fetchFromGitHub { owner = "darkoperator"; repo = pname; rev = version; - hash = "sha256-zbFtaEklkfLkrqJAPptOqDTdWGbCE+3ZO79t68iqLIU="; + hash = "sha256-rOFDoQEIlwV02c2aJsovnhvaC2XTFq9mMEfilG+Gs4w="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix b/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix index d1595d9de2..b4a108e8eb 100644 --- a/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/dontgo403/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dontgo403"; - version = "0.3"; + version = "0.5"; src = fetchFromGitHub { owner = "devploit"; repo = pname; rev = version; - hash = "sha256-QHkmnhOLdyci3PAhf/JIiYlCta8DJ3cZb1S6Sim0qGQ="; + hash = "sha256-aVPmS4qIa9v7jnK1YG9EUV81frhu3/0x3zY7akPkpeg="; }; vendorSha256 = "sha256-jF+CSmLHMdlFpttYf3pK84wdfFAHSVPAK8S5zunUzB0="; diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix index 8b21ef160a..524f27df10 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "doppler"; - version = "3.38.0"; + version = "3.40.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-GKsq6AhkhacG+5XIELpe58bDe5l3BnLCwJHMkCzTzJU="; + sha256 = "sha256-OVfclCkyFw9GO7sGjId40vrmnt4oyHjNYZBNFjyYFUc="; }; - vendorSha256 = "sha256-VPxHxNtDeP5CFDMTeMsZYED9ZGWMquJdeupeCVldY/E="; + vendorSha256 = "sha256-evG1M0ZHfn9hsMsSncwxF5Hr/VJ7y6Ir0D2gHJaunBo="; ldflags = [ "-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix b/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix index eb5fd03416..4c0318ffa3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/expliot/default.nix @@ -12,6 +12,7 @@ let inherit version; sha256 = "0qiax309my534drk81lihq9ghngr96qnm40kbmgc9ay4fncqq6kh"; }; + doCheck = false; }); }; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix index 2325374d96..744c5c6aab 100644 --- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-07-12"; + version = "2022-08-10"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-fnhiLB5Ga2yWhj0/w94d9gl874ekPJBwiIgK8DapN+w="; + hash = "sha256-t+y28QDeu0tIUidPjSqSPcmOzfaH6SnreuiEBDtKzP0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix b/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix index ef09cc1ac7..459f9f12c1 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fail2ban/default.nix @@ -80,7 +80,7 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://www.fail2ban.org/"; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ eelco lovek323 fpletz ]; + maintainers = with maintainers; [ eelco lovek323 ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix index aecdbf8dd2..1442bba07f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-agent-dispatcher"; - version = "2.1.3"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_agent_dispatcher"; - rev = version; - hash = "sha256-lqCW1/wRXfN7C9c6TPvninueOgrhzNdjRJ9fuueMyH0="; + rev = "refs/tags/${version}"; + hash = "sha256-dTXTR2H37FDfnpY4Ts6NoYAnJX52yqRZeD2Yf8S/kS8="; }; nativeBuildInputs = with python3.pkgs; [ @@ -49,6 +49,7 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ "test_execute_agent" + "SSL" ]; disabledTestPaths = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/faraday-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/faraday-cli/default.nix index 28cf907886..0988b9eb95 100644 --- a/third_party/nixpkgs/pkgs/tools/security/faraday-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/faraday-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-cli"; - version = "2.1.5"; + version = "2.1.6"; format = "setuptools"; src = fetchFromGitHub { owner = "infobyte"; repo = pname; - rev = "v${version}"; - hash = "sha256-kl5yOJTMobccZoaIoWwQubCrswPa69I5Kmuox7JqAXs="; + rev = "refs/tags/${version}"; + hash = "sha256-ofL3tRYV2bwF+RYGoLpg/UQPg9HwrCepWAQxXiJkV2E="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix b/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix index 1229620c21..3c67c4aa78 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fido2luks/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.19"; + version = "0.2.20"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "sha256-o21KdsAE9KznobdMMKfVmVnENsLW3cMZjssnrsoN+KY="; + sha256 = "04gl7wn38f42mapmkf026rya668vvhm03yi8iqnz31xgggbr2irm"; }; buildInputs = [ cryptsetup ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" ''; - cargoSha256 = "sha256-8JFe3mivf2Ewu1nLMugeeK+9ZXAGPHaqCyKfWfwLOc8="; + cargoSha256 = "1sp52zsj0s3736zih71plnk01si24jsawnx0580qfgg322d5f601"; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; diff --git a/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix b/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix index fbf065dc3b..6416adec0e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/flare-floss/default.nix @@ -2,44 +2,73 @@ , python3 , fetchFromGitHub }: +let + py = python3.override { + packageOverrides = final: prev: { + # required for networkx 2.5.1 + decorator = prev.decorator.overridePythonAttrs (o: o // rec { + version = "4.4.2"; + src = o.src.override { + inherit version; + sha256 = "sha256-46YvBSAXJEDKDcyCN0kxk4Ljd/N/FAoLme9F/suEv+c="; + }; + }); -python3.pkgs.buildPythonPackage rec { + # flare-floss requires this exact version (newer versions are incompatible) + networkx = prev.networkx.overridePythonAttrs (o: o // rec { + version = "2.5.1"; + src = o.src.override { + inherit version; + sha256 = "sha256-EJzVhcrEEpf3EQPDxCrG73N58peI61TLdRvlpmO7I1o="; + }; + }); + }; + }; +in +py.pkgs.buildPythonPackage rec { pname = "flare-floss"; - version = "1.7.0"; + version = "2.0.0"; src = fetchFromGitHub { - owner = "fireeye"; + owner = "mandiant"; repo = "flare-floss"; rev = "v${version}"; - sha256 = "GMOA1+qM2A/Qw33kOTIINEvjsfqjWQWBXHNemh3IK8w="; + fetchSubmodules = true; # for tests + sha256 = "sha256-V4OWYcISyRdjf8x93B6h2hJwRgmRmk32hr8TrgRDu8Q="; }; - propagatedBuildInputs = with python3.pkgs; [ - pyyaml - simplejson + postPatch = '' + substituteInPlace setup.py \ + --replace "==" ">=" + + substituteInPlace floss/main.py \ + --replace 'sigs_path = os.path.join(get_default_root(), "sigs")' 'sigs_path = "'"$out"'/share/flare-floss/sigs"' + ''; + + propagatedBuildInputs = with py.pkgs; [ + halo + networkx + pydantic tabulate - vivisect - plugnplay + tqdm viv-utils - ]; + vivisect + ] ++ viv-utils.optional-dependencies.flirt; - checkInputs = with python3.pkgs; [ + checkInputs = with py.pkgs; [ + pytest-sugar pytestCheckHook + pyyaml ]; - disabledTests = [ - # test data is in a submodule - "test_main" - ]; - - pythonImportsCheck = [ - "floss" - "floss.plugins" - ]; + postInstall = '' + mkdir -p $out/share/flare-floss/ + cp -r sigs $out/share/flare-floss/ + ''; meta = with lib; { description = "Automatically extract obfuscated strings from malware"; - homepage = "https://github.com/fireeye/flare-floss"; + homepage = "https://github.com/mandiant/flare-floss"; license = licenses.asl20; maintainers = teams.determinatesystems.members; }; diff --git a/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix b/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix index d3b1836c94..125cab6b3f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fprintd/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitLab +, fetchpatch , pkg-config , gobject-introspection , meson @@ -36,6 +37,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-ePhcIZyXoGr8XlBuzKjpibU9D/44iCXYBlpVR9gcswQ="; }; + patches = [ + # backport upstream patch fixing tests + (fetchpatch { + url = "https://gitlab.freedesktop.org/libfprint/fprintd/-/commit/ae04fa989720279e5558c3b8ff9ebe1959b1cf36.patch"; + sha256 = "sha256-jW5vlzrbZQ1gUDLBf7G50GnZfZxhlnL2Eu+9Bghdwdw="; + }) + ]; + nativeBuildInputs = [ pkg-config meson diff --git a/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix b/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix index acfce66834..e1e0353847 100644 --- a/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "0.4.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b+2M28cI+4UkzrIqI+BioxJsGqT0pqJVPTPmXe+NsZo="; + sha256 = "sha256-jNsW4eUpqa1a1itEnY1932ta3UpjLxhbHz9byM6/Rxo="; # 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-INPMsSyjFs4GyapOlc/k5fcI2ePUKgp4BtASOKwQhck="; + vendorSha256 = "sha256-L+20HvkRAs00tbD5q1ATeLrKoa7VFQlrXChh7AtK0PI="; nativeBuildInputs = [ installShellFiles ]; @@ -29,14 +29,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/sigstore/fulcio/pkg/api.gitVersion=v${version}" - "-X github.com/sigstore/fulcio/pkg/api.gitTreeState=clean" + "-X github.com/sigstore/fulcio/pkg/server.gitVersion=v${version}" + "-X github.com/sigstore/fulcio/pkg/server.gitTreeState=clean" ]; # ldflags based on metadata from git and source preBuild = '' - ldflags+=" -X github.com/sigstore/fulcio/pkg/api.gitCommit=$(cat COMMIT)" - ldflags+=" -X github.com/sigstore/fulcio/pkg/api.buildDate=$(cat SOURCE_DATE_EPOCH)" + ldflags+=" -X github.com/sigstore/fulcio/pkg/server.gitCommit=$(cat COMMIT)" + ldflags+=" -X github.com/sigstore/fulcio/pkg/server.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; preCheck = '' @@ -44,7 +44,7 @@ buildGoModule rec { unset subPackages # skip test that requires networking - substituteInPlace pkg/config/config_test.go \ + substituteInPlace pkg/config/config_network_test.go \ --replace "TestLoad" "SkipLoad" ''; diff --git a/third_party/nixpkgs/pkgs/tools/security/gau/default.nix b/third_party/nixpkgs/pkgs/tools/security/gau/default.nix index 29a0aadd15..48f9d7bbbf 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gau/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gau/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gau"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "lc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jIMBvRnY1Z/cLwBnWGp1fsx6oLri1qiknLj+r9B4GHc="; + sha256 = "sha256-z8JmMMob12wRTdpFoVbRHTDwet9AMXet49lHEDVVAnw="; }; vendorSha256 = "sha256-HQATUCzYvhhlqe4HhNu9H4CqmY2IGLNJ9ydt3/igSmQ="; diff --git a/third_party/nixpkgs/pkgs/tools/security/git-hound/default.nix b/third_party/nixpkgs/pkgs/tools/security/git-hound/default.nix index 56fa2ce476..2d13b11d30 100644 --- a/third_party/nixpkgs/pkgs/tools/security/git-hound/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/git-hound/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "git-hound"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "tillson"; repo = pname; rev = "v${version}"; - sha256 = "1l2bif7qpc1yl93ih01g9jci7ba47rsnpq9js88rz216q93dzmsf"; + sha256 = "sha256-HD5OK8HjnLDbyC/TmVI2HfBRIUCyyHTbA3JvKoeXV5E="; }; - vendorSha256 = "055hpfjbqng513c9rscb8jhnlxj7p82sr8cbsvwnzk569n71qwma"; + vendorSha256 = "sha256-qnIcjk2mzG/51ouhrAW6R3ZqoUSL6ZzYCOVZvKS7sBQ="; meta = with lib; { description = "Reconnaissance tool for GitHub code search"; diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix index f5dce0e3a7..960f502e2e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.8.12"; + version = "8.10.2"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rrTZuDMKZqDWFHbnqDbPd5L6g7ff1lZpSpwTgYFd0Uw="; + sha256 = "sha256-FiR1zJ9aOdysp5807vZ9aX3O7l8GhDXlFDWuyk5zJQw="; }; vendorSha256 = "sha256-X8z9iKRR3PptNHwy1clZG8QsClsjbW45nZb2fHGfSYk="; diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index 2e9f0e7c44..5286d0f4a2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.14.3"; + version = "1.14.4"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,10 +21,10 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Tep57FowoDWujgh0pyawzOu3w37cCWKAkb4SOT/5L10="; + sha256 = "sha256-UQvwkprHGez5qRpk6KodtgX99013rcezbgpaCateI4k="; }; - vendorSha256 = "sha256-8Ergb3qYCAlyYVQw6433jEi7cHiqwvwiZHIgnOS6D8w="; + vendorSha256 = "sha256-169KBsJhytzfOgIOHb54gEsLAmhVv+O64hP/DU6cT6A="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/hakrawler/default.nix b/third_party/nixpkgs/pkgs/tools/security/hakrawler/default.nix index 0e2174e50a..a2b62f9b27 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hakrawler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hakrawler/default.nix @@ -1,20 +1,20 @@ -{ buildGoModule +{ lib +, buildGoModule , fetchFromGitHub -, lib }: buildGoModule rec { pname = "hakrawler"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "hakluke"; repo = "hakrawler"; rev = version; - sha256 = "sha256-g0hJGRPLgnWAeB25iIw/JRANrYowfRtAniDD/yAQWYk="; + hash = "sha256-ZJG5KlIlzaztG27NoSlILj0I94cm2xZq28qx1ebrSmc="; }; - vendorSha256 = "sha256-VmMNUNThRP1jEAjZeJC4q1IvnQEDqoOM+7a0AnABQnU="; + vendorSha256 = "sha256-NzgFwPvuEZ2/Ks5dZNRJjzzCNPRGelQP/A6eZltqkmM="; meta = with lib; { description = "Web crawler for the discovery of endpoints and assets"; diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix b/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix index 15abe8449e..2a0d0fe940 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.2.5"; + version = "6.2.7"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "sha256-f8QNP4ApBdgZooeWOs4Om2LtIFoiBbe1ZfCzokyzs0I="; + sha256 = "sha256-C9Vh8PEbxNm+8KnE6F++2CzvDwAzG/AGBYYTwFZvwBA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix index 2519e714b7..de7060e69f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.2.3"; + version = "1.2.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-gBt1xllfzw8M+n+vgUmOQ3vgDxDuDaQ7YXfWdLWnpVk="; + sha256 = "sha256-w4VELxmahqjfiMGXflSnhp5NKPi3HUucjxEUegljbVY="; }; - vendorSha256 = "sha256-9ZwRbeZ1iSuJiIJDBauU1U9PpGn8QQPTd3MfrnSmF+w="; + vendorSha256 = "sha256-9zLZyXrLvxwwkTwtpKxdGftzCZISZ/al98VnPiaMqGA="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/third_party/nixpkgs/pkgs/tools/security/iaito/default.nix b/third_party/nixpkgs/pkgs/tools/security/iaito/default.nix index e2a4d37a97..d8bfc9e474 100644 --- a/third_party/nixpkgs/pkgs/tools/security/iaito/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/iaito/default.nix @@ -1,44 +1,52 @@ { lib , stdenv , fetchFromGitHub +, meson +, ninja , pkg-config +, python3 , qtbase , qttools , radare2 , wrapQtAppsHook -, zip , nix-update-script }: +# TODO MacOS support. +# TODO Build and install translations. + stdenv.mkDerivation rec { pname = "iaito"; - version = "5.7.0"; + version = "5.7.2"; src = fetchFromGitHub { owner = "radareorg"; repo = pname; rev = version; - fetchSubmodules = true; - sha256 = "sha256-qEJTsS669eEwo2iiuybN72O5oopCaGEkju8+ekjw2zk="; + sha256 = "sha256-5/G5wfdc6aua90XLP3B7Ruy8F3NTXzWfQE6yVDZ0rX8="; }; - nativeBuildInputs = [ pkg-config qttools wrapQtAppsHook zip ]; + nativeBuildInputs = [ meson ninja pkg-config python3 qttools wrapQtAppsHook ]; + buildInputs = [ radare2 qtbase ]; - postPatch = '' - substituteInPlace Makefile \ - --replace "git submodule update --init" "" + postUnpack = '' + sourceRoot=$sourceRoot/src ''; - NIX_CFLAGS_COMPILE = [ "-I${radare2}/include/libr" "-I${radare2}/include/libr/sdb" ]; + # TODO Fix version checking and version information for r2. + # Version checking always fails due to values being empty strings for some + # reason. Meanwhile, we can safely assume that radare2's runtime and + # compile-time implementations are the same and remove this check. + patches = [ ./remove-broken-version-check.patch ]; installPhase = '' runHook preInstall - install -Dm755 build/iaito $out/bin/iaito - install -Dm644 $src/src/org.radare.iaito.appdata.xml $out/share/metainfo/org.radare.iaito.appdata.xml - install -Dm644 $src/src/org.radare.iaito.desktop $out/share/applications/org.radare.iaito.desktop - install -Dm644 $src/src/img/iaito-o.svg $out/share/pixmaps/iaito-o.svg + install -m755 -Dt $out/bin iaito + install -m644 -Dt $out/share/metainfo $src/src/org.radare.iaito.appdata.xml + install -m644 -Dt $out/share/applications $src/src/org.radare.iaito.desktop + install -m644 -Dt $out/share/pixmaps $src/src/img/iaito-o.svg runHook postInstall ''; @@ -48,14 +56,15 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Official frontend of radare2"; + description = "An official graphical interface of radare2"; longDescription = '' - The official graphical interface for radare2, a libre reverse engineering - framework. + iaito is the official graphical interface of radare2. It's the + continuation of Cutter for radare2 after the Rizin fork. ''; - homepage = "https://github.com/radareorg/iaito"; + homepage = "https://radare.org/n/iaito.html"; changelog = "https://github.com/radareorg/iaito/releases/tag/${src.rev}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ azahi ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/iaito/remove-broken-version-check.patch b/third_party/nixpkgs/pkgs/tools/security/iaito/remove-broken-version-check.patch new file mode 100644 index 0000000000..7c4e3ef30a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/iaito/remove-broken-version-check.patch @@ -0,0 +1,54 @@ +diff --git i/IaitoApplication.cpp w/IaitoApplication.cpp +index 25b6a4e7..4cbde5c4 100644 +--- i/IaitoApplication.cpp ++++ w/IaitoApplication.cpp +@@ -33,27 +33,6 @@ + #include + #endif + +-static bool versionCheck() { +- // Check r2 version +- QString a = r_core_version (); // runtime library version +- QString b = "" R2_GITTAP; // compiled version +- QStringList la = a.split("."); +- QStringList lb = b.split("."); +- if (la.size() < 2 && lb.size() < 2) { +- eprintf ("Invalid version string somwhere\n"); +- return false; +- } +- if (la.at(0) != lb.at(0)) { +- eprintf ("Major version differs\n"); +- return false; +- } +- if (la.at(1) != lb.at(1)) { +- eprintf ("Minor version differs\n"); +- return false; +- } +- return true; +-} +- + IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc, argv) + { + // Setup application information +@@ -101,21 +80,6 @@ IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc, + std::exit(1); + } + +- if (!versionCheck ()) { +- QMessageBox msg; +- msg.setIcon(QMessageBox::Critical); +- msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No); +- msg.setWindowTitle(QObject::tr("Version mismatch!")); +- QString localVersion = r_core_version (); +- QString r2version = R2_GITTAP; +- msg.setText(QString( +- QObject::tr("The version used to compile Iaito (%1) does not match the binary version of radare2 (%2). This could result in unexpected behaviour. Are you sure you want to continue?")).arg( +- localVersion, r2version)); +- if (msg.exec() == QMessageBox::No) { +- std::exit(1); +- } +- } +- + #ifdef IAITO_ENABLE_PYTHON + // Init python + if (!clOptions.pythonHome.isEmpty()) { diff --git a/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix b/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix index e936ab025f..8dd833f9d2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ioccheck/default.nix @@ -6,6 +6,16 @@ let py = python3.override { packageOverrides = self: super: { + emoji = super.emoji.overridePythonAttrs (oldAttrs: rec { + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "carpedm20"; + repo = "emoji"; + rev = "v${version}"; + sha256 = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I="; + }; + }); # Support for later tweepy releases is missing # https://github.com/ranguli/ioccheck/issues/70 diff --git a/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix b/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix index 21a0a3c612..903dfa090f 100644 --- a/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-WSQyym9RMrCiWlb2O4Cd7/ra2UNTL8XsaSNnSTAmhjs="; + hash = "sha256-5Cx5rwXUNnVSbLjkpB6qeudRHI4RVzl6T4zo7Dg9geo="; }; deps = stdenv.mkDerivation { @@ -40,7 +40,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-LCF03nTC7T2YxlLIWO3zgrbJVTCQOU8Who9NIqvicb4="; + outputHash = "sha256-Q7eGZQJZObLyZlp8JyodA3gEAgfh7ub+BNQh/LEm2Nk="; }; in stdenv.mkDerivation { inherit pname version src; diff --git a/third_party/nixpkgs/pkgs/tools/security/kube-bench/default.nix b/third_party/nixpkgs/pkgs/tools/security/kube-bench/default.nix new file mode 100644 index 0000000000..e95ff1a054 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/kube-bench/default.nix @@ -0,0 +1,48 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "kube-bench"; + version = "0.6.8"; + + src = fetchFromGitHub { + owner = "aquasecurity"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-uqjF2WtsGMzA/JDS93BSQNuBJorMIJha9qPHJkIbjQo="; + }; + vendorSha256 = "sha256-/LSgIfLBsGRSyz9gExgLKAjO+RF/C8CkxSvwx2jZjoI="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/aquasecurity/kube-bench/cmd.KubeBenchVersion=v${version}" + ]; + + postInstall = '' + mkdir -p $out/share/kube-bench/ + mv ./cfg $out/share/kube-bench/ + + installShellCompletion --cmd kube-bench \ + --bash <($out/bin/kube-bench completion bash) \ + --fish <($out/bin/kube-bench completion fish) \ + --zsh <($out/bin/kube-bench completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/kube-bench --help + $out/bin/kube-bench version | grep "v${version}" + runHook postInstallCheck + ''; + + meta = with lib; { + homepage = "https://github.com/aquasecurity/kube-bench"; + changelog = "https://github.com/aquasecurity/kube-bench/releases/tag/v${version}"; + description = "Checks whether Kubernetes is deployed according to security best practices as defined in the CIS Kubernetes Benchmark"; + license = licenses.asl20; + maintainers = with maintainers; [ jk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix b/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix index d9ef1f3825..e082b3d217 100644 --- a/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/kube-hunter/default.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ netaddr netifaces - scapy requests prettytable urllib3 diff --git a/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix b/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix index 5027572627..4af9466a3d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "lethe"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "kostassoid"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0UYUzef7ja8nc2zs7eWqqXQfVVbEJEH9/NRRHVkvkYk="; + sha256 = "sha256-uMpqN9xgA0S861JChfJebU6azxJN8ScftmX8yJV8NM8="; }; - cargoSha256 = "sha256-suE8USKTZECVlTX4Wpz3vapo/Wmn7qaC3eyAJ3gmzqk="; + cargoSha256 = "sha256-GeZ/25ZaD/vyQo02SUt1JtNUL2QCg0varOJC1M3Ji9s="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix b/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix index d410663e4f..558c0fd0c3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/libtpms/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "libtpms"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; rev = "v${version}"; - sha256 = "sha256-f88hT9+rbZXkSQ39mUuGHqmBYN/7pdd5q4Aq4gGjVdY="; + sha256 = "sha256-gA3tXsrJgk0WCI2rKy81f3PrGu/Ml1WExJ0P9AzLQ+c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/linux-exploit-suggester/default.nix b/third_party/nixpkgs/pkgs/tools/security/linux-exploit-suggester/default.nix new file mode 100644 index 0000000000..9744c416bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/linux-exploit-suggester/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenvNoCC, fetchFromGitHub }: + +stdenvNoCC.mkDerivation rec { + pname = "linux-exploit-suggester"; + version = "unstable-2022-04-01"; + + src = fetchFromGitHub { + owner = "mzet-"; + repo = pname; + rev = "54a5c01497d6655be88f6262ccad5bc5a5e4f4ec"; + sha256 = "v0Q8O+aaXEqwWAwGP/u5Nkm4DzM6nM11GI4XbK2PeWM="; + }; + + installPhase = '' + runHook preInstall + + install -Dm755 linux-exploit-suggester.sh $out/bin/${pname} + + runHook postInstall + ''; + + meta = with lib; { + description = "Tool designed to assist in detecting security deficiencies for given Linux kernel/Linux-based machine"; + homepage = "https://github.com/mzet-/linux-exploit-suggester"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/metabigor/default.nix b/third_party/nixpkgs/pkgs/tools/security/metabigor/default.nix index 4e03e11f49..fe0b150bc8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metabigor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metabigor/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "metabigor"; - version = "1.10"; + version = "1.12.1"; src = fetchFromGitHub { owner = "j3ssie"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ADpnSsGZQbXaSGidPmxwkQOl+P8ZupqRaDUh7t+XoDw="; + sha256 = "sha256-T1P+jAAsKObKRaoxH8c/DMEfXtmSrvnDd5Y3ocKcCSc="; }; - vendorSha256 = "sha256-la7bgeimycltFB7l6vNBYdlBIv4kD+HX7f2mo+eZhXM="; + vendorSha256 = "sha256-V+72l2TvhEWgDg7kvn5OOjYcyEgWGLgTGnt58Bu+AEQ="; # Disabled for now as there are some failures ("undefined:") doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile index dc964d2b8c..176a9c231b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.6" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.11" diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index 914ef4a791..eb7bd292a0 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: cb251272d8937b0b5bc92c5194a3617392b50625 - ref: refs/tags/6.2.6 + revision: addeeea49e5217ade1407a2e9a3cf6514ad8972e + ref: refs/tags/6.2.11 specs: - metasploit-framework (6.2.6) + metasploit-framework (6.2.11) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -130,26 +130,26 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.605.0) - aws-sdk-core (3.131.2) + aws-partitions (1.616.0) + aws-sdk-core (3.132.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.321.0) + aws-sdk-ec2 (1.326.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.69.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.57.0) + aws-sdk-kms (1.58.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sigv4 (1.5.0) + aws-sigv4 (1.5.1) aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.18) bcrypt_pbkdf (1.1.0) @@ -174,14 +174,14 @@ GEM http_parser.rb (>= 0.6.0) em-socksify (0.3.2) eventmachine (>= 1.0.0.beta.4) - erubi (1.10.0) + erubi (1.11.0) eventmachine (1.2.7) - faker (2.21.0) + faker (2.22.0) i18n (>= 1.8.11, < 2) - faraday (2.3.0) - faraday-net_http (~> 2.0) + faraday (2.5.1) + faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) - faraday-net_http (2.0.3) + faraday-net_http (3.0.0) faraday-retry (2.0.0) faraday (~> 2.0) faye-websocket (0.11.1) @@ -224,7 +224,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-credential (5.0.7) + metasploit-credential (5.0.8) metasploit-concern metasploit-model metasploit_data_models (>= 5.0.0) @@ -234,7 +234,7 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (4.0.5) + metasploit-model (4.0.6) activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) @@ -254,9 +254,9 @@ GEM mini_portile2 (2.8.0) minitest (5.16.2) mqtt (0.5.0) - msgpack (1.5.3) + msgpack (1.5.4) multi_json (1.15.0) - mustermann (1.1.1) + mustermann (2.0.2) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) net-ldap (0.17.1) @@ -270,15 +270,15 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) - nokogiri (1.13.7) + nokogiri (1.13.8) mini_portile2 (~> 2.8.0) racc (~> 1.4) nori (2.6.0) - octokit (5.1.0) + octokit (5.2.0) faraday (>= 1, < 3) sawyer (~> 0.9) - openssl-ccm (1.2.2) - openssl-cmac (2.0.1) + openssl-ccm (1.2.3) + openssl-cmac (2.0.2) openvas-omp (0.0.4) packetfu (1.1.13) pcaprub @@ -290,13 +290,13 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.4.1) + pg (1.4.3) public_suffix (4.0.7) puma (5.6.4) nio4r (~> 2.0) racc (1.6.0) rack (2.2.4) - rack-protection (2.2.0) + rack-protection (2.2.2) rack rack-test (2.0.2) rack (>= 1.3) @@ -331,7 +331,7 @@ GEM metasm rex-arch rex-text - rex-exploitation (0.1.32) + rex-exploitation (0.1.35) jsobfu metasm rex-arch @@ -356,14 +356,14 @@ GEM metasm rex-core rex-text - rex-socket (0.1.40) + rex-socket (0.1.41) rex-core rex-sslscan (0.1.7) rex-core rex-socket rex-text rex-struct2 (0.1.3) - rex-text (0.2.38) + rex-text (0.2.39) rex-zip (0.1.4) rex-text rexml (3.2.5) @@ -371,7 +371,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.1.6) + ruby_smb (3.1.7) bindata openssl-ccm openssl-cmac @@ -384,10 +384,10 @@ GEM faraday (>= 0.17.3, < 3) simpleidn (0.2.1) unf (~> 0.1.4) - sinatra (2.2.0) - mustermann (~> 1.0) + sinatra (2.2.2) + mustermann (~> 2.0) rack (~> 2.2) - rack-protection (= 2.2.0) + rack-protection (= 2.2.2) tilt (~> 2.0) sqlite3 (1.4.4) sshkey (2.0.0) @@ -397,10 +397,10 @@ GEM eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) thor (1.2.1) - tilt (2.0.10) + tilt (2.0.11) timeout (0.3.0) ttfunk (1.7.0) - tzinfo (2.0.4) + tzinfo (2.0.5) concurrent-ruby (~> 1.0) tzinfo-data (1.2022.1) tzinfo (>= 1.0.0) diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix index c188dfb266..9cbe1ff2ff 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.6"; + version = "6.2.11"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-GppCjA35d4cvCuGE29czAu4JVCq3l2CHIRFkKWNSNH0="; + sha256 = "sha256-MdSAJc0H+UU5pr6OzUNOaZDE3d0MdRQyZS2Ear2Wv9k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index e73b8fa378..078640cb9e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -104,30 +104,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15ff3d8ijqh7har1cgwv2aiq77gkp8jyb8km15vz4kbckf7jps2m"; + sha256 = "1bz5wb377xnp4hs13sf4sxalfn2ycxfry1g5lfwixzvwhhbim5x1"; type = "gem"; }; - version = "1.605.0"; + version = "1.616.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "164abp3cvmvfa2qsgzbxvkafbhwbgn3qwknp0amwmxw5nwvz8p3s"; + sha256 = "0lal5x2qkz6ip36ladynb29j65brq8bbdcgx6cwbybsyadwcf693"; type = "gem"; }; - version = "3.131.2"; + version = "3.132.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a4j83p1a8x9zdrmlnvqr9g53wmrf1dcf7i5glyamsj4lmqxlnv1"; + sha256 = "0674pphc7m3di01dzbcvl9g5brv1mmcmj14lwaj73gsvbc6zybhy"; type = "gem"; }; - version = "1.321.0"; + version = "1.326.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -144,10 +144,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m8vwm4cakfv3i4f723a6id07myx18fpdbq8ypa2j7r5njwxpmzz"; + sha256 = "1p2dbmb1vl8vk2xchrrsp2sxa95ya5w7ll1jlw89yyhls3l2l1ag"; type = "gem"; }; - version = "1.57.0"; + version = "1.58.0"; }; aws-sdk-s3 = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xp7diwq7nv4vvxrl9x3lis2l4x6bissrfzbfyy6rv5bmj5w109z"; + sha256 = "1d4bifmll4hrf4gihr5hdvn59wjpz4qpyg5jj95kp17fykzqg36n"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.1"; }; bcrypt = { groups = ["default"]; @@ -324,10 +324,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; + sha256 = "11bz1v1cxabm8672gabrw542zyg51dizlcvdck6vvwzagxbjv9zx"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; eventmachine = { groups = ["default"]; @@ -344,30 +344,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "025lapimxw0db74gf2yd6zypqq1yvfblhk7wkd6h3r1szk7k8r8p"; + sha256 = "1na8p9r9zdvz75aihjczhamlygrjs9dj7pcbxgg8vfavrx8d89b5"; type = "gem"; }; - version = "2.21.0"; + version = "2.22.0"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rvxs99wvrcw65v8ykppih323kw1qr5pnzgw3daxch1sfj828f2k"; + sha256 = "1jf9gfr2viracxm0nzd2mzs07j2ilznj7w3awyrr2wm53b56pc3h"; type = "gem"; }; - version = "2.3.0"; + version = "2.5.1"; }; faraday-net_http = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mbgcnjikbqa5d0pyn6cv30f33p2vaj3rgzkx45gwxw2gmx4wlb6"; + sha256 = "0yicplzlh5da8pr64286zga3my86cjsb2y9dqlzsacpw8hbkmjvw"; type = "gem"; }; - version = "2.0.3"; + version = "3.0.0"; }; faraday-retry = { groups = ["default"]; @@ -604,32 +604,32 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "073bhxlyszk5iknx6896kch4yfcjk48wq7q5vnjd5k7akx0k9h8p"; + sha256 = "08w1yhjybrdrn7rv77j4d58w9m8fdh4l5kaw7wsikv1zzcjdqwrl"; type = "gem"; }; - version = "5.0.7"; + version = "5.0.8"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "cb251272d8937b0b5bc92c5194a3617392b50625"; - sha256 = "0z9la9ijjr0i463n15xp59a0kvh26gbxp17118pqfxzr1n6456hs"; + rev = "addeeea49e5217ade1407a2e9a3cf6514ad8972e"; + sha256 = "1ndzjsynm11dclr18x8cvpfw94399r1wv3mylqwlby87rljq1m1i"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.6"; + version = "6.2.11"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i08iwb7xgddh798xb3blyygqwgnb15ww3vlvw45248llk01gay3"; + sha256 = "17kmw9gx4mdimv5wbf3935g43ad9spdx9bshdgk5y754kw80cnqd"; type = "gem"; }; - version = "4.0.5"; + version = "4.0.6"; }; metasploit-payloads = { groups = ["default"]; @@ -706,10 +706,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bqf9yp0kvcmqskixzhg66w922z280bkyfq41id6kk5nixlnmwg7"; + sha256 = "02af38s49111wglqzcjcpa7bwg6psjgysrjvgk05h3x4zchb6gd5"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.4"; }; multi_json = { groups = ["default"]; @@ -726,10 +726,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + sha256 = "0m70qz27mlv2rhk4j1li6pw797gmiwwqg02vcgxcxr1rq2v53rnb"; type = "gem"; }; - version = "1.1.1"; + version = "2.0.2"; }; nessus_rest = { groups = ["default"]; @@ -817,10 +817,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lhhnqch8r9n1835p6pvmg4m2r4hb98nkfxrpr4yf6246d9xg8bc"; + sha256 = "0g7axlq2y6gzmixzzzhw3fn6nhrhg469jj8gfr7gs8igiclpkhkr"; type = "gem"; }; - version = "1.13.7"; + version = "1.13.8"; }; nori = { groups = ["default"]; @@ -837,30 +837,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jxx0pxm46vyrc3zp684m5b7xvw12ca2gnhnwizyvh15d65aribm"; + sha256 = "1xn53wdrk0vy08d88s6dd2n3mly3prw8m00pcc9hm7ykmbs1668r"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; openssl-ccm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gxwxk657jya2s5m8cpckvgy5m7qx0hzfp8xvc0hg2wf1lg5gwp0"; + sha256 = "1mqr538wcfjc1q9qxsc2pz0s81kw1f3xk7k1qy903n5b3bh9vri3"; type = "gem"; }; - version = "1.2.2"; + version = "1.2.3"; }; openssl-cmac = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k69p0p0ilvqnwskhc0bfax8rwvyk6n4wzarg8qsjdvm13xwx508"; + sha256 = "1mml6105j6ryd9d019gbwzkdjmvycjlxxld0qzg9vs70f1qdihcc"; type = "gem"; }; - version = "2.0.1"; + version = "2.0.2"; }; openvas-omp = { groups = ["default"]; @@ -917,10 +917,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11q4zw8n0lmff5k514ip30yizr38jb2x5nh3m7fy3k13sbxbysrq"; + sha256 = "1ypj64nhq3grs9zh40vmyfyhmxlhljjsbg5q0jxhlxg5v76ij0mb"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.3"; }; public_suffix = { groups = ["default"]; @@ -967,10 +967,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2"; + sha256 = "169jzzgvbjrqmz4q55wp9pg4ji2h90mggcdxy152gv5vp96l2hgx"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.2"; }; rack-test = { groups = ["default"]; @@ -1107,10 +1107,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0646y7nbc54ljgw28gmlsqbmwxs1hs5v3h24arj4jrnvqrq9bw71"; + sha256 = "1hnwjilqyx39w0vi94ixj6qa2nlmb0z69f57vdb2xw3z9q29jlsl"; type = "gem"; }; - version = "0.1.32"; + version = "0.1.35"; }; rex-java = { groups = ["default"]; @@ -1197,10 +1197,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ckcqycg8jl2iiibpcry88rl0j2hsiklsxh6za5vp9rxsl09wlv6"; + sha256 = "1ws7xj7898ba2ib3c2ww2g6df1jyjny42smndqb5sa4gfzynkcfp"; type = "gem"; }; - version = "0.1.40"; + version = "0.1.41"; }; rex-sslscan = { groups = ["default"]; @@ -1227,10 +1227,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10jxl3p3ndhb5cfj5y5qbiv82d3zn9wn0sr8q32cqlib4wnwx254"; + sha256 = "0za2rihc8d1hr4g5gqabpdd19npah0mmh93wylrh503hiwq7ljsv"; type = "gem"; }; - version = "0.2.38"; + version = "0.2.39"; }; rex-zip = { groups = ["default"]; @@ -1297,10 +1297,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yvm8qg4i6qgdgqh5j4k3vw5hz9zl8w06jxhmwx69l7gvjxqi2fr"; + sha256 = "0y6yz3zpf64hrz5pa43jhrk8jxl2iivsirh7n7gzy6gfbxxmvssb"; type = "gem"; }; - version = "3.1.6"; + version = "3.1.7"; }; rubyntlm = { groups = ["default"]; @@ -1347,10 +1347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y"; + sha256 = "0mbjp75dy35q796iard8izsy7gk55g2c3q864r2p13my3yjmlcvz"; type = "gem"; }; - version = "2.2.0"; + version = "2.2.2"; }; sqlite3 = { groups = ["default"]; @@ -1407,10 +1407,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + sha256 = "186nfbcsk0l4l86gvng1fw6jq6p6s7rc0caxr23b3pnbfb20y63v"; type = "gem"; }; - version = "2.0.10"; + version = "2.0.11"; }; timeout = { groups = ["default"]; @@ -1437,10 +1437,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10qp5x7f9hvlc0psv9gsfbxg4a7s0485wsbq1kljkxq94in91l4z"; + sha256 = "0rx114mpqnw2k4h98vc0rs0x0bmf0img84yh8mkkjkal07cjydf5"; type = "gem"; }; - version = "2.0.4"; + version = "2.0.5"; }; tzinfo-data = { groups = ["default"]; diff --git a/third_party/nixpkgs/pkgs/tools/security/mokutil/default.nix b/third_party/nixpkgs/pkgs/tools/security/mokutil/default.nix index a84763a242..b408e4d2c8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/mokutil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/mokutil/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "mokutil"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "lcp"; repo = pname; rev = version; - sha256 = "sha256-dt41TCr6RkmE9H+NN8LWv3ogGsK38JtLjVN/b2mbGJs="; + sha256 = "sha256-qwSEv14mMpaKmm6RM882JzEnBQG3loqsoglg4qTFWUg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix b/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix index 3f41408150..50860198e7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/monsoon/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "monsoon"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = "monsoon"; rev = "v${version}"; - sha256 = "01c84s11m645mqaa2vdnbsj0kb842arqjhicgjv0ahb7qdw65zz4"; + sha256 = "sha256-eXzD47qFkouYJkqWHbs2g2pbl3I7vWgIU6TqN3MEYQI="; }; - vendorSha256 = "1g84az07hv8w0jha2yl4f5jm0p9nkbawgw9l7cpmn8ckbfa54l7q"; + vendorSha256 = "sha256-tG+qV4Q77wT6x8y5cjZUaAWpL//sMUg1Ce3jS/dXF+Y="; # tests fails on darwin doCheck = !stdenv.isDarwin; diff --git a/third_party/nixpkgs/pkgs/tools/security/msfpc/default.nix b/third_party/nixpkgs/pkgs/tools/security/msfpc/default.nix new file mode 100644 index 0000000000..4286111814 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/msfpc/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, makeWrapper, metasploit, curl, inetutils, openssl }: + +stdenv.mkDerivation rec { + pname = "msfpc"; + version = "1.4.5"; + + src = fetchFromGitHub { + owner = "g0tmi1k"; + repo = pname; + rev = "v${version}"; + sha256 = "UIdE0oSaNu16pf+M96x8AnNju88hdzokv86wm8uBYDQ="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 msfpc.sh $out/bin/msfpc + + runHook postInstall + ''; + + postFixup = '' + wrapProgram $out/bin/msfpc \ + --prefix PATH : "${lib.makeBinPath [ metasploit curl inetutils openssl ]}" + ''; + + meta = with lib; { + description = "MSFvenom Payload Creator"; + homepage = "https://github.com/g0tmi1k/msfpc"; + license = licenses.mit; + maintainers = with maintainers; [ emilytrau ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix b/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix index a93e8082a0..14c2c1def4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.0.7"; + version = "2.1.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "v${version}"; - sha256 = "sha256-pfaK2Hj6iHk8njEMEbeSHGIKTn5O3IF83At14iDNI34="; + sha256 = "sha256-Gx2bYJXSApYhci7yQW45lLZjyfHVV8orPUIumC3+Yxg="; }; - vendorSha256 = "sha256-eco1e1A0cDk1Yc0KP9tc3Kf4E+z1av7EDHynVhoHhMk="; + vendorSha256 = "sha256-wXXtebZUL4Nm7M7Eu0Ucks9forCC+6Yb8eyKPb43rxA="; buildInputs = [ libpcap diff --git a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix b/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix index f06877b99f..acc82636f3 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nitrokey-app/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Nitrokey/nitrokey-app"; license = licenses.gpl3; - maintainers = with maintainers; [ kaiha fpletz ]; + maintainers = with maintainers; [ kaiha ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/nmap-formatter/default.nix b/third_party/nixpkgs/pkgs/tools/security/nmap-formatter/default.nix index 132d6b852b..6aad0b111b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nmap-formatter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nmap-formatter/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nmap-formatter"; - version = "1.0.2"; + version = "2.0.1"; src = fetchFromGitHub { owner = "vdjagilev"; repo = pname; rev = "v${version}"; - hash = "sha256-ePhm1qwluHhMC0oS/qEHkZv04nAdh2IDSkIW507MLjo="; + hash = "sha256-Jhjvtk8SDs//eBW+2+yLcIXf/NetfBUrKvzKCj+VyMg="; }; - vendorSha256 = "sha256-zkPXjCC+ZdR14O60ZaGFYdEZVxQ5z99HVmLOR10qqfg="; + vendorSha256 = "sha256-u36eHSb6YlGJNkgmRDclxTsdkONLKn8J/GKaoCgy+Qk="; meta = with lib; { description = "Tool that allows you to convert nmap output"; diff --git a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix index 0019c82bfb..16f35f3c98 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.7.3"; + version = "2.7.5"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-E0oEB7N1+XyyoGrIgR7IECyKFRV5oDiEwZncVbq5urs="; + sha256 = "sha256-R9Z+xcmrzv89ocDWfWqSLhrgeOSmsnqmPYGUmULAJAI="; }; - vendorSha256 = "sha256-oqM/rOaqL/6un9J9OEconmobvzUwmuz0Hi+C7CR8Yak="; + vendorSha256 = "sha256-jvgwVtYndf+xbGJycnUidMUMDGFRIVJtSAA4Akd64Dk="; modRoot = "./v2"; subPackages = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/nwipe/default.nix b/third_party/nixpkgs/pkgs/tools/security/nwipe/default.nix index 50a8cf83db..35ca1f9b41 100644 --- a/third_party/nixpkgs/pkgs/tools/security/nwipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/nwipe/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "nwipe"; - version = "0.33"; + version = "0.34"; src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; rev = "v${version}"; - sha256 = "sha256-i+cK2XTdWc3ByG9i+rfwL3Ds8Sl15/wZwEc5nrcWdeY="; + sha256 = "sha256-7WI8AwWkg9rOjAbOyDgCVOpeMxvJ5Bd1yvzfSv6TPLs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/openpgp-card-tools/default.nix b/third_party/nixpkgs/pkgs/tools/security/openpgp-card-tools/default.nix new file mode 100644 index 0000000000..572c862b7f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/openpgp-card-tools/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, rustPlatform +, fetchCrate +, pkg-config +, pcsclite +, nettle +, PCSC +, testers +, openpgp-card-tools +}: + +rustPlatform.buildRustPackage rec { + pname = "openpgp-card-tools"; + version = "0.0.12"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-3OKOMe7Uj+8qpzfu0DzqwIGa/QJ0YoKczPN9W8HXJZU="; + }; + + cargoHash = "sha256-gq17BXorXrlJx4zlvLuOT8XGUCqZXFDSxgs/Fv9dChk="; + + nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; + buildInputs = [ pcsclite nettle ] ++ lib.optionals stdenv.isDarwin [ PCSC ]; + + passthru = { + tests.version = testers.testVersion { + package = openpgp-card-tools; + }; + }; + + meta = with lib; { + description = "CLI tools for OpenPGP cards"; + homepage = "https://gitlab.com/openpgp-card/openpgp-card"; + license = licenses.asl20; + maintainers = with maintainers; [ nickcao ]; + mainProgram = "opgpcard"; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix b/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix index e4c42a83f0..1d93647ed4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/otpauth/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "otpauth"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "dim13"; repo = "otpauth"; rev = "v${version}"; - sha256 = "sha256-qSu0kGRi1es9OciN1s9Eh1Z3JkxbcKO8W5cAC7c7n0k="; + sha256 = "sha256-x5/OVUxuNjK05D8n1l5F6qT/wmrBYnOSEoSL0c0fsqc="; }; - vendorSha256 = "sha256-TU5crhmQAhSfURdfPe/xaa3RgGyc+UFn2E+jJ0flNsg="; + vendorSha256 = "sha256-jnIq7Zc2MauJReJ9a8TeqXXsvHixsBB+znmXAxcpqUQ="; doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/security/padbuster/default.nix b/third_party/nixpkgs/pkgs/tools/security/padbuster/default.nix new file mode 100644 index 0000000000..de71010ccb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/padbuster/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, perl }: + +stdenv.mkDerivation rec { + pname = "padbuster"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "AonCyberLabs"; + repo = pname; + rev = "50e4a3e2bf5dfff5699440b3ebc61ed1b5c49bbe"; + sha256 = "VIvZ28MVnTSQru6l8flLVVqIIpxxXD8lCqzH81sPe/U="; + }; + + buildInputs = [ + (perl.withPackages (ps: with ps; [ LWP LWPProtocolHttps CryptSSLeay ])) + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 padBuster.pl $out/bin/padBuster.pl + + runHook postInstall + ''; + + meta = with lib; { + description = "Automated script for performing Padding Oracle attacks"; + homepage = "https://www.gdssecurity.com/l/t.php"; + mainProgram = "padBuster.pl"; + maintainers = with maintainers; [ emilytrau ]; + license = licenses.asl20; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/parsero/default.nix b/third_party/nixpkgs/pkgs/tools/security/parsero/default.nix new file mode 100644 index 0000000000..a8cd9c39eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/parsero/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "parsero"; + version = "0.81"; + + src = fetchFromGitHub { + owner = "behindthefirewalls"; + repo = pname; + rev = "e5b585a19b79426975a825cafa4cc8a353cd267e"; + sha256 = "rqupeJxslL3AfQ+CzBWRb4ZS32VoYd8hlA+eACMKGPY="; + }; + + propagatedBuildInputs = with python3Packages; [ + beautifulsoup4 + urllib3 + ]; + + # Project has no tests + doCheck = false; + + meta = with lib; { + description = "Robots.txt audit tool"; + homepage = "https://github.com/behindthefirewalls/Parsero"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ emilytrau fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix index 7468b5dcc8..7d214f1649 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pass/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchurl, buildEnv , coreutils, findutils, gnugrep, gnused, getopt, git, tree, gnupg, openssl -, which, procps , qrencode , makeWrapper, pass, symlinkJoin +, which, openssh, procps, qrencode, makeWrapper, pass, symlinkJoin , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin , dmenuSupport ? (x11Support || waylandSupport) @@ -91,8 +91,9 @@ stdenv.mkDerivation rec { gnused tree which - qrencode + openssh procps + qrencode ] ++ optional stdenv.isDarwin openssl ++ optional x11Support xclip ++ optional waylandSupport wl-clipboard diff --git a/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix b/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix index 2de900483f..68e72171ec 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pinentry/default.nix @@ -16,18 +16,13 @@ let then mkDerivation else stdenv.mkDerivation; - mkFlag = pfxTrue: pfxFalse: cond: name: - "--${if cond then pfxTrue else pfxFalse}-${name}"; - mkEnable = mkFlag "enable" "disable"; - mkWith = mkFlag "with" "without"; - - mkEnablePinentry = f: + enableFeaturePinentry = f: let info = flavorInfo.${f}; flag = flavorInfo.${f}.flag or null; in optionalString (flag != null) - (mkEnable (elem f enabledFlavors) ("pinentry-" + flag)); + (enableFeature (elem f enabledFlavors) ("pinentry-" + flag)); flavorInfo = { curses = { bin = "curses"; flag = "curses"; buildInputs = [ ncurses ]; }; @@ -68,9 +63,9 @@ pinentryMkDerivation rec { ]; configureFlags = [ - (mkWith (libcap != null) "libcap") - (mkEnable (libsecret != null) "libsecret") - ] ++ (map mkEnablePinentry (attrNames flavorInfo)); + (withFeature (libcap != null) "libcap") + (enableFeature (libsecret != null) "libsecret") + ] ++ (map enableFeaturePinentry (attrNames flavorInfo)); postInstall = concatStrings (flip map enabledFlavors (f: diff --git a/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix b/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix index f7d40dc604..19ce14f915 100644 --- a/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/qdigidoc/default.nix @@ -1,15 +1,27 @@ -{ lib, mkDerivation, fetchurl, cmake, gettext -, pkg-config, libdigidocpp, opensc, openldap, openssl, pcsclite, qtbase -, qttranslations, qtsvg }: +{ lib +, mkDerivation +, fetchurl +, cmake +, gettext +, pkg-config +, libdigidocpp +, opensc +, openldap +, openssl +, pcsclite +, qtbase +, qttranslations +, qtsvg +}: mkDerivation rec { pname = "qdigidoc"; - version = "4.2.11"; + version = "4.2.12"; src = fetchurl { url = - "https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4_${version}.110-1804.tar.xz"; - sha256 = "sha256-Sg6lFZeIJn3T/suDc5Z/kNqBf/sIV9c6EJJ0Nr0dwTM="; + "https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4-${version}.tar.gz"; + hash = "sha256-6bso1qvhVhbBfrcTq4S+aHtHli7X2A926N4r45ztq4E="; }; tsl = fetchurl { diff --git a/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix b/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix index 99928b96ca..0343c389e5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "0.8.2"; + version = "0.10.0"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - sha256 = "sha256-EaOLqStoZJMTSS6g56UhFQRhuwYBjh/XLRX6JjD17+g="; + sha256 = "sha256-jwV6qPItuNrXl3rknY2RVIw3f3VwyiEefomnvGKiluI="; # 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; @@ -23,7 +23,7 @@ let ''; }; - vendorSha256 = "sha256-bvn5TKfTcB/0p47r5kW1P4OlnbWYQpESo9t8IC9f+fM="; + vendorSha256 = "sha256-qT1vY+YLmehQYS+jiCEx7vOJACIGPcl7VNfUEMc8w0U="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/scilla/default.nix b/third_party/nixpkgs/pkgs/tools/security/scilla/default.nix index ab31624c6c..301e037810 100644 --- a/third_party/nixpkgs/pkgs/tools/security/scilla/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/scilla/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "scilla"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "edoardottt"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1gSuKxNpls7B+pSGnGj3k/E93lnj2FPNtAAciPPNAeM="; + sha256 = "sha256-1akwc/J1W1zMNqEc2Vv8wdElKbOVJ8uL3XXftGVwWnQ="; }; - vendorSha256 = "sha256-gHZj8zpc7yFthCCBM8WGw4WwoW46bdQWe4yWjOkkQE8="; + vendorSha256 = "sha256-uTL2qr/LWmdmZipfnbzzzIx6X3fJtB1A9uYekogZN3w="; meta = with lib; { description = "Information gathering tool for DNS, ports and more"; diff --git a/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix b/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix index 0a99ed9840..2c4a377efa 100644 --- a/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix +++ b/third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix @@ -1,13 +1,13 @@ -{ lib, fetchFromGitHub, fetchzip }: +{ lib, fetchFromGitHub, fetchzip, stdenv }: rec { - version = "0.103.0"; + version = "0.108.0"; src = fetchFromGitHub { owner = "returntocorp"; repo = "semgrep"; rev = "v${version}"; - sha256 = "sha256-vk6GBgLsXRLAVu60xW4WWWhhi4b1WLceTxh/TeISIUg="; + sha256 = "sha256-Vdrv7lVPsBsxkwwfviD5zRAdsD02RfWmM+IlaThduQs="; }; # submodule dependencies @@ -17,22 +17,25 @@ rec { langsSrc = fetchFromGitHub { owner = "returntocorp"; repo = "semgrep-langs"; - rev = "78e518dad1ce2a7c76854c944245434bd8426439"; - sha256 = "sha256-t9F/OzzT6FI9G4Fxz0lUjz6TVrJlenusQNJnFpiKaQs="; + rev = "98e4aacb0d58539b50a642a28d916a5d749e2a42"; + sha256 = "sha256-7w+8vLmzqBjbeV+a4Br7kLQ2bJv3aZJw8cB0R9d/D+E="; }; interfacesSrc = fetchFromGitHub { owner = "returntocorp"; repo = "semgrep-interfaces"; - rev = "a64a45034ea428ecbe9da6bd849a4f1cfd23cdd2"; - sha256 = "sha256-eatuyA5xyfZVHCmHvZIzQK2c5eEWUEZd9LumJQtk8+s="; + rev = "bad298d06a5dc50e69b6818ba73f0cc9b9a17b58"; + sha256 = "sha256-AgNSvjVsP4b4zwkmq6BoNcOX3xdCSnQmXK+fVSkDXxQ="; }; # fetch pre-built semgrep-core since the ocaml build is complex and relies on # the opam package manager at some point - coreRelease = fetchzip { - url = "https://github.com/returntocorp/semgrep/releases/download/v${version}/semgrep-v${version}-ubuntu-16.04.tgz"; - sha256 = "sha256-L3NbiVYmgJim7H4W1cr75WOItSiHT1YIkUEefuaCYlY="; + coreRelease = if stdenv.isDarwin then fetchzip { + url = "https://github.com/returntocorp/semgrep/releases/download/v${version}/semgrep-v${version}-osx.zip"; + sha256 = "sha256-f3ah4yGvtUL3Ievz+3hhh5Am1YMplRxsRQzdRAoF9uU="; + } else fetchzip { + url = "https://github.com/returntocorp/semgrep/releases/download/v${version}/semgrep-v${version}-ubuntu-16.04.tgz"; + sha256 = "sha256-qie9svlzRoAsI33W+Sxh4YTVk1iPV0NVXfzfKlEUul4="; }; meta = with lib; { @@ -50,6 +53,6 @@ rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ jk ambroisie ]; # limited by semgrep-core - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix index 50477cf92f..8cf9ad010b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sequoia/default.nix @@ -25,16 +25,16 @@ rustPlatform.buildRustPackage rec { pname = "sequoia"; # Upstream has separate version numbering for the library and the CLI frontend. # This derivation provides the CLI frontend, and thus uses its version number. - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = "sequoia"; rev = "sq/v${version}"; - sha256 = "1rcbv1s7wpxhrzw082q6vfrq1ja2ssfxn53c90h8fh5wrj7ns751"; + sha256 = "sha256-KhJAXpj47Tvds5SLYwnsNeIlPf9QEopoCzsvvHgCwaI="; }; - cargoSha256 = "0f3b8rh4pl03n8j9ihazaak214sv1rsksbgrb1nfcy8sq2yqfj4g"; + cargoSha256 = "sha256-Y7iiZVIT9Vbe4YmTfGTU8p3H3odQKms2FBnnWgvF7mI="; nativeBuildInputs = [ pkg-config @@ -75,7 +75,11 @@ rustPlatform.buildRustPackage rec { LIBCLANG_PATH = "${llvmPackages_12.libclang.lib}/lib"; # Sometimes, tests fail on CI (ofborg) & hydra without this - CARGO_TEST_ARGS = "--workspace --exclude sequoia-store"; + checkFlags = [ + # doctest for sequoia-ipc fail for some reason + "--skip=macros::assert_send_and_sync" + "--skip=macros::time_it" + ]; preInstall = lib.optionalString pythonSupport '' export installFlags="PYTHONPATH=$PYTHONPATH:$out/${pythonPackages.python.sitePackages}" diff --git a/third_party/nixpkgs/pkgs/tools/security/shellnoob/default.nix b/third_party/nixpkgs/pkgs/tools/security/shellnoob/default.nix new file mode 100644 index 0000000000..f7814b2438 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/shellnoob/default.nix @@ -0,0 +1,33 @@ +{ lib, stdenvNoCC, fetchFromGitHub, python3 }: + +stdenvNoCC.mkDerivation rec { + pname = "shellnoob"; + version = "unstable-2022-03-16"; + + src = fetchFromGitHub { + owner = "reyammer"; + repo = pname; + rev = "72cf49804d8ea3de1faa7fae5794449301987bff"; + sha256 = "xF9OTFFe8godW4+z9MFaFEkjE9FB42bKWwdl9xRcmEo="; + }; + + buildInputs = [ + python3 + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 shellnoob.py $out/bin/snoob + + runHook postInstall + ''; + + meta = with lib; { + description = "A shellcode writing toolkit"; + homepage = "https://github.com/reyammer/shellnoob"; + mainProgram = "snoob"; + license = licenses.mit; + maintainers = with maintainers; [ emilytrau ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/sigma-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/sigma-cli/default.nix index 5a3ed90a41..8b10d6412d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sigma-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.4.3"; + version = "0.5.0"; format = "pyproject"; src = fetchFromGitHub { owner = "SigmaHQ"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3LFakeS3aQaacm7HqeAJPMJhi3Wf8zbJc//SEWUA1Rg="; + hash = "sha256-i0rin4TLoqo+F2nWG4kcFp3x/cRtkMzAo5Ldyo0Si5w="; }; nativeBuildInputs = with python3.pkgs; [ @@ -23,8 +23,11 @@ python3.pkgs.buildPythonApplication rec { click prettytable pysigma - pysigma-backend-splunk + pysigma-backend-elasticsearch pysigma-backend-insightidr + pysigma-backend-opensearch + pysigma-backend-qradar + pysigma-backend-splunk pysigma-pipeline-crowdstrike pysigma-pipeline-sysmon pysigma-pipeline-windows @@ -37,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'prettytable = "^3.1.1"' 'prettytable = "*"' \ - --replace 'pysigma = "^0.5.0"' 'pysigma = "*"' + --replace 'pysigma = "^0.7.2"' 'pysigma = "*"' ''; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/signing-party/default.nix b/third_party/nixpkgs/pkgs/tools/security/signing-party/default.nix index ee099b704a..e086321543 100644 --- a/third_party/nixpkgs/pkgs/tools/security/signing-party/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/signing-party/default.nix @@ -220,7 +220,7 @@ in stdenv.mkDerivation rec { * gpg-key2latex: generate LaTeX file with fingerprint paper slips ''; license = with licenses; [ bsd2 bsd3 gpl2 gpl2Plus gpl3Plus ]; - maintainers = with maintainers; [ fpletz primeos ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/slowhttptest/default.nix b/third_party/nixpkgs/pkgs/tools/security/slowhttptest/default.nix index 5dce5d5439..b4c2b0efee 100644 --- a/third_party/nixpkgs/pkgs/tools/security/slowhttptest/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/slowhttptest/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "slowhttptest"; - version = "1.8.2"; + version = "1.9.0"; src = fetchFromGitHub { owner = "shekyan"; repo = pname; rev = "v${version}"; - sha256 = "1xv2j3hl4zj0s2cxcsvlwgridh9ap4g84g7c4918d03id15wydcx"; + sha256 = "sha256-rIvd3LykVAbDXtFWZ1EQ+QKeALzqwK6pq7In0BsCOFo="; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix index 42ea0fc876..aa121e72ea 100644 --- a/third_party/nixpkgs/pkgs/tools/security/spire/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.3.1"; + version = "1.4.0"; outputs = [ "out" "agent" "server" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8LDdHChCTSpepwTMg2hUvQ6ZDoqaZt9QeKrBgfIOLx8="; + sha256 = "sha256-wyKluqYKNmaJaXK70v7/f2WEGgekd0Qgdu3UZnXm/UU="; }; - vendorSha256 = "sha256-QgPDhUu5uCkmC6L5UKtnz/wt/M1rERxc5nXmVVPtRKY="; + vendorSha256 = "sha256-EZWoMSBxdvnrdBmSrRYf4+2d1LCka7oUIhRAW+2n7CU="; subPackages = [ "cmd/spire-agent" "cmd/spire-server" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix index 7342c34ee3..d6a26dc957 100644 --- a/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/ssh-to-age/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ssh-to-age"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "Mic92"; repo = "ssh-to-age"; rev = version; - sha256 = "sha256-ccwCHu6RlWqMnt5nBy54bVEzfE9/3PEL4C5LnYTtnwU="; + sha256 = "sha256-sjiOmIoFyl1Kr4RKg1TqXJNIq2/HF91oxDLtRDa+eWw="; }; - vendorSha256 = "sha256-jiFPcdWnAk54RJv4mHB3A+5tqKzqitfsiRXYZLa3Gu0="; + vendorSha256 = "sha256-Xi5aJAYgbtrDq7KBAfZR1LT5/jbslwEa70qaFqW4vcQ="; checkPhase = '' runHook preCheck diff --git a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix index 5877910ad2..bb2663a70c 100644 --- a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-BhPup3q2muYGWzAa/9b4vnIjBces4GhUHZ/mg4CWMRc="; + sha256 = "sha256-n6rKkhz1J4KNq84UvxRFH2H2PIsRZGONRIhgUyrlkhA="; }; - vendorSha256 = "sha256-oVaziWZGslZCVqkEXL32XvOVU54VOf41Qg+VoVWo7x0="; + vendorSha256 = "sha256-lRezUowItjW2IuxRc5GOnnuWq7VOBacSNrtMvi+3Agc="; ldflags = [ "-buildid=" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix b/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix new file mode 100644 index 0000000000..c616e86d79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/tlsx/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "tlsx"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zUaCUi7U757A8OVQHQV2LPVqu4o73qrp2xGrH7u2viA="; + }; + + vendorSha256 = "sha256-+pSmErlxRyDH1drri294vE+hUmlmKgh3zrKpVJVC1do="; + + meta = with lib; { + description = "TLS grabber focused on TLS based data collection"; + longDescription = '' + A fast and configurable TLS grabber focused on TLS based data + collection and analysis. + ''; + homepage = "https://github.com/projectdiscovery/tlsx"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/uncover/default.nix b/third_party/nixpkgs/pkgs/tools/security/uncover/default.nix new file mode 100644 index 0000000000..f8102c6987 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/uncover/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "uncover"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = pname; + rev = "v${version}"; + hash = "sha256-iWSaNfRZJ59C7DWsPett9zM6hi/kOtpxlkw2haMeuaY="; + }; + + vendorSha256 = "sha256-M50pQJCzEXSBXUsjwxlM8s1WgcPwZgBpArUExLP+bRY="; + + meta = with lib; { + description = "API wrapper to search for exposed hosts"; + longDescription = '' + uncover is a go wrapper using APIs of well known search engines to quickly + discover exposed hosts on the internet. It is built with automation in mind, + so you can query it and utilize the results with your current pipeline tools. + Currently, it supports shodan,shodan-internetdb, censys, and fofa search API. + ''; + homepage = "https://github.com/projectdiscovery/uncover"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix index 7bfa2ee541..0d16ee9a99 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.11.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-r/zq4WjkwsqClipWehMGQ7uOqNy73TPufLq+hp6CTPA="; + sha256 = "sha256-dEIrTz24zBN6axl8bPdc4N9iebE7YBF0mGUSAbHx9Ug="; }; - vendorSha256 = "sha256-9cfza5Gvc0+O2qZ/8Yqf/WqmhrOEzdiTnenTRqfL5W8="; + vendorSha256 = "sha256-/EXrOS7kBxu6LtwTMipVJfjrJH7RuIwqD5LHH3yDADQ="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index 840269995c..b253898c02 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.11.0"; + version = "1.11.1"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-3oxIjILjl85GAl/YwTRrXunWY7UmPtOuG0wxA7wrzp0="; - aarch64-linux = "sha256-PiIibaFPBBTWPLVIWmCXqR51+HujoQmVOsm8AJTNr9s="; - i686-linux = "sha256-t3myhfPUe/28BlSIoxNbjmYykHlet5mWxOLuyNcu4o4="; - x86_64-darwin = "sha256-nPcKir2NcsXnQ6RG6TrioLC4jT9Pn7NssNjjDnw+fAY="; - aarch64-darwin = "sha256-yJJXmoR4Re1iIbSI6+VwOGP3FZvlJcumjxXM+PfPZm4="; + x86_64-linux = "sha256-mh/O9X4yOEspZ3Z+N22Wt8PeNee9U7U4R8laS7PCrhI="; + aarch64-linux = "sha256-9LybdftRdc9NYxYzPwojYdYxu1DbtVjG0nlT88oxX9E="; + i686-linux = "sha256-nPnWzxv5AVfOrGJxnFImZacUeKRZ0+Gyesf5TiRvz/0="; + x86_64-darwin = "sha256-kOT1Vs2LxCih/GewL66tVI5t50eKU/ejT9ccSjp7ar8="; + aarch64-darwin = "sha256-UkuZAFzT3pjg7q7NJ4+DaAk0syAVf6N512bxwLuQHHE="; }; in fetchzip { diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix index 49e02a4e1c..f06ae50ca4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.24.0"; + version = "1.25.2"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "sha256-zeMVdsTSp1z8cwebU2N6w7436N8CcI7PzNedDOSvEx4="; + sha256 = "sha256-6CpdvLCw7SUmWm9NHAxFAo454Rrp1FloDp67YAr0pjQ="; }; - cargoSha256 = "sha256-Sn6DuzV2OfaywE0W2afRG0h8PfOprqMtZtYM/exGEww="; + cargoSha256 = "sha256-+rXQGZNUz6UDLFVNbyHF6dTe3nEm5/2ITmVI+MfY6nM="; postPatch = '' # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working diff --git a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/vault.nix b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/vault.nix index 5814123bfc..4353303a91 100644 --- a/third_party/nixpkgs/pkgs/tools/security/vaultwarden/vault.nix +++ b/third_party/nixpkgs/pkgs/tools/security/vaultwarden/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "vaultwarden-vault"; - version = "2022.5.2"; + version = "2022.6.2"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "sha256-clsiEC9nwfrGMIBwT95G3tR3KLxMvMM553s8it/3JtM="; + sha256 = "sha256-IG/eCBTUa7eKeaelqxCWO+rrXJUuBanhsYwklftxdOE="; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/wafw00f/default.nix b/third_party/nixpkgs/pkgs/tools/security/wafw00f/default.nix index 0e363b608f..55d4b7591e 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wafw00f/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wafw00f/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "wafw00f"; - version = "2.1.0"; + version = "2.2.0"; format = "setuptools"; src = fetchFromGitHub { owner = "EnableSecurity"; repo = pname; - rev = "v${version}"; - sha256 = "0526kz6ypww9nxc2vddkhpn1gqvn25mzj3wmi91wwxwxjjb6w4qj"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-wJZ1/aRMFpE6Q5YAtGxXwxe2G9H/de+l3l0C5rwEWA8="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/webanalyze/default.nix b/third_party/nixpkgs/pkgs/tools/security/webanalyze/default.nix index b61afb16fb..1cbc22b148 100644 --- a/third_party/nixpkgs/pkgs/tools/security/webanalyze/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/webanalyze/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "webanalyze"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "rverton"; repo = pname; rev = "v${version}"; - hash = "sha256-r5HIXh0mKCZmzOOAKThNUPtJLsTYvnVE8FYA6vV5xjg="; + hash = "sha256-W7NgV50r/MNSF6+e0IR9C1dcg/k0w67GcTs0NTbhKBc="; }; vendorSha256 = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0="; diff --git a/third_party/nixpkgs/pkgs/tools/security/witness/default.nix b/third_party/nixpkgs/pkgs/tools/security/witness/default.nix index c3334875d2..78b7f32a61 100644 --- a/third_party/nixpkgs/pkgs/tools/security/witness/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/witness/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "witness"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "testifysec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BRYp8gp3TNZrl6fRNHOIgdhCVCN+N2lReFk+0FxCUxY="; + sha256 = "sha256-/v6dltF4oCIOtN6Fcpf+VvT+c3vTB1q/IgGUqZzbcVk="; }; - vendorSha256 = "sha256-/NniYty50dO44VUTfVq9b8dbT3le4uZ2ZoDN4IjLBto="; + vendorSha256 = "sha256-UP68YNLX+fuCvd+e3rER1icha9bS3MemJLwJOMMOVfg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/yara/default.nix b/third_party/nixpkgs/pkgs/tools/security/yara/default.nix index 59647c250e..07f36f4892 100644 --- a/third_party/nixpkgs/pkgs/tools/security/yara/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/yara/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "yara"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "VirusTotal"; repo = pname; rev = "v${version}"; - hash = "sha256-HWLyDhFQHHmXUaAKp7EZ3ZsXlbwCEoJj4Q0qAtxwN1Y="; + hash = "sha256-Ol2btm1A8JdvYrjD0hPtc17A4L9wgr4l30C8VrImVoE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix b/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix index 06a1452400..2533e0c787 100644 --- a/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/yubihsm-shell/default.nix @@ -38,11 +38,6 @@ stdenv.mkDerivation rec { openssl ]; - cmakeFlags = [ - # help2man fails without this - "-DCMAKE_SKIP_BUILD_RPATH=OFF" - ]; - postPatch = '' # Can't find libyubihsm at runtime because of dlopen() in C code substituteInPlace lib/yubihsm.c \ diff --git a/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix b/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix index e957c10a85..b350558887 100644 --- a/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/collectd/default.nix @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { homepage = "https://collectd.org"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ bjornfor fpletz ]; + maintainers = with maintainers; [ bjornfor ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/envconsul/default.nix b/third_party/nixpkgs/pkgs/tools/system/envconsul/default.nix index 71ff489b56..daa92dc772 100644 --- a/third_party/nixpkgs/pkgs/tools/system/envconsul/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/envconsul/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "envconsul"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "envconsul"; rev = "v${version}"; - sha256 = "sha256-oV+dGenyNYdVLFn43p+J9TgIbliYOppAKr1ePlMF0d4="; + sha256 = "sha256-Zt4jCqHfDTxSrAIASQgUqtYgcHU9xUs025YOxGXhTAg="; }; - vendorSha256 = "sha256-kal1HR9zRVhQKR/ql63hju7XIHU1KRNDTAlOEqzYR4o="; + vendorSha256 = "sha256-qxt2LNPDxdiszkjSjgzP7PG26BsZYq1itiyQfy9uaVI="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index f6f0e1fe7f..cbc8c759c7 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gdu"; - version = "5.14.0"; + version = "5.15.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-a0H/OqIHgutuW1egqlhMy5mX2FMYxmAwCbhecCrXuOU="; + sha256 = "sha256-XfBmxAuhGt5SYl4D8pf+FnB3R5Hg/G72r4pYgIrL2mg="; }; - vendorSha256 = "sha256-9+Zez33oET0nx/Xm3fXh1WFoQduMBodvml1oGO6jUYc="; + vendorSha256 = "sha256-w+nOoEtEtRjXakrVV3aLj+clhyqgL5cJ6iu689cJeKs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/goreman/default.nix b/third_party/nixpkgs/pkgs/tools/system/goreman/default.nix index 51d70fbc93..a9e840860b 100644 --- a/third_party/nixpkgs/pkgs/tools/system/goreman/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/goreman/default.nix @@ -1,24 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, goreman }: buildGoModule rec { pname = "goreman"; - version = "0.3.11"; - rev = "6006c6e410ec5a5ba22b50e96227754a42f2834d"; + version = "0.3.13"; src = fetchFromGitHub { owner = "mattn"; repo = "goreman"; rev = "v${version}"; - sha256 = "sha256-TbJfeU94wakI2028kDqU+7dRRmqXuqpPeL4XBaA/HPo="; + sha256 = "sha256-BQMRkXHac2Is3VvqrBFA+/NrR3sw/gA1k3fPi3EzONQ="; }; - ldflags = [ - "-s" - "-w" - "-X main.revision=${builtins.substring 0 7 rev}" - ]; + vendorSha256 = "sha256-BWfhvJ6kPz3X3TpHNvRIBgfUAQJB2f/lngRvHq91uyw="; - vendorSha256 = "sha256-87aHBRWm5Odv6LeshZty5N31sC+vdSwGlTYhk3BZkPo="; + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = goreman; + command = "goreman version"; + }; meta = with lib; { description = "foreman clone written in go language"; diff --git a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix index 12840b3f51..fcdf353458 100644 --- a/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/hwinfo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.80"; + version = "22.0"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "sha256-T4ny1tq3IMtmeZRgcAOvu2O23XEiLeKRoqOxhuVGBRw="; + sha256 = "sha256-hjKF/fyV7/uQF6iJNOsRpX4Iw7aDURkdb7hbwfIDBPo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/jsvc/default.nix b/third_party/nixpkgs/pkgs/tools/system/jsvc/default.nix index 82631770df..fe53c368c9 100644 --- a/third_party/nixpkgs/pkgs/tools/system/jsvc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/jsvc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jsvc"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://downloads.apache.org//commons/daemon/source/commons-daemon-${version}-src.tar.gz"; - sha256 = "sha256-UzzXb+MRPVNTE8HYsB/yPK9rq8zGmbGmi0RGk3zER0s="; + sha256 = "sha256-SSc3ocubCfBjZtyUHpCE6rDkF7UtAAWsUIa9fQ1gHts="; }; buildInputs = [ commonsDaemon ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/jump/default.nix b/third_party/nixpkgs/pkgs/tools/system/jump/default.nix index 2f69f6a0ef..0061a3d7c8 100644 --- a/third_party/nixpkgs/pkgs/tools/system/jump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/jump/default.nix @@ -36,6 +36,6 @@ buildGoModule rec { ''; homepage = "https://github.com/gsamokovarov/jump"; license = licenses.mit; - maintainers = with maintainers; [ sondr3 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix b/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix new file mode 100644 index 0000000000..08023b0e03 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/kanata/default.nix @@ -0,0 +1,44 @@ +{ fetchFromGitHub +, fetchpatch +, lib +, libevdev +, pkg-config +, rustPlatform +, withCmd ? false +}: + +rustPlatform.buildRustPackage rec { + pname = "kanata"; + version = "1.0.6"; + + src = fetchFromGitHub { + owner = "jtroo"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-0S27dOwtHxQi5ERno040RWZNo5+ao0ULFwHKJz27wWw="; + }; + + cargoHash = "sha256-Ge9CiYIl6R8cjfUAY4B9ggjNZv5vpjmQKMPv93wGJwc="; + + cargoPatches = [ + (fetchpatch { + name = "update-cargo.lock-for-1.0.6.patch"; + url = "https://github.com/jtroo/kanata/commit/29a7669ac230571c30c9113e5c82e8440c8b89af.patch"; + sha256 = "sha256-s4R7vUFlrL1XTNpgXRyIpIq4rDuM5A85ECzbMUX4MAw="; + }) + ]; + + buildFeatures = lib.optional withCmd "cmd"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ libevdev ]; + + meta = with lib; { + description = "A cross-platform advanced keyboard customization tool"; + homepage = "https://github.com/jtroo/kanata"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ linj ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix b/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix index 01873cb86a..73f8cad580 100644 --- a/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/minijail/default.nix @@ -1,42 +1,24 @@ -{ stdenv, lib, fetchFromGitiles, glibc, libcap, qemu }: - -let - dumpConstants = - if stdenv.buildPlatform == stdenv.hostPlatform then "./dump_constants" - else if stdenv.hostPlatform.isAarch32 then "qemu-arm dump_constants" - else if stdenv.hostPlatform.isAarch64 then "qemu-aarch64 dump_constants" - else if stdenv.hostPlatform.isx86_64 then "qemu-x86_64 dump_constants" - else throw "Unsupported host platform"; -in +{ stdenv, lib, fetchFromGitiles, libcap }: stdenv.mkDerivation rec { pname = "minijail"; - version = "17"; + version = "18"; src = fetchFromGitiles { url = "https://android.googlesource.com/platform/external/minijail"; rev = "linux-v${version}"; - sha256 = "1j65h50wa39m6qvgnh1pf59fv9jdsdbc6a6c1na7y0rgljxhmdzv"; + sha256 = "sha256-OpwzISZ5iZNQvJAX7UJJ4gELEaVfcQgY9cqMM0YvBzc="; }; - nativeBuildInputs = - lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) qemu; buildInputs = [ libcap ]; - makeFlags = [ "LIBDIR=$(out)/lib" ]; - dumpConstantsFlags = lib.optional (stdenv.hostPlatform.libc == "glibc") - "LDFLAGS=-L${glibc.static}/lib"; + makeFlags = [ "ECHO=echo" "LIBDIR=$(out)/lib" ]; postPatch = '' - substituteInPlace common.mk --replace /bin/echo echo + substituteInPlace Makefile --replace /bin/echo echo patchShebangs platform2_preinstall.sh ''; - postBuild = '' - make $makeFlags $buildFlags $dumpConstantsFlags dump_constants - ${dumpConstants} > constants.json - ''; - installPhase = '' ./platform2_preinstall.sh ${version} $out/include/chromeos @@ -47,7 +29,6 @@ stdenv.mkDerivation rec { cp -v *.pc $out/lib/pkgconfig cp -v libminijail.h scoped_minijail.h $out/include/chromeos cp -v minijail0 $out/bin - cp -v constants.json $out/share/minijail ''; enableParallelBuilding = true; @@ -55,6 +36,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://android.googlesource.com/platform/external/minijail/"; description = "Sandboxing library and application using Linux namespaces and capabilities"; + changelog = "https://android.googlesource.com/platform/external/minijail/+/refs/tags/linux-v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ pcarrier qyliss ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/system/minijail/tools.nix b/third_party/nixpkgs/pkgs/tools/system/minijail/tools.nix index 875ea0dbff..caaba84c08 100644 --- a/third_party/nixpkgs/pkgs/tools/system/minijail/tools.nix +++ b/third_party/nixpkgs/pkgs/tools/system/minijail/tools.nix @@ -1,9 +1,36 @@ -{ buildPythonApplication, lib, minijail }: +{ lib, stdenv, buildPythonApplication, pkgsBuildTarget, python, minijail }: + +let + targetClang = pkgsBuildTarget.targetPackages.clangStdenv.cc; +in buildPythonApplication { pname = "minijail-tools"; inherit (minijail) version src; + postPatch = '' + substituteInPlace Makefile --replace /bin/echo echo + ''; + + postConfigure = '' + substituteInPlace tools/compile_seccomp_policy.py \ + --replace "'constants.json'" "'$out/share/constants.json'" + ''; + + preBuild = '' + make libconstants.gen.c libsyscalls.gen.c + ${targetClang}/bin/${targetClang.targetPrefix}cc -S -emit-llvm \ + libconstants.gen.c libsyscalls.gen.c + ${python.pythonForBuild.interpreter} tools/generate_constants_json.py \ + --output constants.json \ + libconstants.gen.ll libsyscalls.gen.ll + ''; + + postInstall = '' + mkdir -p $out/share + cp -v constants.json $out/share/constants.json + ''; + meta = with lib; { homepage = "https://android.googlesource.com/platform/external/minijail/+/refs/heads/master/tools/"; description = "A set of tools for minijail"; diff --git a/third_party/nixpkgs/pkgs/tools/system/mlc/default.nix b/third_party/nixpkgs/pkgs/tools/system/mlc/default.nix index 447ab30d49..5df3579ca9 100644 --- a/third_party/nixpkgs/pkgs/tools/system/mlc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/mlc/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, patchelf }: stdenv.mkDerivation rec { pname = "mlc"; - version = "3.9"; + version = "3.9a"; src = fetchurl { - url = "https://software.intel.com/content/dam/develop/external/us/en/protected/mlc_v${version}.tgz"; - sha256 = "1x7abm9hbv9hkqa3cgxz6l04m3ycyl40i4zgx1w819pc10n6dhdb"; + url = "https://downloadmirror.intel.com/736634/mlc_v${version}.tgz"; + sha256 = "3vNI/CQwyY4KMFest1wkVYecsxigjXyGIUIKai979W4="; }; sourceRoot = "Linux"; diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix index 0d5b7e23c1..751725eec6 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -19,14 +19,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.35.1"; + version = "1.36.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-wYphy3+DlT0UpQ5su/LkMJRIcABiBR+fIL/0w9bUeS0="; + sha256 = "sha256-ir8NO150PgDEaWjTvXuSZMIK3qwZrGyPuGHxLIBfCfU="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/openipmi/default.nix b/third_party/nixpkgs/pkgs/tools/system/openipmi/default.nix index 228c305de0..560f055296 100644 --- a/third_party/nixpkgs/pkgs/tools/system/openipmi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/openipmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "OpenIPMI"; - version = "2.0.32"; + version = "2.0.33"; src = fetchurl { url = "mirror://sourceforge/openipmi/OpenIPMI-${version}.tar.gz"; - sha256 = "sha256-9tD9TAp0sF+AkHIp0LJw9UyiMpS8wRl5+LjRJ2Z4aUU="; + sha256 = "sha256-+1Pp6l4mgc+K982gJLGgBExnX4QRbKJ66WFsi3rZW0k="; }; buildInputs = [ ncurses popt python39 readline ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/openseachest/default.nix b/third_party/nixpkgs/pkgs/tools/system/openseachest/default.nix index 7b7909fbe0..b2b6516ba7 100644 --- a/third_party/nixpkgs/pkgs/tools/system/openseachest/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/openseachest/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "openseachest"; - version = "21.06.21"; + version = "22.07"; src = fetchFromGitHub { owner = "Seagate"; repo = "openSeaChest"; rev = "v${version}"; - sha256 = "09xay3frk0yh48ww650dsjp0rx0w1m3ab3rpz5k1jizppv4kk9fi"; + sha256 = "sha256-YZOQfABDr5DGkL08TYn908XdCSCJCg+9nlWXRBjYBOU="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix b/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix index 3153216718..b7cfde5807 100644 --- a/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/pciutils/default.nix @@ -14,10 +14,11 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib kmod which ] ++ - lib.optional stdenv.hostPlatform.isDarwin IOKit; + buildInputs = [ which zlib ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ IOKit ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ kmod ]; - preConfigure = if stdenv.cc.isGNU then null else '' + preConfigure = lib.optionalString (!stdenv.cc.isGNU) '' substituteInPlace Makefile --replace 'CC=$(CROSS_COMPILE)gcc' "" ''; diff --git a/third_party/nixpkgs/pkgs/tools/system/plan9port/builder.sh b/third_party/nixpkgs/pkgs/tools/system/plan9port/builder.sh deleted file mode 100644 index b5196e512f..0000000000 --- a/third_party/nixpkgs/pkgs/tools/system/plan9port/builder.sh +++ /dev/null @@ -1,71 +0,0 @@ -source $stdenv/setup - -export PLAN9=$out/plan9 -export PLAN9_TARGET=$PLAN9 - -plan9portLinkFlags() -{ - eval set -- "$NIX_LDFLAGS" - local flag - for flag in "$@"; do - printf ' -Wl,%s' "$flag" - done -} - -configurePhase() -{ - ( - echo CC9=\"$(command -v $CC)\" - echo CFLAGS=\"$NIX_CFLAGS_COMPILE\" - echo LDFLAGS=\"$(plan9portLinkFlags)\" - echo X11=\"${libXt_dev}/include\" - case "$system" in - x86_64-*) echo OBJTYPE=x86_64;; - i?86-*) echo OBJTYPE=386;; - *power*) echo OBJTYPE=power;; - *sparc*) echo OBJTYPE=sparc;; - esac - if [[ $system =~ .*linux.* ]]; then - echo SYSVERSION=2.6.x - fi - ) >config - - for f in `grep -l -r /usr/local/plan9`; do - sed "s,/usr/local/plan9,${PLAN9},g" -i $f - done -} - -buildPhase() -{ - mkdir -p $PLAN9 - - # Copy sources, some necessary bin scripts - cp -R * $PLAN9 - - local originalPath="$PATH" - export PATH="$PLAN9/bin:$PATH" - export NPROC=$NIX_BUILD_CORES - pushd src - ../dist/buildmk - mk clean - mk libs-nuke - mk all - mk -k install - if [[ -f $PLAN9/bin/quote1 ]]; then - cp $PLAN9/bin/quote1 $PLAN9/bin/'"' - cp $PLAN9/bin/quote2 $PLAN9/bin/'""' - fi - popd - export PATH="$originalPath" -} - -installPhase() -{ - # Copy the `9' utility. This way you can use - # $ 9 awk - # to use the plan 9 awk - mkdir $out/bin - ln -s $PLAN9/bin/9 $out/bin -} - -genericBuild diff --git a/third_party/nixpkgs/pkgs/tools/system/plan9port/default.nix b/third_party/nixpkgs/pkgs/tools/system/plan9port/default.nix index f165bfca42..3e52d10a24 100644 --- a/third_party/nixpkgs/pkgs/tools/system/plan9port/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/plan9port/default.nix @@ -1,69 +1,87 @@ -{ lib -, stdenv -, fetchFromGitHub -, darwin ? null -, fontconfig ? null -, freetype ? null -, libX11 -, libXext ? null -, libXt ? null -, perl ? null # For building web manuals -, which -, xorgproto ? null +{ lib, stdenv, fetchFromGitHub +, fontconfig, freetype, libX11, libXext, libXt, xorgproto +, Carbon, Cocoa, IOKit, Metal, QuartzCore, DarwinTools +, perl # For building web manuals +, which, ed }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "plan9port"; version = "2021-10-19"; - src = fetchFromGitHub { + src = fetchFromGitHub { owner = "9fans"; - repo = "plan9port"; + repo = pname; rev = "d0d440860f2000a1560abb3f593cdc325fcead4c"; hash = "sha256-2aYXqPGwrReyFPrLDtEjgQd/RJjpOfI3ge/tDocYpRQ="; }; postPatch = '' - #hardcoded path - substituteInPlace src/cmd/acme/acme.c \ - --replace /lib/font/bit $out/plan9/font - - #deprecated flags - find . -type f \ - -exec sed -i -e 's/_SVID_SOURCE/_DEFAULT_SOURCE/g' {} \; \ - -exec sed -i -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' {} \; - substituteInPlace bin/9c \ --replace 'which uniq' '${which}/bin/which uniq' - '' + lib.optionalString (!stdenv.isDarwin) '' - #add missing ctrl+c\z\x\v keybind for non-Darwin - substituteInPlace src/cmd/acme/text.c \ - --replace "case Kcmd+'c':" "case 0x03: case Kcmd+'c':" \ - --replace "case Kcmd+'z':" "case 0x1a: case Kcmd+'z':" \ - --replace "case Kcmd+'x':" "case 0x18: case Kcmd+'x':" \ - --replace "case Kcmd+'v':" "case 0x16: case Kcmd+'v':" + + ed -sE INSTALL <LOCAL.config <LOCAL.INSTALL <=1.11.0,<1.15.0" "six" + 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 "jmespath>=0.7.1,<1.0.0" "jmespath==1.0.1" \ + --replace "botocore>1.23.41,<1.24.0" "botocore>1.23.41,<1.27.49" ''; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix index d6be2f9425..a6f090be33 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix @@ -21,15 +21,15 @@ let in buildGoModule rec { pname = "distrobuilder"; - version = "2.0"; + version = "2.1"; - vendorSha256 = "sha256-hcp+ufJFgFLBE4i2quIwhvrwDTes3saXNHHr9XXBc8E="; + vendorSha256 = "sha256-6LsJ6nZIo+aC8kvF+1aZD1WoXNTj9siB8QhKPVA6MSc="; src = fetchFromGitHub { owner = "lxc"; repo = "distrobuilder"; rev = "distrobuilder-${version}"; - sha256 = "sha256-Px8mo2dwHNVjMWtzsa/4fLxlcbYkhIc7W8aR9DR85vc="; + sha256 = "sha256-t3ECLtb0tvIzTWgjmVQDFza+kcm3abTZZMSGYjvw1qQ="; fetchSubmodules = false; }; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix index babcbcfc6c..97545204bf 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -1,31 +1,35 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper, jre }: +{ lib +, stdenv +, fetchurl +, unzip +, makeWrapper +, jre +}: stdenv.mkDerivation rec { pname = "ec2-api-tools"; version = "1.7.5.1"; src = fetchurl { - url = "http://tarballs.nixos.org/ec2-api-tools-${version}.zip"; - sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5"; + url = "http://s3.amazonaws.com/ec2-downloads/${pname}-${version}.zip"; + sha256 = "sha256-hRq+MEA+4chqPr3d9bS//X70tYcRBTD+rfAJVNmuLzo="; }; nativeBuildInputs = [ makeWrapper unzip ]; - installPhase = - '' - d=$out/libexec/ec2-api-tools - mkdir -p $d - mv * $d - rm $d/bin/*.cmd # Windows stuff - - for i in $d/bin/*; do - b=$(basename $i) - if [ $b = "ec2-cmd" ]; then continue; fi - makeWrapper $i $out/bin/$(basename $i) \ - --set EC2_HOME $d \ - --set JAVA_HOME ${jre} - done - ''; # */ + installPhase = '' + d=$out/libexec/ec2-api-tools + mkdir -p $d + mv * $d + rm $d/bin/*.cmd # Windows stuff + for i in $d/bin/*; do + b=$(basename $i) + if [ $b = "ec2-cmd" ]; then continue; fi + makeWrapper $i $out/bin/$(basename $i) \ + --set EC2_HOME $d \ + --set JAVA_HOME ${jre} + done + ''; meta = { homepage = "http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351"; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix index 50ead9de72..fe05078ba3 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "google-guest-oslogin"; - version = "20220205.00"; + version = "20220721.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "guest-oslogin"; rev = version; - sha256 = "sha256-CVJAWda8bn5MPO8ACLtosVvZzuxPbOj377WaysZdhDU="; + sha256 = "sha256-VIbejaHN9ANk+9vjpGAYS/SjHx4Tf7SkTqRD1svJRPU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix index 32cfb4aa66..1a44cf7ebc 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "govc"; - version = "0.28.0"; + version = "0.29.0"; subPackages = [ "govc" ]; @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-uK1JsBJC9O8dEJbAnyeMoolKZ2WhEPsDo/is/I+gfHg="; + sha256 = "sha256-SVQyl1uI3wGBBDhz2VLm0uJj+aREqNot7K+iGRHGmhI="; }; vendorSha256 = "sha256-jbGqQITAhyBLoDa3cKU5gK+4WGgoGSCyFtzeoXx8e7k="; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix index b69924cac4..d1bdc5e16b 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "0.54.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - sha256 = "sha256-MNNseahFXLH9ImViI6542bTwZW4ZXpFMJUz8NMRP/uU"; + sha256 = "sha256-Nz1x1kFywMbVTPYFQFnTbx+SQs5ZY4pMijo7FFttmxg="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index d7a5877939..76913951b6 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -11,10 +11,10 @@ }: let - sha256 = "1yglnmwspdncqmy5x0zc0g43bfm4597zfmwfvs7qkalv1pprf0s3"; + sha256 = "1fv53wikx745kci86xrsq9kfsgv0a65srhywdw32cab1wywwpn2z"; # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.130.0"; - specSha256 = "0qwydx6bsbi37135zmwm8vx1yzwa5gyi8bz1zsvkd64wjv79yra1"; + specVersion = "4.132.0"; + specSha256 = "0r0l23bvaj406xam7hglfx637cxja3g2vqdqx3x0ag7jfhg0s3k5"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; sha256 = specSha256; @@ -24,7 +24,7 @@ in buildPythonApplication rec { pname = "linode-cli"; - version = "5.21.0"; + version = "5.22.0"; src = fetchFromGitHub { owner = "linode"; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/way-displays/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/way-displays/default.nix index 77b97563d5..126f2a4ec9 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/way-displays/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/way-displays/default.nix @@ -9,19 +9,15 @@ stdenv.mkDerivation rec { pname = "way-displays"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "alex-courtis"; repo = "way-displays"; rev = "${version}"; - sha256 = "sha256-5A0qZRpWw3Deo9cGqGULpQMoPCVh85cWE/wJ5XSbVJk="; + sha256 = "sha256-wrfRSJaVz0GjYxuIDvJ+16aaz+kRTtv0q5jN2IG4Uco="; }; - postPatch = '' - substituteInPlace src/cfg.cpp --replace "\"/etc" "\"$out/etc" - ''; - strictDeps = true; nativeBuildInputs = [ @@ -35,7 +31,7 @@ stdenv.mkDerivation rec { libinput ]; - makeFlags = [ "DESTDIR=$(out) PREFIX= PREFIX_ETC="]; + makeFlags = [ "DESTDIR=$(out) PREFIX= PREFIX_ETC= ROOT_ETC=$(out)/etc"]; meta = with lib; { homepage = "https://github.com/alex-courtis/way-displays"; diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wl-mirror/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wl-mirror/default.nix index 3b876c5306..129f02e801 100644 --- a/third_party/nixpkgs/pkgs/tools/wayland/wl-mirror/default.nix +++ b/third_party/nixpkgs/pkgs/tools/wayland/wl-mirror/default.nix @@ -14,6 +14,7 @@ , pipectl , slurp , rofi +, scdoc }: let @@ -27,17 +28,17 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.11.2"; + version = "0.12.1"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-D5uUKaepcSW9v2x6uBeLGXAyuLorlt4Lb6lZD/prfp8="; + hash = "sha256-XuwHHJfUKYugx0CKxkloJnpm6s5rHetinsZCSlLJ0Zg="; }; strictDeps = true; - nativeBuildInputs = [ cmake pkg-config wayland-scanner makeWrapper ]; + nativeBuildInputs = [ cmake pkg-config wayland-scanner scdoc makeWrapper ]; buildInputs = [ libGL wayland wayland-protocols wlr-protocols bash ]; postPatch = '' @@ -49,6 +50,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DINSTALL_EXAMPLE_SCRIPTS=${if installExampleScripts then "ON" else "OFF"}" + "-DINSTALL_DOCUMENTATION=ON" ]; postInstall = lib.optionalString installExampleScripts '' diff --git a/third_party/nixpkgs/pkgs/tools/wayland/wlopm/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wlopm/default.nix new file mode 100644 index 0000000000..5e08e5b53a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/wayland/wlopm/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromSourcehut, wayland, wayland-scanner }: + +stdenv.mkDerivation rec { + pname = "wlopm"; + version = "0.1.0"; + + src = fetchFromSourcehut { + owner = "~leon_plickat"; + repo = "wlopm"; + rev = "v${version}"; + sha256 = "sha256-kcUJVB5jP2qZ1YgJDEBsyn5AgwhRxQmzOrk0gKj1MeM="; + }; + + strictDeps = true; + nativeBuildInputs = [ wayland-scanner ]; + buildInputs = [ wayland ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "Simple client implementing zwlr-output-power-management-v1"; + homepage = "https://git.sr.ht/~leon_plickat/wlopm"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ arjan-s ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index c8f4cdde0d..b2a8d4a5a6 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -408,6 +408,7 @@ mapAliases ({ facette = throw "facette has been removed"; # Added 2020-01-06 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 fastnlo = fastnlo_toolkit; # Added 2021-04-24 + fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26 fedora-coreos-config-transpiler = throw "fedora-coreos-config-transpiler has been renamed to 'butane'"; # Added 2021-04-13 feedreader = throw "feedreader is no longer activily maintained since 2019. The developer is working on a spiritual successor called NewsFlash."; # Added 2022-05-03 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; @@ -422,6 +423,7 @@ mapAliases ({ firefox-wrapper = throw "'firefox-wrapper' has been renamed to/replaced by 'firefox'"; # Converted to throw 2022-02-22 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fish-foreign-env = throw "fish-foreign-env has been replaced with fishPlugins.foreign-env"; # Added 2020-12-29, modified 2021-01-10 + fishfight = jumpy; # Added 2022-08-03 flameGraph = throw "'flameGraph' has been renamed to/replaced by 'flamegraph'"; # Converted to throw 2022-02-22 flashplayer-standalone-debugger = throw "flashplayer-standalone-debugger has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 flashplayer-standalone = throw "flashplayer-standalone has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 @@ -579,6 +581,7 @@ mapAliases ({ ### H ### hal-flash = throw "hal-flash has been removed as Adobe Flash Player is now deprecated"; # Added 2021-02-07 + inherit (harePackages) hare harec; # Added 2022-08-10 hawkthorne = throw "hawkthorne has been removed because it depended on a broken version of love"; # Added 2022-01-15 heapster = throw "Heapster is now retired. See https://github.com/kubernetes-retired/heapster/blob/master/docs/deprecation.md"; # Added 2022-04-05 heimdalFull = throw "'heimdalFull' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2022-02-22 @@ -630,6 +633,7 @@ 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-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 @@ -752,6 +756,7 @@ 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; + lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01 lighthouse = throw "lighthouse has been removed: abandoned by upstream"; # Added 2022-04-24 lighttable = throw "'lighttable' crashes (SIGSEGV) on startup, has not been updated in years and depends on deprecated GTK2"; # Added 2022-06-15 lilypond-unstable = lilypond; # Added 2021-03-11 @@ -772,6 +777,7 @@ mapAliases ({ linuxPackages_5_16 = linuxKernel.packages.linux_5_16; linuxPackages_5_17 = linuxKernel.packages.linux_5_17; linuxPackages_5_18 = linuxKernel.packages.linux_5_18; + linuxPackages_5_19 = linuxKernel.packages.linux_5_19; linuxPackages_5_4 = linuxKernel.packages.linux_5_4; linuxPackages_hardkernel_4_14 = linuxKernel.packages.hardkernel_4_14; linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1; @@ -791,6 +797,7 @@ mapAliases ({ linux_5_16 = linuxKernel.kernels.linux_5_16; linux_5_17 = linuxKernel.kernels.linux_5_17; linux_5_18 = linuxKernel.kernels.linux_5_18; + linux_5_19 = linuxKernel.kernels.linux_5_19; linux_5_4 = linuxKernel.kernels.linux_5_4; linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95; linux_rpi0 = linuxKernel.kernels.linux_rpi1; @@ -889,6 +896,7 @@ mapAliases ({ mopidy-spotify-tunigo = throw "mopidy-spotify-tunigo has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 morituri = throw "'morituri' has been renamed to/replaced by 'whipper'"; # Converted to throw 2022-02-22 + moz-phab = mozphab; # Added 2022-08-09 mozart-binary = mozart2-binary; # Added 2019-09-23 mozart = mozart2-binary; # Added 2019-09-23 mpc_cli = mpc-cli; # moved from top-level 2022-01-24 @@ -919,6 +927,7 @@ mapAliases ({ ### N ### + ncdu_2 = ncdu; # Added 2022-07-22 nccl = throw "nccl has been renamed to cudaPackages.nccl"; # Added 2022-04-04 nccl_cudatoolkit_10 = throw "nccl_cudatoolkit_10 has been renamed to cudaPackages_10.nccl"; # Added 2022-04-04 nccl_cudatoolkit_11 = throw "nccl_cudatoolkit_11 has been renamed to cudaPackages_11.nccl"; # Added 2022-04-04 @@ -1337,6 +1346,7 @@ mapAliases ({ sqlite3_analyzer = throw "'sqlite3_analyzer' has been renamed to/replaced by 'sqlite-analyzer'"; # Converted to throw 2022-02-22 sqliteInteractive = throw "'sqliteInteractive' has been renamed to/replaced by 'sqlite-interactive'"; # Converted to throw 2022-02-22 squid4 = squid; # added 2019-08-22 + srcml = throw "'srcml' has been removed: abandoned by upstream"; # Added 2022-07-21 sshfsFuse = throw "'sshfsFuse' has been renamed to/replaced by 'sshfs-fuse'"; # Converted to throw 2022-02-22 ssmtp = throw "'ssmtp' has been removed due to the software being unmaintained. 'msmtp' can be used as a replacement"; # Added 2022-04-17 stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 @@ -1363,6 +1373,8 @@ mapAliases ({ tahoelafs = throw "'tahoelafs' has been renamed to/replaced by 'tahoe-lafs'"; # Converted to throw 2022-02-22 tangogps = foxtrotgps; # Added 2020-01-26 + taplo-cli = taplo; # Added 2022-07-30 + taplo-lsp = taplo; # Added 2022-07-30 tdm = throw "tdm has been removed because nobody can figure out how to fix OpenAL integration. Use precompiled binary and `steam-run` instead"; teleconsole = throw "teleconsole is archived by upstream"; # Added 2022-04-05 telepathy-qt = throw "telepathy-qt no longer supports Qt 4. Please use libsForQt5.telepathy instead"; # Added 2020-07-02 @@ -1377,6 +1389,7 @@ mapAliases ({ telepathy_qt5 = throw "'telepathy_qt5' has been renamed to/replaced by 'libsForQt5.telepathy'"; # Converted to throw 2022-02-22 telnet = throw "'telnet' has been renamed to/replaced by 'inetutils'"; # Converted to throw 2022-02-22 terminus = throw "terminus has been removed, it was unmaintained in nixpkgs"; # Added 2021-08-21 + terraform-full = throw "terraform-full has been removed, it was an alias for 'terraform.full'"; # Added 2022-08-02 terraform_0_13 = throw "terraform_0_13 has been removed from nixpkgs"; # Added 2022-06-26 terraform_0_14 = throw "terraform_0_14 has been removed from nixpkgs"; # Added 2022-06-26 terraform_0_15 = throw "terraform_0_15 has been removed from nixpkgs"; # Added 2022-06-26 @@ -1518,6 +1531,10 @@ mapAliases ({ ''; xf86_input_multitouch = throw "xf86_input_multitouch has been removed from nixpkgs"; # Added 2020-01-20 xlibs = throw "'xlibs' has been renamed to/replaced by 'xorg'"; # Converted to throw 2022-02-22 + xow = throw ( + "Upstream has ended support for 'xow' and the package has been removed" + + "from nixpkgs. Users are urged to switch to 'xone'." + ); # Added 2022-08-02 xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 xv = xxv; # Added 2020-02-22 xvfb_run = xvfb-run; # Added 2021-05-07 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 6c8af61fe2..9466bd6d8b 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -276,6 +276,8 @@ with pkgs; bakelite = callPackage ../tools/backup/bakelite { }; + benthos = callPackage ../development/tools/benthos {}; + beyond-identity = callPackage ../tools/security/beyond-identity {}; bingo = callPackage ../development/tools/bingo {}; @@ -290,8 +292,12 @@ with pkgs; buf = callPackage ../development/tools/buf { }; + cbfmt = callPackage ../development/tools/cbfmt { }; + cfn-nag = callPackage ../development/tools/cfn-nag { }; + cxx-rs = callPackage ../development/libraries/cxx-rs { }; + elfcat = callPackage ../tools/misc/elfcat { }; # Zip file format only allows times after year 1980, which makes e.g. Python @@ -376,8 +382,12 @@ with pkgs; containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; + crc = callPackage ../applications/networking/cluster/crc { }; + coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; + copilot-cli = callPackage ../tools/admin/copilot-cli { }; + cp437 = callPackage ../tools/misc/cp437 { }; cpm = callPackage ../development/tools/cpm { }; @@ -474,6 +484,8 @@ with pkgs; protoc-gen-connect-go = callPackage ../development/tools/protoc-gen-connect-go { }; + protoc-gen-rust = callPackage ../development/tools/protoc-gen-rust { }; + protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; @@ -488,6 +500,8 @@ with pkgs; ptags = callPackage ../development/tools/misc/ptags { }; + resolve-march-native = callPackage ../development/tools/resolve-march-native { }; + ptouch-print = callPackage ../misc/ptouch-print { }; demoit = callPackage ../servers/demoit { }; @@ -516,6 +530,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + didu = callPackage ../tools/misc/didu { }; + diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; @@ -685,7 +701,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost177; # Configure checks for specific version. protobuf = protobuf3_19; - icu = icu67; + icu = icu69; v8 = v8_8_x; }; @@ -828,6 +844,10 @@ with pkgs; makeDesktopItem = callPackage ../build-support/make-desktopitem { }; + copyPkgconfigItems = makeSetupHook { } ../build-support/setup-hooks/copy-pkgconfig-items.sh; + + makePkgconfigItem = callPackage ../build-support/make-pkgconfigitem { }; + makeDarwinBundle = callPackage ../build-support/make-darwin-bundle { }; makeAutostartItem = callPackage ../build-support/make-startupitem { }; @@ -989,7 +1009,7 @@ with pkgs; _6tunnel = callPackage ../tools/networking/6tunnel { }; - _7zz = callPackage ../tools/archivers/7zz { }; + _7zz = darwin.apple_sdk_11_0.callPackage ../tools/archivers/7zz { }; _9pfs = callPackage ../tools/filesystems/9pfs { }; @@ -1069,7 +1089,6 @@ with pkgs; acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; - libressl = libressl_3_4; }; adrgen = callPackage ../tools/misc/adrgen { }; @@ -1120,6 +1139,8 @@ with pkgs; aide = callPackage ../tools/security/aide { }; + aioblescan = with python3Packages; toPythonApplication aioblescan; + aiodnsbrute = python3Packages.callPackage ../tools/security/aiodnsbrute { }; aircrack-ng = callPackage ../tools/networking/aircrack-ng { }; @@ -1177,10 +1198,14 @@ with pkgs; davinci-resolve = callPackage ../applications/video/davinci-resolve { }; + dwarfs = callPackage ../tools/filesystems/dwarfs { }; + gamemode = callPackage ../tools/games/gamemode { libgamemode32 = pkgsi686Linux.gamemode.lib; }; + gamescope = callPackage ../applications/window-managers/gamescope { }; + gay = callPackage ../tools/misc/gay { }; elkhound = callPackage ../development/tools/elkhound { }; @@ -1197,6 +1222,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + gh-dash = callPackage ../tools/misc/gh-dash { }; + gh-eco = callPackage ../tools/misc/gh-eco { }; glooctl = callPackage ../applications/networking/cluster/glooctl { }; @@ -1221,6 +1248,10 @@ with pkgs; httm = callPackage ../tools/filesystems/httm { }; + kanata = callPackage ../tools/system/kanata { }; + + kanata-with-cmd = callPackage ../tools/system/kanata { withCmd = true; }; + ksnip = libsForQt5.callPackage ../tools/misc/ksnip { }; kubevirt = callPackage ../tools/virtualization/kubevirt { }; @@ -1235,6 +1266,8 @@ with pkgs; midimonster = callPackage ../tools/audio/midimonster { }; + midi-trigger = callPackage ../applications/audio/midi-trigger { }; + mprocs = callPackage ../tools/misc/mprocs { }; nominatim = callPackage ../servers/nominatim { }; @@ -1249,6 +1282,8 @@ with pkgs; redfang = callPackage ../tools/networking/redfang { }; + scarab = callPackage ../tools/games/scarab { }; + sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { }; sdlookup = callPackage ../tools/security/sdlookup { }; @@ -1263,6 +1298,8 @@ with pkgs; tauon = callPackage ../applications/audio/tauon { }; + tere = callPackage ../tools/misc/tere { }; + termusic = callPackage ../applications/audio/termusic { }; tfk8s = callPackage ../tools/misc/tfk8s { }; @@ -1442,9 +1479,7 @@ with pkgs; oberon-risc-emu = callPackage ../applications/emulators/oberon-risc-emu { }; - openmsx = callPackage ../applications/emulators/openmsx { - python = python3; - }; + openmsx = callPackage ../applications/emulators/openmsx { }; packwiz = callPackage ../tools/games/minecraft/packwiz { }; @@ -1758,8 +1793,8 @@ with pkgs; wayst = callPackage ../applications/terminal-emulators/wayst { }; - wezterm = callPackage ../applications/terminal-emulators/wezterm { - inherit (darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation; + wezterm = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/wezterm { + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa CoreGraphics Foundation UserNotifications; }; x3270 = callPackage ../applications/terminal-emulators/x3270 { }; @@ -1903,7 +1938,8 @@ with pkgs; }) arangodb_3_3 arangodb_3_4 arangodb_3_5; arangodb = arangodb_3_4; - arcanist = callPackage ../development/tools/misc/arcanist { php = php81; }; + # arcanist currently crashes with some workflows on php8.1, use 8.0 + arcanist = callPackage ../development/tools/misc/arcanist { php = php80; }; arduino = arduino-core.override { withGui = true; }; @@ -2044,7 +2080,9 @@ with pkgs; betterdiscord-installer = callPackage ../tools/misc/betterdiscord-installer { }; - binocle = callPackage ../applications/misc/binocle { }; + binocle = callPackage ../applications/misc/binocle { + inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreVideo Foundation Metal QuartzCore; + }; bitwise = callPackage ../tools/misc/bitwise { }; @@ -2084,6 +2122,8 @@ with pkgs; crystfel-headless = callPackage ../applications/science/physics/crystfel { withGui = false; }; + cw = callPackage ../tools/admin/cw { }; + ec2-api-tools = callPackage ../tools/virtualization/ec2-api-tools { }; ec2-ami-tools = callPackage ../tools/virtualization/ec2-ami-tools { }; @@ -2248,8 +2288,6 @@ with pkgs; cosign = callPackage ../tools/security/cosign { inherit (darwin.apple_sdk.frameworks) PCSC; - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; }; cozy = callPackage ../applications/audio/cozy { }; @@ -2274,6 +2312,8 @@ with pkgs; cue = callPackage ../development/tools/cue { }; + cuelsp = callPackage ../development/tools/cuelsp {}; + cyclone-scheme = callPackage ../development/interpreters/cyclone { }; cyclonedx-python = callPackage ../tools/misc/cyclonedx-python { }; @@ -2484,7 +2524,9 @@ with pkgs; gtklp = callPackage ../tools/misc/gtklp { }; - google-amber = callPackage ../tools/graphics/amber { }; + google-amber = callPackage ../tools/graphics/amber { + inherit (darwin) cctools; + }; hakrawler = callPackage ../tools/security/hakrawler { }; @@ -2494,9 +2536,13 @@ with pkgs; hime = callPackage ../tools/inputmethods/hime {}; - himitsu = callPackage ../tools/security/himitsu { }; + himitsu = callPackage ../tools/security/himitsu { + inherit (harePackages) hare; + }; - himitsu-firefox = callPackage ../tools/security/himitsu-firefox { }; + himitsu-firefox = callPackage ../tools/security/himitsu-firefox { + inherit (harePackages) hare; + }; hinit = haskell.lib.compose.justStaticExecutables haskellPackages.hinit; @@ -2602,6 +2648,14 @@ with pkgs; goku = callPackage ../os-specific/darwin/goku { }; + kerf = kerf_1; /* kerf2 is WIP */ + kerf_1 = callPackage ../development/interpreters/kerf { + stdenv = clangStdenv; + inherit (darwin.apple_sdk.frameworks) + Accelerate CoreGraphics CoreVideo + ; + }; + kwakd = callPackage ../servers/kwakd { }; kwm = callPackage ../os-specific/darwin/kwm { }; @@ -2992,6 +3046,8 @@ with pkgs; buildtorrent = callPackage ../tools/misc/buildtorrent { }; + bundletool = callPackage ../development/tools/bundletool { }; + bustle = haskellPackages.bustle; bwm_ng = callPackage ../tools/networking/bwm-ng { }; @@ -3131,6 +3187,8 @@ with pkgs; cinny = callPackage ../applications/networking/instant-messengers/cinny { stdenv = stdenvNoCC; }; + cinny-desktop = callPackage ../applications/networking/instant-messengers/cinny-desktop { }; + ckbcomp = callPackage ../tools/X11/ckbcomp { }; clac = callPackage ../tools/misc/clac {}; @@ -3277,6 +3335,8 @@ with pkgs; wlogout = callPackage ../tools/wayland/wlogout { }; + wlopm = callPackage ../tools/wayland/wlopm { }; + wlr-randr = callPackage ../tools/wayland/wlr-randr { }; wlrctl = callPackage ../tools/wayland/wlrctl { }; @@ -3432,6 +3492,8 @@ with pkgs; dbus-broker = callPackage ../os-specific/linux/dbus-broker { }; + dbx = python3Packages.callPackage ../applications/misc/dbx { }; + ioport = callPackage ../os-specific/linux/ioport {}; dgoss = callPackage ../tools/misc/dgoss { }; @@ -3454,6 +3516,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + refinery-cli = callPackage ../development/tools/refinery-cli { }; + digitemp = callPackage ../tools/misc/digitemp { }; dijo = callPackage ../tools/misc/dijo { @@ -3649,7 +3713,9 @@ with pkgs; extrude = callPackage ../tools/security/extrude { }; - fastly = callPackage ../misc/fastly {}; + fastly = callPackage ../misc/fastly { + # If buildGoModule is overriden, provide a matching version of the go attribute + }; f2 = callPackage ../tools/misc/f2 {}; @@ -4009,6 +4075,12 @@ with pkgs; klipper = callPackage ../servers/klipper { }; + klipper-firmware = callPackage ../servers/klipper/klipper-firmware.nix { }; + + klipper-flash = callPackage ../servers/klipper/klipper-flash.nix { }; + + klipper-genconf = callPackage ../servers/klipper/klipper-genconf.nix { }; + klog = qt5.callPackage ../applications/radio/klog { }; krapslog = callPackage ../tools/misc/krapslog { }; @@ -4034,6 +4106,8 @@ with pkgs; lepton-eda = callPackage ../applications/science/electronics/lepton-eda { }; + lexend = callPackage ../data/fonts/lexend { }; + lexicon = callPackage ../tools/admin/lexicon { }; lief = callPackage ../development/libraries/lief { @@ -4129,7 +4203,7 @@ with pkgs; # example of an error which this fixes # [Errno 8] Exec format error: './gdk3-scan' mesonEmulatorHook = - if (stdenv.buildPlatform != stdenv.targetPlatform) then + if (!stdenv.buildPlatform.canExecute stdenv.targetPlatform) then makeSetupHook { name = "mesonEmulatorHook"; @@ -4140,11 +4214,13 @@ with pkgs; ''; }; } ../development/tools/build-managers/meson/emulator-hook.sh - else throw "mesonEmulatorHook has to be in a cross conditional i.e. (stdenv.buildPlatform != stdenv.hostPlatform)"; + else throw "mesonEmulatorHook has to be in a conditional to check if the target binaries can be executed i.e. (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)"; meson-tools = callPackage ../misc/meson-tools { }; - metabase = callPackage ../servers/metabase { }; + metabase = callPackage ../servers/metabase { + jdk11 = jdk11_headless; + }; micropad = callPackage ../applications/office/micropad { electron = electron_17; @@ -4246,7 +4322,6 @@ with pkgs; noti = callPackage ../tools/misc/noti { inherit (darwin.apple_sdk.frameworks) Cocoa; - buildGoPackage = buildGo117Package; }; notify = callPackage ../tools/misc/notify { }; @@ -4305,7 +4380,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - patdiff = callPackage ../tools/misc/patdiff { }; + inherit (ocamlPackages) patdiff; patool = with python3Packages; toPythonApplication patool; @@ -4329,6 +4404,8 @@ with pkgs; piglit = callPackage ../tools/graphics/piglit { }; + pika = callPackage ../applications/graphics/pika { }; + playerctl = callPackage ../tools/audio/playerctl { }; pn = callPackage ../tools/text/pn { }; @@ -4407,6 +4484,8 @@ with pkgs; s2png = callPackage ../tools/graphics/s2png { }; + sfz = callPackage ../tools/misc/sfz { }; + shab = callPackage ../tools/text/shab { }; sheldon = callPackage ../tools/misc/sheldon { }; @@ -4415,6 +4494,8 @@ with pkgs; shellhub-agent = callPackage ../applications/networking/shellhub-agent { }; + shellnoob = callPackage ../tools/security/shellnoob { }; + sheesy-cli = callPackage ../tools/security/sheesy-cli { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4425,6 +4506,8 @@ with pkgs; shisho = callPackage ../tools/security/shisho { }; + siglo = callPackage ../applications/misc/siglo { }; + simg2img = callPackage ../tools/filesystems/simg2img { }; snazy = callPackage ../development/tools/snazy { }; @@ -4640,7 +4723,7 @@ with pkgs; bdsync = callPackage ../tools/backup/bdsync { }; - beamerpresenter = libsForQt5.callPackage ../applications/office/beamerpresenter { }; + beamerpresenter = qt6Packages.callPackage ../applications/office/beamerpresenter { }; beanstalkd = callPackage ../servers/beanstalkd { }; @@ -4856,8 +4939,6 @@ with pkgs; circus = callPackage ../tools/networking/circus { }; - citrix_workspace = citrix_workspace_22_05_0; - cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { }; inherit (callPackage ../applications/networking/remote/citrix-workspace { }) @@ -4868,7 +4949,9 @@ with pkgs; citrix_workspace_21_09_0 citrix_workspace_21_12_0 citrix_workspace_22_05_0 + citrix_workspace_22_07_0 ; + citrix_workspace = citrix_workspace_22_07_0; cmigemo = callPackage ../tools/text/cmigemo { }; @@ -4969,6 +5052,8 @@ with pkgs; keyd = callPackage ../tools/inputmethods/keyd { }; + twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { }; + gebaar-libinput = callPackage ../tools/inputmethods/gebaar-libinput { stdenv = gcc10StdenvCompat; }; kime = callPackage ../tools/inputmethods/kime { }; @@ -5446,6 +5531,8 @@ with pkgs; tk = tk-8_5; }; + dwdiff = callPackage ../applications/misc/dwdiff { }; + picoscope = callPackage ../applications/science/electronics/picoscope { }; picotts = callPackage ../tools/audio/picotts { }; @@ -5637,15 +5724,19 @@ with pkgs; ssh = openssh; }; + kics = callPackage ../tools/admin/kics { }; + kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; - lychee = callPackage ../tools/networking/lychee { }; + lychee = callPackage ../tools/networking/lychee { + inherit (darwin.apple_sdk.frameworks) Security; + }; magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { }; mcrcon = callPackage ../tools/networking/mcrcon {}; - mozillavpn = libsForQt5.callPackage ../tools/networking/mozillavpn { }; + mozillavpn = qt6Packages.callPackage ../tools/networking/mozillavpn { }; mozwire = callPackage ../tools/networking/mozwire { inherit (darwin.apple_sdk.frameworks) Security; @@ -5770,6 +5861,10 @@ with pkgs; zabbixctl = callPackage ../tools/misc/zabbixctl { }; + zee = callPackage ../applications/editors/zee { + inherit (darwin.apple_sdk.frameworks) Security; + }; + zeek = callPackage ../applications/networking/ids/zeek { }; zoekt = callPackage ../tools/text/zoekt { }; @@ -5802,6 +5897,8 @@ with pkgs; efivar = callPackage ../tools/system/efivar { }; + eget = callPackage ../tools/misc/eget { }; + evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. @@ -5850,6 +5947,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit CoreGraphics CoreServices Foundation OpenGL; }; + emulsion-palette = callPackage ../applications/graphics/emulsion-palette { }; + emv = callPackage ../tools/misc/emv { }; enblend-enfuse = callPackage ../tools/graphics/enblend-enfuse { @@ -5939,6 +6038,8 @@ with pkgs; expect = callPackage ../tools/misc/expect { }; + exportarr = callPackage ../servers/monitoring/exportarr { }; + expliot = callPackage ../tools/security/expliot { }; f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; @@ -6335,6 +6436,8 @@ with pkgs; gtk = gtk3; }; + fornalder = callPackage ../applications/version-management/fornalder { }; + free42 = callPackage ../applications/misc/free42 { }; galen = callPackage ../development/tools/galen {}; @@ -6402,6 +6505,8 @@ with pkgs; getopt = callPackage ../tools/misc/getopt { }; + getoptions = callPackage ../tools/misc/getoptions { }; + gexiv2 = callPackage ../development/libraries/gexiv2 { }; gftp = callPackage ../applications/networking/ftp/gftp { @@ -6694,6 +6799,8 @@ with pkgs; gnome-feeds = callPackage ../applications/networking/feedreaders/gnome-feeds {}; + gnome-frog = callPackage ../applications/misc/gnome-frog { }; + gnome-keysign = callPackage ../tools/security/gnome-keysign { }; gnome-secrets = callPackage ../applications/misc/gnome-secrets { }; @@ -7115,8 +7222,7 @@ with pkgs; llvmPackages = llvmPackages_9; }; - harec = callPackage ../development/compilers/hare/harec.nix { }; - hare = callPackage ../development/compilers/hare/hare.nix { }; + harePackages = recurseIntoAttrs (callPackage ../development/compilers/hare { }); ham = pkgs.perlPackages.ham; @@ -7161,6 +7267,8 @@ with pkgs; heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; + heatshrink = callPackage ../tools/compression/heatshrink { }; + heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; heimdall-gui = heimdall.override { enableGUI = true; }; @@ -7304,6 +7412,8 @@ with pkgs; bc-decaf = callPackage ../development/libraries/bc-decaf { }; + deckmaster = callPackage ../applications/misc/deckmaster { }; + deco = callPackage ../applications/misc/deco { }; decoder = callPackage ../tools/security/decoder { }; @@ -7674,6 +7784,8 @@ with pkgs; kdigger = callPackage ../tools/security/kdigger { }; + kdiskmark = libsForQt5.callPackage ../tools/filesystems/kdiskmark { }; + keepalived = callPackage ../tools/networking/keepalived { }; kexec-tools = callPackage ../os-specific/linux/kexec-tools { }; @@ -8030,7 +8142,7 @@ with pkgs; motion = callPackage ../applications/video/motion { }; - moz-phab = python3Packages.callPackage ../applications/misc/moz-phab { }; + mozphab = callPackage ../applications/misc/mozphab { }; mtail = callPackage ../servers/monitoring/mtail { }; @@ -8337,6 +8449,8 @@ with pkgs; limesurvey = callPackage ../servers/limesurvey { }; + linux-exploit-suggester = callPackage ../tools/security/linux-exploit-suggester { }; + linuxquota = callPackage ../tools/misc/linuxquota { }; liquidctl = with python3Packages; toPythonApplication liquidctl; @@ -8391,7 +8505,9 @@ with pkgs; lshw = callPackage ../tools/system/lshw { }; - lunatic = callPackage ../development/interpreters/lunatic { }; + lunatic = callPackage ../development/interpreters/lunatic { + inherit (darwin.apple_sdk.frameworks) Security; + }; lv = callPackage ../tools/text/lv { }; @@ -8480,6 +8596,7 @@ with pkgs; mangohud = callPackage ../tools/graphics/mangohud { libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl; mangohud32 = pkgsi686Linux.mangohud; + inherit (python3Packages) Mako; }; manix = callPackage ../tools/nix/manix { @@ -8621,6 +8738,8 @@ with pkgs; mktorrent = callPackage ../tools/misc/mktorrent { }; + mloader = callPackage ../tools/misc/mloader { }; + mmake = callPackage ../tools/misc/mmake { }; mmixware = callPackage ../development/tools/mmixware { }; @@ -8674,6 +8793,8 @@ with pkgs; mscgen = callPackage ../tools/graphics/mscgen { }; + msfpc = callPackage ../tools/security/msfpc { }; + melt = callPackage ../tools/security/melt { }; metabigor = callPackage ../tools/security/metabigor { }; @@ -9159,8 +9280,9 @@ with pkgs; ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt514.callPackage ../applications/video/olive-editor - { stdenv = gcc10StdenvCompat; inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; + olive-editor = libsForQt514.callPackage ../applications/video/olive-editor { + inherit (darwin.apple_sdk.frameworks) CoreFoundation; + }; ombi = callPackage ../servers/ombi { }; @@ -9255,6 +9377,8 @@ with pkgs; tinystatus = callPackage ../tools/networking/tinystatus { }; + tuc = callPackage ../tools/text/tuc { }; + opensshPackages = dontRecurseIntoAttrs (callPackage ../tools/networking/openssh {}); openssh = opensshPackages.openssh.override { @@ -9399,6 +9523,8 @@ with pkgs; padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { }; + padbuster = callPackage ../tools/security/padbuster { }; + page = callPackage ../tools/misc/page { }; PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { }; @@ -9461,6 +9587,8 @@ with pkgs; pell = callPackage ../applications/misc/pell { }; + perccli = callPackage ../tools/misc/perccli { }; + perceptualdiff = callPackage ../tools/graphics/perceptualdiff { }; percona-xtrabackup = percona-xtrabackup_8_0; @@ -9640,7 +9768,10 @@ with pkgs; plantuml-server = callPackage ../tools/misc/plantuml-server { }; - plan9port = callPackage ../tools/system/plan9port { }; + plan9port = callPackage ../tools/system/plan9port { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit Metal QuartzCore; + inherit (darwin) DarwinTools; + }; platformioPackages = dontRecurseIntoAttrs (callPackage ../development/embedded/platformio { }); platformio = platformioPackages.platformio-chrootenv; @@ -9699,12 +9830,18 @@ with pkgs; libpng = libpng12; }; + pngpaste = callPackage ../os-specific/darwin/pngpaste { + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + }; + pngtools = callPackage ../tools/graphics/pngtools { }; pngpp = callPackage ../development/libraries/png++ { }; pngquant = callPackage ../tools/graphics/pngquant { }; + po4a = perlPackages.Po4a; + podiff = callPackage ../tools/text/podiff { }; podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; @@ -9923,6 +10060,8 @@ with pkgs; ouch = callPackage ../tools/compression/ouch { }; + outils = callPackage ../tools/misc/outils {}; + mpi = openmpi; # this attribute should used to build MPI applications ucx = callPackage ../development/libraries/ucx {}; @@ -9965,7 +10104,7 @@ with pkgs; qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; - qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { }; + qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { }; qpdf = callPackage ../development/libraries/qpdf { }; @@ -9995,6 +10134,8 @@ with pkgs; quilt = callPackage ../development/tools/quilt { }; + railway = callPackage ../development/tools/railway { }; + quota = if stdenv.isLinux then linuxquota else unixtools.quota; qvge = libsForQt5.callPackage ../applications/graphics/qvge { }; @@ -10096,6 +10237,8 @@ with pkgs; realvnc-vnc-viewer = callPackage ../tools/admin/realvnc-vnc-viewer {}; + re-isearch = callPackage ../applications/search/re-isearch { }; + reaverwps = callPackage ../tools/networking/reaver-wps {}; reaverwps-t6x = callPackage ../tools/networking/reaver-wps-t6x {}; @@ -10372,6 +10515,8 @@ with pkgs; scanbd = callPackage ../tools/graphics/scanbd { }; + scdl = callPackage ../tools/misc/scdl { }; + scdoc = callPackage ../tools/typesetting/scdoc { }; scmpuff = callPackage ../applications/version-management/git-and-tools/scmpuff { }; @@ -10434,12 +10579,16 @@ with pkgs; secp256k1 = callPackage ../tools/security/secp256k1 { }; - securefs = callPackage ../tools/filesystems/securefs { }; + securefs = callPackage ../tools/filesystems/securefs { + stdenv = clangStdenv; + }; seehecht = callPackage ../tools/text/seehecht { }; seexpr = callPackage ../development/compilers/seexpr { }; + selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { }; + semgrep = python3.pkgs.callPackage ../tools/security/semgrep { }; semgrep-core = callPackage ../tools/security/semgrep/semgrep-core.nix { }; @@ -10509,6 +10658,8 @@ with pkgs; shout = nodePackages.shout; + showmethekey = callPackage ../applications/video/showmethekey { }; + shrikhand = callPackage ../data/fonts/shrikhand { }; shunit2 = callPackage ../tools/misc/shunit2 { }; @@ -10525,7 +10676,7 @@ with pkgs; sigil = libsForQt5.callPackage ../applications/editors/sigil { }; - signalbackup-tools = callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; + signalbackup-tools = darwin.apple_sdk_11_0.callPackage ../applications/networking/instant-messengers/signalbackup-tools { }; signald = callPackage ../applications/networking/instant-messengers/signald { }; @@ -10558,6 +10709,8 @@ with pkgs; simplescreenrecorder = libsForQt5.callPackage ../applications/video/simplescreenrecorder { }; + sipexer = callPackage ../tools/networking/sipexer { }; + sipsak = callPackage ../tools/networking/sipsak { }; sipvicious = python3Packages.callPackage ../tools/security/sipvicious { }; @@ -10742,6 +10895,8 @@ with pkgs; stm32loader = with python3Packages; toPythonApplication stm32loader; + storcli = callPackage ../tools/misc/storcli { }; + stremio = qt5.callPackage ../applications/video/stremio { }; sunwait = callPackage ../applications/misc/sunwait { }; @@ -10770,6 +10925,8 @@ with pkgs; sourceHighlight = callPackage ../tools/text/source-highlight { }; + somebar = callPackage ../applications/misc/somebar { }; + spacebar = callPackage ../os-specific/darwin/spacebar { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa ScriptingBridge SkyLight; @@ -10787,8 +10944,6 @@ with pkgs; squashfuse = callPackage ../tools/filesystems/squashfuse { }; - srcml = callPackage ../applications/version-management/srcml { }; - srt-live-server = callPackage ../applications/video/srt-live-server { }; srt-to-vtt-cl = callPackage ../tools/cd-dvd/srt-to-vtt-cl { }; @@ -11075,7 +11230,7 @@ with pkgs; termcolor = callPackage ../development/libraries/termcolor { }; termscp = callPackage ../tools/networking/termscp { - inherit (darwin.apple_sdk.frameworks) Foundation Security; + inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation Security; }; termius = callPackage ../applications/networking/termius { }; @@ -11190,6 +11345,8 @@ with pkgs; tlspool = callPackage ../tools/networking/tlspool { }; + tlsx = callPackage ../tools/security/tlsx { }; + tmate = callPackage ../tools/misc/tmate { }; tmate-ssh-server = callPackage ../servers/tmate-ssh-server { }; @@ -11364,6 +11521,8 @@ with pkgs; ttylog = callPackage ../tools/misc/ttylog { }; + txtpbfmt = callPackage ../development/tools/txtpbfmt { }; + ipbt = callPackage ../tools/misc/ipbt { }; tuhi = callPackage ../applications/misc/tuhi { }; @@ -11652,7 +11811,7 @@ with pkgs; wander = callPackage ../tools/admin/wander { }; watchexec = callPackage ../tools/misc/watchexec { - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; + inherit (darwin.apple_sdk.frameworks) Cocoa AppKit; }; watchlog = callPackage ../tools/misc/watchlog { }; @@ -11666,17 +11825,21 @@ with pkgs; wbox = callPackage ../tools/networking/wbox {}; - webassemblyjs-cli = nodePackages."@webassemblyjs/cli"; - webassemblyjs-repl = nodePackages."@webassemblyjs/repl"; + webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1"; + webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1"; wasm-strip = nodePackages."@webassemblyjs/wasm-strip"; - wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen"; - wast-refmt = nodePackages."@webassemblyjs/wast-refmt"; + wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1"; + wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1"; wasm-bindgen-cli = callPackage ../development/tools/wasm-bindgen-cli { inherit (darwin.apple_sdk.frameworks) Security; nodejs = nodejs_latest; }; + wasmedge = callPackage ../development/tools/wasmedge { + llvmPackages = llvmPackages_12; + }; + welkin = callPackage ../tools/graphics/welkin {}; wemux = callPackage ../tools/misc/wemux { }; @@ -11979,9 +12142,7 @@ with pkgs; webalizer = callPackage ../tools/networking/webalizer { }; - wget = callPackage ../tools/networking/wget { - libpsl = null; - }; + wget = callPackage ../tools/networking/wget { }; wget2 = callPackage ../tools/networking/wget2 { # update breaks grub2 @@ -11995,7 +12156,9 @@ with pkgs; }); }; - wgpu-utils = callPackage ../tools/graphics/wgpu-utils { }; + wgpu-utils = callPackage ../tools/graphics/wgpu-utils { + inherit (darwin.apple_sdk.frameworks) QuartzCore; + }; wg-bond = callPackage ../applications/networking/wg-bond { }; @@ -12028,7 +12191,9 @@ with pkgs; wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; - wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { }; + wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { + libjpeg8 = libjpeg.override { enableJpeg8 = true; }; + }; wml = callPackage ../development/web/wml { }; @@ -12378,6 +12543,8 @@ with pkgs; yarn-bash-completion = callPackage ../shells/bash/yarn-completion { }; + blesh = callPackage ../shells/bash/blesh { }; + undistract-me = callPackage ../shells/bash/undistract-me { }; dash = callPackage ../shells/dash { }; @@ -12934,9 +13101,9 @@ with pkgs; clangMultiStdenv = overrideCC stdenv buildPackages.clang_multi; multiStdenv = if stdenv.cc.isClang then clangMultiStdenv else gccMultiStdenv; - gcc_debug = lowPrio (wrapCC (gcc.cc.override { - stripped = false; - })); + gcc_debug = lowPrio (wrapCC (gcc.cc.overrideAttrs (_: { + dontStrip = true; + }))); gccCrossLibcStdenv = overrideCC stdenv buildPackages.gccCrossStageStatic; @@ -13321,6 +13488,7 @@ with pkgs; gcc-arm-embedded-8 = callPackage ../development/compilers/gcc-arm-embedded/8 {}; gcc-arm-embedded-9 = callPackage ../development/compilers/gcc-arm-embedded/9 {}; gcc-arm-embedded-10 = callPackage ../development/compilers/gcc-arm-embedded/10 {}; + gcc-arm-embedded-11 = callPackage ../development/compilers/gcc-arm-embedded/11 {}; gcc-arm-embedded = gcc-arm-embedded-10; # Has to match the default gcc so that there are no linking errors when @@ -13403,6 +13571,9 @@ with pkgs; remarkable2-toolchain = callPackage ../development/tools/misc/remarkable/remarkable2-toolchain { }; + spicedb = callPackage ../servers/spicedb { }; + spicedb-zed = callPackage ../servers/spicedb/zed.nix { }; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = @@ -13440,20 +13611,6 @@ with pkgs; glslang = callPackage ../development/compilers/glslang { }; - go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; - }); - - # go 1.18 requires a newer Apple SDK to be build. See commit message for more details. - go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix { - inherit (darwin.apple_sdk_11_0.frameworks) Security Foundation; - }; - - go = go_1_18; - go-junit-report = callPackage ../development/tools/go-junit-report { }; gobang = callPackage ../development/tools/database/gobang { @@ -13580,8 +13737,6 @@ with pkgs; oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { }; - oraclejdk14 = callPackage ../development/compilers/oraclejdk/jdk14-linux.nix { }; - jasmin = callPackage ../development/compilers/jasmin { }; java-service-wrapper = callPackage ../tools/system/java-service-wrapper { @@ -13918,7 +14073,7 @@ with pkgs; inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4 ocamlformat_0_23_0; + ocamlformat_0_22_4 ocamlformat_0_23_0 ocamlformat_0_24_0; orc = callPackage ../development/compilers/orc { }; @@ -14010,18 +14165,18 @@ with pkgs; inherit (darwin) apple_sdk; }; - rust_1_61 = callPackage ../development/compilers/rust/1_61.nix { + rust_1_62 = callPackage ../development/compilers/rust/1_62.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; llvm_14 = llvmPackages_14.libllvm; }; - rust = rust_1_61; + rust = rust_1_62; mrustc = callPackage ../development/compilers/mrustc { }; mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { }; mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { stdenv = gcc10StdenvCompat; }; - rustPackages_1_61 = rust_1_61.packages.stable; - rustPackages = rustPackages_1_61; + rustPackages_1_62 = rust_1_62.packages.stable; + rustPackages = rustPackages_1_62; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -14075,6 +14230,9 @@ with pkgs; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; }; + cargo-pgx = callPackage ../development/tools/rust/cargo-pgx { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-release = callPackage ../development/tools/rust/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -14141,6 +14299,7 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; cargo-play = callPackage ../development/tools/rust/cargo-play { }; + cargo-profiler = callPackage ../development/tools/rust/cargo-profiler {}; cargo-raze = callPackage ../development/tools/rust/cargo-raze { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -14312,7 +14471,7 @@ with pkgs; svd2rust = callPackage ../development/tools/rust/svd2rust { }; - svdtools = with python3Packages; toPythonApplication svdtools; + svdtools = callPackage ../development/embedded/svdtools { }; swift = callPackage ../development/compilers/swift { }; @@ -14615,7 +14774,7 @@ with pkgs; stdenv = clangStdenv; }; - jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc923.jacinda; + jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc924.jacinda; janet = callPackage ../development/interpreters/janet {}; @@ -14806,6 +14965,8 @@ with pkgs; pythonInterpreters = callPackage ./../development/interpreters/python { }; inherit (pythonInterpreters) python27 python37 python38 python39 python310 python311 python3Minimal pypy27 pypy38 pypy37 rustpython; + # List of extensions with overrides to apply to all Python package sets. + pythonPackagesExtensions = [ ]; # Python package sets. python27Packages = python27.pkgs; python37Packages = python37.pkgs; @@ -14912,7 +15073,9 @@ with pkgs; inherit (ocamlPackages) reason; - buildRubyGem = callPackage ../development/ruby-modules/gem { }; + buildRubyGem = callPackage ../development/ruby-modules/gem { + inherit (darwin) libobjc; + }; defaultGemConfig = callPackage ../development/ruby-modules/gem-config { inherit (darwin) DarwinTools cctools; inherit (darwin.apple_sdk.frameworks) CoreServices; @@ -14966,8 +15129,15 @@ with pkgs; sparkleshare = callPackage ../applications/version-management/sparkleshare { }; - spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { }; - spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { }; + spidermonkey_78 = callPackage ../development/interpreters/spidermonkey/78.nix { + inherit (darwin) libobjc; + }; + spidermonkey_91 = callPackage ../development/interpreters/spidermonkey/91.nix { + inherit (darwin) libobjc; + }; + spidermonkey_102 = callPackage ../development/interpreters/spidermonkey/102.nix { + inherit (darwin) libobjc; + }; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; @@ -15004,6 +15174,10 @@ with pkgs; trealla = callPackage ../development/interpreters/trealla { }; + wapm-cli = callPackage ../tools/package-management/wapm/cli { + inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + }; + wasm = ocamlPackages.wasm; wasm3 = callPackage ../development/interpreters/wasm3 { }; @@ -15145,6 +15319,8 @@ with pkgs; anybadge = with python3Packages; toPythonApplication anybadge; + apkg = callPackage ../tools/package-management/apkg { }; + augeas = callPackage ../tools/system/augeas { }; autoadb = callPackage ../misc/autoadb { }; @@ -15228,7 +15404,8 @@ with pkgs; electron_16 electron_17 electron_18 - electron_19; + electron_19 + electron_20; autobuild = callPackage ../development/tools/misc/autobuild { }; @@ -15299,7 +15476,9 @@ with pkgs; bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { + go = go_1_18; + }; bazel-gazelle = callPackage ../development/tools/bazel-gazelle { }; @@ -15587,8 +15766,8 @@ with pkgs; cmake-format = python3Packages.callPackage ../development/tools/cmake-format { }; - cmake-language-server = python3Packages.callPackage ../development/tools/cmake-language-server { - inherit cmake; + cmake-language-server = python3Packages.callPackage ../development/tools/misc/cmake-language-server { + inherit cmake cmake-format; }; # Does not actually depend on Qt 5 @@ -15837,7 +16016,6 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; - ocamlPackages = ocaml-ng.ocamlPackages_4_12; }; fly = callPackage ../development/tools/continuous-integration/fly { }; @@ -16003,6 +16181,8 @@ with pkgs; hcloud = callPackage ../development/tools/hcloud { }; + hclfmt = callPackage ../development/tools/hclfmt { }; + help2man = callPackage ../development/tools/misc/help2man { }; heroku = callPackage ../development/tools/heroku { }; @@ -16101,6 +16281,8 @@ with pkgs; krew = callPackage ../development/tools/krew { }; + kube-bench = callPackage ../tools/security/kube-bench { }; + kube-hunter = callPackage ../tools/security/kube-hunter { }; kubeaudit = callPackage ../tools/security/kubeaudit { }; @@ -16184,6 +16366,8 @@ with pkgs; stdenv = overrideCC stdenv llvmPackages_9.clang; }); + lurk = callPackage ../development/tools/lurk { }; + malt = callPackage ../development/tools/profiling/malt {}; massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; @@ -16493,6 +16677,8 @@ with pkgs; sd-local = callPackage ../development/tools/sd-local { }; + seer = libsForQt5.callPackage ../development/tools/misc/seer { }; + selenium-server-standalone = callPackage ../development/tools/selenium/server { }; selendroid = callPackage ../development/tools/selenium/selendroid { }; @@ -16664,11 +16850,7 @@ with pkgs; szyszka = callPackage ../tools/misc/szyszka { }; - taplo-cli = callPackage ../development/tools/taplo-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; - - taplo-lsp = callPackage ../development/tools/taplo-lsp { + taplo = callPackage ../development/tools/taplo { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -16937,6 +17119,8 @@ with pkgs; arb = callPackage ../development/libraries/arb {}; + argparse = callPackage ../development/libraries/argparse { }; + argp-standalone = callPackage ../development/libraries/argp-standalone {}; aribb25 = callPackage ../development/libraries/aribb25 { @@ -16949,6 +17133,8 @@ with pkgs; arrow-cpp = callPackage ../development/libraries/arrow-cpp {}; + arrow-glib = callPackage ../development/libraries/arrow-glib {}; + arsenal = callPackage ../tools/security/arsenal { }; assimp = callPackage ../development/libraries/assimp { }; @@ -17296,6 +17482,8 @@ with pkgs; croaring = callPackage ../development/libraries/croaring { }; + crossguid = callPackage ../development/libraries/crossguid { }; + cryptopp = callPackage ../development/libraries/crypto++ { }; cryptominisat = callPackage ../applications/science/logic/cryptominisat { }; @@ -17308,8 +17496,6 @@ with pkgs; cutee = callPackage ../development/libraries/cutee { }; - cutelyst = libsForQt5.callPackage ../development/libraries/cutelyst { }; - cxxtools = callPackage ../development/libraries/cxxtools { stdenv = gcc10StdenvCompat; }; cwiid = callPackage ../development/libraries/cwiid { }; @@ -17659,10 +17845,7 @@ with pkgs; ganv = callPackage ../development/libraries/ganv { }; - garble = callPackage ../build-support/go/garble.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + garble = callPackage ../development/tools/garble { }; gcab = callPackage ../development/libraries/gcab { }; @@ -17680,9 +17863,7 @@ with pkgs; gecode_6 = qt5.callPackage ../development/libraries/gecode { }; gecode = gecode_6; - gephi = callPackage ../applications/science/misc/gephi { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + gephi = callPackage ../applications/science/misc/gephi { }; gegl = callPackage ../development/libraries/gegl { inherit (darwin.apple_sdk.frameworks) OpenCL; @@ -17929,6 +18110,8 @@ with pkgs; # A GMP fork mpir = callPackage ../development/libraries/mpir {}; + gl3w = callPackage ../development/libraries/gl3w { }; + gnatcoll-core = callPackage ../development/libraries/ada/gnatcoll/core.nix { }; # gnatcoll-bindings repository @@ -17951,7 +18134,7 @@ with pkgs; gns3-gui = gns3Packages.guiStable; gns3-server = gns3Packages.serverStable; - gobject-introspection = if (stdenv.hostPlatform != stdenv.targetPlatform) + gobject-introspection = if (!stdenv.hostPlatform.canExecute stdenv.targetPlatform) then callPackage ../development/libraries/gobject-introspection/wrapper.nix { } else gobject-introspection-unwrapped; gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection { @@ -18549,7 +18732,9 @@ with pkgs; libad9361 = callPackage ../development/libraries/libad9361 { }; - libadwaita = callPackage ../development/libraries/libadwaita { }; + libadwaita = callPackage ../development/libraries/libadwaita { + inherit (pkgs.darwin.apple_sdk.frameworks) AppKit Foundation; + }; libaec = callPackage ../development/libraries/libaec { }; @@ -18719,6 +18904,8 @@ with pkgs; libchop = callPackage ../development/libraries/libchop { }; + libcifpp = callPackage ../development/libraries/libcifpp { }; + libcint = callPackage ../development/libraries/libcint { }; libclc = callPackage ../development/libraries/libclc { }; @@ -20357,6 +20544,10 @@ with pkgs; openpa = callPackage ../development/libraries/openpa { }; + openpgp-card-tools = callPackage ../tools/security/openpgp-card-tools { + inherit (darwin.apple_sdk.frameworks) PCSC; + }; + opensaml-cpp = callPackage ../development/libraries/opensaml-cpp { }; openscenegraph = callPackage ../development/libraries/openscenegraph { @@ -20423,6 +20614,8 @@ with pkgs; paperkey = callPackage ../tools/security/paperkey { }; + parsero = callPackage ../tools/security/parsero { }; + pcaudiolib = callPackage ../development/libraries/pcaudiolib { }; pcg_c = callPackage ../development/libraries/pcg-c { }; @@ -20465,6 +20658,8 @@ with pkgs; place-cursor-at = haskell.lib.compose.justStaticExecutables haskellPackages.place-cursor-at; + platform-folders = callPackage ../development/libraries/platform-folders { }; + plib = callPackage ../development/libraries/plib { }; poco = callPackage ../development/libraries/poco { }; @@ -20691,6 +20886,8 @@ with pkgs; quickder = callPackage ../development/libraries/quickder {}; + quickmem = callPackage ../development/libraries/quickmem {}; + quicksynergy = callPackage ../applications/misc/quicksynergy { }; quill = callPackage ../tools/security/quill { @@ -20744,6 +20941,9 @@ with pkgs; rtrlib = callPackage ../development/libraries/rtrlib { }; kissfft = callPackage ../development/libraries/kissfft { }; + kissfftFloat = kissfft.override { + datatype = "float"; + }; lambdabot = callPackage ../development/tools/haskell/lambdabot { haskellLib = haskell.lib.compose; @@ -20780,6 +20980,10 @@ with pkgs; randomx = callPackage ../development/libraries/randomx { }; + remodel = callPackage ../development/tools/remodel { + inherit (darwin.apple_sdk.frameworks) Security; + }; + retro-gtk = callPackage ../development/libraries/retro-gtk { }; resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { }; @@ -21054,7 +21258,10 @@ with pkgs; ]; }; - soapyrtlsdr = callPackage ../applications/radio/soapyrtlsdr { }; + soapyrtlsdr = callPackage ../applications/radio/soapyrtlsdr { + inherit (darwin) libobjc; + inherit (darwin.apple_sdk.frameworks) IOKit Security; + }; soapyuhd = callPackage ../applications/radio/soapyuhd { }; @@ -21353,6 +21560,8 @@ with pkgs; buildGoModule = buildGo117Module; }; + uncover = callPackage ../tools/security/uncover { }; + unibilium = callPackage ../development/libraries/unibilium { }; unicap = callPackage ../development/libraries/unicap {}; @@ -21469,6 +21678,8 @@ with pkgs; vtk = vtk_8; vtkWithQt5 = vtk_8_withQt5; + vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { }; + vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { }; vulkan-headers = callPackage ../development/libraries/vulkan-headers { }; vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; }; @@ -21697,8 +21908,8 @@ with pkgs; libzra = callPackage ../development/libraries/libzra { }; - zig = callPackage ../development/compilers/zig { - stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv; + # requires a newer Apple SDK + zig = darwin.apple_sdk_11_0.callPackage ../development/compilers/zig { llvmPackages = llvmPackages_13; }; @@ -21807,29 +22018,47 @@ with pkgs; buildBowerComponents = callPackage ../development/bower-modules/generic { }; - ### DEVELOPMENT / GO MODULES - - buildGo117Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_17; - }; - - # go 1.18 requires a newer Apple SDK to be build. See commit message for more details. - buildGo118Package = darwin.apple_sdk_11_0.callPackage ../development/go-packages/generic { - go = buildPackages.go_1_18; - }; + ### DEVELOPMENT / GO + # the unversioned attributes should always point to the same go version + go = go_1_18; + buildGoModule = buildGo118Module; buildGoPackage = buildGo118Package; - buildGo117Module = callPackage ../development/go-modules/generic { + go_1_17 = callPackage ../development/compilers/go/1.17.nix ({ + inherit (darwin.apple_sdk.frameworks) Foundation Security; + } // lib.optionalAttrs (stdenv.cc.isGNU && stdenv.isAarch64) { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; + }); + buildGo117Module = callPackage ../build-support/go/module.nix { + go = buildPackages.go_1_17; + }; + buildGo117Package = callPackage ../build-support/go/package.nix { go = buildPackages.go_1_17; }; - # go 1.18 requires a newer Apple SDK to be build. See commit message for more details. - buildGo118Module = darwin.apple_sdk_11_0.callPackage ../development/go-modules/generic { + # requires a newer Apple SDK + go_1_18 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.18.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; + }; + buildGo118Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { + go = buildPackages.go_1_18; + }; + buildGo118Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix{ go = buildPackages.go_1_18; }; - buildGoModule = buildGo118Module; + # requires a newer Apple SDK + go_1_19 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.19.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; + }; + buildGo119Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { + go = buildPackages.go_1_19; + }; + buildGo119Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix { + go = buildPackages.go_1_19; + }; go2nix = callPackage ../development/tools/go2nix { }; @@ -22156,8 +22385,6 @@ with pkgs; podgrab = callPackage ../servers/misc/podgrab { }; prosody = callPackage ../servers/xmpp/prosody { - # _compat can probably be removed on next minor version after 0.10.0 - lua = lua5_2_compat; withExtraLibs = []; withExtraLuaPackages = _: []; }; @@ -22521,10 +22748,11 @@ with pkgs; oauth2-proxy = callPackage ../servers/oauth2-proxy { }; + onlyoffice-documentserver = callPackage ../servers/onlyoffice-documentserver { }; + openbgpd = callPackage ../servers/openbgpd { }; openafs_1_8 = callPackage ../servers/openafs/1.8 { tsmbac = null; ncurses = null; }; - openafs_1_9 = callPackage ../servers/openafs/1.9 { tsmbac = null; ncurses = null; }; # Current stable release; don't backport release updates! openafs = openafs_1_8; @@ -22580,6 +22808,8 @@ with pkgs; sympa = callPackage ../servers/mail/sympa { }; + syncstorage-rs = callPackage ../servers/syncstorage-rs { }; + system-sendmail = lowPrio (callPackage ../servers/mail/system-sendmail { }); # PulseAudio daemons @@ -22700,7 +22930,10 @@ with pkgs; percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; }; percona-server = percona-server56; - influxdb = callPackage ../servers/nosql/influxdb { }; + influxdb = callPackage ../servers/nosql/influxdb { + # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild + buildGoModule = buildGo117Module; + }; influxdb2-server = callPackage ../servers/nosql/influxdb2 { }; influxdb2-cli = callPackage ../servers/nosql/influxdb2/cli.nix { }; # For backwards compatibility with older versions of influxdb2, @@ -22913,6 +23146,7 @@ with pkgs; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; }; + prometheus-zfs-exporter = callPackage ../servers/monitoring/prometheus/zfs-exporter.nix { }; prometheus-xmpp-alerts = callPackage ../servers/monitoring/prometheus/xmpp-alerts.nix { }; prometheus-cpp = callPackage ../development/libraries/prometheus-cpp { }; @@ -22929,7 +23163,7 @@ with pkgs; qpid-cpp = callPackage ../servers/amqp/qpid-cpp { }; - qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; + qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; @@ -23063,7 +23297,7 @@ with pkgs; switcheroo-control = callPackage ../os-specific/linux/switcheroo-control { }; - slurm = callPackage ../servers/computing/slurm { gtk2 = null; }; + slurm = callPackage ../servers/computing/slurm { }; slurm-spank-stunnel = callPackage ../servers/computing/slurm-spank-stunnel { }; @@ -23119,6 +23353,8 @@ with pkgs; unifi = unifi7; + unifi-protect-backup = callPackage ../applications/backup/unifi-protect-backup { }; + unifi-video = callPackage ../servers/unifi-video { }; unpackerr = callPackage ../servers/unpackerr { @@ -23135,8 +23371,6 @@ with pkgs; virtiofsd = callPackage ../servers/misc/virtiofsd { }; - virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; - virtualenv = with python3Packages; toPythonApplication virtualenv; virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; @@ -23343,6 +23577,8 @@ with pkgs; bolt = callPackage ../os-specific/linux/bolt { }; + bpf-linker = callPackage ../development/tools/bpf-linker { }; + bpfmon = callPackage ../os-specific/linux/bpfmon { }; bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; @@ -23515,10 +23751,7 @@ with pkgs; gomp = callPackage ../applications/version-management/gomp { }; - gomplate = callPackage ../development/tools/gomplate { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + gomplate = callPackage ../development/tools/gomplate { }; gpm = callPackage ../servers/gpm { ncurses = null; # Keep curses disabled for lack of value @@ -23777,6 +24010,8 @@ with pkgs; linux_xanmod = linuxKernel.kernels.linux_xanmod; linuxPackages_xanmod_latest = linuxKernel.packages.linux_xanmod_latest; linux_xanmod_latest = linuxKernel.kernels.linux_xanmod_latest; + linuxPackages_xanmod_tt = linuxKernel.packages.linux_xanmod_tt; + linux_xanmod_tt = linuxKernel.kernels.linux_xanmod_tt; linux-doc = callPackage ../os-specific/linux/kernel/htmldocs.nix { }; @@ -23812,6 +24047,10 @@ with pkgs; cudaSupport = false; }; + librealsense-gui = callPackage ../development/libraries/librealsense { + enableGUI = true; + }; + libsass = callPackage ../development/libraries/libsass { }; libsepol = callPackage ../os-specific/linux/libsepol { }; @@ -24467,6 +24706,7 @@ with pkgs; nlsSupport = false; ncursesSupport = false; systemdSupport = false; + translateManpages = false; } else util-linux; v4l-utils = qt5.callPackage ../os-specific/linux/v4l-utils { }; @@ -24630,8 +24870,14 @@ with pkgs; cnstrokeorder = callPackage ../data/fonts/cnstrokeorder {}; + colloid-gtk-theme = callPackage ../data/themes/colloid-gtk-theme { }; + + colloid-icon-theme = callPackage ../data/icons/colloid-icon-theme { }; + comfortaa = callPackage ../data/fonts/comfortaa {}; + colloid-kde = callPackage ../data/themes/colloid-kde {}; + comic-mono = callPackage ../data/fonts/comic-mono { }; comic-neue = callPackage ../data/fonts/comic-neue { }; @@ -25152,6 +25398,8 @@ with pkgs; oldsindhi = callPackage ../data/fonts/oldsindhi { }; + omni-gtk-theme = callPackage ../data/themes/omni-gtk-theme { }; + onestepback = callPackage ../data/themes/onestepback { }; open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; @@ -25253,6 +25501,8 @@ with pkgs; qogir-icon-theme = callPackage ../data/icons/qogir-icon-theme { }; + qogir-kde = callPackage ../data/themes/qogir-kde { }; + qogir-theme = callPackage ../data/themes/qogir { }; quintom-cursor-theme = callPackage ../data/icons/quintom-cursor-theme { }; @@ -25801,6 +26051,10 @@ with pkgs; aucatctl = callPackage ../applications/audio/aucatctl { }; audacious = libsForQt5.callPackage ../applications/audio/audacious { }; + audacious-plugins = libsForQt5.callPackage ../applications/audio/audacious/plugins.nix { + # Avoid circular dependency + audacious = audacious.override { audacious-plugins = null; }; + }; audaciousQt5 = audacious; audacity-gtk2 = callPackage ../applications/audio/audacity { wxGTK = wxGTK31-gtk2; }; @@ -26006,7 +26260,9 @@ with pkgs; bonzomatic = callPackage ../applications/editors/bonzomatic { }; - bottles = callPackage ../applications/misc/bottles { }; + bottles = callPackage ../applications/misc/bottles { + wine = wineWowPackages.minimal; + }; brave = callPackage ../applications/networking/browsers/brave { }; @@ -26040,6 +26296,8 @@ with pkgs; cardboard = callPackage ../applications/window-managers/cardboard { }; + cardo = callPackage ../data/fonts/cardo { }; + cage = callPackage ../applications/window-managers/cage { wlroots = wlroots_0_14; }; @@ -26710,10 +26968,6 @@ with pkgs; fbpanel = callPackage ../applications/window-managers/fbpanel { }; - fbreader = callPackage ../applications/misc/fbreader { - inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; - }; - fdr = libsForQt5.callPackage ../applications/science/programming/fdr { }; feedbackd = callPackage ../applications/misc/feedbackd { }; @@ -26804,7 +27058,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreMIDI CoreServices Cocoa; }; - fvwm = callPackage ../applications/window-managers/fvwm { }; + fvwm = fvwm2; + fvwm2 = callPackage ../applications/window-managers/fvwm/2.6.nix { }; + fvwm3 = callPackage ../applications/window-managers/fvwm/3.nix { }; ganttproject-bin = callPackage ../applications/misc/ganttproject-bin { }; @@ -27125,6 +27381,8 @@ with pkgs; fluxbox = callPackage ../applications/window-managers/fluxbox { }; + hackedbox = callPackage ../applications/window-managers/hackedbox { }; + fomp = callPackage ../applications/audio/fomp { }; formatter = callPackage ../applications/misc/formatter { }; @@ -27141,6 +27399,10 @@ with pkgs; fractal = callPackage ../applications/networking/instant-messengers/fractal { }; + fractal-next = callPackage ../applications/networking/instant-messengers/fractal-next { + inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad; + }; + fragments = callPackage ../applications/networking/p2p/fragments { }; freecad = libsForQt5.callPackage ../applications/graphics/freecad { @@ -27262,6 +27524,7 @@ with pkgs; gitMinimal = git.override { withManual = false; pythonSupport = false; + perlSupport = false; withpcre2 = false; }; @@ -27295,6 +27558,8 @@ with pkgs; gtk-pipe-viewer = perlPackages.callPackage ../applications/video/pipe-viewer { withGtk3 = true; }; + gum = callPackage ../applications/misc/gum { }; + hydrus = python3Packages.callPackage ../applications/graphics/hydrus { inherit miniupnpc_2 swftools; inherit (qt5) wrapQtAppsHook; @@ -27521,6 +27786,8 @@ with pkgs; stdenv = clangStdenv; }; + hedgedoc-cli = callPackage ../tools/admin/hedgedoc-cli { }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; hello = callPackage ../applications/misc/hello { }; @@ -27753,10 +28020,16 @@ with pkgs; tiramisu = callPackage ../applications/misc/tiramisu { }; + rlaunch = callPackage ../applications/misc/rlaunch { + inherit (xorg) libX11 libXft libXinerama; + }; + rootbar = callPackage ../applications/misc/rootbar {}; waybar = callPackage ../applications/misc/waybar {}; + wayshot = callPackage ../tools/misc/wayshot { }; + wbg = callPackage ../applications/misc/wbg { }; hikari = callPackage ../applications/window-managers/hikari { @@ -27866,6 +28139,8 @@ with pkgs; 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; }; @@ -27983,7 +28258,7 @@ with pkgs; irssi = callPackage ../applications/networking/irc/irssi { }; - irssi_fish = callPackage ../applications/networking/irc/irssi/fish { }; + fish-irssi = callPackage ../applications/networking/irc/irssi/fish { }; kirc = callPackage ../applications/networking/irc/kirc { }; @@ -28779,6 +29054,7 @@ with pkgs; inherit (mopidyPackages) mopidy + mopidy-bandcamp mopidy-iris mopidy-jellyfin mopidy-local @@ -28859,6 +29135,8 @@ with pkgs; rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { }; + rofi-top = callPackage ../applications/misc/rofi-top { }; + rofi-vpn = callPackage ../applications/networking/rofi-vpn { }; ympd = callPackage ../applications/audio/ympd { }; @@ -29154,6 +29432,8 @@ with pkgs; taxi-cli = with python3Packages; toPythonApplication taxi; + tcping-go = callPackage ../applications/networking/tcping-go { }; + librep = callPackage ../development/libraries/librep { }; rep-gtk = callPackage ../development/libraries/rep-gtk { }; @@ -29235,7 +29515,7 @@ with pkgs; netcoredbg = callPackage ../development/tools/misc/netcoredbg { }; ncdu = callPackage ../tools/misc/ncdu { }; - ncdu_2 = callPackage ../tools/misc/ncdu_2 { }; + ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { }; ncdc = callPackage ../applications/networking/p2p/ncdc { }; @@ -29586,6 +29866,8 @@ with pkgs; purple-plugin-pack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack { }; + purple-signald = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-signald { }; + purple-slack = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-slack { }; purple-vk-plugin = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-vk-plugin { }; @@ -30013,6 +30295,10 @@ with pkgs; runc = callPackage ../applications/virtualization/runc {}; + rusty-psn = callPackage ../applications/misc/rusty-psn {}; + + rusty-psn-gui = rusty-psn.override { withGui = true; }; + rymcast = callPackage ../applications/audio/rymcast { inherit (gnome) zenity; }; @@ -30115,6 +30401,8 @@ with pkgs; snixembed = callPackage ../applications/misc/snixembed { }; + sommelier = callPackage ../applications/window-managers/sommelier { }; + sooperlooper = callPackage ../applications/audio/sooperlooper { }; sops = callPackage ../tools/security/sops { }; @@ -30212,7 +30500,7 @@ with pkgs; inherit (xorg) libX11 libXdmcp libpthreadstubs; }; - lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { + lightdm-gtk-greeter = callPackage ../applications/display-managers/lightdm/gtk-greeter.nix { inherit (xfce) xfce4-dev-tools; }; @@ -30612,7 +30900,7 @@ with pkgs; timelimit = callPackage ../tools/misc/timelimit { }; - timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapps; }; + timeshift-unwrapped = callPackage ../applications/backup/timeshift/unwrapped.nix { inherit (cinnamon) xapp; }; timeshift = callPackage ../applications/backup/timeshift { grubPackage = grub2_full; }; @@ -31090,6 +31378,8 @@ with pkgs; warp = callPackage ../applications/networking/warp { }; + warpd = callPackage ../applications/misc/warpd { }; + w3m = callPackage ../applications/networking/browsers/w3m { }; # Should always be the version with the most features @@ -31358,7 +31648,7 @@ with pkgs; xdotool = callPackage ../tools/X11/xdotool { }; xed-editor = callPackage ../applications/editors/xed-editor { - xapps = cinnamon.xapps; + xapp = cinnamon.xapp; }; xenPackages = recurseIntoAttrs (callPackage ../applications/virtualization/xen/packages.nix {}); @@ -31468,7 +31758,7 @@ with pkgs; xplayer = callPackage ../applications/video/xplayer { inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad; - inherit (cinnamon) xapps; + inherit (cinnamon) xapp; }; libxplayer-plparser = callPackage ../applications/video/xplayer/plparser.nix { }; @@ -31608,6 +31898,8 @@ with pkgs; zim = callPackage ../applications/office/zim { }; + zine = callPackage ../applications/misc/zine { }; + zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { }; zita-at1 = callPackage ../applications/audio/zita-at1 { }; @@ -31746,7 +32038,7 @@ with pkgs; boost = boost170; }; - dogecoin = callPackage ../applications/blockchains/dogecoin { + dogecoin = libsForQt5.callPackage ../applications/blockchains/dogecoin { boost = boost165; withGui = true; }; @@ -31895,7 +32187,11 @@ with pkgs; boost = boost175; }; - zcash = callPackage ../applications/blockchains/zcash { }; + zcash = callPackage ../applications/blockchains/zcash { + stdenv = if stdenv.isDarwin then stdenv else llvmPackages_13.stdenv; + }; + + zecwallet-lite = callPackage ../applications/blockchains/zecwallet-lite { }; lightwalletd = callPackage ../applications/blockchains/lightwalletd { }; @@ -32318,9 +32614,9 @@ with pkgs; fish-fillets-ng = callPackage ../games/fish-fillets-ng { }; - fishfight = callPackage ../games/fishfight { + jumpy = callPackage ../games/jumpy { inherit (xorg) libX11 libXi; - inherit (darwin.apple_sdk.frameworks) AudioToolbox Cocoa CoreAudio OpenGL; + inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL; }; flightgear = libsForQt5.callPackage ../games/flightgear { }; @@ -32737,7 +33033,9 @@ with pkgs; quakespasm = callPackage ../games/quakespasm { inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio CoreFoundation IOKit OpenGL; }; - vkquake = callPackage ../games/quakespasm/vulkan.nix { }; + vkquake = callPackage ../games/quakespasm/vulkan.nix { + inherit (darwin) moltenvk; + }; ioquake3 = callPackage ../games/quake3/ioquake { }; quake3e = callPackage ../games/quake3/quake3e { }; @@ -32828,6 +33126,10 @@ with pkgs; sgtpuzzles = callPackage ../games/sgt-puzzles { }; + sgtpuzzles-mobile = callPackage ../games/sgt-puzzles { + isMobile = true; + }; + shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; shticker-book-unwritten = callPackage ../games/shticker-book-unwritten { }; @@ -32894,6 +33196,8 @@ with pkgs; protonup = with python3Packages; toPythonApplication protonup; + steam-rom-manager = callPackage ../tools/games/steam-rom-manager {}; + sdlpop = callPackage ../games/sdlpop { }; stepmania = callPackage ../games/stepmania { }; @@ -32947,7 +33251,7 @@ with pkgs; tibia = pkgsi686Linux.callPackage ../games/tibia { }; - tintin = throw "tintin has been removed due to lack of maintainers"; + tintin = callPackage ../games/tintin { }; tinyfugue = callPackage ../games/tinyfugue { }; @@ -33160,9 +33464,7 @@ with pkgs; cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); inherit (cinnamon) mint-x-icons mint-y-icons; - enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { - callPackage = newScope enlightenment; - }); + enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { }); gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); @@ -33382,6 +33684,8 @@ with pkgs; dalfox = callPackage ../tools/security/dalfox { }; + davtest = callPackage ../tools/security/davtest { }; + dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; deepdiff = with python3Packages; toPythonApplication deepdiff; @@ -33399,6 +33703,8 @@ with pkgs; diamond = callPackage ../applications/science/biology/diamond { }; + dssp = callPackage ../applications/science/biology/dssp { }; + ecopcr = callPackage ../applications/science/biology/ecopcr { }; eggnog-mapper = callPackage ../applications/science/biology/eggnog-mapper { }; @@ -34186,7 +34492,7 @@ with pkgs; caffeWithCuda = caffe.override { cudaSupport = true; }; - caffeine-ng = callPackage ../tools/X11/caffeine-ng {}; + caffeine-ng = python3Packages.callPackage ../tools/X11/caffeine-ng {}; cntk = callPackage ../applications/science/math/cntk { stdenv = gcc7Stdenv; @@ -34250,6 +34556,8 @@ with pkgs; pynac = callPackage ../applications/science/math/pynac { }; + scalp = callPackage ../applications/science/math/scalp { }; + singular = callPackage ../applications/science/math/singular { }; scilab-bin = callPackage ../applications/science/math/scilab-bin {}; @@ -34290,6 +34598,13 @@ with pkgs; jre = openjdk11; }; + faiss = callPackage ../development/libraries/science/math/faiss { + pythonPackages = python3Packages; + # faiss wants the "-doxygen" option + # available only since swig4 + swig = swig4; + }; + fityk = callPackage ../applications/science/misc/fityk { }; galario = callPackage ../development/libraries/galario { }; @@ -34371,6 +34686,8 @@ with pkgs; cernlib = callPackage ../development/libraries/physics/cernlib { }; + clhep = callPackage ../development/libraries/physics/clhep { }; + hepmc2 = callPackage ../development/libraries/physics/hepmc2 { }; hepmc3 = callPackage ../development/libraries/physics/hepmc3 { @@ -34445,6 +34762,8 @@ with pkgs; autotiling = python3Packages.callPackage ../misc/autotiling { }; + autotiling-rs = callPackage ../misc/autotiling-rs { }; + avell-unofficial-control-center = python3Packages.callPackage ../applications/misc/avell-unofficial-control-center { }; beep = callPackage ../misc/beep { }; @@ -34557,6 +34876,10 @@ with pkgs; dell-530cdn = callPackage ../misc/drivers/dell-530cdn {}; + deploy-rs = callPackage ../tools/package-management/deploy-rs { + inherit (darwin.apple_sdk.frameworks) CoreServices SystemConfiguration; + }; + dockutil = callPackage ../os-specific/darwin/dockutil { }; eiciel = callPackage ../tools/filesystems/eiciel { }; @@ -34681,6 +35004,8 @@ with pkgs; hplipWithPlugin = hplip.override { withPlugin = true; }; + hyfetch = python3Packages.callPackage ../tools/misc/hyfetch { }; + hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -35088,6 +35413,8 @@ with pkgs; OSCAR = qt5.callPackage ../applications/misc/OSCAR { }; + parsedmarc = with python3Packages; toPythonApplication parsedmarc; + pgmanage = callPackage ../applications/misc/pgmanage { }; pgadmin4 = callPackage ../tools/admin/pgadmin { }; @@ -35315,7 +35642,9 @@ with pkgs; sqsh = callPackage ../development/tools/sqsh { }; - sumneko-lua-language-server = callPackage ../development/tools/sumneko-lua-language-server { }; + sumneko-lua-language-server = darwin.apple_sdk_11_0.callPackage ../development/tools/sumneko-lua-language-server { + inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation Foundation; + }; sysz = callPackage ../tools/misc/sysz { }; @@ -35340,8 +35669,6 @@ with pkgs; ; terraform = terraform_1; - # deprecated - terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( callPackage ../applications/networking/cluster/terraform-providers { } @@ -35402,6 +35729,8 @@ with pkgs; thinkfan = callPackage ../tools/system/thinkfan { }; + touchosc = callPackage ../applications/audio/touchosc {}; + tp-auto-kbbl = callPackage ../tools/system/tp-auto-kbbl { }; tup = callPackage ../development/tools/build-managers/tup { }; @@ -35414,6 +35743,8 @@ with pkgs; tvheadend = callPackage ../servers/tvheadend { }; + twiggy = callPackage ../development/tools/twiggy { }; + uacme = callPackage ../tools/admin/uacme { }; ums = callPackage ../servers/ums { }; @@ -35461,9 +35792,7 @@ with pkgs; viewnior = callPackage ../applications/graphics/viewnior { }; - vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { - inherit (lua51Packages) hasLuaModule; - }; + vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { }; vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { llvmPackages = llvmPackages_6; @@ -35562,6 +35891,8 @@ with pkgs; with-shell = callPackage ../applications/misc/with-shell { }; + wizer = darwin.apple_sdk_11_0.callPackage ../development/tools/wizer {}; + wmutils-core = callPackage ../tools/X11/wmutils-core { }; wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; @@ -35600,8 +35931,6 @@ with pkgs; xorex = callPackage ../tools/security/xorex { }; - xow = callPackage ../misc/drivers/xow { }; - xbps = callPackage ../tools/package-management/xbps { }; xcftools = callPackage ../tools/graphics/xcftools { }; @@ -35949,7 +36278,9 @@ with pkgs; uhubctl = callPackage ../tools/misc/uhubctl {}; - kodelife = callPackage ../applications/graphics/kodelife {}; + kodelife = callPackage ../applications/graphics/kodelife { + inherit (gst_all_1) gstreamer gst-plugins-base; + }; bunnyfetch = callPackage ../tools/misc/bunnyfetch {}; @@ -36013,7 +36344,7 @@ with pkgs; udev = systemdMinimal; jack = libjack2; }; - inherit (jami) jami-daemon jami-libclient jami-client-qt; + inherit (jami) jami-daemon jami-client-qt; jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { electron = electron_17; diff --git a/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix b/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix index 211540260d..70d57672a0 100644 --- a/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/cuda-packages.nix @@ -58,15 +58,16 @@ let }; - composedExtension = composeManyExtensions [ + composedExtension = composeManyExtensions ([ extraPackagesExtension (import ../development/compilers/cudatoolkit/extension.nix) (import ../development/compilers/cudatoolkit/redist/extension.nix) (import ../development/compilers/cudatoolkit/redist/overrides.nix) (import ../development/libraries/science/math/cudnn/extension.nix) + (import ../development/libraries/science/math/tensorrt/extension.nix) (import ../test/cuda/cuda-samples/extension.nix) (import ../test/cuda/cuda-library-samples/extension.nix) cutensorExtension - ]; + ]); in (scope.overrideScope' composedExtension) diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix index 47dd47aede..8c1e259525 100644 --- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -120,8 +120,10 @@ impure-cmds // appleSourcePackages // chooseLibs // { executable = true; text = '' - CODESIGN_ALLOCATE=${targetPrefix}codesign_allocate \ - ${self.sigtool}/bin/codesign -f -s - "$linkerOutput" + if [ "$linkerOutput" != "/dev/null" ]; then + CODESIGN_ALLOCATE=${targetPrefix}codesign_allocate \ + ${self.sigtool}/bin/codesign -f -s - "$linkerOutput" + fi ''; }; @@ -148,7 +150,11 @@ impure-cmds // appleSourcePackages // chooseLibs // { lsusb = callPackage ../os-specific/darwin/lsusb { }; - moltenvk = callPackage ../os-specific/darwin/moltenvk { }; + moltenvk = pkgs.darwin.apple_sdk_11_0.callPackage ../os-specific/darwin/moltenvk { + inherit (apple_sdk_11_0.frameworks) AppKit Foundation Metal QuartzCore; + inherit (apple_sdk_11_0) MacOSX-SDK Libsystem; + inherit (pkgs.darwin) cctools sigtool; + }; opencflite = callPackage ../os-specific/darwin/opencflite { }; diff --git a/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix b/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix index 732fb66731..7d20bcbde9 100644 --- a/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/dotnet-packages.nix @@ -2,6 +2,7 @@ , lib , pkgs , buildDotnetPackage +, buildDotnetModule , fetchurl , fetchFromGitHub , fetchNuGet @@ -124,7 +125,51 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { # SOURCE PACKAGES - Boogie = buildDotnetPackage rec { + Boogie = buildDotnetModule rec { + pname = "Boogie"; + version = "2.15.7"; + + src = fetchFromGitHub { + owner = "boogie-org"; + repo = "boogie"; + rev = "v${version}"; + sha256 = "16kdvkbx2zwj7m43cra12vhczbpj23wyrdnj0ygxf7np7c2aassp"; + }; + + projectFile = [ "Source/Boogie.sln" ]; + nugetDeps = ../development/dotnet-modules/boogie-deps.nix; + + postInstall = '' + mkdir -pv "$out/lib/dotnet/${pname}" + ln -sv "${pkgs.z3}/bin/z3" "$out/lib/dotnet/${pname}/z3.exe" + + # so that this derivation can be used as a vim plugin to install syntax highlighting + vimdir=$out/share/vim-plugins/boogie + install -Dt $vimdir/syntax/ Util/vim/syntax/boogie.vim + mkdir $vimdir/ftdetect + echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim + ''; + + postFixup = '' + ln -s "$out/bin/BoogieDriver" "$out/bin/boogie" + ''; + + meta = with lib; { + description = "An intermediate verification language"; + homepage = "https://github.com/boogie-org/boogie"; + longDescription = '' + Boogie is an intermediate verification language (IVL), intended as a + layer on which to build program verifiers for other languages. + + This derivation may be used as a vim plugin to provide syntax highlighting. + ''; + license = licenses.mspl; + maintainers = [ maintainers.taktoa ]; + platforms = with platforms; (linux ++ darwin); + }; + }; + + Boogie_2_4_1 = buildDotnetPackage rec { pname = "Boogie"; version = "2.4.1"; @@ -192,7 +237,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { self' = pkgs.dotnetPackages.override ({ pkgs = pkgs // { inherit z3; }; }); - Boogie = assert self'.Boogie.version == "2.4.1"; self'.Boogie; + Boogie = assert self'.Boogie_2_4_1.version == "2.4.1"; self'.Boogie_2_4_1; in buildDotnetPackage rec { pname = "Dafny"; version = "2.3.0"; diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index b0d4a7325c..744ddcb879 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -15,13 +15,15 @@ let "integer-simple" "native-bignum" "ghc902" - "ghc923" + "ghc924" + "ghc941" "ghcHEAD" ]; nativeBignumIncludes = [ "ghc902" - "ghc923" + "ghc924" + "ghc941" "ghcHEAD" ]; @@ -106,7 +108,7 @@ in { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # the oldest ghc with aarch64-darwin support is 8.10.5 # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them - if stdenv.isAarch64 || stdenv.isAarch32 then + if stdenv.hostPlatform.isAarch then packages.ghc8107BinaryMinimal else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then # to my (@a-m-joseph) knowledge there are no newer official binaries for this platform @@ -125,7 +127,7 @@ in { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra # the oldest ghc with aarch64-darwin support is 8.10.5 - if stdenv.isAarch64 || stdenv.isAarch32 then + if stdenv.hostPlatform.isAarch then packages.ghc8107BinaryMinimal else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc8107 @@ -136,10 +138,10 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; - ghc923 = callPackage ../development/compilers/ghc/9.2.3.nix { + ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix { bootPkgs = # aarch64 ghc8107Binary exceeds max output size on hydra - if stdenv.isAarch64 || stdenv.isAarch32 then + if stdenv.hostPlatform.isAarch then packages.ghc8107BinaryMinimal else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then packages.ghc8107 @@ -153,6 +155,21 @@ in { buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; llvmPackages = pkgs.llvmPackages_12; }; + ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix { + bootPkgs = + # TODO(@sternenseemann): Package 9.0.2 bindist or wait for upstream fix + # Need to use 902 due to + # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 + packages.ghc902; + 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; + # Support range >= 10 && < 14 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; + llvmPackages = pkgs.llvmPackages_12; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then @@ -260,11 +277,16 @@ in { ghc = bh.compiler.ghc902; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { }; }; - ghc923 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc923; - ghc = bh.compiler.ghc923; + ghc924 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc924; + ghc = bh.compiler.ghc924; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; + ghc941 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc941; + ghc = bh.compiler.ghc941; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix index 5f7f015892..7f7c4bb4e9 100644 --- a/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix +++ b/third_party/nixpkgs/pkgs/top-level/linux-kernels.nix @@ -175,6 +175,13 @@ in { ]; }; + linux_5_19 = callPackage ../os-specific/linux/kernel/linux-5.19.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ @@ -218,22 +225,17 @@ in { ]; }).lqx; - # This contains both the STABLE and EDGE variants of the XanMod kernel - xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix; - - linux_xanmod = (xanmodKernels { + # This contains the variants of the XanMod kernel + xanmodKernels = callPackage ../os-specific/linux/kernel/xanmod-kernels.nix { kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.request_key_helper ]; - }).stable; + }; - linux_xanmod_latest = (xanmodKernels { - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }).edge; + linux_xanmod = xanmodKernels.lts; + linux_xanmod_latest = xanmodKernels.edge; + linux_xanmod_tt = xanmodKernels.tt; linux_libre = deblobKernel packageAliases.linux_default.kernel; @@ -379,6 +381,8 @@ in { rtl8189es = callPackage ../os-specific/linux/rtl8189es { }; + rtl8189fs = callPackage ../os-specific/linux/rtl8189fs { }; + rtl8723bs = callPackage ../os-specific/linux/rtl8723bs { }; rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; @@ -401,7 +405,6 @@ in { rtw89 = if lib.versionOlder kernel.version "5.16" then callPackage ../os-specific/linux/rtw89 { } else null; openafs_1_8 = callPackage ../servers/openafs/1.8/module.nix { }; - openafs_1_9 = callPackage ../servers/openafs/1.9/module.nix { }; # Current stable release; don't backport release updates! openafs = openafs_1_8; @@ -486,12 +489,12 @@ in { x86_energy_perf_policy = callPackage ../os-specific/linux/x86_energy_perf_policy { }; - xmm7360-pci = callPackage ../os-specific/linux/xmm7360-pci { }; - xone = if lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/xone { } else null; xpadneo = callPackage ../os-specific/linux/xpadneo { }; + ithc = callPackage ../os-specific/linux/ithc { }; + zenpower = callPackage ../os-specific/linux/zenpower { }; inherit (callPackage ../os-specific/linux/zfs { @@ -502,8 +505,13 @@ in { can-isotp = callPackage ../os-specific/linux/can-isotp { }; + qc71_laptop = callPackage ../os-specific/linux/qc71_laptop { }; + + hid-ite8291r3 = callPackage ../os-specific/linux/hid-ite8291r3 { }; + } // lib.optionalAttrs config.allowAliases { ati_drivers_x11 = throw "ati drivers are no longer supported by any kernel >=4.1"; # added 2021-05-18; + xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18"; }); hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides); @@ -520,6 +528,7 @@ in { linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23 linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23 linux_5_18 = recurseIntoAttrs (packagesFor kernels.linux_5_18); + linux_5_19 = recurseIntoAttrs (packagesFor kernels.linux_5_19); }; rtPackages = { @@ -564,6 +573,7 @@ in { linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); linux_xanmod = recurseIntoAttrs (packagesFor kernels.linux_xanmod); linux_xanmod_latest = recurseIntoAttrs (packagesFor kernels.linux_xanmod_latest); + linux_xanmod_tt = recurseIntoAttrs (packagesFor kernels.linux_xanmod_tt); hardkernel_4_14 = recurseIntoAttrs (packagesFor kernels.linux_hardkernel_4_14); @@ -575,7 +585,7 @@ in { packageAliases = { linux_default = packages.linux_5_15; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_5_18; + linux_latest = packages.linux_5_19; 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/third_party/nixpkgs/pkgs/top-level/lua-packages.nix b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix index cb963bb1b1..012a4d1e0c 100644 --- a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix @@ -60,7 +60,7 @@ in # wraps programs in $out/bin with valid LUA_PATH/LUA_CPATH wrapLua = callPackage ../development/interpreters/lua-5/wrap-lua.nix { inherit lua lib; - inherit (pkgs) makeSetupHook makeWrapper; + inherit (pkgs.buildPackages) makeSetupHook makeWrapper; }; luarocks = callPackage ../development/tools/misc/luarocks/default.nix { @@ -104,6 +104,11 @@ in }; }; + nfd = callPackage ../development/lua-modules/nfd { + inherit (lib) maintainers; + inherit (pkgs.gnome) zenity; + }; + vicious = luaLib.toLuaModule( stdenv.mkDerivation rec { pname = "vicious"; version = "2.5.1"; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 1955f962b7..bbe7bdcc8c 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -801,7 +801,7 @@ let metrics-lwt = callPackage ../development/ocaml-modules/metrics/lwt.nix { }; - metrics-mirage = callPackage ../development/ocaml-modules/metrics/mirage.nix { }; + metrics-rusage = callPackage ../development/ocaml-modules/metrics/rusage.nix { }; metrics-unix = callPackage ../development/ocaml-modules/metrics/unix.nix { inherit (pkgs) gnuplot; @@ -1547,7 +1547,7 @@ let if lib.versionOlder "4.10.2" ocaml.version then import ../development/ocaml-modules/janestreet/0.15.nix { inherit self; - inherit (pkgs) fetchpatch lib openssl patdiff zstd; + inherit (pkgs) fetchpatch lib openssl zstd; } else if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 3e85dd0713..5bc1299ee5 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -759,10 +759,10 @@ let Appcpm = buildPerlModule { pname = "App-cpm"; - version = "0.997006"; + version = "0.997011"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997006.tar.gz"; - sha256 = "1mh4bg141qbch0vdvir2l9533zzm3k8hnqx36iwciwzhvpd9hl9s"; + url = "mirror://cpan/authors/id/S/SK/SKAJI/App-cpm-0.997011.tar.gz"; + sha256 = "sha256-YyECxuZ958nP9R1vqg2dA7/vvtNbXMXZaRn3uSAlAck="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ CPAN02PackagesSearch CPANCommonIndex CPANDistnameInfo ClassTiny CommandRunner ExtUtilsInstall ExtUtilsInstallPaths FileCopyRecursive Filepushd HTTPTinyish MenloLegacy Modulecpmfile ModuleCPANfile ParsePMFile ParallelPipes locallib ]; @@ -1521,6 +1521,22 @@ let }; }; + BioPerl = buildPerlPackage { + pname = "BioPerl"; + version = "1.7.8"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CJ/CJFIELDS/BioPerl-1.7.8.tar.gz"; + sha256 = "c490a3be7715ea6e4305efd9710e5edab82dabc55fd786b6505b550a30d71738"; + }; + buildInputs = [ ModuleBuild TestMemoryCycle TestWeaken TestDeep TestWarn TestException TestDifferences ]; + propagatedBuildInputs = [ DataStag Error Graph HTTPMessage IOString IOStringy IPCRun LWP ListMoreUtils SetScalar TestMost TestRequiresInternet URI XMLDOM XMLLibXML XMLSAX XMLSAXBase XMLSAXWriter XMLTwig XMLWriter YAML DBFile libxml_perl ]; + meta = { + homepage = "https://metacpan.org/release/BioPerl"; + description = "Perl modules for biology"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + BitVector = buildPerlPackage { pname = "Bit-Vector"; version = "7.4"; @@ -3527,13 +3543,13 @@ let CommandRunner = buildPerlModule { pname = "Command-Runner"; - version = "0.103"; + version = "0.200"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.103.tar.gz"; - sha256 = "0f180b5c3b3fc9db7b83d4a5fdd959db34f7d6d2472f817dbf8b4b795a9dc82a"; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Command-Runner-0.200.tar.gz"; + sha256 = "sha256-WtJtBhEb/s1TyPW7XeqUvyAl9seOlfbYAS5M+oninyY="; }; buildInputs = [ ModuleBuildTiny ]; - propagatedBuildInputs = [ CaptureTiny StringShellQuote Win32ShellQuote ]; + propagatedBuildInputs = [ CaptureTiny Filepushd StringShellQuote Win32ShellQuote ]; meta = { homepage = "https://github.com/skaji/Command-Runner"; description = "Run external commands and Perl code refs"; @@ -5439,6 +5455,20 @@ let }; }; + DataStag = buildPerlPackage { + pname = "Data-Stag"; + version = "0.14"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CM/CMUNGALL/Data-Stag-0.14.tar.gz"; + sha256 = "4ab122508d2fb86d171a15f4006e5cf896d5facfa65219c0b243a89906258e59"; + }; + propagatedBuildInputs = [ IOString ]; + meta = { + description = "Structured Tags"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DataStreamBulk = buildPerlPackage { pname = "Data-Stream-Bulk"; version = "0.11"; @@ -6234,10 +6264,10 @@ let DBDMariaDB = buildPerlPackage { pname = "DBD-MariaDB"; - version = "1.21"; + version = "1.22"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.21.tar.gz"; - sha256 = "068l4ybja5mmy89lwgzl9c1xs37f4fgvf7j7n8k4f78dg8rjp5zm"; + url = "mirror://cpan/authors/id/P/PA/PALI/DBD-MariaDB-1.22.tar.gz"; + sha256 = "sha256-C2j9VCuWU/FbIFhXgZhjSNcehafjhD8JGZdwR6F5scY="; }; buildInputs = [ pkgs.mariadb-connector-c DevelChecklib TestDeep TestDistManifest TestPod ]; propagatedBuildInputs = [ DBI ]; @@ -9248,10 +9278,10 @@ let Future = buildPerlModule { pname = "Future"; - version = "0.47"; + version = "0.48"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.47.tar.gz"; - sha256 = "1pmhkhrmvaf8c3jbrfqqhmxjrzcsxdn2q7apj033gwxggland88h"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.48.tar.gz"; + sha256 = "sha256-D+ixXBQvKjBKMXGKIKEFA6m0TMASw69eN7i34koHUqM="; }; buildInputs = [ TestFatal TestIdentity TestRefcount ]; meta = { @@ -9262,12 +9292,12 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.52"; + version = "0.58"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "0dwij2r51vij91hx808zc2l5q38h55jahzrh73h4rn816jv597yx"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-0.58.tar.gz"; + sha256 = "sha256-OLtJ9jabBUrAUuaNomR/4i0Io605rgNuJ6KRELtOQi4="; }; - buildInputs = [ TestRefcount ]; + buildInputs = [ TestRefcount TestFatal ]; propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { @@ -9277,6 +9307,23 @@ let }; }; + FutureIO = buildPerlModule { + pname = "Future-IO"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-IO-0.11.tar.gz"; + sha256 = "sha256-dVM2JvgfdoxfIxyXAhBsJbV3KotplcqixYvMSsyRB8k="; + }; + buildInputs = [ TestIdentity ]; + propagatedBuildInputs = [ Future StructDumb ]; + preCheck = "rm t/06connect.t"; # this test fails in sandbox + meta = { + description = "Future-returning IO methods"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.zakame ]; + }; + }; + GamesSolitaireVerify = buildPerlModule { pname = "Games-Solitaire-Verify"; version = "0.2403"; @@ -10674,11 +10721,30 @@ let HTTPDaemon = buildPerlPackage { pname = "HTTP-Daemon"; - version = "6.01"; + version = "6.14"; src = fetchurl { - url = "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz"; - sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-6.14.tar.gz"; + sha256 = "sha256-8HZ+fzy7gLITE8dh8HrY7SU7zp+i0LqAaz+3LTCbLh0="; }; + patches = [ + # Patches for CVE-2022-3108, from upstream pre 6.15 + (fetchpatch { + url = "https://github.com/libwww-perl/HTTP-Daemon/commit/331d5c1d1f0e48e6b57ef738c2a8509b1eb53376.patch"; + sha256 = "sha256-vRSyiO38jnsSeKeGbCnKi+VLaTqQSB349eybl1Wa8SQ="; + name = "HTTP-Daemon-CVE-2022-3108-pre.patch"; + }) + (fetchpatch { + url = "https://github.com/libwww-perl/HTTP-Daemon/commit/e84475de51d6fd7b29354a997413472a99db70b2.patch"; + sha256 = "sha256-z8RXcbVEpjSZcm8dUZcDWYeQHtVZODOGCdcDTfXQpfA="; + name = "HTTP-Daemon-CVE-2022-3108-1.patch"; + }) + (fetchpatch { + url = "https://github.com/libwww-perl/HTTP-Daemon/commit/8dc5269d59e2d5d9eb1647d82c449ccd880f7fd0.patch"; + sha256 = "sha256-e1lxt+AJGfbjNOZoKj696H2Ftkx9wlTF557WkZCLE5Q="; + name = "HTTP-Daemon-CVE-2022-3108-2.patch"; + }) + ]; + buildInputs = [ ModuleBuildTiny TestNeeds ]; propagatedBuildInputs = [ HTTPMessage ]; meta = { description = "A simple http server class"; @@ -10995,10 +11061,10 @@ let Imager = buildPerlPackage { pname = "Imager"; - version = "1.012"; + version = "1.019"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.012.tar.gz"; - sha256 = "a321c728e3277fd15de842351e69bbef0e2a5a608a31d089e5029b8381e23f21"; + url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.019.tar.gz"; + sha256 = "sha256-dNRNcBwfFPxLmE+toelVcmtQTC2LBtJl56hh+llDy0g="; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; @@ -11195,14 +11261,14 @@ let IOAsync = buildPerlModule { pname = "IO-Async"; - version = "0.78"; + version = "0.801"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.78.tar.gz"; - sha256 = "sha256-P7UYhZd7hiGKiepC84yvvOWCO/SPqqLRhaGGwqNYNmw="; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.801.tar.gz"; + sha256 = "sha256-ieRZuhe3alcrsbS7EgMBVB6MyTJCQXFmI2tsbbDhybk="; }; preCheck = "rm t/50resolver.t"; # this test fails with "Temporary failure in name resolution" in sandbox propagatedBuildInputs = [ Future StructDumb ]; - buildInputs = [ TestFatal TestIdentity TestMetricsAny TestRefcount ]; + buildInputs = [ FutureIO TestFatal TestIdentity TestMetricsAny TestRefcount ]; meta = { description = "Asynchronous event-driven programming"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -11211,10 +11277,10 @@ let IOAsyncSSL = buildPerlModule { pname = "IO-Async-SSL"; - version = "0.22"; + version = "0.23"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.22.tar.gz"; - sha256 = "0c7363a7f1a08805bd1b2cf2b1a42a950ca71914c2aedbdd985970e011331a21"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-SSL-0.23.tar.gz"; + sha256 = "sha256-0vyuFuJ+F6yjkDpK1aK/L7wmjQZRzn8ARabQVG9YTy4="; }; buildInputs = [ TestIdentity ]; propagatedBuildInputs = [ Future IOAsync IOSocketSSL ]; @@ -11891,10 +11957,10 @@ let JSONValidator = buildPerlPackage { pname = "JSON-Validator"; - version = "4.16"; + version = "5.08"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-4.16.tar.gz"; - sha256 = "0mhdczx2pxzi4lrrzkxl2a3r0s2b79ffsrar6g2l01idfpri6gi2"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/JSON-Validator-5.08.tar.gz"; + sha256 = "sha256-QPaWjtcfxv1Ij6Q1Ityhk5NDhUCSth/eZgHwcWZHeFg="; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ DataValidateDomain DataValidateIP Mojolicious NetIDNEncode YAMLLibYAML ]; @@ -13011,12 +13077,12 @@ let LWP = buildPerlPackage { pname = "libwww-perl"; - version = "6.49"; + version = "6.67"; src = fetchurl { - url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.49.tar.gz"; - sha256 = "19k0cg4j4qz005a4ngy48z4r8dc99dxlpq8kvj7qnk15mvgd1r63"; + url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.67.tar.gz"; + sha256 = "sha256-lu7ECj/QqhvYNBF75eshxDj3MJTYYaGn5XdPCxImtyM="; }; - propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; + propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) postPatch = lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Makefile.PL --replace 'if has_module' 'if 0; #' @@ -13026,7 +13092,7 @@ let description = "The World-Wide Web library for Perl"; license = with licenses; [ artistic1 gpl1Plus ]; }; - buildInputs = [ TestFatal TestNeeds TestRequiresInternet ]; + checkInputs = [ HTTPDaemon TestFatal TestNeeds TestRequiresInternet ]; }; LWPAuthenOAuth = buildPerlPackage { @@ -14062,12 +14128,12 @@ let Minion = buildPerlPackage { pname = "Minion"; - version = "10.14"; + version = "10.25"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.14.tar.gz"; - sha256 = "1xs0z61p42qqzqwlag4fci40lzxfy6pdccijgf8wswb2vk6xambg"; + url = "mirror://cpan/authors/id/S/SR/SRI/Minion-10.25.tar.gz"; + sha256 = "sha256-C+CoN1N2iJ2gRgRpY4TAz5iyYh0mUNnrAwf25LlAra0="; }; - propagatedBuildInputs = [ Mojolicious ]; + propagatedBuildInputs = [ Mojolicious YAMLLibYAML ]; meta = { homepage = "https://github.com/mojolicious/minion"; description = "A high performance job queue for Perl"; @@ -14078,10 +14144,10 @@ let MinionBackendSQLite = buildPerlModule { pname = "Minion-Backend-SQLite"; - version = "5.0.4"; + version = "5.0.6"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.4.tar.gz"; - sha256 = "0xhcsxm3x5v9azmyy12wiwlbpiisq06hgj3yf9ggqx8fp9jqppb1"; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Minion-Backend-SQLite-v5.0.6.tar.gz"; + sha256 = "sha256-/uDUEe9WsAkru8BTN5InaH3hQZUoy2t0T3U9vcH7FNk="; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ Minion MojoSQLite ]; @@ -14095,10 +14161,10 @@ let MinionBackendmysql = buildPerlPackage { pname = "Minion-Backend-mysql"; - version = "0.21"; + version = "1.000"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PR/PREACTION/Minion-Backend-mysql-0.21.tar.gz"; - sha256 = "0dbq0pmyjcrmdjpsrkr1pxvzvdphn6mb6lk5yyyhm380prwrjahn"; + url = "mirror://cpan/authors/id/P/PR/PREACTION/Minion-Backend-mysql-1.000.tar.gz"; + sha256 = "sha256-cGS+CHHxmbSwTl1yQprfNbLkr2qHGorM0Mm1wqP9E00="; }; buildInputs = [ Testmysqld ]; propagatedBuildInputs = [ Minion Mojomysql ]; @@ -14738,10 +14804,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "9.19"; + version = "9.26"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.19.tar.gz"; - sha256 = "15qs99sl3ckzqwpqk4kawhamdm6160bzxyikf3blym4fn1k6s1a5"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-9.26.tar.gz"; + sha256 = "sha256-nkKMVRJpjwXhUTONj6Eq7eKHqzpeQp7D04yApKgsjYg="; }; meta = { homepage = "https://mojolicious.org"; @@ -14801,10 +14867,10 @@ let MojoliciousPluginOpenAPI = buildPerlPackage { pname = "Mojolicious-Plugin-OpenAPI"; - version = "4.02"; + version = "5.05"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-4.02.tar.gz"; - sha256 = "0rkkkcd3y3gjj0kis0hrab6mz8rk1qd57nz4npy39bag6h1kpyfv"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-5.05.tar.gz"; + sha256 = "sha256-xH+I0c434/YT9uizV9grenEEX/wKSXOVUS67zahlYV0="; }; propagatedBuildInputs = [ JSONValidator ]; meta = { @@ -14833,10 +14899,10 @@ let MojoliciousPluginSyslog = buildPerlPackage { pname = "Mojolicious-Plugin-Syslog"; - version = "0.05"; + version = "0.06"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Syslog-0.05.tar.gz"; - sha256 = "sha256-G5Ur6EJ00gAeawLkqw93Et8O4wiPk2qFRlQofh0BPp8="; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-Syslog-0.06.tar.gz"; + sha256 = "sha256-IuxL9TYwDseyAYuoV3C9g2ZFDBAwVDZ9srFp9Mh3QRM="; }; propagatedBuildInputs = [ Mojolicious ]; meta = { @@ -14881,10 +14947,10 @@ let MojoRedis = buildPerlPackage { pname = "Mojo-Redis"; - version = "3.25"; + version = "3.29"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-Redis-3.25.tar.gz"; - sha256 = "17xxhfavj9j1pzjpxf1j72rq3vm2vj0j4h62088l64v11cs86zig"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-Redis-3.29.tar.gz"; + sha256 = "sha256-oDMZpF0uYTpsfS1ZrAD9SwtHiGVi5ish3pG0r4llgII="; }; propagatedBuildInputs = [ Mojolicious ProtocolRedisFaster ]; meta = { @@ -14930,10 +14996,10 @@ let Mojomysql = buildPerlPackage rec { pname = "Mojo-mysql"; - version = "1.20"; + version = "1.25"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.20.tar.gz"; - sha256 = "efc0927d3b479b71b4d1e6b476c2b81e01404134cc5d919ac902207e0a219c67"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojo-mysql-1.25.tar.gz"; + sha256 = "sha256-YC14GXw0HdCPLLH1XZg31P3gFHQz1k2+vxloaAtVzMs="; }; propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ]; buildInputs = [ TestDeep ]; @@ -14964,10 +15030,10 @@ let MojoIOLoopForkCall = buildPerlModule { pname = "Mojo-IOLoop-ForkCall"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.20.tar.gz"; - sha256 = "2b9962244c25a71e4757356fb3e1237cf869e26d1c27215115ba7b057a81f1a6"; + url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.21.tar.gz"; + sha256 = "sha256-8dpdh4RxvdhvAcQjhQgAgE9ttCtUU8IW8Jslt5RYS3g="; }; propagatedBuildInputs = [ IOPipely Mojolicious MojoIOLoopDelay ]; preBuild = '' @@ -15002,12 +15068,12 @@ let MojoPg = buildPerlPackage { pname = "Mojo-Pg"; - version = "4.22"; + version = "4.27"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.22.tar.gz"; - sha256 = "11s3f3km6i3in9wx9q4rkxgvj9rc6w8pdahrc19hi6zkxz3i87nr"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojo-Pg-4.27.tar.gz"; + sha256 = "sha256-oyLI3wDj5WVf300LernXmSiTIOKfZP6ZrHrxJEhO+dg="; }; - propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstract ]; + propagatedBuildInputs = [ DBDPg Mojolicious SQLAbstractPg ]; buildInputs = [ TestDeep ]; meta = { homepage = "https://github.com/mojolicious/mojo-pg"; @@ -15019,10 +15085,10 @@ let MojoUserAgentCached = buildPerlPackage { pname = "Mojo-UserAgent-Cached"; - version = "1.16"; + version = "1.19"; src = fetchurl { - url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.16.tar.gz"; - sha256 = "17gp1kn97s1wv973w0g92alx13lmcvdan794471sfq2is6s6v1qd"; + url = "mirror://cpan/authors/id/N/NI/NICOMEN/Mojo-UserAgent-Cached-1.19.tar.gz"; + sha256 = "sha256-wlmZ2qqCHkZUhLWjINFVqlJZAMh4Ml2aiSAfSnWBxd8="; }; buildInputs = [ ModuleInstall ]; propagatedBuildInputs = [ AlgorithmLCSS CHI DataSerializer DevelStackTrace Mojolicious Readonly StringTruncate ]; @@ -16753,6 +16819,19 @@ let }; }; + NetMQTTSimple = buildPerlPackage { + pname = "Net-MQTT-Simple"; + version = "1.26"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JU/JUERD/Net-MQTT-Simple-1.26.tar.gz"; + sha256 = "sha256-ERxNNnu1AgXci8AjFfDGuw3mDRwwfQLnUuQuwRtPiLQ="; + }; + meta = { + description = "Minimal MQTT version 3 interface"; + license = with lib.licenses; [ free ]; + }; + }; + NetOAuth = buildPerlModule { pname = "Net-OAuth"; version = "0.28"; @@ -17291,10 +17370,10 @@ let OpenAPIClient = buildPerlPackage rec { pname = "OpenAPI-Client"; - version = "1.00"; + version = "1.04"; src = fetchurl { - url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-1.00.tar.gz"; - sha256 = "41bcf211c1123fbfb844413aa53f97061410b592591367b61273a206865991f7"; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/OpenAPI-Client-1.04.tar.gz"; + sha256 = "sha256-szo5AKzdLO5hAHu5MigNjDzslJkpnUNyud+Yd0vXTAo="; }; propagatedBuildInputs = [ MojoliciousPluginOpenAPI ]; meta = { @@ -17514,10 +17593,10 @@ let ParallelPipes = buildPerlModule { pname = "Parallel-Pipes"; - version = "0.005"; + version = "0.102"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.005.tar.gz"; - sha256 = "44bd9e2be33d7b314f81c9b886a95d53514689090635f9fad53181f2d3051fd5"; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Parallel-Pipes-0.102.tar.gz"; + sha256 = "sha256-JjZfgQXcYGsUC9HUX41w1cMFQ5D3Xk/bdISj5ZHL+pc="; }; buildInputs = [ ModuleBuildTiny ]; meta = { @@ -20009,6 +20088,7 @@ let license = with lib.licenses; [ artistic1 gpl1Plus ]; }; buildInputs = [ TestWarn XMLParserLite ]; + checkInputs = [ HTTPDaemon ]; }; Socket6 = buildPerlPackage { @@ -20167,12 +20247,12 @@ let SQLAbstract = buildPerlPackage { pname = "SQL-Abstract"; - version = "1.87"; + version = "2.000001"; src = fetchurl { - url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.87.tar.gz"; - sha256 = "e926a0a83da7efa18e57e5b2952a2ab3b7563a51733fc6dd5c89f12156481c4a"; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/SQL-Abstract-2.000001.tar.gz"; + sha256 = "sha256-NaZCZiw0lCDUS+bg732HZep0PrEq0UOZqjojK7lObpo="; }; - buildInputs = [ TestDeep TestException TestWarn ]; + buildInputs = [ DataDumperConcise TestDeep TestException TestWarn ]; propagatedBuildInputs = [ HashMerge MROCompat Moo ]; meta = { description = "Generate SQL from Perl data structures"; @@ -20197,15 +20277,31 @@ let SQLAbstractLimit = buildPerlPackage { pname = "SQL-Abstract-Limit"; - version = "0.142"; + version = "0.143"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AS/ASB/SQL-Abstract-Limit-0.142.tar.gz"; - sha256 = "0y2q7mxngm9m2kvr6isvxra4frb1cjbiplp381p6hhifn7xfz8fl"; + url = "mirror://cpan/authors/id/A/AS/ASB/SQL-Abstract-Limit-0.143.tar.gz"; + sha256 = "sha256-0Yr9eIk72DC6JGXArmozQlRgFZADhk3tO1rc9RGJyuk="; }; propagatedBuildInputs = [ DBI SQLAbstract ]; buildInputs = [ TestDeep TestException ]; }; + SQLAbstractPg = buildPerlPackage { + pname = "SQL-Abstract-Pg"; + version = "1.0"; + src = fetchurl { + url = "mirror://cpan/authors/id/S/SR/SRI/SQL-Abstract-Pg-1.0.tar.gz"; + sha256 = "sha256-Pic2DfN7jYjzxS2smwNJP5vT7v9sjYj5sIbScRVT9Uc="; + }; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ SQLAbstract ]; + meta = { + homepage = "https://github.com/mojolicious/sql-abstract-pg"; + description = "PostgreSQL features for SQL::Abstract"; + license = lib.licenses.artistic2; + }; + }; + SQLSplitStatement = buildPerlPackage { pname = "SQL-SplitStatement"; version = "1.00020"; @@ -21066,10 +21162,10 @@ let SyntaxKeywordTry = buildPerlModule { pname = "Syntax-Keyword-Try"; - version = "0.25"; + version = "0.27"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.25.tar.gz"; - sha256 = "0xd82gcpcrnmwxsbk7x0ainmyybdc087g6j69hrpy80j0asnq2f5"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.27.tar.gz"; + sha256 = "sha256-JG4bAz4/8i/VQgVQ1Lbg1WtDjNy7nTXL6LG1uhV03iM="; }; propagatedBuildInputs = [ XSParseKeyword ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; @@ -23240,6 +23336,20 @@ let }; }; + TestWeaken = buildPerlPackage { + pname = "Test-Weaken"; + version = "3.022000"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KR/KRYDE/Test-Weaken-3.022000.tar.gz"; + sha256 = "2631a87121310262e0e96107a6fa0ed69487b7701520773bee5fa9accc295f5b"; + }; + propagatedBuildInputs = [ ScalarListUtils ]; + meta = { + description = "Test that freed memory objects were, indeed, freed"; + license = with lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TestWithoutModule = buildPerlPackage { pname = "Test-Without-Module"; version = "0.20"; @@ -24438,6 +24548,7 @@ let IPCShareLite JSON LWP + HTTPDaemon pkgs.cairo pkgs.mapnik pkgs.zlib @@ -25759,10 +25870,10 @@ let XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.12"; + version = "0.25"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.12.tar.gz"; - sha256 = "0crwhcw9ciqndvwvhycd93m6jgyhi77yyj4vi9xfyglpv84p3y68"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.25.tar.gz"; + sha256 = "sha256-9e2zDPfH8iDQxsMdwetVQDKECpnHwpgxT1zD/vZscsc="; }; buildInputs = [ ExtUtilsCChecker ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; @@ -25775,10 +25886,10 @@ let XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; - version = "0.12"; + version = "0.16"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.12.tar.gz"; - sha256 = "08kpia48f1rqc44rvbns97h3jyy2y5c8qlkh4a95v1m0yr5cb22s"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.16.tar.gz"; + sha256 = "sha256-IV5AmzmFgdJfDv8DeFBjvCUTu4YbrL6Z/m1VNTRvZt8="; }; buildInputs = [ TestFatal ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; @@ -25861,10 +25972,10 @@ let YAMLLibYAML = buildPerlPackage { pname = "YAML-LibYAML"; - version = "0.82"; + version = "0.83"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.82.tar.gz"; - sha256 = "0j7yhxkaasccynl5iq1cqpf4x253p4bi5wsq6qbwwv2wjsiwgd02"; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.83.tar.gz"; + sha256 = "sha256-tHF1tP85etdaT3eB09g8CGN9pv8LrjJq87OJ2FS+xJA="; }; }; diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix index 41c507a1ae..ce3af252ab 100644 --- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix @@ -66,8 +66,8 @@ lib.makeScope pkgs.newScope (self: with self; { # # Build inputs is used for extra deps that may be needed. And zendExtension # will mark the extension as a zend extension or not. - mkExtension = - { name + mkExtension = lib.makeOverridable + ({ name , configureFlags ? [ "--enable-${name}" ] , internalDeps ? [ ] , postPhpize ? "" @@ -151,7 +151,7 @@ lib.makeScope pkgs.newScope (self: with self; { description = "PHP upstream extension: ${name}"; inherit (php.meta) maintainers homepage license; }; - }); + })); php = phpPackage; diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index 58223bafd5..fd546e026b 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -73,6 +73,7 @@ mapAliases ({ email_validator = email-validator; # added 2022-06-22 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 + flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20 flask_testing = flask-testing; # added 2022-04-25 flask_wtf = flask-wtf; # added 2022-05-24 garminconnect-ha = garminconnect; # added 2022-02-05 @@ -89,6 +90,7 @@ mapAliases ({ 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 IMAPClient = imapclient; # added 2021-10-28 + imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 jupyter_client = jupyter-client; # added 2021-10-15 @@ -127,6 +129,14 @@ mapAliases ({ 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 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 + pyroute2-ipdb = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 + pyroute2-ipset = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 + pyroute2-ndb = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 + pyroute2-nftables = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 + 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 pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29 pytest_6 = pytest; # added 2022-02-10 @@ -141,6 +151,7 @@ mapAliases ({ python-lz4 = lz4; # added 2018-06-01 python_magic = python-magic; # added 2022-05-07 python_mimeparse = python-mimeparse; # added 2021-10-31 + python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03 python-subunit = subunit; # added 2021-09-10 pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 @@ -165,6 +176,7 @@ mapAliases ({ smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 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 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 4f430c6bb1..53898c7420 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -151,6 +151,8 @@ in { aafigure = callPackage ../development/python-modules/aafigure { }; + aardwolf = callPackage ../development/python-modules/aardwolf { }; + abodepy = callPackage ../development/python-modules/abodepy { }; absl-py = callPackage ../development/python-modules/absl-py { }; @@ -171,6 +173,8 @@ in { adafruit-io = callPackage ../development/python-modules/adafruit-io { }; + adafruit-nrfutil = callPackage ../development/python-modules/adafruit-nrfutil { }; + adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { }; @@ -267,6 +271,8 @@ in { aioazuredevops = callPackage ../development/python-modules/aioazuredevops { }; + aioblescan = callPackage ../development/python-modules/aioblescan { }; + aiocache = callPackage ../development/python-modules/aiocache { }; aiocoap = callPackage ../development/python-modules/aiocoap { }; @@ -285,6 +291,8 @@ in { aioeagle = callPackage ../development/python-modules/aioeagle { }; + aioecowitt = callPackage ../development/python-modules/aioecowitt { }; + aioemonitor = callPackage ../development/python-modules/aioemonitor { }; aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; @@ -325,6 +333,8 @@ in { aioitertools = callPackage ../development/python-modules/aioitertools { }; + aiobiketrax = callPackage ../development/python-modules/aiobiketrax { }; + aiobotocore = callPackage ../development/python-modules/aiobotocore { }; aiobroadlink = callPackage ../development/python-modules/aiobroadlink { }; @@ -361,6 +371,8 @@ in { aiomusiccast = callPackage ../development/python-modules/aiomusiccast { }; + aiomysensors = callPackage ../development/python-modules/aiomysensors { }; + aiomysql = callPackage ../development/python-modules/aiomysql { }; aionanoleaf = callPackage ../development/python-modules/aionanoleaf { }; @@ -371,6 +383,8 @@ in { aiooncue = callPackage ../development/python-modules/aiooncue { }; + aioopenexchangerates = callPackage ../development/python-modules/aioopenexchangerates { }; + aiopg = callPackage ../development/python-modules/aiopg { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { }; @@ -397,6 +411,8 @@ in { aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + aiortm = callPackage ../development/python-modules/aiortm { }; + aiorun = callPackage ../development/python-modules/aiorun { }; aiosenseme = callPackage ../development/python-modules/aiosenseme { }; @@ -559,9 +575,13 @@ in { ansiwrap = callPackage ../development/python-modules/ansiwrap { }; - antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { - inherit (pkgs) antlr4; + antlr4_8-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { + antlr4 = pkgs.antlr4_8; }; + antlr4_9-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { + antlr4 = pkgs.antlr4_9; + }; + antlr4-python3-runtime = self.antlr4_8-python3-runtime; anyascii = callPackage ../development/python-modules/anyascii { }; @@ -617,6 +637,8 @@ in { arabic-reshaper = callPackage ../development/python-modules/arabic-reshaper { }; + arc4 = callPackage ../development/python-modules/arc4 { }; + arcam-fmj = callPackage ../development/python-modules/arcam-fmj { }; archinfo = callPackage ../development/python-modules/archinfo { }; @@ -1189,6 +1211,8 @@ in { basemap = callPackage ../development/python-modules/basemap { }; + basemap-data = callPackage ../development/python-modules/basemap-data { }; + bash_kernel = callPackage ../development/python-modules/bash_kernel { }; bashlex = callPackage ../development/python-modules/bashlex { }; @@ -1227,6 +1251,8 @@ in { beautifultable = callPackage ../development/python-modules/beautifultable { }; + bech32 = callPackage ../development/python-modules/bech32 { }; + bedup = callPackage ../development/python-modules/bedup { }; behave = callPackage ../development/python-modules/behave { }; @@ -1307,6 +1333,8 @@ in { bleak = callPackage ../development/python-modules/bleak { }; + bleak-retry-connector = callPackage ../development/python-modules/bleak-retry-connector { }; + blebox-uniapi = callPackage ../development/python-modules/blebox-uniapi { }; blessed = callPackage ../development/python-modules/blessed { }; @@ -1335,6 +1363,10 @@ in { bluepy-devices = callPackage ../development/python-modules/bluepy-devices { }; + bluetooth-adapters = callPackage ../development/python-modules/bluetooth-adapters { }; + + bluetooth-sensor-state-data = callPackage ../development/python-modules/bluetooth-sensor-state-data { }; + blurhash = callPackage ../development/python-modules/blurhash { }; bme280spi = callPackage ../development/python-modules/bme280spi { }; @@ -1512,6 +1544,8 @@ in { caldav = callPackage ../development/python-modules/caldav { }; + callee = callPackage ../development/python-modules/callee { }; + calmjs-parse = callPackage ../development/python-modules/calmjs-parse { }; can = callPackage ../development/python-modules/can { }; @@ -1674,6 +1708,8 @@ in { chiavdf = callPackage ../development/python-modules/chiavdf { }; + chia-rs = callPackage ../development/python-modules/chia-rs { }; + chirpstack-api = callPackage ../development/python-modules/chirpstack-api { }; chispa = callPackage ../development/python-modules/chispa { }; @@ -1684,6 +1720,8 @@ in { ci-py = callPackage ../development/python-modules/ci-py { }; + cinemagoer = callPackage ../development/python-modules/cinemagoer { }; + circuit-webhook = callPackage ../development/python-modules/circuit-webhook { }; circuitbreaker = callPackage ../development/python-modules/circuitbreaker { }; @@ -1718,6 +1756,8 @@ in { claripy = callPackage ../development/python-modules/claripy { }; + classify-imports = callPackage ../development/python-modules/classify-imports { }; + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; cle = callPackage ../development/python-modules/cle { }; @@ -1806,6 +1846,8 @@ in { clvm-tools = callPackage ../development/python-modules/clvm-tools { }; + clvm-tools-rs = callPackage ../development/python-modules/clvm-tools-rs { }; + cma = callPackage ../development/python-modules/cma { }; cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; @@ -1872,6 +1914,8 @@ in { colorthief = callPackage ../development/python-modules/colorthief { }; + colorzero = callPackage ../development/python-modules/colorzero { }; + colour = callPackage ../development/python-modules/colour { }; cometblue-lite = callPackage ../development/python-modules/cometblue-lite { }; @@ -2009,6 +2053,10 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Security; }; + cryptolyzer = callPackage ../development/python-modules/cryptolyzer { }; + + cryptoparser = callPackage ../development/python-modules/cryptoparser { }; + crytic-compile = callPackage ../development/python-modules/crytic-compile { }; csrmesh = callPackage ../development/python-modules/csrmesh { }; @@ -2170,6 +2218,8 @@ in { dbfread = callPackage ../development/python-modules/dbfread { }; + dbus-client-gen = callPackage ../development/python-modules/dbus-client-gen { }; + dbus-next = callPackage ../development/python-modules/dbus-next { }; dbus-python = callPackage ../development/python-modules/dbus { @@ -2200,6 +2250,8 @@ in { debugpy = callPackage ../development/python-modules/debugpy { }; + debuglater = callPackage ../development/python-modules/debuglater { }; + decli = callPackage ../development/python-modules/decli { }; decorator = callPackage ../development/python-modules/decorator { }; @@ -2364,7 +2416,7 @@ in { django_compat = callPackage ../development/python-modules/django-compat { }; - django_compressor = callPackage ../development/python-modules/django_compressor { }; + django-compressor = callPackage ../development/python-modules/django-compressor { }; django-configurations = callPackage ../development/python-modules/django-configurations { }; @@ -2679,6 +2731,8 @@ in { dvc-render = callPackage ../development/python-modules/dvc-render { }; + dvc-task = callPackage ../development/python-modules/dvc-task { }; + dvclive = callPackage ../development/python-modules/dvclive { }; dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { }; @@ -2878,6 +2932,8 @@ in { eth-utils = callPackage ../development/python-modules/eth-utils { }; + etils = callPackage ../development/python-modules/etils { }; + etuples = callPackage ../development/python-modules/etuples { }; et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; @@ -2970,6 +3026,11 @@ in { factory_boy = callPackage ../development/python-modules/factory_boy { }; + faiss = toPythonModule (pkgs.faiss.override { + pythonSupport = true; + pythonPackages = self; + }); + fake-useragent = callPackage ../development/python-modules/fake-useragent { }; faker = callPackage ../development/python-modules/faker { }; @@ -3219,7 +3280,7 @@ in { flask-sockets = callPackage ../development/python-modules/flask-sockets { }; - flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; + flask-sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; flask-sslify = callPackage ../development/python-modules/flask-sslify { }; @@ -3402,6 +3463,8 @@ in { pythonPackages = self; }); + galois = callPackage ../development/python-modules/galois { }; + gamble = callPackage ../development/python-modules/gamble { }; gaphas = callPackage ../development/python-modules/gaphas { }; @@ -3414,6 +3477,8 @@ in { garages-amsterdam = callPackage ../development/python-modules/garages-amsterdam { }; + gatt = callPackage ../development/python-modules/gatt { }; + gattlib = callPackage ../development/python-modules/gattlib { inherit (pkgs) bluez glib pkg-config; }; @@ -3734,10 +3799,14 @@ in { gorilla = callPackage ../development/python-modules/gorilla { }; + govee-ble = callPackage ../development/python-modules/govee-ble { }; + goveelights = callPackage ../development/python-modules/goveelights { }; gpapi = callPackage ../development/python-modules/gpapi { }; + gpiozero = callPackage ../development/python-modules/gpiozero { }; + gplaycli = callPackage ../development/python-modules/gplaycli { }; gpgme = toPythonModule (pkgs.gpgme.override { @@ -4034,6 +4103,8 @@ in { holoviews = callPackage ../development/python-modules/holoviews { }; + home-assistant-bluetooth = callPackage ../development/python-modules/home-assistant-bluetooth { }; + homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; homeconnect = callPackage ../development/python-modules/homeconnect { }; @@ -4252,8 +4323,6 @@ in { imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; - imdbpy = callPackage ../development/python-modules/imdbpy { }; - img2pdf = callPackage ../development/python-modules/img2pdf { }; imgaug = callPackage ../development/python-modules/imgaug { }; @@ -4308,6 +4377,8 @@ in { injector = callPackage ../development/python-modules/injector { }; + inkbird-ble = callPackage ../development/python-modules/inkbird-ble { }; + inkex = callPackage ../development/python-modules/inkex { }; inotify = callPackage ../development/python-modules/inotify { }; @@ -4689,6 +4760,12 @@ in { justbackoff = callPackage ../development/python-modules/justbackoff { }; + justbases = callPackage ../development/python-modules/justbases { }; + + justbytes = callPackage ../development/python-modules/justbytes { }; + + justnimbus = callPackage ../development/python-modules/justnimbus { }; + jwcrypto = callPackage ../development/python-modules/jwcrypto { }; jxmlease = callPackage ../development/python-modules/jxmlease { }; @@ -5071,6 +5148,8 @@ in { line_profiler = callPackage ../development/python-modules/line_profiler { }; + lingua = callPackage ../development/python-modules/lingua { }; + linkify-it-py = callPackage ../development/python-modules/linkify-it-py { }; linode-api = callPackage ../development/python-modules/linode-api { }; @@ -5354,6 +5433,8 @@ in { mdurl = callPackage ../development/python-modules/mdurl { }; + mdutils = callPackage ../development/python-modules/mdutils { }; + MDP = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; @@ -5368,6 +5449,8 @@ in { mediafile = callPackage ../development/python-modules/mediafile { }; + mediapy = callPackage ../development/python-modules/mediapy { }; + meilisearch = callPackage ../development/python-modules/meilisearch { }; meinheld = callPackage ../development/python-modules/meinheld { }; @@ -5415,6 +5498,8 @@ in { meteoalertapi = callPackage ../development/python-modules/meteoalertapi { }; + meteocalc = callPackage ../development/python-modules/meteocalc { }; + meteofrance-api = callPackage ../development/python-modules/meteofrance-api { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; @@ -5517,6 +5602,8 @@ in { mnist = callPackage ../development/python-modules/mnist { }; + moat-ble = callPackage ../development/python-modules/moat-ble { }; + mocket = callPackage ../development/python-modules/mocket { }; mock = callPackage ../development/python-modules/mock { }; @@ -5844,6 +5931,8 @@ in { nextcord = callPackage ../development/python-modules/nextcord { }; + nextdns = callPackage ../development/python-modules/nextdns { }; + nftables = toPythonModule (pkgs.nftables.override { python3 = python; withPython = true; @@ -6705,6 +6794,8 @@ in { python-ecobee-api = callPackage ../development/python-modules/python-ecobee-api { }; + python-flirt = callPackage ../development/python-modules/python-flirt { }; + python-glanceclient = callPackage ../development/python-modules/python-glanceclient { }; python-google-nest = callPackage ../development/python-modules/python-google-nest { }; @@ -6755,6 +6846,12 @@ in { plaid-python = callPackage ../development/python-modules/plaid-python { }; + plantuml = callPackage ../development/python-modules/plantuml { }; + + plantuml-markdown = callPackage ../development/python-modules/plantuml-markdown { + inherit (pkgs) plantuml; + }; + plaster = callPackage ../development/python-modules/plaster { }; plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { }; @@ -6989,6 +7086,8 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) IOKit; }; + psycopg = callPackage ../development/python-modules/psycopg { }; + psycopg2 = callPackage ../development/python-modules/psycopg2 { }; psycopg2cffi = callPackage ../development/python-modules/psycopg2cffi { }; @@ -7065,6 +7164,8 @@ in { py-tes = callPackage ../development/python-modules/py-tes { }; + py-tree-sitter = callPackage ../development/python-modules/py-tree-sitter { }; + py-ubjson = callPackage ../development/python-modules/py-ubjson { }; py-zabbix = callPackage ../development/python-modules/py-zabbix { }; @@ -7111,6 +7212,8 @@ in { pyarlo = callPackage ../development/python-modules/pyarlo { }; + pyarr = callPackage ../development/python-modules/pyarr { }; + pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake; }; @@ -7309,6 +7412,8 @@ in { pydevccu = callPackage ../development/python-modules/pydevccu { }; + pydevd = callPackage ../development/python-modules/pydevd { }; + pydexcom = callPackage ../development/python-modules/pydexcom { }; pydicom = callPackage ../development/python-modules/pydicom { }; @@ -7496,7 +7601,8 @@ in { pygobject2 = callPackage ../development/python-modules/pygobject { }; pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { - inherit (pkgs) meson; + # inherit (pkgs) meson won't work because it won't be spliced + inherit (pkgs.buildPackages) meson; }; pygogo = callPackage ../development/python-modules/pygogo { }; @@ -7601,6 +7707,8 @@ in { pykoplenti = callPackage ../development/python-modules/pykoplenti { }; + pykostalpiko = callPackage ../development/python-modules/pykostalpiko { }; + pykulersky = callPackage ../development/python-modules/pykulersky { }; pykwalify = callPackage ../development/python-modules/pykwalify { }; @@ -7733,6 +7841,8 @@ in { pymetno = callPackage ../development/python-modules/pymetno { }; + pymicrobot = callPackage ../development/python-modules/pymicrobot { }; + pymitv = callPackage ../development/python-modules/pymitv { }; pymfy = callPackage ../development/python-modules/pymfy { }; @@ -8047,22 +8157,6 @@ in { pyroute2 = callPackage ../development/python-modules/pyroute2 { }; - pyroute2-core = callPackage ../development/python-modules/pyroute2-core { }; - - pyroute2-ethtool = callPackage ../development/python-modules/pyroute2-ethtool { }; - - pyroute2-ipdb = callPackage ../development/python-modules/pyroute2-ipdb { }; - - pyroute2-ipset = callPackage ../development/python-modules/pyroute2-ipset { }; - - pyroute2-ndb = callPackage ../development/python-modules/pyroute2-ndb { }; - - pyroute2-nftables = callPackage ../development/python-modules/pyroute2-nftables { }; - - pyroute2-nslink = callPackage ../development/python-modules/pyroute2-nslink { }; - - pyroute2-protocols = callPackage ../development/python-modules/pyroute2-protocols { }; - pyrr = callPackage ../development/python-modules/pyrr { }; pyrsistent = callPackage ../development/python-modules/pyrsistent { }; @@ -8149,6 +8243,12 @@ in { pysigma = callPackage ../development/python-modules/pysigma { }; + pysigma-backend-elasticsearch = callPackage ../development/python-modules/pysigma-backend-elasticsearch { }; + + pysigma-backend-opensearch = callPackage ../development/python-modules/pysigma-backend-opensearch { }; + + pysigma-backend-qradar = callPackage ../development/python-modules/pysigma-backend-qradar { }; + pysigma-backend-splunk = callPackage ../development/python-modules/pysigma-backend-splunk { }; pysigma-backend-insightidr = callPackage ../development/python-modules/pysigma-backend-insightidr { }; @@ -8293,12 +8393,7 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; - pytest = callPackage ../development/python-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { - doCheck = false; - }; - }; + pytest = callPackage ../development/python-modules/pytest { }; pytest-aio = callPackage ../development/python-modules/pytest-aio { }; @@ -8620,8 +8715,6 @@ in { python_keyczar = callPackage ../development/python-modules/python_keyczar { }; - python-language-server = callPackage ../development/python-modules/python-language-server { }; - python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; @@ -9042,6 +9135,8 @@ in { qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; + qingping-ble = callPackage ../development/python-modules/qingping-ble { }; + qiskit = callPackage ../development/python-modules/qiskit { }; qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; @@ -9501,6 +9596,8 @@ in { safe = callPackage ../development/python-modules/safe { }; + safeio = callPackage ../development/python-modules/safeio { }; + safety = callPackage ../development/python-modules/safety { }; sagemaker = callPackage ../development/python-modules/sagemaker { }; @@ -9663,6 +9760,10 @@ in { sense-energy = callPackage ../development/python-modules/sense-energy { }; + sensor-state-data = callPackage ../development/python-modules/sensor-state-data { }; + + sensorpush-ble = callPackage ../development/python-modules/sensorpush-ble { }; + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece; }; @@ -9976,6 +10077,8 @@ in { sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; + soundcloud-v2 = callPackage ../development/python-modules/soundcloud-v2 { }; + sounddevice = callPackage ../development/python-modules/sounddevice { }; soundfile = callPackage ../development/python-modules/soundfile { }; @@ -10034,6 +10137,8 @@ in { sphinx-external-toc = callPackage ../development/python-modules/sphinx-external-toc { }; + sphinx-fortran = callPackage ../development/python-modules/sphinx-fortran { }; + sphinx-jupyterbook-latex = callPackage ../development/python-modules/sphinx-jupyterbook-latex { }; sphinx-multitoc-numbering = callPackage ../development/python-modules/sphinx-multitoc-numbering { }; @@ -10058,6 +10163,8 @@ in { sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; + sphinxcontrib-confluencebuilder = callPackage ../development/python-modules/sphinxcontrib-confluencebuilder { }; + sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { }; sphinxcontrib-excel-table = callPackage ../development/python-modules/sphinxcontrib-excel-table { }; @@ -10104,6 +10211,8 @@ in { sphinx-autobuild = callPackage ../development/python-modules/sphinx-autobuild { }; + sphinx-autodoc-typehints = callPackage ../development/python-modules/sphinx-autodoc-typehints { }; + sphinx-basic-ng = callPackage ../development/python-modules/sphinx-basic-ng { }; sphinx-copybutton = callPackage ../development/python-modules/sphinx-copybutton { }; @@ -10120,7 +10229,7 @@ in { sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; - sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; + sphinx-rtd-theme = callPackage ../development/python-modules/sphinx-rtd-theme { }; sphinx-serve = callPackage ../development/python-modules/sphinx-serve { }; @@ -10332,8 +10441,6 @@ in { suseapi = callPackage ../development/python-modules/suseapi { }; - svdtools = callPackage ../development/python-modules/svdtools { }; - svg2tikz = callPackage ../development/python-modules/svg2tikz { }; svglib = callPackage ../development/python-modules/svglib { }; @@ -10486,6 +10593,8 @@ in { tensorly = callPackage ../development/python-modules/tensorly { }; + tensorrt = callPackage ../development/python-modules/tensorrt { }; + tellduslive = callPackage ../development/python-modules/tellduslive { }; termcolor = callPackage ../development/python-modules/termcolor { }; @@ -10609,6 +10718,8 @@ in { tilequant = callPackage ../development/python-modules/tilequant { }; + tiler = callPackage ../development/python-modules/tiler { }; + tilestache = callPackage ../development/python-modules/tilestache { }; timeago = callPackage ../development/python-modules/timeago { }; @@ -10747,6 +10858,8 @@ in { transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; + trectools = callPackage ../development/python-modules/trectools { }; + treelog = callPackage ../development/python-modules/treelog { }; treeo = callPackage ../development/python-modules/treeo { }; @@ -11341,6 +11454,8 @@ in { wget = callPackage ../development/python-modules/wget { }; + whatthepatch = callPackage ../development/python-modules/whatthepatch { }; + wheel = callPackage ../development/python-modules/wheel { }; wheel-filename = callPackage ../development/python-modules/wheel-filename { }; @@ -11448,7 +11563,7 @@ in { xapp = callPackage ../development/python-modules/xapp { inherit (pkgs) gtk3 gobject-introspection polkit; - inherit (pkgs.cinnamon) xapps; + inherit (pkgs.cinnamon) xapp; }; xarray = callPackage ../development/python-modules/xarray { }; @@ -11477,6 +11592,8 @@ in { xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + xiaomi-ble = callPackage ../development/python-modules/xiaomi-ble { }; + xkbcommon = callPackage ../development/python-modules/xkbcommon { }; xkcdpass = callPackage ../development/python-modules/xkcdpass { }; @@ -11553,6 +11670,8 @@ in { yalexs = callPackage ../development/python-modules/yalexs { }; + yalexs-ble = callPackage ../development/python-modules/yalexs-ble { }; + yamale = callPackage ../development/python-modules/yamale { }; yamlfix = callPackage ../development/python-modules/yamlfix { }; @@ -11641,6 +11760,8 @@ in { inherit python; })).python; + zadnegoale = callPackage ../development/python-modules/zadnegoale { }; + zake = callPackage ../development/python-modules/zake { }; zarr = callPackage ../development/python-modules/zarr { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix index 17ec8528e4..ef82c54dda 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix @@ -52,7 +52,7 @@ let ghc884 ghc8107 ghc902 - ghc923 + ghc924 ]; # packagePlatforms applied to `haskell.packages.*` @@ -326,17 +326,19 @@ let random QuickCheck cabal2nix + terminfo # isn't bundled for cross xhtml # isn't bundled for cross ; }; - haskell.packages.native-bignum.ghc923 = { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc923) + haskell.packages.native-bignum.ghc924 = { + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924) hello lens random QuickCheck cabal2nix + terminfo # isn't bundled for cross xhtml # isn't bundled for cross ; }; @@ -380,7 +382,7 @@ let weeder = [ compilerNames.ghc8107 compilerNames.ghc902 - compilerNames.ghc923 + compilerNames.ghc924 ]; purescript-cst = [ compilerNames.ghc8107 @@ -454,11 +456,11 @@ let jobs.pkgsMusl.haskell.compiler.ghc884 jobs.pkgsMusl.haskell.compiler.ghc8107 jobs.pkgsMusl.haskell.compiler.ghc902 - jobs.pkgsMusl.haskell.compiler.ghc923 + jobs.pkgsMusl.haskell.compiler.ghc924 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.ghc923 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD ]; }; @@ -474,7 +476,7 @@ let }; constituents = accumulateDerivations [ jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc923 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc924 ]; }; }